oasis_test 0.1.14 → 0.1.15

package/dist/index.js

@@ -2806,13 +2806,10 @@ async function assembleContext(args) {
         for (const [p2, c] of Object.entries(identityFiles)) files[p2] = c;
         identityNote = `\`identity/\` \u2014\u2014 \u4F60\u7684\u4EBA\u683C\u4E0E\u884C\u4E3A\u51C6\u5219\uFF08${Object.keys(identityFiles).join(", ")}\uFF09\uFF0C\u5F00\u5DE5\u524D\u52A1\u5FC5\u8BFB`;
       }
-      const enabledSkillIds = new Set(actorCtx.config?.skills ?? []);
-      if (enabledSkillIds.size > 0) {
-        const byId = new Map(actorCtx.installedSkills.map((s2) => [s2.id, s2]));
-        skillsLines = [...enabledSkillIds].map((id) => {
-          const s2 = byId.get(id);
-          return s2 ? `- **${s2.name}** (\`${s2.id}\`)\uFF1A${s2.description}` : `- \`${id}\`\uFF08\u672A\u5728\u6280\u80FD\u5E93\u4E2D\uFF0C\u53EF\u80FD\u5DF2\u5378\u8F7D\uFF09`;
-        });
+      if (actorCtx.installedSkills.length > 0) {
+        skillsLines = actorCtx.installedSkills.map(
+          (s2) => `- **${s2.name}** (\`${s2.id}\`)\uFF1A${s2.description}`
+        );
       }
       const activeConnectors = actorCtx.connectors.filter((c) => c.status === "connected" || c.status === "verifying");
       if (activeConnectors.length > 0) {
@@ -3330,7 +3327,8 @@ var init_dispatcher = __esm({
           limits,
           ...binding !== void 0 ? { binding } : {},
           ...provisioned?.env && Object.keys(provisioned.env).length > 0 ? { env: provisioned.env } : {},
-          ...provisioned?.wrapperPaths && provisioned.wrapperPaths.length > 0 ? { wrapperPaths: provisioned.wrapperPaths } : {}
+          ...provisioned?.wrapperPaths && provisioned.wrapperPaths.length > 0 ? { wrapperPaths: provisioned.wrapperPaths } : {},
+          ...provisioned?.requiredTools && provisioned.requiredTools.length > 0 ? { requiredTools: provisioned.requiredTools } : {}
         };
         const session = await this.opts.adapter.spawn(job);
         this.inFlight.set(jobKey, session);
@@ -17124,49 +17122,49 @@ var require_fast_uri = __commonJS({
       schemelessOptions.skipEscape = true;
       return serialize(resolved, schemelessOptions);
     }
-    function resolveComponent(base, relative, options, skipNormalization) {
+    function resolveComponent(base, relative2, options, skipNormalization) {
       const target = {};
       if (!skipNormalization) {
         base = parse2(serialize(base, options), options);
-        relative = parse2(serialize(relative, options), options);
+        relative2 = parse2(serialize(relative2, options), options);
       }
       options = options || {};
-      if (!options.tolerant && relative.scheme) {
-        target.scheme = relative.scheme;
-        target.userinfo = relative.userinfo;
-        target.host = relative.host;
-        target.port = relative.port;
-        target.path = removeDotSegments(relative.path || "");
-        target.query = relative.query;
+      if (!options.tolerant && relative2.scheme) {
+        target.scheme = relative2.scheme;
+        target.userinfo = relative2.userinfo;
+        target.host = relative2.host;
+        target.port = relative2.port;
+        target.path = removeDotSegments(relative2.path || "");
+        target.query = relative2.query;
       } else {
-        if (relative.userinfo !== void 0 || relative.host !== void 0 || relative.port !== void 0) {
-          target.userinfo = relative.userinfo;
-          target.host = relative.host;
-          target.port = relative.port;
-          target.path = removeDotSegments(relative.path || "");
-          target.query = relative.query;
+        if (relative2.userinfo !== void 0 || relative2.host !== void 0 || relative2.port !== void 0) {
+          target.userinfo = relative2.userinfo;
+          target.host = relative2.host;
+          target.port = relative2.port;
+          target.path = removeDotSegments(relative2.path || "");
+          target.query = relative2.query;
         } else {
-          if (!relative.path) {
+          if (!relative2.path) {
             target.path = base.path;
-            if (relative.query !== void 0) {
-              target.query = relative.query;
+            if (relative2.query !== void 0) {
+              target.query = relative2.query;
             } else {
               target.query = base.query;
             }
           } else {
-            if (relative.path[0] === "/") {
-              target.path = removeDotSegments(relative.path);
+            if (relative2.path[0] === "/") {
+              target.path = removeDotSegments(relative2.path);
             } else {
               if ((base.userinfo !== void 0 || base.host !== void 0 || base.port !== void 0) && !base.path) {
-                target.path = "/" + relative.path;
+                target.path = "/" + relative2.path;
               } else if (!base.path) {
-                target.path = relative.path;
+                target.path = relative2.path;
               } else {
-                target.path = base.path.slice(0, base.path.lastIndexOf("/") + 1) + relative.path;
+                target.path = base.path.slice(0, base.path.lastIndexOf("/") + 1) + relative2.path;
               }
               target.path = removeDotSegments(target.path);
             }
-            target.query = relative.query;
+            target.query = relative2.query;
           }
           target.userinfo = base.userinfo;
           target.host = base.host;
@@ -17174,7 +17172,7 @@ var require_fast_uri = __commonJS({
         }
         target.scheme = base.scheme;
       }
-      target.fragment = relative.fragment;
+      target.fragment = relative2.fragment;
       return target;
     }
     function equal(uriA, uriB, options) {
@@ -21222,12 +21220,83 @@ var init_planner = __esm({
   }
 });
 
+// ../server/src/domains/trace/chat-parts.ts
+function asObj(v2) {
+  return v2 && typeof v2 === "object" && !Array.isArray(v2) ? v2 : void 0;
+}
+function textOf(v2) {
+  if (typeof v2 === "string") return v2;
+  if (Array.isArray(v2)) return v2.map(textOf).filter(Boolean).join("\n") || void 0;
+  const o = asObj(v2);
+  if (o) {
+    if (typeof o.text === "string") return o.text;
+    if (typeof o.content === "string") return o.content;
+    if (typeof o.thinking === "string") return o.thinking;
+  }
+  return void 0;
+}
+function truncate(s2, limit = OUTPUT_PREVIEW_LIMIT) {
+  return s2.length > limit ? `${s2.slice(0, limit)}\u2026` : s2;
+}
+function isSkillBootstrapText(text) {
+  return typeof text === "string" && text.trimStart().startsWith("Base directory for this skill:");
+}
+function deriveChatPartsFromEvents(events) {
+  const parts = [];
+  for (const ev of [...events].sort((a, b2) => a.seq - b2.seq)) {
+    const p2 = asObj(ev.payload);
+    const kind = p2 && typeof p2.kind === "string" ? p2.kind : void 0;
+    const raw = p2?.raw;
+    if (kind === "thought") {
+      const text = textOf(raw);
+      if (text) parts.push({ type: "thinking", seq: ev.seq, text });
+      continue;
+    }
+    if (kind === "tool_use") {
+      const ro = asObj(raw);
+      parts.push({
+        type: "tool_use",
+        seq: ev.seq,
+        toolName: ro && typeof ro.name === "string" ? ro.name : "tool",
+        ...ro && ro.input !== void 0 ? { input: ro.input } : {},
+        ...ro && typeof ro.id === "string" ? { toolCallId: ro.id } : {}
+      });
+      continue;
+    }
+    if (kind === "tool_result") {
+      const ro = asObj(raw);
+      const output = textOf(raw) ?? "";
+      parts.push({
+        type: "tool_result",
+        seq: ev.seq,
+        output: truncate(output),
+        isError: ro?.is_error === true || ro?.isError === true,
+        ...ro && typeof ro.tool_use_id === "string" ? { toolCallId: ro.tool_use_id } : {}
+      });
+      continue;
+    }
+    if (kind === "message") {
+      const text = textOf(raw);
+      if (text && !isSkillBootstrapText(text)) parts.push({ type: "text", seq: ev.seq, text });
+      continue;
+    }
+  }
+  return parts;
+}
+var OUTPUT_PREVIEW_LIMIT;
+var init_chat_parts = __esm({
+  "../server/src/domains/trace/chat-parts.ts"() {
+    "use strict";
+    OUTPUT_PREVIEW_LIMIT = 4e3;
+  }
+});
+
 // ../server/src/server.ts
 function wantsChatParts(req) {
   const accept = req.headers.accept;
   return typeof accept === "string" && accept.includes("application/x-ndjson");
 }
-function asObj(value) {
+function asObj2(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
 }
 function asJsonValue(value) {
@@ -21240,9 +21309,9 @@ function asJsonValue(value) {
   }
   return null;
 }
-function textOf(value) {
+function textOf2(value) {
   if (typeof value === "string") return value;
-  if (Array.isArray(value)) return value.map(textOf).filter(Boolean).join("\n");
+  if (Array.isArray(value)) return value.map(textOf2).filter(Boolean).join("\n");
   if (value && typeof value === "object") {
     const obj = value;
     if (typeof obj.text === "string") return obj.text;
@@ -21255,13 +21324,14 @@ function truncateOutput(text) {
 ...[truncated]` : text;
 }
 function chatPartFromTrajectoryEvent(event) {
-  const payload = asObj(event.payload);
+  const payload = asObj2(event.payload);
   if (event.kind === "message") {
-    const text = textOf(payload?.text ?? payload?.content ?? event.payload);
-    return text ? { type: "text", text } : null;
+    const text = textOf2(payload?.text ?? payload?.content ?? event.payload);
+    if (!text || isSkillBootstrapText(text)) return null;
+    return { type: "text", text };
   }
   if (event.kind === "thought") {
-    const text = textOf(payload?.text ?? payload?.thinking ?? event.payload);
+    const text = textOf2(payload?.text ?? payload?.thinking ?? event.payload);
     return text ? { type: "thinking", text } : null;
   }
   if (event.kind === "tool_use") {
@@ -21273,7 +21343,7 @@ function chatPartFromTrajectoryEvent(event) {
     };
   }
   if (event.kind === "tool_result") {
-    const output = textOf(payload?.content ?? payload?.output ?? event.payload) ?? "";
+    const output = textOf2(payload?.content ?? payload?.output ?? event.payload) ?? "";
     return {
       type: "tool_result",
       toolCallId: typeof payload?.tool_use_id === "string" ? payload.tool_use_id : typeof payload?.id === "string" ? payload.id : void 0,
@@ -21292,9 +21362,9 @@ function chatPartsFromClaudeStreamLine(line, state) {
     return line ? [{ type: "text", text: line }] : [];
   }
   if (parsed.type === "stream_event") {
-    const event = asObj(parsed.event);
+    const event = asObj2(parsed.event);
     if (event?.type === "content_block_delta") {
-      const delta = asObj(event.delta);
+      const delta = asObj2(event.delta);
       if (delta?.type === "text_delta" && typeof delta.text === "string") {
         state.sawTextDelta = true;
         return [{ type: "text", text: delta.text }];
@@ -21304,7 +21374,7 @@ function chatPartsFromClaudeStreamLine(line, state) {
       }
     }
     if (event?.type === "content_block_start") {
-      const block = asObj(event.content_block);
+      const block = asObj2(event.content_block);
       if (block?.type === "tool_use") {
         return [{
           type: "tool_use",
@@ -21317,12 +21387,12 @@ function chatPartsFromClaudeStreamLine(line, state) {
     return [];
   }
   if (parsed.type === "assistant" || parsed.type === "user") {
-    const message = asObj(parsed.message);
+    const message = asObj2(parsed.message);
     const content = Array.isArray(message?.content) ? message.content : [];
     const parts = [];
     for (const block of content) {
       if (block.type === "text" && !state.sawTextDelta && typeof block.text === "string") {
-        parts.push({ type: "text", text: block.text });
+        if (!isSkillBootstrapText(block.text)) parts.push({ type: "text", text: block.text });
       } else if (block.type === "thinking" && typeof block.thinking === "string") {
         parts.push({ type: "thinking", text: block.thinking });
       } else if (block.type === "tool_use") {
@@ -21336,7 +21406,7 @@ function chatPartsFromClaudeStreamLine(line, state) {
         parts.push({
           type: "tool_result",
           toolCallId: typeof block.tool_use_id === "string" ? block.tool_use_id : void 0,
-          output: truncateOutput(textOf(block.content) ?? ""),
+          output: truncateOutput(textOf2(block.content) ?? ""),
           isError: block.is_error === true
         });
       }
@@ -22589,15 +22659,55 @@ async function startOasisServer(opts) {
                 ...body.chatSessionId ? { chatSessionId: body.chatSessionId } : {},
                 ...attachments.length ? { attachments } : {}
               });
+              const chatStore = opts.chatSession;
+              const persistSession = chatStore && body.chatSessionId ? await chatStore.getSession(body.chatSessionId).catch(() => null) : null;
+              const persistTarget = persistSession && persistSession.humanActorId === actor ? persistSession : null;
+              if (chatStore && persistTarget) {
+                const { randomUUID: randomUUID15 } = await import("node:crypto");
+                await chatStore.appendMessage({
+                  id: randomUUID15(),
+                  sessionId: persistTarget.id,
+                  role: "user",
+                  content: body.message,
+                  createdAt: (/* @__PURE__ */ new Date()).toISOString()
+                }).catch(() => void 0);
+              }
+              let assistantText = "";
+              let persisted = false;
+              const streamedParts = [];
+              const finalizeAssistant = async () => {
+                if (persisted || !chatStore || !persistTarget) return;
+                persisted = true;
+                if (!assistantText && !session.runId && streamedParts.length === 0) return;
+                const { randomUUID: randomUUID15 } = await import("node:crypto");
+                await chatStore.appendMessage({
+                  id: randomUUID15(),
+                  sessionId: persistTarget.id,
+                  role: "assistant",
+                  content: assistantText,
+                  createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+                  ...session.runId ? { runId: session.runId } : {},
+                  ...streamedParts.length ? { parts: streamedParts } : {}
+                }).catch(() => void 0);
+                await chatStore.updateSession(persistTarget.id, {
+                  runtimeSessionId: session.id,
+                  touchedAt: (/* @__PURE__ */ new Date()).toISOString()
+                }).catch(() => void 0);
+              };
               let finished = false;
               res.on("close", () => {
-                if (!finished) void session.kill?.();
+                if (!finished) {
+                  void session.kill?.();
+                  void finalizeAssistant();
+                }
               });
               if (typedParts) {
                 let seq = 0;
                 const writePart = (part) => {
+                  const withSeq = { ...part, seq: ++seq };
+                  if (part.type !== "done") streamedParts.push(withSeq);
                   if (res.destroyed) return;
-                  res.write(`${JSON.stringify({ ...part, seq: ++seq })}
+                  res.write(`${JSON.stringify(withSeq)}
 `);
                 };
                 res.writeHead(200, {
@@ -22610,6 +22720,7 @@ async function startOasisServer(opts) {
                 let sawTextOutput = false;
                 session.onOutput((chunk) => {
                   sawTextOutput = true;
+                  assistantText += chunk;
                   writePart({ type: "text", text: chunk });
                 });
                 session.onTelemetry?.((event) => {
@@ -22623,6 +22734,7 @@ async function startOasisServer(opts) {
                   writePart({ type: "error", text: err instanceof Error ? err.message : String(err) });
                 }
                 finished = true;
+                await finalizeAssistant();
                 writePart({ type: "done", sessionId: session.id });
                 res.end();
                 return;
@@ -22633,7 +22745,10 @@ async function startOasisServer(opts) {
                 "access-control-expose-headers": "X-Session-Id",
                 "x-session-id": session.id
               });
-              session.onOutput((chunk) => res.write(chunk));
+              session.onOutput((chunk) => {
+                assistantText += chunk;
+                res.write(chunk);
+              });
               try {
                 await session.done;
               } catch (err) {
@@ -22643,6 +22758,7 @@ async function startOasisServer(opts) {
 `);
               }
               finished = true;
+              await finalizeAssistant();
               res.end();
               return;
             }
@@ -22654,13 +22770,13 @@ async function startOasisServer(opts) {
             if (body.actorId && opts.resolveActorContext) {
               const actorCtx = await opts.resolveActorContext(body.actorId).catch(() => null);
               if (actorCtx) {
-                const { mkdtempSync: mkdtempSync6, mkdirSync: mkdirSync13, writeFileSync: writeFileSync14 } = await import("node:fs");
-                const { join: join16, dirname: dirname13 } = await import("node:path");
-                const { tmpdir: tmpdir8 } = await import("node:os");
-                const dir = mkdtempSync6(join16(tmpdir8(), "oasis-chat-"));
+                const { mkdtempSync: mkdtempSync7, mkdirSync: mkdirSync13, writeFileSync: writeFileSync14 } = await import("node:fs");
+                const { join: join18, dirname: dirname13 } = await import("node:path");
+                const { tmpdir: tmpdir9 } = await import("node:os");
+                const dir = mkdtempSync7(join18(tmpdir9(), "oasis-chat-"));
                 if (actorCtx.config?.prompt) {
                   for (const [rel, content] of Object.entries(splitIdentityFiles2(actorCtx.config.prompt))) {
-                    const file = join16(dir, rel);
+                    const file = join18(dir, rel);
                     mkdirSync13(dirname13(file), { recursive: true });
                     writeFileSync14(file, content);
                   }
@@ -22672,12 +22788,12 @@ async function startOasisServer(opts) {
                     const s2 = byId.get(id);
                     return s2 ? `- **${s2.name}** (\`${s2.id}\`): ${s2.description}` : `- \`${id}\`\uFF08\u672A\u5728\u6280\u80FD\u5E93\u4E2D\uFF0C\u53EF\u80FD\u5DF2\u5378\u8F7D\uFF09`;
                   });
-                  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"));
+                  writeFileSync14(join18(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);
+                    const file = join18(dir, rel);
                     mkdirSync13(dirname13(file), { recursive: true });
                     writeFileSync14(file, content);
                   }
@@ -22691,7 +22807,7 @@ async function startOasisServer(opts) {
                     const modeNote = c.mode === "oauth" ? "OAuth \xB7 \u51ED\u8BC1\u7531\u5E73\u53F0\u7BA1\u7406\uFF0C\u901A\u8FC7\u5BF9\u5E94 CLI wrapper \u8C03\u7528" : "\u76F4\u63A5\u5199\u5165 \xB7 \u51ED\u8BC1\u5DF2\u6CE8\u5165\u73AF\u5883\u53D8\u91CF";
                     return `- **${c.name}** (\`${c.id}\`): ${statusNote} \xB7 ${modeNote}`;
                   });
-                  writeFileSync14(join16(dir, "CONNECTORS.md"), ["# \u53EF\u7528\u8FDE\u63A5\u5668", "", "\u4EE5\u4E0B\u8FDE\u63A5\u5668\u5DF2\u4E3A\u672C\u6B21\u4F1A\u8BDD\u914D\u7F6E\uFF0C\u51ED\u8BC1\u5DF2\u901A\u8FC7\u73AF\u5883\u53D8\u91CF\u6216 CLI wrapper \u6CE8\u5165\uFF0C\u65E0\u9700\u624B\u52A8\u914D\u7F6E\uFF1A", "", ...lines].join("\n"));
+                  writeFileSync14(join18(dir, "CONNECTORS.md"), ["# \u53EF\u7528\u8FDE\u63A5\u5668", "", "\u4EE5\u4E0B\u8FDE\u63A5\u5668\u5DF2\u4E3A\u672C\u6B21\u4F1A\u8BDD\u914D\u7F6E\uFF0C\u51ED\u8BC1\u5DF2\u901A\u8FC7\u73AF\u5883\u53D8\u91CF\u6216 CLI wrapper \u6CE8\u5165\uFF0C\u65E0\u9700\u624B\u52A8\u914D\u7F6E\uFF1A", "", ...lines].join("\n"));
                 }
                 spawnCwd = dir;
               }
@@ -22808,9 +22924,9 @@ async function startOasisServer(opts) {
               return;
             }
             try {
-              const { execFile: execFile3 } = await import("node:child_process");
-              const { promisify: promisify3 } = await import("node:util");
-              const { stdout } = await promisify3(execFile3)(larkBin, ["config", "show", "--json"]);
+              const { execFile: execFile4 } = await import("node:child_process");
+              const { promisify: promisify4 } = await import("node:util");
+              const { stdout } = await promisify4(execFile4)(larkBin, ["config", "show", "--json"]);
               const cfg = JSON.parse(stdout);
               send(cfg.appId ? { type: "done", appId: cfg.appId } : { type: "error", message: "could not determine appId" });
             } catch (e) {
@@ -22833,9 +22949,9 @@ async function startOasisServer(opts) {
           }
           const larkBin = process.env["LARK_CLI_BIN"] ?? "lark-cli";
           try {
-            const { execFile: execFile3 } = await import("node:child_process");
-            const { promisify: promisify3 } = await import("node:util");
-            const { stdout } = await promisify3(execFile3)(larkBin, ["--profile", appId, "auth", "login", "--no-wait", "--json", "--recommend"]);
+            const { execFile: execFile4 } = await import("node:child_process");
+            const { promisify: promisify4 } = await import("node:util");
+            const { stdout } = await promisify4(execFile4)(larkBin, ["--profile", appId, "auth", "login", "--no-wait", "--json", "--recommend"]);
             const data = JSON.parse(stdout.trim());
             if (!data.verification_url) throw new Error("no verification_url in response");
             res.writeHead(200, { "content-type": "application/json" }).end(JSON.stringify({ verificationUrl: data.verification_url, deviceCode: data.device_code }));
@@ -22852,14 +22968,14 @@ async function startOasisServer(opts) {
           }
           const larkBin = process.env["LARK_CLI_BIN"] ?? "lark-cli";
           try {
-            const { execFile: execFile3 } = await import("node:child_process");
-            const { promisify: promisify3 } = await import("node:util");
-            const { stdout } = await promisify3(execFile3)(larkBin, ["--profile", appId, "auth", "login", "--device-code", deviceCode, "--json"]);
+            const { execFile: execFile4 } = await import("node:child_process");
+            const { promisify: promisify4 } = await import("node:util");
+            const { stdout } = await promisify4(execFile4)(larkBin, ["--profile", appId, "auth", "login", "--device-code", deviceCode, "--json"]);
             const data = JSON.parse(stdout.trim());
             if (data.ok === false) throw new Error(data.error?.message ?? "login failed");
             let appSecret;
             try {
-              const { stdout: cfgOut } = await promisify3(execFile3)(larkBin, ["--profile", appId, "config", "show", "--json"]);
+              const { stdout: cfgOut } = await promisify4(execFile4)(larkBin, ["--profile", appId, "config", "show", "--json"]);
               const cfg = JSON.parse(cfgOut.trim());
               appSecret = cfg.appSecret ?? cfg.app_secret;
             } catch {
@@ -23005,6 +23121,7 @@ var init_server3 = __esm({
     init_draft_edit();
     init_planner();
     init_identity();
+    init_chat_parts();
     CoordinatorRequiredError = class extends Error {
       constructor(requirement) {
         super(requirement.message ?? "\u7CFB\u7EDF\u7F3A\u5C11\u534F\u8C03\u8005\u667A\u80FD\u4F53\u3002");
@@ -25575,7 +25692,7 @@ var init_service = __esm({
 });
 
 // ../server/src/dev-store.ts
-var import_node_crypto4, fs3, path, NdjsonOplogStore, DirBlobStore, MUTATORS, FileTypeRegistryStore, FileRegistryStore, FileProjectStateStore, FileProjectDocumentStore, FileArtifactStateStore, FileTraceStore, MemoryChatSessionStore;
+var import_node_crypto4, fs3, path, NdjsonOplogStore, DirBlobStore, MUTATORS, FileTypeRegistryStore, FileRegistryStore, FileProjectStateStore, FileProjectDocumentStore, FileArtifactStateStore, FileTraceStore, MemoryChatSessionStore, FileChatSessionStore;
 var init_dev_store = __esm({
   "../server/src/dev-store.ts"() {
     "use strict";
@@ -26016,8 +26133,11 @@ var init_dev_store = __esm({
       }
       async appendMessage(m2) {
         const list = this.messages.get(m2.sessionId) ?? [];
-        list.push(m2);
+        const seq = (list.length ? Math.max(...list.map((x2) => x2.seq)) : 0) + 1;
+        const record4 = { ...m2, seq };
+        list.push(record4);
         this.messages.set(m2.sessionId, list);
+        return record4;
       }
       async listMessages(sessionId, limit) {
         const list = (this.messages.get(sessionId) ?? []).sort((a, b2) => a.seq - b2.seq);
@@ -26032,6 +26152,54 @@ var init_dev_store = __esm({
         return [...this.sessionWorkOrders.get(sessionId) ?? []];
       }
     };
+    FileChatSessionStore = class _FileChatSessionStore extends MemoryChatSessionStore {
+      constructor(file) {
+        super();
+        this.file = file;
+      }
+      static async open(file) {
+        const store = new _FileChatSessionStore(file);
+        if (fs3.existsSync(file)) {
+          const snap = JSON.parse(fs3.readFileSync(file, "utf8"));
+          for (const s2 of snap.sessions ?? []) store.sessions.set(s2.id, s2);
+          for (const [sid, list] of Object.entries(snap.messages ?? {})) store.messages.set(sid, list);
+          for (const [sid, ids] of Object.entries(snap.sessionWorkOrders ?? {})) store.sessionWorkOrders.set(sid, new Set(ids));
+        } else {
+          fs3.mkdirSync(path.dirname(file), { recursive: true });
+          fs3.writeFileSync(file, JSON.stringify({ sessions: [], messages: {}, sessionWorkOrders: {} }, null, 2));
+        }
+        return store;
+      }
+      async createSession(s2) {
+        await super.createSession(s2);
+        this.save();
+      }
+      async updateSession(id, patch) {
+        await super.updateSession(id, patch);
+        this.save();
+      }
+      async deleteSession(id) {
+        await super.deleteSession(id);
+        this.save();
+      }
+      async appendMessage(m2) {
+        const record4 = await super.appendMessage(m2);
+        this.save();
+        return record4;
+      }
+      async linkWorkOrder(sessionId, workOrderId) {
+        await super.linkWorkOrder(sessionId, workOrderId);
+        this.save();
+      }
+      save() {
+        const snap = {
+          sessions: [...this.sessions.values()],
+          messages: Object.fromEntries(this.messages),
+          sessionWorkOrders: Object.fromEntries([...this.sessionWorkOrders].map(([k2, v2]) => [k2, [...v2]]))
+        };
+        fs3.writeFileSync(this.file, JSON.stringify(snap, null, 2));
+      }
+    };
   }
 });
 
@@ -28652,7 +28820,7 @@ var require_websocket = __commonJS({
     var http2 = require("http");
     var net = require("net");
     var tls = require("tls");
-    var { randomBytes: randomBytes5, createHash: createHash6 } = require("crypto");
+    var { randomBytes: randomBytes5, createHash: createHash8 } = require("crypto");
     var { Duplex, Readable } = require("stream");
     var { URL: URL2 } = require("url");
     var PerMessageDeflate2 = require_permessage_deflate();
@@ -29320,7 +29488,7 @@ var require_websocket = __commonJS({
           abortHandshake(websocket, socket, "Invalid Upgrade header");
           return;
         }
-        const digest = createHash6("sha1").update(key + GUID).digest("base64");
+        const digest = createHash8("sha1").update(key + GUID).digest("base64");
         if (res.headers["sec-websocket-accept"] !== digest) {
           abortHandshake(websocket, socket, "Invalid Sec-WebSocket-Accept header");
           return;
@@ -29689,7 +29857,7 @@ var require_websocket_server = __commonJS({
     var EventEmitter = require("events");
     var http2 = require("http");
     var { Duplex } = require("stream");
-    var { createHash: createHash6 } = require("crypto");
+    var { createHash: createHash8 } = require("crypto");
     var extension2 = require_extension();
     var PerMessageDeflate2 = require_permessage_deflate();
     var subprotocol2 = require_subprotocol();
@@ -29996,7 +30164,7 @@ var require_websocket_server = __commonJS({
           );
         }
         if (this._state > RUNNING) return abortHandshake(socket, 503);
-        const digest = createHash6("sha1").update(key + GUID).digest("base64");
+        const digest = createHash8("sha1").update(key + GUID).digest("base64");
         const headers = [
           "HTTP/1.1 101 Switching Protocols",
           "Upgrade: websocket",
@@ -30748,6 +30916,17 @@ ${input.description}
         await this.opts.store.putInstalledSkill(updated);
         return updated;
       }
+      /**
+       * 设置组织技能的「全员生效」标记：true = 挂给本组织所有 agent（无需各 agent 启用）；
+       * false = 回落到「技能库」，由各 agent 在 config.skills 里按需挑选。
+       */
+      async setSkillAppliedToAll(skillId, appliedToAll) {
+        const cur = (await this.opts.store.listInstalledSkills()).find((x2) => x2.id === skillId);
+        if (!cur) throw new Error(`\u672A\u5B89\u88C5\u8BE5\u6280\u80FD\uFF1A${skillId}`);
+        const updated = { ...cur, appliedToAll };
+        await this.opts.store.putInstalledSkill(updated);
+        return updated;
+      }
       /**
        * 已安装技能 + 分配派生：员工←→技能的挂载事实在 actor_configs.skills 版本链里
        * （决策：不另建 assignment 表），这里按各 AI 员工最新配置聚合出"谁挂了它"。
@@ -30779,9 +30958,10 @@ ${input.description}
         return this.opts.store.listConnectors();
       }
       /**
-       * 为指定 AI 员工筛出已启用的技能：取该员工最新 config.skills 列表，
-       * 与公司已安装技能库做交叉，返回有元数据的完整 InstalledSkill 记录。
-       * 供派单装配器在每次会话启动时注入 SKILLS.md。
+       * 为指定 AI 员工筛出**生效**的组织技能 = 该员工 config.skills 显式启用集 ∪ 全组织 appliedToAll 技能，
+       * 与公司已安装技能库做交叉、去重，返回带元数据的完整 InstalledSkill 记录。
+       * （内置技能不在 DB、不走这里，由 filesystem 加载后无条件挂给所有 agent。）
+       * 供派单装配器在每次会话启动时注入技能正文与 TASK.md 索引。
        */
       async listInstalledSkillsForActor(actorId) {
         const [config2, all] = await Promise.all([
@@ -30789,8 +30969,9 @@ ${input.description}
           this.opts.store.listInstalledSkills()
         ]);
         const enabledKeys = new Set(config2?.skills ?? []);
-        if (enabledKeys.size === 0) return [];
-        return all.filter((s2) => enabledKeys.has(s2.id) || enabledKeys.has(s2.name));
+        return all.filter(
+          (s2) => s2.appliedToAll === true || enabledKeys.has(s2.id) || enabledKeys.has(s2.name)
+        );
       }
       /** 全局已装技能平铺列表（「默认挂」materialize 用；installedSkillsWithAssignments 带分配关系太重）。 */
       async listInstalledSkills() {
@@ -31235,6 +31416,16 @@ function actorsDomain(opts) {
       const { service } = await resolveCtx(req.auth.companyId);
       return { status: 200, body: { items: await service.installedSkillsWithAssignments() } };
     });
+    router.get("/api/skills/builtin", async () => {
+      const items = (opts.listBuiltinSkills?.() ?? []).map((s2) => ({
+        ...s2,
+        source: "builtin",
+        enabled: true,
+        appliedToAll: true,
+        builtin: true
+      }));
+      return { status: 200, body: { items } };
+    });
     router.post("/api/skills/install", async (req) => {
       const { service } = await resolveCtx(req.auth.companyId);
       const b2 = req.body;
@@ -31259,6 +31450,10 @@ function actorsDomain(opts) {
     router.patch("/api/skills/:id", async (req) => {
       const { service } = await resolveCtx(req.auth.companyId);
       const b2 = req.body;
+      if (typeof b2?.appliedToAll === "boolean") {
+        const updated = await service.setSkillAppliedToAll(req.params.id, b2.appliedToAll);
+        return { status: 200, body: updated };
+      }
       if (typeof b2?.enabled === "boolean") {
         await service.setSkillEnabled(req.params.id, b2.enabled);
         return { status: 200, body: { ok: true } };
@@ -31270,7 +31465,7 @@ function actorsDomain(opts) {
         });
         return { status: 200, body: updated };
       }
-      throw new ApiError(400, "BAD_REQUEST", "\u4F20 enabled\uFF08\u5F00\u5173\uFF09\u6216 name/description\uFF08\u66F4\u65B0\u5143\u6570\u636E\uFF09");
+      throw new ApiError(400, "BAD_REQUEST", "\u4F20 enabled\uFF08\u5F00\u5173\uFF09/ appliedToAll\uFF08\u5168\u5458\u751F\u6548\uFF09/ name\xB7description\uFF08\u66F4\u65B0\u5143\u6570\u636E\uFF09");
     });
     router.get("/api/actors/:id/stats", async (req) => {
       const { oplog } = await resolveCtx(req.auth.companyId);
@@ -31329,14 +31524,7 @@ function sanitizeSkillDir(name) {
   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];
+  const skills = await args.service.listInstalledSkillsForActor(args.actorId);
   if (skills.length === 0) return {};
   const prefix = skillsDirForRuntime(args.runtimeKind);
   const out = {};
@@ -31414,7 +31602,7 @@ function createActorsDomain(opts) {
     cache.set(companyId, ctx);
     return ctx;
   }
-  return { service: defaultCtx.service, register: actorsDomain({ resolveCtx }) };
+  return { service: defaultCtx.service, register: actorsDomain({ resolveCtx, ...opts.listBuiltinSkills ? { listBuiltinSkills: opts.listBuiltinSkills } : {} }) };
 }
 var import_node_crypto6;
 var init_actors = __esm({
@@ -32206,84 +32394,12 @@ var init_projects = __esm({
   }
 });
 
-// ../server/src/domains/companies/migrate.ts
-async function migrateDefaultCompany(store, actors, opts = {}) {
-  const now = opts.now ?? (() => (/* @__PURE__ */ new Date()).toISOString());
-  let company = await store.getCompany(DEFAULT_COMPANY_ID);
-  let createdCompany = false;
-  if (!company) {
-    company = {
-      id: DEFAULT_COMPANY_ID,
-      slug: DEFAULT_COMPANY_SLUG,
-      name: DEFAULT_COMPANY_NAME,
-      status: "active",
-      createdAt: now()
-    };
-    await store.createCompany(company);
-    createdCompany = true;
-  }
-  let addedMembers = 0;
-  for (const a of actors) {
-    if (!await store.getMember(DEFAULT_COMPANY_ID, a.id)) {
-      await store.upsertMember({ companyId: DEFAULT_COMPANY_ID, accountId: a.id, actorId: a.id, role: "member" });
-      addedMembers++;
-    }
-  }
-  let designatedOwner;
-  const members = await store.listMembers(DEFAULT_COMPANY_ID);
-  if (members.length > 0 && !members.some((m2) => m2.role === "owner")) {
-    const sorted = [...actors].sort((x2, y) => x2.id.localeCompare(y.id));
-    const pick2 = sorted.find((a) => a.kind === "human") ?? sorted[0];
-    if (pick2) {
-      await store.upsertMember({ companyId: DEFAULT_COMPANY_ID, accountId: pick2.id, actorId: pick2.id, role: "owner" });
-      designatedOwner = pick2.id;
-    }
-  }
-  return {
-    company,
-    createdCompany,
-    addedMembers,
-    ...designatedOwner !== void 0 ? { designatedOwner } : {}
-  };
-}
-async function ensureCompanyActors(store, companyId, registry2, opts = {}) {
-  const now = opts.now ?? (() => (/* @__PURE__ */ new Date()).toISOString());
-  const members = await store.listMembers(companyId);
-  let created = 0;
-  for (const m2 of members) {
-    if (await registry2.getActor(m2.actorId)) continue;
-    const account = await store.getAccount(m2.accountId);
-    const rec = {
-      id: m2.actorId,
-      kind: "human",
-      name: account?.name ?? m2.accountId,
-      ...account?.email ? { email: account.email } : {},
-      roles: [],
-      status: "active",
-      createdAt: now()
-    };
-    await registry2.upsertActor(rec);
-    created++;
-  }
-  return created;
-}
-var DEFAULT_COMPANY_ID, DEFAULT_COMPANY_SLUG, DEFAULT_COMPANY_NAME;
-var init_migrate = __esm({
-  "../server/src/domains/companies/migrate.ts"() {
-    "use strict";
-    DEFAULT_COMPANY_ID = "company:oasis";
-    DEFAULT_COMPANY_SLUG = "oasis";
-    DEFAULT_COMPANY_NAME = "Oasis \u603B\u90E8";
-  }
-});
-
 // ../server/src/domains/companies/service.ts
 var import_node_crypto7, ROLES, INVITABLE_ROLES, INVITATION_TTL_MS, SLUG_RE, CompanyError, CompaniesService;
 var init_service3 = __esm({
   "../server/src/domains/companies/service.ts"() {
     "use strict";
     import_node_crypto7 = require("node:crypto");
-    init_migrate();
     ROLES = ["owner", "admin", "member"];
     INVITABLE_ROLES = ["admin", "member"];
     INVITATION_TTL_MS = 7 * 24 * 60 * 60 * 1e3;
@@ -32354,16 +32470,25 @@ var init_service3 = __esm({
         return membership;
       }
       /**
-       * CO-101 当前公司解析：默认归到「Oasis 总部」(company:hq)，可由 selector（公司 id 或 slug）改选——
-       * 这是「先恒等到默认公司、留接缝」的接缝（CO-301 路由层据此取/懒建对应引擎）。
-       * 返回 company + 该用户是否其成员；公司不存在返回 null。
+       * 当前公司解析（动态、随登录用户走）：
+       * - 带 selector（公司 id 或 slug）→ 按它取公司（CO-301 路由层据此取/懒建对应引擎）。
+       * - 不带 selector → 回退到**该用户自己的**第一个 active 公司（按 membership），而非全局硬编默认公司。
+       *   前端 CompanyProvider 也是这个语义（存的当前公司不在列表时回退列表首个）。
+       * 返回 company + 该用户是否其成员；找不到（selector 不存在，或用户无任何 active 公司）返回 null。
        */
       async resolveCurrentCompany(accountId, selector) {
         let company;
         if (selector) {
           company = await this.store.getCompany(selector) ?? await this.store.getCompanyBySlug(selector);
         } else {
-          company = await this.store.getCompany(DEFAULT_COMPANY_ID);
+          company = null;
+          for (const m2 of await this.store.listMembershipsForAccount(accountId)) {
+            const c = await this.store.getCompany(m2.companyId);
+            if (c?.status === "active") {
+              company = c;
+              break;
+            }
+          }
         }
         if (!company) return null;
         const member = await this.store.getMember(company.id, accountId);
@@ -32606,6 +32731,84 @@ var init_routes3 = __esm({
   }
 });
 
+// ../server/src/domains/companies/migrate.ts
+function resolveDefaultCompanyConfig(env = process.env) {
+  const slug4 = env["OASIS_DEFAULT_COMPANY_SLUG"]?.trim() || "oasis";
+  const name = env["OASIS_DEFAULT_COMPANY_NAME"]?.trim() || "Oasis \u603B\u90E8";
+  return { id: `company:${slug4}`, slug: slug4, name };
+}
+async function migrateDefaultCompany(store, actors, opts = {}) {
+  const now = opts.now ?? (() => (/* @__PURE__ */ new Date()).toISOString());
+  const cfg = resolveDefaultCompanyConfig(opts.env);
+  let company = await store.getCompany(cfg.id);
+  let createdCompany = false;
+  if (!company) {
+    company = {
+      id: cfg.id,
+      slug: cfg.slug,
+      name: cfg.name,
+      status: "active",
+      createdAt: now()
+    };
+    await store.createCompany(company);
+    createdCompany = true;
+  }
+  let addedMembers = 0;
+  for (const a of actors) {
+    if (!await store.getMember(cfg.id, a.id)) {
+      await store.upsertMember({ companyId: cfg.id, accountId: a.id, actorId: a.id, role: "member" });
+      addedMembers++;
+    }
+  }
+  let designatedOwner;
+  const members = await store.listMembers(cfg.id);
+  if (members.length > 0 && !members.some((m2) => m2.role === "owner")) {
+    const sorted = [...actors].sort((x2, y) => x2.id.localeCompare(y.id));
+    const pick2 = sorted.find((a) => a.kind === "human") ?? sorted[0];
+    if (pick2) {
+      await store.upsertMember({ companyId: cfg.id, accountId: pick2.id, actorId: pick2.id, role: "owner" });
+      designatedOwner = pick2.id;
+    }
+  }
+  return {
+    company,
+    createdCompany,
+    addedMembers,
+    ...designatedOwner !== void 0 ? { designatedOwner } : {}
+  };
+}
+async function ensureCompanyActors(store, companyId, registry2, opts = {}) {
+  const now = opts.now ?? (() => (/* @__PURE__ */ new Date()).toISOString());
+  const members = await store.listMembers(companyId);
+  let created = 0;
+  for (const m2 of members) {
+    if (await registry2.getActor(m2.actorId)) continue;
+    const account = await store.getAccount(m2.accountId);
+    const rec = {
+      id: m2.actorId,
+      kind: "human",
+      name: account?.name ?? m2.accountId,
+      ...account?.email ? { email: account.email } : {},
+      roles: [],
+      status: "active",
+      createdAt: now()
+    };
+    await registry2.upsertActor(rec);
+    created++;
+  }
+  return created;
+}
+var _defaultCompany, DEFAULT_COMPANY_ID, DEFAULT_COMPANY_SLUG, DEFAULT_COMPANY_NAME;
+var init_migrate = __esm({
+  "../server/src/domains/companies/migrate.ts"() {
+    "use strict";
+    _defaultCompany = resolveDefaultCompanyConfig();
+    DEFAULT_COMPANY_ID = _defaultCompany.id;
+    DEFAULT_COMPANY_SLUG = _defaultCompany.slug;
+    DEFAULT_COMPANY_NAME = _defaultCompany.name;
+  }
+});
+
 // ../server/src/domains/companies/index.ts
 function createCompaniesDomain(opts) {
   const service = new CompaniesService({
@@ -33282,19 +33485,29 @@ function nodesDomain(deps) {
       const entry = deps.enrollTokens.peek(enrollToken);
       if (!entry) return { status: 401, body: { error: "invalid or expired enroll token" } };
       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) {
+      } else if (incomingNodeId) {
         nodeId = incomingNodeId;
         deps.enrollTokens.setIssuedNodeId(enrollToken, nodeId);
       } else {
         nodeId = `node-${(0, import_node_crypto9.randomUUID)().slice(0, 8)}`;
         deps.enrollTokens.setIssuedNodeId(enrollToken, nodeId);
       }
+      const existingNode = await deps.nodeStore.getNode(nodeId);
+      if (!existingNode || existingNode.status === "deleted") {
+        const nowIso = (/* @__PURE__ */ new Date()).toISOString();
+        await deps.nodeStore.upsertNode({
+          id: nodeId,
+          hostname: body.hostname ?? existingNode?.hostname ?? "unknown",
+          nodeVersion: existingNode?.nodeVersion ?? "unknown",
+          status: "online",
+          lastSeenAt: nowIso,
+          enrolledAt: existingNode?.enrolledAt ?? nowIso,
+          ...entry.name ? { name: entry.name } : existingNode?.name ? { name: existingNode.name } : {}
+        });
+      }
       deps.enrollTokens.consume(enrollToken);
       if (entry.name) await deps.nodeStore.updateNodeName(nodeId, entry.name);
       const existing = deps.nodeTokens.list().find((e) => e.nodeId === nodeId);
@@ -35068,69 +35281,6 @@ var init_sink = __esm({
   }
 });
 
-// ../server/src/domains/trace/chat-parts.ts
-function asObj2(v2) {
-  return v2 && typeof v2 === "object" && !Array.isArray(v2) ? v2 : void 0;
-}
-function textOf2(v2) {
-  if (typeof v2 === "string") return v2;
-  if (Array.isArray(v2)) return v2.map(textOf2).filter(Boolean).join("\n") || void 0;
-  const o = asObj2(v2);
-  if (o) {
-    if (typeof o.text === "string") return o.text;
-    if (typeof o.content === "string") return o.content;
-    if (typeof o.thinking === "string") return o.thinking;
-  }
-  return void 0;
-}
-function truncate(s2, limit = OUTPUT_PREVIEW_LIMIT) {
-  return s2.length > limit ? `${s2.slice(0, limit)}\u2026` : s2;
-}
-function deriveChatPartsFromEvents(events) {
-  const parts = [];
-  for (const ev of [...events].sort((a, b2) => a.seq - b2.seq)) {
-    const p2 = asObj2(ev.payload);
-    const kind = p2 && typeof p2.kind === "string" ? p2.kind : void 0;
-    const raw = p2?.raw;
-    if (kind === "thought") {
-      const text = textOf2(raw);
-      if (text) parts.push({ type: "thinking", seq: ev.seq, text });
-      continue;
-    }
-    if (kind === "tool_use") {
-      const ro = asObj2(raw);
-      parts.push({
-        type: "tool_use",
-        seq: ev.seq,
-        toolName: ro && typeof ro.name === "string" ? ro.name : "tool",
-        ...ro && ro.input !== void 0 ? { input: ro.input } : {},
-        ...ro && typeof ro.id === "string" ? { toolCallId: ro.id } : {}
-      });
-      continue;
-    }
-    if (kind === "tool_result") {
-      const ro = asObj2(raw);
-      const output = textOf2(raw) ?? "";
-      parts.push({
-        type: "tool_result",
-        seq: ev.seq,
-        output: truncate(output),
-        isError: ro?.is_error === true || ro?.isError === true,
-        ...ro && typeof ro.tool_use_id === "string" ? { toolCallId: ro.tool_use_id } : {}
-      });
-      continue;
-    }
-  }
-  return parts;
-}
-var OUTPUT_PREVIEW_LIMIT;
-var init_chat_parts = __esm({
-  "../server/src/domains/trace/chat-parts.ts"() {
-    "use strict";
-    OUTPUT_PREVIEW_LIMIT = 4e3;
-  }
-});
-
 // ../server/src/domains/trace/index.ts
 function createTraceDomain(opts) {
   const service = new TraceService({ store: opts.store });
@@ -35156,9 +35306,9 @@ function createChatSessionsDomain(opts) {
     return binding?.nodeId ?? null;
   }
   async function enrichMessages(messages) {
-    if (!opts.trace) return messages;
     return Promise.all(messages.map(async (m2) => {
-      if (!m2.runId) return m2;
+      if (Array.isArray(m2.parts) && m2.parts.length) return m2;
+      if (!opts.trace || !m2.runId) return m2;
       const events = await opts.trace.listEvents(m2.runId, {}).catch(() => []);
       const parts = deriveChatPartsFromEvents(events);
       return parts.length ? { ...m2, parts } : m2;
@@ -35222,17 +35372,14 @@ function createChatSessionsDomain(opts) {
       const body = req.body;
       if (!body?.role || !body?.content) throw new ApiError(400, "BAD_REQUEST", "role and content required");
       if (body.role !== "user" && body.role !== "assistant") throw new ApiError(400, "BAD_REQUEST", "role must be user or assistant");
-      const existing = await store.listMessages(req.params.id);
-      const msg = {
+      const msg = await store.appendMessage({
         id: (0, import_node_crypto10.randomUUID)(),
         sessionId: req.params.id,
         role: body.role,
         content: body.content,
-        seq: existing.length + 1,
         createdAt: (/* @__PURE__ */ new Date()).toISOString(),
         ...body.runId ? { runId: body.runId } : {}
-      };
-      await store.appendMessage(msg);
+      });
       await store.updateSession(req.params.id, { touchedAt: (/* @__PURE__ */ new Date()).toISOString() });
       return { status: 201, body: msg };
     });
@@ -37108,7 +37255,8 @@ var init_worker = __esm({
           limits,
           // OASIS_STAGE=1：本会话里 link/spawn/unlink/seal/cancel-part 进编辑缓冲、apply 才提交（react 攒事务）。
           env: { ...prov?.env ?? {}, OASIS_STAGE: "1", ...workspace ? { OASIS_WORKSPACE: workspace } : {} },
-          ...prov?.wrapperPaths && prov.wrapperPaths.length > 0 ? { wrapperPaths: prov.wrapperPaths } : {}
+          ...prov?.wrapperPaths && prov.wrapperPaths.length > 0 ? { wrapperPaths: prov.wrapperPaths } : {},
+          ...prov?.requiredTools && prov.requiredTools.length > 0 ? { requiredTools: prov.requiredTools } : {}
         };
         this.deps.log?.(`[coordinator] ${logMsg}`);
         const handle = await this.deps.adapter.spawn(job);
@@ -37135,112 +37283,75 @@ var init_worker = __esm({
   }
 });
 
-// ../server/src/governance/build-workorder-skill.ts
-async function bootstrapBuildWorkorderSkill(service) {
-  const SYSTEM = "actor:system:bootstrap";
-  const installed = await service.listInstalledSkills();
-  if (!installed.some((s2) => s2.id === BUILD_WORKORDER_SKILL_ID)) {
-    await service.installCustomSkill(
-      { id: BUILD_WORKORDER_SKILL_ID, name: BUILD_WORKORDER_SKILL_ID, description: DESCRIPTION, source: "custom" },
-      SYSTEM
-    );
+// ../server/src/governance/builtin-skills.ts
+async function collectDir(root, dir, out) {
+  const entries = await (0, import_promises.readdir)(dir, { withFileTypes: true });
+  for (const e of entries) {
+    const abs = (0, import_node_path.join)(dir, e.name);
+    if (e.isDirectory()) {
+      await collectDir(root, abs, out);
+    } else if (e.isFile()) {
+      const info = await (0, import_promises.stat)(abs);
+      if (info.size > MAX_FILE_BYTES2) {
+        console.warn(`[builtin-skills] skip oversized file (${info.size}B): ${abs}`);
+        continue;
+      }
+      const rel = (0, import_node_path.relative)(root, abs).split(/[\\/]/).join("/");
+      out[rel] = await (0, import_promises.readFile)(abs, "utf8");
+    }
+  }
+}
+async function loadBuiltinSkills(skillsDir) {
+  let dirents;
+  try {
+    dirents = await (0, import_promises.readdir)(skillsDir, { withFileTypes: true });
+  } catch {
+    return [];
+  }
+  const skills = [];
+  for (const d of dirents) {
+    if (!d.isDirectory()) continue;
+    const slug4 = d.name;
+    const skillDir = (0, import_node_path.join)(skillsDir, slug4);
+    const files = {};
+    try {
+      await collectDir(skillDir, skillDir, files);
+    } catch (err) {
+      console.warn(`[builtin-skills] failed reading ${slug4}: ${String(err)}`);
+      continue;
+    }
+    const skillMd = files["SKILL.md"];
+    if (!skillMd) {
+      console.warn(`[builtin-skills] ${slug4} has no SKILL.md, skipping`);
+      continue;
+    }
+    const { name, description } = parseSkillFrontmatter(skillMd);
+    skills.push({ id: slug4, name: name || slug4, description, files });
+  }
+  return skills;
+}
+function materializeBuiltinSkills(builtins, skillsDirPrefix) {
+  const out = {};
+  for (const skill of builtins) {
+    const dir = sanitize(skill.name || skill.id);
+    for (const [rel, content] of Object.entries(skill.files)) {
+      out[`${skillsDirPrefix}/${dir}/${rel}`] = content;
+    }
   }
-  await service.putSkillFile(BUILD_WORKORDER_SKILL_ID, "SKILL.md", BUILD_WORKORDER_SKILL_MD);
+  return out;
 }
-var BUILD_WORKORDER_SKILL_ID, DESCRIPTION, BUILD_WORKORDER_SKILL_MD;
-var init_build_workorder_skill = __esm({
-  "../server/src/governance/build-workorder-skill.ts"() {
+function sanitize(name) {
+  const s2 = name.toLowerCase().trim().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
+  return s2 || "skill";
+}
+var import_promises, import_node_path, MAX_FILE_BYTES2;
+var init_builtin_skills = __esm({
+  "../server/src/governance/builtin-skills.ts"() {
     "use strict";
-    BUILD_WORKORDER_SKILL_ID = "build-workorder";
-    DESCRIPTION = "\u628A\u804A\u6E05\u695A\u7684\u9700\u6C42\u843D\u6210\u4E00\u5F20\u5DE5\u5355\uFF08\u534F\u4F5C\u56FE\uFF09\uFF0C\u4EE5\u53CA\u5728\u4EBA\u786E\u8BA4\u524D\u7EE7\u7EED\u6539\u8FD9\u4EFD\u8349\u6848\u3002\u5F53\u7528\u6237\u8981\u5EFA\u5355/\u7ACB\u9879\uFF0C\u6216\u8981\u8C03\u6574\u521A\u751F\u6210\u7684\u5DE5\u5355\u8349\u6848\u65F6\u7528\u672C\u6280\u80FD\uFF1A\u67E5\u91CD oasis workorders \u2192 \u5EFA\u5355 oasis create-workorder \u2192 \u6539\u8349\u6848 oasis spawn/edit/link/cancel\u3002";
-    BUILD_WORKORDER_SKILL_MD = String.raw`---
-name: build-workorder
-description: ${DESCRIPTION}
----
-
-# 建单：把对话落成一张工单
-
-工单 = 一张以产物为中心的协作图：一个根 ´brief´（工单总规格）+ 若干分解节点（prd/research/design/dev/qa…），节点间连依赖边。你把对话敲定的内容**结构化暂存**成一份草案，人在编辑器里看、确认才真创建。
-
-## 流程
-1. **查重** ´oasis workorders --search <词>´：有没有类似工单在做/做过，别重复立项。
-2. **建单** ´oasis create-workorder …´：暂存**草案**（stage=draft，人确认才真创建），命令**直接打印** workspace（工单 id）+ 各节点 id。
-3. **改草案** ´oasis spawn/edit/link/cancel …´：人确认前，随时调这份草案（加/删/改节点、连边）。
-4. 人在编辑器确认 → 工单创建。**你不用 apply**，确认是人的事。
-
-## 一、查重（建单前必做）
-- ´oasis workorders --search <关键词>´：列/搜工单。命中类似的 → ´oasis workorder <工单id>´ 看详情，已覆盖就别再建、跟用户说明。
-
-## 二、建单
-信息不足、关键决策没定**别硬建**，用文字问用户；一个工单一个目标，多件独立的事拆成多张。
-
-´´´bash
-oasis create-workorder \
-  --type <工单主产物类型，如 prd；根 brief 自动建> \
-  --title "工单名，名词短语，≤20字" \
-  --goal "一句话目标，≤50字" \
-  --brief "完整规格(markdown)：背景、关键决策、约束、范围、不做什么" \
-  --acceptance '["逐条可判定的验收条件","没聊到给 []"]' \
-  --plan '<节点分解 JSON，见下>'
-´´´
-**不用填 workspace——系统自动生成工单 id。** 命令**直接打印 workspace（工单 id）和每个节点的 id**，记住它们、改草案要用——**不必再去 query**。它产出的是**草案**（stage=draft）：人在编辑器确认才真创建，你别拿它当活工单使。
-
-### --plan 结构
-´´´json
-{
-  "nodes": [
-    { "type": "节点类型", "title": "≤20字，同 type 内唯一",
-      "dependsOn": ["上游节点写 type:title，如 prd:需求；无上游写 []"],
-      "brief": "这个节点具体要产出什么的规格，别套模板、别只写类型名" }
-  ],
-  "notes": ["可选：分解理由/缺口；没有给 []"]
-}
-´´´
-
-## 三、改草案（人确认前随时改）
-建单后草案在编辑器里等人确认。用户要调整就用下面的命令改这份草案（**改完即时生效、人在编辑器里能看到**，你不用 apply）：
-
-**节点引用 = id 或 type:title，分清：**
-- **填完整 id**（´oasis workorder´ / create 返回的，如 ´artifact:prd:x7k2-需求´）→ **不用带 workspace**。推荐。
-- **填 type:title**（简写，如 ´prd:需求´）→ **必须加 ´--workspace <工单id>´**（create 返回的那个）。
-- ´spawn´ 是新建节点、没有现成 id → **一律带 ´--workspace´**。
-
-´´´bash
-# 加节点（带 workspace；--input 上游可用 type:title）
-oasis spawn --type qa --title 验收用例 --brief "覆盖登录成功/失败" --input dev:实现 --workspace ws:wo-x7k2
-# 改节点标题/规格（用 id，免 workspace）
-oasis edit artifact:prd:x7k2-需求 --title "需求与范围"
-# 连边：消费者依赖上游
-oasis link artifact:qa:x7k2-验收 --to artifact:dev:x7k2-实现
-# 删节点（从草案删掉，连它的边一起摘）
-oasis cancel prd:需求 --workspace ws:wo-x7k2
-´´´
-
-# 命令参考
-
-## 查询
-- ´oasis workorders [--search <词>]´ —— 列/搜工单（id/名/阶段/进度）。无参列全部；´--search´ 端侧过滤。
-- ´oasis workorder <工单id>´ —— 工单详情：**stage**（draft 草案 / executing 进行中 / review 评审 / blocked 卡住 / concluded 已完成 / sealed 已封存）+ 目标/验收 + 节点（id/type）+ 依赖边。**刚建的草案这里 ´stage=draft´、也查得到（含各节点 id）**；真查不到才报不存在。
-- ´oasis artifact-types list | search <词> | show <type>´ —— 看可用节点类型（´show´ 看该类型可填的自定义字段）。
-- ´oasis projects [--search <词>]´ —— 列/搜项目（建单 ´--project´ 用）。
-
-## 建单
-- ´oasis create-workorder --type <t> --title <s> [--goal <s>] [--brief <s>] [--acceptance '<json string[]>'] [--plan '<json>'] [--project <id>]´
-  暂存建单草案。´--type´=主产物类型（必填，根 brief 自动建）；´--title´ 必填。**不填 workspace（系统生成）**。返回 ´workspace´ + 各节点 ´id´。
-
-## 改草案（引用 id 不带 workspace；引用 type:title 或 spawn 带 ´--workspace <工单id>´）
-- ´oasis spawn --type <t> --title <s> [--brief <s>] [--input <ref>,<ref>…] --workspace <工单id>´ —— 加节点，id 据 (type,title) 自动派生。´--type´/´--title´ 必填，title 同 type 唯一；´--input´=上游依赖（逗号分隔）。
-- ´oasis edit <ref> [--title <s>] [--brief <s>]´ —— 改节点标题/规格。
-- ´oasis link <consumer-ref> --to <upstream-ref> [--required true]´ —— 加依赖边。´--required true´=阻塞性（上游没完成下游动不了），省=软依赖。
-- ´oasis unlink <consumer-ref> --to <upstream-ref>´ —— 删依赖边。
-- ´oasis cancel <ref> [--note <s>]´ —— 从草案删节点（连它的边一起摘）。
-
-## 规则
-- **节点类型**：先 ´oasis artifact-types list/search/show´ 挑最贴合的；都不贴合用 ´oasis artifact-types add <name> --content-type <text|code|…> --owner-role <角色>´ 新建再用。常见：prd、research、design、adr、dev、qa。
-- **title**：≤20字、同 type 内唯一、别用半角冒号 ´:´（与 type:title 分隔冲突，要冒号用全角 ´：´）。一个工单可多个同 type 节点，靠 title 区分。
-- **项目**：归某项目就 ´oasis projects --search <词>´ 找 id 再加 ´--project´。
-- **边界**：你只管图的结构与规格，不替用户拍产品决策——拿不准就问。改**已建好的活工单**是协调者的活，不在本技能范围。
-`.replace(/´/g, "`");
+    import_promises = require("node:fs/promises");
+    import_node_path = require("node:path");
+    init_skill_fetcher();
+    MAX_FILE_BYTES2 = 1 << 20;
   }
 });
 
@@ -37283,7 +37394,7 @@ var init_src4 = __esm({
     init_worker();
     init_drafts();
     init_workorder_drafts();
-    init_build_workorder_skill();
+    init_builtin_skills();
   }
 });
 
@@ -38855,11 +38966,11 @@ var require_pg_connection_string = __commonJS({
         config2.client_encoding = result.searchParams.get("encoding");
         return config2;
       }
-      const hostname5 = dummyHost ? "" : result.hostname;
+      const hostname6 = dummyHost ? "" : result.hostname;
       if (!config2.host) {
-        config2.host = decodeURIComponent(hostname5);
-      } else if (hostname5 && /^%2f/i.test(hostname5)) {
-        result.pathname = hostname5 + result.pathname;
+        config2.host = decodeURIComponent(hostname6);
+      } else if (hostname6 && /^%2f/i.test(hostname6)) {
+        result.pathname = hostname6 + result.pathname;
       }
       if (!config2.port) {
         config2.port = result.port;
@@ -40824,8 +40935,8 @@ var require_lib = __commonJS({
     var helper = require_helper();
     module2.exports = function(connInfo, cb) {
       var file = helper.getFileName();
-      fs17.stat(file, function(err, stat) {
-        if (err || !helper.usePgPass(stat, file)) {
+      fs17.stat(file, function(err, stat2) {
+        if (err || !helper.usePgPass(stat2, file)) {
           return cb(void 0);
         }
         var st = fs17.createReadStream(file);
@@ -41500,7 +41611,7 @@ var require_pg_pool = __commonJS({
     function throwOnDoubleRelease() {
       throw new Error("Release called on client which has already been released to the pool.");
     }
-    function promisify3(Promise2, callback) {
+    function promisify4(Promise2, callback) {
       if (callback) {
         return { callback, result: void 0 };
       }
@@ -41638,7 +41749,7 @@ var require_pg_pool = __commonJS({
           const err = new Error("Cannot use a pool after calling end on the pool");
           return cb ? cb(err) : this.Promise.reject(err);
         }
-        const response = promisify3(this.Promise, cb);
+        const response = promisify4(this.Promise, cb);
         const result = response.result;
         if (this._isFull() || this._idle.length) {
           if (this._idle.length) {
@@ -41823,7 +41934,7 @@ var require_pg_pool = __commonJS({
       }
       query(text, values, cb) {
         if (typeof text === "function") {
-          const response2 = promisify3(this.Promise, text);
+          const response2 = promisify4(this.Promise, text);
           setImmediate(function() {
             return response2.callback(new Error("Passing a function as the first parameter to pool.query is not supported"));
           });
@@ -41833,7 +41944,7 @@ var require_pg_pool = __commonJS({
           cb = values;
           values = void 0;
         }
-        const response = promisify3(this.Promise, cb);
+        const response = promisify4(this.Promise, cb);
         cb = response.callback;
         this.connect((err, client) => {
           if (err) {
@@ -41878,7 +41989,7 @@ var require_pg_pool = __commonJS({
           return cb ? cb(err) : this.Promise.reject(err);
         }
         this.ending = true;
-        const promised = promisify3(this.Promise, cb);
+        const promised = promisify4(this.Promise, cb);
         this._endCallback = promised.callback;
         this._pulseQueue();
         return promised.result;
@@ -42472,30 +42583,138 @@ var init_trajectory = __esm({
 var fs16 = __toESM(require("node:fs"));
 var os8 = __toESM(require("node:os"));
 var path13 = __toESM(require("node:path"));
-var import_node_child_process10 = require("node:child_process");
+var import_node_child_process12 = require("node:child_process");
 
 // ../cli/src/cli.ts
 var fs15 = __toESM(require("node:fs"), 1);
 var os7 = __toESM(require("node:os"), 1);
 var path12 = __toESM(require("node:path"), 1);
-var import_node_crypto21 = require("node:crypto");
+var import_node_crypto23 = require("node:crypto");
 
 // ../cli/src/serve.ts
 var fs14 = __toESM(require("node:fs"), 1);
 var os6 = __toESM(require("node:os"), 1);
 var path11 = __toESM(require("node:path"), 1);
-var import_node_crypto20 = require("node:crypto");
+var import_node_crypto21 = require("node:crypto");
 var import_node_url3 = require("node:url");
 init_src2();
 init_src4();
 
-// ../connectors/src/feishu/index.ts
+// ../connectors/src/_base/stage.ts
+var import_node_fs2 = require("node:fs");
+var import_node_os = require("node:os");
+var import_node_path2 = require("node:path");
+var stagedBinDirs = /* @__PURE__ */ new Map();
+function stageConnectorWrapper(connector) {
+  const scriptPath = connector.wrapperScriptPath();
+  if (scriptPath === null) return null;
+  const commandName = connector.commandName;
+  if (!commandName) {
+    throw new Error(`connector ${connector.config.slug}: commandName \u4E3A\u7A7A\uFF0CCLI \u7C7B\u5FC5\u987B\u58F0\u660E\u8981\u906E\u853D\u7684\u547D\u4EE4\u540D`);
+  }
+  const cacheKey = `${commandName}\0${scriptPath}`;
+  const cached2 = stagedBinDirs.get(cacheKey);
+  if (cached2 && (0, import_node_fs2.existsSync)((0, import_node_path2.join)(cached2, commandName))) return (0, import_node_path2.join)(cached2, commandName);
+  const binDir = (0, import_node_fs2.mkdtempSync)((0, import_node_path2.join)((0, import_node_os.tmpdir)(), `oasis-conn-${connector.config.slug}-`));
+  const link = (0, import_node_path2.join)(binDir, commandName);
+  (0, import_node_fs2.symlinkSync)(scriptPath, link);
+  stagedBinDirs.set(cacheKey, binDir);
+  return link;
+}
+
+// ../connectors/src/_base/install.ts
 var import_node_child_process3 = require("node:child_process");
 var import_node_util = require("node:util");
-var import_node_path = require("node:path");
-var import_node_url = require("node:url");
 var execFileAsync = (0, import_node_util.promisify)(import_node_child_process3.execFile);
-var __dirname = (0, import_node_path.dirname)((0, import_node_url.fileURLToPath)(__esm_import_meta_url));
+function installPlan(cmd, platform) {
+  if (cmd === "lark-cli") {
+    const npm = platform === "win32" ? "npm.cmd" : "npm";
+    return [{ file: npm, args: ["install", "-g", "@larksuite/cli"] }];
+  }
+  const pkg = cmd === "gh" ? { brew: "gh", apt: "gh", dnf: "gh", pacman: "github-cli", apk: "github-cli", winget: "GitHub.cli", choco: "gh", scoop: "gh" } : { brew: "git", apt: "git", dnf: "git", pacman: "git", apk: "git", winget: "Git.Git", choco: "git", scoop: "git" };
+  if (platform === "darwin") {
+    return [{ file: "brew", args: ["install", pkg.brew], requires: "brew" }];
+  }
+  if (platform === "win32") {
+    return [
+      { file: "winget", args: ["install", "--silent", "--accept-package-agreements", "--accept-source-agreements", "-e", "--id", pkg.winget], requires: "winget" },
+      { file: "choco", args: ["install", "-y", pkg.choco], requires: "choco" },
+      { file: "scoop", args: ["install", pkg.scoop], requires: "scoop" }
+    ];
+  }
+  return [
+    { file: "sudo", args: ["apt-get", "install", "-y", "--no-install-recommends", pkg.apt], requires: "apt-get" },
+    { file: "sudo", args: ["dnf", "install", "-y", pkg.dnf], requires: "dnf" },
+    { file: "sudo", args: ["pacman", "-S", "--noconfirm", pkg.pacman], requires: "pacman" },
+    { file: "sudo", args: ["apk", "add", pkg.apk], requires: "apk" }
+  ];
+}
+var confirmed = /* @__PURE__ */ new Set();
+function defaultDeps() {
+  const whichCmd = process.platform === "win32" ? "where" : "which";
+  const probe = async (cmd) => {
+    try {
+      await execFileAsync(whichCmd, [cmd]);
+      return true;
+    } catch {
+      return false;
+    }
+  };
+  return {
+    isPresent: probe,
+    hasCommand: probe,
+    run: async (file, args) => {
+      await execFileAsync(file, args, { timeout: 18e4 });
+    },
+    platform: process.platform,
+    log: (msg) => console.warn(msg)
+  };
+}
+async function ensureToolInstalled(cmd, deps = {}) {
+  const d = { ...defaultDeps(), ...deps };
+  if (confirmed.has(cmd)) return true;
+  if (await d.isPresent(cmd)) {
+    confirmed.add(cmd);
+    return true;
+  }
+  const steps = installPlan(cmd, d.platform);
+  if (steps.length === 0) {
+    d.log(`[connector-install] ${cmd} \u7F3A\u5931\uFF0C\u4E14 ${d.platform} \u4E0B\u65E0\u5DF2\u77E5\u81EA\u52A8\u5B89\u88C5\u6CD5\u2014\u2014\u8BF7\u624B\u52A8\u5B89\u88C5`);
+    return false;
+  }
+  d.log(`[connector-install] ${cmd} \u7F3A\u5931\uFF0C\u5C1D\u8BD5\u81EA\u52A8\u5B89\u88C5\u2026`);
+  for (const step of steps) {
+    if (step.requires && !await d.hasCommand(step.requires)) continue;
+    try {
+      await d.run(step.file, step.args);
+      if (await d.isPresent(cmd)) {
+        confirmed.add(cmd);
+        d.log(`[connector-install] ${cmd} \u5B89\u88C5\u6210\u529F\uFF08${step.file} ${step.args.join(" ")}\uFF09`);
+        return true;
+      }
+    } catch (err) {
+      d.log(`[connector-install] ${cmd} \u5B89\u88C5\u5C1D\u8BD5\u5931\u8D25\uFF08${step.file}\uFF09\uFF1A${String(err)}`);
+    }
+  }
+  d.log(`[connector-install] ${cmd} \u81EA\u52A8\u5B89\u88C5\u672A\u6210\u529F\u2014\u2014\u5C06\u56DE\u9000\u5230 wrapper/\u547D\u4EE4\u81EA\u8EAB\u62A5\u9519`);
+  return false;
+}
+async function ensureConnectorTools(tools, deps = {}) {
+  if (!tools || tools.length === 0) return [];
+  const missing = [];
+  for (const cmd of tools) {
+    if (!await ensureToolInstalled(cmd, deps)) missing.push(cmd);
+  }
+  return missing;
+}
+
+// ../connectors/src/feishu/index.ts
+var import_node_child_process4 = require("node:child_process");
+var import_node_util2 = require("node:util");
+var import_node_path3 = require("node:path");
+var import_node_url = require("node:url");
+var execFileAsync2 = (0, import_node_util2.promisify)(import_node_child_process4.execFile);
+var __dirname = (0, import_node_path3.dirname)((0, import_node_url.fileURLToPath)(__esm_import_meta_url));
 var FeishuConnector = class {
   config = {
     slug: "feishu",
@@ -42504,6 +42723,10 @@ var FeishuConnector = class {
       { key: "app_id", description: "\u98DE\u4E66 App ID\uFF08\u7559\u7A7A\u5219\u81EA\u52A8\u521B\u5EFA\u65B0\u5E94\u7528\uFF09", secret: false, required: false }
     ]
   };
+  /** wrapper 在 agent PATH 上冒名的命令——必须与真实 CLI 同名，否则遮蔽不生效。 */
+  commandName = "lark-cli";
+  /** node 侧需存在的真实 CLI（缺失则自动装：npm i -g @larksuite/cli，见 _base/install.ts）。 */
+  requiredCommands = ["lark-cli"];
   larkBin;
   constructor(larkBin) {
     this.larkBin = larkBin ?? this.resolveLarkBin();
@@ -42520,17 +42743,17 @@ var FeishuConnector = class {
     const profileName = credentials["app_id"];
     if (!profileName) throw new Error("feishu inject: missing app_id in credentials");
     sessionEnv.set("LARK_PROFILE", profileName);
-    sessionEnv.set("LARK_BIN", this.larkBin);
+    sessionEnv.set("LARK_BIN", await this.resolveRealBin());
   }
   wrapperScriptPath() {
-    return (0, import_node_path.join)(__dirname, "wrapper.sh");
+    return (0, import_node_path3.join)(__dirname, "wrapper.sh");
   }
   async cleanup(sessionEnv) {
     const profile = sessionEnv.get("LARK_PROFILE");
     if (!profile) return;
     if (!process.env["FEISHU_SIMULATE"]) {
       try {
-        await execFileAsync(this.larkBin, ["profile", "remove", profile, "--confirm"]);
+        await execFileAsync2(this.larkBin, ["profile", "remove", profile, "--confirm"]);
       } catch {
       }
     }
@@ -42539,18 +42762,18 @@ var FeishuConnector = class {
   }
   async initNewApp() {
     await new Promise((resolve3, reject) => {
-      const proc = (0, import_node_child_process3.spawn)(this.larkBin, ["config", "init", "--new"], { stdio: "inherit" });
+      const proc = (0, import_node_child_process4.spawn)(this.larkBin, ["config", "init", "--new"], { stdio: "inherit" });
       proc.on("close", (code) => code === 0 ? resolve3() : reject(new Error(`lark-cli config init exited ${code}`)));
       proc.on("error", reject);
     });
-    const { stdout } = await execFileAsync(this.larkBin, ["config", "show", "--json"]);
+    const { stdout } = await execFileAsync2(this.larkBin, ["config", "show", "--json"]);
     const cfg = JSON.parse(stdout);
     if (!cfg.appId) throw new Error("feishu connector: could not determine app_id after config init");
     return cfg.appId;
   }
   async runAuthLogin(app_id) {
     await new Promise((resolve3, reject) => {
-      const proc = (0, import_node_child_process3.spawn)(this.larkBin, ["--profile", app_id, "auth", "login"], { stdio: "inherit" });
+      const proc = (0, import_node_child_process4.spawn)(this.larkBin, ["--profile", app_id, "auth", "login"], { stdio: "inherit" });
       proc.on("close", (code) => code === 0 ? resolve3() : reject(new Error(`lark-cli auth login exited ${code}`)));
       proc.on("error", reject);
     });
@@ -42558,15 +42781,31 @@ var FeishuConnector = class {
   resolveLarkBin() {
     return process.env["LARK_CLI_BIN"] ?? "lark-cli";
   }
+  /**
+   * 把 larkBin 解析成真实二进制的绝对路径，供 wrapper 的 LARK_BIN 使用。
+   * 已是绝对路径直接返回；裸名（"lark-cli"）走 `which` 定位——绝不能把裸名交给 wrapper，
+   * 否则 wrapper 的 exec 会命中 PATH 上的同名 wrapper 软链造成无限递归。which 失败时兜底原值，
+   * 交由 wrapper 内 PATH 扫描逻辑（跳过自身）处理。
+   */
+  async resolveRealBin() {
+    if (this.larkBin.includes("/")) return this.larkBin;
+    try {
+      const { stdout } = await execFileAsync2("which", [this.larkBin]);
+      const resolved = stdout.trim();
+      if (resolved) return resolved;
+    } catch {
+    }
+    return this.larkBin;
+  }
 };
 
 // ../connectors/src/github/index.ts
-var import_node_child_process4 = require("node:child_process");
-var import_node_util2 = require("node:util");
-var import_node_path2 = require("node:path");
+var import_node_child_process5 = require("node:child_process");
+var import_node_util3 = require("node:util");
+var import_node_path4 = require("node:path");
 var import_node_url2 = require("node:url");
-var execFile2 = (0, import_node_util2.promisify)(import_node_child_process4.execFile);
-var __dirname2 = (0, import_node_path2.dirname)((0, import_node_url2.fileURLToPath)(__esm_import_meta_url));
+var execFile3 = (0, import_node_util3.promisify)(import_node_child_process5.execFile);
+var __dirname2 = (0, import_node_path4.dirname)((0, import_node_url2.fileURLToPath)(__esm_import_meta_url));
 var GithubConnector = class {
   config = {
     slug: "github",
@@ -42576,6 +42815,10 @@ var GithubConnector = class {
       { key: "actor_name", description: "AI \u5458\u5DE5\u540D\u79F0\uFF08\u7528\u4E8E git \u63D0\u4EA4\u7F72\u540D\uFF09", secret: false, required: false }
     ]
   };
+  /** wrapper 在 agent PATH 上冒名的命令——必须与真实 CLI 同名，否则遮蔽不生效。 */
+  commandName = "gh";
+  /** node 侧需存在的真实 CLI（缺失则按 OS 自动装，见 _base/install.ts）。gh + git 都要。 */
+  requiredCommands = ["gh", "git"];
   async connect(options = {}) {
     if (process.env["GITHUB_SIMULATE"] && options["access_token"]) {
       return { credentials: { access_token: options["access_token"] ?? "ghp_simulated", actor_name: options["actor_name"] ?? "oasis-agent" } };
@@ -42605,7 +42848,7 @@ var GithubConnector = class {
     sessionEnv.set("EMAIL", "");
   }
   wrapperScriptPath() {
-    return (0, import_node_path2.join)(__dirname2, "wrapper.sh");
+    return (0, import_node_path4.join)(__dirname2, "wrapper.sh");
   }
   async cleanup(sessionEnv) {
     for (const k2 of [
@@ -42622,59 +42865,19 @@ var GithubConnector = class {
     }
   }
   // ── tool availability ────────────────────────────────────────────────────────
+  /**
+   * 确保 gh + git 存在（缺失则按 OS 装）。委托给共享 installer（_base/install.ts）——
+   * 与 node 侧 pre-spawn 钩子同一套跨平台安装逻辑，不再各写一份。装不上则抛（connect() 语义要求可用）。
+   */
   async ensureTools() {
-    const missing = [];
-    for (const tool of ["git", "gh"]) {
-      if (!await this.isAvailable(tool)) missing.push(tool);
-    }
-    if (missing.length === 0) return;
-    console.warn(`[github connector] missing tools: ${missing.join(", ")} \u2014 installing`);
-    await this.installTools(missing);
-    for (const tool of missing) {
-      if (!await this.isAvailable(tool))
-        throw new Error(`github connector: ${tool} could not be installed \u2014 install it manually`);
-    }
-  }
-  async isAvailable(tool) {
-    try {
-      await execFile2("which", [tool]);
-      return true;
-    } catch {
-      return false;
-    }
-  }
-  async installTools(tools) {
-    for (const tool of tools) {
-      try {
-        if (process.platform === "darwin") {
-          await execFile2("brew", ["install", tool === "gh" ? "gh" : "git"]);
-        } else {
-          if (tool === "git") {
-            await execFile2("sudo", ["apt-get", "install", "-y", "--no-install-recommends", "git"]);
-          } else {
-            try {
-              await execFile2("snap", ["install", "gh"]);
-            } catch {
-              await execFile2("bash", ["-c", [
-                "curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg",
-                "| sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg",
-                "&& sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg",
-                '&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main"',
-                "| sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null",
-                "&& sudo apt-get update && sudo apt-get install -y gh"
-              ].join(" ")]);
-            }
-          }
-        }
-        console.warn(`[github connector] installed ${tool}`);
-      } catch (err) {
-        console.error(`[github connector] failed to install ${tool}:`, String(err));
-      }
+    const missing = await ensureConnectorTools(this.requiredCommands);
+    if (missing.length > 0) {
+      throw new Error(`github connector: ${missing.join(", ")} could not be installed \u2014 install it manually`);
     }
   }
   async resolveRealBin(name) {
     try {
-      const { stdout } = await execFile2("which", [name]);
+      const { stdout } = await execFile3("which", [name]);
       return stdout.trim();
     } catch {
       return name;
@@ -42683,12 +42886,12 @@ var GithubConnector = class {
 };
 
 // ../connectors/src/connector-adapter.ts
-var import_promises = require("node:fs/promises");
-var import_node_os = require("node:os");
-var import_node_path3 = require("node:path");
+var import_promises2 = require("node:fs/promises");
+var import_node_os2 = require("node:os");
+var import_node_path5 = require("node:path");
 
 // ../adapters/src/claude-code/index.ts
-var import_node_child_process5 = require("node:child_process");
+var import_node_child_process6 = require("node:child_process");
 var import_node_crypto14 = require("node:crypto");
 var fs9 = __toESM(require("node:fs"), 1);
 var os2 = __toESM(require("node:os"), 1);
@@ -42840,7 +43043,7 @@ var ClaudeCodeAdapter = class {
       ...this.opts.extraArgs ?? []
     ];
     const otelEnv = this.resolveOtelEnv(job, id);
-    const child = (0, import_node_child_process5.spawn)(this.opts.claudeBin ?? "claude", args, {
+    const child = (0, import_node_child_process6.spawn)(this.opts.claudeBin ?? "claude", args, {
       cwd: dir,
       env: {
         // 凭证泄漏防护：剔除 pnpm/npm 脚本注入的变量——npm_lifecycle_script 等会把 serve 的启动命令
@@ -42962,7 +43165,7 @@ var ClaudeCodeAdapter = class {
 };
 
 // ../adapters/src/codex/index.ts
-var import_node_child_process6 = require("node:child_process");
+var import_node_child_process7 = require("node:child_process");
 var import_node_crypto15 = require("node:crypto");
 var fs10 = __toESM(require("node:fs"), 1);
 var os3 = __toESM(require("node:os"), 1);
@@ -43261,7 +43464,7 @@ var CodexAdapter = class {
       ...this.opts.extraArgs ?? [],
       prompt
     ];
-    const child = (0, import_node_child_process6.spawn)(this.opts.codexBin ?? "codex", args, {
+    const child = (0, import_node_child_process7.spawn)(this.opts.codexBin ?? "codex", args, {
       cwd: dir,
       env: {
         ...scrubLeakyEnv(process.env),
@@ -43362,7 +43565,7 @@ var CodexAdapter = class {
 };
 
 // ../adapters/src/_core/acp.ts
-var import_node_child_process7 = require("node:child_process");
+var import_node_child_process8 = require("node:child_process");
 var import_node_crypto16 = require("node:crypto");
 var fs11 = __toESM(require("node:fs"), 1);
 var os4 = __toESM(require("node:os"), 1);
@@ -43785,7 +43988,7 @@ async function runACPSession(job, cfg) {
   }
   const task = job.bundle.files["TASK.md"];
   if (!task) throw new Error("bundle \u7F3A TASK.md\uFF08\u88C5\u914D\u5668\u5951\u7EA6\uFF09");
-  const child = (0, import_node_child_process7.spawn)(cfg.bin, [...cfg.args ?? [], ...cfg.extraArgs ?? []], {
+  const child = (0, import_node_child_process8.spawn)(cfg.bin, [...cfg.args ?? [], ...cfg.extraArgs ?? []], {
     cwd: dir,
     env: {
       ...scrubLeakyEnv(process.env),
@@ -43991,7 +44194,7 @@ var KiroAdapter = class {
 };
 
 // ../adapters/src/_core/subprocess.ts
-var import_node_child_process8 = require("node:child_process");
+var import_node_child_process9 = require("node:child_process");
 var import_node_crypto17 = require("node:crypto");
 var fs12 = __toESM(require("node:fs"), 1);
 var os5 = __toESM(require("node:os"), 1);
@@ -44050,7 +44253,7 @@ function makeFinish(id, cfg, transcriptRefPtr, transcriptOut, dir, exitCbs) {
 function runStreamJson(job, cfg) {
   const { id, dir, task: _task } = materialize(job, cfg.workRoot);
   const args = [...cfg.buildArgs(job, dir), ...cfg.extraArgs ?? []];
-  const child = (0, import_node_child_process8.spawn)(cfg.bin, args, {
+  const child = (0, import_node_child_process9.spawn)(cfg.bin, args, {
     cwd: dir,
     env: buildEnv(job, cfg.env),
     stdio: ["ignore", "pipe", "pipe"]
@@ -44108,7 +44311,7 @@ function runStreamJson(job, cfg) {
 function runOneShotText(job, cfg) {
   const { id, dir } = materialize(job, cfg.workRoot);
   const args = [...cfg.buildArgs(job, dir), ...cfg.extraArgs ?? []];
-  const child = (0, import_node_child_process8.spawn)(cfg.bin, args, {
+  const child = (0, import_node_child_process9.spawn)(cfg.bin, args, {
     cwd: dir,
     env: buildEnv(job, cfg.env),
     stdio: ["ignore", "pipe", "pipe"]
@@ -44616,6 +44819,10 @@ var ConnectorAwareAdapter = class {
   }
   async spawn(job) {
     const t0 = Date.now();
+    if (job.requiredTools?.length) {
+      const missing = await ensureConnectorTools(job.requiredTools);
+      if (missing.length) log("[adapter]", `  connector tools still missing (agent may fail): ${missing.join(", ")}`);
+    }
     const sentinelWrappers = Object.entries(job.env ?? {}).filter(([k2]) => k2.endsWith("_WRAPPER")).map(([, v2]) => v2);
     const wrapperPaths = [...job.wrapperPaths ?? [], ...sentinelWrappers];
     const strippedEnv = Object.fromEntries(
@@ -44623,11 +44830,11 @@ var ConnectorAwareAdapter = class {
     );
     let extraEnv = { ...strippedEnv };
     if (wrapperPaths.length > 0) {
-      const wrapperBinDir = await (0, import_promises.mkdtemp)((0, import_node_path3.join)((0, import_node_os.tmpdir)(), "oasis-wrappers-"));
-      await (0, import_promises.mkdir)(wrapperBinDir, { recursive: true });
+      const wrapperBinDir = await (0, import_promises2.mkdtemp)((0, import_node_path5.join)((0, import_node_os2.tmpdir)(), "oasis-wrappers-"));
+      await (0, import_promises2.mkdir)(wrapperBinDir, { recursive: true });
       for (const wp of wrapperPaths) {
-        const linkName = (0, import_node_path3.basename)(wp).replace(/\.sh$/, "");
-        await (0, import_promises.symlink)(wp, (0, import_node_path3.join)(wrapperBinDir, linkName));
+        const linkName = (0, import_node_path5.basename)(wp).replace(/\.sh$/, "");
+        await (0, import_promises2.symlink)(wp, (0, import_node_path5.join)(wrapperBinDir, linkName));
       }
       extraEnv = { ...extraEnv, PATH: `${wrapperBinDir}:${process.env["PATH"] ?? ""}` };
       log("[adapter]", `  connectors injected  +${Date.now() - t0}ms  wrappers=${wrapperPaths.length}  env_keys=${Object.keys(job.env ?? {}).join(",")}`);
@@ -45156,6 +45363,9 @@ function defaultDocumentPath2(input) {
   return `${domain}/${workOrder}/${input.artifactId}.md`;
 }
 
+// ../storage/src/postgres.ts
+var import_node_crypto19 = require("node:crypto");
+
 // ../../node_modules/.pnpm/pg@8.21.0/node_modules/pg/esm/index.mjs
 var import_lib = __toESM(require_lib2(), 1);
 var Client = import_lib.default.Client;
@@ -45173,9 +45383,551 @@ var esm_default = import_lib.default;
 
 // ../storage/src/postgres.ts
 init_src();
+var ident = (s2) => {
+  if (!/^[a-z_][a-z0-9_]*$/.test(s2)) throw new Error(`invalid schema identifier: ${s2}`);
+  return s2;
+};
+var isUniqueViolation = (err) => typeof err === "object" && err !== null && err.code === "23505";
+var PostgresOplogStore = class _PostgresOplogStore {
+  constructor(pool, schema) {
+    this.pool = pool;
+    this.t = `"${ident(schema)}".oplog`;
+  }
+  t;
+  static async open(pool, schema = "public") {
+    const s2 = ident(schema);
+    await pool.query(`CREATE SCHEMA IF NOT EXISTS "${s2}"`);
+    await pool.query(`
+      CREATE TABLE IF NOT EXISTS "${s2}".oplog (
+        artifact_id text    NOT NULL,
+        seq         integer NOT NULL,
+        op          jsonb   NOT NULL,
+        global_seq  bigserial,
+        appended_at timestamptz NOT NULL DEFAULT now(),
+        PRIMARY KEY (artifact_id, seq)
+      )`);
+    await pool.query(`CREATE INDEX IF NOT EXISTS oplog_global_idx ON "${s2}".oplog (global_seq)`);
+    return new _PostgresOplogStore(pool, schema);
+  }
+  async append(artifactId, op, expectedSeq) {
+    for (let attempt = 0; ; attempt++) {
+      const target = expectedSeq ?? await this.nextSeq(artifactId);
+      try {
+        const res = await this.pool.query(
+          `INSERT INTO ${this.t} (artifact_id, seq, op)
+           SELECT $1, $2::int, $3::jsonb
+           WHERE (SELECT COALESCE(MAX(seq), 0) + 1 FROM ${this.t} WHERE artifact_id = $1) = $2::int`,
+          [artifactId, target, JSON.stringify(op)]
+        );
+        if (res.rowCount === 1) return target;
+      } catch (err) {
+        if (!isUniqueViolation(err)) throw err;
+      }
+      if (expectedSeq !== void 0) {
+        throw new SeqConflictError(artifactId, expectedSeq, await this.nextSeq(artifactId));
+      }
+      if (attempt >= 5) throw new Error(`oplog append contention on ${artifactId}`);
+    }
+  }
+  async nextSeq(artifactId) {
+    const res = await this.pool.query(
+      `SELECT COALESCE(MAX(seq), 0) + 1 AS next FROM ${this.t} WHERE artifact_id = $1`,
+      [artifactId]
+    );
+    return Number(res.rows[0].next);
+  }
+  async read(artifactId, fromSeq = 1) {
+    const res = await this.pool.query(
+      `SELECT seq, op FROM ${this.t} WHERE artifact_id = $1 AND seq >= $2 ORDER BY seq`,
+      [artifactId, fromSeq]
+    );
+    return res.rows.map((row) => ({ ...row.op, artifactId, seq: Number(row.seq) }));
+  }
+  async *readAll(from) {
+    yield* this.scan(from, false);
+  }
+  async *subscribe(from) {
+    yield* this.scan(from, true);
+  }
+  async *scan(from, follow) {
+    let cursor = from ?? "0";
+    try {
+      for (; ; ) {
+        const res = await this.pool.query(
+          `SELECT artifact_id, seq, op, global_seq FROM ${this.t}
+           WHERE global_seq > $1::bigint ORDER BY global_seq LIMIT 500`,
+          [cursor]
+        );
+        if (res.rowCount === 0) {
+          if (!follow) return;
+          await new Promise((resolve3) => setTimeout(resolve3, 120));
+          continue;
+        }
+        for (const row of res.rows) {
+          cursor = String(row.global_seq);
+          yield {
+            op: { ...row.op, artifactId: row.artifact_id, seq: Number(row.seq) },
+            cursor
+          };
+        }
+      }
+    } catch (err) {
+      if (follow) return;
+      throw err;
+    }
+  }
+};
+var PostgresBlobStore = class _PostgresBlobStore {
+  constructor(pool, schema) {
+    this.pool = pool;
+    this.t = `"${ident(schema)}".blobs`;
+  }
+  t;
+  static async open(pool, schema = "public") {
+    const s2 = ident(schema);
+    await pool.query(`CREATE SCHEMA IF NOT EXISTS "${s2}"`);
+    await pool.query(`
+      CREATE TABLE IF NOT EXISTS "${s2}".blobs (
+        hash         text   PRIMARY KEY,
+        bytes        bytea  NOT NULL,
+        size         bigint NOT NULL,
+        content_type text,                                -- \u5199\u5165\u65F6\u6309\u5B57\u8282\u55C5\u63A2\uFF1B\u55C5\u4E0D\u51FA\u4E3A NULL
+        created_at   timestamptz NOT NULL DEFAULT now()
+      )`);
+    await pool.query(`ALTER TABLE "${s2}".blobs ADD COLUMN IF NOT EXISTS content_type text`);
+    await pool.query(`ALTER TABLE "${s2}".blobs ADD COLUMN IF NOT EXISTS created_at timestamptz NOT NULL DEFAULT now()`);
+    return new _PostgresBlobStore(pool, schema);
+  }
+  async put(bytes) {
+    const hash = (0, import_node_crypto19.createHash)("sha256").update(bytes).digest("hex");
+    await this.pool.query(
+      `INSERT INTO ${this.t} (hash, bytes, size, content_type) VALUES ($1, $2, $3, $4) ON CONFLICT (hash) DO NOTHING`,
+      [hash, Buffer.from(bytes), bytes.byteLength, sniffContentType(bytes) ?? null]
+    );
+    return hash;
+  }
+  async meta(hash) {
+    const res = await this.pool.query(`SELECT size, content_type FROM ${this.t} WHERE hash = $1`, [hash]);
+    const row = res.rows[0];
+    if (!row) return null;
+    return { size: Number(row.size), ...row.content_type ? { contentType: row.content_type } : {} };
+  }
+  async get(hash) {
+    const res = await this.pool.query(`SELECT bytes FROM ${this.t} WHERE hash = $1`, [hash]);
+    if (res.rowCount === 0) throw new BlobNotFoundError(hash);
+    return new Uint8Array(res.rows[0].bytes);
+  }
+  async has(hash) {
+    const res = await this.pool.query(`SELECT 1 FROM ${this.t} WHERE hash = $1`, [hash]);
+    return res.rowCount === 1;
+  }
+  async sweep(reachable) {
+    await this.pool.query(`DELETE FROM ${this.t} WHERE NOT (hash = ANY($1::text[]))`, [
+      [...reachable]
+    ]);
+  }
+};
+
+// ../storage/src/postgres-registry.ts
+var ident2 = (s2) => {
+  if (!/^[a-z_][a-z0-9_]*$/.test(s2)) throw new Error(`invalid schema name: ${s2}`);
+  return s2;
+};
+var PostgresRegistryStore = class _PostgresRegistryStore {
+  constructor(pool, schema) {
+    this.pool = pool;
+    this.s = `"${ident2(schema)}"`;
+  }
+  s;
+  static async open(pool, schema = "public") {
+    const s2 = ident2(schema);
+    await pool.query(`CREATE SCHEMA IF NOT EXISTS "${s2}"`);
+    await pool.query(`
+      CREATE TABLE IF NOT EXISTS "${s2}".actors (
+        id         text PRIMARY KEY,           -- "actor:human:<slug>" / "actor:agent:<slug>"
+        kind       text NOT NULL,              -- human | agent
+        name       text NOT NULL,
+        email      text,
+        team_id    text,
+        status     text NOT NULL,              -- active | disabled\uFF08\u5220\u9664\u5373\u505C\u7528\uFF09
+        roles      jsonb NOT NULL DEFAULT '[]'::jsonb,  -- spec \xA76.2 \u540D\u518C\u89D2\u8272\uFF08\u4EFB\u52A1 2.0\uFF09
+        avatar     text,                              -- "blob:<hash>"\uFF0C\u7A7A=\u9ED8\u8BA4\u751F\u6210
+        created_at timestamptz NOT NULL
+      )`);
+    await pool.query(`
+      CREATE TABLE IF NOT EXISTS "${s2}".actor_configs (
+        actor_id          text NOT NULL,
+        version           integer NOT NULL,    -- 1 \u8D77\u9012\u589E\uFF1B\u53EA\u589E\u4E0D\u6539\uFF0C\u56DE\u6EDA=\u590D\u5236\u65E7\u7248\u4E3A\u65B0\u7248
+        prompt            text NOT NULL,
+        model             text NOT NULL,
+        skills            jsonb NOT NULL,
+        connector_ids     jsonb NOT NULL,
+        reviewer_ids      jsonb NOT NULL DEFAULT '[]'::jsonb,
+        max_concurrent    integer NOT NULL DEFAULT 4,
+        created_by        text NOT NULL,
+        created_at        timestamptz NOT NULL,
+        source            text NOT NULL,       -- patch | rollback
+        rolled_back_from  integer,
+        PRIMARY KEY (actor_id, version)
+      )`);
+    await pool.query(`ALTER TABLE "${s2}".actor_configs ADD COLUMN IF NOT EXISTS max_concurrent integer NOT NULL DEFAULT 4`);
+    await pool.query(`ALTER TABLE "${s2}".actor_configs ADD COLUMN IF NOT EXISTS reviewer_ids jsonb NOT NULL DEFAULT '[]'::jsonb`);
+    await pool.query(`
+      CREATE TABLE IF NOT EXISTS "${s2}".teams (
+        id            text PRIMARY KEY,
+        name          text NOT NULL,
+        parent_id     text,                    -- \u7EC4\u7EC7\u6811
+        lead_actor_id text,
+        icon          text                     -- "blob:<hash>"\uFF0C\u7A7A=\u9ED8\u8BA4\u751F\u6210\uFF08\u4E0D\u7528 emoji\uFF09
+      )`);
+    await pool.query(`
+      CREATE TABLE IF NOT EXISTS "${s2}".actor_bindings (
+        actor_id     text PRIMARY KEY,         -- \u4E00\u5458\u5DE5\u4E00\u7ED1\u5B9A\uFF08\u51B3\u7B56 0001\uFF09
+        node_id      text NOT NULL,
+        runtime_kind text NOT NULL,
+        status       text NOT NULL             -- active | paused
+      )`);
+    await pool.query(`
+      CREATE TABLE IF NOT EXISTS "${s2}".connectors (
+        id          text PRIMARY KEY,
+        name        text NOT NULL,
+        mode        text NOT NULL,             -- oauth | direct
+        status      text NOT NULL,
+        account     text,
+        verified_at timestamptz
+      )`);
+    await pool.query(`
+      CREATE TABLE IF NOT EXISTS "${s2}".skill_catalog (
+        id          text PRIMARY KEY,            -- slug
+        name        text NOT NULL,
+        description text NOT NULL,
+        category    text NOT NULL,
+        maker       text NOT NULL,
+        tags        jsonb NOT NULL DEFAULT '[]'::jsonb,
+        installs    integer NOT NULL DEFAULT 0,  -- \u5E02\u573A\u70ED\u5EA6(\u5C55\u793A)
+        created_at  timestamptz NOT NULL
+      )`);
+    await pool.query(`
+      CREATE TABLE IF NOT EXISTS "${s2}".installed_skills (
+        id           text PRIMARY KEY,           -- \u4E0E\u76EE\u5F55\u540C slug;\u81EA\u5B9A\u4E49\u4E3A\u81EA\u8D77 slug
+        name         text NOT NULL,
+        description  text NOT NULL,
+        source       text NOT NULL,              -- market | custom | github
+        enabled      boolean NOT NULL DEFAULT true,
+        installed_by text NOT NULL,
+        installed_at timestamptz NOT NULL,
+        source_url   text                        -- \u5916\u90E8\u6765\u6E90\u539F\u59CB URL\uFF08\u5BFC\u5165\u65F6\u8BBE\u7F6E\uFF09
+      )`);
+    await pool.query(`ALTER TABLE "${s2}".installed_skills ADD COLUMN IF NOT EXISTS applied_to_all boolean NOT NULL DEFAULT false`);
+    await pool.query(`
+      CREATE TABLE IF NOT EXISTS "${s2}".skill_files (
+        skill_id    text NOT NULL,
+        path        text NOT NULL,               -- \u76F8\u5BF9\u8DEF\u5F84\uFF0C\u5982 "SKILL.md"
+        blob_hash   text NOT NULL,               -- BlobStore \u54C8\u5E0C\uFF08\u4E0D\u542B "blob:" \u524D\u7F00\uFF09
+        size        integer NOT NULL,
+        updated_at  timestamptz NOT NULL,
+        PRIMARY KEY (skill_id, path)
+      )`);
+    await pool.query(`
+      CREATE TABLE IF NOT EXISTS "${s2}".variables (
+        key             text NOT NULL,
+        scope           text NOT NULL,
+        actor_id        text,
+        connector_id    text,
+        overrides       text,
+        value_encrypted text NOT NULL,
+        updated_at      timestamptz NOT NULL
+      )`);
+    await pool.query(`CREATE UNIQUE INDEX IF NOT EXISTS "${s2}_variables_key_actor_uq" ON "${s2}".variables (key, COALESCE(actor_id, ''))`);
+    await pool.query(`ALTER TABLE IF EXISTS "${s2}".variables ADD COLUMN IF NOT EXISTS overrides text`);
+    await pool.query(`ALTER TABLE IF EXISTS "${s2}".variables ADD COLUMN IF NOT EXISTS actor_id text`);
+    return new _PostgresRegistryStore(pool, schema);
+  }
+  /* ---------- 员工 ---------- */
+  async upsertActor(a) {
+    await this.pool.query(
+      `INSERT INTO ${this.s}.actors (id, kind, name, email, team_id, status, roles, avatar, created_at)
+       VALUES ($1,$2,$3,$4,$5,$6,$7::jsonb,$8,$9)
+       ON CONFLICT (id) DO UPDATE SET kind=$2, name=$3, email=$4, team_id=$5, status=$6, roles=$7::jsonb, avatar=$8`,
+      [a.id, a.kind, a.name, a.email ?? null, a.teamId ?? null, a.status, JSON.stringify(a.roles), a.avatar ?? null, a.createdAt]
+    );
+  }
+  async getActor(id) {
+    const r = await this.pool.query(`SELECT * FROM ${this.s}.actors WHERE id = $1`, [id]);
+    return r.rows[0] ? rowToActor(r.rows[0]) : null;
+  }
+  async listActors(filter) {
+    const conds = [];
+    const args = [];
+    if (filter?.kind) {
+      args.push(filter.kind);
+      conds.push(`kind = $${args.length}`);
+    }
+    if (filter?.teamId) {
+      args.push(filter.teamId);
+      conds.push(`team_id = $${args.length}`);
+    }
+    if (filter?.status) {
+      args.push(filter.status);
+      conds.push(`status = $${args.length}`);
+    }
+    const where = conds.length ? `WHERE ${conds.join(" AND ")}` : "";
+    const r = await this.pool.query(`SELECT * FROM ${this.s}.actors ${where} ORDER BY created_at`, args);
+    return r.rows.map(rowToActor);
+  }
+  /* ---------- 配置版本 ---------- */
+  async appendConfig(c) {
+    const r = await this.pool.query(
+      `INSERT INTO ${this.s}.actor_configs
+         (actor_id, version, prompt, model, skills, connector_ids, reviewer_ids, max_concurrent, created_by, created_at, source, rolled_back_from)
+       SELECT $1,$2::int,$3,$4,$5::jsonb,$6::jsonb,$7::jsonb,$8::int,$9,$10,$11,$12
+       WHERE (SELECT COALESCE(MAX(version), 0) + 1 FROM ${this.s}.actor_configs WHERE actor_id = $1) = $2::int`,
+      [
+        c.actorId,
+        c.version,
+        c.prompt,
+        c.model,
+        JSON.stringify(c.skills),
+        JSON.stringify(c.connectorIds),
+        JSON.stringify(c.reviewerIds ?? []),
+        c.maxConcurrent,
+        c.createdBy,
+        c.createdAt,
+        c.source,
+        c.rolledBackFrom ?? null
+      ]
+    );
+    if (r.rowCount !== 1) throw new Error(`config version conflict for ${c.actorId}: got ${c.version}`);
+  }
+  async latestConfig(actorId) {
+    const r = await this.pool.query(
+      `SELECT * FROM ${this.s}.actor_configs WHERE actor_id = $1 ORDER BY version DESC LIMIT 1`,
+      [actorId]
+    );
+    return r.rows[0] ? rowToConfig(r.rows[0]) : null;
+  }
+  async listConfigVersions(actorId) {
+    const r = await this.pool.query(
+      `SELECT * FROM ${this.s}.actor_configs WHERE actor_id = $1 ORDER BY version`,
+      [actorId]
+    );
+    return r.rows.map(rowToConfig);
+  }
+  /* ---------- 团队 ---------- */
+  async upsertTeam(t) {
+    await this.pool.query(
+      `INSERT INTO ${this.s}.teams (id, name, parent_id, lead_actor_id, icon) VALUES ($1,$2,$3,$4,$5)
+       ON CONFLICT (id) DO UPDATE SET name=$2, parent_id=$3, lead_actor_id=$4, icon=$5`,
+      [t.id, t.name, t.parentId ?? null, t.leadActorId ?? null, t.icon ?? null]
+    );
+  }
+  async listTeams() {
+    const r = await this.pool.query(`SELECT * FROM ${this.s}.teams ORDER BY id`);
+    return r.rows.map((row) => ({
+      id: row.id,
+      name: row.name,
+      ...row.parent_id !== null ? { parentId: row.parent_id } : {},
+      ...row.lead_actor_id !== null ? { leadActorId: row.lead_actor_id } : {},
+      ...row.icon !== null ? { icon: row.icon } : {}
+    }));
+  }
+  /* ---------- 绑定 ---------- */
+  async upsertBinding(b2) {
+    await this.pool.query(
+      `INSERT INTO ${this.s}.actor_bindings (actor_id, node_id, runtime_kind, status) VALUES ($1,$2,$3,$4)
+       ON CONFLICT (actor_id) DO UPDATE SET node_id=$2, runtime_kind=$3, status=$4`,
+      [b2.actorId, b2.nodeId, b2.runtimeKind, b2.status]
+    );
+  }
+  async removeBinding(actorId) {
+    await this.pool.query(`DELETE FROM ${this.s}.actor_bindings WHERE actor_id = $1`, [actorId]);
+  }
+  async getBinding(actorId) {
+    const r = await this.pool.query(`SELECT * FROM ${this.s}.actor_bindings WHERE actor_id = $1`, [actorId]);
+    const row = r.rows[0];
+    return row ? { actorId: row.actor_id, nodeId: row.node_id, runtimeKind: row.runtime_kind, status: row.status } : null;
+  }
+  async listBindings() {
+    const r = await this.pool.query(`SELECT * FROM ${this.s}.actor_bindings ORDER BY actor_id`);
+    return r.rows.map((row) => ({ actorId: row.actor_id, nodeId: row.node_id, runtimeKind: row.runtime_kind, status: row.status }));
+  }
+  /* ---------- 连接器 ---------- */
+  async upsertConnector(c) {
+    await this.pool.query(
+      `INSERT INTO ${this.s}.connectors (id, name, mode, status, account, verified_at) VALUES ($1,$2,$3,$4,$5,$6)
+       ON CONFLICT (id) DO UPDATE SET name=$2, mode=$3, status=$4, account=$5, verified_at=$6`,
+      [c.id, c.name, c.mode, c.status, c.account ?? null, c.verifiedAt ?? null]
+    );
+  }
+  async listConnectors() {
+    const r = await this.pool.query(`SELECT * FROM ${this.s}.connectors ORDER BY id`);
+    return r.rows.map((row) => ({
+      id: row.id,
+      name: row.name,
+      mode: row.mode,
+      status: row.status,
+      ...row.account !== null ? { account: row.account } : {},
+      ...row.verified_at !== null ? { verifiedAt: new Date(row.verified_at).toISOString() } : {}
+    }));
+  }
+  /* ---------- 技能 ---------- */
+  async upsertSkillCatalogItem(item) {
+    await this.pool.query(
+      `INSERT INTO ${this.s}.skill_catalog (id, name, description, category, maker, tags, installs, created_at)
+       VALUES ($1,$2,$3,$4,$5,$6::jsonb,$7,$8)
+       ON CONFLICT (id) DO UPDATE SET name=$2, description=$3, category=$4, maker=$5, tags=$6::jsonb, installs=$7`,
+      [item.id, item.name, item.description, item.category, item.maker, JSON.stringify(item.tags), item.installs, item.createdAt]
+    );
+  }
+  async listSkillCatalog() {
+    const r = await this.pool.query(`SELECT * FROM ${this.s}.skill_catalog ORDER BY installs DESC`);
+    return r.rows.map((row) => ({
+      id: row.id,
+      name: row.name,
+      description: row.description,
+      category: row.category,
+      maker: row.maker,
+      tags: row.tags,
+      installs: row.installs,
+      createdAt: new Date(row.created_at).toISOString()
+    }));
+  }
+  async putInstalledSkill(x2) {
+    await this.pool.query(
+      `INSERT INTO ${this.s}.installed_skills (id, name, description, source, enabled, installed_by, installed_at, source_url, applied_to_all)
+       VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9)
+       ON CONFLICT (id) DO UPDATE SET name=$2, description=$3, source=$4, enabled=$5, source_url=$8, applied_to_all=$9`,
+      [x2.id, x2.name, x2.description, x2.source, x2.enabled, x2.installedBy, x2.installedAt, x2.sourceUrl ?? null, x2.appliedToAll ?? false]
+    );
+  }
+  async removeInstalledSkill(id) {
+    await this.pool.query(`DELETE FROM ${this.s}.installed_skills WHERE id = $1`, [id]);
+    await this.pool.query(`DELETE FROM ${this.s}.skill_files WHERE skill_id = $1`, [id]);
+  }
+  async listInstalledSkills() {
+    const r = await this.pool.query(`SELECT * FROM ${this.s}.installed_skills ORDER BY installed_at`);
+    return r.rows.map((row) => ({
+      id: row.id,
+      name: row.name,
+      description: row.description,
+      source: row.source,
+      enabled: row.enabled,
+      installedBy: row.installed_by,
+      installedAt: new Date(row.installed_at).toISOString(),
+      ...row.source_url !== null ? { sourceUrl: row.source_url } : {},
+      appliedToAll: !!row.applied_to_all
+    }));
+  }
+  async putSkillFiles(skillId, files) {
+    await this.pool.query(`DELETE FROM ${this.s}.skill_files WHERE skill_id = $1`, [skillId]);
+    for (const f2 of files) {
+      await this.pool.query(
+        `INSERT INTO ${this.s}.skill_files (skill_id, path, blob_hash, size, updated_at)
+         VALUES ($1,$2,$3,$4,$5)
+         ON CONFLICT (skill_id, path) DO UPDATE SET blob_hash=$3, size=$4, updated_at=$5`,
+        [skillId, f2.path, f2.blobHash, f2.size, f2.updatedAt]
+      );
+    }
+  }
+  async listSkillFiles(skillId) {
+    const r = await this.pool.query(
+      `SELECT * FROM ${this.s}.skill_files WHERE skill_id = $1 ORDER BY path`,
+      [skillId]
+    );
+    return r.rows.map((row) => ({
+      skillId: row.skill_id,
+      path: row.path,
+      blobHash: row.blob_hash,
+      size: row.size,
+      updatedAt: new Date(row.updated_at).toISOString()
+    }));
+  }
+  async deleteSkillFiles(skillId) {
+    await this.pool.query(`DELETE FROM ${this.s}.skill_files WHERE skill_id = $1`, [skillId]);
+  }
+  /* ---------- 变量 ---------- */
+  async putVariable(v2) {
+    const aid = v2.actorId ?? null;
+    await this.pool.query(
+      `INSERT INTO ${this.s}.variables (key, scope, actor_id, connector_id, overrides, value_encrypted, updated_at)
+       VALUES ($1,$2,$3,$4,$5,$6,$7)
+       ON CONFLICT (key, COALESCE(actor_id, '')) DO UPDATE
+         SET scope=$2, actor_id=$3, connector_id=$4, overrides=$5, value_encrypted=$6, updated_at=$7`,
+      [v2.key, v2.scope, aid, v2.connectorId ?? null, v2.overrides ?? null, v2.valueEncrypted, v2.updatedAt]
+    );
+  }
+  async patchVariableValue(key, actorId, valueEncrypted, updatedAt) {
+    const aid = actorId ?? null;
+    await this.pool.query(
+      `UPDATE ${this.s}.variables SET value_encrypted=$3, updated_at=$4
+       WHERE key=$1 AND COALESCE(actor_id,'')=COALESCE($2::text,'')`,
+      [key, aid, valueEncrypted, updatedAt]
+    );
+  }
+  async getVariableCiphertext(key, actorId) {
+    const aid = actorId ?? null;
+    const r = await this.pool.query(
+      `SELECT value_encrypted FROM ${this.s}.variables WHERE key=$1 AND COALESCE(actor_id,'')=COALESCE($2::text,'')`,
+      [key, aid]
+    );
+    return r.rows[0]?.value_encrypted ?? null;
+  }
+  async listVariables(actorId) {
+    let r;
+    if (actorId !== void 0) {
+      r = await this.pool.query(
+        `SELECT * FROM ${this.s}.variables WHERE scope='global' OR actor_id=$1 ORDER BY key`,
+        [actorId]
+      );
+    } else {
+      r = await this.pool.query(`SELECT * FROM ${this.s}.variables ORDER BY key`);
+    }
+    return r.rows.map((row) => ({
+      key: row.key,
+      scope: row.scope === "connector" ? "global" : row.scope,
+      ...row.actor_id !== null && row.actor_id !== void 0 ? { actorId: row.actor_id } : {},
+      ...row.connector_id !== null ? { connectorId: row.connector_id } : {},
+      ...row.overrides !== null ? { overrides: row.overrides } : {},
+      valueEncrypted: row.value_encrypted,
+      updatedAt: new Date(row.updated_at).toISOString()
+    }));
+  }
+  async deleteVariable(key, actorId) {
+    const aid = actorId ?? null;
+    await this.pool.query(
+      `DELETE FROM ${this.s}.variables WHERE key=$1 AND COALESCE(actor_id,'')=COALESCE($2::text,'')`,
+      [key, aid]
+    );
+  }
+};
+var rowToActor = (row) => ({
+  id: row.id,
+  kind: row.kind,
+  name: row.name,
+  ...row.email !== null ? { email: row.email } : {},
+  ...row.team_id !== null ? { teamId: row.team_id } : {},
+  status: row.status,
+  roles: row.roles ?? [],
+  ...row.avatar !== null && row.avatar !== void 0 ? { avatar: row.avatar } : {},
+  createdAt: new Date(row.created_at).toISOString()
+});
+var rowToConfig = (row) => ({
+  actorId: row.actor_id,
+  version: row.version,
+  prompt: row.prompt,
+  model: row.model,
+  skills: row.skills,
+  connectorIds: row.connector_ids,
+  reviewerIds: row.reviewer_ids ?? [],
+  maxConcurrent: row.max_concurrent ?? 4,
+  createdBy: row.created_by,
+  createdAt: new Date(row.created_at).toISOString(),
+  source: row.source,
+  ...row.rolled_back_from !== null ? { rolledBackFrom: row.rolled_back_from } : {}
+});
 
 // ../storage/src/postgres-projects.ts
-var ident = (s2) => {
+var ident3 = (s2) => {
   if (!/^[a-z_][a-z0-9_]*$/.test(s2)) throw new Error(`invalid schema name: ${s2}`);
   return s2;
 };
@@ -45183,11 +45935,11 @@ var iso = (v2) => new Date(v2).toISOString();
 var PostgresProjectStateStore = class _PostgresProjectStateStore {
   constructor(pool, schema) {
     this.pool = pool;
-    this.s = `"${ident(schema)}"`;
+    this.s = `"${ident3(schema)}"`;
   }
   s;
   static async open(pool, schema = "public") {
-    const s2 = ident(schema);
+    const s2 = ident3(schema);
     await pool.query(`CREATE SCHEMA IF NOT EXISTS "${s2}"`);
     await pool.query(`
       CREATE TABLE IF NOT EXISTS "${s2}".projects (
@@ -45373,11 +46125,11 @@ var rowToProjectMember = (row) => ({
 var PostgresArtifactStateStore = class _PostgresArtifactStateStore {
   constructor(pool, schema) {
     this.pool = pool;
-    this.s = `"${ident(schema)}"`;
+    this.s = `"${ident3(schema)}"`;
   }
   s;
   static async open(pool, schema = "public") {
-    const s2 = ident(schema);
+    const s2 = ident3(schema);
     await pool.query(`CREATE SCHEMA IF NOT EXISTS "${s2}"`);
     await pool.query(`
       CREATE TABLE IF NOT EXISTS "${s2}".artifacts (
@@ -45953,20 +46705,285 @@ function createPgPool(dsn, opts) {
   });
 }
 
+// ../storage/src/postgres-control-plane.ts
+var ident4 = (s2) => {
+  if (!/^[a-z_][a-z0-9_]*$/.test(s2)) throw new Error(`invalid schema name: ${s2}`);
+  return s2;
+};
+var PostgresControlPlaneStore = class _PostgresControlPlaneStore {
+  constructor(pool, schema) {
+    this.pool = pool;
+    this.s = `"${ident4(schema)}"`;
+  }
+  s;
+  static async open(pool, schema = "public") {
+    const s2 = ident4(schema);
+    await pool.query(`CREATE SCHEMA IF NOT EXISTS "${s2}"`);
+    await pool.query(`
+      CREATE TABLE IF NOT EXISTS "${s2}".companies (
+        id         text PRIMARY KEY,
+        slug       text NOT NULL UNIQUE,        -- \u4E0D\u53EF\u6539\uFF0C\u8DEF\u7531\u952E
+        name       text NOT NULL,
+        avatar     text,                        -- "blob:<hash>"\uFF0C\u7A7A=\u9ED8\u8BA4
+        status     text NOT NULL,               -- active | suspended
+        created_at timestamptz NOT NULL
+      )`);
+    await pool.query(`
+      CREATE TABLE IF NOT EXISTS "${s2}".company_members (
+        company_id text NOT NULL,
+        account_id text NOT NULL,
+        actor_id   text NOT NULL,               -- \u8BE5\u8D26\u53F7\u5728\u672C\u516C\u53F8\u7684\u5458\u5DE5\uFF08\u8FDB oplog \u7F72\u540D\uFF09
+        role       text NOT NULL,               -- owner | admin | member
+        PRIMARY KEY (company_id, account_id)
+      )`);
+    await pool.query(`CREATE INDEX IF NOT EXISTS company_members_account_idx ON "${s2}".company_members (account_id)`);
+    await pool.query(`
+      CREATE TABLE IF NOT EXISTS "${s2}".company_invitations (
+        id         text PRIMARY KEY,
+        company_id text NOT NULL,
+        email      text NOT NULL,
+        role       text NOT NULL,               -- admin | member\uFF08\u4E0D\u542B owner\uFF09
+        status     text NOT NULL,               -- pending | accepted | declined | expired
+        expires_at timestamptz NOT NULL
+      )`);
+    await pool.query(`CREATE INDEX IF NOT EXISTS company_invitations_email_idx ON "${s2}".company_invitations (email)`);
+    await pool.query(`CREATE INDEX IF NOT EXISTS company_invitations_company_idx ON "${s2}".company_invitations (company_id)`);
+    await pool.query(`
+      CREATE TABLE IF NOT EXISTS "${s2}".accounts (
+        id            text PRIMARY KEY,
+        email         text NOT NULL,
+        name          text NOT NULL,
+        avatar        text,
+        status        text NOT NULL,             -- active | disabled
+        password_hash text,                      -- scrypt \u4E32\uFF1BNULL=\u672A\u8BBE\u5BC6\u7801\uFF08\u4EC5\u9A8C\u8BC1\u7801\u767B\u5F55\uFF09\u3002\u7EDD\u4E0D\u7ECF HTTP \u8FD4\u56DE
+        token_version int  NOT NULL DEFAULT 0    -- \u4F1A\u8BDD\u603B\u95F8\uFF1Abump \u5373\u4F5C\u5E9F\u8BE5\u8D26\u53F7\u6240\u6709 oasis_auth
+      )`);
+    await pool.query(`CREATE INDEX IF NOT EXISTS accounts_email_idx ON "${s2}".accounts (email)`);
+    await pool.query(`
+      CREATE TABLE IF NOT EXISTS "${s2}".verification_codes (
+        email      text PRIMARY KEY,             -- \u5355\u90AE\u7BB1\u4E00\u6761 active
+        code_hash  text NOT NULL,
+        created_at timestamptz NOT NULL,
+        expires_at timestamptz NOT NULL,
+        attempts   int  NOT NULL DEFAULT 0
+      )`);
+    return new _PostgresControlPlaneStore(pool, schema);
+  }
+  // —— 公司 ——
+  async createCompany(c) {
+    await this.pool.query(
+      `INSERT INTO ${this.s}.companies (id, slug, name, avatar, status, created_at) VALUES ($1,$2,$3,$4,$5,$6)`,
+      [c.id, c.slug, c.name, c.avatar ?? null, c.status, c.createdAt]
+    );
+  }
+  async getCompany(id) {
+    const r = await this.pool.query(`SELECT * FROM ${this.s}.companies WHERE id = $1`, [id]);
+    return r.rows[0] ? rowToCompany(r.rows[0]) : null;
+  }
+  async getCompanyBySlug(slug4) {
+    const r = await this.pool.query(`SELECT * FROM ${this.s}.companies WHERE slug = $1`, [slug4]);
+    return r.rows[0] ? rowToCompany(r.rows[0]) : null;
+  }
+  async listCompanies() {
+    const r = await this.pool.query(`SELECT * FROM ${this.s}.companies ORDER BY created_at`);
+    return r.rows.map(rowToCompany);
+  }
+  async updateCompany(id, patch) {
+    const sets = [];
+    const args = [];
+    if (patch.name !== void 0) {
+      args.push(patch.name);
+      sets.push(`name = $${args.length}`);
+    }
+    if (patch.avatar !== void 0) {
+      args.push(patch.avatar);
+      sets.push(`avatar = $${args.length}`);
+    }
+    if (patch.status !== void 0) {
+      args.push(patch.status);
+      sets.push(`status = $${args.length}`);
+    }
+    args.push(id);
+    const sql = sets.length ? `UPDATE ${this.s}.companies SET ${sets.join(", ")} WHERE id = $${args.length}` : `SELECT 1 FROM ${this.s}.companies WHERE id = $${args.length}`;
+    const r = await this.pool.query(sql, args);
+    if (r.rowCount === 0) throw new Error(`company not found: ${id}`);
+  }
+  // —— 成员 ——
+  async upsertMember(m2) {
+    await this.pool.query(
+      `INSERT INTO ${this.s}.company_members (company_id, account_id, actor_id, role) VALUES ($1,$2,$3,$4)
+       ON CONFLICT (company_id, account_id) DO UPDATE SET actor_id = $3, role = $4`,
+      [m2.companyId, m2.accountId, m2.actorId, m2.role]
+    );
+  }
+  async getMember(companyId, accountId) {
+    const r = await this.pool.query(
+      `SELECT * FROM ${this.s}.company_members WHERE company_id = $1 AND account_id = $2`,
+      [companyId, accountId]
+    );
+    return r.rows[0] ? rowToMember(r.rows[0]) : null;
+  }
+  async listMembers(companyId) {
+    const r = await this.pool.query(`SELECT * FROM ${this.s}.company_members WHERE company_id = $1`, [companyId]);
+    return r.rows.map(rowToMember);
+  }
+  async listMembershipsForAccount(accountId) {
+    const r = await this.pool.query(`SELECT * FROM ${this.s}.company_members WHERE account_id = $1`, [accountId]);
+    return r.rows.map(rowToMember);
+  }
+  async removeMember(companyId, accountId) {
+    await this.pool.query(`DELETE FROM ${this.s}.company_members WHERE company_id = $1 AND account_id = $2`, [companyId, accountId]);
+  }
+  // —— 邀请 ——
+  async createInvitation(inv) {
+    await this.pool.query(
+      `INSERT INTO ${this.s}.company_invitations (id, company_id, email, role, status, expires_at) VALUES ($1,$2,$3,$4,$5,$6)`,
+      [inv.id, inv.companyId, inv.email, inv.role, inv.status, inv.expiresAt]
+    );
+  }
+  async getInvitation(id) {
+    const r = await this.pool.query(`SELECT * FROM ${this.s}.company_invitations WHERE id = $1`, [id]);
+    return r.rows[0] ? rowToInvitation(r.rows[0]) : null;
+  }
+  async listInvitations(filter) {
+    const conds = [];
+    const args = [];
+    if (filter?.companyId !== void 0) {
+      args.push(filter.companyId);
+      conds.push(`company_id = $${args.length}`);
+    }
+    if (filter?.email !== void 0) {
+      args.push(filter.email);
+      conds.push(`email = $${args.length}`);
+    }
+    if (filter?.status !== void 0) {
+      args.push(filter.status);
+      conds.push(`status = $${args.length}`);
+    }
+    const where = conds.length ? `WHERE ${conds.join(" AND ")}` : "";
+    const r = await this.pool.query(`SELECT * FROM ${this.s}.company_invitations ${where} ORDER BY id`, args);
+    return r.rows.map(rowToInvitation);
+  }
+  async updateInvitationStatus(id, status) {
+    const r = await this.pool.query(`UPDATE ${this.s}.company_invitations SET status = $2 WHERE id = $1`, [id, status]);
+    if (r.rowCount === 0) throw new Error(`invitation not found: ${id}`);
+  }
+  // —— 账号 ——
+  async upsertAccount(a) {
+    await this.pool.query(
+      `INSERT INTO ${this.s}.accounts (id, email, name, avatar, status) VALUES ($1,$2,$3,$4,$5)
+       ON CONFLICT (id) DO UPDATE SET email = $2, name = $3, avatar = $4, status = $5`,
+      [a.id, a.email, a.name, a.avatar ?? null, a.status]
+    );
+  }
+  async getAccount(id) {
+    const r = await this.pool.query(`SELECT * FROM ${this.s}.accounts WHERE id = $1`, [id]);
+    return r.rows[0] ? rowToAccount(r.rows[0]) : null;
+  }
+  async getAccountByEmail(email2) {
+    const r = await this.pool.query(`SELECT * FROM ${this.s}.accounts WHERE email = $1 LIMIT 1`, [email2]);
+    return r.rows[0] ? rowToAccount(r.rows[0]) : null;
+  }
+  async listAccounts() {
+    const r = await this.pool.query(`SELECT * FROM ${this.s}.accounts ORDER BY id`);
+    return r.rows.map(rowToAccount);
+  }
+  // —— 账号密钥（绝不经 HTTP 返回）——
+  async setAccountPassword(accountId, passwordHash) {
+    const r = await this.pool.query(`UPDATE ${this.s}.accounts SET password_hash = $2 WHERE id = $1`, [accountId, passwordHash]);
+    if (r.rowCount === 0) throw new Error(`account not found: ${accountId}`);
+  }
+  async getAccountSecret(accountId) {
+    const r = await this.pool.query(`SELECT password_hash, token_version FROM ${this.s}.accounts WHERE id = $1`, [accountId]);
+    const row = r.rows[0];
+    if (!row) return null;
+    return {
+      tokenVersion: Number(row.token_version),
+      ...row.password_hash !== null && row.password_hash !== void 0 ? { passwordHash: row.password_hash } : {}
+    };
+  }
+  async bumpAccountTokenVersion(accountId) {
+    const r = await this.pool.query(
+      `UPDATE ${this.s}.accounts SET token_version = token_version + 1 WHERE id = $1 RETURNING token_version`,
+      [accountId]
+    );
+    if (r.rowCount === 0) throw new Error(`account not found: ${accountId}`);
+    return Number(r.rows[0].token_version);
+  }
+  // —— 邮箱验证码（单邮箱一条 active）——
+  async putVerificationCode(rec) {
+    await this.pool.query(
+      `INSERT INTO ${this.s}.verification_codes (email, code_hash, created_at, expires_at, attempts) VALUES ($1,$2,$3,$4,$5)
+       ON CONFLICT (email) DO UPDATE SET code_hash = $2, created_at = $3, expires_at = $4, attempts = $5`,
+      [rec.email, rec.codeHash, rec.createdAt, rec.expiresAt, rec.attempts]
+    );
+  }
+  async getVerificationCode(email2) {
+    const r = await this.pool.query(`SELECT * FROM ${this.s}.verification_codes WHERE email = $1`, [email2]);
+    return r.rows[0] ? rowToVerificationCode(r.rows[0]) : null;
+  }
+  async incrementCodeAttempts(email2) {
+    const r = await this.pool.query(
+      `UPDATE ${this.s}.verification_codes SET attempts = attempts + 1 WHERE email = $1 RETURNING attempts`,
+      [email2]
+    );
+    return r.rows[0] ? Number(r.rows[0].attempts) : 0;
+  }
+  async deleteVerificationCode(email2) {
+    await this.pool.query(`DELETE FROM ${this.s}.verification_codes WHERE email = $1`, [email2]);
+  }
+};
+var rowToCompany = (row) => ({
+  id: row.id,
+  slug: row.slug,
+  name: row.name,
+  ...row.avatar !== null && row.avatar !== void 0 ? { avatar: row.avatar } : {},
+  status: row.status,
+  createdAt: new Date(row.created_at).toISOString()
+});
+var rowToMember = (row) => ({
+  companyId: row.company_id,
+  accountId: row.account_id,
+  actorId: row.actor_id,
+  role: row.role
+});
+var rowToInvitation = (row) => ({
+  id: row.id,
+  companyId: row.company_id,
+  email: row.email,
+  role: row.role,
+  status: row.status,
+  expiresAt: new Date(row.expires_at).toISOString()
+});
+var rowToAccount = (row) => ({
+  id: row.id,
+  email: row.email,
+  name: row.name,
+  ...row.avatar !== null && row.avatar !== void 0 ? { avatar: row.avatar } : {},
+  status: row.status
+});
+var rowToVerificationCode = (row) => ({
+  email: row.email,
+  codeHash: row.code_hash,
+  createdAt: new Date(row.created_at).toISOString(),
+  expiresAt: new Date(row.expires_at).toISOString(),
+  attempts: Number(row.attempts)
+});
+
 // ../storage/src/postgres-trace.ts
 init_src();
-var ident2 = (s2) => {
+var ident5 = (s2) => {
   if (!/^[a-z_][a-z0-9_]*$/.test(s2)) throw new Error(`invalid schema name: ${s2}`);
   return s2;
 };
 var PostgresTraceStore = class _PostgresTraceStore {
   constructor(pool, schema) {
     this.pool = pool;
-    this.s = `"${ident2(schema)}"`;
+    this.s = `"${ident5(schema)}"`;
   }
   s;
   static async open(pool, schema = "public") {
-    const s2 = ident2(schema);
+    const s2 = ident5(schema);
     await pool.query(`CREATE SCHEMA IF NOT EXISTS "${s2}"`);
     await pool.query(`
       CREATE TABLE IF NOT EXISTS "${s2}".agent_runs (
@@ -46518,7 +47535,7 @@ var rowToArtifact2 = (row) => ({
 
 // ../storage/src/postgres-automations.ts
 init_src();
-var ident3 = (s2) => {
+var ident6 = (s2) => {
   if (!/^[a-z_][a-z0-9_]*$/.test(s2)) throw new Error(`invalid schema name: ${s2}`);
   return s2;
 };
@@ -46526,11 +47543,11 @@ var genId = (prefix) => `${prefix}_${Math.random().toString(36).slice(2, 12)}`;
 var PostgresAutomationStore = class _PostgresAutomationStore {
   constructor(pool, schema) {
     this.pool = pool;
-    this.s = `"${ident3(schema)}"`;
+    this.s = `"${ident6(schema)}"`;
   }
   s;
   static async open(pool, schema = "public") {
-    const s2 = ident3(schema);
+    const s2 = ident6(schema);
     await pool.query(`CREATE SCHEMA IF NOT EXISTS "${s2}"`);
     await pool.query(`
       CREATE TABLE IF NOT EXISTS "${s2}".automations (
@@ -46825,18 +47842,18 @@ var rowToRun2 = (row) => ({
 });
 
 // ../storage/src/postgres-chat-sessions.ts
-var ident4 = (s2) => {
+var ident7 = (s2) => {
   if (!/^[a-z_][a-z0-9_]*$/.test(s2)) throw new Error(`invalid schema name: ${s2}`);
   return s2;
 };
 var PostgresChatSessionStore = class _PostgresChatSessionStore {
   constructor(pool, schema) {
     this.pool = pool;
-    this.s = `"${ident4(schema)}"`;
+    this.s = `"${ident7(schema)}"`;
   }
   s;
   static async open(pool, schema = "public") {
-    const s2 = ident4(schema);
+    const s2 = ident7(schema);
     await pool.query(`CREATE SCHEMA IF NOT EXISTS "${s2}"`);
     await pool.query(`
       CREATE TABLE IF NOT EXISTS "${s2}".chat_sessions (
@@ -46862,6 +47879,14 @@ var PostgresChatSessionStore = class _PostgresChatSessionStore {
       )`);
     await pool.query(`CREATE INDEX IF NOT EXISTS chat_messages_session_idx ON "${s2}".chat_messages (session_id, seq)`);
     await pool.query(`ALTER TABLE "${s2}".chat_messages ADD COLUMN IF NOT EXISTS run_id text`);
+    await pool.query(`ALTER TABLE "${s2}".chat_messages ADD COLUMN IF NOT EXISTS parts jsonb`);
+    await pool.query(`
+      WITH ranked AS (
+        SELECT id, row_number() OVER (PARTITION BY session_id ORDER BY seq, created_at, id) AS rn
+        FROM "${s2}".chat_messages
+      )
+      UPDATE "${s2}".chat_messages m SET seq = ranked.rn FROM ranked WHERE m.id = ranked.id AND m.seq <> ranked.rn`);
+    await pool.query(`CREATE UNIQUE INDEX IF NOT EXISTS chat_messages_session_seq_uq 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,
@@ -46917,11 +47942,25 @@ var PostgresChatSessionStore = class _PostgresChatSessionStore {
     await this.pool.query(`DELETE FROM ${this.s}.chat_sessions WHERE id = $1`, [id]);
   }
   async appendMessage(m2) {
-    await this.pool.query(
-      `INSERT INTO ${this.s}.chat_messages (id, session_id, role, content, seq, created_at, run_id)
-       VALUES ($1,$2,$3,$4,$5,$6,$7)`,
-      [m2.id, m2.sessionId, m2.role, m2.content, m2.seq, m2.createdAt, m2.runId ?? null]
-    );
+    const insert = async () => {
+      const r = await this.pool.query(
+        `INSERT INTO ${this.s}.chat_messages (id, session_id, role, content, seq, created_at, run_id, parts)
+         SELECT $1,$2,$3,$4, COALESCE(MAX(seq),0)+1, $5,$6,$7
+         FROM ${this.s}.chat_messages WHERE session_id = $2
+         RETURNING seq`,
+        [m2.id, m2.sessionId, m2.role, m2.content, m2.createdAt, m2.runId ?? null, m2.parts !== void 0 ? JSON.stringify(m2.parts) : null]
+      );
+      return Number(r.rows[0].seq);
+    };
+    for (let attempt = 0; ; attempt++) {
+      try {
+        return { ...m2, seq: await insert() };
+      } catch (err) {
+        const isUniqueViolation2 = err && typeof err === "object" && err.code === "23505";
+        if (isUniqueViolation2 && attempt < 10) continue;
+        throw err;
+      }
+    }
   }
   async listMessages(sessionId, limit) {
     const limitClause = limit ? `LIMIT ${limit}` : "";
@@ -46963,23 +48002,24 @@ var rowToMessage = (row) => ({
   content: row.content,
   seq: Number(row.seq),
   createdAt: new Date(row.created_at).toISOString(),
-  ...row.run_id != null ? { runId: row.run_id } : {}
+  ...row.run_id != null ? { runId: row.run_id } : {},
+  ...row.parts != null ? { parts: row.parts } : {}
 });
 
 // ../storage/src/postgres-nodes.ts
-var import_node_crypto19 = require("node:crypto");
-var ident5 = (s2) => {
+var import_node_crypto20 = require("node:crypto");
+var ident8 = (s2) => {
   if (!/^[a-z_][a-z0-9_]*$/.test(s2)) throw new Error(`invalid schema name: ${s2}`);
   return s2;
 };
 var PostgresNodeStore = class _PostgresNodeStore {
   constructor(pool, schema) {
     this.pool = pool;
-    this.s = `"${ident5(schema)}"`;
+    this.s = `"${ident8(schema)}"`;
   }
   s;
   static async open(pool, schema = "public") {
-    const s2 = ident5(schema);
+    const s2 = ident8(schema);
     await pool.query(`CREATE SCHEMA IF NOT EXISTS "${s2}"`);
     await pool.query(`
       CREATE TABLE IF NOT EXISTS "${s2}".nodes (
@@ -47086,12 +48126,12 @@ var PostgresNodeStore = class _PostgresNodeStore {
 var PostgresNodeTokenStore = class _PostgresNodeTokenStore {
   constructor(pool, schema) {
     this.pool = pool;
-    this.s = `"${ident5(schema)}"`;
+    this.s = `"${ident8(schema)}"`;
   }
   s;
   cache = /* @__PURE__ */ new Map();
   static async open(pool, schema = "public") {
-    const s2 = ident5(schema);
+    const s2 = ident8(schema);
     await pool.query(`CREATE SCHEMA IF NOT EXISTS "${s2}"`);
     await pool.query(`CREATE TABLE IF NOT EXISTS "${s2}".node_tokens (token text PRIMARY KEY, node_id text NOT NULL)`);
     const store = new _PostgresNodeTokenStore(pool, schema);
@@ -47100,7 +48140,7 @@ var PostgresNodeTokenStore = class _PostgresNodeTokenStore {
     return store;
   }
   issue(nodeId) {
-    const token = `ont_${(0, import_node_crypto19.randomBytes)(24).toString("base64url")}`;
+    const token = `ont_${(0, import_node_crypto20.randomBytes)(24).toString("base64url")}`;
     this.cache.set(token, nodeId);
     void this.pool.query(`INSERT INTO ${this.s}.node_tokens (token,node_id) VALUES ($1,$2)`, [token, nodeId]);
     return token;
@@ -47139,7 +48179,16 @@ var rowToRuntime = (row) => ({
 // ../cli/src/serve.ts
 init_src3();
 init_trajectory();
-var DEFAULT_CHAT_SKILLS = ["build-workorder"];
+function builtinSkillsDir() {
+  const override = process.env["OASIS_BUILTIN_SKILLS_DIR"]?.trim();
+  if (override) return override;
+  const repoRoot = (0, import_node_url3.fileURLToPath)(new URL("../../../", __esm_import_meta_url));
+  return path11.join(repoRoot, "skills");
+}
+function materializeBuiltins(builtins, runtimeKind) {
+  if (builtins.length === 0) return {};
+  return materializeBuiltinSkills(builtins, skillsDirForRuntime(runtimeKind));
+}
 var SESSION_TOKEN_GRACE_MS = 15 * 6e4;
 function normalizeHttpBaseUrl(raw) {
   const url = new URL(raw);
@@ -47195,13 +48244,16 @@ async function buildActorProvision(service, actorId) {
   const raw = await service.resolveActorEnv(actorId);
   const env = { ...raw };
   const wrapperPaths = [oasisWrapperScript()];
+  const requiredTools = /* @__PURE__ */ new Set();
   if (raw["FEISHU_APP_ID"] && raw["FEISHU_APP_SECRET"]) {
     try {
       const feishu = new FeishuConnector();
       const sessionEnv = /* @__PURE__ */ new Map();
       await feishu.inject({ app_id: raw["FEISHU_APP_ID"], app_secret: raw["FEISHU_APP_SECRET"] }, sessionEnv);
       for (const [k2, v2] of sessionEnv) env[k2] = v2;
-      wrapperPaths.push(feishu.wrapperScriptPath());
+      const staged = stageConnectorWrapper(feishu);
+      if (staged) wrapperPaths.push(staged);
+      for (const c of feishu.requiredCommands) requiredTools.add(c);
     } catch (err) {
       console.warn(`[serve] feishu connector setup failed for ${actorId}:`, String(err));
     }
@@ -47213,13 +48265,14 @@ async function buildActorProvision(service, actorId) {
       await github.inject({ access_token: raw["GITHUB_TOKEN"], actor_name: raw["GIT_AUTHOR_NAME"] ?? actorId.split(":").pop() ?? "oasis-agent" }, sessionEnv);
       for (const [k2, v2] of sessionEnv) env[k2] = v2;
       delete env["GITHUB_TOKEN"];
-      const wp = github.wrapperScriptPath();
-      if (wp) wrapperPaths.push(wp);
+      const staged = stageConnectorWrapper(github);
+      if (staged) wrapperPaths.push(staged);
+      for (const c of github.requiredCommands) requiredTools.add(c);
     } catch (err) {
       console.warn(`[serve] github connector setup failed for ${actorId}:`, String(err));
     }
   }
-  return { env, wrapperPaths };
+  return { env, wrapperPaths, requiredTools: [...requiredTools] };
 }
 async function buildActorContext(service, actorId) {
   const [config2, connectors, installedSkills] = await Promise.all([
@@ -47254,8 +48307,11 @@ async function startServe(opts) {
     const file = path11.join(opts.dir, name);
     return fs14.existsSync(file) ? JSON.parse(fs14.readFileSync(file, "utf8")) : void 0;
   };
-  const oplog = await NdjsonOplogStore.open(path11.join(opts.dir, "oplog.ndjson"));
-  const blobs = new DirBlobStore(path11.join(opts.dir, "blobs"));
+  const pgDsn = process.env["OASIS_PG_DSN"] ?? process.env["DATABASE_URL"];
+  const pgSchema = process.env["OASIS_PG_SCHEMA"] ?? "public";
+  const pgPool = pgDsn ? createPgPool(pgDsn) : void 0;
+  const oplog = pgDsn && pgPool ? await PostgresOplogStore.open(pgPool, pgSchema) : await NdjsonOplogStore.open(path11.join(opts.dir, "oplog.ndjson"));
+  const blobs = pgDsn && pgPool ? await PostgresBlobStore.open(pgPool, pgSchema) : new DirBlobStore(path11.join(opts.dir, "blobs"));
   const assets = new DirBlobStore(path11.join(opts.dir, "assets"));
   const defaultRootSchema = [
     { name: "brief", description: "\u5DE5\u5355\u603B\u7EB2\uFF1A\u53D1\u8D77\u65B9\u5BF9\u9F50\u7684\u603B\u76EE\u6807\u4E0E\u8303\u56F4\uFF0C\u6574\u5F20\u534F\u4F5C\u56FE\u7684\u6839\u3002", contentType: "text", ownerRole: "founder" },
@@ -47282,7 +48338,7 @@ async function startServe(opts) {
     schema.length = 0;
     schema.push(...live);
   }
-  const registryStore = await FileRegistryStore.open(path11.join(opts.dir, "registry-store.json"));
+  const registryStore = pgDsn && pgPool ? await PostgresRegistryStore.open(pgPool, pgSchema) : await FileRegistryStore.open(path11.join(opts.dir, "registry-store.json"));
   const kernel = await Kernel.open(oplog, {
     schema,
     registry: loadJson("registry.json") ?? [],
@@ -47309,6 +48365,8 @@ async function startServe(opts) {
     for (const l of registryListeners) l({ kind: record4.kind, actor: record4.actor, target: record4.target, timestamp: record4.timestamp });
   };
   await syncRegistryRolesToKernel(registryStore, kernel);
+  let builtinSkills = [];
+  let defaultCompanyId = resolveDefaultCompanyConfig().id;
   const actors = createActorsDomain({
     store: registryStore,
     oplog,
@@ -47319,27 +48377,24 @@ async function startServe(opts) {
     // engineRouter 在下方（行 ~411）以 const 声明；此箭头只在请求时调用，那时已初始化，闭包引用合法
     // （TDZ 只在构造时访问才报错，这里不访问）。默认公司命中现有单实例（registry===registryStore），
     // resolveCtx 会复用默认 ctx，行为不变。collab 域仍共用同一 registry（行 ~443），本试点只做 actors。
-    resolveEngine: (cid) => engineRouter.getEngine(cid ?? DEFAULT_COMPANY_ID)
+    resolveEngine: (cid) => engineRouter.getEngine(cid ?? defaultCompanyId),
+    // 内置技能只读列表：/api/skills/builtin 展示用（getter 闭包，加载完成后即返回实际集）。
+    listBuiltinSkills: () => builtinSkills.map((s2) => ({ id: s2.id, name: s2.name, description: s2.description }))
   });
-  const pgDsn = process.env["OASIS_PG_DSN"] ?? process.env["DATABASE_URL"];
-  const pgSchema = process.env["OASIS_PG_SCHEMA"] ?? "public";
-  let pgPool;
   let projectStateStore;
   let artifactStateStore;
   let chatSessionStore;
-  if (pgDsn) {
-    pgPool = createPgPool(pgDsn);
+  if (pgDsn && pgPool) {
     projectStateStore = await PostgresProjectStateStore.open(pgPool, pgSchema);
     artifactStateStore = await PostgresArtifactStateStore.open(pgPool, pgSchema);
     chatSessionStore = await PostgresChatSessionStore.open(pgPool, pgSchema);
     nodeStore = await PostgresNodeStore.open(pgPool, pgSchema);
     nodeTokens = await PostgresNodeTokenStore.open(pgPool, pgSchema);
-    console.log(`[serve] \u4EA4\u4ED8\u7269\u72B6\u6001\u4F53\u7CFB\uFF1APostgres schema=${pgSchema}`);
-    console.log(`[serve] \u8282\u70B9/\u8FD0\u884C\u65F6\u4F53\u7CFB\uFF1APostgres schema=${pgSchema}`);
+    console.log(`[serve] \u4E8B\u5B9E/\u72B6\u6001\u4F53\u7CFB\uFF1APostgres schema=${pgSchema}\uFF08oplog / registry / blobs / artifacts / chat\uFF09`);
   } else {
     projectStateStore = await FileProjectStateStore.open(path11.join(opts.dir, "artifact-document-projects.json"));
     artifactStateStore = await FileArtifactStateStore.open(path11.join(opts.dir, "artifact-document-state.json"));
-    chatSessionStore = new MemoryChatSessionStore();
+    chatSessionStore = await FileChatSessionStore.open(path11.join(opts.dir, "chat-sessions.json"));
     console.log("[serve] \u4EA4\u4ED8\u7269\u72B6\u6001\u4F53\u7CFB\uFF1A\u672C\u5730 JSON dev store");
     console.log("[serve] \u8282\u70B9/\u8FD0\u884C\u65F6\u4F53\u7CFB\uFF1A\u672C\u5730 JSON dev store");
   }
@@ -47392,7 +48447,7 @@ async function startServe(opts) {
   const automationStore = pgPool ? await PostgresAutomationStore.open(pgPool, pgSchema) : new MemoryAutomationStore();
   console.log(`[serve] \u81EA\u52A8\u5316\u4F53\u7CFB\uFF1A${pgPool ? `Postgres schema=${pgSchema}` : "\u5185\u5B58 dev store"}`);
   const automations = createAutomationsDomain({ store: automationStore, kernel });
-  const controlPlaneStore = await FileControlPlaneStore.open(path11.join(opts.dir, "control-plane.json"));
+  const controlPlaneStore = pgDsn && pgPool ? await PostgresControlPlaneStore.open(pgPool, pgSchema) : await FileControlPlaneStore.open(path11.join(opts.dir, "control-plane.json"));
   const resendKey = process.env["RESEND_API_KEY"];
   const mailFrom = process.env["RESEND_FROM_EMAIL"] ?? process.env["OASIS_MAIL_FROM"] ?? "noreply@open-friday.com";
   if (!resendKey) console.warn("[serve] RESEND_API_KEY \u672A\u8BBE\u2014\u2014\u9A8C\u8BC1\u7801/\u9080\u8BF7\u6253\u5370\u5230\u65E5\u5FD7\uFF08dev\uFF09\uFF1B\u751F\u4EA7\u8BF7\u914D RESEND_API_KEY + RESEND_FROM_EMAIL\uFF08Resend \u5DF2\u9A8C\u8BC1\u57DF\u540D\uFF09");
@@ -47410,17 +48465,27 @@ async function startServe(opts) {
     // 邀请上手（切片5）：被邀请但无账号的邮箱，验证码登录成功时建账号。
     provisionAccount: (email2) => companies.service.ensureAccount(email2)
   });
-  await migrateDefaultCompany(controlPlaneStore, await actors.service.listActors());
-  await bootstrapBuildWorkorderSkill(actors.service).catch((err) => console.warn(`[serve] build-workorder skill bootstrap failed: ${String(err)}`));
-  if (!await controlPlaneStore.getMember(DEFAULT_COMPANY_ID, operatorActor)) {
-    await controlPlaneStore.upsertMember({ companyId: DEFAULT_COMPANY_ID, accountId: operatorActor, actorId: operatorActor, role: "owner" });
+  const defaultCompanyMigration = await migrateDefaultCompany(controlPlaneStore, await actors.service.listActors());
+  defaultCompanyId = defaultCompanyMigration.company.id;
+  builtinSkills = await loadBuiltinSkills(builtinSkillsDir()).catch((err) => {
+    console.warn(`[serve] builtin skills load failed: ${String(err)}`);
+    return [];
+  });
+  console.log(`[serve] loaded ${builtinSkills.length} builtin skill(s): ${builtinSkills.map((s2) => s2.id).join(", ") || "(none)"}`);
+  for (const devActor of ["actor:human:yx"]) {
+    if (!await controlPlaneStore.getMember(defaultCompanyId, devActor)) {
+      await controlPlaneStore.upsertMember({ companyId: defaultCompanyId, accountId: devActor, actorId: devActor, role: "member" });
+    }
+  }
+  if (!await controlPlaneStore.getMember(defaultCompanyId, operatorActor)) {
+    await controlPlaneStore.upsertMember({ companyId: defaultCompanyId, accountId: operatorActor, actorId: operatorActor, role: "owner" });
   }
   const bootstrapEmail = process.env["OASIS_BOOTSTRAP_OWNER_EMAIL"];
   if (bootstrapEmail) {
-    const m2 = await companies.service.grantOwner(DEFAULT_COMPANY_ID, bootstrapEmail);
+    const m2 = await companies.service.grantOwner(defaultCompanyId, bootstrapEmail);
     console.log(`[serve] bootstrap owner\uFF1A${bootstrapEmail} \u2192 ${m2.accountId}\uFF08\u9ED8\u8BA4\u516C\u53F8 owner\uFF09`);
   }
-  await ensureCompanyActors(controlPlaneStore, DEFAULT_COMPANY_ID, registryStore);
+  await ensureCompanyActors(controlPlaneStore, defaultCompanyId, registryStore);
   const CONTROL_PLANE_PREFIXES = ["/api/companies", "/api/invitations"];
   const resolveCompanyContext = async (actor, headers, pathname) => {
     if (CONTROL_PLANE_PREFIXES.some((p2) => pathname === p2 || pathname.startsWith(`${p2}/`))) {
@@ -47507,7 +48572,7 @@ async function startServe(opts) {
   });
   const engineRouter = new CompanyEngineRouter({
     defaultEngine: { kernel, oplog, blobs, registry: registryStore, assets },
-    defaultCompanyId: DEFAULT_COMPANY_ID,
+    defaultCompanyId,
     buildEngine: async (companyId) => {
       const engine2 = await openFileEngine(path11.join(opts.dir, "companies", companyEngineDirName(companyId)), { schema });
       await ensureCompanyActors(controlPlaneStore, companyId, engine2.registry);
@@ -47516,7 +48581,7 @@ async function startServe(opts) {
     }
   });
   const typesAdmin = new TypesAdminService(typeStore, () => engineRouter.liveEngines().map((e) => e.kernel));
-  const engine = await engineRouter.getEngine(DEFAULT_COMPANY_ID);
+  const engine = await engineRouter.getEngine(defaultCompanyId);
   let hub = null;
   let chatRemoteAdapter = null;
   let localUrl = "";
@@ -47552,7 +48617,7 @@ async function startServe(opts) {
     resolveCompanyContext,
     auth,
     // CO-301 阶段1：请求热路径按当前公司经路由层取引擎（恒等到默认公司；per-company 懒建是后续阶段）。
-    resolveEngine: (companyId) => engineRouter.getEngine(companyId ?? DEFAULT_COMPANY_ID),
+    resolveEngine: (companyId) => engineRouter.getEngine(companyId ?? defaultCompanyId),
     actors,
     port: opts.port ?? 7320,
     projectState: projectStateStore,
@@ -47589,7 +48654,7 @@ async function startServe(opts) {
         return {};
       }));
       const limits = { wallClockMs: 5 * 6e4 };
-      const artifactId = `artifact:planner:${(0, import_node_crypto20.randomUUID)()}`;
+      const artifactId = `artifact:planner:${(0, import_node_crypto21.randomUUID)()}`;
       const handle = await chatRemoteAdapter.spawn({
         actor: planner.id,
         actorToken: issueSessionToken(planner.id, { artifactId, action: "plan-workorder", limits, binding }),
@@ -47600,7 +48665,8 @@ async function startServe(opts) {
         binding,
         limits,
         env: provision.env,
-        wrapperPaths: provision.wrapperPaths
+        wrapperPaths: provision.wrapperPaths,
+        ...provision.requiredTools.length > 0 ? { requiredTools: provision.requiredTools } : {}
       });
       const chunks = [];
       handle.onOutput?.((chunk) => chunks.push(chunk));
@@ -47635,7 +48701,7 @@ async function startServe(opts) {
         workorderDrafts,
         // 活工单查不到时回退查建单草案（status="draft"）
         ...opts.sla ? { sla: opts.sla } : {},
-        resolveEngine: (cid) => engineRouter.getEngine(cid ?? DEFAULT_COMPANY_ID)
+        resolveEngine: (cid) => engineRouter.getEngine(cid ?? defaultCompanyId)
       }),
       trace.register,
       automations.register,
@@ -47662,7 +48728,10 @@ 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 }),
+    materializeSkills: async (actorId, runtimeKind) => ({
+      ...materializeBuiltins(builtinSkills, runtimeKind),
+      ...await materializeSkillFiles({ service: actors.service, blobs: assets, actorId, runtimeKind })
+    }),
     uploadChatAttachment: async ({ contentBase64 }) => ({ blobRef: await assets.put(new Uint8Array(Buffer.from(contentBase64, "base64"))) }),
     dispatchProduce: async ({ artifactId, actorId, part }) => {
       if (!dispatcher) {
@@ -47692,9 +48761,9 @@ async function startServe(opts) {
       if (!localUrl) {
         throw new ApiError(503, "SERVER_URL_NOT_READY", "server URL \u5C1A\u672A\u5C31\u7EEA");
       }
-      const runtimeSessionId = sessionId ?? (0, import_node_crypto20.randomUUID)();
+      const runtimeSessionId = sessionId ?? (0, import_node_crypto21.randomUUID)();
       const resumeRuntimeSession = Boolean(sessionId);
-      const traceRunId = `chat-run:${(0, import_node_crypto20.randomUUID)()}`;
+      const traceRunId = `chat-run:${(0, import_node_crypto21.randomUUID)()}`;
       const traceStartedAt = (/* @__PURE__ */ new Date()).toISOString();
       let traceSeq = 0;
       let traceEnabled = true;
@@ -47789,18 +48858,18 @@ async function startServe(opts) {
       if (actorCtx?.config?.prompt) {
         Object.assign(files, splitIdentityFiles3(actorCtx.config.prompt));
       }
+      Object.assign(files, materializeBuiltins(builtinSkills, binding.runtimeKind));
       Object.assign(files, await materializeSkillFiles({
         service: actors.service,
         blobs: assets,
         actorId,
-        runtimeKind: binding.runtimeKind,
-        extraSkillIds: DEFAULT_CHAT_SKILLS
+        runtimeKind: binding.runtimeKind
       }).catch((err) => {
         console.warn(`[chat] skill materialize failed for ${actorId}: ${String(err)}`);
         return {};
       }));
       const limits = { wallClockMs: 10 * 6e4 };
-      const artifactId = `artifact:chat:${(0, import_node_crypto20.randomUUID)()}`;
+      const artifactId = `artifact:chat:${(0, import_node_crypto21.randomUUID)()}`;
       const handle = await chatRemoteAdapter.spawn({
         actor: actorId,
         actorToken: issueSessionToken(actorId, { artifactId, action: "chat", limits, binding, sessionId: runtimeSessionId }),
@@ -47816,7 +48885,8 @@ async function startServe(opts) {
         // （建单/改图暂存统一，见 docs/proposals/draft-edit-unification.md）。不设 OASIS_WORKSPACE——
         // chat agent 不绑单一工单，按命令 --workspace / id 定位是哪份草案。
         env: { ...provision.env, OASIS_STAGE: "1", ...chatSessionId ? { OASIS_CHAT_SESSION_ID: chatSessionId } : {} },
-        wrapperPaths: provision.wrapperPaths
+        wrapperPaths: provision.wrapperPaths,
+        ...provision.requiredTools.length > 0 ? { requiredTools: provision.requiredTools } : {}
       });
       const buffered = [];
       const bufferedTelemetry = [];
@@ -47941,7 +49011,10 @@ 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 }),
+      materializeSkills: async (actorId, runtimeKind) => ({
+        ...materializeBuiltins(builtinSkills, runtimeKind),
+        ...await materializeSkillFiles({ service: actors.service, blobs: assets, actorId, runtimeKind })
+      }),
       schema: new Map(schema.map((d2) => [d2.name, d2])),
       resolveCodeRepo,
       // §4/C：异步从权威源（store）解析；dispatcher 装配前 await
@@ -48201,7 +49274,7 @@ var SessionManager = class {
 
 // ../cli/src/daemon/ws-client.ts
 init_wrapper();
-var import_node_os2 = require("node:os");
+var import_node_os3 = require("node:os");
 
 // ../cli/src/daemon/logger.ts
 function ts2() {
@@ -48304,6 +49377,10 @@ var DaemonWsClient = class {
               return;
             }
           }
+          if (job.requiredTools?.length) {
+            const missing = await ensureConnectorTools(job.requiredTools);
+            if (missing.length) log2("[node-cli]", `  connector tools still missing (agent may fail): ${missing.join(", ")}`);
+          }
           const handle = await this.sessions.getAdapter().spawn(job);
           this.sessions.register(dispatchId, handle);
           log2("[node-cli]", `  \u2192 session_started  id=${handle.id}  setup=${Date.now() - t0}ms`);
@@ -48338,12 +49415,12 @@ var DaemonWsClient = class {
     if (this.ws?.readyState === import_websocket.default.OPEN) this.ws.send(JSON.stringify(msg));
   }
   buildMeta() {
-    return { hostname: (0, import_node_os2.hostname)(), adapters: this.adapters, ...this.reportRuntimes ? { runtimes: this.runtimes } : {}, nodeVersion: process.version, ...this.nodeName ? { nodeName: this.nodeName } : {} };
+    return { hostname: (0, import_node_os3.hostname)(), adapters: this.adapters, ...this.reportRuntimes ? { runtimes: this.runtimes } : {}, nodeVersion: process.version, ...this.nodeName ? { nodeName: this.nodeName } : {} };
   }
 };
 
 // ../cli/src/daemon/detect-adapters.ts
-var import_node_child_process9 = require("node:child_process");
+var import_node_child_process10 = require("node:child_process");
 var KNOWN = [
   { adapter: "claude-code", binary: "claude" },
   { adapter: "codex", binary: "codex" },
@@ -48362,7 +49439,7 @@ var KNOWN = [
 function onPath(binary) {
   try {
     const cmd = process.platform === "win32" ? "where" : "which";
-    (0, import_node_child_process9.execFileSync)(cmd, [binary], { stdio: "ignore" });
+    (0, import_node_child_process10.execFileSync)(cmd, [binary], { stdio: "ignore" });
     return true;
   } catch {
     return false;
@@ -48370,7 +49447,7 @@ function onPath(binary) {
 }
 function versionOf(binary) {
   try {
-    return (0, import_node_child_process9.execFileSync)(binary, ["--version"], {
+    return (0, import_node_child_process10.execFileSync)(binary, ["--version"], {
       encoding: "utf8",
       stdio: ["ignore", "pipe", "ignore"],
       timeout: 1500
@@ -48455,6 +49532,79 @@ async function startNode(opts) {
   });
 }
 
+// ../cli/src/daemon/machine-id.ts
+var import_node_child_process11 = require("node:child_process");
+var import_node_fs3 = require("node:fs");
+var import_node_crypto22 = require("node:crypto");
+var import_node_os4 = require("node:os");
+function linuxMachineId() {
+  for (const p2 of ["/etc/machine-id", "/var/lib/dbus/machine-id"]) {
+    try {
+      const v2 = (0, import_node_fs3.readFileSync)(p2, "utf8").trim();
+      if (v2) return v2;
+    } catch {
+    }
+  }
+  return null;
+}
+function macMachineId() {
+  try {
+    const out = (0, import_node_child_process11.execFileSync)("ioreg", ["-rd1", "-c", "IOPlatformExpertDevice"], {
+      encoding: "utf8",
+      timeout: 2e3,
+      stdio: ["ignore", "pipe", "ignore"]
+    });
+    const m2 = out.match(/"IOPlatformUUID"\s*=\s*"([^"]+)"/);
+    return m2?.[1] ?? null;
+  } catch {
+    return null;
+  }
+}
+function windowsMachineId() {
+  try {
+    const out = (0, import_node_child_process11.execFileSync)("reg", [
+      "query",
+      "HKLM\\SOFTWARE\\Microsoft\\Cryptography",
+      "/v",
+      "MachineGuid"
+    ], { encoding: "utf8", timeout: 2e3, stdio: ["ignore", "pipe", "ignore"] });
+    const m2 = out.match(/MachineGuid\s+REG_SZ\s+([A-Za-z0-9-]+)/);
+    return m2?.[1] ?? null;
+  } catch {
+    return null;
+  }
+}
+function fallbackFingerprint() {
+  const macs = [];
+  const ifaces = (0, import_node_os4.networkInterfaces)();
+  for (const name of Object.keys(ifaces).sort()) {
+    for (const ni of ifaces[name] ?? []) {
+      if (!ni.internal && ni.mac && ni.mac !== "00:00:00:00:00:00") macs.push(ni.mac);
+    }
+  }
+  return `fallback:${(0, import_node_os4.hostname)()}:${macs.sort()[0] ?? "no-mac"}`;
+}
+function machineFingerprint() {
+  const byOs = process.platform === "darwin" ? macMachineId() : process.platform === "win32" ? windowsMachineId() : linuxMachineId();
+  return byOs ?? fallbackFingerprint();
+}
+var defaultSources = {
+  machineFingerprint,
+  osUser: () => {
+    try {
+      return (0, import_node_os4.userInfo)().username;
+    } catch {
+      return process.env["USER"] ?? process.env["USERNAME"] ?? "unknown";
+    }
+  }
+};
+function resolveNodeId(sources = {}) {
+  const s2 = { ...defaultSources, ...sources };
+  const material = `${s2.machineFingerprint()}:${s2.osUser()}`;
+  const digest = (0, import_node_crypto22.createHash)("sha256").update(material).digest("hex").slice(0, 12);
+  return `node-${digest}`;
+}
+
 // ../cli/src/cli.ts
 init_src4();
 var USAGE = `oasis \u2014\u2014 artifact-centric \u534F\u4F5C\u5185\u6838 CLI\uFF08\u670D\u52A1\u7AEF\u7626\u5BA2\u6237\u7AEF\uFF09
@@ -48636,16 +49786,17 @@ async function runCli(argv, println = console.log) {
     const nodeTokenFile = path12.join(dir, "node-token");
     const enrollTokenFile = path12.join(dir, "enroll-token");
     const reportMarkerFile = path12.join(dir, "report-runtimes");
-    let nodeId = fs15.existsSync(nodeIdFile) ? fs15.readFileSync(nodeIdFile, "utf8").trim() : null;
+    const persistedNodeId = fs15.existsSync(nodeIdFile) ? fs15.readFileSync(nodeIdFile, "utf8").trim() : null;
+    let nodeId = persistedNodeId || resolveNodeId();
     let token2 = flags.get("token") ?? process.env["OASIS_NODE_TOKEN"] ?? (fs15.existsSync(nodeTokenFile) ? fs15.readFileSync(nodeTokenFile, "utf8").trim() : void 0);
     const enrollToken = flags.get("enroll-token") ?? process.env["OASIS_ENROLL_TOKEN"] ?? (fs15.existsSync(enrollTokenFile) ? fs15.readFileSync(enrollTokenFile, "utf8").trim() : void 0);
     let freshEnrollment = false;
-    if ((!nodeId || !token2) && enrollToken) {
+    if (!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() })
+        body: JSON.stringify({ enrollToken, nodeId, hostname: os7.hostname() })
       });
       if (!res.ok) throw new Error(`enroll token exchange failed: HTTP ${res.status}`);
       const body = await res.json();
@@ -48738,7 +49889,7 @@ async function runCli(argv, println = console.log) {
     const store = createNodeTokenStore(path12.join(dir, "node-tokens.json"));
     const sub = positional[0];
     if (sub === "issue") {
-      const id = flags.get("id") ?? `node-${(0, import_node_crypto21.randomUUID)()}`;
+      const id = flags.get("id") ?? `node-${(0, import_node_crypto23.randomUUID)()}`;
       const token2 = store.issue(id);
       println(token2);
       process.stderr.write(
@@ -48763,9 +49914,10 @@ async function runCli(argv, println = console.log) {
   }
   if (command === "admin" && positional[0] === "grant-owner") {
     const email2 = need(flags, "email");
-    const companyId = flags.get("company") ?? DEFAULT_COMPANY_ID;
-    const name = flags.get("name");
     const store = await FileControlPlaneStore.open(path12.join(dir, "control-plane.json"));
+    const activeCompanies = (await store.listCompanies()).filter((c) => c.status === "active");
+    const companyId = flags.get("company") ?? activeCompanies[0]?.id ?? resolveDefaultCompanyConfig().id;
+    const name = flags.get("name");
     if (!await store.getCompany(companyId)) throw new Error(`\u516C\u53F8\u4E0D\u5B58\u5728\uFF1A${companyId}\uFF08\u5148\u8BA9 serve \u8DD1\u4E00\u6B21\u4EE5\u5EFA\u9ED8\u8BA4\u516C\u53F8\uFF0C\u6216\u7528 --company \u6307\u5B9A\u5DF2\u5B58\u5728\u516C\u53F8\uFF09`);
     const svc = new CompaniesService({ store });
     const m2 = await svc.grantOwner(companyId, email2, name);
@@ -49896,7 +51048,7 @@ function setupAutostart() {
       ""
     ].join("\n"));
     try {
-      (0, import_node_child_process10.execSync)("systemctl --user daemon-reload && systemctl --user enable --now oasis-node", { stdio: "ignore" });
+      (0, import_node_child_process12.execSync)("systemctl --user daemon-reload && systemctl --user enable --now oasis-node", { stdio: "ignore" });
     } catch {
     }
   } else if (process.platform === "darwin") {
@@ -49913,14 +51065,14 @@ function setupAutostart() {
   <key>StandardErrorPath</key><string>${LOG_FILE}</string>
 </dict></plist>`);
     try {
-      (0, import_node_child_process10.execSync)(`launchctl load "${plist}"`, { stdio: "ignore" });
+      (0, import_node_child_process12.execSync)(`launchctl load "${plist}"`, { stdio: "ignore" });
     } catch {
     }
   }
 }
 function spawnDaemon() {
   const log3 = fs16.openSync(LOG_FILE, "a");
-  const child = (0, import_node_child_process10.spawn)(process.execPath, [BIN_FILE, "--_daemon"], {
+  const child = (0, import_node_child_process12.spawn)(process.execPath, [BIN_FILE, "--_daemon"], {
     detached: true,
     stdio: ["ignore", log3, log3]
   });
@@ -49942,11 +51094,11 @@ function stopDaemon() {
   } catch {
   }
   try {
-    (0, import_node_child_process10.execSync)('pkill -f "oasis.js --_daemon"', { stdio: "ignore" });
+    (0, import_node_child_process12.execSync)('pkill -f "oasis.js --_daemon"', { stdio: "ignore" });
   } catch {
   }
   try {
-    (0, import_node_child_process10.execSync)("systemctl --user stop oasis-node 2>/dev/null", { stdio: "ignore" });
+    (0, import_node_child_process12.execSync)("systemctl --user stop oasis-node 2>/dev/null", { stdio: "ignore" });
   } catch {
   }
 }