oasis_test_v2 2.2.43 → 2.2.45

package/dist/index.js

@@ -1509,8 +1509,8 @@ function trimRoundSummariesForReturn(summaries, recentRounds = DELEGATION_RETURN
   const cut = Math.max(0, summaries.length - keep);
   return summaries.map((summary, index2) => {
     if (index2 >= cut) return { round: summary.round, text: summary.text, truncated: false };
-    const firstLine2 = summary.text.split("\n").map((line) => line.trim()).find((line) => line.length > 0) ?? "";
-    return { round: summary.round, text: firstLine2, truncated: true };
+    const firstLine3 = summary.text.split("\n").map((line) => line.trim()).find((line) => line.length > 0) ?? "";
+    return { round: summary.round, text: firstLine3, truncated: true };
   });
 }
 function collectDelegationArtifacts(roundSummaries) {
@@ -3918,7 +3918,7 @@ var init_claude_code = __esm({
         const liveEventCbs = [];
         let eventSeq = 0;
         let lastResult;
-        const stderrTail = [];
+        const stderrTail2 = [];
         const STDERR_MAX_LINES = 40;
         const STDERR_MAX_BYTES = 4e3;
         const usageAcc = newClaudeUsageAcc();
@@ -3991,11 +3991,11 @@ var init_claude_code = __esm({
             out.write(line + "\n");
           } catch {
           }
-          stderrTail.push(line);
-          while (stderrTail.length > STDERR_MAX_LINES) stderrTail.shift();
-          let total = stderrTail.reduce((n, l) => n + l.length + 1, 0);
-          while (total > STDERR_MAX_BYTES && stderrTail.length > 1) {
-            total -= stderrTail.shift().length + 1;
+          stderrTail2.push(line);
+          while (stderrTail2.length > STDERR_MAX_LINES) stderrTail2.shift();
+          let total = stderrTail2.reduce((n, l) => n + l.length + 1, 0);
+          while (total > STDERR_MAX_BYTES && stderrTail2.length > 1) {
+            total -= stderrTail2.shift().length + 1;
           }
         });
         const callbacks = [];
@@ -4025,7 +4025,7 @@ var init_claude_code = __esm({
           if (exited) return;
           let reason = killReason ?? classifyExit(lastResult);
           const resultErrors = Array.isArray(lastResult?.errors) ? lastResult.errors.map(String) : [];
-          const resumeErrText = [stderrTail.join("\n"), String(lastResult?.result ?? ""), ...resultErrors].join("\n");
+          const resumeErrText = [stderrTail2.join("\n"), String(lastResult?.result ?? ""), ...resultErrors].join("\n");
           if (!killReason && job.resumeRuntimeSession && reason !== "clean" && isSessionNotFoundError(resumeErrText)) {
             reason = "session-not-found";
           }
@@ -4059,7 +4059,7 @@ var init_claude_code = __esm({
             const composed = [subtype && `[${subtype}]`, body2].filter(Boolean).join(" ").trim();
             if (composed) errorParts.push(composed);
           }
-          if (stderrTail.length) errorParts.push(stderrTail.join("\n").trim());
+          if (stderrTail2.length) errorParts.push(stderrTail2.join("\n").trim());
           const errorMessage = isError ? errorParts.filter(Boolean).join("\n---\n").slice(-4e3).trim() || void 0 : void 0;
           exited = {
             code: killReason ? null : code2,
@@ -4880,7 +4880,7 @@ async function listModels(runtime, executablePath) {
     case "claude-code":
       return claudeStaticModels();
     case "codex":
-      return withFallback(runtime, executablePath, () => discoverCodexModels(executablePath), codexStaticModels);
+      return discoverCodexCatalog(executablePath);
     case "gemini":
       return withFallback(runtime, executablePath, async () => await discoverACPModels(executablePath ?? "gemini", "gemini", ["--acp"]) ?? [], geminiStaticModels);
     case "copilot":
@@ -5024,22 +5024,9 @@ function codebuddyStaticModels() {
 function cursorStaticModels() {
   return [{ id: "default[]", label: "Auto", provider: "cursor", default: true }];
 }
-async function isModelValid(runtime, modelId, executablePath) {
-  try {
-    const models = await listModels(runtime, executablePath);
-    if (models.length === 0) return true;
-    return models.some((m2) => m2.id === modelId);
-  } catch {
-    return true;
-  }
-}
-async function defaultModelFor(runtime, executablePath) {
-  try {
-    const models = await listModels(runtime, executablePath);
-    return models.find((m2) => m2.default)?.id;
-  } catch {
-    return void 0;
-  }
+function resolveDispatchModel(candidate, catalog) {
+  if (catalog.length === 0 || catalog.some((m2) => m2.id === candidate)) return { model: candidate, replaced: false };
+  return { model: catalog.find((m2) => m2.default)?.id, replaced: true };
 }
 async function discoverOpenCodeModels(bin) {
   const out = await runCapture(bin ?? "opencode", ["models"]);
@@ -5055,7 +5042,163 @@ async function discoverOpenCodeModels(bin) {
   }
   return models;
 }
-async function discoverCodexModels(bin) {
+async function discoverCodexCatalog(bin) {
+  const probed = { customProvider: false };
+  const models = await cachedDiscovery(discoveryCacheKey("codex", bin), async () => {
+    const catalog = codexCatalogFromAppServer(await probeCodexAppServer(bin ?? "codex"));
+    if (!catalog) return discoverCodexBundledModels(bin);
+    probed.customProvider = catalog.customProvider;
+    return catalog.models;
+  });
+  return models.length > 0 || probed.customProvider ? models : codexStaticModels();
+}
+function codexCatalogFromAppServer(probe) {
+  const config2 = probe?.config;
+  if (!probe || !config2) return null;
+  const providerId = config2.modelProvider?.trim() || "openai";
+  const customProvider = providerId.toLowerCase() !== "openai";
+  if (!customProvider && !probe.models) return null;
+  const provider = customProvider ? config2.providerName?.trim() || providerId : "OpenAI";
+  const listApplies = !customProvider || Boolean(config2.modelCatalogJson);
+  const listed = listApplies ? probe.models ?? [] : [];
+  const configured = config2.model?.trim();
+  const defaultId = configured || listed.find((m2) => m2.isDefault)?.id;
+  const models = listed.map((m2) => ({ id: m2.id, label: m2.label, provider }));
+  if (configured && !models.some((m2) => m2.id === configured)) models.push({ id: configured, label: configured, provider });
+  return { models: models.map((m2) => m2.id === defaultId ? { ...m2, default: true } : m2), customProvider };
+}
+async function probeCodexAppServer(bin, timeoutMs = 15e3) {
+  let dir;
+  try {
+    dir = (0, import_node_fs2.mkdtempSync)((0, import_node_path3.join)((0, import_node_os2.tmpdir)(), "oasis-codex-models-"));
+  } catch {
+    return null;
+  }
+  let child;
+  try {
+    child = (0, import_node_child_process5.spawn)(bin, ["app-server", "--stdio", "-c", "allow_login_shell=false"], {
+      cwd: dir,
+      stdio: ["pipe", "pipe", "ignore"],
+      env: { ...process.env }
+    });
+  } catch {
+    (0, import_node_fs2.rmSync)(dir, { recursive: true, force: true });
+    return null;
+  }
+  return await new Promise((resolve10) => {
+    let settled = false;
+    let config2;
+    const listed = [];
+    let listState = "pending";
+    let nextId = 3;
+    const MAX_PAGES = 20;
+    let pages = 0;
+    const finish = (value2) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      try {
+        child.stdin?.end();
+      } catch {
+      }
+      try {
+        child.kill("SIGKILL");
+      } catch {
+      }
+      try {
+        (0, import_node_fs2.rmSync)(dir, { recursive: true, force: true });
+      } catch {
+      }
+      resolve10(value2);
+    };
+    const maybeFinish = () => {
+      if (config2 === void 0 || listState === "pending") return;
+      finish({ config: config2, models: listState === "done" ? listed : null });
+    };
+    const timer = setTimeout(() => finish(null), timeoutMs);
+    const send = (id, method, params) => {
+      try {
+        child.stdin?.write(`${JSON.stringify({ jsonrpc: "2.0", id, method, params })}
+`);
+      } catch {
+        finish(null);
+      }
+    };
+    child.on("error", () => finish(null));
+    child.stdin?.on("error", () => finish(null));
+    child.on("close", () => finish(null));
+    let buf = "";
+    child.stdout?.on("data", (chunk) => {
+      if (settled) return;
+      buf += chunk.toString("utf8");
+      let nl;
+      while ((nl = buf.indexOf("\n")) >= 0) {
+        const line = buf.slice(0, nl).trim();
+        buf = buf.slice(nl + 1);
+        if (!line) continue;
+        let msg;
+        try {
+          msg = JSON.parse(line);
+        } catch {
+          continue;
+        }
+        if (typeof msg.id !== "number") continue;
+        if (msg.id === 1) {
+          if (msg.error !== void 0) {
+            finish(null);
+            return;
+          }
+          send(2, "config/read", { cwd: dir });
+          send(nextId, "model/list", {});
+          continue;
+        }
+        if (msg.id === 2) {
+          config2 = msg.error !== void 0 ? null : parseCodexConfigRead(msg.result);
+          maybeFinish();
+          continue;
+        }
+        if (msg.id === nextId && listState === "pending") {
+          if (msg.error !== void 0) {
+            listState = "failed";
+          } else {
+            const page = msg.result ?? {};
+            for (const m2 of page.data ?? []) {
+              const id = typeof m2.model === "string" && m2.model ? m2.model : typeof m2.id === "string" ? m2.id : "";
+              if (!id || m2.hidden === true || listed.some((x2) => x2.id === id)) continue;
+              listed.push({ id, label: typeof m2.displayName === "string" && m2.displayName ? m2.displayName : id, isDefault: m2.isDefault === true });
+            }
+            pages += 1;
+            if (typeof page.nextCursor === "string" && page.nextCursor && pages < MAX_PAGES) {
+              nextId += 1;
+              send(nextId, "model/list", { cursor: page.nextCursor });
+              continue;
+            }
+            listState = "done";
+          }
+          maybeFinish();
+        }
+      }
+    });
+    send(1, "initialize", { clientInfo: { name: "oasis-model-discovery", version: "0.1.0" }, capabilities: {} });
+  });
+}
+function parseCodexConfigRead(result) {
+  const config2 = (result ?? {}).config ?? {};
+  const str5 = (v2) => typeof v2 === "string" && v2.trim() ? v2.trim() : void 0;
+  const model = str5(config2["model"]);
+  const modelProvider = str5(config2["model_provider"]);
+  const modelCatalogJson = str5(config2["model_catalog_json"]);
+  const providers = config2["model_providers"];
+  const entry = modelProvider && providers && typeof providers === "object" ? providers[modelProvider] : void 0;
+  const providerName = entry && typeof entry === "object" ? str5(entry["name"]) : void 0;
+  return {
+    ...model ? { model } : {},
+    ...modelProvider ? { modelProvider } : {},
+    ...providerName ? { providerName } : {},
+    ...modelCatalogJson ? { modelCatalogJson } : {}
+  };
+}
+async function discoverCodexBundledModels(bin) {
   const out = await runCapture(bin ?? "codex", ["debug", "models", "--bundled"]);
   if (out === void 0) return [];
   try {
@@ -5256,6 +5399,7 @@ async function discoverACPModels(bin, provider, args = ["acp"], timeoutMs = 12e3
     };
     const watchdog = setTimeout(fail, timeoutMs);
     child.on("error", fail);
+    child.stdin?.on("error", fail);
     child.on("exit", () => {
       if (!settled) fail();
     });
@@ -5476,7 +5620,7 @@ async function runProtocolSession(job, cfg) {
   let eventSeq = 0;
   let runtimeSessionId;
   const pendingTurnMessages = [];
-  const stderrTail = [];
+  const stderrTail2 = [];
   const finish = (info) => {
     if (exited) return;
     closing = true;
@@ -5563,8 +5707,8 @@ async function runProtocolSession(job, cfg) {
   child.stderr.on("data", (chunk) => {
     const text6 = chunk.toString("utf8");
     transcript.write(text6);
-    stderrTail.push(text6.trim());
-    while (stderrTail.length > 40) stderrTail.shift();
+    stderrTail2.push(text6.trim());
+    while (stderrTail2.length > 40) stderrTail2.shift();
   });
   const timer = setTimeout(() => {
     killReason ??= "timeout";
@@ -5584,7 +5728,7 @@ async function runProtocolSession(job, cfg) {
       const info = {
         code: killReason ? null : code2,
         reason,
-        ...reason === "error" && stderrTail.length ? { errorMessage: stderrTail.join("\n").slice(-4e3) } : {}
+        ...reason === "error" && stderrTail2.length ? { errorMessage: stderrTail2.join("\n").slice(-4e3) } : {}
       };
       finish(!killReason && cfg.processExitInfo ? cfg.processExitInfo(info, state) : info);
     }
@@ -6287,8 +6431,8 @@ ${task}` : task;
             }
             if (method === "turn/completed") {
               const turn = record2(params?.turn);
-              const failure = typeof turn?.id === "string" ? state.errorsByTurn.get(turn.id) : void 0;
-              if (params?.threadId !== state.threadId || turn?.id !== state.turnId || turn?.status !== "completed" || turn.error || failure && !failure.willRetry) return [];
+              const failure2 = typeof turn?.id === "string" ? state.errorsByTurn.get(turn.id) : void 0;
+              if (params?.threadId !== state.threadId || turn?.id !== state.turnId || turn?.status !== "completed" || turn.error || failure2 && !failure2.willRetry) return [];
               return [{ ...base, itemId: "turn-end", itemType: "control", operation: "completed", payload: { code: "output_block_completed" } }];
             }
             return [];
@@ -6340,8 +6484,8 @@ ${task}` : task;
             if (params?.threadId !== state.threadId || !state.turnId || turn?.id !== state.turnId) return void 0;
             state.active = false;
             if (turn.status === "interrupted") return { code: null, reason: "cancelled" };
-            const failure = state.errorsByTurn.get(state.turnId);
-            const error2 = turn.error ?? (turn.status === "failed" || !failure?.willRetry ? failure?.error : void 0);
+            const failure2 = state.errorsByTurn.get(state.turnId);
+            const error2 = turn.error ?? (turn.status === "failed" || !failure2?.willRetry ? failure2?.error : void 0);
             if (turn.status === "completed" && !error2) return { code: 0, reason: "clean" };
             return { code: 1, reason: "error", errorMessage: codexTurnErrorMessage(error2) };
           },
@@ -6540,15 +6684,15 @@ ${task}` : task;
             for (const cb of telemetryCbs) cb(full);
           }
         };
-        const stderrTail = [];
+        const stderrTail2 = [];
         const STDERR_MAX_LINES = 40;
         const STDERR_MAX_BYTES = 4e3;
         const pushStderrTail = (line) => {
-          stderrTail.push(line);
-          while (stderrTail.length > STDERR_MAX_LINES) stderrTail.shift();
-          let total = stderrTail.reduce((n, l) => n + l.length + 1, 0);
-          while (total > STDERR_MAX_BYTES && stderrTail.length > 1) {
-            total -= stderrTail.shift().length + 1;
+          stderrTail2.push(line);
+          while (stderrTail2.length > STDERR_MAX_LINES) stderrTail2.shift();
+          let total = stderrTail2.reduce((n, l) => n + l.length + 1, 0);
+          while (total > STDERR_MAX_BYTES && stderrTail2.length > 1) {
+            total -= stderrTail2.shift().length + 1;
           }
         };
         const stdoutErrorLines = [];
@@ -6633,8 +6777,8 @@ ${task}` : task;
           const runtimeSessionId = telemetry.sessionId ?? resumeSessionId;
           const sawStreamError = streamErrorMessages.length > 0;
           const isError = !killReason && (code2 !== 0 || sawStreamError);
-          const errorMessage = isError ? [...streamErrorMessages, ...stdoutErrorLines, ...stderrTail].join("\n").trim().slice(-4e3) || void 0 : void 0;
-          const sessionNotFound = !killReason && isResume && isSessionNotFoundError([...streamErrorMessages, ...stdoutErrorLines, ...stderrTail].join("\n"));
+          const errorMessage = isError ? [...streamErrorMessages, ...stdoutErrorLines, ...stderrTail2].join("\n").trim().slice(-4e3) || void 0 : void 0;
+          const sessionNotFound = !killReason && isResume && isSessionNotFoundError([...streamErrorMessages, ...stdoutErrorLines, ...stderrTail2].join("\n"));
           const reason = killReason ? killReason : sessionNotFound ? "session-not-found" : sawStreamError ? "error" : code2 === 0 ? "clean" : "error";
           finish({
             code: killReason ? null : code2,
@@ -7187,10 +7331,10 @@ function parseArgsJSON(argsText) {
     return { text: t };
   }
 }
-function composeAcpErrorMessage(rpcError, stderrTail) {
+function composeAcpErrorMessage(rpcError, stderrTail2) {
   const parts = [];
   if (rpcError && rpcError.trim()) parts.push(rpcError.trim());
-  if (stderrTail.length) parts.push(stderrTail.join("\n").trim());
+  if (stderrTail2.length) parts.push(stderrTail2.join("\n").trim());
   const combined = parts.filter(Boolean).join("\n---\n").slice(-4e3).trim();
   return combined || void 0;
 }
@@ -7344,7 +7488,7 @@ ${note}` : note };
     killReason ??= "timeout";
     child.kill("SIGKILL");
   }, job.limits.wallClockMs);
-  const stderrTail = [];
+  const stderrTail2 = [];
   const STDERR_MAX_LINES = 40;
   const STDERR_MAX_BYTES = 4e3;
   let turnMessage = "";
@@ -7359,11 +7503,11 @@ ${note}` : note };
       turnStderr.push(line);
       if (turnStderr.length > PROMPT_TURN_STDERR_MAX_LINES) turnStderr.shift();
     }
-    stderrTail.push(line);
-    while (stderrTail.length > STDERR_MAX_LINES) stderrTail.shift();
-    let total = stderrTail.reduce((n, l) => n + l.length + 1, 0);
-    while (total > STDERR_MAX_BYTES && stderrTail.length > 1) {
-      total -= stderrTail.shift().length + 1;
+    stderrTail2.push(line);
+    while (stderrTail2.length > STDERR_MAX_LINES) stderrTail2.shift();
+    let total = stderrTail2.reduce((n, l) => n + l.length + 1, 0);
+    while (total > STDERR_MAX_BYTES && stderrTail2.length > 1) {
+      total -= stderrTail2.shift().length + 1;
     }
   });
   let lastRpcError;
@@ -7435,7 +7579,7 @@ ${note}` : note };
   });
   child.on("error", (err) => {
     clearTimeout(timer);
-    finish({ code: null, reason: "error", transcriptRef, errorMessage: composeAcpErrorMessage(err instanceof Error ? err.message : String(err), stderrTail) });
+    finish({ code: null, reason: "error", transcriptRef, errorMessage: composeAcpErrorMessage(err instanceof Error ? err.message : String(err), stderrTail2) });
   });
   child.on("exit", (code2) => {
     clearTimeout(timer);
@@ -7445,7 +7589,7 @@ ${note}` : note };
         code: killReason ? null : code2,
         reason: killReason ?? (code2 === 0 ? "clean" : "error"),
         transcriptRef,
-        ...isError ? { errorMessage: composeAcpErrorMessage(lastRpcError, stderrTail) } : {}
+        ...isError ? { errorMessage: composeAcpErrorMessage(lastRpcError, stderrTail2) } : {}
       });
     });
   });
@@ -7553,14 +7697,14 @@ ${task}` : task;
         inflightAppendBatch = [];
       }
       closingForExit = true;
-      let failure;
+      let failure2;
       if (cfg.classifyPromptFailure) {
         await new Promise((r) => setTimeout(r, PROMPT_FAILURE_STDERR_SETTLE_MS));
-        failure = cfg.classifyPromptFailure({ message: turnMessage, stderrLines: [...turnStderr], result: promptResult });
+        failure2 = cfg.classifyPromptFailure({ message: turnMessage, stderrLines: [...turnStderr], result: promptResult });
       }
       const usage = buildReportedUsage(client.usage, actualModel, cfg.inputTokensIncludeCacheRead === true);
       if (!exited) {
-        finish(failure ? { code: null, reason: failure.reason, errorMessage: failure.errorMessage, transcriptRef, usage, model: actualModel } : { code: 0, reason: "clean", transcriptRef, usage, model: actualModel });
+        finish(failure2 ? { code: null, reason: failure2.reason, errorMessage: failure2.errorMessage, transcriptRef, usage, model: actualModel } : { code: 0, reason: "clean", transcriptRef, usage, model: actualModel });
       }
       child.kill("SIGTERM");
     } catch (err) {
@@ -7568,7 +7712,7 @@ ${task}` : task;
       if (!exited) {
         const reason = killReason ?? "error";
         const usage = buildReportedUsage(client.usage, actualModel, cfg.inputTokensIncludeCacheRead === true);
-        finish({ code: null, reason, transcriptRef, usage, model: actualModel, ...killReason ? {} : { errorMessage: composeAcpErrorMessage(lastRpcError, stderrTail) } });
+        finish({ code: null, reason, transcriptRef, usage, model: actualModel, ...killReason ? {} : { errorMessage: composeAcpErrorMessage(lastRpcError, stderrTail2) } });
       }
     } finally {
       await readerDone;
@@ -7956,35 +8100,67 @@ var init_acp = __esm({
 
 // ../adapters/src/hermes/prompt-failure.ts
 function classifyHermesPromptFailure(turn) {
-  if (promptResultHasUsage(turn.result)) return void 0;
-  const failed = failureFromMessage(turn.message) ?? failureFromStderr(turn.stderrLines);
-  if (!failed) return void 0;
-  return {
-    reason: QUOTA_RE.test(failed.summary) ? "rate-limit" : "error",
-    errorMessage: `API call failed after ${failed.retries} retries: ${failed.summary}`
-  };
+  const errors = mainAgentErrorRecords(turn.stderrLines);
+  if (promptResultHasUsage(turn.result)) {
+    const gaveUp = errors.filter((r) => API_GAVE_UP_RE.test(r));
+    return gaveUp.length > 0 ? failure(clip(gaveUp.slice(-MAX_ERROR_RECORDS).join("\n"))) : void 0;
+  }
+  const failedSentence = FAILED_SENTENCE_RE.test(turn.message) ? firstLine(turn.message) : void 0;
+  const silent = turn.message.trim() === "";
+  if (errors.length === 0 && !failedSentence && !silent) return void 0;
+  return failure(errors.length > 0 ? clip(errors.slice(-MAX_ERROR_RECORDS).join("\n")) : failedSentence ?? `hermes \u672C\u8F6E\u6CA1\u6709\u6B63\u5E38\u6536\u5C3E\uFF08\u54CD\u5E94\u4E0D\u5E26\u7528\u91CF\uFF09\uFF0C\u6CA1\u6709\u8F93\u51FA\uFF0Cstderr \u4E5F\u6CA1\u6709 ERROR \u65E5\u5FD7\u3002${stderrTail(turn.stderrLines)}`);
 }
-function promptResultHasUsage(result) {
-  return typeof result === "object" && result !== null && result.usage != null;
+function failure(errorMessage) {
+  return { reason: QUOTA_RE.test(errorMessage) ? "rate-limit" : "error", errorMessage };
 }
-function failureFromMessage(message) {
-  const m2 = MESSAGE_RE.exec(message);
-  return m2 ? { retries: m2[1], summary: m2[2].trim() } : void 0;
+function promptResultHasUsage(result) {
+  if (typeof result !== "object" || result === null) return false;
+  return USAGE_KEYS.some((k2) => result[k2] != null);
 }
-function failureFromStderr(lines) {
-  for (let i = lines.length - 1; i >= 0; i--) {
-    const m2 = STDERR_RE.exec(lines[i]);
-    if (m2) return { retries: m2[1], summary: m2[2].trim() };
+function mainAgentErrorRecords(lines) {
+  const records = [];
+  let current = null;
+  const flush = () => {
+    if (current) records.push(current.join("\n").trimEnd());
+    current = null;
+  };
+  for (const line of lines) {
+    const m2 = LOG_RECORD_RE.exec(line);
+    if (m2) {
+      flush();
+      const [, level, text6] = m2;
+      if ((level === "ERROR" || level === "CRITICAL") && !SUBAGENT_PREFIX_RE.test(text6)) current = [text6];
+    } else if (current) {
+      current.push(line);
+    }
   }
-  return void 0;
+  flush();
+  return records.filter((r) => r.trim() !== "");
+}
+function firstLine(text6) {
+  return text6.trim().split("\n")[0].trim();
 }
-var QUOTA_RE, MESSAGE_RE, STDERR_RE;
+function clip(text6) {
+  return text6.length > MAX_ERROR_CHARS ? `\u2026${text6.slice(-MAX_ERROR_CHARS)}` : text6;
+}
+function stderrTail(lines) {
+  const tail = lines.filter((l) => l.trim() !== "").slice(-10).join("\n");
+  return tail ? `
+stderr \u672B\u5C3E\uFF1A
+${clip(tail)}` : "";
+}
+var QUOTA_RE, API_GAVE_UP_RE, FAILED_SENTENCE_RE, LOG_RECORD_RE, SUBAGENT_PREFIX_RE, MAX_ERROR_RECORDS, MAX_ERROR_CHARS, USAGE_KEYS;
 var init_prompt_failure = __esm({
   "../adapters/src/hermes/prompt-failure.ts"() {
     "use strict";
     QUOTA_RE = /\b429\b|rate.?limit|usage limit|quota|too many requests/i;
-    MESSAGE_RE = /^\s*API call failed after (\d+) retries: (.+)/;
-    STDERR_RE = /(?:^|:\s)API call failed after (\d+) retries\. (.+?)(?:\s\|\sprovider=.*)?$/;
+    API_GAVE_UP_RE = /^(?:Non-retryable client error: |API call failed after \d+ retries\. )/;
+    FAILED_SENTENCE_RE = /^\s*API call failed after \d+ retries: /;
+    LOG_RECORD_RE = /^\d{4}-\d{2}-\d{2}[ T]\d{2}:\d{2}:\d{2}(?:[,.]\d+)?\s+\[([A-Z]+)\]\s+[\w.-]+:\s?(.*)$/;
+    SUBAGENT_PREFIX_RE = /^\[subagent-\d+\]\s/;
+    MAX_ERROR_RECORDS = 5;
+    MAX_ERROR_CHARS = 4e3;
+    USAGE_KEYS = ["usage", "token_usage", "tokenUsage", "tokens", "usageMetadata", "usage_metadata"];
   }
 });
 
@@ -8026,7 +8202,7 @@ var init_hermes = __esm({
           // skills.external_dirs 配成该 env → hermes 每 session 发现各自技能。见
           // packages/adapters/docs/modules/07-skills-delivery.md 与 connect-script.ts。
           injectSkillsDirEnv: "OASIS_HERMES_SKILLS_DIR",
-          // 重试用尽时 hermes 照样回 end_turn，只发一句「API call failed after N retries」——见 prompt-failure.ts。
+          // hermes 的 ACP 层不转发失败：API 没成功照样回 end_turn，原因只在 stderr 的 ERROR 日志里——见 prompt-failure.ts。
           classifyPromptFailure: classifyHermesPromptFailure,
           ...this.opts.syncSkills ? { syncSkills: this.opts.syncSkills } : {}
         });
@@ -8662,17 +8838,17 @@ async function runStreamJson(job, cfg) {
   );
   let killReason = null;
   let seq = 0;
-  const stderrTail = [];
+  const stderrTail2 = [];
   const stderrRl = readline4.createInterface({ input: child.stderr });
   stderrRl.on("line", (line) => {
     try {
       transcriptOut.write(line + "\n");
     } catch {
     }
-    stderrTail.push(line);
-    while (stderrTail.length > 40) stderrTail.shift();
-    let total = stderrTail.reduce((n, l) => n + l.length + 1, 0);
-    while (total > 4e3 && stderrTail.length > 1) total -= stderrTail.shift().length + 1;
+    stderrTail2.push(line);
+    while (stderrTail2.length > 40) stderrTail2.shift();
+    let total = stderrTail2.reduce((n, l) => n + l.length + 1, 0);
+    while (total > 4e3 && stderrTail2.length > 1) total -= stderrTail2.shift().length + 1;
   });
   const rl = readline4.createInterface({ input: child.stdout });
   rl.on("line", (line) => {
@@ -8698,7 +8874,7 @@ async function runStreamJson(job, cfg) {
   child.on("exit", (code2) => {
     clearTimeout(timer);
     const isError = !killReason && typeof code2 === "number" && code2 !== 0;
-    const errorMessage = isError ? stderrTail.join("\n").trim().slice(-4e3) || void 0 : void 0;
+    const errorMessage = isError ? stderrTail2.join("\n").trim().slice(-4e3) || void 0 : void 0;
     finish({
       code: killReason ? null : code2,
       reason: killReason ?? (code2 === 0 ? "clean" : "error"),
@@ -8774,17 +8950,17 @@ async function runOneShotText(job, cfg) {
     const text6 = chunk.toString("utf8");
     for (const cb of outputCbs) cb(text6);
   });
-  const stderrTail = [];
+  const stderrTail2 = [];
   const stderrRl = readline4.createInterface({ input: child.stderr });
   stderrRl.on("line", (line) => {
     try {
       transcriptOut.write(line + "\n");
     } catch {
     }
-    stderrTail.push(line);
-    while (stderrTail.length > 40) stderrTail.shift();
-    let total = stderrTail.reduce((n, l) => n + l.length + 1, 0);
-    while (total > 4e3 && stderrTail.length > 1) total -= stderrTail.shift().length + 1;
+    stderrTail2.push(line);
+    while (stderrTail2.length > 40) stderrTail2.shift();
+    let total = stderrTail2.reduce((n, l) => n + l.length + 1, 0);
+    while (total > 4e3 && stderrTail2.length > 1) total -= stderrTail2.shift().length + 1;
   });
   const killChild = () => {
     if (containerized) killContainerBestEffort(containerized.containerName, containerized.mode);
@@ -8801,7 +8977,7 @@ async function runOneShotText(job, cfg) {
   child.on("exit", (code2) => {
     clearTimeout(timer);
     const isError = !killReason && typeof code2 === "number" && code2 !== 0;
-    const errorMessage = isError ? stderrTail.join("\n").trim().slice(-4e3) || void 0 : void 0;
+    const errorMessage = isError ? stderrTail2.join("\n").trim().slice(-4e3) || void 0 : void 0;
     finish({
       code: killReason ? null : code2,
       reason: killReason ?? (code2 === 0 ? "clean" : "error"),
@@ -187843,22 +188019,22 @@ var init_network_maintenance = __esm({
               });
               if (!saved.committed) throw new KnowledgeMaintenanceProcessingError(`\u77E5\u8BC6\u7F51\u7EDC\u4EFB\u52A1 ${taskKey} \u7ED3\u679C\u68C0\u67E5\u70B9\u63D0\u4EA4\u51B2\u7A81`, true);
             },
-            onTaskFailed: async (taskKey, failure) => {
+            onTaskFailed: async (taskKey, failure2) => {
               const current = (await store.list(scope2, "maintenance_task")).find((task) => task.maintenanceRunId === run.id && task.taskKey === taskKey);
               if (!current || current.status === "succeeded") return;
-              const retryable = failure.kind === "runtime" && isRetryableKnowledgeMaintenanceError(failure.cause ?? new Error(failure.message));
+              const retryable = failure2.kind === "runtime" && isRetryableKnowledgeMaintenanceError(failure2.cause ?? new Error(failure2.message));
               const now = this.iso();
-              const output = failure.rawOutput ? this.snapshot(ctx, "maintenance_task_output", stableJson2(failure.rawOutput), projectId2, run.spaceId, `snapshot:maintenance-task-output:${run.id}:${taskKey}:${current.retryCount}`) : void 0;
+              const output = failure2.rawOutput ? this.snapshot(ctx, "maintenance_task_output", stableJson2(failure2.rawOutput), projectId2, run.spaceId, `snapshot:maintenance-task-output:${run.id}:${taskKey}:${current.retryCount}`) : void 0;
               const failed = {
                 ...current,
-                ...failure.sessionId ? { sessionId: failure.sessionId } : {},
+                ...failure2.sessionId ? { sessionId: failure2.sessionId } : {},
                 status: retryable ? "failed_transient" : "failed_deterministic",
                 ...output ? { outputSnapshotRef: output.ref, outputHash: output.contentHash } : {},
                 validationStatus: "failed",
-                ...failure.validationError ? { validationError: failure.validationError } : {},
-                error: failure.message.slice(0, 2e3),
+                ...failure2.validationError ? { validationError: failure2.validationError } : {},
+                error: failure2.message.slice(0, 2e3),
                 completedAt: now,
-                ...failure.kind === "deterministic" ? { validatedAt: now } : {},
+                ...failure2.kind === "deterministic" ? { validatedAt: now } : {},
                 updatedAt: now
               };
               const saved = await store.transact(scope2, {
@@ -188039,9 +188215,9 @@ var init_network_maintenance = __esm({
           if (!result.committed) throw new Error("\u7EF4\u62A4\u5206\u6790\u7ED3\u679C\u63D0\u4EA4\u51B2\u7A81");
           return ready;
         } catch (error2) {
-          const failure = maintenanceFailure(error2);
+          const failure2 = maintenanceFailure(error2);
           const latestTasks = (await store.list(scope2, "maintenance_task")).filter((task) => task.maintenanceRunId === run.id);
-          const validationIssue = failure.retryable ? void 0 : validationIssueForFailure(error2, latestTasks);
+          const validationIssue = failure2.retryable ? void 0 : validationIssueForFailure(error2, latestTasks);
           const repairTaskKeys = new Set(validationIssue?.taskKeys ?? []);
           const now = this.iso();
           const invalidatedTasks = latestTasks.flatMap((task) => {
@@ -188059,8 +188235,8 @@ var init_network_maintenance = __esm({
           const failed = {
             ...processing,
             status: "failed",
-            errorCode: failure.retryable ? "ANALYSIS_TRANSIENT_FAILED" : "ANALYSIS_OR_VALIDATION_FAILED",
-            error: failure.message.slice(0, 2e3),
+            errorCode: failure2.retryable ? "ANALYSIS_TRANSIENT_FAILED" : "ANALYSIS_OR_VALIDATION_FAILED",
+            error: failure2.message.slice(0, 2e3),
             ...validationIssue ? { validationIssues: [validationIssue] } : { validationIssues: void 0 },
             retryCount: processing.retryCount + 1,
             updatedAt: now
@@ -188077,7 +188253,7 @@ var init_network_maintenance = __esm({
             const latest = await store.get(scope2, "maintenance_run", run.id);
             if (latest && ["awaiting_review", "approved", "publishing", "active"].includes(latest.status)) return latest;
           }
-          throw failure;
+          throw failure2;
         }
       }
       async validateAndMaterializeAnalysis(ctx, store, scope2, run, input, analysis, options = {}) {
@@ -188876,10 +189052,10 @@ var init_network_maintenance = __esm({
           run = activationRun;
           return await this.activateGeneration(ctx, store, scope2, run, generation, space, connection);
         } catch (error2) {
-          const failure = maintenanceFailure(error2);
-          const message = failure.message.slice(0, 2e3);
+          const failure2 = maintenanceFailure(error2);
+          const message = failure2.message.slice(0, 2e3);
           const activation = Boolean(run.stagedAt || run.activationStartedAt);
-          const errorCode = activation ? failure.retryable ? "GENERATION_ACTIVATION_TRANSIENT_FAILED" : "GENERATION_ACTIVATION_FAILED" : failure.retryable ? "GENERATION_TRANSIENT_FAILED" : "GENERATION_STAGE_FAILED";
+          const errorCode = activation ? failure2.retryable ? "GENERATION_ACTIVATION_TRANSIENT_FAILED" : "GENERATION_ACTIVATION_FAILED" : failure2.retryable ? "GENERATION_TRANSIENT_FAILED" : "GENERATION_STAGE_FAILED";
           const failedRun = { ...run, status: "failed", errorCode, error: message, retryCount: run.retryCount + 1, updatedAt: this.iso() };
           const failedGeneration = { ...generation, status: "failed", failureCode: errorCode, error: message, updatedAt: this.iso() };
           const saved = await store.transact(scope2, {
@@ -188894,7 +189070,7 @@ var init_network_maintenance = __esm({
             const latest = await store.get(scope2, "maintenance_run", run.id);
             if (latest?.status === "active") return latest;
           }
-          throw failure;
+          throw failure2;
         }
       }
       async activateGeneration(ctx, store, scope2, run, generation, space, connection) {
@@ -197921,7 +198097,7 @@ var init_knowledge2 = __esm({
 });
 
 // ../server/src/domains/delegations/parent-conversation.ts
-function firstLine(content3) {
+function firstLine2(content3) {
   const line = content3.split("\n").map((s2) => s2.trim()).find((s2) => s2.length > 0);
   if (!line) return null;
   return line.length > FIRST_LINE_MAX ? `${line.slice(0, FIRST_LINE_MAX)}\u2026` : line;
@@ -197954,7 +198130,7 @@ function buildParentConversationSnapshot(messages, opts) {
     lines.push(`## \u66F4\u65E9\u7684 ${olderCount} \u8F6E\uFF08\u6BCF\u6761\u53EA\u7559\u9996\u884C\uFF09`, "");
     for (let i = 0; i < fullFrom; i++) {
       for (const m2 of turns[i]) {
-        const head = firstLine(m2.content);
+        const head = firstLine2(m2.content);
         if (head) lines.push(`- **${ROLE_LABEL[m2.role]}**\uFF1A${head}`);
       }
     }
@@ -198300,8 +198476,8 @@ function roundRecorded(summaries, dispatchSeq) {
   return summaries.some((s2) => s2.dispatchSeq === void 0 ? s2.round === dispatchSeq + 1 : s2.dispatchSeq === dispatchSeq);
 }
 function taskHeadline(task) {
-  const firstLine2 = task.split("\n").map((s2) => s2.trim()).find((s2) => s2.length > 0) ?? "";
-  const sentence = firstLine2.split(/[。！？.!?]/)[0]?.trim() || firstLine2;
+  const firstLine3 = task.split("\n").map((s2) => s2.trim()).find((s2) => s2.length > 0) ?? "";
+  const sentence = firstLine3.split(/[。！？.!?]/)[0]?.trim() || firstLine3;
   return sentence.length > TITLE_TASK_CHARS ? sentence.slice(0, TITLE_TASK_CHARS) : sentence;
 }
 function actorSlug(actorId) {
@@ -224294,7 +224470,7 @@ var init_list_usage = __esm({
 });
 
 // ../server/src/domains/actors/activity.ts
-function clip(text6) {
+function clip2(text6) {
   const s2 = typeof text6 === "string" ? text6.trim() : "";
   return s2.length > CLIP ? `${s2.slice(0, CLIP)}\u2026` : s2;
 }
@@ -224317,9 +224493,9 @@ function eventSummary(ev) {
       return { summary: `\u6539\u56FE${parts.length ? `\uFF1A${parts.join("\u3001")}` : ""}`, detail: p2.addNodes?.[0]?.title };
     }
     case "plan.update_spec":
-      return { summary: `\u6539\u4EFB\u52A1\u89C4\u683C${p2.title ? `\uFF1A${clip(p2.title)}` : ""}` };
+      return { summary: `\u6539\u4EFB\u52A1\u89C4\u683C${p2.title ? `\uFF1A${clip2(p2.title)}` : ""}` };
     case "plan.add_node":
-      return { summary: `\u65B0\u5EFA\u8282\u70B9${p2.title ? `\uFF1A${clip(p2.title)}` : ""}` };
+      return { summary: `\u65B0\u5EFA\u8282\u70B9${p2.title ? `\uFF1A${clip2(p2.title)}` : ""}` };
     case "plan.delete_node":
       return { summary: "\u5220\u9664\u8282\u70B9" };
     case "plan.add_edge":
@@ -224337,7 +224513,7 @@ function eventSummary(ev) {
     case "work.create":
       return { summary: "\u6D3E\u6D3B" };
     case "work.kill":
-      return { summary: `\u505C\u6D3E${p2.reason ? `\uFF1A${clip(p2.reason)}` : ""}` };
+      return { summary: `\u505C\u6D3E${p2.reason ? `\uFF1A${clip2(p2.reason)}` : ""}` };
     case "work.response":
       return { summary: p2.outcome === "failed" ? "\u4EA4\u7A3F\uFF08\u5931\u8D25\uFF09" : "\u4EA4\u7A3F" };
     case "work.timeout":
@@ -224349,41 +224525,41 @@ function eventSummary(ev) {
     case "review.create":
       return { summary: "\u5F00\u8BC4\u5BA1" };
     case "review.response":
-      return { summary: p2.verdict === "approve" ? "\u8BC4\u5BA1\u901A\u8FC7" : `\u8BC4\u5BA1\u6253\u56DE${p2.note ? `\uFF1A${clip(p2.note)}` : ""}` };
+      return { summary: p2.verdict === "approve" ? "\u8BC4\u5BA1\u901A\u8FC7" : `\u8BC4\u5BA1\u6253\u56DE${p2.note ? `\uFF1A${clip2(p2.note)}` : ""}` };
     case "review.kill":
-      return { summary: `\u505C\u8BC4\u5BA1${p2.reason ? `\uFF1A${clip(p2.reason)}` : ""}` };
+      return { summary: `\u505C\u8BC4\u5BA1${p2.reason ? `\uFF1A${clip2(p2.reason)}` : ""}` };
     case "review.timeout":
       return { summary: "\u8BC4\u5BA1\u8D85\u65F6" };
     case "issue.create": {
       switch (p2.issueKind) {
         case "gap":
-          return { summary: `\u62A5\u544A gap\uFF1A${clip(p2.body) || "\uFF08\u65E0\u63CF\u8FF0\uFF09"}`, detail: ev.issueId ? `issueId=${ev.issueId}` : void 0 };
+          return { summary: `\u62A5\u544A gap\uFF1A${clip2(p2.body) || "\uFF08\u65E0\u63CF\u8FF0\uFF09"}`, detail: ev.issueId ? `issueId=${ev.issueId}` : void 0 };
         case "escalation":
-          return { summary: `\u4E0A\u62A5\u9700\u4EBA\u4ECB\u5165\uFF1A${clip(p2.body) || "\uFF08\u65E0\u539F\u56E0\uFF09"}` };
+          return { summary: `\u4E0A\u62A5\u9700\u4EBA\u4ECB\u5165\uFF1A${clip2(p2.body) || "\uFF08\u65E0\u539F\u56E0\uFF09"}` };
         case "change_request":
-          return { summary: `\u53D8\u66F4\u8BF7\u6C42\uFF1A${clip(p2.body) || "\uFF08\u65E0\u63CF\u8FF0\uFF09"}` };
+          return { summary: `\u53D8\u66F4\u8BF7\u6C42\uFF1A${clip2(p2.body) || "\uFF08\u65E0\u63CF\u8FF0\uFF09"}` };
         default:
-          return { summary: `\u6279\u6CE8\uFF1A${clip(p2.body) || "\uFF08\u7A7A\uFF09"}` };
+          return { summary: `\u6279\u6CE8\uFF1A${clip2(p2.body) || "\uFF08\u7A7A\uFF09"}` };
       }
     }
     case "issue.reply":
-      return { summary: `\u56DE\u590D\u6279\u6CE8\uFF1A${clip(p2.body) || "\uFF08\u7A7A\uFF09"}` };
+      return { summary: `\u56DE\u590D\u6279\u6CE8\uFF1A${clip2(p2.body) || "\uFF08\u7A7A\uFF09"}` };
     case "issue.resolve":
-      return { summary: `${p2.state === "resolved" ? "\u89E3\u9664" : "\u5173\u95ED"}${p2.note ? `\uFF1A${clip(p2.note)}` : ""}` };
+      return { summary: `${p2.state === "resolved" ? "\u89E3\u9664" : "\u5173\u95ED"}${p2.note ? `\uFF1A${clip2(p2.note)}` : ""}` };
     case "issue.resolution_proposed":
-      return { summary: `\u63D0\u51FA\u5904\u7F6E\u65B9\u6848\uFF1A${clip(p2.proposal) || "\uFF08\u65E0\uFF09"}` };
+      return { summary: `\u63D0\u51FA\u5904\u7F6E\u65B9\u6848\uFF1A${clip2(p2.proposal) || "\uFF08\u65E0\uFF09"}` };
     case "issue.resolution_rejected":
       return { summary: "\u9A73\u56DE\u5904\u7F6E\u65B9\u6848" };
     case "workorder.created":
-      return { summary: `\u5EFA\u5DE5\u5355${p2.title ? `\uFF1A${clip(p2.title)}` : ""}` };
+      return { summary: `\u5EFA\u5DE5\u5355${p2.title ? `\uFF1A${clip2(p2.title)}` : ""}` };
     case "workorder.meta_changed":
       return { summary: "\u4FEE\u6539\u5DE5\u5355\u4FE1\u606F" };
     case "workorder.root_set":
       return { summary: "\u8BBE\u5B9A\u6839\u8282\u70B9" };
     case "workorder.sealed":
-      return { summary: `\u5C01\u5B58${p2.reason ? `\uFF1A${clip(p2.reason)}` : ""}${p2.note ? `\uFF1A${clip(p2.note)}` : ""}` };
+      return { summary: `\u5C01\u5B58${p2.reason ? `\uFF1A${clip2(p2.reason)}` : ""}${p2.note ? `\uFF1A${clip2(p2.note)}` : ""}` };
     case "workorder.paused":
-      return { summary: `\u6682\u505C\u6D3E\u53D1${p2.reason ? `\uFF1A${clip(p2.reason)}` : ""}` };
+      return { summary: `\u6682\u505C\u6D3E\u53D1${p2.reason ? `\uFF1A${clip2(p2.reason)}` : ""}` };
     case "workorder.resumed":
       return { summary: "\u6062\u590D\u6D3E\u53D1" };
     case "work.started":
@@ -224411,27 +224587,27 @@ function summarize3(kind, payload2) {
   switch (kind) {
     case "report_gap":
       return {
-        summary: `\u62A5\u544A gap\uFF1A${clip(p2.description) || "\uFF08\u65E0\u63CF\u8FF0\uFF09"}`,
+        summary: `\u62A5\u544A gap\uFF1A${clip2(p2.description) || "\uFF08\u65E0\u63CF\u8FF0\uFF09"}`,
         ...p2.gapId ? { detail: `gapId=${p2.gapId}${p2.part ? `\uFF0Cpart=${p2.part}` : ""}` } : {}
       };
     case "resolve_gap":
-      return { summary: `\u89E3\u9664 gap\uFF1A${clip(p2.note) || "\uFF08\u65E0\u8BF4\u660E\uFF09"}`, ...p2.gapId ? { detail: `gapId=${p2.gapId}` } : {} };
+      return { summary: `\u89E3\u9664 gap\uFF1A${clip2(p2.note) || "\uFF08\u65E0\u8BF4\u660E\uFF09"}`, ...p2.gapId ? { detail: `gapId=${p2.gapId}` } : {} };
     case "escalate":
-      return { summary: `\u4E0A\u62A5\u9700\u4EBA\u4ECB\u5165\uFF1A${clip(p2.reason) || "\uFF08\u65E0\u539F\u56E0\uFF09"}` };
+      return { summary: `\u4E0A\u62A5\u9700\u4EBA\u4ECB\u5165\uFF1A${clip2(p2.reason) || "\uFF08\u65E0\u539F\u56E0\uFF09"}` };
     case "resolve_escalation":
-      return { summary: `\u5173\u95ED\u4E0A\u62A5${p2.note ? `\uFF1A${clip(p2.note)}` : ""}` };
+      return { summary: `\u5173\u95ED\u4E0A\u62A5${p2.note ? `\uFF1A${clip2(p2.note)}` : ""}` };
     case "submit_review":
-      return { summary: `${p2.verdict === "approve" ? "\u8BC4\u5BA1\u901A\u8FC7" : "\u8BC4\u5BA1\u6253\u56DE"}${p2.note ? `\uFF1A${clip(p2.note)}` : ""}` };
+      return { summary: `${p2.verdict === "approve" ? "\u8BC4\u5BA1\u901A\u8FC7" : "\u8BC4\u5BA1\u6253\u56DE"}${p2.note ? `\uFF1A${clip2(p2.note)}` : ""}` };
     case "propose_revision":
-      return { summary: `\u63D0\u4EA4\u7248\u672C\uFF1A${clip(p2.reason) || "\uFF08\u65E0\u8BF4\u660E\uFF09"}` };
+      return { summary: `\u63D0\u4EA4\u7248\u672C\uFF1A${clip2(p2.reason) || "\uFF08\u65E0\u8BF4\u660E\uFF09"}` };
     case "merge":
       return { summary: "\u5408\u5E76\u7248\u672C\u4E3A\u5F53\u524D" };
     case "conclude":
-      return { summary: `\u6536\u5C3E\uFF08\u91CC\u7A0B\u7891\uFF09${p2.note ? `\uFF1A${clip(p2.note)}` : ""}` };
+      return { summary: `\u6536\u5C3E\uFF08\u91CC\u7A0B\u7891\uFF09${p2.note ? `\uFF1A${clip2(p2.note)}` : ""}` };
     case "seal":
-      return { summary: `\u5C01\u5B58${p2.reason ? `\uFF1A${clip(p2.reason)}` : ""}${p2.note ? `\uFF1A${clip(p2.note)}` : ""}` };
+      return { summary: `\u5C01\u5B58${p2.reason ? `\uFF1A${clip2(p2.reason)}` : ""}${p2.note ? `\uFF1A${clip2(p2.note)}` : ""}` };
     case "annotate":
-      return { summary: `${p2.blocks ? "\u6253\u56DE\u6279\u6CE8\uFF08\u963B\u585E\uFF09" : "\u6279\u6CE8"}\uFF1A${clip(p2.body) || "\uFF08\u7A7A\uFF09"}` };
+      return { summary: `${p2.blocks ? "\u6253\u56DE\u6279\u6CE8\uFF08\u963B\u585E\uFF09" : "\u6279\u6CE8"}\uFF1A${clip2(p2.body) || "\uFF08\u7A7A\uFF09"}` };
     case "resolve_annotation":
       return { summary: "\u89E3\u9664\u6279\u6CE8" };
     case "spawn_artifact":
@@ -224441,9 +224617,9 @@ function summarize3(kind, payload2) {
     case "assign_owner":
       return { summary: "\u53D8\u66F4\u8282\u70B9 owner" };
     case "propose_intervention":
-      return { summary: `\u8D77\u8349\u6539\u56FE\u63D0\u6848${p2.reason ? `\uFF1A${clip(p2.reason)}` : ""}` };
+      return { summary: `\u8D77\u8349\u6539\u56FE\u63D0\u6848${p2.reason ? `\uFF1A${clip2(p2.reason)}` : ""}` };
     case "reject_intervention":
-      return { summary: `\u9A73\u56DE\u6539\u56FE\u63D0\u6848${p2.reason ? `\uFF1A${clip(p2.reason)}` : ""}` };
+      return { summary: `\u9A73\u56DE\u6539\u56FE\u63D0\u6848${p2.reason ? `\uFF1A${clip2(p2.reason)}` : ""}` };
     default:
       return { summary: kind };
   }
@@ -229487,8 +229663,8 @@ async function buildChatPreview(chatStore, sessionId, who) {
   const lastUser = [...msgs].reverse().find((m2) => m2.role === "user" && m2.content.trim().length > 0);
   const lastAsst = [...msgs].reverse().find((m2) => m2.role === "assistant" && m2.content.trim().length > 0);
   const lines = [];
-  if (lastUser) lines.push({ label: "\u4F60", text: clip2(lastUser.content) });
-  if (lastAsst) lines.push({ label: who, text: clip2(lastAsst.content) });
+  if (lastUser) lines.push({ label: "\u4F60", text: clip3(lastUser.content) });
+  if (lastAsst) lines.push({ label: who, text: clip3(lastAsst.content) });
   return lines.length ? { lines } : void 0;
 }
 async function buildChatInbox(chatStore, markers, me, resolveActor, excludeChildSessions) {
@@ -229522,14 +229698,14 @@ async function buildChatInbox(chatStore, markers, me, resolveActor, excludeChild
   }
   return out;
 }
-var PREVIEW_MAX_CHARS, PREVIEW_FETCH_CAP, clip2;
+var PREVIEW_MAX_CHARS, PREVIEW_FETCH_CAP, clip3;
 var init_inbox_chat = __esm({
   "../server/src/domains/collab/inbox-chat.ts"() {
     "use strict";
     init_src();
     PREVIEW_MAX_CHARS = 200;
     PREVIEW_FETCH_CAP = 25;
-    clip2 = (s2) => {
+    clip3 = (s2) => {
       const t = (s2 ?? "").trim();
       return t.length > PREVIEW_MAX_CHARS ? `${t.slice(0, PREVIEW_MAX_CHARS)}\u2026` : t;
     };
@@ -264268,7 +264444,9 @@ function buildChatExitError(info) {
     if (!detail && info.transcriptRef) detail = transcriptTail(info.transcriptRef);
   }
   const firstDetailLine = detail.split("\n").map((line) => line.trim()).find(Boolean) ?? "";
-  const summary = (info.reason ? SUMMARY_BY_REASON[info.reason] : void 0) ?? (firstDetailLine ? `\u5BF9\u8BDD\u5931\u8D25\uFF1A${firstDetailLine.slice(0, 200)}` : `\u5BF9\u8BDD\u5931\u8D25\uFF08${genericLine}\uFF09`);
+  const firstErrorLine = info.errorMessage?.split("\n").map((line) => line.trim()).find(Boolean) ?? "";
+  const fixed = info.reason ? SUMMARY_BY_REASON[info.reason] : void 0;
+  const summary = fixed ? firstErrorLine && info.reason !== "cancelled" && info.reason !== "timeout" ? `${fixed}\uFF1A${firstErrorLine.slice(0, 200)}` : fixed : firstDetailLine ? `\u5BF9\u8BDD\u5931\u8D25\uFF1A${firstDetailLine.slice(0, 200)}` : `\u5BF9\u8BDD\u5931\u8D25\uFF08${genericLine}\uFF09`;
   const chatExit = {
     ...info.reason ? { reason: info.reason } : {},
     summary,
@@ -270063,6 +270241,9 @@ async function startServe(opts) {
         // actor→runtime→default 模型解析（内部字段；非用户 per-session 选择）。
         // 决策 0032 预派发校验：候选 model 不在该 runtime 的模型目录里 → 不烧会话，
         // 回退目录默认并留 warn（曾因 actor 存了残缺 id "claude-sonnet"，CLI 秒拒、节点熔断卡死）。
+        // 目录用**绑定那台节点**的（resolveRuntimeModels，与控制台下拉、会话级校验同一份）：控制面本机
+        // 的 isModelValid 看的是控制面自己的 CLI 配置，跨机时回落静态 GPT 目录，会把节点上配好的
+        // deepseek-flash 判无效、悄悄换成 gpt-6-astra 派出去（Bug 0209）。
         resolveModel: async (actorId) => {
           const actors2 = await runActors();
           const binding = await actors2.service.resolveBinding()(actorId);
@@ -270073,13 +270254,14 @@ async function startServe(opts) {
             candidate = runtimeCfg?.model;
           }
           if (!candidate) return void 0;
-          const kind = binding ? traceRuntimeKind(binding.runtimeKind) : void 0;
-          if (kind && kind !== "custom" && !await isModelValid(kind, candidate)) {
-            const fallback = await defaultModelFor(kind);
-            console.warn(`[dispatch] ${actorId} \u914D\u7F6E\u7684\u6A21\u578B '${candidate}' \u5BF9 runtime ${kind} \u65E0\u6548\uFF0C\u56DE\u9000 ${fallback ?? "CLI \u9ED8\u8BA4"}\uFF08\u51B3\u7B56 0032\uFF09`);
-            return fallback;
-          }
-          return candidate;
+          if (!binding || traceRuntimeKind(binding.runtimeKind) === "custom") return candidate;
+          const runtimeId = `runtime:${binding.nodeId}:${binding.runtimeKind}`;
+          const catalog = await resolveRuntimeModels({ nodeStore, registry: registryStore, nodeReportedModels }, runtimeId).catch(() => []);
+          const checked = resolveDispatchModel(candidate, catalog);
+          if (checked.replaced) {
+            console.warn(`[dispatch] ${actorId} \u914D\u7F6E\u7684\u6A21\u578B '${candidate}' \u4E0D\u5728 ${runtimeId} \u7684\u5019\u9009\u91CC\uFF0C\u56DE\u9000 ${checked.model ?? "CLI \u9ED8\u8BA4"}\uFF08\u51B3\u7B56 0032\uFF09`);
+          }
+          return checked.model;
         },
         // ADR「agent CLI 启动参数员工级可配置化」：每次派发解析员工 actor_configs.extraArgs 下发（形态同 resolveModel）。
         // 只读员工配置，不叠 runtime 默认、不做「没有员工就找 runtime」回退（ADR §3.3 / §4-A）。
@@ -274822,9 +275004,9 @@ var GROUP_ORDER = [
   "\u5B58\u91CF\u7BA1\u7406"
 ];
 function indexSummary(description) {
-  const firstLine2 = description.split("\n")[0] ?? "";
-  const dot = firstLine2.indexOf("\u3002");
-  const head = dot >= 0 ? firstLine2.slice(0, dot + 1) : firstLine2;
+  const firstLine3 = description.split("\n")[0] ?? "";
+  const dot = firstLine3.indexOf("\u3002");
+  const head = dot >= 0 ? firstLine3.slice(0, dot + 1) : firstLine3;
   return head.replace(/\*\*/g, "").trim();
 }
 function buildCommandIndex() {
@@ -278701,7 +278883,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.2.43" : "dev";
+var PKG_VERSION = true ? "2.2.45" : "dev";
 var LOCAL_BIN = localBin();
 var NPM_PREFIX = npmPrefix();
 var INSTANCE = DEFAULT_INSTANCE;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis_test_v2",
-  "version": "2.2.43",
+  "version": "2.2.45",
   "description": "Oasis node daemon + CLI — background daemon, auto-start, full server CLI",
   "bin": {
     "oasis": "./dist/index.js"
@@ -26,6 +26,6 @@
     "node": ">=20"
   },
   "oasisRelease": {
-    "sourceHead": "34968cfc5b0889a75157d9e05acecc3540285932"
+    "sourceHead": "c27918782543065f65990ee2acc32b3da89bba06"
   }
 }