@miphamai/cli 0.81.8 → 0.81.9

package/src/ui/app.tsx

@@ -114,9 +114,46 @@ const PERMISSION_COLORS: Record<PermissionMode, string> = {
   bypassPermissions: 'red',
 }
 
+/** 页脚读模式所需的最小面 —— `QueryEngine` 与 `RemoteEngine` 都满足。 */
+export type PermissionSource = {
+  setMode(mode: PermissionMode): void
+  getMode(): PermissionMode
+}
+
+/**
+ * 页脚那一行是**执行的镜像，不是本地猜的值**。
+ *
+ * 组织级限制（`maxAllowedMode` / `forbiddenModes`）会在 `setMode` 里**静默改写**你请求的
+ * 那一档，所以页脚存「请求值」就会报出一个引擎不会给你的权限 —— 说放行、实际审批。
+ * 初始值与每次 Shift+Tab 都从这里回读。
+ */
+export function livePermissionMode(permission: PermissionSource): PermissionMode {
+  return permission.getMode()
+}
+
+/** 走一档 Shift+Tab 循环，然后**回读**真正生效的模式（上限可能把这一档压回去）。 */
+export function cyclePermissionMode(
+  permission: PermissionSource,
+  current: PermissionMode,
+): PermissionMode {
+  const idx = PERMISSION_MODES.indexOf(current)
+  const next = PERMISSION_MODES[(idx + 1) % PERMISSION_MODES.length]!
+  permission.setMode(next)
+  return permission.getMode()
+}
+
+/** 预览截断按 UTF-16 码元计数，落点若正好夹在一个代理对中间，切完就留下
+ *  **半个** emoji（终端渲染成 U+FFFD）。落点是高代理时后退一个码元即可。 */
+export function truncateForDisplay(text: string, max: number): string {
+  if (text.length <= max) return text
+  const last = text.charCodeAt(max - 1)
+  const end = last >= 0xd800 && last <= 0xdbff ? max - 1 : max
+  return text.slice(0, end)
+}
+
 /** Format a tool's input parameters into a compact one-line detail string.
  *  Tool display names follow Claude Code convention: Write/Edit → Update. */
-function formatToolDetail(name: string, input: Record<string, unknown>): string {
+export function formatToolDetail(name: string, input: Record<string, unknown>): string {
   switch (name) {
     case 'Bash':
       return sanitizeForDisplay((input.command as string) || '')
@@ -125,13 +162,13 @@ function formatToolDetail(name: string, input: Record<string, unknown>): string
     case 'Write':
       return (input.file_path as string) || '' // displayed as "Update" in chat
     case 'Edit':
-      return `${(input.file_path as string) || ''}: ${((input.old_string as string) || '').slice(0, 60)}` // displayed as "Update" in chat
+      return `${(input.file_path as string) || ''}: ${truncateForDisplay((input.old_string as string) || '', 60)}` // displayed as "Update" in chat
     case 'Grep':
       return (input.pattern as string) || ''
     case 'Glob':
       return (input.pattern as string) || ''
     case 'Agent':
-      return `${(input.subagent_type as string) || 'general'}, "${((input.description as string) || (input.prompt as string) || '').slice(0, 80)}"`
+      return `${(input.subagent_type as string) || 'general'}, "${truncateForDisplay((input.description as string) || (input.prompt as string) || '', 80)}"`
     case 'WebSearch':
       return (input.query as string) || ''
     case 'WebFetch':
@@ -139,7 +176,7 @@ function formatToolDetail(name: string, input: Record<string, unknown>): string
     case 'Task':
       return `"${(input.subject as string) || ''}"`
     default:
-      return JSON.stringify(input).slice(0, 80)
+      return truncateForDisplay(JSON.stringify(input), 80)
   }
 }
 
@@ -251,7 +288,11 @@ export function App({
   const [focusMode, setFocusMode] = useState(false)
   const [_ultracodeMode, setUltracodeMode] = useState(false)
   const [goalText, setGoalText] = useState('')
-  const [permissionMode, setPermissionMode] = useState<PermissionMode>('default')
+  // 初始值取自 live 权限系统 —— 启动时 config 的模式可能已被组织级限制钳到别处
+  // （页脚写死 'default' 时会与执行不一致，且偏差方向是「报得比实际宽」）。
+  const [permissionMode, setPermissionMode] = useState<PermissionMode>(() =>
+    livePermissionMode(engine.getPermission()),
+  )
   const abortRef = useRef<AbortController | null>(null)
   // Monotonic turn id — lets a stale turn's finally() skip resetting shared UI
   // state (isLoading/abortRef/progress) after a newer turn has already started.
@@ -1239,12 +1280,7 @@ export function App({
                     })
                   }}
                   onCyclePermission={() => {
-                    setPermissionMode((prev) => {
-                      const idx = PERMISSION_MODES.indexOf(prev)
-                      const next = PERMISSION_MODES[(idx + 1) % PERMISSION_MODES.length]!
-                      engine.getPermission().setMode(next)
-                      return next
-                    })
+                    setPermissionMode((prev) => cyclePermissionMode(engine.getPermission(), prev))
                   }}
                   onCancel={() => {
                     if (abortRef.current) {

package/src/ui/commands.ts

@@ -13,6 +13,7 @@ import type { PluginManager } from '../plugin/plugin-manager'
 import type { Message } from '../shared/types.js'
 import type { UpdateStatus } from '../shared/update'
 import { McpClient } from '../mcp/client'
+import { unregisterMcpServerTools } from '../mcp/registry'
 import { buildCapabilityReport } from '../core/capability-inventory'
 import { InstructionsLoader } from '../core/instructions'
 import { findDerivableSections, DERIVABLE_HINTS } from '../core/claude-md-audit'
@@ -56,6 +57,7 @@ import {
 import { NPM_UPDATE_COMMAND, PACKAGE_VERSION, COAUTHOR_TRAILER } from '../shared/index.ts'
 import { getPreference } from '../config/preferences'
 import { loadCrossSessionConfig, tryRestoreFromBackup } from '../config/loader'
+import { getWorkspaceTrust } from '../core/workspace-trust'
 import { getMemoryManager } from '../core/memory/memory-loader'
 import {
   resolveTelemetry,
@@ -363,14 +365,18 @@ const contextCmd: CommandHandler = (ctx) => {
   const tokens = c.getEstimatedTokens()
   const msgs = c.getMessages()
   const systemPromptLen = c.getSystemPrompt().length
+  // 窗口与阈值一律问引擎：模型注册表里 1M/256K/128K/32K 都有，写死 200K 会
+  // 让 1M 模型显示约 5 倍偏高的百分比，并把压缩点说成 90%（实际 95%）。
+  const maxTokens = c.getMaxTokens()
+  const threshold = c.getCompactionThreshold()
   return {
     content: stripIndent`
       ${t('commands.context.title')}
       ${t('commands.context.messages')}       ${msgs.length}
-      ${t('commands.context.estimated_tokens')} ${tokens.toLocaleString()} / 200,000
-      ${t('commands.context.usage_pct')}           ${((tokens / 200_000) * 100).toFixed(1)}%
+      ${t('commands.context.estimated_tokens')} ${tokens.toLocaleString()} / ${maxTokens.toLocaleString()}
+      ${t('commands.context.usage_pct')}           ${((tokens / maxTokens) * 100).toFixed(1)}%
       ${t('commands.context.system_prompt')}   ${systemPromptLen.toLocaleString()} chars (~${Math.ceil(systemPromptLen / 4).toLocaleString()} tokens)
-      ${t('commands.context.compaction')}      at 90% (${(200_000 * 0.9).toLocaleString()} tokens)
+      ${t('commands.context.compaction')}      at ${(threshold * 100).toFixed(0)}% (${Math.round(maxTokens * threshold).toLocaleString()} tokens)
     `,
   }
 }
@@ -395,7 +401,7 @@ const statusCmd: CommandHandler = async (ctx) => {
       ${t('commands.status.provider')}   ${ctx.providerId}
       ${t('commands.status.model')}      ${ctx.modelId}
       ${t('commands.status.messages')}   ${c.getMessages().length}
-      ${t('commands.status.tokens')}     ~${c.getEstimatedTokens().toLocaleString()} / 200,000
+      ${t('commands.status.tokens')}     ~${c.getEstimatedTokens().toLocaleString()} / ${c.getMaxTokens().toLocaleString()}
       ${t('commands.status.tools')}      ${tools.size} ${t('commands.status.loaded')}
       ${t('commands.status.permission')} ${ctx.config.permission}
 
@@ -412,16 +418,18 @@ const statusCmd: CommandHandler = async (ctx) => {
 
 const costCmd: CommandHandler = (ctx) => {
   const t = resolveT(ctx)
-  const tokens = ctx.engine.getContext().getEstimatedTokens()
-  const cacheStatus = ctx.engine.getContext().getCacheStatus()
+  const c = ctx.engine.getContext()
+  const tokens = c.getEstimatedTokens()
+  const cacheStatus = c.getCacheStatus()
   const cachedTokens = cacheStatus.cachedTokens
   const hitRatio = tokens > 0 ? Math.min(1, cachedTokens / tokens) : 0
   const uncachedTokens = Math.max(0, tokens - cachedTokens)
+  const maxTokens = c.getMaxTokens()
   return {
     content: stripIndent`
       ${t('commands.context_tokens.title')}
-      ${t('commands.context_tokens.context_tokens')} ~${tokens.toLocaleString()} / 200,000
-      ${t('commands.context_tokens.usage')} ${((tokens / 200_000) * 100).toFixed(1)}%
+      ${t('commands.context_tokens.context_tokens')} ~${tokens.toLocaleString()} / ${maxTokens.toLocaleString()}
+      ${t('commands.context_tokens.usage')} ${((tokens / maxTokens) * 100).toFixed(1)}%
       ${t('commands.context_tokens.prompt_cache', {
         cached: cachedTokens.toLocaleString(),
         ratio: (hitRatio * 100).toFixed(1),
@@ -2257,7 +2265,7 @@ const usageCmd: CommandHandler = (ctx) => {
   const c = ctx.engine.getContext()
   const estTokens = c.getEstimatedTokens()
   const msgs = c.getMessages()
-  const maxTokens = 200_000
+  const maxTokens = c.getMaxTokens()
   const pct = ((estTokens / maxTokens) * 100).toFixed(1)
 
   const tracker = ctx.engine.getUsageTracker()
@@ -3133,9 +3141,10 @@ const doctorCmd: CommandHandler = async (ctx) => {
   const c = ctx.engine.getContext()
   const msgs = c.getMessages()
   const tokens = c.getEstimatedTokens()
+  const maxTokens = c.getMaxTokens()
   lines.push(`Messages     ${msgs.length}`)
   lines.push(
-    `Tokens       ~${tokens.toLocaleString()} / 200,000 (${((tokens / 200_000) * 100).toFixed(1)}%)`,
+    `Tokens       ~${tokens.toLocaleString()} / ${maxTokens.toLocaleString()} (${((tokens / maxTokens) * 100).toFixed(1)}%)`,
   )
   lines.push(`Checkpoints  ${c.getCheckpoints().length}`)
 
@@ -3637,13 +3646,16 @@ const statsCmd: CommandHandler = (ctx) => {
       assistant: String(assistantMsgs),
       system: String(systemMsgs),
     }),
-    t('commands.stats.tokens', { tokens: tokens.toLocaleString() }),
+    t('commands.stats.tokens', {
+      tokens: tokens.toLocaleString(),
+      max: c.getMaxTokens().toLocaleString(),
+    }),
     t('commands.stats.tools', { count: String(tools.size) }),
     t('commands.stats.provider', { provider: ctx.providerId }),
     t('commands.stats.model', { model: ctx.modelId }),
     t('commands.stats.permission', { permission: ctx.config.permission }),
     '',
-    t('commands.stats.usage', { pct: ((tokens / 200_000) * 100).toFixed(1) }),
+    t('commands.stats.usage', { pct: ((tokens / c.getMaxTokens()) * 100).toFixed(1) }),
   ]
 
   // ── CRSI & SIS extensions ──
@@ -3780,18 +3792,42 @@ const cdCmd: CommandHandler = async (ctx, args) => {
 const hooksCmd: CommandHandler = async (ctx) => {
   const t = resolveT(ctx)
   const { loadSettingsJson } = await import('../config/loader')
-  const settingsJson = loadSettingsJson(process.cwd())
-
-  const hooks = settingsJson.hooks as Record<
-    string,
-    Array<{ matcher?: string; hooks: Array<{ type: string; command?: string }> }>
-  >
+  const cwd = process.cwd()
+  // This command *displays* the configured list, so it asks for the project file
+  // explicitly — the loader's default drops project hooks (they are
+  // repository-controlled code execution) and would hide hooks that really do
+  // exist here.
+  //
+  // Two calls, one per source: the merged list cannot say which entry came from
+  // which file, and the two are not governed alike — only the project file's
+  // entries are gated on workspace trust.
+  const userHooks = loadSettingsJson(cwd).hooks
+  const projectHooks = loadSettingsJson(cwd, { includeProjectHooks: true }).projectHooks ?? {}
+
+  // Listing them is not the same claim as their running. Project hooks are
+  // gated, and this command renders them even when the gate is shut — so the
+  // display has to name the source and say which entries will not run.
+  const gated = !getWorkspaceTrust().isTrusted(cwd)
+
+  type Entry = { matcher?: string; hooks: Array<{ type: string; command?: string }> }
+  const sources: Array<{ project: boolean; hooks: Record<string, Entry[]> }> = [
+    { project: true, hooks: projectHooks as Record<string, Entry[]> },
+    { project: false, hooks: userHooks as Record<string, Entry[]> },
+  ]
 
-  const configured = Object.entries(hooks).filter(
-    ([, entries]) => Array.isArray(entries) && entries.length > 0,
-  )
+  // Event → its entries, project first — the order the merged list produced, so
+  // a trusted workspace's output is unchanged by the split.
+  const byEvent = new Map<string, Array<{ entry: Entry; project: boolean }>>()
+  for (const { project, hooks } of sources) {
+    for (const [eventName, entries] of Object.entries(hooks)) {
+      if (!Array.isArray(entries) || entries.length === 0) continue
+      const bucket = byEvent.get(eventName) ?? []
+      for (const entry of entries) bucket.push({ entry, project })
+      byEvent.set(eventName, bucket)
+    }
+  }
 
-  if (configured.length === 0) {
+  if (byEvent.size === 0) {
     return { content: t('commands.hooks.no_hooks') }
   }
 
@@ -3803,13 +3839,15 @@ const hooksCmd: CommandHandler = async (ctx) => {
   ]
 
   let count = 0
-  for (const [eventName, entries] of configured) {
-    for (const entry of entries) {
+  for (const [eventName, bucket] of byEvent) {
+    for (const { entry, project } of bucket) {
       for (const hook of entry.hooks) {
         count++
         const matcher = entry.matcher || '*'
         const cmd = hook.type === 'command' && hook.command ? hook.command : hook.type
-        lines.push(`  ${eventName} [${matcher}] → ${cmd}`)
+        const source = t(project ? 'commands.hooks.source_project' : 'commands.hooks.source_user')
+        const suffix = project && gated ? `  ${t('commands.hooks.gated')}` : ''
+        lines.push(`  [${source}] ${eventName} [${matcher}] → ${cmd}${suffix}`)
       }
     }
   }
@@ -4092,7 +4130,12 @@ const resumeLastCmd: CommandHandler = async (ctx) => {
             loaded: String(messages.length),
             total: String(session.messages.length),
           })
-        : t('commands.resume.restored_full_footer', { loaded: String(messages.length) }),
+        : t('commands.resume.restored_full_footer', {
+            loaded: String(messages.length),
+            // 文案里的 `{name}` 必须真给：`t()` 把没给的占位符替换成**空串**
+            // （`t.ts` 的 `params[k] ?? ''`），漏掉就静默印出 `--resume ""`。
+            name: latest.name,
+          }),
     ].join('\n'),
     forwardedMessages: messages,
     resumeWarning: true,
@@ -4319,6 +4362,16 @@ const upgradeCmd: CommandHandler = async (ctx) => {
 
   const update = checkForUpdates()
 
+  // The registry was never reached. "Already up to date" would be a claim we
+  // cannot support: `checkForUpdates` leaves `latest === current` on failure, so
+  // the old code printed "✓ Already up to date (v0.81.8 → v0.81.8)" while
+  // offline and gave no hint that a check had even been attempted.
+  // (`mipham update` on the CLI path already says "Could not determine latest
+  // version" — this is the TUI's equivalent.)
+  if (!update.checked) {
+    return { content: t('commands.upgrade.check_failed', { current: update.current }) }
+  }
+
   if (!update.available) {
     return {
       content: t('commands.upgrade.uptodate', { current: update.current, latest: update.latest }),
@@ -4688,18 +4741,51 @@ const mcpCmd: CommandHandler = async (ctx, args) => {
   if (sub === 'disconnect') {
     const name = args[1]
     if (!name) return { content: 'Usage: /mcp disconnect <server-name>' }
-    const tools = client.disconnect(name)
+    client.disconnect(name)
+    // Dropping the connection is not dropping the tools. They live in the
+    // engine's registry — the map the model actually calls — and closing the
+    // transport leaves every one of them registered and selectable, failing
+    // only at call time. Count what the registry actually gave up, not what the
+    // connection used to hold: those are different objects and only one of them
+    // is what "removed" refers to.
+    const toolsMap = ctx.engine.getTools()
+    const before = toolsMap.size
+    unregisterMcpServerTools(name, toolsMap)
+    const removed = before - toolsMap.size
     return {
       content: [
         `── MCP Disconnect: ${name} ──`,
         '',
-        tools.length > 0
-          ? `Disconnected. ${tools.length} tool(s) removed.`
+        removed > 0
+          ? `Disconnected. ${removed} tool(s) removed.`
           : 'Disconnected (no tools were registered).',
       ].join('\n'),
     }
   }
 
+  // /mcp reconnect <name>
+  if (sub === 'reconnect') {
+    const name = args[1]
+    if (!name) return { content: 'Usage: /mcp reconnect <server-name>' }
+    try {
+      await client.reconnect(name)
+      const count = client.getTools(name).length
+      return {
+        content: `── MCP Reconnect: ${name} ──\n\nReconnected — ${count} tool(s) rediscovered.`,
+      }
+    } catch (err) {
+      return {
+        content: [
+          `── MCP Reconnect: ${name} ──`,
+          '',
+          `Failed: ${String(err)}`,
+          '',
+          `The server stayed disconnected. Check that it is reachable, then retry — or use /mcp connect ${name}.`,
+        ].join('\n'),
+      }
+    }
+  }
+
   // /mcp reload
   if (sub === 'reload') {
     return {
@@ -4749,6 +4835,7 @@ const mcpCmd: CommandHandler = async (ctx, args) => {
   lines.push('── Commands ──')
   lines.push('  /mcp connect <name>    Connect to a server (OAuth or stdio)')
   lines.push('  /mcp disconnect <name>  Disconnect from a server')
+  lines.push('  /mcp reconnect <name>  Reconnect a dropped server (with backoff)')
   lines.push('  /mcp reload            Disconnect all and reconnect')
   lines.push('')
   lines.push('── Protocol ──')
@@ -4994,7 +5081,7 @@ Or use the Agent tool in a conversation to launch a sub-agent.`,
   return { content: lines.join('\n') }
 }
 
-const bgCmd: CommandHandler = (ctx, args) => {
+const bgCmd: CommandHandler = async (ctx, args) => {
   const prompt = args.join(' ')
   if (!prompt.trim()) {
     return {
@@ -5023,6 +5110,49 @@ Background agents appear in the Agent View dashboard (/agents).`,
 
   agentViewManager.addMessage(session.id, { role: 'user', content: prompt })
   agentViewManager.updateStatus(session.id, 'working')
+  session.kind = 'unattended'
+
+  // A session row is not a task. Without the spawn below this command only ever
+  // wrote a dashboard entry and reported success — the prompt was never handed
+  // to a model, and the row sat at `working` forever.
+  const bgReg = (await import('../agent/background-registry')).getBackgroundAgentRegistry()
+  bgReg.spawn(
+    prompt,
+    'general',
+    async (_signal) => {
+      const { SubAgent } = await import('../agent/sub-agent')
+      const sa = new SubAgent(
+        ctx.engine.getRegistry(),
+        ctx.engine.getTools(),
+        ctx.engine.getPermission(),
+        undefined,
+        undefined,
+        ctx.engine.getLlm(),
+      )
+      try {
+        // The prompt came from the user typing `/bg …`, so it stays unframed —
+        // unlike a workflow script's computed prompt.
+        const result = await sa.execute(prompt, 'bg: ' + prompt.slice(0, 60), { type: 'general' })
+        agentViewManager.addMessage(session.id, {
+          role: 'assistant',
+          content: result || '(no output)',
+        })
+        agentViewManager.updateStatus(session.id, 'completed')
+        return result
+      } catch (err) {
+        // Leave the row honest on failure too — a session stuck at `working`
+        // after its executor died is the same lie as never spawning at all.
+        const message = err instanceof Error ? err.message : String(err)
+        agentViewManager.addMessage(session.id, {
+          role: 'assistant',
+          content: `Background agent failed: ${message}`,
+        })
+        agentViewManager.updateStatus(session.id, 'failed')
+        throw err
+      }
+    },
+    'unattended',
+  )
 
   return {
     content: `✓ Background agent spawned: ${session.id}

package/src/workflow/primitives/agent.ts

@@ -108,6 +108,10 @@ export async function workflowAgent(
         modelOverride: opts.model,
         allowedTools: undefined, // use all tools by default
         worktreePath,
+        // The prompt is computed by the script, not typed by the user — say so,
+        // so text the script relayed from a file or another agent cannot pass
+        // as the user's own opening instruction.
+        promptOrigin: 'script',
       })
 
       lastResult = textResult