@mobius-os/mobius 0.3.20 → 0.3.25

package/package.json

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

package/src/App.tsx

@@ -121,13 +121,14 @@ export function App() {
     setRoute('chat')
   }
 
-  // /model (= /config): swap task+model and start a brand-new session. App owns
-  // `ready`, so it folds the ConfigFlow result in and remounts Chat on the fresh
-  // session (resumeSessionId = the eagerly created session).
+  // /model or /config: swap task+model (and optionally project for /config)
+  // and start a brand-new session. App owns `ready`, so it folds the result in
+  // and remounts Chat on the fresh session (resumeSessionId = the eagerly
+  // created session).
   function onReconfigure(result: ConfigResult) {
     if (!ready || !client) return
-    if (process.env.MOBIUS_TUI_DEBUG) console.error('[route] reconfigure', result.issue.id, result.prefs.model, result.sessionId)
-    setReady({ project: ready.project, issue: result.issue, prefs: result.prefs })
+    if (process.env.MOBIUS_TUI_DEBUG) console.error('[route] reconfigure', result.project?.id, result.issue.id, result.prefs.model, result.sessionId)
+    setReady({ project: result.project || ready.project, issue: result.issue, prefs: result.prefs })
     setResumeSessionId(result.sessionId)
     setChatKey(k => k + 1)
     setRoute('chat')

package/src/components/Chat.tsx

@@ -21,7 +21,7 @@ import {
 } from '../lib/screen-text.js'
 import type { ReadyState } from './PrepScreen.js'
 import type { AnyEntry } from '../types.js'
-import { ConfigFlow, type ConfigResult } from './ConfigFlow.js'
+import { ConfigFlow, ReconfigFlow, type ConfigResult } from './ConfigFlow.js'
 import type { AimuxStatus } from '../aimux.js'
 import { AimuxStatusLine, aimuxStatusText } from './AimuxStatus.js'
 import { isEscapeKeypress, isMouseInput, useMouseEvents } from './primitives.js'
@@ -55,7 +55,7 @@ const SLASH_COMMANDS = [
   { cmd: '/clear', desc: '清空当前对话，开启新会话' },
   { cmd: '/resume', desc: '恢复一个历史会话' },
   { cmd: '/model', desc: '更换模型并开启新会话（保留当前任务）' },
-  { cmd: '/config', desc: '更换模型（/model 的别名）' },
+  { cmd: '/config', desc: '重新选择项目、任务和模型' },
   { cmd: '/help', desc: '显示帮助' },
   { cmd: '/quit', desc: '退出 TUI' },
 ]
@@ -67,11 +67,12 @@ export function ChatScreen({ client, ready, webUserId, resumeSessionId, onClear,
   const [composerRows, setComposerRows] = useState(DEFAULT_COMPOSER_ROWS)
   const [modelLabel, setModelLabel] = useState<string | null>(null)
   const [configOpen, setConfigOpen] = useState(false)
+  const [reconfigOpen, setReconfigOpen] = useState(false)
   // Ink's useInput keeps whatever handler was registered at subscription time;
   // reading mutable refs (updated every render) keeps the callback from acting
   // on a stale `configOpen`/sessionId closure after the config flow opens.
-  const handlerRef = useRef<{ configOpen: boolean; sessionId: string | null }>({ configOpen: false, sessionId: null })
-  handlerRef.current = { configOpen, sessionId: chat.sessionId }
+  const handlerRef = useRef<{ configOpen: boolean; reconfigOpen: boolean; sessionId: string | null }>({ configOpen: false, reconfigOpen: false, sessionId: null })
+  handlerRef.current = { configOpen, reconfigOpen, sessionId: chat.sessionId }
   const terminal = useTerminalSize()
 
   const runSlash = useCallback((raw: string) => {
@@ -80,7 +81,8 @@ export function ChatScreen({ client, ready, webUserId, resumeSessionId, onClear,
       case '/clear': onClear(); return true
       case '/resume': onResume(); return true
       case '/help': setShowHelp(s => !s); return true
-      case '/model': case '/config': setConfigOpen(true); return true
+      case '/model': setConfigOpen(true); return true
+      case '/config': setReconfigOpen(true); return true
       case '/quit': case '/exit': onQuit(); return true
       default: return false
     }
@@ -148,12 +150,13 @@ export function ChatScreen({ client, ready, webUserId, resumeSessionId, onClear,
   const modelDisplay = modelLabel ?? ready.prefs.model ?? 'default'
 
   useInput((_input, key) => {
-    // While the config flow is open, this ChatScreen-level handler owns Esc so
-    // cancel is reliable even mid-list-loading (a per-component EscToCancel
-    // could be unmounted by the loading→loaded transition and drop the keypress).
-    // configOpen/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) {
+    // While a config/reconfig flow is open, this ChatScreen-level handler owns
+    // Esc so cancel is reliable even mid-list-loading (a per-component
+    // EscToCancel could be unmounted by the loading→loaded transition and drop
+    // 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 (isEscapeKeypress(_input, key)) onConfigCancel(handlerRef.current.sessionId)
       return
     }
@@ -262,6 +265,23 @@ export function ChatScreen({ client, ready, webUserId, resumeSessionId, onClear,
     )
   }
 
+  if (reconfigOpen) {
+    return (
+      <Box
+        flexDirection="column"
+        width={terminal.isTty ? terminal.columns : undefined}
+        height={terminal.isTty ? viewportRows : undefined}
+        paddingX={1}
+        overflowY="hidden"
+      >
+        <ReconfigFlow
+          client={client}
+          onDone={(result) => onReconfigure(result)}
+        />
+      </Box>
+    )
+  }
+
   return (
     <Box
       flexDirection="column"
@@ -282,7 +302,14 @@ export function ChatScreen({ client, ready, webUserId, resumeSessionId, onClear,
           ? <Box width="100%" flexShrink={0}><Text dimColor wrap="truncate-end">  {olderHint}</Text></Box>
           : null}
 
-        <Box flexGrow={1} flexShrink={1} flexDirection="column" justifyContent={showWelcome ? 'flex-start' : 'flex-end'} overflowY="hidden">
+        <Box flexGrow={1} flexShrink={1} flexDirection="column" justifyContent={showWelcome || fitted.hiddenOlder > 0 ? 'flex-start' : 'flex-end'} overflowY="hidden">
+          {fitted.peekLines.length > 0
+            ? <Box width="100%" flexShrink={0} flexDirection="column">
+                {fitted.peekLines.map((line, index) => (
+                  <Text key={`peek-${index}`} dimColor wrap="truncate-end">{index === 0 ? '  ⋯ ' : '    '}{line}</Text>
+                ))}
+              </Box>
+            : null}
           {fitted.entries.map((entry, index) => {
             const entrySel = selMap?.get(index)
             const key = entry.__id ?? `entry-${fitted.startIndex + index}`
@@ -1144,22 +1171,55 @@ function entryRows(entry: AnyEntry, columns: number): number {
 
 function fitTranscript(entries: AnyEntry[], rowBudget: number, columns: number, scrollBack = 0): {
   entries: AnyEntry[]
+  /** Tail rows of the next older entry, used to fill spare space above the viewport. */
+  peekLines: string[]
   hiddenOlder: number
   hiddenRecent: number
   startIndex: number
 } {
   const tail = Math.max(0, entries.length - scrollBack)
   const available = tail === 0 ? [] : entries.slice(0, tail)
-  let rows = 0
-  let first = available.length
-  for (let index = available.length - 1; index >= 0; index--) {
-    const nextRows = entryRows(available[index], columns)
-    if (first < available.length && rows + nextRows > rowBudget) break
-    rows += nextRows
-    first = index
+  const renderedRows = available.map((entry) => entryScreenLines(viewsForEntry(entry), columns))
+  const fit = (budget: number) => {
+    let rows = 0
+    let first = available.length
+    for (let index = available.length - 1; index >= 0; index--) {
+      const nextRows = renderedRows[index].length
+      if (first < available.length && rows + nextRows > budget) break
+      rows += nextRows
+      first = index
+    }
+    return { first, rows }
+  }
+
+  const base = fit(rowBudget)
+  let fitted = base
+  let first = fitted.first
+  let peekLines: string[] = []
+  // When older history exists, guarantee at least one row for the tail of the
+  // next older message. If complete entries exactly consume the budget, refit
+  // them with one fewer row; only the oldest complete entry can drop out, while
+  // the latest content remains visible. A single oversized entry keeps its
+  // original rendering because it cannot safely donate a row.
+  if (first > 0 && fitted.rows <= rowBudget) {
+    if (fitted.rows === rowBudget && rowBudget > 1) {
+      const reduced = fit(rowBudget - 1)
+      if (reduced.first > 0 && reduced.rows <= rowBudget - 1) {
+        fitted = reduced
+        first = reduced.first
+      }
+    }
+    const olderLines = renderedRows[first - 1].slice()
+    while (olderLines.length > 0 && !olderLines[0].trim()) olderLines.shift()
+    while (olderLines.length > 0 && !olderLines[olderLines.length - 1].trim()) olderLines.pop()
+    const spare = rowBudget - fitted.rows
+    if (spare > 0 && olderLines.length > 0) {
+      peekLines = olderLines.slice(-spare)
+    }
   }
   return {
     entries: available.slice(first),
+    peekLines,
     hiddenOlder: first,
     hiddenRecent: entries.length - tail,
     startIndex: first,

package/src/components/ConfigFlow.tsx

@@ -1,7 +1,7 @@
 /**
- * /model (= /config) flow — pick a model, then create a brand-new session in the
- * CURRENT task (Issue) with that model. Launched from inside the chat; Esc at any
- * point before the session is created cancels back to the conversation untouched.
+ * /model flow — pick a model, then create a brand-new session in the CURRENT
+ * task (Issue) with that model. Launched from inside the chat; Esc at any point
+ * before the session is created cancels back to the conversation untouched.
  *
  * The active Issue is intentionally NOT changed: /model only swaps the model and
  * starts a fresh session, keeping the current project/task context. Esc-cancel is
@@ -12,16 +12,27 @@
  *   updateIssuePreference — persist the chosen model on the active issue
  * The session body mirrors useChat.ensureSession() so the pc_client_metadata
  * (is_tui, aimux_id, local_path) matches lazily-created sessions exactly.
+ *
+ * ─────────────────────────────────────────────────────────────────────────────
+ * /config flow (ReconfigFlow) — full reconfiguration: (1) project → (2) issue →
+ * (3) model, then create a brand-new session. Unlike /model, this CAN change the
+ * active project and issue. Project/issue choices are persisted (bindCwdToProject,
+ * setCwdIssue, updateIssuePreference) so they become the new defaults.
  */
 import React, { useEffect, useRef, useState } from 'react'
 import { Box, Text } from 'ink'
-import { Select, Spinner } from './primitives.js'
+import { Select, TextInput, Spinner, type SelectItem } from './primitives.js'
 import { MobiusClient } from '../api.js'
-import { cwd, updateIssuePreference, type IssuePreference } from '../config.js'
+import {
+  bindCwdToProject, cwd, getCwdPreference, loadDir2Project, loadProjectsCache,
+  saveProjectsCache, setCwdIssue, updateIssuePreference, type IssuePreference,
+} from '../config.js'
 import { tuiAimuxIdentifier } from '../aimux.js'
-import type { Issue, SessionModelOption } from '../types.js'
+import type { Issue, Project, SessionModelOption } from '../types.js'
 
 export interface ConfigResult {
+  /** If set, the project was also changed (from /config full reflow). */
+  project?: Project
   issue: Issue
   prefs: IssuePreference
   sessionId: string
@@ -118,3 +129,249 @@ export function ConfigFlow({ client, issue, onDone }: {
     </Box>
   )
 }
+
+// ── /config: full reconfigure (project → issue → model) ─────────────────────
+
+type ReconfigStep = 'projects' | 'issues' | 'models' | 'creating'
+
+export function ReconfigFlow({ client, onDone }: {
+  client: MobiusClient
+  onDone: (r: ConfigResult) => void
+}) {
+  const [step, setStep] = useState<ReconfigStep>('projects')
+  const [projects, setProjects] = useState<Project[] | null>(null)
+  const [project, setProject] = useState<Project | null>(null)
+  const [issues, setIssues] = useState<Issue[] | null>(null)
+  const [issue, setIssue] = useState<Issue | null>(null)
+  const [models, setModels] = useState<SessionModelOption[] | null>(null)
+  const [defaultKey, setDefaultKey] = useState<string | null>(null)
+  const [status, setStatus] = useState('')
+  const [createName, setCreateName] = useState('')
+  const [createMode, setCreateMode] = useState<'project' | 'issue' | null>(null)
+  const doneRef = useRef(false)
+  const thisCwd = cwd()
+
+  useEffect(() => () => { doneRef.current = true }, [])
+
+  // Load projects on mount.
+  useEffect(() => {
+    ;(async () => {
+      let list = await loadProjectsCache()
+      try { list = await client.listProjects(); await saveProjectsCache(list) } catch { /* use cache */ }
+      if (doneRef.current) return
+      setProjects(list)
+    })().catch(e => { if (!doneRef.current) setStatus(`加载项目失败: ${e?.message ?? e}`) })
+  }, [client])
+
+  // Load issues when a project is picked.
+  useEffect(() => {
+    if (!project || step !== 'issues') return
+    ;(async () => {
+      try {
+        const iss = await client.listIssues(project.id, 'active')
+        if (doneRef.current) return
+        setIssues(iss)
+      } catch (e: any) {
+        if (!doneRef.current) setStatus(`加载任务失败: ${e?.message ?? e}`)
+      }
+    })()
+  }, [project, step, client])
+
+  // Load models when we reach the model step.
+  useEffect(() => {
+    if (step !== 'models') return
+    Promise.all([
+      client.modelOptions().catch(() => [] as SessionModelOption[]),
+      client.defaultModel().then(r => r.model).catch(() => null),
+    ]).then(([opts, def]) => {
+      if (doneRef.current) return
+      setModels(opts)
+      setDefaultKey(def)
+    })
+  }, [step, client])
+
+  // ── project ───────────────────────────────────────────────────────────────
+  async function pickProject(p: Project) {
+    await bindCwdToProject(thisCwd, p.id)
+    if (doneRef.current) return
+    setProject(p)
+    setIssues(null)
+    setStep('issues')
+  }
+
+  async function createProject(name: string) {
+    setCreateMode(null)
+    setStatus('创建项目…')
+    try {
+      const safeDir = '/' + (name || '未命名项目').replace(/[^a-zA-Z0-9一-鿿_-]/g, '-').replace(/-+/g, '-').replace(/^-|-$/g, '').slice(0, 64) || 'project'
+      const p = await client.createProject({ name: name || '未命名项目', description: '', bindPath: safeDir, defaultUseWorktree: false })
+      const list = await client.listProjects(); await saveProjectsCache(list)
+      if (doneRef.current) return
+      setProjects(list)
+      await bindCwdToProject(thisCwd, p.id)
+      setProject(p)
+      setIssues(null)
+      setStep('issues')
+      setStatus('')
+    } catch (e: any) { if (!doneRef.current) setStatus(`创建项目失败: ${e?.message ?? e}`) }
+  }
+
+  // ── issue ─────────────────────────────────────────────────────────────────
+  async function pickIssue(iss: Issue) {
+    await setCwdIssue(thisCwd, iss.id, iss.title)
+    if (doneRef.current) return
+    setIssue(iss)
+    setStep('models')
+  }
+
+  async function createIssue(name: string) {
+    if (!project) return
+    setCreateMode(null)
+    setStatus('创建任务…')
+    try {
+      const iss = await client.createIssue(project.id, { title: name || '命令行任务', description: '由 TUI 创建', use_worktree: false })
+      const refreshed = await client.listIssues(project.id, 'active')
+      if (doneRef.current) return
+      setIssues(refreshed)
+      await pickIssue(iss)
+      setStatus('')
+    } catch (e: any) { if (!doneRef.current) setStatus(`创建任务失败: ${e?.message ?? e}`) }
+  }
+
+  // ── model → session ───────────────────────────────────────────────────────
+  async function pickModel(model: string) {
+    if (!project || !issue) return
+    setStep('creating')
+    try {
+      const prefs = await updateIssuePreference(thisCwd, issue.id, { model })
+      if (doneRef.current) return
+      const s = await client.createSession(issue.id, {
+        name: `TUI ${new Date().toISOString().slice(5, 16).replace('T', ' ')}`,
+        model,
+        language: prefs.language,
+        excluded_skill_ids: prefs.excluded_skill_ids,
+        excluded_memory_ids: prefs.excluded_memory_ids,
+        pc_client_metadata: {
+          work_mode: 'pc',
+          aimux_id: tuiAimuxIdentifier(),
+          local_path: process.cwd(),
+          is_tui: true,
+          add_remote_aimux_mcp: true,
+        },
+      })
+      if (doneRef.current) return
+      onDone({ project, issue, prefs, sessionId: s.session_id })
+    } catch (e: any) {
+      if (doneRef.current) return
+      setStatus(`创建新会话失败: ${e?.message ?? e}`)
+      setStep('models')
+    }
+  }
+
+  // ── render ────────────────────────────────────────────────────────────────
+  if (step === 'creating') {
+    return (
+      <Box paddingX={2} paddingY={1}>
+        <Spinner label="正在创建新会话…" />
+      </Box>
+    )
+  }
+
+  if (createMode === 'project') {
+    return (
+      <Box flexDirection="column" paddingX={2} paddingY={1}>
+        <Text bold color="cyan">创建新项目</Text>
+        <Text color="gray">{thisCwd}</Text>
+        <Box marginTop={1} flexDirection="column">
+          <Text color="cyan">项目名称 ←</Text>
+          <TextInput value={createName} onChange={setCreateName} focused placeholder="未命名项目"
+            onSubmit={() => createProject(createName)} onEscape={() => { setCreateMode(null); setCreateName('') }} />
+        </Box>
+        {status ? <Text color="yellow">{status}</Text> : null}
+        <Text color="gray">回车创建 · Esc 返回</Text>
+      </Box>
+    )
+  }
+
+  if (createMode === 'issue') {
+    return (
+      <Box flexDirection="column" paddingX={2} paddingY={1}>
+        <Text bold color="cyan">创建新任务</Text>
+        <Text color="gray">项目: {project?.name}</Text>
+        <TextInput value={createName} onChange={setCreateName} focused placeholder="命令行任务"
+          onSubmit={() => createIssue(createName)} onEscape={() => { setCreateMode(null); setCreateName('') }} />
+        {status ? <Text color="yellow">{status}</Text> : null}
+        <Text color="gray">回车创建 · Esc 返回</Text>
+      </Box>
+    )
+  }
+
+  return (
+    <Box flexDirection="column" paddingX={2} paddingY={1}>
+      <Text bold color="cyan">重新配置</Text>
+      {status ? <Text color="yellow">{status}</Text> : null}
+
+      {step === 'projects' ? (
+        <Box flexDirection="column">
+          <Text bold color="cyan">选择项目</Text>
+          <Box marginTop={1}>
+            {projects === null
+              ? <Text color="cyan">加载项目列表…</Text>
+              : <Select
+                  items={[
+                    { label: '➕ 创建新项目', value: '__create__' },
+                    ...projects.map(p => ({ label: p.name, value: p.id, desc: p.description })),
+                  ]}
+                  onSelect={v => v === '__create__' ? setCreateMode('project') : pickProject(projects!.find(p => p.id === v)!)}
+                />}
+          </Box>
+          <Text color="gray">↑↓ 选择 · 回车确认 · Esc 取消</Text>
+        </Box>
+      ) : null}
+
+      {step === 'issues' ? (
+        <Box flexDirection="column">
+          <Text bold color="cyan">选择任务</Text>
+          <Text color="gray">项目: {project?.name}</Text>
+          <Box marginTop={1}>
+            {issues === null
+              ? <Text color="cyan">加载任务列表…</Text>
+              : issues.length === 0
+                ? <Select
+                    items={[{ label: '➕ 创建新任务（尚无任务）', value: '__create__' }]}
+                    onSelect={() => setCreateMode('issue')} />
+                : <Select
+                    items={[
+                      { label: '➕ 创建新任务', value: '__create__' },
+                      ...issues.map(i => ({ label: i.title, value: i.id, desc: i.description })),
+                    ]}
+                    onSelect={v => v === '__create__' ? setCreateMode('issue') : pickIssue(issues!.find(i => i.id === v)!)} />}
+          </Box>
+          <Text color="gray">↑↓ 选择 · 回车确认 · Esc 取消</Text>
+        </Box>
+      ) : null}
+
+      {step === 'models' ? (
+        <Box flexDirection="column">
+          <Text bold color="cyan">选择模型</Text>
+          <Text color="gray">项目: {project?.name} · 任务: {issue?.title}</Text>
+          <Box marginTop={1}>
+            {models === null
+              ? <Text color="cyan">加载模型列表…</Text>
+              : models.length === 0
+                ? <Text color="gray">（无可用模型）</Text>
+                : <Select
+                    items={models.map(o => ({
+                      label: `${o.label}${o.key === defaultKey ? ' （默认）' : ''}`,
+                      value: o.key,
+                      desc: o.sub,
+                    }))}
+                    onSelect={key => void pickModel(key)}
+                  />}
+          </Box>
+          <Text color="gray">↑↓ 选择 · 回车确认 · Esc 取消</Text>
+        </Box>
+      ) : null}
+    </Box>
+  )
+}

package/src/components/PrepScreen.tsx

@@ -10,6 +10,7 @@
  * Preferences are stored INSIDE the selected Issue (switching issues restores
  * that issue's saved model/language/skill/memory choices).
  */
+import { randomBytes } from 'crypto'
 import React, { useEffect, useState } from 'react'
 import { Box, Text } from 'ink'
 import { Select, TextInput, type SelectItem } from './primitives.js'
@@ -116,7 +117,14 @@ export function PrepScreen({ client, onReady, onQuit }: {
   async function createProject(name: string, description: string) {
     setStatusMsg('创建项目…')
     try {
-      const p = await client.createProject({ name: name || '未命名项目', description, bindPath: thisCwd, defaultUseWorktree: false })
+      // bindPath 是 mobius 服务器上的工作目录，不应使用 TUI 客户端的 process.cwd()。
+      // TUI 可能运行在不同机器/OS 上（尤其是通过 aimux 连接时），
+      // 客户端 cwd 对服务器无意义（Windows 路径如 C:\Users\... 在 Linux 上会被误解析为相对路径）。
+      // 用项目名+随机后缀生成唯一服务器端子目录，由服务器 resolveBindPath 拼到用户 work_dir 下。
+      const slug = (name || '未命名项目').replace(/[^a-zA-Z0-9一-鿿_-]/g, '-').replace(/-+/g, '-').replace(/^-|-$/g, '').slice(0, 56) || 'project'
+      const suffix = randomBytes(3).toString('hex')
+      const safeDir = `/${slug}-${suffix}`
+      const p = await client.createProject({ name: name || '未命名项目', description, bindPath: safeDir, defaultUseWorktree: false })
       const list = await client.listProjects(); await saveProjectsCache(list); setProjects(list)
       await bindCwdToProject(thisCwd, p.id)
       await enterProject(p, list)