@dsh-cc/cli 0.9.0-rc.4 → 0.9.0

package/bin/dsh-cc.js

@@ -9,7 +9,7 @@ import { existsSync, readFileSync } from 'node:fs'
 import { homedir } from 'node:os'
 import { dirname, join } from 'node:path'
 import { fileURLToPath } from 'node:url'
-import { bootstrapCommand, BOOTSTRAP_STAMP, devStoreRestoreDecision, dshUnavailableMessage, existingWorktreeDecision, formatVersionLabel, healDecision, interceptResume, parseLocalConfig, parseWorktreeFlag, parseWorktreeRef, planWorktree, planWorktreeRef, prFetchRefs, readBootstrapVersion, remoteHost, PROFILE, readBuildInfo, repoRootFromCommonDir, runStoreHeal, runStoreRestore, sanitizeInheritedEnv, slugRetryDecision, spawnEnv, symlinkedPath, versionGate, worktreeAddArgv, worktreeEnv, worktreeIdentityRefusal, writeBootstrapStamp } from '../bootstrap.mjs'
+import { bootstrapCommand, BOOTSTRAP_STAMP, ACP_PROFILE, ACP_BUNDLES, acpBundleSpec, devStoreRestoreDecision, dshUnavailableMessage, existingWorktreeDecision, formatVersionLabel, healDecision, interceptResume, parseLocalConfig, parseWorktreeFlag, parseWorktreeRef, planWorktree, planWorktreeRef, prFetchRefs, readBootstrapVersion, remoteHost, PROFILE, readBuildInfo, repoRootFromCommonDir, runStoreHeal, runStoreRestore, sanitizeInheritedEnv, slugRetryDecision, spawnEnv, symlinkedPath, versionGate, worktreeAddArgv, worktreeEnv, worktreeIdentityRefusal, writeBootstrapStamp } from '../bootstrap.mjs'
 import { readWorktreeSettings, resolveBaseRef, sweepWorktrees, SWEEP_CAP_MS, worktreeReuseReset, worktreeSettingsPaths } from '../worktree-lifecycle.mjs'
 
 const here = dirname(fileURLToPath(import.meta.url))
@@ -27,6 +27,78 @@ if (process.argv.includes('--version') || process.argv.includes('-V')) {
   console.log(formatVersionLabel(ownVersion, buildInfo))
   process.exit(0)
 }
+
+// `dsh-cc acp [...]` — the Agent Client Protocol lane (design
+// 2026-10-09-acp-m2-own-plugin §5.1). Dispatched BEFORE any TUI-specific
+// processing (worktree parsing, interceptResume, DSH_CC_* env): stdout
+// belongs to the ACP NDJSON protocol, so bootstrap/install output goes to
+// stderr only, the branch never consumes stdin, and the child dsh inherits
+// stdio so the protocol flows through.
+if (process.argv[2] === 'acp') {
+  const restArgs = process.argv.slice(3)
+  const acpSpecFor = name => acpBundleSpec(name, ownVersion)
+  const acpProfileDir = join(home, 'profiles', ACP_PROFILE)
+  const acpExisted = existsSync(join(acpProfileDir, 'package.json'))
+  const acpAdd = bootstrapCommand(acpExisted, ownVersion, { profile: ACP_PROFILE, bundles: ACP_BUNDLES, specFor: acpSpecFor })
+  if (acpAdd !== undefined) {
+    console.error(`dsh-cc: initializing profile "${ACP_PROFILE}"…`)
+    const acpGate = versionGate(() => spawnSync('dsh', ['--version'], { encoding: 'utf8' }))
+    if (acpGate.warning) console.error(acpGate.warning)
+    if (!acpGate.ok) {
+      console.error(acpGate.message)
+      process.exit(1)
+    }
+    const installed = spawnSync('dsh', acpAdd, { encoding: 'utf8', stdio: 'inherit' })
+    if (installed.error) {
+      console.error(dshUnavailableMessage())
+      process.exit(1)
+    }
+    if (installed.status !== 0) {
+      console.error(`dsh-cc: plugin install failed. Retry:\n  dsh ${acpAdd.join(' ')}`)
+      process.exit(installed.status ?? 1)
+    }
+    writeBootstrapStamp(join(acpProfileDir, BOOTSTRAP_STAMP), ownVersion)
+  }
+  // Same converge/restore machinery as the TUI path, with the ACP floor list
+  // and specifiers; all of it logs to stderr.
+  const acpBuildInfo = readBuildInfo(join(acpProfileDir, 'node_modules', '@dsh-cc', 'dsh-cc-build.json'))
+  const acpRestore = devStoreRestoreDecision(acpBuildInfo, ownVersion)
+  const acpConvergeOpts = { bundles: ACP_BUNDLES, specFor: acpSpecFor }
+  if (acpRestore !== null) {
+    const restored = runStoreRestore(acpProfileDir, ownVersion, acpConvergeOpts)
+    if (restored.restored) writeBootstrapStamp(join(acpProfileDir, BOOTSTRAP_STAMP), ownVersion)
+  } else {
+    const heal = healDecision({
+      profileExists: acpExisted && acpAdd === undefined,
+      stampVersion: readBootstrapVersion(join(acpProfileDir, BOOTSTRAP_STAMP)),
+      ownVersion,
+      buildInfo: acpBuildInfo,
+    })
+    if (heal !== null) runStoreHeal(acpProfileDir, ownVersion, { from: heal.from, ...acpConvergeOpts })
+  }
+  // Never run TUI arg processing on this path: restArgs pass through as-is.
+  const acpEnv = sanitizeInheritedEnv({ ...process.env })
+  acpEnv.NODE_ENV ??= 'production'
+  acpEnv.DSH_CC_PROFILE = ACP_PROFILE
+  const acpChild = spawn('dsh', ['--profile', ACP_PROFILE, ...restArgs], {
+    env: spawnEnv(acpEnv, home),
+    stdio: 'inherit',
+  })
+  acpChild.on('error', (error) => {
+    if (/** @type {NodeJS.ErrnoException} */ (error).code === 'ENOENT') {
+      console.error(dshUnavailableMessage())
+      process.exit(1)
+    }
+    throw error
+  })
+  acpChild.on('exit', (code, signal) => {
+    if (signal) {
+      process.kill(process.pid, signal)
+      return
+    }
+    process.exit(code ?? 0)
+  })
+} else {
 const profileExisted = existsSync(join(profileDir, 'package.json'))
 const add = bootstrapCommand(profileExisted, ownVersion)
 if (add !== undefined) {
@@ -336,3 +408,4 @@ child.on('exit', (code, signal) => {
   }
   process.exit(code ?? 0)
 })
+}

package/bootstrap.mjs

@@ -14,6 +14,35 @@ export const BUNDLES = [
   '@dsh-cc/bundle-tui',
 ]
 
+/** Profile name for the ACP (`dsh-cc acp`) lane. */
+export const ACP_PROFILE = 'cc-acp'
+/**
+ * Floor bundle list for the ACP lane. dsh-base resolves from the
+ * installation (tui precedent: not a profile dependency); dsh-acp-app stays
+ * in the floor carrying the startup latch + hmr/system-prompt rows.
+ */
+export const ACP_BUNDLES = [
+  '@deepseek-ai/dsh-base',
+  '@deepseek-ai/dsh-acp-app',
+  '@dsh-cc/bundle-permissions',
+  '@dsh-cc/bundle-shell',
+  '@dsh-cc/bundle-acp',
+]
+/** Exact pin for dsh-acp-app: its npm latest is a fossil, never bare-install it. */
+export const ACP_APP_PIN = '0.2.0-rc.2'
+
+/**
+ * Install specifier for an ACP floor bundle. dsh-base is passed bare (it
+ * resolves from the dsh installation, never becomes a profile dependency);
+ * dsh-acp-app is pinned to the harness release; @dsh-cc bundles follow the
+ * launcher version scheme, like the TUI path.
+ */
+export function acpBundleSpec(name, version) {
+  if (name === '@deepseek-ai/dsh-base') return name
+  if (name === '@deepseek-ai/dsh-acp-app') return `${name}@${ACP_APP_PIN}`
+  return `${name}@${version}`
+}
+
 /**
  * Scan dsh-cc args for resume-mode flags and translate them into the env
  * contract the TUI plugin consumes. Collection is order-independent: all
@@ -138,10 +167,12 @@ export function spawnEnv(env, dshHome) {
 /**
  * @param {boolean} profileExists
  * @param {string} version
+ * @param {{ profile?: string, bundles?: string[], specFor?: (name: string) => string }} [opts]
  */
-export function bootstrapCommand(profileExists, version) {
+export function bootstrapCommand(profileExists, version, { profile = PROFILE, bundles = BUNDLES, specFor } = {}) {
   if (profileExists) return undefined
-  return ['plugin', '--profile', PROFILE, 'add', ...BUNDLES.map(name => `${name}@${version}`)]
+  const spec = specFor ?? (name => `${name}@${version}`)
+  return ['plugin', '--profile', profile, 'add', ...bundles.map(spec)]
 }
 
 // --- worktree support (--worktree) ------------------------------------------
@@ -692,7 +723,8 @@ export function devStoreRestoreDecision(info, ownVersion) {
  * @returns {{ restored: boolean, reason?: string, from?: string, to?: string }>}
  */
 export function runStoreRestore(profileDir, ownVersion, deps = {}) {
-  const { spawnSyncImpl = spawnSync, log = console.error, now = Date.now } = deps
+  const { spawnSyncImpl = spawnSync, log = console.error, now = Date.now, bundles = BUNDLES, specFor } = deps
+  const spec = specFor ?? (name => `${name}@${ownVersion}`)
   const scope = join(profileDir, 'node_modules', '@dsh-cc')
   const backup = `${scope}.__dev-restore-backup`
   const lock = join(profileDir, 'node_modules', '.dsh-cc-restore.lock')
@@ -775,7 +807,7 @@ export function runStoreRestore(profileDir, ownVersion, deps = {}) {
     setAside = true
 
     // 4. Re-materialize from the registry, same command surface as first boot.
-    const result = spawnSyncImpl('dsh', ['plugin', '--profile', profileName, 'add', ...BUNDLES.map(n => `${n}@${ownVersion}`)], {
+    const result = spawnSyncImpl('dsh', ['plugin', '--profile', profileName, 'add', ...bundles.map(spec)], {
       stdio: 'inherit',
       env: spawnEnv(sanitizeInheritedEnv(process.env), home),
     })
@@ -896,7 +928,8 @@ export function writeBootstrapStamp(stampPath, ownVersion, log = console.error)
  * @returns {{ healed: boolean, reason?: 'locked' | 'plugin-add-failed' }}
  */
 export function runStoreHeal(profileDir, ownVersion, options = {}) {
-  const { from, spawnSyncImpl = spawnSync, log = console.error, now = Date.now } = options
+  const { from, spawnSyncImpl = spawnSync, log = console.error, now = Date.now, bundles = BUNDLES, specFor } = options
+  const spec = specFor ?? (name => `${name}@${ownVersion}`)
   const lock = join(profileDir, HEAL_LOCK)
   const stamp = join(profileDir, BOOTSTRAP_STAMP)
   const home = dirname(dirname(profileDir))
@@ -929,7 +962,7 @@ export function runStoreHeal(profileDir, ownVersion, options = {}) {
       }
     }
 
-    const result = spawnSyncImpl('dsh', ['plugin', '--profile', profileName, 'add', ...BUNDLES.map(n => `${n}@${ownVersion}`)], {
+    const result = spawnSyncImpl('dsh', ['plugin', '--profile', profileName, 'add', ...bundles.map(spec)], {
       stdio: 'inherit',
       env: spawnEnv(sanitizeInheritedEnv(process.env), home),
     })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-cc/cli",
-  "version": "0.9.0-rc.4",
+  "version": "0.9.0",
   "description": "Optional dsh-cc shortcut: bootstraps the tui profile and runs dsh --profile tui",
   "type": "module",
   "bin": {