@miphamai/cli 0.78.0 → 0.79.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@miphamai/cli",
-  "version": "0.78.0",
+  "version": "0.79.1",
   "description": "Mipham Code — Multi-model open-core intelligent coding terminal by MiphamAI",
   "keywords": [
     "ai",

package/src/shared/package-info.ts

@@ -9,7 +9,7 @@
 export const PACKAGE_NAME = '@miphamai/cli' as const
 
 /** 当前发布版本 */
-export const PACKAGE_VERSION = '0.78.0' as const
+export const PACKAGE_VERSION = '0.79.1' as const
 
 /** npm install 全局安装命令 */
 export const NPM_INSTALL_COMMAND = `npm install -g ${PACKAGE_NAME}` as const

package/src/ui/app.tsx

@@ -1244,7 +1244,7 @@ export function App({
             )}
 
             {/* Status line — Claude Code style */}
-            <Box marginTop={1} flexDirection="column">
+            <Box flexDirection="column">
               <Box flexDirection="row">
                 <Text color={PERMISSION_COLORS[permissionMode]}>
                   ⏵⏵ {PERMISSION_LABELS[permissionMode]}

package/src/ui/chat.tsx

@@ -135,9 +135,7 @@ export function ChatPanel({ messages, focusMode }: ChatPanelProps) {
           </Box>
           <Text dimColor>{t('ui.banner.tagline')}</Text>
           <Box marginTop={1}>
-            <Text dimColor>
-              {t('ui.banner.start_message')} <Text color="yellow">/help</Text>
-            </Text>
+            <Text dimColor>{t('ui.banner.start_message')}</Text>
           </Box>
           <Box marginTop={1}>
             <Text dimColor>{t('ui.banner.controls_hint')}</Text>

package/src/ui/graft-status.tsx

@@ -38,16 +38,16 @@ export function GraftStatusLine({ cwd, ctxPct }: { cwd: string; ctxPct?: number
     <Box flexDirection="column">
       {stats && fresh && (
         <Box>
-          <Text dimColor>◤ </Text>
+          <Text>◤ </Text>
           <Text color="blue">graft</Text>
-          <Text dimColor>
+          <Text>
             {' '}
             · {stats.nodeCount} nodes / {stats.edgeCount} edges ·{' '}
           </Text>
           <Text color={fresh.color}>{fresh.label}</Text>
           {saved > 0 && (
             <>
-              <Text dimColor> · </Text>
+              <Text> · </Text>
               <Text color="blue">~{saved.toLocaleString()} tok saved</Text>
             </>
           )}
@@ -55,7 +55,7 @@ export function GraftStatusLine({ cwd, ctxPct }: { cwd: string; ctxPct?: number
       )}
       {bottom.length > 0 && (
         <Box>
-          <Text dimColor>▸ {bottom.join(' · ')}</Text>
+          <Text>▸ {bottom.join(' · ')}</Text>
         </Box>
       )}
     </Box>

package/src/ui/input.tsx

@@ -86,6 +86,108 @@ export function normalizeInput(input: string): string {
   return input.replace(/[\r\n\t]+/g, ' ')
 }
 
+/** Cursor-aware edit state — value plus the insertion point (0..value.length). */
+export interface EditState {
+  value: string
+  cursor: number
+}
+
+/** A single editing keystroke, normalized away from Ink's key object for testability. */
+export type EditAction =
+  | { type: 'moveLeft' }
+  | { type: 'moveRight' }
+  | { type: 'backspace' }
+  | { type: 'delete' }
+  | { type: 'insert'; text: string }
+
+/**
+ * Pure cursor-editing transition. Returns a new state (or the same state when
+ * the action is a no-op). Cursor is always clamped to [0, value.length].
+ */
+export function applyEdit(state: EditState, action: EditAction): EditState {
+  const { value, cursor } = state
+  switch (action.type) {
+    case 'moveLeft':
+      return { value, cursor: Math.max(0, cursor - 1) }
+    case 'moveRight':
+      return { value, cursor: Math.min(value.length, cursor + 1) }
+    case 'backspace':
+      if (cursor === 0) return state
+      return {
+        value: value.slice(0, cursor - 1) + value.slice(cursor),
+        cursor: cursor - 1,
+      }
+    case 'delete':
+      if (cursor >= value.length) return state
+      return { value: value.slice(0, cursor) + value.slice(cursor + 1), cursor }
+    case 'insert': {
+      if (!action.text) return state
+      return {
+        value: value.slice(0, cursor) + action.text + value.slice(cursor),
+        cursor: cursor + action.text.length,
+      }
+    }
+  }
+}
+
+/**
+ * Map an Ink key object + raw input to a cursor-editing action (null when the key
+ * isn't an edit). Extracted from the MiphamTextInput useInput handler so the macOS
+ * Backspace quirk is unit-testable.
+ *
+ * Ink 5.2.1 parses the macOS Backspace key (terminal sends \x7f) as `key.delete`,
+ * NOT `key.backspace` (that's \x08). So both must map to a backward delete; the
+ * true forward-Delete key (\x1b[3~) is also parsed as `key.delete` by Ink and is
+ * rare, so it deliberately stays backward-delete too.
+ */
+export function keyToEditAction(
+  key: { leftArrow?: boolean; rightArrow?: boolean; backspace?: boolean; delete?: boolean },
+  input: string,
+): EditAction | null {
+  if (key.leftArrow) return { type: 'moveLeft' }
+  if (key.rightArrow) return { type: 'moveRight' }
+  if (key.backspace || key.delete) return { type: 'backspace' }
+  const cleaned = normalizeInput(input)
+  if (cleaned) return { type: 'insert', text: cleaned }
+  return null
+}
+
+/** Browsing state for arrow-key history navigation. */
+export interface HistoryNavState {
+  history: string[]
+  index: number // -1 = not browsing
+  savedDraft: string // draft saved on first up-arrow
+}
+
+/**
+ * Pure history-navigation transition. Returns the value to display plus the
+ * updated browsing state, or null when the key is a no-op (empty history for up,
+ * or not browsing for down).
+ */
+export function navigateHistory(
+  state: HistoryNavState,
+  dir: 'up' | 'down',
+  draft: string,
+): { index: number; savedDraft: string; value: string } | null {
+  if (dir === 'up') {
+    if (state.history.length === 0) return null
+    const savedDraft = state.index === -1 ? draft : state.savedDraft
+    const index = Math.min(state.index + 1, state.history.length - 1)
+    return { index, savedDraft, value: state.history[state.history.length - 1 - index]! }
+  }
+  // down
+  if (state.index === -1) return null
+  const index = state.index - 1
+  if (index === -1) {
+    return { index, savedDraft: '', value: state.savedDraft }
+  }
+  return {
+    index,
+    savedDraft: state.savedDraft,
+    value: state.history[state.history.length - 1 - index]!,
+  }
+}
+
 /** True when typing a leading `/` should auto-open the slash-command picker. */
 export function shouldAutoOpenPicker(value: string, prevValue: string, enabled: boolean): boolean {
   return enabled && value.startsWith('/') && !prevValue.startsWith('/')
@@ -99,8 +201,8 @@ export function shouldAutoOpenPicker(value: string, prevValue: string, enabled:
  * 边界拆成多块，同一轮 synchronous flush 里后续块读到的仍是旧值，于是「覆盖
  * 前块 / 插到中段」，表现为粘贴内容乱序、丢失、冻住。
  *
- * 这里用 ref 做同步真值：每块按当前 ref 原子追加（光标恒在末尾），不依赖
- * React 渲染时序，分块粘贴自然累积成完整文本。
+ * 这里用 ref 做同步真值：每块按当前 ref 在光标处原子插入（默认光标在末尾），
+ * 不依赖 React 渲染时序，分块粘贴自然累积成完整文本。
  */
 function MiphamTextInput({
   value,
@@ -117,10 +219,19 @@ function MiphamTextInput({
 }) {
   // 同步真值：valueRef 永远是最新文本；受控 value 仅在渲染时落后于 ref。
   const valueRef = useRef(value)
+  // 光标插入点（0..value.length）：cursorRef 供 useInput 同步读，cursor state 驱动渲染。
+  const [cursor, setCursor] = useState(value.length)
+  const cursorRef = useRef(cursor)
 
-  // 外部改动（箭头历史回填、提交清空）时，把真值对齐回受控 prop。
+  // 外部改动（箭头历史回填、提交/Esc 清空）时把真值对齐回受控 prop，光标归位到末尾。
+  // 组件自身 edit 在 onChange 前已同步更新 valueRef，故 ref 与 prop 相等时跳过，
+  // 避免把「中段插入」后的光标错误拉回末尾。
   useEffect(() => {
-    valueRef.current = value
+    if (valueRef.current !== value) {
+      valueRef.current = value
+      cursorRef.current = value.length
+      setCursor(value.length)
+    }
   }, [value])
 
   useInput(
@@ -133,21 +244,20 @@ function MiphamTextInput({
         onSubmit(valueRef.current)
         return
       }
-      if (key.backspace || key.delete) {
-        if (valueRef.current.length > 0) {
-          const next = valueRef.current.slice(0, -1)
-          valueRef.current = next
-          onChange(next)
-        }
-        return
-      }
 
-      // 打字 / 粘贴：归一化控制符后原子追加（光标恒在末尾）。
-      const cleaned = normalizeInput(input)
-      if (!cleaned) return
-      const next = valueRef.current + cleaned
-      valueRef.current = next
-      onChange(next)
+      // 把按键归一化为一次光标编辑：左/右移动，退格/删除，或光标处插入（打字/粘贴）。
+      // macOS Backspace 发 \x7f，被 Ink 映射成 key.delete（非 key.backspace），
+      // 故 keyToEditAction 里两者都按向后删处理。
+      const state: EditState = { value: valueRef.current, cursor: cursorRef.current }
+      const action = keyToEditAction(key, input)
+      if (!action) return
+
+      const next = applyEdit(state, action)
+      valueRef.current = next.value
+      cursorRef.current = next.cursor
+      setCursor(next.cursor)
+      // 纯移动不通知父组件（文本未变），只在文本变化时 onChange。
+      if (next.value !== state.value) onChange(next.value)
     },
     { isActive: focus },
   )
@@ -158,8 +268,9 @@ function MiphamTextInput({
         <Text dimColor>{placeholder}</Text>
       ) : (
         <>
-          {value}
-          <Text inverse> </Text>
+          {value.slice(0, cursor)}
+          <Text inverse>{value[cursor] ?? ' '}</Text>
+          {value.slice(cursor + 1)}
         </>
       )}
     </Text>
@@ -320,30 +431,19 @@ export function InputBar({
       // Ignore if picker is active (command picker handles its own arrows)
       if (value.startsWith('/')) return
 
-      if (key.upArrow) {
-        if (submittedHistory.length === 0) return
-        // Save current draft the first time we enter history browsing
-        if (historyIndexRef.current === -1) {
-          // Save the latest value from the ref — state `value` may lag a render.
-          savedDraftRef.current = valueRef.current
-        }
-        const newIndex = Math.min(historyIndexRef.current + 1, submittedHistory.length - 1)
-        historyIndexRef.current = newIndex
-        setValue(submittedHistory[submittedHistory.length - 1 - newIndex]!)
-        return
-      }
-      if (key.downArrow) {
-        if (historyIndexRef.current === -1) return
-        const newIndex = historyIndexRef.current - 1
-        historyIndexRef.current = newIndex
-        if (newIndex === -1) {
-          // Back to the original draft
-          setValue(savedDraftRef.current)
-          savedDraftRef.current = ''
-        } else {
-          setValue(submittedHistory[submittedHistory.length - 1 - newIndex]!)
-        }
-        return
+      const result = navigateHistory(
+        {
+          history: submittedHistory,
+          index: historyIndexRef.current,
+          savedDraft: savedDraftRef.current,
+        },
+        key.upArrow ? 'up' : 'down',
+        valueRef.current,
+      )
+      if (result) {
+        historyIndexRef.current = result.index
+        savedDraftRef.current = result.savedDraft
+        setValue(result.value)
       }
     }
   })