oasis_test_v2 2.2.42 → 2.2.43

package/dist/index.js

@@ -7347,12 +7347,18 @@ ${note}` : note };
   const stderrTail = [];
   const STDERR_MAX_LINES = 40;
   const STDERR_MAX_BYTES = 4e3;
+  let turnMessage = "";
+  let turnStderr = [];
   const stderrRl = readline3.createInterface({ input: child.stderr });
   stderrRl.on("line", (line) => {
     try {
       transcriptOut.write(line + "\n");
     } catch {
     }
+    if (cfg.classifyPromptFailure) {
+      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);
@@ -7399,6 +7405,7 @@ ${note}` : note };
     },
     (text6) => {
       confirmAppendBatch();
+      if (cfg.classifyPromptFailure && turnMessage.length < PROMPT_TURN_MESSAGE_MAX) turnMessage += text6;
       for (const cb of outputCbs) cb(text6);
     },
     (e) => {
@@ -7514,6 +7521,8 @@ ${task}` : task;
       }
       streamingCurrentTurn = true;
       const sendPrompt = async (text6) => {
+        turnMessage = "";
+        turnStderr = [];
         const p2 = client.request("session/prompt", { sessionId, prompt: [{ type: "text", text: text6 }] });
         inflightStopReason = p2.then((r) => extractStopReason(r), () => "");
         try {
@@ -7544,8 +7553,15 @@ ${task}` : task;
         inflightAppendBatch = [];
       }
       closingForExit = true;
+      let failure;
+      if (cfg.classifyPromptFailure) {
+        await new Promise((r) => setTimeout(r, PROMPT_FAILURE_STDERR_SETTLE_MS));
+        failure = cfg.classifyPromptFailure({ message: turnMessage, stderrLines: [...turnStderr], result: promptResult });
+      }
       const usage = buildReportedUsage(client.usage, actualModel, cfg.inputTokensIncludeCacheRead === true);
-      if (!exited) finish({ code: 0, reason: "clean", transcriptRef, usage, model: actualModel });
+      if (!exited) {
+        finish(failure ? { code: null, reason: failure.reason, errorMessage: failure.errorMessage, transcriptRef, usage, model: actualModel } : { code: 0, reason: "clean", transcriptRef, usage, model: actualModel });
+      }
       child.kill("SIGTERM");
     } catch (err) {
       lastRpcError = err instanceof Error ? err.message : String(err);
@@ -7637,7 +7653,7 @@ ${task}` : task;
     return run;
   }
 }
-var import_node_child_process8, import_node_crypto10, fs9, path11, readline3, ACPClient, LEGACY_APPROVE_OPTION_ID;
+var import_node_child_process8, import_node_crypto10, fs9, path11, readline3, PROMPT_TURN_MESSAGE_MAX, PROMPT_TURN_STDERR_MAX_LINES, PROMPT_FAILURE_STDERR_SETTLE_MS, ACPClient, LEGACY_APPROVE_OPTION_ID;
 var init_acp = __esm({
   "../adapters/src/_core/acp.ts"() {
     "use strict";
@@ -7656,6 +7672,9 @@ var init_acp = __esm({
     init_transcript();
     init_filter_extra_args();
     init_root_bypass();
+    PROMPT_TURN_MESSAGE_MAX = 4e3;
+    PROMPT_TURN_STDERR_MAX_LINES = 200;
+    PROMPT_FAILURE_STDERR_SETTLE_MS = 50;
     ACPClient = class {
       constructor(write, onOutput, onTelemetry, onStop, acceptNotification = () => true, finalUsageIsAuthoritative = false, vendorUsage) {
         this.write = write;
@@ -7935,12 +7954,47 @@ 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}`
+  };
+}
+function promptResultHasUsage(result) {
+  return typeof result === "object" && result !== null && result.usage != null;
+}
+function failureFromMessage(message) {
+  const m2 = MESSAGE_RE.exec(message);
+  return m2 ? { retries: m2[1], summary: m2[2].trim() } : void 0;
+}
+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() };
+  }
+  return void 0;
+}
+var QUOTA_RE, MESSAGE_RE, STDERR_RE;
+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=.*)?$/;
+  }
+});
+
 // ../adapters/src/hermes/index.ts
 var HermesAdapter;
 var init_hermes = __esm({
   "../adapters/src/hermes/index.ts"() {
     "use strict";
     init_acp();
+    init_prompt_failure();
     HermesAdapter = class {
       constructor(opts = {}) {
         this.opts = opts;
@@ -7972,6 +8026,8 @@ 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。
+          classifyPromptFailure: classifyHermesPromptFailure,
           ...this.opts.syncSkills ? { syncSkills: this.opts.syncSkills } : {}
         });
       }
@@ -7985,6 +8041,7 @@ var init_oasis_agent = __esm({
   "../adapters/src/oasis-agent/index.ts"() {
     "use strict";
     init_acp();
+    init_prompt_failure();
     OasisAgentAdapter = class {
       constructor(opts = {}) {
         this.opts = opts;
@@ -8015,6 +8072,8 @@ var init_oasis_agent = __esm({
           // 名字分开才能在同机共存时一眼看出哪份 config 是给谁的。node enroll 会把该字面量写进
           // `~/.oasis-agent/home/config.yaml` 的 skills.external_dirs（见 connect-script.ts）。
           injectSkillsDirEnv: "OASIS_AGENT_SKILLS_DIR",
+          // 分叉没动 acp_adapter/，失败回合的线上形态与 hermes 相同（未在分叉上实测）。
+          classifyPromptFailure: classifyHermesPromptFailure,
           ...this.opts.syncSkills ? { syncSkills: this.opts.syncSkills } : {}
         });
       }
@@ -138626,7 +138685,7 @@ function classifyExitReason(info) {
   if (info.reason) return info.reason;
   const msg = info.errorMessage;
   if (!msg) return info.reason;
-  if (QUOTA_RE.test(msg)) return "rate-limit";
+  if (QUOTA_RE2.test(msg)) return "rate-limit";
   if (UNREACHABLE_RE.test(msg)) return "server-unreachable";
   if (AUTH_RE.test(msg)) return "auth-error";
   return info.reason;
@@ -138643,11 +138702,11 @@ function extractResetHint(errorMessage) {
   const m2 = /((?:resets?|try again at)\s+[^·。\n]{1,48})/i.exec(errorMessage);
   return m2?.[1]?.trim().replace(/[.,;]$/, "");
 }
-var QUOTA_RE, UNREACHABLE_RE, AUTH_RE;
+var QUOTA_RE2, UNREACHABLE_RE, AUTH_RE;
 var init_exit_classify = __esm({
   "../core/src/exit-classify.ts"() {
     "use strict";
-    QUOTA_RE = /hit your (?:weekly|session|usage|daily|monthly) limit|usage limit|rate.?limit|quota exceeded|too many requests|\b429\b/i;
+    QUOTA_RE2 = /hit your (?:weekly|session|usage|daily|monthly) limit|usage limit|rate.?limit|quota exceeded|too many requests|\b429\b/i;
     UNREACHABLE_RE = /不在线|socket 非 OPEN|帧未送达|失联超宽限期|未见任何回执|unreachable|ECONNREFUSED|ETIMEDOUT/i;
     AUTH_RE = /\b401\b|\b403\b|unauthor|invalid[_ -]?api[_ -]?key|authentication failed|credential/i;
   }
@@ -206652,6 +206711,7 @@ async function startOasisServer(opts) {
     const label = ctx.effectLabel || ctx.command || "";
     return approved ? `\u547D\u4EE4\u5DF2\u7531 ${by} \u6279\u51C6\u5E76\u4EE5\u5176\u540D\u4E49\u6267\u884C${label ? `\uFF1A${label}` : ""}\u3002` : `\u547D\u4EE4\u5DF2\u88AB ${by} \u9A73\u56DE${reason ? `\uFF1A${reason}` : ""}\u3002`;
   };
+  const GRAPH_EDIT_IN_FLIGHT_SUFFIX = "\uFF08\u8FD9\u6761\u662F\u5728\u4F60\u672C\u8F6E\u8FDB\u884C\u4E2D\u63D2\u5165\u7684\u901A\u77E5\uFF1A\u56DE\u5E94\u5B8C\u540E\u63A5\u7740\u505A\u4F60\u624B\u4E0A\u8FD8\u6CA1\u505A\u5B8C\u7684\u4E8B\uFF0C\u522B\u5C31\u6B64\u6536\u5C3E\u3002\uFF09";
   const authorizationResumePrompt = (resolution, ctx) => {
     const approved = resolution.status === "approved";
     const by = ctx.authorizedBy ?? "\u7BA1\u7406\u8005";
@@ -206705,12 +206765,43 @@ async function startOasisServer(opts) {
       await store.markMessageDeliveredToAgent?.(statusMessageId).catch(() => void 0);
     };
     const prompt2 = authorizationResumePrompt(resolution, ctx);
+    const inFlightPrompt = ctx.kind === "graph-edit" ? `${prompt2}${GRAPH_EDIT_IN_FLIGHT_SUFFIX}` : prompt2;
     if (liveChat.isRunning(origin)) {
-      const appended = await liveChat.append(origin, prompt2, { system: true }).catch(() => ({ accepted: false }));
+      const appended = await liveChat.append(origin, inFlightPrompt, { system: true }).catch(() => ({ accepted: false }));
       if (appended.accepted) await markDelivered();
       return;
     }
     const sessionCompanyId = session.companyId ?? companyId;
+    let held;
+    let itemStore;
+    try {
+      const turns = (opts.resolveChatTurns ? await opts.resolveChatTurns(sessionCompanyId) : opts.chatTurns) ?? null;
+      itemStore = opts.resolveChatItems ? await opts.resolveChatItems(sessionCompanyId).catch(() => void 0) : opts.chatItems;
+      const opened = await openChatTurn({
+        turns,
+        chatSessionId: origin,
+        source: "internal",
+        log: (m2) => console.warn(m2)
+      });
+      if (!opened.ok) {
+        const appended = await liveChat.append(origin, inFlightPrompt, { system: true }).catch(() => ({ accepted: false }));
+        if (appended.accepted) {
+          await markDelivered();
+          return;
+        }
+        console.warn(
+          `[chat-system-message] \u6388\u6743\u5361\u7EC8\u5C40\u7EED\u8DD1\u672A\u5F00\u8F6E\uFF1A\u4F1A\u8BDD\u69FD\u88AB\u5360\u4E14\u672C\u5B9E\u4F8B\u63D2\u4E0D\u8FDB\uFF0C\u72B6\u6001\u6761\u7559\u4F5C\u5F85\u8865\u6295\uFF08draft=${draftId} session=${origin} company=${sessionCompanyId ?? "(\u9ED8\u8BA4)"} \u5360\u69FD\u8F6E=${opened.activeTurn.id} \u6765\u6E90=${opened.activeTurn.source}\uFF09`
+        );
+        return;
+      }
+      held = opened.turn;
+    } catch (err) {
+      console.error(
+        `[chat-system-message] \u6388\u6743\u5361\u7EC8\u5C40\u7EED\u8DD1\u5360\u4F1A\u8BDD\u69FD\u5931\u8D25\uFF0C\u72B6\u6001\u6761\u7559\u4F5C\u5F85\u8865\u6295\uFF08draft=${draftId} session=${origin} company=${sessionCompanyId ?? "(\u9ED8\u8BA4)"}\uFF09:`,
+        err
+      );
+      return;
+    }
     let dispatched;
     try {
       dispatched = await dispatch({
@@ -206721,6 +206812,11 @@ async function startOasisServer(opts) {
         ...sessionCompanyId ? { companyId: sessionCompanyId } : {}
       });
     } catch (err) {
+      await held?.settle({
+        status: "failed",
+        completedAt: (/* @__PURE__ */ new Date()).toISOString(),
+        lastError: err instanceof Error ? err.message : String(err)
+      });
       console.error(
         `[chat-system-message] \u6388\u6743\u5361\u7EC8\u5C40\u7EED\u8DD1\u6D3E\u53D1\u5931\u8D25\uFF0C\u72B6\u6001\u6761\u7559\u4F5C\u5F85\u8865\u6295\uFF08draft=${draftId} session=${origin} company=${sessionCompanyId ?? "(\u672A\u5E26\uFF0C\u6309\u9ED8\u8BA4\u516C\u53F8)"}\uFF09:`,
         err
@@ -206744,9 +206840,25 @@ async function startOasisServer(opts) {
       chatStore: store,
       chatSessionId: origin,
       session: bgSession,
-      ...resumeOutputsPart ? { outputsPart: resumeOutputsPart } : {}
+      ...resumeOutputsPart ? { outputsPart: resumeOutputsPart } : {},
+      liveChat,
+      liveHandle: {
+        runtimeSessionId: dispatched.id,
+        ...dispatched.runId ? { runId: dispatched.runId } : {},
+        kill: () => {
+          void dispatched.kill?.();
+        },
+        ...dispatched.appendInput ? { appendInput: (input) => dispatched.appendInput(input) } : {},
+        get canAppendInput() {
+          return typeof dispatched.appendInput === "function" && dispatched.canAppendInput !== false;
+        }
+      },
+      ...itemStore ? { itemStore } : {},
+      ...held ? { turnId: held.id } : {}
     });
+    await held?.start({ assistantRunId: dispatched.runId ?? null, dispatchId: dispatched.runId ?? null });
     await markDelivered();
+    void Promise.resolve(dispatched.done).then(() => held?.settle({ status: "succeeded", completedAt: (/* @__PURE__ */ new Date()).toISOString() })).catch((err) => held?.settle({ status: "failed", completedAt: (/* @__PURE__ */ new Date()).toISOString(), lastError: String(err) }));
   };
   const broadcastSeen = /* @__PURE__ */ new Set();
   let _broadcastFlushOwner = null;
@@ -207019,7 +207131,7 @@ async function startOasisServer(opts) {
             }
           },
           ...itemStore ? { itemStore } : {},
-          // 广播/委派回流带上 held turn id（B3）；授权卡入口在别处，那条路本轮不接账本。
+          // 广播/委派回流带上 held turn id（B3）；授权卡续跑（settleAuthorizationStatusLine 第③档）同一口径。
           ...turnId ? { turnId } : {}
         });
       },
@@ -278589,7 +278701,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.2.42" : "dev";
+var PKG_VERSION = true ? "2.2.43" : "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.42",
+  "version": "2.2.43",
   "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": "0f4fa607e6e47a8a8df2194a3a42b194fef3ef0b"
+    "sourceHead": "34968cfc5b0889a75157d9e05acecc3540285932"
   }
 }