@askdkc/dsh-cli 0.11.5 → 0.11.6

package/README.md

@@ -121,6 +121,20 @@ it. The managed PATH block goes in `${ZDOTDIR:-$HOME}/.zshrc` for zsh;
 it, remove the managed command and that block; delete the fish file only if
 it contains nothing else (Windows: remove the command and user PATH entry). The
 existing `dsh-tui` and `dst` commands remain compatibility aliases.
+
+A Harness source checkout does not put `dsh` on PATH. When the TUI first starts
+through `pnpm dsh --profile dsh-cli` in a Harness checkout, registration also
+records that checkout as `DSH_TUI_DSH_ROOT` in the managed shell startup block
+(`.zshrc` for zsh). Open a new shell, then launch from any project directory:
+
+```sh
+cd /absolute/path/to/your-project
+dsh-cli
+```
+
+The launcher uses the checkout's built `apps/cli/lib/bin.js` and preserves the
+project directory. Rebuild Harness after changing its source. An explicit
+`DSH_TUI_DSH_ROOT` value overrides the registered default.
 A locally packed fork should be updated by rebuilding and reinstalling the
 archive, rather than by using the registry-backed `/update` command.
 

package/bin/dsh-tui.js

@@ -97,7 +97,7 @@ const shellOpt = isWin ? { shell: true } : {}
 // DEP0190（issue #148）：shell:true + 非空参数数组触发语法级弃用告警——
 // 转义后拼进命令字符串（空参数数组不触发），非 Windows 保持数组直传。
 const cmd = (command, args) =>
-  isWin ? [`${command} ${shellQuote(args).join(' ')}`, []] : [command, args]
+  isWin ? [`${shellQuote([command])[0]} ${shellQuote(args).join(' ')}`, []] : [command, args]
 
 // 内联 semver（解析 + 严格大于）：启动器可能在依赖不完整的环境里被执行
 // （迁移、半损坏安装、测试沙箱），零外部依赖是自保底线。覆盖 semver 的
@@ -136,8 +136,12 @@ const isVersionNewer = (a, b) => {
 const lang = process.env.DSH_TUI_LANG === 'en' ? 'en' : 'zh'
 const MSG = {
   noDsh: {
-    en: '[dsh-cli] dsh CLI not found. Install the official client first:\n  npm install -g @deepseek-ai/dsh',
-    zh: '[dsh-cli] 未检测到 dsh CLI。请先安装官方客户端：\n  npm install -g @deepseek-ai/dsh',
+    en: '[dsh-cli] dsh CLI not found. Install it or set DSH_TUI_DSH_ROOT to a built Harness checkout:\n  npm install -g @deepseek-ai/dsh',
+    zh: '[dsh-cli] 未检测到 dsh CLI。可安装官方客户端，或将 DSH_TUI_DSH_ROOT 指向已构建的 Harness 源码目录：\n  npm install -g @deepseek-ai/dsh',
+  },
+  invalidDshRoot: {
+    en: root => `[dsh-cli] DSH_TUI_DSH_ROOT must be an absolute, built DeepSeek Harness checkout: ${root}`,
+    zh: root => `[dsh-cli] DSH_TUI_DSH_ROOT 必须指向已构建的 DeepSeek Harness 源码绝对路径：${root}`,
   },
   noPnpm: {
     en: '[dsh-cli] The first-time setup needs pnpm (dsh plugin delegates installs to it):\n  npm install -g pnpm   (or via corepack: corepack enable pnpm)',
@@ -541,6 +545,19 @@ if (subcommand === 'help' || subcommand === '--help' || subcommand === '-h') {
   console.log(msg('helpText'))
   process.exit(0)
 }
+// A source checkout does not put `dsh` on PATH. An explicit Harness root lets
+// the launcher run its built CLI while keeping the caller's project cwd.
+const dshRoot = process.env.DSH_TUI_DSH_ROOT
+let dshBin
+if (dshRoot !== undefined) {
+  const candidate = join(dshRoot, 'apps', 'cli', 'lib', 'bin.js')
+  if (!isAbsolute(dshRoot) || readJson(join(dshRoot, 'apps', 'cli', 'package.json'))?.name !== '@deepseek-ai/dsh' || !existsSync(candidate)) {
+    console.error(msg('invalidDshRoot')(dshRoot))
+    process.exit(1)
+  }
+  dshBin = candidate
+}
+const dshCmd = args => dshBin === undefined ? cmd('dsh', args) : cmd(process.execPath, [dshBin, ...args])
 /**
  * Whether the DSH credential store declares a reference by this name.
  *
@@ -578,7 +595,7 @@ const runDoctorChecks = () => {
   lines.push(`dsh-cli doctor · ${PACKAGE} ${ownVersion ?? 'unknown'}`)
   report(true, 'node', `${process.version} · ${process.platform} ${process.arch}`)
   const probeVersion = command => {
-    const probe = spawnSync(...cmd(command, ['--version']), { stdio: 'pipe', encoding: 'utf8', ...shellOpt })
+    const probe = spawnSync(...command(['--version']), { stdio: 'pipe', encoding: 'utf8', ...shellOpt })
     if (probe.error || probe.status !== 0) return undefined
     // 白名单校验：只回显版本号形状的首行。诊断输出的红线是绝不泄露密钥，
     // 而 PATH 上的 wrapper 理论上可以把任意环境变量 echo 进 --version——
@@ -586,14 +603,14 @@ const runDoctorChecks = () => {
     const line = String(probe.stdout ?? '').trim().split('\n')[0] ?? ''
     return /^v?\d[\w.+-]*$/.test(line) ? line : '(version unreadable)'
   }
-  const dshVersion = probeVersion('dsh')
+  const dshVersion = probeVersion(dshCmd)
   if (dshVersion === undefined) {
     hardFailure = true
     report(false, 'dsh', L.dshMissing)
   } else {
     report(true, 'dsh', dshVersion)
   }
-  const pnpmVersion = probeVersion('pnpm')
+  const pnpmVersion = probeVersion(args => cmd('pnpm', args))
   report(pnpmVersion !== undefined, 'pnpm', pnpmVersion ?? L.pnpmMissing)
   const profileVersion = readJson(installedPkgPath)?.version
   if (profileVersion === undefined) {
@@ -722,7 +739,7 @@ const forwardExit = child => {
 // 不从数值反推信号（spec §5.1）。
 const startDshSession = (dshArgs, profile = PROFILE, env = process.env) =>
   new Promise(resolve => {
-    const child = spawn(...cmd('dsh', ['--profile', profile, ...dshArgs]), {
+    const child = spawn(...dshCmd(['--profile', profile, ...dshArgs]), {
       stdio: 'inherit',
       env,
       ...shellOpt,
@@ -1029,11 +1046,11 @@ const createRescueProfile = () => {
     }
     console.log(msg('safeRescueCleanup')(rescueProfileDir))
   }
-  const probe = spawnSync(...cmd('dsh', ['--version']), { stdio: 'pipe', ...shellOpt })
+  const probe = spawnSync(...dshCmd(['--version']), { stdio: 'pipe', ...shellOpt })
   if (probe.error || probe.status !== 0) return { kind: 'failed', lines: [msg('safeRescueFailed')('dsh missing')] }
   console.log(msg('safeRescueCreating'))
   const runAdd = extraArgs => spawnSync(
-    ...cmd('dsh', ['plugin', '--profile', RESCUE_PROFILE, 'add', ...extraArgs, `${PACKAGE}@${installVersion}`]),
+    ...dshCmd(['plugin', '--profile', RESCUE_PROFILE, 'add', ...extraArgs, `${PACKAGE}@${installVersion}`]),
     { stdio: ['inherit', 'pipe', 'pipe'], env: rescueEnv(), ...shellOpt },
   )
   let add = runAdd([])
@@ -1099,7 +1116,7 @@ const profileReady = () => {
   }
 }
 const bootstrapProfile = () => {
-  const probe = spawnSync(...cmd('dsh', ['--version']), { stdio: 'pipe', ...shellOpt })
+  const probe = spawnSync(...dshCmd(['--version']), { stdio: 'pipe', ...shellOpt })
   if (probe.error || probe.status !== 0) {
     console.error(msg('noDsh'))
     process.exit(1)
@@ -1111,7 +1128,7 @@ const bootstrapProfile = () => {
   }
   console.log(msg('bootstrapStart'))
   const runAdd = (extraArgs, capture) => spawnSync(
-    ...cmd('dsh', ['plugin', '--profile', PROFILE, 'add', ...extraArgs, `${PACKAGE}@${installVersion}`]),
+    ...dshCmd(['plugin', '--profile', PROFILE, 'add', ...extraArgs, `${PACKAGE}@${installVersion}`]),
     { stdio: capture ? ['inherit', 'pipe', 'pipe'] : 'inherit', ...shellOpt },
   )
   let add = runAdd([], true)
@@ -1225,7 +1242,7 @@ if (subcommand === 'safe') {
 if (subcommand === 'update') {
   if (!profileReady()) bootstrapProfile()
   {
-    const probe = spawnSync(...cmd('dsh', ['--version']), { stdio: 'pipe', ...shellOpt })
+    const probe = spawnSync(...dshCmd(['--version']), { stdio: 'pipe', ...shellOpt })
     if (probe.error || probe.status !== 0) {
       console.error(msg('noDsh'))
       process.exit(1)
@@ -1291,7 +1308,7 @@ if (!runningInsideProfile && ownVersion !== undefined && process.env.DSH_TUI_NO_
   // ─── profile 副本（或源码运行）：完整启动逻辑 ─────────────────────────────
   // dsh CLI 预检（缺失时给安装指引，先于一切 profile 逻辑）。
   {
-    const probe = spawnSync(...cmd('dsh', ['--version']), { stdio: 'pipe', ...shellOpt })
+    const probe = spawnSync(...dshCmd(['--version']), { stdio: 'pipe', ...shellOpt })
     if (probe.error || probe.status !== 0) {
       console.error(msg('noDsh'))
       process.exit(1)

package/lib/types/dsh-adapter/cli-registration.d.ts

@@ -7,6 +7,8 @@ export interface CliRegistrationOptions {
     zdotdir?: string;
     xdgConfigHome?: string;
     localAppData?: string;
+    cliEntry?: string;
+    dshRoot?: string;
     windowsUserPath?: {
         read(): string;
         write(value: string): void;

package/lib/types/dsh-adapter/cli-registration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli-registration.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/cli-registration.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,sBAAsB;IACrC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAA;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,eAAe,CAAC,EAAE;QAAE,IAAI,IAAI,MAAM,CAAC;QAAC,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CACjE;AA4DD,gGAAgG;AAChG,wBAAgB,mBAAmB,CAAC,OAAO,GAAE,sBAA2B,GAAG,MAAM,CA0EhF"}
+{"version":3,"file":"cli-registration.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/cli-registration.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,sBAAsB;IACrC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAA;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,eAAe,CAAC,EAAE;QAAE,IAAI,IAAI,MAAM,CAAC;QAAC,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CACjE;AAqFD,gGAAgG;AAChG,wBAAgB,mBAAmB,CAAC,OAAO,GAAE,sBAA2B,GAAG,MAAM,CAgFhF"}

package/lib/types/dsh-adapter/cli-registration.js

@@ -1,7 +1,7 @@
 import { execFileSync } from 'node:child_process';
 import { closeSync, existsSync, lstatSync, mkdirSync, openSync, readFileSync, realpathSync, renameSync, rmSync, statSync, writeFileSync } from 'node:fs';
 import { homedir } from 'node:os';
-import { basename, dirname, join } from 'node:path';
+import { basename, dirname, isAbsolute, join, resolve } from 'node:path';
 const begin = '# BEGIN dsh-cli managed PATH';
 const end = '# END dsh-cli managed PATH';
 const marker = '# dsh-cli managed launcher';
@@ -71,6 +71,34 @@ function posixShellFiles(home, shell, zdotdir, xdg) {
         default: throw new Error(`unsupported shell ${shell}; add ~/.local/bin to PATH manually`);
     }
 }
+/** Resolve a Harness source entry, never the caller's project directory. */
+function harnessSourceRoot(cliEntry) {
+    if (cliEntry === undefined)
+        return undefined;
+    try {
+        const entry = realpathSync(cliEntry);
+        const root = resolve(dirname(entry), '../../..');
+        if (entry !== join(root, 'apps', 'cli', 'src', 'bin.ts')
+            && entry !== join(root, 'apps', 'cli', 'lib', 'bin.js'))
+            return undefined;
+        const pkg = JSON.parse(readFileSync(join(root, 'apps', 'cli', 'package.json'), 'utf8'));
+        return pkg.name === '@deepseek-ai/dsh' ? root : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+function configuredHarnessRoot(root) {
+    if (root === undefined || !isAbsolute(root))
+        return undefined;
+    try {
+        const pkg = JSON.parse(readFileSync(join(root, 'apps', 'cli', 'package.json'), 'utf8'));
+        return pkg.name === '@deepseek-ai/dsh' ? realpathSync(root) : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
 /** Register a user-owned launcher for the existing dsh-cli profile. No DSH state is changed. */
 export function ensureCliRegistered(options = {}) {
     const home = options.home ?? homedir();
@@ -78,6 +106,8 @@ export function ensureCliRegistered(options = {}) {
     const platform = options.platform ?? process.platform;
     const shell = options.shell ?? process.env.SHELL ?? '';
     const pathValue = options.path ?? process.env.PATH ?? '';
+    const sourceRoot = harnessSourceRoot(options.cliEntry ?? process.argv[1])
+        ?? configuredHarnessRoot(options.dshRoot ?? process.env.DSH_TUI_DSH_ROOT);
     const binDir = platform === 'win32'
         ? join(options.localAppData ?? process.env.LOCALAPPDATA ?? join(home, 'AppData', 'Local'), 'dsh-cli', 'bin')
         : join(home, '.local', 'bin');
@@ -140,9 +170,13 @@ export function ensureCliRegistered(options = {}) {
         }
         else {
             const files = posixShellFiles(home, shell, options.zdotdir ?? process.env.ZDOTDIR, options.xdgConfigHome ?? process.env.XDG_CONFIG_HOME);
-            const line = basename(shell) === 'fish'
+            const pathLine = basename(shell) === 'fish'
                 ? `contains -- ${quoted(binDir)} $PATH; or set -gx PATH ${quoted(binDir)} $PATH`
                 : `case ":$PATH:" in *:${quoted(binDir)}:*) ;; *) export PATH=${quoted(binDir)}:"$PATH" ;; esac`;
+            const sourceLine = sourceRoot === undefined ? '' : basename(shell) === 'fish'
+                ? `\nset -q DSH_TUI_DSH_ROOT; or set -gx DSH_TUI_DSH_ROOT ${quoted(sourceRoot)}`
+                : `\nif [ -z "\${DSH_TUI_DSH_ROOT:-}" ]; then export DSH_TUI_DSH_ROOT=${quoted(sourceRoot)}; fi`;
+            const line = pathLine + sourceLine;
             for (const file of files)
                 updateShellFile(file, line);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@askdkc/dsh-cli",
-  "version": "0.11.5",
+  "version": "0.11.6",
   "description": "Interactive terminal interface for DeepSeek Harness agents, sessions and tools.",
   "keywords": [
     "dsh",