@ljwei-stak/dsh-model-router 0.21.0 → 0.22.0

package/.dsh-plugin/shared/run-ledger.mjs

@@ -4,12 +4,16 @@
  * gentle routing adjustments from user ratings and reviews.
  */
 
+import { reasoningExecutionFields, unsupportedCliReasoning } from './reasoning-execution.mjs'
+import { packageSelectionFields } from './package-assignments.mjs'
+
 export const MAX_STORED_ANSWER = 4_000
 export const MAX_STORED_TASK = 20_000
 /** Ratings move a route's quality by at most this much (quality is 0–1). */
 export const MAX_QUALITY_BIAS = 0.04
 
 const finite = value => typeof value === 'number' && Number.isFinite(value)
+const nonEmptyText = value => (typeof value === 'string' && value.length > 0 ? value : null)
 const routeKey = (provider, model) => `${String(provider ?? '')}\u0000${String(model ?? '')}`
 
 function modelIdentity(value) {
@@ -20,8 +24,48 @@ function modelIdentity(value) {
   return null
 }
 
+// A stop marker belongs to one attempt, not to earlier requests in a cascade.
+// Contradictory positive/invalid counters remain potentially paid evidence.
+function clearlyNotStarted(attempt) {
+  if (!attempt || typeof attempt !== 'object' || (attempt.notStarted !== true && attempt.blocked !== true)) return false
+  if (Object.hasOwn(attempt, 'reportedCostUsd') && attempt.reportedCostUsd !== undefined
+    && attempt.reportedCostUsd !== null && attempt.reportedCostUsd !== 0) return false
+  return !['inputTokens', 'outputTokens', 'cacheReadTokens', 'cacheWriteTokens'].some(key => {
+    const value = attempt.usage?.[key]
+    return value !== undefined && value !== null && value !== 0
+  })
+}
+
+/** True when some quality attempt ran, or execution cannot safely be ruled out. */
+export function hasStartedQualityAttempts(result) {
+  if (!result || !Object.hasOwn(result, 'qualityAttempts')) return false
+  const attempts = result.qualityAttempts
+  if (!Array.isArray(attempts) || attempts.length < 1 || attempts.length > 2) return true
+  return attempts.some(attempt => !clearlyNotStarted(attempt))
+}
+
 /** USD cost of one package. Prefers a CLI-reported cost, else usage × configured price. */
 export function actualCost(result, pricing) {
+  if (result && Object.hasOwn(result, 'qualityAttempts')) {
+    const attempts = result.qualityAttempts
+    if (!Array.isArray(attempts) || attempts.length < 1 || attempts.length > 2
+      || attempts.some(item => !item || typeof item !== 'object' || Object.hasOwn(item, 'qualityAttempts')
+        || item.channel === 'official-cli' || item.billing === 'subscription')) {
+      return { costUsd: null, costSource: 'quality-attempts-invalid' }
+    }
+    const costs = attempts.map(item => clearlyNotStarted(item)
+      ? { costUsd: 0, costSource: 'not-run' }
+      : actualCost(item, item.pricingSnapshot ?? null))
+    if (costs.some(item => item.costUsd === null)) {
+      const knownCostUsd = costs.filter(item => item.costUsd !== null).reduce((sum, item) => sum + item.costUsd, 0)
+      return finite(knownCostUsd) ? { costUsd: null, costSource: 'quality-attempts-incomplete', knownCostUsd,
+        unknownAttemptCount: costs.filter(item => item.costUsd === null).length }
+        : { costUsd: null, costSource: 'cost-invalid' }
+    }
+    const total = costs.reduce((sum, item) => sum + item.costUsd, 0)
+    return finite(total) && total >= 0 ? { costUsd: total, costSource: 'quality-attempts' }
+      : { costUsd: null, costSource: 'cost-invalid' }
+  }
   if (result && Object.hasOwn(result, 'reportedCostUsd') && finite(result.reportedCostUsd) && result.reportedCostUsd >= 0) {
     return { costUsd: result.reportedCostUsd, costSource: 'cli-reported' }
   }
@@ -148,7 +192,10 @@ function* spendingEntries(runs) {
         amount.subscriptionRuns = 1
         if (finite(item.referenceCostUsd) && item.referenceCostUsd >= 0) amount.subscriptionUsd = item.referenceCostUsd
       } else if (finite(item.costUsd) && item.costUsd >= 0) amount.costUsd = item.costUsd
-      else if (item.ran === true) amount.unknown = 1
+      else if (item.ran === true) {
+        amount.unknown = 1
+        if (finite(item.knownCostUsd) && item.knownCostUsd >= 0) amount.costUsd = item.knownCostUsd
+      }
       else continue
       yield { when, amount }
     }
@@ -257,11 +304,16 @@ export function applyQualityBiases(routes, biases) {
 }
 
 function storedPackage(planned, result, pricing, finishedAt, billingFor = billingOf) {
-  const cost = !result || result.blocked || result.notStarted
+  const plannedEffort = nonEmptyText(planned?.recommendedReasoningEffort) ?? nonEmptyText(planned?.plannedReasoningEffort)
+  const startedAttempts = hasStartedQualityAttempts(result)
+  const qualityAttempts = Array.isArray(result?.qualityAttempts)
+    ? result.qualityAttempts.slice(0, 2).map(attempt => attempt && typeof attempt === 'object' ? attempt : {}) : null
+  const cost = !result || ((result.blocked || result.notStarted) && !startedAttempts)
     ? { costUsd: null, costSource: 'not-run', billing: null, referenceCostUsd: null }
     : billedCost(result, pricing, billingFor(result))
   return {
     id: planned.id,
+    ...packageSelectionFields(result?.manualAssignment !== undefined ? { ...planned, ...result } : planned),
     name: planned.name,
     objective: String(planned.objective ?? '').slice(0, 2_000),
     ...(planned.type ? { type: String(planned.type) } : {}),
@@ -270,6 +322,24 @@ function storedPackage(planned, result, pricing, finishedAt, billingFor = billin
     dependsOn: [...(planned.dependsOn ?? [])],
     recommendedProvider: planned.recommendedProvider,
     recommendedModel: planned.recommendedModel,
+    ...reasoningExecutionFields(result),
+    ...(qualityAttempts ? { qualityAttempts: qualityAttempts.map(attempt => ({
+      provider: attempt.provider, model: attempt.model, channel: 'harness-llm',
+      ok: attempt.ok === true, usage: attempt.usage ?? null,
+      ...(attempt.notStarted === true ? { notStarted: true } : {}),
+      ...(attempt.blocked === true ? { blocked: true } : {}),
+      ...(attempt.usageIncomplete ? { usageIncomplete: true } : {}),
+      ...(finite(attempt.reportedCostUsd) && attempt.reportedCostUsd >= 0 ? { reportedCostUsd: attempt.reportedCostUsd } : {}),
+      pricingSnapshot: attempt.pricingSnapshot ? { ...attempt.pricingSnapshot } : null,
+      ...reasoningExecutionFields(attempt),
+      ...(finite(attempt.durationMs) ? { durationMs: attempt.durationMs } : {}),
+      ...(finite(attempt.inputChars) ? { inputChars: attempt.inputChars } : {}),
+      finishedAt: attempt.finishedAt, error: typeof attempt.error === 'string' ? attempt.error.slice(0, 1_000) : null,
+    })) } : {}),
+    ...(result?.qualityValidation ? { qualityValidation: { ...result.qualityValidation } } : {}),
+    ...(plannedEffort ? { plannedReasoningEffort: plannedEffort } : {}),
+    ...(finite(result?.durationMs) && result.durationMs >= 0 ? { durationMs: result.durationMs } : {}),
+    ...(finite(result?.inputChars) && result.inputChars >= 0 ? { inputChars: result.inputChars } : {}),
     difficulty: planned.difficulty ?? null,
     estimatedCost: finite(planned.estimatedCost) ? planned.estimatedCost : null,
     plannedChannel: planned.executionChannel ?? null,
@@ -278,7 +348,7 @@ function storedPackage(planned, result, pricing, finishedAt, billingFor = billin
     status: !result ? 'pending' : result.ok ? (result.fallback ? 'fallback' : 'succeeded') : result.paused ? 'paused'
       : result.waiting ? 'waiting' : result.blocked ? 'blocked' : result.cancelled ? 'cancelled' : 'failed',
     ok: result?.ok === true,
-    ran: Boolean(result) && !result.blocked && !result.notStarted,
+    ran: Boolean(result) && (startedAttempts || (!result.blocked && !result.notStarted)),
     blocked: result?.blocked === true,
     ...(result?.paused ? { paused: true, pause: { ...result.pause } } : {}),
     ...(result?.waiting ? { waiting: true } : {}),
@@ -324,6 +394,7 @@ export function plannedPackages(plan, task) {
     const route = plan.directRoute ?? plan.selected
     return [{ id: 'direct', name: '指定模型', objective: String(task ?? ''), dependsOn: [],
       recommendedProvider: route?.provider, recommendedModel: route?.model,
+      ...(typeof route?.reasoningEffort === 'string' && route.reasoningEffort ? { recommendedReasoningEffort: route.reasoningEffort } : {}),
       difficulty: plan.complexity?.band ?? null, estimatedCost: plan.estimatedCost ?? null,
       executionChannel: plan.executionChannel ?? null }]
   }
@@ -344,6 +415,9 @@ export function buildRunRecord({ id, createdAt, task, plan, execution, preset =
     executionMode,
     routingBypassed: plan?.routingBypassed === true,
     mode: plan?.mode ?? 'single',
+    ...(typeof plan?.assignmentMode === 'string' && plan.assignmentMode.trim().length > 0
+      && plan.assignmentMode.length <= 40 && !/[\u0000-\u001f\u007f]/u.test(plan.assignmentMode)
+      ? { assignmentMode: plan.assignmentMode.trim() } : {}),
     preset,
     decision: {
       dataVersions: plan?.optimization?.dataVersions ?? null,
@@ -385,6 +459,10 @@ export function storedResults(run) {
     id: item.id, name: item.name, ok: item.ok, provider: item.provider, model: item.model,
     channel: item.channel, answer: item.answer, error: item.error, fallback: item.fallback,
     blocked: item.blocked, finishedAt: item.finishedAt,
+    ...packageSelectionFields(item),
+    ...reasoningExecutionFields(item),
+    ...(finite(item.durationMs) && item.durationMs >= 0 ? { durationMs: item.durationMs } : {}),
+    ...(finite(item.inputChars) && item.inputChars >= 0 ? { inputChars: item.inputChars } : {}),
     ...(item.paused ? { paused: true } : {}), ...(item.waiting ? { waiting: true } : {}),
   }))
 }
@@ -406,6 +484,10 @@ export function teamExecutionResults(plan, execution) {
     cancelled: result.status === 'cancelled',
     provider: result.provider,
     model: result.recommendedModel,
+    ...unsupportedCliReasoning({ reasoningEffort: result.recommendedReasoningEffort }),
+    ...reasoningExecutionFields(result),
+    ...(finite(result.durationMs) && result.durationMs >= 0 ? { durationMs: result.durationMs } : {}),
+    ...(finite(result.inputChars) && result.inputChars >= 0 ? { inputChars: result.inputChars } : {}),
     requestedCliModel: result.requestedCliModel ?? null,
     actualModel: result.actualModel ?? null,
     ...(result.reportedModel !== undefined ? { reportedModel: result.reportedModel } : {}),

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

@@ -21,6 +21,8 @@ import { installedModuleRoots } from './vendor-mimo-grok-adapter.mjs'
 import { CODE_FILE, npmAttestor } from './npm-attestation.mjs'
 import { normalizeExecutionPreference } from './model-profiles.mjs'
 import { BILLING_MODE_LABEL, billingPlan, detectQuotaExhaustion, vendorKey } from './subscription-billing.mjs'
+import { reasoningExecutionFields, reasoningRouteForAssignment, routeForReasoningSwitch, unsupportedCliReasoning } from './reasoning-execution.mjs'
+import { parsePackageAssignments, packageSelectionFields } from './package-assignments.mjs'
 
 export const MAX_TASK_BYTES = 64_000
 const MAX_ANSWER_CHARS = 48_000
@@ -42,6 +44,17 @@ const BASE_ENV_KEYS = Object.freeze([
 
 const READ_ONLY_INSTRUCTION = 'Read the task supplied on standard input. Answer in the task language. Do not modify files.'
 
+function additionalApiFields(value) {
+  if (!value || typeof value !== 'object') return {}
+  return {
+    ...(value.notStarted === true ? { notStarted: true } : {}),
+    ...(value.usageIncomplete === true ? { usageIncomplete: true } : {}),
+    ...(value.qualityValidation ? { qualityValidation: value.qualityValidation } : {}),
+    ...(Array.isArray(value.qualityAttempts) ? { qualityAttempts: value.qualityAttempts,
+      ...(typeof value.provider === 'string' && typeof value.model === 'string' ? { provider: value.provider, model: value.model } : {}) } : {}),
+  }
+}
+
 /** Portable headless adapters. Registry tools without an entry here use the verified runner. */
 export const TASK_ADAPTERS = Object.freeze([
   Object.freeze({
@@ -167,8 +180,13 @@ const TRUNCATED = '…（已截断）'
 
 function truncatedTo(value, maxBytes) {
   const textValue = String(value ?? '')
-  if (Buffer.byteLength(textValue, 'utf8') <= maxBytes) return textValue
-  return `${sliceUtf8(textValue, Math.max(0, maxBytes - Buffer.byteLength(TRUNCATED, 'utf8')))}${TRUNCATED}`
+  const limit = Math.max(0, Math.floor(maxBytes) || 0)
+  if (Buffer.byteLength(textValue, 'utf8') <= limit) return textValue
+  const markerBytes = Buffer.byteLength(TRUNCATED, 'utf8')
+  // A marker must not consume more than the whole allocation. Very small
+  // shares keep useful content rather than an oversized or partial marker.
+  if (limit < markerBytes) return sliceUtf8(textValue, limit)
+  return `${sliceUtf8(textValue, limit - markerBytes)}${TRUNCATED}`
 }
 
 function checkedModel(modelId) {
@@ -626,6 +644,8 @@ async function useApi(apiFallback, { route, task, signal, reason, adapter, prefe
         ok: false, provider, model, preference, channel: 'official-cli', toolId: adapter?.id ?? null, answer: '',
         fallback: null, timedOut, exitCode, paused: true,
         pause: { ...api.pause, ...(detail ? { detail } : {}), ...(fallback.loginRequired ? { loginRequired: true } : {}) },
+        ...reasoningExecutionFields(api),
+        ...additionalApiFields(api),
         error: api.error,
       }
     }
@@ -635,6 +655,8 @@ async function useApi(apiFallback, { route, task, signal, reason, adapter, prefe
         ok: false, provider, model, preference, channel: 'harness-llm', toolId: adapter?.id ?? null,
         answer: '', fallback, timedOut, exitCode, error: '执行已取消。', cancelled: true,
         ...(api?.usage ? { usage: api.usage } : {}),
+        ...reasoningExecutionFields(api),
+        ...additionalApiFields(api),
       }
     }
     // A billing-aware fallback can refuse (subscription-only) or explain a switch.
@@ -644,6 +666,9 @@ async function useApi(apiFallback, { route, task, signal, reason, adapter, prefe
       provider, model, preference, channel: api?.refused ? 'official-cli' : 'harness-llm', toolId: adapter?.id ?? null,
       answer, fallback: note?.reason ? { ...fallback, reason: note.reason } : api?.refused ? { ...fallback, reason: api.error } : fallback, timedOut, exitCode,
       ...(api?.usage ? { usage: api.usage } : {}),
+      ...reasoningExecutionFields(api),
+      ...additionalApiFields(api),
+      ...(api?.notStarted === true ? { notStarted: true } : {}),
       ...(note ? { billingSwitch: note } : {}),
       ...(api?.billing ? { billing: api.billing } : {}),
       error: api?.ok === true && answer.trim() ? undefined : (api?.error || reason),
@@ -676,6 +701,7 @@ function officialSuccess({ route, adapter, preference, answer, exitCode, version
   requestedCliModel = null, reportedModel = null, modelNotice = null, source, sandboxEnforcement }) {
   const actualModel = reportedCliModel(reportedModel)
   return {
+    ...unsupportedCliReasoning(route),
     ok: true,
     provider: route.provider,
     model: route.model,
@@ -952,10 +978,15 @@ async function routeWithBilling(plan, { route, billing = null, apiFallback, ...o
     if (!apiRoute || (sub?.kind === 'plan-key' && apiRoute.provider === sub.route.provider && apiRoute.model === sub.route.model)) {
       return refuse(`${reason.replace(/，?已切换 API Key。$/u, '。')}没有配置可回退的 API 路线（apiRoute）。`, note ? { billingSwitch: { ...note, to: null } } : {})
     }
-    const result = await useApiRoute(apiFallback, { route: apiRoute, task: options.task, signal: options.signal, reason, skipped })
+    const reasoningRoute = routeForReasoningSwitch(route, apiRoute)
+    const originalEffort = typeof route?.reasoningEffort === 'string' && route.reasoningEffort ? route.reasoningEffort : null
+    const result = await useApiRoute(apiFallback, { route: reasoningRoute, task: options.task, signal: options.signal, reason, skipped })
+    const droppedEffort = originalEffort && reasoningRoute.reasoningEffort !== originalEffort ? originalEffort : null
     // Keep the API route that actually ran (pricing); the plan route is recorded separately.
     return {
-      ...base, ...result, billingMode: plan.mode, billing: 'api',
+      ...base, ...result,
+      ...(droppedEffort ? { plannedReasoningEffort: droppedEffort, reasoningEffortStatus: 'unapplied' } : {}),
+      billingMode: plan.mode, billing: 'api',
       ...(note ? { billingSwitch: { ...note, to: 'api' } } : {}),
       ...(sub?.kind === 'plan-key' ? { subscriptionRoute: { ...sub.route } } : {}),
     }
@@ -985,13 +1016,19 @@ async function routeWithBilling(plan, { route, billing = null, apiFallback, ...o
   }
 
   if (sub.kind === 'plan-key') {
+    const reasoningRoute = routeForReasoningSwitch(route, sub.route)
+    const originalEffort = typeof route?.reasoningEffort === 'string' && route.reasoningEffort ? route.reasoningEffort : null
     let attempt
-    try { attempt = await apiFallback({ route: sub.route, task: options.task, signal: options.signal, reason: '编程套餐（订阅）', subscription: true }) }
+    try { attempt = await apiFallback({ route: reasoningRoute, task: options.task, signal: options.signal, reason: '编程套餐（订阅）', subscription: true }) }
     catch (error) { attempt = { ok: false, error: String(error?.message ?? error) } }
+    const droppedEffort = originalEffort && reasoningRoute.reasoningEffort !== originalEffort ? originalEffort : null
     if (attempt?.ok === true && String(attempt.answer ?? '').trim()) {
       return {
         ok: true, ...base, preference: executionPreference(route), channel: 'harness-llm', toolId: null,
         answer: String(attempt.answer).slice(0, MAX_ANSWER_CHARS), fallback: null,
+        ...reasoningExecutionFields(attempt),
+        ...additionalApiFields(attempt),
+        ...(droppedEffort ? { plannedReasoningEffort: droppedEffort, reasoningEffortStatus: 'unapplied' } : {}),
         billing: 'subscription', subscriptionRoute: { ...sub.route },
         ...(attempt.usage ? { usage: attempt.usage } : {}),
       }
@@ -1058,8 +1095,13 @@ ${args?.raw ?? ''}`, vendor)
       if (plan.mode === 'subscription-only') {
         return { ok: false, refused: true, error: reason.replace('已切换 API Key。', '按设置只用订阅，未使用 API Key。'), billingNote: { ...note, to: null } }
       }
-      const api = await apiFallback({ ...args, route: apiRoute ?? args.route })
-      return { ...api, billing: 'api', billingNote: { ...note, to: 'api' } }
+      const reasoningRoute = routeForReasoningSwitch(args.route, apiRoute ?? args.route)
+      const api = await apiFallback({ ...args, route: reasoningRoute })
+      const droppedEffort = typeof args.route?.reasoningEffort === 'string' && args.route.reasoningEffort
+        && reasoningRoute.reasoningEffort !== args.route.reasoningEffort ? args.route.reasoningEffort : null
+      return { ...api,
+        ...(droppedEffort ? { plannedReasoningEffort: droppedEffort, reasoningEffortStatus: 'unapplied' } : {}),
+        billing: 'api', billingNote: { ...note, to: 'api' } }
     }
     if (plan.mode === 'subscription-only') return { ok: false, refused: true, error: `${args?.reason ?? '官方 CLI 执行失败。'}（按设置只用订阅，未回退 API）` }
     // The subscription really ran and failed for another reason: do not spend API money silently.
@@ -1100,7 +1142,7 @@ const DEPENDENCY_ANSWER_BYTES = 7_500
  * The prompt for one work package, always within MAX_TASK_BYTES: the objective
  * is capped first, dependency answers share what the task leaves (each at most
  * DEPENDENCY_ANSWER_BYTES, the remainder split evenly), and the total task is
- * truncated last. Truncated parts end with “（已截断）”.
+ * truncated last. Truncated parts include a marker when their share permits it.
  */
 export function packagePrompt(task, item, completed, maxBytes = MAX_TASK_BYTES) {
   const dependencies = (item.dependsOn ?? []).map(id => completed.find(result => result.id === id)).filter(Boolean)
@@ -1114,13 +1156,17 @@ export function packagePrompt(task, item, completed, maxBytes = MAX_TASK_BYTES)
   const taskBytes = bytes(String(task))
   const free = Math.max(0, budget - fixed)
   // Dependencies get what they need up to their cap, but never squeeze the task below its share.
-  const wantDeps = dependencies.reduce((sum, dep) => sum + Math.min(bytes(String(dep.answer ?? '')), DEPENDENCY_ANSWER_BYTES), 0)
+  const wanted = dependencies.map(dep => Math.min(bytes(String(dep.answer ?? '')), DEPENDENCY_ANSWER_BYTES))
+  const wantDeps = wanted.reduce((sum, value) => sum + value, 0)
   const depBudget = Math.max(0, Math.min(wantDeps, free - Math.min(taskBytes, MIN_TASK_SHARE_BYTES)))
   let remaining = depBudget
+  let remainingWanted = wantDeps
   const depTexts = dependencies.map((dep, index) => {
-    const share = Math.floor(remaining / (dependencies.length - index))
-    const answer = truncatedTo(String(dep.answer ?? ''), Math.min(DEPENDENCY_ANSWER_BYTES, share))
+    const share = remaining >= remainingWanted ? wanted[index]
+      : Math.min(wanted[index], Math.floor(remaining / (dependencies.length - index)))
+    const answer = truncatedTo(String(dep.answer ?? ''), share)
     remaining -= bytes(answer)
+    remainingWanted -= wanted[index]
     return `${truncatedTo(dep.name, 200)}:\n${answer}`
   })
   const taskText = truncatedTo(String(task), Math.max(0, free - (depBudget - remaining)))
@@ -1146,6 +1192,7 @@ export function assignmentPackages(plan, task) {
       dependsOn: [],
       recommendedProvider: route.provider,
       recommendedModel: route.model,
+      ...(typeof route.reasoningEffort === 'string' && route.reasoningEffort ? { recommendedReasoningEffort: route.reasoningEffort } : {}),
     }]
   }
   const packages = plan?.team?.workPackages
@@ -1157,6 +1204,10 @@ export function assignmentPackages(plan, task) {
     dependsOn: [...(item.dependsOn ?? [])],
     recommendedProvider: item.recommendedProvider,
     recommendedModel: item.recommendedModel,
+    ...(item.type ? { type: item.type } : {}),
+    ...(item.purpose ? { purpose: item.purpose } : {}),
+    ...packageSelectionFields(item),
+    ...(typeof item.recommendedReasoningEffort === 'string' && item.recommendedReasoningEffort ? { recommendedReasoningEffort: item.recommendedReasoningEffort } : {}),
   }))
 }
 
@@ -1172,6 +1223,75 @@ function aggregateOf(results) {
   return { status, packages: results, aggregate }
 }
 
+function checkedPackageSelections(packages, routes, overrides, runVerified, targets) {
+  const preceding = new Set()
+  const selected = {}
+  const effective = packages.map(item => {
+    if (typeof item?.id !== 'string' || item.id !== item.id.trim() || !item.id || item.id.length > 128
+      || /[\u0000-\u001f\u007f]/u.test(item.id) || ['__proto__', 'constructor', 'prototype'].includes(item.id)
+      || preceding.has(item.id) || !Array.isArray(item.dependsOn ?? [])
+      || (item.dependsOn ?? []).some(id => !preceding.has(id))) {
+      throw new TypeError('Work packages require unique ids and topological dependencies')
+    }
+    preceding.add(item.id)
+    const override = Object.hasOwn(overrides, item.id) ? overrides[item.id] : null
+    const next = item.manualAssignment && override?.provider && override?.model
+      ? { ...item, manualAssignment: { kind: 'api', provider: override.provider, model: override.model } } : item
+    if (next.manualAssignment !== undefined) selected[next.id] = next.manualAssignment
+    return next
+  })
+  const normalized = Object.keys(selected).length ? parsePackageAssignments(selected) : undefined
+  for (const [id, target] of Object.entries(normalized ?? {})) {
+    // Retained successful receipts are context, not new execution requests.
+    // Their exact intent still validates above; a removed catalog entry or
+    // unavailable runner must not prevent a different target from retrying.
+    if (targets && !targets.has(id)) continue
+    if (target.kind === 'api' && !routes.some(route => route.provider === target.provider && route.model === target.model)) {
+      throw new TypeError(`Manual API route is not configured for work package ${id}`)
+    }
+    if (target.kind === 'tool' && typeof runVerified !== 'function') {
+      throw new TypeError('Manual official tool assignments require runVerified')
+    }
+  }
+  return effective.map(item => normalized?.[item.id]
+    ? { ...item, ...packageSelectionFields({ ...item, manualAssignment: normalized[item.id] }) } : item)
+}
+
+async function runManualTool(target, prompt, options) {
+  const base = { provider: 'official-tool', model: target.toolId, toolId: target.toolId,
+    channel: 'official-cli', preference: 'official', requestedCliModel: null,
+    modelNotice: '使用所选官方工具配置的默认模型。', fallback: null }
+  try {
+    const raw = await options.runVerified({ toolId: target.toolId, task: prompt, workspace: options.workspace,
+      mode: 'read-only', signal: options.signal })
+    if (!raw || typeof raw.status !== 'string') throw new TypeError('官方工具未返回有效执行状态。')
+    const answer = typeof raw.finalText === 'string' ? raw.finalText : ''
+    const ok = raw.status === 'succeeded' && answer.trim().length > 0
+    const executionEvidence = Number.isFinite(raw.startedAt) || raw.usage != null
+      || (Number.isFinite(raw.reportedCostUsd) && raw.reportedCostUsd > 0)
+    const notStarted = !executionEvidence && (raw.status === 'unsupported' || raw.notStarted === true || raw.blocked === true)
+    return { ...base, ok, answer: answer.slice(0, MAX_ANSWER_CHARS),
+      actualModel: reportedCliModel(raw.actualModel ?? raw.reportedModel),
+      ...(raw.reportedModel !== undefined ? { reportedModel: raw.reportedModel } : {}),
+      ...(raw.usage != null ? { usage: raw.usage } : {}),
+      ...(raw.usageIncomplete === true ? { usageIncomplete: true } : {}),
+      ...(Number.isFinite(raw.reportedCostUsd) && raw.reportedCostUsd >= 0 ? { reportedCostUsd: raw.reportedCostUsd } : {}),
+      ...Object.fromEntries(['credentialSource', 'source', 'sandboxEnforcement', 'executionEnvironment']
+        .filter(key => typeof raw[key] === 'string').map(key => [key, raw[key]])),
+      ...(Number.isInteger(raw.exitCode) ? { exitCode: raw.exitCode } : {}),
+      ...(notStarted ? { notStarted: true } : {}),
+      ...(raw.status === 'cancelled' || options.signal?.aborted ? { cancelled: true } : {}),
+      ...(raw.status === 'timed-out' ? { timedOut: true } : {}),
+      ...(raw.status === 'output-limit' || answer.length > MAX_ANSWER_CHARS ? { truncated: true } : {}),
+      ...(!ok && (raw.diagnostic || raw.outputTail) ? { diagnostic: redactDiagnostic(raw.diagnostic ?? raw.outputTail) } : {}),
+      error: ok ? undefined : redactDiagnostic(raw.error ?? raw.reason ?? (answer.trim() ? '官方工具执行失败。' : '官方工具未返回有效文本。')) }
+  } catch (error) {
+    return { ...base, ok: false, answer: '', actualModel: null, usageIncomplete: true,
+      ...(options.signal?.aborted || error?.name === 'AbortError' ? { cancelled: true } : {}),
+      error: redactDiagnostic(error?.message ?? error) }
+  }
+}
+
 /**
  * Run `targets` (all packages when null) in plan order. Packages outside the
  * target set keep their previous results, so a single failed step can be
@@ -1180,20 +1300,26 @@ function aggregateOf(results) {
 async function runPackages({ packages, task, routingBypassed, routes, previous = [], targets = null, overrides = {}, choices = {}, options }) {
   const routeList = Array.isArray(routes) ? routes : []
   const { credentialsFor, onPackage, billing, ...runOptions } = options
+  const effectivePackages = checkedPackageSelections(packages, routeList, overrides, runOptions.runVerified, targets)
   const results = []
   const ranIds = []
-  for (const item of packages) {
+  for (const item of effectivePackages) {
     const kept = previous.find(result => result.id === item.id)
     if (targets && !targets.has(item.id) && kept) {
       results.push(kept)
       continue
     }
-    const override = overrides[item.id]
-    const provider = override?.provider ?? item.recommendedProvider
-    const model = override?.model ?? item.recommendedModel
+    const override = Object.hasOwn(overrides, item.id) ? overrides[item.id] : undefined
+    const selection = packageSelectionFields(item)
+    const target = selection.manualAssignment
+    const provider = target?.kind === 'tool' ? 'official-tool' : target?.provider ?? override?.provider ?? item.recommendedProvider
+    const model = target?.kind === 'tool' ? target.toolId : target?.model ?? override?.model ?? item.recommendedModel
+    const identity = { ...selection, ...(item.type ? { type: item.type } : {}), ...(item.purpose ? { purpose: item.purpose } : {}) }
     if (runOptions.signal?.aborted) {
       // Cancelled: later packages are not started (no CLI process, no API spend).
-      const cancelled = { id: item.id, name: item.name, ok: false, provider, model, channel: 'harness-llm', answer: '', fallback: null, cancelled: true, notStarted: true, error: '执行已取消，此步骤未开始。' }
+      const cancelled = { id: item.id, name: item.name, ok: false, provider, model,
+        channel: target?.kind === 'tool' ? 'official-cli' : 'harness-llm', ...(target?.kind === 'tool' ? { toolId: target.toolId } : {}),
+        ...identity, answer: '', fallback: null, cancelled: true, notStarted: true, error: '执行已取消，此步骤未开始。' }
       results.push(cancelled)
       ranIds.push(item.id)
       if (typeof onPackage === 'function') await onPackage(cancelled)
@@ -1205,7 +1331,8 @@ async function runPackages({ packages, task, routingBypassed, routes, previous =
       const waitingOn = unmet.filter(id => { const dep = results.find(result => result.id === id); return dep?.paused || dep?.waiting })
       const blocked = {
         id: item.id, name: item.name, ok: false, provider, model,
-        channel: 'harness-llm', answer: '', fallback: null, blocked: true,
+        channel: target?.kind === 'tool' ? 'official-cli' : 'harness-llm', ...(target?.kind === 'tool' ? { toolId: target.toolId } : {}),
+        ...identity, answer: '', fallback: null, blocked: true,
         ...(waitingOn.length ? { waiting: true } : {}),
         error: waitingOn.length ? `等待上游步骤确认：${waitingOn.join('、')}` : `依赖未完成：${unmet.join('、')}`,
       }
@@ -1214,17 +1341,45 @@ async function runPackages({ packages, task, routingBypassed, routes, previous =
       if (typeof onPackage === 'function') await onPackage(blocked)
       continue
     }
-    const route = routeList.find(candidate => candidate.provider === provider && candidate.model === model)
+    const plannedRoute = routeList.find(candidate => candidate.provider === provider && candidate.model === model)
       ?? { provider, model }
-    const credentials = typeof credentialsFor === 'function' ? await credentialsFor(route) : runOptions.credentials ?? null
-    const result = await executeRouteWithBilling({
-      ...runOptions,
-      billing: billing ? { ...billing, routes: billing.routes ?? routeList, ...(choices[item.id] ? { choice: choices[item.id] } : {}) } : null,
-      credentials,
-      route,
-      task: routingBypassed ? checkedTask(task) : packagePrompt(task, item, results),
-    })
-    const entry = { id: item.id, name: item.name, ...(override ? { reassigned: true } : {}), ...result }
+    const route = target?.kind === 'api' ? { ...plannedRoute, execution: 'api', manualPinned: true }
+      : target?.kind === 'tool' ? { provider, model } : reasoningRouteForAssignment(plannedRoute, item, override)
+    if (target?.kind === 'api') delete route.reasoningEffort
+    const promptText = routingBypassed ? checkedTask(task) : packagePrompt(task, item, results)
+    const startedAt = Date.now()
+    let result
+    if (target?.kind === 'tool') result = await runManualTool(target, promptText, runOptions)
+    else if (target?.kind === 'api') result = { ...await useApi(runOptions.apiFallback, { route, task: promptText,
+      signal: runOptions.signal, preference: 'api', reason: '按工作包手动选择模型目录 API。' }), fallback: null }
+    else {
+      const credentials = typeof credentialsFor === 'function' ? await credentialsFor(route) : runOptions.credentials ?? null
+      result = await executeRouteWithBilling({
+        ...runOptions,
+        billing: billing ? { ...billing, routes: billing.routes ?? routeList, ...(choices[item.id] ? { choice: choices[item.id] } : {}) } : null,
+        credentials, route, task: promptText,
+      })
+    }
+    const durationMs = Date.now() - startedAt
+    const plannedEffort = typeof item.recommendedReasoningEffort === 'string' && item.recommendedReasoningEffort
+      ? item.recommendedReasoningEffort
+      : null
+    const effortFields = {
+      ...reasoningExecutionFields(result),
+      ...(plannedEffort && route.reasoningEffort !== plannedEffort
+        ? { plannedReasoningEffort: plannedEffort, reasoningEffortStatus: target?.kind === 'tool' ? 'unsupported' : 'unapplied' }
+        : {}),
+    }
+    const entry = {
+      id: item.id,
+      name: item.name,
+      ...(override ? { reassigned: true } : {}),
+      ...result,
+      ...identity,
+      ...effortFields,
+      ...(Number.isFinite(durationMs) && durationMs >= 0 ? { durationMs } : {}),
+      inputChars: promptText.length,
+    }
     results.push(entry)
     ranIds.push(item.id)
     if (typeof onPackage === 'function') await onPackage(entry)

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

@@ -166,6 +166,10 @@ export function parseInstallPreferences(config = {}, { tools = [], home = '', en
 
 /** Where a script install puts the binary: the user's directory, else the vendor default. */
 export function scriptInstallDir(tool, preferences, { home = '', env = {}, method } = {}) {
+  // Only a chosen root overrides Hermes' source location. Its user home and
+  // default global command directory remain owned by the vendor installer.
+  if (tool?.id === 'hermes') return preferences?.installDir
+    ? joinPath(preferences.installDir, method?.installDirSubdir || 'hermes-agent') : ''
   const binaryDir = vendorScriptDir(tool, { home, env, method })
   if (!binaryDir) return ''
   if (preferences?.installDir) return method?.installDirSubdir ? joinPath(preferences.installDir, method.installDirSubdir) : preferences.installDir
@@ -285,6 +289,9 @@ export function resolveInstallPlan(tool, methodId, preferences = {}, { platform
       : target ? [] : installDir
       ? [`${method.label} 无法使用自定义安装目录（官方脚本写死了安装路径），将安装到 ${vendorScriptDir(tool, { home, env, method })}。`]
       : []
+    if (tool.id === 'hermes' && target) {
+      notices.push(`Hermes 源码安装目录：${target}；插件启动器目录：${binDir}。配置、登录和历史保留原位置，不迁移现有数据；官方安装器可能更新全局命令使其指向所选源码。`)
+    }
     if (method.registryEnv === 'MCODE_NPM_REGISTRY' && preferences.registry && !minimaxScriptRegistry(preferences.registry)) {
       notices.push('MiniMax 官方脚本只接受 https://registry.npmjs.org/ 或 https://registry.npmmirror.com/，本次不改写它的 npm 源。')
     }
@@ -360,10 +367,11 @@ export function resolveInstallLocation(tool, method, preferences = {}, { home =
   if (method.kind === 'script') {
     // A method that cannot honour the configured directory always lands in the
     // vendor's own location, whatever the user typed.
-    const dir = methodHonoursInstallDir(method)
+    const target = methodHonoursInstallDir(method)
       ? scriptInstallDir(tool, preferences, { home, env, method })
-      : vendorScriptDir(tool, { home, env, method })
-    const binDir = methodHonoursInstallDir(method) && method.installDirSuffix ? joinPath(dir, method.installDirSuffix) : dir
+      : ''
+    const dir = target || vendorScriptDir(tool, { home, env, method })
+    const binDir = target && method.installDirSuffix ? joinPath(target, method.installDirSuffix) : dir
     return { kind: 'script', dir: binDir, installDir: dir, binaries: [...(method.scriptBinaryNames ?? tool.scriptBinaryNames ?? [])] }
   }
   return { kind: 'package-manager', dir: packageManagerBinDir(preferences?.installDir || '', { platform }), installDir: preferences?.installDir || '', binaries: [] }

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## 0.22.0 — 2026-10-19
+
+- Add an explicit algorithm/manual assignment choice after task decomposition. Manually select an exact model API or registered official tool for every package, retain the original recommendation and dependencies, restore recommendations, and invalidate stale execution previews after edits.
+- Validate the entire assignment before the first paid request, recompute per-package API estimates, check tool readiness, and execute the prepared plan. Manual APIs use adapter-default effort and stay pinned through budget checks and JSON validation; manual tools use their own default model and never silently fall back to API. Mixed execution is read-only; editable official teams retain their existing isolated-worktree lifecycle.
+- Persist manual intent and original recommendations with actual channels, model evidence and costs. Retries retain selected targets, preserve completed upstream results even when their model leaves the catalog, and revalidate image capabilities after reassignment.
+- Import explicit objective training evidence for task-related quality estimates and compare model/effort actions only with enough matching evidence. Learn empirical P90 token and duration resources from complete successful records, retaining conservative cold-start and missing-price fallbacks.
+- Improve bounded DAG assignment search using future dependency boundaries, safe prefix dominance and optimistic handoff ranking. Beam search remains approximate, and synthetic/oracle tests do not establish production answer-quality or cost gains.
+- Carry exact supported API effort IDs into execution, distinguish requested controls from unverified backend effort, and prevent cross-model effort leakage. Optional JSON-structure validation and one API upgrade default to off and respect subscription and budget restrictions.
+- Retain earlier paid attempts when an upgrade fails or never starts; preserve unknown spending separately. Fix short dependency answers being replaced by truncation markers while keeping the total UTF-8 prompt limit.
+
+Validation: 966 automated tests, 963 passed and 3 platform-dependent skips; 12 real Chromium interactions against offline UI fixtures passed. Frozen pnpm installation, client build/check and package verification passed. No new real provider or vendor CLI model calls were made. An existing Windows multi-process lock test had one transient EPERM during development; isolated rechecks and the final full suite passed, without a lock implementation change. See [release acceptance and limits](docs/releases/0.22.0-validation.md).
+
+Fully quit Harness, including its tray and Host background processes, update the plugin to 0.22.0, and restart.
+
+## 0.21.1 — 2026-10-18
+
+- Honor Hermes custom program directories on Windows and POSIX through the official `-InstallDir` / `--dir` parameter. Place the checkout in the shared root's `hermes-agent` child and bind probes and terminals to its source-local `.hermes/bin` launcher; an old global command cannot satisfy a missing selected installation.
+- Retain existing Hermes configuration, login and history locations. Keep vendor-default discovery when the shared root is empty, preserve old source trees and explain the separate program/data locations. Installation does not migrate user data; the official installer may refresh its global convenience command.
+- Move the official-tools interactive terminal above onboarding and tool maintenance, preserving the existing component and tab/session lifecycle.
+- Add offline directory, installer-argument and selected-entry regressions. Vendor installation and model calls are not part of this release's acceptance.
+
 ## 0.21.0 — 2026-10-18
 
 - Added support for Hermes Agent (NousResearch source installer): includes native Windows PowerShell and POSIX Bash non-interactive flags, vendor-specific launcher and data paths, `hermes auth` authentication flow, and manual uninstall via `hermes uninstall`.

package/README.i18n.yaml

@@ -1,4 +1,4 @@
 # README translation pairing for this repository.
 # Reviewed together; Git blob hashes identify the exact synchronized texts.
-README.md: 04f64547cf8a120e07e15e9f649ed7001e6d23c5
-README.zh.md: 5bd65b5afeb80afcc047dbde68724861746f2975
+README.md: b7789d744cd5c467bc577c91d344e1b85a2a375e
+README.zh.md: 6605958c924e9fddb96ed7aee1ceef070a0f7c22