oasis_test 0.1.60 → 0.1.61

package/dist/index.js

@@ -1912,9 +1912,12 @@ var init_kernel = __esm({
     };
     FrozenError = class extends KernelError {
       name = "FrozenError";
-      retryable = true;
-      constructor(artifactId, scope) {
-        super(`artifact is frozen (scope=${scope}, retry after unfreeze): ${artifactId}`);
+      retryable;
+      constructor(artifactId, scope, opts) {
+        super(
+          opts?.reviewPending ? `artifact under review\uFF08\u6536\u5C3E\u8BC4\u5BA1\u8FDB\u884C\u4E2D\uFF0C\u7B49 reviewer/CI \u6295\u7968\u2014\u2014\u522B\u91CD\u8BD5\uFF1B\u6709\u672A\u7B54\u590D\u7684\u56DE\u538B\u5148\u5904\u7F6E\uFF09: ${artifactId}` : `artifact is frozen (scope=${scope}, retry after unfreeze): ${artifactId}`
+        );
+        this.retryable = !opts?.reviewPending;
       }
     };
     Kernel = class _Kernel {
@@ -2305,15 +2308,15 @@ var init_kernel = __esm({
         if (artifact.currentRev === null) {
           throw new KernelError(`cannot conclude an empty artifact: ${args.artifactId}`);
         }
-        if (concludeMilestones(this.model, args.artifactId).some((m2) => m2.head === artifact.currentRev)) {
-          return;
-        }
         const pending = queueOf(this.model, args.artifactId);
         if (pending.length > 0) {
           throw new KernelError(
             `queue not quiescent (${pending.length} pending): \u4E0D\u80FD\u5BF9\u9A6C\u4E0A\u8981\u53D8\u7684 head \u5BA3\u5E03\u5B8C\u6210\u2014\u2014\u5148\u843D\u5B8C/\u62D2\u6389/\u96C6\u6210\uFF08\xA75.7\uFF09`
           );
         }
+        if (concludeMilestones(this.model, args.artifactId).some((m2) => m2.head === artifact.currentRev)) {
+          return { kind: "noop-concluded", head: artifact.currentRev };
+        }
         const openGaps = unresolvedGapsOf(this.model, args.artifactId);
         if (openGaps.length > 0) {
           throw new KernelError(
@@ -2395,7 +2398,11 @@ var init_kernel = __esm({
           ...gate ? { gate } : {}
         };
         await this.commit(args.artifactId, args.actor, "conclude", args.artifactId, payload);
-        if (!gate) await this.fireTriggers(args.artifactId);
+        if (!gate) {
+          await this.fireTriggers(args.artifactId);
+          return { kind: "milestone", head: artifact.currentRev };
+        }
+        return { kind: "gate-pending" };
       }
       /**
        * 收尾 gate 投票（§5.3/§5.7）。票落在被审的 head 快照上；
@@ -3354,7 +3361,7 @@ ${res.candidates.map((c) => `  - ${c.type}:${c.title ?? "(\u65E0title)"} \u2192
       bounceHeadMovers(artifactId, opts) {
         const scope = this.frozen.get(artifactId);
         if (scope) throw new FrozenError(artifactId, scope);
-        if (!opts?.allowPendingGate && pendingConcludeAttempt(this.model, artifactId)) throw new FrozenError(artifactId, "merge");
+        if (!opts?.allowPendingGate && pendingConcludeAttempt(this.model, artifactId)) throw new FrozenError(artifactId, "merge", { reviewPending: true });
       }
       /** propose（emit）类：只有 write 档（§11.7 干预）才拦——merge 档下照常入队。 */
       bounceWrites(artifactId) {
@@ -3860,14 +3867,18 @@ async function assembleContext(args) {
         })
       ];
     })() : canvasMode ? [
-      `\u4F60\u8D1F\u8D23 **design \u4EA7\u7269 \`${artifactId}\`**\uFF0C\u8FD0\u884C\u5728**\u901A\u7528\u8FD0\u884C\u65F6**\u4E0A\u2014\u2014\u7528 \`oasis design run\` \u9A71\u52A8**\u534F\u4F5C\u753B\u677F\u5F15\u64CE**\u4EA7\u51FA\u5E76\u4EA4\u4ED8\u754C\u9762\u7A3F\uFF1A`,
+      `\u4F60\u8D1F\u8D23 **design \u4EA7\u7269 \`${artifactId}\`**\uFF0C\u8FD0\u884C\u5728**\u901A\u7528\u8FD0\u884C\u65F6**\u4E0A\u2014\u2014\u4F60\u662F**\u7532\u65B9\u8BBE\u8BA1\u8D1F\u8D23\u4EBA**\uFF0C\u591A\u8F6E\u5BF9\u8BDD\u9A71\u52A8**\u534F\u4F5C\u753B\u677F\u5F15\u64CE**\u6253\u78E8\u754C\u9762\u7A3F\uFF0C\u6EE1\u610F\u4E86\u624D\u4EA4\u4ED8\uFF1A`,
       ``,
-      `    oasis design run ${artifactId} --reason "<\u4E00\u53E5\u8BDD\u8BF4\u8FD9\u7248\u505A\u4E86\u4EC0\u4E48>"`,
+      `    oasis design chat ${artifactId} --message "<\u8FD9\u4E00\u8F6E\u8981\u5F15\u64CE\u505A\u4EC0\u4E48\uFF1A\u8BBE\u8BA1\u9700\u6C42 + \u771F\u5B9E\u6570\u636E>"`,
+      `    oasis design chat ${artifactId} --turn continue --message "<\u8BFB\u5B8C\u4E0A\u4E00\u7248\u4EA7\u7269\u540E\uFF0C\u8981\u6539\u54EA\u91CC>"`,
       ``,
-      `- \u5B83\u4F1A\uFF1A\u8D77/\u590D\u7528\u672C\u4EA7\u7269\u7684**\u753B\u677F** \u2192 \u8BBE\u8BA1\u5F15\u64CE\u5728\u771F\u5B9E\u753B\u5E03\u4E0A\u4EA7**\u81EA\u5305\u542B HTML** \u5165\u53E3\u7A3F + \`acceptance.md\` \u2192 \u5BFC\u51FA\u5FEB\u7167 \u2192 **\u81EA\u52A8 propose \u4EA4\u7A3F**\u3002\u8BBE\u8BA1\u9700\u6C42\u5B83\u4ECE \`DESIGN_BRIEF.md\` + \`inputs/\` \u81EA\u52A8\u8BFB\u53D6\uFF1B`,
-      `- \u4F60**\u4E0D\u7528\u624B\u5199 HTML\u3001\u4E5F\u4E0D\u7528\u624B\u52A8 propose**\u2014\u2014\u8FD9\u6761\u547D\u4EE4\u4E00\u6B65\u5230\u4F4D\uFF1B\u8DD1\u5B8C\u770B\u5B83\u8F93\u51FA\u7684 board \u94FE\u63A5\u4E0E index.html \u786E\u8BA4\u4EA7\u51FA\uFF1B`,
-      `- \u547D\u4EE4\u5931\u8D25\uFF08\u5F15\u64CE\u62A5\u9519/\u65E0\u4EA7\u51FA\uFF09\u2192 \u770B\u8F93\u51FA\u5B9A\u4F4D\uFF1B\u7F3A**\u8FD8\u4E0D\u5B58\u5728\u7684\u4E0A\u6E38\u524D\u7F6E**\u505A\u4E0D\u4E0B\u53BB \u2192 \`oasis gap ${artifactId} --desc "<\u7F3A\u4EC0\u4E48>"\` \u62A5\u7F3A\u53E3\u540E\u6536\u5DE5\uFF1B`,
-      `- \u5FE0\u5B9E \`DESIGN_BRIEF.md\` \u4E0E \`inputs/\` \u91CC\u7684\u4E0A\u6E38\uFF1B\u4E0D\u5F52\u4F60\u5B9A\u7684\u53D6\u820D\u522B\u786C\u7F16\uFF0C\u8BA9\u5F15\u64CE\u5728 acceptance.md \u7684\u300C\u5F00\u653E\u95EE\u9898\u300D\u91CC\u7559\u5F85\u4EBA\u5DE5\u786E\u8BA4\u3002`
+      `**\u6BCF\u4E00\u8F6E\u7684\u95ED\u73AF\uFF08\u522B\u8DF3\u6B65\uFF09**\uFF1A`,
+      `1. **\u5582\u9971\u5B83**\uFF1A\u9996\u8F6E \`--message\` \u628A\u8BBE\u8BA1\u9700\u6C42\u8FDE\u540C**\u771F\u5B9E\u793A\u4F8B\u6570\u636E**\u4E00\u8D77\u7ED9\u8DB3\u2014\u2014\u5F15\u64CE\u53EA\u62FF\u5230 \`DESIGN_BRIEF.md\`/\`inputs/\`\uFF0CPRD \u91CC\u6CA1\u6709\u7684 mock \u6570\u636E\u5B83\u4F1A**\u81EA\u5DF1\u7F16**\uFF08\u66FE\u628A\u5A74\u513F\u770B\u62A4\u5668\u7F16\u6210\u8033\u673A\uFF09\u3002\u771F\u5B9E\u4E1A\u52A1\u6570\u636E\uFF08\u4EA7\u54C1/\u4E70\u5BB6/\u8BA2\u5355\u7B49\uFF09\u5728\u54EA\u3001\u957F\u4EC0\u4E48\u6837\uFF0C\u4F60**\u5FC5\u987B\u5728 message \u91CC\u5199\u6E05\u6216\u544A\u8BC9\u5B83\u53BB\u54EA\u53D6**\uFF1B`,
+      `2. **\u8BFB\u4EA7\u7269**\uFF1A\u547D\u4EE4\u8DD1\u5B8C\u4F1A\u6253\u5370\u672C\u8F6E\u4EA4\u4ED8\u7684 artifact \u6E05\u5355\uFF08\`index.html\` / \`acceptance.md\` \u53CA status\uFF09\u2014\u2014**\u6253\u5F00 \`index.html\` \u771F\u8BFB\u4E00\u904D**\uFF0C\u5BF9\u7167 \`DESIGN_BRIEF.md\` \u4E0E \`inputs/\` \u6838\uFF1A\u6570\u636E\u5BF9\u4E0D\u5BF9\uFF1F\u72B6\u6001/\u8FB9\u754C\u6001\u5168\u4E0D\u5168\uFF1F\u6709\u6CA1\u6709\u7F16\u9020\uFF1F`,
+      `3. **\u51B3\u5B9A**\uFF1A\u591F\u597D \u2192 \`oasis propose ${artifactId} --reason "<\u8FD9\u7248\u505A\u4E86\u4EC0\u4E48>"\` \u4EA4\u7A3F\uFF1B\u8FD8\u5DEE \u2192 \`oasis design chat ${artifactId} --turn continue --message "<\u5177\u4F53\u6539\u4EC0\u4E48>"\` **\u518D\u4E00\u8F6E**\u6253\u78E8\uFF1B\u9047\u5230**\u4F60\u4E5F\u5B9A\u4E0D\u4E86\u7684\u53D6\u820D**\uFF08\u5982\u67D0\u6001\u7528\u54EA\u4E2A\u4E70\u5BB6\u627F\u8F7D\uFF09\u2192 \u5199\u8FDB acceptance.md \u7684\u300C\u5F00\u653E\u95EE\u9898\u300D\uFF0C\u6216 \`oasis gap ${artifactId} --desc "<\u8981\u4EBA\u5B9A\u4EC0\u4E48>"\` \u5192\u6CE1\u7ED9\u4EBA\uFF1B`,
+      `- **\u522B\u628A\u7B2C\u4E00\u7248\u76F2\u76EE propose**\u2014\u2014\u5148\u8BFB\u3001\u5148\u81EA\u68C0\u3001\u4E0D\u591F\u5C31\u518D\u4E00\u8F6E\uFF0C\u6BD4 propose \u51FA\u53BB\u88AB\u4E0B\u6E38\u6253\u56DE\u3001\u7ED5\u6574\u5F20\u56FE\u4E00\u5708\u4FBF\u5B9C\u5F97\u591A\uFF1B`,
+      `- \u5F15\u64CE\u4E00\u8F6E\u8981 13\u201344 \u5206\u949F\uFF08\u771F\u5728\u753B\u5E03\u4E0A\u753B\uFF09\uFF0C\`oasis design chat\` \u5185\u90E8\u5DF2\u8F6E\u8BE2 30 \u5206\u949F\u3002**\u522B\u7528 \`timeout\` \u5305\u5B83\u3001\u522B 15 \u5206\u949F\u5C31\u5F53\u5B83\u5931\u8D25**\u2014\u2014\u8010\u5FC3\u7B49\u5B83\u8DD1\u5B8C\uFF1B`,
+      `- \u7F3A**\u8FD8\u4E0D\u5B58\u5728\u7684\u4E0A\u6E38\u524D\u7F6E**\u505A\u4E0D\u4E0B\u53BB \u2192 \`oasis gap ${artifactId} --desc "<\u7F3A\u4EC0\u4E48>"\` \u62A5\u7F3A\u53E3\u540E\u6536\u5DE5\u3002`
     ] : (() => {
       const codeRepo = args.codeRepo ?? null;
       const repos = typeDef?.contentType === "code" ? codeRepo?.repos : void 0;
@@ -3922,7 +3933,7 @@ async function assembleContext(args) {
     ``,
     ...canvasMode ? [
       `## \u5173\u4E8E\u5DE5\u5177`,
-      `oasis CLI \u5DF2\u6CE8\u5165\uFF08\`OASIS_SERVER\` / \`OASIS_TOKEN\` \u5C31\u7EEA\uFF0C\u65E0\u9700\u914D\u7F6E\uFF09\u2014\u2014**\u4EA7\u51FA\u8FD9\u4E2A design \u4EA7\u7269\u5C31\u9760\u4E0A\u9762\u300C\u600E\u4E48\u63D0\u4EA4\u300D\u91CC\u7684 \`oasis design run\`**\uFF08\u5B83\u53BB\u9A71\u52A8\u753B\u677F\u5F15\u64CE\u3001\u4EA7\u754C\u9762\u7A3F\u3001\u4EA4\u7A3F\uFF09\uFF1B\u7F3A\u524D\u7F6E\u7528 \`oasis gap\`\u3002\u8BBE\u8BA1\u9700\u6C42\u89C1\u672C\u76EE\u5F55 \`DESIGN_BRIEF.md\`\uFF0C\u4E0A\u6E38\u8F93\u5165\u5728 \`inputs/\`\u3002`
+      `oasis CLI \u5DF2\u6CE8\u5165\uFF08\`OASIS_SERVER\` / \`OASIS_TOKEN\` \u5C31\u7EEA\uFF0C\u65E0\u9700\u914D\u7F6E\uFF09\u2014\u2014\u4F60\u7528 \`oasis design chat\` \u591A\u8F6E\u9A71\u52A8\u753B\u677F\u5F15\u64CE\u6253\u78E8\u754C\u9762\u7A3F\uFF0C\u8BFB\u4EA7\u7269\u540E\u7528 \`oasis propose\` \u4EA4\u7A3F\u3001\`oasis gap\` \u62A5\u7F3A\u53E3\uFF08\u90FD\u89C1\u4E0A\u9762\u300C\u600E\u4E48\u63D0\u4EA4\u300D\uFF09\u3002\u8BBE\u8BA1\u9700\u6C42\u89C1\u672C\u76EE\u5F55 \`DESIGN_BRIEF.md\`\uFF0C\u4E0A\u6E38\u8F93\u5165\u5728 \`inputs/\`\u3002`
     ] : commandReference({
       artifactId,
       action: args.action ?? "produce",
@@ -3950,12 +3961,14 @@ async function assembleContext(args) {
         (s2) => `- ${s2.upstream}: pin=${s2.pinned ?? "\u2205"} \u2192 \u6700\u65B0 ${s2.latest}${s2.upstreamCancelled ? "\uFF08\u26A0 \u4E0A\u6E38\u5DF2 cancelled\uFF09" : ""}`
       )
     ] : [],
-    // 画板模式：守则的 oasis 命令（gap/annotate/propose/add-revision）内层引擎全不可用——换画板版守则
+    // 画板模式：你在通用 runtime 上、CLI 齐全（design chat/propose/gap 都能用）；引擎里的内层 agent 才没 CLI，那层不用你管
     ...canvasMode ? [
       ``,
       `## \u751F\u4EA7\u8005\u5B88\u5219\uFF08\u753B\u677F\u7248\uFF09`,
-      `- \u4F60\u53EA\u4EA7**\u8FD9\u4E00\u4E2A**\u8BBE\u8BA1\u4EA7\u7269\uFF1B**\u4E0D\u5F52\u4F60\u5B9A\u7684\u51B3\u7B56\u522B\u786C\u7F16**\uFF08\u4F1A\u88AB\u6253\u56DE\uFF09\u2014\u2014\u62FF\u4E0D\u51C6\u7684\u53D6\u820D\u5199\u8FDB acceptance.md \u7684\u300C\u5F00\u653E\u95EE\u9898\u300D\u3002`,
+      `- \u4F60\u662F\u7532\u65B9\uFF1A\u591A\u8F6E \`oasis design chat\` \u9A71\u52A8\u5F15\u64CE\uFF0C\u6BCF\u8F6E**\u8BFB\u4EA7\u7269**\u518D\u51B3\u5B9A\u2014\u2014\u591F\u597D\u624D \`oasis propose\`\uFF0C\u522B\u628A\u7B2C\u4E00\u7248\u76F2\u76EE\u4EA4\u51FA\u53BB\u3002`,
+      `- \u4F60\u53EA\u4EA7**\u8FD9\u4E00\u4E2A**\u8BBE\u8BA1\u4EA7\u7269\uFF1B**\u4E0D\u5F52\u4F60\u5B9A\u7684\u51B3\u7B56\u522B\u786C\u7F16**\uFF08\u4F1A\u88AB\u6253\u56DE\uFF09\u2014\u2014\u62FF\u4E0D\u51C6\u7684\u53D6\u820D\u5199\u8FDB acceptance.md \u7684\u300C\u5F00\u653E\u95EE\u9898\u300D\uFF0C\u6216 \`oasis gap\` \u5192\u6CE1\u7ED9\u4EBA\u3002`,
       `- \u5FE0\u5B9E\u4E8E task-context/ \u91CC\u7684\u4E0A\u6E38\u8F93\u5165\uFF08PRD/\u603B\u7EB2\uFF09\uFF1B\u4E0E\u4E0A\u6E38\u51B2\u7A81\u5904\u4EE5\u4E0A\u6E38\u4E3A\u51C6\uFF0C\u5E76\u5728\u5F00\u653E\u95EE\u9898\u91CC\u6807\u6CE8\u5F02\u8BAE\u3002`,
+      `- \u771F\u5B9E\u793A\u4F8B\u6570\u636E\uFF08\u4EA7\u54C1/\u4E70\u5BB6/\u8BA2\u5355\u7B49\uFF09**\u5FC5\u987B\u5728 \`--message\` \u91CC\u5582\u7ED9\u5F15\u64CE**\u2014\u2014\u5B83\u62FF\u4E0D\u5230\u7684\u4E1C\u897F\u4F1A\u81EA\u5DF1\u7F16\uFF0C\u522B\u8BA9\u5B83\u66FF\u4F60\u9020\u6570\u636E\u3002`,
       `- \u754C\u9762\u7A3F\u5FC5\u987B**\u771F\u5B9E\u53EF\u6253\u5F00**\uFF08\u81EA\u5305\u542B HTML\uFF09\uFF0C\u522B\u4EA4\u793A\u610F\u63CF\u8FF0\u3002`
     ] : [],
     // review 会话不产出、不该给生产者守则（它只投票，守则的 propose/conclude/gap/add-revision 全不适用）
@@ -4228,7 +4241,7 @@ var init_dispatcher = __esm({
       }
     };
     SEED_ROOT_SUCCESSFUL_PRODUCE_LIMIT = 5;
-    SELF_HEALING_EXITS = /* @__PURE__ */ new Set(["rate-limit"]);
+    SELF_HEALING_EXITS = /* @__PURE__ */ new Set(["rate-limit", "session-not-found"]);
     CANVAS_RUNTIME_KIND = "open-design";
     NON_PRODUCE_FALLBACK_RUNTIME_KIND = "claude-code";
     Dispatcher = class {
@@ -4284,7 +4297,8 @@ var init_dispatcher = __esm({
       }
       /** ann: 讨论/回踢 resume 用：该 artifact 最近一次 produce/integrate 会话的 runtimeSessionId */
       retainedProduceSessionFor(artifactId) {
-        return decodeProduceSession(this.produceSessions.get(`produce:${artifactId}`))?.rtId;
+        const rec = decodeProduceSession(this.produceSessions.get(`produce:${artifactId}`));
+        return rec?.sessionMissing ? void 0 : rec?.rtId;
       }
       emitJournal(entry) {
         try {
@@ -4681,8 +4695,8 @@ var init_dispatcher = __esm({
         const sessionKey = this.produceSessionKeyFor(spec);
         const prior = sessionKey ? decodeProduceSession(this.produceSessions.get(sessionKey)) : void 0;
         const priorConsistent = prior !== void 0 && prior.nodeId === binding?.nodeId && prior.runtimeKind === binding?.runtimeKind;
-        const retainedPartSession = spec.action === "produce" && spec.part !== void 0 && priorConsistent ? prior.rtId : void 0;
-        const retainedWholeSession = spec.action === "produce" && spec.part === void 0 && priorConsistent ? this.resumableWholeSession(spec.artifactId, seqNow, prior.rtId) : void 0;
+        const retainedPartSession = spec.action === "produce" && spec.part !== void 0 && priorConsistent && !prior.sessionMissing ? prior.rtId : void 0;
+        const retainedWholeSession = spec.action === "produce" && spec.part === void 0 && priorConsistent && !prior.sessionMissing ? this.resumableWholeSession(spec.artifactId, seqNow, prior.rtId) : void 0;
         const retainedSession = retainedPartSession ?? retainedWholeSession;
         const runtimeSessionId = retainedSession ?? (isProduceLike ? (0, import_node_crypto3.randomUUID)() : void 0);
         const resumeSession = retainedSession !== void 0;
@@ -4856,11 +4870,12 @@ var init_dispatcher = __esm({
           const prev = decodeProduceSession(this.produceSessions.get(exitSessionKey));
           if (prev) {
             const isWholeProduce = spec.action === "produce" && spec.part === void 0;
+            const sessionNotFound = info.reason === "session-not-found";
             try {
               this.produceSessions.set(exitSessionKey, encodeProduceSession({
                 ...prev,
                 ...info.runtimeSessionId ? { rtId: info.runtimeSessionId } : {},
-                ...isWholeProduce ? { seqAtExit } : { seqAtExit: void 0 },
+                ...sessionNotFound ? { sessionMissing: true, seqAtExit: void 0 } : { sessionMissing: void 0, ...isWholeProduce ? { seqAtExit } : { seqAtExit: void 0 } },
                 lastUsedAt: (/* @__PURE__ */ new Date()).toISOString()
               }));
             } catch {
@@ -137781,11 +137796,15 @@ ${acceptanceCriteria.map((c) => `- ${c}`).join("\n")}` : brief;
     }
     case "conclude": {
       const artifactId = str(args, "artifactId");
-      await kernel.conclude({ artifactId, actor, note: optStr(args, "note") });
-      const pending = pendingConcludeAttempt(kernel.model, artifactId);
-      return {
-        message: pending ? `conclude \u5DF2\u53D1\u8D77\uFF0Cgate \u5F85\u5BA1\uFF08quorum=${pending.gate.quorum}\uFF0Celigible=${pending.gate.eligible.join(", ")}\uFF09` : `concluded\uFF1A\u91CC\u7A0B\u7891\u6210\u7ACB\uFF08head=${concludedHead(kernel.model, artifactId)}\uFF09`
-      };
+      const result = await kernel.conclude({ artifactId, actor, note: optStr(args, "note") });
+      if (result.kind === "gate-pending") {
+        const pending = pendingConcludeAttempt(kernel.model, artifactId);
+        return { message: `conclude \u5DF2\u53D1\u8D77\uFF0Cgate \u5F85\u5BA1\uFF08quorum=${pending.gate.quorum}\uFF0Celigible=${pending.gate.eligible.join(", ")}\uFF09` };
+      }
+      if (result.kind === "noop-concluded") {
+        return { message: `\u8BE5 head \u5DF2\u7ECF\u6536\u53E3\u8FC7\u4E86\u3001\u65E0\u65B0\u7248\u672C\u5F85\u6536\u53E3\uFF08head=${result.head}\uFF09\u2014\u2014\u82E5\u4F60\u521A propose \u4E86\u65B0\u7248\uFF0C\u5B83\u53EF\u80FD\u8FD8\u5728\u961F\u5217/\u8BC4\u5BA1\u4E2D\uFF0C\u5148\u8BA9\u5B83\u6210\u4E3A head \u518D\u6536\u53E3\u3002` };
+      }
+      return { message: `concluded\uFF1A\u91CC\u7A0B\u7891\u6210\u7ACB\uFF08head=${result.head}\uFF09` };
     }
     case "review": {
       const revisionArg = optStr(args, "revisionId");
@@ -138416,7 +138435,7 @@ async function startOasisServer(opts) {
             res.writeHead(status, { "content-type": "application/json" }).end(
               JSON.stringify({
                 error: err instanceof Error ? err.message : String(err),
-                ...err instanceof FrozenError ? { retryable: true } : {}
+                ...err instanceof FrozenError ? { retryable: err.retryable } : {}
               })
             );
           }
@@ -139078,10 +139097,13 @@ async function startOasisServer(opts) {
                 ...draftWorkspace ? { draftWorkspace } : {}
               });
               const effectiveSessionId = persistTarget ? runtimeChanged ? void 0 : persistTarget.runtimeSessionId ?? void 0 : body.sessionId || void 0;
+              const resumeFallbackHistory = effectiveSessionId && chatStore && persistTarget ? (await chatStore.listMessages(persistTarget.id, 20)).filter((m2) => !(m2.role === "assistant" && m2.status === "running")).map((m2) => ({ role: m2.role, content: m2.role === "user" ? stripInjectedChatContext(m2.content) : m2.content })) : [];
+              const fallbackMessage = resumeFallbackHistory.length ? buildRuntimeChatPrompt({ userMessage: persistedUserMessage, history: resumeFallbackHistory, ...draftWorkspace ? { draftWorkspace } : {} }) : void 0;
               const session = await opts.dispatchChat({
                 actorId: body.actorId,
                 message: runtimeMessage,
                 ...effectiveSessionId ? { sessionId: effectiveSessionId } : {},
+                ...fallbackMessage ? { fallbackMessage } : {},
                 ...body.chatSessionId ? { chatSessionId: body.chatSessionId } : {},
                 ...body.workspace ? { workspace: body.workspace } : {},
                 ...currentCompanyId !== void 0 ? { companyId: currentCompanyId } : {},
@@ -146742,6 +146764,17 @@ function materializeContext(resolvedDir, files) {
     fs8.writeFileSync(f2, content);
   }
 }
+async function putVisibleUserTurn(base, fetchImpl, args) {
+  const messageId = (0, import_node_crypto11.randomUUID)();
+  await odApi(
+    base,
+    fetchImpl,
+    "PUT",
+    `/api/projects/${encodeURIComponent(args.boardKey)}/conversations/${encodeURIComponent(args.conversationId)}/messages/${messageId}`,
+    { id: messageId, role: "user", content: args.content }
+  );
+  return messageId;
+}
 async function startDesignRun(base, fetchImpl, args) {
   const created = await odApi(base, fetchImpl, "POST", "/api/runs", {
     agentId: args.agentId,
@@ -146750,10 +146783,22 @@ async function startDesignRun(base, fetchImpl, args) {
     assistantMessageId: (0, import_node_crypto11.randomUUID)(),
     clientRequestId: (0, import_node_crypto11.randomUUID)(),
     message: args.message,
-    systemPrompt: args.systemPrompt
+    // 提案 design-conversational-driving 坑②：systemPrompt 从写死改为可选——缺省用引擎侧默认，
+    // 让设计意图由驱动方每轮的话（message）表达，而非焊死一句。
+    ...args.systemPrompt !== void 0 ? { systemPrompt: args.systemPrompt } : {}
   });
   return created.runId;
 }
+async function fetchResultPackage(base, fetchImpl, runId) {
+  const body = await odApi(base, fetchImpl, "GET", `/api/runs/${encodeURIComponent(runId)}/result-package`);
+  const artifacts = (body.artifacts ?? []).map((a) => ({
+    path: a.path ?? "",
+    kind: a.kind ?? null,
+    title: a.title ?? null,
+    status: a.status ?? null
+  }));
+  return { artifacts, fileCount: body.project?.fileCount ?? artifacts.length };
+}
 async function pumpDesignEvents(base, fetchImpl, runId, onLine) {
   const res = await fetchImpl(`${base}/api/runs/${runId}/events`);
   if (!res.ok || !res.body) return;
@@ -146837,7 +146882,7 @@ async function runOpenDesignSession(opts) {
     boardKey,
     conversationId,
     message: opts.message,
-    systemPrompt: opts.systemPrompt
+    ...opts.systemPrompt !== void 0 ? { systemPrompt: opts.systemPrompt } : {}
   });
   if (opts.onLine) void pumpDesignEvents(opts.base, fetchImpl, runId, opts.onLine).catch(() => {
   });
@@ -146850,6 +146895,30 @@ async function runOpenDesignSession(opts) {
   const { dir, entry } = await harvestBoard(opts.base, fetchImpl, opts.publicBase, workRoot, boardKey, runId);
   return { dir, entry, boardKey, runId };
 }
+async function runDesignChatTurn(opts) {
+  const fetchImpl = opts.fetchImpl ?? fetch;
+  const boardKey = deriveBoardKey(opts.artifactId);
+  const { conversationId, resolvedDir } = await ensureProject(opts.base, fetchImpl, boardKey, opts.title);
+  if (opts.contextFiles) materializeContext(resolvedDir, opts.contextFiles);
+  const userMessageId = await putVisibleUserTurn(opts.base, fetchImpl, { boardKey, conversationId, content: opts.message });
+  const runId = await startDesignRun(opts.base, fetchImpl, {
+    agentId: opts.agentId,
+    boardKey,
+    conversationId,
+    message: opts.message,
+    ...opts.systemPrompt !== void 0 ? { systemPrompt: opts.systemPrompt } : {}
+  });
+  if (opts.onLine) void pumpDesignEvents(opts.base, fetchImpl, runId, opts.onLine).catch(() => {
+  });
+  const status = await pollDesignRun(opts.base, fetchImpl, runId, {
+    ...opts.pollIntervalMs !== void 0 ? { intervalMs: opts.pollIntervalMs } : {},
+    ...opts.pollMaxMs !== void 0 ? { maxMs: opts.pollMaxMs } : {}
+  });
+  if (status === "canceled") throw new Error(`od run ${runId} \u88AB\u53D6\u6D88`);
+  if (status === "failed") throw new Error(`od run ${runId} \u5931\u8D25`);
+  const { artifacts, fileCount } = await fetchResultPackage(opts.base, fetchImpl, runId);
+  return { boardKey, conversationId, runId, userMessageId, artifacts, fileCount };
+}
 var import_node_crypto11, fs8, os, path7;
 var init_driver = __esm({
   "../adapters/src/open-design/driver.ts"() {
@@ -146892,6 +146961,25 @@ var init_sync_skills = __esm({
   }
 });
 
+// ../adapters/src/_core/resume-classify.ts
+function isSessionNotFoundError(text) {
+  if (!text) return false;
+  const t = text.toLowerCase();
+  return SESSION_NOT_FOUND_PATTERNS.some((p2) => t.includes(p2));
+}
+var SESSION_NOT_FOUND_PATTERNS;
+var init_resume_classify = __esm({
+  "../adapters/src/_core/resume-classify.ts"() {
+    "use strict";
+    SESSION_NOT_FOUND_PATTERNS = [
+      "no conversation found",
+      // claude: `claude --resume <缺失的 id>`
+      "no rollout found for thread id"
+      // codex:  `codex exec resume <缺失的 uuid>`
+    ];
+  }
+});
+
 // ../adapters/src/_core/session-paths.ts
 function resolveWorkRoot(workRoot) {
   if (workRoot) return workRoot;
@@ -147219,29 +147307,17 @@ function classifyExit(result) {
   if (result.is_error === true || String(result.subtype ?? "").startsWith("error")) return "error";
   return void 0;
 }
-function conversationExists(sessionId) {
-  const configDir = process.env["CLAUDE_CONFIG_DIR"] || path9.join(os3.homedir(), ".claude");
-  const projectsDir = path9.join(configDir, "projects");
-  const target = `${sessionId}.jsonl`;
-  try {
-    for (const proj of fs10.readdirSync(projectsDir)) {
-      if (fs10.existsSync(path9.join(projectsDir, proj, target))) return true;
-    }
-  } catch {
-  }
-  return false;
-}
-var import_node_child_process7, import_node_crypto13, fs10, os3, path9, readline, ONE_SHOT_UNSAFE_TOOLS, ClaudeCodeAdapter;
+var import_node_child_process7, import_node_crypto13, fs10, path9, readline, ONE_SHOT_UNSAFE_TOOLS, ClaudeCodeAdapter;
 var init_claude_code = __esm({
   "../adapters/src/claude-code/index.ts"() {
     "use strict";
     import_node_child_process7 = require("node:child_process");
     import_node_crypto13 = require("node:crypto");
     fs10 = __toESM(require("node:fs"), 1);
-    os3 = __toESM(require("node:os"), 1);
     path9 = __toESM(require("node:path"), 1);
     readline = __toESM(require("node:readline"), 1);
     init_sync_skills();
+    init_resume_classify();
     init_session_paths();
     ONE_SHOT_UNSAFE_TOOLS = ["ScheduleWakeup", "CronCreate", "CronDelete", "CronList"];
     ClaudeCodeAdapter = class {
@@ -147315,8 +147391,7 @@ var init_claude_code = __esm({
         const prompt = job.bundle.files["TASK.md"];
         if (!prompt) throw new Error("bundle \u7F3A TASK.md\uFF08\u88C5\u914D\u5668\u5951\u7EA6\uFF09");
         const promptViaStdin = Buffer.byteLength(prompt, "utf8") > 1e5;
-        const canResume = job.resumeRuntimeSession && conversationExists(job.runtimeSessionId ?? "");
-        const runtimeSessionArgs = job.runtimeSessionId ? canResume ? ["--resume", job.runtimeSessionId] : ["--session-id", job.runtimeSessionId] : [];
+        const runtimeSessionArgs = job.runtimeSessionId ? job.resumeRuntimeSession ? ["--resume", job.runtimeSessionId] : ["--session-id", job.runtimeSessionId] : [];
         const oneShotSafety = this.opts.oneShotSafety !== false;
         const args = [
           "-p",
@@ -147441,7 +147516,12 @@ var init_claude_code = __esm({
         child.on("exit", (code) => {
           clearTimeout(timer);
           if (exited) return;
-          const reason = killReason ?? classifyExit(lastResult);
+          let reason = killReason ?? classifyExit(lastResult);
+          const resultErrors = Array.isArray(lastResult?.errors) ? lastResult.errors.map(String) : [];
+          const resumeErrText = [stderrTail.join("\n"), String(lastResult?.result ?? ""), ...resultErrors].join("\n");
+          if (!killReason && job.resumeRuntimeSession && reason !== "clean" && isSessionNotFoundError(resumeErrText)) {
+            reason = "session-not-found";
+          }
           const workdirRef = dir;
           const isOneShot = job.workdirKey ? false : !job.runtimeSessionId;
           unlockWorkdir(dir);
@@ -147652,7 +147732,7 @@ var init_resilient = __esm({
 
 // ../adapters/src/_core/skill-cache.ts
 function defaultCacheRoot() {
-  return path10.join(os4.homedir(), ".oasis", "skill-cache");
+  return path10.join(os3.homedir(), ".oasis", "skill-cache");
 }
 function sessionSkillsSubdir(runtimeKind) {
   switch (runtimeKind) {
@@ -147895,12 +147975,12 @@ async function syncSessionSymlinks(sessionDir, runtimeKind, actorDir, manifest,
     }
   }
 }
-var fsp, os4, path10, MANIFEST_SCHEMA_VERSION, STALE_LOCK_MS, LOCK_ACQUIRE_TIMEOUT_MS, LOCK_POLL_MS;
+var fsp, os3, path10, MANIFEST_SCHEMA_VERSION, STALE_LOCK_MS, LOCK_ACQUIRE_TIMEOUT_MS, LOCK_POLL_MS;
 var init_skill_cache = __esm({
   "../adapters/src/_core/skill-cache.ts"() {
     "use strict";
     fsp = __toESM(require("node:fs/promises"), 1);
-    os4 = __toESM(require("node:os"), 1);
+    os3 = __toESM(require("node:os"), 1);
     path10 = __toESM(require("node:path"), 1);
     MANIFEST_SCHEMA_VERSION = 1;
     STALE_LOCK_MS = 6e4;
@@ -148271,7 +148351,7 @@ function codexSessionsRoot() {
   const candidates = [];
   const ch = process.env["CODEX_HOME"];
   if (ch) candidates.push(path11.join(ch, "sessions"));
-  const home = process.env["HOME"] || os5.homedir();
+  const home = process.env["HOME"] || os4.homedir();
   if (home) candidates.push(path11.join(home, ".codex", "sessions"));
   for (const c of candidates) {
     try {
@@ -148281,31 +148361,6 @@ function codexSessionsRoot() {
   }
   return "";
 }
-function codexRolloutExists(sessionId, root = codexSessionsRoot()) {
-  if (!sessionId || !root) return false;
-  const suffix = `-${sessionId}.jsonl`;
-  let hit = false;
-  const walk = (d) => {
-    if (hit) return;
-    let ents;
-    try {
-      ents = fs11.readdirSync(d, { withFileTypes: true });
-    } catch {
-      return;
-    }
-    for (const ent of ents) {
-      if (hit) return;
-      const p2 = path11.join(d, ent.name);
-      if (ent.isDirectory()) walk(p2);
-      else if (ent.isFile() && ent.name.startsWith("rollout-") && ent.name.endsWith(suffix)) {
-        hit = true;
-        return;
-      }
-    }
-  };
-  walk(root);
-  return hit;
-}
 function listRecentRollouts(root, sinceMs) {
   const margin = sinceMs - 6e4;
   const found = [];
@@ -148547,17 +148602,18 @@ function normalizeCodexConsoleLine(line, state = createCodexNormalizeState()) {
   tool.output.push(line);
   return [];
 }
-var import_node_child_process9, import_node_crypto14, fs11, os5, path11, readline2, CodexAdapter;
+var import_node_child_process9, import_node_crypto14, fs11, os4, path11, readline2, CodexAdapter;
 var init_codex = __esm({
   "../adapters/src/codex/index.ts"() {
     "use strict";
     import_node_child_process9 = require("node:child_process");
     import_node_crypto14 = require("node:crypto");
     fs11 = __toESM(require("node:fs"), 1);
-    os5 = __toESM(require("node:os"), 1);
+    os4 = __toESM(require("node:os"), 1);
     path11 = __toESM(require("node:path"), 1);
     readline2 = __toESM(require("node:readline"), 1);
     init_sync_skills();
+    init_resume_classify();
     init_session_paths();
     init_claude_code();
     CodexAdapter = class {
@@ -148606,9 +148662,7 @@ var init_codex = __esm({
         const task = job.bundle.files["TASK.md"];
         if (!task) throw new Error("bundle \u7F3A TASK.md\uFF08\u88C5\u914D\u5668\u5951\u7EA6\uFF09");
         const prompt = job.systemPrompt ? ["# System Prompt", job.systemPrompt, "", "# Task", task].join("\n") : task;
-        const isResume = Boolean(
-          job.resumeRuntimeSession && job.runtimeSessionId && codexRolloutExists(job.runtimeSessionId)
-        );
+        const isResume = Boolean(job.resumeRuntimeSession && job.runtimeSessionId);
         const args = [
           "exec",
           "-C",
@@ -148744,7 +148798,8 @@ var init_codex = __esm({
           const sawStreamError = streamErrorMessages.length > 0;
           const isError = !killReason && (typeof code === "number" && code !== 0 || sawStreamError);
           const errorMessage = isError ? [...streamErrorMessages, ...stdoutErrorLines, ...stderrTail].join("\n").trim().slice(-4e3) || void 0 : void 0;
-          const reason = killReason ? killReason : sawStreamError ? "error" : code === 0 ? "clean" : "error";
+          const sessionNotFound = !killReason && isResume && isSessionNotFoundError([...streamErrorMessages, ...stdoutErrorLines, ...stderrTail].join("\n"));
+          const reason = killReason ? killReason : sessionNotFound ? "session-not-found" : sawStreamError ? "error" : code === 0 ? "clean" : "error";
           finish({
             code: killReason ? null : code,
             reason,
@@ -153560,7 +153615,44 @@ var init_node_health = __esm({
 });
 
 // ../server/src/domains/nodes/routes.ts
+function daemonVersionLess(a, b2) {
+  if (!a || !b2 || a === "\u2014" || b2 === "\u2014") return false;
+  const parse2 = (v2) => v2.replace(/^v/, "").split(".").map((x2) => Number.parseInt(x2, 10));
+  const pa = parse2(a);
+  const pb = parse2(b2);
+  if (pa.some(Number.isNaN) || pb.some(Number.isNaN)) return a < b2;
+  for (let i = 0; i < Math.max(pa.length, pb.length); i++) {
+    const ai = pa[i] ?? 0;
+    const bi = pb[i] ?? 0;
+    if (ai !== bi) return ai < bi;
+  }
+  return false;
+}
 function nodesDomain(deps) {
+  async function resolveLatestDaemonVersion() {
+    const envVer = (process.env["OASIS_LATEST_NODE_DAEMON_VERSION"] ?? "").trim();
+    if (envVer) return { version: envVer, source: "env" };
+    if (deps.fetchLatestNpmDaemonVersion) {
+      try {
+        const v2 = (await deps.fetchLatestNpmDaemonVersion())?.trim();
+        if (v2) return { version: v2, source: "npm" };
+      } catch {
+      }
+    }
+    try {
+      const here = (0, import_node_path10.dirname)((0, import_node_url3.fileURLToPath)(__esm_import_meta_url));
+      for (const rel of ["../../../../node-daemon/package.json", "../../../../../node-daemon/package.json"]) {
+        try {
+          const raw = (0, import_node_fs7.readFileSync)((0, import_node_path10.resolve)(here, rel), "utf8");
+          const pkg = JSON.parse(raw);
+          if (pkg.version) return { version: pkg.version, source: "monorepo" };
+        } catch {
+        }
+      }
+    } catch {
+    }
+    return { version: null, source: null };
+  }
   let hubWired = false;
   function wireHub(hub) {
     if (hubWired) return;
@@ -153770,30 +153862,23 @@ function nodesDomain(deps) {
       return { status: 200, body: { ok: true } };
     });
     router.get("/api/nodes/expected-daemon-version", async () => {
-      const envVer = (process.env["OASIS_LATEST_NODE_DAEMON_VERSION"] ?? "").trim();
-      if (envVer) return { status: 200, body: { version: envVer, source: "env" } };
-      try {
-        const here = (0, import_node_path10.dirname)((0, import_node_url3.fileURLToPath)(__esm_import_meta_url));
-        for (const rel of ["../../../../node-daemon/package.json", "../../../../../node-daemon/package.json"]) {
-          try {
-            const raw = (0, import_node_fs7.readFileSync)((0, import_node_path10.resolve)(here, rel), "utf8");
-            const pkg = JSON.parse(raw);
-            if (pkg.version) return { status: 200, body: { version: pkg.version, source: "monorepo" } };
-          } catch {
-          }
-        }
-      } catch {
-      }
-      return { status: 200, body: { version: null, source: null } };
+      return { status: 200, body: await resolveLatestDaemonVersion() };
     });
     router.post("/api/nodes/:nodeId/update", async (req) => {
       const nodeId = req.params["nodeId"];
       if (!nodeId) return { status: 400, body: { error: "missing nodeId" } };
       const hub = deps.getHub();
       if (!hub) return { status: 503, body: { error: "node gateway \u672A\u5C31\u7EEA" } };
+      const daemon = hub.connectedDaemons().find((d) => d.daemonId === nodeId);
+      if (!daemon) return { status: 409, body: { error: `\u8282\u70B9 ${nodeId} \u5F53\u524D\u4E0D\u5728\u7EBF\uFF0C\u65E0\u6CD5\u66F4\u65B0` } };
+      const current = daemon.meta.daemonVersion;
+      const { version: latest } = await resolveLatestDaemonVersion();
+      if (latest && current && !daemonVersionLess(current, latest)) {
+        return { status: 200, body: { ok: true, alreadyLatest: true, version: current } };
+      }
       const sent = hub.dispatch(nodeId, { type: "update" });
       if (!sent) return { status: 409, body: { error: `\u8282\u70B9 ${nodeId} \u5F53\u524D\u4E0D\u5728\u7EBF\uFF0C\u65E0\u6CD5\u66F4\u65B0` } };
-      return { status: 200, body: { ok: true } };
+      return { status: 200, body: { ok: true, alreadyLatest: false } };
     });
     router.delete("/api/runtimes/:runtimeId", async (req) => {
       const runtimeId = req.params["runtimeId"];
@@ -164189,19 +164274,19 @@ var init_trajectory = __esm({
 
 // src/index.ts
 var fs26 = __toESM(require("node:fs"));
-var os10 = __toESM(require("node:os"));
+var os9 = __toESM(require("node:os"));
 var path21 = __toESM(require("node:path"));
 var import_node_child_process15 = require("node:child_process");
 
 // ../cli/src/cli.ts
 var fs25 = __toESM(require("node:fs"), 1);
-var os9 = __toESM(require("node:os"), 1);
+var os8 = __toESM(require("node:os"), 1);
 var path20 = __toESM(require("node:path"), 1);
 var import_node_crypto31 = require("node:crypto");
 
 // ../cli/src/serve.ts
 var fs23 = __toESM(require("node:fs"), 1);
-var os6 = __toESM(require("node:os"), 1);
+var os5 = __toESM(require("node:os"), 1);
 var path18 = __toESM(require("node:path"), 1);
 var import_node_crypto28 = require("node:crypto");
 var import_node_url4 = require("node:url");
@@ -168088,6 +168173,62 @@ function refreshConnectorSkillsInBackground(dataDir, apply) {
   })();
 }
 var SESSION_TOKEN_GRACE_MS = 15 * 6e4;
+function makeResumeRetryProxy(first, spawnFallback) {
+  const outCbs = [];
+  const telCbs = [];
+  const outBuf = [];
+  const telBuf = [];
+  let sawOutput = false;
+  let active = first;
+  const fanOut = (chunk) => {
+    if (outCbs.length) for (const cb of outCbs) cb(chunk);
+    else outBuf.push(chunk);
+  };
+  const fanTel = (e) => {
+    if (telCbs.length) for (const cb of telCbs) cb(e);
+    else telBuf.push(e);
+  };
+  const wire = (s2) => {
+    s2.onOutput((c) => {
+      sawOutput = true;
+      fanOut(c);
+    });
+    s2.onTelemetry?.((e) => fanTel(e));
+  };
+  wire(first);
+  const isSessionNotFound = (err) => {
+    const chatExit = err instanceof Error ? err.chatExit : void 0;
+    return chatExit?.reason === "session-not-found";
+  };
+  const done = first.done.catch(async (err) => {
+    if (sawOutput || !isSessionNotFound(err)) throw err;
+    const second = await spawnFallback();
+    active = second;
+    wire(second);
+    await second.done;
+  });
+  return {
+    get id() {
+      return active.id;
+    },
+    get runId() {
+      return active.runId;
+    },
+    onOutput(cb) {
+      for (const c of outBuf.splice(0)) cb(c);
+      outCbs.push(cb);
+    },
+    onTelemetry(cb) {
+      for (const e of telBuf.splice(0)) cb(e);
+      telCbs.push(cb);
+    },
+    done,
+    kill: () => active.kill?.() ?? Promise.resolve(),
+    get nativeSessionId() {
+      return active.nativeSessionId;
+    }
+  };
+}
 function normalizeHttpBaseUrl(raw) {
   const url = new URL(raw);
   if (url.protocol !== "http:" && url.protocol !== "https:") {
@@ -168111,13 +168252,37 @@ function apiUrlFromGatewayUrl(raw) {
     return void 0;
   }
 }
+var NODE_DAEMON_PKG = "oasis_test";
+var NPM_LATEST_TTL_MS = 5 * 6e4;
+var npmLatestCache = null;
+async function fetchLatestNpmDaemonVersion() {
+  if (npmLatestCache && Date.now() - npmLatestCache.atMs < NPM_LATEST_TTL_MS) return npmLatestCache.version;
+  let version2 = null;
+  try {
+    const ctrl = new AbortController();
+    const timer = setTimeout(() => ctrl.abort(), 3e3);
+    try {
+      const resp = await fetch(`https://registry.npmjs.org/${NODE_DAEMON_PKG}/latest`, { signal: ctrl.signal });
+      if (resp.ok) {
+        const body = await resp.json();
+        version2 = typeof body.version === "string" ? body.version : null;
+      }
+    } finally {
+      clearTimeout(timer);
+    }
+  } catch {
+    version2 = null;
+  }
+  if (version2) npmLatestCache = { version: version2, atMs: Date.now() };
+  return version2;
+}
 var oasisWrapperCache;
 function oasisWrapperScript() {
   if (oasisWrapperCache && fs23.existsSync(oasisWrapperCache)) return oasisWrapperCache;
   const repoRoot = (0, import_node_url4.fileURLToPath)(new URL("../../../", __esm_import_meta_url));
   const tsx = path18.join(repoRoot, "node_modules/.bin/tsx");
   const main = path18.join(repoRoot, "packages/cli/src/main.ts");
-  const dir = fs23.mkdtempSync(path18.join(os6.tmpdir(), "oasis-cli-"));
+  const dir = fs23.mkdtempSync(path18.join(os5.tmpdir(), "oasis-cli-"));
   const wrapper = path18.join(dir, "oasis");
   fs23.writeFileSync(wrapper, `#!/usr/bin/env bash
 exec ${JSON.stringify(tsx)} ${JSON.stringify(main)} "$@"
@@ -168328,7 +168493,7 @@ async function startServe(opts) {
     `[serve] \u8FD4\u5DE5\u6CE2\u7A33\u5B9A\u524D\u6CBF\uFF08rework-wavefront\uFF09\uFF1A${reworkWavefront ? "\u5DF2\u542F\u7528\uFF08\u9ED8\u8BA4\uFF09" : `\u26A0 \u5DF2\u88AB OASIS_REWORK_WAVEFRONT=${process.env.OASIS_REWORK_WAVEFRONT} \u663E\u5F0F\u5173\u95ED \u2014\u2014 \u56DE\u9000\u73B0\u72B6\u884C\u4E3A\uFF0C\u7B49\u7A33\u95E8/\u7B2C7\u9501/\u4E0A\u6E38\u5B88\u536B\u5168\u90E8\u4E0D\u751F\u6548`}`
   );
   const issuer = createTokenIssuer({ secretFile: path18.join(opts.dir, "session-token-secret") });
-  const operatorActor = `actor:human:${os6.userInfo().username}`;
+  const operatorActor = `actor:human:${os5.userInfo().username}`;
   const operatorToken = issuer.issue(operatorActor);
   fs23.writeFileSync(path18.join(opts.dir, "operator-token"), operatorToken, { mode: 384 });
   let nodeTokens = createNodeTokenStore(path18.join(opts.dir, "node-tokens.json"));
@@ -168814,7 +168979,8 @@ async function startServe(opts) {
         gatewayUrl: opts.gatewayUrl ?? `ws://127.0.0.1:${opts.port ?? 7320}/node-gateway`,
         repoRemote: opts.nodeRepoRemote ?? "git@github.com:open-friday/oasis-core.git",
         nodeHealth,
-        activeRunCountOf
+        activeRunCountOf,
+        fetchLatestNpmDaemonVersion
       }),
       collabDomain({
         kernel,
@@ -168893,301 +169059,309 @@ async function startServe(opts) {
     discussSessions: new FileSideMap(path18.join(opts.dir, "discuss-sessions.json")),
     escalateDiscussRetain: new FileSideMap(path18.join(opts.dir, "escalate-discuss-retain.json")),
     // 切片 2b：代署 escalate 发起会话保留（落盘）
-    dispatchChat: async ({ actorId, message, sessionId, chatSessionId, attachments, workspace, companyId }) => {
-      const runCompanyId = companyId ?? defaultCompanyId;
-      const actorCtxForCompany = await actors.resolveCtx(runCompanyId);
-      const actorService = actorCtxForCompany.service;
-      const binding = await actorService.resolveBinding()(actorId);
-      if (!binding) {
-        throw new ApiError(409, "ACTOR_BINDING_MISSING", `\u6570\u5B57\u5458\u5DE5 ${actorId} \u6CA1\u6709 active runtime \u7ED1\u5B9A`);
-      }
-      const node = hub?.connectedDaemons().find((d) => d.daemonId === binding.nodeId);
-      if (!node) {
-        throw new ApiError(409, "NODE_OFFLINE", `\u7ED1\u5B9A\u8282\u70B9 ${binding.nodeId} \u5F53\u524D\u4E0D\u5728\u7EBF`);
-      }
-      if (!node.meta.adapters.includes(binding.runtimeKind)) {
-        throw new ApiError(409, "RUNTIME_UNAVAILABLE", `\u8282\u70B9 ${binding.nodeId} \u672A\u4E0A\u62A5\u8FD0\u884C\u65F6 ${binding.runtimeKind}`);
-      }
-      if (!chatRemoteAdapter) {
-        throw new ApiError(503, "NODE_GATEWAY_NOT_READY", "node-gateway \u5C1A\u672A\u5C31\u7EEA");
-      }
-      if (!localUrl) {
-        throw new ApiError(503, "SERVER_URL_NOT_READY", "server URL \u5C1A\u672A\u5C31\u7EEA");
-      }
-      const priorChatSession = chatSessionId ? await chatSessionStore?.getSession(chatSessionId).catch(() => null) : null;
-      const freshChatWorkdir = chatSessionId ? chatNodeChanged(
-        { nodeId: priorChatSession?.runtimeId, runtimeKind: priorChatSession?.runtimeKind },
-        { nodeId: binding.nodeId, runtimeKind: binding.runtimeKind }
-      ) : false;
-      const runtimeSessionId = sessionId ?? (0, import_node_crypto28.randomUUID)();
-      const resumeRuntimeSession = Boolean(sessionId);
-      const traceRunId = `chat-run:${(0, import_node_crypto28.randomUUID)()}`;
-      const artifactId = `artifact:chat:${(0, import_node_crypto28.randomUUID)()}`;
-      const traceStartedAt = (/* @__PURE__ */ new Date()).toISOString();
-      let traceSeq = 0;
-      let lastProgressTouchMs = 0;
-      const PROGRESS_TOUCH_THROTTLE_MS2 = 2e4;
-      let traceEnabled = true;
-      const analyzedRunId = chatSessionId ? (await chatSessionStore.getSession(chatSessionId).catch(() => null))?.analyzedRunId ?? void 0 : void 0;
-      let traceChain = traceStore.createRun({
-        id: traceRunId,
-        actorId,
-        runtimeKind: traceRuntimeKind(binding.runtimeKind),
-        runtimeInstanceId: `runtime:${binding.nodeId}:${binding.runtimeKind}`,
-        triggerKind: "api",
-        triggerRef: runtimeSessionId,
-        jobKey: runtimeSessionId,
-        artifactId,
-        action: "chat",
-        startedAt: traceStartedAt,
-        metadata: {
-          runtimeSessionId,
-          nodeId: binding.nodeId,
-          runtimeKind: binding.runtimeKind,
-          messagePreview: message.slice(0, 500),
-          ...analyzedRunId ? { analyzedRunId } : {}
-        }
-      }).then(async () => {
-        await traceStore.appendEvents(traceRunId, [
-          {
-            seq: ++traceSeq,
-            eventType: "run.started",
-            stream: "runtime",
-            message: `chat ${actorId}`,
-            startedAt: traceStartedAt
-          },
-          {
-            seq: ++traceSeq,
-            eventType: "input.message",
-            stream: "model",
-            actorId,
-            message: message.slice(0, 500),
-            payload: { text: message },
-            startedAt: traceStartedAt
-          }
-        ]);
-      }).catch((err) => {
-        traceEnabled = false;
-        console.warn(`[trace] chat run create failed: ${String(err)}`);
-      });
-      const enqueueTrace = (step) => {
-        if (!traceEnabled) return;
-        traceChain = traceChain.then(async () => {
-          if (traceEnabled) await step();
+    dispatchChat: async (chatReq) => {
+      const dispatchChatImpl = async ({ actorId, message, sessionId, chatSessionId, attachments, workspace, companyId }) => {
+        const runCompanyId = companyId ?? defaultCompanyId;
+        const actorCtxForCompany = await actors.resolveCtx(runCompanyId);
+        const actorService = actorCtxForCompany.service;
+        const binding = await actorService.resolveBinding()(actorId);
+        if (!binding) {
+          throw new ApiError(409, "ACTOR_BINDING_MISSING", `\u6570\u5B57\u5458\u5DE5 ${actorId} \u6CA1\u6709 active runtime \u7ED1\u5B9A`);
+        }
+        const node = hub?.connectedDaemons().find((d) => d.daemonId === binding.nodeId);
+        if (!node) {
+          throw new ApiError(409, "NODE_OFFLINE", `\u7ED1\u5B9A\u8282\u70B9 ${binding.nodeId} \u5F53\u524D\u4E0D\u5728\u7EBF`);
+        }
+        if (!node.meta.adapters.includes(binding.runtimeKind)) {
+          throw new ApiError(409, "RUNTIME_UNAVAILABLE", `\u8282\u70B9 ${binding.nodeId} \u672A\u4E0A\u62A5\u8FD0\u884C\u65F6 ${binding.runtimeKind}`);
+        }
+        if (!chatRemoteAdapter) {
+          throw new ApiError(503, "NODE_GATEWAY_NOT_READY", "node-gateway \u5C1A\u672A\u5C31\u7EEA");
+        }
+        if (!localUrl) {
+          throw new ApiError(503, "SERVER_URL_NOT_READY", "server URL \u5C1A\u672A\u5C31\u7EEA");
+        }
+        const priorChatSession = chatSessionId ? await chatSessionStore?.getSession(chatSessionId).catch(() => null) : null;
+        const freshChatWorkdir = chatSessionId ? chatNodeChanged(
+          { nodeId: priorChatSession?.runtimeId, runtimeKind: priorChatSession?.runtimeKind },
+          { nodeId: binding.nodeId, runtimeKind: binding.runtimeKind }
+        ) : false;
+        const runtimeSessionId = sessionId ?? (0, import_node_crypto28.randomUUID)();
+        const resumeRuntimeSession = Boolean(sessionId);
+        const traceRunId = `chat-run:${(0, import_node_crypto28.randomUUID)()}`;
+        const artifactId = `artifact:chat:${(0, import_node_crypto28.randomUUID)()}`;
+        const traceStartedAt = (/* @__PURE__ */ new Date()).toISOString();
+        let traceSeq = 0;
+        let lastProgressTouchMs = 0;
+        const PROGRESS_TOUCH_THROTTLE_MS2 = 2e4;
+        let traceEnabled = true;
+        const analyzedRunId = chatSessionId ? (await chatSessionStore.getSession(chatSessionId).catch(() => null))?.analyzedRunId ?? void 0 : void 0;
+        let traceChain = traceStore.createRun({
+          id: traceRunId,
+          actorId,
+          runtimeKind: traceRuntimeKind(binding.runtimeKind),
+          runtimeInstanceId: `runtime:${binding.nodeId}:${binding.runtimeKind}`,
+          triggerKind: "api",
+          triggerRef: runtimeSessionId,
+          jobKey: runtimeSessionId,
+          artifactId,
+          action: "chat",
+          startedAt: traceStartedAt,
+          metadata: {
+            runtimeSessionId,
+            nodeId: binding.nodeId,
+            runtimeKind: binding.runtimeKind,
+            messagePreview: message.slice(0, 500),
+            ...analyzedRunId ? { analyzedRunId } : {}
+          }
+        }).then(async () => {
+          await traceStore.appendEvents(traceRunId, [
+            {
+              seq: ++traceSeq,
+              eventType: "run.started",
+              stream: "runtime",
+              message: `chat ${actorId}`,
+              startedAt: traceStartedAt
+            },
+            {
+              seq: ++traceSeq,
+              eventType: "input.message",
+              stream: "model",
+              actorId,
+              message: message.slice(0, 500),
+              payload: { text: message },
+              startedAt: traceStartedAt
+            }
+          ]);
         }).catch((err) => {
           traceEnabled = false;
-          console.warn(`[trace] chat run ${traceRunId} failed: ${String(err)}`);
+          console.warn(`[trace] chat run create failed: ${String(err)}`);
         });
-      };
-      const provision = await buildActorProvision(actorService, actorId);
-      const actorCtx = await buildActorContext(actorService, actorId).catch(() => null);
-      const chatResolvedModel = (() => {
-        if (actorCtx?.config?.model) return actorCtx.config.model;
-        return void 0;
-      })();
-      const chatModel = chatResolvedModel ?? await registryStore.getRuntimeConfig(`runtime:${binding.nodeId}:${binding.runtimeKind}`).then((c) => c?.model).catch(() => void 0) ?? void 0;
-      const chatModelSource = chatResolvedModel ? "actor_config" : chatModel ? "runtime_default" : null;
-      const attachmentFiles = {};
-      const attachmentBinary = {};
-      const attachmentPaths = [];
-      const usedRel = /* @__PURE__ */ new Set();
-      for (const att of attachments ?? []) {
-        const safe = (att.name || "attachment").replace(/[^\w.\-]+/g, "_").replace(/^\.+/, "").slice(0, 80) || "attachment";
-        let rel = `inputs/attachments/${safe}`;
-        let n = 1;
-        while (usedRel.has(rel)) rel = `inputs/attachments/${n++}-${safe}`;
-        usedRel.add(rel);
-        if (typeof att.text === "string") {
-          attachmentFiles[rel] = att.text;
-          attachmentPaths.push(rel);
-        } else if (att.blobRef) {
-          try {
-            const bytes = await assets.get(att.blobRef);
-            attachmentBinary[rel] = Buffer.from(bytes).toString("base64");
+        const enqueueTrace = (step) => {
+          if (!traceEnabled) return;
+          traceChain = traceChain.then(async () => {
+            if (traceEnabled) await step();
+          }).catch((err) => {
+            traceEnabled = false;
+            console.warn(`[trace] chat run ${traceRunId} failed: ${String(err)}`);
+          });
+        };
+        const provision = await buildActorProvision(actorService, actorId);
+        const actorCtx = await buildActorContext(actorService, actorId).catch(() => null);
+        const chatResolvedModel = (() => {
+          if (actorCtx?.config?.model) return actorCtx.config.model;
+          return void 0;
+        })();
+        const chatModel = chatResolvedModel ?? await registryStore.getRuntimeConfig(`runtime:${binding.nodeId}:${binding.runtimeKind}`).then((c) => c?.model).catch(() => void 0) ?? void 0;
+        const chatModelSource = chatResolvedModel ? "actor_config" : chatModel ? "runtime_default" : null;
+        const attachmentFiles = {};
+        const attachmentBinary = {};
+        const attachmentPaths = [];
+        const usedRel = /* @__PURE__ */ new Set();
+        for (const att of attachments ?? []) {
+          const safe = (att.name || "attachment").replace(/[^\w.\-]+/g, "_").replace(/^\.+/, "").slice(0, 80) || "attachment";
+          let rel = `inputs/attachments/${safe}`;
+          let n = 1;
+          while (usedRel.has(rel)) rel = `inputs/attachments/${n++}-${safe}`;
+          usedRel.add(rel);
+          if (typeof att.text === "string") {
+            attachmentFiles[rel] = att.text;
             attachmentPaths.push(rel);
-          } catch (err) {
-            console.warn(`[chat] \u9644\u4EF6 blob ${att.blobRef} \u8BFB\u53D6\u5931\u8D25: ${String(err)}`);
-          }
-        }
-      }
-      const sessionLine = chatSessionId ? `chat_session_id: ${chatSessionId}` : `runtime_session_id: ${runtimeSessionId}`;
-      const taskHeader = workspace ? [
-        "# \u4E0E\u5DE5\u5355\u7BA1\u7406\u8005\u5BF9\u8BDD",
-        "",
-        sessionLine,
-        `actor_id: ${actorId}`,
-        `workspace: ${workspace}`,
-        "",
-        CONVERSATIONAL_MANAGER_BODY
-      ] : [
-        "# \u5373\u65F6\u8111\u66B4\u5BF9\u8BDD",
-        "",
-        sessionLine,
-        `actor_id: ${actorId}`,
-        "",
-        "\u8BF7\u76F4\u63A5\u56DE\u7B54\u7528\u6237\u95EE\u9898\u3002\u9664\u975E\u7528\u6237\u660E\u786E\u8981\u6C42\u5199\u5165\u7CFB\u7EDF\uFF0C\u5426\u5219\u4E0D\u8981\u521B\u5EFA\u6216\u4FEE\u6539 artifact\u3002"
-      ];
-      const files = {
-        "TASK.md": [
-          ...taskHeader,
-          ...attachmentPaths.length ? ["", "## \u7528\u6237\u9644\u4EF6", "", "\u7528\u6237\u968F\u6D88\u606F\u9644\u5E26\u4E86\u4EE5\u4E0B\u6587\u4EF6\uFF08\u5728\u4F60\u7684\u5DE5\u4F5C\u76EE\u5F55\u4E0B\uFF0C\u53EF\u76F4\u63A5\u8BFB\u53D6\uFF09\uFF1A", ...attachmentPaths.map((p2) => `- ${p2}`)] : [],
+          } else if (att.blobRef) {
+            try {
+              const bytes = await assets.get(att.blobRef);
+              attachmentBinary[rel] = Buffer.from(bytes).toString("base64");
+              attachmentPaths.push(rel);
+            } catch (err) {
+              console.warn(`[chat] \u9644\u4EF6 blob ${att.blobRef} \u8BFB\u53D6\u5931\u8D25: ${String(err)}`);
+            }
+          }
+        }
+        const sessionLine = chatSessionId ? `chat_session_id: ${chatSessionId}` : `runtime_session_id: ${runtimeSessionId}`;
+        const taskHeader = workspace ? [
+          "# \u4E0E\u5DE5\u5355\u7BA1\u7406\u8005\u5BF9\u8BDD",
           "",
-          "## \u7528\u6237\u6D88\u606F",
+          sessionLine,
+          `actor_id: ${actorId}`,
+          `workspace: ${workspace}`,
           "",
-          message
-        ].join("\n")
-      };
-      Object.assign(files, attachmentFiles);
-      if (actorCtx?.config?.prompt) {
-        Object.assign(files, splitIdentityFiles3(actorCtx.config.prompt));
-      }
-      if (!SKILL_CACHE_RUNTIMES.has(binding.runtimeKind)) {
-        Object.assign(files, materializeBuiltins(builtinSkills, binding.runtimeKind));
-        Object.assign(files, await materializeSkillFiles({
-          service: actorService,
-          actorId,
-          runtimeKind: binding.runtimeKind
-        }).catch((err) => {
-          console.warn(`[chat] skill materialize failed for ${actorId}: ${String(err)}`);
-          return {};
-        }));
-      }
-      const limits = { wallClockMs: SESSION_WALL_CLOCK_MS.chat };
-      const handle = await chatRemoteAdapter.spawn({
-        actor: actorId,
-        actorToken: issueSessionToken(actorId, { artifactId, action: "chat", limits, binding, sessionId: runtimeSessionId, companyId: runCompanyId, ...chatSessionId !== void 0 ? { chatSessionId } : {} }),
-        artifactId,
-        bundle: { files, ...Object.keys(attachmentBinary).length ? { binaryFiles: attachmentBinary } : {} },
-        ...actorCtx?.config?.prompt ? { systemPrompt: actorCtx.config.prompt } : {},
-        ...chatModel ? { model: chatModel } : {},
-        // ADR-0053 D1：chat 的**会话线 id 是 chatSessionId**（Oasis 命名空间、跨轮不变），不是 rtId
-        // （rtId 跨轮会变：换节点时服务端主动清掉它、codex/ACP 还会自己另分配）。
-        //
-        // 没有 chatSessionId → **不给 workdirKey** → 落 one-shot，这是契约的直接应用而不是折中：
-        // 服务端对这种请求也不落库消息（persistTarget 要求 chatSessionId），没有会话线、没有历史，
-        // 本就没什么可续的。产品路径跑不到这条分支（前端三个调用方都保证先建会话再传），只兜住
-        // 裸 API 调用。
-        ...chatSessionId ? { workdirKey: `chat:${chatSessionId}` } : {},
-        // 与上一条成对：稳定目录一上，A→B→A 回到 node1 就会撞见同名目录里 A 自己 N 轮前的陈旧
-        // 文件（而注入的历史正告诉它「B 改了 X」）。切根前没这问题纯属侥幸——那时换节点会清掉
-        // rtId、rtId 又是目录名，"新目录"是副产品；稳定目录一上，侥幸就没了。
-        //
-        // **在这儿算，不放进 ChatDispatchRequest**：本函数是唯一同时握着 binding 与 chatSessionId
-        // 的地方，四个调用方（/api/chat、discuss、飞书入站、草案评审通知）全覆盖且谁都不用记得
-        // 传。放进契约就等于要求每个调用方自己算，而其中三个压根不碰 binding。
-        ...freshChatWorkdir ? { freshWorkdir: true } : {},
-        runtimeSessionId,
-        resumeRuntimeSession,
-        server: { url: serverUrlForBinding(binding) },
-        binding,
-        limits,
-        // OASIS_STAGE=1：chat agent 的改图命令（edit/link/spawn/cancel）经 /api/stage → 草案路由
-        // （建单/改图暂存统一，见 docs/proposals/draft-edit-unification.md）。
-        // OASIS_WORKSPACE：给定工单（协调者对话）时绑上——staged 编辑的 type:title 在本工单范围解析，
-        // 产出的草案 plan.workspace = 本工单，前端「待确认变更」按工单过滤才抓得到。普通脑暴不传，保持不绑。
-        env: {
-          ...provision.env,
-          OASIS_STAGE: "1",
-          ...chatSessionId ? { OASIS_CHAT_SESSION_ID: chatSessionId } : {},
-          ...workspace ? { OASIS_WORKSPACE: workspace } : {}
-        },
-        wrapperPaths: provision.wrapperPaths,
-        ...provision.requiredTools.length > 0 ? { requiredTools: provision.requiredTools } : {}
-      });
-      const chatJobKey = `chat::${artifactId}`;
-      chatLiveSessions.set(chatJobKey, { artifactId, sessionId: traceRunId, dispatchId: handle.id, kill: () => handle.kill() });
-      enqueueTrace(async () => {
-        const run = await traceStore.getRun(traceRunId);
-        if (!run) return;
-        const base = run.metadata && typeof run.metadata === "object" && !Array.isArray(run.metadata) ? run.metadata : {};
-        await traceStore.updateRun(traceRunId, {
-          metadata: { ...base, dispatchId: handle.id },
-          // 恢复路径拿不到 dispatchChat 闭包里的 fallback 解析结果，开跑时先写进账本；退出帧若上报
-          // 更精确 model 仍会覆盖为 runtime 来源。
-          ...chatModel ? { effectiveModel: chatModel, modelSource: chatModelSource } : {}
+          CONVERSATIONAL_MANAGER_BODY
+        ] : [
+          "# \u5373\u65F6\u8111\u66B4\u5BF9\u8BDD",
+          "",
+          sessionLine,
+          `actor_id: ${actorId}`,
+          "",
+          "\u8BF7\u76F4\u63A5\u56DE\u7B54\u7528\u6237\u95EE\u9898\u3002\u9664\u975E\u7528\u6237\u660E\u786E\u8981\u6C42\u5199\u5165\u7CFB\u7EDF\uFF0C\u5426\u5219\u4E0D\u8981\u521B\u5EFA\u6216\u4FEE\u6539 artifact\u3002"
+        ];
+        const files = {
+          "TASK.md": [
+            ...taskHeader,
+            ...attachmentPaths.length ? ["", "## \u7528\u6237\u9644\u4EF6", "", "\u7528\u6237\u968F\u6D88\u606F\u9644\u5E26\u4E86\u4EE5\u4E0B\u6587\u4EF6\uFF08\u5728\u4F60\u7684\u5DE5\u4F5C\u76EE\u5F55\u4E0B\uFF0C\u53EF\u76F4\u63A5\u8BFB\u53D6\uFF09\uFF1A", ...attachmentPaths.map((p2) => `- ${p2}`)] : [],
+            "",
+            "## \u7528\u6237\u6D88\u606F",
+            "",
+            message
+          ].join("\n")
+        };
+        Object.assign(files, attachmentFiles);
+        if (actorCtx?.config?.prompt) {
+          Object.assign(files, splitIdentityFiles3(actorCtx.config.prompt));
+        }
+        if (!SKILL_CACHE_RUNTIMES.has(binding.runtimeKind)) {
+          Object.assign(files, materializeBuiltins(builtinSkills, binding.runtimeKind));
+          Object.assign(files, await materializeSkillFiles({
+            service: actorService,
+            actorId,
+            runtimeKind: binding.runtimeKind
+          }).catch((err) => {
+            console.warn(`[chat] skill materialize failed for ${actorId}: ${String(err)}`);
+            return {};
+          }));
+        }
+        const limits = { wallClockMs: SESSION_WALL_CLOCK_MS.chat };
+        const handle = await chatRemoteAdapter.spawn({
+          actor: actorId,
+          actorToken: issueSessionToken(actorId, { artifactId, action: "chat", limits, binding, sessionId: runtimeSessionId, companyId: runCompanyId, ...chatSessionId !== void 0 ? { chatSessionId } : {} }),
+          artifactId,
+          bundle: { files, ...Object.keys(attachmentBinary).length ? { binaryFiles: attachmentBinary } : {} },
+          ...actorCtx?.config?.prompt ? { systemPrompt: actorCtx.config.prompt } : {},
+          ...chatModel ? { model: chatModel } : {},
+          // ADR-0053 D1：chat 的**会话线 id 是 chatSessionId**（Oasis 命名空间、跨轮不变），不是 rtId
+          // （rtId 跨轮会变：换节点时服务端主动清掉它、codex/ACP 还会自己另分配）。
+          //
+          // 没有 chatSessionId → **不给 workdirKey** → 落 one-shot，这是契约的直接应用而不是折中：
+          // 服务端对这种请求也不落库消息（persistTarget 要求 chatSessionId），没有会话线、没有历史，
+          // 本就没什么可续的。产品路径跑不到这条分支（前端三个调用方都保证先建会话再传），只兜住
+          // 裸 API 调用。
+          ...chatSessionId ? { workdirKey: `chat:${chatSessionId}` } : {},
+          // 与上一条成对：稳定目录一上，A→B→A 回到 node1 就会撞见同名目录里 A 自己 N 轮前的陈旧
+          // 文件（而注入的历史正告诉它「B 改了 X」）。切根前没这问题纯属侥幸——那时换节点会清掉
+          // rtId、rtId 又是目录名，"新目录"是副产品；稳定目录一上，侥幸就没了。
+          //
+          // **在这儿算，不放进 ChatDispatchRequest**：本函数是唯一同时握着 binding 与 chatSessionId
+          // 的地方，四个调用方（/api/chat、discuss、飞书入站、草案评审通知）全覆盖且谁都不用记得
+          // 传。放进契约就等于要求每个调用方自己算，而其中三个压根不碰 binding。
+          ...freshChatWorkdir ? { freshWorkdir: true } : {},
+          runtimeSessionId,
+          resumeRuntimeSession,
+          server: { url: serverUrlForBinding(binding) },
+          binding,
+          limits,
+          // OASIS_STAGE=1：chat agent 的改图命令（edit/link/spawn/cancel）经 /api/stage → 草案路由
+          // （建单/改图暂存统一，见 docs/proposals/draft-edit-unification.md）。
+          // OASIS_WORKSPACE：给定工单（协调者对话）时绑上——staged 编辑的 type:title 在本工单范围解析，
+          // 产出的草案 plan.workspace = 本工单，前端「待确认变更」按工单过滤才抓得到。普通脑暴不传，保持不绑。
+          env: {
+            ...provision.env,
+            OASIS_STAGE: "1",
+            ...chatSessionId ? { OASIS_CHAT_SESSION_ID: chatSessionId } : {},
+            ...workspace ? { OASIS_WORKSPACE: workspace } : {}
+          },
+          wrapperPaths: provision.wrapperPaths,
+          ...provision.requiredTools.length > 0 ? { requiredTools: provision.requiredTools } : {}
         });
-      });
-      const buffered = [];
-      const bufferedTelemetry = [];
-      const outputCbs = [];
-      const telemetryCbs = [];
-      handle.onOutput?.((chunk) => {
-        if (outputCbs.length === 0) buffered.push(chunk);
-        for (const cb of outputCbs) cb(chunk);
-      });
-      handle.onTelemetry?.((event) => {
-        if (telemetryCbs.length === 0) bufferedTelemetry.push(event);
-        for (const cb of telemetryCbs) cb(event);
-        if (event.kind === "system") {
-          const ms = Date.parse(event.ts);
-          if (!Number.isNaN(ms) && ms - lastProgressTouchMs >= PROGRESS_TOUCH_THROTTLE_MS2) {
-            lastProgressTouchMs = ms;
-            enqueueTrace(() => traceStore.updateRun(traceRunId, { lastProgressAt: event.ts }).then(() => void 0));
+        const chatJobKey = `chat::${artifactId}`;
+        chatLiveSessions.set(chatJobKey, { artifactId, sessionId: traceRunId, dispatchId: handle.id, kill: () => handle.kill() });
+        enqueueTrace(async () => {
+          const run = await traceStore.getRun(traceRunId);
+          if (!run) return;
+          const base = run.metadata && typeof run.metadata === "object" && !Array.isArray(run.metadata) ? run.metadata : {};
+          await traceStore.updateRun(traceRunId, {
+            metadata: { ...base, dispatchId: handle.id },
+            // 恢复路径拿不到 dispatchChat 闭包里的 fallback 解析结果，开跑时先写进账本；退出帧若上报
+            // 更精确 model 仍会覆盖为 runtime 来源。
+            ...chatModel ? { effectiveModel: chatModel, modelSource: chatModelSource } : {}
+          });
+        });
+        const buffered = [];
+        const bufferedTelemetry = [];
+        const outputCbs = [];
+        const telemetryCbs = [];
+        handle.onOutput?.((chunk) => {
+          if (outputCbs.length === 0) buffered.push(chunk);
+          for (const cb of outputCbs) cb(chunk);
+        });
+        handle.onTelemetry?.((event) => {
+          if (telemetryCbs.length === 0) bufferedTelemetry.push(event);
+          for (const cb of telemetryCbs) cb(event);
+          if (event.kind === "system") {
+            const ms = Date.parse(event.ts);
+            if (!Number.isNaN(ms) && ms - lastProgressTouchMs >= PROGRESS_TOUCH_THROTTLE_MS2) {
+              lastProgressTouchMs = ms;
+              enqueueTrace(() => traceStore.updateRun(traceRunId, { lastProgressAt: event.ts }).then(() => void 0));
+            }
+            return;
           }
-          return;
-        }
-        enqueueTrace(() => traceStore.appendEvents(traceRunId, [trajectoryEventToRunEvent(event, ++traceSeq)]).then(() => void 0));
-      });
-      let capturedNativeSessionId;
-      const done = new Promise((resolve5, reject) => {
-        handle.onExit((info) => {
-          chatLiveSessions.delete(chatJobKey);
-          void provision.cleanup();
-          const endedAt = (/* @__PURE__ */ new Date()).toISOString();
-          const durationMs = Date.parse(endedAt) - Date.parse(traceStartedAt);
-          if (info.runtimeSessionId) capturedNativeSessionId = info.runtimeSessionId;
-          enqueueTrace(async () => {
-            await traceStore.appendEvents(traceRunId, [{
-              seq: ++traceSeq,
-              eventType: "run.finished",
-              stream: "runtime",
-              message: `exit code=${info.code ?? "killed"}`,
-              startedAt: endedAt
-            }]);
-            const usage = info.usage ?? null;
-            const effectiveModel = info.model ?? chatModel ?? null;
-            const modelSource = info.model ? "runtime" : chatModelSource;
-            await traceStore.updateRun(traceRunId, {
-              status: info.reason === "timeout" ? "timeout" : info.reason === "cancelled" ? "cancelled" : info.code === 0 ? "succeeded" : "failed",
-              endedAt,
-              durationMs,
-              exitCode: info.code,
-              exitReason: info.reason ?? null,
-              transcriptRef: info.transcriptRef ?? null,
-              usage,
-              effectiveModel,
-              modelSource
+          enqueueTrace(() => traceStore.appendEvents(traceRunId, [trajectoryEventToRunEvent(event, ++traceSeq)]).then(() => void 0));
+        });
+        let capturedNativeSessionId;
+        const done = new Promise((resolve5, reject) => {
+          handle.onExit((info) => {
+            chatLiveSessions.delete(chatJobKey);
+            void provision.cleanup();
+            const endedAt = (/* @__PURE__ */ new Date()).toISOString();
+            const durationMs = Date.parse(endedAt) - Date.parse(traceStartedAt);
+            if (info.runtimeSessionId) capturedNativeSessionId = info.runtimeSessionId;
+            enqueueTrace(async () => {
+              await traceStore.appendEvents(traceRunId, [{
+                seq: ++traceSeq,
+                eventType: "run.finished",
+                stream: "runtime",
+                message: `exit code=${info.code ?? "killed"}`,
+                startedAt: endedAt
+              }]);
+              const usage = info.usage ?? null;
+              const effectiveModel = info.model ?? chatModel ?? null;
+              const modelSource = info.model ? "runtime" : chatModelSource;
+              await traceStore.updateRun(traceRunId, {
+                status: info.reason === "timeout" ? "timeout" : info.reason === "cancelled" ? "cancelled" : info.code === 0 ? "succeeded" : "failed",
+                endedAt,
+                durationMs,
+                exitCode: info.code,
+                exitReason: info.reason ?? null,
+                transcriptRef: info.transcriptRef ?? null,
+                usage,
+                effectiveModel,
+                modelSource
+              });
+              if (usage && traceStore.updateUsageAggregates) {
+                const run = await traceStore.getRun(traceRunId);
+                if (run) void traceStore.updateUsageAggregates(run).catch(() => {
+                });
+              }
             });
-            if (usage && traceStore.updateUsageAggregates) {
-              const run = await traceStore.getRun(traceRunId);
-              if (run) void traceStore.updateUsageAggregates(run).catch(() => {
-              });
+            const failed = info.code !== 0 || info.reason !== void 0 && info.reason !== "clean";
+            if (!failed) resolve5();
+            else {
+              reject(buildChatExitError(info));
             }
           });
-          const failed = info.code !== 0 || info.reason !== void 0 && info.reason !== "clean";
-          if (!failed) resolve5();
-          else {
-            reject(buildChatExitError(info));
-          }
         });
-      });
-      return {
-        id: runtimeSessionId,
-        runId: traceRunId,
-        onOutput(cb) {
-          for (const chunk of buffered.splice(0)) cb(chunk);
-          outputCbs.push(cb);
-        },
-        onTelemetry(cb) {
-          for (const event of bufferedTelemetry.splice(0)) cb(event);
-          telemetryCbs.push(cb);
-        },
-        done,
-        kill: () => handle.kill(),
-        get nativeSessionId() {
-          return capturedNativeSessionId;
-        }
+        return {
+          id: runtimeSessionId,
+          runId: traceRunId,
+          onOutput(cb) {
+            for (const chunk of buffered.splice(0)) cb(chunk);
+            outputCbs.push(cb);
+          },
+          onTelemetry(cb) {
+            for (const event of bufferedTelemetry.splice(0)) cb(event);
+            telemetryCbs.push(cb);
+          },
+          done,
+          kill: () => handle.kill(),
+          get nativeSessionId() {
+            return capturedNativeSessionId;
+          }
+        };
       };
+      const first = await dispatchChatImpl(chatReq);
+      if (!chatReq.fallbackMessage || !chatReq.sessionId) return first;
+      return makeResumeRetryProxy(
+        first,
+        () => dispatchChatImpl({ ...chatReq, sessionId: void 0, fallbackMessage: void 0, message: chatReq.fallbackMessage })
+      );
     },
     trajectoryFeed: {
       subscribe(sessionId, listener) {
@@ -170673,7 +170847,7 @@ async function runCli(argv, println = console.log) {
       const res = await fetch(`${httpBase2}/api/nodes/exchange`, {
         method: "POST",
         headers: { "content-type": "application/json" },
-        body: JSON.stringify({ enrollToken, nodeId, hostname: os9.hostname() })
+        body: JSON.stringify({ enrollToken, nodeId, hostname: os8.hostname() })
       });
       if (!res.ok) throw new Error(`enroll token exchange failed: HTTP ${res.status}`);
       const body = await res.json();
@@ -170706,7 +170880,7 @@ async function runCli(argv, println = console.log) {
       const binPath = path20.join(prefix, "bin", "oasis_test");
       const svcArgs = `node --server-ws ${serverUrl} --dir ${dir}${nodeName ? ` --name ${nodeName}` : ""}`;
       if (process.platform === "linux") {
-        const svcFile = path20.join(os9.homedir(), ".config/systemd/user/oasis-node.service");
+        const svcFile = path20.join(os8.homedir(), ".config/systemd/user/oasis-node.service");
         fs25.mkdirSync(path20.dirname(svcFile), { recursive: true });
         if (spawnSync("systemctl", ["--user", "is-active", "--quiet", "oasis-node"], {}).status === 0)
           spawnSync("systemctl", ["--user", "stop", "oasis-node"], { stdio: "inherit" });
@@ -170719,7 +170893,7 @@ async function runCli(argv, println = console.log) {
           `ExecStart=${binPath} ${svcArgs}`,
           // Carry the install-time PATH so the detached daemon detects CLIs in user dirs
           // (~/.npm-global/bin, ~/.local/bin) — systemd --user otherwise gives a minimal PATH.
-          `Environment=PATH=${process.env["PATH"] ?? ""}:${path20.join(os9.homedir(), ".npm-global/bin")}:${path20.join(os9.homedir(), ".local/bin")}:/usr/local/bin`,
+          `Environment=PATH=${process.env["PATH"] ?? ""}:${path20.join(os8.homedir(), ".npm-global/bin")}:${path20.join(os8.homedir(), ".local/bin")}:/usr/local/bin`,
           "Restart=on-failure",
           "RestartSec=5",
           "StandardOutput=journal",
@@ -170731,23 +170905,23 @@ async function runCli(argv, println = console.log) {
         ].join("\n"));
         spawnSync("systemctl", ["--user", "daemon-reload"], { stdio: "inherit" });
         spawnSync("systemctl", ["--user", "enable", "--now", "oasis-node"], { stdio: "inherit" });
-        spawnSync("loginctl", ["enable-linger", os9.userInfo().username], { stdio: "ignore" });
+        spawnSync("loginctl", ["enable-linger", os8.userInfo().username], { stdio: "ignore" });
         println("\u2713 Oasis node service started (systemd --user oasis-node)");
         println("  Status : systemctl --user status oasis-node");
         println("  Logs   : journalctl --user -u oasis-node -f");
         println("  Stop   : systemctl --user stop oasis-node");
       } else if (process.platform === "darwin") {
-        const plist = path20.join(os9.homedir(), "Library/LaunchAgents/com.oasis.node.plist");
+        const plist = path20.join(os8.homedir(), "Library/LaunchAgents/com.oasis.node.plist");
         fs25.mkdirSync(path20.dirname(plist), { recursive: true });
         spawnSync("launchctl", ["unload", plist], { stdio: "ignore" });
         const argXml = [binPath, "node", "--server-ws", serverUrl, "--dir", dir, ...nodeName ? ["--name", nodeName] : []].map((a) => `<string>${a}</string>`).join("");
-        fs25.writeFileSync(plist, `<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"><plist version="1.0"><dict><key>Label</key><string>com.oasis.node</string><key>ProgramArguments</key><array>${argXml}</array><key>RunAtLoad</key><true/><key>KeepAlive</key><true/><key>StandardOutPath</key><string>${os9.homedir()}/.oasis-node.log</string><key>StandardErrorPath</key><string>${os9.homedir()}/.oasis-node.err</string></dict></plist>`);
+        fs25.writeFileSync(plist, `<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"><plist version="1.0"><dict><key>Label</key><string>com.oasis.node</string><key>ProgramArguments</key><array>${argXml}</array><key>RunAtLoad</key><true/><key>KeepAlive</key><true/><key>StandardOutPath</key><string>${os8.homedir()}/.oasis-node.log</string><key>StandardErrorPath</key><string>${os8.homedir()}/.oasis-node.err</string></dict></plist>`);
         spawnSync("launchctl", ["load", plist], { stdio: "inherit" });
         println("\u2713 Oasis node service started (macOS LaunchAgent com.oasis.node)");
-        println(`  Logs : tail -f ${os9.homedir()}/.oasis-node.log`);
+        println(`  Logs : tail -f ${os8.homedir()}/.oasis-node.log`);
         println(`  Stop : launchctl unload ${plist}`);
       } else {
-        spawnSync("sh", ["-c", `nohup ${binPath} ${svcArgs} > ${path20.join(os9.homedir(), ".oasis-node.log")} 2>&1 &`], { stdio: "inherit" });
+        spawnSync("sh", ["-c", `nohup ${binPath} ${svcArgs} > ${path20.join(os8.homedir(), ".oasis-node.log")} 2>&1 &`], { stdio: "inherit" });
         println(`\u2713 Oasis node started in background (nohup). Logs: ~/.oasis-node.log`);
         println("  Note: no automatic restart on reboot in this environment.");
       }
@@ -170818,8 +170992,8 @@ async function runCli(argv, println = console.log) {
   if (command === "serve" && positional[0] === "install") {
     const absDir = path20.resolve(dir);
     const name = `oasis-serve-${path20.basename(absDir)}`;
-    const unitDir = flags.get("unit-dir") ?? path20.join(os9.homedir(), ".config", "systemd", "user");
-    const bin = flags.get("bin") ?? path20.join(os9.homedir(), ".local", "bin", "oasis");
+    const unitDir = flags.get("unit-dir") ?? path20.join(os8.homedir(), ".config", "systemd", "user");
+    const bin = flags.get("bin") ?? path20.join(os8.homedir(), ".local", "bin", "oasis");
     const port = flags.get("port") ?? "7320";
     const extra = (flags.get("dispatch") === "true" ? ` --dispatch true` : "") + (flags.has("model") ? ` --model ${flags.get("model")}` : "");
     const unit = [
@@ -171404,7 +171578,39 @@ ${res.warning}`);
     }
     case "design": {
       const sub = positional[0];
-      if (sub !== "run") throw new Error("\u7528\u6CD5\uFF1Aoasis design run <artifactId> [--brief <t>] [--reason <t>] [--od-url <url>] [--title <t>] [--agent <id>]");
+      const LEGACY_DESIGN_SYSTEM_PROMPT = "\u4F60\u662F\u8BBE\u8BA1\u5F15\u64CE\u4E2D\u7684\u754C\u9762\u8BBE\u8BA1\u5E08\u3002\u4EFB\u52A1\u4E66\u89C1\u672C\u6761\u6D88\u606F\uFF1B\u4E0A\u6E38\u8F93\u5165\u7B49\u4E0A\u4E0B\u6587\u6587\u4EF6\u5728\u9879\u76EE task-context/ \u76EE\u5F55\u3002\u6309\u4EFB\u52A1\u4E66\u7684\u300C\u600E\u4E48\u63D0\u4EA4\u300D\u534F\u8BAE\u5DE5\u4F5C\uFF1A\u4EA7\u51FA\u81EA\u5305\u542B HTML \u5165\u53E3\u7A3F\u4E0E acceptance.md\uFF0C\u5B8C\u6210\u5373\u7ED3\u675F\u56DE\u590D\uFF0C\u4EA4\u7A3F\u7531\u7CFB\u7EDF\u4EE3\u529E\u3002";
+      if (sub === "chat") {
+        const artifactId2 = needPos(positional, 1, "oasis design chat <artifactId> --message <t>");
+        const message2 = flags.get("message") ?? (["DESIGN_BRIEF.md", "TASK.md"].map((f2) => fs25.existsSync(f2) ? fs25.readFileSync(f2, "utf8") : "").find((s2) => s2.trim()) ?? "");
+        if (!message2.trim()) throw new Error("\u65E0\u5BF9\u8BDD\u5185\u5BB9\uFF1A\u7ED9 --message <text>\uFF0C\u6216\u5728\u5F53\u524D\u76EE\u5F55\u653E DESIGN_BRIEF.md / TASK.md");
+        const odBase2 = (flags.get("od-url") ?? process.env["OASIS_OPEN_DESIGN_URL"] ?? "http://127.0.0.1:7457").replace(/\/$/, "");
+        const isContinue = flags.get("turn") === "continue";
+        const contextFiles2 = {};
+        if (!isContinue) {
+          contextFiles2["DESIGN_BRIEF.md"] = message2;
+          if (fs25.existsSync("inputs") && fs25.statSync("inputs").isDirectory()) {
+            for (const f2 of readDirFiles("inputs")) {
+              contextFiles2[`inputs/${f2.path}`] = Buffer.from(f2.contentBase64, "base64").toString("utf8");
+            }
+          }
+        }
+        println(`[design] \u753B\u677F ${deriveBoardKey(artifactId2)} \u2190 ${artifactId2}\uFF1B${isContinue ? "\u7EED\u8F6E" : "\u9996\u8F6E"}\u5BF9\u8BDD\u9A71\u52A8 od \u5F15\u64CE ${odBase2} \u2026`);
+        const turn = await runDesignChatTurn({
+          base: odBase2,
+          agentId: flags.get("agent") ?? "claude",
+          artifactId: artifactId2,
+          title: flags.get("title") ?? artifactId2,
+          message: message2,
+          ...flags.get("system") !== void 0 ? { systemPrompt: flags.get("system") } : {},
+          ...isContinue ? {} : { contextFiles: contextFiles2 },
+          onLine: (line) => println(`[od] ${line.length > 500 ? line.slice(0, 500) + "\u2026" : line}`)
+        });
+        println(`[design] \u672C\u8F6E\u4EA4\u4ED8\uFF08board ${turn.boardKey}, run ${turn.runId.slice(0, 8)}, \u53EF\u89C1 user \u56DE\u5408 ${turn.userMessageId.slice(0, 8)}\uFF09\uFF1A`);
+        for (const a of turn.artifacts) println(`  - ${a.path}\uFF08${a.kind ?? "?"}\uFF09status=${a.status ?? "?"}${a.title ? ` \xB7 ${a.title}` : ""}`);
+        println(`[design] \u8BFB\u4EA7\u7269\u540E\u81EA\u884C\u51B3\u5B9A\uFF1A\u591F\u597D \u2192 oasis propose\uFF1B\u6709\u5206\u6B67/\u7F3A\u4FE1\u606F \u2192 oasis gap\uFF1B\u4E0D\u591F \u2192 \u518D\u4E00\u8F6E oasis design chat ${artifactId2} --turn continue --message "<\u4E0B\u4E00\u53E5>"`);
+        break;
+      }
+      if (sub !== "run") throw new Error("\u7528\u6CD5\uFF1Aoasis design run <artifactId> \u2026\uFF0C\u6216 oasis design chat <artifactId> --message <t> [--turn first|continue]");
       const artifactId = needPos(positional, 1, "oasis design run <artifactId>");
       const odBase = (flags.get("od-url") ?? process.env["OASIS_OPEN_DESIGN_URL"] ?? "http://127.0.0.1:7457").replace(/\/$/, "");
       const odPublic = (flags.get("od-public-url") ?? process.env["OASIS_OPEN_DESIGN_PUBLIC_URL"] ?? "https://design.open-friday.com").replace(/\/$/, "");
@@ -171425,7 +171631,7 @@ ${res.warning}`);
         artifactId,
         title: flags.get("title") ?? artifactId,
         message: brief,
-        systemPrompt: "\u4F60\u662F\u8BBE\u8BA1\u5F15\u64CE\u4E2D\u7684\u754C\u9762\u8BBE\u8BA1\u5E08\u3002\u4EFB\u52A1\u4E66\u89C1\u672C\u6761\u6D88\u606F\uFF1B\u4E0A\u6E38\u8F93\u5165\u7B49\u4E0A\u4E0B\u6587\u6587\u4EF6\u5728\u9879\u76EE task-context/ \u76EE\u5F55\u3002\u6309\u4EFB\u52A1\u4E66\u7684\u300C\u600E\u4E48\u63D0\u4EA4\u300D\u534F\u8BAE\u5DE5\u4F5C\uFF1A\u4EA7\u51FA\u81EA\u5305\u542B HTML \u5165\u53E3\u7A3F\u4E0E acceptance.md\uFF0C\u5B8C\u6210\u5373\u7ED3\u675F\u56DE\u590D\uFF0C\u4EA4\u7A3F\u7531\u7CFB\u7EDF\u4EE3\u529E\u3002",
+        systemPrompt: flags.get("system") ?? LEGACY_DESIGN_SYSTEM_PROMPT,
         contextFiles,
         onLine: (line) => println(`[od] ${line.length > 500 ? line.slice(0, 500) + "\u2026" : line}`)
       });
@@ -172064,12 +172270,12 @@ ${res.warning}`);
 init_src6();
 
 // src/index.ts
-var PKG_VERSION = true ? "0.1.60" : "dev";
-var OASIS_DIR = path21.join(os10.homedir(), ".oasis");
+var PKG_VERSION = true ? "0.1.61" : "dev";
+var OASIS_DIR = path21.join(os9.homedir(), ".oasis");
 var CONFIG_FILE = path21.join(OASIS_DIR, "node-config.json");
 var PID_FILE = path21.join(OASIS_DIR, "node.pid");
 var BIN_FILE = path21.join(OASIS_DIR, "bin", "oasis.js");
-var LOCAL_BIN = path21.join(os10.homedir(), ".local", "bin", "oasis");
+var LOCAL_BIN = path21.join(os9.homedir(), ".local", "bin", "oasis");
 var LOG_FILE = path21.join(OASIS_DIR, "node.log");
 var NPM_PREFIX = path21.join(OASIS_DIR, "npm-global");
 var PKG_NAME = "oasis_test";
@@ -172119,7 +172325,7 @@ exec node "${BIN_FILE}" "$@"
 }
 function setupAutostart() {
   const cmd = `${process.execPath} "${BIN_FILE}" --_daemon`;
-  const home = os10.homedir();
+  const home = os9.homedir();
   const extraBins = [
     path21.join(home, ".npm-global", "bin"),
     path21.join(home, ".local", "bin"),
@@ -172127,7 +172333,7 @@ function setupAutostart() {
   ];
   const daemonPath = [process.env["PATH"] ?? "", ...extraBins].filter(Boolean).join(":");
   if (process.platform === "linux") {
-    const unitDir = path21.join(os10.homedir(), ".config", "systemd", "user");
+    const unitDir = path21.join(os9.homedir(), ".config", "systemd", "user");
     fs26.mkdirSync(unitDir, { recursive: true });
     fs26.writeFileSync(path21.join(unitDir, "oasis-node.service"), [
       "[Unit]",
@@ -172151,7 +172357,7 @@ function setupAutostart() {
     } catch {
     }
   } else if (process.platform === "darwin") {
-    const plist = path21.join(os10.homedir(), "Library", "LaunchAgents", "com.oasis.node.plist");
+    const plist = path21.join(os9.homedir(), "Library", "LaunchAgents", "com.oasis.node.plist");
     fs26.mkdirSync(path21.dirname(plist), { recursive: true });
     fs26.writeFileSync(plist, `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -172314,7 +172520,7 @@ void (async () => {
       const res = await fetch(`${httpBase(serverUrl)}/api/nodes/exchange`, {
         method: "POST",
         headers: { "content-type": "application/json" },
-        body: JSON.stringify({ enrollToken, nodeId: derivedNodeId, hostname: os10.hostname() })
+        body: JSON.stringify({ enrollToken, nodeId: derivedNodeId, hostname: os9.hostname() })
       });
       if (!res.ok) throw new Error(`enroll token exchange failed: HTTP ${res.status}`);
       const body = await res.json();