oasis_test_v2 2.2.98 → 2.2.99

package/dist/index.js

@@ -13674,12 +13674,13 @@ async function recordChatTurnInterruption(deps) {
     let version2 = await items.sessionVersionCursor(sessionId).catch(() => 0);
     const touched = [];
     const at2 = now();
-    for (const row of rows) {
+    for (const row of deps.cause === "user-stop" ? [] : rows) {
       if (row.status !== "streaming") continue;
       const updated = await items.applyOp(row.id, { op: "set_status", status: "interrupted" }, { at: at2, version: ++version2, sessionId });
       if (updated) touched.push(updated);
     }
-    const payload2 = deps.cause === "sweep-orphan" ? {
+    if (existing && isUserStopPayload(existing.payload)) return touched;
+    const payload2 = deps.cause === "user-stop" ? { code: "error", note: CHAT_INTERRUPT_NOTICE["user-stop"], reason: "cancelled", closedBy: deps.reason, cancelledBy: "user" } : deps.cause === "sweep-orphan" ? {
       code: "error",
       note: deps.cancelledBy ? chatCancelNote(deps.cancelledBy) : CHAT_INTERRUPT_NOTICE[deps.cause],
       reason: "cancelled",
@@ -13713,6 +13714,9 @@ async function recordChatTurnInterruption(deps) {
     return [];
   }
 }
+function isUserStopPayload(payload2) {
+  return !!payload2 && typeof payload2 === "object" && !Array.isArray(payload2) && payload2.cancelledBy === "user";
+}
 var chatInterruptItemId, CHAT_INTERRUPT_NOTICE;
 var init_chat_interrupt_notice = __esm({
   "../server/src/chat-interrupt-notice.ts"() {
@@ -13724,7 +13728,10 @@ var init_chat_interrupt_notice = __esm({
     CHAT_INTERRUPT_NOTICE = {
       "sweep-orphan": CHAT_CANCELLED_NOTE,
       "sweep-absolute-cap": "\u8FD9\u4E00\u8F6E\u8FD0\u884C\u65F6\u95F4\u8D85\u8FC7\u4E86\u4E0A\u9650\uFF0C\u5DF2\u88AB\u7CFB\u7EDF\u7EC8\u6B62\u3002\u4E0A\u9762\u662F\u7EC8\u6B62\u524D\u5DF2\u7ECF\u751F\u6210\u7684\u5185\u5BB9\uFF0C\u53EF\u4EE5\u628A\u4EFB\u52A1\u62C6\u5C0F\u4E00\u4E9B\u518D\u53D1\u4E00\u6B21\u3002",
-      "run-failed": "\u8FD9\u4E00\u8F6E\u6CA1\u6709\u6B63\u5E38\u7ED3\u675F\uFF08\u8FD0\u884C\u88AB\u4E2D\u65AD\uFF09\uFF0C\u6CA1\u80FD\u8DD1\u5B8C\u3002\u4E0A\u9762\u662F\u4E2D\u65AD\u524D\u5DF2\u7ECF\u751F\u6210\u7684\u5185\u5BB9\uFF0C\u4F60\u53EF\u4EE5\u518D\u53D1\u4E00\u6B21\u3002"
+      "run-failed": "\u8FD9\u4E00\u8F6E\u6CA1\u6709\u6B63\u5E38\u7ED3\u675F\uFF08\u8FD0\u884C\u88AB\u4E2D\u65AD\uFF09\uFF0C\u6CA1\u80FD\u8DD1\u5B8C\u3002\u4E0A\u9762\u662F\u4E2D\u65AD\u524D\u5DF2\u7ECF\u751F\u6210\u7684\u5185\u5BB9\uFF0C\u4F60\u53EF\u4EE5\u518D\u53D1\u4E00\u6B21\u3002",
+      // Bug 0228：serve 重启窗口里点停止，注册表里没有这一轮、只能在台账上收（`chat-turn-stop.ts`）。
+      // 与在飞路径用户停止同一句、同一格归因；不借 `sweep-orphan` 那一支，免得日志里「用户停的」长成孤儿清扫。
+      "user-stop": CHAT_CANCEL_NOTE.user
     };
   }
 });
@@ -131263,7 +131270,7 @@ async function renewInjectedCredentials(injected, fetchCredentials) {
         log("[node-connectors]", `\u7EED\u671F\uFF1A${slug6} \u6362\u5230\u65B0\u4EE4\u724C`);
       } else {
         outcome.unchanged.push(slug6);
-        log("[node-connectors]", `\u7EED\u671F\uFF1A${slug6} server \u8FD4\u56DE\u7684\u4ECD\u662F\u65E7\u4EE4\u724C\uFF08\u672A\u5230\u6362\u65B0\u95E8\u69DB\uFF09`);
+        log("[node-connectors]", `\u7EED\u671F\uFF1A${slug6} server \u8FD4\u56DE\u7684\u4ECD\u662F\u65E7\u4EE4\u724C\uFF08\u539F\u56E0\u89C1 server \u65E5\u5FD7 [credential-refresh]\uFF09`);
       }
     } catch (err) {
       outcome.failed.push({ slug: slug6, error: String(err) });
@@ -176539,6 +176546,58 @@ var init_chat_workorder_files = __esm({
   }
 });
 
+// ../server/src/chat-turn-stop.ts
+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);
+  for (let attempt = 0; attempt < MAX_CAS_ATTEMPTS; attempt += 1) {
+    if (!turn || turn.status !== "reserved" && turn.status !== "running") return { stopped: false, reason: "no-live-turn" };
+    if (deps.expectedRunId && turn.assistantRunId && 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` }
+    );
+    if (ok3) {
+      log3(`[chat-stop] \u4F1A\u8BDD ${deps.sessionId} \u8F6E ${turn.id} \u6309\u53F0\u8D26\u505C\u6B62\uFF08${turn.status} \u2192 cancelled\uFF09`);
+      await recordUserStopNotice(deps, turn, completedAt);
+      return { stopped: true, ledger: true };
+    }
+    turn = await deps.turns.getTurn(turn.id);
+  }
+  return { stopped: false, reason: "turn-changed" };
+}
+async function recordUserStopNotice(deps, turn, completedAt) {
+  if (!deps.items) return;
+  const messageId = turn.assistantRunId && deps.findAssistantMessageId ? await deps.findAssistantMessageId(turn.assistantRunId).catch(() => void 0) : void 0;
+  const turnId = messageId ? await resolveChatItemsTurnId(deps.items, messageId, turn.id) : turn.id;
+  await recordChatTurnInterruption({
+    items: deps.items,
+    sessionId: deps.sessionId,
+    turnId,
+    runId: turn.assistantRunId,
+    messageId,
+    cause: "user-stop",
+    reason: "user-stop",
+    now: () => completedAt,
+    ...deps.log ? { log: deps.log } : {}
+  });
+}
+var MAX_CAS_ATTEMPTS;
+var init_chat_turn_stop = __esm({
+  "../server/src/chat-turn-stop.ts"() {
+    "use strict";
+    init_chat_interrupt_notice();
+    init_chat_item_ledger();
+    MAX_CAS_ATTEMPTS = 3;
+  }
+});
+
 // ../server/src/chat-broadcast.ts
 function isFreshTerminal(terminalAt, nowMs, maxAgeMs) {
   if (!terminalAt) return true;
@@ -211147,6 +211206,10 @@ function writeApiError(res, err) {
     error: { code: err.code, message: err.message, ...err.details ?? {} }
   }));
 }
+async function findAssistantMessageIdByRun(store, sessionId, runId) {
+  const rows = await (await store())?.listMessages(sessionId, 20).catch(() => []) ?? [];
+  return rows.find((m2) => m2.role === "assistant" && m2.runId === runId)?.id;
+}
 function toApiError(err) {
   if (err instanceof ApiError) return err;
   const message = err instanceof Error ? err.message : String(err);
@@ -212730,6 +212793,7 @@ async function startOasisServer(opts) {
   }) : void 0;
   knowledgeDomain?.register(domainRouter);
   const liveChat = opts.liveChat ?? new LiveChatRegistry();
+  const serveBootedAtMs = Date.now();
   const resolveChatSessionsForDelegation = opts.chatSessionFor ?? (opts.chatSession ? async () => opts.chatSession : void 0);
   let delegationService = null;
   if (opts.delegationStoreFor && resolveChatSessionsForDelegation && opts.actors && opts.dispatchChat) {
@@ -215166,12 +215230,15 @@ async function startOasisServer(opts) {
               liveChat.reopenForRecovery(sid, {
                 runtimeSessionId: cs.runtimeSessionId ?? active.dispatchId ?? "",
                 ...active.assistantRunId ? { runId: active.assistantRunId } : {},
+                // 占位轮被 `/stop` 停掉：与注册表落空时同一个收法（条件迁移 + 用户停止结局项，Bug 0228）。
                 onStop: () => {
-                  void turns.settleTurn(active.id, {
-                    status: "cancelled",
-                    completedAt: (/* @__PURE__ */ new Date()).toISOString(),
-                    lastError: `\u7528\u6237\u5728 serve \u91CD\u542F\u6062\u590D\u7A97\u53E3\u5185\u505C\u6B62\uFF08\u8F6E ${active.id}\uFF09`
-                  }).catch(() => void 0);
+                  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);
                 }
               });
             };
@@ -215335,7 +215402,32 @@ async function startOasisServer(opts) {
               if (typeof b2.expectedRunId === "string" && b2.expectedRunId) expectedRunId = b2.expectedRunId;
             } catch {
             }
-            const outcome = liveChat.stop(sid, expectedRunId);
+            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);
+                }
+                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" };
+                  });
+                }
+              }
+            }
             res.writeHead(200, { "content-type": "application/json" }).end(JSON.stringify(outcome));
             return;
           }
@@ -217432,7 +217524,7 @@ async function markDeliveredWithRetry(store, messageId, attempts = 3) {
   }
   return false;
 }
-var http, import_node_crypto44, CONNECTOR_AUTH_SNAPSHOT_TTL_MS, COMPANY_FROM_PENDING_CALLBACKS, defaultResolveActor, enc, APPEND_TURN_START_WAIT_MS, STREAMING_PATHS, PLANNER_BLOCKING_CODES, WILL_VERBS, GOVERNANCE_COMMANDS, READ_ONLY_COMMANDS, isAgent, isHuman;
+var http, import_node_crypto44, CONNECTOR_AUTH_SNAPSHOT_TTL_MS, COMPANY_FROM_PENDING_CALLBACKS, defaultResolveActor, enc, APPEND_TURN_START_WAIT_MS, STOP_TURN_START_WAIT_MS, STREAMING_PATHS, PLANNER_BLOCKING_CODES, WILL_VERBS, GOVERNANCE_COMMANDS, READ_ONLY_COMMANDS, isAgent, isHuman;
 var init_server3 = __esm({
   "../server/src/server.ts"() {
     "use strict";
@@ -217498,6 +217590,7 @@ var init_server3 = __esm({
     init_chat_workorder_files();
     init_chat_item_ledger();
     init_chat_cancel_attribution();
+    init_chat_turn_stop();
     init_chat_assistant_turn();
     init_src2();
     init_chat_broadcast();
@@ -217519,6 +217612,7 @@ var init_server3 = __esm({
     defaultResolveActor = (token2) => token2.startsWith("token:") ? token2.slice("token:".length) : null;
     enc = (s2) => new TextEncoder().encode(s2);
     APPEND_TURN_START_WAIT_MS = 1e4;
+    STOP_TURN_START_WAIT_MS = 5e3;
     STREAMING_PATHS = ["/api/events", "/api/chat", "/api/trajectory/events", "/api/intervention/wait"];
     PLANNER_BLOCKING_CODES = /* @__PURE__ */ new Set([
       "title_collision",
@@ -238094,10 +238188,10 @@ function stepRef(nodeId, title) {
   return token("s", nodeId ?? "", title);
 }
 function actorRef2(actorId, name) {
-  return actorId ? token("a", actorId, name) : clean(name);
+  return actorId ? token("a", actorId, name) : withAt(clean(name));
 }
 function mentionRef(actorId, name) {
-  return actorId ? token("m", actorId, name) : `@${clean(name)}`;
+  return actorId ? token("m", actorId, name) : withAt(clean(name));
 }
 function tokenize(s2) {
   const out = [];
@@ -238141,9 +238235,9 @@ function sentenceSegments(s2) {
   return out;
 }
 function plainSentence(s2) {
-  return tokenize(s2).map((t) => typeof t === "string" ? t : t.kind === "s" ? `\u300C${t.name}\u300D` : t.kind === "m" ? `@${t.name}` : t.name).join("");
+  return tokenize(s2).map((t) => typeof t === "string" ? t : t.kind === "s" ? `\u300C${t.name}\u300D` : withAt(t.name)).join("");
 }
-var OPEN2, SEP, CLOSE2, MARKS, clean, token;
+var OPEN2, SEP, CLOSE2, MARKS, clean, withAt, token, plainActor;
 var init_activity_text = __esm({
   "../server/src/domains/collab/activity-text.ts"() {
     "use strict";
@@ -238152,7 +238246,9 @@ var init_activity_text = __esm({
     CLOSE2 = "\uE002";
     MARKS = /[-]/g;
     clean = (s2) => s2.replace(MARKS, "");
+    withAt = (name) => name.startsWith("@") ? name : `@${name}`;
     token = (kind, id, name) => `${OPEN2}${kind}${SEP}${clean(id)}${SEP}${clean(name)}${CLOSE2}`;
+    plainActor = (name) => withAt(clean(name));
   }
 });
 
@@ -238625,7 +238721,7 @@ function buildWorkorderActivity(input) {
   const managerId = resolveWorkorderManager(snap);
   const ownerId = snap.workorder.ownerActorId;
   const nameOf2 = (id) => id ? ref2(id).name ?? id : "\u2014";
-  const personOf = (id) => actorRef2(id ?? void 0, nameOf2(id));
+  const personOf = (id) => id ? actorRef2(id, nameOf2(id)) : nameOf2(id);
   const mentionOf = (id) => mentionRef(id ?? void 0, nameOf2(id));
   const managerName = () => personOf(managerId);
   const nodeTitleOf = (nodeId) => {
@@ -240891,7 +240987,10 @@ function buildInbox(model, me, leadOf, resolveActor, markers = [], slaMs, nowIso
       ...extra?.avatar ? { avatar: extra.avatar } : {}
     };
   };
-  const actorName = (id) => resolveActor?.(id)?.name ?? "";
+  const atName = (id) => {
+    const name = resolveActor?.(id)?.name;
+    return name ? plainActor(name) : "";
+  };
   const nowMs = nowIso ? Date.parse(nowIso) : Number.NaN;
   const overdueSince = (sinceIso) => {
     if (slaMs === void 0 || !Number.isFinite(nowMs) || !sinceIso) return void 0;
@@ -241028,7 +241127,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: `${actorName(r.proposedBy) || "\u7BA1\u7406\u8005"}\uFF1A${r.command ? commandCardLine(r.command) : firstSentence3(r.plan.reason)}`,
+      detail: `${atName(r.proposedBy) || "\u7BA1\u7406\u8005"}\uFF1A${r.command ? commandCardLine(r.command) : firstSentence3(r.plan.reason)}`,
       ...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)
@@ -241069,7 +241168,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 ? actorName(lastPost.author) : "") || "\u6709\u4EBA"} @ \u4E86\u4F60\uFF1A${firstSentence3(lastPost?.body ?? an.body)}`,
+        detail: `${(lastPost ? atName(lastPost.author) : "") || "\u6709\u4EBA"} @ \u4E86\u4F60\uFF1A${firstSentence3(lastPost?.body ?? an.body)}`,
         ...lastPost ? { actor: actorRef3(lastPost.author) } : {},
         ...overdueField(an.createdAt)
       });
@@ -241094,7 +241193,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: `${actorName(activity.by) || "\u5BF9\u65B9"} \u56DE\u5E94\u4E86\u4F60\u7684\u4FE1\uFF1A${firstSentence3(lastNote)}`,
+        detail: `${atName(activity.by) || "\u5BF9\u65B9"} \u56DE\u5E94\u4E86\u4F60\u7684\u4FE1\uFF1A${firstSentence3(lastNote)}`,
         actor: actorRef3(activity.by)
         // 通知型不判 overdue（诊断明说），不设 overdue 字段。
       });
@@ -241114,7 +241213,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: `${actorName(pendingHead.author) || "agent"} \u4EA4\u4E86\u65B0\u7248\u7B54\u590D\u4F60\u7684\u4FE1\uFF1A${firstSentence3(pendingHead.reason)}`,
+          detail: `${atName(pendingHead.author) || "agent"} \u4EA4\u4E86\u65B0\u7248\u7B54\u590D\u4F60\u7684\u4FE1\uFF1A${firstSentence3(pendingHead.reason)}`,
           actor: actorRef3(pendingHead.author),
           ...overdueField(pendingHead.createdAt)
         });
@@ -241141,7 +241240,7 @@ function buildInbox(model, me, leadOf, resolveActor, markers = [], slaMs, nowIso
           actionRequired: true,
           summary: `\u5F85\u4F60\u5BA1\u6279\uFF1A${label2}`,
           title: label2,
-          ...gp ? { detail: `${actorName(gp.headAuthor) || "\u4F5C\u8005"} \u4EA4\u4E86\u65B0\u7248\uFF1A${firstSentence3(headReason)}`, actor: actorRef3(gp.headAuthor) } : {},
+          ...gp ? { detail: `${atName(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)
         });
@@ -241164,7 +241263,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: `${actorName(rejectVote.author) || "\u8BC4\u5BA1"} \u6253\u56DE\uFF1A${firstSentence3(rejectVote.note ?? "\u89C1\u8BC4\u5BA1\u610F\u89C1")}`, actor: actorRef3(rejectVote.author) } : {},
+        ...rejectVote ? { detail: `${atName(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)
       });
@@ -241284,6 +241383,7 @@ var init_inbox = __esm({
     init_src8();
     init_src();
     init_node_state();
+    init_activity_text();
     C_ACTION_LABEL = {
       unlink: "\u65AD\u5F00\u4F9D\u8D56\u8FB9",
       pin: "\u6539\u9489\u7248\u672C",
@@ -247596,11 +247696,12 @@ function nodesDomain(deps) {
       ...typeof r.presentOnMachine === "boolean" ? { presentOnMachine: r.presentOnMachine } : {}
     };
   }
-  function revokeNodeAccess(nodeId) {
+  function revokeNodeAccess(nodeId, opts = {}) {
+    const tellMachine = opts.tellMachine ?? true;
     const daemon = deps.getHub()?.connectedDaemons().find((d) => d.daemonId === nodeId);
-    daemon?.send({ type: "node_deleted", nodeId });
+    if (tellMachine) daemon?.send({ type: "node_deleted", nodeId });
     for (const { token: token2, nodeId: nid } of deps.nodeTokens.list()) {
-      if (nid === nodeId) deps.nodeTokens.revoke(token2, "node-deleted");
+      if (nid === nodeId) deps.nodeTokens.revoke(token2, tellMachine ? "node-deleted" : "unspecified");
     }
     daemon?.close();
   }
@@ -247608,9 +247709,9 @@ function nodesDomain(deps) {
   const restartEmptyClock = (nodeId) => {
     emptySince.set(nodeId, Date.now());
   };
-  async function removeNode(nodeId, releaseAs) {
+  async function removeNode(nodeId, releaseAs, opts = {}) {
     const kinds = [...new Set((await deps.nodeStore.listRuntimes(nodeId)).map((r) => r.kind))];
-    revokeNodeAccess(nodeId);
+    revokeNodeAccess(nodeId, opts);
     await deps.nodeStore.deleteNode(nodeId);
     emptySince.delete(nodeId);
     const released = [];
@@ -247647,13 +247748,25 @@ function nodesDomain(deps) {
     if (removed.length > 0) deps.onStatusChange?.();
     return removed;
   }
+  async function purgeUnownedNodes() {
+    const removed = [];
+    for (const n of await deps.nodeStore.listUnownedNodes()) {
+      const current = await deps.nodeStore.getNode(n.id);
+      if (!current || current.companyId) continue;
+      await removeNode(n.id, void 0, { tellMachine: false });
+      removed.push(n.id);
+      console.log(`[nodes] \u4F5C\u5E9F\u6CA1\u6709\u5F52\u5C5E\u516C\u53F8\u7684\u8282\u70B9\uFF1A${n.id}\uFF08\u4E3B\u673A\u540D ${n.hostname}${n.name ? `\uFF0C\u540D\u79F0 ${n.name}` : ""}\uFF0C\u72B6\u6001 ${n.status}\uFF09\u2014\u2014\u5DF2\u64A4\u51ED\u8BC1\u3001\u65AD\u5F00\u8FDE\u63A5\u3001\u5220\u9664\u8BB0\u5F55\uFF0C\u673A\u5668\u672C\u5730\u4E0D\u52A8\uFF1B\u91CD\u65B0\u8FD0\u884C\u63A5\u5165\u547D\u4EE4\u5373\u6309\u65B0\u673A\u5668\u63A5\u5165`);
+    }
+    if (removed.length > 0) deps.onStatusChange?.();
+    return removed;
+  }
   if (deps.emptyNodeSweep) {
     const { graceMs, intervalMs } = deps.emptyNodeSweep;
     let sweeping = false;
     const timer = setInterval(() => {
       if (sweeping) return;
       sweeping = true;
-      void sweepEmptyNodes(graceMs).catch((err) => console.warn(`[nodes] \u7A7A\u8282\u70B9\u6E05\u626B\u5931\u8D25\uFF08\u4E0B\u4E00\u62CD\u518D\u8BD5\uFF09\uFF1A${err instanceof Error ? err.message : String(err)}`)).finally(() => {
+      void purgeUnownedNodes().then(() => sweepEmptyNodes(graceMs)).catch((err) => console.warn(`[nodes] \u7A7A\u8282\u70B9\u6E05\u626B\u5931\u8D25\uFF08\u4E0B\u4E00\u62CD\u518D\u8BD5\uFF09\uFF1A${err instanceof Error ? err.message : String(err)}`)).finally(() => {
         sweeping = false;
       });
     }, intervalMs);
@@ -248160,6 +248273,12 @@ function nodesDomain(deps) {
         deps.enrollTokens.setIssuedNodeId(enrollToken, nodeId);
       }
       const existingNode = await deps.nodeStore.getNode(nodeId);
+      if (existingNode && !existingNode.companyId && entry.companyId) {
+        return {
+          status: 409,
+          body: { error: "NODE_UNOWNED", message: "\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\u7CFB\u7EDF\u4F1A\u5728\u7EA6\u4E00\u5206\u949F\u5185\u6E05\u6389\u8FD9\u6761\u65E7\u8BB0\u5F55\uFF0C\u4E4B\u540E\u91CD\u65B0\u8FD0\u884C\u63A5\u5165\u547D\u4EE4\u5373\u53EF\u6309\u65B0\u673A\u5668\u63A5\u5165" }
+        };
+      }
       if (existingNode?.companyId && entry.companyId && existingNode.companyId !== entry.companyId) {
         return { status: 409, body: { error: "\u8BE5\u8282\u70B9\u65E0\u6CD5\u7528\u5F53\u524D\u5165\u7F51\u4EE4\u724C\u63A5\u7BA1" } };
       }
@@ -249169,6 +249288,9 @@ var init_node_store = __esm({
         const live = [...this.nodes.values()].filter((n) => n.status !== "deleted");
         return filter?.companyId === void 0 ? live : live.filter((n) => n.companyId === filter.companyId);
       }
+      async listUnownedNodes() {
+        return [...this.nodes.values()].filter((n) => !n.companyId);
+      }
       async listRuntimes(nodeId, filter) {
         let all2 = [...this.runtimes.values()];
         if (nodeId) all2 = all2.filter((r) => r.nodeId === nodeId);
@@ -253341,11 +253463,12 @@ function missingNodeFacts(body2) {
 }
 function renderEscalationOpeningBody(facts) {
   const body2 = facts.body.trim();
+  const who = facts.actorName ? plainActor(facts.actorName) : void 0;
   if (facts.kind === "reviewer_unavailable") {
     const { reviewerId, role } = reviewerUnavailableFacts(body2);
     if (!reviewerId) return body2;
     return [
-      `\u300C${facts.nodeLabel ?? "\u8FD9\u4E00\u6B65"}\u300D\u9501\u5B9A\u7684\u5BA1\u6838\u4EBA${facts.actorName ? ` ${facts.actorName}` : ""}\uFF08${role} \u89D2\u8272\uFF09\u73B0\u5728\u4E0D\u53EF\u7528\u2014\u2014\u7194\u65AD\u3001\u79BB\u5C97\uFF0C\u6216\u8005\u5DF2\u88AB\u79FB\u51FA\u8FD9\u4E2A\u89D2\u8272\u2014\u2014\u8FD9\u4E00\u6B65\u7684\u8BC4\u5BA1\u6D3E\u4E0D\u51FA\u53BB\u3002`,
+      `\u300C${facts.nodeLabel ?? "\u8FD9\u4E00\u6B65"}\u300D\u9501\u5B9A\u7684\u5BA1\u6838\u4EBA${who ? ` ${who}` : ""}\uFF08${role} \u89D2\u8272\uFF09\u73B0\u5728\u4E0D\u53EF\u7528\u2014\u2014\u7194\u65AD\u3001\u79BB\u5C97\uFF0C\u6216\u8005\u5DF2\u88AB\u79FB\u51FA\u8FD9\u4E2A\u89D2\u8272\u2014\u2014\u8FD9\u4E00\u6B65\u7684\u8BC4\u5BA1\u6D3E\u4E0D\u51FA\u53BB\u3002`,
       "\u9700\u8981\u4F60\u5B9A\u4E00\u4E0B\uFF1A\u6362\u4E00\u4E2A\u5BA1\u6838\u4EBA\uFF0C\u8FD8\u662F\u7B49\u539F\u5BA1\u6838\u4EBA\u6062\u590D\u3002"
     ].join("\n\n");
   }
@@ -253353,7 +253476,7 @@ function renderEscalationOpeningBody(facts) {
     const { gone, runtimeNode } = missingNodeFacts(body2);
     if (!runtimeNode) return body2;
     return [
-      `\u300C${facts.nodeLabel ?? "\u8FD9\u4E00\u6B65"}\u300D\u8FD8\u6CA1\u6709\u542F\u52A8\uFF1A${facts.actorName ?? "\u6267\u884C\u4EBA"}\u7ED1\u5B9A\u7684\u8FD0\u884C\u8282\u70B9 ${runtimeNode} ${gone === "\u672A\u6CE8\u518C" ? "\u6CA1\u6709\u6CE8\u518C\u8FC7" : "\u5DF2\u7ECF\u88AB\u5220\u9664"}\uFF0C\u6D3E\u4E0D\u51FA\u53BB\u3002\u8FD9\u6B21\u68C0\u67E5\u6CA1\u6709\u7EC8\u6B62\u4EFB\u4F55\u4F1A\u8BDD\uFF0C\u4E5F\u6CA1\u6709\u6D88\u8017\u91CD\u8BD5\u6B21\u6570\u3002`,
+      `\u300C${facts.nodeLabel ?? "\u8FD9\u4E00\u6B65"}\u300D\u8FD8\u6CA1\u6709\u542F\u52A8\uFF1A${who ?? "\u6267\u884C\u4EBA"}\u7ED1\u5B9A\u7684\u8FD0\u884C\u8282\u70B9 ${runtimeNode} ${gone === "\u672A\u6CE8\u518C" ? "\u6CA1\u6709\u6CE8\u518C\u8FC7" : "\u5DF2\u7ECF\u88AB\u5220\u9664"}\uFF0C\u6D3E\u4E0D\u51FA\u53BB\u3002\u8FD9\u6B21\u68C0\u67E5\u6CA1\u6709\u7EC8\u6B62\u4EFB\u4F55\u4F1A\u8BDD\uFF0C\u4E5F\u6CA1\u6709\u6D88\u8017\u91CD\u8BD5\u6B21\u6570\u3002`,
       "\u9700\u8981\u4F60\u6062\u590D\u90A3\u53F0\u8282\u70B9\uFF0C\u6216\u8005\u7ED9\u6267\u884C\u4EBA\u6539\u7ED1\u4E00\u53F0\u5728\u7EBF\u7684\u8282\u70B9\uFF1B\u4FEE\u597D\u4E4B\u540E\u544A\u8BC9\u6211\uFF0C\u6211\u6765\u628A\u8FD9\u4E00\u6B65\u653E\u51FA\u53BB\u3002"
     ].join("\n\n");
   }
@@ -253362,7 +253485,7 @@ function renderEscalationOpeningBody(facts) {
     const { count: count3, lastReason } = retryFacts(body2);
     if (!count3) return body2;
     return [
-      `${facts.actorName ?? "\u8FD9\u4E00\u6B65\u7684\u6267\u884C\u4EBA"}${at(facts.nodeLabel)}\u8FDE\u7EED ${count3.n} \u8F6E\u90FD\u6CA1\u8DD1\u6210\uFF0C\u81EA\u52A8\u91CD\u8BD5\u5DF2\u7ECF\u7528\u5B8C\u2014\u2014\u8FD9\u4E00\u6B65\u4E0D\u4F1A\u518D\u81EA\u52A8\u91CD\u6765\u4E86\u3002`,
+      `${who ?? "\u8FD9\u4E00\u6B65\u7684\u6267\u884C\u4EBA"}${at(facts.nodeLabel)}\u8FDE\u7EED ${count3.n} \u8F6E\u90FD\u6CA1\u8DD1\u6210\uFF0C\u81EA\u52A8\u91CD\u8BD5\u5DF2\u7ECF\u7528\u5B8C\u2014\u2014\u8FD9\u4E00\u6B65\u4E0D\u4F1A\u518D\u81EA\u52A8\u91CD\u6765\u4E86\u3002`,
       ...lastReason ? [`\u6700\u540E\u4E00\u6B21\u5931\u8D25\u8BB0\u4E0B\u7684\u539F\u56E0\uFF1A${lastReason}`] : [],
       "\u9700\u8981\u4F60\u5B9A\u4E00\u4E0B\u63A5\u4E0B\u6765\u600E\u4E48\u529E\uFF1A\u6309\u539F\u65B9\u6848\u518D\u8BD5\u4E00\u6B21\u3001\u6539\u4E86\u4EFB\u52A1\u8BF4\u660E\u518D\u8DD1\uFF0C\u8FD8\u662F\u6362\u4E2A\u4EBA\u505A\u3002"
     ].join("\n\n");
@@ -253377,7 +253500,7 @@ function renderEscalationOpeningBody(facts) {
   }
   const { count: count2, minutes, cost, remark, stalled } = stallFacts(body2);
   if (!count2) return body2;
-  const subject = stalled ? `${facts.actorName ?? (stalled === "review" ? "\u8FD9\u4E00\u6B65\u7684\u8BC4\u5BA1\u5458" : "\u8FD9\u4E00\u6B65\u7684\u6267\u884C\u4EBA")}${at(facts.nodeLabel)}` : `\u300C${facts.nodeLabel ?? "\u8FD9\u4E00\u6B65"}\u300D`;
+  const subject = stalled ? `${who ?? (stalled === "review" ? "\u8FD9\u4E00\u6B65\u7684\u8BC4\u5BA1\u5458" : "\u8FD9\u4E00\u6B65\u7684\u6267\u884C\u4EBA")}${at(facts.nodeLabel)}` : `\u300C${facts.nodeLabel ?? "\u8FD9\u4E00\u6B65"}\u300D`;
   const window3 = minutes !== void 0 ? `\u6700\u8FD1 ${minutes} \u5206\u949F\u91CC` : "\u6700\u8FD1\u4E00\u6BB5\u65F6\u95F4\u91CC";
   const spent = cost ? `\uFF08\u8FD9\u4E9B\u7A7A\u8DD1\u5408\u8BA1\u5DF2\u7ECF\u82B1\u6389\u7EA6 ${cost}\uFF09` : "";
   const each = count2.unit === "\u8F6E" ? "\u6BCF\u4E00\u8F6E" : "\u6BCF\u4E00\u6B21";
@@ -253393,6 +253516,7 @@ var num3, at;
 var init_escalation_opening_body = __esm({
   "../server/src/domains/collab/escalation-opening-body.ts"() {
     "use strict";
+    init_activity_text();
     num3 = (v2) => {
       if (v2 === void 0) return void 0;
       const n = Number(v2);
@@ -272051,6 +272175,10 @@ var init_postgres_nodes = __esm({
         const r = filter?.companyId !== void 0 ? await this.pool.query(`SELECT * FROM ${this.s}.nodes WHERE status <> 'deleted' AND company_id = $1 ORDER BY enrolled_at ASC`, [filter.companyId]) : await this.pool.query(`SELECT * FROM ${this.s}.nodes WHERE status <> 'deleted' ORDER BY enrolled_at ASC`);
         return r.rows.map(rowToNode);
       }
+      async listUnownedNodes() {
+        const r = await this.pool.query(`SELECT * FROM ${this.s}.nodes WHERE company_id IS NULL ORDER BY enrolled_at ASC`);
+        return r.rows.map(rowToNode);
+      }
       async listRuntimes(nodeId, filter) {
         const where = [];
         const params = [];
@@ -298232,7 +298360,7 @@ async function waitForCommandAuthorization(base, headers, draftId, fallback) {
     }
   }
 }
-var CLI_VERSION = "2.2.98" ? "2.2.98" : "dev";
+var CLI_VERSION = "2.2.99" ? "2.2.99" : "dev";
 function apiHeaders(token2, company) {
   const headers = {
     authorization: `Bearer ${token2}`,
@@ -302203,7 +302331,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.2.98" : "dev";
+var PKG_VERSION = true ? "2.2.99" : "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.98",
+  "version": "2.2.99",
   "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": "9232426433ddd120620c9d131d9f3fd247d726eb"
+    "sourceHead": "705a5a2b945e6e24cd1ddefef8d0e6e148574808"
   }
 }