oasis_test_v2 2.2.46 → 2.2.48

package/dist/index.js

@@ -5240,18 +5240,19 @@ async function probeCodexAppServer(bin, timeoutMs = 15e3) {
       if (config2 === void 0 || listState === "pending") return;
       finish({ config: config2, models: listState === "done" ? listed : null });
     };
-    const timer = setTimeout(() => finish(null), timeoutMs);
+    const abort = () => finish(config2 === void 0 ? null : { config: config2, models: listState === "done" ? listed : null });
+    const timer = setTimeout(abort, timeoutMs);
     const send = (id, method, params) => {
       try {
         child.stdin?.write(`${JSON.stringify({ jsonrpc: "2.0", id, method, params })}
 `);
       } catch {
-        finish(null);
+        abort();
       }
     };
-    child.on("error", () => finish(null));
-    child.stdin?.on("error", () => finish(null));
-    child.on("close", () => finish(null));
+    child.on("error", abort);
+    child.stdin?.on("error", abort);
+    child.on("close", abort);
     let buf = "";
     child.stdout?.on("data", (chunk) => {
       if (settled) return;
@@ -5951,6 +5952,9 @@ var init_protocol_session = __esm({
 function codexNum(v2) {
   return typeof v2 === "number" && Number.isFinite(v2) ? v2 : 0;
 }
+function codexOutputTokens(output, reasoning) {
+  return Math.max(codexNum(output), codexNum(reasoning));
+}
 function parseCodexAppServerTurnUsage(params) {
   const p2 = params;
   const last = p2?.tokenUsage?.last;
@@ -5959,7 +5963,7 @@ function parseCodexAppServerTurnUsage(params) {
     input: codexNum(last["inputTokens"]),
     cacheRead: codexNum(last["cachedInputTokens"]),
     cacheWrite: codexNum(last["cacheWriteInputTokens"]),
-    output: codexNum(last["outputTokens"]) + codexNum(last["reasoningOutputTokens"])
+    output: codexOutputTokens(last["outputTokens"], last["reasoningOutputTokens"])
   };
 }
 function addCodexBuckets(acc, add) {
@@ -5991,8 +5995,8 @@ function bucketsOf(usage) {
     // cache 字段名跨版本有两种
     cacheRead: codexNum(usage["cached_input_tokens"]) || codexNum(usage["cache_read_input_tokens"]),
     cacheWrite: codexNum(usage["cache_write_input_tokens"]),
-    // reasoning 计入 output（对齐 Multica：codex 的 output_tokens 不含 reasoning）。
-    output: codexNum(usage["output_tokens"]) + codexNum(usage["reasoning_output_tokens"])
+    // output_tokens 已含 reasoning，见 codexOutputTokens。
+    output: codexOutputTokens(usage["output_tokens"], usage["reasoning_output_tokens"])
   };
 }
 function usageFromBuckets(b2) {
@@ -10504,6 +10508,11 @@ var init_chat_item_ledger = __esm({
         const ord = this.rows.get(itemId)?.ord;
         return ord === null ? void 0 : ord;
       }
+      /** 展示时间与持久行同源；不以浏览器收到帧的时间代替。 */
+      timestampsFor(itemId) {
+        const row = this.rows.get(itemId);
+        return row ? { createdAt: row.createdAt, completedAt: row.completedAt } : void 0;
+      }
       get failures() {
         return this.failureCount;
       }
@@ -10707,6 +10716,8 @@ var init_chat_item_ledger = __esm({
           if (this.rows.has(row.id)) continue;
           const { text: text6, attrs } = restoredTextAndAttrs(row);
           const item = {
+            createdAt: row.createdAt,
+            completedAt: row.completedAt,
             id: row.id,
             seq: ++this.seqCounter,
             ord: row.ord,
@@ -10961,7 +10972,10 @@ var init_chat_item_ledger = __esm({
         const id = input.deterministicId ?? this.newId();
         const startedVersion = this.tick();
         const writeVersion = this.tick();
+        const createdAt = this.now();
         const row = {
+          createdAt,
+          completedAt: null,
           id,
           seq: ++this.seqCounter,
           ord: null,
@@ -10985,7 +10999,6 @@ var init_chat_item_ledger = __esm({
         if (!input.forceNullMessage) this.segmentItemCount += 1;
         if (!input.persist || !this.persistEnabled) return id;
         const messageId = row.messageId;
-        const createdAt = this.now();
         const payload2 = input.payload ?? this.payloadOf(row);
         const metadata = input.metadata ?? { [CHAT_ITEM_META_LEGACY_CONTENT]: input.inContent };
         this.enqueue(async () => {
@@ -11053,9 +11066,11 @@ var init_chat_item_ledger = __esm({
       persist(row, op, what) {
         const version2 = this.tick();
         row.wireVersion = version2;
+        const at = this.now();
+        if (op.op === "set_status" && op.status !== "streaming") row.completedAt = at;
         if (!row.persist || !this.persistEnabled) return;
         this.enqueue(async () => {
-          await this.deps.items.applyOp(row.id, op, { at: this.now(), version: version2 });
+          await this.deps.items.applyOp(row.id, op, { at, version: version2 });
         }, what);
       }
       /** 串行链 + 失败吞掉计数。**串行是必须的**：append_text 依赖建行已经落地。 */
@@ -121001,11 +121016,11 @@ var require_lib2 = __commonJS({
     var DEFAULT_INITIAL = "Thinking...";
     var DEFAULT_EMPTY = "(no content)";
     var INITIAL_SUMMARY = "[Generating...]";
-    var SUMMARY_MAX_CHARS = 50;
+    var SUMMARY_MAX_CHARS2 = 50;
     var ERROR_FOOTER = "\n\n\u2014 _(Generation interrupted)_";
     var DEFAULT_MAX_ELEMENT_CHARS = 3e4;
     var ELEMENT_ID = "stream_md";
-    function truncateSummary(text6, max = SUMMARY_MAX_CHARS) {
+    function truncateSummary(text6, max = SUMMARY_MAX_CHARS2) {
       if (!text6)
         return "";
       const cleaned = text6.replace(/\s+/g, " ").trim();
@@ -162578,8 +162593,12 @@ var init_live_chat = __esm({
           payload: item.payload
         });
       }
-      assignV3Seq(turn, frame) {
-        return { ...frame, epoch: turn.liveEpoch, seq: ++turn.v3Seq };
+      assignV3Seq(turn, frame, times = turn.items?.timestampsFor(frame.itemId)) {
+        const payload2 = times ? {
+          ...frame.payload && typeof frame.payload === "object" && !Array.isArray(frame.payload) ? frame.payload : {},
+          ...times
+        } : frame.payload;
+        return { ...frame, ...payload2 !== void 0 ? { payload: payload2 } : {}, epoch: turn.liveEpoch, seq: ++turn.v3Seq };
       }
       /**
        * v3 帧的**唯一**发布出口：按 24ms 窗口合并同一 item 上相邻的 `append_text`，其余一律是顺序屏障。
@@ -162732,7 +162751,7 @@ var init_live_chat = __esm({
           operation: item.status === "completed" ? "completed" : "failed",
           itemVersion: item.version,
           ...item.ord !== null ? { ord: item.ord } : {}
-        }));
+        }, { createdAt: item.createdAt, completedAt: item.completedAt }));
         return true;
       }
       emitV3TurnTerminal(turn, status) {
@@ -200836,7 +200855,34 @@ function registerDelegatedChildTurn(liveChat, childSessionId, session, deps = {}
     } catch {
     }
   });
-  const settle = async (signal) => {
+  const recordFailure = (err) => {
+    const chatExit = err instanceof Error ? err.chatExit : void 0;
+    const text6 = chatExit?.summary ?? (err instanceof Error ? err.message : String(err));
+    const extra = {
+      ...chatExit?.reason ? { reason: chatExit.reason } : {},
+      ...chatExit?.detail ? { detail: chatExit.detail } : {}
+    };
+    try {
+      ctrl.emit({ type: "error", text: text6, ...extra });
+    } catch {
+    }
+    try {
+      const outcome = ledger.recordError(text6, extra);
+      ctrl.publishServerItem({
+        itemId: outcome.itemId,
+        itemType: "control",
+        startedVersion: outcome.startedVersion,
+        version: outcome.version,
+        ord: outcome.ord,
+        status: "failed",
+        payload: { code: "error", note: text6, ...extra }
+      });
+    } catch (e) {
+      log3(`[delegation] \u5B50\u4F1A\u8BDD ${childSessionId} \u5931\u8D25\u539F\u56E0\u843D\u8D26\u5931\u8D25: ${String(e)}`);
+    }
+  };
+  const settle = async (signal, err) => {
+    if (signal === "failed") recordFailure(err);
     try {
       normalized4?.finishTurn(signal);
     } catch {
@@ -200844,12 +200890,12 @@ function registerDelegatedChildTurn(liveChat, childSessionId, session, deps = {}
     try {
       ledger.finish(signal);
       await ledger.drain();
-    } catch (err) {
-      log3(`[delegation] \u5B50\u4F1A\u8BDD ${childSessionId} \u8D26\u672C\u6536\u5C3E\u5931\u8D25: ${String(err)}`);
+    } catch (err2) {
+      log3(`[delegation] \u5B50\u4F1A\u8BDD ${childSessionId} \u8D26\u672C\u6536\u5C3E\u5931\u8D25: ${String(err2)}`);
     }
     ctrl.finish(signal === "completed" ? "done" : "error");
   };
-  void session.done.then(() => settle("completed"), () => settle("failed"));
+  void session.done.then(() => settle("completed"), (err) => settle("failed", err));
 }
 var init_child_live_turn = __esm({
   "../server/src/domains/delegations/child-live-turn.ts"() {
@@ -239393,6 +239439,25 @@ var init_escalation_opening = __esm({
   }
 });
 
+// ../server/src/domains/delegations/reply-anchors.ts
+function delegationReplyAnchors(record8) {
+  const bySequence = /* @__PURE__ */ new Map();
+  for (const summary of record8.roundSummaries) {
+    const sequence = summary.settledSeq;
+    if (typeof sequence !== "number" || !Number.isSafeInteger(sequence) || sequence < 1 || !Number.isSafeInteger(summary.round) || summary.round < 1) continue;
+    const ids2 = bySequence.get(sequence) ?? /* @__PURE__ */ new Set();
+    ids2.add(childRoundMessageIds(record8.childSessionId, summary.round).placeholderId);
+    bySequence.set(sequence, ids2);
+  }
+  return [...bySequence].flatMap(([settledSeq, ids2]) => ids2.size === 1 ? [{ settledSeq, childMessageId: [...ids2][0] }] : []);
+}
+var init_reply_anchors = __esm({
+  "../server/src/domains/delegations/reply-anchors.ts"() {
+    "use strict";
+    init_service3();
+  }
+});
+
 // ../server/src/domains/chat-sessions/project-bundle.ts
 async function buildChatProjectBundle(projectId2, projects, readBlob) {
   const project = await projects.getProject(projectId2);
@@ -239492,7 +239557,11 @@ function mapChatItemToSnapshotEntry(row) {
     ord: row.ord,
     messageId: row.messageId,
     updatedAt: row.updatedAt,
-    payload: row.payload
+    payload: {
+      ...row.payload && typeof row.payload === "object" && !Array.isArray(row.payload) ? row.payload : {},
+      createdAt: row.createdAt,
+      completedAt: row.completedAt
+    }
   };
 }
 function throwWorkdirError(code2) {
@@ -240014,6 +240083,7 @@ function createChatSessionsDomain(opts) {
           /* 与协调者读口**同一个函数**——两侧 artifacts 有「逐字同源」的既有断言。它顺带给每份产物
              填上 `childMessageId`（子会话面板把产出卡挂到产出它的那一轮下面要用）。 */
           artifacts: delegationArtifactsView(record8),
+          replyAnchors: delegationReplyAnchors(record8),
           createdAt: record8.createdAt,
           ...record8.settledAt ? { settledAt: record8.settledAt } : {}
         });
@@ -240401,6 +240471,7 @@ var init_chat_sessions2 = __esm({
     init_workorders();
     init_chat_parts();
     init_service3();
+    init_reply_anchors();
     init_injected_context();
     init_deletion();
     init_chat_turn_gate();
@@ -263799,6 +263870,16 @@ function pickDecisionContent(d) {
 
 // ../server/src/domains/discussions/context.ts
 init_project_bundle();
+var decisionLabels = {
+  proposed: "\u63D0\u8BAE\u4E2D",
+  accepted: "\u5DF2\u786E\u8BA4",
+  rejected: "\u5DF2\u5426\u51B3",
+  superseded: "\u5DF2\u88AB\u66FF\u4EE3",
+  withdrawn: "\u5DF2\u64A4\u9500"
+};
+function listField(label, items) {
+  return items.length > 1 ? [`- ${label}\uFF1A`, ...items.map((item) => `  - ${item}`)] : [`- ${label}\uFF1A${items[0] ?? "\u65E0"}`];
+}
 function renderDiscussionContext(input) {
   const lines = [
     "# \u5F53\u524D\u4F1A\u8BDD\u4E0A\u4E0B\u6587",
@@ -263819,44 +263900,37 @@ function renderDiscussionContext(input) {
   if (!input.discussions.length) lines.push("\u5F53\u524D\u6682\u65E0\u5386\u53F2\u8BA8\u8BBA\u8BB0\u5F55\u3002", "");
   for (const row of input.discussions) {
     const d = row.value.record;
+    const topicNames = d.topics.map((t) => input.topics.find((topic) => topic.value.projectId === d.project_id && topic.value.topicId === t.topic_id)?.value.title ?? "\u8BAE\u9898\u540D\u79F0\u7F3A\u5931");
     lines.push(
-      `### ${d.session_id}\uFF1A${d.title}`,
-      `- \u9879\u76EE\u5F52\u5C5E\uFF1A${d.project_id ?? "\u975E\u9879\u76EE\u8BA8\u8BBA"}`,
-      `- \u53C2\u4E0E\u7528\u6237\uFF1A${d.participant_user}`,
-      `- \u53C2\u4E0E\u667A\u80FD\u4F53\uFF1A${d.participant_agent}`,
-      `- \u6700\u540E\u8986\u76D6\u7684\u5BF9\u8BDD\u65F6\u95F4\uFF1A${row.value.discussedAt}`,
-      `- \u6D88\u606F\u622A\u6B62\u70B9\uFF1A${d.source_cutoff}`,
+      `### ${d.title}`,
+      "",
+      ...!input.projectId ? [`- \u9879\u76EE\u5F52\u5C5E\uFF1A${d.project_id ?? "\u975E\u9879\u76EE\u8BA8\u8BBA"}`] : [],
+      `- \u8BA8\u8BBA\u65E5\u671F\uFF1A${row.value.discussedAt.slice(0, 10)}`,
       `- \u6458\u8981\uFF1A${d.summary}`,
-      "- \u6D89\u53CA\u8BAE\u9898\uFF1A",
-      ...d.topics.map((t) => `  - ${t.topic_id}\uFF1A${t.summary}`),
-      "- \u672A\u51B3\u95EE\u9898\uFF1A",
-      ...d.open_questions.map((q2) => `  - ${q2}`),
-      "- \u4E0B\u4E00\u6B65\uFF1A",
-      ...d.next_steps.map((n) => `  - ${n}`),
+      `- \u6D89\u53CA\u8BAE\u9898\uFF1A${topicNames.join("\u3001") || "\u65E0"}`,
+      ...listField("\u672A\u51B3\u95EE\u9898", d.open_questions),
+      ...listField("\u4E0B\u4E00\u6B65", d.next_steps),
       ""
     );
   }
   if (input.projectId) {
-    lines.push("## \u9879\u76EE\u8BAE\u9898\u4E0E\u51B3\u7B56", "", "\u4EC5 accepted \u8868\u793A\u5DF2\u786E\u8BA4\uFF1Bproposed \u5C1A\u672A\u786E\u8BA4\uFF1Brejected / withdrawn / superseded \u4E3A\u5931\u6548\u6216\u5386\u53F2\u65B9\u6848\u3002", "");
+    lines.push("## \u9879\u76EE\u8BAE\u9898\u4E0E\u51B3\u7B56", "", "\u4EC5\u201C\u5DF2\u786E\u8BA4\u201D\u8868\u793A\u5DF2\u786E\u8BA4\u65B9\u6848\uFF1B\u201C\u63D0\u8BAE\u4E2D\u201D\u5C1A\u672A\u786E\u8BA4\uFF1B\u201C\u5DF2\u5426\u51B3\u201D\u201C\u5DF2\u64A4\u9500\u201D\u201C\u5DF2\u88AB\u66FF\u4EE3\u201D\u4E3A\u5931\u6548\u6216\u5386\u53F2\u65B9\u6848\u3002", "");
     if (!input.topics.length) lines.push("\u5F53\u524D\u6682\u65E0\u9879\u76EE\u8BAE\u9898\u4E0E\u51B3\u7B56\u3002", "");
     for (const t of input.topics) {
-      lines.push(`### ${t.value.topicId}\uFF1A${t.value.title}`, "");
+      lines.push(`### \u8BAE\u9898\uFF1A${t.value.title}`, "");
       const decisions = input.decisions.filter((d) => d.value.topicId === t.value.topicId);
       if (!decisions.length) lines.push("\u6682\u65E0\u51B3\u7B56\u3002", "");
-      for (const d of decisions) {
+      for (const [index2, d] of decisions.entries()) {
         const r = d.value.record;
         lines.push(
-          `#### ${d.value.decisionId}`,
-          `- \u72B6\u6001\uFF1A${r.state}`,
-          `- \u65B9\u6848\uFF1A${r.statement}`,
-          `- \u539F\u56E0\uFF1A${r.rationale}`,
+          `#### \u51B3\u7B56 ${index2 + 1}\uFF1A${r.statement}`,
+          "",
+          `- \u72B6\u6001\uFF1A${decisionLabels[r.state]}`,
+          `- \u539F\u56E0\uFF1A${r.rationale || "\u672A\u8BF4\u660E"}`,
           `- \u786E\u8BA4\u4EBA\uFF1A${r.confirmer ?? "\u672A\u786E\u8BA4"}`,
-          "- \u5907\u9009\u65B9\u6848\u53CA\u7406\u7531\uFF1A",
-          ...r.alternatives.map((a) => `  - ${a.statement}\uFF1A${a.reason}`),
-          "- \u6D88\u606F\u6765\u6E90\uFF1A",
-          ...r.source_refs.map((s2) => `  - ${s2.session_id} / ${s2.message_id}\uFF1A${JSON.stringify(s2.content)}`),
-          `- \u66FF\u4EE3\u5173\u7CFB\uFF1A${r.supersedes.join("\u3001") || "\u65E0"}`,
-          `- \u6700\u8FD1\u66F4\u65B0\u65F6\u95F4\uFF1A${r.updated_at}`,
+          ...listField("\u5907\u9009\u65B9\u6848", r.alternatives.map((a) => `${a.statement}\uFF0C${a.reason || "\u672A\u8BF4\u660E\u539F\u56E0"}`)),
+          ...r.supersedes.length ? listField("\u66FF\u4EE3\u51B3\u7B56", r.supersedes.map((id) => input.decisions.find((other) => other.value.decisionId === id)?.value.record.statement ?? "\u672A\u627E\u5230\u5BF9\u5E94\u51B3\u7B56")) : [],
+          `- \u66F4\u65B0\u65F6\u95F4\uFF1A${r.updated_at.slice(0, 10)}`,
           ""
         );
       }
@@ -263889,7 +263963,12 @@ var DiscussionContext = class {
       let discussions = (await tx.list("discussion")).filter((r) => r.value.userId === session.humanActorId);
       discussions.sort((a, b2) => Date.parse(a.value.discussedAt) - Date.parse(b2.value.discussedAt) || a.id.localeCompare(b2.id));
       discussions = projectId2 ? discussions.filter((r) => r.value.record.project_id === projectId2) : discussions.slice(-10);
-      const view = projectId2 ? await this.service.view(projectId2, tx) : { topics: [], decisions: [] };
+      const discussionProjects = new Set(discussions.map((d) => d.value.record.project_id));
+      const view = projectId2 ? await this.service.view(projectId2, tx) : {
+        // Resolve names for the selected personal history without loading project decisions.
+        topics: (await tx.list("topic")).filter((t) => discussionProjects.has(t.value.projectId)),
+        decisions: []
+      };
       const markdown = renderDiscussionContext({
         userName,
         projectId: projectId2,
@@ -264567,6 +264646,15 @@ function transcriptTail(ref2) {
     return "";
   }
 }
+var SUMMARY_MAX_CHARS = 500;
+function clipLine(line) {
+  return line.length > SUMMARY_MAX_CHARS ? `${line.slice(0, SUMMARY_MAX_CHARS)}\u2026` : line;
+}
+function providerMessage(line) {
+  const m2 = /['"]message['"]\s*:\s*(?:'((?:[^'\\]|\\.)*)'|"((?:[^"\\]|\\.)*)")/.exec(line);
+  const text6 = (m2?.[1] ?? m2?.[2])?.trim();
+  return text6 ? text6 : void 0;
+}
 function buildChatExitError(info) {
   const genericLine = `runtime exited with code ${info.code ?? "null"}${info.reason ? ` (${info.reason})` : ""}`;
   let detail = "";
@@ -264576,8 +264664,9 @@ function buildChatExitError(info) {
   }
   const firstDetailLine = detail.split("\n").map((line) => line.trim()).find(Boolean) ?? "";
   const firstErrorLine = info.errorMessage?.split("\n").map((line) => line.trim()).find(Boolean) ?? "";
+  const readableError = firstErrorLine ? clipLine(providerMessage(firstErrorLine) ?? firstErrorLine) : "";
   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 summary = fixed ? readableError && info.reason !== "cancelled" && info.reason !== "timeout" ? `${fixed}\uFF1A${readableError}` : fixed : readableError ? `\u5BF9\u8BDD\u5931\u8D25\uFF1A${readableError}` : firstDetailLine ? `\u5BF9\u8BDD\u5931\u8D25\uFF1A${clipLine(firstDetailLine)}` : `\u5BF9\u8BDD\u5931\u8D25\uFF08${genericLine}\uFF09`;
   const chatExit = {
     ...info.reason ? { reason: info.reason } : {},
     summary,
@@ -279036,7 +279125,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.2.46" : "dev";
+var PKG_VERSION = true ? "2.2.48" : "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.46",
+  "version": "2.2.48",
   "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": "71593b93fa3ef6950c616a185e2ed7b0ee7b88e7"
+    "sourceHead": "e73f3d47b4a699e20634f714e27dd2dd31e4082c"
   }
 }