@miphamai/cli 0.82.0 → 0.84.0

package/src/ui/app.tsx

@@ -9,6 +9,7 @@ import type { RemoteEngine } from '../daemon/remote-engine'
 import type { MiphamConfig } from '../shared/index.ts'
 import type { Llm } from '../providers/llm'
 import { AUTOCOMPLETE_MAX_CONTEXT, type RecentMessage } from '../core/autocomplete'
+import { MODE_CYCLE } from '../core/permission-config'
 import { resolveGitPr, prColor, type GitPr } from '../core/git-pr'
 import type { SkillsLoader } from '../skills/loader'
 import type { PluginManager } from '../plugin/plugin-manager'
@@ -103,17 +104,43 @@ interface AgentProgress {
 // Version is read fresh from package.json at startup via runApp prop
 // (bypasses Bun module caching after npm update)
 
-// Cycle order: Claude Code modes (manual → accept edits → plan → bypass).
-const PERMISSION_MODES: PermissionMode[] = ['default', 'acceptEdits', 'plan', 'bypassPermissions']
+// The wheel is `MODE_CYCLE` — imported, not copied. This file used to hold its own
+// array, which is how a help screen and a footer come to advertise a mode the wheel
+// cannot reach: two lists that agree on the day they are written and drift after.
 // Labels aligned with Claude Code terminology: describe behavior, not capability.
-// Claude Code modes: manual mode → accept edits on → plan → bypass.
 const PERMISSION_COLORS: Record<PermissionMode, string> = {
   default: 'white',
   acceptEdits: 'blue',
   plan: 'yellow',
+  auto: 'magenta',
   bypassPermissions: 'red',
 }
 
+// 页脚那一行的**字形**，取值与 Claude Code 二进制里那四个格逐字对齐（`$Pe="⏸"` /
+// `Ije="⏵⏵"`）：`default` **什么都不显示**、`acceptEdits` 与 `auto` 都是 `⏵⏵`、`plan` 是 `⏸`。
+// 这本是设计文档决策 9 的一半，Step 6/7 只做了标签派生、漏了字形，此处补上。
+// `bypassPermissions` 在 CC 的转盘上没有对应格（它的转盘 4 格、我们这张是 5 档），
+// 无从对照 ⇒ **保留既有渲染** `⏵⏵`，是最小的选择而不是新决定。
+// 穷尽 `Record` 与 `PERMISSION_COLORS` 同形：将来加档位忘了字形是**编译错**，不是静默空串。
+const PERMISSION_GLYPHS: Record<PermissionMode, string> = {
+  default: '',
+  acceptEdits: '⏵⏵',
+  plan: '⏸',
+  auto: '⏵⏵',
+  bypassPermissions: '⏵⏵',
+}
+
+/**
+ * 页脚前缀 = `<字形> `，**没有字形时连那个空格都不留**（否则 `default` 那一行会以空格起头）。
+ *
+ * 与 `PERMISSION_LABELS` 合成**单独一个**文本节点交给 Ink：分两处写时，中间那点缩进是否
+ * 落成空格取决于 JSX 的空白折叠规则 —— 一件与权限无关、却会改变用户读到的东西的巧合。
+ */
+export function permissionGlyphPrefix(mode: PermissionMode): string {
+  const glyph = PERMISSION_GLYPHS[mode]
+  return glyph ? `${glyph} ` : ''
+}
+
 /** 页脚读模式所需的最小面 —— `QueryEngine` 与 `RemoteEngine` 都满足。 */
 export type PermissionSource = {
   setMode(mode: PermissionMode): void
@@ -136,8 +163,17 @@ export function cyclePermissionMode(
   permission: PermissionSource,
   current: PermissionMode,
 ): PermissionMode {
-  const idx = PERMISSION_MODES.indexOf(current)
-  const next = PERMISSION_MODES[(idx + 1) % PERMISSION_MODES.length]!
+  // An off-wheel *current* mode is reachable, not hypothetical: `bypassPermissions`
+  // is legal (`ALL_MODES`) without being cyclable, so `permission: bypassPermissions`
+  // in config puts the user in a state the wheel has no slot for. `indexOf` then
+  // answers `-1`, and `(-1 + 1) % length` lands on slot 0 by arithmetic accident.
+  // Spelled out here so it is a decision rather than an accident: off-wheel goes to
+  // the wheel's first slot, the same answer `nextMode` gives. That slot is `default`,
+  // which is **not** the narrowest mode (`plan` is) — the wheel is not a permissiveness
+  // order — but it *is* narrower than the only off-wheel state you can reach,
+  // `bypassPermissions`, so the step still points away from wider.
+  const idx = MODE_CYCLE.indexOf(current)
+  const next = idx === -1 ? MODE_CYCLE[0]! : MODE_CYCLE[(idx + 1) % MODE_CYCLE.length]!
   permission.setMode(next)
   return permission.getMode()
 }
@@ -204,6 +240,7 @@ export function App({
       default: t('ui.permission.manual'),
       acceptEdits: t('ui.permission.accept_edits'),
       plan: t('ui.permission.plan_mode'),
+      auto: t('ui.permission.auto_mode'),
       bypassPermissions: t('ui.permission.bypass'),
     }),
     [t],
@@ -231,6 +268,10 @@ export function App({
   const [providerId, setProviderId] = useState(initialProvider || config.defaultProvider)
   const [modelId, setModelId] = useState(initialModel || config.defaultModel)
   const [pickerOpen, setPickerOpen] = useState(false)
+  // ↑/↓ 翻历史用的已提交输入。**必须住在这里而不是 InputBar 里** —— InputBar 会被
+  // 卸载（pickerOpen 三元 / apiKeyPrompt 早退 / Ctrl+G），组件内 state 随之清零，
+  // 于是「开一次模型选择器，历史就没了」（ROADMAP D7）。
+  const [inputHistory, setInputHistory] = useState<string[]>([])
   const [updateStatus, setUpdateStatus] = useState<UpdateStatus | null>(null)
   // Current git branch — read once at mount (not a git repo → null).
   const [gitBranch] = useState<string | null>(() => {
@@ -1242,6 +1283,8 @@ export function App({
                 <InputBar
                   onSubmit={handleSubmit}
                   isLoading={isLoading}
+                  history={inputHistory}
+                  onHistoryAppend={(v) => setInputHistory((prev) => [...prev, v])}
                   llm={autocompleteLlm}
                   recentMessages={recentMessages}
                   autocompleteEnabled={
@@ -1319,13 +1362,12 @@ export function App({
             <Box flexDirection="column">
               <Box flexDirection="row">
                 <Text color={PERMISSION_COLORS[permissionMode]}>
-                  ⏵⏵ {PERMISSION_LABELS[permissionMode]}
+                  {permissionGlyphPrefix(permissionMode) + PERMISSION_LABELS[permissionMode]}
                 </Text>
                 <Text dimColor>
                   {' '}
-                  ({t('ui.status.shift_tab_cycle')}: {PERMISSION_LABELS.default} ·{' '}
-                  {PERMISSION_LABELS.acceptEdits} · {PERMISSION_LABELS.plan} ·{' '}
-                  {PERMISSION_LABELS.bypassPermissions}){' · '}
+                  ({t('ui.status.shift_tab_cycle')}:{' '}
+                  {MODE_CYCLE.map((m) => PERMISSION_LABELS[m]).join(' · ')}){' · '}
                   {t('ui.status.esc_to_interrupt')}
                   {' · '}
                   {t('ui.status.left_for_agents')}

package/src/ui/commands.ts

@@ -17,7 +17,7 @@ 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'
-import { worktreeRoot, workflowScriptDir, workflowScriptDirs } from '../core/paths.ts'
+import { miphamHome, workflowScriptDir, workflowScriptDirs, worktreeRoot } from '../core/paths.ts'
 import { fixDoctor, fixConfig, fixCache, selectRepoClaudeFiles } from '../core/fix'
 import { fixCodeTarget } from '../core/fix-code'
 import { homedir } from 'node:os'
@@ -37,7 +37,13 @@ import {
   MANAGED_RULES_FILE,
 } from '../core/crsi-producer'
 import { prefilterProposal } from '../core/proposal-guard'
-import { runEval, appendEvalScore } from '../core/eval-harness'
+import {
+  runEval,
+  appendEvalScore,
+  getContractHistory,
+  diffContractHistory,
+  renderContractDiff,
+} from '../core/eval-harness'
 import { listRewardFns } from '../core/reward-fn'
 import {
   runTaskPerformance,
@@ -47,6 +53,7 @@ import {
 import { randomUUID } from 'node:crypto'
 import {
   buildImprovementReport,
+  formatCostLine,
   appendImprovement,
   readImprovements,
   improvementRate,
@@ -101,7 +108,7 @@ import { keysCmd } from '../commands/keys'
 import { workflowViewCmd, workflowWatchCmd } from '../commands/workflow-view.js'
 import { listActiveAutoloops, formatLoopRows } from '../commands/autoloop-journal.js'
 import { execSync } from 'node:child_process'
-import { OLLAMA_PRESET_MODELS } from '../shared/constants'
+import { MIPHAM_DIR, OLLAMA_PRESET_MODELS } from '../shared/constants'
 import { renameActiveSession } from '../agent/cross-session/discovery'
 
 export interface CommandContext {
@@ -901,9 +908,12 @@ const crsiModifyCmd: CommandHandler = async (ctx, args) => {
             ? 'regressed ⚠️'
             : 'inconclusive'
       const sign = report.deltaMean >= 0 ? '+' : ''
+      // B2 代价维：只展示、不进判定（`formatCostLine` 缺席时返回 null ⇒ 整行不打）。
+      const costLine = formatCostLine(report)
       improvementLine =
         `\n📊 改进判定: ${label} (delta ${sign}${report.deltaMean.toFixed(1)}, 噪声 ${report.noise.toFixed(1)}, 阈值 ${report.minEffect.toFixed(1)})` +
         `\n   改进率: ${rate.improved}/${rate.total} (${(rate.rate * 100).toFixed(0)}%, Wilson 95% [${(rate.lo * 100).toFixed(0)}%, ${(rate.hi * 100).toFixed(0)}%])` +
+        (costLine ? `\n${costLine}` : '') +
         (report.verdict === 'regressed' ? '\n   ⚠️ 任务表现倒退：--approve 将被拒绝。' : '')
     }
   } catch {
@@ -1009,6 +1019,10 @@ const crsiProposeCmd: CommandHandler = async (ctx, args) => {
             `\n🎯 ε 预测命中: ${report.predictionHit ? '命中 ✅' : '未命中 ⚠️'}` +
             `（预测 ${report.predictedDelta}，实际 delta ${report.deltaMean.toFixed(1)}）`
         }
+        // B2 代价维：**与手工路径同一行读数**，两条渲染路径都接（只接一条即本仓库记过的
+        // 「局部正确全局遗漏」）。ε 行可以有、代价行可以没有，故各自独立追加。
+        const costLine = formatCostLine(report)
+        if (costLine) predictionLine += `\n${costLine}`
       }
     } catch {
       // 测量失败（LLM 不可用等）不阻断提案流程 —— 与手工路径 :889 的处置一致。
@@ -1132,14 +1146,26 @@ const crsiEvalCmd: CommandHandler = async (ctx, args) => {
         content: `❌ 未知 reward: ${rewardName}。可用: ${fns.map((f) => f.name).join(', ')}`,
       }
     }
+    // 先读后写：比较基准是「上一次已落盘的态」，不依赖刚写进去那条排第几。
+    const prev = getContractHistory(fn.name)
     const report = await fn.evaluate()
+    const deltaLines = report.results
+      ? renderContractDiff(diffContractHistory(report.results, prev))
+      : []
     appendEvalScore(fn.name, report)
     return {
-      content: `得分 **${report.score}/100** (${report.passed}/${report.total})\n失败: ${report.failures.join(', ') || '无'}`,
+      content: [
+        `得分 **${report.score}/100** (${report.passed}/${report.total})`,
+        `失败: ${report.failures.join(', ') || '无'}`,
+        ...(deltaLines.length > 0 ? ['', '### 与上次相比', ...deltaLines] : []),
+      ].join('\n'),
     }
   }
 
+  // 先读后写（同上）：基准是上一次落盘的态。
+  const prevSnapshot = getContractHistory('mechanism-sentinel')
   const report = runEval()
+  const deltaLines = renderContractDiff(diffContractHistory(report.results, prevSnapshot))
   appendEvalScore('mechanism-sentinel', report)
 
   const lines: string[] = ['## 🧪 CRSI Eval Harness', '']
@@ -1154,6 +1180,11 @@ const crsiEvalCmd: CommandHandler = async (ctx, args) => {
   if (report.failures.length > 0) {
     lines.push('', `❌ 失败任务: ${report.failures.join(', ')}`)
   }
+  // 只读展示：账本按契约粒度落盘后，才能回答「是哪条契约翻的」。
+  // 这里不做任何自动决策——闸门仍只看 regressedAnchors / score。
+  if (deltaLines.length > 0) {
+    lines.push('', '### 与上次相比', ...deltaLines)
+  }
 
   // 奖励函数注册表（reward function = policy→feedback 抽象可见）
   // 传 llm 列出完整注册表（task-performance 需 llm 才能跑，但构造它零 LLM 调用）。
@@ -3335,7 +3366,6 @@ const fixCmd: CommandHandler = async (ctx, args) => {
   const t = resolveT(ctx)
   const { readFileSync, writeFileSync } = await import('node:fs')
   const { join } = await import('node:path')
-  const { homedir } = await import('node:os')
   const { parse: parseYaml } = await import('yaml')
 
   const target = args.find((a) => a === 'doctor' || a === 'config' || a === 'cache' || a === 'test')
@@ -3375,11 +3405,7 @@ const fixCmd: CommandHandler = async (ctx, args) => {
   }
 
   if (!target || target === 'config') {
-    const home = homedir()
-    const configPaths = [
-      join(process.cwd(), '.mipham', 'config.yml'),
-      join(home, '.mipham', 'config.yml'),
-    ]
+    const configPaths = [join(process.cwd(), MIPHAM_DIR, 'config.yml'), miphamHome('config.yml')]
     const hookEngine = ctx.engine.getHookEngine?.()
     const result = fixConfig({
       configPaths,
@@ -3413,7 +3439,7 @@ const fixCmd: CommandHandler = async (ctx, args) => {
   }
 
   if (!target || target === 'cache') {
-    const crsiDir = join(homedir(), '.mipham', 'crsi')
+    const crsiDir = miphamHome('crsi')
     const cacheFiles = ['eval-scores.jsonl', 'improvements.jsonl', 'prose-proposals.jsonl'].map(
       (f) => join(crsiDir, f),
     )
@@ -3639,7 +3665,7 @@ const filesCmd: CommandHandler = async (ctx) => {
   try {
     const entries = readdirSync(cwd, { withFileTypes: true })
     const items = entries
-      .filter((e) => !e.name.startsWith('.') || e.name === '.mipham' || e.name === '.mcp.json')
+      .filter((e) => !e.name.startsWith('.') || e.name === MIPHAM_DIR || e.name === '.mcp.json')
       .slice(0, 40)
       .map((e) => {
         const icon = e.isDirectory() ? '📁' : '📄'
@@ -4285,8 +4311,7 @@ const memoryCmd: CommandHandler = async (ctx, args) => {
   const { existsSync, readdirSync, readFileSync, statSync } = await import('node:fs')
   const { join } = await import('node:path')
 
-  const home = homedir()
-  const memoryDir = join(home, '.mipham', 'memory')
+  const memoryDir = miphamHome('memory')
 
   // /memory gc — 记忆卫生：归档「0 召回 + 过期」的 auto-* 记忆（手写只报告）
   if (args[0]?.toLowerCase() === 'gc') {
@@ -4951,10 +4976,8 @@ const loginCmd: CommandHandler = (ctx) => {
 
 const logoutCmd: CommandHandler = async () => {
   const { existsSync } = await import('node:fs')
-  const { join } = await import('node:path')
 
-  const home = homedir()
-  const userConfig = join(home, '.mipham', 'config.yml')
+  const userConfig = miphamHome('config.yml')
   const hasUserConfig = existsSync(userConfig)
 
   return {
@@ -4996,9 +5019,8 @@ const feedbackCmd: CommandHandler = async (ctx, args) => {
     try {
       const { writeFileSync, mkdirSync, existsSync } = await import('node:fs')
       const { join } = await import('node:path')
-      const { homedir } = await import('node:os')
 
-      const dir = join(homedir(), '.mipham', 'feedback')
+      const dir = miphamHome('feedback')
       if (!existsSync(dir)) mkdirSync(dir, { recursive: true })
 
       const ts = new Date().toISOString().replace(/[:.]/g, '-')

package/src/ui/config-wizard.tsx

@@ -17,10 +17,10 @@ import type { ModelInfo } from '../shared/types'
 import { mkdirSync } from 'node:fs'
 import { atomicWriteFileSync } from '../shared/atomic-write'
 import { join } from 'node:path'
-import { homedir } from 'node:os'
 import { execSync } from 'node:child_process'
 import { getCredentialKey, encryptApiKey } from '../config/credential-crypto'
 import { CLOUD_PROVIDERS, getActiveModels, buildConfigYaml } from '../config/wizard-config'
+import { miphamHome } from '../core/paths.ts'
 
 // ── Types ──
 
@@ -38,7 +38,7 @@ const SELECTED_COLOR = 'cyan'
 // ── Helpers ──
 
 function writeConfigFile(providerId: string, modelId: string, apiKey: string): void {
-  const configDir = join(homedir(), '.mipham')
+  const configDir = miphamHome()
   mkdirSync(configDir, { recursive: true })
 
   const models = providerId === 'ollama' ? getOllamaModelListForConfig() : []

package/src/ui/input.tsx

@@ -24,6 +24,14 @@ interface InputBarProps {
   onCancel?: () => void
   /** When false, don't auto-open the slash-command picker when typing `/`. */
   showCommandPicker?: boolean
+  /**
+   * ↑/↓ 翻历史用的已提交输入。**由调用方持有，不放本组件内** —— app.tsx 有三条路径把
+   * InputBar 整个卸载（`pickerOpen` 三元 / `apiKeyPrompt` 早退 / Ctrl+G），
+   * 放在这里会被卸载清空（ROADMAP D7）。
+   */
+  history: string[]
+  /** 提交时把该条追加进 history（由调用方落 state）。 */
+  onHistoryAppend: (value: string) => void
   /** LLM 续写建议所需的模型（app.tsx 传；RemoteEngine 下 undefined → 补全禁用）。 */
   llm?: Llm
   /** 最近对话上下文（供续写贴合）。 */
@@ -288,6 +296,8 @@ export function InputBar({
   onCyclePermission,
   onCancel,
   showCommandPicker = true,
+  history,
+  onHistoryAppend,
   llm,
   recentMessages,
   autocompleteEnabled = true,
@@ -302,7 +312,9 @@ export function InputBar({
   const prevLoading = useRef(isLoading)
 
   // ── Message history for arrow-key navigation (Claude Code parity) ──
-  const [submittedHistory, setSubmittedHistory] = useState<string[]>([])
+  // `history` 由调用方持有（见 InputBarProps.history）：本组件不拥有它，因为
+  // app.tsx 会卸载本组件，而卸载会清空组件内 state（ROADMAP D7）。
+  // 下面两个 ref 是**浏览游标**、不是历史本体，随卸载重置才是对的。
   const historyIndexRef = useRef(-1) // -1 = not browsing history
   const savedDraftRef = useRef('') // saved user draft before browsing history
 
@@ -434,7 +446,7 @@ export function InputBar({
 
       const result = navigateHistory(
         {
-          history: submittedHistory,
+          history,
           index: historyIndexRef.current,
           savedDraft: savedDraftRef.current,
         },
@@ -480,7 +492,7 @@ export function InputBar({
       onCancel?.()
     }
     // Save to message history for arrow-key navigation
-    setSubmittedHistory((prev) => [...prev, finalValue])
+    onHistoryAppend(finalValue)
     historyIndexRef.current = -1
     savedDraftRef.current = ''
     onSubmit(finalValue)

package/src/workflow/journal.ts

@@ -7,9 +7,9 @@ import {
   readdirSync,
 } from 'node:fs'
 import { join } from 'node:path'
-import { homedir } from 'node:os'
+import { miphamHome } from '../core/paths.ts'
 
-const WORKFLOW_DIR = join(homedir(), '.mipham', 'workflows')
+const WORKFLOW_DIR = miphamHome('workflows')
 
 export interface JournalEntry {
   seq: number