oasis_test 0.1.46 → 0.1.48

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");
@@ -34362,7 +34363,7 @@ function priceForModel(model) {
 function estimateRowCost(row) {
   return estimateUsageCost(row.effectiveModel, row);
 }
-function estimateUsageCost(model, usage) {
+function estimateUsageCostBreakdown(model, usage) {
   const price = priceForModel(model);
   if (!price) return null;
   const inputTokens = Math.max(usage.inputTokens ?? 0, 0);
@@ -34370,8 +34371,22 @@ function estimateUsageCost(model, usage) {
   const cacheReadTokens = Math.max(usage.cacheReadTokens ?? 0, 0);
   const cacheCreationTokens = Math.max(usage.cacheCreationTokens ?? 0, 0);
   const cacheReadPrice = price.cachedInputPerMillion ?? price.inputPerMillion * 0.1;
-  const cost = (inputTokens + cacheCreationTokens) * price.inputPerMillion / 1e6 + outputTokens * price.outputPerMillion / 1e6 + cacheReadTokens * cacheReadPrice / 1e6;
-  return { currency: price.currency, micros: Math.round(cost * 1e6) };
+  return {
+    currency: price.currency,
+    inputMicros: Math.round(inputTokens * price.inputPerMillion / 1e6 * 1e6),
+    cacheMicros: Math.round(
+      (cacheCreationTokens * price.inputPerMillion + cacheReadTokens * cacheReadPrice) / 1e6 * 1e6
+    ),
+    outputMicros: Math.round(outputTokens * price.outputPerMillion / 1e6 * 1e6)
+  };
+}
+function estimateUsageCost(model, usage) {
+  const breakdown = estimateUsageCostBreakdown(model, usage);
+  if (!breakdown) return null;
+  return {
+    currency: breakdown.currency,
+    micros: breakdown.inputMicros + breakdown.cacheMicros + breakdown.outputMicros
+  };
 }
 var FOREIGN_MODEL_MARKUP, usd, cny, MODEL_PRICES, PREFIX_PRICES;
 var init_model_pricing = __esm({
@@ -34486,6 +34501,30 @@ var init_model_pricing = __esm({
 });
 
 // ../server/src/domains/actors/stats.ts
+function emptyCostBreakdown() {
+  return {
+    inputUsdMicros: 0,
+    cacheUsdMicros: 0,
+    outputUsdMicros: 0,
+    inputCnyMicros: 0,
+    cacheCnyMicros: 0,
+    outputCnyMicros: 0
+  };
+}
+function addEstimatedBreakdown(target, model, usage) {
+  const estimated = estimateUsageCostBreakdown(model, usage);
+  if (!estimated) return false;
+  if (estimated.currency === "USD") {
+    target.inputUsdMicros += estimated.inputMicros;
+    target.cacheUsdMicros += estimated.cacheMicros;
+    target.outputUsdMicros += estimated.outputMicros;
+  } else {
+    target.inputCnyMicros += estimated.inputMicros;
+    target.cacheCnyMicros += estimated.cacheMicros;
+    target.outputCnyMicros += estimated.outputMicros;
+  }
+  return true;
+}
 async function actorStats(oplog, actorId, opts = {}) {
   const myRevisions = /* @__PURE__ */ new Set();
   const mergedTargets = /* @__PURE__ */ new Set();
@@ -34529,8 +34568,10 @@ async function actorStats(oplog, actorId, opts = {}) {
     approveRateGiven: reviewsGiven === 0 ? null : approvalsGiven / reviewsGiven,
     reworkReceived,
     tokenWeek: weeklyUsage.tokenWeek,
+    tokenWeekBreakdown: weeklyUsage.tokenWeekBreakdown,
     costWeekUsdMicros: weeklyUsage.costWeekUsdMicros,
     costWeekCnyMicros: weeklyUsage.costWeekCnyMicros,
+    costWeekBreakdown: weeklyUsage.costWeekBreakdown,
     usageWindow: { from, to },
     unpricedModels: weeklyUsage.unpricedModels
   };
@@ -34546,18 +34587,24 @@ async function listWeeklyRuns(trace, actorId, from, to) {
   return out;
 }
 function summarizeWeeklyRuns(runs) {
-  let tokenWeek = 0;
+  let input = 0;
+  let cache = 0;
+  let output = 0;
   let costWeekUsdMicros = 0;
   let costWeekCnyMicros = 0;
+  const costWeekBreakdown = emptyCostBreakdown();
   const unpriced = /* @__PURE__ */ new Set();
   for (const run of runs) {
     const usage = run.usage;
     if (!usage) continue;
-    const input = Math.max(usage.inputTokens ?? 0, 0);
-    const output = Math.max(usage.outputTokens ?? 0, 0);
+    const inputTokens = Math.max(usage.inputTokens ?? 0, 0);
+    const outputTokens = Math.max(usage.outputTokens ?? 0, 0);
     const cacheCreation = Math.max(usage.cacheCreationTokens ?? 0, 0);
     const cacheRead = Math.max(usage.cacheReadTokens ?? 0, 0);
-    tokenWeek += input + output + cacheCreation + cacheRead;
+    input += inputTokens;
+    cache += cacheCreation + cacheRead;
+    output += outputTokens;
+    const priced = addEstimatedBreakdown(costWeekBreakdown, run.effectiveModel ?? null, usage);
     const storedCost = Math.max(usage.costUsdMicros ?? 0, 0);
     if (storedCost > 0) {
       costWeekUsdMicros += storedCost;
@@ -34569,28 +34616,36 @@ function summarizeWeeklyRuns(runs) {
       else costWeekCnyMicros += estimated.micros;
       continue;
     }
-    if (input + output + cacheCreation + cacheRead > 0) {
+    if (!priced && inputTokens + outputTokens + cacheCreation + cacheRead > 0) {
       unpriced.add(run.effectiveModel ?? "unknown");
     }
   }
   return {
-    tokenWeek,
+    tokenWeek: input + cache + output,
+    tokenWeekBreakdown: { input, cache, output },
     costWeekUsdMicros,
     costWeekCnyMicros,
+    costWeekBreakdown,
     unpricedModels: [...unpriced].sort()
   };
 }
 function summarizeWeeklyUsage(rows) {
-  let tokenWeek = 0;
+  let input = 0;
+  let cache = 0;
+  let output = 0;
   let costWeekUsdMicros = 0;
   let costWeekCnyMicros = 0;
+  const costWeekBreakdown = emptyCostBreakdown();
   const unpriced = /* @__PURE__ */ new Set();
   for (const row of rows) {
-    const input = Math.max(row.inputTokens, 0);
-    const output = Math.max(row.outputTokens, 0);
+    const inputTokens = Math.max(row.inputTokens, 0);
+    const outputTokens = Math.max(row.outputTokens, 0);
     const cacheCreation = Math.max(row.cacheCreationTokens, 0);
     const cacheRead = Math.max(row.cacheReadTokens, 0);
-    tokenWeek += input + output + cacheCreation + cacheRead;
+    input += inputTokens;
+    cache += cacheCreation + cacheRead;
+    output += outputTokens;
+    const priced = addEstimatedBreakdown(costWeekBreakdown, row.effectiveModel, row);
     const storedCost = Math.max(row.costUsdMicros, 0);
     if (storedCost > 0) {
       costWeekUsdMicros += storedCost;
@@ -34602,14 +34657,16 @@ function summarizeWeeklyUsage(rows) {
       else costWeekCnyMicros += estimated.micros;
       continue;
     }
-    if (input + output + cacheCreation + cacheRead > 0) {
+    if (!priced && inputTokens + outputTokens + cacheCreation + cacheRead > 0) {
       unpriced.add(row.effectiveModel ?? "unknown");
     }
   }
   return {
-    tokenWeek,
+    tokenWeek: input + cache + output,
+    tokenWeekBreakdown: { input, cache, output },
     costWeekUsdMicros,
     costWeekCnyMicros,
+    costWeekBreakdown,
     unpricedModels: [...unpriced].sort()
   };
 }
@@ -37457,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 = [];
@@ -37496,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;
@@ -37507,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) => {
@@ -37539,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 {
@@ -39906,7 +39996,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) => {
@@ -39927,7 +40028,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({
@@ -39967,7 +40075,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");
@@ -39978,7 +40097,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({
@@ -58645,7 +58771,7 @@ ${res.warning}`);
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "0.1.46" : "dev";
+var PKG_VERSION = true ? "0.1.48" : "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.46",
+  "version": "0.1.48",
   "description": "Oasis node daemon + CLI — background daemon, auto-start, full server CLI",
   "bin": {
     "oasis": "./dist/index.js"