@skaile/workspaces 5.18.0 → 5.19.0

package/dist/bridge/drivers/omp.js

@@ -1,478 +1,27 @@
 import { checkToolInputSchema } from '../../chunk-L2AMXONH.js';
-import { entrySurface } from '../../chunk-GRKU3S5V.js';
+import { materializeOmpProviders, isCredentialOmissionWarning, materializeOmpIdentityDir, registryModelEntries } from '../../chunk-COJIL7G4.js';
 import { dispatchCapability } from '../../chunk-AJ7EGIFR.js';
-import { ReconfigureLedger, stripRunnerPrivateEnv, classifyGenericErrorMessage } from '../../chunk-B4X2N7JQ.js';
+import '../../chunk-2GXSSZAM.js';
+import { ReconfigureLedger, stripRunnerPrivateEnv, classifyGenericErrorMessage } from '../../chunk-RPZVHXQ3.js';
 import { wrapAgentCommand, resolveAgentExec } from '../../chunk-YROR332M.js';
-import { AgentDriver, getBridgeLogger, TOOL_ALLOWLIST_UNSUPPORTED, registryDriverConfig } from '../../chunk-YU6AURJY.js';
-import { BUILTIN_DRIVER_CATALOG, unresolvedProviderCredentials, entryCredentialValue, providerCredentialEnvName } from '../../chunk-X54YR4AW.js';
+import { AgentDriver, getBridgeLogger, TOOL_ALLOWLIST_UNSUPPORTED, registryDriverConfig } from '../../chunk-XWOPZW26.js';
+import { BUILTIN_DRIVER_CATALOG } from '../../chunk-CQJH4G2K.js';
 import '../../chunk-6E6PKKAD.js';
 import { withActivityLabelJsonSchema } from '../../chunk-Y56YIT6J.js';
 import '../../chunk-ICSCSM5D.js';
 import '../../chunk-DKXNKFKP.js';
-import { AI_PROVIDER_SURFACES, registryEntries, isEntryEnabled, parseModelRef, normalizeEntryBaseUrl, resolveEntryBaseUrl } from '../../chunk-MJHSLODD.js';
+import '../../chunk-MJHSLODD.js';
 import '../../chunk-C3CAXQMA.js';
 import '../../chunk-BOFL7GIF.js';
 import '../../chunk-NSBPE2FW.js';
 import { spawn } from 'child_process';
-import { randomUUID, createHash } from 'crypto';
+import { randomUUID } 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 os from 'os';
-import { stringify, parse } from 'yaml';
 
-var OMP_API_VALUES = [...AI_PROVIDER_SURFACES, "google-gemini-cli"];
-var OMP_DISCOVERY_TYPES = [
-  "ollama",
-  "llama.cpp",
-  "lm-studio",
-  "openai-models-list",
-  "proxy",
-  "litellm"
-];
-var OMP_MODELS_FILENAME = "models.yml";
-var OMP_CONFIG_FILENAME = "config.yml";
-var OWNED_AGENT_DIR_FILES = {
-  "models.yml": true,
-  "models.yaml": true,
-  "models.json": true,
-  "config.yml": true,
-  "config.yaml": true,
-  "config.yml.lock": true,
-  "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
-};
-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 ?? {}),
-    ...Object.keys(entry.capabilities ?? {})
-  ]);
-  const seen = /* @__PURE__ */ new Set();
-  const out = [];
-  for (const id of logical) {
-    const providerSide = entry.model_map?.[id] ?? id;
-    if (seen.has(providerSide)) continue;
-    seen.add(providerSide);
-    out.push([id, providerSide]);
-  }
-  return out;
-}
-function renderProvider(id, entry, warnings) {
-  const baseUrl = normalizeEntryBaseUrl(resolveEntryBaseUrl(entry), entrySurface(entry));
-  if (!baseUrl) {
-    warnings.push(
-      `provider '${id}' has no resolvable base_url (missing transport params?) \u2014 omitted from models.yml`
-    );
-    return void 0;
-  }
-  const surface = entry.surface;
-  if (surface && !OMP_API_VALUES.includes(surface)) {
-    warnings.push(
-      `provider '${id}' has surface '${surface}', which omp's api enum does not accept`
-    );
-    return void 0;
-  }
-  const block = { baseUrl };
-  if (surface) block.api = surface;
-  const kind = entry.credential?.kind ?? "none";
-  if (kind === "none") {
-    block.auth = "none";
-  } else if (kind === "sigv4" || kind === "google_adc" || kind === "azure_entra") {
-    block.auth = "none";
-  } else {
-    block.apiKey = providerCredentialEnvName(id);
-    if (kind === "bearer" || kind === "oauth") block.authHeader = true;
-  }
-  const headers = { ...entry.headers };
-  if (entry.query_params && Object.keys(entry.query_params).length > 0) {
-    if (surface === "bedrock-converse-stream") {
-      const search = new URLSearchParams(entry.query_params).toString();
-      block.baseUrl = `${baseUrl}${baseUrl.includes("?") ? "&" : "?"}${search}`;
-    } else {
-      warnings.push(
-        `provider '${id}' declares query_params, which omp's models.yml has no slot for on surface '${surface ?? "unset"}' \u2014 they were dropped`
-      );
-    }
-  }
-  if (Object.keys(headers).length > 0) block.headers = headers;
-  const discoveryType = entry.discovery?.type;
-  if (discoveryType) {
-    if (!OMP_DISCOVERY_TYPES.includes(discoveryType)) {
-      warnings.push(
-        `provider '${id}' declares discovery '${discoveryType}', which omp does not implement \u2014 models come from model_map only`
-      );
-    } else if (!surface && discoveryType !== "proxy") {
-      warnings.push(
-        `provider '${id}' declares discovery '${discoveryType}' but no surface \u2014 omp requires provider-level api for every discovery type but 'proxy'`
-      );
-    } else {
-      block.discovery = { type: discoveryType };
-    }
-  }
-  const models = [];
-  for (const [logical, providerSide] of entryModelIds(entry)) {
-    const model = { id: providerSide };
-    if (logical !== providerSide) model.name = logical;
-    const caps = entry.capabilities?.[logical];
-    if (caps?.context_window !== void 0) model.contextWindow = caps.context_window;
-    if (caps?.images !== void 0) model.input = caps.images ? ["text", "image"] : ["text"];
-    if (caps?.tools !== void 0) model.supportsTools = caps.tools;
-    models.push(model);
-  }
-  if (models.length > 0) {
-    if (!surface) {
-      warnings.push(
-        `provider '${id}' declares models but no surface \u2014 omp requires api at provider or model level`
-      );
-      return void 0;
-    }
-    block.models = models;
-  } else if (!block.discovery) {
-    warnings.push(
-      `provider '${id}' declares neither model_map/capabilities nor a discovery omp implements \u2014 it will only override an omp built-in provider of the same id`
-    );
-  }
-  return block;
-}
-function renderModelRoles(registry, roles, modelRef, warnings) {
-  const out = {};
-  for (const [role, selector] of Object.entries(roles ?? {})) {
-    const trimmed = selector.trim();
-    if (!trimmed) continue;
-    const ref = parseModelRef(trimmed, registry);
-    if (!ref?.providerModelId) {
-      warnings.push(
-        `role '${role}' ('${selector}') resolves to no model in this registry \u2014 dropped`
-      );
-      continue;
-    }
-    out[role] = `${ref.providerId}/${ref.providerModelId}`;
-  }
-  if (out.default === void 0 && modelRef) {
-    const ref = parseModelRef(modelRef, registry, roles);
-    if (ref?.providerModelId) out.default = `${ref.providerId}/${ref.providerModelId}`;
-  }
-  return out;
-}
-function renderOmpRegistry(registry, options = {}) {
-  const warnings = [];
-  const providers = {};
-  const providerIds = [];
-  const credentialEnv = {};
-  const unresolved = new Map(
-    unresolvedProviderCredentials(registry, options).map((u) => [u.providerId, u.reason])
-  );
-  for (const [id, entry] of registryEntries(registry)) {
-    if (entry.kind !== "llm" && entry.kind !== "embed") continue;
-    if (!isEntryEnabled(entry)) continue;
-    const reason = unresolved.get(id);
-    if (reason) {
-      warnings.push(`provider '${id}' omitted from models.yml: ${reason}`);
-      continue;
-    }
-    const block = renderProvider(id, entry, warnings);
-    if (!block) continue;
-    providers[id] = block;
-    providerIds.push(id);
-    const secret = entryCredentialValue(id, entry, options);
-    if (secret) credentialEnv[providerCredentialEnvName(id)] = secret;
-  }
-  const modelRoles = renderModelRoles(registry, options.roles, options.modelRef, warnings);
-  const settings = { ...options.baseSettings };
-  if (Object.keys(modelRoles).length > 0) settings.modelRoles = modelRoles;
-  return {
-    modelsYml: stringify({ providers }),
-    configYml: stringify(settings),
-    credentialEnv,
-    providerIds,
-    modelRoles,
-    warnings
-  };
-}
-function registryModelEntries(registry) {
-  if (!registry) return [];
-  const out = [];
-  for (const [id, entry] of registryEntries(registry)) {
-    if (entry.kind !== "llm" && entry.kind !== "embed") continue;
-    if (!isEntryEnabled(entry)) continue;
-    const label = entry.label ?? id;
-    for (const [logical, providerSide] of entryModelIds(entry)) {
-      out.push({ id: `${id}/${providerSide}`, name: `${label} ${logical}` });
-    }
-  }
-  return out;
-}
-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 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 });
-    await sweepStaleOmpHomes(root);
-    agentDir = await fs.mkdtemp(path.join(root, `${key.replace(/[^A-Za-z0-9._-]/g, "_")}-`));
-    await fs.writeFile(path.join(agentDir, OWNER_FILE), String(process.pid));
-  }
-  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, ephemeral };
-  try {
-    if (!(await fs.stat(seedFrom)).isDirectory()) return { agentDir, ephemeral };
-  } catch {
-    return { agentDir, ephemeral };
-  }
-  return { agentDir, seedFrom, ephemeral };
-}
-var OWNER_FILE = ".skaile-owner-pid";
-var STALE_HOME_MS = 24 * 60 * 60 * 1e3;
-var SKAILE_HOME_NAME = /^[A-Za-z0-9._-]+-(?:[A-Za-z0-9]{6}|[0-9a-f]{12})$/;
-function processAlive(pid) {
-  try {
-    process.kill(pid, 0);
-    return true;
-  } catch (err) {
-    return err.code === "EPERM";
-  }
-}
-async function sweepStaleOmpHomes(root, now = Date.now()) {
-  let names;
-  try {
-    names = await fs.readdir(root);
-  } catch {
-    return;
-  }
-  await Promise.all(
-    names.map(async (name) => {
-      const home = path.join(root, name);
-      try {
-        const stat = await fs.lstat(home);
-        if (!stat.isDirectory() || now - stat.mtimeMs < STALE_HOME_MS) return;
-        const owner = Number.parseInt(
-          await fs.readFile(path.join(home, OWNER_FILE), "utf8").catch(() => ""),
-          10
-        );
-        if (Number.isInteger(owner) && processAlive(owner)) return;
-        if (!Number.isInteger(owner) && !SKAILE_HOME_NAME.test(name)) return;
-        await fs.rm(home, { recursive: true, force: true });
-      } catch {
-      }
-    })
-  );
-}
-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;
-  }
-}
-async function removeEntry(target) {
-  let stat;
-  try {
-    stat = await fs.lstat(target);
-  } catch {
-    return;
-  }
-  if (stat.isSymbolicLink() || stat.isFile()) {
-    await fs.unlink(target);
-    return;
-  }
-  await fs.rm(target, { recursive: true, force: true });
-}
-async function linkInto(dir, sourceDir, skip) {
-  let names;
-  try {
-    names = await fs.readdir(sourceDir);
-  } catch {
-    return [];
-  }
-  const linked = [];
-  for (const name of names) {
-    if (skip[name]) continue;
-    const target = path.join(dir, name);
-    await removeEntry(target);
-    await fs.symlink(path.join(sourceDir, name), target);
-    linked.push(name);
-  }
-  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;
-    try {
-      raw = await fs.readFile(path.join(seedFrom, name), "utf-8");
-    } catch {
-      continue;
-    }
-    const parsed = parse(raw);
-    if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
-      return parsed;
-    }
-  }
-  return {};
-}
-async function ownDefaultNeedingOwnModels(seedFrom, rendered) {
-  const selector = (await readSeededSettings(seedFrom)).modelRoles;
-  const own = selector && typeof selector === "object" && !Array.isArray(selector) ? selector.default : void 0;
-  if (typeof own !== "string" || !own.includes("/")) return void 0;
-  const providerId = own.slice(0, own.indexOf("/"));
-  if (rendered.includes(providerId)) return void 0;
-  let raw;
-  try {
-    raw = await fs.readFile(path.join(seedFrom, OMP_MODELS_FILENAME), "utf-8");
-  } catch {
-    return void 0;
-  }
-  const providers = parse(raw)?.providers;
-  if (!providers || typeof providers !== "object" || Array.isArray(providers)) return void 0;
-  return providerId in providers ? own : void 0;
-}
-async function materializeOmpAgentDir(agentDir, registry, options = {}) {
-  await fs.mkdir(agentDir, { recursive: true });
-  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 });
-  await fs.writeFile(path.join(agentDir, OMP_MODELS_FILENAME), render.modelsYml, "utf-8");
-  await fs.writeFile(path.join(agentDir, OMP_CONFIG_FILENAME), render.configYml, "utf-8");
-  return { ...render, agentDir, seeded, identity };
-}
-async function materializeOmpProviders(config) {
-  const registry = config.registry;
-  if (!registry) return void 0;
-  const selectable = registryEntries(registry).some(
-    ([, 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 } : {}
-  });
-  if (!selected && !config.model && plan.seedFrom) {
-    const named = renderOmpRegistry(registry, {
-      env,
-      ...config.roles ? { roles: config.roles } : {}
-    }).modelRoles;
-    if (named.default === void 0 && await ownDefaultNeedingOwnModels(plan.seedFrom, usable)) {
-      if (plan.ephemeral) await fs.rm(plan.agentDir, { recursive: true, force: true });
-      return void 0;
-    }
-  }
-  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}` } : {}
-  };
-}
-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 } : {}
-  });
-  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 identity = await linkInto(plan.agentDir, identityDir, {
-      ...OWNED_AGENT_DIR_FILES,
-      ...OMP_RUNTIME_ENTRIES
-    });
-    return { agentDir: plan.agentDir, ephemeral: plan.ephemeral, seeded, identity };
-  });
-}
-
-// bridge/src/drivers/omp.ts
 function ompCredentialMessage(msg) {
   const match = /^(?:Error:\s*)?No API key found for ([A-Za-z0-9._-]+?)\.?(?:\s|$)/.exec(msg);
   if (!match) return msg;
@@ -838,7 +387,10 @@ 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 });
+      for (const warning of providers.warnings) {
+        if (isCredentialOmissionWarning(warning)) this.log.debug(warning);
+        else this.log.warn(warning);
+      }
       this.log.info("rendered omp models.yml", {
         agentDir: providers.agentDir,
         providers: providers.providerIds,
@@ -979,10 +531,14 @@ var OmpDriver = class extends AgentDriver {
           }
         });
       }
+      const replayStartStderr = () => {
+        for (const line of startStderr) this.log.warn(`stderr: ${line}`);
+      };
       if (proc.stderr) {
         const stderrRl = createInterface({ input: proc.stderr });
         stderrRl.on("line", (line) => {
-          this.log.warn(`stderr: ${line}`);
+          if (this.ready) this.log.warn(`stderr: ${line}`);
+          else this.log.debug(`stderr: ${line}`);
           this.stderrBuffer.push(line);
           if (this.stderrBuffer.length > 20) this.stderrBuffer.shift();
           startStderr.push(line);
@@ -994,6 +550,7 @@ var OmpDriver = class extends AgentDriver {
         if (!this.ready && this.proc === proc) {
           this.log.warn("ready timeout, proceeding", { timeoutMs: 5e3 });
           this.ready = true;
+          replayStartStderr();
           resolve(proc);
         }
       }, 5e3);
@@ -1002,6 +559,7 @@ var OmpDriver = class extends AgentDriver {
         if (!this.ready && this.proc === proc) {
           this.log.info("process ready", { elapsedMs: Date.now() - startTime });
           this.ready = true;
+          replayStartStderr();
           resolve(proc);
         }
       });