oasis_test 0.1.73 → 0.1.74

package/dist/index.js

@@ -142983,13 +142983,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: dirname25 } = await import("node:path");
+                const { join: join28, dirname: dirname24 } = 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(dirname25(file), { recursive: true });
+                    mkdirSync20(dirname24(file), { recursive: true });
                     writeFileSync13(file, content);
                   }
                 }
@@ -143006,7 +143006,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(dirname25(file), { recursive: true });
+                    mkdirSync20(dirname24(file), { recursive: true });
                     writeFileSync13(file, content);
                   }
                 }
@@ -152106,6 +152106,73 @@ var init_registry2 = __esm({
   }
 });
 
+// ../connectors/src/logger.ts
+function ts() {
+  return (/* @__PURE__ */ new Date()).toISOString().slice(11, 23);
+}
+function log(tag, msg, extra) {
+  const suffix = extra ? "  " + JSON.stringify(extra) : "";
+  console.log(`[${ts()}] ${tag} ${msg}${suffix}`);
+}
+var init_logger = __esm({
+  "../connectors/src/logger.ts"() {
+    "use strict";
+  }
+});
+
+// ../connectors/src/prepare-job.ts
+async function prepareConnectorsForJob(job) {
+  const creds = job.connectorCreds ?? [];
+  const remoteWrappers = job.wrapperPaths ?? [];
+  const localWrappers = [];
+  const cleanups = [];
+  const envOverrides = {};
+  for (const { slug: slug5, credentials } of creds) {
+    const connector = createConnectorBySlug(slug5);
+    if (!connector) {
+      log("[node-connectors]", `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) envOverrides[k2] = v2;
+      const staged = stageConnectorWrapper(connector);
+      if (staged) localWrappers.push(staged);
+      cleanups.push(() => connector.cleanup(sessionEnv));
+      log("[node-connectors]", `${slug5}: creds + wrapper \u5DF2\u843D\u5728\u672C\u673A`);
+    } catch (err) {
+      log("[node-connectors]", `${slug5}: \u672C\u5730\u6CE8\u5165\u5931\u8D25\uFF08\u8BE5 connector \u672C\u8F6E\u4E0D\u53EF\u7528\uFF09: ${String(err)}`);
+    }
+  }
+  const keptRemote = remoteWrappers.filter((p2) => (0, import_node_fs5.existsSync)(p2));
+  const dropped = remoteWrappers.length - keptRemote.length;
+  if (dropped > 0) log("[node-connectors]", `\u4E22\u5F03 ${dropped} \u6761\u672C\u673A\u4E0D\u5B58\u5728\u7684 wrapper \u8DEF\u5F84\uFF08server \u4FA7\u8DEF\u5F84\uFF09`);
+  const basePath = job.env?.["PATH"] ?? process.env["PATH"] ?? "";
+  const toolsBin = connectorToolsBinDir();
+  const pathWithTools = basePath.split(":").includes(toolsBin) ? basePath : [toolsBin, basePath].filter(Boolean).join(":");
+  const preparedJob = {
+    ...job,
+    env: { ...job.env ?? {}, ...envOverrides, PATH: pathWithTools },
+    wrapperPaths: [...localWrappers, ...keptRemote]
+  };
+  const cleanup = async () => {
+    for (const fn of cleanups) await fn().catch(() => {
+    });
+  };
+  return { job: preparedJob, cleanup };
+}
+var import_node_fs5;
+var init_prepare_job = __esm({
+  "../connectors/src/prepare-job.ts"() {
+    "use strict";
+    import_node_fs5 = require("node:fs");
+    init_base();
+    init_registry2();
+    init_logger();
+  }
+});
+
 // ../adapters/src/open-design/driver.ts
 function deriveBoardKey(artifactId) {
   const tail = artifactId.split(":").pop() ?? artifactId;
@@ -152442,8 +152509,8 @@ function materializeFiles(dir, files) {
   for (const [rel, content] of Object.entries(files)) {
     try {
       const file = import_node_path7.default.join(dir, rel);
-      import_node_fs5.default.mkdirSync(import_node_path7.default.dirname(file), { recursive: true });
-      import_node_fs5.default.writeFileSync(file, content);
+      import_node_fs6.default.mkdirSync(import_node_path7.default.dirname(file), { recursive: true });
+      import_node_fs6.default.writeFileSync(file, content);
     } catch {
     }
   }
@@ -152476,26 +152543,26 @@ function sessionDirKind(runtimeKind) {
 }
 function resolveSessionDirWithLegacy(args) {
   const fresh = sessionDirFor(args.workRoot, args.runtimeKind, args.workdirKey);
-  if (import_node_fs5.default.existsSync(fresh)) return fresh;
+  if (import_node_fs6.default.existsSync(fresh)) return fresh;
   if (!args.rtId) return fresh;
   const legacy = legacyChatSessionDir(args.workRoot, args.rtId);
-  return import_node_fs5.default.existsSync(legacy) ? legacy : fresh;
+  return import_node_fs6.default.existsSync(legacy) ? legacy : fresh;
 }
 function oneShotDirFor(workRoot, runtimeKind) {
   const base = import_node_path7.default.join(resolveWorkRoot(workRoot), "tmp");
-  import_node_fs5.default.mkdirSync(base, { recursive: true });
-  return import_node_fs5.default.mkdtempSync(import_node_path7.default.join(base, `${runtimeKind}-`));
+  import_node_fs6.default.mkdirSync(base, { recursive: true });
+  return import_node_fs6.default.mkdtempSync(import_node_path7.default.join(base, `${runtimeKind}-`));
 }
 function writeMeta(dir, meta) {
   try {
-    import_node_fs5.default.writeFileSync(import_node_path7.default.join(dir, META_FILE), `${JSON.stringify(meta, null, 2)}
+    import_node_fs6.default.writeFileSync(import_node_path7.default.join(dir, META_FILE), `${JSON.stringify(meta, null, 2)}
 `);
   } catch {
   }
 }
 function readMeta(dir) {
   try {
-    const raw = JSON.parse(import_node_fs5.default.readFileSync(import_node_path7.default.join(dir, META_FILE), "utf8"));
+    const raw = JSON.parse(import_node_fs6.default.readFileSync(import_node_path7.default.join(dir, META_FILE), "utf8"));
     if (!raw || typeof raw !== "object") return null;
     const m2 = raw;
     return typeof m2.kind === "string" && typeof m2.createdAt === "string" ? m2 : null;
@@ -152524,14 +152591,14 @@ function lockWorkdir(dir, pid, holder, workdirKey) {
     ...workdirKey !== void 0 ? { workdirKey } : {}
   };
   try {
-    import_node_fs5.default.writeFileSync(import_node_path7.default.join(dir, LOCK_FILE), `${JSON.stringify(lock)}
+    import_node_fs6.default.writeFileSync(import_node_path7.default.join(dir, LOCK_FILE), `${JSON.stringify(lock)}
 `);
   } catch {
   }
 }
 function readLock(dir) {
   try {
-    const raw = JSON.parse(import_node_fs5.default.readFileSync(import_node_path7.default.join(dir, LOCK_FILE), "utf8"));
+    const raw = JSON.parse(import_node_fs6.default.readFileSync(import_node_path7.default.join(dir, LOCK_FILE), "utf8"));
     if (!raw || typeof raw !== "object") return null;
     const l = raw;
     return Number.isInteger(l.pid) && l.pid > 0 ? l : null;
@@ -152541,14 +152608,14 @@ function readLock(dir) {
 }
 function unlockWorkdir(dir) {
   try {
-    import_node_fs5.default.unlinkSync(import_node_path7.default.join(dir, LOCK_FILE));
+    import_node_fs6.default.unlinkSync(import_node_path7.default.join(dir, LOCK_FILE));
   } catch {
   }
 }
 function isWorkdirLive(dir) {
   let raw;
   try {
-    raw = import_node_fs5.default.readFileSync(import_node_path7.default.join(dir, LOCK_FILE), "utf8");
+    raw = import_node_fs6.default.readFileSync(import_node_path7.default.join(dir, LOCK_FILE), "utf8");
   } catch {
     return false;
   }
@@ -152557,15 +152624,15 @@ function isWorkdirLive(dir) {
   return isRunning(lock.pid);
 }
 function clearWorkdir(dir) {
-  if (!import_node_fs5.default.existsSync(dir)) return;
+  if (!import_node_fs6.default.existsSync(dir)) return;
   if (isWorkdirLive(dir)) {
     const lock = readLock(dir);
     throw new Error(
       `refusing to clear live workdir ${dir}` + (lock ? ` (held by pid ${lock.pid}, holder=${lock.holder}, since ${lock.startedAt})` : " (lock unreadable)")
     );
   }
-  for (const entry of import_node_fs5.default.readdirSync(dir)) {
-    import_node_fs5.default.rmSync(import_node_path7.default.join(dir, entry), { recursive: true, force: true });
+  for (const entry of import_node_fs6.default.readdirSync(dir)) {
+    import_node_fs6.default.rmSync(import_node_path7.default.join(dir, entry), { recursive: true, force: true });
   }
 }
 function prepareWorkdir(args) {
@@ -152582,7 +152649,7 @@ function prepareWorkdir(args) {
     workdirKey: args.workdirKey,
     rtId: args.meta.runtimeSessionId
   });
-  import_node_fs5.default.mkdirSync(dir, { recursive: true });
+  import_node_fs6.default.mkdirSync(dir, { recursive: true });
   if (args.freshWorkdir) clearWorkdir(dir);
   const prev = readMeta(dir);
   writeMeta(dir, {
@@ -152597,12 +152664,12 @@ function prepareWorkdir(args) {
 function legacyChatSessionDir(workRoot, rtId) {
   return import_node_path7.default.join(resolveLegacyWorkRoot(workRoot), "oasis-chat-sessions", rtId.replace(/[^a-zA-Z0-9_-]+/g, "_"));
 }
-var import_node_crypto16, import_node_fs5, import_node_os5, import_node_path7, META_FILE, LOCK_FILE, NEW_WORK_ROOT, LEGACY_ROOTS, LEGACY_ONESHOT_PREFIX;
+var import_node_crypto16, import_node_fs6, import_node_os5, import_node_path7, META_FILE, LOCK_FILE, NEW_WORK_ROOT, LEGACY_ROOTS, LEGACY_ONESHOT_PREFIX;
 var init_session_paths = __esm({
   "../adapters/src/_core/session-paths.ts"() {
     "use strict";
     import_node_crypto16 = require("node:crypto");
-    import_node_fs5 = __toESM(require("node:fs"), 1);
+    import_node_fs6 = __toESM(require("node:fs"), 1);
     import_node_os5 = __toESM(require("node:os"), 1);
     import_node_path7 = __toESM(require("node:path"), 1);
     META_FILE = ".oasis-meta.json";
@@ -153772,7 +153839,7 @@ async function discoverACPModels(bin, provider, args = ["acp"]) {
     }
     if (tmpDir) {
       try {
-        (0, import_node_fs6.rmSync)(tmpDir, { recursive: true, force: true });
+        (0, import_node_fs7.rmSync)(tmpDir, { recursive: true, force: true });
       } catch {
       }
     }
@@ -153801,7 +153868,7 @@ async function discoverACPModels(bin, provider, args = ["acp"]) {
       clientCapabilities: {}
     });
     try {
-      tmpDir = (0, import_node_fs6.mkdtempSync)((0, import_node_path8.join)((0, import_node_os6.tmpdir)(), `oasis-acp-${provider}-`));
+      tmpDir = (0, import_node_fs7.mkdtempSync)((0, import_node_path8.join)((0, import_node_os6.tmpdir)(), `oasis-acp-${provider}-`));
     } catch {
       return fail();
     }
@@ -153857,12 +153924,12 @@ function parseACPSessionNewModels(result) {
 async function discoverOpenclawModels(bin) {
   throw new Error("discoverOpenclawModels: TODO");
 }
-var import_node_child_process10, import_node_fs6, import_node_os6, import_node_path8, modelCache, CACHE_TTL_MS2;
+var import_node_child_process10, import_node_fs7, import_node_os6, import_node_path8, modelCache, CACHE_TTL_MS2;
 var init_models = __esm({
   "../adapters/src/_core/models.ts"() {
     "use strict";
     import_node_child_process10 = require("node:child_process");
-    import_node_fs6 = require("node:fs");
+    import_node_fs7 = require("node:fs");
     import_node_os6 = require("node:os");
     import_node_path8 = require("node:path");
     modelCache = /* @__PURE__ */ new Map();
@@ -156414,7 +156481,7 @@ function dirSizeBytes(dir) {
   const walk = (d) => {
     let entries;
     try {
-      entries = import_node_fs7.default.readdirSync(d, { withFileTypes: true });
+      entries = import_node_fs8.default.readdirSync(d, { withFileTypes: true });
     } catch {
       return;
     }
@@ -156426,7 +156493,7 @@ function dirSizeBytes(dir) {
         continue;
       }
       try {
-        total += import_node_fs7.default.statSync(p2).size;
+        total += import_node_fs8.default.statSync(p2).size;
       } catch {
       }
     }
@@ -156438,10 +156505,10 @@ function listWorkdirs(workRoot, legacyRoot) {
   const out = [];
   const sessions = import_node_path9.default.join(workRoot, "sessions");
   try {
-    for (const kind of import_node_fs7.default.readdirSync(sessions)) {
+    for (const kind of import_node_fs8.default.readdirSync(sessions)) {
       const kindDir = import_node_path9.default.join(sessions, kind);
       try {
-        for (const slug5 of import_node_fs7.default.readdirSync(kindDir)) out.push(import_node_path9.default.join(kindDir, slug5));
+        for (const slug5 of import_node_fs8.default.readdirSync(kindDir)) out.push(import_node_path9.default.join(kindDir, slug5));
       } catch {
       }
     }
@@ -156449,18 +156516,18 @@ function listWorkdirs(workRoot, legacyRoot) {
   }
   const tmp = import_node_path9.default.join(workRoot, "tmp");
   try {
-    for (const d of import_node_fs7.default.readdirSync(tmp)) out.push(import_node_path9.default.join(tmp, d));
+    for (const d of import_node_fs8.default.readdirSync(tmp)) out.push(import_node_path9.default.join(tmp, d));
   } catch {
   }
   for (const legacy of LEGACY_ROOTS) {
     const root = import_node_path9.default.join(legacyRoot, legacy);
     try {
-      for (const d of import_node_fs7.default.readdirSync(root)) out.push(import_node_path9.default.join(root, d));
+      for (const d of import_node_fs8.default.readdirSync(root)) out.push(import_node_path9.default.join(root, d));
     } catch {
     }
   }
   try {
-    for (const d of import_node_fs7.default.readdirSync(legacyRoot)) {
+    for (const d of import_node_fs8.default.readdirSync(legacyRoot)) {
       if (d.startsWith(LEGACY_ONESHOT_PREFIX)) out.push(import_node_path9.default.join(legacyRoot, d));
     }
   } catch {
@@ -156478,7 +156545,7 @@ function observe(dir) {
   const meta = readMeta(dir);
   let mtimeMs = 0;
   try {
-    mtimeMs = import_node_fs7.default.statSync(dir).mtimeMs;
+    mtimeMs = import_node_fs8.default.statSync(dir).mtimeMs;
   } catch {
   }
   return { dir, meta, sizeBytes: dirSizeBytes(dir), mtimeMs, live: isWorkdirLive(dir) };
@@ -156511,14 +156578,14 @@ async function runGcSweep(deps) {
   let deleted = 0;
   for (const d of decisions) {
     if (d.action !== "delete") continue;
-    if (import_node_fs7.default.existsSync(import_node_path9.default.join(d.dir, LOCK_FILE)) && isWorkdirLive(d.dir)) {
+    if (import_node_fs8.default.existsSync(import_node_path9.default.join(d.dir, LOCK_FILE)) && isWorkdirLive(d.dir)) {
       log3(`[gc] \u8DF3\u8FC7 ${d.dir}\uFF1A\u6267\u884C\u524D\u590D\u67E5\u53D1\u73B0\u5DF2\u88AB\u5360\u7528`);
       continue;
     }
     const kind = candidates.find((c) => c.dir === d.dir)?.meta?.runtimeKind ?? kindFromPath(deps.workRoot, d.dir);
     try {
       deps.reapRuntimeState?.(d.dir, kind);
-      import_node_fs7.default.rmSync(d.dir, { recursive: true, force: true });
+      import_node_fs8.default.rmSync(d.dir, { recursive: true, force: true });
       deleted++;
       log3(`[gc] \u6536 ${d.dir}\uFF08${d.reason}, ${(d.sizeBytes / 1024 ** 2).toFixed(1)}MB\uFF09`);
     } catch (e) {
@@ -156562,11 +156629,11 @@ function startGcLoop(deps) {
     clearInterval(timer);
   };
 }
-var import_node_fs7, import_node_path9;
+var import_node_fs8, import_node_path9;
 var init_gc_loop = __esm({
   "../adapters/src/_core/gc-loop.ts"() {
     "use strict";
-    import_node_fs7 = __toESM(require("node:fs"), 1);
+    import_node_fs8 = __toESM(require("node:fs"), 1);
     import_node_path9 = __toESM(require("node:path"), 1);
     init_session_paths();
     init_workdir_gc();
@@ -156602,32 +156669,18 @@ var init_src5 = __esm({
   }
 });
 
-// ../connectors/src/logger.ts
-function ts() {
-  return (/* @__PURE__ */ new Date()).toISOString().slice(11, 23);
-}
-function log(tag, msg, extra) {
-  const suffix = extra ? "  " + JSON.stringify(extra) : "";
-  console.log(`[${ts()}] ${tag} ${msg}${suffix}`);
-}
-var init_logger = __esm({
-  "../connectors/src/logger.ts"() {
-    "use strict";
-  }
-});
-
 // ../connectors/src/connector-adapter.ts
-var import_promises3, import_node_fs8, import_node_os7, import_node_path10, ConnectorAwareAdapter;
+var import_promises3, import_node_fs9, 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_fs9 = require("node:fs");
     import_node_os7 = require("node:os");
     import_node_path10 = require("node:path");
     init_src5();
     init_base();
-    init_registry2();
+    init_prepare_job();
     init_logger();
     ConnectorAwareAdapter = class {
       constructor(baseOpts = {}) {
@@ -156639,40 +156692,13 @@ var init_connector_adapter = __esm({
           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 remoteWrappers = [...job.wrapperPaths ?? [], ...sentinelWrappers];
-        const wrapperPaths = remoteWrappers.filter((p2) => (0, import_node_fs8.existsSync)(p2));
-        const droppedWrappers = remoteWrappers.length - wrapperPaths.length;
+        const prepared = await prepareConnectorsForJob(job);
+        const sentinelWrappers = Object.entries(prepared.job.env ?? {}).filter(([k2]) => k2.endsWith("_WRAPPER")).map(([, v2]) => v2).filter((p2) => (0, import_node_fs9.existsSync)(p2));
         const strippedEnv = Object.fromEntries(
-          Object.entries(job.env ?? {}).filter(([k2]) => !k2.endsWith("_WRAPPER"))
+          Object.entries(prepared.job.env ?? {}).filter(([k2]) => !k2.endsWith("_WRAPPER"))
         );
+        const wrapperPaths = [...prepared.job.wrapperPaths ?? [], ...sentinelWrappers];
         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 });
@@ -156680,23 +156706,17 @@ 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));
           }
-          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(",")}`);
+          extraEnv = { ...extraEnv, PATH: [wrapperBinDir, extraEnv["PATH"] ?? ""].filter(Boolean).join(":") };
+          log("[adapter]", `  connectors injected  +${Date.now() - t0}ms  wrappers=${wrapperPaths.length}`);
         } else {
           log("[adapter]", `  no connectors  +${Date.now() - t0}ms`);
         }
         const jobAdapter = new ClaudeCodeAdapter({ ...this.baseOpts, env: extraEnv });
-        const handle = await jobAdapter.spawn(job);
-        if (localCleanups.length > 0) {
-          handle.onExit(() => {
-            for (const fn of localCleanups) void fn().catch(() => {
-            });
+        const handle = await jobAdapter.spawn(prepared.job);
+        handle.onExit(() => {
+          void prepared.cleanup().catch(() => {
           });
-        }
+        });
         return handle;
       }
     };
@@ -156714,6 +156734,7 @@ var init_src6 = __esm({
     init_well_known_skills();
     init_github();
     init_registry2();
+    init_prepare_job();
     init_connector_adapter();
   }
 });
@@ -158509,11 +158530,11 @@ var init_routes2 = __esm({
 });
 
 // ../server/src/domains/projects/postgres-documents.ts
-var import_node_fs9, ident2, PostgresProjectDocumentStore;
+var import_node_fs10, ident2, PostgresProjectDocumentStore;
 var init_postgres_documents = __esm({
   "../server/src/domains/projects/postgres-documents.ts"() {
     "use strict";
-    import_node_fs9 = __toESM(require("node:fs"), 1);
+    import_node_fs10 = __toESM(require("node:fs"), 1);
     init_service2();
     ident2 = (s2) => {
       if (!/^[a-z_][a-z0-9_]*$/.test(s2)) throw new Error(`invalid schema name: ${s2}`);
@@ -158551,10 +158572,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_fs9.default.existsSync(file)) return;
+        if (!import_node_fs10.default.existsSync(file)) return;
         let snap;
         try {
-          snap = JSON.parse(import_node_fs9.default.readFileSync(file, "utf8"));
+          snap = JSON.parse(import_node_fs10.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;
@@ -159918,7 +159939,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_fs10.readFileSync)((0, import_node_path12.resolve)(here, rel), "utf8");
+          const raw = (0, import_node_fs11.readFileSync)((0, import_node_path12.resolve)(here, rel), "utf8");
           const pkg = JSON.parse(raw);
           if (pkg.version) return { version: pkg.version, source: "monorepo" };
         } catch {
@@ -160272,12 +160293,12 @@ function nodesDomain(deps) {
     });
   };
 }
-var import_node_crypto24, import_node_fs10, import_node_url4, import_node_path12;
+var import_node_crypto24, import_node_fs11, 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_fs10 = require("node:fs");
+    import_node_fs11 = require("node:fs");
     import_node_url4 = require("node:url");
     import_node_path12 = require("node:path");
     init_src5();
@@ -161326,11 +161347,11 @@ function nameKey(name) {
 function cleanName(name) {
   return name.trim().replace(/\s+/g, " ");
 }
-var import_node_fs11, import_node_path13, import_node_crypto25, SEP, keyOf, prefixOf, MemoryWorkorderTagStore, FileWorkorderTagStore;
+var import_node_fs12, 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_fs11 = __toESM(require("node:fs"), 1);
+    import_node_fs12 = __toESM(require("node:fs"), 1);
     import_node_path13 = __toESM(require("node:path"), 1);
     import_node_crypto25 = __toESM(require("node:crypto"), 1);
     SEP = "::";
@@ -161408,7 +161429,7 @@ var init_tags = __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" && typeof v2.id === "string" && typeof v2.name === "string") this.map.set(k2, v2);
           }
@@ -161417,10 +161438,10 @@ var init_tags = __esm({
       }
       persist() {
         try {
-          import_node_fs11.default.mkdirSync(import_node_path13.default.dirname(this.file), { recursive: true });
+          import_node_fs12.default.mkdirSync(import_node_path13.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 {
         }
       }
@@ -172697,11 +172718,11 @@ function normalize(patch) {
     ...reviewRoles !== void 0 ? { reviewRoles: [...new Set(reviewRoles.map((r) => r.trim()).filter(Boolean))] } : {}
   };
 }
-var import_node_fs12, import_node_path15, SEP2, keyOf2, prefixOf2, MemoryPlaybookOverrideStore, FilePlaybookOverrideStore;
+var import_node_fs13, import_node_path15, SEP2, keyOf2, prefixOf2, MemoryPlaybookOverrideStore, FilePlaybookOverrideStore;
 var init_overrides = __esm({
   "../server/src/domains/playbooks/overrides.ts"() {
     "use strict";
-    import_node_fs12 = __toESM(require("node:fs"), 1);
+    import_node_fs13 = __toESM(require("node:fs"), 1);
     import_node_path15 = __toESM(require("node:path"), 1);
     SEP2 = "::";
     keyOf2 = (companyId, ref2, nodeKey) => `${companyId}${SEP2}${ref2}${SEP2}${nodeKey}`;
@@ -172732,7 +172753,7 @@ var init_overrides = __esm({
         super();
         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 (v2 && typeof v2 === "object") this.map.set(k2, v2);
           }
@@ -172741,10 +172762,10 @@ var init_overrides = __esm({
       }
       persist() {
         try {
-          import_node_fs12.default.mkdirSync(import_node_path15.default.dirname(this.file), { recursive: true });
+          import_node_fs13.default.mkdirSync(import_node_path15.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 {
         }
       }
@@ -173162,17 +173183,17 @@ var init_daemon_adapter = __esm({
 });
 
 // ../server/src/side-map.ts
-var import_node_fs13, import_node_path16, FileSideMap;
+var import_node_fs14, import_node_path16, FileSideMap;
 var init_side_map = __esm({
   "../server/src/side-map.ts"() {
     "use strict";
-    import_node_fs13 = __toESM(require("node:fs"), 1);
+    import_node_fs14 = __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_fs13.default.readFileSync(file, "utf8"));
+          const raw = JSON.parse(import_node_fs14.default.readFileSync(file, "utf8"));
           for (const [k2, v2] of Object.entries(raw)) if (typeof v2 === "string") this.map.set(k2, v2);
         } catch {
         }
@@ -173194,10 +173215,10 @@ var init_side_map = __esm({
       }
       persist() {
         try {
-          import_node_fs13.default.mkdirSync(import_node_path16.default.dirname(this.file), { recursive: true });
+          import_node_fs14.default.mkdirSync(import_node_path16.default.dirname(this.file), { recursive: true });
           const tmp = `${this.file}.tmp`;
-          import_node_fs13.default.writeFileSync(tmp, JSON.stringify(Object.fromEntries(this.map), null, 2));
-          import_node_fs13.default.renameSync(tmp, this.file);
+          import_node_fs14.default.writeFileSync(tmp, JSON.stringify(Object.fromEntries(this.map), null, 2));
+          import_node_fs14.default.renameSync(tmp, this.file);
         } catch {
         }
       }
@@ -184084,10 +184105,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_fs14.default.existsSync(file)) return { filled: 0 };
+  if (!import_node_fs15.default.existsSync(file)) return { filled: 0 };
   let defs;
   try {
-    defs = JSON.parse(import_node_fs14.default.readFileSync(file, "utf8"));
+    defs = JSON.parse(import_node_fs15.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 };
@@ -184097,11 +184118,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_fs14, ident13, PostgresTypeRegistryStore;
+var import_node_fs15, ident13, PostgresTypeRegistryStore;
 var init_postgres_type_registry = __esm({
   "../storage/src/postgres-type-registry.ts"() {
     "use strict";
-    import_node_fs14 = __toESM(require("node:fs"), 1);
+    import_node_fs15 = __toESM(require("node:fs"), 1);
     init_esm2();
     ident13 = (s2) => {
       if (!/^[a-z_][a-z0-9_]*$/.test(s2)) throw new Error(`invalid schema name: ${s2}`);
@@ -187654,7 +187675,7 @@ function detectRuntimes() {
 }
 
 // ../cli/src/daemon/workdir-handler.ts
-var import_node_fs15 = __toESM(require("node:fs"), 1);
+var import_node_fs16 = __toESM(require("node:fs"), 1);
 var import_node_path18 = __toESM(require("node:path"), 1);
 init_src5();
 init_src();
@@ -187690,7 +187711,7 @@ async function trustedCanonicalContainer(req, logicalBase, dirKind) {
   const trustedRoot = isLegacy ? resolveLegacyWorkRoot(req.workRoot) : resolveWorkRoot(req.workRoot);
   let trustedRootReal;
   try {
-    trustedRootReal = await import_node_fs15.default.promises.realpath(trustedRoot);
+    trustedRootReal = await import_node_fs16.default.promises.realpath(trustedRoot);
   } catch {
     return null;
   }
@@ -187708,7 +187729,7 @@ async function resolveWithinWorkdir(req) {
   if (canonicalContainer === null) return { ok: false, code: "NOT_FOUND" };
   let base;
   try {
-    base = await import_node_fs15.default.promises.realpath(logicalBase);
+    base = await import_node_fs16.default.promises.realpath(logicalBase);
   } catch {
     return { ok: false, code: "NOT_FOUND" };
   }
@@ -187720,7 +187741,7 @@ async function resolveWithinWorkdir(req) {
   if (relPathIsSensitive(cleanRel)) return { ok: false, code: "SENSITIVE" };
   let real;
   try {
-    real = await import_node_fs15.default.promises.realpath(requested);
+    real = await import_node_fs16.default.promises.realpath(requested);
   } catch (e) {
     if (e.code === "ENOENT") return { ok: false, code: "NOT_FOUND" };
     return { ok: false, code: "PATH_ESCAPE" };
@@ -187737,7 +187758,7 @@ async function handleWorkdirList(req) {
     const { base, real } = resolved;
     let dh;
     try {
-      dh = await import_node_fs15.default.promises.open(real, import_node_fs15.default.constants.O_RDONLY | import_node_fs15.default.constants.O_NOFOLLOW | import_node_fs15.default.constants.O_NONBLOCK);
+      dh = await import_node_fs16.default.promises.open(real, import_node_fs16.default.constants.O_RDONLY | import_node_fs16.default.constants.O_NOFOLLOW | import_node_fs16.default.constants.O_NONBLOCK);
     } catch (e) {
       const code = e.code;
       if (code === "ELOOP") return { ok: false, code: "PATH_ESCAPE" };
@@ -187751,7 +187772,7 @@ async function handleWorkdirList(req) {
       const anchor = verified.anchor;
       const dst = await dh.stat();
       if (!dst.isDirectory()) return { ok: false, code: "NOT_FOUND" };
-      const dirents = await import_node_fs15.default.promises.readdir(anchor, { withFileTypes: true });
+      const dirents = await import_node_fs16.default.promises.readdir(anchor, { withFileTypes: true });
       const visible = dirents.filter((d) => !isSensitiveSegment(d.name));
       visible.sort((a, b2) => {
         const ad = a.isDirectory() ? 0 : 1;
@@ -187764,7 +187785,7 @@ async function handleWorkdirList(req) {
       for (const d of slice) {
         const abs = import_node_path18.default.join(anchor, d.name);
         try {
-          const st = await import_node_fs15.default.promises.lstat(abs);
+          const st = await import_node_fs16.default.promises.lstat(abs);
           if (st.isSymbolicLink()) continue;
           entries.push({
             name: d.name,
@@ -187785,7 +187806,7 @@ async function handleWorkdirList(req) {
 }
 async function fdCanonicalPath(fh) {
   try {
-    return await import_node_fs15.default.promises.readlink(`/proc/self/fd/${fh.fd}`);
+    return await import_node_fs16.default.promises.readlink(`/proc/self/fd/${fh.fd}`);
   } catch {
     return null;
   }
@@ -187806,7 +187827,7 @@ async function handleWorkdirRead(req) {
     const { base, real } = resolved;
     let fh;
     try {
-      fh = await import_node_fs15.default.promises.open(real, import_node_fs15.default.constants.O_RDONLY | import_node_fs15.default.constants.O_NOFOLLOW | import_node_fs15.default.constants.O_NONBLOCK);
+      fh = await import_node_fs16.default.promises.open(real, import_node_fs16.default.constants.O_RDONLY | import_node_fs16.default.constants.O_NOFOLLOW | import_node_fs16.default.constants.O_NONBLOCK);
     } catch (e) {
       const code = e.code;
       if (code === "ELOOP") return { ok: false, code: "PATH_ESCAPE" };
@@ -188051,7 +188072,12 @@ var DaemonWsClient = class {
             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);
+          const prepared = await prepareConnectorsForJob(job);
+          const handle = await this.sessions.getAdapter().spawn(prepared.job);
+          handle.onExit(() => {
+            void prepared.cleanup().catch(() => {
+            });
+          });
           this.sessions.register(dispatchId, handle, {
             ...job.jobKey ? { jobKey: job.jobKey } : {},
             jobArtifactId: job.artifactId,
@@ -188250,7 +188276,7 @@ var RuntimeRouterAdapter = class {
 };
 
 // ../cli/src/daemon/reap-claude-projects.ts
-var import_node_fs16 = __toESM(require("node:fs"), 1);
+var import_node_fs17 = __toESM(require("node:fs"), 1);
 var import_node_os9 = __toESM(require("node:os"), 1);
 var import_node_path19 = __toESM(require("node:path"), 1);
 function claudeProjectSlug(cwd) {
@@ -188263,9 +188289,9 @@ function claudeProjectsRoot() {
 function reapClaudeProjects(workdir, runtimeKind) {
   if (runtimeKind !== "claude" && runtimeKind !== "claude-code") return;
   const dir = import_node_path19.default.join(claudeProjectsRoot(), claudeProjectSlug(workdir));
-  if (!import_node_fs16.default.existsSync(dir)) return;
+  if (!import_node_fs17.default.existsSync(dir)) return;
   try {
-    import_node_fs16.default.rmSync(dir, { recursive: true, force: true });
+    import_node_fs17.default.rmSync(dir, { recursive: true, force: true });
   } catch {
   }
 }
@@ -188369,13 +188395,13 @@ async function startNode(opts) {
 
 // ../cli/src/daemon/machine-id.ts
 var import_node_child_process16 = require("node:child_process");
-var import_node_fs17 = require("node:fs");
+var import_node_fs18 = 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_fs17.readFileSync)(p2, "utf8").trim();
+      const v2 = (0, import_node_fs18.readFileSync)(p2, "utf8").trim();
       if (v2) return v2;
     } catch {
     }
@@ -190600,7 +190626,7 @@ ${res.warning}`);
 init_src6();
 
 // src/index.ts
-var PKG_VERSION = true ? "0.1.73" : "dev";
+var PKG_VERSION = true ? "0.1.74" : "dev";
 var OASIS_DIR = path28.join(os9.homedir(), ".oasis");
 var CONFIG_FILE = path28.join(OASIS_DIR, "node-config.json");
 var PID_FILE = path28.join(OASIS_DIR, "node.pid");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis_test",
-  "version": "0.1.73",
+  "version": "0.1.74",
   "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": "d0ee4c4d3e4ff3fb73c414c8a84c9eab1b20916d"
+    "sourceHead": "fde786a6df90f43d10cb364cd65e3878caba3f16"
   }
 }