oasis_test 0.1.3 → 0.1.5

package/dist/index.js

@@ -955,13 +955,6 @@ var init_chat = __esm({
   }
 });
 
-// ../contract/src/chat-session.ts
-var init_chat_session = __esm({
-  "../contract/src/chat-session.ts"() {
-    "use strict";
-  }
-});
-
 // ../contract/src/http-api.ts
 var init_http_api = __esm({
   "../contract/src/http-api.ts"() {
@@ -995,7 +988,6 @@ var init_src = __esm({
     init_telemetry();
     init_trace();
     init_chat();
-    init_chat_session();
     init_http_api();
   }
 });
@@ -1785,6 +1777,11 @@ var init_kernel = __esm({
       async seal(args) {
         this.ensureActive(args.artifactId);
         this.artifactOrThrow(args.artifactId);
+        if (args.reason === "cancelled") {
+          for (const edge of this.edgesTouching(args.artifactId)) {
+            await this.unlinkInput({ artifactId: edge.artifactId, to: edge.to, actor: args.actor });
+          }
+        }
         const payload = {
           reason: args.reason,
           ...args.note !== void 0 ? { note: args.note } : {}
@@ -1878,6 +1875,14 @@ var init_kernel = __esm({
           for (const a of fork.artifacts.values()) {
             if (lifecycleOf(fork, a.id) === "active" && !a.owner) violations.push(`active \u65E0 owner: ${a.id}`);
           }
+          for (const a of fork.artifacts.values()) {
+            if (lifecycleOf(fork, a.id) !== "active") continue;
+            for (const e of a.inputs) {
+              if (lifecycleOf(fork, e.to) === "sealed:cancelled") {
+                violations.push(`\u4F9D\u8D56\u5E9F\u5F03\u8282\u70B9: ${a.id} \u2192 ${e.to}\uFF08cancelled \u4E0D\u53EF\u88AB\u4F9D\u8D56\uFF1B\u6539\u6295\u6216\u64A4\u8FB9\uFF09`);
+              }
+            }
+          }
           for (const id of touched) {
             if (fork.artifacts.get(id)?.createdVia === "prereq" && this.prereqChainDepth(fork, id) > MAX_PREREQ_DEPTH) {
               violations.push(`\u524D\u7F6E\u94FE\u8D85\u4E0A\u9650 ${MAX_PREREQ_DEPTH}\uFF1A${id}\uFF08\u7591\u4F3C\u5931\u63A7\u9012\u5F52\uFF0C\u505C\u5728\u6B64\u3001\u5347\u4EBA\uFF09`);
@@ -1900,10 +1905,14 @@ var init_kernel = __esm({
             if (edge?.required) advisory.push(`\u65AD\u5F00 required \u8FB9 ${op.artifactId} \u2192 ${op.to}\uFF08\u627F\u91CD\u53EF\u80FD\uFF1A\u6D88\u8D39\u65B9\u518D\u6D3E\u751F\u5C06\u5931\u53BB\u6B64\u8F93\u5165\uFF09`);
           }
           if (op.action === "seal" && op.reason === "cancelled") {
-            const n = consumersOf(this.model, op.artifactId).length;
-            if (n > 0) advisory.push(`seal(cancelled) ${op.artifactId}\uFF1A${n} \u4E2A\u6D88\u8D39\u8005\u5C06\u5E26"\u5E9F\u5F03\u5730\u57FA"\u6807\u8BB0\uFF08\u5B50\u6811\u6E05\u7406\u662F\u4EBA\u7684\u5224\u65AD\uFF0C\xA711.6\uFF09`);
+            const edges = this.edgesTouching(op.artifactId).length;
+            const consumers = consumersOf(this.model, op.artifactId).length;
+            if (edges > 0)
+              advisory.push(
+                `cancel ${op.artifactId}\uFF1A\u81EA\u52A8\u65AD\u5F00 ${edges} \u6761\u76F8\u5173\u8FB9\uFF08\u53CC\u5411\uFF09` + (consumers > 0 ? `\uFF1B${consumers} \u4E2A\u6D88\u8D39\u8005\u5C06\u88AB\u91CD\u5524\u53BB\u6389\u5BF9\u5B83\u7684\u9002\u914D\u2014\u2014\u6309\u9700\u6539\u6295(link\u2192\u66FF\u4EE3)/\u7EA7\u8054 cancel` : "")
+              );
           }
-          if (op.action === "seal" && !isConcluded(this.model, op.artifactId)) {
+          if (op.action === "seal" && op.reason !== "cancelled" && !isConcluded(this.model, op.artifactId)) {
             const strandedConsumers = consumersOf(this.model, op.artifactId).filter(
               (c) => c.inputs.some((e) => e.to === op.artifactId && e.required)
             );
@@ -1930,37 +1939,6 @@ var init_kernel = __esm({
             advisory.push(`\u8282\u70B9\u4FE1\u606F\u4E3A\u7A7A\uFF1A${id} \u6CA1\u6709 title/description\u2014\u2014\u5EFA\u4E86\u4E2A\u6CA1\u8BF4\u660E\u7684\u8282\u70B9\uFF1F\uFF08\u4ECD\u53EF\u63D0\u4EA4\uFF0C\u8BF7\u786E\u8BA4\uFF09`);
           }
         }
-        const touchedWorkspaces = new Set(
-          touched.map((id) => fork.artifacts.get(id)?.workspace).filter((w) => !!w)
-        );
-        for (const ws of touchedWorkspaces) {
-          const members = [...fork.artifacts.values()].filter((a) => a.workspace === ws);
-          if (members.length < 2) continue;
-          const root = members.find((a) => a.type === "brief") ?? members.find((a) => a.inputs.length === 0);
-          if (!root) continue;
-          const seen = /* @__PURE__ */ new Set([root.id]);
-          const stack = [root.id];
-          while (stack.length > 0) {
-            const cur = stack.pop();
-            const neighbors = [
-              ...fork.artifacts.get(cur)?.inputs.map((e) => e.to) ?? [],
-              // 上游
-              ...consumersOf(fork, cur).map((c) => c.id)
-              // 下游
-            ];
-            for (const n of neighbors) {
-              if (fork.artifacts.has(n) && !seen.has(n)) {
-                seen.add(n);
-                stack.push(n);
-              }
-            }
-          }
-          for (const a of members) {
-            if (lifecycleOf(fork, a.id) === "active" && !seen.has(a.id)) {
-              advisory.push(`\u5B64\u5C9B\u8282\u70B9\uFF1A${a.id} \u4E0E\u6839 brief \u4E0D\u8FDE\u901A\u2014\u2014\u6F0F\u8FDE\u4F9D\u8D56\u8FB9\uFF1F\uFF08\u4ECD\u53EF\u63D0\u4EA4\uFF0C\u8BF7\u786E\u8BA4\u4E0D\u662F\u8BEF\u5EFA\uFF09`);
-            }
-          }
-        }
         const closure = /* @__PURE__ */ new Set();
         const expand = (id) => {
           for (const c of consumersOf(this.model, id)) {
@@ -2032,8 +2010,42 @@ var init_kernel = __esm({
         }
         return { interventionId, applied: constituents.length };
       }
-      /** 把 InterventionOp 词汇编译成按依赖序排列的 oplog 构件（spawn 先、seal 最后） */
+      /** D2：cancel 一个节点要断的所有相关边（双向）——消费者→它（C.inputs∋id）、它→上游（id.inputs∋U）。 */
+      edgesTouching(id) {
+        const out = [];
+        for (const c of consumersOf(this.model, id)) out.push({ artifactId: c.id, to: id });
+        for (const e of this.model.artifacts.get(id)?.inputs ?? []) out.push({ artifactId: id, to: e.to });
+        return out;
+      }
+      /** D2：cancel(id) 会级联断掉的相关边（双向）——供 stage 回显/preview 列明"断了哪些边"。 */
+      cancelCascadeEdges(id) {
+        return this.edgesTouching(id);
+      }
+      /**
+       * 编译 InterventionOp → oplog 构件。D2（决策 0017）：seal(cancelled) 级联展开——在该 seal **之前**
+       * 插入"断掉与本节点相关的所有边（双向）"的 unlink（趁本节点还 active：X→U 的 unlink 需 X active），再 seal；
+       * 去重 plan 里已显式 unlink 的边。accepted/frozen 不级联（输出保留、消费者继续依赖）。
+       */
       buildConstituents(plan) {
+        const already = new Set(
+          plan.ops.filter((o) => o.action === "unlink").map((o) => `${o.artifactId} ${o.to}`)
+        );
+        const out = [];
+        for (const c of this.buildConstituentsRaw(plan)) {
+          if (c.kind === "seal" && c.payload.reason === "cancelled") {
+            for (const edge of this.edgesTouching(c.artifactId)) {
+              const key = `${edge.artifactId} ${edge.to}`;
+              if (already.has(key)) continue;
+              already.add(key);
+              out.push({ artifactId: edge.artifactId, kind: "unlink_input", target: edge.artifactId, payload: { to: edge.to } });
+            }
+          }
+          out.push(c);
+        }
+        return out;
+      }
+      /** 把 InterventionOp 词汇编译成按依赖序排列的 oplog 构件（spawn 先、seal 最后） */
+      buildConstituentsRaw(plan) {
         const order = { spawn: 0, edit: 1, reopen: 2, assign: 3, link: 4, pin: 5, unlink: 6, cancelPart: 7, seal: 8, annotate: 9 };
         const sorted = [...plan.ops].sort((a, b) => order[a.action] - order[b.action]);
         const spawnedHere = new Set(plan.ops.flatMap((op) => op.action === "spawn" ? [op.id] : []));
@@ -2373,6 +2385,18 @@ async function assembleContext(args) {
   const headRev = head !== null ? model.revisions.get(head) : null;
   const headSpread = headRev !== null ? await spreadRevisionContent(blobs, headRev, files, "deliverable") : null;
   if (headSpread?.inlineText != null) files["deliverable/CONTENT.md"] = headSpread.inlineText;
+  let orphanBriefNote = null;
+  if (artifact.inputs.length === 0 && artifact.type !== "brief") {
+    const brief = [...model.artifacts.values()].find(
+      (a) => a.workspace === artifact.workspace && a.type === "brief" && a.id !== artifactId
+    );
+    const briefHead = brief?.currentRev ? model.revisions.get(brief.currentRev) ?? null : null;
+    if (brief && briefHead) {
+      const spread = await spreadRevisionContent(blobs, briefHead, files, "inputs/work-order");
+      if (spread.inlineText != null) files["inputs/work-order/CONTENT.md"] = spread.inlineText;
+      orphanBriefNote = `\u4F60\u6CA1\u6709\u4E0A\u6E38\u4F9D\u8D56\u2014\u2014\u4EE5\u5DE5\u5355\u6839 brief \`${brief.id}\` \u4E3A\u51C6\uFF08\u5DF2\u653E\u8FDB \`inputs/work-order/\`\uFF09\u3002`;
+    }
+  }
   const integrating = args.action === "integrate";
   const queuedParts = [];
   if (integrating) {
@@ -2410,11 +2434,16 @@ async function assembleContext(args) {
     whatLines.push(`\u628A\u4F60\u6D3E\u51FA\u53BB\u7684\u5404\u90E8\u4EF6\u6536\u53E3\u6210**\u4E00\u7248\u5B8C\u6574\u3001\u81EA\u6D3D\u7684 R\\***\u2014\u2014\u5404\u90E8\u4EF6\u5728\u54EA\u3001\u4EE5\u4EC0\u4E48\u4E3A\u5E95\u600E\u4E48\u5408\uFF0C\u89C1\u300C\u600E\u4E48\u63D0\u4EA4\u300D\uFF08\u968F\u5185\u5BB9\u7C7B\u578B\u4E0D\u540C\uFF09\u3002`);
   } else {
     if (unfoundedHere.length > 0) {
-      whyLines.push(`**\u8FD4\u5DE5\uFF1A\u4E0A\u6E38\u66F4\u65B0\u4E86**\u2014\u2014\u4F60\u5F53\u524D head \u57FA\u4E8E\u7684\u662F\u65E7\u7248\uFF0C\u8FD9\u4E9B\u4E0A\u6E38\u53D8\u4E86\uFF08diff \u5982\u4E0B\uFF09\uFF1A`);
+      whyLines.push(`**\u8FD4\u5DE5\uFF1A\u4F60\u4F9D\u8D56\u7684\u4E0A\u6E38\u53D8\u4E86**\u2014\u2014\u4F60\u5F53\u524D head \u57FA\u4E8E\u65E7\u60C5\u51B5\uFF1B\u4E0B\u5217\u4E0A\u6E38\u6709\u53D8\uFF08\u66F4\u65B0\uFF0F\u88AB\u65AD\u6216\u5E9F\u5F03\uFF09\uFF0C\u636E\u6B64\u4FEE\u8BA2\u4F60\u7684\u4EA7\u7269\uFF1A`);
       for (const u of unfoundedHere) {
         const oldC = await contentMapOf(u.basedOn ? model.revisions.get(u.basedOn) ?? null : null);
         const newC = u.pinned ? await contentMapOf(model.revisions.get(u.pinned) ?? null) : /* @__PURE__ */ new Map();
-        whyLines.push(`- \u4E0A\u6E38 ${u.upstream}\uFF08${(u.basedOn ?? "\u2205").slice(9, 17)} \u2192 ${(u.pinned ?? "\u2205").slice(9, 17)}\uFF09\uFF1A`);
+        if (u.pinned === null) {
+          const status = lifecycleOf(model, u.upstream) === "sealed:cancelled" ? "\u5DF2\u5E9F\u5F03(cancelled)" : "\u5DF2\u65AD\u5F00(unlink)";
+          whyLines.push(`- \u4E0A\u6E38 ${u.upstream} **${status}**\uFF08\u4F60\u66FE\u57FA\u4E8E\u5B83\u7684 ${(u.basedOn ?? "\u2205").slice(9, 17)} \u7248\uFF09\uFF1A**\u53BB\u6389\u4F60\u4EA7\u7269\u91CC\u4F9D\u8D56\u5B83\u7684\u90E8\u5206**\uFF08\u5B83\u7684\u65E7\u5185\u5BB9\u89C1\u4E0B\uFF09\uFF1A`);
+        } else {
+          whyLines.push(`- \u4E0A\u6E38 ${u.upstream}\uFF08${(u.basedOn ?? "\u2205").slice(9, 17)} \u2192 ${(u.pinned ?? "\u2205").slice(9, 17)}\uFF09\uFF1A`);
+        }
         whyLines.push(oldC !== null && newC !== null ? manifestDiff(oldC, newC) : `\uFF08\u4EE3\u7801-git\uFF1A\u7528 \`git log -p\` \u81EA\u67E5\uFF1B\u65B0\u7248\u4E5F\u5728 inputs/ \u91CC\uFF09`);
       }
       whatLines.push(`\u636E\u4E0A\u6E38\u65B0\u7248**\u66F4\u65B0\u53D7\u5F71\u54CD\u7684\u90E8\u5206**\u3001\u91CD\u65B0\u63D0\u4EA4\uFF1B\u4E0D\u53D7\u5F71\u54CD\u7684\u522B\u52A8\uFF08\u600E\u4E48\u843D\u89C1\u300C\u600E\u4E48\u63D0\u4EA4\u300D\uFF09\u3002`);
@@ -2500,6 +2529,7 @@ async function assembleContext(args) {
     `- type: ${artifact.type}${typeDef ? `\uFF08contentType=${typeDef.contentType}\uFF09` : ""}`,
     `- \u4F60\u662F **${typeDef?.ownerRole ?? "owner"}**\uFF08\u4F60\u7684\u4E13\u957F/\u98CE\u683C\u89C1 \`identity/\`\uFF09`,
     `- \u5F53\u524D head: ${head ?? "\u2205\uFF08\u80DA\u80CE\u671F\u2014\u2014\u8BF7\u4EA7\u51FA\u9996\u4E2A revision\uFF09"}`,
+    ...orphanBriefNote ? [`- \u2693 ${orphanBriefNote}`] : [],
     ...whyLines.length > 0 ? [``, `## \u672C\u6B21\u4E3A\u4EC0\u4E48\u5524\u8D77\u4F60`, ...whyLines] : [],
     ...whatLines.length > 0 ? [``, `## \u9700\u8981\u4F60\u505A\u4EC0\u4E48`, ...whatLines] : [],
     ``,
@@ -2784,6 +2814,7 @@ var init_dispatcher = __esm({
       async tick() {
         const { kernel } = this.opts;
         let started = 0;
+        await this.autoConcludeReadyMergedArtifacts();
         for (const job of computeProduceJobs(kernel.model)) {
           if (kernel.isFrozen(job.artifactId)) continue;
           const artifact = kernel.model.artifacts.get(job.artifactId);
@@ -2923,74 +2954,134 @@ var init_dispatcher = __esm({
           wallClockMs: job.limits.wallClockMs
         });
         session.onExit((info) => {
-          this.inFlight.delete(jobKey);
-          const seqAtExit = kernel.model.lastSeq.get(spec.artifactId) ?? 0;
-          if (sink) {
-            void (async () => {
-              const ops = await this.opts.oplog.read(spec.artifactId);
-              const opRefs = ops.filter((o) => o.seq > seqAtDispatch && o.seq <= seqAtExit).map((o) => ({ seq: o.seq, kind: o.kind, id: o.id, target: o.target }));
-              sink.end(session.id, {
-                exit: {
-                  code: info.code,
-                  at: (/* @__PURE__ */ new Date()).toISOString(),
-                  durationMs: Date.now() - dispatchedAtMs,
-                  wallclockKilled: info.code === null,
-                  // 适配器从 stream-json 抽出的 token/成本（含 cache）；不带则缺省。
-                  ...info.usage ? { usage: info.usage } : {}
-                },
-                opRefs
-              });
-            })().catch(() => {
+          void this.handleSessionExit({
+            jobKey,
+            spec,
+            session,
+            info,
+            sink,
+            seqAtDispatch,
+            dispatchedAtMs
+          });
+        });
+        return 1;
+      }
+      async handleSessionExit(args) {
+        const { kernel } = this.opts;
+        const { jobKey, spec, session, info, sink, seqAtDispatch, dispatchedAtMs } = args;
+        const seqBeforeAutoConclude = kernel.model.lastSeq.get(spec.artifactId) ?? 0;
+        if (info.code === 0 && seqBeforeAutoConclude !== seqAtDispatch) {
+          await this.maybeAutoConclude(spec);
+        }
+        this.inFlight.delete(jobKey);
+        const seqAtExit = kernel.model.lastSeq.get(spec.artifactId) ?? 0;
+        if (sink) {
+          void (async () => {
+            const ops = await this.opts.oplog.read(spec.artifactId);
+            const opRefs = ops.filter((o) => o.seq > seqAtDispatch && o.seq <= seqAtExit).map((o) => ({ seq: o.seq, kind: o.kind, id: o.id, target: o.target }));
+            sink.end(session.id, {
+              exit: {
+                code: info.code,
+                at: (/* @__PURE__ */ new Date()).toISOString(),
+                durationMs: Date.now() - dispatchedAtMs,
+                wallclockKilled: info.code === null,
+                // 适配器从 stream-json 抽出的 token/成本（含 cache）；不带则缺省。
+                ...info.usage ? { usage: info.usage } : {}
+              },
+              opRefs
             });
-          }
-          const progressed = seqAtExit !== seqAtDispatch;
-          let consecutive = 0;
-          if (progressed) {
-            this.strikes.delete(jobKey);
-          } else {
-            consecutive = (this.strikes.get(jobKey)?.count ?? 0) + 1;
-            const max = this.opts.backoff?.maxConsecutiveFailures ?? 3;
-            const base = this.opts.backoff?.baseMs ?? 3e4;
-            const fused = consecutive >= max;
-            this.strikes.set(jobKey, {
+          })().catch(() => {
+          });
+        }
+        const progressed = seqAtExit !== seqAtDispatch;
+        let consecutive = 0;
+        if (progressed) {
+          this.strikes.delete(jobKey);
+        } else {
+          consecutive = (this.strikes.get(jobKey)?.count ?? 0) + 1;
+          const max = this.opts.backoff?.maxConsecutiveFailures ?? 3;
+          const base = this.opts.backoff?.baseMs ?? 3e4;
+          const fused = consecutive >= max;
+          this.strikes.set(jobKey, {
+            artifactId: spec.artifactId,
+            actor: spec.actor,
+            action: spec.action,
+            count: consecutive,
+            nextEligibleAt: Date.now() + base * 2 ** (consecutive - 1),
+            fused,
+            ...fused ? { fusedAt: (/* @__PURE__ */ new Date()).toISOString() } : {},
+            seqAtVerdict: seqAtExit,
+            ...info.reason ? { lastReason: info.reason } : {}
+          });
+          if (fused) {
+            this.emitJournal({
+              kind: "fused",
+              at: (/* @__PURE__ */ new Date()).toISOString(),
+              jobKey,
               artifactId: spec.artifactId,
               actor: spec.actor,
               action: spec.action,
-              count: consecutive,
-              nextEligibleAt: Date.now() + base * 2 ** (consecutive - 1),
-              fused,
-              ...fused ? { fusedAt: (/* @__PURE__ */ new Date()).toISOString() } : {},
-              seqAtVerdict: seqAtExit,
-              ...info.reason ? { lastReason: info.reason } : {}
+              consecutiveFailures: consecutive
             });
-            if (fused) {
-              this.emitJournal({
-                kind: "fused",
-                at: (/* @__PURE__ */ new Date()).toISOString(),
-                jobKey,
-                artifactId: spec.artifactId,
-                actor: spec.actor,
-                action: spec.action,
-                consecutiveFailures: consecutive
-              });
-            }
           }
-          this.emitJournal({
-            kind: "exited",
-            at: (/* @__PURE__ */ new Date()).toISOString(),
-            jobKey,
+        }
+        this.emitJournal({
+          kind: "exited",
+          at: (/* @__PURE__ */ new Date()).toISOString(),
+          jobKey,
+          artifactId: spec.artifactId,
+          actor: spec.actor,
+          action: spec.action,
+          code: info.code,
+          ...info.reason ? { reason: info.reason } : {},
+          // BUG-5：结构化退出归因
+          durationMs: Date.now() - dispatchedAtMs,
+          progressed,
+          consecutiveFailures: consecutive
+        });
+      }
+      async maybeAutoConclude(spec) {
+        if (!this.shouldAutoConclude(spec)) return;
+        try {
+          await this.opts.kernel.conclude({
             artifactId: spec.artifactId,
             actor: spec.actor,
-            action: spec.action,
-            code: info.code,
-            ...info.reason ? { reason: info.reason } : {},
-            // BUG-5：结构化退出归因
-            durationMs: Date.now() - dispatchedAtMs,
-            progressed,
-            consecutiveFailures: consecutive
+            note: "auto-conclude after successful dispatch"
           });
-        });
-        return 1;
+        } catch {
+        }
+      }
+      async autoConcludeReadyMergedArtifacts() {
+        for (const artifact of this.opts.kernel.model.artifacts.values()) {
+          if (!artifact.owner.startsWith("actor:agent:")) continue;
+          await this.maybeAutoConclude({
+            artifactId: artifact.id,
+            actor: artifact.owner,
+            action: (artifact.parts ?? []).length > 0 ? "integrate" : "produce"
+          });
+        }
+      }
+      shouldAutoConclude(spec) {
+        if (spec.action !== "produce" && spec.action !== "integrate") return false;
+        if (spec.part !== void 0) return false;
+        const model = this.opts.kernel.model;
+        const artifact = model.artifacts.get(spec.artifactId);
+        if (!artifact) return false;
+        if (!artifact.owner.startsWith("actor:agent:")) return false;
+        if (lifecycleOf(model, spec.artifactId) !== "active") return false;
+        if (isConcluded(model, spec.artifactId)) return false;
+        if (pendingConcludeAttempt(model, spec.artifactId)) return false;
+        if (!artifact.currentRev) return false;
+        if (queueOf(model, spec.artifactId).length > 0) return false;
+        if (unresolvedGapsOf(model, spec.artifactId).length > 0) return false;
+        if (annotationsOf(model, spec.artifactId).some((a) => a.state === "open" && a.raisedFrom === spec.artifactId)) return false;
+        if (hasOpenHumanChangeRequest(model, spec.artifactId)) return false;
+        const parts = artifact.parts ?? [];
+        if (parts.length === 0) return true;
+        if (spec.action !== "integrate") return false;
+        return parts.every(
+          (p) => revisionsOf(model, spec.artifactId).some((r) => r.part === p.name && r.state !== "rejected")
+        );
       }
       /** per-type 预算优先（schema.budget），其次 Dispatcher 配置，最后 10min 兜底 */
       wallClockFor(artifactId) {
@@ -16475,6 +16566,29 @@ async function closeHumanChangeRequestForRevision(kernel, oplog, artifactId, rev
     await kernel.resolveAnnotation({ annotationId, actor, resolution, note });
   }
 }
+async function mergeApprovedRevision(kernel, args) {
+  if (args.revisionId === void 0) {
+    const artifact2 = await kernel.merge({ artifactId: args.artifactId, actor: args.actor });
+    return { artifact: artifact2, mergedRevisionId: artifact2.currentRev, approvedRevisionId: artifact2.currentRev };
+  }
+  const queue = queueOf(kernel.model, args.artifactId);
+  const target = kernel.model.revisions.get(args.revisionId);
+  if (queue.length === 1 && queue[0]?.id === args.revisionId && target?.state === "proposed" && isStale(kernel.model, target)) {
+    const successor = await kernel.proposeRevision({
+      artifactId: args.artifactId,
+      actor: args.actor,
+      contentRef: target.contentRef,
+      contentKind: target.contentKind,
+      reason: `\u6279\u51C6\u8FC7\u671F\u4FEE\u8BA2\u540E\u91CD\u653E\uFF1A${target.reason}`,
+      ...target.part !== void 0 ? { part: target.part } : {},
+      rebasedFrom: target.id
+    });
+    const artifact2 = await kernel.merge({ artifactId: args.artifactId, actor: args.actor, revisionId: successor.id });
+    return { artifact: artifact2, mergedRevisionId: successor.id, approvedRevisionId: target.id, rebasedFrom: target.id };
+  }
+  const artifact = await kernel.merge({ artifactId: args.artifactId, actor: args.actor, revisionId: args.revisionId });
+  return { artifact, mergedRevisionId: args.revisionId, approvedRevisionId: args.revisionId };
+}
 function splitIdentityFiles2(prompt) {
   const SEP = /<!-- FILE: (.+?) -->\n?/g;
   const parts = prompt.split(SEP);
@@ -16690,22 +16804,24 @@ async function runCommand(kernel, blobs, oplog, actor, command, args, ctx = {})
     case "merge": {
       const revisionId = optStr(args, "revisionId");
       const artifactId = str(args, "artifactId");
-      const artifact = await kernel.merge({
+      const merged = await mergeApprovedRevision(kernel, {
         artifactId,
         actor,
         ...revisionId !== void 0 ? { revisionId } : {}
       });
-      const mergedRevisionId = revisionId ?? artifact.currentRev;
       await closeHumanChangeRequestForRevision(
         kernel,
         oplog,
         artifactId,
-        mergedRevisionId,
+        merged.approvedRevisionId,
         actor,
         "resolved",
-        `\u5BA1\u6838\u901A\u8FC7${revisionId ? `\uFF1A${revisionId}` : ""}\uFF0C\u53D8\u66F4\u8BF7\u6C42\u5DF2\u89E3\u51B3\u3002`
+        merged.rebasedFrom ? `\u5BA1\u6838\u901A\u8FC7\uFF1A${merged.rebasedFrom}\uFF08\u5DF2\u91CD\u653E\u4E3A ${merged.mergedRevisionId}\uFF09\uFF0C\u53D8\u66F4\u8BF7\u6C42\u5DF2\u89E3\u51B3\u3002` : `\u5BA1\u6838\u901A\u8FC7${revisionId ? `\uFF1A${revisionId}` : ""}\uFF0C\u53D8\u66F4\u8BF7\u6C42\u5DF2\u89E3\u51B3\u3002`
       );
-      return { message: `merged\uFF1Ahead \u2192 ${artifact.currentRev}` };
+      return {
+        message: merged.rebasedFrom ? `merged(rebase)\uFF1Ahead \u2192 ${merged.artifact.currentRev}\uFF1Bsuperseded ${merged.rebasedFrom}` : `merged\uFF1Ahead \u2192 ${merged.artifact.currentRev}`,
+        data: merged.rebasedFrom ? { rebasedFrom: merged.rebasedFrom, revisionId: merged.mergedRevisionId } : void 0
+      };
     }
     case "advance": {
       const result = await kernel.advanceQueue(str(args, "artifactId"), actor);
@@ -17271,7 +17387,10 @@ async function startOasisServer(opts) {
             const buf = stagingBuffers.get(sessionKey) ?? [];
             buf.push(op);
             stagingBuffers.set(sessionKey, buf);
-            res.writeHead(200, { "content-type": "application/json" }).end(JSON.stringify({ count: buf.length, staged: op }));
+            const cascade = op.action === "seal" && op.reason === "cancelled" ? engine.kernel.cancelCascadeEdges(op.artifactId) : void 0;
+            res.writeHead(200, { "content-type": "application/json" }).end(
+              JSON.stringify({ count: buf.length, staged: op, ...cascade && cascade.length > 0 ? { cascade } : {} })
+            );
           } catch (err) {
             res.writeHead(400, { "content-type": "application/json" }).end(
               JSON.stringify({ error: err instanceof Error ? err.message : String(err) })
@@ -17497,13 +17616,13 @@ async function startOasisServer(opts) {
               const actorCtx = await opts.resolveActorContext(body.actorId).catch(() => null);
               if (actorCtx) {
                 const { mkdtempSync: mkdtempSync6, mkdirSync: mkdirSync13, writeFileSync: writeFileSync13 } = await import("node:fs");
-                const { join: join16, dirname: dirname12 } = await import("node:path");
+                const { join: join16, dirname: dirname13 } = await import("node:path");
                 const { tmpdir: tmpdir8 } = await import("node:os");
                 const dir = mkdtempSync6(join16(tmpdir8(), "oasis-chat-"));
                 if (actorCtx.config?.prompt) {
                   for (const [rel, content] of Object.entries(splitIdentityFiles2(actorCtx.config.prompt))) {
                     const file = join16(dir, rel);
-                    mkdirSync13(dirname12(file), { recursive: true });
+                    mkdirSync13(dirname13(file), { recursive: true });
                     writeFileSync13(file, content);
                   }
                 }
@@ -18595,11 +18714,11 @@ function deriveRevisionStatus(revision, currentRev) {
       return { status: "editing" };
   }
 }
-function deriveArtifactStatus(currentRev, revisions) {
-  if (currentRev) return "current";
+function deriveArtifactStatus(model, artifactId, currentRev, revisions) {
+  if (isConcluded(model, artifactId)) return "current";
   if (revisions.some((r) => r.state === "proposed")) return "pending_review";
   if (revisions.length > 0 && revisions.every((r) => r.state === "rejected")) return "rejected";
-  if (revisions.length > 0) return "editing";
+  if (currentRev || revisions.length > 0) return "editing";
   return "pending";
 }
 function deriveActorKind(actor) {
@@ -18640,7 +18759,7 @@ function buildArtifactProjection(input) {
       projectId,
       type: artifact.docType ?? descriptor.docType ?? artifact.type,
       title: artifact.title ?? descriptor.title ?? artifactDerivation?.title ?? artifactId,
-      status: deriveArtifactStatus(currentRev, ordered),
+      status: deriveArtifactStatus(model, artifactId, currentRev, ordered),
       ...currentRev ? { currentRevisionId: currentRev } : {},
       ...latest ? { latestRevisionId: latest.id } : {},
       ...artifactDerivation ? { createdFromWorkOrderId: artifactDerivation.workOrderId } : {},
@@ -18854,6 +18973,12 @@ var init_projection = __esm({
 });
 
 // ../server/src/domains/collab/node-state.ts
+function nodeLabel(a) {
+  if (a.title) return a.title;
+  if (a.description) return a.description;
+  const tail = a.id.split(":").slice(2).join(":");
+  return tail ? `\u672A\u547D\u540D ${a.type}\uFF08${tail}\uFF09` : `\u672A\u547D\u540D ${a.type}`;
+}
 function nodeInfo(model, a) {
   const lifecycle = lifecycleOf(model, a.id);
   const sealed = lifecycle !== "active";
@@ -18993,10 +19118,10 @@ function renderIndexYaml(index) {
 }
 function summarizeArtifacts(artifacts) {
   const total = artifacts.length;
-  const current = artifacts.filter((artifact) => artifact.status === "current").length;
-  const editing = artifacts.filter((artifact) => artifact.status === "editing").length;
-  const pendingReview = artifacts.filter((artifact) => artifact.status === "pending_review").length;
-  const rejected = artifacts.filter((artifact) => artifact.status === "rejected").length;
+  const current = artifacts.filter((artifact) => (artifact.businessStatus ?? businessStatusFromLegacyStatus(artifact.status)) === "completed").length;
+  const editing = artifacts.filter((artifact) => ["producing", "produced", "blocked"].includes(artifact.businessStatus ?? businessStatusFromLegacyStatus(artifact.status))).length;
+  const pendingReview = artifacts.filter((artifact) => (artifact.businessStatus ?? businessStatusFromLegacyStatus(artifact.status)) === "review").length;
+  const rejected = artifacts.filter((artifact) => (artifact.businessStatus ?? businessStatusFromLegacyStatus(artifact.status)) === "rejected").length;
   return {
     total,
     current,
@@ -19006,14 +19131,80 @@ function summarizeArtifacts(artifacts) {
     progressPercent: total === 0 ? 0 : Math.round(current / total * 100)
   };
 }
-function artifactStatusFromNode(info) {
-  if (info.concluded) return "current";
+function businessStatusFromLegacyStatus(status) {
+  switch (status) {
+    case "current":
+    case "history":
+      return "completed";
+    case "pending_review":
+      return "review";
+    case "rejected":
+      return "rejected";
+    case "archived":
+      return "archived";
+    case "producing":
+      return "producing";
+    case "editing":
+      return "produced";
+    case "pending":
+    default:
+      return "not_started";
+  }
+}
+function artifactStatusFromNode(info, revisions) {
   const stage = deriveNodeStage(info);
+  if (stage === "concluded") return "current";
   if (stage === "review" || stage === "gate") return "pending_review";
   if (stage === "sealed") return "archived";
+  if (hasProposedRevision(revisions) && !info.concluded) return "pending_review";
+  if (hasOnlyRejectedRevisions(revisions) && !info.concluded) return "rejected";
   if (stage === "editing" || stage === "merged" || stage === "blocked") return "editing";
   return "producing";
 }
+function artifactOutputStatusFromNode(info, revisions) {
+  const stage = deriveNodeStage(info);
+  if (hasProposedRevision(revisions) || hasOnlyRejectedRevisions(revisions)) return "produced";
+  if (stage === "editing") return "producing";
+  if (stage === "merged" || stage === "review" || stage === "gate" || stage === "concluded") return "produced";
+  if (stage === "blocked" && info.hasWorking) return "producing";
+  if (stage === "blocked" && info.queueLen > 0) return "produced";
+  if (stage === "blocked" && info.concluded) return "produced";
+  if (stage === "sealed" && info.concluded) return "produced";
+  return "not_started";
+}
+function artifactAcceptanceStatusFromNode(info, revisions) {
+  const stage = deriveNodeStage(info);
+  if (stage === "concluded" || stage === "sealed" && info.concluded) return "accepted";
+  if (stage === "review" || stage === "gate") return "review_pending";
+  if (hasProposedRevision(revisions) && !info.concluded) return "review_pending";
+  if (hasOnlyRejectedRevisions(revisions) && !info.concluded) return "rejected";
+  if (stage === "blocked") return "blocked";
+  return "not_ready";
+}
+function hasProposedRevision(revisions) {
+  return revisions.some((revision) => revision.state === "proposed");
+}
+function hasOnlyRejectedRevisions(revisions) {
+  return revisions.length > 0 && revisions.every((revision) => revision.state === "rejected");
+}
+function artifactBusinessStatusFromLayers(outputStatus, acceptanceStatus, info) {
+  if (info.sealed) return "archived";
+  switch (acceptanceStatus) {
+    case "accepted":
+      return "completed";
+    case "review_pending":
+      return "review";
+    case "blocked":
+      return "blocked";
+    case "rejected":
+      return "rejected";
+    case "not_ready":
+    default:
+      if (outputStatus === "produced" || outputStatus === "stale") return "produced";
+      if (outputStatus === "producing") return "producing";
+      return "not_started";
+  }
+}
 function actorToProjectMember(projectId, actor, addedAt) {
   return {
     projectId,
@@ -19438,11 +19629,14 @@ var init_service = __esm({
       async getProjectContents(projectId) {
         const project = await this.getProject(projectId);
         if (!project) return null;
-        const artifacts = (await this.artifacts.listArtifacts({ projectId })).map((a) => ({
+        const artifacts = (await this.listAllProjectArtifacts(projectId)).map((a) => ({
           artifactId: a.artifactId,
           type: a.type,
           title: a.title,
           status: a.status,
+          ...a.outputStatus !== void 0 ? { outputStatus: a.outputStatus } : {},
+          ...a.acceptanceStatus !== void 0 ? { acceptanceStatus: a.acceptanceStatus } : {},
+          ...a.businessStatus !== void 0 ? { businessStatus: a.businessStatus } : {},
           ...a.currentRevisionId !== void 0 ? { currentRevisionId: a.currentRevisionId } : {},
           updatedAt: a.updatedAt
         }));
@@ -19713,6 +19907,10 @@ var init_service = __esm({
         } else if (kernelRev?.state !== "merged") {
           throw new Error(`revision not approvable (state=${kernelRev?.state ?? "missing"}): ${input.revisionId}`);
         }
+        const artifactAfterMerge = this.kernel.model.artifacts.get(input.artifactId);
+        if (artifactAfterMerge?.currentRev === input.revisionId && concludedHead(this.kernel.model, input.artifactId) !== input.revisionId) {
+          await this.kernel.conclude({ artifactId: input.artifactId, actor, note: "conclude after artifact revision approval" });
+        }
         await this.syncProjection();
         const updatedArtifact = await this.artifacts.getArtifact(input.artifactId);
         const approved = await this.artifacts.getRevision(input.revisionId);
@@ -19948,18 +20146,29 @@ var init_service = __esm({
         const projectByWorkorder = new Map(bindings.map((binding) => [binding.workOrderId, binding.projectId]));
         for (const artifact of this.kernel.model.artifacts.values()) {
           if (projectByWorkorder.get(artifact.workspace) !== projectId) continue;
-          if (byArtifact.has(artifact.id)) continue;
           const descriptor = decodeDocumentDescription(artifact.description);
           const info = nodeInfo(this.kernel.model, artifact);
+          const revisions = revisionsOf(this.kernel.model, artifact.id);
           const updatedAt = this.kernel.model.lastOpAt.get(artifact.id) ?? (/* @__PURE__ */ new Date(0)).toISOString();
+          const existing = byArtifact.get(artifact.id);
+          const status = artifactStatusFromNode(info, revisions);
+          const outputStatus = artifactOutputStatusFromNode(info, revisions);
+          const acceptanceStatus = artifactAcceptanceStatusFromNode(info, revisions);
+          const businessStatus = artifactBusinessStatusFromLayers(outputStatus, acceptanceStatus, info);
           byArtifact.set(artifact.id, {
+            ...existing ?? {},
             artifactId: artifact.id,
             projectId,
             type: artifact.docType ?? descriptor.docType ?? artifact.type,
             title: artifact.title ?? descriptor.title ?? artifact.id,
-            status: artifactStatusFromNode(info),
+            status,
+            outputStatus,
+            acceptanceStatus,
+            businessStatus,
+            ...artifact.currentRev ? { currentRevisionId: artifact.currentRev } : {},
+            ...existing?.latestRevisionId !== void 0 ? { latestRevisionId: existing.latestRevisionId } : {},
             createdFromWorkOrderId: artifact.workspace,
-            createdAt: updatedAt,
+            createdAt: existing?.createdAt ?? updatedAt,
             updatedAt
           });
         }
@@ -26049,6 +26258,9 @@ function toApiArtifact(artifact) {
     type: artifact.type,
     title: artifact.title,
     status: artifact.status,
+    output_status: artifact.outputStatus,
+    acceptance_status: artifact.acceptanceStatus,
+    business_status: artifact.businessStatus,
     current_revision_id: artifact.currentRevisionId,
     latest_revision_id: artifact.latestRevisionId,
     source_work_order_id: artifact.createdFromWorkOrderId,
@@ -27155,6 +27367,10 @@ Write-Host "  Stop   : Stop-ScheduledTask -TaskName 'OasisNode-${p.nodeId}'"
 Write-Host "  Remove : Unregister-ScheduledTask -TaskName 'OasisNode-${p.nodeId}' -Confirm:$false"
 `;
 }
+function buildNpxCmd(p) {
+  const namePart = p.nodeName ? ` --name ${p.nodeName}` : "";
+  return `npx -y oasis_test@latest start --server-ws ${p.gatewayUrl} --id ${p.nodeId}${namePart} --token ${p.token}`;
+}
 var init_connect_script = __esm({
   "../server/src/domains/nodes/connect-script.ts"() {
     "use strict";
@@ -27190,8 +27406,20 @@ function nodesDomain(deps) {
       }));
       return { status: 200, body: { items: [...online, ...offline] } };
     });
+    const suppressedRuntimes = /* @__PURE__ */ new Set();
+    let hubListenerAdded = false;
     router.get("/api/runtimes", async () => {
       const hub = deps.getHub();
+      if (hub && !hubListenerAdded) {
+        hubListenerAdded = true;
+        hub.addMessageListener((daemonId, msg) => {
+          if (msg.type === "hello") {
+            for (const id of suppressedRuntimes) {
+              if (id.startsWith(`runtime:${daemonId}:`)) suppressedRuntimes.delete(id);
+            }
+          }
+        });
+      }
       const online = (hub?.connectedDaemons() ?? []).flatMap((d) => {
         if (d.meta.nodeName) nodeNames.set(d.daemonId, d.meta.nodeName);
         return runtimeInfos(d.daemonId, d.meta, "online");
@@ -27200,7 +27428,13 @@ function nodesDomain(deps) {
       const offline = (hub?.recentlyDisconnected() ?? []).flatMap(
         (g) => runtimeInfos(g.daemonId, g.meta, "offline").filter((r) => !onlineIds.has(r.id))
       );
-      return { status: 200, body: { items: [...online, ...offline] } };
+      return { status: 200, body: { items: [...online, ...offline].filter((r) => !suppressedRuntimes.has(r.id)) } };
+    });
+    router.delete("/api/runtimes/:runtimeId", async (req) => {
+      const runtimeId = req.params["runtimeId"];
+      if (!runtimeId) return { status: 400, body: { error: "missing runtimeId" } };
+      suppressedRuntimes.add(runtimeId);
+      return { status: 200, body: { ok: true } };
     });
     router.post("/api/nodes/enroll", async (req) => {
       const body = req.body ?? {};
@@ -27214,7 +27448,15 @@ function nodesDomain(deps) {
       nodeNames.set(nodeId, nodeName);
       const params = { gatewayUrl: deps.gatewayUrl, nodeId, token, repoRemote: deps.repoRemote };
       const script = body.platform === "windows" ? buildWindowsConnectScript(params) : buildConnectScript(params);
-      return { status: 200, body: { nodeId, nodeName, token, script, gatewayUrl: deps.gatewayUrl } };
+      const npxCmd = buildNpxCmd({ gatewayUrl: deps.gatewayUrl, nodeId, token, nodeName });
+      return { status: 200, body: { nodeId, nodeName, token, script, gatewayUrl: deps.gatewayUrl, npxCmd } };
+    });
+    router.patch("/api/nodes/:nodeId", async (req) => {
+      const nodeId = req.params["nodeId"];
+      if (!nodeId) return { status: 400, body: { error: "missing nodeId" } };
+      const body = req.body ?? {};
+      if (body.name) nodeNames.set(nodeId, body.name);
+      return { status: 200, body: { ok: true } };
     });
     router.delete("/api/nodes/:nodeId", async (req) => {
       const nodeId = req.params["nodeId"];
@@ -27276,7 +27518,7 @@ function buildWorkorderDetail(model, workspaceId, resolveActor, resolveProject,
     return {
       id: a.id,
       type: a.type,
-      label: a.title ?? a.description ?? a.id,
+      label: nodeLabel(a),
       stage: deriveNodeStage(info),
       currentRev: a.currentRev,
       queue: info.queueLen,
@@ -27402,7 +27644,7 @@ function buildActivity(model, arts, ref) {
 function buildAcceptance(model, arts) {
   return arts.map((a) => ({
     artifactId: a.id,
-    label: a.description ?? a.id,
+    label: nodeLabel(a),
     state: isConcluded(model, a.id) ? "done" : a.currentRev ? "active" : "pending"
   }));
 }
@@ -27420,7 +27662,7 @@ function buildInbox(model, me) {
   const out = [];
   for (const a of model.artifacts.values()) {
     const ws = a.workspace;
-    const label = a.title ?? a.description ?? a.id;
+    const label = nodeLabel(a);
     const queue = queueOf(model, a.id);
     const myOpenChangeRequest = queue.length > 0 ? annotationsOf(model, a.id).find((an) => an.state === "open" && an.author === me && an.author.startsWith("actor:human:")) : void 0;
     if (myOpenChangeRequest) {
@@ -27475,6 +27717,7 @@ var init_inbox = __esm({
   "../server/src/domains/collab/inbox.ts"() {
     "use strict";
     init_src2();
+    init_node_state();
   }
 });
 
@@ -27547,7 +27790,7 @@ async function buildDashboard(model, oplog, me, deps) {
     inFlight.push({
       artifactId: a.id,
       workspace: a.workspace,
-      label: a.title ?? a.description ?? a.id,
+      label: nodeLabel(a),
       stage: deriveNodeStage(nodeInfo(model, a)),
       heldMs,
       onSlaClock,
@@ -29023,7 +29266,8 @@ var init_worker = __esm({
 - \`oasis spawn <id> --type <t> --title "<\u77ED\u540D>" --brief "<\u89C4\u683C>" [--input <up>]\` \u2014\u2014 \u65B0\u5EFA\u8282\u70B9
 - \`oasis edit <id> [--title "\u2026"] [--brief "\u2026"]\` \u2014\u2014 \u6539\u8282\u70B9\u6807\u9898/brief
 - \`oasis unlink <consumer> --to <up>\` \u2014\u2014 \u65AD\u4F9D\u8D56\u8FB9
-- \`oasis seal <id> --as cancelled|frozen [--note "\u2026"]\` \u2014\u2014 \u5C01\u8282\u70B9
+- \`oasis cancel <id> [--note "\u2026"]\` \u2014\u2014 \u5E9F\u5F03\u8282\u70B9\uFF08\u81EA\u52A8\u7EA7\u8054\u65AD\u5B83\u7684\u6240\u6709\u76F8\u5173\u8FB9\u3001\u91CD\u5524\u4E0B\u6E38\u53BB\u6389\u5BF9\u5B83\u7684\u9002\u914D\uFF09
+- \`oasis freeze <id> [--note "\u2026"]\` \u2014\u2014 \u51BB\u7ED3\u8282\u70B9\uFF08\u4FDD\u7559\u8F93\u51FA\u3001\u505C\u6B62\u6539\u52A8\uFF1B\u8FB9\u4E0D\u52A8\uFF09
 - \`oasis cancel-part <id> --part <\u540D>\` \u2014\u2014 \u64A4\u90E8\u4EF6
 - \`oasis staged\` \u2014\u2014 \u770B\u5F53\u524D\u7F13\u51B2\u5168\u90E8\u5F85\u63D0\u4EA4\u9879\uFF08+ \u63D0\u4EA4\u540E\u9884\u89C8\uFF09
 - \`oasis apply --reason "\u4E3A\u4EC0\u4E48\u8FD9\u4E48\u6539"\` \u2014\u2014 \u4E00\u6B21\u63D0\u4EA4\u7F13\u51B2
@@ -29184,7 +29428,7 @@ var init_worker = __esm({
           `## \u4F60\u7684\u52A8\u4F5C\uFF08\u6682\u5B58 \u2192 apply\uFF09`,
           `- \u67D0\u65E2\u6709\u6EE1\u8DB3\u8FD9\u9700\u6C42 \u2192 \`oasis link ${gap.artifactId} --to <\u65E2\u6709id>\`\uFF0C\`oasis apply --reason "\u2026"\`\uFF08apply \u540E\u81EA\u52A8\u89E3\u8FD9\u6761 gap\uFF09\u3002`,
           `- \u786E\u65E0\u5339\u914D\u3001\u65B0\u9700\u6C42 \u2192 \`oasis spawn <\u65B0id> --type <\u7C7B\u578B> --title "<\u77ED\u540D>" --brief "${gap.description}"\` + \`oasis link ${gap.artifactId} --to <\u65B0id>\` \u2192 apply\u3002`,
-          `- \u987A\u624B\u53D1\u73B0\u4E24\u4E2A\u4EA7\u7269\u91CD\u590D \u2192 **\u5148\u628A\u4E0A\u9762\u89E3 gap \u90A3\u7B14\u5355\u72EC apply \u6389**\uFF0C\u518D\u53E6\u8D77\u4E00\u7B14\uFF1A\`oasis edit\` \u6269\u4FDD\u7559\u4EF6 brief + \`oasis link\` \u6539\u8FDE + \`oasis seal\` \u5E9F\u5F03\u4EF6\uFF0C\u4E00\u8D77\u6682\u5B58\u518D apply\u3002`,
+          `- \u987A\u624B\u53D1\u73B0\u4E24\u4E2A\u4EA7\u7269\u91CD\u590D \u2192 **\u5148\u628A\u4E0A\u9762\u89E3 gap \u90A3\u7B14\u5355\u72EC apply \u6389**\uFF0C\u518D\u53E6\u8D77\u4E00\u7B14\uFF1A\`oasis edit\` \u6269\u4FDD\u7559\u4EF6 brief + \`oasis link\` \u628A\u6D88\u8D39\u8005\u6539\u8FDE\u5230\u4FDD\u7559\u4EF6 + \`oasis cancel\` \u5E9F\u5F03\u4EF6\uFF08\u81EA\u52A8\u65AD\u5B83\u7684\u8FB9\u3001\u91CD\u5524\u88AB\u6539\u8FDE\u7684\u6D88\u8D39\u8005\uFF09\uFF0C\u4E00\u8D77\u6682\u5B58\u518D apply\u3002`,
           `- \u62FF\u4E0D\u51C6 \u2192 \u522B\u6682\u5B58\uFF0C\u4E00\u53E5\u8BDD\u8BF4\u660E\u7591\u8651\u6536\u5DE5\u3002`
         ].join("\n");
         await this.runCoordinator(gap.artifactId, task, `reconcile ${gap.artifactId}: ${gap.description.slice(0, 50)}`);
@@ -38495,13 +38739,12 @@ async function startServe(opts) {
   const blobs = new DirBlobStore(path11.join(opts.dir, "blobs"));
   const assets = new DirBlobStore(path11.join(opts.dir, "assets"));
   const defaultRootSchema = [
-    { name: "brief", description: "\u5DE5\u5355\u603B\u7EB2\uFF1A\u53D1\u8D77\u65B9\u5BF9\u9F50\u7684\u603B\u76EE\u6807\u4E0E\u8303\u56F4\uFF0C\u6574\u5F20\u534F\u4F5C\u56FE\u7684\u6839\u3002", contentType: "text", ownerRole: "founder", triggersOnMerge: [{ action: "spawn", type: "prd" }] },
+    { name: "brief", description: "\u5DE5\u5355\u603B\u7EB2\uFF1A\u53D1\u8D77\u65B9\u5BF9\u9F50\u7684\u603B\u76EE\u6807\u4E0E\u8303\u56F4\uFF0C\u6574\u5F20\u534F\u4F5C\u56FE\u7684\u6839\u3002", contentType: "text", ownerRole: "founder" },
     {
       name: "prd",
       description: "\u4EA7\u54C1\u9700\u6C42\u6587\u6863\uFF1A\u8981\u505A\u4EC0\u4E48\u3001\u7ED9\u8C01\u3001\u6838\u5FC3\u573A\u666F\u4E0E\u9A8C\u6536\u6807\u51C6\u3002",
       contentType: "text",
       ownerRole: "pm",
-      triggersOnMerge: [{ action: "spawn", type: "adr" }],
       reviews: { gates: [{ on: "conclude", reviewers: ["architect", "designer"], quorum: 2 }] }
     },
     { name: "adr", description: "\u67B6\u6784\u51B3\u7B56\u8BB0\u5F55\uFF1A\u6280\u672F\u65B9\u6848\u9009\u578B\u4E0E\u53D6\u820D\u7406\u7531\u3002", contentType: "text", ownerRole: "architect" },
@@ -39482,7 +39725,7 @@ var USAGE = `oasis \u2014\u2014 artifact-centric \u534F\u4F5C\u5185\u6838 CLI\uF
       token \u89E3\u6790\u987A\u5E8F: --token > $OASIS_TOKEN > <dir>/operator-token
 
   \u7248\u672C\u673A\uFF08\xA75\uFF09
-  spawn     <artifactId> --type <t> [--input <\u4E0A\u6E38id>[,<id>\u2026]] [--owner <actorId>] [--workspace ws] [--persistence temp|persistent] [--parts-file <json>]
+  spawn     <artifactId> --type <t> [--title <\u77ED\u540D>] [--brief <\u89C4\u683C>] [--input <\u4E0A\u6E38id>[,<id>\u2026]] [--owner <actorId>] [--workspace ws] [--persistence temp|persistent] [--parts-file <json>]
             # --parts-file\uFF1Aconvergent \u5E76\u884C\u5206\u89E3\u7684\u90E8\u4EF6\u6E05\u5355 JSON [{name, spec?, deps?}]\uFF08Stage 3\uFF0C\u7CFB\u7EDF\u6309\u90E8\u4EF6\u6D3E N \u8DEF\uFF09
   propose   <artifactId> (--file <path> | --from-dir <path> | --git-commit <sha>) --reason <text> [--base <revisionId|none>] [--part <name>] [--rebase-of <revisionId>]
             # --file \u5355\u6587\u4EF6\uFF1B--from-dir \u9012\u5F52\u6574\u76EE\u5F55\u4E3A\u591A\u6587\u4EF6 revision\uFF08\u88C5\u7BB1\u5355\uFF0C\u8DE8\u7248\u672C\u53BB\u91CD\uFF0CF1\uFF09\u3002
@@ -39505,7 +39748,9 @@ var USAGE = `oasis \u2014\u2014 artifact-centric \u534F\u4F5C\u5185\u6838 CLI\uF
   pin       <artifactId> --to <\u4E0A\u6E38> --rev <revisionId>
   stale     <artifactId>
   blocked   [artifactId]
-  seal      <artifactId> --as accepted|cancelled|frozen
+  cancel    <artifactId> [--note "\u2026"]               # \u5E9F\u5F03\u8282\u70B9\uFF1A\u7EA7\u8054\u65AD\u76F8\u5173\u8FB9\u3001\u91CD\u5524\u4E0B\u6E38
+  freeze    <artifactId> [--note "\u2026"]               # \u51BB\u7ED3\u8282\u70B9\uFF1A\u4FDD\u7559\u8F93\u51FA\u3001\u505C\u6B62\u6539\u52A8
+  accept    <artifactId> [--note "\u2026"]               # \u5B9A\u7A3F\uFF08\u5148 conclude \u518D accept\uFF09
   assign    <artifactId> --owner <actorId>
   gc                                                # \u5B64\u513F blob \u56DE\u6536\uFF08mark-and-sweep\uFF1B\u64CD\u4F5C\u8005\u547D\u4EE4\uFF0CF1\uFF09
   \u8BFB\u4EA7\u7269: status <id>\uFF08\u72B6\u6001\u7D22\u5F15\uFF0C\u4E0D\u542B\u6B63\u6587\uFF09/ content <id> [path]\uFF08\u5B9E\u9645\u5185\u5BB9\uFF0C\u591A\u6587\u4EF6\u7ED9 path \u53D6\u5355\u4E2A\uFF09/ project <id>\uFF08\u9879\u76EE\u76EE\u5F55\uFF09   # \u7ED9 agent\uFF0C\u6E10\u8FDB\u62AB\u9732
@@ -39620,10 +39865,73 @@ async function runCli(argv, println = console.log) {
   const dir = flags.get("dir") ?? process.env["OASIS_DIR"] ?? path12.resolve(".oasis");
   if (command === "node" && positional[0] !== "output") {
     const serverUrl = flags.get("server-ws") ?? process.env["OASIS_SERVER_WS"] ?? "ws://127.0.0.1:7320/node-gateway";
-    const nodeId = flags.get("id") ?? process.env["OASIS_NODE_ID"] ?? `node-${(0, import_node_crypto20.randomUUID)()}`;
+    const nodeName = flags.get("name") ?? process.env["OASIS_NODE_NAME"];
+    const nodeIdFile = path12.join(dir, "node-id");
+    const storedNodeId = fs13.existsSync(nodeIdFile) ? fs13.readFileSync(nodeIdFile, "utf8").trim() : null;
+    const nodeId = storedNodeId ?? flags.get("id") ?? process.env["OASIS_NODE_ID"] ?? `node-${(0, import_node_crypto20.randomUUID)()}`;
+    if (!storedNodeId) {
+      fs13.mkdirSync(dir, { recursive: true });
+      fs13.writeFileSync(nodeIdFile, nodeId);
+    }
     const nodeTokenFile = path12.join(dir, "node-token");
     const token2 = flags.get("token") ?? process.env["OASIS_NODE_TOKEN"] ?? (fs13.existsSync(nodeTokenFile) ? fs13.readFileSync(nodeTokenFile, "utf8").trim() : void 0);
-    await startNode({ serverUrl, nodeId, ...token2 ? { token: token2 } : {} });
+    if (flags.has("service")) {
+      const { spawnSync, execSync: execSync2 } = await import("node:child_process");
+      if (token2) {
+        fs13.mkdirSync(dir, { recursive: true });
+        fs13.writeFileSync(nodeTokenFile, token2, { mode: 384 });
+      }
+      println("\u2192 Installing oasis_test globally...");
+      spawnSync("npm", ["install", "-g", "oasis_test@latest"], { stdio: "inherit" });
+      const prefix = execSync2("npm prefix -g").toString().trim();
+      const binPath = path12.join(prefix, "bin", "oasis_test");
+      const svcArgs = `node --server-ws ${serverUrl} --id ${nodeId} --dir ${dir}${nodeName ? ` --name ${nodeName}` : ""}`;
+      if (process.platform === "linux") {
+        const svcFile = path12.join(os7.homedir(), ".config/systemd/user/oasis-node.service");
+        fs13.mkdirSync(path12.dirname(svcFile), { recursive: true });
+        if (spawnSync("systemctl", ["--user", "is-active", "--quiet", "oasis-node"], {}).status === 0)
+          spawnSync("systemctl", ["--user", "stop", "oasis-node"], { stdio: "inherit" });
+        fs13.writeFileSync(svcFile, [
+          "[Unit]",
+          "Description=Oasis Node Daemon",
+          "After=network.target",
+          "",
+          "[Service]",
+          `ExecStart=${binPath} ${svcArgs}`,
+          "Restart=on-failure",
+          "RestartSec=5",
+          "StandardOutput=journal",
+          "StandardError=journal",
+          "",
+          "[Install]",
+          "WantedBy=default.target",
+          ""
+        ].join("\n"));
+        spawnSync("systemctl", ["--user", "daemon-reload"], { stdio: "inherit" });
+        spawnSync("systemctl", ["--user", "enable", "--now", "oasis-node"], { stdio: "inherit" });
+        spawnSync("loginctl", ["enable-linger", os7.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 = path12.join(os7.homedir(), "Library/LaunchAgents/com.oasis.node.plist");
+        fs13.mkdirSync(path12.dirname(plist), { recursive: true });
+        spawnSync("launchctl", ["unload", plist], { stdio: "ignore" });
+        const argXml = [binPath, "node", "--server-ws", serverUrl, "--id", nodeId, "--dir", dir, ...nodeName ? ["--name", nodeName] : []].map((a) => `<string>${a}</string>`).join("");
+        fs13.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>${os7.homedir()}/.oasis-node.log</string><key>StandardErrorPath</key><string>${os7.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 ${os7.homedir()}/.oasis-node.log`);
+        println(`  Stop : launchctl unload ${plist}`);
+      } else {
+        spawnSync("sh", ["-c", `nohup ${binPath} ${svcArgs} > ${path12.join(os7.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.");
+      }
+      return;
+    }
+    await startNode({ serverUrl, nodeId, ...token2 ? { token: token2 } : {}, ...nodeName ? { nodeName } : {} });
     return;
   }
   if (command === "node-token") {
@@ -39762,7 +40070,7 @@ async function runCli(argv, println = console.log) {
     if (out.length === 0) throw new Error(`\u76EE\u5F55\u4E3A\u7A7A\uFF1A${root}`);
     return out;
   };
-  const STAGE_COMMANDS = /* @__PURE__ */ new Set(["link", "spawn", "unlink", "seal", "cancel-part", "edit"]);
+  const STAGE_COMMANDS = /* @__PURE__ */ new Set(["link", "spawn", "unlink", "cancel", "freeze", "cancel-part", "edit"]);
   const buildStageOp = (cmd) => {
     switch (cmd) {
       case "link":
@@ -39783,11 +40091,12 @@ async function runCli(argv, println = console.log) {
         };
       case "unlink":
         return { action: "unlink", artifactId: needPos(positional, 0, "oasis unlink <consumer> --to <upstream>"), to: need(flags, "to") };
-      case "seal":
+      case "cancel":
+      case "freeze":
         return {
           action: "seal",
-          artifactId: needPos(positional, 0, "oasis seal <id> --as cancelled|frozen"),
-          reason: need(flags, "as"),
+          artifactId: needPos(positional, 0, `oasis ${cmd} <id> [--note \u2026]`),
+          reason: cmd === "cancel" ? "cancelled" : "frozen",
           ...flags.get("note") !== void 0 ? { note: flags.get("note") } : {}
         };
       case "cancel-part":
@@ -39812,7 +40121,7 @@ async function runCli(argv, println = console.log) {
       case "unlink":
         return `unlink ${op["artifactId"]} \u2715 ${op["to"]}`;
       case "seal":
-        return `seal ${op["artifactId"]}\uFF08${op["reason"]}\uFF09`;
+        return `${op["reason"] === "cancelled" ? "cancel" : op["reason"] === "frozen" ? "freeze" : "accept"} ${op["artifactId"]}`;
       case "cancelPart":
         return `cancel-part ${op["artifactId"]} part=${op["part"]}`;
       case "edit":
@@ -39824,7 +40133,11 @@ async function runCli(argv, println = console.log) {
   if (process.env["OASIS_STAGE"] === "1" && STAGE_COMMANDS.has(command)) {
     const op = buildStageOp(command);
     const r = await api.post("/api/stage", { op });
-    println(`\u5DF2\u6682\u5B58\uFF1A${describeStageOp(op)}\uFF08\u7F13\u51B2 ${r.count} \u9879\uFF1B\u6539\u5B8C \`oasis apply --reason "\u2026"\` \u63D0\u4EA4\u3001\`oasis staged\` \u770B\u5168\u90E8\uFF09`);
+    let msg = `\u5DF2\u6682\u5B58\uFF1A${describeStageOp(op)}\uFF08\u7F13\u51B2 ${r.count} \u9879\uFF1B\u6539\u5B8C \`oasis apply --reason "\u2026"\` \u63D0\u4EA4\u3001\`oasis staged\` \u770B\u5168\u90E8\uFF09`;
+    if (r.cascade && r.cascade.length > 0)
+      msg += `
+  apply \u65F6\u7EA7\u8054\u65AD\u8FB9\uFF1A${r.cascade.map((e) => `${e.artifactId}\u2192${e.to}`).join("\u3001")}\u2014\u2014\u6D88\u8D39\u8005\u4F1A\u88AB\u91CD\u5524\uFF1B\u6309\u9700\u6539\u6295(link\u2192\u66FF\u4EE3)/\u7EA7\u8054 cancel`;
+    println(msg);
     return;
   }
   switch (command) {
@@ -40135,10 +40448,12 @@ async function runCli(argv, println = console.log) {
       println(message);
       break;
     }
-    case "seal": {
+    case "cancel":
+    case "freeze":
+    case "accept": {
       const { message } = await api.cmd("seal", {
-        artifactId: needPos(positional, 0, "oasis seal <artifactId> --as reason"),
-        reason: need(flags, "as"),
+        artifactId: needPos(positional, 0, `oasis ${command} <artifactId> [--note \u2026]`),
+        reason: command === "cancel" ? "cancelled" : command === "freeze" ? "frozen" : "accepted",
         note: flags.get("note")
       });
       println(message);
@@ -40457,6 +40772,7 @@ var isRunning = (pid) => {
     return false;
   }
 };
+var httpBase = (wsUrl) => wsUrl.replace(/^wss?:\/\//, "http://").replace(/\/node-gateway.*$/, "");
 function installBinary() {
   fs14.mkdirSync(path13.dirname(BIN_FILE), { recursive: true });
   fs14.copyFileSync(process.argv[1], BIN_FILE);
@@ -40521,22 +40837,24 @@ function spawnDaemon() {
 }
 function stopDaemon() {
   const pid = readPid();
-  if (!pid || !isRunning(pid)) {
+  if (pid && isRunning(pid)) {
     try {
-      fs14.unlinkSync(PID_FILE);
+      process.kill(pid, "SIGTERM");
     } catch {
     }
-    return false;
   }
   try {
-    process.kill(pid, "SIGTERM");
+    fs14.unlinkSync(PID_FILE);
   } catch {
   }
   try {
-    fs14.unlinkSync(PID_FILE);
+    (0, import_node_child_process10.execSync)('pkill -f "oasis.js --_daemon"', { stdio: "ignore" });
+  } catch {
+  }
+  try {
+    (0, import_node_child_process10.execSync)("systemctl --user stop oasis-node 2>/dev/null", { stdio: "ignore" });
   } catch {
   }
-  return true;
 }
 void (async () => {
   const [, , cmd] = process.argv;
@@ -40563,34 +40881,48 @@ void (async () => {
       cleanup();
       process.exit(0);
     });
+    if (cfg.nodeId && cfg.name) {
+      const base = httpBase(cfg.serverUrl);
+      fetch(`${base}/api/nodes/${cfg.nodeId}`, {
+        method: "PATCH",
+        headers: { authorization: `Bearer ${cfg.token}`, "content-type": "application/json" },
+        body: JSON.stringify({ name: cfg.name })
+      }).catch(() => {
+      });
+    }
     await startNode({
       serverUrl: cfg.serverUrl,
       token: cfg.token,
-      nodeId: `node-${(0, import_node_crypto21.randomUUID)()}`,
+      nodeId: cfg.nodeId ?? `node-${(0, import_node_crypto21.randomUUID)()}`,
       ...cfg.name ? { nodeName: cfg.name } : {}
     });
     return;
   }
   if (cmd === "start") {
-    const serverUrl = flags.get("server-ws") ?? process.env["OASIS_SERVER_WS"] ?? readConfig()?.serverUrl;
-    const token = flags.get("token") ?? process.env["OASIS_NODE_TOKEN"] ?? readConfig()?.token;
+    const prev = readConfig();
+    const serverUrl = flags.get("server-ws") ?? process.env["OASIS_SERVER_WS"] ?? prev?.serverUrl;
+    const token = flags.get("token") ?? process.env["OASIS_NODE_TOKEN"] ?? prev?.token;
     if (!serverUrl || !token) {
-      console.error("Usage: oasis start --server-ws <wss://...> --token <token> [--name <name>]");
+      console.error("Usage: oasis start --server-ws <wss://...> --token <token> [--name <name>] [--id <nodeId>]");
       process.exit(1);
     }
-    saveConfig({ serverUrl, token, name: flags.get("name") ?? readConfig()?.name });
+    const nodeId = prev?.nodeId ?? flags.get("id") ?? `node-${(0, import_node_crypto21.randomUUID)()}`;
+    const name = flags.get("name") ?? prev?.name;
+    const nameChanged = prev?.name !== void 0 && name !== prev.name;
+    saveConfig({ serverUrl, token, nodeId, ...name ? { name } : {} });
     installBinary();
     stopDaemon();
     setupAutostart();
     const pid = spawnDaemon();
-    console.log(`\u2713 daemon started (PID ${pid})
-  logs: tail -f ${LOG_FILE}`);
+    console.log(`\u2713 daemon started (PID ${pid})${nameChanged ? `  [name updated: ${prev.name} \u2192 ${name}]` : ""}`);
+    console.log(`  logs: tail -f ${LOG_FILE}`);
     if (!process.env["PATH"]?.includes(path13.dirname(LOCAL_BIN)))
       console.log(`  add to PATH: echo 'export PATH="$HOME/.local/bin:$PATH"' >> ~/.bashrc && source ~/.bashrc`);
     return;
   }
   if (cmd === "stop") {
-    console.log(stopDaemon() ? "\u2713 stopped" : "not running");
+    stopDaemon();
+    console.log("\u2713 stopped");
     return;
   }
   if (cmd === "restart") {
@@ -40605,7 +40937,12 @@ void (async () => {
   }
   if (cmd === "status") {
     const pid = readPid();
-    console.log(pid && isRunning(pid) ? `running (PID ${pid})` : "not running");
+    const cfg = readConfig();
+    if (pid && isRunning(pid)) {
+      console.log(`running  PID=${pid}  nodeId=${cfg?.nodeId ?? "?"}  name=${cfg?.name ?? "(none)"}`);
+    } else {
+      console.log("not running");
+    }
     return;
   }
   await runCli(process.argv.slice(2));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis_test",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Oasis node daemon + CLI — background daemon, auto-start, full server CLI",
   "bin": { "oasis": "./dist/index.js" },
   "files": ["dist"],