@miphamai/cli 0.85.1 → 0.85.3

package/src/agent-view/dashboard.tsx

@@ -8,11 +8,14 @@
  *   mipham agents          (from CLI)
  *   /agents                (from slash command within a running session)
  */
-import React, { useState, useCallback, useMemo } from 'react'
+import React, { useState, useCallback, useEffect, useMemo } from 'react'
 import { Box, Text, useInput } from 'ink'
+import TextInput from 'ink-text-input'
 import { AgentViewManager, type AgentSession, type SessionStatus } from './agent-view-manager'
 import { SessionRow } from './session-row'
 import { SessionPeek } from './session-peek'
+import { useCtrlCConfirm } from '../ui/ctrl-c-confirm'
+import { getBackgroundAgentRegistry } from '../agent/background-registry'
 
 interface DashboardProps {
   manager: AgentViewManager
@@ -32,8 +35,13 @@ export function AgentViewDashboard({ manager, onAttach, onExit }: DashboardProps
   const [peekingSessionId, setPeekingSessionId] = useState<string | null>(null)
   const [groupBy, setGroupBy] = useState<'status' | 'directory'>('status')
   const [feedback, setFeedback] = useState<string | null>(null)
-  // Bump to force flatList recompute after a session is removed (list membership change).
+  // Bump to force flatList recompute after the session set changes.
   const [version, setVersion] = useState(0)
+  // Non-null while the rename box is open; holds the row being renamed + the draft.
+  const [renaming, setRenaming] = useState<{ id: string; draft: string } | null>(null)
+
+  // Ctrl+C 的「再按一次才退」，与主界面同源（见 ui/ctrl-c-confirm.ts）
+  const ctrlC = useCtrlCConfirm()
 
   // Flash a brief feedback message that auto-clears
   const showFeedback = useCallback((msg: string) => {
@@ -41,6 +49,12 @@ export function AgentViewDashboard({ manager, onAttach, onExit }: DashboardProps
     setTimeout(() => setFeedback(null), 1800)
   }, [])
 
+  // The mutations that matter happen outside this component: `/bg` and `/fork`
+  // resolve their executors long after the keystroke that spawned them, so a
+  // run that finishes while this panel is open used to leave the row — and the
+  // header counts — frozen at whatever they were when the panel mounted.
+  useEffect(() => manager.onChange(() => setVersion((v) => v + 1)), [manager])
+
   // Build a flat list of sessions in group order, with group headers
   const flatList = useMemo(() => {
     const result: Array<
@@ -111,7 +125,55 @@ export function AgentViewDashboard({ manager, onAttach, onExit }: DashboardProps
     [manager, onAttach],
   )
 
+  // Commit the open rename box. Empty title cancels — a session with no name is
+  // indistinguishable in the list, so the box refuses rather than writing ''.
+  const handleRenameSubmit = useCallback(
+    (value: string) => {
+      const id = renaming?.id
+      setRenaming(null)
+      if (!id) return
+      const title = value.trim()
+      if (!title) {
+        showFeedback('Rename cancelled — title cannot be empty')
+        return
+      }
+      manager.rename(id, title)
+      showFeedback(`Renamed to ${title}`)
+    },
+    [manager, renaming, showFeedback],
+  )
+
   useInput((input, key) => {
+    // While the rename box is open it owns the keyboard: the list keys below
+    // must not fire on the same keystroke that is being typed into the title
+    // (Ink delivers every key to every mounted useInput).
+    if (renaming) {
+      if (key.escape || (key.ctrl && input === 'c')) {
+        setRenaming(null)
+        ctrlC.reset()
+        showFeedback('Rename cancelled')
+      }
+      return
+    }
+
+    // Ctrl+C 不再一下就退出（Ink 的 `exitOnCtrlC` 已在 render 处关掉，见
+    // src/index.tsx）：第一次只提示，再按一次才走。面板里 Esc 已经是退出键，
+    // 所以这里只补「误按一次不带走整个面板」。
+    if (key.ctrl && input === 'c') {
+      if (peekingSessionId) {
+        setPeekingSessionId(null)
+        ctrlC.reset()
+        return
+      }
+      if (ctrlC.isArmed()) {
+        onExit()
+        return
+      }
+      ctrlC.arm()
+      showFeedback('Ctrl+C again to exit')
+      return
+    }
+
     if (key.escape) {
       if (peekingSessionId) {
         setPeekingSessionId(null)
@@ -128,7 +190,7 @@ export function AgentViewDashboard({ manager, onAttach, onExit }: DashboardProps
       return
     }
 
-    // Ctrl+R — rename selected session
+    // Ctrl+R — open the rename box on the selected session
     if (key.ctrl && input === 'r') {
       if (sessionsOnly.length === 0) {
         showFeedback('No sessions to rename')
@@ -136,13 +198,13 @@ export function AgentViewDashboard({ manager, onAttach, onExit }: DashboardProps
       }
       const current = sessionsOnly[selectedIndex]
       if (!current) return
-      const newTitle = `session-${Date.now().toString(36)}`
-      manager.rename(current.session.id, newTitle)
-      showFeedback(`Renamed to ${newTitle}`)
+      // Seeded with the current title: renaming is usually an edit, and a box
+      // that opens blank silently invites the user to retype a whole task name.
+      setRenaming({ id: current.session.id, draft: current.session.title })
       return
     }
 
-    // Ctrl+X — permanently remove the selected session
+    // Ctrl+X — stop the selected session's work (if any) and drop its row
     if (key.ctrl && input === 'x') {
       if (sessionsOnly.length === 0) {
         showFeedback('No sessions to remove')
@@ -150,11 +212,20 @@ export function AgentViewDashboard({ manager, onAttach, onExit }: DashboardProps
       }
       const current = sessionsOnly[selectedIndex]
       if (!current) return
-      manager.remove(current.session.id)
+      const session = current.session
+      // Discarding a row whose work is still running would throw away the only
+      // handle to it — the manager's own `kill()` flips a status label and
+      // stops nothing, and the running sub-agent checks the registry's abort
+      // signal. So: stop the task, then remove the row.
+      const stopped = session.taskId ? getBackgroundAgentRegistry().stop(session.taskId) : false
+      manager.remove(session.id)
       setPeekingSessionId(null)
       setSelectedIndex((prev) => Math.max(0, Math.min(prev, sessionsOnly.length - 2)))
-      setVersion((v) => v + 1)
-      showFeedback(`Removed ${current.session.title || current.session.id}`)
+      showFeedback(
+        stopped
+          ? `Stopped + removed ${session.title || session.id}`
+          : `Removed ${session.title || session.id}`,
+      )
       return
     }
 
@@ -198,11 +269,7 @@ export function AgentViewDashboard({ manager, onAttach, onExit }: DashboardProps
       }
       const current = sessionsOnly[selectedIndex]
       if (!current) return
-      if (peekingSessionId) {
-        handleAttach(current.session.id)
-      } else {
-        handleAttach(current.session.id)
-      }
+      handleAttach(current.session.id)
       return
     }
   })
@@ -211,7 +278,9 @@ export function AgentViewDashboard({ manager, onAttach, onExit }: DashboardProps
   const peekData = useMemo(() => {
     if (!peekingSessionId) return null
     return manager.peek(peekingSessionId) ?? null
-  }, [manager, peekingSessionId])
+    // `version` is a dependency so an open peek keeps up with a session that
+    // reports new messages while the viewer sits on it.
+  }, [manager, peekingSessionId, version])
 
   const totalSessions = sessionsOnly.length
   const counts = manager.countByStatus()
@@ -301,6 +370,27 @@ export function AgentViewDashboard({ manager, onAttach, onExit }: DashboardProps
         <SessionPeek session={peekData.session} recentMessages={peekData.recentMessages} />
       )}
 
+      {/* Rename box — opens on Ctrl+R, owns the keyboard until Enter/Esc */}
+      {renaming && (
+        <Box
+          flexDirection="column"
+          marginTop={1}
+          borderStyle="single"
+          borderColor="cyan"
+          padding={1}
+        >
+          <Text dimColor>Rename session — Enter to save · Esc to cancel</Text>
+          <Box>
+            <Text color="cyan">{'> '}</Text>
+            <TextInput
+              value={renaming.draft}
+              onChange={(draft) => setRenaming((cur) => (cur ? { ...cur, draft } : cur))}
+              onSubmit={handleRenameSubmit}
+            />
+          </Box>
+        </Box>
+      )}
+
       {/* Feedback toast — flashes briefly on action */}
       {feedback && (
         <Box marginTop={1}>

package/src/agent-view/session-view.tsx

@@ -0,0 +1,128 @@
+/**
+ * AgentSessionView — where Enter ("attach") in the Agent View dashboard lands.
+ *
+ * Read-only on purpose. The session's work runs inside its own `SubAgent` with
+ * its own context; this CLI has no channel back into that loop, so a view that
+ * accepted input would be collecting keystrokes it could not deliver. What this
+ * shows is the real thing instead: the transcript the session actually
+ * accumulated, kept current through the manager's change notifications.
+ *
+ * Esc returns to the dashboard.
+ */
+import React, { useCallback, useEffect, useMemo, useState } from 'react'
+import { Box, Text, useInput } from 'ink'
+import { AgentViewManager, type SessionStatus } from './agent-view-manager'
+import { ChatPanel } from '../ui/chat'
+
+interface AgentSessionViewProps {
+  manager: AgentViewManager
+  sessionId: string
+  onDetach: () => void
+}
+
+const STATUS_COLORS: Record<SessionStatus, string> = {
+  'needs-input': 'yellow',
+  working: 'cyan',
+  completed: 'green',
+  failed: 'red',
+}
+
+const STATUS_LABELS: Record<SessionStatus, string> = {
+  'needs-input': 'needs input',
+  working: 'working',
+  completed: 'completed',
+  failed: 'failed',
+}
+
+export function AgentSessionView({ manager, sessionId, onDetach }: AgentSessionViewProps) {
+  const [version, setVersion] = useState(0)
+
+  // The session keeps running while we look at it — follow it rather than
+  // photographing it once at mount.
+  useEffect(() => manager.onChange(() => setVersion((v) => v + 1)), [manager])
+
+  const session = useMemo(
+    () => manager.get(sessionId),
+    // `version` is a dependency so the transcript keeps up with a session that
+    // reports new messages while the viewer sits on it.
+    [manager, sessionId, version],
+  )
+
+  useInput((_input, key) => {
+    if (key.escape) onDetach()
+  })
+
+  // Esc while the agent view is open is the app's "go back" — but the app-level
+  // handler lives in `app.tsx` and only knows its own layers, so this component
+  // answers for itself.
+  const status = session ? STATUS_LABELS[session.status] : 'gone'
+  const statusColor = session ? STATUS_COLORS[session.status] : 'red'
+
+  const transcript = session?.messages ?? []
+  const emptyState = useCallback(
+    () => (
+      <Box paddingLeft={2}>
+        <Text dimColor>(no messages yet)</Text>
+      </Box>
+    ),
+    [],
+  )
+
+  if (!session) {
+    return (
+      <Box flexDirection="column" padding={1} height="100%">
+        <Text bold color="red">
+          Session {sessionId} no longer exists.
+        </Text>
+        <Box marginTop={1}>
+          <Text dimColor>Esc back to Agent View</Text>
+        </Box>
+      </Box>
+    )
+  }
+
+  return (
+    <Box flexDirection="column" padding={1} height="100%">
+      {/* Header */}
+      <Box flexDirection="column" marginBottom={1}>
+        <Box>
+          <Text bold color="cyan">
+            Attached
+          </Text>
+          <Text dimColor> — {session.id}</Text>
+        </Box>
+        <Box>
+          <Text>{session.title}</Text>
+          <Text dimColor>
+            {' '}
+            · {session.provider}/{session.model} · <Text color={statusColor}>{status}</Text>
+          </Text>
+        </Box>
+        {session.branch && (
+          <Box>
+            <Text dimColor>
+              branch {session.branch} · worktree {session.worktree}
+            </Text>
+          </Box>
+        )}
+        <Box>
+          <Text dimColor>
+            {transcript.length} message(s) · read-only transcript · Esc back to Agent View
+          </Text>
+        </Box>
+      </Box>
+
+      {/* Divider */}
+      <Box marginBottom={1}>
+        <Text dimColor>{'─'.repeat(70)}</Text>
+      </Box>
+
+      {/* Transcript */}
+      {transcript.length === 0 ? (
+        emptyState()
+      ) : (
+        <ChatPanel messages={transcript} focusMode={false} />
+      )}
+    </Box>
+  )
+}

package/src/commands/autoloop-journal.ts

@@ -1,4 +1,5 @@
-import { mkdirSync, readFileSync, writeFileSync, readdirSync, existsSync } from 'node:fs'
+import { mkdirSync, readFileSync, readdirSync, existsSync } from 'node:fs'
+import { atomicWriteFileSync } from '../shared/atomic-write'
 import { join } from 'node:path'
 import { miphamHome } from '../core/paths.ts'
 
@@ -43,7 +44,7 @@ export function createAutoloopJournal(
     totalTokens: 0,
     maxIterations: 100,
   }
-  writeFileSync(journalPath(sessionId), JSON.stringify(journal, null, 2), 'utf-8')
+  atomicWriteFileSync(journalPath(sessionId), JSON.stringify(journal, null, 2), { mode: 0o644 })
   return journal
 }
 
@@ -52,7 +53,7 @@ export function recordLoopTokens(sessionId: string, delta: number): void {
   const journal = readAutoloopJournal(sessionId)
   if (!journal) return
   journal.totalTokens += delta
-  writeFileSync(journalPath(sessionId), JSON.stringify(journal, null, 2), 'utf-8')
+  atomicWriteFileSync(journalPath(sessionId), JSON.stringify(journal, null, 2), { mode: 0o644 })
 }
 
 /** Read the journal for an autonomous loop. */
@@ -88,7 +89,7 @@ export function logAutoloopIteration(sessionId: string, summary: string): void {
   journal.logs.push(`[${journal.lastIteration}] #${journal.iterations}: ${summary.slice(0, 200)}`)
   // Keep last 50 log entries
   if (journal.logs.length > 50) journal.logs = journal.logs.slice(-50)
-  writeFileSync(journalPath(sessionId), JSON.stringify(journal, null, 2), 'utf-8')
+  atomicWriteFileSync(journalPath(sessionId), JSON.stringify(journal, null, 2), { mode: 0o644 })
 }
 
 /** Mark an autonomous loop as completed or stopped. */
@@ -97,7 +98,7 @@ export function completeAutoloopJournal(sessionId: string, status: 'completed' |
   if (!journal) return
   journal.status = status
   journal.lastIteration = new Date().toISOString()
-  writeFileSync(journalPath(sessionId), JSON.stringify(journal, null, 2), 'utf-8')
+  atomicWriteFileSync(journalPath(sessionId), JSON.stringify(journal, null, 2), { mode: 0o644 })
 }
 
 /** List all active autonomous loops. */

package/src/commands/environment.ts

@@ -89,7 +89,8 @@ Full changelog: https://mipham.ai/code/releases`,
 // ═══════════════════════════════════════════════════════════════
 
 const ideCmd: CommandHandler = async (_ctx) => {
-  const { mkdirSync, writeFileSync } = await import('node:fs')
+  const { mkdirSync } = await import('node:fs')
+  const { atomicWriteFileSync } = await import('../shared/atomic-write')
   const { join } = await import('node:path')
 
   const cwd = process.cwd()
@@ -121,7 +122,7 @@ const ideCmd: CommandHandler = async (_ctx) => {
       },
     },
   }
-  writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + '\n', 'utf-8')
+  atomicWriteFileSync(settingsPath, JSON.stringify(settings, null, 2) + '\n', { mode: 0o644 })
   files.push('.vscode/settings.json')
 
   // ── keybindings.json: Cmd+Esc launch ──
@@ -137,7 +138,7 @@ const ideCmd: CommandHandler = async (_ctx) => {
       command: 'workbench.action.terminal.new',
     },
   ]
-  writeFileSync(keybindingsPath, JSON.stringify(keybindings, null, 2) + '\n', 'utf-8')
+  atomicWriteFileSync(keybindingsPath, JSON.stringify(keybindings, null, 2) + '\n', { mode: 0o644 })
   files.push('.vscode/keybindings.json')
 
   // ── extensions.json: recommended ──
@@ -145,7 +146,7 @@ const ideCmd: CommandHandler = async (_ctx) => {
   const extensions = {
     recommendations: ['miphamai.mipham-code'],
   }
-  writeFileSync(extensionsPath, JSON.stringify(extensions, null, 2) + '\n', 'utf-8')
+  atomicWriteFileSync(extensionsPath, JSON.stringify(extensions, null, 2) + '\n', { mode: 0o644 })
   files.push('.vscode/extensions.json')
 
   return {
@@ -178,8 +179,9 @@ const ideCmd: CommandHandler = async (_ctx) => {
 // ═══════════════════════════════════════════════════════════════
 
 const terminalSetupCmd: CommandHandler = async () => {
-  const { writeFileSync, appendFileSync, existsSync, mkdirSync, readFileSync } =
-    await import('node:fs')
+  const { existsSync, mkdirSync, readFileSync } = await import('node:fs')
+  const { atomicWriteFileSync } = await import('../shared/atomic-write')
+  const { appendRegularFileSync } = await import('../shared/regular-file')
   const { join } = await import('node:path')
   const { homedir } = await import('node:os')
 
@@ -210,7 +212,7 @@ const terminalSetupCmd: CommandHandler = async () => {
     '  export MIPHAM_PROVIDER=$(grep "defaultProvider:" ~/.mipham/config.yml | awk "{print \$2}")',
     'fi',
   ].join('\n')
-  writeFileSync(shellScript, shellContent + '\n', 'utf-8')
+  atomicWriteFileSync(shellScript, shellContent + '\n', { mode: 0o644 })
   lines.push(`  ✅ Generated: ${shellScript}`)
 
   // ── 2. Append to shell profile ──
@@ -224,7 +226,8 @@ const terminalSetupCmd: CommandHandler = async () => {
     if (existing.includes('shell-setup.sh')) {
       lines.push(`  ⏭  ${profileName} already has Mipham Code integration`)
     } else {
-      appendFileSync(profilePath, sourceLine, 'utf-8')
+      // 写不进去（含 profile 路径上是个 FIFO）就与下面 catch 同路：把命令印给用户。
+      if (!appendRegularFileSync(profilePath, sourceLine)) throw new Error('not a regular file')
       lines.push(`  ✅ Added to ~/${profileName}`)
     }
   } catch {

package/src/commands/project.ts

@@ -240,8 +240,10 @@ Messages:   ${msgs.length} in context
 Tools:      ${ctx.engine.getTools().size} available
 
 Shift+Tab cycles: ${renderCycleLine()} (this session only).
-To persist a mode, set \`permission:\` in .mipham/config.yml — every mode below is
-accepted there.
+To persist a mode, name it in ~/.mipham/config.yml (\`permission:\`) or in
+~/.mipham/settings.json (\`permissions.defaultMode\`) — every mode below is accepted
+in either. A **project-level** file cannot set a mode: it arrives with the code, so
+whoever wrote the repository would be choosing the approval gate.
 
 Modes (least → most permissive):
 ${renderModeTable()}
@@ -476,7 +478,7 @@ const setupCmd: CommandHandler = async (ctx, args) => {
   ${skills.length} loaded (${standardSkills} standard + ${miphamSkills} mipham)
 
   Permissions
-  Mode: ${ctx.config.permission}  ·  Tools: ${ctx.engine.getTools().size}
+  Mode: ${ctx.engine.getPermission().getMode()}  ·  Tools: ${ctx.engine.getTools().size}
 
 
   ── Setup Steps ──

package/src/config/credential-crypto.ts

@@ -8,6 +8,7 @@ import {
   statSync,
 } from 'node:fs'
 import { dirname, join } from 'node:path'
+import { isRegularFile } from '../shared/regular-file'
 import { createCipheriv, createDecipheriv, randomBytes } from 'node:crypto'
 
 /**
@@ -43,7 +44,9 @@ export function getCredentialKey(keyDir: string): Buffer {
   const keyPath = join(keyDir, CREDENTIAL_KEY_FILENAME)
   if (!existsSync(keyPath)) {
     const legacyPath = join(keyDir, LEGACY_KEY_FILENAME)
-    if (existsSync(legacyPath)) {
+    // 迁移的**源**要过类型闸：`copyFileSync` 打开 FIFO 读端会一直等到有写者
+    // （见 shared/regular-file.ts）。
+    if (isRegularFile(legacyPath)) {
       copyFileSync(legacyPath, keyPath)
       chmodSync(keyPath, 0o400)
     }
@@ -58,6 +61,15 @@ export function getCredentialKey(keyDir: string): Buffer {
  * would ever notice.
  */
 function readKeyFile(keyPath: string): Buffer {
+  // 类型闸先过：这里两次进入都在**启动链**上（配置里任何 `enc:v1:` 都要它解密），
+  // 而 `readFileSync` 读 FIFO/socket 会一直等到有写者为止 —— 挂住时用户看不到报错、
+  // 也没有计时器救得回来。明确失败，并把「去删掉那个东西」写进消息里。
+  if (!isRegularFile(keyPath)) {
+    throw new Error(
+      `${keyPath} is not a regular file — refusing to read the credential key from it ` +
+        `(remove or replace it with a regular file).`,
+    )
+  }
   if ((statSync(keyPath).mode & 0o777) !== 0o400) chmodSync(keyPath, 0o400)
   return readFileSync(keyPath)
 }

package/src/config/keys-manager.ts

@@ -1,6 +1,7 @@
-import { existsSync, readFileSync, writeFileSync, mkdirSync, chmodSync } from 'node:fs'
+import { mkdirSync, chmodSync } from 'node:fs'
 import { join, dirname } from 'node:path'
 import { atomicWriteFileSync } from '../shared/atomic-write'
+import { readRegularFileSync } from '../shared/regular-file'
 import { saveProviderApiKey } from './loader'
 import { miphamHome } from '../core/paths.ts'
 
@@ -29,9 +30,11 @@ export interface KeysData {
 }
 
 function loadKeys(): KeysData {
-  if (!existsSync(KEYS_FILE)) return {}
   try {
-    const raw = readFileSync(KEYS_FILE, 'utf-8')
+    // 类型闸在读取之前（`~/.mipham/keys.json` 若是个 FIFO，`readFileSync` 会
+    // 一直等写者）—— 见 shared/regular-file.ts。
+    const raw = readRegularFileSync(KEYS_FILE)
+    if (raw === null) return {}
     const parsed: unknown = JSON.parse(raw)
     // Valid JSON is not necessarily a key map. `null` throws straight out of
     // `Object.entries` in `list()` — i.e. on the startup path, not in some corner
@@ -92,7 +95,7 @@ export class KeyManager {
       const backupDir = join(MIPHAM_HOME, 'keys')
       mkdirSync(backupDir, { recursive: true })
       const backupPath = join(backupDir, `${provider}.backup`)
-      writeFileSync(backupPath, JSON.stringify(existing, null, 2) + '\n', { mode: 0o600 })
+      atomicWriteFileSync(backupPath, JSON.stringify(existing, null, 2) + '\n', { mode: 0o600 })
       try {
         chmodSync(backupPath, 0o600)
       } catch {