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

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

@@ -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)

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

@@ -405,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'],
   }),
 ])

package/.dsh-plugin/shared/official-tools-runtime.mjs

@@ -60,7 +60,7 @@ export const CLAUDE_UPDATE_ARGS = Object.freeze(['update'])
  * and script source). Refreshed on apply and live config updates, so a client
  * can only ever pick a method id — these addresses never arrive over the wire.
  */
-let preferences = { installDir: '', registry: '', methods: {}, scriptUrls: {}, allowScriptInstall: true }
+let preferences = { installDir: '', registry: '', methods: {}, scriptUrls: {}, allowScriptInstall: true, zcodeInstallDir: '' }
 
 export function setInstallPreferences(next) {
   if (next && typeof next === 'object') {
@@ -868,10 +868,13 @@ async function probeUncached(tool, runner, { selectedPreferences, plan, fileExis
   }
   if (tool.manager === 'signed-windows-installer') {
     let rejected = null
-    const bundle = await discoverZCodeBundle({ onRejected: value => { rejected ??= value } })
+    const bundle = await discoverZCodeBundle({ installDir: (selectedPreferences ?? preferences).zcodeInstallDir,
+      onRejected: value => { rejected ??= value } })
     if (bundle) return { id: tool.id, installed: true, version: bundle.version, status: 'installed',
-      detail: `${tool.probeNote} 安装目录：${bundle.root}`, bannerLine: `${tool.label} ${bundle.buildVersion}` }
-    if (rejected) return { id: tool.id, installed: false, version: null, status: 'not-installed', detail: `检测到已安装的 ZCode ${rejected.version}（${rejected.root}）：${rejected.rejected}` }
+      detail: `${tool.probeNote} 安装目录：${bundle.root}`, bannerLine: `${tool.label} 桌面版 ${bundle.buildVersion}`,
+      installDir: bundle.root, cliEntry: bundle.cliEntry, source: bundle.source }
+    if (rejected) return { id: tool.id, installed: false, version: null, status: 'not-installed',
+      detail: rejected.version ? `检测到 ZCode ${rejected.version}（${rejected.root}）：${rejected.rejected}` : rejected.rejected }
     const other = (await unverifiedZCodeInstalls().catch(() => []))[0]
     return { id: tool.id, installed: false, version: null, status: 'not-installed',
       detail: other
@@ -1589,30 +1592,43 @@ async function runInstallJob(installPlan, job) {
   await finishVerifiedInstall(job, probe)
 }
 
-async function runZCodeInstallJob(job) {
+export async function runZCodeInstallJob(job, {
+  probe = probeToolWith, lookup = (...args) => latestVersions.lookup(...args),
+  openInstaller = openZCodeInstaller, capture = runCapture,
+} = {}) {
   if (job.status !== 'running') return
   job.phase = 'preflight'
   probeCache.delete(job.tool.id)
-  const before = await probeToolWith(job.tool, defaultRunner)
+  const before = await probe(job.tool, defaultRunner, { preferences: job.preferences, cacheMs: 0 })
   if (job.cancelRequested) { markCancelled(job); return }
-  const latest = await latestVersions.lookup(job.tool, { fresh: true }).catch(() => null)
+  const latest = await lookup(job.tool, { fresh: true }).catch(() => null)
   if (job.cancelRequested) { markCancelled(job); return }
-  if (before.installed && latest?.version && (compareReleaseVersions(before.version, latest.version) ?? -1) >= 0) {
+  const desktopOrder = before.installed && latest?.version ? compareReleaseVersions(before.version, latest.version) : null
+  if (before.installed && desktopOrder === null) {
+    job.status = 'failed'
+    job.phase = 'done'
+    job.finishedAt = new Date().toISOString()
+    job.error = '无法核实 ZCode 最新桌面版本；保留当前安装，网络恢复后重试检查更新。'
+    return
+  }
+  if (desktopOrder === 1 || (job.operation !== 'repair' && desktopOrder === 0)) {
     job.status = 'succeeded'
     job.phase = 'done'
     job.finishedAt = new Date().toISOString()
     job.postInstallProbe = before
-    pushLine(job, `— 已找到 ZCode ${before.version}（最新 ${latest.version}），无需重复打开安装器 —`)
+    pushLine(job, desktopOrder === 1
+      ? `— ZCode ${before.version} 高于下载页的 ${latest.version}，不会打开旧版安装器降级；TUI 使用当前桌面内置入口 —`
+      : `— 已找到 ZCode ${before.version}（最新 ${latest.version}），无需重复打开安装器；TUI 使用当前桌面内置入口 —`)
     return
   }
-  const prefix = await runCapture('npm', ['config', 'get', 'prefix'], {
+  const prefix = await capture('npm', ['config', 'get', 'prefix'], {
     timeoutMs: 5_000, useShell: IS_WINDOWS, signal: job.controller.signal,
   })
   if (job.cancelRequested) { markCancelled(job); return }
   job.phase = 'downloading-and-verifying'
   let lastProgress = 0
   try {
-    const opened = await openZCodeInstaller({
+    const opened = await openInstaller({
       latest,
       npmPrefix: prefix.ok ? prefix.stdout.trim() : undefined,
       signal: job.controller.signal,
@@ -1629,7 +1645,11 @@ async function runZCodeInstallJob(job) {
     job.finishedAt = new Date().toISOString()
     probeCache.delete(job.tool.id)
     pushLine(job, `已验证发布者签名并打开 ZCode ${opened.version} 官方安装器：${opened.installerPath}`)
-    pushLine(job, '请在原厂安装界面选择非 C 盘目录；完成后点击“重新检测”。')
+    const desktopDirectory = before.installDir || (/[\\/]ZCode\.exe$/i.test(job.preferences.zcodeInstallDir ?? '')
+      ? dirname(job.preferences.zcodeInstallDir) : job.preferences.zcodeInstallDir)
+    pushLine(job, desktopDirectory
+      ? `请在原厂安装界面选择原桌面安装目录 ${desktopDirectory}；完成后重新体检，内置 TUI 随桌面版更新。`
+      : '请在原厂安装界面选择独立的 ZCode 桌面目录；完成后保存该目录并重新体检，内置 TUI 随桌面版更新。')
   } catch (error) {
     if (job.cancelRequested || job.controller.signal.aborted) { markCancelled(job); return }
     job.status = 'failed'
@@ -1700,5 +1720,5 @@ export function resetForTests() {
   installJobs.clear()
   installChain = Promise.resolve()
   prefixPromise = null
-  preferences = { installDir: '', registry: '', methods: {}, scriptUrls: {}, allowScriptInstall: true }
+  preferences = { installDir: '', registry: '', methods: {}, scriptUrls: {}, allowScriptInstall: true, zcodeInstallDir: '' }
 }

package/.dsh-plugin/shared/tool-install-preferences.mjs

@@ -70,6 +70,26 @@ export function expandInstallDir(value, { home = '', env = {} } = {}) {
   return expanded
 }
 
+/** ZCode's existing desktop bundle is selected independently of npm's prefix. */
+export function normalizeZCodeInstallDir(value, options = {}) {
+  const input = String(value ?? '')
+  if (/[\x00-\x1f]/.test(input)) throw new Error('ZCode 安装位置包含无效字符。')
+  const raw = input.trim().replace(/^"(.*)"$/, '$1')
+  if (!raw) return ''
+  let path
+  try { path = expandInstallDir(raw, options) } catch (error) {
+    throw new Error(`ZCode 安装位置无效：${error.message}`)
+  }
+  // Discovery and Authenticode verification operate on local Windows files.
+  if (!/^[A-Za-z]:[\\/]/.test(path)) {
+    throw new Error('ZCode 安装位置必须是 Windows 本地绝对目录或 ZCode.exe 路径。')
+  }
+  if (/\.exe[\\/]*$/i.test(path) && !/[\\/]ZCode\.exe[\\/]*$/i.test(path)) {
+    throw new Error('ZCode 程序路径必须指向官方 ZCode.exe。')
+  }
+  return path.replace(/[\\/]+$/, '')
+}
+
 /** Only https mirrors are accepted; a plain-http script source can be tampered with in transit. */
 export function normalizeSourceUrl(value, subject) {
   const raw = String(value ?? '').trim()
@@ -116,6 +136,7 @@ function keepKnownToolIds(raw, known, subject) {
 export function parseInstallPreferences(config = {}, { tools = [], home = '', env = {} } = {}) {
   const known = new Set(tools.map(tool => tool.id))
   const installDir = expandInstallDir(valueOf(config, 'toolInstallDir', ''), { home, env })
+  const zcodeInstallDir = normalizeZCodeInstallDir(valueOf(config, 'zcodeInstallDir', ''), { home, env })
   const registry = normalizeSourceUrl(valueOf(config, 'toolNpmRegistry', DEFAULT_NPM_REGISTRY), 'npm 源') || DEFAULT_NPM_REGISTRY
   const methodRaw = keepKnownToolIds(
     parseJsonObject(valueOf(config, 'toolInstallMethodsJson', '{}'), '安装方式覆盖'), known, '安装方式覆盖')
@@ -134,6 +155,7 @@ export function parseInstallPreferences(config = {}, { tools = [], home = '', en
   }
   return {
     installDir,
+    zcodeInstallDir,
     registry,
     methods,
     scriptUrls,

package/.dsh-plugin/shared/zcode-bundle.mjs

@@ -46,6 +46,14 @@ function powershellPath(env) {
   return join(systemRoot, 'System32', 'WindowsPowerShell', 'v1.0', 'powershell.exe')
 }
 
+/** PowerShell 7's module path can prevent Windows PowerShell 5.1 loading Security. */
+export function zcodeWindowsPowerShellEnvironment(env = process.env) {
+  return {
+    ...env,
+    PSModulePath: join(env.SystemRoot || env.windir || 'C:\\Windows', 'System32', 'WindowsPowerShell', 'v1.0', 'Modules'),
+  }
+}
+
 async function powershellJson(script, env, extraEnv = {}) {
   if (process.platform !== 'win32') return null
   const command = Buffer.from(
@@ -62,7 +70,7 @@ async function powershellJson(script, env, extraEnv = {}) {
       encoding: 'utf8',
       timeout: 10_000,
       maxBuffer: 256_000,
-      env: { ...env, ...extraEnv },
+      env: { ...zcodeWindowsPowerShellEnvironment(env), ...extraEnv },
     })
     const output = stdout.trim().replace(/^\uFEFF/, '')
     return output ? JSON.parse(output) : null
@@ -94,13 +102,21 @@ function rootFromCommand(value) {
   return executable && win32.isAbsolute(executable) ? dirname(executable) : null
 }
 
-function candidateRoots(env, records) {
+/** Explicit selection is authoritative, even when the selected bundle is missing. */
+export function zcodeDiscoveryCandidates({ installDir = '', env = process.env, records = [] } = {}) {
   const candidates = []
   const add = (path, source, registryVersion = null) => {
     if (typeof path !== 'string' || !path.trim()) return
     candidates.push({ path: path.trim().replace(/^"|"$/g, ''), source, registryVersion })
   }
-  add(env[ZCODE_INSTALL_ENV_VAR], 'operator-env')
+  if (installDir != null && String(installDir).trim()) {
+    add(installDir, 'operator-config')
+    return candidates
+  }
+  if (env[ZCODE_INSTALL_ENV_VAR] != null && String(env[ZCODE_INSTALL_ENV_VAR]).trim()) {
+    add(env[ZCODE_INSTALL_ENV_VAR], 'operator-env')
+    return candidates
+  }
   for (const record of records) {
     const version = String(record.displayVersion || '') || null
     add(record.installLocation, 'uninstall-registry', version)
@@ -204,7 +220,7 @@ async function checkedBundle(candidate, env, trustPath) {
   const input = candidate.path
   if (!localWindowsPath(input)) return null
   try {
-    const initial = input.toLowerCase().endsWith('\\zcode.exe') ? dirname(input) : input
+    const initial = /[\\/]zcode\.exe$/i.test(input) ? dirname(input) : input
     const root = await realpath(initial)
     if (!localWindowsPath(root) || !(await stat(root)).isDirectory()) return null
     const executable = await realpath(join(root, 'ZCode.exe'))
@@ -239,18 +255,23 @@ async function checkedBundle(candidate, env, trustPath) {
   }
 }
 
-/** Return the first verified local bundle (any version), or null when none is usable. */
-export async function discoverZCodeBundle({ env = process.env, trustPath = zcodeTrustPath(env), onRejected } = {}) {
+/** A configured desktop location never falls back to a different installation. */
+export async function discoverZCodeBundle({ installDir = '', env = process.env, trustPath = zcodeTrustPath(env), onRejected } = {}) {
   if (process.platform !== 'win32') return null
-  const records = await uninstallRecords(env)
+  const explicit = Boolean(String(installDir || env[ZCODE_INSTALL_ENV_VAR] || '').trim())
+  const records = explicit ? [] : await uninstallRecords(env)
   const seen = new Set()
-  for (const candidate of candidateRoots(env, records)) {
+  for (const candidate of zcodeDiscoveryCandidates({ installDir, env, records })) {
     const key = win32.normalize(candidate.path).toLowerCase()
     if (seen.has(key)) continue
     seen.add(key)
     const bundle = await checkedBundle(candidate, env, trustPath)
     if (bundle?.rejected) { onRejected?.(bundle); continue }
     if (bundle) return bundle
+    if (explicit) onRejected?.({
+      root: candidate.path,
+      rejected: `指定的 ZCode 安装位置 ${candidate.path} 不存在，或未通过官方签名、桌面内置 CLI 和目录边界核验；请检查独立安装位置。`,
+    })
   }
   return null
 }

package/.dsh-plugin/shared/zcode-installer.mjs

@@ -19,7 +19,7 @@ import { dirname, isAbsolute, join, relative, sep } from 'node:path'
 import { Readable, Transform } from 'node:stream'
 import { pipeline } from 'node:stream/promises'
 import { promisify } from 'node:util'
-import { ZCODE_SIGNER } from './zcode-bundle.mjs'
+import { ZCODE_SIGNER, zcodeWindowsPowerShellEnvironment } from './zcode-bundle.mjs'
 import { getOfficialTool } from './official-tool-registry.mjs'
 import { latestVersions } from './latest-versions.mjs'
 
@@ -118,7 +118,7 @@ async function verifyInstallerSignature(path, env) {
       encoding: 'utf8',
       timeout: 120_000,
       maxBuffer: 16_384,
-      env: { ...env, MODEL_ROUTER_ZCODE_INSTALLER_PATH: path },
+      env: { ...zcodeWindowsPowerShellEnvironment(env), MODEL_ROUTER_ZCODE_INSTALLER_PATH: path },
     })
     const signature = JSON.parse(stdout.trim().replace(/^\uFEFF/, ''))
     return signature.status === 'Valid'

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.19.0 — 2026-10-12
+
+Stable minor under the npm latest tag. Fully quit Harness (including its tray or WebUI Host process) and restart after upgrading.
+
+- Synchronize interactive terminal targets with the complete official-tool registry, adding OpenCode, Step Code and the verified Windows ZCode desktop-bundled TUI. Terminal refresh discovers current installations; older requests and health snapshots cannot restore stale target lists.
+- Resolve terminals from the saved package manager, package entry or private script directory. Refuse to launch a different PATH copy when the selected installation is missing. Fix Windows pipe fallback argument handling for command shims.
+- Add independent ZCode desktop-directory configuration in its tool card and plugin settings. Explicit selection is authoritative; missing, unsigned or modified bundles cannot silently fall back to another desktop. The built-in CLI follows desktop updates, while users configure login, models and plugins in TUI.
+- Offer separate desktop update checks and reinstall controls, preserve reviewed queued-job settings and refuse known downgrades or an unverified latest version. Opening an installer remains distinct from completed installation.
+- Fix ZCode discovery/installer signature checks under inherited PowerShell 7 module paths by using the Windows PowerShell system module directory. Prefer signed external Node 24 for TUI; a verified desktop Electron runtime can run the same bundled entry when Node is unavailable.
+- Add directory, refresh-race, desktop lifecycle and terminal launch regressions. Release notes record full validation and version-only probes of all ten installed CLI entries; no model requests were made.
+
 ## 0.18.2 — 2026-10-12
 
 Stable patch under the npm latest tag. Upgrade and fully restart Harness before using Step install, repair or update.

package/README.md

@@ -1,9 +1,11 @@
 # Model Router · DeepSeek Harness Desktop
 
-Version: **0.18.2**. See [routing research](docs/ROUTING_RESEARCH.zh.md), [mathematical derivation and experiments](docs/ROUTING_DERIVATION_EXPERIMENTS.zh.md), and the [LiveBench evidence audit and validation protocol](docs/ROUTING_LIVEBENCH_VALIDATION.zh.md). The latest public 2026-06-25 score/cost tables are aggregates; its paired question-quality/cost matrix has not been obtained, and no real routing gain is claimed.
+Version: **0.19.0**. See [routing research](docs/ROUTING_RESEARCH.zh.md), [mathematical derivation and experiments](docs/ROUTING_DERIVATION_EXPERIMENTS.zh.md), and the [LiveBench evidence audit and validation protocol](docs/ROUTING_LIVEBENCH_VALIDATION.zh.md). The latest public 2026-06-25 score/cost tables are aggregates; its paired question-quality/cost matrix has not been obtained, and no real routing gain is claimed.
 
 A cost-aware model-routing workbench for **DeepSeek Harness Desktop**. Describe a task, compare your configured models, inspect the plan, and explicitly choose when to execute it.
 
+**0.19.0:** interactive terminals follow the full registry and saved installation, including OpenCode, Step and the ZCode desktop-bundled TUI. ZCode has independent desktop-directory configuration and desktop update/reinstall controls; its bundled CLI follows desktop updates. Fresh terminal discovery discards stale responses.
+
 **0.18.2:** isolates configurable vendor scripts beneath the shared install root, preventing Step from replacing other tools’ npm packages. Gemini/OpenCode installation success is separate from restricted execution support; Windows Gemini uses its verified package entry through Node. Upgrade and restart Harness before updating Step.
 
 **0.18.1:** fixes install-method selection stuck on saving. Saved volatile settings now update Host install preferences immediately; command previews refresh separately from tool inspection.
@@ -20,7 +22,7 @@ A cost-aware model-routing workbench for **DeepSeek Harness Desktop**. Describe
 
 **0.16.0:** [dynamic data and adaptive feedback](docs/ROUTING_ADAPTIVE_LEARNING.zh.md) adds opt-in public benchmark/curated fixed-USD pricing refresh and task-specific, time-decayed, shrinkage-regularized subjective utility. Objective proxy quality floors remain separate. Public sources default off; preferences are shared within one local DSH_HOME and limited to the latest 200 runs. This is not a universal vendor-price scraper or evidence of real quality–cost gains.
 
-Current version: **0.18.2** (`@ljwei-stak/dsh-model-router`). Its declared host compatibility is **DeepSeek Harness Desktop 0.2.0-rc.1 / 0.2.0-rc.2**. The router and [GAL](https://github.com/Alice-Marx/deepseek-harness-galgame) have been independent plugins since 0.12.0.
+Current version: **0.19.0** (`@ljwei-stak/dsh-model-router`). Its declared host compatibility is **DeepSeek Harness Desktop 0.2.0-rc.1 / 0.2.0-rc.2**. The router and [GAL](https://github.com/Alice-Marx/deepseek-harness-galgame) have been independent plugins since 0.12.0.
 
 **0.15.0 changes:** a four-tab workbench with routing advice directly below task planning, protection against stale execution previews, preserved spending totals across history pruning and retries, and a standalone mock UI preview for source development.
 
@@ -38,7 +40,7 @@ For self-testing, follow the [desktop acceptance and quality–cost experiment s
 | Read-only execution | Preview and confirm a routed run from the workbench, or invoke it in an official Harness session. Supported headless CLIs and model-directory API calls return recorded results. |
 | Editable CLI execution | One supported official CLI or a sequential CLI team, using approved isolated Git worktrees and conditional patch integration. |
 | Official tools | Detect, install/update, check launch readiness and inspect login status for ten registry tools; installation jobs have logs and cancellation. |
-| Interactive terminal | PowerShell/system shell and seven CLI targets, including fixed login commands, live output and multiple sessions. |
+| Interactive terminal | PowerShell/system shell and all ten registry CLI targets (ZCode TUI on verified Windows desktop installs), including fixed login commands, live output and multiple sessions. |
 | Costs and subscriptions | Daily/monthly budget checks, economy downgrade or pause, subscription-first routing, quota cooldown and explicit handling of other subscription failures. |
 | History and quality | Per-package results, dependency views, failure details, rerun/reassignment, ratings and optional stronger-model review. |
 | Execution boundaries | Shows what each route can read/write and whether its process uses the Harness sandbox. |
@@ -52,16 +54,16 @@ Generating a route recommendation is local: it does not start a vendor CLI or ma
 Open **Plugins → Add plugin** and enter:
 
 ```text
-@ljwei-stak/dsh-model-router@0.18.2
+@ljwei-stak/dsh-model-router@0.19.0
 ```
 
-Use the official HTTPS npm source `https://registry.npmjs.org/` when a mirror lacks that exact version. Enable the plugin, then fully quit Harness (including its tray process) and restart it. Plugin details should show **0.18.2** and the sidebar should contain **模型路由** (Model Router). A global `npm install -g` alone does not register a Desktop plugin.
+Use the official HTTPS npm source `https://registry.npmjs.org/` when a mirror lacks that exact version. Enable the plugin, then fully quit Harness (including its tray process) and restart it. Plugin details should show **0.19.0** and the sidebar should contain **模型路由** (Model Router). A global `npm install -g` alone does not register a Desktop plugin.
 
 You can instead install a local `.tgz` archive or its extracted inner `package` directory through the plugin manager. Both must contain `package.json` and `.dsh-plugin`. See [releases](https://github.com/Alice-Marx/dsh-model-router/releases) for archived builds, or build your own checkout below.
 
 ### Upgrade from the old package name
 
-The old name `@ljwei-stak/model-router-galgame` ended at 0.13.0. Remove that plugin entry while retaining your profile/application data, then add `@ljwei-stak/dsh-model-router@0.18.2`. Do not keep both entries installed: they share the internal plugin id `model-router-galgame` and tool names. The retained id lets existing router settings and history carry over.
+The old name `@ljwei-stak/model-router-galgame` ended at 0.13.0. Remove that plugin entry while retaining your profile/application data, then add `@ljwei-stak/dsh-model-router@0.19.0`. Do not keep both entries installed: they share the internal plugin id `model-router-galgame` and tool names. The retained id lets existing router settings and history carry over.
 
 For the combined 0.11.x package, back up the profile and export the GAL saves you want to preserve before upgrading. Story playback, artwork, music and saves now belong to the independent `@ljwei-stak/dsh-galgame` package. The detailed save limitations are in [MIGRATION.md](docs/archive/MIGRATION.md).