@ljwei-stak/dsh-model-router 0.18.1 → 0.19.0

package/.dsh-plugin/index.mjs

@@ -95,6 +95,7 @@ export const Config = z.object({
   toolInstallMethodsJson: z.string().max(8_000).default('{}').volatile(),
   toolScriptUrlsJson: z.string().max(8_000).default('{}').volatile(),
   toolAllowScriptInstall: z.boolean().default(true).volatile(),
+  zcodeInstallDir: z.string().max(4_096).default('').volatile(),
 })
 
 const JSON_OUTPUT = {
@@ -1387,6 +1388,8 @@ export async function startWorkbenchRun(ctx, config, request = {}, options = {})
 export function createRouterTerminals(options = {}) {
   return createTerminalManager({
     prepare: () => ensureNpmPrefixOnPath(),
+    preferences: () => installPreferences(),
+    launchOptions: () => currentInstallOptions(),
     onSessionEnd: record => { void routerStateStore().appendTerminalSession(record).catch(() => {}) },
     ...options,
   })
@@ -1397,11 +1400,14 @@ async function terminalHistory(limit = 20) {
   return (saved.terminalSessions ?? []).slice(-limit).reverse()
 }
 
-function terminalServices(terminals) {
+function terminalServices(terminals, assertPreferences = () => {}) {
   if (!terminals) return {}
   return {
-    terminalInfo: async () => ({ ...terminals.info(), history: await terminalHistory() }),
-    terminalStart: async request => terminals.start(parseTerminalStart(request)),
+    terminalInfo: async () => {
+      const tools = await probeAllTools({ fresh: true })
+      return { ...terminals.info(), tools, toolsCheckedAt: Date.now(), history: await terminalHistory() }
+    },
+    terminalStart: async request => { assertPreferences(); return terminals.start(parseTerminalStart(request)) },
     terminalRead: async request => terminals.read(parseTerminalRead(request)),
     terminalWrite: async request => terminals.write(parseTerminalWrite(request)),
     terminalResize: async request => terminals.resize(parseTerminalResize(request)),
@@ -1409,9 +1415,9 @@ function terminalServices(terminals) {
   }
 }
 
-export function routerRemoteServices(ctx, config, { terminals = null } = {}) {
+export function routerRemoteServices(ctx, config, { terminals = null, assertPreferences } = {}) {
   return {
-    ...terminalServices(terminals),
+    ...terminalServices(terminals, assertPreferences),
     health: async fresh => {
       const report = await toolHealthReport({ fresh: fresh === true })
       const saved = await savedState()
@@ -1444,7 +1450,7 @@ export function apply(ctx, config = {}) {
       installPreferenceError = null
     } catch (error) { installPreferenceError = errorText(error) }
   }
-  const installFields = new Set(['toolInstallDir', 'toolNpmRegistry', 'toolInstallMethodsJson', 'toolScriptUrlsJson', 'toolAllowScriptInstall'])
+  const installFields = new Set(['toolInstallDir', 'toolNpmRegistry', 'toolInstallMethodsJson', 'toolScriptUrlsJson', 'toolAllowScriptInstall', 'zcodeInstallDir'])
   syncInstallPreferences()
   // Loader scopes this event to the fiber whose refs were committed.
   ctx.on('loader/volatile-update', paths => {
@@ -1464,9 +1470,10 @@ export function apply(ctx, config = {}) {
       return () => { process.off('exit', onExit); terminals.disposeAll('dispose') }
     }, 'model-router-galgame: interactive terminals')
     registerOfficialToolsRemote(ctx, {
-      ...routerRemoteServices(ctx, config, { terminals }),
+      ...routerRemoteServices(ctx, config, { terminals, assertPreferences: assertInstallPreferences }),
       installSettingsError: () => installPreferenceError,
       installRequestedDirectory: () => valueOf(config, 'toolInstallDir', ''),
+      zcodeRequestedDirectory: () => valueOf(config, 'zcodeInstallDir', ''),
     })
   }
   ctx.on('tools/pre-execute', async (exec, next) => {

package/.dsh-plugin/official-tools-remote-service.mjs

@@ -44,6 +44,7 @@ const unavailable = () => { throw new Error('模型路由工作台服务尚未
 export function installSummary(preferences = installPreferences(), options = currentInstallOptions()) {
   return {
     installDir: preferences.installDir ?? '',
+    zcodeInstallDir: preferences.zcodeInstallDir ?? '',
     registry: preferences.registry ?? '',
     allowScriptInstall: preferences.allowScriptInstall !== false,
     scriptUrls: { ...(preferences.scriptUrls ?? {}) },
@@ -61,12 +62,14 @@ export function installSummary(preferences = installPreferences(), options = cur
       }
       if (tool.manager === 'signed-windows-installer') {
         entry.methodId = 'signed-windows-installer'
+        entry.installDir = preferences.zcodeInstallDir ?? ''
         if (options.platform === 'win32') {
           entry.command = installCommandLine(tool)
           entry.updateCommand = entry.command
-          entry.notices = [preferences.installDir
-            ? `请在官方安装窗口手动选择 ${preferences.installDir}，完成后重新体检。`
-            : '请在官方安装窗口选择目录并完成安装，然后重新体检。']
+          entry.notices = [preferences.zcodeInstallDir
+            ? `TUI 使用已保存的 ZCode 桌面目录 ${preferences.zcodeInstallDir}。更新时请在官方安装窗口选择同一目录，完成后重新体检。`
+            : '请在下方单独配置 ZCode 桌面目录，或留空自动检测。内置 CLI 随桌面版更新，TUI 的登录、模型和插件在终端中自行配置。']
+          entry.notices.push('ZCode 桌面目录独立于统一 npm 安装根；不会把桌面资源放进其他工具的共享目录。')
         } else entry.installError = entry.error = 'ZCode 签名安装器仅支持 Windows。'
         entry.uninstallError = 'ZCode 是桌面安装版，请在系统“应用”中卸载它。'
         return entry
@@ -191,6 +194,7 @@ export class OfficialToolsRemoteService extends TypertRemoteService {
     // The saved input can contain Host-only home/environment expansions. Keep
     // it separate from the resolved directory used by the actual command.
     install.requestedInstallDir = this.services?.installRequestedDirectory?.() ?? install.installDir
+    install.requestedZCodeInstallDir = this.services?.zcodeRequestedDirectory?.() ?? install.zcodeInstallDir
     return { install, hostVersion: HOST_PLUGIN_VERSION }
   }
 

package/.dsh-plugin/shared/cli-terminal-protocol.mjs

@@ -9,10 +9,12 @@
  * into that interactive process, exactly as in their own terminal, so a
  * session starts only after an explicit confirmation.
  */
-import { getOfficialTool } from './official-tool-registry.mjs'
+import { getOfficialTool, OFFICIAL_TOOLS } from './official-tool-registry.mjs'
 
-/** Registry CLIs that have an interactive terminal UI (ZCode is a desktop app). */
-export const TERMINAL_TOOL_IDS = Object.freeze(['codex', 'claude-code', 'kimi-code', 'minimax-code', 'mimo-code', 'grok-build', 'gemini'])
+/** Follow the tool registry, including the TUI bundled with ZCode desktop. */
+export const TERMINAL_TOOL_IDS = Object.freeze(OFFICIAL_TOOLS
+  .filter(tool => !tool.unsupported && (tool.probeExecutables?.length || tool.manager === 'signed-windows-installer'))
+  .map(tool => tool.id))
 export const TERMINAL_SHELL_ID = 'shell'
 export const TERMINAL_TARGETS = Object.freeze([TERMINAL_SHELL_ID, ...TERMINAL_TOOL_IDS])
 export const TERMINAL_MODES = Object.freeze(['interactive', 'login'])
@@ -46,8 +48,16 @@ export const TERMINAL_LOGIN_ARGS = Object.freeze({
   'mimo-code': Object.freeze(['auth', 'login']),
   'grok-build': Object.freeze(['login']),
   gemini: Object.freeze([]),
+  opencode: Object.freeze(['auth', 'login']),
+  stepcode: Object.freeze(['login']),
+  zcode: Object.freeze([]),
 })
 
+/** Tools without a separate login command authenticate from their TUI. */
+export function terminalCanLogin(target) {
+  return Boolean(TERMINAL_LOGIN_ARGS[target]?.length)
+}
+
 const SESSION_ID = /^term-[a-z0-9]{6,40}$/
 
 function plainObject(value, subject) {
@@ -82,7 +92,7 @@ export function terminalTargetLabel(target) {
 export function terminalCommandPreview(target, mode = 'interactive', platform = 'win32') {
   if (target === TERMINAL_SHELL_ID) return platform === 'win32' ? 'powershell.exe -NoLogo' : '$SHELL -l'
   const tool = getOfficialTool(target)
-  const executable = tool?.probeExecutables?.[0] ?? String(target)
+  const executable = target === 'zcode' ? 'ZCode 桌面版内置 TUI' : tool?.probeExecutables?.[0] ?? String(target)
   const args = mode === 'login' ? TERMINAL_LOGIN_ARGS[target] ?? [] : []
   return [executable, ...args].join(' ')
 }
@@ -92,7 +102,7 @@ export function parseTerminalStart(value) {
   if (!TERMINAL_TARGETS.includes(request.target)) throw new TypeError('target must be the shell or a fixed official CLI')
   const mode = request.mode === undefined ? 'interactive' : request.mode
   if (!TERMINAL_MODES.includes(mode)) throw new TypeError('mode must be interactive or login')
-  if (mode === 'login' && request.target === TERMINAL_SHELL_ID) throw new TypeError('the shell has no login mode')
+  if (mode === 'login' && !terminalCanLogin(request.target)) throw new TypeError('this target has no login mode')
   if (!isAbsoluteDirectoryText(request.cwd)) throw new TypeError('cwd must be an absolute directory path')
   if (request.confirmed !== true) throw new TypeError('starting a terminal requires the user\'s confirmation')
   return {

package/.dsh-plugin/shared/cli-terminal.mjs

@@ -13,11 +13,14 @@
  */
 import { spawn } from 'node:child_process'
 import { randomBytes } from 'node:crypto'
-import { stat } from 'node:fs/promises'
+import { readFile, readdir, realpath, stat } from 'node:fs/promises'
 import { createRequire } from 'node:module'
 import { StringDecoder } from 'node:string_decoder'
-import { extname } from 'node:path'
-import { getOfficialTool } from './official-tool-registry.mjs'
+import { homedir } from 'node:os'
+import { extname, isAbsolute, join, relative, sep } from 'node:path'
+import { getOfficialTool, installMethodFor } from './official-tool-registry.mjs'
+import { resolveInstallPlan } from './tool-install-preferences.mjs'
+import { discoverZCodeBundle } from './zcode-bundle.mjs'
 import {
   TERMINAL_LIMITS,
   TERMINAL_LOGIN_ARGS,
@@ -84,6 +87,75 @@ export function pickWindowsExecutable(candidates) {
 
 const quoteWindows = path => `"${String(path).replace(/"/g, '')}"`
 
+function within(root, child) {
+  const part = relative(root, child)
+  return Boolean(part) && part !== '..' && !part.startsWith(`..${sep}`) && !isAbsolute(part)
+}
+
+/** Bind a configured npm/pnpm tool to its declared package entry, not a shared shim. */
+export async function findTerminalPackageEntry(tool, plan, { platform = process.platform } = {}) {
+  let roots = plan.packageModuleRoots
+  let boundary
+  if (!Array.isArray(roots)) {
+    if (!plan.installDir) return null
+    if (plan.manager === 'pnpm') {
+      const global = join(plan.installDir, '.pnpm', 'global')
+      boundary = await realpath(global).catch(() => null)
+      const versions = await readdir(global, { withFileTypes: true }).catch(() => [])
+      roots = versions.filter(item => item.isDirectory() && /^\d+$/.test(item.name))
+        .sort((left, right) => Number(left.name) - Number(right.name))
+        .map(item => join(global, item.name, 'node_modules'))
+    } else {
+      const modules = platform === 'win32' ? join(plan.installDir, 'node_modules') : join(plan.installDir, 'lib', 'node_modules')
+      boundary = await realpath(modules).catch(() => null)
+      roots = [modules]
+    }
+  } else {
+    boundary = await realpath(plan.globalDir || plan.installDir || roots[0]).catch(() => null)
+  }
+  if (!boundary) return null
+  const entries = []
+  for (const modules of roots) {
+    try {
+      const packageRoot = await realpath(join(modules, ...tool.package.split('/')))
+      if (!within(boundary, packageRoot)) continue
+      const manifest = JSON.parse(await readFile(join(packageRoot, 'package.json'), 'utf8'))
+      if (manifest.name !== tool.package) continue
+      for (const executable of tool.probeExecutables) {
+        const raw = typeof manifest.bin === 'string' ? manifest.bin : manifest.bin?.[executable]
+        const bin = typeof raw === 'string' ? raw.replace(/\\/g, '/').replace(/^\.\//, '') : ''
+        if (!bin || bin.split('/').some(part => !part || part === '..') || isAbsolute(bin)) continue
+        const entry = await realpath(join(packageRoot, ...bin.split('/')))
+        if (!within(packageRoot, entry) || !(await stat(entry)).isFile()) continue
+        entries.push({ entry, packageRoot, version: String(manifest.version ?? '') })
+      }
+    } catch { /* not the selected tool's usable package */ }
+  }
+  // pnpm normally has one active global tree. Prefer the highest numbered
+  // layout when multiple layouts survive an upgrade, following its directories.
+  return entries.at(-1) ?? null
+}
+
+async function terminalNode(workspace, minimum, acceptedVersion) {
+  const { findNodeExecutable } = await import('./official-tool-executor.mjs')
+  return findNodeExecutable(workspace, minimum, acceptedVersion)
+}
+
+function executableLaunch(file, args, display, { platform, env }) {
+  if (platform !== 'win32') return { file, args, verbatim: false, display }
+  const extension = extname(file).toLowerCase()
+  if (extension === '.cmd' || extension === '.bat') {
+    const comspec = env.ComSpec || env.COMSPEC || 'cmd.exe'
+    const tail = `/d /s /c "${[quoteWindows(file), ...args].join(' ')}"`
+    return { file: comspec, args: tail, verbatim: true, display }
+  }
+  if (extension === '.ps1') {
+    const root = env.SystemRoot || env.SYSTEMROOT || 'C:\\Windows'
+    return { file: `${root}\\System32\\WindowsPowerShell\\v1.0\\powershell.exe`, args: ['-NoLogo', '-NoProfile', '-File', file, ...args], verbatim: false, display }
+  }
+  return { file, args, verbatim: false, display }
+}
+
 /**
  * Build the fixed launch for one target. `locate(executable)` returns the
  * candidate paths `where`/`which` printed. Returns
@@ -92,6 +164,9 @@ const quoteWindows = path => `"${String(path).replace(/"/g, '')}"`
  */
 export async function resolveTerminalLaunch(target, mode = 'interactive', {
   platform = process.platform, env = process.env, locate = defaultLocate,
+  preferences = {}, home = homedir(), cwd = process.cwd(),
+  packageEntry = findTerminalPackageEntry, fileExists = async path => (await stat(path).catch(() => null))?.isFile() === true,
+  discoverBundle = discoverZCodeBundle, findNode = terminalNode,
 } = {}) {
   if (target === TERMINAL_SHELL_ID) {
     if (platform === 'win32') {
@@ -104,9 +179,47 @@ export async function resolveTerminalLaunch(target, mode = 'interactive', {
   }
   if (!TERMINAL_TOOL_IDS.includes(target)) throw new Error('只能启动系统终端或固定注册表中的官方 CLI。')
   const tool = getOfficialTool(target)
+  if (target === 'zcode') {
+    if (platform !== 'win32') throw new Error('当前仅支持 Windows ZCode 桌面版内置 TUI。')
+    const bundle = await discoverBundle({ installDir: preferences.zcodeInstallDir, env })
+    if (!bundle) throw new Error('未找到通过智谱签名与组件核验的 ZCode 桌面版；请先配置 ZCode 独立安装目录并重新体检。')
+    const node = await findNode(cwd, [24, 14, 0], version => Number(String(version).split('.')[0]) === 24)
+    // The verified desktop's electron-node entry is usable independently of
+    // its GUI. It supplies its own runtime when external Node 24 is absent.
+    return { file: node || bundle.executable, args: [bundle.cliEntry], verbatim: false,
+      display: `ZCode TUI · ${bundle.cliEntry}`, ...(!node ? { env: { ELECTRON_RUN_AS_NODE: '1' } } : {}) }
+  }
   const executable = tool.probeExecutables[0]
   const args = mode === 'login' ? [...(TERMINAL_LOGIN_ARGS[target] ?? [])] : []
   const display = [executable, ...args].join(' ')
+  const selectedScript = installMethodFor(tool, preferences.methods?.[target])?.kind === 'script'
+  const selectedPreferences = selectedScript ? { ...preferences, allowScriptInstall: true } : preferences
+  const plan = resolveInstallPlan(tool, undefined, selectedPreferences, { platform, env, home })
+  const configured = Boolean(preferences.installDir || preferences.methods?.[target])
+  if (plan.kind === 'package-manager' && configured) {
+    const boundPlan = plan.installDir ? plan : await (await import('./official-tools-runtime.mjs')).resolvePackageJobPlan(tool, plan, selectedPreferences, { options: { platform, env, home } })
+    const found = await packageEntry(tool, boundPlan, { platform })
+    if (!found) throw new Error(`未在所选 ${boundPlan.manager} 安装目录中找到 ${tool.label} 的真实命令入口；请重新体检或修复。`)
+    const extension = extname(found.entry).toLowerCase()
+    if (['.js', '.mjs', '.cjs'].includes(extension) || (platform === 'win32' && !extension)) {
+      const node = await findNode(cwd)
+      if (!node) throw new Error(`未找到可核验的 Node.js 运行时，无法启动 ${tool.label}。`)
+      return { file: node, args: [found.entry, ...args], verbatim: false, display }
+    }
+    return executableLaunch(found.entry, args, display, { platform, env })
+  }
+  if (plan.kind === 'script' && plan.binDir) {
+    for (const name of tool.probeExecutables) {
+      const filenames = platform === 'win32' ? WINDOWS_PREFERENCE.map(extension => `${name}${extension}`) : [name]
+      for (const filename of filenames) {
+        const file = join(plan.binDir, filename)
+        if (await fileExists(file)) return executableLaunch(file, args, display, { platform, env })
+      }
+    }
+    // A saved method or directory is authoritative: an older PATH copy cannot
+    // satisfy a missing install in the user's selected tool directory.
+    if (configured || tool.manager === 'script-installer') throw new Error(`未在所选安装目录 ${plan.binDir} 中找到 ${tool.label}；请重新体检或安装。`)
+  }
   const candidates = await locate(executable, { platform, env })
   if (platform !== 'win32') {
     const file = candidates.map(item => String(item).trim()).find(item => item.startsWith('/'))
@@ -115,18 +228,7 @@ export async function resolveTerminalLaunch(target, mode = 'interactive', {
   }
   const file = pickWindowsExecutable(candidates)
   if (!file) throw new Error(`未在 PATH 中找到 ${executable}；请先在“官方工具 · 体检”中安装 ${tool.label}。`)
-  const extension = extname(file).toLowerCase()
-  if (extension === '.cmd' || extension === '.bat') {
-    // npm shims only run under cmd.exe. Every token is fixed by the registry.
-    const comspec = env.ComSpec || env.COMSPEC || 'cmd.exe'
-    const tail = `/d /s /c "${[quoteWindows(file), ...args].join(' ')}"`
-    return { file: comspec, args: tail, verbatim: true, display }
-  }
-  if (extension === '.ps1') {
-    const root = env.SystemRoot || env.SYSTEMROOT || 'C:\\Windows'
-    return { file: `${root}\\System32\\WindowsPowerShell\\v1.0\\powershell.exe`, args: ['-NoLogo', '-NoProfile', '-File', file, ...args], verbatim: false, display }
-  }
-  return { file, args, verbatim: false, display }
+  return executableLaunch(file, args, display, { platform, env })
 }
 
 /** Locate an executable with where.exe / which (fixed registry names only). */
@@ -161,7 +263,10 @@ function spawnPtyProcess(pty, launch, { cwd, cols, rows, env }) {
 
 /** Pipe fallback: no TTY; the Host echoes input and maps Enter/Ctrl+C. */
 export function spawnPipeProcess(launch, { cwd, env, platform = process.platform, spawnImpl = spawn }) {
-  const child = spawnImpl(launch.file, launch.args, {
+  // node-pty accepts a Windows command-line string; node:child_process needs
+  // an array even with windowsVerbatimArguments. Keep the prepared tail intact.
+  const args = typeof launch.args === 'string' ? [launch.args] : launch.args
+  const child = spawnImpl(launch.file, args, {
     cwd, env, stdio: ['pipe', 'pipe', 'pipe'], windowsHide: true, shell: false,
     windowsVerbatimArguments: launch.verbatim === true,
   })
@@ -220,6 +325,8 @@ export function createTerminalManager({
   statPath = stat,
   prepare = async () => {},
   environment = () => terminalEnvironment(process.env),
+  preferences = () => ({}),
+  launchOptions = () => ({}),
   onSessionEnd = () => {},
   now = Date.now,
   platform = process.platform,
@@ -329,10 +436,11 @@ export function createTerminalManager({
       try { info = await statPath(request.cwd) } catch { info = null }
       if (!info?.isDirectory?.()) throw new Error(`工作目录不存在或不是目录：${request.cwd}`)
       await prepare()
-      const launch = await resolveLaunch(request.target, request.mode, { platform })
       const env = environment()
+      const launch = await resolveLaunch(request.target, request.mode, { ...launchOptions(), platform, env,
+        preferences: preferences(), cwd: request.cwd })
       const backend = backendInfo()
-      const options = { cwd: request.cwd, cols: request.cols, rows: request.rows, env, platform }
+      const options = { cwd: request.cwd, cols: request.cols, rows: request.rows, env: { ...env, ...launch.env }, platform }
       let proc
       try {
         proc = backend.backend === 'pty'

package/.dsh-plugin/shared/official-tool-executor.mjs

@@ -345,7 +345,7 @@ function nodeVersion(entry, pattern = /^v(\d+\.\d+\.\d+)/) {
   })
 }
 
-async function findNodeExecutable(workspace, minimum = [22, 19, 0], acceptedVersion = () => true) {
+export async function findNodeExecutable(workspace, minimum = [22, 19, 0], acceptedVersion = () => true) {
   await ensureNpmPrefixOnPath()
   const candidates = [process.execPath, ...pathDirectories().map(directory => join(directory, IS_WINDOWS ? 'node.exe' : 'node'))]
   for (const candidate of candidates) {
@@ -586,7 +586,7 @@ async function launchSpec(toolId, workspace, mode, modelId, task = 'Check readin
     }
   }
   if (toolId === 'zcode') {
-    const found = await discoverZCodeBundle()
+    const found = await discoverZCodeBundle({ installDir: (selectionOptions?.preferences ?? installPreferences()).zcodeInstallDir })
     if (!found) return { unsupported: '未找到具有智谱有效签名、且 CLI 脚本与首次核验记录一致的 ZCode 桌面版。' }
     const nodeExecutable = await findNodeExecutable(workspace, [24, 14, 0], version =>
       Number(String(version).split('.')[0]) === 24)
@@ -676,17 +676,17 @@ export function harnessSandboxBlocker(toolId, platform = process.platform) {
 /** Check the actual trusted launch entry without starting an account call. */
 export async function officialToolReadiness(toolId, workspace = process.cwd(), selectionOptions = {}) {
   const tool = getOfficialTool(toolId)
-  if (!tool) return { id: String(toolId), ready: false, reason: '工具不在固定官方注册表中。' }
+  if (!tool) return { id: String(toolId), supported: false, ready: false, reason: '工具不在固定官方注册表中。' }
   const capability = CAPABILITIES[tool.id]
-  if (!capability?.supported) return { id: tool.id, ready: false, reason: capability?.reason ?? '当前平台不支持托管执行。' }
+  if (!capability?.supported) return { id: tool.id, supported: false, ready: false, reason: capability?.reason ?? '当前平台不支持托管执行。' }
   try {
     const directory = await checkedWorkspace(workspace)
     const spec = await launchSpec(tool.id, directory, capability.modes[0], null, undefined, selectionOptions)
     return spec.unsupported
-      ? { id: tool.id, ready: false, reason: spec.unsupported }
-      : { id: tool.id, ready: true, source: spec.source, modes: capability.modes }
+      ? { id: tool.id, supported: true, ready: false, reason: spec.unsupported }
+      : { id: tool.id, supported: true, ready: true, source: spec.source, modes: capability.modes }
   } catch (error) {
-    return { id: tool.id, ready: false, reason: String(error?.message ?? error).slice(0, 300) }
+    return { id: tool.id, supported: true, ready: false, reason: String(error?.message ?? error).slice(0, 300) }
   }
 }
 

package/.dsh-plugin/shared/official-tool-registry.mjs

@@ -45,7 +45,7 @@ function scriptMethod(id, label, {
   shell, scriptUrl, verify, installArg = [], env = [], platforms,
   supportsInstallDir = false, installDirEnv = '', installDirSuffix = '',
   defaultScriptInstallDir, defaultScriptInstallDirEnv, scriptBinaryNames,
-  registryEnv, installDirSubdir, uninstallUnsupportedReason, scriptFallbackUrls,
+  registryEnv, installDirSubdir, legacySharedInstallDir = false, sharedDefaultBin = false, uninstallUnsupportedReason, scriptFallbackUrls,
 }) {
   return Object.freeze({
     id,
@@ -64,6 +64,8 @@ function scriptMethod(id, label, {
     installDirEnv,
     installDirSuffix,
     ...(installDirSubdir ? { installDirSubdir } : {}),
+    ...(legacySharedInstallDir ? { legacySharedInstallDir: true } : {}),
+    ...(sharedDefaultBin ? { sharedDefaultBin: true } : {}),
     ...(uninstallUnsupportedReason ? { uninstallUnsupportedReason } : {}),
     ...(defaultScriptInstallDir ? { defaultScriptInstallDir } : {}),
     ...(defaultScriptInstallDirEnv ? { defaultScriptInstallDirEnv } : {}),
@@ -96,6 +98,7 @@ export const OFFICIAL_TOOLS = Object.freeze([
         shell: 'bash', scriptUrl: 'https://code.kimi.com/kimi-code/install.sh',
         platforms: ['linux', 'darwin'], supportsInstallDir: true,
         installDirEnv: 'KIMI_INSTALL_DIR', installDirSuffix: 'bin',
+        installDirSubdir: 'kimi-code', legacySharedInstallDir: true,
         env: ['KIMI_INSTALL_DIR'],
         scriptBinaryNames: ['kimi'],
         verify: Object.freeze({ mustInclude: ['kimi-code', 'code.kimi.com/kimi-code'] }),
@@ -104,6 +107,7 @@ export const OFFICIAL_TOOLS = Object.freeze([
         shell: 'powershell', scriptUrl: 'https://code.kimi.com/kimi-code/install.ps1',
         platforms: ['win32'], supportsInstallDir: true,
         installDirEnv: 'KIMI_INSTALL_DIR', installDirSuffix: 'bin',
+        installDirSubdir: 'kimi-code', legacySharedInstallDir: true,
         env: ['KIMI_INSTALL_DIR'],
         scriptBinaryNames: ['kimi.exe'],
         verify: Object.freeze({ mustInclude: ['kimi-code', 'code.kimi.com/kimi-code'] }),
@@ -135,6 +139,7 @@ export const OFFICIAL_TOOLS = Object.freeze([
         scriptFallbackUrls: ['https://downloads.claude.ai/claude-code-releases/bootstrap.sh'],
         platforms: ['linux', 'darwin'],
         scriptBinaryNames: ['claude'],
+        sharedDefaultBin: true,
         verify: Object.freeze({ mustInclude: ['downloads.claude.ai/claude-code-releases', 'manifest.json'] }),
       }),
       scriptMethod('script-powershell', 'irm | iex', {
@@ -142,6 +147,7 @@ export const OFFICIAL_TOOLS = Object.freeze([
         scriptFallbackUrls: ['https://downloads.claude.ai/claude-code-releases/bootstrap.ps1'],
         platforms: ['win32'],
         scriptBinaryNames: ['claude.exe'],
+        sharedDefaultBin: true,
         verify: Object.freeze({ mustInclude: ['downloads.claude.ai/claude-code-releases', 'manifest.json'] }),
       }),
     ]),
@@ -167,6 +173,8 @@ export const OFFICIAL_TOOLS = Object.freeze([
         shell: 'sh', scriptUrl: 'https://chatgpt.com/codex/install.sh',
         platforms: ['linux', 'darwin'], supportsInstallDir: true,
         installDirEnv: 'CODEX_INSTALL_DIR', env: ['CODEX_INSTALL_DIR'],
+        installDirSubdir: 'codex/bin', legacySharedInstallDir: true,
+        sharedDefaultBin: true,
         scriptBinaryNames: ['codex'],
         verify: Object.freeze({ mustInclude: ['releases.openai.com/codex', 'CODEX_INSTALL_DIR'] }),
       }),
@@ -210,6 +218,7 @@ export const OFFICIAL_TOOLS = Object.freeze([
         shell: 'bash', scriptUrl: 'https://filecdn.minimax.chat/public/install.sh',
         platforms: ['linux', 'darwin'], supportsInstallDir: true,
         installDirEnv: 'MCODE_INSTALL_DIR', installDirSuffix: 'bin',
+        installDirSubdir: 'minimax-code', legacySharedInstallDir: true,
         registryEnv: 'MCODE_NPM_REGISTRY', env: ['MCODE_INSTALL_DIR', 'MCODE_NPM_REGISTRY'],
         verify: Object.freeze({ mustInclude: ['MiniMax Code CLI', '@minimax-ai/code'] }),
       }),
@@ -217,6 +226,7 @@ export const OFFICIAL_TOOLS = Object.freeze([
         shell: 'powershell', scriptUrl: 'https://filecdn.minimax.chat/public/install.ps1',
         platforms: ['win32'], supportsInstallDir: true,
         installDirEnv: 'MCODE_INSTALL_DIR',
+        installDirSubdir: 'minimax-code', legacySharedInstallDir: true,
         registryEnv: 'MCODE_NPM_REGISTRY', env: ['MCODE_INSTALL_DIR', 'MCODE_NPM_REGISTRY'],
         defaultScriptInstallDir: '.minimax-code',
         scriptBinaryNames: ['mcode.cmd', 'mcode.ps1', 'mcode-tools.cmd', 'mcode-tools.ps1'],
@@ -250,6 +260,7 @@ export const OFFICIAL_TOOLS = Object.freeze([
         shell: 'powershell', scriptUrl: 'https://mimo.xiaomi.com/install.ps1',
         platforms: ['win32'], supportsInstallDir: true,
         installDirEnv: 'MIMOCODE_INSTALL_DIR', env: ['MIMOCODE_INSTALL_DIR'],
+        installDirSubdir: 'mimo-code', legacySharedInstallDir: true,
         scriptBinaryNames: ['mimo.exe'],
         verify: Object.freeze({ mustInclude: ['mimo.xiaomi.com', '.mimocode'] }),
       }),
@@ -276,6 +287,7 @@ export const OFFICIAL_TOOLS = Object.freeze([
         shell: 'bash', scriptUrl: 'https://x.ai/cli/install.sh',
         platforms: ['linux', 'darwin'], supportsInstallDir: true,
         installDirEnv: 'GROK_BIN_DIR', env: ['GROK_BIN_DIR'],
+        installDirSubdir: 'grok-build', legacySharedInstallDir: true,
         scriptBinaryNames: ['grok', 'agent'],
         verify: Object.freeze({ mustInclude: ['Grok CLI installer', 'x.ai/cli'] }),
       }),
@@ -283,6 +295,7 @@ export const OFFICIAL_TOOLS = Object.freeze([
         shell: 'powershell', scriptUrl: 'https://x.ai/cli/install.ps1',
         platforms: ['win32'], supportsInstallDir: true,
         installDirEnv: 'GROK_BIN_DIR', env: ['GROK_BIN_DIR'],
+        installDirSubdir: 'grok-build', legacySharedInstallDir: true,
         scriptBinaryNames: ['grok.exe', 'agent.exe', 'grove.exe', 'grove-fsmonitor.exe', 'grove-credential.exe'],
         verify: Object.freeze({ mustInclude: ['Grok CLI installer', 'x.ai/cli'] }),
       }),
@@ -365,6 +378,9 @@ export const OFFICIAL_TOOLS = Object.freeze([
         installArg: ['--install-dir'],
         env: ['STEP_INSTALL_DIR', 'STEP_RELEASE_BASE_URL'],
         supportsInstallDir: true,
+        // The installer replaces its runtime directories, including the entire
+        // node_modules tree on Windows. It must own a dedicated directory.
+        installDirSubdir: 'stepcode', legacySharedInstallDir: true,
         verify: Object.freeze({
           mustInclude: ['static-openapi.stepfun.com', 'stepcode installer'],
           mustNotInclude: ['anomalyco/opencode'],
@@ -377,6 +393,7 @@ export const OFFICIAL_TOOLS = Object.freeze([
         installArg: ['-InstallDir'],
         env: ['STEP_INSTALL_DIR', 'STEP_RELEASE_BASE_URL'],
         supportsInstallDir: true,
+        installDirSubdir: 'stepcode', legacySharedInstallDir: true,
         verify: Object.freeze({
           mustInclude: ['static-openapi.stepfun.com', 'stepcode'],
           mustNotInclude: ['anomalyco/opencode'],
@@ -388,12 +405,12 @@ export const OFFICIAL_TOOLS = Object.freeze([
     id: 'zcode',
     label: 'ZCode',
     vendor: 'Z.ai',
-    purpose: '智谱官方 ZCode 桌面版，内含 GLM 编程代理。Windows 安装器可选择 D 盘目录。',
+    purpose: '智谱官方 ZCode 桌面版，内含可独立运行的 GLM CLI/TUI。可单独配置桌面目录，内置 CLI 随桌面版更新。',
     manager: 'signed-windows-installer',
     installArgs: [],
     uninstallArgs: [],
     probeExecutables: [],
-    probeNote: '检测经过有效签名的 ZCode.exe 和同目录 GLM 资源；桌面安装器需人工选择安装位置。',
+    probeNote: '检测经过有效签名的 ZCode.exe 和同目录 GLM CLI/TUI 资源；桌面安装器需人工选择安装位置。',
     providerHints: ['zai', 'z.ai', 'zcode', 'glm', 'zhipu', 'bigmodel'],
   }),
 ])