@mobius-os/mobius 0.3.45 → 0.3.46

package/package.json

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

package/src/api.ts

@@ -9,6 +9,7 @@ import type {
   AnyEntry,
   AuthConfig,
   HistoryGroup,
+  HistoryPendingOpener,
   Issue,
   LoginResponse,
   Memory,
@@ -163,11 +164,16 @@ export class MobiusClient {
   }
 
   // ── agent-history (协议 ①②: 组元数据 + 整组条目) ──────────────────────────
-  /** ① 全部组元数据, 一次给全. */
-  async listHistoryGroups(sessionId: string): Promise<{ session_version: number; groups: HistoryGroup[] }> {
+  /** ① 全部组元数据, 一次给全; 顺带返回挂起中的开轮卡 (pending). */
+  async listHistoryGroups(sessionId: string): Promise<{ session_version: number; groups: HistoryGroup[]; pending: HistoryPendingOpener[] }> {
     return this.request(`/api/sessions/${encodeURIComponent(sessionId)}/groups`)
   }
 
+  /** 打断当前 turn 并出队下一条排队指令 (不追加新 prompt). */
+  async pauseToDequeue(sessionId: string): Promise<{ ok: boolean }> {
+    return this.request(`/api/sessions/${encodeURIComponent(sessionId)}/pause-to-dequeue`, { method: 'POST', body: '{}' })
+  }
+
   /** ② 某组全部条目 (全量, 无分页, 条目不可变). */
   async listHistoryGroupEntries(sessionId: string, groupId: string): Promise<{ group_id: string; version: number; entries: AnyEntry[] }> {
     return this.request(`/api/sessions/${encodeURIComponent(sessionId)}/groups/${encodeURIComponent(groupId)}/entries`)

package/src/components/Chat.tsx

@@ -161,15 +161,32 @@ export function ChatScreen({ client, ready, webUserId, resumeSessionId, onClear,
   // (type:user / response_item.message[user] / event_msg.user_message) 合并成 1 条,
   // 避免在累积视图里把同一条提问显示多次.
   const dedupedEntries = useMemo(() => dedupeUserEntries(chat.entries), [chat.entries])
-  const pendingEntry = useMemo<AnyEntry | null>(() => chat.pendingUser === null ? null : ({
-    type: 'user',
-    __id: '__pending-user__',
-    message: { role: 'user', content: chat.pendingUser },
-  }), [chat.pendingUser])
-  const transcriptEntries = useMemo(
-    () => pendingEntry ? [...dedupedEntries, pendingEntry] : dedupedEntries,
-    [dedupedEntries, pendingEntry],
-  )
+  const pendingEntry = useMemo<AnyEntry | null>(() => {
+    // 忙时提交的指令已由排队行统一呈现, 乐观占位退役 (避免 "You:" 与 "排队" 双重显示).
+    if (chat.pending.length > 0) return null
+    return chat.pendingUser === null ? null : ({
+      type: 'user',
+      __id: '__pending-user__',
+      message: { role: 'user', content: chat.pendingUser },
+    })
+  }, [chat.pendingUser, chat.pending.length])
+  // 排队行 (合成条目): 显示最后一条挂起指令 + 总数, 紧跟对话末尾.
+  const pendingQueueEntry = useMemo<AnyEntry | null>(() => {
+    if (chat.pending.length === 0) return null
+    const last = chat.pending[chat.pending.length - 1]
+    return {
+      type: '__pending_queue__',
+      __id: '__pending-queue__',
+      text: last?.user_summary ?? '',
+      count: chat.pending.length,
+    }
+  }, [chat.pending])
+  const transcriptEntries = useMemo(() => {
+    const parts = [...dedupedEntries]
+    if (pendingEntry) parts.push(pendingEntry)
+    if (pendingQueueEntry) parts.push(pendingQueueEntry)
+    return parts
+  }, [dedupedEntries, pendingEntry, pendingQueueEntry])
 
   // Markdown parsing and wrapping are paid once per entry/terminal width. Keep
   // the two most recent widths so resize-back does not immediately reparse the
@@ -414,6 +431,8 @@ export function ChatScreen({ client, ready, webUserId, resumeSessionId, onClear,
           commands={SLASH_COMMANDS}
           onHeightChange={setComposerRows}
           inputActiveRef={chatInputActiveRef}
+          onPauseToDequeue={chat.pauseToDequeue}
+          hasPending={chat.pending.length > 0}
         />
         <StatusArea
           ready={ready}
@@ -499,7 +518,8 @@ function ScreenText({ row, text }: { row: ScreenRow; text: string }) {
       : tone === 'edit_header' || tone === 'reasoning' ? 'magenta'
         : tone === 'edit_new' ? 'green'
           : tone === 'system' ? 'yellow'
-            : undefined
+            : tone === 'pending' ? 'yellow'
+              : undefined
   const dimColor = tone === 'tool_result' || tone === 'tool_error' || tone === 'reasoning' || tone === 'system'
   return <Text wrap="truncate-end" bold={tone === 'user'} dimColor={dimColor} color={color}>{text}</Text>
 }
@@ -614,9 +634,12 @@ interface ComposerProps {
   commands: { cmd: string; desc: string }[]
   onHeightChange?: (rows: number) => void
   inputActiveRef?: React.RefObject<boolean>
+  // 排队插队: 有挂起指令时空输入回车触发; hasPending 控制提示文案与触发开关.
+  onPauseToDequeue?: () => void
+  hasPending?: boolean
 }
 
-export function Composer({ onSubmit, onStop, onQuit, typing, commands, onHeightChange, inputActiveRef }: ComposerProps) {
+export function Composer({ onSubmit, onStop, onQuit, typing, commands, onHeightChange, inputActiveRef, onPauseToDequeue, hasPending }: ComposerProps) {
   const [value, setValue] = useState('')
   const [cursor, setCursor] = useState(0)
   const [popupIdx, setPopupIdx] = useState(0)
@@ -837,6 +860,9 @@ export function Composer({ onSubmit, onStop, onQuit, typing, commands, onHeightC
         onSubmit(submitted)
         edit('', 0)
         setHistIdx(null)
+      } else if (hasPending) {
+        // 空输入回车 = 插队: 打断当前 turn 并出队下一条排队指令.
+        void onPauseToDequeue?.()
       }
       return
     }
@@ -969,7 +995,10 @@ export function Composer({ onSubmit, onStop, onQuit, typing, commands, onHeightC
         <Box justifyContent="space-between">
           {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>
+                {hasPending ? <Text color="yellowBright">空回车插队 · </Text> : null}
+                {(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/hooks/useChat.ts

@@ -19,7 +19,7 @@ import { SseConnection } from '../sse.js'
 import { updateIssuePreference } from '../config.js'
 import { tuiAimuxIdentifier, probeAimuxBridgeConnection } from '../aimux.js'
 import { viewsForEntry } from '../lib/entry-view.js'
-import type { AnyEntry } from '../types.js'
+import type { AnyEntry, HistoryPendingOpener } from '../types.js'
 import type { ReadyState } from '../components/PrepScreen.js'
 
 export interface ChatApi {
@@ -31,12 +31,14 @@ export interface ChatApi {
 export interface ChatController {
   entries: AnyEntry[]
   pendingUser: string | null
+  pending: HistoryPendingOpener[]
   typing: boolean
   sending: boolean
   error: string | null
   sessionId: string | null
   send: (text: string) => Promise<void>
   stop: () => Promise<void>
+  pauseToDequeue: () => Promise<void>
 }
 
 let ID = 0
@@ -110,6 +112,7 @@ export function useChat({ client, ready, resumeSessionId }: ChatApi): ChatContro
   const [sessionId, setSessionId] = useState<string | null>(resumeSessionId ?? null)
   const [entries, setEntries] = useState<AnyEntry[]>([])
   const [pendingUser, setPendingUser] = useState<string | null>(null)
+  const [pending, setPending] = useState<HistoryPendingOpener[]>([])
   const [typing, setTyping] = useState(false)
   const [sending, setSending] = useState(false)
   const [error, setError] = useState<string | null>(null)
@@ -185,6 +188,8 @@ export function useChat({ client, ready, resumeSessionId }: ChatApi): ChatContro
     try {
       const data = await client.listHistoryGroups(sid)
       const groups: any[] = Array.isArray(data?.groups) ? data.groups : []
+      // 挂起中的开轮卡 (排队指令): /groups 是权威快照, 覆盖本地增量.
+      setPending(Array.isArray(data?.pending) ? data.pending : [])
       const local = groupSlotsRef.current
       const targets = local.size === 0 ? groups.slice(-BOOTSTRAP_GROUP_COUNT) : groups
       let changed = false
@@ -240,6 +245,9 @@ export function useChat({ client, ready, resumeSessionId }: ChatApi): ChatContro
           version: Number(group.version) || 1,
           entries: [],
         })
+        // 新组开轮 = 后端已把挂起的 pending_round_openers 一次性出队 (flushPendingOpenersToSink).
+        // 排队行随之清空; 随后 entries 事件会把这一整组内容补齐.
+        setPending([])
       },
       onEntries: ({ group_id, group_id_version, entries }) => {
         if (process.env.MOBIUS_TUI_DEBUG) console.error('[onEntries]', group_id, group_id_version, entries.length)
@@ -269,6 +277,16 @@ export function useChat({ client, ready, resumeSessionId }: ChatApi): ChatContro
           setPendingUser(null)
         }
       },
+      onPendingOpener: (opener) => {
+        // 忙时提交的新指令被挂起: 追加到排队行 (uuid 去重), 乐观占位随之退役.
+        if (!opener || typeof opener !== 'object') return
+        const id = String(opener.id ?? '')
+        setPending(prev => {
+          if (id && prev.some(p => p.id === id)) return prev
+          return [...prev, { id, opener_ts: opener.opener_ts ?? null, user_summary: opener.user_summary ?? '' }]
+        })
+        setPendingUser(null)
+      },
       onSubscribed: () => {
         reconnectAttemptRef.current = 0
         // 订阅即对账 (首开 = bootstrap 拉末尾几组; 重连 = stateless 补差额).
@@ -521,5 +539,18 @@ export function useChat({ client, ready, resumeSessionId }: ChatApi): ChatContro
     pollNowRef.current?.()
   }, [sessionId, client, updateTyping])
 
-  return { entries, pendingUser, typing, sending, error, sessionId, send, stop }
+  // 打断当前 turn 并出队下一条排队指令 (空输入回车 / 插队). 不追加新 prompt,
+  // 后端对 claude-code/codex 发一次 C-c, deepseek harness 是空实现. 排队行会在
+  // 新组开轮 (group_created) 时被清空, 这里只需触发并刷新状态轮询.
+  const pauseToDequeue = useCallback(async () => {
+    if (!sessionId) return
+    statusEpochRef.current += 1
+    try { await client.pauseToDequeue(sessionId) } catch (e: any) {
+      const msg = e instanceof ApiError ? e.message : `插队失败: ${e?.message ?? e}`
+      setError(msg)
+    }
+    pollNowRef.current?.()
+  }, [sessionId, client])
+
+  return { entries, pendingUser, pending, typing, sending, error, sessionId, send, stop, pauseToDequeue }
 }

package/src/lib/entry-view.ts

@@ -31,6 +31,7 @@ export type EntryView =
   | { kind: 'write_file'; filePath: string; content: string }
   | { kind: 'system'; text: string }
   | { kind: 'error'; text: string }
+  | { kind: 'pending'; text: string; count: number }
 
 export interface ToolResultView {
   text: string
@@ -113,7 +114,7 @@ function extractLocalCommandParts(entry: AnyEntry): LocalCommandPart[] {
 }
 
 /**
- * 整卡隐藏的噪声: 对齐 web entry-classify.ts isHiddenJsonlNoiseEntry 的 7 类
+ * 整卡隐藏的噪声: 对齐 web entry-classify.ts isHiddenJsonlNoiseEntry 的 8 类
  *   - token_count         : codex 每轮 token 用量统计 (event_msg)
  *   - environment_context : codex 每轮注入的 <environment_context> 纯系统 user 消息
  *   - session_meta        : codex 会话首条元数据
@@ -121,10 +122,12 @@ function extractLocalCommandParts(entry: AnyEntry): LocalCommandPart[] {
  *   - turn_duration       : Claude Code 每轮结束注入的 system 耗时统计
  *   - skill_listing       : Claude Code 注入的可用 Skill 清单
  *   - agent_listing_delta : Claude Code 注入的可用 subagent 清单
+ *   - mcp_tool_call_end   : MCP 工具调用完成生命周期标记
  * 注: context_compacted 不在此列 (对齐 web — 它保留为可见事件, TUI 显示成 system 行).
  */
 export function isHiddenNoise(entry: AnyEntry): boolean {
   if (entry?.type === 'event_msg' && entry?.payload?.type === 'token_count') return true
+  if (entry?.type === 'event_msg' && entry?.payload?.type === 'mcp_tool_call_end') return true
   if (entry?.type === 'session_meta') return true
   if (entry?.type === 'turn_context') return true
   if (entry?.type === 'system' && entry?.subtype === 'turn_duration') return true
@@ -515,6 +518,10 @@ function parseCustomToolCall(raw: any): { name: string; input: Record<string, an
 export function viewsForBlock(block: Block): EntryView[] {
   const entry = block.entry
   if (!entry || typeof entry !== 'object') return [{ kind: 'skip' }]
+  // 排队行 (合成条目): 显示忙时挂起的用户指令, 与 web 排队卡片同形.
+  if (entry.type === '__pending_queue__') {
+    return [{ kind: 'pending', text: String(entry.text ?? ''), count: Number(entry.count) || 1 }]
+  }
   if (isHiddenNoise(entry)) return [{ kind: 'skip' }]
   const type = entry.type
 

package/src/lib/screen-text.ts

@@ -118,6 +118,7 @@ export type ScreenRowTone =
   | 'reasoning'
   | 'system'
   | 'error'
+  | 'pending'
 
 export interface ScreenRow {
   /** Visible text used for geometry, hit-testing, and clipboard extraction. */
@@ -204,6 +205,11 @@ export function viewScreenRows(view: EntryView, columns: number): ScreenRows {
       const rows = view.text.split('\n').map((l, i) => `${i === 0 ? '⚠ ' : '  '}${l}`)
       return { marginTop: true, rows: fit(rows, 'error') }
     }
+    case 'pending': {
+      const summary = clampLines(view.text, width - 6, 1)[0] || '(无内容)'
+      const tail = view.count > 1 ? ` · 等 ${view.count} 条指令` : ''
+      return { marginTop: true, rows: fit([`⚡ 排队 · ${summary}${tail}`], 'pending') }
+    }
     default:
       return { marginTop: false, rows: [] }
   }

package/src/sse.ts

@@ -19,6 +19,8 @@ export interface SseHandlers {
   onGroupCreated?: (group: any) => void
   /** ③ 组条目增量: version = 应用该批后的组版本 (调用方水位线判据). */
   onEntries?: (payload: { group_id: string; group_id_version: number; entries: AnyEntry[] }) => void
+  /** 挂起开轮卡 (忙时提交、尚未出队的用户指令): { id, opener_ts, user_summary }. */
+  onPendingOpener?: (pending: { id: string; opener_ts: string | null; user_summary: string }) => void
   onTyping?: (active: boolean) => void
   onError?: (message: string, category?: string) => void
   onClose?: () => void
@@ -117,6 +119,9 @@ export class SseConnection {
           entries: Array.isArray(p.entries) ? p.entries : [],
         })
         break
+      case 'pending_opener':
+        this.handlers.onPendingOpener?.(p.entry)
+        break
       case 'typing':
         this.handlers.onTyping?.(!!p.active)
         break

package/src/types.ts

@@ -203,6 +203,16 @@ export interface HistoryGroup {
   entry_count: number
 }
 
+/**
+ * 挂起中的开轮卡 (pending_round_openers): 忙时提交、尚未出队的用户指令.
+ * /groups 端点返回的 `pending` 数组与 SSE `pending_opener` 事件的 `entry` 字段同形.
+ */
+export interface HistoryPendingOpener {
+  id: string
+  opener_ts: string | null
+  user_summary: string
+}
+
 // ── SSE envelope events (GET /api/sessions/:id/events) ───────────────────────
 // Each SSE frame's data is a JSON object with an `event` discriminator.
 export type SseEvent =