@openma/deepseek-harness-acp 0.3.0 → 0.4.0

package/dist/index.js

@@ -47,6 +47,9 @@ var init_self_harness = __esm({
   }
 });
 
+// src/index.ts
+import { spawnSync } from "node:child_process";
+
 // src/app.ts
 var app_exports = {};
 __export(app_exports, {
@@ -89,6 +92,10 @@ function logDebug(message) {
   if (process.env["DSH_ACP_DEBUG"]) process.stderr.write(`${PREFIX} debug: ${message}
 `);
 }
+function logInfo(message) {
+  process.stderr.write(`${PREFIX} ${message}
+`);
+}
 
 // src/bridge/translate.ts
 var MAX_TITLE_LENGTH = 80;
@@ -1752,9 +1759,6 @@ function resolveHost(explicit) {
     probed.push(`--dsh-path/DSH_PATH: ${explicit}`);
     throw new HarnessNotFoundError(probed);
   }
-  const own = hostAt(dirname(fileURLToPath(import.meta.url)), "dsh-acp package tree");
-  if (own !== void 0) return own;
-  probed.push("dsh-acp package tree");
   const local = hostAt(process.cwd(), `invoking directory (${process.cwd()})`);
   if (local !== void 0) return local;
   probed.push(`invoking directory: ${process.cwd()}`);
@@ -1764,6 +1768,9 @@ function resolveHost(explicit) {
   const globalNpm = hostFromGlobalNpm();
   if (globalNpm !== void 0) return globalNpm;
   probed.push("npm root -g");
+  const own = hostAt(dirname(fileURLToPath(import.meta.url)), "dsh-acp package tree (vendored)");
+  if (own !== void 0) return own;
+  probed.push("dsh-acp package tree (vendored)");
   throw new HarnessNotFoundError(probed);
 }
 function entryFile(packageDir, subpath) {
@@ -2000,8 +2007,8 @@ async function apply2(ctx, config) {
     await compaction;
     yield compaction.dispose;
     const bridge = anyCtx.plugin(bridge_exports, {
-      provider: settings.provider,
-      model: settings.model,
+      provider: settings.provider ?? "deepseek-official",
+      model: settings.model ?? "deepseek-v4-flash",
       models: settings.models,
       ...settings.maxTokens !== void 0 ? { maxTokens: settings.maxTokens } : {},
       permissionMode: settings.permissionMode,
@@ -2012,9 +2019,130 @@ async function apply2(ctx, config) {
   }, "dsh-acp-app.composition");
 }
 
+// src/profile-boot.ts
+import { existsSync as existsSync2, readFileSync as readFileSync2 } from "node:fs";
+import { createRequire as createRequire2 } from "node:module";
+import { dirname as dirname2, join as join2, sep as sep2 } from "node:path";
+import { pathToFileURL as pathToFileURL2 } from "node:url";
+var BIN = "dsh-acp";
+function ownRoot() {
+  return dirname2(createRequire2(import.meta.url).resolve("../package.json"));
+}
+var OWN_BRIDGE_SPECIFIER = "@openma/deepseek-harness-acp/bridge";
+function rewriteBridgeRows(row, absoluteEntry) {
+  if (row["name"] === OWN_BRIDGE_SPECIFIER) row["name"] = absoluteEntry;
+  const insert = row["insert"];
+  if (Array.isArray(insert)) {
+    for (const nested of insert) {
+      if (nested !== null && typeof nested === "object") {
+        rewriteBridgeRows(nested, absoluteEntry);
+      }
+    }
+  }
+}
+function bundlePatchPath(packageJsonPath) {
+  const pkg = JSON.parse(readFileSync2(packageJsonPath, "utf8"));
+  const declared = pkg.dsh?.bundle?.patch;
+  if (declared === void 0) {
+    throw new Error(`${BIN}: bundle ${pkg.name ?? packageJsonPath} declares no dsh.bundle in its package.json`);
+  }
+  return join2(dirname2(packageJsonPath), declared);
+}
+async function bootAcpProfile(host, overrides) {
+  const req = createRequire2(join2(host.base, "noop.js"));
+  const dshPkgPath = req.resolve("@deepseek-ai/dsh/package.json");
+  const dshDir = dirname2(dshPkgPath);
+  const appBoot = await import(pathToFileURL2(req.resolve("@deepseek-ai/dsh-app-boot")).href);
+  const homePaths = await import(pathToFileURL2(req.resolve("@deepseek-ai/dsh-home-paths")).href);
+  const home = homePaths.resolveDshHome();
+  let bundlePatches;
+  let profilePatches = [];
+  let profilePatchPath;
+  let rootConfigPath = join2(ownRoot(), "profile-root.cordis.yml");
+  let bareModuleBaseUrl = pathToFileURL2(dshDir + sep2).href;
+  const distBridge = join2(ownRoot(), "dist", "bridge.js");
+  const bridgeEntry = existsSync2(distBridge) ? distBridge : join2(ownRoot(), "src", "bundle.ts");
+  const realProfileDir = join2(home, "profiles", "acp");
+  if (existsSync2(join2(realProfileDir, "package.json"))) {
+    appBoot.healProfilesModuleFallback(dshPkgPath);
+    const profile = appBoot.loadProfile(BIN, "acp", dshPkgPath);
+    bundlePatches = profile.layers.flatMap((layer) => layer.patches);
+    profilePatches = profile.patches;
+    profilePatchPath = join2(profile.dir, "cordis.patch.yml");
+    const realRoot = join2(profile.dir, "cordis.yml");
+    if (existsSync2(realRoot)) rootConfigPath = realRoot;
+    bareModuleBaseUrl = void 0;
+    logDebug(`profile: real (${profile.dir})`);
+  } else {
+    const basePatch = bundlePatchPath(req.resolve("@deepseek-ai/dsh-base/package.json"));
+    const ownPatch = bundlePatchPath(join2(ownRoot(), "package.json"));
+    bundlePatches = [
+      ...appBoot.loadOverlayPatches(BIN, basePatch),
+      ...appBoot.loadOverlayPatches(BIN, ownPatch)
+    ];
+    logDebug(`profile: virtual (dsh-base + ${ownRoot()})`);
+  }
+  for (const row of bundlePatches) rewriteBridgeRows(row, bridgeEntry);
+  const homePatchPath = join2(home, "cordis.patch.yml");
+  const homePatches = appBoot.loadOptionalPatches(BIN, homePatchPath) ?? [];
+  const rows = /* @__PURE__ */ new Map();
+  for (const row of appBoot.composeEntries([bundlePatches, profilePatches, homePatches])) {
+    if (typeof row.id === "string") rows.set(row.id, row);
+  }
+  const overlays = [];
+  const shippedPresets = join2(dshDir, "config", "agent-presets") + sep2;
+  if (rows.has("agent-presets") && existsSync2(shippedPresets)) {
+    overlays.push({
+      id: "agent-presets",
+      config: {
+        ...rows.get("agent-presets")?.config ?? {},
+        roots: [{ path: shippedPresets, trust: "system" }]
+      }
+    });
+  }
+  if (process.env["DSH_TELEMETRY_DISABLED"] !== void 0 && rows.has("session-telemetry-otel")) {
+    overlays.push({ id: "session-telemetry-otel", disabled: true });
+  }
+  const bridgeRow = rows.get("acp-bridge");
+  if (overrides !== void 0 && bridgeRow !== void 0) {
+    const patch = {};
+    if (overrides.provider !== void 0) patch["provider"] = overrides.provider;
+    if (overrides.model !== void 0) patch["model"] = overrides.model;
+    if (overrides.permissionMode !== void 0) patch["permissionMode"] = overrides.permissionMode;
+    if (overrides.maxTokens !== void 0) patch["maxTokens"] = overrides.maxTokens;
+    if (Object.keys(patch).length > 0) {
+      overlays.push({ id: "acp-bridge", config: { ...bridgeRow.config ?? {}, ...patch } });
+    }
+  }
+  const allPatches = [...bundlePatches, ...profilePatches, ...homePatches, ...overlays];
+  const launchEnvironment = appBoot.loadLayeredEnv("dsh");
+  const launchEnvKey = (await import(pathToFileURL2(req.resolve("@deepseek-ai/dsh-launch-environment")).href)).DSH_LAUNCH_ENVIRONMENT_KEY;
+  const ctx = await appBoot.boot(
+    BIN,
+    rootConfigPath,
+    structuredClone(allPatches),
+    (hostCtx) => {
+      hostCtx.provide(launchEnvKey, launchEnvironment);
+    },
+    bareModuleBaseUrl
+  );
+  try {
+    appBoot.assertEntriesLoaded(ctx, BIN);
+    await appBoot.assertEntriesActivated(ctx, BIN);
+  } catch (error) {
+    await ctx.fiber.dispose().catch(() => {
+    });
+    throw error;
+  }
+  if (profilePatchPath !== void 0) {
+    logDebug(`user patch layers are read at boot; edit ${profilePatchPath} and restart to apply`);
+  }
+  return ctx;
+}
+
 // src/settings.ts
 import { homedir } from "node:os";
-import { join as join2 } from "node:path";
+import { join as join3 } from "node:path";
 var DEFAULT_PERSONA = `You are a coding assistant powered by the {{model}} model, working inside an editor via the Agent Client Protocol. Your working directory is {{cwd}}. Your bash tool runs under a file sandbox \u2014 a \`[sandbox: file access denied \u2026]\` result is policy, not a command bug.
 
 Verify your work by running the code or tests. Keep answers brief and factual.`;
@@ -2073,7 +2201,7 @@ function resolveSettings(argv) {
       throw new SettingsError(`unknown flag: --${name3}`);
     }
   }
-  const model = stringFlag(parsed, "model") ?? envString("DSH_MODEL") ?? "deepseek-v4-flash";
+  const model = stringFlag(parsed, "model") ?? envString("DSH_MODEL");
   const modelsRaw = stringFlag(parsed, "models") ?? envString("DSH_ACP_MODELS");
   const models = (modelsRaw !== void 0 ? modelsRaw.split(",") : ["deepseek-v4-flash", "deepseek-v4-pro"]).map((entry) => entry.trim()).filter((entry) => entry.length > 0);
   const permissionModeRaw = stringFlag(parsed, "permission-mode") ?? envString("DSH_PERMISSION_MODE") ?? "workspace-write";
@@ -2102,12 +2230,12 @@ function resolveSettings(argv) {
   }
   return {
     dshPath: stringFlag(parsed, "dsh-path") ?? envString("DSH_PATH"),
-    provider: stringFlag(parsed, "provider") ?? envString("DSH_PROVIDER") ?? "deepseek-official",
+    provider: stringFlag(parsed, "provider") ?? envString("DSH_PROVIDER"),
     model,
     models,
     maxTokens,
     permissionMode,
-    sessionRoot: stringFlag(parsed, "session-root") ?? envString("DSH_SESSION_ROOT") ?? join2(homedir(), ".dsh-acp", "sessions"),
+    sessionRoot: stringFlag(parsed, "session-root") ?? envString("DSH_SESSION_ROOT") ?? join3(homedir(), ".dsh-acp", "sessions"),
     persona: stringFlag(parsed, "persona") ?? envString("DSH_SYSTEM_PROMPT") ?? DEFAULT_PERSONA,
     thinking: !parsed.flags.has("no-thinking"),
     reasoningEffort: reasoningRaw,
@@ -2158,6 +2286,18 @@ async function main() {
     console.log(HELP_TEXT.trimEnd());
     return;
   }
+  if (argv[0] === "update") {
+    logInfo(`updating ${NAME} (npm install -g ${NAME}@latest)\u2026`);
+    const result = spawnSync("npm", ["install", "-g", `${NAME}@latest`], { stdio: ["ignore", 2, 2] });
+    if (result.status !== 0) {
+      logError(`npm install failed with status ${result.status ?? "unknown"}`);
+      process.exitCode = result.status ?? 1;
+      return;
+    }
+    logInfo("updated. If you also keep a global DeepSeek Harness, refresh it with:");
+    logInfo("    npm install -g @deepseek-ai/dsh@latest");
+    return;
+  }
   let settings;
   try {
     settings = resolveSettings(argv);
@@ -2171,11 +2311,24 @@ ${HELP_TEXT}`);
     }
     throw error;
   }
-  let kit;
+  let ctx;
   try {
     const host = resolveHost(settings.dshPath);
     logDebug(`harness host: ${host.base} via ${host.source} (${host.version ?? "unknown version"})`);
-    kit = await loadKit(host);
+    if (process.env["DSH_ACP_COMPOSE"] === "spine") {
+      const kit = await loadKit(host);
+      const spineCtx = new kit.cordis.Context();
+      await spineCtx.plugin(app_exports, { settings, kit });
+      ctx = spineCtx;
+    } else {
+      const booted = await bootAcpProfile(host, {
+        ...settings.provider !== void 0 ? { provider: settings.provider } : {},
+        ...settings.model !== void 0 ? { model: settings.model } : {},
+        ...settings.permissionMode !== void 0 ? { permissionMode: settings.permissionMode } : {},
+        ...settings.maxTokens !== void 0 ? { maxTokens: settings.maxTokens } : {}
+      });
+      ctx = booted;
+    }
   } catch (error) {
     if (error instanceof HarnessNotFoundError) {
       logError(error.message);
@@ -2184,8 +2337,6 @@ ${HELP_TEXT}`);
     }
     throw error;
   }
-  const ctx = new kit.cordis.Context();
-  await ctx.plugin(app_exports, { settings, kit });
   let disposing = false;
   const shutdown = (code) => {
     if (disposing) return;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.3.0",
+  "version": "0.4.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/openma-ai/deepseek-harness-acp.git"
@@ -23,7 +23,8 @@
     "cordis.patch.yml",
     "README.md",
     "LICENSE",
-    "package.json"
+    "package.json",
+    "profile-root.cordis.yml"
   ],
   "scripts": {
     "prepublishOnly": "npm run build",
@@ -110,7 +111,8 @@
     "@deepseek-ai/dsh-mcp-client": "^0.1.0-rc.6",
     "@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-session-title": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh": "^0.1.0-rc.6"
   },
   "exports": {
     ".": "./dist/index.js",

package/profile-root.cordis.yml

@@ -0,0 +1,3 @@
+# dsh-acp self-hosted profile root — an empty entry list; the tree is
+# composed as bundle patches (dsh-base, this package) plus the home layer.
+[]