@mobius-os/mobius 0.3.24 → 0.3.26

package/package.json

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

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'
@@ -121,7 +122,7 @@ export function PrepScreen({ client, onReady, onQuit }: {
       // 客户端 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 = require('crypto').randomBytes(3).toString('hex')
+      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)

package/src/components/ResumePicker.tsx

@@ -1,12 +1,13 @@
 /**
  * /resume picker — list the ~32 most recently active sessions in the current
- * project (aggregated across its issues, ordered by last_active DESC), pick one
- * to reconnect its SSE stream.
+ * project (aggregated across its issues), sorted local-first then by last_active
+ * DESC. Sessions created on the current machine are visually marked.
  */
 import React, { useEffect, useState } from 'react'
 import { Box, Text } from 'ink'
 import { Select } from './primitives.js'
 import { MobiusClient } from '../api.js'
+import { tuiAimuxIdentifier } from '../aimux.js'
 import type { Project, Session } from '../types.js'
 
 function relativeTime(iso?: string): string {
@@ -24,6 +25,24 @@ function relativeTime(iso?: string): string {
   return new Date(iso).toISOString().slice(0, 10)
 }
 
+/** Extract aimux_id from pc_client_metadata (object or JSON string). */
+function sessionAimuxId(meta: unknown): string | null {
+  if (!meta) return null
+  if (typeof meta === 'string') {
+    try { meta = JSON.parse(meta) } catch { return null }
+  }
+  if (typeof meta === 'object' && meta !== null && typeof (meta as any).aimux_id === 'string') {
+    return (meta as any).aimux_id.trim() || null
+  }
+  return null
+}
+
+/** Optional: extract hostname hint from aimux_id (tui-<hostname> or desktop-<hostname>). */
+function hostHint(aimuxId: string): string {
+  const m = aimuxId.match(/^(?:tui|desktop)-(.+)/)
+  return m ? m[1] : aimuxId
+}
+
 export function ResumePicker({ client, project, onPick, onBack }: {
   client: MobiusClient
   project: Project
@@ -34,7 +53,7 @@ export function ResumePicker({ client, project, onPick, onBack }: {
   const [err, setErr] = useState<string | null>(null)
 
   useEffect(() => {
-    client.listProjectSessions(project.id, 32)
+    client.listProjectSessions(project.id, 64)
       .then(setSessions)
       .catch(e => setErr(e?.message ?? String(e)))
   }, [client, project.id])
@@ -42,16 +61,37 @@ export function ResumePicker({ client, project, onPick, onBack }: {
   if (err) return <Box paddingX={2}><Text color="red">加载会话失败: {err}</Text></Box>
   if (sessions === null) return <Box paddingX={2}><Text color="cyan">加载历史会话…</Text></Box>
 
-  const items = sessions.map(s => ({
-    label: `${s.name}${s.issue_title ? ` · ${s.issue_title}` : ''}`,
-    value: s.session_id,
-    desc: `${relativeTime(s.last_active)} · ${s.message_count ?? 0} 条消息 · 模型 ${s.model ?? '?'}`,
-  }))
+  const myId = tuiAimuxIdentifier()
+
+  // Sort: local sessions first, then remote; each group by last_active DESC.
+  const sorted = [...sessions].sort((a, b) => {
+    const aLocal = sessionAimuxId(a.pc_client_metadata) === myId ? 0 : 1
+    const bLocal = sessionAimuxId(b.pc_client_metadata) === myId ? 0 : 1
+    if (aLocal !== bLocal) return aLocal - bLocal
+    return (b.last_active || '').localeCompare(a.last_active || '')
+  })
+
+  const localCount = sorted.filter(s => sessionAimuxId(s.pc_client_metadata) === myId).length
+
+  const items = sorted.map(s => {
+    const aid = sessionAimuxId(s.pc_client_metadata)
+    const isLocal = aid === myId
+    const host = aid ? hostHint(aid) : null
+    const marker = isLocal ? '💻 ' : host ? `🌐 ${host} ` : '🌐 ? '
+    const label = `${marker}${s.name}${s.issue_title ? ` · ${s.issue_title}` : ''}`
+    const time = relativeTime(s.last_active)
+    const desc = `${time} · ${s.message_count ?? 0} 条消息 · ${s.model ?? '?'}`
+    return { label, value: s.session_id, desc }
+  })
+
+  const hint = localCount > 0
+    ? `本机 ${localCount} 个 · 远程 ${sorted.length - localCount} 个，共 ${sorted.length} 个`
+    : `全部 ${sorted.length} 个（无本机会话）`
 
   return (
     <Box flexDirection="column" paddingX={2} paddingY={1}>
       <Text bold color="cyan">恢复历史会话（{project.name}）</Text>
-      <Text color="gray">按活跃时间排序，最近 32 个</Text>
+      <Text color="gray">{hint}</Text>
       <Box marginTop={1}>
         {items.length === 0
           ? <Text color="gray">（暂无历史会话）</Text>