From 05089044fbc557e8e81d5875cbcc5ee620fdcf70 Mon Sep 17 00:00:00 2001
From: na-trium-144 <100704180+na-trium-144@users.noreply.github.com>
Date: Tue, 11 Nov 2025 01:05:46 +0900
Subject: [PATCH] =?UTF-8?q?repl=E3=81=AE=E5=88=9D=E6=9C=9F=E5=8C=96?=
 =?UTF-8?q?=E6=99=82=E3=81=AB=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89=E3=81=8C?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E3=81=AE?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/terminal/repl.tsx | 51 ++++++++++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 20 deletions(-)

diff --git a/app/terminal/repl.tsx b/app/terminal/repl.tsx
index 79666ef..4134580 100644
--- a/app/terminal/repl.tsx
+++ b/app/terminal/repl.tsx
@@ -124,17 +124,6 @@ export function ReplTerminal({
       }
       return rows + 2; // 最後のプロンプト行を含める
     },
-    onReady: () => {
-      if (initCommand) {
-        for (const cmd of initCommand) {
-          updateBuffer(() => cmd.command.split("\n"));
-          terminalInstanceRef.current!.writeln("");
-          inputBuffer.current = [];
-          handleOutput(cmd.output);
-        }
-      }
-      terminalInstanceRef.current!.scrollToTop();
-    },
   });
 
   // REPLのユーザー入力
@@ -143,7 +132,7 @@ export function ReplTerminal({
   // inputBufferを更新し、画面に描画する
   const updateBuffer = useCallback(
     (newBuffer: () => string[]) => {
-      if (terminalInstanceRef.current && Prism) {
+      if (terminalInstanceRef.current) {
         hideCursor(terminalInstanceRef.current);
         // バッファの行数分カーソルを戻す
         if (inputBuffer.current.length >= 2) {
@@ -161,9 +150,14 @@ export function ReplTerminal({
             (i === 0 ? prompt : (promptMore ?? prompt)) ?? "> "
           );
           if (language) {
-            terminalInstanceRef.current.write(
-              highlightCodeToAnsi(Prism, inputBuffer.current[i], language)
-            );
+            if (Prism) {
+              terminalInstanceRef.current.write(
+                highlightCodeToAnsi(Prism, inputBuffer.current[i], language)
+              );
+            } else {
+              console.warn("Prism is not loaded, cannot highlight input code");
+              terminalInstanceRef.current.write(inputBuffer.current[i]);
+            }
           } else {
             terminalInstanceRef.current.write(inputBuffer.current[i]);
           }
@@ -193,7 +187,7 @@ export function ReplTerminal({
         updateBuffer(() => [""]);
       }
     },
-    [updateBuffer, terminalInstanceRef, returnPrefix, language]
+    [Prism, updateBuffer, terminalInstanceRef, returnPrefix, language]
   );
 
   const keyHandler = useCallback(
@@ -288,18 +282,34 @@ export function ReplTerminal({
     }
   }, [keyHandler, termReady, runtimeReady, terminalInstanceRef]);
 
-  // ユーザーがクリックした時(triggered) && ランタイムが準備できた時に、実際にinitCommandを実行する(executing)
   const [initCommandState, setInitCommandState] = useState<
-    "idle" | "triggered" | "executing" | "done"
-  >("idle");
+    "initializing" | "idle" | "triggered" | "executing" | "done"
+  >("initializing");
   useEffect(() => {
     if (
+      terminalInstanceRef.current &&
+      termReady &&
+      Prism &&
+      initCommandState === "initializing"
+    ) {
+      // xtermの初期化とPrismの読み込みが完了したら、initCommandを実行せず描画する
+      if (initCommand) {
+        for (const cmd of initCommand) {
+          updateBuffer(() => cmd.command.split("\n"));
+          terminalInstanceRef.current!.writeln("");
+          inputBuffer.current = [];
+          handleOutput(cmd.output);
+        }
+      }
+      terminalInstanceRef.current!.scrollToTop();
+      setInitCommandState("idle");
+    } else if (
       terminalInstanceRef.current &&
       termReady &&
       runtimeReady &&
       initCommandState === "triggered"
     ) {
-      setInitCommandState("executing");
+      // ユーザーがクリックした時(triggered) && ランタイムが準備できた時に、実際にinitCommandを実行する(executing)      setInitCommandState("executing");
       (async () => {
         if (initCommand) {
           // 初期化時に実行するコマンドがある場合はそれを実行
@@ -338,6 +348,7 @@ export function ReplTerminal({
     handleOutput,
     termReady,
     terminalInstanceRef,
+    Prism,
   ]);
 
   return (