oasis_test_v2 2.2.100 → 2.2.101

package/dist/index.js

@@ -2240,18 +2240,23 @@ function firstSentenceSummary(text7, max = CARD_SUMMARY_MAX) {
   const cps = [...clean2];
   return cps.length > max ? `${cps.slice(0, max).join("")}\u2026` : clean2;
 }
+function requoteStepTitle(text7, title) {
+  const t = title?.trim();
+  return t && text7 ? text7.split(`\u300A${t}\u300B`).join(stepQuote(t)) : text7;
+}
 function nodePhrase(args, refs) {
   const id = argStr(args, "artifactId");
   const title = id ? refs.nodeTitle?.(id)?.trim() : void 0;
-  return title ? `\u300A${title}\u300B` : NEUTRAL_NODE;
+  return title ? stepQuote(title) : NEUTRAL_NODE;
 }
 function targetPhrase(naming, neutral) {
-  const summary = firstSentenceSummary(naming?.summary);
   const nodeTitle = naming?.nodeTitle?.trim();
+  const raw = firstSentenceSummary(naming?.summary);
+  const summary = requoteStepTitle(raw, nodeTitle);
   if (summary) {
-    return { phrase: nodeTitle && !summary.includes(nodeTitle) ? `\u300A${nodeTitle}\u300B\u2014\u2014${summary}` : summary, named: true };
+    return { phrase: nodeTitle && !summary.includes(nodeTitle) ? `${stepQuote(nodeTitle)}\u2014\u2014${summary}` : summary, named: true };
   }
-  if (nodeTitle) return { phrase: `\u300A${nodeTitle}\u300B\u4E0A\u7684${neutral}`, named: true };
+  if (nodeTitle) return { phrase: `${stepQuote(nodeTitle)}\u4E0A\u7684${neutral}`, named: true };
   return { phrase: neutral, named: false };
 }
 function escalationPhraseOf(refs, escalationId) {
@@ -2272,7 +2277,7 @@ function describeCommandForHuman(command2, args, refs = {}) {
     case "promote":
       return `\u628A${nodePhrase(args, refs)}\u8F6C\u4E3A\u957F\u671F\u4FDD\u7559\u7684\u8282\u70B9\uFF08\u4E0D\u518D\u968F\u4EFB\u52A1\u7ED3\u675F\u56DE\u6536\uFF09\u3002`;
     // continueBatch（续跑额度卡）**故意不在这里**：它的文案由引擎写好放在 `continuationBudget.request.summary`
-    // 里，本来就是「《节点名》尚未完成，已达到自动派发上限。累计已运行 N 轮…」这种名称式写法，没有 id。
+    // 里，本来就是「「节点名」尚未完成，已达到自动派发上限。累计已运行 N 轮…」这种名称式写法，没有 id。
     // 重写一遍只会让同一句话有两个事实源，交给 {@link commandCardDisplayLabel} 的兜底清洗即可。
     case "resolveEscalation": {
       const escalation = escalationPhraseOf(refs, argStr(args, "escalationId"));
@@ -2291,16 +2296,18 @@ function describeCommandForHuman(command2, args, refs = {}) {
 }
 function commandCardDisplayLabel(command2, args, storedLabel, refs = {}) {
   const described = command2 ? describeCommandForHuman(command2, args ?? {}, refs) : void 0;
-  return described ?? stripInternalIds(storedLabel ?? "");
+  if (described !== void 0) return described;
+  const id = argStr(args ?? {}, "artifactId");
+  return requoteStepTitle(stripInternalIds(storedLabel ?? ""), id ? refs.nodeTitle?.(id) : void 0);
 }
 function nodeRefPhrase(ref2, refs, neutral = NEUTRAL_NODE) {
   const raw = (ref2 ?? "").trim();
   if (!raw) return neutral;
   const title = refs.nodeTitle?.(raw)?.trim();
-  if (title) return `\u300A${title}\u300B`;
+  if (title) return stepQuote(title);
   if (!containsInternalId(raw)) {
     const tail = raw.includes(":") ? raw.slice(raw.indexOf(":") + 1).trim() : raw;
-    if (tail && !containsInternalId(tail)) return `\u300A${tail}\u300B`;
+    if (tail && !containsInternalId(tail)) return stepQuote(tail);
   }
   return neutral;
 }
@@ -2308,8 +2315,8 @@ function actorNamePhrase(actorId, refs) {
   const raw = (actorId ?? "").trim();
   if (!raw) return NEUTRAL_APPROVER;
   const name = refs.actorName?.(raw)?.trim();
-  if (name) return name;
-  return containsInternalId(raw) ? NEUTRAL_APPROVER : raw;
+  if (name) return atName(name);
+  return containsInternalId(raw) ? NEUTRAL_APPROVER : atName(raw);
 }
 function graphEditOpDisplayLabel(op, refs = {}) {
   const node2 = nodeRefPhrase(op?.artifactId, refs);
@@ -2341,7 +2348,7 @@ function graphEditOpDisplayLabel(op, refs = {}) {
       return op?.action ? stripInternalIds(op.action) : "\u53D8\u66F4";
   }
 }
-var PREFIXED_ID_RE, UUID_RE, SHORT_ID_RE, CARD_SUMMARY_MAX, NEUTRAL_NODE, NEUTRAL_NODE_OTHER, NEUTRAL_ESCALATION, NEUTRAL_GAP, NEUTRAL_APPROVER, argStr;
+var PREFIXED_ID_RE, UUID_RE, SHORT_ID_RE, CARD_SUMMARY_MAX, NEUTRAL_NODE, NEUTRAL_NODE_OTHER, NEUTRAL_ESCALATION, NEUTRAL_GAP, NEUTRAL_APPROVER, argStr, stepQuote, atName;
 var init_command_card_copy = __esm({
   "../contract/src/command-card-copy.ts"() {
     "use strict";
@@ -2358,6 +2365,8 @@ var init_command_card_copy = __esm({
       const v2 = args[key2];
       return typeof v2 === "string" && v2.trim() ? v2.trim() : void 0;
     };
+    stepQuote = (title) => `\u300C${title}\u300D`;
+    atName = (name) => name.startsWith("@") ? name : `@${name}`;
   }
 });
 
@@ -13705,6 +13714,7 @@ async function recordChatTurnInterruption(deps) {
     return touched;
   } catch (err) {
     log3(`[chat-interrupt] items \u7ED3\u5C40\u9879\u5199\u5165\u5931\u8D25\uFF1Asession=${sessionId} turn=${turnId} ${String(err)}`);
+    if (deps.rethrow) throw err;
     return [];
   }
 }
@@ -166150,7 +166160,10 @@ var init_live_chat = __esm({
         };
         ctrl = this.start(chatSessionId, handle);
         const turn = this.turns.get(chatSessionId);
-        if (turn) turn.recovering = true;
+        if (turn) {
+          turn.recovering = true;
+          turn.recoveringLedgerTurnId = opts.ledgerTurnId;
+        }
         return ctrl;
       }
       /** 占位轮的最后一个观众断开即回收：没真 runtime 喂它，留着只会占内存、也会让 `isRunning` 恒真。 */
@@ -166338,6 +166351,61 @@ var init_live_chat = __esm({
         turn.cancelCause = cause;
         return true;
       }
+      /**
+       * 该会话当前挂着的是不是一个还在跑的**占位轮**（{@link reopenForRecovery} 起的，没有真句柄）。
+       * `/stop` 据此改走台账：占位轮的 kill 只会就地收掉页面上的那一轮，真正让节点那一轮停下的是台账终态，
+       * 必须等台账写成了才能回「停住了」（Bug 0228 评审返工）。
+       */
+      isRecovering(chatSessionId) {
+        const turn = this.turns.get(chatSessionId);
+        return !!turn?.recovering && turn.status === "running";
+      }
+      /**
+       * 当前占位轮的身份；不是占位轮 = undefined。`epoch` = 本会话的轮次序号（单调递增、不复用），
+       * `/stop` 回来用 {@link stopSameTurn} 只收这一个占位轮；`ledgerTurnId` = 它对应的台账行，
+       * `/stop` 在台账上只停这一行，绝不按会话现查到的下一轮去写。
+       */
+      recoveringTurn(chatSessionId) {
+        const turn = this.turns.get(chatSessionId);
+        if (!turn?.recovering || turn.status !== "running" || !turn.recoveringLedgerTurnId) return void 0;
+        return { epoch: turn.liveEpoch, ledgerTurnId: turn.recoveringLedgerTurnId };
+      }
+      /**
+       * 当前在跑的真轮（非占位轮）的身份；没有 = undefined。`/stop` 等完本进程开轮后先记下它，
+       * 核实它就是台账上要停的那一行，再用 {@link stopSameTurn} 按 `epoch` 只停它（Bug 0228 第四轮评审）。
+       */
+      runningTurn(chatSessionId) {
+        const turn = this.turns.get(chatSessionId);
+        if (!turn || turn.recovering || turn.status !== "running") return void 0;
+        return {
+          epoch: turn.liveEpoch,
+          ...turn.runId ? { runId: turn.runId } : {},
+          ...turn.items ? { turnId: turn.items.turnId } : {}
+        };
+      }
+      /**
+       * 注册表里此刻在跑的这一轮，**认得出**就是台账行 `ledgerTurnId` 吗（Bug 0228 第五轮评审）。
+       * 占位轮看它挂的台账行，真轮看它 items 账本的轮次 id（接了台账的开轮路上就是台账行 id）。
+       * 认不出（没有 items 账本、或 items 沿用了老 turn_id）一律 false——调用方改去台账上按 id 核，不当成同一轮。
+       */
+      isTurn(chatSessionId, ledgerTurnId) {
+        const turn = this.turns.get(chatSessionId);
+        if (!turn || turn.status !== "running") return false;
+        return (turn.recovering ? turn.recoveringLedgerTurnId : turn.items?.turnId) === ledgerTurnId;
+      }
+      /**
+       * 只停「还是那一轮」的轮：轮次序号等于 `epoch`（还是当初那个占位轮），或 `runId` 严格相等
+       * （恢复路已把占位轮换成同一轮的真句柄）。换成了别的轮（下一轮、或没有 runId 的新轮）一律不动、回 false。
+       * 与 {@link stop} 的 `expectedRunId` 不同：那边没有 runId 的轮也会停，这里不会（Bug 0228 评审返工）。
+       */
+      stopSameTurn(chatSessionId, same) {
+        const turn = this.turns.get(chatSessionId);
+        if (!turn) return false;
+        const isSame = turn.liveEpoch === same.epoch || !!same.runId && turn.runId === same.runId;
+        if (!isSame) return false;
+        this.stop(chatSessionId);
+        return true;
+      }
       /** 该会话当前是否有一轮 running（供上层判断是否要挡并发发送）。 */
       isRunning(chatSessionId) {
         return this.turns.get(chatSessionId)?.status === "running";
@@ -171383,20 +171451,27 @@ async function stopLedgerTurn(deps) {
   const now = deps.now ?? (() => (/* @__PURE__ */ new Date()).toISOString());
   const log3 = deps.log ?? (() => {
   });
-  let turn = deps.turn ?? await deps.turns.activeTurn(deps.sessionId);
+  let turn = deps.turn ?? (deps.turnId ? await deps.turns.getTurn(deps.turnId) : await deps.turns.activeTurn(deps.sessionId));
   for (let attempt = 0; attempt < MAX_CAS_ATTEMPTS; attempt += 1) {
+    if (turn?.status === "cancelled" && turn.cancelledBy === "user") {
+      if (deps.expectedRunId && turn.assistantRunId !== deps.expectedRunId) return { stopped: false, reason: "turn-changed" };
+      deps.onCancelled?.(turn);
+      await recordUserStopNotice(deps, turn, turn.completedAt ?? now());
+      return { stopped: true, ledger: true };
+    }
     if (!turn || turn.status !== "reserved" && turn.status !== "running") return { stopped: false, reason: "no-live-turn" };
-    if (deps.expectedRunId && turn.assistantRunId && turn.assistantRunId !== deps.expectedRunId) {
+    if (deps.expectedRunId && turn.assistantRunId !== deps.expectedRunId) {
       return { stopped: false, reason: "turn-changed" };
     }
     const completedAt = now();
     const ok3 = await deps.turns.transitionTurn(
       turn.id,
       { status: turn.status, dispatchId: turn.dispatchId },
-      { status: "cancelled", completedAt, lastError: `\u7528\u6237\u505C\u6B62\uFF08\u672C\u8FDB\u7A0B\u6CE8\u518C\u8868\u91CC\u6CA1\u6709\u8FD9\u4E00\u8F6E\uFF0C\u6309\u53F0\u8D26\u6536\uFF1B\u539F\u72B6\u6001 ${turn.status}\uFF09` }
+      { status: "cancelled", cancelledBy: "user", completedAt, lastError: `\u7528\u6237\u505C\u6B62\uFF08\u672C\u8FDB\u7A0B\u6CE8\u518C\u8868\u91CC\u6CA1\u6709\u8FD9\u4E00\u8F6E\uFF0C\u6309\u53F0\u8D26\u6536\uFF1B\u539F\u72B6\u6001 ${turn.status}\uFF09` }
     );
     if (ok3) {
       log3(`[chat-stop] \u4F1A\u8BDD ${deps.sessionId} \u8F6E ${turn.id} \u6309\u53F0\u8D26\u505C\u6B62\uFF08${turn.status} \u2192 cancelled\uFF09`);
+      deps.onCancelled?.(turn);
       await recordUserStopNotice(deps, turn, completedAt);
       return { stopped: true, ledger: true };
     }
@@ -171417,7 +171492,8 @@ async function recordUserStopNotice(deps, turn, completedAt) {
     cause: "user-stop",
     reason: "user-stop",
     now: () => completedAt,
-    ...deps.log ? { log: deps.log } : {}
+    ...deps.log ? { log: deps.log } : {},
+    rethrow: true
   });
 }
 var MAX_CAS_ATTEMPTS;
@@ -214800,17 +214876,10 @@ async function startOasisServer(opts) {
               if (!active || active.status !== "running") return;
               liveChat.reopenForRecovery(sid, {
                 runtimeSessionId: cs.runtimeSessionId ?? active.dispatchId ?? "",
-                ...active.assistantRunId ? { runId: active.assistantRunId } : {},
-                // 占位轮被 `/stop` 停掉：与注册表落空时同一个收法（条件迁移 + 用户停止结局项，Bug 0228）。
-                onStop: () => {
-                  void (async () => stopLedgerTurn({
-                    turns,
-                    sessionId: sid,
-                    turn: active,
-                    items: opts.resolveChatItems ? await opts.resolveChatItems(currentCompanyId).catch(() => void 0) : opts.chatItems,
-                    findAssistantMessageId: (runId) => findAssistantMessageIdByRun(chatStoreNowOrNull, sid, runId)
-                  }))().catch(() => void 0);
-                }
+                ledgerTurnId: active.id,
+                ...active.assistantRunId ? { runId: active.assistantRunId } : {}
+                // 不挂 onStop：占位轮被 `/stop` 停时，由 `/stop` 先**等**台账写成（条件迁移 + 用户停止结局项，
+                // Bug 0228）再收它；写不成就留着它、回「没停成」。在 kill 里异步发起会先回成功、失败被吞掉。
               });
             };
             const wantsV3 = url.searchParams.get("protocol") === "v3";
@@ -214968,37 +215037,92 @@ async function startOasisServer(opts) {
               return;
             }
             let expectedRunId;
+            let expectedTurnId;
             try {
               const b2 = JSON.parse(rawBody);
               if (typeof b2.expectedRunId === "string" && b2.expectedRunId) expectedRunId = b2.expectedRunId;
+              if (typeof b2.expectedTurnId === "string" && b2.expectedTurnId) expectedTurnId = b2.expectedTurnId;
             } catch {
             }
-            let outcome = liveChat.stop(sid, expectedRunId);
-            if (!outcome.stopped && outcome.reason === "no-live-turn") {
-              const turns = opts.resolveChatTurns ? await opts.resolveChatTurns(currentCompanyId).catch(() => void 0) : opts.chatTurns;
-              const active = turns ? await turns.activeTurn(sid).catch(() => null) : null;
-              if (turns && active) {
-                const openedByThisProcess = Date.parse(active.reservedAt) >= serveBootedAtMs;
-                if (openedByThisProcess) {
-                  await waitForAdmittedTurnStart(sid, { liveChat, ledgerTurnRunning: async () => true, timeoutMs: STOP_TURN_START_WAIT_MS });
-                  outcome = liveChat.stop(sid, expectedRunId);
+            const ledgerUnavailable = (err) => {
+              console.warn(`[chat-stop] \u4F1A\u8BDD ${sid} \u6309\u53F0\u8D26\u505C\u6B62\u5931\u8D25: ${String(err)}`);
+              return { stopped: false, reason: "ledger-unavailable" };
+            };
+            const stopOnLedger = async (turns, target, onCancelled) => stopLedgerTurn({
+              turns,
+              sessionId: sid,
+              expectedRunId,
+              ...target,
+              ...onCancelled ? { onCancelled } : {},
+              items: opts.resolveChatItems ? await opts.resolveChatItems(currentCompanyId).catch(() => void 0) : opts.chatItems,
+              findAssistantMessageId: (runId) => findAssistantMessageIdByRun(chatStoreNowOrNull, sid, runId),
+              log: (m2) => console.log(m2)
+            }).catch(ledgerUnavailable);
+            const resolveTurns = async () => opts.resolveChatTurns ? await opts.resolveChatTurns(currentCompanyId) : opts.chatTurns;
+            const outcome = await (async () => {
+              const placeholder = liveChat.recoveringTurn(sid);
+              if (placeholder !== void 0 && (!expectedTurnId || placeholder.ledgerTurnId === expectedTurnId)) {
+                let turns2;
+                try {
+                  turns2 = await resolveTurns();
+                } catch (err) {
+                  return ledgerUnavailable(err);
                 }
-                if (!outcome.stopped && outcome.reason === "no-live-turn") {
-                  outcome = await stopLedgerTurn({
-                    turns,
-                    sessionId: sid,
-                    expectedRunId,
-                    ...openedByThisProcess ? {} : { turn: active },
-                    items: opts.resolveChatItems ? await opts.resolveChatItems(currentCompanyId).catch(() => void 0) : opts.chatItems,
-                    findAssistantMessageId: (runId) => findAssistantMessageIdByRun(chatStoreNowOrNull, sid, runId),
-                    log: (m2) => console.log(m2)
-                  }).catch((err) => {
-                    console.warn(`[chat-stop] \u4F1A\u8BDD ${sid} \u6309\u53F0\u8D26\u505C\u6B62\u5931\u8D25: ${String(err)}`);
-                    return { stopped: false, reason: "turn-changed" };
+                if (turns2) {
+                  let cancelledRunId;
+                  const onLedger = await stopOnLedger(turns2, { turnId: placeholder.ledgerTurnId }, (t) => {
+                    cancelledRunId = t.assistantRunId ?? void 0;
                   });
+                  if (onLedger.stopped || onLedger.reason === "no-live-turn") {
+                    liveChat.stopSameTurn(sid, { epoch: placeholder.epoch, ...cancelledRunId ? { runId: cancelledRunId } : {} });
+                  }
+                  return onLedger;
                 }
               }
-            }
+              const noLiveTurn = { stopped: false, reason: "no-live-turn" };
+              const inRegistry = !expectedTurnId || liveChat.isTurn(sid, expectedTurnId) ? liveChat.stop(sid, expectedRunId) : noLiveTurn;
+              if (inRegistry.stopped || inRegistry.reason !== "no-live-turn") return inRegistry;
+              let turns;
+              try {
+                turns = await resolveTurns();
+              } catch (err) {
+                return ledgerUnavailable(err);
+              }
+              if (!turns) return inRegistry;
+              const registeredBefore = expectedTurnId ? liveChat.runningTurn(sid) : void 0;
+              let active;
+              try {
+                active = expectedTurnId ? await turns.getTurn(expectedTurnId) : await turns.activeTurn(sid);
+              } catch (err) {
+                return ledgerUnavailable(err);
+              }
+              if (active && active.chatSessionId !== sid) active = null;
+              if (!active) return inRegistry;
+              if (active.status !== "reserved" && active.status !== "running") return stopOnLedger(turns, { turn: active });
+              const isSameTurn = (reg, row) => reg.turnId === row.id || !!row.assistantRunId && reg.runId === row.assistantRunId || reg.turnId === void 0 && !row.assistantRunId;
+              if (registeredBefore && isSameTurn(registeredBefore, active)) {
+                if (expectedRunId && registeredBefore.runId && registeredBefore.runId !== expectedRunId) return { stopped: false, reason: "turn-changed" };
+                if (liveChat.stopSameTurn(sid, { epoch: registeredBefore.epoch })) return { stopped: true };
+              }
+              const openedByThisProcess = Date.parse(active.reservedAt) >= serveBootedAtMs;
+              if (openedByThisProcess) {
+                await waitForAdmittedTurnStart(sid, { liveChat, ledgerTurnRunning: async () => true, timeoutMs: STOP_TURN_START_WAIT_MS });
+                const registered = liveChat.runningTurn(sid);
+                let again;
+                try {
+                  again = await turns.getTurn(active.id);
+                } catch (err) {
+                  return ledgerUnavailable(err);
+                }
+                if (!again || again.status !== "reserved" && again.status !== "running") return { stopped: false, reason: "no-live-turn" };
+                if (registered && isSameTurn(registered, again)) {
+                  if (expectedRunId && registered.runId && registered.runId !== expectedRunId) return { stopped: false, reason: "turn-changed" };
+                  if (liveChat.stopSameTurn(sid, { epoch: registered.epoch })) return { stopped: true };
+                }
+                return stopOnLedger(turns, { turn: again });
+              }
+              return stopOnLedger(turns, { turn: active });
+            })();
             res.writeHead(200, { "content-type": "application/json" }).end(JSON.stringify(outcome));
             return;
           }
@@ -224212,7 +224336,8 @@ function applyTurnPatch(t, patch) {
     ...patch.assistantRunId !== void 0 ? { assistantRunId: patch.assistantRunId } : {},
     ...patch.startedAt !== void 0 ? { startedAt: patch.startedAt } : {},
     ...patch.completedAt !== void 0 ? { completedAt: patch.completedAt } : {},
-    ...patch.lastError !== void 0 ? { lastError: patch.lastError } : {}
+    ...patch.lastError !== void 0 ? { lastError: patch.lastError } : {},
+    ...patch.cancelledBy !== void 0 ? { cancelledBy: patch.cancelledBy } : {}
   };
 }
 var import_node_crypto49, fs23, path22, NdjsonOplogStore, DirBlobStore, MUTATORS, FileTypeRegistryStore, FileRoleRegistryStore, FileRegistryStore, FileAssistantBindStore, FileHumanPrefsStore, FileProjectStateStore, FileArtifactStateStore, FileTraceStore, MemoryChatSessionStore, FileChatSessionStore, MemoryChatTurnStore, FileChatTurnStore, MemoryReadMarkerStore, FileReadMarkerStore;
@@ -229617,7 +229742,8 @@ async function sweepDanglingChatTurns(deps) {
       completedAt = run?.endedAt ?? new Date(deps.now).toISOString();
       reason = run ? `run \u7EC8\u6001 ${run.status}` : "run \u7F3A\u5931";
       exitReason = run?.exitReason ?? null;
-      cancelledBy = serveRestartCauseOfRun(run);
+      const ledgerTurn = await deps.getTurnForRun?.(row.sessionId, row.runId).catch(() => null);
+      cancelledBy = (ledgerTurn?.status === "cancelled" ? ledgerTurn.cancelledBy ?? void 0 : void 0) ?? serveRestartCauseOfRun(run);
     } else {
       if (deps.now - Date.parse(row.createdAt) < (deps.noRunGraceMs ?? 10 * 6e4)) continue;
       status = "error";
@@ -229886,7 +230012,8 @@ async function sweepDanglingChatTurnsAcrossCompanies(deps) {
         ...log3 ? { log: (m2) => log3(companyId ? `${m2}\uFF3B${companyId}\uFF3D` : m2) } : {},
         ...sessionOutputsScan ? { outputsPartFor: (sid) => outputsPartProvider(sessionOutputsScan, sid, companyId) } : {},
         // Bug #0185：结局项要写进**这一家**的 `chat_items`（公司分 schema，写错家等于没写）。
-        ...stores.items ? { itemsFor: () => stores.items } : {}
+        ...stores.items ? { itemsFor: () => stores.items } : {},
+        ...stores.getTurnForRun ? { getTurnForRun: stores.getTurnForRun } : {}
       });
       closed.push(...ids2);
     } catch (err) {
@@ -229931,6 +230058,19 @@ async function reconcileSettledChatTurn(deps) {
     succeeded ? "completed" : "failed",
     deps.log ?? (() => void 0)
   );
+  if (turn.status === "cancelled" && turn.cancelledBy === "user" && deps.items) {
+    await recordChatTurnInterruption({
+      items: deps.items,
+      sessionId: plan.chatSessionId,
+      turnId,
+      runId: plan.runId,
+      messageId: plan.assistantMsgId,
+      cause: "user-stop",
+      reason: "user-stop",
+      now: () => completedAt,
+      ...deps.log ? { log: deps.log } : {}
+    });
+  }
   const withOutputs = await appendOutputsPart(plan.seedParts, deps.outputsPart);
   await deps.chatStore.updateMessage(plan.assistantMsgId, {
     status: succeeded ? "done" : "error",
@@ -240428,8 +240568,8 @@ var init_activity_trace = __esm({
 function commandCardLine(command2) {
   return command2.displayLabel?.trim() || stripInternalIds(command2.effectLabel ?? "");
 }
-function changeConfirmSummary(r) {
-  if (r.continuation) return `\u672C\u6279\u8F6E\u6570\u5DF2\u7528\u5B8C\uFF0C\u7B49\u4F60\u51B3\u5B9A\u662F\u5426\u7EE7\u7EED\uFF1A${r.plan.reason}`;
+function changeConfirmSummary(r, stepTitle) {
+  if (r.continuation) return `\u672C\u6279\u8F6E\u6570\u5DF2\u7528\u5B8C\uFF0C\u7B49\u4F60\u51B3\u5B9A\u662F\u5426\u7EE7\u7EED\uFF1A${requoteStepTitle(r.plan.reason, stepTitle)}`;
   const why = r.plan.reason.slice(0, 100);
   if (r.kind === "command" && r.command) {
     return `\u7BA1\u7406\u8005\u8BF7\u6C42\u6267\u884C\u4E00\u4E2A\u9AD8\u5371\u64CD\u4F5C\uFF0C\u7B49\u4F60\u6388\u6743\uFF1A${commandCardLine(r.command)}`;
@@ -240475,7 +240615,7 @@ function buildInbox(model, me, leadOf, resolveActor, markers = [], slaMs, nowIso
       ...extra?.avatar ? { avatar: extra.avatar } : {}
     };
   };
-  const atName = (id) => {
+  const atName2 = (id) => {
     const name = resolveActor?.(id)?.name;
     return name ? plainActor(name) : "";
   };
@@ -240604,7 +240744,7 @@ function buildInbox(model, me, leadOf, resolveActor, markers = [], slaMs, nowIso
       workspace: r.workspace,
       since: r.at,
       actionRequired: true,
-      summary: changeConfirmSummary(r),
+      summary: changeConfirmSummary(r, anchorArt?.title),
       draftId: r.draftId,
       // ★ 落点（2026-09-11）：带上起草它的那段对话，让前端把这一行跳回**卡真正渲染着的地方**。
       // 此前这一行恒跳「任务详情 ?tab=activity」，而全仓库渲染待审卡的只有 chat 页与任务页的协调者
@@ -240615,7 +240755,7 @@ function buildInbox(model, me, leadOf, resolveActor, markers = [], slaMs, nowIso
       // 续跑申请的入口在任务动态那张续跑申请卡上（卡 id = 申请 id，见 activity.ts `continuationCards`）。
       ...r.continuation ? { activityCardId: r.continuation.requestId } : {},
       ...anchorArt ? { title: nodeLabel(anchorArt) } : {},
-      detail: `${atName(r.proposedBy) || "\u7BA1\u7406\u8005"}\uFF1A${r.command ? commandCardLine(r.command) : firstSentence3(r.plan.reason)}`,
+      detail: `${atName2(r.proposedBy) || "\u7BA1\u7406\u8005"}\uFF1A${r.command ? commandCardLine(r.command) : requoteStepTitle(firstSentence3(r.plan.reason), anchorArt?.title)}`,
       ...r.kind !== "command" && opCount > 0 ? { impact: `\u6D89\u53CA ${opCount} \u5904\u6539\u52A8${r.nonMonotonicOps.length > 0 ? " \xB7 \u542B\u9500\u6BC1\u6027" : ""}` } : {},
       actor: actorRef3(r.proposedBy),
       ...overdueField(r.at)
@@ -240656,7 +240796,7 @@ function buildInbox(model, me, leadOf, resolveActor, markers = [], slaMs, nowIso
         actionRequired: true,
         summary: `\u6709\u4EBA\u5728\u300C${label2}\u300D\u7684\u4FE1\u91CC @ \u4E86\u4F60\uFF0C\u7B49\u4F60\u56DE\u8BDD\uFF1A${(lastPost?.body ?? an.body).slice(0, 100)}`,
         title: label2,
-        detail: `${(lastPost ? atName(lastPost.author) : "") || "\u6709\u4EBA"} @ \u4E86\u4F60\uFF1A${firstSentence3(lastPost?.body ?? an.body)}`,
+        detail: `${(lastPost ? atName2(lastPost.author) : "") || "\u6709\u4EBA"} @ \u4E86\u4F60\uFF1A${firstSentence3(lastPost?.body ?? an.body)}`,
         ...lastPost ? { actor: actorRef3(lastPost.author) } : {},
         ...overdueField(an.createdAt)
       });
@@ -240681,7 +240821,7 @@ function buildInbox(model, me, leadOf, resolveActor, markers = [], slaMs, nowIso
         actionRequired: false,
         summary: `\u4F60\u7684\u4FE1\u6709\u65B0\u52A8\u9759\uFF08${phrase}\uFF09\u300C${nodeLabel(a)}\u300D\uFF1A${lastNote.slice(0, 100)}\u2014\u2014\u4E0D\u8BA4\u53EF\u53EF\u5728\u4FE1\u4E2D\u56DE\u5E16`,
         title: nodeLabel(a),
-        detail: `${atName(activity.by) || "\u5BF9\u65B9"} \u56DE\u5E94\u4E86\u4F60\u7684\u4FE1\uFF1A${firstSentence3(lastNote)}`,
+        detail: `${atName2(activity.by) || "\u5BF9\u65B9"} \u56DE\u5E94\u4E86\u4F60\u7684\u4FE1\uFF1A${firstSentence3(lastNote)}`,
         actor: actorRef3(activity.by)
         // 通知型不判 overdue（诊断明说），不设 overdue 字段。
       });
@@ -240701,7 +240841,7 @@ function buildInbox(model, me, leadOf, resolveActor, markers = [], slaMs, nowIso
           actionRequired: true,
           summary: `\u5F85\u4F60\u9A8C\u6536\uFF1A${label2}\uFF08${pendingHead.id}\uFF09\u2014\u2014\u8BE5\u7248\u7B54\u590D\u4E86\u4F60\u7684\u4FE1`,
           title: label2,
-          detail: `${atName(pendingHead.author) || "agent"} \u4EA4\u4E86\u65B0\u7248\u7B54\u590D\u4F60\u7684\u4FE1\uFF1A${firstSentence3(pendingHead.reason)}`,
+          detail: `${atName2(pendingHead.author) || "agent"} \u4EA4\u4E86\u65B0\u7248\u7B54\u590D\u4F60\u7684\u4FE1\uFF1A${firstSentence3(pendingHead.reason)}`,
           actor: actorRef3(pendingHead.author),
           ...overdueField(pendingHead.createdAt)
         });
@@ -240728,7 +240868,7 @@ function buildInbox(model, me, leadOf, resolveActor, markers = [], slaMs, nowIso
           actionRequired: true,
           summary: `\u5F85\u4F60\u5BA1\u6279\uFF1A${label2}`,
           title: label2,
-          ...gp ? { detail: `${atName(gp.headAuthor) || "\u4F5C\u8005"} \u4EA4\u4E86\u65B0\u7248\uFF1A${firstSentence3(headReason)}`, actor: actorRef3(gp.headAuthor) } : {},
+          ...gp ? { detail: `${atName2(gp.headAuthor) || "\u4F5C\u8005"} \u4EA4\u4E86\u65B0\u7248\uFF1A${firstSentence3(headReason)}`, actor: actorRef3(gp.headAuthor) } : {},
           ...impactParts.length > 0 ? { impact: impactParts.join(" \xB7 ") } : {},
           ...overdueField(gate.at)
         });
@@ -240751,7 +240891,7 @@ function buildInbox(model, me, leadOf, resolveActor, markers = [], slaMs, nowIso
         actionRequired: true,
         summary: `\u4EA7\u51FA\u88AB\u6253\u56DE\uFF0C\u9700\u8FD4\u5DE5\uFF1A${label2}`,
         title: label2,
-        ...rejectVote ? { detail: `${atName(rejectVote.author) || "\u8BC4\u5BA1"} \u6253\u56DE\uFF1A${firstSentence3(rejectVote.note ?? "\u89C1\u8BC4\u5BA1\u610F\u89C1")}`, actor: actorRef3(rejectVote.author) } : {},
+        ...rejectVote ? { detail: `${atName2(rejectVote.author) || "\u8BC4\u5BA1"} \u6253\u56DE\uFF1A${firstSentence3(rejectVote.note ?? "\u89C1\u8BC4\u5BA1\u610F\u89C1")}`, actor: actorRef3(rejectVote.author) } : {},
         ...reworkDs > 0 ? { impact: `\u6321\u7740\u4E0B\u6E38 ${reworkDs} \u4E2A\u8282\u70B9` } : {},
         ...overdueField(latest.createdAt)
       });
@@ -258700,6 +258840,16 @@ var init_daemon_adapter = __esm({
         timer.unref?.();
         this.sessionReapTimers.set(dispatchId, timer);
       }
+      /**
+       * 这次派发的会话连接已经断了、正在等失联宽限（`onSessionDown` 起的倒计时还在走）。
+       *
+       * 给静默保险丝用（Bug 0279）：机器掉线时「最后一次输出」总是早于「连接断开」，按输出算的静默保险丝
+       * 几乎总是先到点，把这一轮当成「长时间没有响应」停掉（`cancelled`）——既不换候选、也不标故障。
+       * 连接已断的那一轮交给失联收割判（`server-unreachable`），保险丝让开。
+       */
+      isAwaitingSessionReap(dispatchId) {
+        return this.sessionReapTimers.has(dispatchId);
+      }
       /** 节点失联超宽限期：只报警，不把「暂时够不到」升级成「runtime 已死」。 */
       markNodeUnknown(daemonId) {
         const unknown2 = [];
@@ -267319,6 +267469,7 @@ async function ensureChatTurnsTable(pool, schema = "public") {
       completed_at     timestamptz,
       last_error       text
     )`);
+  await pool.query(`ALTER TABLE "${s2}".chat_session_turns ADD COLUMN IF NOT EXISTS cancelled_by text`);
   await pool.query(`CREATE UNIQUE INDEX IF NOT EXISTS chat_session_turns_source_uq ON "${s2}".chat_session_turns (source, source_run_id)`);
   await pool.query(`CREATE UNIQUE INDEX IF NOT EXISTS chat_session_turns_msgkey_uq ON "${s2}".chat_session_turns (message_key)`);
   await pool.query(`CREATE UNIQUE INDEX IF NOT EXISTS chat_session_turns_active_uq ON "${s2}".chat_session_turns (chat_session_id) WHERE status IN ('reserved','running')`);
@@ -267350,6 +267501,10 @@ function patchSets(patch) {
     args.push(patch.lastError);
     sets.push(`last_error = $${args.length}`);
   }
+  if (patch.cancelledBy !== void 0) {
+    args.push(patch.cancelledBy);
+    sets.push(`cancelled_by = $${args.length}`);
+  }
   return { sets, args };
 }
 var ident11, PostgresChatTurnStore, isUniqueViolation2, iso5, rowToTurn;
@@ -267466,7 +267621,8 @@ var init_postgres_chat_turns = __esm({
       reservedAt: iso5(row.reserved_at),
       startedAt: iso5(row.started_at),
       completedAt: iso5(row.completed_at),
-      lastError: row.last_error ?? null
+      lastError: row.last_error ?? null,
+      ...row.cancelled_by ? { cancelledBy: row.cancelled_by } : {}
     });
   }
 });
@@ -269726,7 +269882,7 @@ var init_postgres_chat_sessions = __esm({
       /** 按本 schema 中的会话 + run 精确找轮，不能用 activeTurn：已取消的轮已不占 active slot。 */
       async getTurnForRun(sessionId, runId) {
         const r = await this.pool.query(
-          `SELECT id, status, completed_at, last_error FROM ${this.s}.chat_session_turns
+          `SELECT * FROM ${this.s}.chat_session_turns
         WHERE chat_session_id = $1 AND assistant_run_id = $2 ORDER BY reserved_at DESC LIMIT 1`,
           [sessionId, runId]
         );
@@ -269735,7 +269891,8 @@ var init_postgres_chat_sessions = __esm({
           id: row.id,
           status: row.status,
           completedAt: row.completed_at == null ? null : new Date(row.completed_at).toISOString(),
-          lastError: row.last_error ?? null
+          lastError: row.last_error ?? null,
+          ...row.cancelled_by ? { cancelledBy: row.cancelled_by } : {}
         } : null;
       }
       async getSession(id) {
@@ -289749,6 +289906,7 @@ async function startServe(opts) {
         const exits = relay();
         let sawOutput = false;
         let retried = null;
+        let retriedFinish = null;
         handle.onOutput?.((c) => {
           sawOutput = true;
           out.push(c);
@@ -289777,8 +289935,11 @@ async function startServe(opts) {
           }
           if (sawOutput && info.reason !== "server-unreachable") return null;
           if (!automationDispatchChat || !canRetryAllocation(allocator.inspect(unitOfWork)?.failures ?? 0)) return null;
-          const session = await (await chatStoreFor(companyId)).getSession(plan.chatSessionId).catch(() => null);
-          if (!session?.isDelegationChild) return null;
+          const isChild = await delegationStoreFor(companyId).then((store) => store.getByChildSession(plan.chatSessionId)).then(Boolean).catch(() => false);
+          if (!isChild) {
+            console.log(`[runtime-alloc] \u63A5\u56DE\u7684\u8F6E ${plan.chatSessionId} \u4E0D\u662F\u59D4\u6D3E\u5B50\u4F1A\u8BDD\uFF0C\u53EA\u6807\u6545\u969C\u3001\u4E0D\u6362\u5019\u9009`);
+            return null;
+          }
           const events = await traceStore2.listEvents(plan.runId, {}).catch(() => []);
           const input = events.find((e) => e.eventType === "input.message");
           const payload2 = input?.payload ?? {};
@@ -289812,7 +289973,16 @@ async function startServe(opts) {
             retried = next;
             next.onOutput((c) => out.push(c));
             next.onLiveEvent?.((e) => live.push(e));
-            next.onNormalizedProviderEvent?.((e) => norm.push(e));
+            if (typeof next.onNormalizedProviderEvent === "function") {
+              next.onNormalizedProviderEvent((e) => norm.push(e));
+            } else {
+              const source = attachStreamNormalizer(next, {
+                providerName: "runtime",
+                fallbackTurnId: `oasis-turn:${plan.runId}:retry`
+              });
+              source.onNormalizedProviderEvent((e) => norm.push(e));
+              retriedFinish = (signal) => source.finishTurn(signal);
+            }
             let failure2;
             try {
               await next.done;
@@ -289838,7 +290008,7 @@ async function startServe(opts) {
             }
             if (prop === "kill") return () => retried?.kill ? retried.kill() : target.kill();
             if (prop === "finishNormalizedTurn") {
-              return (signal) => retried?.finishNormalizedTurn ? retried.finishNormalizedTurn(signal) : target.finishNormalizedTurn?.(signal);
+              return (signal) => retriedFinish ? retriedFinish(signal) : retried?.finishNormalizedTurn ? retried.finishNormalizedTurn(signal) : target.finishNormalizedTurn?.(signal);
             }
             const value2 = Reflect.get(target, prop, receiver);
             return typeof value2 === "function" ? value2.bind(target) : value2;
@@ -292039,7 +292209,7 @@ ${nodeFault}` : "");
           for (const session of sessions2) dispatcherByJob.set(session.jobKey, d);
           return sessions2;
         });
-        const chatSessions = [...chatLiveSessions.entries()].map(([jobKey, c]) => ({ jobKey, artifactId: c.artifactId, sessionId: c.sessionId }));
+        const chatSessions = [...chatLiveSessions.entries()].filter(([, c]) => !(c.dispatchId && chatRemoteAdapter?.isAwaitingSessionReap(c.dispatchId))).map(([jobKey, c]) => ({ jobKey, artifactId: c.artifactId, sessionId: c.sessionId }));
         const sessions = [...dispatcherSessions, ...chatSessions];
         if (sessions.length === 0) return;
         probe.retain(sessions.map((s2) => s2.sessionId));
@@ -297653,7 +297823,7 @@ async function waitForCommandAuthorization(base, headers, draftId, fallback) {
     }
   }
 }
-var CLI_VERSION = "2.2.100" ? "2.2.100" : "dev";
+var CLI_VERSION = "2.2.101" ? "2.2.101" : "dev";
 function apiHeaders(token2, company) {
   const headers = {
     authorization: `Bearer ${token2}`,
@@ -301494,6 +301664,71 @@ function runtimeAssetSourceRoots(input) {
   return [...new Set(roots.map((root) => path43.resolve(root)))];
 }
 
+// src/enroll-exchange.ts
+function enrollTokenToUse(plan, supplied) {
+  const token2 = supplied?.trim();
+  if (!token2) return void 0;
+  if (plan.mode === "new") return token2;
+  return plan.names.length === 1 ? token2 : void 0;
+}
+var EnrollExchangeError = class extends Error {
+  constructor(message, status) {
+    super(message);
+    this.status = status;
+    this.name = "EnrollExchangeError";
+  }
+};
+var UNCHANGED = "\u672C\u673A\u6CA1\u6709\u505A\u4EFB\u4F55\u6539\u52A8\uFF08\u5B9E\u4F8B\u914D\u7F6E\u672A\u5199\u5165\uFF0C\u5B88\u62A4\u8FDB\u7A0B\u4E5F\u6CA1\u6709\u91CD\u542F\uFF09\u3002";
+function describeExchangeFailure(status, body2) {
+  const serverMessage = typeof body2?.message === "string" && body2.message.trim() ? body2.message.trim() : void 0;
+  const serverError = typeof body2?.error === "string" && body2.error.trim() ? body2.error.trim() : void 0;
+  let why;
+  if (status === 401) {
+    why = "\u63A5\u5165\u4EE4\u724C\u65E0\u6548\u3001\u5DF2\u8FC7\u671F\u6216\u5DF2\u7ECF\u88AB\u7528\u8FC7\u3002\u8BF7\u56DE\u5230\u9875\u9762\u91CD\u65B0\u6253\u5F00\u63A5\u5165\u5BF9\u8BDD\u6846\uFF0C\u590D\u5236\u65B0\u751F\u6210\u7684\u547D\u4EE4\u518D\u8FD0\u884C\u4E00\u6B21\u3002";
+  } else if (status === 409 && serverError === "NODE_UNOWNED") {
+    why = serverMessage ?? "\u8FD9\u53F0\u673A\u5668\u5728\u7CFB\u7EDF\u91CC\u7684\u65E7\u8BB0\u5F55\u6CA1\u6709\u5F52\u5C5E\u516C\u53F8\uFF0C\u4E0D\u80FD\u88AB\u63A5\u5165\uFF1B\u8BF7\u7A0D\u540E\u91CD\u65B0\u8FD0\u884C\u63A5\u5165\u547D\u4EE4\u3002";
+  } else if (status === 409) {
+    why = "\u8FD9\u53F0\u673A\u5668\u5728\u7CFB\u7EDF\u91CC\u5DF2\u767B\u8BB0\u5728\u53E6\u4E00\u4E2A\u516C\u53F8\u540D\u4E0B\uFF0C\u4E0D\u80FD\u7528\u5F53\u524D\u516C\u53F8\u7684\u63A5\u5165\u4EE4\u724C\u63A5\u5165\u3002\u8BF7\u7528\u8FD9\u53F0\u673A\u5668\u6240\u5C5E\u516C\u53F8\u7684\u8D26\u53F7\u751F\u6210\u63A5\u5165\u547D\u4EE4\uFF0C\u6216\u8BF7\u8BE5\u516C\u53F8\u7684\u7BA1\u7406\u5458\u5148\u5220\u9664\u8FD9\u53F0\u673A\u5668\u540E\u518D\u8FD0\u884C\u3002";
+  } else {
+    const detail = serverMessage ?? serverError;
+    why = `\u670D\u52A1\u7AEF\u62D2\u7EDD\u4E86\u8FD9\u6B21\u63A5\u5165${detail ? `\uFF1A${detail}` : ""}\u3002\u8BF7\u7A0D\u540E\u91CD\u8BD5\uFF1B\u4ECD\u7136\u5931\u8D25\u8BF7\u628A\u8FD9\u6BB5\u8F93\u51FA\u53D1\u7ED9\u7BA1\u7406\u5458\u3002`;
+  }
+  return `\u2717 \u63A5\u5165\u5931\u8D25\uFF08HTTP ${status}\uFF09\uFF1A${why}
+  ${UNCHANGED}`;
+}
+async function exchangeEnrollToken(o) {
+  const doFetch = o.fetchImpl ?? fetch;
+  let res;
+  try {
+    res = await doFetch(`${o.httpBase}/api/nodes/exchange`, {
+      method: "POST",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify({
+        enrollToken: o.enrollToken,
+        nodeId: o.nodeId,
+        hostname: o.hostname,
+        serverUrl: o.serverUrl,
+        ...o.companyId ? { companyId: o.companyId } : {}
+      })
+    });
+  } catch (e) {
+    throw new EnrollExchangeError(
+      `\u2717 \u63A5\u5165\u5931\u8D25\uFF1A\u8FDE\u4E0D\u4E0A\u670D\u52A1\u7AEF ${o.httpBase}\uFF08${e instanceof Error ? e.message : String(e)}\uFF09\u3002\u8BF7\u68C0\u67E5\u7F51\u7EDC\u540E\u91CD\u65B0\u8FD0\u884C\u63A5\u5165\u547D\u4EE4\u3002
+  ${UNCHANGED}`
+    );
+  }
+  if (!res.ok) {
+    const body3 = await res.json().catch(() => null);
+    throw new EnrollExchangeError(describeExchangeFailure(res.status, body3), res.status);
+  }
+  const body2 = await res.json();
+  if (!body2.token || !body2.nodeId) {
+    throw new EnrollExchangeError(`\u2717 \u63A5\u5165\u5931\u8D25\uFF1A\u670D\u52A1\u7AEF\u7684\u5E94\u7B54\u91CC\u7F3A\u5C11\u8282\u70B9\u8EAB\u4EFD\u3002\u8BF7\u7A0D\u540E\u91CD\u65B0\u8FD0\u884C\u63A5\u5165\u547D\u4EE4\u3002
+  ${UNCHANGED}`, res.status);
+  }
+  return { token: body2.token, nodeId: body2.nodeId };
+}
+
 // src/install.ts
 var import_node_crypto97 = require("node:crypto");
 var fs49 = __toESM(require("node:fs"));
@@ -301624,7 +301859,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.2.100" : "dev";
+var PKG_VERSION = true ? "2.2.101" : "dev";
 var LOCAL_BIN = localBin();
 var NPM_PREFIX = npmPrefix();
 var INSTANCE = DEFAULT_INSTANCE;
@@ -301964,16 +302199,17 @@ async function startOneInstance(o) {
   const serverChanged = !!prev?.serverUrl && normalizeServerUrl(prev.serverUrl) !== normalizeServerUrl(serverUrl);
   let nodeId = serverChanged ? void 0 : prev?.nodeId;
   let token2 = serverChanged ? flags.get("token") ?? process.env["OASIS_NODE_TOKEN"] : flags.get("token") ?? process.env["OASIS_NODE_TOKEN"] ?? prev?.token;
-  const enrollToken = o.mode === "new" ? flags.get("enroll-token") ?? process.env["OASIS_ENROLL_TOKEN"] : void 0;
-  const derivedNodeId = derivedNodeIdFor(INSTANCE);
+  const enrollToken = o.enrollToken;
   if (enrollToken) {
-    const res = await fetch(`${httpBase(serverUrl)}/api/nodes/exchange`, {
-      method: "POST",
-      headers: { "content-type": "application/json" },
-      body: JSON.stringify({ enrollToken, nodeId: derivedNodeId, hostname: os15.hostname(), serverUrl, ...companyId ? { companyId } : {} })
+    const exchangeNodeId = o.mode === "resume" && prev?.nodeId && !serverChanged ? prev.nodeId : derivedNodeIdFor(INSTANCE);
+    const body2 = await exchangeEnrollToken({
+      httpBase: httpBase(serverUrl),
+      enrollToken,
+      nodeId: exchangeNodeId,
+      hostname: os15.hostname(),
+      serverUrl,
+      ...companyId ? { companyId } : {}
     });
-    if (!res.ok) throw new Error(`enroll token exchange failed: HTTP ${res.status}`);
-    const body2 = await res.json();
     token2 = body2.token;
     nodeId = body2.nodeId;
   } else if (prev?.nodeId && prev?.token && !serverChanged) {
@@ -302015,7 +302251,7 @@ async function startOneInstance(o) {
   }
   const pidNow = readPid();
   const alive2 = !!pidNow && isRunning2(pidNow);
-  if (alive2 && label2 === before && !serverChanged && !companyChanged && !nameChanged) {
+  if (alive2 && !enrollToken && label2 === before && !serverChanged && !companyChanged && !nameChanged) {
     console.log(`\u2713 ${INSTANCE}\uFF1A\u5DF2\u5728\u8DD1\uFF08PID ${pidNow}\uFF0C${label2 ?? "?"}\uFF09\uFF0C\u7248\u672C\u4E0E\u914D\u7F6E\u5747\u672A\u53D8\uFF0C\u672A\u91CD\u542F`);
     return;
   }
@@ -302259,9 +302495,22 @@ void (async () => {
     } else if (plan.mode === "new" && !explicit && listInstances().length > 0) {
       console.log(`\u2192 \u672C\u673A\u5DF2\u6709\u5B9E\u4F8B\uFF08${listInstances().join(", ")}\uFF09\uFF0C\u4F46\u90FD\u4E0D\u8FDE\u8BE5\u670D\u52A1\u7AEF\uFF1B\u65B0\u5EFA\u5B9E\u4F8B ${plan.names[0]}`);
     }
+    const suppliedEnrollToken = flags.get("enroll-token") ?? process.env["OASIS_ENROLL_TOKEN"];
+    const enrollToken = enrollTokenToUse(plan, suppliedEnrollToken);
+    if (suppliedEnrollToken?.trim() && !enrollToken) {
+      console.log("  \u63A5\u5165\u4EE4\u724C\u53EA\u80FD\u63A5\u4E00\u53F0\uFF1A\u672C\u6B21\u540C\u65F6\u6062\u590D\u591A\u4E2A\u5B9E\u4F8B\uFF0C\u4E0D\u4F7F\u7528\u5B83\uFF1B\u8981\u91CD\u65B0\u63A5\u5165\u67D0\u4E00\u4E2A\u5B9E\u4F8B\uFF0C\u8BF7\u52A0 --instance <\u5B9E\u4F8B\u540D> \u518D\u8FD0\u884C\u3002");
+    }
     for (const name of plan.names) {
       useInstance(name);
-      await startOneInstance({ mode: plan.mode, serverUrl, upgrade, flags, applyName: plan.names.length === 1, companyId });
+      await startOneInstance({
+        mode: plan.mode,
+        serverUrl,
+        upgrade,
+        flags,
+        applyName: plan.names.length === 1,
+        companyId,
+        ...enrollToken ? { enrollToken } : {}
+      });
     }
     if (!process.env["PATH"]?.includes(path45.dirname(LOCAL_BIN)))
       console.log(`  add to PATH: echo 'export PATH="$HOME/.local/bin:$PATH"' >> ~/.bashrc && source ~/.bashrc`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis_test_v2",
-  "version": "2.2.100",
+  "version": "2.2.101",
   "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": "46aa7e398a1d19701c598dbdef60d4c80fe82718"
+    "sourceHead": "67501849999ce34dfcf0775dfcb95c9ca22118fb"
   }
 }