@divergeai/cli 0.1.8 → 0.1.10

package/README.md

@@ -79,10 +79,13 @@ Anthropic or OpenAI. Every other model, dsh included, searches through the
 platform's `search_online` tool: one key on the platform, metered and audited
 per organization. The dsh overlay wires it in as `mcp__divergent__search_online`
 (dsh's DeepSeek-backed `web_search` needs a vendor key and is off; `web_fetch`
-stays). In dsh's web profile the shipped agent presets still list `web_search`,
-where a patch cannot reach; it fails loudly and the model uses the bridge's
-tool listed beside it. To give Claude Code or Codex the same tool for a
-non-native upstream, register the bridge once:
+stays). dsh's web profile composes the model's tools per agent preset, where a
+patch cannot reach, so `diverge agents setup dsh` and `run dsh` also derive a
+**Divergent** preset from the installed dsh's `standard` one, with the vendor
+search left out of the model's tools, under `$DSH_HOME/.agent-presets/`, and
+make it the default for new web sessions once in `settings.yaml` (a preset you
+pick yourself there stays picked). To give Claude Code or Codex the same tool
+for a non-native upstream, register the bridge once:
 
 ```bash
 claude mcp add --scope user divergent -- diverge tools bridge --tools search_online

package/dist/diverge.mjs

@@ -6915,14 +6915,14 @@ var require_parser = __commonJS({
             case "scalar":
             case "single-quoted-scalar":
             case "double-quoted-scalar": {
-              const fs8 = this.flowScalar(this.type);
+              const fs9 = this.flowScalar(this.type);
               if (atNextItem || it.value) {
-                map.items.push({ start, key: fs8, sep: [] });
+                map.items.push({ start, key: fs9, sep: [] });
                 this.onKeyLine = true;
               } else if (it.sep) {
-                this.stack.push(fs8);
+                this.stack.push(fs9);
               } else {
-                Object.assign(it, { key: fs8, sep: [] });
+                Object.assign(it, { key: fs9, sep: [] });
                 this.onKeyLine = true;
               }
               return;
@@ -7050,13 +7050,13 @@ var require_parser = __commonJS({
             case "scalar":
             case "single-quoted-scalar":
             case "double-quoted-scalar": {
-              const fs8 = this.flowScalar(this.type);
+              const fs9 = this.flowScalar(this.type);
               if (!it || it.value)
-                fc.items.push({ start: [], key: fs8, sep: [] });
+                fc.items.push({ start: [], key: fs9, sep: [] });
               else if (it.sep)
-                this.stack.push(fs8);
+                this.stack.push(fs9);
               else
-                Object.assign(it, { key: fs8, sep: [] });
+                Object.assign(it, { key: fs9, sep: [] });
               return;
             }
             case "flow-map-end":
@@ -7382,12 +7382,12 @@ var CliError = class extends Error {
 };
 
 // src/commands/agents.ts
-import fs6 from "node:fs";
+import fs7 from "node:fs";
 import path10 from "node:path";
 import { parseArgs } from "node:util";
 
 // src/version.ts
-var VERSION = true ? "0.1.8" : "dev";
+var VERSION = true ? "0.1.10" : "dev";
 var USER_AGENT = `diverge/${VERSION}`;
 
 // src/http.ts
@@ -7451,19 +7451,27 @@ function openerCommand(url, env = process.env, platform = process.platform) {
   }
   return { command: "xdg-open", args: [url] };
 }
-function openBrowser(url, env = process.env, platform = process.platform) {
+function openBrowser(url, env = process.env, platform = process.platform, report = () => {
+}) {
   const opener = openerCommand(url, env, platform);
+  if (!env.BROWSER?.trim() && platform !== "darwin" && platform !== "win32" && !env.DISPLAY?.trim() && !env.WAYLAND_DISPLAY?.trim()) {
+    report("this shell has no display (DISPLAY and WAYLAND_DISPLAY are unset)");
+    return false;
+  }
   try {
     const child = spawn(opener.command, opener.args, {
       detached: true,
       stdio: "ignore",
       ...opener.windowsVerbatimArguments ? { windowsVerbatimArguments: true } : {}
     });
-    child.on("error", () => {
+    child.on("error", (error) => report(`${opener.command}: ${error.code === "ENOENT" ? "not found" : error.message}`));
+    child.on("exit", (code2) => {
+      if (code2) report(`${opener.command} exited with code ${code2}`);
     });
     child.unref();
     return true;
-  } catch {
+  } catch (error) {
+    report(`${opener.command}: ${error instanceof Error ? error.message : String(error)}`);
     return false;
   }
 }
@@ -7668,7 +7676,11 @@ function cachedFrom(payload, baseUrl, previousRefresh, nowMs) {
     base_url: baseUrl.replace(/\/+$/, "")
   };
 }
-var defaultDeps = { startLoopback, openBrowser, now: Date.now };
+var defaultDeps = {
+  startLoopback,
+  openBrowser: (url, report) => openBrowser(url, process.env, process.platform, report),
+  now: Date.now
+};
 async function login(options, deps = defaultDeps) {
   const verifier = generateVerifier();
   const state = generateState();
@@ -7686,7 +7698,7 @@ async function login(options, deps = defaultDeps) {
       loginHint: options.loginHint
     });
     const pending = loopback.waitForCode(state, options.timeoutMs);
-    if (options.openBrowser) deps.openBrowser(authorizeUrl);
+    if (options.openBrowser) deps.openBrowser(authorizeUrl, (reason) => options.print(`Could not open a browser (${reason}); paste the URL below into one.`));
     options.print("Open this URL to sign in:");
     options.print(`  ${authorizeUrl}`);
     const code2 = await pending;
@@ -7904,6 +7916,8 @@ function mergeCodexConfig(existing, block) {
 
 // src/agents/dsh.ts
 var import_yaml = __toESM(require_dist(), 1);
+import fs4 from "node:fs";
+import { createRequire } from "node:module";
 import os4 from "node:os";
 import path5 from "node:path";
 var DSH_SHIPPED_DEFAULT_MODEL = "deepseek-flash";
@@ -8016,6 +8030,83 @@ function dshSettingsDefaultModel(settingsText, surface) {
 function stalePinMessage(settingsPath, pinned, surface, served) {
   return `${settingsPath} pins ${pinned} on divergent-${surface}, which the gateway does not serve; set agent-default-model.model there to one of: ${served.join(", ")} (or remove it to use ${served[0]})`;
 }
+var DIVERGENT_PRESET_ID = "divergent";
+var DSH_USER_PRESETS_DIR = ".agent-presets";
+function dshPackageDir(binary) {
+  if (/\.(cmd|bat)$/i.test(binary)) {
+    const dir2 = path5.join(path5.dirname(binary), "node_modules", "@deepseek-ai", "dsh");
+    return fs4.existsSync(path5.join(dir2, "package.json")) ? dir2 : null;
+  }
+  let dir;
+  try {
+    dir = path5.dirname(fs4.realpathSync(binary));
+  } catch {
+    return null;
+  }
+  for (; ; ) {
+    try {
+      if (JSON.parse(fs4.readFileSync(path5.join(dir, "package.json"), "utf8")).name === "@deepseek-ai/dsh") return dir;
+    } catch {
+    }
+    const parent = path5.dirname(dir);
+    if (parent === dir) return null;
+    dir = parent;
+  }
+}
+function shippedPresetDir(packageDir, id = "standard") {
+  try {
+    const require2 = createRequire(path5.join(packageDir, "package.json"));
+    const dir = path5.join(path5.dirname(require2.resolve("@deepseek-ai/dsh-agent-presets/package.json")), "presets", id);
+    return fs4.existsSync(path5.join(dir, "agent.cordis.yml")) ? dir : null;
+  } catch {
+    return null;
+  }
+}
+function divergentPreset(shippedComposition) {
+  const lines = shippedComposition.split("\n");
+  const start = lines.findIndex((line) => /^- id: ['"]?tool-web['"]?\s*$/.test(line));
+  if (start === -1) throw new Error("the shipped preset composes no tool-web row");
+  let end = lines.findIndex((line, index) => index > start && /^- /.test(line));
+  if (end === -1) end = lines.length;
+  const row = lines.slice(start, end);
+  const search = row.findIndex((line) => /^\s+search:/.test(line));
+  if (search !== -1) {
+    row[search] = row[search].replace(/:.*$/, ": false");
+  } else {
+    const config = row.findIndex((line) => /^  config:\s*$/.test(line));
+    if (config !== -1) row.splice(config + 1, 0, "    search: false");
+    else row.splice(1, 0, "  config:", "    search: false");
+  }
+  return [
+    `# The Divergent agent preset: dsh's shipped "standard" preset with the vendor web`,
+    "# search left out of the model's tools; the platform's search_online arrives over the",
+    "# bridge (row mcp-divergent). Derived from the installed dsh by `diverge agents",
+    "# setup dsh` and `diverge agents run dsh` on every run; edits do not survive.",
+    ...lines.slice(0, start),
+    ...row,
+    ...lines.slice(end)
+  ].join("\n");
+}
+var DIVERGENT_PRESET_METADATA = [
+  "name: Divergent",
+  "description: The standard coding agent, searching the web through the platform's search_online tool instead of a vendor key.",
+  "order: 0",
+  ""
+].join("\n");
+function writeDivergentPreset(home, shippedDir) {
+  const dir = path5.join(home, DSH_USER_PRESETS_DIR, DIVERGENT_PRESET_ID);
+  writeTextAtomic(path5.join(dir, "agent.cordis.yml"), divergentPreset(fs4.readFileSync(path5.join(shippedDir, "agent.cordis.yml"), "utf8")), 420);
+  writeTextAtomic(path5.join(dir, "preset.yml"), DIVERGENT_PRESET_METADATA, 420);
+  return dir;
+}
+function withDivergentPresetDefault(settingsText) {
+  const parsed = settingsText?.trim() ? (0, import_yaml.parse)(settingsText) : null;
+  const settings = parsed && typeof parsed === "object" && !Array.isArray(parsed) ? { ...parsed } : {};
+  const presets = settings["agent-presets"];
+  if (presets && typeof presets === "object" && presets.default) return null;
+  settings["agent-presets"] = { ...presets ?? {}, default: DIVERGENT_PRESET_ID };
+  return (0, import_yaml.stringify)(settings, { lineWidth: 0 });
+}
 
 // src/agents/opencode.ts
 import os5 from "node:os";
@@ -8037,7 +8128,7 @@ function mergeOpencodeConfig(existing, options) {
 
 // src/agents/run-dsh.ts
 import { spawn as spawn2 } from "node:child_process";
-import fs4 from "node:fs";
+import fs5 from "node:fs";
 import path7 from "node:path";
 function findOnPath(name, env = process.env, platform = process.platform) {
   const dirs = (env.PATH ?? "").split(path7.delimiter).filter(Boolean);
@@ -8047,8 +8138,8 @@ function findOnPath(name, env = process.env, platform = process.platform) {
     for (const candidate of candidates) {
       const full = path7.join(dir, candidate);
       try {
-        fs4.accessSync(full, fs4.constants.X_OK);
-        if (fs4.statSync(full).isFile()) return full;
+        fs5.accessSync(full, fs5.constants.X_OK);
+        if (fs5.statSync(full).isFile()) return full;
       } catch {
       }
     }
@@ -8056,7 +8147,7 @@ function findOnPath(name, env = process.env, platform = process.platform) {
   return null;
 }
 function writeDshToken(credentialsPath, accessToken) {
-  const existing = fs4.existsSync(credentialsPath) ? fs4.readFileSync(credentialsPath, "utf8") : null;
+  const existing = fs5.existsSync(credentialsPath) ? fs5.readFileSync(credentialsPath, "utf8") : null;
   let merged;
   try {
     merged = mergeDshCredentials(existing, accessToken);
@@ -8074,7 +8165,7 @@ function dshLaunch(binary, args, platform = process.platform, execPath = process
   const packageDir = path7.join(path7.dirname(binary), "node_modules", "@deepseek-ai", "dsh");
   let bin;
   try {
-    bin = JSON.parse(fs4.readFileSync(path7.join(packageDir, "package.json"), "utf8")).bin;
+    bin = JSON.parse(fs5.readFileSync(path7.join(packageDir, "package.json"), "utf8")).bin;
   } catch {
     throw new CliError(`${binary} is not an npm shim for @deepseek-ai/dsh (no ${packageDir}); reinstall: npm install -g @deepseek-ai/dsh`);
   }
@@ -8165,19 +8256,19 @@ async function rotateTokenFile(loop) {
 }
 
 // src/agents/self-command.ts
-import fs5 from "node:fs";
+import fs6 from "node:fs";
 import path9 from "node:path";
 function resolveSelfCommand(argv = process.argv, platform = process.platform, execPath = process.execPath) {
   const script = argv[1];
   if (!script) return { command: execPath, args: [] };
   if (platform !== "win32") {
     try {
-      fs5.accessSync(script, fs5.constants.X_OK);
+      fs6.accessSync(script, fs6.constants.X_OK);
       return { command: path9.resolve(script), args: [] };
     } catch {
     }
   }
-  return { command: execPath, args: [fs5.realpathSync(script)] };
+  return { command: execPath, args: [fs6.realpathSync(script)] };
 }
 function shellCommand(self, ...trailing) {
   return [self.command, ...self.args, ...trailing].map((part) => /[\s"]/.test(part) ? `"${part.replace(/"/g, '\\"')}"` : part).join(" ");
@@ -8204,12 +8295,29 @@ function surfaceOf(value, fallback) {
   throw new CliError(`--surface must be one of: ${SURFACES.join(", ")}`);
 }
 function readJson(file) {
-  if (!fs6.existsSync(file)) return null;
-  return JSON.parse(fs6.readFileSync(file, "utf8"));
+  if (!fs7.existsSync(file)) return null;
+  return JSON.parse(fs7.readFileSync(file, "utf8"));
 }
 async function servedModels(apiUrl, token, surface) {
   return (await listModels(apiUrl, token.access_token, surface)).map((entry) => entry.id);
 }
+function syncDivergentPreset(io, binary, home) {
+  if (!binary) {
+    io.stderr("dsh is not on PATH; the Divergent agent preset is derived when `diverge agents run dsh` first runs.");
+    return;
+  }
+  const packageDir = dshPackageDir(binary);
+  const shipped = packageDir ? shippedPresetDir(packageDir) : null;
+  if (!shipped) {
+    io.stderr(`warning: no shipped "standard" preset found behind ${binary}; dsh's own web_search stays in its web sessions and fails without a vendor key`);
+    return;
+  }
+  const dir = writeDivergentPreset(home, shipped);
+  const settingsPath = path10.join(home, "settings.yaml");
+  const settings = withDivergentPresetDefault(fs7.existsSync(settingsPath) ? fs7.readFileSync(settingsPath, "utf8") : null);
+  if (settings !== null) writeTextAtomic(settingsPath, settings);
+  io.stderr(`Agent preset "${DIVERGENT_PRESET_ID}" (${dir}): web sessions search through the platform${settings !== null ? "; set as the default preset in settings.yaml" : ""}.`);
+}
 async function overlayAndDefault(apiUrl, token, surface, io, requested) {
   const models = await servedModels(apiUrl, token, surface);
   if (models.length === 0) throw new CliError(`the gateway serves no models on the ${surface} surface for this organization`);
@@ -8265,7 +8373,7 @@ async function setup(args, io) {
       }
       const token = await ensureInferenceLogin(io, apiUrl, values["organization-id"]);
       const file = values.config ?? codexConfigPath();
-      const existing = fs6.existsSync(file) ? fs6.readFileSync(file, "utf8") : null;
+      const existing = fs7.existsSync(file) ? fs7.readFileSync(file, "utf8") : null;
       writeTextAtomic(file, mergeCodexConfig(existing, block));
       io.stdout(`Codex provider divergent \u2192 ${openaiBaseUrl(apiUrl)} as you, organization ${tokenClaims(token.access_token).organizationId}. Wrote ${file}.`);
       io.stdout('Select it per run with: codex -c model_provider=divergent   (or set model_provider = "divergent" in the config)');
@@ -8284,6 +8392,7 @@ async function setup(args, io) {
       writeTextAtomic(file, overlay);
       io.stdout(`dsh route divergent-${surface} \u2192 ${surfaceBaseUrl(apiUrl, surface)} as you, organization ${tokenClaims(token.access_token).organizationId}, default model ${defaultModel}. Wrote ${file}.`);
       io.stdout("Web search is the platform tool search_online over `diverge tools bridge` (row mcp-divergent); dsh's DeepSeek search is off.");
+      syncDivergentPreset(io, findOnPath("dsh", io.env), dshHome(io.env));
       io.stdout("Boot a profile with the overlay and the token in its environment (user tokens expire; the login refreshes):");
       io.stdout(`  DIVERGENT_TOKEN="$(diverge token)" dsh --profile headless --patch ${file} "<task>"`);
       io.stdout(`or let the CLI keep the token fresh for the whole session:  diverge agents run dsh --surface ${surface} -- --profile web --port 3131 --no-open`);
@@ -8314,7 +8423,7 @@ ${agentsUsage}`);
   const settingsPath = path10.join(home, "settings.yaml");
   let pinned;
   try {
-    pinned = dshSettingsDefaultModel(fs6.existsSync(settingsPath) ? fs6.readFileSync(settingsPath, "utf8") : null, surface);
+    pinned = dshSettingsDefaultModel(fs7.existsSync(settingsPath) ? fs7.readFileSync(settingsPath, "utf8") : null, surface);
   } catch (error) {
     throw new CliError(`${settingsPath}: ${error instanceof Error ? error.message : String(error)}`);
   }
@@ -8322,6 +8431,7 @@ ${agentsUsage}`);
   if (pinned && !served.includes(pinned)) throw new CliError(stalePinMessage(settingsPath, pinned, surface, served));
   const overlayPath = path10.join(home, `divergent-${surface}.yml`);
   writeTextAtomic(overlayPath, overlay);
+  syncDivergentPreset(io, binary, home);
   io.stderr(`dsh on divergent-${surface} as you (organization ${tokenClaims(token.access_token).organizationId}), default model ${defaultModel}`);
   if (passthrough.length === 0) io.stderr('Starting the web UI; open the URL dsh prints. For one task without the UI: diverge agents run dsh -- "<task>"');
   const source = { tokenFile: tokenFile(io.env), baseUrl: apiUrl, clientId: clientId(io.env) };
@@ -9265,7 +9375,7 @@ ${toolsUsage}`);
 }
 
 // src/commands/plugins.ts
-import fs7 from "node:fs";
+import fs8 from "node:fs";
 import { parseArgs as parseArgs5 } from "node:util";
 var pluginsUsage = `diverge plugins <validate|publish|list|retire> [--organization-id <id>] ...
 
@@ -9292,7 +9402,7 @@ function readManifest(file) {
 ${pluginsUsage}`);
   let text;
   try {
-    text = fs7.readFileSync(file, "utf8");
+    text = fs8.readFileSync(file, "utf8");
   } catch (error) {
     throw new CliError(`Cannot read ${file}: ${error instanceof Error ? error.message : String(error)}`);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@divergeai/cli",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "Divergent platform CLI: sign in, wire coding agents to the inference gateway, call platform tools",
   "license": "UNLICENSED",
   "type": "module",