@openma/deepseek-harness-acp 0.4.6 → 0.4.7

package/dist/index.js

@@ -144,7 +144,7 @@ function resolveHost(explicit) {
 // src/profile-boot.ts
 import { existsSync as existsSync2, readFileSync as readFileSync2 } from "node:fs";
 import { createRequire } from "node:module";
-import { dirname as dirname2, join as join2, sep as sep2 } from "node:path";
+import { dirname as dirname2, isAbsolute as isAbsolute2, join as join2, resolve as resolve2, sep as sep2 } from "node:path";
 import { pathToFileURL as pathToFileURL2 } from "node:url";
 var BIN = "dsh-acp";
 function ownRoot() {
@@ -170,6 +170,53 @@ function bundlePatchPath(packageJsonPath) {
   }
   return join2(dirname2(packageJsonPath), declared);
 }
+function resolveBundlePackageJson(specifier) {
+  const candidate = resolve2(specifier);
+  if (existsSync2(candidate)) {
+    return candidate.endsWith("package.json") ? candidate : join2(candidate, "package.json");
+  }
+  const req = createRequire(join2(process.cwd(), "noop.js"));
+  try {
+    return req.resolve(`${specifier}/package.json`);
+  } catch (cause) {
+    throw new Error(`${BIN}: cannot resolve bundle ${JSON.stringify(specifier)}`, { cause });
+  }
+}
+function rewriteBundleRows(row, packageJsonPath, manifest) {
+  const name = row["name"];
+  if (typeof name === "string" && !name.startsWith("cordis:") && !isAbsolute2(name)) {
+    const req = createRequire(packageJsonPath);
+    try {
+      row["name"] = req.resolve(name);
+    } catch (cause) {
+      if (name === manifest.name && manifest.main !== void 0) {
+        const entry = resolve2(dirname2(packageJsonPath), manifest.main);
+        if (existsSync2(entry)) row["name"] = entry;
+        else throw new Error(`${BIN}: bundle entry does not exist: ${entry}`, { cause });
+      } else {
+        throw new Error(
+          `${BIN}: bundle ${manifest.name ?? packageJsonPath} cannot resolve plugin ${JSON.stringify(name)}`,
+          { cause }
+        );
+      }
+    }
+  }
+  const insert = row["insert"];
+  if (Array.isArray(insert)) {
+    for (const nested of insert) {
+      if (nested !== null && typeof nested === "object") {
+        rewriteBundleRows(nested, packageJsonPath, manifest);
+      }
+    }
+  }
+}
+function loadBundleLayer(appBoot, specifier) {
+  const packageJsonPath = resolveBundlePackageJson(specifier);
+  const manifest = JSON.parse(readFileSync2(packageJsonPath, "utf8"));
+  const patches = appBoot.loadOverlayPatches(BIN, bundlePatchPath(packageJsonPath));
+  for (const row of patches) rewriteBundleRows(row, packageJsonPath, manifest);
+  return patches;
+}
 async function bootAcpProfile(host, overrides) {
   const req = createRequire(join2(host.base, "noop.js"));
   const dshPkgPath = req.resolve("@deepseek-ai/dsh/package.json");
@@ -204,6 +251,10 @@ async function bootAcpProfile(host, overrides) {
     ];
     logDebug(`profile: virtual (dsh-base + ${ownRoot()})`);
   }
+  for (const bundle of overrides?.bundles ?? []) {
+    bundlePatches.push(...loadBundleLayer(appBoot, bundle));
+    logDebug(`profile: added bundle ${bundle}`);
+  }
   for (const row of bundlePatches) rewriteBridgeRows(row, bridgeEntry);
   const homePatchPath = join2(home, "cordis.patch.yml");
   const homePatches = appBoot.loadOptionalPatches(BIN, homePatchPath) ?? [];
@@ -317,7 +368,7 @@ async function readSecret(promptText) {
     return Buffer.concat(chunks).toString("utf8").trim();
   }
   process.stderr.write(promptText);
-  return await new Promise((resolve2) => {
+  return await new Promise((resolve3) => {
     stdin.setRawMode(true);
     stdin.resume();
     stdin.setEncoding("utf8");
@@ -329,7 +380,7 @@ async function readSecret(promptText) {
           stdin.pause();
           stdin.off("data", onData);
           process.stderr.write("\n");
-          resolve2(buffer.trim());
+          resolve3(buffer.trim());
           return;
         }
         if (char === "") {
@@ -387,6 +438,7 @@ function envString(name) {
 }
 function parseFlags(argv) {
   const flags = /* @__PURE__ */ new Map();
+  const bundles = [];
   for (let i = 0; i < argv.length; i += 1) {
     const arg = argv[i];
     if (arg === void 0 || !arg.startsWith("--")) {
@@ -394,19 +446,23 @@ function parseFlags(argv) {
     }
     const eq = arg.indexOf("=");
     if (eq >= 0) {
-      flags.set(arg.slice(2, eq), arg.slice(eq + 1));
+      const name2 = arg.slice(2, eq);
+      const value = arg.slice(eq + 1);
+      if (name2 === "bundle") bundles.push(value);
+      else flags.set(name2, value);
       continue;
     }
     const name = arg.slice(2);
     const next = argv[i + 1];
     if (next !== void 0 && !next.startsWith("--") && FLAGS_WITH_VALUES.has(name)) {
-      flags.set(name, next);
+      if (name === "bundle") bundles.push(next);
+      else flags.set(name, next);
       i += 1;
     } else {
       flags.set(name, true);
     }
   }
-  return { flags };
+  return { flags, bundles };
 }
 var FLAGS_WITH_VALUES = /* @__PURE__ */ new Set([
   "dsh-path",
@@ -418,7 +474,8 @@ var FLAGS_WITH_VALUES = /* @__PURE__ */ new Set([
   "session-root",
   "persona",
   "reasoning-effort",
-  "bash-timeout"
+  "bash-timeout",
+  "bundle"
 ]);
 function stringFlag(parsed, name) {
   const value = parsed.flags.get(name);
@@ -428,6 +485,10 @@ function stringFlag(parsed, name) {
 }
 function resolveSettings(argv) {
   const parsed = parseFlags(argv);
+  if (parsed.flags.has("bundle")) stringFlag(parsed, "bundle");
+  if (parsed.bundles.some((bundle) => bundle.length === 0)) {
+    throw new SettingsError("--bundle requires a value");
+  }
   for (const name of parsed.flags.keys()) {
     if (!FLAGS_WITH_VALUES.has(name) && name !== "no-thinking") {
       throw new SettingsError(`unknown flag: --${name}`);
@@ -462,6 +523,7 @@ function resolveSettings(argv) {
   }
   return {
     dshPath: stringFlag(parsed, "dsh-path") ?? envString("DSH_PATH"),
+    bundles: parsed.bundles,
     provider: stringFlag(parsed, "provider") ?? envString("DSH_PROVIDER"),
     model,
     models,
@@ -487,6 +549,7 @@ Options:
                               package dir, or any dir carrying node_modules/@deepseek-ai
                               (DSH_PATH; auto-detected when unset \u2014 own tree, ./node_modules,
                               dsh on PATH, npm root -g)
+  --bundle <package-dir>      Add a dsh bundle layer to the agent tree (repeatable)
   --provider <route>          Provider route (DSH_PROVIDER, default deepseek-official)
   --model <id>                Default model (DSH_MODEL, default deepseek-v4-flash)
   --models <a,b,...>          Selectable models for the session "Model" option
@@ -585,6 +648,7 @@ ${HELP_TEXT}`);
       return;
     }
     const booted = await bootAcpProfile(host, {
+      bundles: settings.bundles,
       ...settings.provider !== void 0 ? { provider: settings.provider } : {},
       ...settings.model !== void 0 ? { model: settings.model } : {},
       ...settings.permissionMode !== void 0 ? { permissionMode: settings.permissionMode } : {},

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.4.6",
+  "version": "0.4.7",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/openma-ai/deepseek-harness-acp.git"
@@ -113,6 +113,7 @@
     "@deepseek-ai/dsh-sandbox-policy": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-session": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-session-title": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-user-questions": "^0.1.0-rc.6",
     "@deepseek-ai/dsh": "^0.1.0-rc.6"
   },
   "exports": {