oasis_test_v2 2.2.126 → 2.2.128

package/dist/index.js

@@ -1720,6 +1720,22 @@ function formatOverlapCandidate(c5, timeZone) {
   bits.push(`\u4EA7\u51FA ${c5.artifactCount} \u4E2A`);
   return `  ${bits.join("  ")}`;
 }
+function formatOverlapForExpert(r5, timeZone) {
+  const all2 = [...r5.active, ...r5.done];
+  if (all2.length === 0) return "";
+  return [
+    "---",
+    "## \u76F8\u8FD1\u7684\u4E8B\u9879\uFF08\u7CFB\u7EDF\u7C97\u7B5B\uFF0C\u672A\u786E\u8BA4\uFF09",
+    "",
+    "\u7CFB\u7EDF\u7C97\u7B5B\u5230\u4EE5\u4E0B\u76F8\u8FD1\u7684\u4E8B\u9879\uFF08\u672A\u786E\u8BA4\uFF09\u3002**\u5F00\u5DE5\u524D**\u5148\u7528 id \u9010\u6761\u67E5\u8BE6\u60C5\uFF1A`oasis todo show <\u5F85\u529Eid>` / `oasis workorder <\u5DE5\u5355id>` / `oasis delegate --status <\u59D4\u6D3Eid>`\uFF08\u522B\u4EBA\u5BF9\u8BDD\u91CC\u6D3E\u7684\u4E5F\u80FD\u8BFB\u6458\u8981\uFF09\u3002",
+    "",
+    ...all2.map((c5) => formatOverlapCandidate(c5, timeZone)),
+    "",
+    "- \u6709\u73B0\u6210\u7ED3\u679C\u80FD\u76F4\u63A5\u7528\uFF0C\u6216\u80FD\u5728\u5B83\u57FA\u7840\u4E0A\u6539 \u2192 \u7528\u5B83\uFF0C\u4EA4\u56DE\u65F6\u5199\u660E\u7528\u4E86\u54EA\u6761\uFF08id\uFF09\u3002",
+    "- \u786E\u5B9E\u662F\u540C\u4E00\u4EF6\u4E8B\uFF08\u522B\u4EBA\u6B63\u5728\u505A\uFF0C\u6216\u5DF2\u7ECF\u505A\u5B8C\u3001\u7167\u505A\u5C31\u662F\u91CD\u590D\uFF09\u2192 **\u5148\u522B\u505A**\uFF0C\u76F4\u63A5\u4EA4\u56DE\uFF1A\u8BF4\u660E\u662F\u54EA\u6761\uFF08id\uFF09\u3001\u4E3A\u4EC0\u4E48\u5224\u65AD\u662F\u91CD\u590D\u3001\u5EFA\u8BAE\u600E\u4E48\u5904\u7406\uFF08\u5408\u5E76 / \u590D\u7528 / \u4ECD\u8981\u91CD\u505A\uFF09\uFF0C\u7531\u6D3E\u6D3B\u65B9\u8F6C\u544A\u7528\u6237\u51B3\u5B9A\u3002",
+    "- \u90FD\u4E0D\u76F8\u5173 \u2192 \u7167\u5E38\u5E72\u6D3B\uFF0C\u4EA4\u56DE\u65F6\u4E0D\u7528\u63D0\u3002"
+  ].join("\n");
+}
 function formatOverlapLines(r5, timeZone) {
   const all2 = [...r5.active, ...r5.done];
   if (all2.length === 0) return [];
@@ -210633,7 +210649,7 @@ async function seedChildRoundRows(chatStore, childSessionId, round, prompt2, now
     createdAt: now
   });
 }
-var import_node_crypto42, DelegationError, DIGEST_CHARS, PENDING_QUEUE_OWNER, DISPATCH_LEASE_MS, CONSECUTIVE_FAIL_LIMIT, roundTurnKey, roundTurnId, DelegationService;
+var import_node_crypto42, DelegationError, DELEGATION_OVERLAP_TIMEOUT_MS, DIGEST_CHARS, PENDING_QUEUE_OWNER, DISPATCH_LEASE_MS, CONSECUTIVE_FAIL_LIMIT, roundTurnKey, roundTurnId, DelegationService;
 var init_service3 = __esm({
   "../server/src/domains/delegations/service.ts"() {
     "use strict";
@@ -210654,6 +210670,7 @@ var init_service3 = __esm({
         this.name = "DelegationError";
       }
     };
+    DELEGATION_OVERLAP_TIMEOUT_MS = 3e3;
     DIGEST_CHARS = 200;
     PENDING_QUEUE_OWNER = "delegation-dispatch";
     DISPATCH_LEASE_MS = 10 * 60 * 1e3;
@@ -211019,7 +211036,11 @@ var init_service3 = __esm({
             `\u8FD9\u6761\u4F1A\u8BDD\u91CC\u53EB\u300C${desiredLabel}\u300D\u7684\u59D4\u6D3E\u592A\u591A\u4E86\uFF0C\u6362\u4E00\u4E2A --as \u77ED\u540D\u518D\u6D3E\u3002`
           );
         }
-        await this.materializeChild({ record: record10, chatStore, parent, expert, task: input.task, companyId, now });
+        const overlap = inserted ? await this.overlapForExpert(input.task, record10, caller, companyId) : void 0;
+        const expertTask = overlap ? `${input.task}
+
+${overlap.block}` : input.task;
+        await this.materializeChild({ record: record10, chatStore, parent, expert, task: expertTask, companyId, now });
         await store.appendTouch({
           delegationId: record10.id,
           messageId: parentMessageId,
@@ -211035,9 +211056,41 @@ var init_service3 = __esm({
         );
         const turns = await this.resolveTurns(companyId);
         const claimed = await this.claim(store, record10.id, now, Boolean(turns));
-        if (claimed) this.track(this.dispatchExpert(claimed, input.task, companyId, snapshot, turns, { inbound }));
+        if (claimed) this.track(this.dispatchExpert(claimed, expertTask, companyId, snapshot, turns, { inbound }));
         if (inserted) this.options.metrics?.recordCreated();
-        return { record: record10, created: inserted };
+        return { record: record10, created: inserted, ...overlap ? { overlap: { count: overlap.count, lines: overlap.lines } } : {} };
+      }
+      /**
+       * 派活之前那一次比对（ADR 0640 D-C9）。返回要拼进任务书末尾的那一段与条数；没候选、没接比对、出错、超时都回 undefined——
+       * **绝不挡住派活**。超时那一枝不等比对自己结束（它在后台跑完也只是多记一条比对事件）。
+       */
+      async overlapForExpert(task, record10, caller, companyId) {
+        if (!this.options.overlapForTask) return void 0;
+        const timeoutMs = this.options.overlapTimeoutMs ?? DELEGATION_OVERLAP_TIMEOUT_MS;
+        let timer;
+        try {
+          const r5 = await Promise.race([
+            this.options.overlapForTask({
+              ...companyId ? { companyId } : {},
+              actor: caller.actor,
+              parentSessionId: record10.parentSessionId,
+              delegationId: record10.id,
+              task
+            }),
+            new Promise((resolve13) => {
+              timer = setTimeout(() => resolve13(void 0), timeoutMs);
+            })
+          ]);
+          if (!r5?.enabled) return void 0;
+          const block = formatOverlapForExpert(r5, r5.timeZone);
+          if (!block) return void 0;
+          return { block, count: r5.active.length + r5.done.length, lines: formatOverlapLines(r5, r5.timeZone).filter((l3) => l3.startsWith("  ")) };
+        } catch (error3) {
+          console.warn(`[delegation] \u6D3E\u6D3B\u524D\u7684\u9632\u91CD\u53E0\u6BD4\u5BF9\u5931\u8D25\uFF0C\u8FD9\u6B21\u4E0D\u9644\u5019\u9009\u3001\u7167\u5E38\u6D3E\u6D3B\uFF08${record10.id}\uFF09: ${String(error3)}`);
+          return void 0;
+        } finally {
+          if (timer) clearTimeout(timer);
+        }
       }
       /**
        * 把子会话与它的两条起始消息**补齐到该有的样子**——可以重复调用，缺什么补什么。
@@ -212073,14 +212126,16 @@ function delegationRoutes(service) {
       const body2 = { to, task, ...as ? { as } : {}, ...files?.length ? { files } : {} };
       const invocationId = trustedDelegationInvocationId(body2, req.auth.dispatch);
       try {
-        const { record: record10, created } = await service.create(body2, callerOf(req, invocationId));
+        const { record: record10, created, overlap } = await service.create(body2, callerOf(req, invocationId));
         const payload2 = {
           delegationId: record10.id,
           childSessionId: record10.childSessionId,
           // **实际生效**的 label（撞名后服务端加了后缀）。协调者引用时用这个返回值，
           // 不用它自己传进去的那个——引用错了会静默指到另一条委派上（§6.2.8）。
           label: record10.label ?? "",
-          ...files?.length ? { attachedFiles: files } : {}
+          ...files?.length ? { attachedFiles: files } : {},
+          // 派活之前比出来、已附进专家任务书的相近事项（ADR 0640 D-C9）。派活方只据此说一句「附了 N 条」。
+          ...overlap ? { overlapAttached: overlap.count, overlap: overlap.lines } : {}
         };
         return { status: created ? 202 : 200, body: payload2 };
       } catch (error3) {
@@ -213340,6 +213395,14 @@ var init_github_app_timing = __esm({
 });
 
 // ../server/src/manifest-text.ts
+function decodeUtf8Text(bytes2) {
+  if (bytes2.includes(0)) return null;
+  try {
+    return new TextDecoder("utf-8", { fatal: true }).decode(bytes2);
+  } catch {
+    return null;
+  }
+}
 async function renderManifestText(blobs, manifestRef) {
   const CAP = 256 * 1024;
   let entries;
@@ -213349,13 +213412,11 @@ async function renderManifestText(blobs, manifestRef) {
     return `\u591A\u6587\u4EF6\uFF08\u88C5\u7BB1\u5355 ${manifestRef.slice(0, 12)}\u2026\uFF09\u2014\u2014 \u8BFB\u53D6\u5931\u8D25\uFF1A${e5 instanceof Error ? e5.message : String(e5)}`;
   }
   if (entries.length === 0) return "\uFF08\u7A7A\u4EA4\u4ED8\u7269\uFF09";
-  const dec2 = new TextDecoder();
   const single = entries.length === 1;
   const parts = [];
   let total = 0;
   for (const e5 of entries) {
-    const isText = !e5.bytes.includes(0);
-    let body2 = isText ? dec2.decode(e5.bytes) : `\uFF08\u4E8C\u8FDB\u5236\u6587\u4EF6\uFF0C${e5.bytes.length} \u5B57\u8282\uFF09`;
+    let body2 = decodeUtf8Text(e5.bytes) ?? `\uFF08\u4E8C\u8FDB\u5236\u6587\u4EF6\uFF0C${e5.bytes.length} \u5B57\u8282\uFF09`;
     if (total + body2.length > CAP) body2 = body2.slice(0, Math.max(0, CAP - total)) + "\n\u2026\uFF08\u5DF2\u622A\u65AD\uFF09";
     total += body2.length;
     parts.push(single ? body2 : `===== ${e5.path} =====
@@ -214873,12 +214934,11 @@ async function runView(kernel, oplog, engineStore, blobs, name, artifactId, para
         if (path50 !== null) {
           const e5 = entries.find((x2) => x2.path === path50);
           if (!e5) throw new Error(`\u6587\u4EF6\u4E0D\u5B58\u5728: ${path50}\uFF08\u8BE5\u7248\u672C\u6709\uFF1A${entries.map((x2) => x2.path).join("\u3001")}\uFF09`);
-          const isText = !e5.bytes.includes(0);
-          return { kind: "file", path: path50, bytes: e5.bytes.length, text: isText ? dec2.decode(e5.bytes) : null, at: at2 };
+          return { kind: "file", path: path50, bytes: e5.bytes.length, text: decodeUtf8Text(e5.bytes), at: at2 };
         }
         return {
           kind: "manifest",
-          files: entries.map((e5) => ({ path: e5.path, bytes: e5.bytes.length, binary: e5.bytes.includes(0) })),
+          files: entries.map((e5) => ({ path: e5.path, bytes: e5.bytes.length, binary: decodeUtf8Text(e5.bytes) === null })),
           at: at2
         };
       }
@@ -215026,6 +215086,7 @@ async function startOasisServer(opts) {
       resolveChatTurns: async (companyId) => (opts.resolveChatTurns ? await opts.resolveChatTurns(companyId) : void 0) ?? opts.chatTurns,
       ...opts.delegationProbeRuntime ? { probeRuntime: opts.delegationProbeRuntime } : {},
       ...opts.delegationProbeAllocation ? { probeAllocation: opts.delegationProbeAllocation } : {},
+      ...opts.delegationOverlap ? { overlapForTask: opts.delegationOverlap } : {},
       ...opts.chatDelegationEnabled ? { enabled: opts.chatDelegationEnabled } : {},
       ...opts.delegationWorkdir ? { workdir: opts.delegationWorkdir } : {},
       ...opts.delegationMetrics ? { metrics: opts.delegationMetrics } : {}
@@ -255856,7 +255917,7 @@ function metaString(meta, key2) {
   }
   return null;
 }
-var SEG_TURN_CAP, RUN_PAGE, RUN_CAP, NODE_WORK_CAP, MAX_CHAIN_NODES, MESSAGE_CAP, SIGNAL_TEXT_CAP, EXOGENOUS_TEXT_CAP, FIND_DEFAULT_LIMIT, FIND_BATCH_MAX, FIND_MAX_LIMIT, RUN_ROW_CAP, TURN_TERMINAL, REVIEW_ENDED, DELEGATION_ENDED, SYSTEM_CANCEL_REASONS, EXOGENOUS_RUN_STATUS, UnitError, ms, turnStart, turnEnd, UnitService, unitTypeOf, segId, clipField, outcomeFetchCmd, exogenousFetchCmd, UnitReader;
+var SEG_TURN_CAP, RUN_PAGE, RUN_CAP, NODE_WORK_CAP, MAX_CHAIN_NODES, MESSAGE_CAP, SIGNAL_TEXT_CAP, EXOGENOUS_TEXT_CAP, EXOGENOUS_SUMMARY_CAP, FIND_DEFAULT_LIMIT, FIND_BATCH_MAX, FIND_MAX_LIMIT, RUN_ROW_CAP, TURN_TERMINAL, REVIEW_ENDED, DELEGATION_ENDED, SYSTEM_CANCEL_REASONS, EXOGENOUS_RUN_STATUS, UnitError, ms, turnStart, turnEnd, UnitService, unitTypeOf, segId, clipField, outcomeFetchCmd, exogenousFetchCmd, UnitReader;
 var init_units = __esm({
   "../server/src/domains/trace/units.ts"() {
     "use strict";
@@ -255871,6 +255932,7 @@ var init_units = __esm({
     MESSAGE_CAP = 1e3;
     SIGNAL_TEXT_CAP = 2e3;
     EXOGENOUS_TEXT_CAP = 500;
+    EXOGENOUS_SUMMARY_CAP = 120;
     FIND_DEFAULT_LIMIT = 20;
     FIND_BATCH_MAX = 200;
     FIND_MAX_LIMIT = 200;
@@ -256728,11 +256790,14 @@ var init_units = __esm({
             });
           }
         }
-        if (u.kind === "work") facts.push(...await this.upstreamFacts(u.work, field));
+        if (u.kind === "work") facts.push(...await this.upstreamFacts(u.work, field, opts.full === true));
         return facts;
       }
-      /** 单元时间窗里上游（输入节点、brief）收到的 issue、出的新版本。 */
-      async upstreamFacts(w2, field) {
+      /**
+       * 单元时间窗里上游（输入节点、brief）收到的 issue、出的新版本。
+       * `full`：issue 摘要给原文全文——摘要里的截断标记指向的就是 `--full`，不能在 `--full` 下仍给同一截断（旧版 CLI 只打摘要，也靠这一行取全文）。
+       */
+      async upstreamFacts(w2, field, full) {
         const out = [];
         const from = w2.startedAt ?? w2.createdAt;
         const to = w2.endedAt ?? w2.deadAt ?? new Date(this.nowMs).toISOString();
@@ -256745,11 +256810,13 @@ var init_units = __esm({
         const nodeIds = [...nodes5];
         for (const i5 of await this.data.issuesInWorkorder(w2.workorderId, { aboutNodeIds: nodeIds, fromIso: from, toIso: to, limit: 50 })) {
           const b6 = field(i5.body);
+          const head = (i5.body.split("\n")[0] ?? "").slice(0, EXOGENOUS_SUMMARY_CAP);
+          const more = head.length < i5.body.length ? ` \u2026\uFF08\u5168\u6587 ${i5.body.length} \u5B57 \u2192 ${b6.fetchCmd}\uFF09` : "";
           out.push({
             kind: "upstream-issue",
             at: i5.createdAt,
             runId: null,
-            summary: `\u6267\u884C\u671F\u95F4\u4E0A\u6E38\u8282\u70B9 ${i5.aboutNodeId} \u6536\u5230 ${i5.kind}\uFF1A${b6.text.split("\n")[0]}`,
+            summary: `\u6267\u884C\u671F\u95F4\u4E0A\u6E38\u8282\u70B9 ${i5.aboutNodeId} \u6536\u5230 ${i5.kind}\uFF1A${full ? i5.body : `${head}${more}`}`,
             detail: { issueId: i5.id, kind: i5.kind, aboutNodeId: i5.aboutNodeId, author: i5.authorActorId, resolved: i5.resolvedAt != null, body: b6 }
           });
         }
@@ -326728,6 +326795,7 @@ __export(src_exports2, {
   DEFAULT_SIMPLE_QUERY_MAX_CHARS: () => DEFAULT_SIMPLE_QUERY_MAX_CHARS,
   DEFAULT_TERMINAL_MAX_AGE_MS: () => DEFAULT_TERMINAL_MAX_AGE_MS,
   DEFAULT_TIME_ZONE_ENV: () => DEFAULT_TIME_ZONE_ENV,
+  DELEGATION_OVERLAP_TIMEOUT_MS: () => DELEGATION_OVERLAP_TIMEOUT_MS,
   DELIVERY_REPAIR_BATCH: () => DELIVERY_REPAIR_BATCH,
   DENY_ALL_TRACE_READ: () => DENY_ALL_TRACE_READ,
   DISPATCH_DROP_BACKOFF_MS: () => DISPATCH_DROP_BACKOFF_MS,
@@ -330331,7 +330399,8 @@ var OverlapService = class {
       ...input.subjectId?.trim() ? { subjectId: input.subjectId.trim() } : {},
       ...input.chatSessionId?.trim() ? { chatSessionId: input.chatSessionId.trim() } : {},
       candidates: picked.map((c5) => ({ kind: c5.kind, phase: c5.phase, id: overlapCandidateId(c5), score: c5.score })),
-      minScore
+      minScore,
+      deliveredTo: input.deliveredTo ?? "caller"
     };
     try {
       await (await this.deps.events(companyId)).append(event);
@@ -331036,15 +331105,16 @@ var PostgresOverlapEventStore = class _PostgresOverlapEventStore {
         candidates jsonb NOT NULL,
         min_score double precision NOT NULL
       )`);
+      await pool.query(`ALTER TABLE ${store.s}.overlap_events ADD COLUMN IF NOT EXISTS delivered_to text`);
       await pool.query(`CREATE INDEX IF NOT EXISTS overlap_events_at_idx ON ${store.s}.overlap_events (at DESC)`);
     });
     return store;
   }
   async append(e5) {
     await this.pool.query(
-      `INSERT INTO ${this.s}.overlap_events (id,at,principal_actor_id,actor_id,action,subject_id,chat_session_id,candidates,min_score)
-      VALUES ($1,$2,$3,$4,$5,$6,$7,$8::jsonb,$9) ON CONFLICT (id) DO NOTHING`,
-      [e5.id, e5.at, e5.principalActorId, e5.actorId, e5.action, e5.subjectId ?? null, e5.chatSessionId ?? null, JSON.stringify(e5.candidates), e5.minScore]
+      `INSERT INTO ${this.s}.overlap_events (id,at,principal_actor_id,actor_id,action,subject_id,chat_session_id,candidates,min_score,delivered_to)
+      VALUES ($1,$2,$3,$4,$5,$6,$7,$8::jsonb,$9,$10) ON CONFLICT (id) DO NOTHING`,
+      [e5.id, e5.at, e5.principalActorId, e5.actorId, e5.action, e5.subjectId ?? null, e5.chatSessionId ?? null, JSON.stringify(e5.candidates), e5.minScore, e5.deliveredTo ?? null]
     );
   }
   async listRecent(limit) {
@@ -331058,7 +331128,8 @@ var PostgresOverlapEventStore = class _PostgresOverlapEventStore {
       ...row.subject_id ? { subjectId: row.subject_id } : {},
       ...row.chat_session_id ? { chatSessionId: row.chat_session_id } : {},
       candidates: row.candidates,
-      minScore: Number(row.min_score)
+      minScore: Number(row.min_score),
+      deliveredTo: row.delivered_to === "expert" ? "expert" : "caller"
     }));
   }
 };
@@ -335601,6 +335672,17 @@ async function startServe(opts) {
      * 用 `tryAllocate`（不抛、不消耗重试次数）：这里只是问「挑不挑得出来」，真正的分配在
      * 那一轮派发时再跑一次——两次之间机器状态可能变，以派发那一次为准。
      */
+    // 防重叠比对（ADR 0640 D-C9）：委派在派活之前比一次（代表派活那段对话的真人），候选附进专家任务书；比对事件标「附给专家」。
+    delegationOverlap: async ({ companyId, actor, parentSessionId, delegationId, task }) => {
+      const cid = companyId ?? defaultCompanyId;
+      return overlapRuntime.service.check(cid, await overlapRuntime.resolveCaller(actor, cid), {
+        action: "delegate",
+        text: task,
+        subjectId: delegationId,
+        chatSessionId: parentSessionId,
+        deliveredTo: "expert"
+      });
+    },
     delegationProbeAllocation: async ({ actorId, actorName, companyId }) => {
       const result = await runtimeAllocatorFor(companyId ?? defaultCompanyId).tryAllocate({
         actorId,
@@ -342823,7 +342905,7 @@ var COMMAND_DECLS = {
   delegate: {
     group: "\u59D4\u6D3E\u4E13\u5BB6",
     usage: 'oasis delegate --to <role|actorId> --task "<\u4EFB\u52A1\u4E66>" [--as <\u77ED\u540D>] [--file <\u8DEF\u5F84>]... [--json true]\n      oasis delegate --follow-up <\u5F15\u7528> --text "<...>" [--file <\u8DEF\u5F84>]...\n      oasis delegate --status <\u5F15\u7528|\u59D4\u6D3Eid> [--json true]\n      oasis delegate --list [--all] [--json true]',
-    description: "\u628A\u4E00\u4EF6\u4E8B\u4EA4\u7ED9\u7EC4\u7EC7\u91CC\u5BF9\u53E3\u7684\u4E13\u5BB6\u53BB\u505A\uFF08\u5F02\u6B65\uFF09\u3002\u547D\u4EE4\u7ACB\u5373\u8FD4\u56DE\uFF0C\u4E13\u5BB6\u5E72\u5B8C\u4E86\u7ED3\u679C\u81EA\u5DF1\u56DE\u5230\u8FD9\u6761\u5BF9\u8BDD\u2014\u2014**\u4E0D\u8981\u5728\u8FD9\u91CC\u7B49**\u3002\u6210\u529F\u540E\u5982\u679C\u672C\u516C\u53F8\u6709\u4EBA\u5728\u505A\u6216\u505A\u8FC7\u76F8\u8FD1\u7684\u4E8B\uFF0C\u8F93\u51FA\u672B\u5C3E\u4F1A\u591A\u4E00\u6BB5\u300C\u76F8\u8FD1\u7684\u4E8B\u9879\uFF08\u7CFB\u7EDF\u7C97\u7B5B\uFF0C\u672A\u786E\u8BA4\uFF0C\u8BF7\u7528 id \u67E5\u8BE6\u60C5\u540E\u5224\u65AD\uFF09\u300D\uFF08--json \u65F6\u5728 overlap \u5B57\u6BB5\u91CC\uFF0C\u540C\u6837\u51E0\u884C\uFF09\uFF0C\u6BCF\u6761\u5E26 id\uFF1A\u7528 id \u9010\u6761\u67E5\u8BE6\u60C5\uFF08\u5F85\u529E oasis todo show\u3001\u5DE5\u5355 oasis workorder\u3001\u59D4\u6D3E oasis delegate --status\uFF09\uFF0C\u5224\u65AD\u662F\u4E0D\u662F\u540C\u4E00\u4EF6\u4E8B\uFF1B\u786E\u5B9E\u76F8\u5173\u624D\u544A\u8BC9\u7528\u6237\uFF0C\u4E0D\u76F8\u5173\u4E00\u4E2A\u5B57\u90FD\u4E0D\u63D0\uFF1B\u5728\u505A\u7684\u5EFA\u8BAE\u7528\u6237\u5148\u95EE\u95EE\u5BF9\u65B9\uFF0C\u770B\u5408\u5E76\u8FD8\u662F\u5206\u5DE5\uFF1B\u505A\u5B8C\u7684\u628A\u7ED3\u679C\u7ED9\u7528\u6237\uFF0C\u95EE\u80FD\u4E0D\u80FD\u76F4\u63A5\u7528\uFF1B\u4E0D\u66FF\u7528\u6237\u505C\u6389\u8FD9\u6B21\u59D4\u6D3E\u3001\u5408\u5E76\u3001\u53D6\u6D88\u6216\u6539\u6D3E\u3002\u6CA1\u6709\u8FD9\u4E00\u6BB5\u5C31\u662F\u6CA1\u6BD4\u51FA\u6765\uFF0C\u6BD4\u5BF9\u51FA\u4E86\u95EE\u9898\u4E5F\u53EA\u662F\u6CA1\u6709\u8FD9\u4E00\u6BB5\uFF0C\u547D\u4EE4\u7167\u6837\u7B97\u6210\u529F\u3002",
+    description: "\u628A\u4E00\u4EF6\u4E8B\u4EA4\u7ED9\u7EC4\u7EC7\u91CC\u5BF9\u53E3\u7684\u4E13\u5BB6\u53BB\u505A\uFF08\u5F02\u6B65\uFF09\u3002\u547D\u4EE4\u7ACB\u5373\u8FD4\u56DE\uFF0C\u4E13\u5BB6\u5E72\u5B8C\u4E86\u7ED3\u679C\u81EA\u5DF1\u56DE\u5230\u8FD9\u6761\u5BF9\u8BDD\u2014\u2014**\u4E0D\u8981\u5728\u8FD9\u91CC\u7B49**\u3002\u6D3E\u6D3B\u4E4B\u524D\u7CFB\u7EDF\u4F1A\u62FF\u4EFB\u52A1\u4E66\u6BD4\u4E00\u4E0B\u672C\u516C\u53F8\u6709\u6CA1\u6709\u4EBA\u5728\u505A\u6216\u505A\u8FC7\u76F8\u8FD1\u7684\u4E8B\uFF0C\u6709\u7684\u8BDD\u9644\u5728\u4E13\u5BB6\u4EFB\u52A1\u4E66\u672B\u5C3E\u3001\u7531\u4E13\u5BB6\u5F00\u5DE5\u524D\u6838\u5BF9\uFF08\u8F93\u51FA\u91CC\u591A\u4E00\u884C\u300C\u5DF2\u628A N \u6761\u76F8\u8FD1\u4E8B\u9879\u9644\u7ED9\u4E13\u5BB6\u300D\uFF0C--json \u5728 overlapAttached / overlap \u5B57\u6BB5\uFF09\uFF1B\u4F60\u4E0D\u7528\u53BB\u67E5\uFF0C\u7167\u5E38\u6536\u5C3E\u3002",
     flags: [
       { name: "to", desc: "\u6D3E\u7ED9\u8C01\uFF1A\u5C97\u4F4D\u540D\u6216 actorId\uFF08\u5C97\u4F4D 0 \u4EBA\u5728\u5C97 / \u7ED1\u5B9A\u4E0D\u53EF\u7528\u4F1A\u5F53\u573A\u62A5\u9519\uFF0C\u90A3\u65F6\u81EA\u5DF1\u505A\uFF09" },
       { name: "task", desc: "\u4EFB\u52A1\u4E66\u5168\u6587\u2014\u2014\u4E13\u5BB6**\u552F\u4E00**\u7684\u4E0A\u4E0B\u6587\u6765\u6E90\uFF0C\u5199\u5168\uFF1B\u4E0D\u8BBE\u957F\u5EA6\u4E0A\u9650\u3001\u4E0D\u622A\u65AD" },
@@ -343935,7 +344017,7 @@ var COMMAND_DECLS = {
   "trace exogenous": {
     group: "\u6267\u884C\u8BB0\u5F55\uFF08trace\uFF09",
     usage: "oasis trace exogenous <unit> [--full] [--json]",
-    description: "\u5916\u90E8\u56E0\u7D20\u4E8B\u5B9E\uFF1Arun \u8D85\u65F6 / \u88AB\u6740 / \u5931\u8054\u3001\u767B\u5F55\u5931\u6548\u4E0E\u989D\u5EA6\u4E00\u7C7B\u9519\u8BEF\u7801\u3001\u6362\u673A\u3001\u7CFB\u7EDF\u539F\u56E0\u7684\u53EB\u505C\u3001\u534F\u8BAE\u6062\u590D\u3001\u4E0A\u6E38 issue\u3001\u6267\u884C\u671F\u95F4\u9700\u6C42\u53D8\u4E86\u3002\u53CD\u601D\u65F6\u5148\u770B\u5B83\uFF0C\u5C5E\u4E8E\u5916\u90E8\u539F\u56E0\u7684\u6539\u8FDB\u70B9\u6807 category=external\u3002\u9519\u8BEF\u4FE1\u606F\u4E0E issue \u539F\u6587\u8FC7\u957F\u65F6\u622A\u65AD\u5E76\u5E26 `[\u5DF2\u7701\u7565 N \u5B57 \u2192 oasis trace exogenous <unit> --full]`\u3002",
+    description: "\u5916\u90E8\u56E0\u7D20\u4E8B\u5B9E\uFF1Arun \u8D85\u65F6 / \u88AB\u6740 / \u5931\u8054\u3001\u767B\u5F55\u5931\u6548\u4E0E\u989D\u5EA6\u4E00\u7C7B\u9519\u8BEF\u7801\u3001\u6362\u673A\u3001\u7CFB\u7EDF\u539F\u56E0\u7684\u53EB\u505C\u3001\u534F\u8BAE\u6062\u590D\u3001\u4E0A\u6E38 issue\u3001\u6267\u884C\u671F\u95F4\u9700\u6C42\u53D8\u4E86\u3002\u53CD\u601D\u65F6\u5148\u770B\u5B83\uFF0C\u5C5E\u4E8E\u5916\u90E8\u539F\u56E0\u7684\u6539\u8FDB\u70B9\u6807 category=external\u3002\u6BCF\u6761\u4E8B\u5B9E\u4E0B\u65B9\u7F29\u8FDB\u6253\u51FA run \u7684\u9519\u8BEF\u4FE1\u606F\u4E0E\u4E0A\u6E38 issue \u6B63\u6587\uFF1B\u8FC7\u957F\u65F6\u622A\u65AD\u5E76\u5E26 `[\u5DF2\u7701\u7565 N \u5B57 \u2192 oasis trace exogenous <unit> --full]`\uFF0C\u52A0 --full \u6253\u51FA\u5168\u6587\u3002",
     positional: [{ name: "<unit>", required: true, desc: "\u5355\u5143 id \u6216 run id" }],
     flags: [
       { name: "full", desc: "\u957F\u6587\u672C\u4E0D\u622A\u65AD", boolean: true, own: true },
@@ -345058,6 +345140,9 @@ var fmtMs = (ms2) => {
   return s3 < 120 ? `${s3}s` : `${Math.round(s3 / 60)}min`;
 };
 var scalar = (v2) => typeof v2 === "string" ? v2 : JSON.stringify(v2);
+var isTruncatedField = (v2) => typeof v2 === "object" && v2 !== null && typeof v2.text === "string" && typeof v2.truncated === "boolean" && typeof v2.fullChars === "number";
+var EXOGENOUS_TEXT_LABELS = { errorMessage: "\u9519\u8BEF\u4FE1\u606F", body: "\u6B63\u6587" };
+var EXOGENOUS_TEXT_INDENT = "      ";
 function renderEventPreview(e5, opts = {}) {
   const head = `#${e5.seq} [${e5.eventType}] ${e5.kind}${e5.toolName ? ` ${e5.toolName}` : ""}${e5.level === "error" ? " \u26A0error" : ""}`;
   const tail = e5.ingestTruncated ? "  [\u5165\u5E93\u524D\u5DF2\u88AB\u9002\u914D\u5668\u622A\u65AD\uFF0C\u539F\u6837\u7ED9\u51FA]" : "";
@@ -345096,7 +345181,14 @@ function renderTrace(sub, data, flags, println) {
         return;
       }
       println(`${r5.unitId} \u7684\u5916\u90E8\u56E0\u7D20\uFF08${r5.facts.length} \u6761\uFF09\uFF1A`);
-      for (const f6 of r5.facts) println(`  [${f6.kind}] ${orDash(f6.at)}${f6.runId ? `  ${f6.runId}` : ""}  ${oneLine3(f6.summary)}`);
+      for (const f6 of r5.facts) {
+        println(`  [${f6.kind}] ${orDash(f6.at)}${f6.runId ? `  ${f6.runId}` : ""}  ${oneLine3(f6.summary)}`);
+        for (const [k6, v2] of Object.entries(f6.detail ?? {})) {
+          if (!isTruncatedField(v2)) continue;
+          println(`    ${EXOGENOUS_TEXT_LABELS[k6] ?? k6}\uFF08\u5171 ${v2.fullChars} \u5B57${v2.truncated ? `\uFF0C\u5DF2\u622A\u65AD\uFF0C\u53D6\u5168\u6587\uFF1A${v2.fetchCmd}` : ""}\uFF09\uFF1A`);
+          println(v2.text.replace(/^/gm, EXOGENOUS_TEXT_INDENT));
+        }
+      }
       return;
     }
     case "runs": {
@@ -346025,7 +346117,7 @@ async function waitForCommandAuthorization(base, headers, draftId, fallback2) {
     }
   }
 }
-var CLI_VERSION = "2.2.126" ? "2.2.126" : "dev";
+var CLI_VERSION = "2.2.128" ? "2.2.128" : "dev";
 function apiHeaders(token2, company) {
   const headers = {
     authorization: `Bearer ${token2}`,
@@ -346831,17 +346923,15 @@ ${round.text}`);
         { to, task, ...flags.get("as") ? { as: flags.get("as") } : {}, ...fileArgs.length ? { files: fileArgs } : {} }
       );
       if (asJson2) {
-        const overlap2 = await overlapLines("delegate", task, started.delegationId);
-        println(JSON.stringify({ ...started, ...overlap2.length ? { overlap: overlap2 } : {} }, null, 2));
+        println(JSON.stringify(started, null, 2));
         break;
       }
       println(`\u5DF2\u4EA4\u7ED9 ${to} \u53BB\u505A\uFF08\u5F02\u6B65\uFF0C\u4E0D\u7528\u7B49\uFF09\u3002`);
       println(`  \u77ED\u540D\uFF08--follow-up \u7528\u8FD9\u4E2A\uFF09\uFF1A${started.label}`);
       println(`  delegationId\uFF1A${started.delegationId}`);
       if (started.attachedFiles?.length) println(`  \u5E26\u8FC7\u53BB\u7684\u6587\u4EF6\uFF1A${started.attachedFiles.join("\u3001")}`);
-      const overlap = await overlapLines("delegate", task, started.delegationId);
-      for (const line2 of overlap) println(line2);
-      println(overlap.length ? "\u7ED3\u679C\u5E72\u5B8C\u4E86\u4F1A\u81EA\u5DF1\u56DE\u5230\u8FD9\u6761\u5BF9\u8BDD\u3002\u6536\u5C3E\u524D\u5148\u6309\u4E0A\u9762\u300C\u76F8\u8FD1\u7684\u4E8B\u9879\u300D\u9010\u6761\u67E5\u5B8C\uFF08\u786E\u5B9E\u76F8\u5173\u624D\u987A\u5E26\u544A\u8BC9\u7528\u6237\uFF09\uFF0C\u7136\u540E\u8FD9\u4E00\u8F6E\u5C31\u6536\u5C3E\u2014\u2014\u4E0D\u7528\u7B49\u4E13\u5BB6\u3002" : "\u7ED3\u679C\u5E72\u5B8C\u4E86\u4F1A\u81EA\u5DF1\u56DE\u5230\u8FD9\u6761\u5BF9\u8BDD\u3002\u8FD9\u4E00\u8F6E\u5148\u6536\u5C3E\u2014\u2014\u53EF\u4EE5\u987A\u624B\u8DDF\u7528\u6237\u8BF4\u4E00\u53E5\u4F60\u628A\u8FD9\u4EF6\u4E8B\u6D3E\u51FA\u53BB\u4E86\u3002");
+      if (started.overlapAttached) println(`  \u5DF2\u628A ${started.overlapAttached} \u6761\u76F8\u8FD1\u4E8B\u9879\u9644\u7ED9\u4E13\u5BB6\uFF0C\u4E13\u5BB6\u5F00\u5DE5\u524D\u4F1A\u6838\u5BF9\u3002`);
+      println("\u7ED3\u679C\u5E72\u5B8C\u4E86\u4F1A\u81EA\u5DF1\u56DE\u5230\u8FD9\u6761\u5BF9\u8BDD\u3002\u8FD9\u4E00\u8F6E\u5148\u6536\u5C3E\u2014\u2014\u53EF\u4EE5\u987A\u624B\u8DDF\u7528\u6237\u8BF4\u4E00\u53E5\u4F60\u628A\u8FD9\u4EF6\u4E8B\u6D3E\u51FA\u53BB\u4E86\u3002");
       break;
     }
     case "kb": {
@@ -350339,7 +350429,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.2.126" : "dev";
+var PKG_VERSION = true ? "2.2.128" : "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.126",
+  "version": "2.2.128",
   "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": "b1403f15edbd747bb5d7cbc69d8cf5931df713d1"
+    "sourceHead": "04f9ff49b5d972690f1ff184c248f9683de3e8b1"
   }
 }