@miphamai/cli 0.16.0 → 0.16.2

package/src/ui/input.tsx

@@ -8,6 +8,16 @@ import { CommandPicker } from './command-picker.js'
 interface InputBarProps {
   onSubmit: (input: string) => void
   isLoading: boolean
+  /** Ctrl+P → open model picker */
+  onTogglePicker?: () => void
+  /** Ctrl+F → toggle focus mode */
+  onToggleFocus?: () => void
+  /** Ctrl+O → expand last tool call */
+  onToggleExpand?: () => void
+  /** Shift+Tab → cycle permission mode */
+  onCyclePermission?: () => void
+  /** Escape → cancel loading (when input is empty) */
+  onCancel?: () => void
 }
 
 // ── Status verbs — English (Claude Code-aligned) + Chinese (Mipham originals) ──
@@ -107,7 +117,15 @@ function pick<T>(arr: T[]): T {
   return arr[Math.floor(Math.random() * arr.length)]!
 }
 
-export function InputBar({ onSubmit, isLoading }: InputBarProps) {
+export function InputBar({
+  onSubmit,
+  isLoading,
+  onTogglePicker,
+  onToggleFocus,
+  onToggleExpand,
+  onCyclePermission,
+  onCancel,
+}: InputBarProps) {
   const [value, setValue] = useState('')
   const [verb, setVerb] = useState(() => pick(STATUS_GERUNDS))
   const [completionVerb, setCompletionVerb] = useState<string | null>(null)
@@ -158,10 +176,19 @@ export function InputBar({ onSubmit, isLoading }: InputBarProps) {
   const [searchMode, setSearchMode] = useState(false)
   const [searchQuery, setSearchQuery] = useState('')
 
+  // Track pre-shortcut value so we can revert ink-text-input's Ctrl-key insertions.
+  // ink-text-input inserts 'p'/'f'/'o' for Ctrl+P/F/O (Ink normalizes control chars
+  // to their letter names before passing to useInput).
+  const valueBeforeShortcut = useRef(value)
+  // Keep the ref in sync with state on every change that isn't a Ctrl shortcut revert.
+  useEffect(() => {
+    valueBeforeShortcut.current = value
+  }, [value])
+
   // ── Vim motions: intercept keys in normal mode ──
 
   useInput((input, key) => {
-    // Escape toggles between insert and normal mode
+    // ── Escape: cancel loading → toggle vim mode ──
     if (key.escape) {
       // Cancel search mode if active
       if (searchMode) {
@@ -169,6 +196,11 @@ export function InputBar({ onSubmit, isLoading }: InputBarProps) {
         setSearchQuery('')
         return
       }
+      // Escape while loading → abort (priority over vim toggle)
+      if (isLoading) {
+        onCancel?.()
+        return
+      }
       // Clear any pending multi-key sequence
       if (vimPending.current) {
         vimPending.current = null
@@ -178,6 +210,33 @@ export function InputBar({ onSubmit, isLoading }: InputBarProps) {
       return
     }
 
+    // ── Global hotkeys (work in both insert and normal modes) ──
+    // Shift+Tab → cycle permission mode
+    if (key.shift && key.tab) {
+      onCyclePermission?.()
+      return
+    }
+    // Ctrl+P → toggle model picker
+    // NOTE: Ink passes input=keypress.name (just 'p') when ctrl is true, not raw \x10.
+    // ink-text-input inserts 'p' as literal text — revert it.
+    if (key.ctrl && input === 'p') {
+      setValue(valueBeforeShortcut.current)
+      onTogglePicker?.()
+      return
+    }
+    // Ctrl+F → toggle focus mode
+    if (key.ctrl && input === 'f') {
+      setValue(valueBeforeShortcut.current)
+      onToggleFocus?.()
+      return
+    }
+    // Ctrl+O → expand/collapse last tool call
+    if (key.ctrl && input === 'o') {
+      setValue(valueBeforeShortcut.current)
+      onToggleExpand?.()
+      return
+    }
+
     if (vimEngine.current.mode !== 'normal') return
 
     // Handle search mode — collect query characters

package/src/ui/strip-indent.ts

@@ -0,0 +1,19 @@
+/**
+ * Template literal tag that strips leading indentation from multi-line strings.
+ * Used by slash command handlers to format help text and status messages.
+ */
+export function stripIndent(strings: TemplateStringsArray, ...values: unknown[]): string {
+  let result = strings.reduce((acc, s, i) => acc + s + (values[i] ?? ''), '')
+  // Remove leading newline
+  result = result.replace(/^\n/, '')
+  // Find minimum indent
+  const match = result.match(/^( +)/m)
+  if (match?.[1]) {
+    const indent = match[1].length
+    result = result
+      .split('\n')
+      .map((line) => line.slice(indent))
+      .join('\n')
+  }
+  return result.trim()
+}

package/src/workflow/runtime.ts

@@ -157,7 +157,17 @@ export async function runWorkflow(
   sandboxCtx.phase = wrappedPhase
   sandboxCtx.log = log
 
-  const result = await vmScript.runInContext(sandboxCtx, { timeout: 120_000 })
+  let result: unknown
+  try {
+    result = await vmScript.runInContext(sandboxCtx, { timeout: 120_000 })
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err)
+    throw new Error(
+      `Workflow script execution failed: ${message}\n\n` +
+        `This is likely a bug in the workflow script, not in Mipham Code itself. ` +
+        `Check the script for syntax errors, undefined references, or unhandled promise rejections.`,
+    )
+  }
 
   // Count journal entries from state
   const priorEntries = loadJournal(runId)