oasis_test 0.1.47 → 0.1.49

package/dist/index.js

@@ -322,7 +322,7 @@ function fold(model, op) {
     case "escalate": {
       const p2 = op.payload;
       const list = model.escalations.get(op.artifactId) ?? [];
-      list.push({ part: p2.part ?? null, reason: p2.reason, by: op.actor, at: op.timestamp, resolved: false });
+      list.push({ part: p2.part ?? null, reason: p2.reason, by: op.actor, ...op.hand !== void 0 ? { hand: op.hand } : {}, at: op.timestamp, resolved: false });
       model.escalations.set(op.artifactId, list);
       break;
     }
@@ -565,7 +565,7 @@ function findGap(model, gapId) {
   return null;
 }
 function unresolvedEscalationsOf(model, id) {
-  return (model.escalations.get(id) ?? []).filter((e) => !e.resolved).map((e) => ({ part: e.part, reason: e.reason, by: e.by, at: e.at }));
+  return (model.escalations.get(id) ?? []).filter((e) => !e.resolved).map((e) => ({ part: e.part, reason: e.reason, by: e.by, ...e.hand !== void 0 ? { hand: e.hand } : {}, at: e.at }));
 }
 function listPendingReviews(model, workspace) {
   const all = [...model.pendingReviews.values()];
@@ -23082,7 +23082,8 @@ function resolveDiscussContext(model, input) {
     if (!a) throw new Error(`\u8282\u70B9\u4E0D\u5B58\u5728\uFF1A${input.artifactId}`);
     workspace = a.workspace;
     const escs = unresolvedEscalationsOf(model, input.artifactId);
-    initiator = escs.at(-1)?.by;
+    const lastEsc = escs.at(-1);
+    initiator = lastEsc?.by.startsWith("actor:agent:") ? lastEsc.by : lastEsc?.hand;
     seed = escs.length ? `\u53D1\u8D77\u4EBA\u5C31\u4F60\u4E0A\u62A5\u7684\u95EE\u9898\u6765\u627E\u4F60\u4E86\uFF1A${escs.at(-1).reason}\u3002\u8BF7\u8BCA\u65AD\u6839\u56E0\u3001\u7ED9 1\u20132 \u4E2A\u65B9\u6848\u3001\u95EE ta \u91C7\u7528\u54EA\u4E2A\u3002` : `\u53D1\u8D77\u4EBA\u60F3\u548C\u4F60\u8BA8\u8BBA\u300C${input.artifactId}\u300D\u5F53\u524D\u7684\u5361\u70B9\u3002\u8BF7\u8BFB\u56FE\u8BCA\u65AD\u3001\u7ED9\u65B9\u6848\u518D\u95EE ta\u3002`;
   } else {
     throw new Error("discuss \u9700\u8981 artifactId \u6216 draftId");
@@ -37513,6 +37514,9 @@ var init_claude_code = __esm({
         const telemetryCbs = [];
         let eventSeq = 0;
         let lastResult;
+        const stderrTail = [];
+        const STDERR_MAX_LINES = 40;
+        const STDERR_MAX_BYTES = 4e3;
         const usageAcc = newClaudeUsageAcc();
         let sessionModel;
         const outputCbs = [];
@@ -37552,7 +37556,19 @@ var init_claude_code = __esm({
             for (const cb of outputCbs) cb(text);
           });
         }
-        child.stderr.pipe(out);
+        const stderrRl = readline.createInterface({ input: child.stderr });
+        stderrRl.on("line", (line) => {
+          try {
+            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;
+          }
+        });
         const callbacks = [];
         let exited;
         let killedByUs = false;
@@ -37563,14 +37579,15 @@ var init_claude_code = __esm({
         child.on("error", (err) => {
           if (exited) return;
           clearTimeout(timer);
+          const spawnErr = err instanceof Error ? err.message : String(err);
           try {
             out.write(`
-[adapter] spawn \u5931\u8D25\uFF1A${err instanceof Error ? err.message : String(err)}
+[adapter] spawn \u5931\u8D25\uFF1A${spawnErr}
 `);
             out.end();
           } catch {
           }
-          exited = { code: null, reason: "error", transcriptRef };
+          exited = { code: null, reason: "error", transcriptRef, errorMessage: spawnErr };
           for (const cb of callbacks.splice(0)) cb(exited);
         });
         child.on("exit", (code) => {
@@ -37595,7 +37612,24 @@ var init_claude_code = __esm({
             }
           }
           const usage = buildClaudeUsage(usageAcc);
-          exited = { code: killedByUs ? null : code, ...reason ? { reason } : {}, transcriptRef, ...usage ? { usage } : {}, ...sessionModel ? { model: sessionModel } : {} };
+          const isError = !killedByUs && (typeof code === "number" && code !== 0 || reason === "error" || reason === "output-limit" || reason === "rate-limit");
+          const errorParts = [];
+          if (lastResult?.is_error === true) {
+            const subtype = typeof lastResult.subtype === "string" ? lastResult.subtype : "";
+            const body = typeof lastResult.result === "string" ? lastResult.result : "";
+            const composed = [subtype && `[${subtype}]`, body].filter(Boolean).join(" ").trim();
+            if (composed) errorParts.push(composed);
+          }
+          if (stderrTail.length) errorParts.push(stderrTail.join("\n").trim());
+          const errorMessage = isError ? errorParts.filter(Boolean).join("\n---\n").slice(-4e3).trim() || void 0 : void 0;
+          exited = {
+            code: killedByUs ? null : code,
+            ...reason ? { reason } : {},
+            transcriptRef,
+            ...usage ? { usage } : {},
+            ...sessionModel ? { model: sessionModel } : {},
+            ...errorMessage ? { errorMessage } : {}
+          };
           for (const cb of callbacks.splice(0)) cb(exited);
         });
         return {
@@ -38721,10 +38755,26 @@ var init_codex = __esm({
             if (stdoutErrorLines.length > 10) stdoutErrorLines.shift();
           }
         };
+        const streamErrorMessages = [];
+        const pushStreamErrorLine = (line) => {
+          let obj;
+          try {
+            obj = JSON.parse(line);
+          } catch {
+            return;
+          }
+          if (obj?.type === "error" && typeof obj.message === "string") {
+            streamErrorMessages.push(obj.message);
+          } else if (obj?.type === "turn.failed" && typeof obj.error?.message === "string") {
+            streamErrorMessages.push(obj.error.message);
+          }
+          if (streamErrorMessages.length > 5) streamErrorMessages.shift();
+        };
         const rl = readline2.createInterface({ input: child.stdout });
         rl.on("line", (line) => {
           out.write(line + "\n");
           pushStdoutErrorLine(line);
+          pushStreamErrorLine(line);
           emitNormalized(normalizeCodexStreamLine(line, normalizeState));
         });
         const errRl = readline2.createInterface({ input: child.stderr });
@@ -38772,11 +38822,13 @@ var init_codex = __esm({
           const telemetry = scanCodexTelemetry(dir, startedAtMs);
           const model = telemetry.model ?? job.model ?? this.opts.model;
           const runtimeSessionId = telemetry.sessionId ?? (job.resumeRuntimeSession ? job.runtimeSessionId : void 0);
-          const isError = !killedByUs && typeof code === "number" && code !== 0;
-          const errorMessage = isError ? [...stdoutErrorLines, ...stderrTail].join("\n").trim().slice(-4e3) || void 0 : void 0;
+          const sawStreamError = streamErrorMessages.length > 0;
+          const isError = !killedByUs && (typeof code === "number" && code !== 0 || sawStreamError);
+          const errorMessage = isError ? [...streamErrorMessages, ...stdoutErrorLines, ...stderrTail].join("\n").trim().slice(-4e3) || void 0 : void 0;
+          const reason = killedByUs ? "timeout" : sawStreamError ? "error" : code === 0 ? "clean" : "error";
           finish({
             code: killedByUs ? null : code,
-            reason: killedByUs ? "timeout" : code === 0 ? "clean" : "error",
+            reason,
             transcriptRef,
             ...telemetry.usage ? { usage: telemetry.usage } : {},
             ...model ? { model } : {},
@@ -39962,7 +40014,18 @@ function runStreamJson(job, cfg) {
   const { finish, exited } = makeFinish(id, cfg, transcriptRefPtr, transcriptOut, dir, exitCbs);
   let killedByUs = false;
   let seq = 0;
-  child.stderr.pipe(transcriptOut);
+  const stderrTail = [];
+  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;
+  });
   const state = cfg.createState();
   const rl = readline4.createInterface({ input: child.stdout });
   rl.on("line", (line) => {
@@ -39983,7 +40046,14 @@ function runStreamJson(job, cfg) {
   });
   child.on("exit", (code) => {
     clearTimeout(timer);
-    finish({ code: killedByUs ? null : code, reason: killedByUs ? "timeout" : code === 0 ? "clean" : "error", transcriptRef: transcriptRefPtr.value });
+    const isError = !killedByUs && typeof code === "number" && code !== 0;
+    const errorMessage = isError ? stderrTail.join("\n").trim().slice(-4e3) || void 0 : void 0;
+    finish({
+      code: killedByUs ? null : code,
+      reason: killedByUs ? "timeout" : code === 0 ? "clean" : "error",
+      transcriptRef: transcriptRefPtr.value,
+      ...errorMessage ? { errorMessage } : {}
+    });
   });
   const current = exited();
   return Promise.resolve({
@@ -40023,7 +40093,18 @@ function runOneShotText(job, cfg) {
     const text = chunk.toString("utf8");
     for (const cb of outputCbs) cb(text);
   });
-  child.stderr.pipe(transcriptOut);
+  const stderrTail = [];
+  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;
+  });
   const timer = setTimeout(() => {
     killedByUs = true;
     child.kill("SIGKILL");
@@ -40034,7 +40115,14 @@ function runOneShotText(job, cfg) {
   });
   child.on("exit", (code) => {
     clearTimeout(timer);
-    finish({ code: killedByUs ? null : code, reason: killedByUs ? "timeout" : code === 0 ? "clean" : "error", transcriptRef: transcriptRefPtr.value });
+    const isError = !killedByUs && typeof code === "number" && code !== 0;
+    const errorMessage = isError ? stderrTail.join("\n").trim().slice(-4e3) || void 0 : void 0;
+    finish({
+      code: killedByUs ? null : code,
+      reason: killedByUs ? "timeout" : code === 0 ? "clean" : "error",
+      transcriptRef: transcriptRefPtr.value,
+      ...errorMessage ? { errorMessage } : {}
+    });
   });
   const current = exited();
   return Promise.resolve({
@@ -40790,7 +40878,7 @@ Write-Host "  Remove : Unregister-ScheduledTask -TaskName 'OasisNode' -Confirm:$
 }
 function buildNpxCmd(p2) {
   const namePart = p2.nodeName ? ` --name ${p2.nodeName}` : "";
-  return `npm install -g --prefer-online --prefix ~/.oasis/npm-global oasis_test@latest && ~/.oasis/npm-global/bin/oasis start --server-ws ${p2.gatewayUrl}${namePart} --enroll-token ${p2.token}`;
+  return `npx -y oasis_test@latest start --server-ws ${p2.gatewayUrl}${namePart} --enroll-token ${p2.token}`;
 }
 var init_connect_script = __esm({
   "../server/src/domains/nodes/connect-script.ts"() {
@@ -58701,7 +58789,7 @@ ${res.warning}`);
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "0.1.47" : "dev";
+var PKG_VERSION = true ? "0.1.49" : "dev";
 var OASIS_DIR = path19.join(os11.homedir(), ".oasis");
 var CONFIG_FILE = path19.join(OASIS_DIR, "node-config.json");
 var PID_FILE = path19.join(OASIS_DIR, "node.pid");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis_test",
-  "version": "0.1.47",
+  "version": "0.1.49",
   "description": "Oasis node daemon + CLI — background daemon, auto-start, full server CLI",
   "bin": {
     "oasis": "./dist/index.js"