@mobius-os/mobius 0.3.34 → 0.3.42

package/src/components/PrepScreen.tsx

@@ -230,10 +230,75 @@ function toItems(arr: { id: string; name: string; description?: string }[]): Sel
   return arr.map(s => ({ label: s.name, value: s.id, desc: s.description }))
 }
 
-// 把可能含换行的描述压成单行：换行 → 可见符号 ⏎，避免列表项跨行。
-function flattenDesc(s?: string): string {
-  if (!s) return ''
-  return s.replace(/\s*\n\s*/g, ' ⏎ ').replace(/[ \t]+/g, ' ').trim()
+// Search-first picker used by the project and issue screens. The search field
+// owns the initial focus so a user can type immediately; Down hands control to
+// the normal Select for keyboard navigation. Enter in the search field chooses
+// the first matching row, which keeps the common "type a unique name, Enter"
+// workflow to one step.
+function SearchableSelect({
+  items,
+  createItem,
+  title,
+  placeholder,
+  onSelect,
+  onCreate,
+  onQuit,
+}: {
+  items: SelectItem[]
+  createItem?: SelectItem
+  title: string
+  placeholder: string
+  onSelect: (value: string) => void
+  onCreate?: () => void
+  onQuit?: () => void
+}) {
+  const [query, setQuery] = useState('')
+  const [focus, setFocus] = useState<'search' | 'list'>('search')
+  const needle = query.trim().toLocaleLowerCase()
+  const matches = (item: SelectItem) => {
+    if (!needle) return true
+    return `${item.label}\n${item.desc ?? ''}\n${item.value}`.toLocaleLowerCase().includes(needle)
+  }
+  const filtered = items.filter(matches)
+  const createMatches = createItem && matches(createItem)
+  const visibleItems = createItem && (!needle || createMatches)
+    ? [createItem, ...filtered]
+    : filtered
+
+  function choose(value: string) {
+    if (value === createItem?.value) onCreate?.()
+    else onSelect(value)
+  }
+
+  return (
+    <Box flexDirection="column">
+      <Text bold color="cyan">{title}</Text>
+      <Box marginTop={1} flexDirection="column">
+        <TextInput
+          value={query}
+          onChange={setQuery}
+          focused={focus === 'search'}
+          prompt="搜索:"
+          placeholder={placeholder}
+          onArrowDown={() => setFocus('list')}
+          onArrowUp={() => setFocus('list')}
+          onSubmit={() => { if (visibleItems.length) choose(visibleItems[0].value) }}
+          onEscape={() => onQuit?.()}
+        />
+        {query.trim() && !filtered.length
+          ? <Text color="yellow">没有匹配的项目，请修改搜索</Text>
+          : focus === 'search' && query.trim() ? <Text color="gray">匹配 {filtered.length} 项 · ↓进入列表</Text> : null}
+        {focus === 'list' && !visibleItems.length
+          ? <Text color="yellow">没有匹配的项目，请按 Esc 修改搜索</Text>
+          : <Select
+              items={visibleItems}
+              focused={focus === 'list'}
+              onBack={() => setFocus('search')}
+              onSelect={choose}
+            />}
+      </Box>
+    </Box>
+  )
 }
 
 // ── Project picker ───────────────────────────────────────────────────────────
@@ -264,22 +329,25 @@ function ProjectPicker({ cwd, projects, statusMsg, onPick, onCreate, onQuit }: {
     )
   }
 
-  const items: SelectItem[] = [
-    { label: '➕ 创建新项目', value: '__create__', desc: '绑定到当前路径' },
-    ...projects.map(p => {
-      const desc = flattenDesc(p.description)
-      return { label: desc ? `${p.name} — ${desc}` : p.name, value: p.id }
-    }),
-  ]
+  const items: SelectItem[] = projects.map(p => ({
+    label: p.name,
+    desc: p.description,
+    value: p.id,
+  }))
   return (
     <Box flexDirection="column" paddingX={2} paddingY={1}>
-      <Text bold color="cyan">选择当前路径的绑定项目</Text>
       <Text color="gray">{cwd}</Text>
-      <Box marginTop={1}>
-        <Select items={items} onBack={onQuit} onSelect={v => v === '__create__' ? setMode('create') : onPick(projects.find(p => p.id === v)!)} />
-      </Box>
+      <SearchableSelect
+        title="选择当前路径的绑定项目"
+        placeholder="输入项目名或描述"
+        items={items}
+        createItem={{ label: '➕ 创建新项目', value: '__create__', desc: '绑定到当前路径' }}
+        onSelect={v => onPick(projects.find(p => p.id === v)!)}
+        onCreate={() => setMode('create')}
+        onQuit={onQuit}
+      />
       {statusMsg ? <Text color="yellow">{statusMsg}</Text> : null}
-      <Text color="gray">↑↓ 选择 · 回车确认 · Esc 退出</Text>
+      <Text color="gray">输入关键词筛选 · ↓进入列表 · Esc 退出</Text>
     </Box>
   )
 }
@@ -306,18 +374,23 @@ function IssuePicker({ issues, onPick, onCreate }: {
       </Box>
     )
   }
-  const items: SelectItem[] = [
-    { label: '➕ 创建新任务', value: '__create__' },
-    ...issues.map(i => ({ label: i.title, value: i.id, desc: i.description })),
-  ]
+  const items: SelectItem[] = issues.map(i => ({
+    label: i.title,
+    desc: i.description,
+    value: i.id,
+  }))
   return (
     <Box flexDirection="column">
-      <Text bold color="cyan">选择任务（Issue）</Text>
       <Text color="gray">偏好设置将保存在所选任务内部</Text>
       <Box marginTop={1}>
-        {issues.length === 0 && mode === 'list'
-          ? <Select items={[{ label: '➕ 创建新任务（尚无任务）', value: '__create__' }]} onSelect={() => setMode('create-name')} />
-          : <Select items={items} onSelect={v => v === '__create__' ? setMode('create-name') : onPick(issues.find(i => i.id === v)!)} />}
+        <SearchableSelect
+          title="选择任务（Issue）"
+          placeholder="输入任务标题或描述"
+          items={items}
+          createItem={{ label: issues.length ? '➕ 创建新任务' : '➕ 创建新任务（尚无任务）', value: '__create__' }}
+          onSelect={v => onPick(issues.find(i => i.id === v)!)}
+          onCreate={() => setMode('create-name')}
+        />
       </Box>
     </Box>
   )
@@ -332,8 +405,8 @@ function ModelPicker({ options, defaultKey, onSelect }: {
   if (!options.length) return <Text color="gray">加载模型列表…</Text>
   const items: SelectItem[] = options.map(o => ({
     label: `${o.label}${o.key === defaultKey ? ' （默认）' : ''}`,
-    value: o.key,
     desc: o.sub,
+    value: o.key,
   }))
   return (
     <Box flexDirection="column">

package/src/components/primitives.tsx

@@ -4,7 +4,8 @@
  */
 import React, { useEffect, useRef, useState } from 'react'
 import { Box, Text, useInput, useStdout, useStdin, type Key } from 'ink'
-import { useDeleteKeyCapture, applyDeleteIntent } from '../lib/delete-keys.js'
+import { useDeleteKeyCapture, applyDeleteIntent, clampCursor, previousWordBoundary, nextWordBoundary } from '../lib/delete-keys.js'
+import { useCursorKeyCapture } from '../lib/cursor-keys.js'
 
 /** Return false when a mounted listener deliberately did not consume the input. */
 type InputHandler = (input: string, key: Key) => void | false
@@ -318,6 +319,14 @@ export function TextInput(props: TextInputProps) {
     const { text, cursor: nextCursor } = applyDeleteIntent(valueRef.current, cursorRef.current, intent)
     edit(text, nextCursor)
   })
+  useCursorKeyCapture(focused, (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)
+    cursorRef.current = next
+    setCursor(next)
+  })
 
   useStableInput((input, key) => {
     if (isMouseInput(input)) return
@@ -343,6 +352,7 @@ export function TextInput(props: TextInputProps) {
       edit(text, nextCursor)
       return
     }
+    if (key.ctrl && (key.leftArrow || key.rightArrow)) return
     if (key.leftArrow) { setCursor(c => Math.max(0, c - 1)); return }
     if (key.rightArrow) { setCursor(c => Math.min(value.length, c + 1)); return }
     if (key.ctrl && input === 'a') { setCursor(0); return }
@@ -421,6 +431,12 @@ export interface SelectItem {
   desc?: string
 }
 
+/** Keep a picker explanation on the item's main row; Select truncates that row. */
+export function inlineSelectLabel(label: string, detail?: string): string {
+  const oneLine = detail?.replace(/\s*\n\s*/g, ' ⏎ ').replace(/[ \t]+/g, ' ').trim()
+  return oneLine ? `${label} - ${oneLine}` : label
+}
+
 export interface SelectProps {
   items: SelectItem[]
   mode?: 'single' | 'multi'
@@ -491,17 +507,20 @@ export function Select(props: SelectProps) {
         const isActive = realIdx === active
         const checked = mode === 'multi' ? selectedSet.has(it.value) : false
         const marker = mode === 'multi' ? (checked ? '☑' : '☐') : isActive ? '❯' : ' '
+        // Keep picker rows compact: descriptions belong on the highlighted
+        // row only.  Unfocused rows show just their label so a long list does
+        // not turn every item into a multi-line block.
+        const rowLabel = isActive ? inlineSelectLabel(it.label, it.desc) : it.label
         return (
-          <Box key={it.value} flexDirection="column">
+          <Box key={it.value}>
             <Text
               color={isActive ? 'black' : undefined}
               backgroundColor={isActive ? 'cyan' : undefined}
               bold={isActive}
               wrap="truncate-end"
             >
-              {marker} {it.label}
+              {marker} {rowLabel}
             </Text>
-            {isActive && it.desc ? <Text color="gray" wrap="truncate-end">    {it.desc}</Text> : null}
           </Box>
         )
       })}

package/src/lib/cursor-keys.ts

@@ -0,0 +1,70 @@
+/** Raw terminal cursor-key capture for keys Ink does not expose in `Key`. */
+
+import { useEffect, useRef } from 'react'
+import { useStdin } from 'ink'
+
+export type CursorIntent = 'home' | 'end' | 'backward-word' | 'forward-word'
+
+// Home/End vary by terminal/application mode. Ctrl+Left/Right are the xterm
+// CSI modifier-5 forms; the shorter 5D/5C forms are emitted by some tmux and
+// ConPTY bridges. Longest sequences come first so prefixes cannot win early.
+const CURSOR_SEQUENCES: ReadonlyArray<readonly [string, CursorIntent]> = [
+  ['\x1b[1;5D', 'backward-word'],
+  ['\x1b[1;5C', 'forward-word'],
+  ['\x1b[5D', 'backward-word'],
+  ['\x1b[5C', 'forward-word'],
+  ['\x1b[1~', 'home'],
+  ['\x1b[7~', 'home'],
+  ['\x1b[4~', 'end'],
+  ['\x1b[8~', 'end'],
+  ['\x1b[H', 'home'],
+  ['\x1b[F', 'end'],
+  ['\x1bOH', 'home'],
+  ['\x1bOF', 'end'],
+]
+
+export function classifyCursorSequence(raw: string): { intent: CursorIntent; length: number } | null {
+  for (const [sequence, intent] of CURSOR_SEQUENCES) {
+    if (raw.startsWith(sequence)) return { intent, length: sequence.length }
+  }
+  return null
+}
+
+function isCursorPrefix(raw: string): boolean {
+  return CURSOR_SEQUENCES.some(([sequence]) => sequence.startsWith(raw))
+}
+
+/** Capture physical Home/End and Ctrl+arrow bytes without relying on Ink's lossy key object. */
+export function useCursorKeyCapture(
+  enabled: boolean,
+  onCursor: (intent: CursorIntent) => void,
+): void {
+  const { internal_eventEmitter } = useStdin()
+  const enabledRef = useRef(enabled)
+  const onCursorRef = useRef(onCursor)
+  enabledRef.current = enabled
+  onCursorRef.current = onCursor
+
+  useEffect(() => {
+    if (!internal_eventEmitter) return
+    let buf = ''
+    const handler = (chunk: unknown) => {
+      buf += String(chunk)
+      while (buf) {
+        const match = classifyCursorSequence(buf)
+        if (match) {
+          buf = buf.slice(match.length)
+          if (enabledRef.current) onCursorRef.current(match.intent)
+          continue
+        }
+        if (isCursorPrefix(buf)) break
+        // Ordinary text is handled by Ink's useInput; only retain a possible
+        // incomplete escape prefix so split terminal sequences still match.
+        const nextEsc = buf.indexOf('\x1b', buf.startsWith('\x1b') ? 1 : 0)
+        buf = nextEsc >= 0 ? buf.slice(nextEsc) : ''
+      }
+    }
+    internal_eventEmitter.on('input', handler)
+    return () => { internal_eventEmitter.off('input', handler) }
+  }, [internal_eventEmitter])
+}

package/src/lib/delete-keys.ts

@@ -59,7 +59,7 @@ export function nextCursorBoundary(text: string, cursor: number): number {
 }
 
 /** Backward-word boundary: skip trailing whitespace, then the word before it. */
-function backwardWordBoundary(text: string, at: number): number {
+export function previousWordBoundary(text: string, at: number): number {
   let i = at
   while (i > 0 && /\s/.test(text[i - 1])) i--
   while (i > 0 && !/\s/.test(text[i - 1])) i--
@@ -67,7 +67,7 @@ function backwardWordBoundary(text: string, at: number): number {
 }
 
 /** Forward-word boundary: skip leading whitespace, then the word after it. */
-function forwardWordBoundary(text: string, at: number): number {
+export function nextWordBoundary(text: string, at: number): number {
   let i = at
   while (i < text.length && /\s/.test(text[i])) i++
   while (i < text.length && !/\s/.test(text[i])) i++
@@ -93,12 +93,12 @@ export function applyDeleteIntent(
       return { text: text.slice(0, at) + text.slice(next), cursor: at }
     }
     case 'backward-word': {
-      const start = backwardWordBoundary(text, at)
+      const start = previousWordBoundary(text, at)
       if (start === at) return { text, cursor: at }
       return { text: text.slice(0, start) + text.slice(at), cursor: start }
     }
     case 'forward-word': {
-      const end = forwardWordBoundary(text, at)
+      const end = nextWordBoundary(text, at)
       if (end === at) return { text, cursor: at }
       return { text: text.slice(0, at) + text.slice(end), cursor: at }
     }

package/src/lib/entry-view.ts

@@ -87,6 +87,31 @@ function entryUserText(entry: AnyEntry): string {
 
 const ENV_CONTEXT_RE = /<environment_context\b[^>]*>[\s\S]*?<\/environment_context>/gi
 
+// ── Claude Code 本地命令产物标签 (/compact 等) ─────────────────────────────
+// slash command 在 claude-code jsonl 里以 user 外壳 + 下列标签出现, 不是人类提问:
+//   <command-name>/compact</command-name> 等   命令回显 (噪声)
+//   <local-command-caveat>…</local-command-caveat>   "由本地命令产生" 提示 (噪声)
+//   <local-command-stdout>Compacted …</local-command-stdout>   命令输出 (压缩完成信号)
+// 对齐 web entry-extract.ts 的 extractLocalCommandParts (精简版), 渲染时不能把
+// 标签原文当用户消息显示.
+const LOCAL_COMMAND_TAG_PATTERN = /<(local-command-stdout|local-command-caveat|command-name|command-message|command-args)>\s*([\s\S]*?)<\/\1>/gi
+
+interface LocalCommandPart { tag: string; body: string }
+
+function extractLocalCommandParts(entry: AnyEntry): LocalCommandPart[] {
+  if (entry?.type !== 'user') return []
+  const text = entryUserText(entry)
+  if (!text || !text.includes('<')) return []
+  const parts: LocalCommandPart[] = []
+  LOCAL_COMMAND_TAG_PATTERN.lastIndex = 0
+  let m: RegExpExecArray | null
+  while ((m = LOCAL_COMMAND_TAG_PATTERN.exec(text))) {
+    const body = m[2].replace(/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]/g, '').trim()
+    parts.push({ tag: m[1].toLowerCase(), body })
+  }
+  return parts
+}
+
 /**
  * 整卡隐藏的噪声: 对齐 web entry-classify.ts isHiddenJsonlNoiseEntry 的 7 类
  *   - token_count         : codex 每轮 token 用量统计 (event_msg)
@@ -558,6 +583,21 @@ export function viewsForBlock(block: Block): EntryView[] {
       }
       return out
     }
+    // Claude Code 本地命令产物 (/compact 等): 命令回显/caveat 标签是噪声 → 整条
+    // 隐藏; local-command-stdout 渲染成 system 行, "Compacted …" 对齐 codex 的
+    // context_compacted 事件显示 "◇ 上下文已压缩"。
+    const localParts = extractLocalCommandParts(entry)
+    if (localParts.length > 0) {
+      const out: EntryView[] = []
+      for (const part of localParts) {
+        if (part.tag !== 'local-command-stdout' || !part.body) continue
+        const text = /^compacted\b/i.test(part.body)
+          ? `◇ 上下文已压缩 · ${part.body}`
+          : part.body
+        out.push({ kind: 'system', text: truncate(text, 160) })
+      }
+      return out.length ? out : [{ kind: 'skip' }]
+    }
     const text = entryUserText(entry)
     return text ? [{ kind: 'user', text: stripUserFraming(text) }] : [{ kind: 'skip' }]
   }

package/src/markdown.ts

@@ -12,6 +12,30 @@ import chalk from 'chalk'
 import { highlight, supportsLanguage } from 'cli-highlight'
 import { lexer, type Token, type Tokens } from 'marked'
 
+/**
+ * Decode HTML entities that marked's lexer injects into text tokens.
+ * marked encodes `' " < > &` as `&#39; &quot; &lt; &gt; &amp;` even when
+ * only lexing (not rendering to HTML).  The TUI renders to a terminal so
+ * we must reverse that encoding ourselves.
+ */
+const HTML_ENTITY_RE = /&(?:#(x?)([0-9a-fA-F]+)|(amp|lt|gt|quot|#39));/g
+function decodeHtmlEntities(s: string): string {
+  return s.replace(HTML_ENTITY_RE, (_, hex: string | undefined, num: string, named: string | undefined) => {
+    if (named) {
+      switch (named) {
+        case 'amp': return '&'
+        case 'lt': return '<'
+        case 'gt': return '>'
+        case 'quot': return '"'
+        case '#39': return "'"
+        default: return _
+      }
+    }
+    const code = parseInt(num, hex ? 16 : 10)
+    return String.fromCodePoint(code)
+  })
+}
+
 export interface RenderedMarkdownLine {
   text: string
   code: boolean
@@ -43,7 +67,7 @@ function renderInlineOne(t: Token): string {
   const anyT = t as any
   switch (t.type) {
     case 'text':
-      return anyT.tokens ? renderInline(anyT.tokens) : escapeAnsiReset(anyT.text)
+      return anyT.tokens ? renderInline(anyT.tokens) : escapeAnsiReset(decodeHtmlEntities(anyT.text))
     case 'strong':
       return chalk.bold(renderInline(anyT.tokens))
     case 'em':
@@ -51,20 +75,20 @@ function renderInlineOne(t: Token): string {
     case 'del':
       return chalk.dim.strikethrough(renderInline(anyT.tokens))
     case 'codespan':
-      return chalk.cyanBright(anyT.text)
+      return chalk.cyanBright(decodeHtmlEntities(anyT.text))
     case 'link': {
       const label = renderInline(anyT.tokens) || anyT.href
       return anyT.href && label !== anyT.href ? `${chalk.cyan(label)} (${chalk.dim.underline(anyT.href)})` : chalk.cyan(label)
     }
     case 'image':
-      return chalk.magentaBright(`[图片: ${anyT.href || anyT.text}]`)
+      return chalk.magentaBright(`[图片: ${anyT.href || decodeHtmlEntities(anyT.text)}]`)
     case 'br':
       return '\n'
     case 'escape':
     case 'html':
-      return anyT.text ?? ''
+      return anyT.text ? decodeHtmlEntities(anyT.text) : ''
     default:
-      return anyT.text ?? renderInline(anyT.tokens)
+      return anyT.text ? decodeHtmlEntities(anyT.text) : renderInline(anyT.tokens)
   }
 }
 
@@ -74,7 +98,7 @@ function escapeAnsiReset(s: string): string {
 }
 
 function renderTable(t: Tokens.Table): string {
-  const cell = (toks: any) => renderInline(toks?.tokens ?? [{ type: 'text', text: toks?.text ?? '' }])
+  const cell = (toks: any) => renderInline(toks?.tokens ?? [{ type: 'text', text: decodeHtmlEntities(toks?.text ?? '') }])
   const header = t.header.map((h) => cell(h)).join(' | ')
   const rows = t.rows.map((r) => r.map((c) => cell(c)).join(' | ')).join('\n')
   return chalk.bold(header) + '\n' + chalk.dim('-'.repeat(Math.min(header.length, 80))) + '\n' + rows
@@ -121,7 +145,7 @@ function renderBlock(t: Token): string {
     case 'paragraph':
       return renderInline(anyT.tokens)
     case 'code': {
-      return renderCode(anyT.text, anyT.lang)
+      return renderCode(decodeHtmlEntities(anyT.text), anyT.lang)
     }
     case 'blockquote': {
       const inner = (anyT.tokens as Token[]).map(renderBlock).join('\n')
@@ -142,9 +166,9 @@ function renderBlock(t: Token): string {
     case 'space':
       return ''
     case 'html':
-      return chalk.dim(anyT.text ?? '')
+      return chalk.dim(decodeHtmlEntities(anyT.text ?? ''))
     default:
-      return anyT.text ?? renderInline(anyT.tokens)
+      return anyT.text ? decodeHtmlEntities(anyT.text) : renderInline(anyT.tokens)
   }
 }
 
@@ -156,5 +180,5 @@ function renderListItemBody(item: any): string {
       .filter(Boolean)
       .join('\n')
   }
-  return item.text ?? ''
+  return item.text ? decodeHtmlEntities(item.text) : ''
 }

package/tests/aimux.test.tsx

@@ -7,7 +7,7 @@ import os from 'node:os'
 import path from 'node:path'
 import { render } from 'ink-testing-library'
 import { AimuxStatusLine } from '../src/components/AimuxStatus.js'
-import { AimuxSupervisor, probeAimuxBridgeConnection, bundleArch, bundleUrl, spawnLauncher, ensureFromBundle, downloadBundleForTest, reverseConnectArgs, aimuxLogPath, bundleHealthCheckCode } from '../src/aimux.js'
+import { AimuxSupervisor, probeAimuxBridgeConnection, bundleArch, bundleUrl, spawnLauncher, ensureFromBundle, downloadBundleForTest, reverseConnectArgs, pickSilentFlag, aimuxLogPath, bundleHealthCheckCode, tuiAimuxIdentifier } from '../src/aimux.js'
 
 const delay = (ms: number) => new Promise<void>(resolve => setTimeout(resolve, ms))
 let pass = 0, fail = 0
@@ -78,11 +78,11 @@ async function testBundleArchAndUrl() {
   const arch = bundleArch()
   ok(arch === 'linux-x64' || arch === 'win-x64' || arch === 'mac-x64', `bundleArch returns a supported arch on this host (${arch})`)
   const before = bundleUrl('linux-x64')
-  ok(before.includes('mobius-python-linux-x64-v2') && before.endsWith('.zip'), 'bundleUrl follows the fixed filename pattern')
+  ok(before.includes('mobius-python-linux-x64-v3') && before.endsWith('.zip'), 'bundleUrl follows the fixed filename pattern')
   const saved = process.env.MOBIUS_TUI_PYTHON_BUNDLE_URL
   process.env.MOBIUS_TUI_PYTHON_BUNDLE_URL = 'https://example.test/cdn/'
   try {
-    ok(bundleUrl('win-x64') === 'https://example.test/cdn/mobius-python-win-x64-v2.zip', 'MOBIUS_TUI_PYTHON_BUNDLE_URL overrides the CDN base and trims trailing slash')
+    ok(bundleUrl('win-x64') === 'https://example.test/cdn/mobius-python-win-x64-v3.zip', 'MOBIUS_TUI_PYTHON_BUNDLE_URL overrides the CDN base and trims trailing slash')
   } finally { if (saved === undefined) delete process.env.MOBIUS_TUI_PYTHON_BUNDLE_URL; else process.env.MOBIUS_TUI_PYTHON_BUNDLE_URL = saved }
 }
 
@@ -133,12 +133,41 @@ async function testSpawnLauncher() {
 }
 
 function testReverseConnectArgs() {
-  console.log('\n[AIMUX 6] reverse connect Windows shell visibility')
-  const win = reverseConnectArgs('https://mobius.test/', 'tui-win', 'jwt-test', 'win32')
-  const linux = reverseConnectArgs('https://mobius.test/', 'tui-linux', 'jwt-test', 'linux')
-  ok(win.includes('--silent-shell'), 'Windows reverse connection always requests hidden command shells')
-  ok(!linux.includes('--silent-shell'), 'non-Windows reverse connection does not receive the Windows-only flag')
-  ok(win[2] === 'https://mobius.test/aimux_bridge', 'reverse connection normalizes the bridge URL')
+  console.log('\n[AIMUX 6] reverse connect silent flag adapts to installed aimux')
+  // Old aimux (PyPI 0.1.20 / cached bundle 0.1.21): advertises only --silent-shell.
+  // Must NOT send the newer --slient-v2 it doesn't know — that is the crash-loop bug.
+  const oldWin = reverseConnectArgs('https://mobius.test/', 'tui-win', 'jwt-test', 'win32', '--silent-shell')
+  ok(oldWin.includes('--silent-shell'), 'old aimux gets the --silent-shell flag it supports')
+  ok(!oldWin.includes('--slient-v2') && !oldWin.includes('--silent-v2'), 'old aimux never gets the unsupported v2 flag (no crash-loop)')
+  // New aimux (0.1.22+): probe resolves the correctly-spelled --silent-v2.
+  const newWin = reverseConnectArgs('https://mobius.test/', 'tui-win', 'jwt-test', 'win32', '--silent-v2')
+  ok(newWin.includes('--silent-v2'), 'new aimux gets the no-console v2 flag')
+  // Probe found nothing supported (or pre-probe default): send nothing, stay alive.
+  const bareWin = reverseConnectArgs('https://mobius.test/', 'tui-win', 'jwt-test', 'win32', null)
+  ok(!bareWin.some(a => a === '--slient-v2' || a === '--silent-v2' || a === '--silent-shell'), 'unknown aimux gets no silent flag rather than crash-looping')
+  // Off-Windows: never any silent flag, regardless of what the probe found.
+  const linux = reverseConnectArgs('https://mobius.test/', 'tui-linux', 'jwt-test', 'linux', '--silent-v2')
+  ok(!linux.includes('--silent-v2') && !linux.includes('--silent-shell'), 'non-Windows never receives a Windows-only flag')
+  ok(oldWin[2] === 'https://mobius.test/aimux_bridge', 'reverse connection normalizes the bridge URL')
+}
+
+function testPickSilentFlag() {
+  console.log('\n[AIMUX 6b] pickSilentFlag reads what aimux advertises')
+  ok(pickSilentFlag('  --slient-v2, --silent-v2  Hide console.', 'win32') === '--silent-v2', 'prefers correct --silent-v2 spelling when both aliases are advertised')
+  ok(pickSilentFlag('  --slient-v2  Hide console.', 'win32') === '--slient-v2', 'falls back to the historical --slient-v2 alias')
+  ok(pickSilentFlag('  --silent-shell  Hide console.', 'win32') === '--silent-shell', 'old aimux advertising only --silent-shell')
+  ok(pickSilentFlag('Usage: aimux reverse connect ...', 'win32') === null, 'unsupported aimux → null (send nothing, avoid crash-loop)')
+  ok(pickSilentFlag('  --silent-v2  Hide console.', 'linux') === null, 'off-Windows → always null')
+}
+
+function testAimuxIdentifierScopesWorkspace() {
+  console.log('\n[AIMUX 6a] reverse client identifier workspace isolation')
+  const first = tuiAimuxIdentifier('same-host', '/work/project-a')
+  const firstAgain = tuiAimuxIdentifier('same-host', '/work/project-a')
+  const second = tuiAimuxIdentifier('same-host', '/work/project-b')
+  ok(first === firstAgain, 'identifier is stable for the same host and workspace')
+  ok(first !== second, 'different workspaces on one host do not replace each other')
+  ok(/^tui-same-host-[a-f0-9]{10}$/.test(first), 'identifier remains bridge-safe and recognizable')
 }
 
 function testBundleHealthCheck() {
@@ -146,7 +175,7 @@ function testBundleHealthCheck() {
   const win = bundleHealthCheckCode('win32')
   const linux = bundleHealthCheckCode('linux')
   ok(win.includes('aimux.bridge_client') && win.includes('win32_setctime'), 'Windows bundle probe imports the real bridge path and its platform dependency')
-  ok(win.includes("aimux.__version__ == '0.1.21'"), 'bundle probe rejects stale AIMUX versions')
+  ok(win.includes("aimux.__version__ == '0.1.23'"), 'bundle probe rejects stale AIMUX versions')
   ok(!linux.includes('win32_setctime'), 'non-Windows bundle probe does not require the Windows-only package')
 }
 
@@ -199,6 +228,8 @@ async function main() {
   await testBundleArchAndUrl()
   await testSpawnLauncher()
   testReverseConnectArgs()
+  testPickSilentFlag()
+  testAimuxIdentifierScopesWorkspace()
   testBundleHealthCheck()
   await testEnsureFromBundleReady()
   await testDownloadBundleStream()