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

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

@@ -127,6 +127,7 @@ const rerunRequestCodec = strictCodec(`${OFFICIAL_TOOLS_REMOTE_PACKAGE}#RerunReq
     ...(provider ? { provider, model } : {}),
     confirmOverBudget: request.confirmOverBudget === true,
     confirmWrite: request.confirmWrite === true,
+    ...(request.confirmUnsandboxed === undefined ? {} : { confirmUnsandboxed: request.confirmUnsandboxed === true }),
     ...(['api', 'subscription', 'cancel'].includes(request.subscriptionChoice) ? { subscriptionChoice: request.subscriptionChoice } : {}),
   }
 })
@@ -152,11 +153,22 @@ export function parseRunRequest(value) {
     throw new TypeError('budgetUsd must be a non-negative number')
   }
   const confirmed = Array.isArray(request.confirmedReasons) ? request.confirmedReasons : []
+  if (request.executor !== undefined && !['routed', 'official-team'].includes(request.executor)) throw new TypeError('executor is invalid')
+  if (request.executionMode !== undefined && !['read-only', 'workspace-write'].includes(request.executionMode)) throw new TypeError('executionMode is invalid')
+  if (request.executionEnvironment !== undefined && !['harness', 'cli-native'].includes(request.executionEnvironment)) throw new TypeError('executionEnvironment is invalid')
+  const officialTeam = request.executor === 'official-team'
+  if (officialTeam && (request.planMode !== 'team' || provider || model)) throw new TypeError('official-team requires a team plan without an explicit route')
+  if (!officialTeam && request.executionMode === 'workspace-write') throw new TypeError('workspace-write requires official-team')
+  if (request.executionEnvironment === 'cli-native' && (!officialTeam || request.executionMode !== 'workspace-write')) {
+    throw new TypeError('cli-native requires official-team with workspace-write')
+  }
   if (confirmed.length > RUN_CONFIRMATION_CODES.length || confirmed.some(code => !RUN_CONFIRMATION_CODES.includes(code))) {
     throw new TypeError('confirmedReasons contains an unknown reason')
   }
   return {
     task: request.task,
+    ...(officialTeam ? { executor: 'official-team', executionMode: request.executionMode ?? 'read-only',
+      ...(request.executionEnvironment === undefined ? {} : { executionEnvironment: request.executionEnvironment }) } : {}),
     ...(provider ? { provider, model } : {}),
     ...(['single', 'team'].includes(request.planMode) ? { planMode: request.planMode } : {}),
     ...(['economy', 'balanced', 'quality'].includes(request.preset) ? { preset: request.preset } : {}),

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') {
@@ -850,6 +850,22 @@ export async function probeToolWith(tool, runner, {
   return probe
 }
 
+/** Reuse the concrete entry discovered by the installation probe for login checks. */
+export async function loginLaunchForProbe(probe, {
+  workspace = process.cwd(),
+  fileExists = async path => (await stat(path).catch(() => null))?.isFile() === true,
+  findNode = async cwd => (await import('./official-tool-executor.mjs')).findNodeExecutable(cwd),
+} = {}) {
+  if (probe?.installed !== true || !getOfficialTool(probe.id)) return null
+  const entry = probe.packageEntry || probe.executablePath
+  if (typeof entry !== 'string' || !isAbsolute(entry) || !(await fileExists(entry))) return null
+  if (/\.(?:mjs|cjs|js)$/i.test(entry)) {
+    const node = await findNode(workspace)
+    return node ? { file: node, args: [entry], useShell: false } : null
+  }
+  return { file: entry, args: [], useShell: IS_WINDOWS && /\.(?:cmd|bat)$/i.test(entry) }
+}
+
 async function selectedPackageEntries(tool, { plan, preferences: selectedPreferences }) {
   const { findGlobalPackageEntries, officialToolEntrySelection } = await import('./official-tool-executor.mjs')
   const selection = officialToolEntrySelection(tool.id, { preferences: selectedPreferences, plan })
@@ -868,10 +884,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
@@ -885,7 +904,12 @@ async function probeUncached(tool, runner, { selectedPreferences, plan, fileExis
         ...selectedPreferences,
         allowScriptInstall: installMethodFor(tool, selectedPreferences.methods?.[tool.id])?.kind === 'script' ? true : selectedPreferences.allowScriptInstall,
       }, currentInstallOptions())
-    } catch { /* a blocked saved method still allows normal detection */ }
+    } catch (error) {
+      if (usesConfiguredInstallPlan(tool.id, selectedPreferences)) {
+        return { id: tool.id, installed: false, version: null, status: 'probe-failed',
+          detail: `无法检查所选安装方式或目录：${String(error?.message ?? error).slice(0, 200)}` }
+      }
+    }
   }
   // npm and pnpm can write the same shim into a unified bin directory. Its
   // banner belongs to whichever manager wrote it last, not the selected copy.
@@ -1589,30 +1613,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 +1666,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 +1741,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/run-ledger.mjs

@@ -12,12 +12,30 @@ export const MAX_QUALITY_BIAS = 0.04
 const finite = value => typeof value === 'number' && Number.isFinite(value)
 const routeKey = (provider, model) => `${String(provider ?? '')}\u0000${String(model ?? '')}`
 
+function modelIdentity(value) {
+  if (typeof value === 'string' && value.trim()) return value.trim()
+  if (value && typeof value === 'object' && !Array.isArray(value)
+    && typeof value.providerId === 'string' && value.providerId
+    && typeof value.modelId === 'string' && value.modelId) return `${value.providerId}/${value.modelId}`
+  return null
+}
+
 /** USD cost of one package. Prefers a CLI-reported cost, else usage × configured price. */
 export function actualCost(result, pricing) {
   if (result && Object.hasOwn(result, 'reportedCostUsd') && finite(result.reportedCostUsd) && result.reportedCostUsd >= 0) {
     return { costUsd: result.reportedCostUsd, costSource: 'cli-reported' }
   }
   const usage = result && Object.hasOwn(result, 'usage') ? result.usage : null
+  if (usage && result.usageIncomplete === true) return { costUsd: null, costSource: 'usage-incomplete' }
+  if (usage && result.channel === 'official-cli') {
+    const actualModel = modelIdentity(result.actualModel) ?? modelIdentity(result.reportedModel)
+    if (!actualModel) return { costUsd: null, costSource: 'model-unknown' }
+    const pricedModel = pricing?.model ?? result.model
+    const provider = pricing?.provider ?? result.provider
+    const matches = [pricedModel, pricing?.cliModel, provider && pricedModel ? `${provider}/${pricedModel}` : null]
+      .some(value => typeof value === 'string' && value === actualModel)
+    if (!matches) return { costUsd: null, costSource: 'model-price-unverified' }
+  }
   if (!usage || !pricing || !Object.hasOwn(pricing, 'input') || !Object.hasOwn(pricing, 'output')
     || pricing.input === undefined || pricing.input === null || pricing.output === undefined || pricing.output === null) {
     return { costUsd: null, costSource: usage ? 'price-missing' : 'usage-missing' }
@@ -268,12 +286,25 @@ function storedPackage(planned, result, pricing, finishedAt, billingFor = billin
     channel: result?.channel ?? null,
     toolId: result?.toolId ?? null,
     credentialSource: result?.credentialSource ?? null,
-    ...(result?.actualModel ? { actualModel: String(result.actualModel) } : {}),
+    ...(result?.channel === 'official-cli' ? {
+      requestedCliModel: result.requestedCliModel ?? null,
+      actualModel: modelIdentity(result.actualModel) ?? modelIdentity(result.reportedModel),
+      modelNotice: result.modelNotice ?? null,
+    } : {}),
+    ...(result?.channel !== 'official-cli' && result?.actualModel ? { actualModel: String(result.actualModel) } : {}),
+    ...(result?.reportedModel !== undefined ? { reportedModel: result.reportedModel } : {}),
+    ...(typeof result?.source === 'string' ? { source: result.source } : {}),
+    ...(typeof result?.sandboxEnforcement === 'string' ? { sandboxEnforcement: result.sandboxEnforcement } : {}),
+    ...(result?.usageIncomplete === true ? { usageIncomplete: true } : {}),
+    ...(typeof result?.executionEnvironment === 'string' ? { executionEnvironment: result.executionEnvironment } : {}),
+    ...(finite(result?.reportedCostUsd) && result.reportedCostUsd >= 0 ? { reportedCostUsd: result.reportedCostUsd } : {}),
     fallback: result?.fallback ?? null,
     ...(result?.billingMode ? { billingMode: String(result.billingMode) } : {}),
     ...(result?.billingSwitch ? { billingSwitch: { ...result.billingSwitch } } : {}),
     ...(result?.subscriptionRoute ? { subscriptionRoute: { provider: String(result.subscriptionRoute.provider ?? ''), model: String(result.subscriptionRoute.model ?? '') } } : {}),
     error: result?.ok ? null : (result?.error ?? null),
+    ...(!result?.ok && result?.diagnostic ? { diagnostic: String(result.diagnostic).slice(0, 2_000) } : {}),
+    ...(Number.isInteger(result?.exitCode) ? { exitCode: result.exitCode } : {}),
     answer: String(result?.answer ?? '').slice(0, MAX_STORED_ANSWER),
     answerTruncated: String(result?.answer ?? '').length > MAX_STORED_ANSWER,
     usage: result?.usage ?? null,
@@ -375,12 +406,21 @@ export function teamExecutionResults(plan, execution) {
     cancelled: result.status === 'cancelled',
     provider: result.provider,
     model: result.recommendedModel,
+    requestedCliModel: result.requestedCliModel ?? null,
     actualModel: result.actualModel ?? null,
+    ...(result.reportedModel !== undefined ? { reportedModel: result.reportedModel } : {}),
+    modelNotice: result.modelNotice ?? null,
+    ...(typeof result.source === 'string' ? { source: result.source } : {}),
+    ...(typeof result.sandboxEnforcement === 'string' ? { sandboxEnforcement: result.sandboxEnforcement } : {}),
+    ...(result.usageIncomplete === true ? { usageIncomplete: true } : {}),
+    ...(typeof result.executionEnvironment === 'string' ? { executionEnvironment: result.executionEnvironment } : {}),
     channel: 'official-cli',
     toolId: result.toolId ?? null,
     answer: String(result.finalText ?? ''),
     error: result.status === 'succeeded' ? null : String(result.error ?? (TEAM_FAILURE.has(result.status) ? result.status : '官方 CLI 未成功完成。')),
     stderrTail: result.outputTail ?? null,
+    diagnostic: result.outputTail ?? null,
+    exitCode: result.exitCode ?? null,
     ...(result.usage ? { usage: result.usage } : {}),
     ...(finite(result.reportedCostUsd) ? { reportedCostUsd: result.reportedCostUsd } : {}),
   }))
@@ -421,9 +461,18 @@ export function buildToolRunRecord({ toolId, toolLabel, provider, model, cliMode
       id: packageId, ok: succeeded, cancelled: result?.status === 'cancelled',
       provider: plan.directRoute.provider, model: plan.directRoute.model,
       channel: 'official-cli', toolId,
-      actualModel: result?.reportedModel && typeof result.reportedModel === 'string' ? result.reportedModel : null,
+      requestedCliModel: Object.hasOwn(result ?? {}, 'requestedModel') ? result.requestedModel : cliModel,
+      actualModel: modelIdentity(result?.actualModel) ?? modelIdentity(result?.reportedModel),
+      ...(result?.reportedModel !== undefined ? { reportedModel: result.reportedModel } : {}),
+      modelNotice: result?.modelNotice ?? null,
+      ...(typeof result?.source === 'string' ? { source: result.source } : {}),
+      ...(typeof result?.sandboxEnforcement === 'string' ? { sandboxEnforcement: result.sandboxEnforcement } : {}),
+      ...(result?.usageIncomplete === true ? { usageIncomplete: true } : {}),
       answer: String(result?.finalText ?? ''),
       error: succeeded ? null : String(result?.error ?? result?.reason ?? result?.status ?? '官方 CLI 未成功完成。'),
+      ...(!succeeded && typeof result?.diagnostic === 'string' && result.diagnostic.trim()
+        ? { diagnostic: result.diagnostic } : {}),
+      ...(Number.isInteger(result?.exitCode) ? { exitCode: result.exitCode } : {}),
       ...(result?.usage ? { usage: result.usage } : {}),
       ...(finite(result?.reportedCostUsd) ? { reportedCostUsd: result.reportedCostUsd } : {}),
     }],

package/.dsh-plugin/shared/task-executors.mjs

@@ -36,7 +36,7 @@ const BASE_ENV_KEYS = Object.freeze([
   'PATH', 'Path', 'PATHEXT', 'SystemRoot', 'windir', 'ComSpec',
   'HOME', 'USERPROFILE', 'HOMEDRIVE', 'HOMEPATH', 'APPDATA', 'LOCALAPPDATA',
   'PROGRAMDATA', 'TEMP', 'TMP', 'TMPDIR', 'LANG', 'LC_ALL', 'TERM',
-  'HTTP_PROXY', 'HTTPS_PROXY', 'NO_PROXY', 'http_proxy', 'https_proxy', 'no_proxy',
+  'HTTP_PROXY', 'HTTPS_PROXY', 'ALL_PROXY', 'NO_PROXY', 'http_proxy', 'https_proxy', 'all_proxy', 'no_proxy',
   'SSL_CERT_FILE', 'NODE_EXTRA_CA_CERTS',
 ])
 
@@ -50,7 +50,9 @@ export const TASK_ADAPTERS = Object.freeze([
     executable: 'claude',
     portable: true,
     apiKeyEnv: 'ANTHROPIC_API_KEY',
-    sessionEnv: Object.freeze(['CLAUDE_CODE_OAUTH_TOKEN', 'CLAUDE_CONFIG_DIR']),
+    sessionEnv: Object.freeze(['CLAUDE_CODE_OAUTH_TOKEN', 'CLAUDE_CONFIG_DIR', 'ANTHROPIC_AUTH_TOKEN',
+      'ANTHROPIC_BASE_URL', 'ANTHROPIC_MODEL', 'ANTHROPIC_DEFAULT_HAIKU_MODEL', 'ANTHROPIC_DEFAULT_SONNET_MODEL',
+      'ANTHROPIC_DEFAULT_OPUS_MODEL', 'ANTHROPIC_SMALL_FAST_MODEL']),
     format: 'claude-json',
     buildArgs(modelId) {
       return [
@@ -193,17 +195,22 @@ async function checkedWorkspace(workspace) {
 }
 
 function cliModelFor(route, adapter) {
-  const explicit = checkedModel(route?.cliModel)
-  if (explicit) return explicit
-  if (adapter?.id === 'claude-code' || adapter?.id === 'codex' || adapter?.id === 'gemini') {
-    return checkedModel(route?.model)
+  // Catalog IDs are routing recommendations, not vendor CLI aliases. Omit
+  // the model argument unless the route explicitly binds a CLI model.
+  const value = route?.cliModel
+  if (value === undefined || value === null || value === '') return null
+  const explicit = checkedModel(value)
+  if (!explicit) throw new TypeError('cliModel must be a bounded model identifier')
+  if ((adapter?.id === 'minimax-code' || adapter?.id === 'mimo-code') && !explicit.includes('/')) {
+    throw new TypeError(`${adapter.id} cliModel requires provider/model`)
   }
-  return null
+  if (adapter?.id === 'zcode') throw new TypeError('ZCode CLI does not support a per-call cliModel')
+  return explicit
 }
 
 /** Variables that switch a CLI from its account login to API-key billing. */
 const API_KEY_VARIABLES = Object.freeze({
-  'claude-code': ['ANTHROPIC_API_KEY'],
+  'claude-code': ['ANTHROPIC_API_KEY', 'ANTHROPIC_AUTH_TOKEN'],
   codex: ['OPENAI_API_KEY', 'CODEX_API_KEY'],
   gemini: ['GEMINI_API_KEY', 'GOOGLE_API_KEY'],
 })
@@ -324,7 +331,7 @@ function parseAdapterOutput(format, stdout) {
 const DIAGNOSTIC_CHARS = 400
 
 /** Shorten and scrub a CLI diagnostic before it reaches the user or the run ledger. */
-export function redactDiagnostic(value, secret = '') {
+export function redactDiagnostic(value, secret = '', maxChars = DIAGNOSTIC_CHARS) {
   const scrubbed = redact(String(value ?? ''), secret)
     .replace(/sk-[A-Za-z0-9_-]{8,}/g, 'sk-[redacted]')
     .replace(/(Bearer\s+)[A-Za-z0-9._~+/=-]{8,}/gi, '$1[redacted]')
@@ -332,7 +339,10 @@ export function redactDiagnostic(value, secret = '') {
     .replace(/\b(api[_-]?key|token|secret|password)(["'\s:=]+)[^\s"',}]{6,}/gi, '$1$2[redacted]')
     .replace(/\s+/g, ' ')
     .trim()
-  return scrubbed.length > DIAGNOSTIC_CHARS ? `${scrubbed.slice(0, DIAGNOSTIC_CHARS)}…` : scrubbed
+  const limit = Number.isInteger(maxChars) ? Math.max(100, Math.min(4_000, maxChars)) : DIAGNOSTIC_CHARS
+  if (scrubbed.length <= limit) return scrubbed
+  const head = Math.floor(limit / 3)
+  return `${scrubbed.slice(0, head)}…${scrubbed.slice(-(limit - head - 1))}`
 }
 
 function jsonLines(stdout) {
@@ -389,7 +399,9 @@ export function usageFromOutput(format, stdout = '') {
       const result = JSON.parse(stdout)
       const usage = result?.usage
       if (!usage || typeof usage !== 'object') return null
-      const reported = Number(result.total_cost_usd)
+      const reported = result.total_cost_usd
+      const models = result.modelUsage && typeof result.modelUsage === 'object' && !Array.isArray(result.modelUsage)
+        ? Object.keys(result.modelUsage) : []
       return {
         usage: {
           inputTokens: count(usage.input_tokens),
@@ -397,7 +409,8 @@ export function usageFromOutput(format, stdout = '') {
           cacheReadTokens: count(usage.cache_read_input_tokens),
           cacheWriteTokens: count(usage.cache_creation_input_tokens),
         },
-        ...(Number.isFinite(reported) && reported > 0 ? { reportedCostUsd: reported } : {}),
+        ...(Number.isFinite(reported) && reported >= 0 ? { reportedCostUsd: reported } : {}),
+        ...(models.length === 1 && /^[A-Za-z0-9][A-Za-z0-9._:/\[\]-]{0,199}$/.test(models[0]) ? { reportedModel: models[0] } : {}),
       }
     }
     if (format === 'codex-jsonl') {
@@ -442,26 +455,27 @@ export function usageFromEvents(format, value) {
   if (format === 'grok-end') {
     const usage = value?.usage
     if (!usage || typeof usage !== 'object') return null
-    const reported = Number(value.total_cost_usd)
+    const reported = value.total_cost_usd
     return {
       usage: {
         inputTokens: count(usage.input_tokens), outputTokens: count(usage.output_tokens),
         cacheReadTokens: count(usage.cache_read_input_tokens), cacheWriteTokens: count(usage.cache_creation_input_tokens),
       },
-      ...(value.cost_is_partial !== true && Number.isFinite(reported) && reported > 0 ? { reportedCostUsd: reported } : {}),
+      ...(value.cost_is_partial !== true && Number.isFinite(reported) && reported >= 0 ? { reportedCostUsd: reported } : {}),
     }
   }
   if (format === 'mimo-steps') {
     const parts = (Array.isArray(value) ? value : []).filter(part => part?.tokens && typeof part.tokens === 'object')
     if (!parts.length) return null
     const sum = pick => parts.reduce((total, part) => total + count(pick(part)), 0)
-    const cost = parts.reduce((total, part) => total + (Number.isFinite(part.cost) && part.cost > 0 ? part.cost : 0), 0)
+    const costKnown = parts.every(part => Number.isFinite(part.cost) && part.cost >= 0)
+    const cost = costKnown ? parts.reduce((total, part) => total + part.cost, 0) : null
     return {
       usage: {
         inputTokens: sum(part => part.tokens.input), outputTokens: sum(part => part.tokens.output) + sum(part => part.tokens.reasoning),
         cacheReadTokens: sum(part => part.tokens.cache?.read), cacheWriteTokens: sum(part => part.tokens.cache?.write),
       },
-      ...(cost > 0 ? { reportedCostUsd: Number(cost.toFixed(8)) } : {}),
+      ...(costKnown ? { reportedCostUsd: Number(cost.toFixed(8)) } : {}),
     }
   }
   if (format === 'minimax-result') {
@@ -648,11 +662,30 @@ async function useApi(apiFallback, { route, task, signal, reason, adapter, prefe
   }
 }
 
-function officialSuccess({ route, adapter, preference, answer, exitCode, version, credentialSource, usage = null }) {
+function reportedCliModel(value) {
+  if (typeof value === 'string' && value.trim()) return value.trim()
+  if (value && typeof value === 'object' && !Array.isArray(value)
+    && typeof value.providerId === 'string' && value.providerId
+    && typeof value.modelId === 'string' && value.modelId) {
+    return `${value.providerId}/${value.modelId}`
+  }
+  return null
+}
+
+function officialSuccess({ route, adapter, preference, answer, exitCode, version, credentialSource, usage = null,
+  requestedCliModel = null, reportedModel = null, modelNotice = null, source, sandboxEnforcement }) {
+  const actualModel = reportedCliModel(reportedModel)
   return {
     ok: true,
     provider: route.provider,
     model: route.model,
+    recommendedModel: route.model,
+    requestedCliModel,
+    actualModel,
+    ...(reportedModel !== null && reportedModel !== undefined ? { reportedModel } : {}),
+    modelNotice: modelNotice ?? (!requestedCliModel
+      ? '本次使用厂商 CLI 已配置的默认模型；Harness 推荐模型 ID 未作为 CLI 模型参数。'
+      : actualModel ? null : '该 CLI 未返回可核验的实际模型 ID；请以厂商运行记录核对。'),
     preference,
     channel: 'official-cli',
     toolId: adapter.id,
@@ -664,8 +697,11 @@ function officialSuccess({ route, adapter, preference, answer, exitCode, version
     exitCode,
     version: version ?? null,
     credentialSource,
+    ...(typeof source === 'string' ? { source } : {}),
+    ...(typeof sandboxEnforcement === 'string' ? { sandboxEnforcement } : {}),
     ...(usage?.usage ? { usage: usage.usage } : {}),
-    ...(usage?.reportedCostUsd ? { reportedCostUsd: usage.reportedCostUsd } : {}),
+    ...(Number.isFinite(usage?.reportedCostUsd) && usage.reportedCostUsd >= 0 ? { reportedCostUsd: usage.reportedCostUsd } : {}),
+    ...(usage?.usageIncomplete === true ? { usageIncomplete: true } : {}),
   }
 }
 
@@ -758,6 +794,13 @@ export async function executeAssignedTask({
       return officialSuccess({
         route, adapter, preference, answer: redact(verified.finalText, secret),
         exitCode: verified.exitCode ?? 0, version: null, credentialSource,
+        requestedCliModel: Object.hasOwn(verified, 'requestedModel') ? verified.requestedModel : modelId,
+        reportedModel: verified.reportedModel,
+        modelNotice: verified.modelNotice,
+        source: verified.source,
+        sandboxEnforcement: verified.sandboxEnforcement,
+        usage: { usage: verified.usage, reportedCostUsd: verified.reportedCostUsd,
+          usageIncomplete: verified.usageIncomplete },
       })
     }
     if (verified && verified.status !== 'unsupported') {
@@ -833,6 +876,7 @@ export async function executeAssignedTask({
     route, adapter, preference, answer, exitCode: run.exitCode,
     version: versionFromBanner(`${probe.stdout}\n${probe.stderr}`),
     credentialSource,
+    requestedCliModel: modelId,
     usage: usageFromOutput(adapter.format, run.stdout),
   })
 }

package/.dsh-plugin/shared/tool-health.mjs

@@ -14,6 +14,7 @@
  */
 import { OFFICIAL_TOOLS, getOfficialTool } from './official-tool-registry.mjs'
 import { compareReleaseVersions } from './latest-versions.mjs'
+import { loginLaunchForProbe } from './official-tools-runtime.mjs'
 
 export const LOGIN_CHECK_TIMEOUT_MS = 5_000
 export const HEALTH_CACHE_MS = 10 * 60_000
@@ -34,7 +35,7 @@ export const LOGIN_GUIDES = Object.freeze({
 
 /** Environment variable names whose presence means a CLI can authenticate without a session. */
 const KEY_ENV = Object.freeze({
-  'claude-code': ['ANTHROPIC_API_KEY', 'CLAUDE_CODE_OAUTH_TOKEN'],
+  'claude-code': ['ANTHROPIC_API_KEY', 'ANTHROPIC_AUTH_TOKEN', 'CLAUDE_CODE_OAUTH_TOKEN'],
   codex: ['OPENAI_API_KEY', 'CODEX_API_KEY'],
   gemini: ['GEMINI_API_KEY', 'GOOGLE_API_KEY'],
   'kimi-code': ['KIMI_API_KEY', 'MOONSHOT_API_KEY'],
@@ -92,7 +93,7 @@ function grokHomeHint(env) {
 
 /** Variables that make the CLI bill an API account rather than a subscription login. */
 const API_KEY_ENV = Object.freeze({
-  'claude-code': ['ANTHROPIC_API_KEY'],
+  'claude-code': ['ANTHROPIC_API_KEY', 'ANTHROPIC_AUTH_TOKEN'],
   codex: ['OPENAI_API_KEY', 'CODEX_API_KEY'],
   gemini: ['GEMINI_API_KEY', 'GOOGLE_API_KEY'],
   'kimi-code': ['KIMI_API_KEY', 'MOONSHOT_API_KEY'],
@@ -151,14 +152,30 @@ function guide(toolId) {
  * Login state for one installed tool: 'logged-in', 'logged-out', or 'unknown'.
  * `runner(executable, args, { timeoutMs })` resolves { ok, code, stdout, stderr, timedOut }.
  */
-export async function checkLogin(toolId, { runner, env = process.env, exists = async () => false, home = '', readAuthState = async () => null } = {}) {
+export async function checkLogin(toolId, {
+  runner, env = process.env, exists = async () => false, home = '', readAuthState = async () => null,
+  probe, resolveLoginLaunch = loginLaunchForProbe,
+} = {}) {
   const keyNames = (KEY_ENV[toolId] ?? []).filter(name => typeof env?.[name] === 'string' && env[name].trim())
   const viaKey = keyNames.length > 0 ? { state: 'logged-in', detail: `检测到环境变量 ${keyNames.join('、')}（未验证有效性）。`, source: 'environment',
     billing: apiKeyEnvPresent(toolId, env) ? 'api-key' : 'subscription',
     accountLogin: keyNames.some(name => !(API_KEY_ENV[toolId] ?? []).includes(name)) } : null
   const keyBilling = apiKeyEnvPresent(toolId, env) ? 'api-key' : null
+  // A health report must inspect the same npm/pnpm/native copy whose version
+  // was shown. Never replace a missing selected entry with a bare PATH command.
+  const statusCommand = async (command, args) => {
+    const launch = probe === undefined
+      ? { file: command, args: [] }
+      : await resolveLoginLaunch(probe)
+    if (!launch) return null
+    return runner(launch.file, [...launch.args, ...args], {
+      timeoutMs: LOGIN_CHECK_TIMEOUT_MS, env: sessionEnvironment(toolId, env),
+      ...(launch.useShell === undefined ? {} : { useShell: launch.useShell }),
+    })
+  }
   if (toolId === 'claude-code' && typeof runner === 'function') {
-    const outcome = await runner('claude', ['auth', 'status', '--json'], { timeoutMs: LOGIN_CHECK_TIMEOUT_MS, env: sessionEnvironment(toolId, env) })
+    const outcome = await statusCommand('claude', ['auth', 'status', '--json'])
+    if (!outcome) return viaKey ?? { state: 'unknown', detail: '所选安装副本的登录检测入口不可用；未使用 PATH 中的其他 Claude Code。' }
     if (outcome.timedOut) return viaKey ?? { state: 'unknown', detail: '登录状态检测超时。' }
     try {
       const status = JSON.parse(outcome.stdout)
@@ -170,7 +187,8 @@ export async function checkLogin(toolId, { runner, env = process.env, exists = a
     return viaKey ?? { state: 'unknown', detail: '无法解析 claude auth status 输出。' }
   }
   if (toolId === 'codex' && typeof runner === 'function') {
-    const outcome = await runner('codex', ['login', 'status'], { timeoutMs: LOGIN_CHECK_TIMEOUT_MS, env: sessionEnvironment(toolId, env) })
+    const outcome = await statusCommand('codex', ['login', 'status'])
+    if (!outcome) return viaKey ?? { state: 'unknown', detail: '所选安装副本的登录检测入口不可用；未使用 PATH 中的其他 Codex。' }
     if (outcome.timedOut) return viaKey ?? { state: 'unknown', detail: '登录状态检测超时。' }
     const output = `${outcome.stdout}\n${outcome.stderr}`
     if (/not logged in/i.test(output)) return viaKey ?? { state: 'logged-out', detail: 'codex login status 报告未登录。', source: 'cli' }
@@ -234,7 +252,7 @@ export async function checkToolHealth(probe, options = {}) {
   const tool = getOfficialTool(probe?.id)
   if (!tool) throw new TypeError('unknown official tool')
   const installed = probe.installed === true
-  const login = installed ? await checkLogin(tool.id, options) : { state: 'unknown', detail: probe.status === 'not-installed' && /检测到已安装/.test(String(probe.detail ?? '')) ? String(probe.detail) : '尚未安装。' }
+  const login = installed ? await checkLogin(tool.id, { ...options, probe }) : { state: 'unknown', detail: probe.status === 'not-installed' && /检测到已安装/.test(String(probe.detail ?? '')) ? String(probe.detail) : '尚未安装。' }
   const { command, steps } = guide(tool.id)
   return {
     id: tool.id,

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,