@skaile/workspaces 5.12.0 → 5.14.0

package/dist/bridge/drivers/omp.js

@@ -1,11 +1,12 @@
 import { checkToolInputSchema } from '../../chunk-X5O56UO4.js';
-import { entrySurface } from '../../chunk-NGJIVDDD.js';
-import { dispatchCapability } from '../../chunk-2H73V6XR.js';
+import { entrySurface } from '../../chunk-IQVZIVSA.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-MF54ZHWT.js';
+import { AgentDriver, getBridgeLogger, TOOL_ALLOWLIST_UNSUPPORTED, registryDriverConfig } from '../../chunk-DWRYUWOK.js';
+import { BUILTIN_DRIVER_CATALOG, unresolvedProviderCredentials, entryCredentialValue, providerCredentialEnvName } from '../../chunk-6VIVUBNN.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';
@@ -13,13 +14,14 @@ import '../../chunk-C3CAXQMA.js';
 import '../../chunk-BOFL7GIF.js';
 import '../../chunk-NSBPE2FW.js';
 import { spawn } from 'child_process';
+import { randomUUID, createHash } from 'crypto';
+import { rmSync } from 'fs';
 import fs from 'fs/promises';
 import path from 'path';
 import { createInterface } from 'readline';
 import * as z from 'zod';
-import { createHash } from 'crypto';
 import os from 'os';
-import { parse, stringify } from 'yaml';
+import { stringify, parse } from 'yaml';
 
 var OMP_API_VALUES = [...AI_PROVIDER_SURFACES, "google-gemini-cli"];
 var OMP_DISCOVERY_TYPES = [
@@ -42,6 +44,20 @@ var OWNED_AGENT_DIR_FILES = {
   "config.yaml.lock": true,
   "settings.json": true
 };
+var OMP_RUNTIME_ENTRIES = {
+  "agent.db": true,
+  "agent.db-shm": true,
+  "agent.db-wal": true,
+  "models.db": true,
+  "models.db-shm": true,
+  "models.db-wal": true,
+  "skill-descriptions.db": true,
+  "skill-descriptions.db-shm": true,
+  "skill-descriptions.db-wal": true,
+  "custom-session-files": true,
+  intercom: true,
+  sessions: true
+};
 function entryModelIds(entry) {
   const logical = /* @__PURE__ */ new Set([
     ...Object.keys(entry.model_map ?? {}),
@@ -278,26 +294,71 @@ async function materializeOmpProviders(config) {
     ([, entry]) => (entry.kind === "llm" || entry.kind === "embed") && isEntryEnabled(entry)
   );
   if (!selectable) return void 0;
+  const env = { ...process.env, ...config.env };
+  const selected = config.modelRef ? parseModelRef(config.modelRef, registry, config.roles) : void 0;
+  const usable = renderOmpRegistry(registry, {
+    env,
+    ...config.roles ? { roles: config.roles } : {},
+    ...config.modelRef ? { modelRef: config.modelRef } : {}
+  }).providerIds;
+  if (usable.length === 0) return void 0;
+  if (selected && !usable.includes(selected.providerId)) return void 0;
   const plan = await planOmpAgentDir({
     cwd: config.cwd,
     ...config.sessionId ? { sessionId: config.sessionId } : {},
     ...config.driverOptions?.omp ? { options: config.driverOptions.omp } : {}
   });
   const rendered = await materializeOmpAgentDir(plan.agentDir, registry, {
-    env: { ...process.env, ...config.env },
+    env,
     ...plan.seedFrom ? { seedFrom: plan.seedFrom } : {},
     ...config.agentDir ? { identityDir: config.agentDir } : {},
     ...config.roles ? { roles: config.roles } : {},
     ...config.modelRef ? { modelRef: config.modelRef } : {}
   });
-  const selected = config.modelRef ? parseModelRef(config.modelRef, registry, config.roles) : void 0;
   return {
     ...rendered,
     ...selected?.providerModelId ? { modelArg: `${selected.providerId}/${selected.providerModelId}` } : {}
   };
 }
+async function materializeOmpIdentityDir(config) {
+  const identityDir = config.agentDir;
+  if (!identityDir) return void 0;
+  const agentKey = createHash("sha256").update(`${path.resolve(identityDir)}\0${path.resolve(config.cwd)}`).digest("hex").slice(0, 12);
+  const plan = await planOmpAgentDir({
+    cwd: config.cwd,
+    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;
+      }
+      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
+  });
+  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);
+  if (!match) return msg;
+  const provider = match[1];
+  const envName = `${provider.toUpperCase().replace(/[^A-Z0-9]/g, "_")}_API_KEY`;
+  return `No API key found for ${provider}. Add the provider with \`skaile providers add ${provider} --credential env:${envName}\`, or log in once with \`omp\` (type /login).`;
+}
 var OMP_BASE_ENV_KEYS = ["PATH", "HOME", "USER", "HOSTNAME", "SKAILE_SESSION_ID"];
 function buildOmpChildEnv(parent) {
   const out = {};
@@ -477,6 +538,8 @@ var OmpDriver = class extends AgentDriver {
   _lastContextTokens = null;
   /** Context window of the active model, from `get_state.contextUsage`. */
   _contextWindow = null;
+  /** Per-spawn file holding the system prompt omp was started with; removed with the process. */
+  systemPromptFile = null;
   getTokenUsage() {
     return this._lastTokens;
   }
@@ -613,8 +676,8 @@ var OmpDriver = class extends AgentDriver {
    * @param config - Driver configuration. omp-relevant fields:
    *   - `cwd` — working directory; omp session files are stored under `<cwd>/.omp/sessions/`.
    *   - `model` — forwarded as `--model <selector>`. In registry mode `modelRef` takes precedence at spawn; `reconfigure({ model })` keeps both in step.
-   *   - `systemPrompt` — written to `<cwd>/.omp/system.md` and appended via `--append-system-prompt`.
-   *   - `agentDir` — sets `PI_CODING_AGENT_DIR`; omp reads agent identity from this directory.
+   *   - `systemPrompt` — written to a per-spawn file under `<cwd>/.skaile/cache/omp-system/` and appended via `--append-system-prompt`.
+   *   - `agentDir` — its entries are linked into omp's private home (`PI_CODING_AGENT_DIR`); the directory itself is never omp's home.
    *   - `sshKeyPath` — injected as `GIT_SSH_COMMAND` for authenticated git operations.
    *   - `resumeSessionId` — omp session UUID to restore via `--session <id>`.
    */
@@ -633,7 +696,10 @@ var OmpDriver = class extends AgentDriver {
   async start() {
     if (this.startPromise) return this.startPromise;
     if (this.proc) return;
-    this.startPromise = this._start();
+    this.startPromise = this._start().catch((err) => {
+      this.removeSystemPromptFile();
+      throw err;
+    });
     return this.startPromise;
   }
   async _start() {
@@ -648,18 +714,14 @@ var OmpDriver = class extends AgentDriver {
     const providers = await materializeOmpProviders(this.config);
     if (providers) {
       for (const warning of providers.warnings) this.log.warn("registry", { warning });
-      if (providers.providerIds.length === 0) {
-        this.log.info("registry rendered no omp providers", {
-          agentDir: providers.agentDir
-        });
-      } else {
-        this.log.info("rendered omp models.yml", {
-          agentDir: providers.agentDir,
-          providers: providers.providerIds,
-          modelRoles: providers.modelRoles,
-          seeded: providers.seeded.length
-        });
-      }
+      this.log.info("rendered omp models.yml", {
+        agentDir: providers.agentDir,
+        providers: providers.providerIds,
+        modelRoles: providers.modelRoles,
+        seeded: providers.seeded.length
+      });
+    } else if (this.config.registry) {
+      this.log.info("registry gives omp no usable provider; omp uses its own login");
     }
     const modelArg = providers?.modelArg ?? this.config.model;
     if (modelArg) args.push("--model", modelArg);
@@ -677,11 +739,13 @@ var OmpDriver = class extends AgentDriver {
       this.log.info("applying tool restrictions", { args: toolArgs });
       args.push(...toolArgs);
     }
+    this.removeSystemPromptFile();
     if (this.config.systemPrompt) {
-      const ompDir = path.join(this.config.cwd, ".omp");
-      await fs.mkdir(ompDir, { recursive: true });
-      const systemFile = path.join(ompDir, "system.md");
+      const promptDir = path.join(this.config.cwd, ".skaile", "cache", "omp-system");
+      await fs.mkdir(promptDir, { recursive: true });
+      const systemFile = path.join(promptDir, `${randomUUID()}.md`);
       await fs.writeFile(systemFile, this.config.systemPrompt);
+      this.systemPromptFile = systemFile;
       args.push("--append-system-prompt", systemFile);
     }
     const env = this.config.env ? { ...this.config.env } : buildOmpChildEnv(process.env);
@@ -689,7 +753,11 @@ var OmpDriver = class extends AgentDriver {
       env.PI_CODING_AGENT_DIR = providers.agentDir;
       Object.assign(env, providers.credentialEnv);
     } else if (this.config.agentDir) {
-      env.PI_CODING_AGENT_DIR = this.config.agentDir;
+      const home = await materializeOmpIdentityDir(this.config);
+      if (home) {
+        this.log.info("omp home for the agent", { agentDir: home.agentDir });
+        env.PI_CODING_AGENT_DIR = home.agentDir;
+      }
     }
     if (this.config.sshKeyPath) {
       env.GIT_SSH_COMMAND = `ssh -i "${this.config.sshKeyPath}" -o StrictHostKeyChecking=accept-new`;
@@ -1574,7 +1642,8 @@ ${input.text}` : input.text;
       hint: "An unexpected process error occurred. Try sending your prompt again."
     };
   }
-  classifyErrorMessage(msg) {
+  classifyErrorMessage(rawMsg) {
+    const msg = ompCredentialMessage(rawMsg);
     const generic = classifyGenericErrorMessage(msg);
     if (!generic) return { message: msg, category: "unknown", retryable: true };
     const lower = msg.toLowerCase();
@@ -1603,7 +1672,14 @@ ${input.text}` : input.text;
   async listModels() {
     return registryModelEntries(this.config.registry);
   }
+  /** Delete the system prompt file of the process that is gone (or about to be replaced). */
+  removeSystemPromptFile() {
+    const file = this.systemPromptFile;
+    this.systemPromptFile = null;
+    if (file) rmSync(file, { force: true });
+  }
   cleanup() {
+    this.removeSystemPromptFile();
     this.rl?.close();
     this.rl = null;
     this.proc = null;
@@ -1635,6 +1711,6 @@ var ompDriverTarget = {
   }).listModels()
 };
 
-export { OMP_BUILTIN_TOOLS, OMP_DEFAULT_TOOLS, OMP_THINKING_LEVELS, OmpDriver, buildOmpChildEnv, buildOmpHostTools, buildOmpToolArgs, ompDriverTarget, ompStartFailureCause, ompThinkingLevel, splitOmpModel };
+export { OMP_BUILTIN_TOOLS, OMP_DEFAULT_TOOLS, OMP_THINKING_LEVELS, OmpDriver, buildOmpChildEnv, buildOmpHostTools, buildOmpToolArgs, ompCredentialMessage, ompDriverTarget, ompStartFailureCause, ompThinkingLevel, splitOmpModel };
 //# sourceMappingURL=omp.js.map
 //# sourceMappingURL=omp.js.map