runtime初期化/実行の異常系を onError + fatalError で分離伝播 (#218)

Copilot · na-trium-144 · web-flow · commit e270b491378d · 2026-04-18T01:43:19.000+09:00
* chore: plan runtime fatal error handling changes Agent-Logs-Url: https://github.com/ut-code/my-code/sessions/3499a4d7-2b75-4046-b6d5-24912d4eaf0a Co-authored-by: na-trium-144 <100704180+na-trium-144@users.noreply.github.com> * feat(runtime): add fatalError and onError callback propagation Agent-Logs-Url: https://github.com/ut-code/my-code/sessions/3499a4d7-2b75-4046-b6d5-24912d4eaf0a Co-authored-by: na-trium-144 <100704180+na-trium-144@users.noreply.github.com> * revert package-lock.json * fix: restore package-lock from sentry to prevent dependency drift Agent-Logs-Url: https://github.com/ut-code/my-code/sessions/f1dea2f9-037f-4cd9-a9e0-cefe2e569bfa Co-authored-by: na-trium-144 <100704180+na-trium-144@users.noreply.github.com> * fix(runtime): avoid bundling typescript.js in server handler Agent-Logs-Url: https://github.com/ut-code/my-code/sessions/1f1e6587-2ca0-4873-86cf-5cc4025a539b Co-authored-by: na-trium-144 <100704180+na-trium-144@users.noreply.github.com> * fatalErrorをそんなに目立たせる必要ない * handleRuntimeErrorをplainの関数にし、alertを追加 --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: na-trium-144 <100704180+na-trium-144@users.noreply.github.com>
diff --git a/app/terminal/exec.tsx b/app/terminal/exec.tsx
@@ -13,8 +13,16 @@ import { useEmbedContext } from "./embedContext";
 import clsx from "clsx";
 import { LangConstants } from "@my-code/runtime/languages";
 import { useRuntime } from "@my-code/runtime/context";
+import { captureException } from "@sentry/nextjs";
 import { MinMaxButton, Modal } from "./modal";
 
+function handleRuntimeError(error: unknown) {
+  captureException(error);
+  window.alert(
+    "コード実行環境で予期せぬエラーが発生しました: \n" + String(error)
+  );
+}
+
 interface ExecProps {
   /*
    * Pythonの場合はメインファイル1つのみを指定する。
@@ -68,8 +76,9 @@ export function ExecFile(props: ExecProps) {
       `Language ${props.language.originalLang} does not have a runtime environment.`
     );
   }
+
   const { ready, runFiles, getCommandlineStr, runtimeInfo, interrupt } =
-    useRuntime(props.language.runtime);
+    useRuntime(props.language.runtime, { onError: handleRuntimeError });
 
   // ユーザーがクリックした時(triggered) && ランタイムが準備できた時に、実際にinitCommandを実行する(executing)
   const [executionState, setExecutionState] = useState<
diff --git a/app/terminal/repl.tsx b/app/terminal/repl.tsx
@@ -17,6 +17,7 @@ import { useEmbedContext } from "./embedContext";
 import { LangConstants } from "@my-code/runtime/languages";
 import clsx from "clsx";
 import { InlineCode } from "@/markdown/codeBlock";
+import { captureException } from "@sentry/nextjs";
 import {
   emptyMutex,
   ReplCommand,
@@ -26,6 +27,13 @@ import { useRuntime } from "@my-code/runtime/context";
 import { MinMaxButton, Modal } from "./modal";
 import { StopButtonContent } from "./exec";
 
+function handleRuntimeError(error: unknown) {
+  captureException(error);
+  window.alert(
+    "コード実行環境で予期せぬエラーが発生しました: \n" + String(error)
+  );
+}
+
 export function writeOutput(
   term: Terminal,
   output: ReplOutput,
@@ -37,6 +45,7 @@ export function writeOutput(
   const message = String(output.message).replace(/\n/g, "\r\n");
   switch (output.type) {
     case "error":
+    case "fatalError":
       term.writeln(chalk.red(message));
       break;
     case "trace":
@@ -95,7 +104,7 @@ export function ReplTerminal({
     checkSyntax,
     splitReplExamples,
     runtimeInfo,
-  } = useRuntime(language.runtime);
+  } = useRuntime(language.runtime, { onError: handleRuntimeError });
   const { tabSize, prompt, promptMore, returnPrefix } = language;
   if (!prompt) {
     console.warn(`prompt not defined for language: ${language}`);
diff --git a/packages/runtime/src/context.tsx b/packages/runtime/src/context.tsx
@@ -10,13 +10,20 @@ import { PyodideContext, usePyodide } from "./worker/pyodide";
 import { RubyContext, useRuby } from "./worker/ruby";
 import { WorkerProvider } from "./worker/runtime";
 
-export function useRuntime(language: RuntimeLang): RuntimeContext {
+interface UseRuntimeOptions {
+  onError?: (error: unknown) => void;
+}
+export function useRuntime(
+  language: RuntimeLang,
+  options?: UseRuntimeOptions
+): RuntimeContext {
   const runtimes = useRuntimeAll();
   const runtime = runtimes[language];
   const { init } = runtime;
+  const { onError } = options ?? {};
   useEffect(() => {
-    init?.();
-  }, [init]);
+    init?.(onError);
+  }, [init, onError]);
   return runtime;
 }
 export function useRuntimeAll(): Record<RuntimeLang, RuntimeContext> {
diff --git a/packages/runtime/src/interface.ts b/packages/runtime/src/interface.ts
@@ -27,7 +27,7 @@ export interface RuntimeContext {
    * 初期化とcleanupはuseEffect()で非同期に行うのがよいです。
    *
    */
-  init?: () => void;
+  init?: (onError?: RuntimeErrorHandler) => void;
   /**
    * ランタイムの初期化が完了したか、不要である場合true
    */
@@ -148,11 +148,13 @@ export interface RuntimeInfo {
   prettyLangName: string;
   version?: string;
 }
+export type RuntimeErrorHandler = (error: unknown) => void;
 
 export const ReplOutputTypeSchema = z.enum([
   "stdout",
   "stderr",
   "error",
+  "fatalError",
   "return",
   "trace",
   "system",
diff --git a/packages/runtime/src/typescript/runtime.tsx b/packages/runtime/src/typescript/runtime.tsx
@@ -9,9 +9,16 @@ import {
   useContext,
   useEffect,
   useMemo,
+  useRef,
   useState,
 } from "react";
-import { ReplOutput, RuntimeContext, RuntimeInfo, UpdatedFile } from "../interface";
+import {
+  ReplOutput,
+  RuntimeContext,
+  RuntimeErrorHandler,
+  RuntimeInfo,
+  UpdatedFile,
+} from "../interface";
 
 export const compilerOptions: CompilerOptions = {
   lib: ["ESNext", "WebWorker"],
@@ -20,22 +27,26 @@ export const compilerOptions: CompilerOptions = {
 };
 
 const TypeScriptContext = createContext<{
-  init: () => void;
+  init: (onError?: RuntimeErrorHandler) => void;
   tsEnv: VirtualTypeScriptEnvironment | null;
   tsVersion?: string;
 }>({ init: () => undefined, tsEnv: null });
 export function TypeScriptProvider({ children }: { children: ReactNode }) {
   const [tsEnv, setTSEnv] = useState<VirtualTypeScriptEnvironment | null>(null);
   const [tsVersion, setTSVersion] = useState<string | undefined>(undefined);
   const [doInit, setDoInit] = useState(false);
-  const init = useCallback(() => setDoInit(true), []);
+  const onErrorRef = useRef<RuntimeErrorHandler | undefined>(undefined);
+  const init = useCallback((onError?: RuntimeErrorHandler) => {
+    onErrorRef.current = onError;
+    setDoInit(true);
+  }, []);
   useEffect(() => {
     // useEffectはサーバーサイドでは実行されないが、
     // typeof window !== "undefined" でガードしないとなぜかesbuildが"typescript"を
     // サーバーサイドでのインポート対象とみなしてしまう。
     if (doInit && tsEnv === null && typeof window !== "undefined") {
       const abortController = new AbortController();
-      (async () => {
+      void (async () => {
         const ts = await import("typescript");
         const vfs = await import("@typescript/vfs");
         const system = vfs.createSystem(new Map());
@@ -70,7 +81,12 @@ export function TypeScriptProvider({ children }: { children: ReactNode }) {
         );
         setTSEnv(env);
         setTSVersion(ts.version);
-      })();
+      })().catch((error) => {
+        if (error instanceof DOMException && error.name === "AbortError") {
+          return;
+        }
+        onErrorRef.current?.(error);
+      });
       return () => {
         abortController.abort();
       };
@@ -86,9 +102,11 @@ export function TypeScriptProvider({ children }: { children: ReactNode }) {
 export function useTypeScript(jsEval: RuntimeContext): RuntimeContext {
   const { init: tsInit, tsEnv, tsVersion } = useContext(TypeScriptContext);
   const { init: jsInit } = jsEval;
-  const init = useCallback(() => {
-    tsInit();
-    jsInit?.();
+  const onErrorRef = useRef<RuntimeErrorHandler | undefined>(undefined);
+  const init = useCallback((onError?: RuntimeErrorHandler) => {
+    onErrorRef.current = onError;
+    tsInit(onError);
+    jsInit?.(onError);
   }, [tsInit, jsInit]);
 
   const runFiles = useCallback(
@@ -101,6 +119,7 @@ export function useTypeScript(jsEval: RuntimeContext): RuntimeContext {
         onOutput({ type: "error", message: "TypeScript is not ready yet." });
         return;
       } else {
+        try {
         for (const [filename, content] of Object.entries(files)) {
           tsEnv.createFile(filename, content);
         }
@@ -151,6 +170,13 @@ export function useTypeScript(jsEval: RuntimeContext): RuntimeContext {
           { ...files, ...emittedFiles },
           onOutput
         );
+        } catch (error) {
+          onErrorRef.current?.(error);
+          onOutput({
+            type: "fatalError",
+            message: error instanceof Error ? error.message : String(error),
+          });
+        }
       }
     },
     [tsEnv, jsEval]
diff --git a/packages/runtime/src/wandbox/runtime.tsx b/packages/runtime/src/wandbox/runtime.tsx
@@ -5,18 +5,27 @@ import {
   ReactNode,
   useCallback,
   useContext,
+  useEffect,
   useMemo,
+  useRef,
 } from "react";
 import useSWR from "swr";
 import { compilerInfoFetcher, SelectedCompiler } from "./api";
 import { cppRunFiles, selectCppCompiler } from "./cpp";
 import { RuntimeLang } from "../languages";
 import { rustRunFiles, selectRustCompiler } from "./rust";
-import { ReplOutput, RuntimeContext, RuntimeInfo, UpdatedFile } from "../interface";
+import {
+  ReplOutput,
+  RuntimeContext,
+  RuntimeErrorHandler,
+  RuntimeInfo,
+  UpdatedFile,
+} from "../interface";
 
 type WandboxLang = "cpp" | "rust";
 
 interface IWandboxContext {
+  init: (onError?: RuntimeErrorHandler) => void;
   ready: boolean;
   getCommandlineStrWithLang: (
     lang: WandboxLang
@@ -34,10 +43,17 @@ interface IWandboxContext {
 const WandboxContext = createContext<IWandboxContext>(null!);
 
 export function WandboxProvider({ children }: { children: ReactNode }) {
+  const onErrorRef = useRef<RuntimeErrorHandler | undefined>(undefined);
+  const init = useCallback((onError?: RuntimeErrorHandler) => {
+    onErrorRef.current = onError;
+  }, []);
   const { data: compilerList, error } = useSWR("list", compilerInfoFetcher);
-  if (error) {
-    console.error("Failed to fetch compiler list from Wandbox:", error);
-  }
+  useEffect(() => {
+    if (error) {
+      console.error("Failed to fetch compiler list from Wandbox:", error);
+      onErrorRef.current?.(error);
+    }
+  }, [error]);
 
   const ready = !!compilerList;
 
@@ -76,16 +92,29 @@ export function WandboxProvider({ children }: { children: ReactNode }) {
           onOutput({ type: "error", message: "Wandbox is not ready yet." });
           return;
         }
-        switch (lang) {
-          case "cpp":
-            await cppRunFiles(selectedCompiler.cpp, files, filenames, onOutput);
-            break;
-          case "rust":
-            await rustRunFiles(selectedCompiler.rust, files, filenames, onOutput);
-            break;
-          default:
-            lang satisfies never;
-            throw new Error(`unsupported language: ${lang}`);
+        try {
+          switch (lang) {
+            case "cpp":
+              await cppRunFiles(selectedCompiler.cpp, files, filenames, onOutput);
+              break;
+            case "rust":
+              await rustRunFiles(
+                selectedCompiler.rust,
+                files,
+                filenames,
+                onOutput
+              );
+              break;
+            default:
+              lang satisfies never;
+              throw new Error(`unsupported language: ${lang}`);
+          }
+        } catch (error) {
+          onErrorRef.current?.(error);
+          onOutput({
+            type: "fatalError",
+            message: error instanceof Error ? error.message : String(error),
+          });
         }
       },
     [selectedCompiler]
@@ -94,6 +123,7 @@ export function WandboxProvider({ children }: { children: ReactNode }) {
   return (
     <WandboxContext.Provider
       value={{
+        init,
         ready,
         getCommandlineStrWithLang,
         runFilesWithLang,
@@ -123,6 +153,7 @@ export function useWandbox(lang: WandboxLang): RuntimeContext {
   );
 
   return {
+    init: context.init,
     ready: context.ready,
     runFiles,
     getCommandlineStr,
diff --git a/packages/runtime/src/worker/pyodide.worker.ts b/packages/runtime/src/worker/pyodide.worker.ts
@@ -115,13 +115,13 @@ async function runCode(
         });
       } else {
         await onOutput({
-          type: "error",
+          type: "fatalError",
           message: `予期せぬエラー: ${e.message.trim()}`,
         });
       }
     } else {
       await onOutput({
-        type: "error",
+        type: "fatalError",
         message: `予期せぬエラー: ${String(e).trim()}`,
       });
     }
@@ -175,13 +175,13 @@ async function runFile(
         });
       } else {
         await onOutput({
-          type: "error",
+          type: "fatalError",
           message: `予期せぬエラー: ${e.message.trim()}`,
         });
       }
     } else {
       await onOutput({
-        type: "error",
+        type: "fatalError",
         message: `予期せぬエラー: ${String(e).trim()}`,
       });
     }
diff --git a/packages/runtime/src/worker/ruby.worker.ts b/packages/runtime/src/worker/ruby.worker.ts
diff --git a/packages/runtime/src/worker/runtime.tsx b/packages/runtime/src/worker/runtime.tsx
