@skaile/workspaces 5.13.0 → 5.15.0

package/dist/bridge/drivers/omp.js

@@ -1,11 +1,12 @@
 import { checkToolInputSchema } from '../../chunk-X5O56UO4.js';
-import { entrySurface } from '../../chunk-4DLQESIY.js';
-import { dispatchCapability } from '../../chunk-2H73V6XR.js';
+import { entrySurface } from '../../chunk-O673TBWJ.js';
+import { dispatchCapability } from '../../chunk-PW3TYWOI.js';
 import { ReconfigureLedger, stripRunnerPrivateEnv, classifyGenericErrorMessage } from '../../chunk-B4X2N7JQ.js';
 import { wrapAgentCommand, resolveAgentExec } from '../../chunk-YROR332M.js';
-import { BUILTIN_DRIVER_CATALOG, AgentDriver, getBridgeLogger, TOOL_ALLOWLIST_UNSUPPORTED, registryDriverConfig, unresolvedProviderCredentials, entryCredentialValue, providerCredentialEnvName } from '../../chunk-BVJU2GKE.js';
+import { AgentDriver, getBridgeLogger, TOOL_ALLOWLIST_UNSUPPORTED, registryDriverConfig } from '../../chunk-4AKR4XPQ.js';
+import { BUILTIN_DRIVER_CATALOG, unresolvedProviderCredentials, entryCredentialValue, providerCredentialEnvName } from '../../chunk-GQ5OYFVD.js';
 import '../../chunk-6E6PKKAD.js';
-import { withActivityLabelJsonSchema } from '../../chunk-F4NJDSR7.js';
+import { withActivityLabelJsonSchema } from '../../chunk-D5WTOVLG.js';
 import '../../chunk-ICSCSM5D.js';
 import '../../chunk-DKXNKFKP.js';
 import { AI_PROVIDER_SURFACES, registryEntries, isEntryEnabled, parseModelRef, normalizeEntryBaseUrl, resolveEntryBaseUrl } from '../../chunk-MJHSLODD.js';
@@ -57,6 +58,7 @@ var OMP_RUNTIME_ENTRIES = {
   intercom: true,
   sessions: true
 };
+var OMP_LOGIN_FILES = ["agent.db", "agent.db-shm", "agent.db-wal"];
 function entryModelIds(entry) {
   const logical = /* @__PURE__ */ new Set([
     ...Object.keys(entry.model_map ?? {}),
@@ -220,16 +222,30 @@ function registryModelEntries(registry) {
 async function planOmpAgentDir(input) {
   const options = input.options;
   const key = input.sessionId?.trim() || createHash("sha256").update(path.resolve(input.cwd)).digest("hex").slice(0, 16);
-  const agentDir = options?.agentHome ?? path.join(input.tmpDir ?? os.tmpdir(), "skaile-omp-agent", key);
-  if (options?.seedUserAgentDir === false) return { agentDir };
+  const ephemeral = options?.agentHome === void 0;
+  let agentDir = options?.agentHome ?? "";
+  if (ephemeral) {
+    const root = path.join(input.tmpDir ?? os.tmpdir(), "skaile-omp-agent");
+    await fs.mkdir(root, { recursive: true });
+    agentDir = await fs.mkdtemp(path.join(root, `${key.replace(/[^A-Za-z0-9._-]/g, "_")}-`));
+  }
+  if (options?.seedUserAgentDir === false) return { agentDir, ephemeral };
   const seedFrom = options?.userAgentDir ?? path.join(input.homeDir ?? os.homedir(), ".omp", "agent");
-  if (path.resolve(seedFrom) === path.resolve(agentDir)) return { agentDir };
+  if (path.resolve(seedFrom) === path.resolve(agentDir)) return { agentDir, ephemeral };
   try {
-    if (!(await fs.stat(seedFrom)).isDirectory()) return { agentDir };
+    if (!(await fs.stat(seedFrom)).isDirectory()) return { agentDir, ephemeral };
   } catch {
-    return { agentDir };
+    return { agentDir, ephemeral };
+  }
+  return { agentDir, seedFrom, ephemeral };
+}
+async function removeHomeOnThrow(plan, fill) {
+  try {
+    return await fill();
+  } catch (err) {
+    if (plan.ephemeral) await fs.rm(plan.agentDir, { recursive: true, force: true });
+    throw err;
   }
-  return { agentDir, seedFrom };
 }
 async function removeEntry(target) {
   let stat;
@@ -261,6 +277,42 @@ async function linkInto(dir, sourceDir, skip) {
   }
   return linked;
 }
+async function dropStaleSeedLinks(dir, sourceDir) {
+  let names;
+  try {
+    names = await fs.readdir(dir);
+  } catch {
+    return;
+  }
+  const root = path.resolve(sourceDir);
+  for (const name of names) {
+    if (OMP_LOGIN_FILES.includes(name)) continue;
+    const entry = path.join(dir, name);
+    try {
+      if (!(await fs.lstat(entry)).isSymbolicLink()) continue;
+      const to = path.resolve(dir, await fs.readlink(entry));
+      if (to === root || to.startsWith(root + path.sep)) await fs.unlink(entry);
+    } catch {
+    }
+  }
+}
+async function linkLoginFiles(dir, sourceDir) {
+  await dropStaleSeedLinks(dir, sourceDir);
+  const linked = [];
+  for (const name of OMP_LOGIN_FILES) {
+    const from = path.join(sourceDir, name);
+    try {
+      if (!(await fs.stat(from)).isFile()) continue;
+    } catch {
+      continue;
+    }
+    const target = path.join(dir, name);
+    await removeEntry(target);
+    await fs.symlink(from, target);
+    linked.push(name);
+  }
+  return linked;
+}
 async function readSeededSettings(seedFrom) {
   for (const name of ["config.yml", "config.yaml"]) {
     let raw;
@@ -278,7 +330,7 @@ async function readSeededSettings(seedFrom) {
 }
 async function materializeOmpAgentDir(agentDir, registry, options = {}) {
   await fs.mkdir(agentDir, { recursive: true });
-  const seeded = options.seedFrom ? await linkInto(agentDir, options.seedFrom, OWNED_AGENT_DIR_FILES) : [];
+  const seeded = options.seedFrom ? await linkLoginFiles(agentDir, options.seedFrom) : [];
   const identity = options.identityDir ? await linkInto(agentDir, options.identityDir, OWNED_AGENT_DIR_FILES) : [];
   const baseSettings = options.baseSettings ?? (options.seedFrom ? await readSeededSettings(options.seedFrom) : void 0);
   const render = renderOmpRegistry(registry, { ...options, baseSettings });
@@ -307,15 +359,19 @@ async function materializeOmpProviders(config) {
     ...config.sessionId ? { sessionId: config.sessionId } : {},
     ...config.driverOptions?.omp ? { options: config.driverOptions.omp } : {}
   });
-  const rendered = await materializeOmpAgentDir(plan.agentDir, registry, {
-    env,
-    ...plan.seedFrom ? { seedFrom: plan.seedFrom } : {},
-    ...config.agentDir ? { identityDir: config.agentDir } : {},
-    ...config.roles ? { roles: config.roles } : {},
-    ...config.modelRef ? { modelRef: config.modelRef } : {}
-  });
+  const rendered = await removeHomeOnThrow(
+    plan,
+    () => materializeOmpAgentDir(plan.agentDir, registry, {
+      env,
+      ...plan.seedFrom ? { seedFrom: plan.seedFrom } : {},
+      ...config.agentDir ? { identityDir: config.agentDir } : {},
+      ...config.roles ? { roles: config.roles } : {},
+      ...config.modelRef ? { modelRef: config.modelRef } : {}
+    })
+  );
   return {
     ...rendered,
+    ephemeral: plan.ephemeral,
     ...selected?.providerModelId ? { modelArg: `${selected.providerId}/${selected.providerModelId}` } : {}
   };
 }
@@ -328,31 +384,33 @@ async function materializeOmpIdentityDir(config) {
     sessionId: `${config.sessionId?.trim() || "agent"}-${agentKey}`,
     ...config.driverOptions?.omp ? { options: config.driverOptions.omp } : {}
   });
-  await fs.mkdir(plan.agentDir, { recursive: true });
-  const seeded = plan.seedFrom ? await linkInto(plan.agentDir, plan.seedFrom, OWNED_AGENT_DIR_FILES) : [];
-  if (plan.seedFrom) {
-    for (const name of Object.keys(OWNED_AGENT_DIR_FILES)) {
-      const from = path.join(plan.seedFrom, name);
-      try {
-        if (!(await fs.stat(from)).isFile()) continue;
-      } catch {
-        continue;
+  return removeHomeOnThrow(plan, async () => {
+    await fs.mkdir(plan.agentDir, { recursive: true });
+    const seeded = plan.seedFrom ? await linkLoginFiles(plan.agentDir, plan.seedFrom) : [];
+    if (plan.seedFrom) {
+      for (const name of Object.keys(OWNED_AGENT_DIR_FILES)) {
+        const from = path.join(plan.seedFrom, name);
+        try {
+          if (!(await fs.stat(from)).isFile()) continue;
+        } catch {
+          continue;
+        }
+        const to = path.join(plan.agentDir, name);
+        await removeEntry(to);
+        await fs.copyFile(from, to);
       }
-      const to = path.join(plan.agentDir, name);
-      await removeEntry(to);
-      await fs.copyFile(from, to);
     }
-  }
-  const identity = await linkInto(plan.agentDir, identityDir, {
-    ...OWNED_AGENT_DIR_FILES,
-    ...OMP_RUNTIME_ENTRIES
+    const identity = await linkInto(plan.agentDir, identityDir, {
+      ...OWNED_AGENT_DIR_FILES,
+      ...OMP_RUNTIME_ENTRIES
+    });
+    return { agentDir: plan.agentDir, ephemeral: plan.ephemeral, seeded, identity };
   });
-  return { agentDir: plan.agentDir, seeded, identity };
 }
 
 // bridge/src/drivers/omp.ts
 function ompCredentialMessage(msg) {
-  const match = /^No API key found for ([A-Za-z0-9._-]+?)\.?(?:\s|$)/.exec(msg);
+  const match = /^(?:Error:\s*)?No API key found for ([A-Za-z0-9._-]+?)\.?(?:\s|$)/.exec(msg);
   if (!match) return msg;
   const provider = match[1];
   const envName = `${provider.toUpperCase().replace(/[^A-Z0-9]/g, "_")}_API_KEY`;
@@ -539,6 +597,8 @@ var OmpDriver = class extends AgentDriver {
   _contextWindow = null;
   /** Per-spawn file holding the system prompt omp was started with; removed with the process. */
   systemPromptFile = null;
+  /** The private omp home of the running process, when it is the driver's own temporary one. */
+  privateHome = null;
   getTokenUsage() {
     return this._lastTokens;
   }
@@ -697,6 +757,7 @@ var OmpDriver = class extends AgentDriver {
     if (this.proc) return;
     this.startPromise = this._start().catch((err) => {
       this.removeSystemPromptFile();
+      this.removePrivateHome();
       throw err;
     });
     return this.startPromise;
@@ -712,6 +773,7 @@ var OmpDriver = class extends AgentDriver {
     }
     const providers = await materializeOmpProviders(this.config);
     if (providers) {
+      this.privateHome = providers.ephemeral ? providers.agentDir : null;
       for (const warning of providers.warnings) this.log.warn("registry", { warning });
       this.log.info("rendered omp models.yml", {
         agentDir: providers.agentDir,
@@ -756,6 +818,7 @@ var OmpDriver = class extends AgentDriver {
       if (home) {
         this.log.info("omp home for the agent", { agentDir: home.agentDir });
         env.PI_CODING_AGENT_DIR = home.agentDir;
+        this.privateHome = home.ephemeral ? home.agentDir : null;
       }
     }
     if (this.config.sshKeyPath) {
@@ -821,7 +884,7 @@ var OmpDriver = class extends AgentDriver {
             clearTimeout(fallback);
             reject(
               new Error(
-                `omp exited before it was ready (${code !== null ? `exit code ${code}` : `signal ${signal}`})${startStderr.length > 0 ? `: ${ompStartFailureCause(startStderr)}` : ""}`
+                `omp exited before it was ready (${code !== null ? `exit code ${code}` : `signal ${signal}`})${startStderr.length > 0 ? `: ${ompCredentialMessage(ompStartFailureCause(startStderr))}` : ""}`
               )
             );
           };
@@ -1240,7 +1303,7 @@ var OmpDriver = class extends AgentDriver {
       const quiet = typeof event.id === "string" && this.quietRequestIds.delete(event.id);
       if (!event.success && event.error && !quiet) {
         const detail = this.classifyErrorMessage(event.error);
-        this.emit("agent-event", { type: "error", error: event.error, detail });
+        this.emit("agent-event", { type: "error", error: detail.message, detail });
       }
       this.emit(`response:${event.id}`, event);
       return;
@@ -1263,7 +1326,7 @@ var OmpDriver = class extends AgentDriver {
     }
     if (event.type === "error" && event.error) {
       const detail = this.classifyErrorMessage(event.error);
-      this.emit("agent-event", { ...event, detail });
+      this.emit("agent-event", { ...event, error: detail.message, detail });
       return;
     }
     if (event.type === "message_update" && event.message) {
@@ -1295,7 +1358,7 @@ var OmpDriver = class extends AgentDriver {
       const error = event.message.errorMessage || "omp request failed";
       const detail = this.classifyErrorMessage(error);
       this.log.error("omp request failed", new Error(error), { detail });
-      this.emit("agent-event", { type: "error", error, detail });
+      this.emit("agent-event", { type: "error", error: detail.message, detail });
     }
     if (event.type === "agent_end") {
       void this.captureState();
@@ -1677,8 +1740,18 @@ ${input.text}` : input.text;
     this.systemPromptFile = null;
     if (file) rmSync(file, { force: true });
   }
+  /**
+   * Delete the private omp home of the process that is gone: it holds symlinks to the login
+   * and the agent files and omp's runtime databases, and nothing reads it afterwards (p811).
+   */
+  removePrivateHome() {
+    const home = this.privateHome;
+    this.privateHome = null;
+    if (home) rmSync(home, { recursive: true, force: true });
+  }
   cleanup() {
     this.removeSystemPromptFile();
+    this.removePrivateHome();
     this.rl?.close();
     this.rl = null;
     this.proc = null;