oasis_test 0.1.70 → 0.1.72

package/dist/index.js

@@ -137173,7 +137173,6 @@ var init_live_chat = __esm({
         if (!turn || turn.status !== "running") return { accepted: false, reason: "no-live-turn" };
         const fn = turn.handle.appendInput;
         if (typeof fn !== "function") return { accepted: false, reason: "unsupported" };
-        if (turn.handle.canAppendInput === false) return { accepted: false, reason: "session-closing" };
         let res;
         try {
           res = await fn.call(turn.handle, { text: text2 });
@@ -138897,7 +138896,7 @@ function requiresMeReasonOf(model, artifact, viewer, facts) {
 function computeRequiresMe(model, artifact, viewer, facts) {
   return requiresMeReasonOf(model, artifact, viewer, facts) !== null;
 }
-function buildWorkorderDetail(model, workspaceId, resolveActor, resolveProject, dispatchJournal = [], dispatchPausedOf, ops = [], reviewerPreview, dispatcherSignalsOf, viewer, roleDefaultOwnerOf) {
+function buildWorkorderDetail(model, workspaceId, resolveActor, resolveProject, dispatchJournal = [], dispatchPausedOf, ops = [], reviewerPreview, dispatcherSignalsOf, viewer, roleDefaultOwnerOf, roleLabelOf) {
   const arts = [...model.artifacts.values()].filter((a) => a.workspace === workspaceId);
   if (arts.length === 0) return null;
   const ref2 = (id) => {
@@ -138961,11 +138960,15 @@ function buildWorkorderDetail(model, workspaceId, resolveActor, resolveProject,
         quorum: pv.quorum,
         // 0089：每桶门槛后端给，前端别拿聚合 quorum 做减法。
         // 诊断 f1641dd3-abdaa869（改 B）：给角色桶补**纯展示**的 defaultOwner（该角色 RoleDef.defaultOwner
-        // 解析成 ActorRef）。core 无岗位目录、算不出，故在此注入。未配 / 无解析器 → 不带该字段。
+        // 解析成 ActorRef）与 roleLabel（RoleDef.label 中文名，annotation 6e3608ee）。core 无岗位目录、
+        // 算不出，故在此注入。未配 / 无解析器 → 不带对应字段（前端各自兜底）。
         reviewerRequirements: pv.requirements.map((r) => {
           if (r.source !== "type") return r;
-          const owner = r.roles?.[0] ? roleDefaultOwnerOf?.(r.roles[0]) : void 0;
-          return owner ? { ...r, defaultOwner: ref2(owner) } : r;
+          const role = r.roles?.[0];
+          const owner = role ? roleDefaultOwnerOf?.(role) : void 0;
+          const label = role ? roleLabelOf?.(role) : void 0;
+          const withOwner = owner ? { ...r, defaultOwner: ref2(owner) } : r;
+          return label ? { ...withOwner, roleLabel: label } : withOwner;
         }),
         // 0101：审核角色是否被覆盖过（替换了类型默认）——供详情页角色位徽标/复原判断。
         ...a.reviewRoles !== void 0 ? { reviewRolesOverridden: true } : {},
@@ -142560,13 +142563,13 @@ async function startOasisServer(opts) {
               const actorCtx = await opts.resolveActorContext(body.actorId).catch(() => null);
               if (actorCtx) {
                 const { mkdtempSync: mkdtempSync5, mkdirSync: mkdirSync20, writeFileSync: writeFileSync13 } = await import("node:fs");
-                const { join: join28, dirname: dirname24 } = await import("node:path");
+                const { join: join28, dirname: dirname25 } = await import("node:path");
                 const { tmpdir: tmpdir9 } = await import("node:os");
                 const dir = mkdtempSync5(join28(tmpdir9(), "oasis-chat-"));
                 if (actorCtx.config?.prompt) {
                   for (const [rel, content] of Object.entries(splitIdentityFiles2(actorCtx.config.prompt))) {
                     const file = join28(dir, rel);
-                    mkdirSync20(dirname24(file), { recursive: true });
+                    mkdirSync20(dirname25(file), { recursive: true });
                     writeFileSync13(file, content);
                   }
                 }
@@ -142583,7 +142586,7 @@ async function startOasisServer(opts) {
                   const skillFiles = await opts.materializeSkills(body.actorId, "claude").catch(() => ({}));
                   for (const [rel, content] of Object.entries(skillFiles)) {
                     const file = join28(dir, rel);
-                    mkdirSync20(dirname24(file), { recursive: true });
+                    mkdirSync20(dirname25(file), { recursive: true });
                     writeFileSync13(file, content);
                   }
                 }
@@ -151656,6 +151659,25 @@ export GITHUB_TOKEN=${shSingleQuote2(token)}
   }
 });
 
+// ../connectors/src/registry.ts
+function createConnectorBySlug(slug5) {
+  switch (slug5) {
+    case "feishu":
+      return new FeishuConnector();
+    case "github":
+      return new GithubConnector();
+    default:
+      return null;
+  }
+}
+var init_registry2 = __esm({
+  "../connectors/src/registry.ts"() {
+    "use strict";
+    init_feishu();
+    init_github();
+  }
+});
+
 // ../adapters/src/open-design/driver.ts
 function deriveBoardKey(artifactId) {
   const tail = artifactId.split(":").pop() ?? artifactId;
@@ -152324,6 +152346,11 @@ function buildClaudeUsage(acc) {
     costUsdMicros: acc.costUsd != null ? Math.round(acc.costUsd * 1e6) : null
   };
 }
+function claudeAppendGraceMs(opts) {
+  const raw = opts.appendGraceMs ?? Number(process.env["OASIS_CLAUDE_APPEND_GRACE_MS"] ?? NaN);
+  const n = Number.isFinite(raw) ? Number(raw) : 8e3;
+  return n > 0 ? n : 0;
+}
 function claudeAppendEnabled(opts) {
   if (opts.streamJson !== true) return false;
   if (opts.enableAppendInput === false) return false;
@@ -152426,6 +152453,7 @@ var init_claude_code = __esm({
         const prompt = materializeBundle(dir, job.bundle);
         const promptViaStdin = Buffer.byteLength(prompt, "utf8") > 1e5;
         const appendMode = claudeAppendEnabled(this.opts);
+        const appendGraceMs = claudeAppendGraceMs(this.opts);
         const promptOnStdin = appendMode || promptViaStdin;
         const runtimeSessionArgs = job.runtimeSessionId ? job.resumeRuntimeSession ? ["--resume", job.runtimeSessionId] : ["--session-id", job.runtimeSessionId] : [];
         const oneShotSafety = this.opts.oneShotSafety !== false;
@@ -152471,18 +152499,27 @@ var init_claude_code = __esm({
         let writes = 0;
         let results = 0;
         let inputClosing = false;
+        let pendingClose = null;
+        const cancelPendingClose = () => {
+          if (pendingClose) {
+            clearTimeout(pendingClose);
+            pendingClose = null;
+          }
+        };
         const writeUserMessage = (text2) => {
           try {
             child.stdin.write(
               JSON.stringify({ type: "user", message: { role: "user", content: [{ type: "text", text: text2 }] } }) + "\n"
             );
             writes++;
+            cancelPendingClose();
             return true;
           } catch {
             return false;
           }
         };
         const closeInput = () => {
+          cancelPendingClose();
           if (inputClosing) return;
           inputClosing = true;
           try {
@@ -152491,7 +152528,17 @@ var init_claude_code = __esm({
           }
         };
         const maybeCloseInputOnResult = () => {
-          if (appendMode && !inputClosing && results >= writes) closeInput();
+          if (!appendMode || inputClosing || results < writes) return;
+          if (appendGraceMs <= 0) {
+            closeInput();
+            return;
+          }
+          cancelPendingClose();
+          pendingClose = setTimeout(() => {
+            pendingClose = null;
+            closeInput();
+          }, appendGraceMs);
+          pendingClose.unref?.();
         };
         let interruptSeq = 0;
         const writeInterrupt = () => {
@@ -152641,11 +152688,13 @@ var init_claude_code = __esm({
             ...sessionModel ? { model: sessionModel } : {},
             ...errorMessage ? { errorMessage } : {}
           };
+          cancelPendingClose();
           for (const cb of callbacks.splice(0)) cb(exited);
         });
         return {
           id,
           async kill() {
+            cancelPendingClose();
             inputClosing = true;
             killReason ??= "cancelled";
             child.kill("SIGKILL");
@@ -156137,15 +156186,17 @@ var init_logger = __esm({
 });
 
 // ../connectors/src/connector-adapter.ts
-var import_promises3, import_node_os7, import_node_path10, ConnectorAwareAdapter;
+var import_promises3, import_node_fs8, import_node_os7, import_node_path10, ConnectorAwareAdapter;
 var init_connector_adapter = __esm({
   "../connectors/src/connector-adapter.ts"() {
     "use strict";
     import_promises3 = require("node:fs/promises");
+    import_node_fs8 = require("node:fs");
     import_node_os7 = require("node:os");
     import_node_path10 = require("node:path");
     init_src5();
     init_base();
+    init_registry2();
     init_logger();
     ConnectorAwareAdapter = class {
       constructor(baseOpts = {}) {
@@ -156158,13 +156209,39 @@ var init_connector_adapter = __esm({
           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 remoteWrappers = [...job.wrapperPaths ?? [], ...sentinelWrappers];
+        const wrapperPaths = remoteWrappers.filter((p2) => (0, import_node_fs8.existsSync)(p2));
+        const droppedWrappers = remoteWrappers.length - wrapperPaths.length;
         const strippedEnv = Object.fromEntries(
           Object.entries(job.env ?? {}).filter(([k2]) => !k2.endsWith("_WRAPPER"))
         );
         let extraEnv = { ...strippedEnv };
         const toolsBin = connectorToolsBinDir();
         const inheritedPath = process.env["PATH"] ?? "";
+        const localBinDirs = [];
+        const localCleanups = [];
+        for (const { slug: slug5, credentials } of job.connectorCreds ?? []) {
+          const connector = createConnectorBySlug(slug5);
+          if (!connector) {
+            log("[adapter]", `  unknown connector slug from server: ${slug5}\uFF08\u8DF3\u8FC7\uFF09`);
+            continue;
+          }
+          try {
+            const sessionEnv = /* @__PURE__ */ new Map();
+            await connector.inject(credentials, sessionEnv);
+            for (const [k2, v2] of sessionEnv) extraEnv[k2] = v2;
+            const staged = stageConnectorWrapper(connector);
+            if (staged) localBinDirs.push((0, import_node_path10.dirname)(staged));
+            localCleanups.push(() => connector.cleanup(sessionEnv));
+            log("[adapter]", `  ${slug5} injected locally  creds+wrapper on this node`);
+          } catch (err) {
+            log("[adapter]", `  ${slug5} local inject failed\uFF08\u8BE5 connector \u672C\u8F6E\u4E0D\u53EF\u7528\uFF09: ${String(err)}`);
+          }
+        }
+        if (droppedWrappers > 0) {
+          log("[adapter]", `  dropped ${droppedWrappers} wrapper path(s) not present on this node\uFF08server \u4FA7\u8DEF\u5F84\uFF0C\u5DF2\u7531\u672C\u5730\u6CE8\u5165\u63A5\u7BA1\uFF09`);
+        }
+        const pathParts = [...localBinDirs];
         if (wrapperPaths.length > 0) {
           const wrapperBinDir = await (0, import_promises3.mkdtemp)((0, import_node_path10.join)((0, import_node_os7.tmpdir)(), "oasis-wrappers-"));
           await (0, import_promises3.mkdir)(wrapperBinDir, { recursive: true });
@@ -156172,14 +156249,24 @@ var init_connector_adapter = __esm({
             const linkName = (0, import_node_path10.basename)(wp).replace(/\.sh$/, "");
             await (0, import_promises3.symlink)(wp, (0, import_node_path10.join)(wrapperBinDir, linkName));
           }
-          extraEnv = { ...extraEnv, PATH: [wrapperBinDir, toolsBin, inheritedPath].filter(Boolean).join(":") };
-          log("[adapter]", `  connectors injected  +${Date.now() - t0}ms  wrappers=${wrapperPaths.length}  env_keys=${Object.keys(job.env ?? {}).join(",")}`);
+          pathParts.push(wrapperBinDir);
+        }
+        pathParts.push(toolsBin, inheritedPath);
+        extraEnv = { ...extraEnv, PATH: pathParts.filter(Boolean).join(":") };
+        if (localBinDirs.length > 0 || wrapperPaths.length > 0) {
+          log("[adapter]", `  connectors injected  +${Date.now() - t0}ms  local=${localBinDirs.length}  remote_wrappers=${wrapperPaths.length}  env_keys=${Object.keys(job.env ?? {}).join(",")}`);
         } else {
-          extraEnv = { ...extraEnv, PATH: [toolsBin, inheritedPath].filter(Boolean).join(":") };
           log("[adapter]", `  no connectors  +${Date.now() - t0}ms`);
         }
         const jobAdapter = new ClaudeCodeAdapter({ ...this.baseOpts, env: extraEnv });
-        return jobAdapter.spawn(job);
+        const handle = await jobAdapter.spawn(job);
+        if (localCleanups.length > 0) {
+          handle.onExit(() => {
+            for (const fn of localCleanups) void fn().catch(() => {
+            });
+          });
+        }
+        return handle;
       }
     };
   }
@@ -156195,6 +156282,7 @@ var init_src6 = __esm({
     init_feishu();
     init_well_known_skills();
     init_github();
+    init_registry2();
     init_connector_adapter();
   }
 });
@@ -157990,11 +158078,11 @@ var init_routes2 = __esm({
 });
 
 // ../server/src/domains/projects/postgres-documents.ts
-var import_node_fs8, ident2, PostgresProjectDocumentStore;
+var import_node_fs9, ident2, PostgresProjectDocumentStore;
 var init_postgres_documents = __esm({
   "../server/src/domains/projects/postgres-documents.ts"() {
     "use strict";
-    import_node_fs8 = __toESM(require("node:fs"), 1);
+    import_node_fs9 = __toESM(require("node:fs"), 1);
     init_service2();
     ident2 = (s2) => {
       if (!/^[a-z_][a-z0-9_]*$/.test(s2)) throw new Error(`invalid schema name: ${s2}`);
@@ -158032,10 +158120,10 @@ var init_postgres_documents = __esm({
       async backfillFromFile(file) {
         const counted = await this.sql.query(`SELECT count(*) AS n FROM ${this.s}.project_document_spaces`);
         if (Number(counted.rows[0]?.["n"] ?? 0) > 0) return;
-        if (!import_node_fs8.default.existsSync(file)) return;
+        if (!import_node_fs9.default.existsSync(file)) return;
         let snap;
         try {
-          snap = JSON.parse(import_node_fs8.default.readFileSync(file, "utf8"));
+          snap = JSON.parse(import_node_fs9.default.readFileSync(file, "utf8"));
         } catch {
           console.warn(`[projectdoc-backfill] ${file} \u89E3\u6790\u5931\u8D25\uFF0C\u8DF3\u8FC7\u56DE\u586B\uFF08\u7A7A\u95F4\u5C06\u6309\u9700\u91CD\u65B0\u521D\u59CB\u5316\uFF09`);
           return;
@@ -159399,7 +159487,7 @@ function nodesDomain(deps) {
       const here = (0, import_node_path12.dirname)((0, import_node_url4.fileURLToPath)(__esm_import_meta_url));
       for (const rel of ["../../../../node-daemon/package.json", "../../../../../node-daemon/package.json"]) {
         try {
-          const raw = (0, import_node_fs9.readFileSync)((0, import_node_path12.resolve)(here, rel), "utf8");
+          const raw = (0, import_node_fs10.readFileSync)((0, import_node_path12.resolve)(here, rel), "utf8");
           const pkg = JSON.parse(raw);
           if (pkg.version) return { version: pkg.version, source: "monorepo" };
         } catch {
@@ -159753,12 +159841,12 @@ function nodesDomain(deps) {
     });
   };
 }
-var import_node_crypto24, import_node_fs9, import_node_url4, import_node_path12;
+var import_node_crypto24, import_node_fs10, import_node_url4, import_node_path12;
 var init_routes4 = __esm({
   "../server/src/domains/nodes/routes.ts"() {
     "use strict";
     import_node_crypto24 = require("node:crypto");
-    import_node_fs9 = require("node:fs");
+    import_node_fs10 = require("node:fs");
     import_node_url4 = require("node:url");
     import_node_path12 = require("node:path");
     init_src5();
@@ -160807,11 +160895,11 @@ function nameKey(name) {
 function cleanName(name) {
   return name.trim().replace(/\s+/g, " ");
 }
-var import_node_fs10, import_node_path13, import_node_crypto25, SEP, keyOf, prefixOf, MemoryWorkorderTagStore, FileWorkorderTagStore;
+var import_node_fs11, import_node_path13, import_node_crypto25, SEP, keyOf, prefixOf, MemoryWorkorderTagStore, FileWorkorderTagStore;
 var init_tags = __esm({
   "../server/src/domains/collab/tags.ts"() {
     "use strict";
-    import_node_fs10 = __toESM(require("node:fs"), 1);
+    import_node_fs11 = __toESM(require("node:fs"), 1);
     import_node_path13 = __toESM(require("node:path"), 1);
     import_node_crypto25 = __toESM(require("node:crypto"), 1);
     SEP = "::";
@@ -160889,7 +160977,7 @@ var init_tags = __esm({
         super();
         this.file = file;
         try {
-          const raw = JSON.parse(import_node_fs10.default.readFileSync(file, "utf8"));
+          const raw = JSON.parse(import_node_fs11.default.readFileSync(file, "utf8"));
           for (const [k2, v2] of Object.entries(raw)) {
             if (v2 && typeof v2 === "object" && typeof v2.id === "string" && typeof v2.name === "string") this.map.set(k2, v2);
           }
@@ -160898,10 +160986,10 @@ var init_tags = __esm({
       }
       persist() {
         try {
-          import_node_fs10.default.mkdirSync(import_node_path13.default.dirname(this.file), { recursive: true });
+          import_node_fs11.default.mkdirSync(import_node_path13.default.dirname(this.file), { recursive: true });
           const tmp = `${this.file}.tmp`;
-          import_node_fs10.default.writeFileSync(tmp, JSON.stringify(Object.fromEntries(this.map), null, 2));
-          import_node_fs10.default.renameSync(tmp, this.file);
+          import_node_fs11.default.writeFileSync(tmp, JSON.stringify(Object.fromEntries(this.map), null, 2));
+          import_node_fs11.default.renameSync(tmp, this.file);
         } catch {
         }
       }
@@ -161080,11 +161168,12 @@ function collabDomain(opts) {
       const wsArts = [...kernel.model.artifacts.values()].filter((a) => a.workspace === req.params.id);
       const ops = (await Promise.all(wsArts.map((a) => oplog.read(a.id)))).flat();
       const signalsForThisCompany = opts.dispatcherSignalsOf ? (id) => opts.dispatcherSignalsOf(req.auth.companyId, id) : void 0;
-      const roleDefaultOwners = opts.roles ? new Map((await opts.roles.list()).map((r) => [r.name, r.defaultOwner])) : void 0;
-      const roleDefaultOwnerOf = roleDefaultOwners ? (role) => {
-        const o = roleDefaultOwners.get(role);
+      const roleDefsByName = opts.roles ? new Map((await opts.roles.list()).map((r) => [r.name, { label: r.label, defaultOwner: r.defaultOwner }])) : void 0;
+      const roleDefaultOwnerOf = roleDefsByName ? (role) => {
+        const o = roleDefsByName.get(role)?.defaultOwner;
         return o ? o : void 0;
       } : void 0;
+      const roleLabelOf = roleDefsByName ? (role) => roleDefsByName.get(role)?.label : void 0;
       const detail = buildWorkorderDetail(
         kernel.model,
         req.params.id,
@@ -161096,7 +161185,8 @@ function collabDomain(opts) {
         (id) => kernel.reviewerPreview(id),
         signalsForThisCompany,
         req.auth.actor,
-        roleDefaultOwnerOf
+        roleDefaultOwnerOf,
+        roleLabelOf
       );
       if (detail) return { status: 200, body: detail };
       const draft = await opts.workorderDrafts?.forWorkspace(req.params.id);
@@ -171187,7 +171277,7 @@ async function caseManifests(root) {
   return output.sort();
 }
 async function optionalResolvedFile(allowedRoot, referenceBase, value) {
-  if (typeof value !== "string" || ![".md", ".yaml", ".yml", ".json"].includes((0, import_node_path14.extname)(value))) return void 0;
+  if (typeof value !== "string" || (0, import_node_path14.isAbsolute)(value) || ![".md", ".yaml", ".yml", ".json"].includes((0, import_node_path14.extname)(value))) return void 0;
   const referenced = (0, import_node_path14.resolve)(referenceBase, value);
   const path28 = inside(allowedRoot, referenced, "Referenced file");
   try {
@@ -171198,7 +171288,7 @@ async function optionalResolvedFile(allowedRoot, referenceBase, value) {
     return void 0;
   }
 }
-async function resolvedEvaluator(caseDirectory, caseSpecialPath, input) {
+async function resolvedEvaluator(repositoryRoot, caseDirectory, caseSpecialPath, input) {
   const evaluator = structuredClone(object2(input, "caseSpecial.items[].evaluator"));
   const configPath = text(evaluator["config"], "caseSpecial.items[].evaluator.config");
   const absoluteConfig = inside((0, import_node_path14.dirname)(caseSpecialPath), configPath, "Evaluator config");
@@ -171208,14 +171298,14 @@ async function resolvedEvaluator(caseDirectory, caseSpecialPath, input) {
     if (!value || typeof value !== "object") return;
     for (const [key, child] of Object.entries(value)) {
       const childPath = keyPath ? `${keyPath}.${key}` : key;
-      const resolved = await optionalResolvedFile(caseDirectory, (0, import_node_path14.dirname)(absoluteConfig), child);
+      const resolved = await optionalResolvedFile(repositoryRoot, (0, import_node_path14.dirname)(absoluteConfig), child);
       if (resolved !== void 0) resolvedFiles[childPath] = resolved;
       await walk(child, childPath);
     }
   };
   await walk(config2, "");
   const promptRef = config2["prompt"] ?? object2(config2["protocol"] ?? {}, "evaluator.protocol")["judge_prompt"];
-  const resolvedPrompt = await optionalResolvedFile(caseDirectory, (0, import_node_path14.dirname)(absoluteConfig), promptRef);
+  const resolvedPrompt = await optionalResolvedFile(repositoryRoot, (0, import_node_path14.dirname)(absoluteConfig), promptRef);
   return {
     ...evaluator,
     resolved_config: {
@@ -171226,7 +171316,7 @@ async function resolvedEvaluator(caseDirectory, caseSpecialPath, input) {
     resolved_config_path: (0, import_node_path14.relative)(caseDirectory, absoluteConfig)
   };
 }
-async function resolveCaseSpecial(caseDirectory, manifest) {
+async function resolveCaseSpecial(repositoryRoot, caseDirectory, manifest) {
   const evaluation = object2(manifest["evaluation"], "case.evaluation");
   const caseSpecialPath = inside(
     caseDirectory,
@@ -171242,7 +171332,7 @@ async function resolveCaseSpecial(caseDirectory, manifest) {
       const oraclePath = item["oracle"];
       return {
         ...item,
-        evaluator: await resolvedEvaluator(caseDirectory, caseSpecialPath, item["evaluator"]),
+        evaluator: await resolvedEvaluator(repositoryRoot, caseDirectory, caseSpecialPath, item["evaluator"]),
         ...typeof oraclePath === "string" ? { resolved_oracle: await yaml(inside(caseDirectory, oraclePath, "Case oracle")) } : {}
       };
     }))
@@ -171278,7 +171368,7 @@ async function loadCase(root, manifestPath, commonRubric, registry2) {
     stages: Array.isArray(classification["stages"]) ? classification["stages"].map((stage) => text(stage, "case.classification.stages[]")) : [],
     commonRubric,
     specialtyRubric: await (0, import_promises5.readFile)(inside(root, text(rubricEntry["path"], `S rubric ${scopeType}.path`), "S rubric path"), "utf8"),
-    caseSpecial: await resolveCaseSpecial(caseDirectory, manifest),
+    caseSpecial: await resolveCaseSpecial(root, caseDirectory, manifest),
     task: await task(caseDirectory, manifest),
     evaluatorVersion: `oasis-bench/${version2}`,
     rubricVersion: `oasis-bench/${version2}`
@@ -171647,7 +171737,7 @@ function resolvePlaybook2(ref2, ctx) {
   return def ? def.resolve(ctx) : null;
 }
 var BUG_FIX_INPUTS, BUG_FIX_STRUCTURE, ADOPT_EXTERNAL_INPUTS, ADOPT_EXTERNAL_STRUCTURE, BUILTIN2, PLAYBOOK_REFS;
-var init_registry2 = __esm({
+var init_registry3 = __esm({
   "../server/src/domains/playbooks/registry.ts"() {
     "use strict";
     init_src();
@@ -172031,7 +172121,7 @@ var init_routes8 = __esm({
     "use strict";
     import_node_crypto29 = require("node:crypto");
     init_router();
-    init_registry2();
+    init_registry3();
     init_planner();
     init_config_audit();
     init_migrate();
@@ -172050,11 +172140,11 @@ function normalize(patch) {
     ...reviewRoles !== void 0 ? { reviewRoles: [...new Set(reviewRoles.map((r) => r.trim()).filter(Boolean))] } : {}
   };
 }
-var import_node_fs11, import_node_path15, SEP2, keyOf2, prefixOf2, MemoryPlaybookOverrideStore, FilePlaybookOverrideStore;
+var import_node_fs12, import_node_path15, SEP2, keyOf2, prefixOf2, MemoryPlaybookOverrideStore, FilePlaybookOverrideStore;
 var init_overrides = __esm({
   "../server/src/domains/playbooks/overrides.ts"() {
     "use strict";
-    import_node_fs11 = __toESM(require("node:fs"), 1);
+    import_node_fs12 = __toESM(require("node:fs"), 1);
     import_node_path15 = __toESM(require("node:path"), 1);
     SEP2 = "::";
     keyOf2 = (companyId, ref2, nodeKey) => `${companyId}${SEP2}${ref2}${SEP2}${nodeKey}`;
@@ -172085,7 +172175,7 @@ var init_overrides = __esm({
         super();
         this.file = file;
         try {
-          const raw = JSON.parse(import_node_fs11.default.readFileSync(file, "utf8"));
+          const raw = JSON.parse(import_node_fs12.default.readFileSync(file, "utf8"));
           for (const [k2, v2] of Object.entries(raw)) {
             if (v2 && typeof v2 === "object") this.map.set(k2, v2);
           }
@@ -172094,10 +172184,10 @@ var init_overrides = __esm({
       }
       persist() {
         try {
-          import_node_fs11.default.mkdirSync(import_node_path15.default.dirname(this.file), { recursive: true });
+          import_node_fs12.default.mkdirSync(import_node_path15.default.dirname(this.file), { recursive: true });
           const tmp = `${this.file}.tmp`;
-          import_node_fs11.default.writeFileSync(tmp, JSON.stringify(Object.fromEntries(this.map), null, 2));
-          import_node_fs11.default.renameSync(tmp, this.file);
+          import_node_fs12.default.writeFileSync(tmp, JSON.stringify(Object.fromEntries(this.map), null, 2));
+          import_node_fs12.default.renameSync(tmp, this.file);
         } catch {
         }
       }
@@ -172125,7 +172215,7 @@ var init_playbooks2 = __esm({
   "../server/src/domains/playbooks/index.ts"() {
     "use strict";
     init_routes8();
-    init_registry2();
+    init_registry3();
     init_routes8();
     init_overrides();
   }
@@ -172451,17 +172541,17 @@ var init_daemon_adapter = __esm({
 });
 
 // ../server/src/side-map.ts
-var import_node_fs12, import_node_path16, FileSideMap;
+var import_node_fs13, import_node_path16, FileSideMap;
 var init_side_map = __esm({
   "../server/src/side-map.ts"() {
     "use strict";
-    import_node_fs12 = __toESM(require("node:fs"), 1);
+    import_node_fs13 = __toESM(require("node:fs"), 1);
     import_node_path16 = __toESM(require("node:path"), 1);
     FileSideMap = class {
       constructor(file) {
         this.file = file;
         try {
-          const raw = JSON.parse(import_node_fs12.default.readFileSync(file, "utf8"));
+          const raw = JSON.parse(import_node_fs13.default.readFileSync(file, "utf8"));
           for (const [k2, v2] of Object.entries(raw)) if (typeof v2 === "string") this.map.set(k2, v2);
         } catch {
         }
@@ -172483,10 +172573,10 @@ var init_side_map = __esm({
       }
       persist() {
         try {
-          import_node_fs12.default.mkdirSync(import_node_path16.default.dirname(this.file), { recursive: true });
+          import_node_fs13.default.mkdirSync(import_node_path16.default.dirname(this.file), { recursive: true });
           const tmp = `${this.file}.tmp`;
-          import_node_fs12.default.writeFileSync(tmp, JSON.stringify(Object.fromEntries(this.map), null, 2));
-          import_node_fs12.default.renameSync(tmp, this.file);
+          import_node_fs13.default.writeFileSync(tmp, JSON.stringify(Object.fromEntries(this.map), null, 2));
+          import_node_fs13.default.renameSync(tmp, this.file);
         } catch {
         }
       }
@@ -173880,7 +173970,8 @@ ${ctx.nodeFault}
           // 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?.requiredTools && prov.requiredTools.length > 0 ? { requiredTools: prov.requiredTools } : {}
+          ...prov?.requiredTools && prov.requiredTools.length > 0 ? { requiredTools: prov.requiredTools } : {},
+          ...prov?.connectorCreds && prov.connectorCreds.length > 0 ? { connectorCreds: prov.connectorCreds } : {}
         };
         this.deps.log?.(`[coordinator] ${logMsg}`);
         const handle = await this.deps.adapter.spawn(job);
@@ -183371,10 +183462,10 @@ var init_postgres_model_prices = __esm({
 // ../storage/src/postgres-type-registry.ts
 async function backfillTypeRegistryFromFile(store, file) {
   if ((await store.list()).length > 0) return { filled: 0 };
-  if (!import_node_fs13.default.existsSync(file)) return { filled: 0 };
+  if (!import_node_fs14.default.existsSync(file)) return { filled: 0 };
   let defs;
   try {
-    defs = JSON.parse(import_node_fs13.default.readFileSync(file, "utf8"));
+    defs = JSON.parse(import_node_fs14.default.readFileSync(file, "utf8"));
   } catch {
     console.warn(`[type-registry-backfill] ${file} \u89E3\u6790\u5931\u8D25\uFF0C\u8DF3\u8FC7\u56DE\u586B\uFF08serve \u5C06\u7528\u4EE3\u7801\u5E38\u91CF\u64AD\u79CD\uFF09`);
     return { filled: 0 };
@@ -183384,11 +183475,11 @@ async function backfillTypeRegistryFromFile(store, file) {
   console.log(`[type-registry-backfill] \u51B3\u7B56 0062 \u56DE\u586B\uFF1A${defs.length} \u4E2A\u4EA7\u7269\u7C7B\u578B\u5DF2\u8FC1\u5165 Postgres`);
   return { filled: defs.length };
 }
-var import_node_fs13, ident13, PostgresTypeRegistryStore;
+var import_node_fs14, ident13, PostgresTypeRegistryStore;
 var init_postgres_type_registry = __esm({
   "../storage/src/postgres-type-registry.ts"() {
     "use strict";
-    import_node_fs13 = __toESM(require("node:fs"), 1);
+    import_node_fs14 = __toESM(require("node:fs"), 1);
     init_esm2();
     ident13 = (s2) => {
       if (!/^[a-z_][a-z0-9_]*$/.test(s2)) throw new Error(`invalid schema name: ${s2}`);
@@ -184502,6 +184593,7 @@ async function buildActorProvision(service, actorId) {
   const raw = await service.resolveActorEnv(actorId);
   const env = { ...raw };
   const wrapperPaths = [oasisWrapperScript()];
+  const connectorCreds = [];
   const requiredTools = /* @__PURE__ */ new Set();
   const cleanupFns = [];
   const SENSITIVE_KEYS = [
@@ -184519,11 +184611,13 @@ async function buildActorProvision(service, actorId) {
     try {
       const feishu = new FeishuConnector();
       const sessionEnv = /* @__PURE__ */ new Map();
-      await feishu.inject({
+      const feishuCreds = {
         app_id: raw["FEISHU_APP_ID"],
         app_secret: raw["FEISHU_APP_SECRET"],
         ...raw["FEISHU_USER_ACCESS_TOKEN"] ? { user_access_token: raw["FEISHU_USER_ACCESS_TOKEN"] } : {}
-      }, sessionEnv);
+      };
+      connectorCreds.push({ slug: feishu.config.slug, credentials: feishuCreds });
+      await feishu.inject(feishuCreds, sessionEnv);
       for (const [k2, v2] of sessionEnv) env[k2] = v2;
       const staged = stageConnectorWrapper(feishu);
       if (staged) wrapperPaths.push(staged);
@@ -184537,7 +184631,12 @@ async function buildActorProvision(service, actorId) {
     try {
       const github = new GithubConnector();
       const sessionEnv = /* @__PURE__ */ new Map();
-      await github.inject({ access_token: raw["GITHUB_TOKEN"], actor_name: raw["GIT_AUTHOR_NAME"] ?? actorId.split(":").pop() ?? "oasis-agent" }, sessionEnv);
+      const githubCreds = {
+        access_token: raw["GITHUB_TOKEN"],
+        actor_name: raw["GIT_AUTHOR_NAME"] ?? actorId.split(":").pop() ?? "oasis-agent"
+      };
+      connectorCreds.push({ slug: github.config.slug, credentials: githubCreds });
+      await github.inject(githubCreds, sessionEnv);
       for (const [k2, v2] of sessionEnv) env[k2] = v2;
       const staged = stageConnectorWrapper(github);
       if (staged) wrapperPaths.push(staged);
@@ -184551,7 +184650,7 @@ async function buildActorProvision(service, actorId) {
     for (const fn of cleanupFns) await fn().catch(() => {
     });
   };
-  return { env, wrapperPaths, requiredTools: [...requiredTools], cleanup };
+  return { env, wrapperPaths, requiredTools: [...requiredTools], connectorCreds, cleanup };
 }
 async function buildActorContext(service, actorId) {
   const [config2, connectors, installedSkills, record6] = await Promise.all([
@@ -185318,7 +185417,8 @@ async function startServe(opts) {
         limits,
         env: provision.env,
         wrapperPaths: provision.wrapperPaths,
-        ...provision.requiredTools.length > 0 ? { requiredTools: provision.requiredTools } : {}
+        ...provision.requiredTools.length > 0 ? { requiredTools: provision.requiredTools } : {},
+        ...provision.connectorCreds.length > 0 ? { connectorCreds: provision.connectorCreds } : {}
       });
       const chunks = [];
       handle.onOutput?.((chunk) => chunks.push(chunk));
@@ -185669,7 +185769,8 @@ async function startServe(opts) {
             ...workspace ? { OASIS_WORKSPACE: workspace } : {}
           },
           wrapperPaths: provision.wrapperPaths,
-          ...provision.requiredTools.length > 0 ? { requiredTools: provision.requiredTools } : {}
+          ...provision.requiredTools.length > 0 ? { requiredTools: provision.requiredTools } : {},
+          ...provision.connectorCreds.length > 0 ? { connectorCreds: provision.connectorCreds } : {}
         });
         const chatJobKey = `chat::${artifactId}`;
         chatLiveSessions.set(chatJobKey, { artifactId, sessionId: traceRunId, dispatchId: handle.id, kill: () => handle.kill() });
@@ -187230,7 +187331,7 @@ var RuntimeRouterAdapter = class {
 };
 
 // ../cli/src/daemon/reap-claude-projects.ts
-var import_node_fs14 = __toESM(require("node:fs"), 1);
+var import_node_fs15 = __toESM(require("node:fs"), 1);
 var import_node_os9 = __toESM(require("node:os"), 1);
 var import_node_path18 = __toESM(require("node:path"), 1);
 function claudeProjectSlug(cwd) {
@@ -187243,9 +187344,9 @@ function claudeProjectsRoot() {
 function reapClaudeProjects(workdir, runtimeKind) {
   if (runtimeKind !== "claude" && runtimeKind !== "claude-code") return;
   const dir = import_node_path18.default.join(claudeProjectsRoot(), claudeProjectSlug(workdir));
-  if (!import_node_fs14.default.existsSync(dir)) return;
+  if (!import_node_fs15.default.existsSync(dir)) return;
   try {
-    import_node_fs14.default.rmSync(dir, { recursive: true, force: true });
+    import_node_fs15.default.rmSync(dir, { recursive: true, force: true });
   } catch {
   }
 }
@@ -187346,13 +187447,13 @@ async function startNode(opts) {
 
 // ../cli/src/daemon/machine-id.ts
 var import_node_child_process16 = require("node:child_process");
-var import_node_fs15 = require("node:fs");
+var import_node_fs16 = require("node:fs");
 var import_node_crypto38 = require("node:crypto");
 var import_node_os11 = require("node:os");
 function linuxMachineId() {
   for (const p2 of ["/etc/machine-id", "/var/lib/dbus/machine-id"]) {
     try {
-      const v2 = (0, import_node_fs15.readFileSync)(p2, "utf8").trim();
+      const v2 = (0, import_node_fs16.readFileSync)(p2, "utf8").trim();
       if (v2) return v2;
     } catch {
     }
@@ -189577,7 +189678,7 @@ ${res.warning}`);
 init_src6();
 
 // src/index.ts
-var PKG_VERSION = true ? "0.1.70" : "dev";
+var PKG_VERSION = true ? "0.1.72" : "dev";
 var OASIS_DIR = path27.join(os9.homedir(), ".oasis");
 var CONFIG_FILE = path27.join(OASIS_DIR, "node-config.json");
 var PID_FILE = path27.join(OASIS_DIR, "node.pid");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis_test",
-  "version": "0.1.70",
+  "version": "0.1.72",
   "description": "Oasis node daemon + CLI — background daemon, auto-start, full server CLI",
   "bin": {
     "oasis": "./dist/index.js"
@@ -26,6 +26,6 @@
     "node": ">=20"
   },
   "oasisRelease": {
-    "sourceHead": "20ad053a32c3636f94509e06767e7bbb49b1bb8f"
+    "sourceHead": "d0ee4c4d3e4ff3fb73c414c8a84c9eab1b20916d"
   }
 }