oasis_test 0.1.11 → 0.1.13

package/dist/index.js

@@ -73,6 +73,8 @@ function fold(model, op) {
         ...p2.description !== void 0 ? { description: p2.description } : {},
         ...p2.docType !== void 0 ? { docType: p2.docType } : {},
         ...p2.parts !== void 0 ? { parts: p2.parts } : {},
+        // 浅拷贝 fields：edit 会 {...a.fields,...} 重建，但 spawn 这份不能别名日志 payload
+        ...p2.fields !== void 0 ? { fields: { ...p2.fields } } : {},
         // 深拷贝：投影状态绝不别名日志数据（边后续会被 link/bump 改写，日志必须不可变）
         inputs: (p2.inputs ?? []).map((e) => ({ ...e }))
       });
@@ -90,6 +92,7 @@ function fold(model, op) {
       if (p2.title !== void 0) a.title = p2.title;
       if (p2.description !== void 0) a.description = p2.description;
       if (p2.docType !== void 0) a.docType = p2.docType;
+      if (p2.fields !== void 0) a.fields = { ...a.fields, ...p2.fields };
       break;
     }
     case "propose_revision": {
@@ -601,6 +604,40 @@ var init_read_model = __esm({
   }
 });
 
+// ../core/src/node-identity.ts
+function slugify(s2, max) {
+  return s2.trim().toLowerCase().replace(/^wo-/, "").replace(/[^a-z0-9一-龥]+/g, "-").replace(/^-|-$/g, "").slice(0, max);
+}
+function deriveArtifactId(type, workspace, title, usedIds) {
+  const wsSlug = slugify(workspace.split(":").pop() ?? workspace, 24) || "ws";
+  const titleSlug = slugify(title, 30) || "untitled";
+  const base = `artifact:${type}:${wsSlug}-${titleSlug}`;
+  let id = base;
+  let n = 2;
+  while (usedIds.has(id)) id = `${base}-${n++}`;
+  usedIds.add(id);
+  return id;
+}
+function resolveNodeRef(ref, candidates) {
+  const r = ref.trim();
+  if (r.startsWith("artifact:")) {
+    const hit = candidates.find((n) => n.id === r);
+    return hit ? { ok: true, id: hit.id } : { ok: false, reason: "not_found" };
+  }
+  const sep = r.indexOf(":");
+  const type = (sep >= 0 ? r.slice(0, sep) : r).trim().toLowerCase();
+  const title = sep >= 0 ? r.slice(sep + 1).trim().toLowerCase() : null;
+  const matches = candidates.filter((n) => n.type.toLowerCase() === type && (title === null || (n.title ?? "").toLowerCase() === title));
+  if (matches.length === 0) return { ok: false, reason: "not_found" };
+  if (matches.length === 1) return { ok: true, id: matches[0].id };
+  return { ok: false, reason: "ambiguous", candidates: matches };
+}
+var init_node_identity = __esm({
+  "../core/src/node-identity.ts"() {
+    "use strict";
+  }
+});
+
 // ../core/src/content-handler.ts
 function defaultHandlersByContentType() {
   return /* @__PURE__ */ new Map([
@@ -678,7 +715,7 @@ var init_content_type_handler = __esm({
         const parts = ctx.queuedPartLabels.map((p2) => `\`${p2}\``).join("\u3001") || "\uFF08\u961F\u5217\u4E3A\u7A7A\uFF09";
         return [
           `\u5404\u90E8\u4EF6\u4ECE**\u5171\u540C\u7956\u5148 H** \u5206\u5934\u4EA7\u51FA\u3001\u5404\u6539\u5404\u5757\uFF1A\u6BCF\u6761\u5185\u5BB9\u5728 \`parts/<\u540D>/CONTENT.md\`\uFF08\u6216\u5176\u5C55\u5F00\u6587\u4EF6\uFF09\u91CC\uFF08${parts}\uFF09\uFF0CH \u7684\u5185\u5BB9\u5728 \`deliverable/\`\uFF08\u4ECE\u96F6\u5206\u89E3\u5219\u4E3A\u7A7A\uFF09\u3002`,
-          `\u628A\u5B83\u4EEC\u5408\u6210 R\\* \u7684\u5B8C\u6574\u5185\u5BB9**\u5C31\u5730\u5199\u8FDB \`deliverable/\`**\u2014\u2014**\u4EE5 H \u4E3A\u5E95**\u3001\u628A\u5404\u90E8\u4EF6\u6539\u52A8**\u5168\u5E76\u8FDB\u6765**\uFF08\u5355\u6587\u4EF6 \`deliverable/CONTENT.md\`\uFF0C\u591A\u6587\u4EF6\u94FA\u6210\u591A\u4E2A\u6587\u4EF6\uFF1B\u5927\u6587\u4EF6\u589E\u91CF\u5199\uFF1AWrite \u9AA8\u67B6 \u2192 Edit \u8FFD\u52A0\uFF09\uFF0C\u7136\u540E\uFF1A`,
+          `\u628A\u5B83\u4EEC\u5408\u6210\u4E00\u4E2A\u5B8C\u6574\u7684\u6574\u5408\u7248**\u5C31\u5730\u5199\u8FDB \`deliverable/\`**\u2014\u2014**\u4EE5 H \u4E3A\u5E95**\u3001\u628A\u5404\u90E8\u4EF6\u6539\u52A8**\u5168\u5E76\u8FDB\u6765**\uFF08\u5355\u6587\u4EF6 \`deliverable/CONTENT.md\`\uFF0C\u591A\u6587\u4EF6\u94FA\u6210\u591A\u4E2A\u6587\u4EF6\uFF1B\u5927\u6587\u4EF6\u589E\u91CF\u5199\uFF1AWrite \u9AA8\u67B6 \u2192 Edit \u8FFD\u52A0\uFF09\uFF0C\u7136\u540E\uFF1A`,
           `\`oasis integrate ${ctx.artifactId} --from-dir deliverable/ --reason "<\u96C6\u6210\u8BF4\u660E>"\` \u2192 \`oasis conclude ${ctx.artifactId}\`\u3002`,
           ``,
           `**\u5FE0\u5B9E\u5408\u5E76\u3001\u522B\u4E22\u4EFB\u4F55\u90E8\u4EF6**\uFF1B\u63A5\u53E3/\u547D\u540D\u5BF9\u4E0D\u9F50\u5C31\u6309\u4E0A\u6E38\u89C4\u683C\u6821\u6B63\uFF0C\u8BA9 N \u4E2A\u90E8\u4EF6\u62FC\u6210\u4E00\u4E2A\u81EA\u6D3D\u6574\u4F53\u3002`
@@ -729,7 +766,7 @@ var init_content_type_handler = __esm({
           `\u8FD9\u662F\u4EE3\u7801\u2014\u2014\u5404\u90E8\u4EF6**\u5DF2\u81EA\u884C\u5E76\u5165\u5DE5\u5355\u5206\u652F \`${feat}\`**\uFF08\u6BCF\u4E2A part \u5E72\u5B8C\u81EA\u5DF1 merge \u8FDB\u6765\u3001\u89E3\u4E86\u5404\u81EA\u7684\u51B2\u7A81\uFF09\u3002\u4F60 owner **\u4E0D\u7528\u518D\u9010\u6761\u5408\u5E76**\uFF0C\u53EA\u9A8C\u6574\u4F53 + \u6536\u53E3\uFF1A`,
           `1. \`git clone ${r0?.remote ?? "<remote>"} repos/${r0?.id ?? "<id>"}\` \u2192 \`git checkout ${feat}\`\uFF0C**\u9A8C\u6574\u4F53\u80FD\u6784\u5EFA/\u80FD\u8DD1**\uFF08\u8FD9\u624D\u662F\u4F60 owner \u7684\u5224\u65AD\u6D3B\uFF09\u3002`,
           `2. \u82E5\u6709\u6B8B\u7559\u95EE\u9898\uFF08\u63A5\u53E3\u6CA1\u5BF9\u9F50\u3001\u6784\u5EFA\u5931\u8D25\u3001\u90E8\u4EF6\u8854\u63A5\u5904\u8981\u6536\u5C3E\uFF09\u2192 \u5C31\u5730\u4FEE\u3001\`git commit\`\u3001\`git push origin ${feat}\`\u3002`,
-          `3. \`oasis integrate ${artifactId} --reason "<\u96C6\u6210\u8BF4\u660E>"\` \u2192 \`oasis conclude ${artifactId}\`\uFF08\u7CFB\u7EDF\u4ECE \`${feat}\` \u6536\u96C6 R\\*\uFF1Bconclude \u540E\u9010\u4ED3\u540C\u6B65\u8FDB develop\uFF09\u3002`,
+          `3. \`oasis integrate ${artifactId} --reason "<\u96C6\u6210\u8BF4\u660E>"\` \u2192 \`oasis conclude ${artifactId}\`\uFF08\u7CFB\u7EDF\u4ECE \`${feat}\` \u6536\u96C6\u6574\u5408\u7248\uFF1Bconclude \u540E\u9010\u4ED3\u540C\u6B65\u8FDB develop\uFF09\u3002`,
           ``,
           `**\u4F60\u8FD9\u7EA7\u662F\u628A\u5173\u6574\u4F53\u81EA\u6D3D\u3001\u4E0D\u662F\u91CD\u65B0\u5408\u5E76**\u2014\u2014\u5408\u5E76\u5DF2\u7ECF\u5728\u5404\u90E8\u4EF6\u6536\u5C3E\u65F6\u5404\u81EA\u505A\u5B8C\u4E86\u3002`
         ];
@@ -1248,6 +1285,48 @@ var init_grounding = __esm({
 });
 
 // ../core/src/kernel.ts
+function fieldValueMatches(val, type) {
+  switch (type) {
+    case "string":
+      return typeof val === "string";
+    case "number":
+      return typeof val === "number";
+    case "boolean":
+      return typeof val === "boolean";
+    case "string[]":
+      return Array.isArray(val) && val.every((x2) => typeof x2 === "string");
+  }
+}
+function coerceFieldValue(key, val, type) {
+  if (fieldValueMatches(val, type)) return val;
+  if (typeof val === "string") {
+    if (type === "number" && val.trim() !== "" && !Number.isNaN(Number(val))) return Number(val);
+    if (type === "boolean" && (val === "true" || val === "false")) return val === "true";
+  }
+  throw new KernelError(`\u5B57\u6BB5 '${key}' \u7C7B\u578B\u5E94\u4E3A ${type}${type === "string[]" ? "\uFF08\u6570\u7EC4\u503C\u8BF7\u7528 --set-json\uFF09" : ""}`);
+}
+function validateArtifactFields(fields, specs, mode) {
+  const declared = new Map((specs ?? []).map((s2) => [s2.name, s2]));
+  let out;
+  if (fields !== void 0) {
+    out = {};
+    for (const [key, val] of Object.entries(fields)) {
+      const spec = declared.get(key);
+      if (!spec) {
+        throw new KernelError(`\u672A\u58F0\u660E\u5B57\u6BB5 '${key}'\uFF08${declared.size > 0 ? `\u8BE5\u7C7B\u578B\u58F0\u660E\uFF1A${[...declared.keys()].join(", ")}` : "\u8BE5\u7C7B\u578B\u672A\u58F0\u660E\u4EFB\u4F55\u81EA\u5B9A\u4E49\u5B57\u6BB5"}\uFF09`);
+      }
+      out[key] = val === null ? null : coerceFieldValue(key, val, spec.type);
+    }
+  }
+  if (mode === "spawn") {
+    for (const spec of specs ?? []) {
+      if (spec.required && (fields?.[spec.name] === void 0 || fields[spec.name] === null)) {
+        throw new KernelError(`\u7F3A\u5FC5\u586B\u5B57\u6BB5 '${spec.name}'\uFF08${spec.type}\uFF09`);
+      }
+    }
+  }
+  return out;
+}
 var import_node_crypto, SYSTEM_ACTOR, MAX_PREREQ_DEPTH, KernelError, FrozenError, Kernel;
 var init_kernel = __esm({
   "../core/src/kernel.ts"() {
@@ -1256,6 +1335,7 @@ var init_kernel = __esm({
     init_src();
     init_read_model();
     init_content_handler();
+    init_node_identity();
     init_governance();
     init_manifest_store();
     init_grounding();
@@ -1350,6 +1430,7 @@ var init_kernel = __esm({
           );
         }
         this.enforceAcl("spawn", typeDef, args.actor);
+        const fields = this.schema.size > 0 ? validateArtifactFields(args.fields, typeDef?.fieldDefs, "spawn") : args.fields;
         const inputs = [];
         for (const edge of args.inputs ?? []) {
           if (edge.to === args.id) throw new KernelError("\u4E0D\u80FD\u4F9D\u8D56\u81EA\u5DF1");
@@ -1378,7 +1459,8 @@ var init_kernel = __esm({
           ...args.title !== void 0 ? { title: args.title } : {},
           ...args.description !== void 0 ? { description: args.description } : {},
           ...args.docType !== void 0 ? { docType: args.docType } : {},
-          ...args.parts !== void 0 ? { parts: args.parts } : {}
+          ...args.parts !== void 0 ? { parts: args.parts } : {},
+          ...fields !== void 0 ? { fields } : {}
         };
         await this.commit(args.id, args.actor, "spawn_artifact", args.id, payload);
         return this.model.artifacts.get(args.id);
@@ -1993,7 +2075,64 @@ var init_kernel = __esm({
        * 预检（②终态校验 + ③advisory + ④爆炸半径）。preview 白送：
        * structuredClone 读模型、灌假设 op、看终态——derived-not-stored 的红利，无须仿真引擎。
        */
+      /**
+       * 二期 title-identity：把 plan 里的【节点引用】（`type` | `type:title` | `id`）解析成最终 id。
+       * - spawn 省略 id → 据 (type,title) 派生（usedIds 预种工单现有 id + 本批显式 id,不和存量撞）。
+       * - 引用现有/本批节点 → 在 plan.workspace 范围内 {现有 ∪ 本批 spawn} 匹配;撞多个 throw 带候选、无则 throw。
+       * - 批内**先派生所有 spawn 的 id,再解引用**（link 才引得到本批新建的）。
+       * - workspace 缺省 = 只走 id（向后兼容 passthrough）。**幂等**:解析一份已解析的 plan = 原样。
+       * 落 oplog 的是解析后的 id（重放确定）。
+       */
+      resolveInterventionRefs(plan) {
+        const ws = plan.workspace;
+        const existing = ws ? [...this.model.artifacts.values()].filter((a) => a.workspace === ws).map((a) => ({ id: a.id, type: a.type, ...a.title ? { title: a.title } : {} })) : [];
+        const usedIds = new Set(existing.map((n) => n.id));
+        for (const op of plan.ops) if (op.action === "spawn" && op.id) usedIds.add(op.id);
+        const batch = [];
+        const spawnIds = plan.ops.map((op) => {
+          if (op.action !== "spawn") return void 0;
+          if (op.id) {
+            batch.push({ id: op.id, type: op.type, ...op.title ? { title: op.title } : {} });
+            return op.id;
+          }
+          if (!ws) throw new KernelError("spawn \u7701\u7565 id \u9700\u8981 InterventionPlan.workspace + title \u624D\u80FD\u6D3E\u751F");
+          const title = op.title?.trim();
+          if (!title) throw new KernelError("spawn \u7701\u7565 id \u65F6 title \u5FC5\u586B\uFF08\u636E (type,title) \u6D3E\u751F id\uFF09");
+          if ([...existing, ...batch].some((n) => n.type === op.type && (n.title ?? "").toLowerCase() === title.toLowerCase()))
+            throw new KernelError(`\u8282\u70B9 title \u649E\u540D\uFF1A${op.type}\u300C${title}\u300D\u5728\u672C\u5DE5\u5355\u5DF2\u5B58\u5728,\u8BF7\u6362\u4E2A\u533A\u5206\u7684\u540D\u5B57`);
+          const id = deriveArtifactId(op.type, ws, title, usedIds);
+          batch.push({ id, type: op.type, title });
+          return id;
+        });
+        const candidates = [...existing, ...batch];
+        const ref = (r, what) => {
+          if (r === void 0) return void 0;
+          if (!ws) return r;
+          const res = resolveNodeRef(r, candidates);
+          if (res.ok) return res.id;
+          if (res.reason === "ambiguous")
+            throw new KernelError(`${what}\u300C${r}\u300D\u5339\u914D\u5230\u591A\u4E2A\u8282\u70B9,\u8BF7\u6307\u660E\u54EA\u4E2A:
+${res.candidates.map((c) => `  - ${c.type}:${c.title ?? "(\u65E0title)"} \u2192 ${c.id}`).join("\n")}`);
+          throw new KernelError(`${what}\u300C${r}\u300D\u627E\u4E0D\u5230\u5BF9\u5E94\u8282\u70B9\uFF08\u53EF\u7528 type / type:title / id\uFF09`);
+        };
+        const ops = plan.ops.map((op, i) => {
+          switch (op.action) {
+            case "spawn":
+              return { ...op, id: spawnIds[i], ...op.workspace === void 0 && ws ? { workspace: ws } : {}, ...op.inputs ? { inputs: op.inputs.map((e) => ({ to: ref(e.to, "spawn \u4F9D\u8D56"), ...e.required !== void 0 ? { required: e.required } : {} })) } : {} };
+            case "link":
+            case "unlink":
+            case "pin":
+              return { ...op, artifactId: ref(op.artifactId, op.action), to: ref(op.to, `${op.action} \u4E0A\u6E38`) };
+            case "annotate":
+              return { ...op, artifactId: ref(op.artifactId, "annotate"), ...op.raisedFrom ? { raisedFrom: ref(op.raisedFrom, "annotate raisedFrom") } : {} };
+            default:
+              return { ...op, artifactId: ref(op.artifactId, op.action) };
+          }
+        });
+        return { ...plan, ops };
+      }
       async previewIntervention(plan) {
+        plan = this.resolveInterventionRefs(plan);
         const constituents = this.buildConstituents(plan);
         const touched = [...new Set(constituents.map((c) => c.artifactId))];
         const baseSeqs = Object.fromEntries(touched.map((id) => [id, this.model.lastSeq.get(id) ?? 0]));
@@ -2122,6 +2261,7 @@ var init_kernel = __esm({
        * v1 注：inverse 批次未物化（oplog 信息足以推导），可逆性=再发一个 intervention。
        */
       async applyIntervention(plan, baseSeqs, actor) {
+        plan = this.resolveInterventionRefs(plan);
         const { changeClass, nonMonotonicOps } = classifyIntervention(plan);
         if (changeClass === "C" && !isHumanActor(actor)) {
           throw new KernelError(
@@ -2199,27 +2339,31 @@ var init_kernel = __esm({
       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, b2) => order[a.action] - order[b2.action]);
-        const spawnedHere = new Set(plan.ops.flatMap((op) => op.action === "spawn" ? [op.id] : []));
+        const spawnedHere = new Set(plan.ops.flatMap((op) => op.action === "spawn" && op.id ? [op.id] : []));
         const isPrereqFill = (id) => plan.ops.some((op) => op.action === "link" && op.to === id && !spawnedHere.has(op.artifactId));
         return sorted.map((op) => {
           switch (op.action) {
             case "spawn": {
+              const spawnId = op.id;
+              if (!spawnId) throw new KernelError("internal: spawn id \u672A\u89E3\u6790\uFF08\u5E94\u5148\u8FC7 resolveInterventionRefs\uFF09");
               const typeDef = this.schema.get(op.type);
               if (this.schema.size > 0 && !typeDef) throw new KernelError(`unknown ArtifactType: ${op.type}`);
+              const spawnFields = this.schema.size > 0 ? validateArtifactFields(op.fields, typeDef?.fieldDefs, "spawn") : op.fields;
               const owner = op.owner ?? this.resolveOwner(op.type, typeDef);
               return {
-                artifactId: op.id,
+                artifactId: spawnId,
                 kind: "spawn_artifact",
-                target: op.id,
+                target: spawnId,
                 payload: {
                   type: op.type,
                   owner,
                   workspace: op.workspace ?? "ws:default",
                   persistence: "persistent",
-                  createdVia: isPrereqFill(op.id) ? "prereq" : "manual-spawn",
+                  createdVia: isPrereqFill(spawnId) ? "prereq" : "manual-spawn",
                   ...op.title !== void 0 ? { title: op.title } : {},
                   ...op.description !== void 0 ? { description: op.description } : {},
                   ...op.docType !== void 0 ? { docType: op.docType } : {},
+                  ...spawnFields !== void 0 ? { fields: spawnFields } : {},
                   inputs: (op.inputs ?? []).map((e) => ({
                     to: e.to,
                     pinned: concludedHead(this.model, e.to),
@@ -2254,7 +2398,12 @@ var init_kernel = __esm({
                   ...op.blocks !== void 0 ? { blocks: op.blocks } : {}
                 }
               };
-            case "edit":
+            case "edit": {
+              let editFields = op.fields;
+              if (this.schema.size > 0 && op.fields !== void 0) {
+                const a = this.model.artifacts.get(op.artifactId);
+                editFields = validateArtifactFields(op.fields, a ? this.schema.get(a.type)?.fieldDefs : void 0, "edit");
+              }
               return {
                 artifactId: op.artifactId,
                 kind: "edit_artifact",
@@ -2262,9 +2411,11 @@ var init_kernel = __esm({
                 payload: {
                   ...op.title !== void 0 ? { title: op.title } : {},
                   ...op.description !== void 0 ? { description: op.description } : {},
-                  ...op.docType !== void 0 ? { docType: op.docType } : {}
+                  ...op.docType !== void 0 ? { docType: op.docType } : {},
+                  ...editFields !== void 0 ? { fields: editFields } : {}
                 }
               };
+            }
           }
         });
       }
@@ -2500,7 +2651,7 @@ function commandReference(opts) {
   const write = [`**\u5199**`];
   if (opts.action === "integrate") {
     write.push(
-      opts.isCode ? `- \`oasis integrate ${id} --reason "<\u96C6\u6210\u8BF4\u660E>"\` \u2014\u2014 **\u6536\u53E3\u4E13\u7528**\uFF1A\u628A\u5DE5\u5355\u5206\u652F\u7684\u6574\u5408\u7248\u843D\u4E3A R\\*\uFF08\u7CFB\u7EDF\u4ECE git \u6536\u96C6\uFF1B\u89C1\u300C\u600E\u4E48\u63D0\u4EA4\u300D\uFF09\u3002**\u7EDD\u4E0D\u8981\u7528 propose/advance \u4EA4\u96C6\u6210**\u3002` : `- \`oasis integrate ${id} --from-dir deliverable/ --reason "<\u96C6\u6210\u8BF4\u660E>"\` \u2014\u2014 **\u6536\u53E3\u4E13\u7528**\uFF1A\u628A\u4F60\u5728 deliverable/ \u5408\u6210\u7684 R\\* \u843D\u4E3A\u65B0 head\uFF08\u5185\u90E8\u81EA\u52A8 FF \u961F\u9996 + \u628A\u5176\u4F59\u7ADE\u4E89\u7248\u6298\u8FDB\u6765\uFF09\u3002**\u7EDD\u4E0D\u8981\u7528 propose/advance \u4EA4\u96C6\u6210**\uFF08\u4F1A\u628A\u96C6\u6210\u5F53\u6210\u53C8\u4E00\u4E2A\u7ADE\u4E89\u7248\u3001\u843D\u9519\u7248\u672C\uFF09\u3002`
+      opts.isCode ? `- \`oasis integrate ${id} --reason "<\u96C6\u6210\u8BF4\u660E>"\` \u2014\u2014 **\u6536\u53E3\u4E13\u7528**\uFF1A\u628A\u5DE5\u5355\u5206\u652F\u7684\u6574\u5408\u7248\u843D\u4E3A R\\*\uFF08\u7CFB\u7EDF\u4ECE git \u6536\u96C6\uFF1B\u89C1\u300C\u600E\u4E48\u63D0\u4EA4\u300D\uFF09\u3002**\u7EDD\u4E0D\u8981\u7528 propose/advance \u4EA4\u96C6\u6210**\u3002` : `- \`oasis integrate ${id} --from-dir deliverable/ --reason "<\u96C6\u6210\u8BF4\u660E>"\` \u2014\u2014 **\u6536\u53E3\u4E13\u7528**\uFF1A\u628A\u4F60\u5728 deliverable/ \u5408\u6210\u7684\u6574\u5408\u7248\u843D\u4E3A\u65B0 head\uFF08\u7CFB\u7EDF\u5185\u90E8\u4F1A\u628A\u961F\u5217\u91CC\u5176\u4F59\u5F85\u843D\u7248\u672C\u4E00\u5E76\u5E76\u8FDB\u6765\uFF09\u3002**\u7EDD\u4E0D\u8981\u7528 propose / advance \u4EA4\u96C6\u6210**\uFF08\u90A3\u4F1A\u628A\u96C6\u6210\u5F53\u6210\u53C8\u4E00\u4E2A\u5E76\u5217\u7248\u672C\u3001\u843D\u9519\u7248\u672C\uFF09\u3002`
     );
   } else {
     const reviewSuffix = opts.hasOpenAnnotations ? "\u5F53\u524D\u6709\u672A\u51B3\u4EBA\u5DE5/\u6279\u6CE8\u8981\u6C42\uFF0C\u63D0\u4EA4\u540E\u4F1A\u8FDB\u5165\u4EBA\u5DE5\u5BA1\u6838/\u961F\u5217\uFF0C\u4E0D\u4F1A\u81EA\u52A8\u843D head\uFF1B\u4E0D\u8981\u628A\u4EBA\u5DE5\u53D8\u66F4\u8BF7\u6C42\u81EA\u884C\u6807\u4E3A resolved\uFF0C\u7B49\u4EBA\u5BA1\u6838\u901A\u8FC7\u6216\u9000\u56DE\u3002" : "\u4F60\u662F\u5355 producer\u3001\u961F\u5217\u7A7A\u65F6\u5B83**\u81EA\u52A8\u843D head**\uFF0C\u4E0D\u7528 advance\u3002";
@@ -2510,15 +2661,15 @@ function commandReference(opts) {
   }
   write.push(
     `- \`oasis conclude ${id}\` \u2014\u2014 \u5BA3\u5E03\u4EA7\u7269**\u5B8C\u6574\u3001\u53EF\u88AB\u4E0B\u6E38\u6D88\u8D39**\uFF0C\u76D6\u4E00\u4E2A\u91CC\u7A0B\u7891\u3002\u524D\u63D0\uFF1A\u961F\u5217\u5DF2\u6E05\u7A7A\u3001\u4E14\u65E0\u672A\u89E3\u6790 gap / \u672A\u7B54\u590D\u56DE\u538B\uFF08\u5426\u5219\u88AB\u62D2\uFF09\u3002\u76D6\u5B8C\u4E0B\u6E38\u6536\u5230\u901A\u77E5\u3002`,
-    `- \`oasis add-revision ${id} --part <\u90E8\u4EF6\u540D> --role <\u89D2\u8272> --desc "<\u8FD9\u90E8\u4EF6\u505A\u4EC0\u4E48>"\` \u2014\u2014 \u628A\u672C\u4EA7\u7269\u62C6\u6210\u4E00\u4E2A**\u53EF\u5E76\u884C\u4EA7\u51FA\u7684\u5B50\u90E8\u4EF6**\u6D3E\u51FA\u53BB\u3002\`--role\` \u7F3A\u7701=\u4F60\u81EA\u5DF1\uFF1B\u5404\u90E8\u4EF6\u4EA7\u5B8C\u7531\u4F60 \`oasis integrate\` \u6536\u53E3\u3002`,
+    `- \`oasis add-revision ${id} --desc "<\u8FD9\u90E8\u4EF6\u505A\u4EC0\u4E48>" [--name <\u90E8\u4EF6\u540D>] [--role <\u89D2\u8272>]\` \u2014\u2014 \u628A\u672C\u4EA7\u7269\u62C6\u51FA\u4E00\u4E2A**\u53EF\u5E76\u884C\u4EA7\u51FA\u7684\u5B50\u90E8\u4EF6**\u6D3E\u51FA\u53BB\u3002\`--desc\`\uFF08**\u5FC5\u586B**\uFF09= \u8FD9\u4E2A\u5B50\u90E8\u4EF6\u8981\u5B8C\u6210\u4EC0\u4E48\uFF1B\`--name\` = \u7ED9\u5B83\u8D77\u7684\u90E8\u4EF6\u540D\uFF08\u53EF\u9009\uFF0C\u7F3A\u7701\u81EA\u52A8\u751F\u6210\uFF09\uFF1B\`--role\` = \u8C01\u6765\u505A\uFF08\u53EF\u9009\uFF0C\u7F3A\u7701=\u4F60\u81EA\u5DF1\uFF09\u3002\u5404\u90E8\u4EF6\u4EA7\u5B8C\u7531\u4F60 \`oasis integrate\` \u6536\u53E3\u3002`,
     `- \`oasis gap ${id} --desc "<\u7F3A\u4EC0\u4E48>"\` \u2014\u2014 \u7F3A\u4E00\u4E2A\u8FD8\u4E0D\u5B58\u5728\u7684\u524D\u7F6E\u3001\u505A\u4E0D\u4E0B\u53BB\u65F6\u7528\u3002\`--desc\` \u63CF\u8FF0\u7F3A\u4EC0\u4E48\uFF08\u534F\u8C03\u8005\u636E\u5B83\u5224\u8FDE\u65E2\u6709/\u65B0\u5EFA\uFF09\u3002\u62A5\u5B8C**\u6536\u5DE5**\uFF1A\u8FD9\u6761\u4F1A\u6682\u505C\u3001\u524D\u7F6E\u5C31\u7EEA\u540E\u91CD\u65B0\u5524\u8D77\u4F60\uFF1B\u671F\u95F4\u522B propose\u3002`,
     `- \`oasis annotate <\u4E0A\u6E38id> --from ${id} --body "<\u7591\u95EE>"\` \u2014\u2014 \u5BF9\u67D0\u4E0A\u6E38\u63D0\u7591\u95EE/\u5F02\u8BAE\uFF08\u56DE\u538B\uFF09\u3002\`<\u4E0A\u6E38id>\`=\u88AB\u95EE\u7684\u4E0A\u6E38\uFF1B\`--from\`=\u672C\u4EA7\u7269\uFF08\u7CFB\u7EDF\u636E\u6B64\u5728\u4E0A\u6E38\u7B54\u590D\u540E\u91CD\u6D3E\u4F60\uFF09\uFF1B\`--body\`=\u5177\u4F53\u95EE\u9898\u3002\u63D0\u5B8C**\u6536\u5DE5**\u7B49\u7B54\u590D\uFF0C\u522B propose\u3002`
   );
   if (opts.hasOpenAnnotations) {
-    write.push(`- \`oasis resolve <annId> --resolution resolved|wontfix|acknowledged [--note "..."]\` \u2014\u2014 \u7B54\u590D/\u4E86\u7ED3**\u6302\u5728\u4F60\u4EA7\u7269\u4E0A\u7684** annotation\uFF08\u542B\u4E0B\u6E38\u56DE\u538B\uFF09\u3002`);
+    write.push(`- \`oasis resolve <annId> --as resolved|wontfix|acknowledged [--note "<\u8BF4\u660E>"]\` \u2014\u2014 \u7B54\u590D / \u4E86\u7ED3**\u6302\u5728\u4F60\u4EA7\u7269\u4E0A\u7684** annotation\uFF08\u542B\u4E0B\u6E38\u56DE\u538B\uFF09\u3002\`<annId>\`\uFF08\u4F4D\u7F6E\u53C2\u6570\uFF09= \u8981\u4E86\u7ED3\u7684\u6279\u6CE8 id\uFF1B\`--as\` = \u7ED3\u8BBA\uFF08resolved=\u5DF2\u89E3\u51B3 / wontfix=\u4E0D\u6539 / acknowledged=\u5DF2\u77E5\u6089\uFF09\uFF1B\`--note\` = \u8865\u5145\u8BF4\u660E\uFF08\u53EF\u9009\uFF09\u3002`);
   }
   if (opts.action === "integrate") {
-    write.push(`- \`oasis reject <revId> --reason "<\u4E3A\u4EC0\u4E48>"\` \u2014\u2014 \u5F03\u7528\u961F\u5217\u91CC\u67D0\u4E2A\u574F\u7684\u90E8\u4EF6-revision\uFF08\u4E0D\u5E76\u8FDB\u96C6\u6210\uFF09\u3002`);
+    write.push(`- \`oasis reject <artifactId> <revId> --reason "<\u4E3A\u4EC0\u4E48>"\` \u2014\u2014 \u5F03\u7528\u961F\u5217\u91CC\u67D0\u4E2A\u574F\u7684\u90E8\u4EF6-revision\uFF08\u4E0D\u5E76\u8FDB\u96C6\u6210\uFF09\u3002\`<artifactId>\`\uFF08**\u7B2C\u4E00\u4E2A**\u4F4D\u7F6E\u53C2\u6570\uFF09= \u4EA7\u7269 id\uFF1B\`<revId>\`\uFF08\u7B2C\u4E8C\u4E2A\uFF09= \u8981\u5F03\u7528\u7684 revision id\uFF1B\`--reason\` = \u4E3A\u4EC0\u4E48\u5F03\u3002`);
   }
   return [`## \u4F60\u80FD\u7528\u7684 oasis \u547D\u4EE4\uFF08\u672C\u6B21\uFF09`, ...write, ``, ...readFull];
 }
@@ -2672,6 +2823,10 @@ async function assembleContext(args) {
       }
     }
   }
+  if (args.materializeSkills) {
+    const skillFiles = await args.materializeSkills().catch(() => ({}));
+    for (const [p2, c] of Object.entries(skillFiles)) files[p2] = c;
+  }
   const wsCodeRepo = args.codeRepo ?? null;
   const isCodeArtifact = typeDef?.contentType === "code" && !!wsCodeRepo?.repos?.some((r) => r.remote);
   files["TASK.md"] = [
@@ -2935,6 +3090,8 @@ var init_dispatcher = __esm({
       inFlight = /* @__PURE__ */ new Map();
       /** v1 调度准入：在途会话的 actor（jobKey → actorId），用于每 agent 并发计数。与 inFlight 同生同灭。 */
       inFlightActor = /* @__PURE__ */ new Map();
+      /** 在途会话的派发时刻（jobKey → ms），算"已跑多久"用（协调者病历的会话情况）。与 inFlight 同生同灭。 */
+      inFlightStartedAt = /* @__PURE__ */ new Map();
       strikes = /* @__PURE__ */ new Map();
       /** v1 调度准入：上一轮 tick 中"够格但被并发上限挡下"的 produce（隐式队列；下个 tick 重评）。
        *  jobKey → 撞的是哪道闸（global 全局总量 / per-actor owner 自己到上限）+ 该 actor——
@@ -2979,8 +3136,9 @@ var init_dispatcher = __esm({
             artifactId: this.artifactIdFromJobKey(jobKey),
             sessionId: handle.id,
             actor: this.inFlightActor.get(jobKey) ?? "",
-            action: jobKey.slice(0, jobKey.indexOf("::"))
+            action: jobKey.slice(0, jobKey.indexOf("::")),
             // produce / review / integrate
+            startedAt: new Date(this.inFlightStartedAt.get(jobKey) ?? Date.now()).toISOString()
           });
         }
         return out;
@@ -3129,6 +3287,8 @@ var init_dispatcher = __esm({
         const lastFailure = retry && retry.count > 0 && retry.lastReason ? { reason: retry.lastReason } : void 0;
         const ws = kernel.model.artifacts.get(spec.artifactId)?.workspace;
         const codeRepo = ws ? await this.opts.resolveCodeRepo?.(ws) ?? null : null;
+        const binding = await this.opts.resolveBinding?.(spec.actor) ?? void 0;
+        const materializeSkills = this.opts.materializeSkills ? () => this.opts.materializeSkills(spec.actor, binding?.runtimeKind ?? "claude") : void 0;
         const bundle = await assembleContext({
           model: kernel.model,
           blobs: this.opts.blobs,
@@ -3140,9 +3300,9 @@ var init_dispatcher = __esm({
           ...lastFailure ? { lastFailure } : {},
           ...this.opts.schema !== void 0 ? { schema: this.opts.schema } : {},
           ...codeRepo ? { codeRepo } : {},
-          ...this.opts.resolveActorContext !== void 0 ? { resolveActorContext: this.opts.resolveActorContext } : {}
+          ...this.opts.resolveActorContext !== void 0 ? { resolveActorContext: this.opts.resolveActorContext } : {},
+          ...materializeSkills ? { materializeSkills } : {}
         });
-        const binding = await this.opts.resolveBinding?.(spec.actor) ?? void 0;
         const provisioned = this.opts.provision ? await this.opts.provision(spec.actor) : void 0;
         const job = {
           actor: spec.actor,
@@ -3159,6 +3319,7 @@ var init_dispatcher = __esm({
         this.inFlight.set(jobKey, session);
         this.inFlightActor.set(jobKey, spec.actor);
         const dispatchedAtMs = Date.now();
+        this.inFlightStartedAt.set(jobKey, dispatchedAtMs);
         const seqAtDispatch = seqNow;
         const sink = this.opts.trajectory;
         if (sink) {
@@ -3224,6 +3385,7 @@ var init_dispatcher = __esm({
         }
         this.inFlight.delete(jobKey);
         this.inFlightActor.delete(jobKey);
+        this.inFlightStartedAt.delete(jobKey);
         const seqAtExit = kernel.model.lastSeq.get(spec.artifactId) ?? 0;
         if (sink) {
           void (async () => {
@@ -3363,6 +3525,7 @@ var init_src2 = __esm({
   "../core/src/index.ts"() {
     "use strict";
     init_read_model();
+    init_node_identity();
     init_content_handler();
     init_content_type_handler();
     init_diff();
@@ -20363,6 +20526,36 @@ var init_drafts = __esm({
   }
 });
 
+// ../server/src/governance/workorder-drafts.ts
+var WorkorderDraftStore;
+var init_workorder_drafts = __esm({
+  "../server/src/governance/workorder-drafts.ts"() {
+    "use strict";
+    WorkorderDraftStore = class {
+      drafts = /* @__PURE__ */ new Map();
+      seq = 0;
+      submit(d) {
+        const draft = { ...d, id: `wodraft:${++this.seq}`, at: (/* @__PURE__ */ new Date()).toISOString() };
+        this.drafts.set(draft.id, draft);
+        return draft;
+      }
+      list() {
+        return [...this.drafts.values()];
+      }
+      /** 按 workspace 取最新一份：friday 用它发起建单时生成的 workspace id 取回草案，无需解析 chat 文本。 */
+      forWorkspace(workspace) {
+        return [...this.drafts.values()].reverse().find((d) => d.workspace === workspace);
+      }
+      get(id) {
+        return this.drafts.get(id);
+      }
+      remove(id) {
+        return this.drafts.delete(id);
+      }
+    };
+  }
+});
+
 // ../server/src/domains/collab/planner.ts
 function ensureDefaultWorkorderTypes(schema) {
   const out = [...schema];
@@ -20371,18 +20564,17 @@ function ensureDefaultWorkorderTypes(schema) {
   }
   return out;
 }
-function parsePlanningIssues(body) {
-  const first = body.split("\n", 1)[0] ?? "";
-  if (!first.startsWith(PLANNING_ISSUES_PREFIX)) return [];
-  try {
-    const parsed = JSON.parse(first.slice(PLANNING_ISSUES_PREFIX.length));
-    return Array.isArray(parsed) ? parsed : [];
-  } catch {
-    return [];
+function upgradeDefaultFieldDefs(schema) {
+  const changed = [];
+  for (const def of DEFAULT_TYPES) {
+    if (!def.fieldDefs) continue;
+    const cur = schema.find((item) => item.name === def.name);
+    if (cur && !cur.fieldDefs) {
+      cur.fieldDefs = def.fieldDefs;
+      changed.push(def.name);
+    }
   }
-}
-function workorderSpecBody(spec) {
-  return WORKORDER_SPEC_PREFIX + JSON.stringify(spec);
+  return changed;
 }
 function parseWorkorderSpec(body) {
   const first = body.split("\n", 1)[0] ?? "";
@@ -20420,6 +20612,12 @@ async function buildDynamicWorkorderPlan(input) {
     return match;
   };
   const briefOwner = input.actor;
+  const specFields = {};
+  if (input.goal?.trim()) specFields["goal"] = input.goal.trim();
+  if (input.acceptanceCriteria?.length) {
+    const items = input.acceptanceCriteria.map((x2) => x2.trim()).filter(Boolean);
+    if (items.length > 0) specFields["acceptanceCriteria"] = items;
+  }
   const ops = [
     {
       action: "spawn",
@@ -20429,23 +20627,12 @@ async function buildDynamicWorkorderPlan(input) {
       workspace: input.workspace,
       // 工单名 → brief.title；工单目标/brief → brief.description（别再把 name 塞进 description、丢掉 goal）
       ...input.title?.trim() ? { title: input.title.trim() } : {},
-      description: input.description
+      description: input.description,
+      ...Object.keys(specFields).length > 0 ? { fields: specFields } : {}
     }
   ];
-  const spec = {};
-  if (input.goal?.trim()) spec.goal = input.goal.trim();
-  if (input.acceptanceCriteria?.length) {
-    const items = input.acceptanceCriteria.map((x2) => x2.trim()).filter(Boolean);
-    if (items.length > 0) spec.acceptanceCriteria = items;
-  }
-  if (spec.goal !== void 0 || spec.acceptanceCriteria !== void 0) {
-    ops.push({ action: "annotate", artifactId: briefId, body: workorderSpecBody(spec), blocks: false });
-  }
   const spawned = [{ id: briefId, type: "brief", role: "pm", owner: briefOwner }];
   const agentGraph = input.agentPlan ? normalizeAgentPlan(input.agentPlan, schema.map((d) => d.name)) : null;
-  const briefByType = new Map(
-    (input.agentPlan?.nodes ?? []).filter((n) => typeof n.brief === "string" && n.brief.trim().length > 0).map((n) => [n.type.trim().toLowerCase(), n.brief.trim()])
-  );
   if (input.agentPlan && !agentGraph) {
     issues.push({
       code: "planner_invalid",
@@ -20453,51 +20640,63 @@ async function buildDynamicWorkorderPlan(input) {
       message: "pm_agent \u7684\u89C4\u5212\u7ED3\u679C\u4E3A\u7A7A\u6216\u683C\u5F0F\u65E0\u6548\uFF0C\u5DF2\u56DE\u9000\u5230\u89C4\u5219 planner\u3002"
     });
   }
-  const desired = agentGraph?.types ?? desiredArtifacts(primaryType, input.description);
+  for (const dup of agentGraph?.dupTitles ?? []) {
+    issues.push({ code: "title_collision", severity: "warning", message: `\u8282\u70B9 title \u649E\u540D\u300C${dup}\u300D\u2014\u2014\u540C\u4E00\u5DE5\u5355\u540C\u7C7B\u578B title \u987B\u552F\u4E00\uFF0C\u5DF2\u5FFD\u7565\u91CD\u590D\u9879\uFF1B\u8BF7\u6539\u4E2A\u533A\u5206\u7684\u540D\u5B57\u3002` });
+  }
+  const usedIds = /* @__PURE__ */ new Set([briefId]);
   const availableNodes = [];
-  for (const type of desired) {
-    const def = schemaByName.get(type);
-    if (!def) {
-      issues.push({
-        code: "missing_artifact_type",
-        severity: "warning",
-        artifactType: type,
-        message: `\u7F3A\u5C11 ArtifactType ${type}\uFF0C\u672C\u6B21\u4E0D\u4F1A\u521B\u5EFA\u8BE5\u8282\u70B9\u3002`
+  if (agentGraph) {
+    for (const node of agentGraph.nodes) {
+      const def = schemaByName.get(node.type);
+      if (!def) {
+        issues.push({ code: "missing_artifact_type", severity: "warning", artifactType: node.type, message: `\u7F3A\u5C11 ArtifactType ${node.type}\uFF0C\u672C\u6B21\u4E0D\u4F1A\u521B\u5EFA\u8BE5\u8282\u70B9\u3002` });
+        continue;
+      }
+      const owner = await resolveRole(def.ownerRole, node.type);
+      const ownerActor = owner.actor ?? `pending:role:${def.ownerRole}`;
+      availableNodes.push({
+        type: node.type,
+        title: node.title,
+        id: deriveArtifactId(node.type, input.workspace, node.title, usedIds),
+        role: def.ownerRole,
+        owner: ownerActor,
+        dependsOn: node.dependsOn,
+        ...node.brief ? { brief: node.brief } : {}
       });
-      continue;
     }
-    const owner = await resolveRole(def.ownerRole, type);
-    const ownerActor = owner.actor ?? (type === primaryType ? input.actor : void 0);
-    if (!ownerActor) continue;
-    const id = type === primaryType ? primaryId : `artifact:${type}:${slug4}`;
-    availableNodes.push({ type, id, role: def.ownerRole, owner: ownerActor });
+  } else {
+    const desired = desiredArtifacts(primaryType, input.description);
+    for (const type of desired) {
+      const def = schemaByName.get(type);
+      if (!def) {
+        issues.push({ code: "missing_artifact_type", severity: "warning", artifactType: type, message: `\u7F3A\u5C11 ArtifactType ${type}\uFF0C\u672C\u6B21\u4E0D\u4F1A\u521B\u5EFA\u8BE5\u8282\u70B9\u3002` });
+        continue;
+      }
+      const owner = await resolveRole(def.ownerRole, type);
+      const ownerActor = owner.actor ?? (type === primaryType ? input.actor : `pending:role:${def.ownerRole}`);
+      const id = type === primaryType ? primaryId : `artifact:${type}:${slug4}`;
+      availableNodes.push({ type, id, role: def.ownerRole, owner: ownerActor });
+    }
   }
   for (const node of availableNodes) {
-    const inputs = inputEdgesFor(node.type, availableNodes, briefId, agentGraph?.dependsOn);
+    const inputs = agentGraph ? agentEdgesFor(node.dependsOn ?? [], availableNodes, briefId, issues) : ruleEdgesFor(node.type, availableNodes, briefId);
     ops.push({
       action: "spawn",
       id: node.id,
       type: node.type,
       owner: node.owner,
       workspace: input.workspace,
+      ...node.title ? { title: node.title } : {},
       inputs,
-      description: node.type === "prd" && issues.length > 0 ? `\u964D\u7EA7\u65B9\u6848\u6587\u6863\uFF1A${displayTitle}` : `${labelForType(node.type)}\uFF1A${displayTitle}`
+      description: !agentGraph && node.type === "prd" && issues.length > 0 ? `\u964D\u7EA7\u65B9\u6848\u6587\u6863\uFF1A${displayTitle}` : `${labelForType(node.type)}\uFF1A${node.title ?? displayTitle}`
     });
     ops.push({
       action: "annotate",
       artifactId: node.id,
-      body: briefByType.get(node.type) ?? taskBookFor(node.type, input.description, node.role, issues, agentGraph?.notes),
-      blocks: false
-    });
-    spawned.push(node);
-  }
-  if (issues.length > 0) {
-    ops.push({
-      action: "annotate",
-      artifactId: briefId,
-      body: planningIssueBody(issues),
+      body: node.brief ?? taskBookFor(node.type, input.description, node.role, issues, agentGraph?.notes),
       blocks: false
     });
+    spawned.push({ id: node.id, type: node.type, role: node.role, owner: node.owner });
   }
   return {
     plan: {
@@ -20543,18 +20742,21 @@ function buildPmAgentPlannerPrompt(input) {
     "",
     JSON.stringify({
       nodes: [
-        { type: "prd", dependsOn: ["brief"], title: "\u9700\u6C42\u4E0E\u8303\u56F4\u8BF4\u660E", brief: "\u8FD9\u4E2A\u8282\u70B9\u5177\u4F53\u8981\u505A\u4EC0\u4E48\u7684\u89C4\u683C\uFF1A\u4EA7\u51FA\u4EC0\u4E48\u3001\u8981\u70B9\u3001\u7EA6\u675F" },
-        { type: "dev", dependsOn: ["prd"], title: "\u5B9E\u73B0", brief: "\u2026" }
+        { type: "prd", title: "\u9700\u6C42\u4E0E\u8303\u56F4\u8BF4\u660E", dependsOn: ["brief"], brief: "\u8FD9\u4E2A\u8282\u70B9\u5177\u4F53\u8981\u505A\u4EC0\u4E48\u7684\u89C4\u683C\uFF1A\u4EA7\u51FA\u4EC0\u4E48\u3001\u8981\u70B9\u3001\u7EA6\u675F" },
+        { type: "research", title: "\u7ADE\u54C1\u8C03\u7814", dependsOn: ["brief"], brief: "\u2026" },
+        { type: "dev", title: "\u540E\u7AEF\u5B9E\u73B0", dependsOn: ["prd:\u9700\u6C42\u4E0E\u8303\u56F4\u8BF4\u660E"], brief: "\u2026" }
       ],
       notes: ["\u53EF\u9009\uFF1A\u89C4\u5212\u7406\u7531\u6216\u98CE\u9669\u63D0\u793A"]
     }, null, 2),
     "",
     "\u89C4\u5219\uFF1A",
     "- brief \u6839\u8282\u70B9\u7531\u7CFB\u7EDF\u56FA\u5B9A\u521B\u5EFA\uFF0C\u4F60\u4E0D\u8981\u628A brief \u5199\u8FDB nodes\u3002",
-    "- type \u53EA\u80FD\u4ECE\u4E0A\u9762\u3010\u53EF\u7528 ArtifactType\u3011\u76EE\u5F55\u91CC\u9009\uFF08\u4EE5\u6CE8\u5165\u76EE\u5F55\u4E3A\u51C6\uFF0C\u4E0D\u9650\u4E8E\u67D0\u51E0\u4E2A\u56FA\u5B9A\u7C7B\u578B\uFF09\u3002",
-    "- \u6BCF\u4E2A\u8282\u70B9\u5199 brief\uFF1A\u8FD9\u4E2A\u8282\u70B9\u5177\u4F53\u8981\u505A\u4EC0\u4E48\u7684\u89C4\u683C\uFF08\u4EA7\u51FA\u4EC0\u4E48\u3001\u8981\u70B9\u3001\u7EA6\u675F\uFF09\uFF0C\u522B\u5957\u6A21\u677F\u3001\u522B\u53EA\u5199\u7C7B\u578B\u540D\u3002",
-    "- \u7B80\u5355\u9700\u6C42\u53EF\u4EE5\u53EA\u8981 prd\uFF1B\u6709\u8C03\u7814/\u8BBE\u8BA1/\u5F00\u53D1/\u6D4B\u8BD5/\u67B6\u6784\u9700\u8981\u65F6\u518D\u52A0\u5BF9\u5E94\u7C7B\u578B\u7684\u8282\u70B9\u3002",
-    "- dependsOn \u4F7F\u7528 type \u540D\uFF0C\u5141\u8BB8\u5F15\u7528 brief\u3002"
+    "- type \u53EA\u80FD\u4ECE\u4E0A\u9762\u3010\u53EF\u7528 ArtifactType\u3011\u76EE\u5F55\u91CC\u9009\uFF08\u4EE5\u6CE8\u5165\u76EE\u5F55\u4E3A\u51C6\uFF09\u3002",
+    "- \u6BCF\u4E2A\u8282\u70B9\u5FC5\u7ED9 title\uFF08\u226420\u5B57\u3001\u7528\u6765\u533A\u5206\u8282\u70B9\uFF09+ brief\uFF08\u8FD9\u4E2A\u8282\u70B9\u8981\u4EA7\u51FA\u4EC0\u4E48\u7684\u89C4\u683C\uFF0C\u522B\u5957\u6A21\u677F\u3001\u522B\u53EA\u5199\u7C7B\u578B\u540D\uFF09\u3002",
+    '- \u3010\u53EF\u6709\u591A\u4E2A\u540C type \u8282\u70B9\u3011\uFF0C\u7528\u4E0D\u540C title \u533A\u5206\uFF08\u5982\u4E24\u4E2A prd\uFF1A"\u524D\u7AEF\u9700\u6C42"\u3001"\u540E\u7AEF\u9700\u6C42"\uFF1B\u591A\u4EFD\u8C03\u7814\u62A5\u544A\u5404\u53D6\u5176\u540D\uFF09\u3002',
+    "- \u540C\u4E00\u5DE5\u5355\u5185\u3001\u540C type \u4E0B title \u5FC5\u987B\u552F\u4E00\uFF1Btitle \u4E0D\u542B\u534A\u89D2\u5192\u53F7 `:`\uFF08\u4E2D\u6587\u5168\u89D2 `\uFF1A` \u53EF\u4EE5\uFF09\u3002",
+    '- dependsOn \u5F15\u7528\u4E0A\u6E38\u8282\u70B9\u7684 "type:title"\uFF08\u5982 "prd:\u9700\u6C42\u4E0E\u8303\u56F4\u8BF4\u660E"\uFF09\uFF0C\u6216\u7528 "brief" \u5F15\u7528\u5DE5\u5355\u6839\uFF1B\u65E0\u4E0A\u6E38\u7ED9 []\u3002',
+    "- \u7B80\u5355\u9700\u6C42\u53EF\u4EE5\u53EA\u8981 prd\uFF1B\u6709\u8C03\u7814/\u8BBE\u8BA1/\u5F00\u53D1/\u6D4B\u8BD5/\u67B6\u6784\u9700\u8981\u65F6\u518D\u52A0\u5BF9\u5E94\u8282\u70B9\u3002"
   ].join("\n");
 }
 function parseAgentWorkorderPlan(text) {
@@ -20652,16 +20854,28 @@ function desiredArtifacts(primaryType, description) {
 }
 function normalizeAgentPlan(plan, validTypes) {
   const allowed = validTypes.map((t) => t.trim().toLowerCase()).filter((t) => t !== "brief");
-  const types2 = [];
-  const dependsOn = /* @__PURE__ */ new Map();
+  const nodes = [];
+  const seen = /* @__PURE__ */ new Set();
+  const dupTitles = [];
   for (const node of plan.nodes) {
     const type = node.type.trim().toLowerCase();
     if (type === "brief") continue;
-    if (!types2.includes(type)) types2.push(type);
-    if (node.dependsOn?.length) dependsOn.set(type, [...new Set(node.dependsOn.map((dep) => dep.trim().toLowerCase()).filter(Boolean))]);
+    if (!allowed.includes(type)) continue;
+    const title = (node.title?.trim() || labelForType(type)).slice(0, 40);
+    const key = `${type}:${title.toLowerCase()}`;
+    if (seen.has(key)) {
+      dupTitles.push(`${type}:${title}`);
+      continue;
+    }
+    seen.add(key);
+    nodes.push({
+      type,
+      title,
+      dependsOn: node.dependsOn?.map((d) => d.trim()).filter(Boolean) ?? [],
+      ...node.brief ? { brief: node.brief } : {}
+    });
   }
-  const filtered = allowed.filter((type) => types2.includes(type));
-  return filtered.length > 0 ? { types: filtered, dependsOn, ...plan.notes?.length ? { notes: plan.notes } : {} } : null;
+  return nodes.length > 0 ? { nodes, dupTitles, ...plan.notes?.length ? { notes: plan.notes } : {} } : null;
 }
 function extractJson(text) {
   const fence = text.match(/```(?:json)?\s*([\s\S]*?)```/i);
@@ -20674,23 +20888,30 @@ function extractJson(text) {
   if (arrStart >= 0 && arrEnd > arrStart) return text.slice(arrStart, arrEnd + 1);
   return null;
 }
-function inputEdgesFor(type, nodes, briefId, plannedDependsOn) {
-  const idOf = (t) => nodes.find((node) => node.type === t)?.id;
+function agentEdgesFor(dependsOn, nodes, briefId, issues) {
   const edges = /* @__PURE__ */ new Set();
-  const planned = plannedDependsOn?.get(type);
-  if (planned) {
-    for (const dep of planned) {
-      if (dep === "brief") edges.add(briefId);
-      else {
-        const id = idOf(dep);
-        if (id) edges.add(id);
-      }
+  for (const dep of dependsOn) {
+    const d = dep.trim();
+    if (!d) continue;
+    if (d.toLowerCase() === "brief") {
+      edges.add(briefId);
+      continue;
     }
+    const sep = d.indexOf(":");
+    const depType = (sep >= 0 ? d.slice(0, sep) : d).trim().toLowerCase();
+    const depTitle = sep >= 0 ? d.slice(sep + 1).trim().toLowerCase() : null;
+    const match = nodes.find((n) => n.type === depType && (depTitle === null || (n.title ?? "").toLowerCase() === depTitle));
+    if (match) edges.add(match.id);
+    else issues.push({ code: "planner_invalid", severity: "warning", message: `\u8282\u70B9\u4F9D\u8D56\u300C${dep}\u300D\u627E\u4E0D\u5230\u5BF9\u5E94\u4E0A\u6E38\uFF08\u6309 type:title \u5339\u914D\uFF09\uFF0C\u5DF2\u5FFD\u7565\u8FD9\u6761\u8FB9\u3002` });
   }
-  if (edges.size === 0) {
-    if (type !== "prd") edges.add(idOf("prd") ?? briefId);
-    else edges.add(briefId);
-  }
+  if (edges.size === 0) edges.add(briefId);
+  return [...edges].map((to) => ({ to, required: true }));
+}
+function ruleEdgesFor(type, nodes, briefId) {
+  const idOf = (t) => nodes.find((node) => node.type === t)?.id;
+  const edges = /* @__PURE__ */ new Set();
+  if (type !== "prd") edges.add(idOf("prd") ?? briefId);
+  else edges.add(briefId);
   if (type === "adr") {
     const research = idOf("research");
     if (research) edges.add(research);
@@ -20727,17 +20948,6 @@ ${plannerNotes.map((note) => `- ${note}`).join("\n")}` : "";
     notes
   ].join("\n");
 }
-function planningIssueBody(issues) {
-  return [
-    `${PLANNING_ISSUES_PREFIX}${JSON.stringify(dedupeIssues(issues))}`,
-    "",
-    "# \u5DE5\u5355\u89C4\u5212\u63D0\u793A",
-    "",
-    ...dedupeIssues(issues).map((issue2) => `- ${issue2.message}`),
-    "",
-    "\u7CFB\u7EDF\u5DF2\u5148\u521B\u5EFA\u53EF\u63A5\u5355\u8282\u70B9\uFF1B\u7F3A\u5931\u80FD\u529B\u6682\u65F6\u964D\u7EA7\u4E3A PM \u65B9\u6848\u6587\u6863\uFF0C\u8865\u9F50\u5458\u5DE5\u6216\u8FD0\u884C\u65F6\u7ED1\u5B9A\u540E\u53EF\u518D\u6269\u56FE\u3002"
-  ].join("\n");
-}
 function dedupeIssues(issues) {
   const seen = /* @__PURE__ */ new Set();
   const out = [];
@@ -20763,16 +20973,19 @@ function labelForType(type) {
 }
 function artifactSlug(idOrWorkspace, description) {
   const source = idOrWorkspace.split(":").pop() ?? description;
-  const slug4 = source.trim().toLowerCase().replace(/^wo-/, "").replace(/[^a-z0-9\u4e00-\u9fa5]+/g, "-").replace(/^-|-$/g, "").slice(0, 40);
-  return slug4 || `wo-${Date.now()}`;
+  return slugify(source, 40) || `wo-${Date.now()}`;
 }
-var PLANNING_ISSUES_PREFIX, DEFAULT_TYPES, WORKORDER_SPEC_PREFIX;
+var DEFAULT_TYPES, WORKORDER_SPEC_PREFIX;
 var init_planner = __esm({
   "../server/src/domains/collab/planner.ts"() {
     "use strict";
-    PLANNING_ISSUES_PREFIX = "OASIS_PLANNING_ISSUES ";
+    init_src2();
     DEFAULT_TYPES = [
-      { name: "brief", contentType: "text", ownerRole: "pm" },
+      // brief 的 goal/acceptanceCriteria 现在是【自定义字段】（Phase 3，替代旧 OASIS_WORKORDER_SPEC 批注，铲 #1 死锁根）
+      { name: "brief", contentType: "text", ownerRole: "pm", fieldDefs: [
+        { name: "goal", type: "string", description: "\u4E00\u53E5\u8BDD\u76EE\u6807\uFF1A\u8FD9\u4E2A\u5DE5\u5355\u8981\u8FBE\u6210\u4EC0\u4E48" },
+        { name: "acceptanceCriteria", type: "string[]", description: "\u9A8C\u6536\u6761\u76EE\uFF08\u6EE1\u8DB3\u5373\u7B97\u5B8C\u6210\uFF09" }
+      ] },
       { name: "prd", contentType: "text", ownerRole: "pm" },
       { name: "research", contentType: "text", ownerRole: "research" },
       { name: "design", contentType: "text", ownerRole: "designer" },
@@ -20784,145 +20997,6 @@ var init_planner = __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";
-  const concluded = isConcluded(model, a.id);
-  const mark = sealed ? lifecycle : pendingConcludeAttempt(model, a.id) ? "gate-pending" : blockedOf(model, a.id).blocked ? "blocked" : concluded ? "concluded" : a.currentRev ? "active" : "embryo";
-  const hasWorking = revisionsOf(model, a.id).some((r) => r.state === "working");
-  return { mark, queueLen: queueOf(model, a.id).length, concluded, sealed, hasWorking };
-}
-function deriveStage(members) {
-  if (members.length > 0 && members.every((m2) => m2.sealed)) return "sealed";
-  const live = members.filter((m2) => !m2.sealed);
-  if (live.length > 0 && live.every((m2) => m2.concluded)) return "concluded";
-  const reviewing = live.some((m2) => m2.mark === "gate-pending" || m2.mark === "active" && m2.queueLen > 0);
-  if (reviewing) return "review";
-  const progressing = live.some((m2) => m2.mark === "active" || m2.mark === "embryo");
-  const blocked = live.some((m2) => m2.mark === "blocked");
-  if (blocked && !progressing) return "blocked";
-  return "executing";
-}
-function deriveNodeStage(info) {
-  if (info.sealed) return "sealed";
-  switch (info.mark) {
-    case "concluded":
-      return "concluded";
-    case "gate-pending":
-      return "gate";
-    case "blocked":
-      return "blocked";
-    case "embryo":
-      return "embryo";
-    default:
-      if (info.hasWorking) return "editing";
-      if (info.queueLen > 0) return "review";
-      return "merged";
-  }
-}
-var init_node_state = __esm({
-  "../server/src/domains/collab/node-state.ts"() {
-    "use strict";
-    init_src2();
-  }
-});
-
-// ../server/src/domains/collab/workorders.ts
-function buildWorkorderSummaries(model, resolveActor, resolveProject) {
-  const byWorkspace = /* @__PURE__ */ new Map();
-  for (const a of model.artifacts.values()) {
-    const arr = byWorkspace.get(a.workspace) ?? [];
-    arr.push(a);
-    byWorkspace.set(a.workspace, arr);
-  }
-  const ref = (id) => {
-    const extra = resolveActor?.(id);
-    return {
-      id,
-      ...extra?.name ? { name: extra.name } : {},
-      ...extra?.role ? { role: extra.role } : {},
-      ...extra?.avatar ? { avatar: extra.avatar } : {}
-    };
-  };
-  const out = [];
-  for (const [workspace, arts] of byWorkspace) {
-    const members = arts.map((a) => nodeInfo(model, a));
-    const seed = arts.find((a) => a.inputs.length === 0) ?? arts[0];
-    const spec = workorderSpecOf(model, arts);
-    const concluded = members.filter((m2) => m2.concluded).length;
-    const lastOps = arts.map((a) => model.lastOpAt.get(a.id)).filter((t) => Boolean(t)).sort();
-    const participantIds = [...new Set(arts.map((a) => a.owner))];
-    const woTitle = seed.title ?? seed.description ?? workspace;
-    out.push({
-      id: workspace,
-      title: woTitle,
-      // 工单完整内容 = 根产物 description；仅当与标题不同（根产物有独立 title）时给出，避免与 title 重复
-      ...seed.description && seed.description !== woTitle ? { description: seed.description } : {},
-      // 一句话目标：优先取结构化 spec.goal；缺省时前端回退 description 首段（投影不替前端做回退，只给真值）
-      ...spec?.goal ? { goal: spec.goal } : {},
-      stage: deriveStage(members),
-      owner: ref(seed.owner),
-      participants: participantIds.map(ref),
-      artifactCount: arts.length,
-      progress: { concluded, total: arts.length },
-      updatedAt: lastOps[lastOps.length - 1] ?? "",
-      projectId: resolveProject?.(workspace) ?? null,
-      planning: planningStatusOf(model, arts),
-      ...workspaceDispatchPaused(model, arts) ? { dispatchPaused: true } : {}
-    });
-  }
-  return out.sort((a, b2) => a.updatedAt < b2.updatedAt ? 1 : a.updatedAt > b2.updatedAt ? -1 : 0);
-}
-function planningStatusOf(model, arts) {
-  const ids = new Set(arts.map((a) => a.id));
-  const issues = [...model.annotations.values()].filter((annotation) => ids.has(annotation.anchor.target)).flatMap((annotation) => parsePlanningIssues(annotation.body));
-  return issues.length > 0 ? { status: "needs_staffing", issues } : { status: "ready", issues: [] };
-}
-function workorderSpecOf(model, arts) {
-  const seed = arts.find((a) => a.type === "brief") ?? arts.find((a) => a.inputs.length === 0);
-  if (!seed) return null;
-  for (const annotation of model.annotations.values()) {
-    if (annotation.anchor.target !== seed.id) continue;
-    const spec = parseWorkorderSpec(annotation.body);
-    if (spec) return spec;
-  }
-  return null;
-}
-function workspaceDispatchPaused(model, arts) {
-  const seed = arts.find((a) => a.type === "brief") ?? arts.find((a) => a.inputs.length === 0);
-  if (!seed) return false;
-  for (const annotation of model.annotations.values()) {
-    if (annotation.anchor.target !== seed.id) continue;
-    if (annotation.state === "open" && annotation.body.startsWith(DISPATCH_HOLD_PREFIX)) return true;
-  }
-  return false;
-}
-function openDispatchHoldOf(model, arts) {
-  const seed = arts.find((a) => a.type === "brief") ?? arts.find((a) => a.inputs.length === 0);
-  if (!seed) return null;
-  for (const annotation of model.annotations.values()) {
-    if (annotation.anchor.target !== seed.id) continue;
-    if (annotation.state === "open" && annotation.body.startsWith(DISPATCH_HOLD_PREFIX)) return annotation.id;
-  }
-  return null;
-}
-var DISPATCH_HOLD_PREFIX;
-var init_workorders = __esm({
-  "../server/src/domains/collab/workorders.ts"() {
-    "use strict";
-    init_node_state();
-    init_planner();
-    DISPATCH_HOLD_PREFIX = "OASIS_DISPATCH_HOLD";
-  }
-});
-
 // ../server/src/server.ts
 function wantsChatParts(req) {
   const accept = req.headers.accept;
@@ -21183,6 +21257,10 @@ async function runCommand(kernel, blobs, oplog, actor, command, args, ctx = {})
         ...p2.spec !== void 0 ? { spec: String(p2.spec) } : {},
         ...Array.isArray(p2.deps) ? { deps: p2.deps.map(String) } : {}
       }));
+      const rawFields = args["fields"];
+      if (rawFields !== void 0 && (typeof rawFields !== "object" || rawFields === null || Array.isArray(rawFields))) {
+        throw new Error("\u53C2\u6570 fields \u5FC5\u987B\u662F\u5BF9\u8C61 {key: value}");
+      }
       const createdViaArg = optStr(args, "createdVia");
       if (createdViaArg !== void 0 && createdViaArg !== "seed" && createdViaArg !== "manual-spawn") {
         throw new Error(`createdVia \u4EC5\u63A5\u53D7 seed\uFF08\u53D1\u8D77\u5DE5\u5355\uFF09\u6216 manual-spawn\uFF1Bauto-trigger/prereq \u7531\u5185\u6838\u5185\u90E8\u8BBE\u7F6E`);
@@ -21274,6 +21352,33 @@ ${acceptanceCriteria.map((c) => `- ${c}`).join("\n")}` : brief;
         if (!preview2.endState.ok) {
           throw new Error(`\u52A8\u6001\u89C4\u5212\u7EC8\u6001\u6821\u9A8C\u4E0D\u8FC7\uFF1A${preview2.endState.violations.join("\uFF1B")}`);
         }
+        if (args["stage"] === true && ctx.workorderDrafts) {
+          const draft = ctx.workorderDrafts.submit({
+            workspace,
+            plan: planned.plan,
+            rootArtifactId: planned.rootArtifactId,
+            seed: {
+              brief,
+              ...goal !== void 0 ? { goal } : {},
+              ...acceptanceCriteria && acceptanceCriteria.length > 0 ? { acceptanceCriteria } : {},
+              ...args["dispatch"] === false ? { dispatch: false } : {}
+            },
+            draftedBy: actor
+          });
+          return {
+            message: planned.issues.length > 0 ? `staged workorder draft ${draft.id}\uFF1A${planned.spawned.length} \u4E2A\u8282\u70B9\u5F85\u4EBA\u786E\u8BA4\uFF0C${planned.issues.length} \u4E2A staffing \u63D0\u793A` : `staged workorder draft ${draft.id}\uFF1A${planned.spawned.length} \u4E2A\u8282\u70B9\u5F85\u4EBA\u786E\u8BA4`,
+            data: {
+              draftId: draft.id,
+              workspace,
+              rootArtifactId: planned.rootArtifactId,
+              spawned: planned.spawned,
+              planning: {
+                status: planned.issues.length > 0 ? "needs_staffing" : "ready",
+                issues: planned.issues
+              }
+            }
+          };
+        }
         const applied = await kernel.applyIntervention(planned.plan, preview2.baseSeqs, actor);
         const briefArtifactId = planned.rootArtifactId;
         if (brief && brief.trim()) {
@@ -21283,7 +21388,7 @@ ${acceptanceCriteria.map((c) => `- ${c}`).join("\n")}` : brief;
           await kernel.conclude({ artifactId: briefArtifactId, actor, note: "\u5EFA\u5355\u65F6\u7531\u53D1\u8D77\u4EBA\u62CD\u677F\u5B9A\u7A3F" });
         }
         if (args["dispatch"] === false) {
-          await kernel.annotate({ artifactId: briefArtifactId, actor, body: `${DISPATCH_HOLD_PREFIX} \u5F85\u53D1\u8D77\u4EBA\u6D3E\u5355` });
+          await ctx.artifactState?.setWorkspaceDispatchHold(workspace, true);
         }
         return {
           message: planned.issues.length > 0 ? `planned ${workspace}: created ${planned.spawned.length} nodes\uFF0C${planned.issues.length} \u4E2A staffing \u63D0\u793A\u5DF2\u5199\u5165\u5DE5\u5355` : `planned ${workspace}: created ${planned.spawned.length} nodes`,
@@ -21312,7 +21417,8 @@ ${acceptanceCriteria.map((c) => `- ${c}`).join("\n")}` : brief;
         ...optStr(args, "description") !== void 0 ? { description: optStr(args, "description") } : {},
         ...optStr(args, "docType") !== void 0 ? { docType: optStr(args, "docType") } : {},
         ...inputs !== void 0 ? { inputs } : {},
-        ...parts !== void 0 ? { parts } : {}
+        ...parts !== void 0 ? { parts } : {},
+        ...rawFields !== void 0 ? { fields: rawFields } : {}
       });
       return { message: `spawned ${artifact.id}\uFF08owner=${artifact.owner}${artifact.parts?.length ? `\uFF0Cparts=${artifact.parts.map((p2) => p2.name).join("/")}` : ""}\uFF09`, data: artifact };
     }
@@ -21836,17 +21942,9 @@ async function startOasisServer(opts) {
               ...opts.planWorkorderWithAgent ? { planWorkorderWithAgent: opts.planWorkorderWithAgent } : {},
               ...opts.resolveCodeRepo ? { resolveCodeRepo: opts.resolveCodeRepo } : {},
               ...opts.dispatchProduce ? { dispatchProduce: opts.dispatchProduce } : {},
+              ...opts.workorderDrafts ? { workorderDrafts: opts.workorderDrafts } : {},
               ...opts.gitEnv ? { gitEnv: opts.gitEnv } : {}
             });
-            if (body.command === "spawn" && opts.chatSession) {
-              const workspace = body.args?.["workspace"];
-              if (workspace && workspace !== "ws:default") {
-                const chatSid = req.headers["x-chat-session-id"];
-                if (typeof chatSid === "string") {
-                  await opts.chatSession.linkWorkOrder(chatSid, workspace).catch(() => void 0);
-                }
-              }
-            }
             res.writeHead(200, { "content-type": "application/json" }).end(JSON.stringify(result));
           } catch (err) {
             const status = err instanceof FrozenError ? 409 : 400;
@@ -21883,6 +21981,40 @@ async function startOasisServer(opts) {
           }
           return;
         }
+        if (url.pathname === "/api/workorder/draft" && req.method === "GET" && opts.workorderDrafts) {
+          const workspace = url.searchParams.get("workspace");
+          const draft = workspace ? opts.workorderDrafts.forWorkspace(workspace) : void 0;
+          if (!draft) {
+            res.writeHead(404, { "content-type": "application/json" }).end(JSON.stringify({ error: "no staged workorder draft" }));
+            return;
+          }
+          res.writeHead(200, { "content-type": "application/json" }).end(JSON.stringify({ data: draft }));
+          return;
+        }
+        if (url.pathname === "/api/workorder/apply" && req.method === "POST") {
+          try {
+            const body = JSON.parse(rawBody);
+            const result = await engine.kernel.applyIntervention(body.plan, body.baseSeqs, actor);
+            const brief = engine.kernel.model.artifacts.get(body.briefArtifactId);
+            if (brief && brief.description && brief.description.trim()) {
+              const briefRef = await engine.blobs.put(new TextEncoder().encode(brief.description));
+              await engine.kernel.proposeRevision({ artifactId: body.briefArtifactId, actor, contentRef: briefRef, reason: "\u5EFA\u5355\uFF1A\u843D\u5B9A\u53D1\u8D77\u4EBA\u6572\u5B9A\u7684 brief \u9996\u7248" });
+              await engine.kernel.advanceQueue(body.briefArtifactId, actor);
+              await engine.kernel.conclude({ artifactId: body.briefArtifactId, actor, note: "\u5EFA\u5355\u65F6\u7531\u53D1\u8D77\u4EBA\u62CD\u677F\u5B9A\u7A3F" });
+            }
+            if (body.dispatch === false && brief?.workspace) {
+              await opts.artifactState?.setWorkspaceDispatchHold(brief.workspace, true);
+            }
+            res.writeHead(200, { "content-type": "application/json" }).end(
+              JSON.stringify({ ...result, briefArtifactId: body.briefArtifactId, workspace: brief?.workspace ?? null })
+            );
+          } catch (err) {
+            res.writeHead(409, { "content-type": "application/json" }).end(
+              JSON.stringify({ error: err instanceof Error ? err.message : String(err) })
+            );
+          }
+          return;
+        }
         if (url.pathname === "/api/intervention/draft" && req.method === "POST" && opts.drafts) {
           try {
             const plan = JSON.parse(rawBody);
@@ -22129,8 +22261,7 @@ async function startOasisServer(opts) {
               const session = await opts.dispatchChat({
                 actorId: body.actorId,
                 message: body.message,
-                ...body.sessionId ? { sessionId: body.sessionId } : {},
-                ...body.chatSessionId ? { chatSessionId: body.chatSessionId } : {}
+                ...body.sessionId ? { sessionId: body.sessionId } : {}
               });
               let finished = false;
               res.on("close", () => {
@@ -22216,6 +22347,14 @@ async function startOasisServer(opts) {
                   });
                   writeFileSync14(join16(dir, "SKILLS.md"), ["# \u53EF\u7528\u6280\u80FD", "", "\u4EE5\u4E0B\u6280\u80FD\u5DF2\u4E3A\u4F60\u542F\u7528\uFF0C\u53EF\u5728\u672C\u6B21\u4F1A\u8BDD\u4E2D\u76F4\u63A5\u4F7F\u7528\uFF1A", "", ...lines].join("\n"));
                 }
+                if (opts.materializeSkills) {
+                  const skillFiles = await opts.materializeSkills(body.actorId, "claude").catch(() => ({}));
+                  for (const [rel, content] of Object.entries(skillFiles)) {
+                    const file = join16(dir, rel);
+                    mkdirSync13(dirname13(file), { recursive: true });
+                    writeFileSync14(file, content);
+                  }
+                }
                 const activeConnectors = actorCtx.connectors.filter(
                   (c) => c.status === "connected" || c.status === "verifying"
                 );
@@ -22231,8 +22370,8 @@ async function startOasisServer(opts) {
               }
             }
             const { spawn: spawn6 } = await import("node:child_process");
-            const { randomUUID: randomUUID15 } = await import("node:crypto");
-            const sessionId = body.sessionId ?? randomUUID15();
+            const { randomUUID: randomUUID14 } = await import("node:crypto");
+            const sessionId = body.sessionId ?? randomUUID14();
             const args = [
               "-p",
               body.message,
@@ -22243,7 +22382,7 @@ async function startOasisServer(opts) {
             ];
             const child = spawn6(opts.claudeBin ?? "claude", args, {
               ...spawnCwd ? { cwd: spawnCwd } : {},
-              env: { ...process.env, ...env, ...body.chatSessionId ? { OASIS_CHAT_SESSION_ID: body.chatSessionId } : {} },
+              env: { ...process.env, ...env },
               stdio: ["ignore", "pipe", "pipe"]
             });
             if (typedParts) {
@@ -22535,8 +22674,8 @@ var init_server3 = __esm({
     init_mcp2();
     init_router();
     init_drafts();
+    init_workorder_drafts();
     init_planner();
-    init_workorders();
     defaultResolveActor = (token) => token.startsWith("token:") ? token.slice("token:".length) : null;
     enc = (s2) => new TextEncoder().encode(s2);
     CHAT_OUTPUT_LIMIT = 16e3;
@@ -22614,11 +22753,11 @@ function createEnrollTokenStore(defaultTtlMs = 30 * 60 * 1e3, file) {
     return m2;
   };
   return {
-    issue(nodeId, ttlMs = defaultTtlMs) {
+    issue(name, ttlMs = defaultTtlMs) {
       const m2 = prune();
       const token = `ent_${(0, import_node_crypto3.randomBytes)(24).toString("base64url")}`;
       const expiresAt = Date.now() + ttlMs;
-      m2.set(token, { nodeId, expiresAt });
+      m2.set(token, { name, expiresAt });
       write(m2);
       return { token, expiresAt: new Date(expiresAt).toISOString() };
     },
@@ -22626,7 +22765,7 @@ function createEnrollTokenStore(defaultTtlMs = 30 * 60 * 1e3, file) {
       const m2 = prune();
       const entry = m2.get(token);
       if (!entry) return null;
-      return { nodeId: entry.nodeId };
+      return { name: entry.name, ...entry.issuedNodeId ? { issuedNodeId: entry.issuedNodeId } : {} };
     },
     consume(token) {
       const m2 = prune();
@@ -22634,7 +22773,15 @@ function createEnrollTokenStore(defaultTtlMs = 30 * 60 * 1e3, file) {
       if (!entry) return null;
       m2.delete(token);
       write(m2);
-      return { nodeId: entry.nodeId };
+      return { name: entry.name, ...entry.issuedNodeId ? { issuedNodeId: entry.issuedNodeId } : {} };
+    },
+    setIssuedNodeId(token, nodeId) {
+      const m2 = read();
+      const entry = m2.get(token);
+      if (entry) {
+        entry.issuedNodeId = nodeId;
+        write(m2);
+      }
     }
   };
 }
@@ -23746,6 +23893,147 @@ 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";
+  const concluded = isConcluded(model, a.id);
+  const mark = sealed ? lifecycle : pendingConcludeAttempt(model, a.id) ? "gate-pending" : blockedOf(model, a.id).blocked ? "blocked" : concluded ? "concluded" : a.currentRev ? "active" : "embryo";
+  const hasWorking = revisionsOf(model, a.id).some((r) => r.state === "working");
+  return { mark, queueLen: queueOf(model, a.id).length, concluded, sealed, hasWorking };
+}
+function deriveStage(members) {
+  if (members.length > 0 && members.every((m2) => m2.sealed)) return "sealed";
+  const live = members.filter((m2) => !m2.sealed);
+  if (live.length > 0 && live.every((m2) => m2.concluded)) return "concluded";
+  const reviewing = live.some((m2) => m2.mark === "gate-pending" || m2.mark === "active" && m2.queueLen > 0);
+  if (reviewing) return "review";
+  const progressing = live.some((m2) => m2.mark === "active" || m2.mark === "embryo");
+  const blocked = live.some((m2) => m2.mark === "blocked");
+  if (blocked && !progressing) return "blocked";
+  return "executing";
+}
+function deriveNodeStage(info) {
+  if (info.sealed) return "sealed";
+  switch (info.mark) {
+    case "concluded":
+      return "concluded";
+    case "gate-pending":
+      return "gate";
+    case "blocked":
+      return "blocked";
+    case "embryo":
+      return "embryo";
+    default:
+      if (info.hasWorking) return "editing";
+      if (info.queueLen > 0) return "review";
+      return "merged";
+  }
+}
+var init_node_state = __esm({
+  "../server/src/domains/collab/node-state.ts"() {
+    "use strict";
+    init_src2();
+  }
+});
+
+// ../server/src/domains/collab/workorders.ts
+function buildWorkorderSummaries(model, resolveActor, resolveProject, dispatchPausedOf) {
+  const byWorkspace = /* @__PURE__ */ new Map();
+  for (const a of model.artifacts.values()) {
+    const arr = byWorkspace.get(a.workspace) ?? [];
+    arr.push(a);
+    byWorkspace.set(a.workspace, arr);
+  }
+  const ref = (id) => {
+    const extra = resolveActor?.(id);
+    return {
+      id,
+      ...extra?.name ? { name: extra.name } : {},
+      ...extra?.role ? { role: extra.role } : {},
+      ...extra?.avatar ? { avatar: extra.avatar } : {}
+    };
+  };
+  const out = [];
+  for (const [workspace, arts] of byWorkspace) {
+    const members = arts.map((a) => nodeInfo(model, a));
+    const seed = arts.find((a) => a.inputs.length === 0) ?? arts[0];
+    const spec = workorderSpecOf(model, arts);
+    const concluded = members.filter((m2) => m2.concluded).length;
+    const lastOps = arts.map((a) => model.lastOpAt.get(a.id)).filter((t) => Boolean(t)).sort();
+    const participantIds = [...new Set(arts.map((a) => a.owner))];
+    const woTitle = seed.title ?? seed.description ?? workspace;
+    out.push({
+      id: workspace,
+      title: woTitle,
+      // 工单完整内容 = 根产物 description；仅当与标题不同（根产物有独立 title）时给出，避免与 title 重复
+      ...seed.description && seed.description !== woTitle ? { description: seed.description } : {},
+      // 一句话目标：优先取结构化 spec.goal；缺省时前端回退 description 首段（投影不替前端做回退，只给真值）
+      ...spec?.goal ? { goal: spec.goal } : {},
+      stage: deriveStage(members),
+      owner: ref(seed.owner),
+      participants: participantIds.map(ref),
+      artifactCount: arts.length,
+      progress: { concluded, total: arts.length },
+      updatedAt: lastOps[lastOps.length - 1] ?? "",
+      projectId: resolveProject?.(workspace) ?? null,
+      planning: planningStatusOf(model, arts),
+      ...dispatchPausedOf?.(workspace) ? { dispatchPaused: true } : {}
+    });
+  }
+  return out.sort((a, b2) => a.updatedAt < b2.updatedAt ? 1 : a.updatedAt > b2.updatedAt ? -1 : 0);
+}
+function planningStatusOf(_model, arts) {
+  const issues = [];
+  const seenRoles = /* @__PURE__ */ new Set();
+  for (const a of arts) {
+    const m2 = /^pending:role:(.+)$/.exec(a.owner);
+    if (!m2) continue;
+    const role = m2[1];
+    if (seenRoles.has(role)) continue;
+    seenRoles.add(role);
+    issues.push({ code: "missing_role", severity: "warning", role, message: `${role} \u89D2\u8272\u65E0 active \u5458\u5DE5\uFF0C\u76F8\u5173\u8282\u70B9\u5F85\u6D3E\u2014\u2014\u8BF7\u8865\u4EBA\u6216 assign\u3002` });
+  }
+  return issues.length > 0 ? { status: "needs_staffing", issues } : { status: "ready", issues: [] };
+}
+function specFromFields(fields) {
+  if (!fields) return null;
+  const out = {};
+  const goal = fields["goal"];
+  if (typeof goal === "string" && goal.trim()) out.goal = goal.trim();
+  const ac = fields["acceptanceCriteria"];
+  if (Array.isArray(ac)) {
+    const items = ac.filter((x2) => typeof x2 === "string" && x2.trim().length > 0).map((x2) => x2.trim());
+    if (items.length > 0) out.acceptanceCriteria = items;
+  }
+  return out.goal !== void 0 || out.acceptanceCriteria !== void 0 ? out : null;
+}
+function workorderSpecOf(model, arts) {
+  const seed = arts.find((a) => a.type === "brief") ?? arts.find((a) => a.inputs.length === 0);
+  if (!seed) return null;
+  const fromFields = specFromFields(seed.fields);
+  if (fromFields) return fromFields;
+  for (const annotation of model.annotations.values()) {
+    if (annotation.anchor.target !== seed.id) continue;
+    const spec = parseWorkorderSpec(annotation.body);
+    if (spec) return spec;
+  }
+  return null;
+}
+var init_workorders = __esm({
+  "../server/src/domains/collab/workorders.ts"() {
+    "use strict";
+    init_node_state();
+    init_planner();
+  }
+});
+
 // ../server/src/domains/projects/service.ts
 function namedError(name, message) {
   const err = new Error(message);
@@ -24003,6 +24291,8 @@ var init_service = __esm({
       nodeOutputs = /* @__PURE__ */ new Map();
       // B5：工单→项目绑定（key=workOrderId）。与 node_outputs 同属合法薄旁存——reset 不清、重放时种回。
       workspaceBindings = /* @__PURE__ */ new Map();
+      // #2 派单门：处于"待派发"的工单 id（薄旁存，同 binding——dispatcher/工单视图读它，不进 oplog）。
+      dispatchHeld = /* @__PURE__ */ new Set();
       /**
        * B2 清空式重建用：清掉 oplog 派生的事实投影（artifact/revision/event/annotation），
        * 保留 node_output（合法薄投影，投影正依赖它补 source*；由 registerNodeOutput 独立维护）。
@@ -24070,6 +24360,13 @@ var init_service = __esm({
       async listWorkspaceBindings() {
         return [...this.workspaceBindings.values()].map((binding) => ({ ...binding }));
       }
+      async setWorkspaceDispatchHold(workOrderId, held) {
+        if (held) this.dispatchHeld.add(workOrderId);
+        else this.dispatchHeld.delete(workOrderId);
+      }
+      async listWorkspaceDispatchHeld() {
+        return [...this.dispatchHeld];
+      }
       async listAll() {
         return {
           artifacts: [...this.artifacts.values()].map(cloneArtifact),
@@ -24077,7 +24374,8 @@ var init_service = __esm({
           events: [...this.events.values()].map(cloneEvent),
           annotations: [...this.annotations.values()].map(cloneAnnotation),
           nodeOutputs: [...this.nodeOutputs.values()].map(cloneNodeOutput),
-          workspaceBindings: [...this.workspaceBindings.values()].map((binding) => ({ ...binding }))
+          workspaceBindings: [...this.workspaceBindings.values()].map((binding) => ({ ...binding })),
+          workspaceDispatchHeld: [...this.dispatchHeld]
         };
       }
     };
@@ -25205,9 +25503,10 @@ var init_dev_store = __esm({
           for (const annotation of snap.annotations ?? []) await MemoryArtifactStateStore.prototype.upsertAnnotation.call(store, annotation);
           for (const output of snap.nodeOutputs ?? []) await MemoryArtifactStateStore.prototype.upsertNodeOutput.call(store, output);
           for (const binding of snap.workspaceBindings ?? []) await MemoryArtifactStateStore.prototype.upsertWorkspaceBinding.call(store, binding);
+          for (const ws of snap.workspaceDispatchHeld ?? []) await MemoryArtifactStateStore.prototype.setWorkspaceDispatchHold.call(store, ws, true);
         } else {
           fs2.mkdirSync(path.dirname(file), { recursive: true });
-          fs2.writeFileSync(file, JSON.stringify({ artifacts: [], revisions: [], events: [], annotations: [], nodeOutputs: [], workspaceBindings: [] }, null, 2));
+          fs2.writeFileSync(file, JSON.stringify({ artifacts: [], revisions: [], events: [], annotations: [], nodeOutputs: [], workspaceBindings: [], workspaceDispatchHeld: [] }, null, 2));
         }
         return store;
       }
@@ -25235,6 +25534,10 @@ var init_dev_store = __esm({
         await super.upsertWorkspaceBinding(binding);
         await this.save();
       }
+      async setWorkspaceDispatchHold(workOrderId, held) {
+        await super.setWorkspaceDispatchHold(workOrderId, held);
+        await this.save();
+      }
       async save() {
         fs2.writeFileSync(this.file, JSON.stringify(await this.listAll(), null, 2));
       }
@@ -25321,7 +25624,6 @@ var init_dev_store = __esm({
     MemoryChatSessionStore = class {
       sessions = /* @__PURE__ */ new Map();
       messages = /* @__PURE__ */ new Map();
-      sessionWorkOrders = /* @__PURE__ */ new Map();
       async createSession(s2) {
         this.sessions.set(s2.id, s2);
       }
@@ -25338,7 +25640,6 @@ var init_dev_store = __esm({
       async deleteSession(id) {
         this.sessions.delete(id);
         this.messages.delete(id);
-        this.sessionWorkOrders.delete(id);
       }
       async appendMessage(m2) {
         const list = this.messages.get(m2.sessionId) ?? [];
@@ -25349,14 +25650,6 @@ var init_dev_store = __esm({
         const list = (this.messages.get(sessionId) ?? []).sort((a, b2) => a.seq - b2.seq);
         return limit ? list.slice(-limit) : list;
       }
-      async linkWorkOrder(sessionId, workOrderId) {
-        const set = this.sessionWorkOrders.get(sessionId) ?? /* @__PURE__ */ new Set();
-        set.add(workOrderId);
-        this.sessionWorkOrders.set(sessionId, set);
-      }
-      async listWorkOrdersForSession(sessionId) {
-        return [...this.sessionWorkOrders.get(sessionId) ?? []];
-      }
     };
   }
 });
@@ -25474,12 +25767,36 @@ function typeDefError(def, mode) {
   }
   return null;
 }
-var TYPE_DEF_SCHEMA, TypesAdminService;
+var RESERVED_FIELD_NAMES, TYPE_DEF_SCHEMA, TypesAdminService;
 var init_types_admin = __esm({
   "../server/src/types-admin.ts"() {
     "use strict";
     init_zod();
     init_src2();
+    RESERVED_FIELD_NAMES = /* @__PURE__ */ new Set([
+      // Artifact 内置字段
+      "id",
+      "type",
+      "title",
+      "description",
+      "docType",
+      "currentRev",
+      "owner",
+      "workspace",
+      "persistence",
+      "createdVia",
+      "inputs",
+      "parts",
+      "fields",
+      // edit/spawn 自己的 flag + 全局 infra flag（--<字段> 转发要避开）
+      "brief",
+      "input",
+      "set-json",
+      "clear",
+      "server",
+      "token",
+      "dir"
+    ]);
     TYPE_DEF_SCHEMA = external_exports.object({
       name: external_exports.string().regex(/^[a-z][a-z0-9-]*$/, "name \u987B\u5C0F\u5199\u5B57\u6BCD\u5F00\u5934\u3001\u9650\u5C0F\u5199\u5B57\u6BCD/\u6570\u5B57/\u8FDE\u5B57\u7B26"),
       description: external_exports.string(),
@@ -25505,8 +25822,16 @@ var init_types_admin = __esm({
       budget: external_exports.object({ wallClockMinutes: external_exports.number().positive().optional() }).strict(),
       cascade: external_exports.enum(["auto", "manual"]),
       acl: external_exports.object({ propose: external_exports.array(external_exports.string()).optional(), annotate: external_exports.array(external_exports.string()).optional(), spawn: external_exports.array(external_exports.string()).optional() }).strict(),
-      mirror: external_exports.record(external_exports.string(), external_exports.unknown())
+      mirror: external_exports.record(external_exports.string(), external_exports.unknown()),
       // MirrorConfig 是连接器侧复杂类型——只要求是对象、内部松校验
+      fieldDefs: external_exports.array(
+        external_exports.object({
+          name: external_exports.string().regex(/^[a-z][a-zA-Z0-9_]*$/, "\u5B57\u6BB5 name \u987B\u5C0F\u5199\u5B57\u6BCD\u5F00\u5934\u3001\u9650\u5B57\u6BCD/\u6570\u5B57/\u4E0B\u5212\u7EBF").refine((n) => !RESERVED_FIELD_NAMES.has(n), "\u5B57\u6BB5 name \u4E0D\u5F97\u649E Artifact \u5185\u7F6E\u5B57\u6BB5\u6216\u6838\u5FC3\u547D\u4EE4 flag\uFF08\u649E\u4E86\u6539\u7528 --set-json\uFF09"),
+          type: external_exports.enum(["string", "string[]", "number", "boolean"]),
+          required: external_exports.boolean().optional(),
+          description: external_exports.string().optional()
+        }).strict()
+      )
     }).partial().strict();
     TypesAdminService = class {
       constructor(store, kernels) {
@@ -25576,6 +25901,36 @@ var init_types_admin = __esm({
         for (const k2 of this.kernels()) k2.removeType(name);
         return { ok: true };
       }
+      // —— B 平面：自定义字段声明（fieldDefs）的增/改/删。都落到 edit（复用 zod 校验 + 传播 + usage 影响半径）。
+      // 改名禁、删=deprecate（存量值留、新写入拒）都由"只有这三个动词、且 name 钉死"在结构上保证。
+      /** 加一条字段声明。name 已声明 / 撞保留集（edit 的 zod 把住）则拒。 */
+      async addField(typeName, spec) {
+        const cur = (await this.store.list()).find((t) => t.name === typeName);
+        if (!cur) return { ok: false, error: `\u7C7B\u578B\u4E0D\u5B58\u5728: ${typeName}` };
+        if ((cur.fieldDefs ?? []).some((f2) => f2.name === spec.name)) {
+          return { ok: false, error: `\u5B57\u6BB5\u5DF2\u58F0\u660E: ${spec.name}\uFF08\u6539\u5C5E\u6027\u7528 edit-field\u3001\u5220\u7528 drop-field\uFF09` };
+        }
+        return this.edit(typeName, { fieldDefs: [...cur.fieldDefs ?? [], spec] });
+      }
+      /** 改一条字段声明的属性（type/required/description）；**name 钉死、不可改名**。 */
+      async editField(typeName, fieldName, attrs) {
+        const cur = (await this.store.list()).find((t) => t.name === typeName);
+        if (!cur) return { ok: false, error: `\u7C7B\u578B\u4E0D\u5B58\u5728: ${typeName}` };
+        const idx = (cur.fieldDefs ?? []).findIndex((f2) => f2.name === fieldName);
+        if (idx < 0) return { ok: false, error: `\u5B57\u6BB5\u672A\u58F0\u660E: ${fieldName}\uFF08${typeName} \u58F0\u660E\uFF1A${(cur.fieldDefs ?? []).map((f2) => f2.name).join(", ") || "\u65E0"}\uFF09` };
+        const nextDefs = [...cur.fieldDefs];
+        nextDefs[idx] = { ...nextDefs[idx], ...attrs, name: fieldName };
+        return this.edit(typeName, { fieldDefs: nextDefs });
+      }
+      /** 删一条字段声明（deprecate 语义：存量值留、新写入拒）。返回 usage 供影响半径预览。 */
+      async dropField(typeName, fieldName) {
+        const cur = (await this.store.list()).find((t) => t.name === typeName);
+        if (!cur) return { ok: false, error: `\u7C7B\u578B\u4E0D\u5B58\u5728: ${typeName}` };
+        if (!(cur.fieldDefs ?? []).some((f2) => f2.name === fieldName)) {
+          return { ok: false, error: `\u5B57\u6BB5\u672A\u58F0\u660E: ${fieldName}` };
+        }
+        return this.edit(typeName, { fieldDefs: (cur.fieldDefs ?? []).filter((f2) => f2.name !== fieldName) });
+      }
     };
   }
 });
@@ -30047,6 +30402,10 @@ ${input.description}
         if (enabledKeys.size === 0) return [];
         return all.filter((s2) => enabledKeys.has(s2.id) || enabledKeys.has(s2.name));
       }
+      /** 全局已装技能平铺列表（「默认挂」materialize 用；installedSkillsWithAssignments 带分配关系太重）。 */
+      async listInstalledSkills() {
+        return this.opts.store.listInstalledSkills();
+      }
       /* ---------- 变量（2.8）：AES-256-GCM，读侧只见掩码 ---------- */
       /**
        * 写入变量。
@@ -30565,6 +30924,61 @@ var init_routes = __esm({
   }
 });
 
+// ../server/src/domains/actors/skill-materializer.ts
+function skillsDirForRuntime(runtimeKind) {
+  switch (runtimeKind) {
+    case "claude":
+    case "claude-code":
+      return ".claude/skills";
+    default:
+      return ".agent_context/skills";
+  }
+}
+function sanitizeSkillDir(name) {
+  const s2 = name.toLowerCase().trim().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
+  return s2 || "skill";
+}
+async function materializeSkillFiles(args) {
+  const own = await args.service.listInstalledSkillsForActor(args.actorId);
+  let extras = [];
+  if (args.extraSkillIds && args.extraSkillIds.length > 0) {
+    const ownIds = new Set(own.map((s2) => s2.id));
+    const wanted = new Set(args.extraSkillIds);
+    extras = (await args.service.listInstalledSkills()).filter((s2) => wanted.has(s2.id) && !ownIds.has(s2.id));
+  }
+  const skills = [...own, ...extras];
+  if (skills.length === 0) return {};
+  const prefix = skillsDirForRuntime(args.runtimeKind);
+  const out = {};
+  const dec2 = new TextDecoder();
+  const usedDirs = /* @__PURE__ */ new Set();
+  for (const skill of skills) {
+    const files = await args.service.listSkillFiles(skill.id);
+    if (files.length === 0) continue;
+    let dir = sanitizeSkillDir(skill.name);
+    if (usedDirs.has(dir)) {
+      let n = 2;
+      while (usedDirs.has(`${dir}-${n}`)) n++;
+      dir = `${dir}-${n}`;
+    }
+    usedDirs.add(dir);
+    for (const f2 of files) {
+      try {
+        const bytes = await args.blobs.get(f2.blobHash);
+        out[`${prefix}/${dir}/${f2.path}`] = dec2.decode(bytes);
+      } catch (err) {
+        console.warn(`[skill-materializer] skip ${skill.id}/${f2.path} (blob ${f2.blobHash.slice(0, 12)}\u2026): ${String(err)}`);
+      }
+    }
+  }
+  return out;
+}
+var init_skill_materializer = __esm({
+  "../server/src/domains/actors/skill-materializer.ts"() {
+    "use strict";
+  }
+});
+
 // ../server/src/domains/actors/index.ts
 async function syncRegistryRolesToKernel(store, kernel) {
   for (const actor of await store.listActors()) {
@@ -30622,6 +31036,7 @@ var init_actors = __esm({
     init_service2();
     init_routes();
     init_stats();
+    init_skill_materializer();
   }
 });
 
@@ -32111,14 +32526,20 @@ OASIS_DIR="$(pwd)"
 NODE_DIR="$OASIS_DIR/${dir}"
 NODE_CMD="$OASIS_DIR/node_modules/.bin/tsx $OASIS_DIR/packages/cli/src/main.ts"
 
-# \u5199\u5165\u8282\u70B9\u51ED\u8BC1\uFF1A600 \u6743\u9650\u3001\u72EC\u7ACB\u6587\u4EF6\uFF0C\u4E0D\u653E\u8FDB\u547D\u4EE4\u884C/ExecStart\uFF08\u9632\u6CC4\u6F0F\u5230 ps/journald\uFF09\u3002
-# CLI \u7684 oasis node \u4F1A\u4ECE <dir>/node-token \u81EA\u52A8\u8BFB\u53D6\u3002
+# \u5199\u5165\u4E00\u6B21\u6027\u63A5\u5165\u4EE4\u724C\uFF1A600 \u6743\u9650\u3001\u72EC\u7ACB\u6587\u4EF6\uFF0C\u4E0D\u653E\u8FDB\u547D\u4EE4\u884C/ExecStart\uFF08\u9632\u6CC4\u6F0F\u5230 ps/journald\uFF09\u3002
+# CLI \u7684 oasis node \u9996\u6B21\u542F\u52A8\u4F1A\u7528\u5B83\u5411\u670D\u52A1\u7AEF exchange \u53D6\u56DE nodeId + \u957F\u671F node-token\uFF0C
+# \u4E4B\u540E\u843D\u76D8\u5230 <dir>/node-id \u4E0E <dir>/node-token\uFF0C\u91CD\u542F\u4E0D\u518D exchange\u3002
 mkdir -p "$NODE_DIR"
-( umask 077; cat > "$NODE_DIR/node-token" <<'OASIS_NODE_TOKEN_EOF'
+( umask 077; cat > "$NODE_DIR/enroll-token" <<'OASIS_ENROLL_TOKEN_EOF'
 ${p2.token}
-OASIS_NODE_TOKEN_EOF
+OASIS_ENROLL_TOKEN_EOF
 )
 
+# "Script was run" marker: tells the daemon to (re)report its available runtimes once on
+# next start. Adapters are picked up only on an explicit script run \u2014 never on plain
+# reconnects/restarts \u2014 so admin-side runtime deletions stay deleted until you re-run this.
+touch "$NODE_DIR/report-runtimes"
+
 # \u7528 systemd \u7528\u6237\u670D\u52A1\uFF08Linux\uFF09\u4FDD\u6301\u540E\u53F0\u5E38\u9A7B + \u5F00\u673A\u81EA\u542F
 if command -v systemctl &>/dev/null && systemctl --user daemon-reload &>/dev/null 2>&1; then
   SERVICE_FILE=~/.config/systemd/user/oasis-node.service
@@ -32133,11 +32554,12 @@ if command -v systemctl &>/dev/null && systemctl --user daemon-reload &>/dev/nul
   echo '\u2192 \u5199\u5165 systemd \u7528\u6237\u670D\u52A1\u914D\u7F6E...'
   cat > "$SERVICE_FILE" << EOF
 [Unit]
-Description=Oasis Node Daemon (${p2.nodeId})
+Description=Oasis Node Daemon
 After=network.target
 
 [Service]
-ExecStart=$NODE_CMD node --server-ws ${p2.gatewayUrl} --id ${p2.nodeId} --dir $NODE_DIR
+ExecStart=$NODE_CMD node --server-ws ${p2.gatewayUrl} --dir $NODE_DIR
+Environment=PATH=$PATH:$HOME/.npm-global/bin:$HOME/.local/bin:/usr/local/bin
 WorkingDirectory=$OASIS_DIR
 Restart=on-failure
 RestartSec=5
@@ -32176,7 +32598,6 @@ elif [[ "$(uname)" == "Darwin" ]]; then
     <string>$MAIN</string>
     <string>node</string>
     <string>--server-ws</string><string>${p2.gatewayUrl}</string>
-    <string>--id</string><string>${p2.nodeId}</string>
     <string>--dir</string><string>$NODE_DIR</string>
   </array>
   <key>WorkingDirectory</key><string>$OASIS_DIR</string>
@@ -32204,7 +32625,7 @@ else
     sleep 1
   fi
   echo '\u2192 \u542F\u52A8\u8282\u70B9\uFF08nohup \u540E\u53F0\uFF09...'
-  nohup $NODE_CMD node --server-ws ${p2.gatewayUrl} --id ${p2.nodeId} --dir $NODE_DIR > ~/.oasis-node.log 2>&1 &
+  nohup $NODE_CMD node --server-ws ${p2.gatewayUrl} --dir $NODE_DIR > ~/.oasis-node.log 2>&1 &
   echo "\u2713 \u8282\u70B9\u5DF2\u5728\u540E\u53F0\u542F\u52A8\uFF08PID $!\uFF09"
   echo '  \u65E5\u5FD7\uFF1Atail -f ~/.oasis-node.log'
   echo '  \u505C\u6B62\uFF1Apkill -f "oasis node"'
@@ -32239,9 +32660,10 @@ if (-not (Test-Path "node_modules")) {
   Write-Host "\u2192 Dependencies already present, skipping."
 }
 
-# \u2500\u2500 write token (ACL-restricted) \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
+# \u2500\u2500 write enroll token (ACL-restricted) \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
+# \u4E00\u6B21\u6027\u4EE4\u724C\uFF1Boasis node \u9996\u6B21\u542F\u52A8\u7528\u5B83 exchange \u53D6\u56DE nodeId + \u957F\u671F node-token\uFF0C\u4E4B\u540E\u843D\u76D8\u590D\u7528\u3002
 New-Item -ItemType Directory -Force -Path $NODE_DIR | Out-Null
-$tokenPath = "$NODE_DIR\\node-token"
+$tokenPath = "$NODE_DIR\\enroll-token"
 Set-Content -Path $tokenPath -Value "${p2.token}" -NoNewline -Encoding utf8
 $acl = Get-Acl $tokenPath
 $acl.SetAccessRuleProtection($true, $false)
@@ -32250,10 +32672,15 @@ $rule = New-Object System.Security.AccessControl.FileSystemAccessRule(
 $acl.AddAccessRule($rule)
 Set-Acl $tokenPath $acl
 
+# "Script was run" marker: tells the daemon to (re)report its available runtimes once on
+# next start. Adapters are picked up only on an explicit script run \u2014 never on plain
+# reconnects/restarts \u2014 so admin-side runtime deletions stay deleted until you re-run this.
+Set-Content -Path "$NODE_DIR\\report-runtimes" -Value "" -NoNewline -Encoding utf8
+
 # \u2500\u2500 register Task Scheduler (run at logon, restart on failure) \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
 $tsx  = "$INSTALL_DIR\\node_modules\\.bin\\tsx.cmd"
 $main = "$INSTALL_DIR\\packages\\cli\\src\\main.ts"
-$args = "\`"$main\`" node --server-ws ${p2.gatewayUrl} --id ${p2.nodeId} --dir \`"$NODE_DIR\`""
+$args = "\`"$main\`" node --server-ws ${p2.gatewayUrl} --dir \`"$NODE_DIR\`""
 
 $action   = New-ScheduledTaskAction -Execute $tsx -Argument $args -WorkingDirectory $INSTALL_DIR
 $trigger  = New-ScheduledTaskTrigger -AtLogOn -User $env:USERNAME
@@ -32261,23 +32688,23 @@ $settings = New-ScheduledTaskSettingsSet -RestartCount 5 \`
               -RestartInterval (New-TimeSpan -Minutes 1) \`
               -ExecutionTimeLimit ([TimeSpan]::Zero) \`
               -StartWhenAvailable $true
-Register-ScheduledTask -TaskName "OasisNode-${p2.nodeId}" \`
+Register-ScheduledTask -TaskName "OasisNode" \`
   -Action $action -Trigger $trigger -Settings $settings -Force | Out-Null
 
 # \u2500\u2500 start now \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
-Start-ScheduledTask -TaskName "OasisNode-${p2.nodeId}"
+Start-ScheduledTask -TaskName "OasisNode"
 Pop-Location
 
 Write-Host ""
 Write-Host "\u2713 Node started (Task Scheduler, runs at every logon)"
-Write-Host "  Status : Get-ScheduledTask -TaskName 'OasisNode-${p2.nodeId}'"
-Write-Host "  Stop   : Stop-ScheduledTask -TaskName 'OasisNode-${p2.nodeId}'"
-Write-Host "  Remove : Unregister-ScheduledTask -TaskName 'OasisNode-${p2.nodeId}' -Confirm:$false"
+Write-Host "  Status : Get-ScheduledTask -TaskName 'OasisNode'"
+Write-Host "  Stop   : Stop-ScheduledTask -TaskName 'OasisNode'"
+Write-Host "  Remove : Unregister-ScheduledTask -TaskName 'OasisNode' -Confirm:$false"
 `;
 }
 function buildNpxCmd(p2) {
   const namePart = p2.nodeName ? ` --name ${p2.nodeName}` : "";
-  return `npx -y oasis_test@latest start --server-ws ${p2.gatewayUrl} --id ${p2.nodeId}${namePart} --enroll-token ${p2.token}`;
+  return `npx -y oasis_test@latest start --server-ws ${p2.gatewayUrl}${namePart} --enroll-token ${p2.token}`;
 }
 var init_connect_script = __esm({
   "../server/src/domains/nodes/connect-script.ts"() {
@@ -32287,7 +32714,6 @@ var init_connect_script = __esm({
 
 // ../server/src/domains/nodes/routes.ts
 function nodesDomain(deps) {
-  const nodeNames = /* @__PURE__ */ new Map();
   let hubWired = false;
   function wireHub(hub) {
     if (hubWired) return;
@@ -32298,19 +32724,20 @@ function nodesDomain(deps) {
       if (msg.type !== "hello") return;
       const d = hub.connectedDaemons().find((c) => c.daemonId === daemonId);
       if (!d) return;
-      const existing = await nodeStore.getNode(daemonId);
-      await nodeStore.upsertNode({
-        id: daemonId,
-        hostname: d.meta.hostname,
-        nodeVersion: d.meta.nodeVersion ?? "unknown",
-        status: "online",
-        lastSeenAt: now(),
-        enrolledAt: existing?.enrolledAt ?? now(),
-        ...d.meta.nodeName ? { name: d.meta.nodeName } : existing?.name ? { name: existing.name } : {}
-      });
-      if (d.meta.runtimes) {
-        for (const cap of d.meta.runtimes) {
-          await nodeStore.upsertRuntime({
+      if (msg.meta.runtimes) {
+        const existing = await nodeStore.getNode(daemonId);
+        await nodeStore.upsertNode({
+          id: daemonId,
+          hostname: d.meta.hostname,
+          nodeVersion: d.meta.nodeVersion ?? "unknown",
+          status: "online",
+          // revives a previously soft-deleted node
+          lastSeenAt: now(),
+          enrolledAt: existing?.enrolledAt ?? now(),
+          ...d.meta.nodeName ? { name: d.meta.nodeName } : existing?.name ? { name: existing.name } : {}
+        });
+        for (const cap of msg.meta.runtimes) {
+          await nodeStore.addRuntimeIfAbsent({
             id: `runtime:${daemonId}:${cap.kind}`,
             nodeId: daemonId,
             kind: cap.kind,
@@ -32321,7 +32748,9 @@ function nodesDomain(deps) {
             lastSeenAt: now()
           });
         }
+        await nodeStore.setNodeRuntimesOnline(daemonId, true);
       } else {
+        await nodeStore.setNodeOnline(daemonId, true);
         await nodeStore.setNodeRuntimesOnline(daemonId, true);
       }
     });
@@ -32331,35 +32760,24 @@ function nodesDomain(deps) {
     };
   }
   return (router) => {
+    let wirePoll = null;
+    const tryWire = () => {
+      const hub = deps.getHub();
+      if (hub) {
+        wireHub(hub);
+        if (wirePoll) {
+          clearInterval(wirePoll);
+          wirePoll = null;
+        }
+      }
+    };
+    tryWire();
+    if (!hubWired) wirePoll = setInterval(tryWire, 100);
     async function syncConnectedDaemon(daemonId, hub) {
       const d = hub.connectedDaemons().find((c) => c.daemonId === daemonId);
       if (!d) return;
-      const existing = await deps.nodeStore.getNode(daemonId);
-      await deps.nodeStore.upsertNode({
-        id: daemonId,
-        hostname: d.meta.hostname,
-        nodeVersion: d.meta.nodeVersion ?? "unknown",
-        status: "online",
-        lastSeenAt: (/* @__PURE__ */ new Date()).toISOString(),
-        enrolledAt: existing?.enrolledAt ?? (/* @__PURE__ */ new Date()).toISOString(),
-        ...d.meta.nodeName ? { name: d.meta.nodeName } : existing?.name ? { name: existing.name } : {}
-      });
-      if (d.meta.runtimes) {
-        for (const cap of d.meta.runtimes) {
-          await deps.nodeStore.upsertRuntime({
-            id: `runtime:${daemonId}:${cap.kind}`,
-            nodeId: daemonId,
-            kind: cap.kind,
-            hostname: d.meta.hostname,
-            ...cap.binary ? { binary: cap.binary } : {},
-            ...cap.version ? { version: cap.version } : {},
-            status: "online",
-            lastSeenAt: (/* @__PURE__ */ new Date()).toISOString()
-          });
-        }
-      } else {
-        await deps.nodeStore.setNodeRuntimesOnline(daemonId, true);
-      }
+      await deps.nodeStore.setNodeOnline(daemonId, true);
+      await deps.nodeStore.setNodeRuntimesOnline(daemonId, true);
     }
     router.get("/api/nodes", async () => {
       const hub = deps.getHub();
@@ -32414,16 +32832,11 @@ function nodesDomain(deps) {
     router.post("/api/nodes/enroll", async (req) => {
       const body = req.body ?? {};
       const nodeName = body.nodeName?.trim() || void 0;
-      const requestedId = body.nodeId?.trim();
-      const existing = requestedId ? await deps.nodeStore.getNode(requestedId) : null;
-      const nodeId = existing?.id ?? requestedId ?? `node-${(0, import_node_crypto9.randomUUID)().slice(0, 8)}`;
-      const enroll = deps.enrollTokens.issue(nodeId);
-      if (nodeName) nodeNames.set(nodeId, nodeName);
-      if (existing && nodeName) await deps.nodeStore.updateNodeName(nodeId, nodeName);
-      const params = { gatewayUrl: deps.gatewayUrl, nodeId, token: enroll.token, repoRemote: deps.repoRemote };
+      const enroll = deps.enrollTokens.issue(nodeName ?? "");
+      const params = { gatewayUrl: deps.gatewayUrl, token: enroll.token, repoRemote: deps.repoRemote };
       const script = body.platform === "windows" ? buildWindowsConnectScript(params) : buildConnectScript(params);
-      const npxCmd = buildNpxCmd({ gatewayUrl: deps.gatewayUrl, nodeId, token: enroll.token, nodeName });
-      return { status: 200, body: { nodeId, nodeName, token: enroll.token, script, gatewayUrl: deps.gatewayUrl, npxCmd } };
+      const npxCmd = buildNpxCmd({ gatewayUrl: deps.gatewayUrl, token: enroll.token, nodeName });
+      return { status: 200, body: { nodeName, token: enroll.token, script, gatewayUrl: deps.gatewayUrl, npxCmd } };
     });
     router.post("/api/nodes/exchange", async (req) => {
       const body = req.body ?? {};
@@ -32431,15 +32844,22 @@ function nodesDomain(deps) {
       if (!enrollToken) return { status: 400, body: { error: "missing enrollToken" } };
       const entry = deps.enrollTokens.peek(enrollToken);
       if (!entry) return { status: 401, body: { error: "invalid or expired enroll token" } };
-      const requestedNodeId = body.nodeId?.trim() || entry.nodeId;
-      const requestedExists = await deps.nodeStore.getNode(requestedNodeId);
-      if (requestedNodeId !== entry.nodeId && !requestedExists) {
-        return { status: 409, body: { error: "requested node does not exist" } };
-      }
-      const consumed = deps.enrollTokens.consume(enrollToken);
-      if (!consumed) return { status: 401, body: { error: "invalid or expired enroll token" } };
-      const nodeId = requestedNodeId;
-      await deps.nodeStore.clearDeletedRuntimesForNode(nodeId);
+      const incomingNodeId = body.nodeId?.trim();
+      const ownsIncoming = !!incomingNodeId && (deps.nodeTokens.list().some((e) => e.nodeId === incomingNodeId) || await deps.nodeStore.getNode(incomingNodeId) !== null);
+      let nodeId;
+      if (entry.issuedNodeId) {
+        if (incomingNodeId && incomingNodeId !== entry.issuedNodeId && !ownsIncoming)
+          return { status: 409, body: { error: "nodeId mismatch" } };
+        nodeId = entry.issuedNodeId;
+      } else if (ownsIncoming) {
+        nodeId = incomingNodeId;
+        deps.enrollTokens.setIssuedNodeId(enrollToken, nodeId);
+      } else {
+        nodeId = `node-${(0, import_node_crypto9.randomUUID)().slice(0, 8)}`;
+        deps.enrollTokens.setIssuedNodeId(enrollToken, nodeId);
+      }
+      deps.enrollTokens.consume(enrollToken);
+      if (entry.name) await deps.nodeStore.updateNodeName(nodeId, entry.name);
       const existing = deps.nodeTokens.list().find((e) => e.nodeId === nodeId);
       const token = existing?.token ?? deps.nodeTokens.issue(nodeId);
       return { status: 200, body: { nodeId, token } };
@@ -32505,6 +32925,24 @@ function typesDomain(deps) {
       const r = await deps.admin.delete(name);
       return r.ok ? { status: 200, body: { ok: true } } : { status: 400, body: { error: r.error, ...r.usage ? { usage: r.usage } : {} } };
     });
+    router.post("/api/artifact-types/:name/fields", async (req) => {
+      const name = req.params["name"];
+      if (!name) return { status: 400, body: { error: "missing name" } };
+      const r = await deps.admin.addField(name, req.body ?? {});
+      return r.ok ? { status: 200, body: { ok: true, ...r.usage ? { usage: r.usage } : {} } } : { status: 400, body: { error: r.error } };
+    });
+    router.patch("/api/artifact-types/:name/fields/:field", async (req) => {
+      const { name, field } = req.params;
+      if (!name || !field) return { status: 400, body: { error: "missing name/field" } };
+      const r = await deps.admin.editField(name, field, req.body ?? {});
+      return r.ok ? { status: 200, body: { ok: true, ...r.usage ? { usage: r.usage } : {} } } : { status: 400, body: { error: r.error } };
+    });
+    router.delete("/api/artifact-types/:name/fields/:field", async (req) => {
+      const { name, field } = req.params;
+      if (!name || !field) return { status: 400, body: { error: "missing name/field" } };
+      const r = await deps.admin.dropField(name, field);
+      return r.ok ? { status: 200, body: { ok: true, ...r.usage ? { usage: r.usage } : {} } } : { status: 400, body: { error: r.error } };
+    });
   };
 }
 var init_types3 = __esm({
@@ -32522,17 +32960,20 @@ var init_node_store = __esm({
     MemoryNodeStore = class {
       nodes = /* @__PURE__ */ new Map();
       runtimes = /* @__PURE__ */ new Map();
-      deletedRuntimeIds = /* @__PURE__ */ new Set();
       async upsertNode(node) {
         this.nodes.set(node.id, { ...this.nodes.get(node.id), ...node });
       }
       async upsertRuntime(rt) {
-        if (this.deletedRuntimeIds.has(rt.id)) return;
         this.runtimes.set(rt.id, { ...this.runtimes.get(rt.id), ...rt });
       }
+      async addRuntimeIfAbsent(rt) {
+        if (this.runtimes.has(rt.id)) return false;
+        this.runtimes.set(rt.id, rt);
+        return true;
+      }
       async setNodeOnline(id, online) {
         const n = this.nodes.get(id);
-        if (n) {
+        if (n && n.status !== "deleted") {
           n.status = online ? "online" : "offline";
           n.lastSeenAt = (/* @__PURE__ */ new Date()).toISOString();
         }
@@ -32554,7 +32995,7 @@ var init_node_store = __esm({
         return this.nodes.get(id) ?? null;
       }
       async listNodes() {
-        return [...this.nodes.values()];
+        return [...this.nodes.values()].filter((n) => n.status !== "deleted");
       }
       async listRuntimes(nodeId) {
         const all = [...this.runtimes.values()];
@@ -32565,23 +33006,24 @@ var init_node_store = __esm({
         for (const [k2, rt] of this.runtimes) {
           if (rt.nodeId === id) this.runtimes.delete(k2);
         }
-        for (const k2 of [...this.deletedRuntimeIds]) {
-          if (k2.startsWith(`runtime:${id}:`)) this.deletedRuntimeIds.delete(k2);
-        }
       }
-      async clearDeletedRuntimesForNode(nodeId) {
-        for (const id of [...this.deletedRuntimeIds]) {
-          if (id.startsWith(`runtime:${nodeId}:`)) this.deletedRuntimeIds.delete(id);
+      async softDeleteNode(id) {
+        const n = this.nodes.get(id);
+        if (n) {
+          n.status = "deleted";
+          n.lastSeenAt = (/* @__PURE__ */ new Date()).toISOString();
+        }
+        for (const [k2, rt] of this.runtimes) {
+          if (rt.nodeId === id) this.runtimes.delete(k2);
         }
       }
       async deleteRuntime(id) {
-        this.deletedRuntimeIds.add(id);
         const rt = this.runtimes.get(id);
         this.runtimes.delete(id);
         if (!rt) return { nodeDeleted: false };
         const remaining = [...this.runtimes.values()].filter((r) => r.nodeId === rt.nodeId);
         if (remaining.length === 0) {
-          this.nodes.delete(rt.nodeId);
+          await this.softDeleteNode(rt.nodeId);
           return { nodeDeleted: true };
         }
         return { nodeDeleted: false };
@@ -32598,7 +33040,6 @@ var init_node_store = __esm({
           const snap = JSON.parse(fs5.readFileSync(file, "utf8"));
           for (const n of snap.nodes ?? []) s2.nodes.set(n.id, n);
           for (const r of snap.runtimes ?? []) s2.runtimes.set(r.id, r);
-          for (const id of snap.deletedRuntimeIds ?? []) s2.deletedRuntimeIds.add(id);
         } catch {
           fs5.writeFileSync(file, JSON.stringify({ nodes: [], runtimes: [] }, null, 2));
         }
@@ -32607,8 +33048,7 @@ var init_node_store = __esm({
       flush() {
         fs5.writeFileSync(this.file, JSON.stringify({
           nodes: [...this.nodes.values()],
-          runtimes: [...this.runtimes.values()],
-          deletedRuntimeIds: [...this.deletedRuntimeIds]
+          runtimes: [...this.runtimes.values()]
         }, null, 2));
       }
       async upsertNode(node) {
@@ -32619,6 +33059,11 @@ var init_node_store = __esm({
         await super.upsertRuntime(rt);
         this.flush();
       }
+      async addRuntimeIfAbsent(rt) {
+        const r = await super.addRuntimeIfAbsent(rt);
+        if (r) this.flush();
+        return r;
+      }
       async setNodeOnline(id, online) {
         await super.setNodeOnline(id, online);
         this.flush();
@@ -32635,8 +33080,8 @@ var init_node_store = __esm({
         await super.deleteNode(id);
         this.flush();
       }
-      async clearDeletedRuntimesForNode(nodeId) {
-        await super.clearDeletedRuntimesForNode(nodeId);
+      async softDeleteNode(id) {
+        await super.softDeleteNode(id);
         this.flush();
       }
       async deleteRuntime(id) {
@@ -32649,10 +33094,10 @@ var init_node_store = __esm({
 });
 
 // ../server/src/domains/collab/workorder-detail.ts
-function buildWorkorderDetail(model, workspaceId, resolveActor, resolveProject, dispatchJournal = []) {
+function buildWorkorderDetail(model, workspaceId, resolveActor, resolveProject, dispatchJournal = [], dispatchPausedOf) {
   const arts = [...model.artifacts.values()].filter((a) => a.workspace === workspaceId);
   if (arts.length === 0) return null;
-  const summary = buildWorkorderSummaries(model, resolveActor, resolveProject).find((w2) => w2.id === workspaceId);
+  const summary = buildWorkorderSummaries(model, resolveActor, resolveProject, dispatchPausedOf).find((w2) => w2.id === workspaceId);
   if (!summary) return null;
   const ref = (id) => {
     const extra = resolveActor?.(id);
@@ -32823,6 +33268,26 @@ var init_workorder_detail = __esm({
 // ../server/src/domains/collab/inbox.ts
 function buildInbox(model, me) {
   const out = [];
+  const creatorOf = /* @__PURE__ */ new Map();
+  for (const a of model.artifacts.values()) {
+    if (a.type === "brief") creatorOf.set(a.workspace, a.owner);
+  }
+  const staffingSeen = /* @__PURE__ */ new Set();
+  for (const a of model.artifacts.values()) {
+    const pendingRole = /^pending:role:(.+)$/.exec(a.owner);
+    if (!pendingRole || creatorOf.get(a.workspace) !== me) continue;
+    const key = `${a.workspace}:${pendingRole[1]}`;
+    if (staffingSeen.has(key)) continue;
+    staffingSeen.add(key);
+    out.push({
+      kind: "needs-staffing",
+      artifactId: a.id,
+      workspace: a.workspace,
+      since: model.lastOpAt.get(a.id) ?? "",
+      actionRequired: true,
+      summary: `\u5DE5\u5355\u7F3A\u4EBA\u624B\uFF1A${pendingRole[1]} \u89D2\u8272\u65E0\u5458\u5DE5\uFF0C\u300C${nodeLabel(a)}\u300D\u5F85\u6D3E\u2014\u2014\u8BF7\u8865\u4EBA\u6216 assign`
+    });
+  }
   for (const a of model.artifacts.values()) {
     const ws = a.workspace;
     const label = nodeLabel(a);
@@ -33018,6 +33483,11 @@ async function buildProjectResolver(artifacts) {
   const byWorkOrder = new Map(bindings.map((binding) => [binding.workOrderId, binding.projectId]));
   return (workOrderId) => byWorkOrder.get(workOrderId) ?? null;
 }
+async function buildDispatchPausedResolver(artifacts) {
+  if (!artifacts) return void 0;
+  const held = new Set(await artifacts.listWorkspaceDispatchHeld());
+  return (workspace) => held.has(workspace);
+}
 function collabDomain(opts) {
   const defaultCtx = {
     kernel: opts.kernel,
@@ -33044,28 +33514,30 @@ function collabDomain(opts) {
       const { kernel, registry: registry2, artifacts } = await resolveCtx(req.auth.companyId);
       const resolve3 = await buildResolver(registry2);
       const resolveProject = await buildProjectResolver(artifacts);
-      return { status: 200, body: { items: buildWorkorderSummaries(kernel.model, resolve3, resolveProject) } };
+      const dispatchPausedOf = await buildDispatchPausedResolver(artifacts);
+      return { status: 200, body: { items: buildWorkorderSummaries(kernel.model, resolve3, resolveProject, dispatchPausedOf) } };
     });
     router.get("/api/workorders/:id", async (req) => {
       const { kernel, registry: registry2, artifacts } = await resolveCtx(req.auth.companyId);
       const resolve3 = await buildResolver(registry2);
       const resolveProject = await buildProjectResolver(artifacts);
-      const detail = buildWorkorderDetail(kernel.model, req.params.id, resolve3, resolveProject, opts.dispatchJournal?.() ?? []);
+      const dispatchPausedOf = await buildDispatchPausedResolver(artifacts);
+      const detail = buildWorkorderDetail(kernel.model, req.params.id, resolve3, resolveProject, opts.dispatchJournal?.() ?? [], dispatchPausedOf);
       if (!detail) {
         return { status: 404, body: { error: { code: "not_found", message: `\u5DE5\u5355\u4E0D\u5B58\u5728: ${req.params.id}` } } };
       }
       return { status: 200, body: detail };
     });
     router.post("/api/workorders/:id/dispatch", async (req) => {
-      const { kernel } = await resolveCtx(req.auth.companyId);
+      const { kernel, artifacts } = await resolveCtx(req.auth.companyId);
       const ws = req.params.id;
       const arts = [...kernel.model.artifacts.values()].filter((a) => a.workspace === ws);
       if (arts.length === 0) {
         return { status: 404, body: { error: { code: "not_found", message: `\u5DE5\u5355\u4E0D\u5B58\u5728: ${ws}` } } };
       }
-      const holdId = openDispatchHoldOf(kernel.model, arts);
-      if (!holdId) return { status: 200, body: { dispatched: false } };
-      await kernel.resolveAnnotation({ annotationId: holdId, actor: req.auth.actor, resolution: "resolved", note: "\u4EBA\u5DE5\u6D3E\u5355" });
+      const held = artifacts ? (await artifacts.listWorkspaceDispatchHeld()).includes(ws) : false;
+      if (!held) return { status: 200, body: { dispatched: false } };
+      await artifacts.setWorkspaceDispatchHold(ws, false);
       return { status: 200, body: { dispatched: true } };
     });
     router.get("/api/inbox", async (req) => {
@@ -34016,23 +34488,6 @@ function createChatSessionsDomain(opts) {
       await store.updateSession(req.params.id, { touchedAt: (/* @__PURE__ */ new Date()).toISOString() });
       return { status: 201, body: msg };
     });
-    router.get("/api/chat-sessions/:id/work-orders", async (req) => {
-      const session = await store.getSession(req.params.id);
-      if (!session || session.humanActorId !== req.auth.actor) throw new ApiError(404, "NOT_FOUND", "session not found");
-      const workOrderIds = await store.listWorkOrdersForSession(req.params.id);
-      if (!opts.kernel || workOrderIds.length === 0) return { status: 200, body: { items: [] } };
-      const bindings = opts.artifactState ? await opts.artifactState.listWorkspaceBindings() : [];
-      const byWo = new Map(bindings.map((b2) => [b2.workOrderId, b2.projectId]));
-      const actors = opts.kernel ? await registry2.listActors().catch(() => []) : [];
-      const byId = new Map(actors.map((a) => [a.id, a]));
-      const resolver = (id) => {
-        const a = byId.get(id);
-        return a ? { name: a.name } : void 0;
-      };
-      const allSummaries = buildWorkorderSummaries(opts.kernel.model, resolver, (wo) => byWo.get(wo) ?? null);
-      const items = allSummaries.filter((s2) => workOrderIds.includes(s2.id));
-      return { status: 200, body: { items } };
-    });
   };
 }
 var import_node_crypto10;
@@ -34041,7 +34496,6 @@ var init_chat_sessions = __esm({
     "use strict";
     import_node_crypto10 = require("node:crypto");
     init_router();
-    init_workorders();
   }
 });
 
@@ -35582,16 +36036,16 @@ var init_worker = __esm({
 \u2461 **\u786E\u5C5E\u56FE\u75C5\u624D\u4E0B\u5200**\uFF08link / spawn / cancel-part / \u6539\u8FDE\uFF09\uFF1B
 \u2462 **\u62FF\u4E0D\u51C6\u3001\u6216\u6839\u56E0\u4E0D\u5728\u56FE\u4E0A**\uFF08\u50CF\u8FD0\u884C\u65F6\u5361\u6B7B\u3001\u5185\u5BB9\u5199\u4E0D\u51FA\u3001\u9700\u6C42\u672C\u8EAB\u77DB\u76FE\uFF09\u2192 **\u522B\u52A8\u56FE**\uFF0C\u4E00\u53E5\u8BDD\u8BF4\u6E05\u4F60\u5224\u65AD\u7684\u6839\u56E0 + \u5EFA\u8BAE\u8C01\u5904\u7F6E\uFF0C\u6536\u5DE5\u3002**\u8BEF\u5220\u4E00\u6761\u672C\u8BE5\u7B49\u7684\u6D41\u7A0B\uFF0C\u6BD4\u665A\u6551\u4E00\u4F1A\u513F\u66F4\u7CDF\u3002**
 
-\u3010\u6539\u56FE\uFF1A\u6682\u5B58 \u2192 \u63D0\u4EA4\u3011\u4F60\u80FD\u7528\u7684\u6539\u56FE\u547D\u4EE4\uFF08\u90FD\u5148\u8FDB**\u7F16\u8F91\u7F13\u51B2**\u3001\u4E0D\u7ACB\u5373\u6539\u771F\u56FE\uFF09\uFF1A
-- \`oasis link <consumer> --to <up> [--required]\` \u2014\u2014 \u52A0\u4F9D\u8D56\u8FB9
-- \`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 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
+\u3010\u6539\u56FE\uFF1A\u6682\u5B58 \u2192 \u63D0\u4EA4\u3011\u4F60\u80FD\u7528\u7684\u6539\u56FE\u547D\u4EE4\uFF08**\u90FD\u5148\u8FDB\u7F16\u8F91\u7F13\u51B2\u3001\u4E0D\u7ACB\u5373\u6539\u771F\u56FE**\uFF1B\u6539\u5B8C\u7528 \`oasis apply\` \u4E00\u6B21\u6027\u63D0\u4EA4\uFF09\uFF1A
+- \`oasis link <consumer> --to <up> [--required true]\` \u2014\u2014 \u7ED9 consumer \u52A0\u4E00\u6761\u6307\u5411\u4E0A\u6E38 up \u7684\u4F9D\u8D56\u8FB9\u3002\`<consumer>\`\uFF08\u4F4D\u7F6E\u53C2\u6570\uFF09= \u8981\u52A0\u4F9D\u8D56\u7684\u4E0B\u6E38\u8282\u70B9 id\uFF1B\`--to <up>\` = \u88AB\u4F9D\u8D56\u7684\u4E0A\u6E38 id\uFF1B\`--required true\` = \u8FD9\u6761\u662F**\u963B\u585E\u6027**\u4F9D\u8D56\uFF08up \u6CA1 conclude\uFF0Cconsumer \u5C31\u52A8\u4E0D\u4E86\uFF09\uFF0C**\u7701\u7565\u5219\u662F\u8F6F\u4F9D\u8D56**\uFF08\u53EA\u8BB0\u5173\u7CFB\u3001\u4E0D\u963B\u585E\uFF09\u3002\u53BB\u91CD\u65F6\u7528\u5B83\u628A"\u8BE5\u8FDE\u65E2\u6709"\u7684\u8FB9\u8865\u4E0A\u3002
+- \`oasis spawn <id> --type <t> [--title "<\u77ED\u540D>"] [--brief "<\u89C4\u683C>"] [--input <up>[,<up2>\u2026]]\` \u2014\u2014 \u65B0\u5EFA\u4E00\u4E2A\u8282\u70B9\u3002\`<id>\`\uFF08\u4F4D\u7F6E\u53C2\u6570\uFF09= \u65B0\u8282\u70B9 id\uFF08\u5F62\u5982 \`artifact:<type>:<\u540D>\`\uFF09\uFF1B\`--type <t>\` = \u7C7B\u578B\u540D\uFF08**\u5FC5\u586B**\uFF0C\u5148 \`oasis artifact-types\` \u770B\u53EF\u9009\u7C7B\u578B\u4E0E\u7528\u9014\uFF09\uFF1B\`--title\` = \u77ED\u540D\uFF1B\`--brief\` = \u7ED9\u5B83\u7684\u4EA7\u51FA\u89C4\u683C\uFF08\u5199\u6E05\u8981\u505A\u6210\u4EC0\u4E48\uFF0C\u4F1A\u6210\u4E3A\u8BE5\u8282\u70B9 owner \u7684\u4EFB\u52A1\u4E66\uFF09\uFF1B\`--input\` = \u5B83\u4F9D\u8D56\u54EA\u4E9B\u4E0A\u6E38\uFF08**\u9017\u53F7\u5206\u9694**\u591A\u4E2A\uFF09\u3002**\u786E\u65E0\u65E2\u6709\u53EF\u8FDE\u3001\u662F\u771F\u65B0\u9700\u6C42\u624D\u7528**\u3002
+- \`oasis edit <id> [--title "<\u65B0\u77ED\u540D>"] [--brief "<\u65B0\u89C4\u683C>"]\` \u2014\u2014 \u6539\u4E00\u4E2A**\u5DF2\u5B58\u5728**\u8282\u70B9\u7684\u6807\u9898 / brief\uFF08**\u53EA\u6539\u8FD9\u4E24\u6837\u5143\u6570\u636E\uFF0C\u7EDD\u4E0D\u78B0\u6B63\u6587**\uFF09\u3002\`<id>\` = \u88AB\u6539\u8282\u70B9\uFF1B\`--title\` / \`--brief\` \u7ED9\u54EA\u4E2A\u4F20\u54EA\u4E2A\u3002\u5408\u5E76\u53BB\u91CD\u65F6\u7528\u5B83\u628A\u4FDD\u7559\u4EF6\u7684 brief \u6269\u5199\u3002
+- \`oasis unlink <consumer> --to <up>\` \u2014\u2014 \u5220\u6389 consumer \u6307\u5411 up \u7684\u90A3\u6761\u4F9D\u8D56\u8FB9\u3002\`<consumer>\` = \u4E0B\u6E38\uFF1B\`--to <up>\` = \u4E0D\u518D\u4F9D\u8D56\u7684\u4E0A\u6E38\u3002\u6539\u8FDE\uFF08\u65AD\u9519\u8FB9 / \u6539\u8FDE\u5230\u6B63\u786E\u4E0A\u6E38\uFF09\u65F6\u7528\u3002
+- \`oasis cancel <id> [--note "<\u539F\u56E0>"]\` \u2014\u2014 **\u5F7B\u5E95\u5E9F\u5F03**\u4E00\u4E2A\u8282\u70B9\uFF1A\u5B83\u4E0D\u518D\u7B97\u6570\uFF0C\u7CFB\u7EDF**\u81EA\u52A8\u7EA7\u8054**\u65AD\u6389\u5B83\u6240\u6709\u4F9D\u8D56\u8FB9\u3001\u5E76\u91CD\u5524\u4E0B\u6E38\u8BA9\u5B83\u4EEC\u53BB\u6389\u5BF9\u5B83\u7684\u9002\u914D\u3002\`<id>\`\uFF08\u4F4D\u7F6E\u53C2\u6570\uFF09= \u88AB\u5E9F\u8282\u70B9\uFF1B\`--note\` = \u4E3A\u4EC0\u4E48\u5E9F\uFF08\u7559\u75D5\uFF09\u3002\u5EFA\u5728\u5DF2\u5E9F\u5730\u57FA\u4E0A\u3001\u6216\u8FD9\u8282\u70B9\u6839\u672C\u4E0D\u8BE5\u5B58\u5728\u65F6\u7528\u3002\u5E9F\u5F03\u540E\u8BE5\u8282\u70B9\u5728 \`oasis status\` \u91CC\u663E\u793A lifecycle=sealed:cancelled\u3002**\u9500\u6BC1\u6027**\u2014\u2014apply \u65F6\u6253\u5305\u6210\u63D0\u6848\u4EA4\u4EBA\u786E\u8BA4\u3002
+- \`oasis freeze <id> [--note "<\u539F\u56E0>"]\` \u2014\u2014 **\u51BB\u7ED3**\u4E00\u4E2A\u8282\u70B9\uFF1A\u4FDD\u7559\u5B83\u73B0\u6709\u4EA7\u51FA\u3001\u505C\u6B62\u518D\u6539\u52A8\uFF0C\u4F46**\u4F9D\u8D56\u8FB9\u90FD\u4FDD\u7559\u4E0D\u52A8**\uFF08\u4E0E cancel \u7684\u5173\u952E\u533A\u522B\u2014\u2014cancel \u662F\u65AD\u8FB9\u5E9F\u5F03\uFF0Cfreeze \u53EA\u662F\u6309\u4E0B\u6682\u505C\uFF09\u3002\`<id>\`\uFF08\u4F4D\u7F6E\u53C2\u6570\uFF09= \u88AB\u51BB\u8282\u70B9\uFF1B\`--note\` = \u4E3A\u4EC0\u4E48\u51BB\uFF08\u7559\u75D5\uFF09\u3002\u67D0\u8282\u70B9\u6682\u4E0D\u63A8\u8FDB\u3001\u4F46\u6210\u679C\u8981\u7559\u7740\u65F6\u7528\u3002\u51BB\u7ED3\u540E\u8BE5\u8282\u70B9\u5728 \`oasis status\` \u91CC\u663E\u793A lifecycle=sealed:frozen\u3002
+- \`oasis cancel-part <id> --part <\u90E8\u4EF6\u540D>\` \u2014\u2014 \u4ECE\u4E00\u4E2A\u5206\u89E3\u4E86\u90E8\u4EF6\u7684\u8282\u70B9\u4E0A**\u64A4\u6389\u4E00\u4E2A\u90E8\u4EF6**\u3002\`<id>\` = \u8282\u70B9\uFF1B\`--part\` = \u8981\u64A4\u7684\u90E8\u4EF6\u540D\uFF08**\u5FC5\u586B**\uFF09\u3002\u67D0 part \u6C38\u4E45\u4EA4\u4ED8\u4E0D\u4E86\u3001\u5361\u6B7B\u6574\u6761\u96C6\u6210\u65F6\u64A4\u6389\u5B83\u6551\u5176\u4F59\u3002**\u9500\u6BC1\u6027**\u2014\u2014\u8F6C\u4EBA\u5BA1\u3002
+- \`oasis staged\` \u2014\u2014 \u770B\u5F53\u524D\u7F16\u8F91\u7F13\u51B2\u91CC**\u5168\u90E8\u5F85\u63D0\u4EA4\u9879** + \u63D0\u4EA4\u540E\u5404\u53D7\u5F71\u54CD\u8282\u70B9\u4F1A\u53D8\u6210\u4EC0\u4E48\u6837\uFF08apply \u524D\u81EA\u68C0\uFF1B\u65E0\u53C2\u6570\uFF09\u3002
+- \`oasis apply --reason "<\u4E3A\u4EC0\u4E48\u8FD9\u4E48\u6539>"\` \u2014\u2014 **\u4E00\u6B21\u6027\u63D0\u4EA4**\u6574\u4E2A\u7F13\u51B2\u3002\`--reason\`\uFF08**\u5FC5\u586B**\uFF09\u5199\u6E05\u8FD9\u6279\u6539\u52A8\u7684\u610F\u56FE\u3002
 \u6BCF\u4E2A\u6539\u56FE\u547D\u4EE4\u56DE\u663E"\u5DF2\u6682\u5B58\u4EC0\u4E48 + \u53D7\u5F71\u54CD\u8282\u70B9\u6682\u5B58\u540E\u7684\u6837\u5B50"\u3002\`apply\` \u65F6\u7CFB\u7EDF\u770B\u4F60\u8FD9\u6279 diff \u81EA\u52A8\u51B3\u5B9A\uFF1A\u80FD\u76F4\u63A5\u843D\u7684\u76F4\u63A5\u843D\uFF0C\u6D89\u53CA\u9500\u6BC1/\u6539\u6D3E/\u89E3\u5C01\u7684\u6253\u5305\u6210\u4E00\u4EFD\u63D0\u6848\u4EA4\u4EBA\u786E\u8BA4\u2014\u2014**\u4F60\u4E0D\u5FC5\u81EA\u5DF1\u5206\u7C7B\u3001\u4E0D\u5199 JSON**\u3002\u6388\u6743\u5355\u4F4D\u662F **diff \u4E0D\u662F\u80FD\u529B**\u3002
 - \u6539\u5B8C**\u4E00\u5B9A apply**\uFF08\u5FD8\u4E86\u4E5F\u515C\u5E95\uFF1A\u6536\u5DE5\u65F6\u7F13\u51B2\u975E\u7A7A\uFF0C\u7CFB\u7EDF\u6309\u4E0A\u9762\u89C4\u5219\u66FF\u4F60\u63D0\u4EA4\uFF09\u3002
 - \u4E00\u4EFD\u63D0\u6848\uFF1D**\u4E00\u4E2A\u8FDE\u8D2F\u4E8B\u52A1**\uFF1A\u5408\u5E76\u91CD\u590D\u5C31\u628A"\`edit\` \u6269\u4FDD\u7559\u4EF6 brief + \u6539\u8FDE + \`seal\` \u5E9F\u5F03\u4EF6"\u4E00\u8D77\u6682\u5B58\u518D apply\u3002
@@ -35599,10 +36053,10 @@ var init_worker = __esm({
 - \u63D0\u4EA4\u540E**\u5C31\u6536\u5DE5**\uFF1B\u8F6C\u4EBA\u5BA1\u5C31\u5230\u6B64\u4E3A\u6B62\u2014\u2014\u4EBA\u786E\u8BA4\u540E\u56FE\u4F1A\u53D8\uFF0C\u9700\u8981\u65F6\u7CFB\u7EDF\u6309**\u65B0\u72B6\u6001**\u91CD\u65B0\u5524\u8D77\u4F60\uFF08\u4E0D\u5FC5\u7B49\u3001\u4E0D\u5FC5\u8BB0\u540E\u7EED\u3001\u4ECE\u56FE\u91CD\u5224\uFF09\u3002**\u8282\u70B9\u4E0A\u6709"\u88AB\u9A73\u56DE"\u7559\u75D5\u5C31\u522B\u91CD\u590D\u63D0\u3002**
 
 \u3010\u8BFB\u56FE\u3011\uFF08\u90FD\u8BFB**\u771F\u56FE**\uFF0C\u4E0E\u522B\u7684 agent \u540C\u8BED\u4E49\uFF0C\u4E0D\u53D7\u4F60\u6682\u5B58\u5F71\u54CD\uFF09
-- \`oasis graph\` / \`oasis ls\` \u2014\u2014 \u5168\u56FE\u4F9D\u8D56\u8FB9 / \u5168\u4EA7\u7269\u5217\u8868\u3002
-- \`oasis status <id>\` \u2014\u2014 \u5355\u4EA7\u7269\u72B6\u6001\uFF08lifecycle/head/\u4F9D\u8D56/\u963B\u585E/\u672A\u51B3\u6279\u6CE8\uFF09\u3002
-- \`oasis content <id> [path]\` \u2014\u2014 \u5355\u4EA7\u7269\u6B63\u6587\uFF08\u5224\u65AD\u4E24\u4E2A\u662F\u5426\u8BED\u4E49\u91CD\u590D\u65F6\u7528\uFF09\u3002
-- \`oasis session-log <id|runId> [--n N]\` \u2014\u2014 \u770B\u67D0\u8282\u70B9\u5728\u8DD1\u7684 session \u6700\u65B0\u8F93\u51FA + "\u8DDD\u4E0A\u6B21\u4E8B\u4EF6 X \u5206\u949F"\uFF0C\u5224\u5B83\u662F**\u5728\u60F3**\u8FD8\u662F**\u5361\u6B7B**\uFF08\u6B8B\u5DEE\u4E8C\u6B21\u5F52\u56E0\u3001\u6216\u6000\u7591\u8FD0\u884C\u65F6\u5361\u6B7B\u65F6\u7528\uFF1A>10min\u2248\u5361\uFF0C1\u20132min \u518D\u7B49\uFF09\u3002`;
+- \`oasis graph\` \u2014\u2014 \u5168\u56FE\u4F9D\u8D56\u8FB9\uFF08\u8C01\u8FDE\u8C01\uFF09\uFF1B\`oasis ls\` \u2014\u2014 \u5168\u4EA7\u7269\u5217\u8868\uFF08id / type / owner / head / \u961F\u5217 / \u72B6\u6001\u6807\uFF09\u3002\u5148\u7528\u5B83\u4EEC\u5EFA\u7ACB\u5168\u5C40\u56FE\u666F\u3002
+- \`oasis status <id>\` \u2014\u2014 \u5355\u4EA7\u7269\u7684\u72B6\u6001\u7D22\u5F15\uFF1Alifecycle\u3001\u5F53\u524D head\u3001\u4F9D\u8D56\u3001\u662F\u5426\u963B\u585E\u3001\u672A\u51B3\u6279\u6CE8\uFF08**\u4E0D\u542B\u6B63\u6587**\uFF0C\u5148\u770B\u8FD9\u4E2A\uFF09\u3002\`<id>\` = \u8981\u770B\u7684\u4EA7\u7269\u3002
+- \`oasis content <id> [path]\` \u2014\u2014 \u53D6\u5355\u4EA7\u7269**\u5B9E\u9645\u6B63\u6587**\uFF08\u5224\u65AD\u4E24\u8282\u70B9\u662F\u5426\u8BED\u4E49\u91CD\u590D\u3001\u8981\u4E0D\u8981\u5408\u5E76\u65F6\u8BFB\uFF09\u3002\`<id>\` = \u4EA7\u7269\uFF1B\u591A\u6587\u4EF6\u4EA7\u7269**\u7701\u7565 \`path\`** \u5148\u770B\u6587\u4EF6\u6E05\u5355\u3001\u518D\u7ED9 \`path\` \u53D6\u5355\u4E2A\u6587\u4EF6\u3002
+- \`oasis session-log <id|runId> [--n N]\` \u2014\u2014 \u770B\u67D0\u8282\u70B9 / \u67D0\u4F1A\u8BDD\u7684**\u8FD0\u884C\u65F6\u8F93\u51FA**\uFF08agent \u6B64\u523B\u5728\u8BF4 / \u5E72\u4EC0\u4E48\uFF0C\u975E\u5185\u6838\u4E8B\u5B9E\uFF09+ "\u8DDD\u4E0A\u6B21\u4E8B\u4EF6 X \u5206\u949F"\uFF0C\u5224\u5B83\u5728**\u60F3**\u8FD8\u662F**\u5361\u6B7B**\uFF08>10min\u2248\u5361\uFF09\u3002\u4F20 \`<artifactId>\` \u4F1A\u5217\u51FA\u8BE5\u8282\u70B9\u7684**\u5168\u90E8\u4F1A\u8BDD**\u3001\u518D\u5C55\u5F00\u6700\u8FD1\u5728\u8DD1\u7684\u90A3\u4E2A\uFF1B\u4F20\u5177\u4F53 \`<runId>\` \u76F4\u63A5\u770B\u90A3\u4E00\u4E2A\uFF1B\`--n N\` = \u770B\u6700\u65B0 N \u6761\u4E8B\u4EF6\uFF08\u9ED8\u8BA4 20\uFF09\u3002\u6B8B\u5DEE\u4E8C\u6B21\u5F52\u56E0\u3001\u6216\u60F3\u786E\u8BA4\u4E0A\u6E38\u662F\u5426\u771F\u5728\u88AB\u5E72\u65F6\u7528\u3002`;
     CoordinatorWorker = class {
       constructor(deps) {
         this.deps = deps;
@@ -35751,15 +36205,6 @@ var init_worker = __esm({
           gaps.length > 0 ? `\u672A\u89E3\u6790gap\xD7${gaps.length}` : null
         ].filter(Boolean).join("\u3001");
       }
-      graphDigest(exclude) {
-        const lines = [];
-        for (const a of this.deps.kernel.model.artifacts.values()) {
-          if (a.id === exclude) continue;
-          const deps = a.inputs.length > 0 ? `\uFF1B\u4F9D\u8D56 [${a.inputs.map((e) => e.to).join(", ")}]` : "";
-          lines.push(`- ${a.id}\uFF08type=${a.type}\uFF5C${this.nodeState(a.id)}\uFF09${a.description ? `\uFF1A${a.description}` : ""}${deps}`);
-        }
-        return lines.length > 0 ? lines.join("\n") : "\uFF08\u56FE\u91CC\u6682\u65E0\u5176\u5B83\u4EA7\u7269\uFF09";
-      }
       /** 结构摘要（reconcile 去重用）：id / type / 是否已交付 / title+brief / 依赖——不含进度态（去重只看语义）。 */
       structDigest(exclude) {
         const m2 = this.deps.kernel.model;
@@ -35804,22 +36249,51 @@ var init_worker = __esm({
        * 真死锁且某 part 卡住整条集成 → 起草 cancelPart（C 类，人确认）；能解就解；拿不准 / 非图病 → 别动、交人。
        */
       async reconcileDeadlock(p2) {
-        const node = this.deps.kernel.model.artifacts.get(p2.id);
+        const m2 = this.deps.kernel.model;
+        const node = m2.artifacts.get(p2.id);
         const mins = Math.round(p2.staleMs / 6e4);
-        const parts = node?.parts?.map((x2) => x2.name).join("\u3001") || "\uFF08\u65E0\u5206\u89E3\uFF09";
         const brief = node?.title ?? node?.description ?? "";
+        const now = Date.now();
         const caseFile = p2.diag.causes.length ? p2.diag.causes.map((c) => `> - [${c.category}\uFF5C\u6765\u6E90 ${c.source}\uFF5C\u5EFA\u8BAE\u5904\u7F6E ${c.handler}] ${c.detail}`).join("\n") : "> \uFF08\u673A\u68B0\u7A77\u4E3E\u65E0\u660E\u786E\u75C5\u56E0\u2014\u2014\u6B8B\u5DEE\uFF0C\u9700\u4F60\u4E8C\u6B21\u5F52\u56E0\uFF09";
+        const sessionsLine = (id) => {
+          const ss = this.deps.sessionsOf?.(id) ?? [];
+          if (ss.length === 0) return "\u65E0\u5728\u8DD1\u4F1A\u8BDD";
+          return `${ss.length} \u4E2A \u2014\u2014 ${ss.map((s2) => `${s2.action} run ${s2.runId}\uFF08\u5DF2\u8DD1 ${Math.round((now - Date.parse(s2.startedAt)) / 6e4)} \u5206\u949F\uFF09`).join("\u3001")}`;
+        };
+        const nodeBlock = (id) => {
+          const a = m2.artifacts.get(id);
+          if (!a) return `- **${id}**\uFF08\u4E0D\u5B58\u5728 / \u5DF2\u88AB\u6E05\u7406\uFF09`;
+          const head = a.currentRev ? `head@${String(a.currentRev).slice(9, 17)}` : "\u65E0head";
+          const blk = blockedOf(m2, id);
+          const status = [lifecycleOf(m2, id), head, blk.blocked ? `\u963B\u585E[${blk.reasons.join("\uFF1B")}]` : null].filter(Boolean).join("\uFF5C");
+          const label = a.title ?? a.description ?? "\uFF08\u65E0 brief\uFF09";
+          return [
+            `- **${id}**\uFF08type=${a.type}\uFF1A${label}\uFF09`,
+            `  - \u72B6\u6001\uFF1A${status}${a.parts?.length ? `\uFF5C\u90E8\u4EF6 [${a.parts.map((x2) => x2.name).join("\u3001")}]` : ""}`,
+            `  - \u5728\u8DD1\u4F1A\u8BDD\uFF1A${sessionsLine(id)}`
+          ].join("\n");
+        };
+        const upstreams = (node?.inputs ?? []).map((e) => e.to);
+        const downstreams = consumersOf(m2, p2.id).map((a) => a.id);
         const task = [
           `## \u672C\u6B21\u4E3A\u4EC0\u4E48\u5524\u8D77\u4F60`,
-          `\u8282\u70B9 **${p2.id}**${brief ? `\uFF08${brief}\uFF09` : ""} \u5DF2\u963B\u585E\u7EA6 **${mins} \u5206\u949F**\u6CA1\u8FDB\u5C55\u3002\u7CFB\u7EDF\u5DF2\u673A\u68B0\u8BCA\u65AD\u3001\u786E\u8BA4**\u8FD9\u662F\u56FE\u75C5\u6216\u673A\u68B0\u5B9A\u4F4D\u4E0D\u5230\u7684\u6B8B\u5DEE**\uFF08\u8D44\u6E90 / \u4EBA / \u8FD0\u884C\u65F6\u7C7B\u75C5\u56E0\u5DF2\u53E6\u884C\u8DEF\u7531\uFF0C\u4E0D\u52B3\u4F60\uFF09\u3002`,
+          `\u8282\u70B9 **${p2.id}**${brief ? `\uFF08${brief}\uFF09` : ""} \u5DF2\u963B\u585E\u7EA6 **${mins} \u5206\u949F**\u6CA1\u8FDB\u5C55\u3002\u7CFB\u7EDF\u5DF2\u673A\u68B0\u8BCA\u65AD\u3001\u786E\u8BA4**\u8FD9\u662F\u56FE\u75C5\u6216\u673A\u68B0\u5B9A\u4F4D\u4E0D\u5230\u7684\u6B8B\u5DEE**\uFF08\u8D44\u6E90 / \u4EBA / \u8FD0\u884C\u65F6\u7C7B\u75C5\u56E0\u5DF2\u6392\u9664\uFF09\u3002`,
           ``,
           `## \u75C5\u5386\uFF08\u673A\u68B0\u8BCA\u65AD\uFF1B\u5148\u8BFB\u8FD9\u4E2A\uFF09`,
           caseFile,
-          `\u5148\u8FA8\u300C\u771F\u6B7B\u9501 / \u8BE5\u6539\u56FE\u300D\u8FD8\u662F\u300C\u53EA\u662F\u5728\u7B49\u6B63\u5728\u4EA7\u7684\u4E0A\u6E38\u300D\u2014\u2014**\u5BBD\u677E\u544A\u8B66\uFF0C\u522B\u8BEF\u6740**\u3002`,
+          `\u5148\u8FA8\u662F**\u771F\u6B7B\u9501 / \u8BE5\u6539\u56FE**\uFF0C\u8FD8\u662F**\u53EA\u662F\u5728\u7B49\u4E00\u4E2A\u5065\u5EB7\u5728\u4EA7\u7684\u4E0A\u6E38**\u2014\u2014**\u786E\u662F\u771F\u6B7B\u9501\u5C31\u679C\u65AD\u6539\u56FE\uFF08\u8FD9\u6B63\u662F\u8981\u4F60\u505A\u7684\uFF09\uFF1B\u53EA\u6709\u5065\u5EB7\u7B49\u5F85\u624D\u522B\u52A8**\u3002`,
+          ``,
+          `## \u672C\u8282\u70B9 + \u90BB\u57DF`,
+          `> \u5B57\u6BB5\u8BFB\u6CD5\uFF1Alifecycle\uFF08active=\u8FDB\u884C\u4E2D / sealed:frozen=\u51BB\u7ED3\u3001\u4EA7\u4E0D\u51FA\u65B0\u91CC\u7A0B\u7891 / sealed:cancelled=\u5DF2\u5E9F\u5F03 / sealed:accepted=\u5DF2\u5B9A\u7A3F\u7EC8\u6001\uFF09\uFF1Bhead=\u5F53\u524D\u5B9A\u7A3F\u7248\u672C\uFF08\u65E0head=\u8FD8\u6CA1\u4EA7\u51FA\u8FC7\u4EFB\u4F55\u91CC\u7A0B\u7891\uFF09\uFF1B\u963B\u585E[\u2026]=\u5361\u5728\u4EC0\u4E48\u4E0A\uFF1B\u5728\u8DD1\u4F1A\u8BDD=\u6B64\u523B\u6709\u51E0\u4E2A agent \u4F1A\u8BDD\u5728\u5E72\u5B83\u3001\u5404\u8DD1\u591A\u4E45\u3002`,
+          ``,
+          `### \u672C\u8282\u70B9`,
+          nodeBlock(p2.id),
           ``,
-          `## \u672C\u8282\u70B9 + \u90BB\u57DF\u72B6\u6001\uFF08\u636E\u6B64\u5224\u4F1A\u81EA\u5DF1\u597D vs \u771F\u5361\u6B7B\uFF09`,
-          `- **${p2.id}**\uFF08\u672C\u8282\u70B9\uFF0C\u90E8\u4EF6\uFF1A${parts}\uFF09\uFF1A${this.nodeState(p2.id)}`,
-          this.graphDigest(p2.id),
+          `### \u4E0A\u6E38\uFF08\u672C\u8282\u70B9\u4F9D\u8D56\u8C01\u2014\u2014\u5B83\u4EEC\u6CA1\u5C31\u7EEA\uFF0C\u672C\u8282\u70B9\u52A8\u4E0D\u4E86\uFF09`,
+          upstreams.length ? upstreams.map(nodeBlock).join("\n") : "- \uFF08\u65E0\u4E0A\u6E38\u4F9D\u8D56\uFF09",
+          ``,
+          `### \u4E0B\u6E38\uFF08\u8C01\u4F9D\u8D56\u672C\u8282\u70B9\u2014\u2014\u672C\u8282\u70B9\u5361\uFF0C\u5B83\u4EEC\u8DDF\u7740\u5361\uFF09`,
+          downstreams.length ? downstreams.map(nodeBlock).join("\n") : "- \uFF08\u65E0\u4E0B\u6E38\u6D88\u8D39\u8005\uFF09",
           ``,
           `## \u4F60\u7684\u52A8\u4F5C\uFF08\u6682\u5B58 \u2192 apply\uFF09`,
           `- \u5728**\u7B49\u4E00\u4E2A active\u3001\u6709 head/\u5728\u4EA7\u7684\u4E0A\u6E38** \u2192 **\u4E0D\u662F\u6B7B\u9501\uFF0C\u522B\u52A8**\uFF0C\u6536\u5DE5\uFF08\u53EF \`oasis status <\u4E0A\u6E38>\` \u786E\u8BA4\uFF09\u3002`,
@@ -35907,6 +36381,7 @@ var init_src4 = __esm({
     init_resolve();
     init_worker();
     init_drafts();
+    init_workorder_drafts();
   }
 });
 
@@ -37478,11 +37953,11 @@ var require_pg_connection_string = __commonJS({
         config2.client_encoding = result.searchParams.get("encoding");
         return config2;
       }
-      const hostname3 = dummyHost ? "" : result.hostname;
+      const hostname5 = dummyHost ? "" : result.hostname;
       if (!config2.host) {
-        config2.host = decodeURIComponent(hostname3);
-      } else if (hostname3 && /^%2f/i.test(hostname3)) {
-        result.pathname = hostname3 + result.pathname;
+        config2.host = decodeURIComponent(hostname5);
+      } else if (hostname5 && /^%2f/i.test(hostname5)) {
+        result.pathname = hostname5 + result.pathname;
       }
       if (!config2.port) {
         config2.port = result.port;
@@ -41092,7 +41567,6 @@ var init_trajectory = __esm({
 });
 
 // src/index.ts
-var import_node_crypto22 = require("node:crypto");
 var fs15 = __toESM(require("node:fs"));
 var os8 = __toESM(require("node:os"));
 var path13 = __toESM(require("node:path"));
@@ -41874,6 +42348,9 @@ var CodexAdapter = class {
       "-C",
       dir,
       ...this.opts.model ? ["--model", this.opts.model] : [],
+      // 打开 reasoning 摘要通道：默认 auto，让 codex 产出 reasoning item（→ thought → 前端思考块）。
+      ...this.opts.reasoningSummary !== "none" ? ["-c", `model_reasoning_summary=${this.opts.reasoningSummary ?? "auto"}`] : [],
+      ...this.opts.reasoningEffort ? ["-c", `model_reasoning_effort=${this.opts.reasoningEffort}`] : [],
       ...this.opts.extraArgs ?? [],
       prompt
     ];
@@ -43907,6 +44384,10 @@ var PostgresArtifactStateStore = class _PostgresArtifactStateStore {
         work_order_id text PRIMARY KEY,
         project_id    text NOT NULL
       )`);
+    await pool.query(`
+      CREATE TABLE IF NOT EXISTS "${s2}".workspace_dispatch_hold (
+        work_order_id text PRIMARY KEY
+      )`);
     return new _PostgresArtifactStateStore(pool, schema);
   }
   /* ---------- artifacts ---------- */
@@ -44180,14 +44661,29 @@ var PostgresArtifactStateStore = class _PostgresArtifactStateStore {
     const r = await this.pool.query(`SELECT * FROM ${this.s}.workspace_bindings`);
     return r.rows.map(rowToWorkspaceBinding);
   }
+  async setWorkspaceDispatchHold(workOrderId, held) {
+    if (held) {
+      await this.pool.query(
+        `INSERT INTO ${this.s}.workspace_dispatch_hold (work_order_id) VALUES ($1) ON CONFLICT DO NOTHING`,
+        [workOrderId]
+      );
+    } else {
+      await this.pool.query(`DELETE FROM ${this.s}.workspace_dispatch_hold WHERE work_order_id = $1`, [workOrderId]);
+    }
+  }
+  async listWorkspaceDispatchHeld() {
+    const r = await this.pool.query(`SELECT work_order_id FROM ${this.s}.workspace_dispatch_hold`);
+    return r.rows.map((row) => String(row.work_order_id));
+  }
   async listAll() {
-    const [artifacts, revisions, events, annotations, outputs, bindings] = await Promise.all([
+    const [artifacts, revisions, events, annotations, outputs, bindings, held] = await Promise.all([
       this.pool.query(`SELECT * FROM ${this.s}.artifacts`),
       this.pool.query(`SELECT * FROM ${this.s}.artifact_revisions`),
       this.pool.query(`SELECT * FROM ${this.s}.artifact_events ORDER BY seq`),
       this.pool.query(`SELECT * FROM ${this.s}.artifact_annotations`),
       this.pool.query(`SELECT * FROM ${this.s}.node_outputs`),
-      this.pool.query(`SELECT * FROM ${this.s}.workspace_bindings`)
+      this.pool.query(`SELECT * FROM ${this.s}.workspace_bindings`),
+      this.pool.query(`SELECT work_order_id FROM ${this.s}.workspace_dispatch_hold`)
     ]);
     const nodeOutputs = [];
     for (const row of outputs.rows) {
@@ -44203,7 +44699,8 @@ var PostgresArtifactStateStore = class _PostgresArtifactStateStore {
       events: events.rows.map(rowToEvent),
       annotations: annotations.rows.map(rowToAnnotation),
       nodeOutputs,
-      workspaceBindings: bindings.rows.map(rowToWorkspaceBinding)
+      workspaceBindings: bindings.rows.map(rowToWorkspaceBinding),
+      workspaceDispatchHeld: held.rows.map((row) => String(row.work_order_id))
     };
   }
   /**
@@ -45249,13 +45746,6 @@ var PostgresChatSessionStore = class _PostgresChatSessionStore {
         created_at  timestamptz NOT NULL
       )`);
     await pool.query(`CREATE INDEX IF NOT EXISTS chat_messages_session_idx ON "${s2}".chat_messages (session_id, seq)`);
-    await pool.query(`
-      CREATE TABLE IF NOT EXISTS "${s2}".chat_session_work_orders (
-        session_id    text NOT NULL,
-        work_order_id text NOT NULL,
-        linked_at     timestamptz NOT NULL DEFAULT now(),
-        PRIMARY KEY (session_id, work_order_id)
-      )`);
     return new _PostgresChatSessionStore(pool, schema);
   }
   async createSession(s2) {
@@ -45319,19 +45809,6 @@ var PostgresChatSessionStore = class _PostgresChatSessionStore {
     const rows = r.rows.map(rowToMessage);
     return limit ? rows.reverse() : rows;
   }
-  async linkWorkOrder(sessionId, workOrderId) {
-    await this.pool.query(
-      `INSERT INTO ${this.s}.chat_session_work_orders (session_id, work_order_id) VALUES ($1,$2) ON CONFLICT DO NOTHING`,
-      [sessionId, workOrderId]
-    );
-  }
-  async listWorkOrdersForSession(sessionId) {
-    const r = await this.pool.query(
-      `SELECT work_order_id FROM ${this.s}.chat_session_work_orders WHERE session_id = $1 ORDER BY linked_at`,
-      [sessionId]
-    );
-    return r.rows.map((row) => row.work_order_id);
-  }
 };
 var rowToSession = (row) => ({
   id: row.id,
@@ -45389,10 +45866,6 @@ var PostgresNodeStore = class _PostgresNodeStore {
         last_seen_at timestamptz NOT NULL
       )`);
     await pool.query(`CREATE INDEX IF NOT EXISTS node_runtimes_node_idx ON "${s2}".node_runtimes (node_id)`);
-    await pool.query(`
-      CREATE TABLE IF NOT EXISTS "${s2}".deleted_runtime_ids (
-        id text PRIMARY KEY
-      )`);
     return new _PostgresNodeStore(pool, schema);
   }
   async upsertNode(n) {
@@ -45409,8 +45882,6 @@ var PostgresNodeStore = class _PostgresNodeStore {
     );
   }
   async upsertRuntime(r) {
-    const deleted = await this.pool.query(`SELECT 1 FROM ${this.s}.deleted_runtime_ids WHERE id=$1`, [r.id]);
-    if (deleted.rowCount) return;
     await this.pool.query(
       `INSERT INTO ${this.s}.node_runtimes (id,node_id,kind,hostname,runtime_binary,version,status,last_seen_at)
        VALUES ($1,$2,$3,$4,$5,$6,$7,$8)
@@ -45423,8 +45894,18 @@ var PostgresNodeStore = class _PostgresNodeStore {
       [r.id, r.nodeId, r.kind, r.hostname, r.binary ?? null, r.version ?? null, r.status, r.lastSeenAt]
     );
   }
+  /** Insert only if absent (ON CONFLICT DO NOTHING). Returns true if a row was inserted. */
+  async addRuntimeIfAbsent(r) {
+    const res = await this.pool.query(
+      `INSERT INTO ${this.s}.node_runtimes (id,node_id,kind,hostname,runtime_binary,version,status,last_seen_at)
+       VALUES ($1,$2,$3,$4,$5,$6,$7,$8)
+       ON CONFLICT (id) DO NOTHING`,
+      [r.id, r.nodeId, r.kind, r.hostname, r.binary ?? null, r.version ?? null, r.status, r.lastSeenAt]
+    );
+    return (res.rowCount ?? 0) > 0;
+  }
   async setNodeOnline(id, online) {
-    await this.pool.query(`UPDATE ${this.s}.nodes SET status=$2,last_seen_at=$3 WHERE id=$1`, [id, online ? "online" : "offline", (/* @__PURE__ */ new Date()).toISOString()]);
+    await this.pool.query(`UPDATE ${this.s}.nodes SET status=$2,last_seen_at=$3 WHERE id=$1 AND status <> 'deleted'`, [id, online ? "online" : "offline", (/* @__PURE__ */ new Date()).toISOString()]);
   }
   async setNodeRuntimesOnline(nodeId, online) {
     await this.pool.query(`UPDATE ${this.s}.node_runtimes SET status=$2,last_seen_at=$3 WHERE node_id=$1`, [nodeId, online ? "online" : "offline", (/* @__PURE__ */ new Date()).toISOString()]);
@@ -45437,7 +45918,7 @@ var PostgresNodeStore = class _PostgresNodeStore {
     return r.rows[0] ? rowToNode(r.rows[0]) : null;
   }
   async listNodes() {
-    const r = await this.pool.query(`SELECT * FROM ${this.s}.nodes ORDER BY enrolled_at ASC`);
+    const r = await this.pool.query(`SELECT * FROM ${this.s}.nodes WHERE status <> 'deleted' ORDER BY enrolled_at ASC`);
     return r.rows.map(rowToNode);
   }
   async listRuntimes(nodeId) {
@@ -45446,24 +45927,24 @@ var PostgresNodeStore = class _PostgresNodeStore {
   }
   async deleteNode(id) {
     await this.pool.query(`DELETE FROM ${this.s}.nodes WHERE id=$1`, [id]);
-    await this.pool.query(`DELETE FROM ${this.s}.deleted_runtime_ids WHERE id LIKE $1`, [`runtime:${id}:%`]);
+  }
+  /** Soft-delete: mark node as deleted (excluded from normal API, kept for audit) and drop its runtime rows. */
+  async softDeleteNode(id) {
+    await this.pool.query(`UPDATE ${this.s}.nodes SET status='deleted',last_seen_at=$2 WHERE id=$1`, [id, (/* @__PURE__ */ new Date()).toISOString()]);
+    await this.pool.query(`DELETE FROM ${this.s}.node_runtimes WHERE node_id=$1`, [id]);
   }
   async deleteRuntime(id) {
-    await this.pool.query(`INSERT INTO ${this.s}.deleted_runtime_ids (id) VALUES ($1) ON CONFLICT DO NOTHING`, [id]);
     const existing = await this.pool.query(`SELECT node_id FROM ${this.s}.node_runtimes WHERE id=$1`, [id]);
     await this.pool.query(`DELETE FROM ${this.s}.node_runtimes WHERE id=$1`, [id]);
     if (!existing.rows[0]) return { nodeDeleted: false };
     const nodeId = existing.rows[0].node_id;
     const remaining = await this.pool.query(`SELECT 1 FROM ${this.s}.node_runtimes WHERE node_id=$1 LIMIT 1`, [nodeId]);
     if (!remaining.rowCount) {
-      await this.deleteNode(nodeId);
+      await this.softDeleteNode(nodeId);
       return { nodeDeleted: true };
     }
     return { nodeDeleted: false };
   }
-  async clearDeletedRuntimesForNode(nodeId) {
-    await this.pool.query(`DELETE FROM ${this.s}.deleted_runtime_ids WHERE id LIKE $1`, [`runtime:${nodeId}:%`]);
-  }
 };
 var PostgresNodeTokenStore = class _PostgresNodeTokenStore {
   constructor(pool, schema) {
@@ -45521,6 +46002,7 @@ var rowToRuntime = (row) => ({
 // ../cli/src/serve.ts
 init_src3();
 init_trajectory();
+var DEFAULT_CHAT_SKILLS = ["build-workorder"];
 var oasisWrapperCache;
 function oasisWrapperScript() {
   if (oasisWrapperCache && fs13.existsSync(oasisWrapperCache)) return oasisWrapperCache;
@@ -45634,6 +46116,7 @@ async function startServe(opts) {
   if ((await typeStore.list()).length === 0) for (const d of schema) await typeStore.put(d);
   {
     const live = await typeStore.list();
+    upgradeDefaultFieldDefs(live);
     schema.length = 0;
     schema.push(...live);
   }
@@ -45800,6 +46283,7 @@ async function startServe(opts) {
     return auth.sessionAccountId(headers);
   };
   const interventionDrafts = new InterventionDraftStore();
+  const workorderDrafts = new WorkorderDraftStore();
   const journalFile = path11.join(opts.dir, "dispatch-journal.ndjson");
   const journalRing = [];
   if (fs13.existsSync(journalFile)) {
@@ -45880,6 +46364,15 @@ async function startServe(opts) {
       if (actorCtx?.config?.prompt) {
         Object.assign(files, splitIdentityFiles3(actorCtx.config.prompt));
       }
+      Object.assign(files, await materializeSkillFiles({
+        service: actors.service,
+        blobs: assets,
+        actorId: planner.id,
+        runtimeKind: binding.runtimeKind
+      }).catch((err) => {
+        console.warn(`[planner] skill materialize failed for ${planner.id}: ${String(err)}`);
+        return {};
+      }));
       const handle = await chatRemoteAdapter.spawn({
         actor: planner.id,
         actorToken: issuer.issue(planner.id),
@@ -45927,10 +46420,10 @@ async function startServe(opts) {
       }),
       trace.register,
       automations.register,
-      ...chatSessionStore ? [createChatSessionsDomain({ store: chatSessionStore, registry: registryStore, kernel, artifactState: artifactStateStore })] : []
+      ...chatSessionStore ? [createChatSessionsDomain({ store: chatSessionStore, registry: registryStore })] : []
     ],
     drafts: interventionDrafts,
-    ...chatSessionStore ? { chatSession: chatSessionStore } : {},
+    workorderDrafts,
     // 暴露注册的 artifact 类型，给前端「发起工单」动态拉取根产物可选类型——schema.json 增改即自动扩展，
     // 前端不再写死枚举。走通用 /api/view（generic data），非域路由契约，不进 gen:api。
     views: {
@@ -45949,6 +46442,7 @@ async function startServe(opts) {
     },
     resolveActorEnv: async (actorId) => (await buildActorProvision(actors.service, actorId)).env,
     resolveActorContext: (actorId) => buildActorContext(actors.service, actorId),
+    materializeSkills: (actorId, runtimeKind) => materializeSkillFiles({ service: actors.service, blobs: assets, actorId, runtimeKind }),
     dispatchProduce: async ({ artifactId, actorId, part }) => {
       if (!dispatcher) {
         throw new ApiError(503, "DISPATCH_NOT_ENABLED", "\u670D\u52A1\u7AEF\u672A\u542F\u7528 --dispatch true\uFF0C\u4E0D\u80FD\u62C9\u8D77\u771F\u5B9E\u667A\u80FD\u4F53\u4FEE\u6539");
@@ -45959,7 +46453,7 @@ async function startServe(opts) {
         ...part !== void 0 ? { part } : {}
       });
     },
-    dispatchChat: async ({ actorId, message, sessionId, chatSessionId }) => {
+    dispatchChat: async ({ actorId, message, sessionId }) => {
       const binding = await actors.service.resolveBinding()(actorId);
       if (!binding) {
         throw new ApiError(409, "ACTOR_BINDING_MISSING", `\u6570\u5B57\u5458\u5DE5 ${actorId} \u6CA1\u6709 active runtime \u7ED1\u5B9A`);
@@ -46049,6 +46543,16 @@ async function startServe(opts) {
       if (actorCtx?.config?.prompt) {
         Object.assign(files, splitIdentityFiles3(actorCtx.config.prompt));
       }
+      Object.assign(files, await materializeSkillFiles({
+        service: actors.service,
+        blobs: assets,
+        actorId,
+        runtimeKind: binding.runtimeKind,
+        extraSkillIds: DEFAULT_CHAT_SKILLS
+      }).catch((err) => {
+        console.warn(`[chat] skill materialize failed for ${actorId}: ${String(err)}`);
+        return {};
+      }));
       const handle = await chatRemoteAdapter.spawn({
         actor: actorId,
         actorToken: issuer.issue(actorId),
@@ -46060,7 +46564,7 @@ async function startServe(opts) {
         server: { url: localUrl },
         binding,
         limits: { wallClockMs: 10 * 6e4 },
-        env: { ...provision.env, ...chatSessionId ? { OASIS_CHAT_SESSION_ID: chatSessionId } : {} },
+        env: provision.env,
         wrapperPaths: provision.wrapperPaths
       });
       const buffered = [];
@@ -46183,11 +46687,12 @@ async function startServe(opts) {
       resolveBinding: actors.service.resolveBinding(),
       provision: (actorId) => buildActorProvision(actors.service, actorId),
       resolveActorContext: (actorId) => buildActorContext(actors.service, actorId),
+      materializeSkills: (actorId, runtimeKind) => materializeSkillFiles({ service: actors.service, blobs: assets, actorId, runtimeKind }),
       schema: new Map(schema.map((d2) => [d2.name, d2])),
       resolveCodeRepo,
       // §4/C：异步从权威源（store）解析；dispatcher 装配前 await
-      // #2 派单开关：工单"待派发"（brief 挂未 resolve 的 OASIS_DISPATCH_HOLD 批注）时不派其活。
-      resolveDispatchHold: (ws) => workspaceDispatchPaused(kernel.model, [...kernel.model.artifacts.values()].filter((a) => a.workspace === ws)),
+      // #2 派单开关：工单"待派发"（控制面旁存标 held）时不派其活。held 集通常空、表极小，每次查可接受。
+      resolveDispatchHold: async (ws) => (await artifactStateStore.listWorkspaceDispatchHeld()).includes(ws),
       tokenFor: (actor) => issuer.issue(actor),
       journal,
       // TrajectoryEvent 是唯一事件模型；trace 旁账与 M7 蒸馏库并行消费同一流（§16.D 收口）。
@@ -46343,6 +46848,8 @@ async function startServe(opts) {
       // 阻塞诊断（proposal D1/D3）：派发器运行时信号（queued/fused/backoff/hasInFlight）注入诊断，
       // 让协调者把"资源 / 运行时"病因和"图病"分开——资源排队的节点不会被误唤去砍流程。
       runtimeSignals: (id) => dispatcher?.runtimeSignalsFor(id) ?? { hasInFlight: false },
+      // 病历里展示节点的"在跑会话情况"（runId + 跑了多久）：从派发器在途会话按 artifactId 过滤。
+      sessionsOf: (id) => (dispatcher?.inFlightSessions() ?? []).filter((s2) => s2.artifactId === id).map((s2) => ({ runId: s2.sessionId, action: s2.action, startedAt: s2.startedAt })),
       log: (m2) => console.log(m2)
     });
     coordTimer = setInterval(() => {
@@ -46473,6 +46980,7 @@ var DaemonWsClient = class {
     ws.on("open", () => {
       log2("[node-cli]", `connected  id=${this.daemonId}`);
       this.send({ type: "hello", daemonId: this.daemonId, meta: this.buildMeta() });
+      this.reportRuntimes = false;
       this.pingTimer = setInterval(() => this.send({ type: "pong" }), PING_INTERVAL_MS);
     });
     ws.on("message", (raw) => {
@@ -46636,7 +47144,7 @@ async function startNode(opts) {
       claude
     )
   );
-  const client = new DaemonWsClient(opts.serverUrl, opts.nodeId, sessions, adapters, opts.token, runtimes, opts.nodeName, opts.reportRuntimes ?? true);
+  const client = new DaemonWsClient(opts.serverUrl, opts.nodeId, sessions, adapters, opts.token, runtimes, opts.nodeName, opts.reportRuntimes ?? false);
   console.log(`[oasis node] ${opts.nodeId} \u2192 ${opts.serverUrl}`);
   client.start();
   await new Promise((resolve3) => {
@@ -46672,8 +47180,9 @@ 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> [--title <\u77ED\u540D>] [--brief <\u89C4\u683C>] [--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>] [--<\u5B57\u6BB5> <\u503C>] [--set-json <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
+            # --<\u5B57\u6BB5> <\u503C>\uFF1A\u8BE5\u7C7B\u578B\u3010\u52A8\u6001\u58F0\u660E\u3011\u7684\u81EA\u5B9A\u4E49\u5B57\u6BB5\uFF08\u4E0D\u662F\u56FA\u5B9A\u6E05\u5355\uFF09\u2014\u2014\u7528 "oasis artifact-types show <type>" \u770B\u53EF\u586B\u5B57\u6BB5\uFF1Bstring[]/\u6279\u91CF\u7528 --set-json\uFF1B\u7F3A\u5FC5\u586B\u4F1A\u62A5\u9519\u5217\u51FA
   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
             # --git-commit\uFF1AModel Y \u4EE3\u7801-git project\u2014\u2014\u5185\u5BB9\u6D3B\u5728 git\uFF0C\u53EA external-pin \u90A3\u4E2A commit sha\uFF08\u5148 push \u4F60\u7684 feat \u5206\u652F\uFF09\u3002
@@ -46705,8 +47214,12 @@ var USAGE = `oasis \u2014\u2014 artifact-centric \u534F\u4F5C\u5185\u6838 CLI\uF
   log <artifactId>                                 # \u8BE5\u4EA7\u7269\u7684**\u64CD\u4F5C\u65E5\u5FD7**\uFF1A\u5DF2\u53D1\u751F\u7684\u5185\u6838\u4E8B\u5B9E\uFF08spawn/propose/merge/conclude\u2026\uFF09\uFF0C\u4ECE oplog \u8BFB
   session-log <runId|artifactId> [--n 20]          # \u67D0 agent **\u4F1A\u8BDD\u7684\u8FD0\u884C\u65F6\u8F93\u51FA**\uFF08\u65C1\u8D26\uFF0C\u975E\u5185\u6838\u4E8B\u5B9E\uFF09\uFF1A\u6700\u65B0 N \u6761\u4E8B\u4EF6 + "\u8DDD\u4E0A\u6B21\u4E8B\u4EF6 X \u5206\u949F"\uFF08>10min\u2248\u5361\uFF09+ \u5728\u98DE tool_use\u2014\u2014\u5224"\u60F3 vs \u5361"\u3002\u6CE8\u610F\u2260 log\uFF1Alog \u770B\u4EA7\u7269\u7ECF\u5386\u4E86\u4EC0\u4E48\uFF0Csession-log \u770B agent \u6B64\u523B\u5728\u8BF4/\u5E72\u4EC0\u4E48
   artifact-types [list | search <q>]               # \u770B/\u68C0\u7D22\u5DF2\u6CE8\u518C\u7C7B\u578B\uFF08\u7528\u9014/owner/\u72B6\u6001\uFF09\u2014\u2014\u7ED9\u4EBA\u548C agent \u9009 type
+  artifact-types show <type>                        # \u770B\u5355\u7C7B\u578B\u8BE6\u60C5\uFF1A\u542B\u3010\u81EA\u5B9A\u4E49\u5B57\u6BB5\u8868\u3011(\u540D/\u7C7B\u578B/\u5FC5\u586B/\u8BF4\u660E)\u2014\u2014spawn/edit \u524D\u67E5\u80FD\u586B\u5565
   artifact-types add <name> (--content-type <t> --owner-role <r> | --file <json>) [--description \u2026]   # \u65B0\u589E\uFF08--file \u6536\u5B8C\u6574 ArtifactTypeDef\uFF1Atriggers/reviews/grounding/budget/acl/mirror\u2026\uFF09
-  artifact-types edit <name> [--file <json>] [--description \u2026] [--owner-role \u2026] [--content-type \u2026]    # \u6539\u5B57\u6BB5\uFF08name \u4E0D\u53EF\u6539\uFF1BcontentType \u6709\u5B58\u91CF\u5373\u62E6\uFF1B--file \u6536\u5B8C\u6574 patch\uFF09
+  artifact-types edit <name> [--file <json>] [--description \u2026] [--owner-role \u2026] [--content-type \u2026]    # \u6539\u7C7B\u578B\u914D\u7F6E\uFF08name \u4E0D\u53EF\u6539\uFF1BcontentType \u6709\u5B58\u91CF\u5373\u62E6\uFF1B--file \u6536\u5B8C\u6574 patch\u3002\u6539\u5B57\u6BB5\u7528 *-field\uFF09
+  artifact-types add-field <type> <\u5B57\u6BB5> --type <string|string[]|number|boolean> [--required true] [--description \u2026]   # \u7ED9\u7C7B\u578B\u3010\u58F0\u660E\u3011\u4E00\u4E2A\u81EA\u5B9A\u4E49\u5B57\u6BB5\uFF08\u6539 schema\u3001\u5F71\u54CD\u8BE5 type \u6240\u6709\u8282\u70B9\u7684\u672A\u6765\u5199\u5165\uFF09
+  artifact-types edit-field <type> <\u5B57\u6BB5> [--type \u2026] [--required true|false] [--description \u2026]   # \u6539\u5B57\u6BB5\u58F0\u660E\u7684\u5C5E\u6027\uFF08\u4E0D\u53EF\u6539\u540D\uFF1B\u524D\u5411\u751F\u6548 + \u5F71\u54CD\u534A\u5F84\uFF09
+  artifact-types drop-field <type> <\u5B57\u6BB5>            # \u5220\u5B57\u6BB5\u58F0\u660E\uFF08deprecate\uFF1A\u5B58\u91CF\u503C\u7559\u3001\u65B0\u5199\u5165\u62D2\uFF1B\u5E26\u5F71\u54CD\u534A\u5F84\uFF09
   artifact-types deprecate <name> | delete <name>  # \u5F03\u7528\uFF08\u7981\u65B0\u5EFA\u3001\u5B58\u91CF\u4E0D\u52A8\uFF09/ \u786C\u5220\uFF08\u4EC5\u96F6\u5F15\u7528\uFF0C\u5426\u5219\u5F15\u5BFC deprecate\uFF09
 
   \u6CBB\u7406\uFF08\xA711\uFF09
@@ -46767,10 +47280,7 @@ function projectSlug(value) {
   return value.trim().toLowerCase().replace(/[^\w\u4e00-\u9fa5\s-]/g, "").replace(/\s+/g, "-").replace(/-+/g, "-").slice(0, 32);
 }
 function makeClient(base, token) {
-  const baseHeaders = { authorization: `Bearer ${token}`, "content-type": "application/json" };
-  const chatSessionId = process.env["OASIS_CHAT_SESSION_ID"];
-  if (chatSessionId) baseHeaders["x-chat-session-id"] = chatSessionId;
-  const headers = baseHeaders;
+  const headers = { authorization: `Bearer ${token}`, "content-type": "application/json" };
   const fail = async (res) => {
     const body = await res.json().catch(() => ({}));
     const err = body.error;
@@ -46823,25 +47333,50 @@ async function runCli(argv, println = console.log) {
     const serverUrl = flags.get("server-ws") ?? process.env["OASIS_SERVER_WS"] ?? "ws://127.0.0.1:7320/node-gateway";
     const nodeName = flags.get("name") ?? process.env["OASIS_NODE_NAME"];
     const nodeIdFile = path12.join(dir, "node-id");
-    const storedNodeId = fs14.existsSync(nodeIdFile) ? fs14.readFileSync(nodeIdFile, "utf8").trim() : null;
-    const nodeId = storedNodeId ?? flags.get("id") ?? process.env["OASIS_NODE_ID"] ?? `node-${(0, import_node_crypto21.randomUUID)()}`;
-    if (!storedNodeId) {
+    const nodeTokenFile = path12.join(dir, "node-token");
+    const enrollTokenFile = path12.join(dir, "enroll-token");
+    const reportMarkerFile = path12.join(dir, "report-runtimes");
+    let nodeId = fs14.existsSync(nodeIdFile) ? fs14.readFileSync(nodeIdFile, "utf8").trim() : null;
+    let token2 = flags.get("token") ?? process.env["OASIS_NODE_TOKEN"] ?? (fs14.existsSync(nodeTokenFile) ? fs14.readFileSync(nodeTokenFile, "utf8").trim() : void 0);
+    const enrollToken = flags.get("enroll-token") ?? process.env["OASIS_ENROLL_TOKEN"] ?? (fs14.existsSync(enrollTokenFile) ? fs14.readFileSync(enrollTokenFile, "utf8").trim() : void 0);
+    let freshEnrollment = false;
+    if ((!nodeId || !token2) && enrollToken) {
+      const httpBase2 = serverUrl.replace(/^ws(s?):\/\//, "http$1://").replace(/\/node-gateway.*$/, "");
+      const res = await fetch(`${httpBase2}/api/nodes/exchange`, {
+        method: "POST",
+        headers: { "content-type": "application/json" },
+        body: JSON.stringify({ enrollToken, ...nodeId ? { nodeId } : {}, hostname: os7.hostname() })
+      });
+      if (!res.ok) throw new Error(`enroll token exchange failed: HTTP ${res.status}`);
+      const body = await res.json();
+      nodeId = body.nodeId;
+      token2 = body.token;
       fs14.mkdirSync(dir, { recursive: true });
       fs14.writeFileSync(nodeIdFile, nodeId);
+      fs14.writeFileSync(nodeTokenFile, token2, { mode: 384 });
+      try {
+        fs14.unlinkSync(enrollTokenFile);
+      } catch {
+      }
+      freshEnrollment = true;
     }
-    const nodeTokenFile = path12.join(dir, "node-token");
-    const token2 = flags.get("token") ?? process.env["OASIS_NODE_TOKEN"] ?? (fs14.existsSync(nodeTokenFile) ? fs14.readFileSync(nodeTokenFile, "utf8").trim() : void 0);
+    if (!nodeId) throw new Error("no nodeId \u2014 provide --enroll-token <ent_...> on first run");
+    const scriptRun = freshEnrollment || fs14.existsSync(reportMarkerFile);
     if (flags.has("service")) {
       const { spawnSync, execSync: execSync2 } = await import("node:child_process");
       if (token2) {
         fs14.mkdirSync(dir, { recursive: true });
         fs14.writeFileSync(nodeTokenFile, token2, { mode: 384 });
       }
+      if (scriptRun) {
+        fs14.mkdirSync(dir, { recursive: true });
+        fs14.writeFileSync(reportMarkerFile, "");
+      }
       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}` : ""}`;
+      const svcArgs = `node --server-ws ${serverUrl} --dir ${dir}${nodeName ? ` --name ${nodeName}` : ""}`;
       if (process.platform === "linux") {
         const svcFile = path12.join(os7.homedir(), ".config/systemd/user/oasis-node.service");
         fs14.mkdirSync(path12.dirname(svcFile), { recursive: true });
@@ -46854,6 +47389,9 @@ async function runCli(argv, println = console.log) {
           "",
           "[Service]",
           `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"] ?? ""}:${path12.join(os7.homedir(), ".npm-global/bin")}:${path12.join(os7.homedir(), ".local/bin")}:/usr/local/bin`,
           "Restart=on-failure",
           "RestartSec=5",
           "StandardOutput=journal",
@@ -46874,7 +47412,7 @@ async function runCli(argv, println = console.log) {
         const plist = path12.join(os7.homedir(), "Library/LaunchAgents/com.oasis.node.plist");
         fs14.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("");
+        const argXml = [binPath, "node", "--server-ws", serverUrl, "--dir", dir, ...nodeName ? ["--name", nodeName] : []].map((a) => `<string>${a}</string>`).join("");
         fs14.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)");
@@ -46887,7 +47425,13 @@ async function runCli(argv, println = console.log) {
       }
       return;
     }
-    await startNode({ serverUrl, nodeId, ...token2 ? { token: token2 } : {}, ...nodeName ? { nodeName } : {} });
+    if (fs14.existsSync(reportMarkerFile)) {
+      try {
+        fs14.unlinkSync(reportMarkerFile);
+      } catch {
+      }
+    }
+    await startNode({ serverUrl, nodeId, ...token2 ? { token: token2 } : {}, ...nodeName ? { nodeName } : {}, reportRuntimes: scriptRun });
     return;
   }
   if (command === "node-token") {
@@ -47029,6 +47573,30 @@ async function runCli(argv, println = console.log) {
     return out;
   };
   const STAGE_COMMANDS = /* @__PURE__ */ new Set(["link", "spawn", "unlink", "cancel", "freeze", "cancel-part", "edit"]);
+  const GLOBAL_NON_FIELD_FLAGS = /* @__PURE__ */ new Set(["server", "token", "dir", "set-json", "clear"]);
+  const SPAWN_OWN_FLAGS = /* @__PURE__ */ new Set(["type", "owner", "workspace", "persistence", "title", "brief", "description", "input", "parts-file"]);
+  const EDIT_OWN_FLAGS = /* @__PURE__ */ new Set(["title", "brief"]);
+  const fieldsFromFlags = (ownFlags) => {
+    const fields = {};
+    for (const [k2, v2] of flags) {
+      if (ownFlags.has(k2) || GLOBAL_NON_FIELD_FLAGS.has(k2)) continue;
+      fields[k2] = v2;
+    }
+    const sj = flags.get("set-json");
+    if (sj !== void 0) {
+      const parsed = JSON.parse(sj);
+      if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
+        throw new Error(`--set-json \u9700\u8981\u4E00\u4E2A JSON \u5BF9\u8C61\uFF0C\u5982 '{"goal":"..."}'`);
+      }
+      Object.assign(fields, parsed);
+    }
+    const clear = flags.get("clear");
+    if (clear !== void 0) for (const k2 of clear.split(",")) {
+      const t = k2.trim();
+      if (t) fields[t] = null;
+    }
+    return Object.keys(fields).length > 0 ? fields : void 0;
+  };
   const buildStageOp = (cmd) => {
     switch (cmd) {
       case "link":
@@ -47038,15 +47606,18 @@ async function runCli(argv, println = console.log) {
           to: need(flags, "to"),
           ...flags.get("required") !== void 0 ? { required: flags.get("required") === "true" } : {}
         };
-      case "spawn":
+      case "spawn": {
+        const fields = fieldsFromFlags(SPAWN_OWN_FLAGS);
         return {
           action: "spawn",
           id: needPos(positional, 0, "oasis spawn <id> --type <t>"),
           type: need(flags, "type"),
           ...flags.get("title") !== void 0 ? { title: flags.get("title") } : {},
           ...(flags.get("brief") ?? flags.get("description")) !== void 0 ? { description: flags.get("brief") ?? flags.get("description") } : {},
-          ...flags.get("input") !== void 0 ? { inputs: flags.get("input").split(",").map((to) => ({ to: to.trim() })) } : {}
+          ...flags.get("input") !== void 0 ? { inputs: flags.get("input").split(",").map((to) => ({ to: to.trim() })) } : {},
+          ...fields !== void 0 ? { fields } : {}
         };
+      }
       case "unlink":
         return { action: "unlink", artifactId: needPos(positional, 0, "oasis unlink <consumer> --to <upstream>"), to: need(flags, "to") };
       case "cancel":
@@ -47059,13 +47630,16 @@ async function runCli(argv, println = console.log) {
         };
       case "cancel-part":
         return { action: "cancelPart", artifactId: needPos(positional, 0, "oasis cancel-part <id> --part <name>"), part: need(flags, "part") };
-      case "edit":
+      case "edit": {
+        const fields = fieldsFromFlags(EDIT_OWN_FLAGS);
         return {
           action: "edit",
-          artifactId: needPos(positional, 0, "oasis edit <id> [--title \u2026] [--brief \u2026]"),
+          artifactId: needPos(positional, 0, "oasis edit <id> [--title \u2026] [--brief \u2026] [--<\u5B57\u6BB5> <\u503C>] [--set-json <json>] [--clear <\u5B57\u6BB5,\u2026>]\uFF08--<\u5B57\u6BB5> \u662F\u8BE5\u7C7B\u578B\u52A8\u6001\u58F0\u660E\u7684\uFF0C\u7528 oasis show <id> / artifact-types show <type> \u770B\u53EF\u586B\u5B57\u6BB5\uFF09"),
           ...flags.get("title") !== void 0 ? { title: flags.get("title") } : {},
-          ...flags.get("brief") !== void 0 ? { description: flags.get("brief") } : {}
+          ...flags.get("brief") !== void 0 ? { description: flags.get("brief") } : {},
+          ...fields !== void 0 ? { fields } : {}
         };
+      }
       default:
         throw new Error(`\u672A\u77E5\u6682\u5B58\u547D\u4EE4: ${cmd}`);
     }
@@ -47099,43 +47673,28 @@ async function runCli(argv, println = console.log) {
     return;
   }
   switch (command) {
-    case "workorders": {
-      const sessionId = flags.get("session");
-      if (sessionId) {
-        const res = await api.request(
-          "GET",
-          `/api/chat-sessions/${encodeURIComponent(sessionId)}/work-orders`
-        );
-        println(`\u4F1A\u8BDD ${sessionId} \u7684\u5DE5\u5355\uFF08${res.items.length}\uFF09\uFF1A`);
-        for (const w2 of res.items) {
-          const p2 = w2.progress ? ` [${w2.progress.concluded}/${w2.progress.total}]` : "";
-          println(`  ${w2.id}  ${w2.title}  [${w2.stage}]${p2}`);
-        }
-      } else {
-        const res = await api.request(
-          "GET",
-          "/api/workorders"
-        );
-        println(`\u5DE5\u5355\uFF08${res.items.length}\uFF09\uFF1A`);
-        for (const w2 of res.items) {
-          const p2 = w2.progress ? ` [${w2.progress.concluded}/${w2.progress.total}]` : "";
-          println(`  ${w2.id}  ${w2.title}  [${w2.stage}]${p2}`);
-        }
-      }
-      break;
-    }
-    case "artifacts": {
-      const workOrderId = positional[0];
-      if (!workOrderId) {
-        println("\u7528\u6CD5: oasis artifacts <workOrderId>");
-        break;
+    case "create-workorder": {
+      const planRaw = flags.get("plan-file") !== void 0 ? fs14.readFileSync(flags.get("plan-file"), "utf8") : flags.get("plan");
+      const acceptanceFlag = flags.get("acceptance");
+      const args = {
+        createdVia: "seed",
+        stage: true,
+        type: need(flags, "type"),
+        workspace: need(flags, "workspace"),
+        title: need(flags, "title"),
+        ...flags.get("brief") !== void 0 ? { brief: flags.get("brief") } : {},
+        ...flags.get("goal") !== void 0 ? { goal: flags.get("goal") } : {},
+        ...acceptanceFlag !== void 0 ? { acceptance_criteria: parseStringArrayFlag(acceptanceFlag, "acceptance") } : {},
+        ...planRaw !== void 0 ? { plan: parseJsonFlag(planRaw, "plan") } : {},
+        ...flags.get("project") !== void 0 ? { project_id: flags.get("project") } : {},
+        ...flags.get("dispatch") === "false" ? { dispatch: false } : {}
+      };
+      const res = await api.cmd("spawn", args);
+      println(res.message);
+      const data = res.data;
+      if (data?.draftId) {
+        println(`draftId=${data.draftId}  workspace=${data.workspace}  \u8282\u70B9=${data.spawned?.length ?? 0}  \u89C4\u5212=${data.planning?.status ?? "?"}`);
       }
-      const res = await api.request(
-        "GET",
-        `/api/workorders/${encodeURIComponent(workOrderId)}`
-      );
-      println(`\u5DE5\u5355 ${res.summary.title} \u7684\u4EA7\u7269\uFF08${res.graph.nodes.length}\uFF09\uFF1A`);
-      for (const n of res.graph.nodes) println(`  ${n.id}  [${n.type}]  ${n.label}  stage=${n.stage}`);
       break;
     }
     case "projects": {
@@ -47326,6 +47885,7 @@ async function runCli(argv, println = console.log) {
     }
     case "spawn": {
       const partsFile = flags.get("parts-file");
+      const spawnFields = fieldsFromFlags(SPAWN_OWN_FLAGS);
       const { message } = await api.cmd("spawn", {
         id: positional[0],
         type: need(flags, "type"),
@@ -47335,7 +47895,8 @@ async function runCli(argv, println = console.log) {
         title: flags.get("title"),
         description: flags.get("brief") ?? flags.get("description"),
         inputs: flags.get("input")?.split(",").map((to) => ({ to: to.trim() })),
-        ...partsFile !== void 0 ? { parts: JSON.parse(readFileArg(partsFile)) } : {}
+        ...partsFile !== void 0 ? { parts: JSON.parse(readFileArg(partsFile)) } : {},
+        ...spawnFields !== void 0 ? { fields: spawnFields } : {}
       });
       println(message);
       break;
@@ -47787,6 +48348,52 @@ async function runCli(argv, println = console.log) {
         println(`\u5DF2\u5220\u9664 ${name}`);
         break;
       }
+      if (sub === "add-field") {
+        const name = needPos(positional, 1, "oasis artifact-types add-field <type> <\u5B57\u6BB5> --type <string|string[]|number|boolean> [--required true] [--description \u2026]");
+        const field = needPos(positional, 2, "oasis artifact-types add-field <type> <\u5B57\u6BB5> --type <t> [--required true] [--description \u2026]");
+        const spec = {
+          name: field,
+          type: need(flags, "type"),
+          ...flags.get("required") === "true" ? { required: true } : {},
+          ...flags.get("description") !== void 0 ? { description: flags.get("description") } : {}
+        };
+        const r = await api.request("POST", `/api/artifact-types/${encodeURIComponent(name)}/fields`, spec);
+        println(`\u5DF2\u7ED9 ${name} \u52A0\u5B57\u6BB5 ${field}\uFF08${spec.type}${spec["required"] ? "\uFF0C\u5FC5\u586B" : ""}\uFF09${r.usage && r.usage.total > 0 ? `\u2014\u2014${r.usage.total} \u4E2A\u5B58\u91CF\u8282\u70B9\u6682\u65E0\u6B64\u5B57\u6BB5\uFF08\u524D\u5411\uFF1A\u65B0\u5199\u5165\u53EF\u586B\uFF09` : ""}`);
+        break;
+      }
+      if (sub === "edit-field") {
+        const name = needPos(positional, 1, "oasis artifact-types edit-field <type> <\u5B57\u6BB5> [--type \u2026] [--required true|false] [--description \u2026]\uFF08\u4E0D\u53EF\u6539\u540D\uFF09");
+        const field = needPos(positional, 2, "oasis artifact-types edit-field <type> <\u5B57\u6BB5> [--type \u2026] [--required \u2026] [--description \u2026]");
+        const attrs = {
+          ...flags.get("type") !== void 0 ? { type: flags.get("type") } : {},
+          ...flags.get("required") !== void 0 ? { required: flags.get("required") === "true" } : {},
+          ...flags.get("description") !== void 0 ? { description: flags.get("description") } : {}
+        };
+        const r = await api.request("PATCH", `/api/artifact-types/${encodeURIComponent(name)}/fields/${encodeURIComponent(field)}`, attrs);
+        println(`\u5DF2\u6539 ${name}.${field}${r.usage && r.usage.total > 0 ? `\uFF08\u524D\u5411\u751F\u6548\uFF0C\u5F71\u54CD ${r.usage.total} \u4E2A\u5B58\u91CF\u8282\u70B9\uFF09` : ""}`);
+        break;
+      }
+      if (sub === "drop-field") {
+        const name = needPos(positional, 1, "oasis artifact-types drop-field <type> <\u5B57\u6BB5>");
+        const field = needPos(positional, 2, "oasis artifact-types drop-field <type> <\u5B57\u6BB5>");
+        const r = await api.request("DELETE", `/api/artifact-types/${encodeURIComponent(name)}/fields/${encodeURIComponent(field)}`, void 0);
+        println(`\u5DF2\u5220\u5B57\u6BB5\u58F0\u660E ${name}.${field}${r.usage && r.usage.total > 0 ? `\u2014\u2014${r.usage.total} \u4E2A\u5B58\u91CF\u8282\u70B9\u4ECD\u4FDD\u7559\u8BE5\u5B57\u6BB5\u7684\u503C\uFF08\u6570\u636E\u672A\u52A8\uFF1B\u65B0\u5199\u5165\u5C06\u62D2\uFF09` : ""}`);
+        break;
+      }
+      if (sub === "show") {
+        const name = needPos(positional, 1, "oasis artifact-types show <type>");
+        const { items } = await api.request("GET", "/api/artifact-types");
+        const t = items.find((x2) => x2.name === name);
+        if (!t) {
+          println(`\uFF08\u65E0\u6B64\u7C7B\u578B: ${name}\uFF09`);
+          break;
+        }
+        println(`${t.name}${t.status === "deprecated" ? " [\u5DF2\u5F03\u7528]" : ""}  (${t.contentType}, owner=${t.ownerRole})${t.description ? ` \u2014\u2014 ${t.description}` : ""}`);
+        const fds = t.fieldDefs ?? [];
+        println(fds.length === 0 ? "  \u81EA\u5B9A\u4E49\u5B57\u6BB5\uFF1A\u65E0" : "  \u81EA\u5B9A\u4E49\u5B57\u6BB5\uFF1A");
+        for (const f2 of fds) println(`    ${f2.name}	${f2.type}	${f2.required ? "\u5FC5\u586B" : "\u53EF\u9009"}${f2.description ? `	${f2.description}` : ""}`);
+        break;
+      }
       const all = await api.view(
         "artifact-types"
       );
@@ -47878,7 +48485,7 @@ var isRunning = (pid) => {
     return false;
   }
 };
-var httpBase = (wsUrl) => wsUrl.replace(/^wss?:\/\//, "http://").replace(/\/node-gateway.*$/, "");
+var httpBase = (wsUrl) => wsUrl.replace(/^ws(s?):\/\//, "http$1://").replace(/\/node-gateway.*$/, "");
 function installBinary() {
   fs15.mkdirSync(path13.dirname(BIN_FILE), { recursive: true });
   fs15.copyFileSync(process.argv[1], BIN_FILE);
@@ -47889,6 +48496,13 @@ exec node "${BIN_FILE}" "$@"
 }
 function setupAutostart() {
   const cmd = `${process.execPath} "${BIN_FILE}" --_daemon`;
+  const home = os8.homedir();
+  const extraBins = [
+    path13.join(home, ".npm-global", "bin"),
+    path13.join(home, ".local", "bin"),
+    "/usr/local/bin"
+  ];
+  const daemonPath = [process.env["PATH"] ?? "", ...extraBins].filter(Boolean).join(":");
   if (process.platform === "linux") {
     const unitDir = path13.join(os8.homedir(), ".config", "systemd", "user");
     fs15.mkdirSync(unitDir, { recursive: true });
@@ -47899,6 +48513,7 @@ function setupAutostart() {
       "",
       "[Service]",
       `ExecStart=${cmd}`,
+      `Environment=PATH=${daemonPath}`,
       `StandardOutput=append:${LOG_FILE}`,
       `StandardError=append:${LOG_FILE}`,
       "Restart=on-failure",
@@ -47920,6 +48535,7 @@ function setupAutostart() {
 <plist version="1.0"><dict>
   <key>Label</key><string>com.oasis.node</string>
   <key>ProgramArguments</key><array><string>/bin/sh</string><string>-c</string><string>${cmd}</string></array>
+  <key>EnvironmentVariables</key><dict><key>PATH</key><string>${daemonPath}</string></dict>
   <key>RunAtLoad</key><true/><key>KeepAlive</key><true/>
   <key>StandardOutPath</key><string>${LOG_FILE}</string>
   <key>StandardErrorPath</key><string>${LOG_FILE}</string>
@@ -48001,8 +48617,11 @@ void (async () => {
     await startNode({
       serverUrl: cfg.serverUrl,
       token: cfg.token,
-      nodeId: cfg.nodeId ?? `node-${(0, import_node_crypto22.randomUUID)()}`,
-      nodeName: cfg.name ?? cfg.nodeId ?? `node-${(0, import_node_crypto22.randomUUID)()}`,
+      nodeId: cfg.nodeId ?? (() => {
+        console.error("[oasis] no nodeId in config \u2014 run `oasis start` first");
+        process.exit(1);
+      })(),
+      nodeName: cfg.name ?? cfg.nodeId,
       reportRuntimes
     });
     return;
@@ -48011,32 +48630,29 @@ void (async () => {
     const prev = readConfig();
     const serverUrl = flags.get("server-ws") ?? process.env["OASIS_SERVER_WS"] ?? prev?.serverUrl;
     if (!serverUrl) {
-      console.error("Usage: oasis start --server-ws <wss://...> (--enroll-token <ent_...> | --token <ont_...>) [--name <name>] [--id <nodeId>]");
+      console.error("Usage: oasis start --server-ws <wss://...> (--enroll-token <ent_...> | --token <ont_...>) [--name <name>]");
       process.exit(1);
     }
-    const commandNodeId = flags.get("id");
     const serverChanged = !!prev?.serverUrl && prev.serverUrl !== serverUrl;
-    let nodeId = serverChanged ? commandNodeId ?? `node-${(0, import_node_crypto22.randomUUID)()}` : prev?.nodeId ?? commandNodeId ?? `node-${(0, import_node_crypto22.randomUUID)()}`;
+    let nodeId = serverChanged ? void 0 : prev?.nodeId;
     let token = serverChanged ? flags.get("token") ?? process.env["OASIS_NODE_TOKEN"] : flags.get("token") ?? process.env["OASIS_NODE_TOKEN"] ?? prev?.token;
     const enrollToken = flags.get("enroll-token") ?? process.env["OASIS_ENROLL_TOKEN"];
-    if (enrollToken) {
-      const exchange = async (candidateNodeId) => fetch(`${httpBase(serverUrl)}/api/nodes/exchange`, {
+    if (prev?.nodeId && prev?.token && !serverChanged) {
+      nodeId = prev.nodeId;
+      token = prev.token;
+    } else if (enrollToken) {
+      const res = await fetch(`${httpBase(serverUrl)}/api/nodes/exchange`, {
         method: "POST",
         headers: { "content-type": "application/json" },
-        body: JSON.stringify({ enrollToken, nodeId: candidateNodeId })
+        body: JSON.stringify({ enrollToken, hostname: os8.hostname() })
       });
-      let res = await exchange(nodeId);
-      if (!res.ok && commandNodeId && commandNodeId !== nodeId) {
-        res = await exchange(commandNodeId);
-        if (res.ok) nodeId = commandNodeId;
-      }
       if (!res.ok) throw new Error(`enroll token exchange failed: HTTP ${res.status}`);
       const body = await res.json();
       token = body.token;
-      nodeId = body.nodeId || nodeId;
+      nodeId = body.nodeId;
     }
-    if (!token) {
-      console.error("Usage: oasis start --server-ws <wss://...> (--enroll-token <ent_...> | --token <ont_...>) [--name <name>] [--id <nodeId>]");
+    if (!token || !nodeId) {
+      console.error("Usage: oasis start --server-ws <wss://...> (--enroll-token <ent_...> | --token <ont_...>) [--name <name>]");
       process.exit(1);
     }
     const name = flags.get("name") ?? prev?.name;