@divergeai/cli 0.1.28 → 0.1.29

package/README.md

@@ -222,6 +222,19 @@ command in a fresh sandbox. Its tool definitions ride on every request
 (about 5k tokens, cached after the first). Without a Chrome on the port the
 server waits; the first tool call connects.
 
+dsh runs the repository's hooks. Started inside a git checkout whose root
+holds a Claude Code hook config (`.claude/settings.json`), `diverge dsh`
+mounts dsh's own hook bridge (`@deepseek-ai/dsh-hooks-claude-code`, installed
+beside the harness) on that file, and says so at launch; anywhere else
+nothing is mounted. The bridge reads the file once at start and runs each
+command hook at the matching moment: session start, prompt, tool use, stop.
+Three things differ from Claude Code, and a hook meant for both allows for
+them: a hook runs inside dsh's sandbox (the working directory is writable,
+the home directory is not, `/tmp` does not outlive the command); context is
+read only as JSON (`hookSpecificOutput.additionalContext`), never as plain
+output; and a stop hook is never told the stop was already continued, so it
+keeps its own record of what it held for.
+
 ## Platform tools
 
 Every command takes the scope it acts in: `--organization-id` (or

package/dist/diverge.mjs

@@ -7553,7 +7553,7 @@ function tokenSource(env, baseUrl) {
 }
 
 // src/version.ts
-var VERSION = true ? "0.1.28" : "dev";
+var VERSION = true ? "0.1.29" : "dev";
 var USER_AGENT = `diverge/${VERSION}`;
 
 // src/http.ts
@@ -8600,9 +8600,28 @@ function dshPatchYaml(options) {
     ...dshSearchRows(),
     ...dshShellRows(),
     ...dshBrowserRows(),
+    ...options.hooks ? dshHookRows(options.hooks) : [],
     ""
   ].join("\n");
 }
+function repositoryHookConfig(cwd) {
+  for (let dir = path4.resolve(cwd); ; dir = path4.dirname(dir)) {
+    if (fs5.existsSync(path4.join(dir, ".git"))) {
+      const file = path4.join(dir, ".claude", "settings.json");
+      return fs5.existsSync(file) ? file : null;
+    }
+    if (dir === path4.dirname(dir)) return null;
+  }
+}
+function dshHookRows(hooks) {
+  return [
+    "- insert:",
+    "    - id: hooks-claude-code",
+    `      name: ${JSON.stringify(hooks.bridge)}`,
+    "      config:",
+    `        configPath: ${JSON.stringify(hooks.configPath)}`
+  ];
+}
 var DSH_LAUNCH_ID_HEADER = "x-divergent-launch-id";
 var DSH_CLIENT_HEADER = "x-divergent-client";
 function dshLaunchHeaderRows(launch) {
@@ -9550,6 +9569,7 @@ var TESTED_DSH_VERSION = "0.2.1-rc.5";
 
 // src/agents/dsh-install.ts
 var DSH_PACKAGE = "@deepseek-ai/dsh";
+var DSH_HOOK_BRIDGE_PACKAGE = "@deepseek-ai/dsh-hooks-claude-code";
 var REGISTRY = "https://registry.npmjs.org";
 var RETIRED_AFTER_MS = 7 * 24 * 60 * 60 * 1e3;
 function dshInstallRoot(env) {
@@ -9558,6 +9578,15 @@ function dshInstallRoot(env) {
 function dshPackageIn(prefix) {
   return path13.join(prefix, "node_modules", "@deepseek-ai", "dsh");
 }
+function dshHookBridgeIn(prefix) {
+  const dir = path13.join(prefix, "node_modules", ...DSH_HOOK_BRIDGE_PACKAGE.split("/"));
+  try {
+    const manifest = JSON.parse(fs10.readFileSync(path13.join(dir, "package.json"), "utf8"));
+    return path13.join(dir, manifest.main ?? "lib/index.js");
+  } catch {
+    return null;
+  }
+}
 function readManifest(prefix) {
   try {
     return JSON.parse(fs10.readFileSync(path13.join(dshPackageIn(prefix), "package.json"), "utf8"));
@@ -9586,9 +9615,12 @@ var realDeps = (env) => ({
   // start; the rest check prebuilt binaries or print a notice. An older npm
   // ignores the field and runs them all. stdout goes to stderr: a headless
   // run's stdout is the answer.
-  npmInstall: (prefix, spec) => {
-    fs10.writeFileSync(path13.join(prefix, "package.json"), JSON.stringify({ private: true, allowScripts: { "@deepseek-ai/dsh-subprocess-local": true } }));
-    return runNpm(["install", "--prefix", prefix, "--no-audit", "--no-fund", "--loglevel=error", spec], env, process.platform, ["ignore", 2, 2]);
+  // A prefix that holds a version already keeps its manifest: npm removes what
+  // a manifest stops naming.
+  npmInstall: (prefix, specs) => {
+    const manifest = path13.join(prefix, "package.json");
+    if (!fs10.existsSync(manifest)) fs10.writeFileSync(manifest, JSON.stringify({ private: true, allowScripts: { "@deepseek-ai/dsh-subprocess-local": true } }));
+    return runNpm(["install", "--prefix", prefix, "--no-audit", "--no-fund", "--loglevel=error", ...specs], env, process.platform, ["ignore", 2, 2]);
   },
   engines: async (version) => (await fetchJson(`${REGISTRY}/${DSH_PACKAGE}/${version}`, { timeoutMs: 15e3 })).engines?.node,
   nodeVersion: process.version,
@@ -9600,6 +9632,10 @@ async function ensureDsh(io, version = TESTED_DSH_VERSION, deps = realDeps(io.en
   let manifest = readManifest(prefix);
   if (manifest) {
     requireNode(version, manifest.engines?.node, deps.nodeVersion);
+    if (!dshHookBridgeIn(prefix)) {
+      const code2 = await deps.npmInstall(prefix, [`${DSH_HOOK_BRIDGE_PACKAGE}@${version}`]).catch(() => 1);
+      if (code2 !== 0) io.stderr(`warning: could not add dsh's hook bridge (npm exited with ${code2}); this session runs without the repository's hooks.`);
+    }
   } else {
     let engines;
     try {
@@ -9611,7 +9647,7 @@ async function ensureDsh(io, version = TESTED_DSH_VERSION, deps = realDeps(io.en
     const staging = `${prefix}.installing-${process.pid}`;
     fs10.mkdirSync(staging, { recursive: true });
     try {
-      const code2 = await deps.npmInstall(staging, `${DSH_PACKAGE}@${version}`);
+      const code2 = await deps.npmInstall(staging, [`${DSH_PACKAGE}@${version}`, `${DSH_HOOK_BRIDGE_PACKAGE}@${version}`]);
       if (code2 !== 0) throw new CliError(`Installing dsh ${version} failed: npm exited with ${code2}. Check the network and run diverge dsh again.`);
       try {
         fs10.renameSync(staging, prefix);
@@ -10291,7 +10327,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) {
+async function overlayAndDefault(io, apiUrl, token, surface, requested, saved, launch, hooks) {
   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`);
@@ -10299,7 +10335,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 }), defaultModel };
+  return { overlay: dshPatchYaml({ baseUrl: surfaceBaseUrl(apiUrl, surface), surface, models: served, defaultModel, reasoningEffort: usable?.reasoningEffort, launch, hooks }), defaultModel };
 }
 async function runDshCommand(args, io) {
   const terminator = args.indexOf("--");
@@ -10321,10 +10357,14 @@ async function runDshCommand(args, io) {
   await skillsFor(io, apiUrl, "dsh", values["organization-id"]);
   const launch = { id: randomUUID(), client: `dsh/${TESTED_DSH_VERSION}` };
   const home = dshHome(io.env);
-  const { overlay, defaultModel } = await overlayAndDefault(io, apiUrl, token, surface, values.model, savedModel(home, surface), launch);
+  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 overlayPath = path18.join(home, `divergent-${surface}.yml`);
   writeTextAtomic(overlayPath, `${overlay}${dshPresetOverrides(prefix)}`);
   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"];

package/package.json

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