thincoder 0.10.0 → 0.11.1

package/src/tui/cmd-fold.mjs

@@ -3,10 +3,9 @@
  */
 import { C } from "./ansi.mjs"
 
-export async function handleFoldCommand(ctx) {
+export async function handleFoldCommand(ctx, args = []) {
   const { state } = ctx
-  const text = state.input.join("").trim()
-  const arg = text.split(/\s+/)[1]
+  const arg = args[0]?.toLowerCase()
   if (arg === "on") {
     state.foldEnabled = true
     ctx.pushLine("Folding: on (long tool results are collapsed)", C.dim)

package/src/tui/cmd-goal.mjs

@@ -1,8 +1,47 @@
+import { C } from "./ansi.mjs"
+
 /** /goal command: set/view/cancel long-term goal.
  *  Extracted from slash-commands.mjs.
- *  ctx: { agent, pushLine, pushLabel, openPicker, askQuestion } */
-export async function handleGoalCommand(ctx) {
-  const { agent, pushLine, pushLabel, openPicker, askQuestion } = ctx
+ *  ctx: { agent, pushLine, pushLabel, showPicker, askQuestion } */
+export async function handleGoalCommand(ctx, args = []) {
+  const { agent, pushLine, pushLabel, showPicker, askQuestion } = ctx
+
+  function setGoal(goalText) {
+    const semiIdx = goalText.indexOf("；") >= 0 ? goalText.indexOf("；") : goalText.indexOf(";")
+    const objective = semiIdx >= 0 ? goalText.slice(0, semiIdx).trim() : goalText.trim()
+    const criteria = semiIdx >= 0 ? goalText.slice(semiIdx + 1).trim() : ""
+    agent.goal = { objective, criteria, setAt: Date.now(), status: "active", turnsUsed: 0, _blockTally: null }
+  }
+
+  function viewGoal() {
+    const statusText = { active: "active", complete: "completed", blocked: "blocked" }[agent.goal.status] ?? agent.goal.status
+    pushLine(`Goal: ${agent.goal.objective}`, C.tool)
+    if (agent.goal.criteria) pushLine(`  Criteria: ${agent.goal.criteria}`, C.dim)
+    pushLine(`  Status: ${statusText} │ Turns used: ${agent.goal.turnsUsed ?? 0} │ Set at: ${new Date(agent.goal.setAt).toLocaleString()}`, C.dim)
+  }
+
+  // Direct args: /goal set <text> │ /goal cancel │ /goal view
+  const sub = args[0]?.toLowerCase()
+  if (sub === "set") {
+    const goalText = args.slice(1).join(" ")
+    if (!goalText) { pushLine("Usage: /goal set <objective>[; criteria]", C.error); return }
+    setGoal(goalText)
+    pushLine(`Goal set: ${agent.goal.objective}`, C.tool)
+    return
+  }
+  if (sub === "cancel") {
+    if (!agent.goal) { pushLine("No goal set", C.dim); return }
+    agent.goal = null
+    pushLine("Goal cancelled", C.tool)
+    return
+  }
+  if (sub === "view") {
+    if (!agent.goal) { pushLine("No goal set", C.dim); return }
+    viewGoal()
+    return
+  }
+  if (sub) { pushLine("Usage: /goal [set <text>|cancel|view]", C.error); return }
+
   const entries = [
     { type: "header", text: agent.goal ? `Current goal: ${agent.goal.objective.slice(0, 60)}` : "Actions" },
     { type: "item", text: "Set new goal", action: "set" },
@@ -11,28 +50,20 @@ export async function handleGoalCommand(ctx) {
     entries.push({ type: "item", text: "Cancel goal", action: "cancel" })
     entries.push({ type: "item", text: "View details", action: "view" })
   }
-  openPicker({
-    title: "Goal",
-    entries,
-    onSelect: async (e) => {
-      if (e.action === "view") {
-        const statusText = { active: "active", complete: "completed", blocked: "blocked" }[agent.goal.status] ?? agent.goal.status
-        pushLine(`Goal: ${agent.goal.objective}`, C.tool)
-        if (agent.goal.criteria) pushLine(`  Criteria: ${agent.goal.criteria}`, C.dim)
-        pushLine(`  Status: ${statusText} │ Turns used: ${agent.goal.turnsUsed ?? 0} │ Set at: ${new Date(agent.goal.setAt).toLocaleString()}`, C.dim)
-        return
-      }
-      if (e.action === "cancel") {
-        agent.goal = null
-        return
-      }
-      // set — requires entering goal text
-      const goalText = await askQuestion("Enter goal description (; separates criteria)")
-      if (!goalText) return
-      const semi = goalText.indexOf("；") >= 0 ? "；" : goalText.indexOf(";") >= 0 ? ";" : null
-      const objective = semi ? goalText.slice(0, semi).trim() : goalText.trim()
-      const criteria = semi ? goalText.slice(semi + 1).trim() : ""
-      agent.goal = { objective, criteria, setAt: Date.now(), status: "active", turnsUsed: 0, _blockTally: null }
-    },
-  })
+  // 先 await picker 返回（选中即关闭），再 askQuestion —— 两者不共存
+  const e = await showPicker("Goal", entries)
+  if (!e) return
+  if (e.action === "view") {
+    viewGoal()
+    return
+  }
+  if (e.action === "cancel") {
+    agent.goal = null
+    return
+  }
+  // set — requires entering goal text
+  const goalText = await askQuestion("Enter goal description (; separates criteria)")
+  if (!goalText) return
+  setGoal(goalText)
+  pushLine(`Goal set: ${agent.goal.objective}`, C.tool) // 与直参路径口径一致
 }

package/src/tui/cmd-help.mjs

@@ -1,10 +1,12 @@
 import { ansi, C } from "./ansi.mjs"
+import { SLASH_ALIASES } from "./slash-commands.mjs"
 
 /** /help command: list all slash commands and aliases.
  *  ctx: { pushLine, pushLabel, SLASH_COMMANDS } */
 export async function handleHelpCommand(ctx) {
   const { pushLine, pushLabel, SLASH_COMMANDS } = ctx
-  const aliasList = { "/help": "/h", "/exit": "/x", "/model": "/m", "/plan": "/p", "/think": "/t", "/clear": "/c", "/new": "/n" }
+  // reverse the shared alias table: command → alias
+  const aliasList = Object.fromEntries(Object.entries(SLASH_ALIASES).map(([alias, cmd]) => [cmd, alias]))
   const order = ["Agent", "Session", "Project", "System"]
   const byGroup = new Map()
   for (const c of SLASH_COMMANDS) {

package/src/tui/cmd-mcp.mjs

@@ -2,7 +2,7 @@ import { ansi, C } from "./ansi.mjs"
 
 /** /mcp command handler: view/add/remove/reconnect MCP server.
  *  Extracted from slash-commands.mjs, includes /mcp-specific parseHeaders / addAndConnect helpers.
- *  ctx: { agent, pushLine, pushLabel, openPicker, askQuestion, persistRaw, ansi, C } */
+ *  ctx: { agent, pushLine, pushLabel, showPicker, askQuestion, persistRaw, ansi, C } */
 
 function parseHeaders(pairs) {
   const headers = {}
@@ -41,106 +41,62 @@ async function addAndConnect(ctx, srv) {
   }
 }
 
-export async function handleMcpCommand(ctx) {
-  const { agent, pushLine, pushLabel, openPicker, askQuestion, persistRaw } = ctx
-  const servers = agent.config?.mcp?.servers ?? []
-  const entries = [
-    { type: "header", text: `${servers.length} MCP servers configured` },
-    { type: "item", text: "View list", action: "list" },
-    { type: "item", text: "Add server", action: "add" },
-  ]
-  if (servers.length > 0) {
-    entries.push(
-      { type: "item", text: "Remove server", action: "remove" },
-      { type: "item", text: "Reconnect server", action: "connect" },
-    )
+export async function handleMcpCommand(ctx, args = []) {
+  const { agent, pushLine, pushLabel, showPicker, askQuestion, persistRaw } = ctx
+  // 每轮重读：原本无 mcp 配置时 `?? []` 会拿到游离数组，Add server 后快照过期
+  const getServers = () => agent.config?.mcp?.servers ?? []
+
+  function listServers() {
+    const servers = getServers()
+    pushLabel(`❯ MCP Servers`, ansi.bold + C.tool)
+    if (servers.length === 0) {
+      pushLine(" (no MCP server configured)", C.dim)
+    }
+    for (const srv of servers) {
+      const connected = agent.tools.some((t) => t._mcpName === srv.name)
+      const mark = connected ? "●" : "○"
+      const color = connected ? C.tool : C.dim
+      const toolCount = agent.tools.filter((t) => t._mcpName === srv.name).length
+      const desc = srv.wsUrl ? srv.wsUrl : srv.url ? srv.url : `${srv.command} ${(srv.args ?? []).join(" ")}`
+      pushLine(`  ${mark} ${srv.name} (${desc})${connected ? ` — ${toolCount} tools` : ""}`, color)
+    }
+  }
+
+  async function removeServer(name) {
+    agent.config.mcp.servers = getServers().filter((s) => s.name !== name)
+    await persistRaw((raw) => { raw.mcp.servers = agent.config.mcp.servers })
+    // Remove from tool list
+    const { removeMcpTools } = await import("../mcp.mjs")
+    removeMcpTools(agent, name)
+    pushLine(`[mcp] ${name} removed`, C.tool)
+  }
+
+  async function connectServer(name) {
+    const srv = getServers().find((s) => s.name === name)
+    const { removeMcpTools, connectMcpServer } = await import("../mcp.mjs")
+    removeMcpTools(agent, name)
+    try {
+      pushLine(`[mcp] Reconnecting ${name}...`, C.dim)
+      const tools = await connectMcpServer(srv)
+      agent.tools.push(...tools)
+      pushLabel(`❯ MCP`, ansi.bold + C.tool)
+      pushLine(`${name} reconnected, ${tools.length} tools available.`, C.tool)
+    } catch (error) {
+      pushLine(`[mcp] ${name}: ${error.message}`, C.error)
+    }
   }
-  openPicker({
-    title: "MCP",
-    entries,
-    onSelect: async (e) => {
-      if (e.action === "list") {
-        pushLabel(`❯ MCP Servers`, ansi.bold + C.tool)
-        if (servers.length === 0) {
-          pushLine(" (no MCP server configured)", C.dim)
-        }
-        for (const srv of servers) {
-          const connected = agent.tools.some((t) => t._mcpName === srv.name)
-          const mark = connected ? "●" : "○"
-          const color = connected ? C.tool : C.dim
-          const toolCount = agent.tools.filter((t) => t._mcpName === srv.name).length
-          const desc = srv.wsUrl ? srv.wsUrl : srv.url ? srv.url : `${srv.command} ${(srv.args ?? []).join(" ")}`
-          pushLine(`  ${mark} ${srv.name} (${desc})${connected ? ` — ${toolCount} tools` : ""}`, color)
-        }
-        return
-      }
-      if (e.action === "remove") {
-        const removeEntries = [
-          { type: "header", text: "Select server to remove" },
-          ...servers.map((s) => ({ type: "item", text: `${s.name} (${s.wsUrl ?? s.url ?? s.command})`, name: s.name })),
-        ]
-        openPicker({
-          title: "Remove MCP Server",
-          entries: removeEntries,
-          onSelect: async (se) => {
-            // Remove from config
-            agent.config.mcp.servers = servers.filter((s) => s.name !== se.name)
-            await persistRaw((raw) => { raw.mcp.servers = agent.config.mcp.servers })
-            // Remove from tool list
-            const { removeMcpTools } = await import("../mcp.mjs")
-            removeMcpTools(agent, se.name)
-            pushLine(`[mcp] ${se.name} removed`, C.tool)
-          },
-        })
-        return
-      }
-      if (e.action === "connect") {
-        const connectEntries = [
-          { type: "header", text: "Select server to reconnect" },
-          ...servers.map((s) => ({ type: "item", text: `${s.name} (${s.wsUrl ?? s.url ?? s.command})`, name: s.name })),
-        ]
-        openPicker({
-          title: "Reconnect MCP",
-          entries: connectEntries,
-          onSelect: async (se) => {
-            const srv = servers.find((s) => s.name === se.name)
-            const { removeMcpTools, connectMcpServer } = await import("../mcp.mjs")
-            removeMcpTools(agent, se.name)
-            try {
-              pushLine(`[mcp] Reconnecting ${se.name}...`, C.dim)
-              const tools = await connectMcpServer(srv)
-              agent.tools.push(...tools)
-              pushLabel(`❯ MCP`, ansi.bold + C.tool)
-              pushLine(`${se.name} reconnected, ${tools.length} tools available.`, C.tool)
-            } catch (error) {
-              pushLine(`[mcp] ${se.name}: ${error.message}`, C.error)
-            }
-          },
-        })
-        return
-      }
-      if (e.action === "add") {
-        // Pick transport type first, then ask name + URL/command
-        openPicker({
-          title: "MCP Transport",
-          entries: [
-            { type: "header", text: "Select transport or use AI assist" },
-            { type: "item", text: "🤖 Describe with AI — natural language → config", action: "ai" },
-            { type: "item", text: "HTTP (https://…)", action: "http" },
-            { type: "item", text: "WebSocket (ws://…)", action: "ws" },
-            { type: "item", text: "stdio (local command)", action: "stdio" },
-          ],
-          onSelect: async (te) => {
-            if (te.action === "ai") {
-              const description = await askQuestion("Describe the MCP server you want to add (e.g. 'a filesystem server that gives access to /tmp'):")
-              if (!description) return
-              pushLine("[mcp] Generating config from description...", C.dim)
-              try {
-                const { chat } = await import("../provider/index.mjs")
-                const res = await chat(agent.provider, {
-                  messages: [{
-                    role: "user",
-                    content: `Generate an MCP server configuration JSON from this description. Return ONLY the JSON object, no explanation.
+
+  async function addWithTransport(transport) {
+    if (transport === "ai") {
+      const description = await askQuestion("Describe the MCP server you want to add (e.g. 'a filesystem server that gives access to /tmp'):")
+      if (!description) return
+      pushLine("[mcp] Generating config from description...", C.dim)
+      try {
+        const { chat } = await import("../provider/index.mjs")
+        const res = await chat(agent.provider, {
+          messages: [{
+            role: "user",
+            content: `Generate an MCP server configuration JSON from this description. Return ONLY the JSON object, no explanation.
 
 Description: "${description}"
 
@@ -153,48 +109,128 @@ Example HTTP: {"name":"filesystem","url":"https://example.com/mcp","headers":{"A
 Example stdio: {"name":"filesystem","command":"npx","args":["-y","@modelcontextprotocol/server-filesystem","/tmp"]}
 
 Return ONLY the JSON object:`,
-                  }],
-                  tools: [],
-                  signal: AbortSignal.timeout(15_000),
-                })
-                const jsonMatch = (res.content ?? "").match(/\{[\s\S]*\}/)
-                if (!jsonMatch) { pushLine("[mcp] AI response not valid JSON", C.error); return }
-                const srv = JSON.parse(jsonMatch[0])
-                if (!srv.name) { pushLine("[mcp] AI response missing 'name' field", C.error); return }
-                // Show preview and confirm
-                pushLine(`[mcp] Generated config: ${JSON.stringify(srv)}`, C.tool)
-                const confirm = await askQuestion("Add this server? (y/n):")
-                if (confirm?.toLowerCase() !== "y") { pushLine("[mcp] Cancelled", C.dim); return }
-                await addAndConnect(ctx, srv)
-              } catch (err) {
-                pushLine(`[mcp] AI generation failed: ${err.message}`, C.error)
-              }
-              return
-            }
-            const name = await askQuestion("Server name:")
-            if (!name) return
-            const existing = (agent.config?.mcp?.servers ?? []).find((s) => s.name === name)
-            if (existing) { pushLine(`[mcp] "${name}" already exists`, C.error); return }
-            if (te.action === "stdio") {
-              const cmd = await askQuestion("Command (e.g. npx, python):")
-              if (!cmd) return
-              const argsInput = await askQuestion("Arguments (space-separated, or leave empty):")
-              const args = argsInput ? argsInput.split(/\s+/) : undefined
-              await addAndConnect(ctx, { name, command: cmd, args })
-            } else {
-              const urlPrompt = te.action === "ws" ? "WebSocket URL (ws://…):" : "HTTP URL (https://…):"
-              const url = await askQuestion(urlPrompt)
-              if (!url) return
-              const headersInput = await askQuestion("Headers (key=value, space-separated, or leave empty):")
-              const headers = headersInput ? parseHeaders(headersInput.split(/\s+/)) : undefined
-              const srv = te.action === "ws"
-                ? { name, wsUrl: url, headers: Object.keys(headers ?? {}).length > 0 ? headers : undefined }
-                : { name, url, headers: Object.keys(headers ?? {}).length > 0 ? headers : undefined }
-              await addAndConnect(ctx, srv)
-            }
-          },
+          }],
+          tools: [],
+          signal: AbortSignal.timeout(15_000),
         })
+        const jsonMatch = (res.content ?? "").match(/\{[\s\S]*\}/)
+        if (!jsonMatch) { pushLine("[mcp] AI response not valid JSON", C.error); return }
+        const srv = JSON.parse(jsonMatch[0])
+        if (!srv.name) { pushLine("[mcp] AI response missing 'name' field", C.error); return }
+        // Show preview and confirm
+        pushLine(`[mcp] Generated config: ${JSON.stringify(srv)}`, C.tool)
+        const confirm = await askQuestion("Add this server? (y/n):")
+        if (confirm?.toLowerCase() !== "y") { pushLine("[mcp] Cancelled", C.dim); return }
+        await addAndConnect(ctx, srv)
+      } catch (err) {
+        pushLine(`[mcp] AI generation failed: ${err.message}`, C.error)
       }
-    },
-  })
+      return
+    }
+    const name = await askQuestion("Server name:")
+    if (!name) return
+    const existing = (agent.config?.mcp?.servers ?? []).find((s) => s.name === name)
+    if (existing) { pushLine(`[mcp] "${name}" already exists`, C.error); return }
+    if (transport === "stdio") {
+      const cmd = await askQuestion("Command (e.g. npx, python):")
+      if (!cmd) return
+      const argsInput = await askQuestion("Arguments (space-separated, or leave empty):")
+      const cmdArgs = argsInput ? argsInput.split(/\s+/) : undefined
+      await addAndConnect(ctx, { name, command: cmd, args: cmdArgs })
+    } else {
+      const urlPrompt = transport === "ws" ? "WebSocket URL (ws://…):" : "HTTP URL (https://…):"
+      const url = await askQuestion(urlPrompt)
+      if (!url) return
+      const headersInput = await askQuestion("Headers (key=value, space-separated, or leave empty):")
+      const headers = headersInput ? parseHeaders(headersInput.split(/\s+/)) : undefined
+      const srv = transport === "ws"
+        ? { name, wsUrl: url, headers: Object.keys(headers ?? {}).length > 0 ? headers : undefined }
+        : { name, url, headers: Object.keys(headers ?? {}).length > 0 ? headers : undefined }
+      await addAndConnect(ctx, srv)
+    }
+  }
+
+  async function addFlow() {
+    // Pick transport type first, then ask name + URL/command
+    const te = await showPicker("MCP Transport", [
+      { type: "header", text: "Select transport or use AI assist" },
+      { type: "item", text: "🤖 Describe with AI — natural language → config", action: "ai" },
+      { type: "item", text: "HTTP (https://…)", action: "http" },
+      { type: "item", text: "WebSocket (ws://…)", action: "ws" },
+      { type: "item", text: "stdio (local command)", action: "stdio" },
+    ])
+    if (te) await addWithTransport(te.action)
+  }
+
+  /** remove/connect 的服务器选择 picker + 执行。返回 true = 已执行；false = Esc 取消。 */
+  async function pickAndRun(action) {
+    const servers = getServers()
+    if (servers.length === 0) {
+      pushLine("[mcp] no MCP server configured", C.error)
+      return true
+    }
+    const subEntries = [
+      { type: "header", text: action === "remove" ? "Select server to remove" : "Select server to reconnect" },
+      ...servers.map((s) => ({ type: "item", text: `${s.name} (${s.wsUrl ?? s.url ?? s.command})`, name: s.name })),
+    ]
+    const se = await showPicker(action === "remove" ? "Remove MCP Server" : "Reconnect MCP", subEntries)
+    if (!se) return false // Esc 取消
+    if (action === "remove") await removeServer(se.name)
+    else await connectServer(se.name)
+    return true
+  }
+
+  // Direct args: /mcp list │ /mcp add │ /mcp http|ws|stdio|ai │ /mcp remove [name] │ /mcp connect [name]
+  const sub = args[0]?.toLowerCase()
+  if (sub === "list") { listServers(); return }
+  if (sub === "add") { await addFlow(); return }
+  if (sub === "http" || sub === "ws" || sub === "stdio" || sub === "ai") { await addWithTransport(sub); return }
+  if (sub === "remove" || sub === "connect") {
+    const name = args[1]
+    if (name) {
+      const servers = getServers()
+      if (!servers.some((s) => s.name === name)) {
+        pushLine(`[mcp] no server named "${name}" (${servers.map((s) => s.name).join(", ") || "none configured"})`, C.error)
+        return
+      }
+      if (sub === "remove") await removeServer(name)
+      else await connectServer(name)
+      return
+    }
+    // 已明确 remove/connect 意图但没带 name → 直接进服务器选择 picker，不落主菜单
+    await pickAndRun(sub)
+    return
+  } else if (sub) {
+    pushLine("Usage: /mcp [list|add|http|ws|stdio|ai|remove [name]|connect [name]]", C.error)
+    return
+  }
+
+  // 主菜单循环：选中即关闭，子菜单 Esc 返回主菜单，主菜单 Esc 退出
+  for (;;) {
+    const servers = getServers()
+    const entries = [
+      { type: "header", text: `${servers.length} MCP servers configured` },
+      { type: "item", text: "View list", action: "list" },
+      { type: "item", text: "Add server", action: "add" },
+    ]
+    if (servers.length > 0) {
+      entries.push(
+        { type: "item", text: "Remove server", action: "remove" },
+        { type: "item", text: "Reconnect server", action: "connect" },
+      )
+    }
+    const e = await showPicker("MCP", entries)
+    if (!e) return // Esc 退出
+    if (e.action === "list") {
+      listServers()
+      return
+    }
+    if (e.action === "add") {
+      await addFlow()
+      continue
+    }
+    const done = await pickAndRun(e.action)
+    if (!done) continue // 子菜单 Esc → 回主菜单
+    return
+  }
 }

package/src/tui/cmd-model.mjs

@@ -1,7 +1,18 @@
 import { C } from "./ansi.mjs"
 
-/** /model command: open model picker.
- *  ctx: { openModelPicker, pushLine } */
-export async function handleModelCommand(ctx) {
-  ctx.openModelPicker().catch((e) => ctx.pushLine(`[error] ${e.message}`, C.error))
+/** /model command: open model picker, or switch provider directly via `/model <provider>`.
+ *  ctx: { agent, openModelPicker, selectModel, pushLine } */
+export async function handleModelCommand(ctx, args = []) {
+  const name = args[0]?.toLowerCase()
+  if (!name) {
+    ctx.openModelPicker().catch((e) => ctx.pushLine(`[error] ${e.message}`, C.error))
+    return
+  }
+  const target = ctx.agent.providers.find((p) => p.name.toLowerCase() === name)
+  if (!target) {
+    const available = ctx.agent.providers.map((p) => p.name).join(", ")
+    ctx.pushLine(`Unknown provider: ${args[0]} (available: ${available})`, C.error)
+    return
+  }
+  await ctx.selectModel({ provider: target.name, model: target.model }).catch((e) => ctx.pushLine(`[error] ${e.message}`, C.error))
 }

package/src/tui/cmd-new.mjs

@@ -2,9 +2,9 @@ import { clearSession } from "../session.mjs"
 import { C } from "./ansi.mjs"
 
 /** /new command: start new session (old session archived to slot).
- *  ctx: { agent, state, pushLine, openPicker, render } */
+ *  ctx: { agent, state, pushLine, showPicker, render } */
 export async function handleNewCommand(ctx) {
-  const { agent, state, pushLine, openPicker, render } = ctx
+  const { agent, state, pushLine, showPicker, render } = ctx
 
   const doNewSession = () => {
     agent.history = []
@@ -21,17 +21,11 @@ export async function handleNewCommand(ctx) {
   }
 
   if (agent.history.length > 0) {
-    openPicker({
-      title: "Start new session?",
-      entries: [
-        { type: "item", text: "Yes, archive current and start new", action: "yes" },
-        { type: "item", text: "Cancel", action: "no" },
-      ],
-      defaultIndex: 1,
-      onSelect: (e) => {
-        if (e.action === "yes") doNewSession()
-      },
-    })
+    const e = await showPicker("Start new session?", [
+      { type: "item", text: "Yes, archive current and start new", action: "yes" },
+      { type: "item", text: "Cancel", action: "no" },
+    ], { defaultIndex: 1 })
+    if (e?.action === "yes") doNewSession()
     return
   }
   doNewSession()

package/src/tui/cmd-restore.mjs

@@ -1,9 +1,9 @@
 import { ansi, C } from "./ansi.mjs"
 
 /** /restore command: list git checkpoints and roll back to selected snapshot.
- *  ctx: { agent, openPicker, pushLine, pushLabel } */
+ *  ctx: { agent, showPicker, pushLine, pushLabel } */
 export async function handleRestoreCommand(ctx) {
-  const { agent, openPicker, pushLine, pushLabel } = ctx
+  const { agent, showPicker, pushLine, pushLabel } = ctx
   const { listCheckpoints, rewind, isGitRepo } = await import("../git/checkpoint.mjs")
   if (!isGitRepo(agent.cwd)) {
     pushLine("[rewind] not a git repository, checkpoints unavailable", C.error)
@@ -22,18 +22,14 @@ export async function handleRestoreCommand(ctx) {
       id: cp.id,
     })),
   ]
-  openPicker({
-    title: "Restore Checkpoint",
-    entries,
-    onSelect: async (e) => {
-      try {
-        const summary = await rewind(agent.cwd, e.id)
-        pushLabel(`❯ Rewind`, ansi.bold + C.warn)
-        pushLine(`Restored to ${e.id}: patch ${summary.patchApplied ? "applied" : "none"}, deleted ${summary.deleted} new files, restored ${summary.restored} file(s)`, C.tool)
-        pushLine("(current state saved as new checkpoint; /restore again to go back)", C.dim)
-      } catch (error) {
-        pushLine(`[rewind] ${error.message}`, C.error)
-      }
-    },
-  })
+  const e = await showPicker("Restore Checkpoint", entries)
+  if (!e) return
+  try {
+    const summary = await rewind(agent.cwd, e.id)
+    pushLabel(`❯ Rewind`, ansi.bold + C.warn)
+    pushLine(`Restored to ${e.id}: patch ${summary.patchApplied ? "applied" : "none"}, deleted ${summary.deleted} new files, restored ${summary.restored} file(s)`, C.tool)
+    pushLine("(current state saved as new checkpoint; /restore again to go back)", C.dim)
+  } catch (error) {
+    pushLine(`[rewind] ${error.message}`, C.error)
+  }
 }

package/src/tui/cmd-session.mjs

@@ -2,41 +2,37 @@ import { listSlots, switchToSlot, applySession } from "../session.mjs"
 import { ansi, C } from "./ansi.mjs"
 
 /** /session command: list/switch archived session slots.
- *  ctx: { agent, state, openPicker, pushLine, pushLabel, render } */
+ *  ctx: { agent, state, showPicker, pushLine, pushLabel, render } */
 export async function handleSessionCommand(ctx) {
-  const { agent, state, openPicker, pushLine, pushLabel, render } = ctx
+  const { agent, state, showPicker, pushLine, pushLabel, render } = ctx
   const slots = listSlots(agent.cwd)
   if (slots.length === 0) {
     pushLine("No archived sessions (use /new and old sessions auto-archive to slots)", C.dim)
-  } else {
-    const entries = [
-      { type: "header", text: `Archived sessions (↑↓ select, Enter switch, Esc cancel)` },
-      ...slots.map((s) => ({
-        type: "item",
-        text: `Slot ${s.slot} — ${s.date}`,
-        slot: s.slot,
-      })),
-    ]
-    openPicker({
-      title: "Sessions",
-      entries,
-      onSelect: (e) => {
-        const data = switchToSlot(agent.cwd, e.slot)
-        if (!data) {
-          pushLine(`Slot ${e.slot} not found`, C.dim)
-          return
-        }
-        applySession(agent, data)
-        state.lines = data.display.length
-          ? data.display.map((l) => ({ text: l.text, color: l.color }))
-          : []
-        state.tasks = agent.tasks ?? []
-        if (state.tasks.length > 0 && state.tasks.every((t) => t.status === "done")) {
-          state.tasks = []
-        }
-        pushLabel(`── Switched to slot ${e.slot} (${data.history.length} messages) ──`, C.warn)
-        render()
-      },
-    })
+    return
   }
+  const entries = [
+    { type: "header", text: `Archived sessions (↑↓ select, Enter switch, Esc cancel)` },
+    ...slots.map((s) => ({
+      type: "item",
+      text: `Slot ${s.slot} — ${s.date}`,
+      slot: s.slot,
+    })),
+  ]
+  const e = await showPicker("Sessions", entries)
+  if (!e) return
+  const data = switchToSlot(agent.cwd, e.slot)
+  if (!data) {
+    pushLine(`Slot ${e.slot} not found`, C.dim)
+    return
+  }
+  applySession(agent, data)
+  state.lines = data.display.length
+    ? data.display.map((l) => ({ text: l.text, color: l.color }))
+    : []
+  state.tasks = agent.tasks ?? []
+  if (state.tasks.length > 0 && state.tasks.every((t) => t.status === "done")) {
+    state.tasks = []
+  }
+  pushLabel(`── Switched to slot ${e.slot} (${data.history.length} messages) ──`, C.warn)
+  render()
 }