@divergeai/cli 0.1.29 → 0.1.30

package/README.md

@@ -117,7 +117,8 @@ after `--` goes to dsh as given. Each launch, in order:
    `$DIVERGE_HOME/harness/dsh/<version>`: about a minute and nearly 1 GB, and
    Node 24.9 or later. A dsh you installed yourself is neither used nor touched.
    A version no launch has used for a week is deleted.
-4. brings your skills up to date in `$DSH_HOME/skills`.
+4. brings the launch organization's skills and the CLI's up to date (see
+   [Skills](#skills)) and names both roots in the overlay.
 5. writes the overlay `$DSH_HOME/divergent-<surface>.yml`: the models the
    gateway serves, each with the input, context window and output cap the
    gateway lists for it; dsh's DeepSeek adapter, telemetry upload and vendor
@@ -178,7 +179,7 @@ a shell.
 
 ```bash
 diverge skills list       # what the platform serves you, per organization
-diverge skills install    # into ~/.claude/skills, ~/.codex/skills and $DSH_HOME/skills
+diverge skills install    # into ~/.claude/skills, ~/.codex/skills and $DIVERGE_HOME/skills/dsh
 diverge skills refresh    # the same, best effort and quiet: what sign-in and a session start run
 diverge skills status     # what each folder holds against the platform
 ```
@@ -213,6 +214,18 @@ shell with `diverge tools`, which costs nothing until a tool is called, and
 the `diverge` skill shows it how, arguments piped through stdin and batches
 included.
 
+A dsh session is bound to one organization by the launch that starts it, so
+dsh's skills do not sit side by side: the CLI writes them under its own root,
+`$DIVERGE_HOME/skills/dsh/<organization id>/<folder>/SKILL.md`, and the CLI's
+`diverge` and `drive-chrome` under `$DIVERGE_HOME/skills/dsh/cli/`. A `diverge
+dsh` launch refreshes its organization's folder and names it and the CLI's as
+`customSkillDirs` on dsh's skill provider, in the host row and in every
+shipped agent preset that mounts one, so its catalog offers only the skills
+its token can run. dsh's default roots stay on: your own `$DSH_HOME/skills`
+and a project's `.agents/skills` still load. A CLI before 0.1.30 wrote every
+organization's skills into `$DSH_HOME/skills`; the first install or launch
+after it removes exactly the folders it recorded there, and nothing of yours.
+
 dsh also gets the browser. The overlay mounts Chrome DevTools MCP, attached
 to a Chrome the person starts in debug mode (`--remote-debugging-port=9222`,
 on a profile of its own), and the CLI's `drive-chrome` skill says how to use

package/dist/diverge.mjs

@@ -7553,7 +7553,7 @@ function tokenSource(env, baseUrl) {
 }
 
 // src/version.ts
-var VERSION = true ? "0.1.29" : "dev";
+var VERSION = true ? "0.1.30" : "dev";
 var USER_AGENT = `diverge/${VERSION}`;
 
 // src/http.ts
@@ -8601,9 +8601,18 @@ function dshPatchYaml(options) {
     ...dshShellRows(),
     ...dshBrowserRows(),
     ...options.hooks ? dshHookRows(options.hooks) : [],
+    ...options.skillDirs?.length ? dshSkillRows(options.skillDirs) : [],
     ""
   ].join("\n");
 }
+function dshSkillRows(skillDirs) {
+  return [
+    "- id: skill-filesystem",
+    "  config:",
+    "    customSkillDirs:",
+    ...skillDirs.map((dir) => `      - ${JSON.stringify(dir)}`)
+  ];
+}
 function repositoryHookConfig(cwd) {
   for (let dir = path4.resolve(cwd); ; dir = path4.dirname(dir)) {
     if (fs5.existsSync(path4.join(dir, ".git"))) {
@@ -8688,48 +8697,77 @@ function dshSavedModel(patchText, surface) {
   return { model: String(config.model), ...config.reasoningEffort ? { reasoningEffort: String(config.reasoningEffort) } : {} };
 }
 var dshPresetsDir = (prefix) => path4.join(prefix, "node_modules", "@deepseek-ai", "dsh-web-app", "presets");
-function dshPresetOverride(shipped) {
-  const lines = shipped.split("\n");
-  const insert = lines.indexOf("- insert:");
-  if (insert === -1) throw new Error("a shipped preset is not one inserted row");
-  const row = lines.slice(insert + 1).map((line) => line.replace(/^ {4}/, ""));
-  const start = row.findIndex((line) => /^\s+- id: ['"]?tool-web['"]?\s*$/.test(line));
-  if (start === -1) return null;
+function editPresetPlugin(row, id, edit) {
+  const start = row.findIndex((line) => new RegExp(`^\\s+- id: ['"]?${id}['"]?\\s*$`).test(line));
+  if (start === -1) return false;
   const indent = row[start].indexOf("-");
   const body = " ".repeat(indent + 2);
   let end = row.findIndex((line, index) => index > start && line.trim() !== "" && line.search(/\S/) <= indent);
   if (end === -1) end = row.length;
   const block = row.slice(start, end);
-  const search = block.findIndex((line) => line.startsWith(`${body}  search:`));
-  if (search !== -1) {
-    block[search] = `${body}  search: false`;
-  } else {
-    const config = block.indexOf(`${body}config:`);
-    if (config !== -1) block.splice(config + 1, 0, `${body}  search: false`);
-    else block.splice(1, 0, `${body}config:`, `${body}  search: false`);
-  }
-  return [...row.slice(0, start), ...block, ...row.slice(end)].join("\n").trimEnd() + "\n";
+  edit(block, body);
+  row.splice(start, end - start, ...block);
+  return true;
+}
+function dshPresetOverride(shipped, skillDirs = []) {
+  const lines = shipped.split("\n");
+  const insert = lines.indexOf("- insert:");
+  if (insert === -1) throw new Error("a shipped preset is not one inserted row");
+  const row = lines.slice(insert + 1).map((line) => line.replace(/^ {4}/, ""));
+  const web = editPresetPlugin(row, "tool-web", (block, body) => {
+    const search = block.findIndex((line) => line.startsWith(`${body}  search:`));
+    if (search !== -1) {
+      block[search] = `${body}  search: false`;
+    } else {
+      const config = block.indexOf(`${body}config:`);
+      if (config !== -1) block.splice(config + 1, 0, `${body}  search: false`);
+      else block.splice(1, 0, `${body}config:`, `${body}  search: false`);
+    }
+  });
+  const skills = skillDirs.length > 0 && editPresetPlugin(row, "skill-filesystem", (block, body) => {
+    const items = skillDirs.map((dir) => `${body}    - ${JSON.stringify(dir)}`);
+    const list = block.indexOf(`${body}  customSkillDirs:`);
+    if (list !== -1) {
+      let last = list + 1;
+      while (last < block.length && block[last].startsWith(`${body}    `)) last += 1;
+      block.splice(last, 0, ...items);
+    } else {
+      const config = block.indexOf(`${body}config:`);
+      if (config !== -1) block.splice(config + 1, 0, `${body}  customSkillDirs:`, ...items);
+      else block.splice(1, 0, `${body}config:`, `${body}  customSkillDirs:`, ...items);
+    }
+  });
+  if (!web && !skills) return null;
+  return row.join("\n").trimEnd() + "\n";
 }
-function dshPresetOverrides(prefix) {
+function dshPresetOverrides(prefix, skillDirs = []) {
   const dir = dshPresetsDir(prefix);
-  return fs5.readdirSync(dir).filter((name) => name.endsWith(".patch.yml")).sort().flatMap((name) => dshPresetOverride(fs5.readFileSync(path4.join(dir, name), "utf8")) ?? []).join("");
+  return fs5.readdirSync(dir).filter((name) => name.endsWith(".patch.yml")).sort().flatMap((name) => dshPresetOverride(fs5.readFileSync(path4.join(dir, name), "utf8"), skillDirs) ?? []).join("");
 }
 
 // src/skills/install.ts
 var HARNESSES = ["claude", "codex", "dsh"];
 var SKILLS_MANIFEST = ".diverge-skills.json";
-function skillsRoot(harness, env = process.env) {
+var DSH_CLI_SKILLS = "cli";
+function harnessHome(harness, env) {
   switch (harness) {
     case "claude":
-      return path5.join(env.CLAUDE_CONFIG_DIR?.trim() || path5.join(os3.homedir(), ".claude"), "skills");
+      return env.CLAUDE_CONFIG_DIR?.trim() || path5.join(os3.homedir(), ".claude");
     case "codex":
-      return path5.join(env.CODEX_HOME?.trim() || path5.join(os3.homedir(), ".codex"), "skills");
+      return env.CODEX_HOME?.trim() || path5.join(os3.homedir(), ".codex");
     case "dsh":
-      return path5.join(dshHome(env), "skills");
+      return dshHome(env);
   }
 }
+function skillsRoot(harness, env = process.env) {
+  return harness === "dsh" ? path5.join(configDir(env), "skills", "dsh") : path5.join(harnessHome(harness, env), "skills");
+}
+function dshSkillDirs(organizationId, env = process.env) {
+  const root = skillsRoot("dsh", env);
+  return [path5.join(root, organizationId), path5.join(root, DSH_CLI_SKILLS)];
+}
 function presentHarnesses(env = process.env) {
-  return HARNESSES.filter((harness) => fs6.existsSync(path5.dirname(skillsRoot(harness, env))));
+  return HARNESSES.filter((harness) => fs6.existsSync(harnessHome(harness, env)));
 }
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -8866,6 +8904,66 @@ function skillsStatus(root, set2) {
   const retired = [...new Set(retirable(manifest, set2))].filter((folder) => !servedFolders.has(folder));
   return { root, installedAt: manifest?.installedAt || null, current, behind, missing, retired, skipped };
 }
+function isOrganizationFolder(id) {
+  return id !== DSH_CLI_SKILLS && /^[A-Za-z0-9_-]{1,64}$/.test(id);
+}
+function targets(harness, root, set2) {
+  if (harness !== "dsh") return [{ root, set: set2 }];
+  return [
+    ...set2.organizations.filter((organization) => isOrganizationFolder(organization.id)).map((organization) => ({ root: path5.join(root, organization.id), set: { cli: [], organizations: [organization], complete: true } })),
+    { root: path5.join(root, DSH_CLI_SKILLS), set: { cli: set2.cli, organizations: [], complete: true } }
+  ];
+}
+function retiredOrganizations(root, set2) {
+  if (!set2.complete || !fs6.existsSync(root)) return [];
+  const listed = new Set(set2.organizations.map((organization) => organization.id));
+  return fs6.readdirSync(root, { withFileTypes: true }).filter((entry) => entry.isDirectory() && isOrganizationFolder(entry.name) && !listed.has(entry.name) && readSkillsManifest(path5.join(root, entry.name))).map((entry) => path5.join(root, entry.name));
+}
+function legacyDshFolders(env) {
+  const root = path5.join(dshHome(env), "skills");
+  return { root, folders: [...heldFolders(readSkillsManifest(root)).keys()].filter(isSkillFolder) };
+}
+function installHarness(harness, root, set2, source, env = process.env, now = () => /* @__PURE__ */ new Date()) {
+  const results = targets(harness, root, set2).map((target) => installSkills(target.root, target.set, source, now));
+  const merged = {
+    root,
+    written: results.flatMap((result) => result.written),
+    added: results.flatMap((result) => result.added),
+    updated: results.flatMap((result) => result.updated),
+    removed: results.flatMap((result) => result.removed),
+    skipped: results.flatMap((result) => result.skipped),
+    counts: results.flatMap((result) => result.counts)
+  };
+  if (harness !== "dsh") return merged;
+  for (const folder of retiredOrganizations(root, set2)) {
+    merged.removed.push(...heldFolders(readSkillsManifest(folder)).keys());
+    fs6.rmSync(folder, { recursive: true, force: true });
+  }
+  if (root !== skillsRoot("dsh", env)) return merged;
+  const legacy = legacyDshFolders(env);
+  for (const folder of legacy.folders) fs6.rmSync(path5.join(legacy.root, folder), { recursive: true, force: true });
+  fs6.rmSync(path5.join(legacy.root, SKILLS_MANIFEST), { force: true });
+  merged.removed.push(...legacy.folders);
+  return merged;
+}
+function harnessStatus(harness, root, set2, env = process.env) {
+  const statuses = targets(harness, root, set2).map((target) => skillsStatus(target.root, target.set));
+  const retired = statuses.flatMap((status2) => status2.retired);
+  if (harness === "dsh") {
+    for (const folder of retiredOrganizations(root, set2)) retired.push(...heldFolders(readSkillsManifest(folder)).keys());
+    if (root === skillsRoot("dsh", env)) retired.push(...legacyDshFolders(env).folders);
+  }
+  const installed = statuses.map((status2) => status2.installedAt).filter((at) => at !== null).sort();
+  return {
+    root,
+    installedAt: installed[0] ?? null,
+    current: statuses.flatMap((status2) => status2.current),
+    behind: statuses.flatMap((status2) => status2.behind),
+    missing: statuses.flatMap((status2) => status2.missing),
+    retired,
+    skipped: statuses.flatMap((status2) => status2.skipped)
+  };
+}
 
 // src/skills/installable.ts
 async function fetchInstallableSkills(baseUrl, accessToken) {
@@ -8913,9 +9011,11 @@ async function collectLoginSkills(deps, options = {}) {
 var skillsUsage = `diverge skills <list|install|refresh|status> [--organization-id <id|name>] [--harness claude,codex,dsh] [--into <dir>]
 
   list      the skills the platform serves you: in every organization you can act in, the skills whose tools you can run
-  install   write them, and the CLI's own skills ("diverge"; "drive-chrome" for dsh), into each harness's user skill folder
-            (~/.claude/skills, ~/.codex/skills, $DSH_HOME/skills), side by side under each organization's prefix;
-            retires what an organization stopped serving; reports what changed \u2014 the full list is \`skills list\`
+  install   write them, and the CLI's own skills ("diverge"; "drive-chrome" for dsh), into each harness's skill folder:
+            ~/.claude/skills and ~/.codex/skills side by side under each organization's prefix; for dsh one folder
+            per organization and one for the CLI's under ~/.diverge/skills/dsh, of which a diverge dsh launch names
+            its organization's and the CLI's; retires what an organization stopped serving; reports what changed \u2014
+            the full list is \`skills list\`
   refresh   the same, best effort: no login, no network or nothing changed prints nothing and never fails.
             Runs at sign-in and at every session start, so the folders hold what the organizations serve now
   status    what each folder holds against what the platform serves now
@@ -8980,7 +9080,7 @@ function installReport(harness, result) {
   return `${harness}: ${result.written.length} skills in ${result.root} (${holdings}${changes.length ? `; ${changes.join("; ")}` : "; unchanged"})`;
 }
 function installForHarness(io, harness, skills, apiUrl, into) {
-  const result = installSkills(into ?? skillsRoot(harness, io.env), installSet(harness, skills), apiUrl);
+  const result = installHarness(harness, into ?? skillsRoot(harness, io.env), installSet(harness, skills), apiUrl, io.env);
   io.stdout(installReport(harness, result));
   return result;
 }
@@ -8999,7 +9099,7 @@ async function refreshSkills(io, apiUrl, options = {}) {
   }
   const results = [];
   for (const harness of harnesses) {
-    const result = installSkills(skillsRoot(harness, io.env), installSet(harness, skills), apiUrl);
+    const result = installHarness(harness, skillsRoot(harness, io.env), installSet(harness, skills), apiUrl, io.env);
     if (!options.quiet || result.added.length || result.updated.length || result.removed.length) io.stdout(installReport(harness, result));
     results.push(result);
   }
@@ -9037,7 +9137,7 @@ async function runSkills(args, io) {
       const skills = await loginSkillSet(apiUrl, io.env, organizationId);
       let behind = false;
       for (const harness of harnessesOf(values.harness, io.env)) {
-        const status2 = skillsStatus(values.into ?? skillsRoot(harness, io.env), installSet(harness, skills));
+        const status2 = harnessStatus(harness, values.into ?? skillsRoot(harness, io.env), installSet(harness, skills), io.env);
         const parts = [`${status2.current.length} current`];
         if (status2.behind.length) parts.push(`${status2.behind.length} behind (${few(status2.behind)})`);
         if (status2.missing.length) parts.push(`${status2.missing.length} missing${status2.current.length || status2.behind.length ? ` (${few(status2.missing)})` : ""}`);
@@ -10327,7 +10427,7 @@ function savedModel(home, surface) {
     throw new CliError(`${file}: ${error instanceof Error ? error.message : String(error)}`);
   }
 }
-async function overlayAndDefault(io, apiUrl, token, surface, requested, saved, launch, hooks) {
+async function overlayAndDefault(io, apiUrl, token, surface, requested, saved, launch, hooks, skillDirs) {
   const served = (await listModels(apiUrl, token.access_token, surface)).map(servedModel);
   const models = served.map((model) => model.id);
   if (models.length === 0) throw new CliError(`the gateway serves no models on the ${surface} surface for this organization`);
@@ -10335,7 +10435,7 @@ async function overlayAndDefault(io, apiUrl, token, surface, requested, saved, l
   const usable = !requested && saved && models.includes(saved.model) ? saved : null;
   const defaultModel = dshDefaultModel(models, requested ?? usable?.model);
   if (!requested && saved && !usable) io.stderr(`The model you last chose, ${saved.model}, is no longer served here; using ${defaultModel}.`);
-  return { overlay: dshPatchYaml({ baseUrl: surfaceBaseUrl(apiUrl, surface), surface, models: served, defaultModel, reasoningEffort: usable?.reasoningEffort, launch, hooks }), defaultModel };
+  return { overlay: dshPatchYaml({ baseUrl: surfaceBaseUrl(apiUrl, surface), surface, models: served, defaultModel, reasoningEffort: usable?.reasoningEffort, launch, hooks, skillDirs }), defaultModel };
 }
 async function runDshCommand(args, io) {
   const terminator = args.indexOf("--");
@@ -10354,21 +10454,22 @@ async function runDshCommand(args, io) {
   const token = await ensureInferenceLogin(io, apiUrl, values["organization-id"]);
   const dsh = await ensureDsh(io);
   const prefix = path18.join(dshInstallRoot(io.env), TESTED_DSH_VERSION);
-  await skillsFor(io, apiUrl, "dsh", values["organization-id"]);
+  const organizationId = tokenClaims(token.access_token).organizationId ?? values["organization-id"];
+  if (!organizationId) throw new CliError("the gateway token names no organization; pass --organization-id");
+  await skillsFor(io, apiUrl, "dsh", organizationId);
+  const skillDirs = dshSkillDirs(organizationId, io.env);
   const launch = { id: randomUUID(), client: `dsh/${TESTED_DSH_VERSION}` };
   const home = dshHome(io.env);
   const bridge = dshHookBridgeIn(prefix);
   const configPath = bridge ? repositoryHookConfig(process.cwd()) : null;
   const hooks = bridge && configPath ? { bridge, configPath } : null;
-  const { overlay, defaultModel } = await overlayAndDefault(io, apiUrl, token, surface, values.model, savedModel(home, surface), launch, hooks);
+  const { overlay, defaultModel } = await overlayAndDefault(io, apiUrl, token, surface, values.model, savedModel(home, surface), launch, hooks, skillDirs);
   const overlayPath = path18.join(home, `divergent-${surface}.yml`);
-  writeTextAtomic(overlayPath, `${overlay}${dshPresetOverrides(prefix)}`);
+  writeTextAtomic(overlayPath, `${overlay}${dshPresetOverrides(prefix, skillDirs)}`);
   io.stderr(`dsh ${TESTED_DSH_VERSION} on divergent-${surface} as you (organization ${tokenClaims(token.access_token).organizationId}), default model ${defaultModel}`);
   if (hooks) io.stderr(`Running this repository's hooks (${hooks.configPath}).`);
   if (passthrough.length === 0) io.stderr('Starting the web UI; open the URL dsh prints. For one task without the UI: diverge dsh -- "<task>"');
   const source = tokenSource(io.env, apiUrl);
-  const organizationId = tokenClaims(token.access_token).organizationId ?? values["organization-id"];
-  if (!organizationId) throw new CliError("the gateway token names no organization; pass --organization-id");
   io.stderr(`This session is organization ${organizationId}'s own record at the level its administrators set \u2014 off, metadata (tools, tokens, models; no content) or the whole conversation \u2014 named once its record opens. Yours to read: diverge tools call ${AGENT_SESSION_LIST_TOOL} (ADR 0121).`);
   const tools = new ToolsClient({ apiUrl, organizationId, mode: "operator", clientId: clientId(io.env) }, io.env);
   const publisher = new DshSessionPublisher({

package/package.json

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