@mobius-os/mobius 0.3.34 → 0.3.42

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mobius-os/mobius",
-  "version": "0.3.34",
+  "version": "0.3.42",
   "type": "module",
   "description": "Mobius terminal client. Reuses Mobius frontend TypeScript types and jsonl entry shapes.",
   "bin": {

package/scripts/build-python-bundles.sh

@@ -13,8 +13,8 @@ set -euo pipefail
 
 TAG=20241002
 PYVER=3.12.7
-BUNDLE_VER=2
-AIMUX_VERSION=0.1.21
+BUNDLE_VER=3
+AIMUX_VERSION=0.1.22
 PYPI_INDEX=https://pypi.org/simple
 WORK="${WORK:-/home/tianyi/python-bundles}"
 DIST="${DIST:-$WORK/dist}"

package/src/App.tsx

@@ -12,7 +12,7 @@
 import React, { useEffect, useState } from 'react'
 import { Box, Text } from 'ink'
 import { MobiusClient, getMe, login, ApiError } from './api.js'
-import { loadLogin, saveLogin, type LoginRecord } from './config.js'
+import { clearLogin, loadLogin, saveLogin, type LoginRecord } from './config.js'
 import { LoginScreen } from './components/Login.js'
 import { PrepScreen, type ReadyState } from './components/PrepScreen.js'
 import { ChatScreen } from './components/Chat.js'
@@ -150,6 +150,21 @@ export function App() {
     void stopAimuxConnection().finally(() => process.exit(0))
   }
 
+  async function onLogout() {
+    if (process.env.MOBIUS_TUI_DEBUG) console.error('[route] logout')
+    try {
+      await clearLogin()
+      await stopAimuxConnection()
+    } finally {
+      setClient(null)
+      setUserId(null)
+      setReady(null)
+      setResumeSessionId(null)
+      setAimuxStatus({ state: 'stopped', phase: 'idle', detail: '登录后自动连接' })
+      setRoute('login')
+    }
+  }
+
   // ── render ─────────────────────────────────────────────────────────────────
   // The chat screen already pins itself to the terminal height, so render it
   // bare — a <Screen> wrapper would clip its transcript in short terminals and
@@ -168,6 +183,7 @@ export function App() {
         onClear={onClear}
         onResume={onResume}
         onQuit={onQuit}
+        onLogout={() => { void onLogout() }}
         onReconfigure={onReconfigure}
         onConfigCancel={onConfigCancel}
         aimuxStatus={aimuxStatus}
@@ -178,7 +194,7 @@ export function App() {
   if (route === 'boot') {
     node = <Box paddingX={2} paddingY={1}><Text color="cyan">{bootMsg}</Text></Box>
   } else if (route === 'login' || !client) {
-    node = <LoginScreen onSuccess={onLoginSuccess} />
+    node = <LoginScreen onSuccess={onLoginSuccess} initialServer={prefill.server} initialUsername={prefill.username} />
   } else if (route === 'resume' && ready) {
     node = <Box flexDirection="column"><AimuxStatusLine status={aimuxStatus} compact /><ResumePicker client={client} project={ready.project} onPick={onResumed} onBack={() => setRoute('chat')} /></Box>
   } else {

package/src/aimux.ts

@@ -6,6 +6,7 @@
  * currently authenticated Mobius server.  Nothing is started before login.
  */
 import { spawn, spawnSync, type ChildProcess } from 'node:child_process'
+import { createHash } from 'node:crypto'
 import { promises as fs, existsSync, createWriteStream } from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
@@ -88,8 +89,8 @@ async function pythonForAimux(onProgress?: (p: InstallProgress) => void): Promis
 // 解压到 ~/.mobius/python-bundle/ 后用 `<python> -m aimux` 运行，彻底绕开宿主机
 // 系统 python（如被精简掉 ensurepip 的容器镜像）。aimux 全部依赖为纯 Python，
 // 故三平台可共用同一套打包产物，分别按 arch 发布到 CDN。
-const BUNDLE_VER = '2'
-const BUNDLE_AIMUX_VERSION = '0.1.21'
+const BUNDLE_VER = '3'
+const BUNDLE_AIMUX_VERSION = '0.1.23'
 const bundleDir = () => path.join(mobiusHome(), 'python-bundle')
 const bundlePython = () => WIN
   ? path.join(bundleDir(), 'python', 'python.exe')
@@ -300,32 +301,76 @@ export async function ensureAimux(onProgress?: (p: InstallProgress) => void): Pr
   return { ok: false, error: `${venvError}；内置运行时也失败: ${bundle.error}` }
 }
 
-export function tuiAimuxIdentifier(): string {
-  const host = os.hostname().toLowerCase().replace(/[^a-z0-9_.-]+/g, '-').replace(/^-+|-+$/g, '').slice(0, 32)
-  return `tui-${host || 'pc'}`
+export function tuiAimuxIdentifier(hostname = os.hostname(), cwd = process.cwd()): string {
+  const host = hostname.toLowerCase().replace(/[^a-z0-9_.-]+/g, '-').replace(/^-+|-+$/g, '').slice(0, 32)
+  // One machine may run several Mobius TUIs for different projects.  A
+  // hostname-only identifier makes every reverse client register with the
+  // same name and --replace continuously evicts its siblings ("client
+  // replaced").  The normalized cwd hash is stable across restarts/resume but
+  // unique for the common multi-project case.
+  const workspace = createHash('sha256').update(path.resolve(cwd)).digest('hex').slice(0, 10)
+  return `tui-${host || 'pc'}-${workspace}`
 }
 
 /**
- * Build the reverse-connect command in one place. The TUI can launch AIMUX
- * through either a venv executable or bundled Python; both paths must request
- * hidden Windows shells or every remote command flashes a console and steals
- * keyboard focus from the TUI.
+ * Build the reverse-connect command in one place. On Windows the bridge shells
+ * must run headless or every remote command flashes a console and steals
+ * keyboard focus from the TUI — but *which* flag asks for that depends on the
+ * installed aimux: `--silent-shell` landed in 0.1.18, the no-console
+ * `--slient-v2`/`--silent-v2` only in 0.1.22+. PyPI and cached bundles in the
+ * wild are often older, and hard-coding any one spelling makes Click reject the
+ * whole command ("No such option: --slient-v2") and the supervisor crash-loop.
+ * So the caller probes `reverse connect --help` once (see probeReverseConnectHelp
+ * + pickSilentFlag) and passes the flag aimux actually advertises; when nothing
+ * is supported we send nothing rather than crash.
  */
 export function reverseConnectArgs(
   server: string,
   identifier: string,
   token: string,
   platform: NodeJS.Platform = process.platform,
+  silentFlag: string | null = null,
 ): string[] {
   return [
     'reverse', 'connect', `${server.replace(/\/$/, '')}/aimux_bridge`,
     '--identifier', identifier,
     '--token', token,
     '--replace',
-    ...(platform === 'win32' ? ['--silent-shell'] : []),
+    ...(platform === 'win32' && silentFlag ? [silentFlag] : []),
   ]
 }
 
+/**
+ * Capture `aimux reverse connect --help` so we can see which console-hiding
+ * flags this particular build advertises. Returns '' on any failure (the
+ * caller then sends no silent flag and stays alive instead of crash-looping).
+ */
+export async function probeReverseConnectHelp(launcher: AimuxLauncher): Promise<string> {
+  const base = launcher.kind === 'exe'
+    ? { cmd: launcher.path, args: ['reverse', 'connect', '--help'] }
+    : { cmd: launcher.python, args: ['-m', 'aimux', 'reverse', 'connect', '--help'] }
+  try {
+    const r = await run(base.cmd, base.args)
+    return `${r.stdout}\n${r.stderr}`
+  } catch {
+    return ''
+  }
+}
+
+/**
+ * Pick the strongest console-hiding flag aimux advertised for Windows. Prefers
+ * the correctly-spelled --silent-v2 (future-proof if the historical --slient-v2
+ * typo alias is ever dropped), then the --slient-v2 alias, then --silent-shell.
+ * Returns null off-Windows or when the installed aimux supports none.
+ */
+export function pickSilentFlag(helpText: string, platform: NodeJS.Platform = process.platform): string | null {
+  if (platform !== 'win32') return null
+  if (/--silent-v2\b/.test(helpText)) return '--silent-v2'
+  if (/--slient-v2\b/.test(helpText)) return '--slient-v2'
+  if (/--silent-shell\b/.test(helpText)) return '--silent-shell'
+  return null
+}
+
 export async function probeAimuxBridgeConnection(
   server: string,
   token: string,
@@ -504,6 +549,10 @@ export class AimuxSupervisor {
 
 let supervisor: AimuxSupervisor | null = null
 let installing: Promise<void> | null = null
+// Resolved Windows console-hiding flag for the installed aimux (undefined =
+// not probed yet this process). Cached so reconnects reuse it without re-running
+// `aimux reverse connect --help`. See reverseConnectArgs for why this is probed.
+let cachedSilentFlag: string | null | undefined = undefined
 
 export async function startAimuxConnection(opts: { server: string; token: string; onStatus?: (s: AimuxStatus) => void }): Promise<void> {
   const onStatus = opts.onStatus ?? (() => {})
@@ -525,9 +574,18 @@ export async function startAimuxConnection(opts: { server: string; token: string
     if (!ready.ok || !ready.launcher) { logInstall(`startAimuxConnection giving up: ${ready.error}\n`); onStatus({ state: 'failed', phase: 'idle', detail: `${ready.error} · 日志: ${aimuxLogPath()}` }); return }
     const identifier = tuiAimuxIdentifier()
     const launcher = ready.launcher
+    // Windows only: ask the installed aimux which console-hiding flag it accepts
+    // before spawning, so a version mismatch (older PyPI/bundle aimux without
+    // --slient-v2) can't crash-loop the supervisor with "No such option".
+    if (WIN && cachedSilentFlag === undefined) {
+      const help = await probeReverseConnectHelp(launcher)
+      cachedSilentFlag = pickSilentFlag(help)
+      logInstall(`reverse-connect silent flag probe → ${cachedSilentFlag ?? '(none supported; sending no flag)'}\n`)
+    }
+    const silentFlag = cachedSilentFlag
     supervisor = new AimuxSupervisor({
       server: opts.server, token: opts.token, identifier, onStatus,
-      spawnProcess: () => spawnLauncher(launcher, reverseConnectArgs(opts.server, identifier, opts.token)),
+      spawnProcess: () => spawnLauncher(launcher, reverseConnectArgs(opts.server, identifier, opts.token, process.platform, silentFlag)),
     })
     supervisor.start()
   })().finally(() => { installing = null })

package/src/components/Chat.tsx

@@ -27,7 +27,8 @@ import { ConfigFlow, ReconfigFlow, type ConfigResult } from './ConfigFlow.js'
 import type { AimuxStatus } from '../aimux.js'
 import { AimuxStatusLine, aimuxStatusText } from './AimuxStatus.js'
 import { isEscapeKeypress, isMouseInput, useMouseEvents, useStableInput } from './primitives.js'
-import { useDeleteKeyCapture, applyDeleteIntent, clampCursor, previousCursorBoundary, nextCursorBoundary } from '../lib/delete-keys.js'
+import { useDeleteKeyCapture, applyDeleteIntent, clampCursor, previousCursorBoundary, nextCursorBoundary, previousWordBoundary, nextWordBoundary } from '../lib/delete-keys.js'
+import { useCursorKeyCapture } from '../lib/cursor-keys.js'
 
 interface ChatProps {
   client: MobiusClient
@@ -37,6 +38,7 @@ interface ChatProps {
   onClear: () => void
   onResume: () => void
   onQuit: () => void
+  onLogout: () => void
   onReconfigure: (result: ConfigResult) => void
   onConfigCancel: (sessionId: string | null) => void
   aimuxStatus?: AimuxStatus
@@ -54,14 +56,16 @@ const STATUS_ROWS = 3
 
 const SLASH_COMMANDS = [
   { cmd: '/clear', desc: '清空当前对话，开启新会话' },
+  { cmd: '/compact', desc: '压缩当前会话上下文' },
   { cmd: '/resume', desc: '恢复一个历史会话' },
   { cmd: '/model', desc: '更换模型并开启新会话（保留当前任务）' },
   { cmd: '/config', desc: '重新选择项目、任务和模型' },
+  { cmd: '/logout', desc: '断开当前连接并返回登录界面' },
   { cmd: '/help', desc: '显示帮助' },
   { cmd: '/quit', desc: '退出 TUI' },
 ]
 
-export function ChatScreen({ client, ready, webUserId, resumeSessionId, onClear, onResume, onQuit, onReconfigure, onConfigCancel, aimuxStatus }: ChatProps) {
+export function ChatScreen({ client, ready, webUserId, resumeSessionId, onClear, onResume, onQuit, onLogout, onReconfigure, onConfigCancel, aimuxStatus }: ChatProps) {
   const chat = useChat({ client, ready, resumeSessionId })
   const [showHelp, setShowHelp] = useState(false)
   // null means "follow the tail". A concrete anchor identifies the exact row
@@ -71,6 +75,8 @@ export function ChatScreen({ client, ready, webUserId, resumeSessionId, onClear,
   const [modelLabel, setModelLabel] = useState<string | null>(null)
   const [configOpen, setConfigOpen] = useState(false)
   const [reconfigOpen, setReconfigOpen] = useState(false)
+  // 本地命令错误 (如无会话时 /compact): 与 chat.error 分开, 下一次提交时清除。
+  const [slashError, setSlashError] = useState<string | null>(null)
   // Ink may deliver one final event to Composer while an async config picker is
   // replacing it. The shared ref lets that stale listener report "not handled"
   // so App can replay the key after the new Select mounts.
@@ -87,18 +93,33 @@ export function ChatScreen({ client, ready, webUserId, resumeSessionId, onClear,
     const [name] = raw.trim().split(/\s+/)
     switch (name) {
       case '/clear': onClear(); return true
+      case '/compact': {
+        // 对齐 web sendCompactCommand: 把字面 '/compact' 作为消息发给后端, 由
+        // agent (claude-code 原生 slash command / codex) 自行执行上下文压缩。
+        // 尚无会话时没有可压缩的上文, 提示而不是新建空会话去发。
+        if (!chat.sessionId) {
+          setSlashError('当前没有可发送指令的会话')
+          return true
+        }
+        setShowHelp(false)
+        setRowAnchor(null)
+        void chat.send('/compact')
+        return true
+      }
       case '/resume': onResume(); return true
       case '/help': setShowHelp(s => !s); return true
       case '/model': setConfigOpen(true); return true
       case '/config': setReconfigOpen(true); return true
+      case '/logout': onLogout(); return true
       case '/quit': case '/exit': onQuit(); return true
       default: return false
     }
-  }, [onClear, onResume, onQuit])
+  }, [chat, onClear, onResume, onQuit, onLogout])
 
   const onSubmit = useCallback((text: string) => {
     const t = text.trim()
     if (!t) return
+    setSlashError(null)
     if (t.startsWith('/')) {
       if (!runSlash(t)) setShowHelp(true)
       return
@@ -156,7 +177,7 @@ export function ChatScreen({ client, ready, webUserId, resumeSessionId, onClear,
     (entry) => rowsForEntry(entry),
   ), [transcriptEntries, rowsForEntry])
   const viewportRows = terminal.isTty ? Math.max(9, terminal.rows - 1) : terminal.rows
-  const activityRows = (chat.typing ? 2 : 0) + (chat.error ? 1 : 0)
+  const activityRows = (chat.typing ? 2 : 0) + (chat.error ? 1 : 0) + (slashError ? 1 : 0)
   const helpRows = showHelp ? SLASH_COMMANDS.length + 3 : 0
   // Conversation chrome is exactly two rows: compact header + navigation.
   const transcriptRows = Math.max(1, viewportRows - composerRows - STATUS_ROWS - activityRows - helpRows - 2)
@@ -201,17 +222,19 @@ export function ChatScreen({ client, ready, webUserId, resumeSessionId, onClear,
     // the keypress). configOpen/reconfigOpen/sessionId are read from handlerRef
     // (see above) because Ink keeps the originally-registered callback and would
     // otherwise see a stale closure.
-    if (handlerRef.current.configOpen || handlerRef.current.reconfigOpen) {
+    if (handlerRef.current.configOpen) {
       if (isEscapeKeypress(_input, key)) onConfigCancel(handlerRef.current.sessionId)
       return
     }
+    if (handlerRef.current.reconfigOpen) return // ReconfigFlow owns hierarchical Esc navigation.
     if (key.pageUp) scrollRows(-pageRows)
     else if (key.pageDown) scrollRows(pageRows)
   }, { interactive: false })
 
-  const navigationHint = viewport.hasOlder
-    ? `${viewport.hasNewer ? '↑ 较早内容 · ↓ 较新内容' : '↑ 还有较早内容'} · 滚轮 3 行 · PageUp/PageDown ${pageRows} 行 · 拖动选中文本`
-    : `${viewport.hasNewer ? '已到最早 · ↓ 还有较新内容' : '全部内容'} · 滚轮 3 行 · PageUp/PageDown ${pageRows} 行 · 拖动选中文本`
+  const navigationPosition = viewport.hasOlder
+    ? (viewport.hasNewer ? '↑ 较早内容 · ' : '↑ 还有较早内容')
+    : (viewport.hasNewer ? '已到最早 · ' : '全部内容')
+  const navigationDetail = ` · 滚轮 3 行 · PageUp/PageDown ${pageRows} 行 · 拖动选中文本`
 
   // Mouse: wheel pages through history in small fixed steps, and a left-button
   // drag selects transcript text (tmux-style: the app owns the mouse, draws its
@@ -310,6 +333,7 @@ export function ChatScreen({ client, ready, webUserId, resumeSessionId, onClear,
         <ReconfigFlow
           client={client}
           onDone={(result) => onReconfigure(result)}
+          onCancel={() => onConfigCancel(chat.sessionId)}
         />
       </Box>
     )
@@ -329,7 +353,7 @@ export function ChatScreen({ client, ready, webUserId, resumeSessionId, onClear,
           : <CompactHeader ready={ready} sessionId={chat.sessionId} columns={terminal.columns} />}
 
         {!showWelcome
-          ? <Box width="100%" flexShrink={0}><Text dimColor wrap="truncate-end">  {navigationHint}</Text></Box>
+          ? <Box width="100%" flexShrink={0}><Text dimColor wrap="truncate-end">  {navigationPosition}{viewport.hasNewer ? <Text color="yellowBright">↓ 有新内容</Text> : null}{navigationDetail}</Text></Box>
           : null}
 
         <Box
@@ -359,6 +383,7 @@ export function ChatScreen({ client, ready, webUserId, resumeSessionId, onClear,
       <Box flexDirection="column" flexShrink={0}>
         {chat.typing ? <WorkingIndicator firstQuery={firstQueryInFlight} /> : null}
         {chat.error ? <Text color="red">⚠ {chat.error}</Text> : null}
+        {slashError ? <Text color="red">⚠ {slashError}</Text> : null}
 
         <Composer
           onSubmit={onSubmit}
@@ -568,6 +593,11 @@ export function Composer({ onSubmit, onStop, onQuit, typing, commands, onHeightC
   const [popupDismissed, setPopupDismissed] = useState(false)
   const historyRef = useRef<string[]>([])
   const [histIdx, setHistIdx] = useState<number | null>(null)
+  // Idle Ctrl+C quits, but a single accidental press must not kill the session:
+  // the first press arms a 2s confirmation window, the second press exits.
+  const [confirmQuit, setConfirmQuit] = useState(false)
+  const confirmQuitRef = useRef(false)
+  const confirmQuitTimer = useRef<ReturnType<typeof setTimeout> | null>(null)
   const valueRef = useRef(value)
   const cursorRef = useRef(cursor)
   const pasteRef = useRef<ComposerPasteState>({
@@ -581,6 +611,8 @@ export function Composer({ onSubmit, onStop, onQuit, typing, commands, onHeightC
   })
   const { stdout } = useStdout()
 
+  useEffect(() => () => { if (confirmQuitTimer.current) clearTimeout(confirmQuitTimer.current) }, [])
+
   // Physical Backspace/Delete keys are owned by useDeleteKeyCapture from the
   // raw stdin bytes — Ink reports the Backspace key (\x7f) and the Delete key
   // (ESC[3~) both as `key.delete`, so handling `key.delete` in useInput would
@@ -589,6 +621,13 @@ export function Composer({ onSubmit, onStop, onQuit, typing, commands, onHeightC
     const { text, cursor: nextCursor } = applyDeleteIntent(valueRef.current, cursorRef.current, intent)
     edit(text, nextCursor)
   })
+  useCursorKeyCapture(true, (intent) => {
+    const current = valueRef.current
+    const at = clampCursor(current, cursorRef.current)
+    const next = intent === 'home' ? 0 : intent === 'end' ? current.length
+      : intent === 'backward-word' ? previousWordBoundary(current, at) : nextWordBoundary(current, at)
+    moveCursor(next)
+  })
 
   const filtered = useMemo(() => {
     const match = /^(\w*)$/.exec(value.slice(1))
@@ -771,7 +810,19 @@ export function Composer({ onSubmit, onStop, onQuit, typing, commands, onHeightC
       }
       return
     }
-    if (key.ctrl && input === 'c') { typing ? void onStop() : onQuit(); return }
+    if (key.ctrl && input === 'c') {
+      if (typing) { void onStop(); return }
+      // Idle Ctrl+C exits, but guard against an accidental single press.
+      if (confirmQuitRef.current) { onQuit(); return }
+      confirmQuitRef.current = true
+      setConfirmQuit(true)
+      if (confirmQuitTimer.current) clearTimeout(confirmQuitTimer.current)
+      confirmQuitTimer.current = setTimeout(() => {
+        confirmQuitRef.current = false
+        setConfirmQuit(false)
+      }, 2000)
+      return
+    }
     // Physical Backspace/Delete keys are handled by useDeleteKeyCapture above
     // (raw stdin bytes distinguish them; Ink maps both to `key.delete`). Only
     // the unambiguous logical editing bindings stay here.
@@ -790,6 +841,7 @@ export function Composer({ onSubmit, onStop, onQuit, typing, commands, onHeightC
       edit(text, nextCursor)
       return
     }
+    if (key.ctrl && (key.leftArrow || key.rightArrow)) return
     if (key.leftArrow) { moveCursor(previousCursorBoundary(current, at)); return }
     if (key.rightArrow) { moveCursor(nextCursorBoundary(current, at)); return }
 
@@ -885,7 +937,9 @@ export function Composer({ onSubmit, onStop, onQuit, typing, commands, onHeightC
           })}
         </Box>
         <Box justifyContent="space-between">
-          <Text dimColor>{(stdout.columns ?? 80) >= 58 ? 'Enter 发送 · Shift+Enter / Ctrl+J 换行' : 'Enter 发送 · Ctrl+J 换行'}</Text>
+          {confirmQuit
+            ? <Text color="yellowBright" bold>请再次按下Ctrl+C退出</Text>
+            : <Text dimColor>{(stdout.columns ?? 80) >= 72 ? 'Enter 发送 · Shift+Enter / Alt+Enter / Ctrl+J 换行' : 'Enter 发送 · Alt+Enter / Ctrl+J 换行'}</Text>}
           <Text dimColor>{wrapped.length > maxRows ? `${visualCursor + 1}/${wrapped.length} 行` : `${wrapped.length} 行`}</Text>
         </Box>
       </Box>

package/src/components/ConfigFlow.tsx

@@ -21,7 +21,7 @@
  */
 import React, { useEffect, useRef, useState } from 'react'
 import { Box, Text } from 'ink'
-import { Select, TextInput, Spinner, type SelectItem } from './primitives.js'
+import { isEscapeKeypress, Select, TextInput, Spinner, useStableInput, type SelectItem } from './primitives.js'
 import { MobiusClient } from '../api.js'
 import {
   bindCwdToProject, cwd, getCwdPreference, loadDir2Project, loadProjectsCache,
@@ -118,8 +118,8 @@ export function ConfigFlow({ client, issue, onDone }: {
               : <Select
                   items={models.map(o => ({
                     label: `${o.label}${o.key === defaultKey ? ' （默认）' : ''}`,
-                    value: o.key,
                     desc: o.sub,
+                    value: o.key,
                   }))}
                   onSelect={key => void pickModel(key)}
                 />}
@@ -134,9 +134,10 @@ export function ConfigFlow({ client, issue, onDone }: {
 
 type ReconfigStep = 'projects' | 'issues' | 'models' | 'creating'
 
-export function ReconfigFlow({ client, onDone }: {
+export function ReconfigFlow({ client, onDone, onCancel }: {
   client: MobiusClient
   onDone: (r: ConfigResult) => void
+  onCancel: () => void
 }) {
   const [step, setStep] = useState<ReconfigStep>('projects')
   const [projects, setProjects] = useState<Project[] | null>(null)
@@ -151,6 +152,29 @@ export function ReconfigFlow({ client, onDone }: {
   const doneRef = useRef(false)
   const thisCwd = cwd()
 
+  function goBack() {
+    // The focused TextInput owns Esc while a create form is open. Returning
+    // here prevents the same raw key from also navigating the underlying step.
+    if (createMode !== null) return
+    if (step === 'models') {
+      setIssue(null)
+      setStep('issues')
+      return
+    }
+    if (step === 'issues') {
+      setProject(null)
+      setIssue(null)
+      setStep('projects')
+      return
+    }
+    if (step === 'projects') onCancel()
+  }
+
+  // Own Esc across both loaded lists and their async loading frames.
+  useStableInput((input, key) => {
+    if (isEscapeKeypress(input, key)) goBack()
+  })
+
   useEffect(() => () => { doneRef.current = true }, [])
 
   // Load projects on mount.
@@ -320,7 +344,7 @@ export function ReconfigFlow({ client, onDone }: {
               : <Select
                   items={[
                     { label: '➕ 创建新项目', value: '__create__' },
-                    ...projects.map(p => ({ label: p.name, value: p.id, desc: p.description })),
+                    ...projects.map(p => ({ label: p.name, desc: p.description, value: p.id })),
                   ]}
                   initialActive={projects.length > 0 ? 1 : 0}
                   onSelect={v => v === '__create__' ? setCreateMode('project') : pickProject(projects!.find(p => p.id === v)!)}
@@ -344,7 +368,7 @@ export function ReconfigFlow({ client, onDone }: {
                 : <Select
                     items={[
                       { label: '➕ 创建新任务', value: '__create__' },
-                      ...issues.map(i => ({ label: i.title, value: i.id, desc: i.description })),
+                      ...issues.map(i => ({ label: i.title, desc: i.description, value: i.id })),
                     ]}
                     initialActive={1}
                     onSelect={v => v === '__create__' ? setCreateMode('issue') : pickIssue(issues!.find(i => i.id === v)!)} />}
@@ -365,8 +389,8 @@ export function ReconfigFlow({ client, onDone }: {
                 : <Select
                     items={models.map(o => ({
                       label: `${o.label}${o.key === defaultKey ? ' （默认）' : ''}`,
-                      value: o.key,
                       desc: o.sub,
+                      value: o.key,
                     }))}
                     onSelect={key => void pickModel(key)}
                   />}

package/src/components/Login.tsx

@@ -15,12 +15,14 @@ import { saveLogin, type LoginRecord } from '../config.js'
 
 const DEFAULT_SERVER = ''
 
-export function LoginScreen({ onSuccess, onError }: {
+export function LoginScreen({ onSuccess, onError, initialServer = DEFAULT_SERVER, initialUsername = '' }: {
   onSuccess: (rec: LoginRecord) => void
   onError?: (msg: string) => void
+  initialServer?: string
+  initialUsername?: string
 }) {
-  const [server, setServer] = useState(DEFAULT_SERVER)
-  const [username, setUsername] = useState('')
+  const [server, setServer] = useState(initialServer)
+  const [username, setUsername] = useState(initialUsername)
   const [password, setPassword] = useState('')
   const [pwdRequired, setPwdRequired] = useState<boolean | null>(null)
   const [focus, setFocus] = useState(0) // 0 server, 1 user, 2 password