thincoder 0.12.67 → 0.12.69

package/src/cli/make-agent.mjs

@@ -1,15 +1,20 @@
-import { execSync } from "node:child_process"
-import { isAbsolute, join } from "node:path"
-import { createAgent } from "@thincoder/core/agent.mjs"
-import { loadConfig, configDir } from "@thincoder/core/config.mjs"
-import { createMemory, syncDir } from "@thincoder/core/memory.mjs"
-import { discoverRules } from "@thincoder/core/rules.mjs"
-// #70（CORE-UNIFICATION TOOLS）：注册表与消费侧拼装面归位核内——单源 `assembleBuiltinTools`
-// （静态表 ∪ memory / code_search / doc_search / repo_outline / settings / peer_instances 六面 ∪ 门控 read_image）。
-// 传 `model` 必需：漏传 ⇒ `read_image` 对所有模型静默消失（门判据 = specForModel(model)?.multimodal）。
-import { assembleBuiltinTools } from "@thincoder/core/tools/index.mjs"
+/**
+ * make-agent.mjs — CLI 装配面（`assembleAgent` 出档；消费面 = `command-interactive.mjs` ∕ `acp.mjs` ∕
+ * `distill-command.mjs` ∕ `memory-command.mjs` ∕ `command-table.mjs`）。
+ * **装配序 = 核单源**（`thincoder-core/agent/assemble.mjs` —— B5 装配序上提批）：本档 = 端壳 adapter，
+ * 留面 = cwd（`process.cwd()`）· MCP 合入 + `applyToolExclusions`（入核 `toolsFinalize` 缝 —— 位次保持：
+ * 工具装配后、`createAgent` 前）· `_mcpWarnings` · M1 装配钩子 `attachManifest` · 校验调用；装配序本体
+ * 与团队层取值随上提归核，本档四名**同名转口**（`teamConfig` ∕ `gitAuthor` ∕ `validateProvider` ∕
+ * `DEFAULT_DEPS`）——调用面 import 路径与名面零改。
+ */
+import { join } from "node:path"
+// 装配序核单源（B5 装配序上提批）：本档 = 核调用 + MCP 缝 + 后处理。
+import { assembleAgent as coreAssemble, DEFAULT_DEPS, gitAuthor, teamConfig, validateProvider } from "@thincoder/core/agent/assemble.mjs"
 import { resolveEngineeringManifest, projectView } from "@thincoder/core/manifest.mjs"
 
+// 四名转口（核单源**恒等绑定**；调用面零改 —— 枚举见档头）。
+export { DEFAULT_DEPS, gitAuthor, teamConfig, validateProvider }
+
 /** 第 27 批 §12.3⑤（R-A1.1）：装配期工具剔除——按 `name` 过滤的纯函数（机验锚）。
  *  恒等语义：空列表 / 零命中 → 原数组原样返回（零意外剔除——T15）。
  *  ACP 通道经 `assembleAgent({ excludeTools })` 传入（acp.mjs `ACP_EXCLUDED_TOOLS`）。 */
@@ -20,49 +25,35 @@ export function applyToolExclusions(tools, excludeTools = []) {
   return kept.length === tools.length ? tools : kept
 }
 
-/** Assemble an agent with memory, MCP tools, and code/doc indices attached (sync all layers, then return) */
-export async function assembleAgent({ excludeTools = [], slotData } = {}) {
-  const config = loadConfig()
-  const provider = config.provider
-  const providers = config.providersList
-
-  // Inject proxy URI into providers (double opt-in: provider.proxy + config.proxy.model)
-  const { injectProxy } = await import("@thincoder/core/proxy.mjs")
-  injectProxy(providers, config)
-  // config.provider 是 loadConfig 里的独立拷贝，同步注入结果
-  if (provider?.name) provider.proxyUri = providers.find((p) => p.name === provider.name)?.proxyUri
-
-  const memory = createMemory({ dbPath: config.memory.dbPath })
-  // Vector retrieval: enabled if embedding is configured (lazy vector generation, computed on first search)
-  if (config.embedding?.apiKey) {
-    const { createEmbedder } = await import("@thincoder/core/embedding.mjs")
-    memory.embedder = createEmbedder(config.embedding)
-  }
+/** Assemble an agent with memory, MCP tools, and code/doc indices attached (sync all layers, then return)
+ *  = 核装配序（`thincoder-core/agent/assemble.mjs`）+ 本端留面（MCP 合入 ∕ 剔除经 `toolsFinalize` 缝 ·
+ *  `_mcpWarnings` · M1 装配钩子 · 校验调用）。`deps` 逐项可注入（缺省 = 核缺省）。 */
+export async function assembleAgent({ excludeTools = [], slotData, deps = {} } = {}) {
   const cwd = process.cwd()
-  // Merge project-level rules (.thincoder/rules/*.md) into config; file rules take priority (first),
-  // config.json rules append (deduped by pattern). Users can override with explicit config rules.
-  const fileRules = discoverRules(cwd)
-  if (fileRules.length) {
-    const filePatterns = new Set(fileRules.map(r => r.pattern))
-    const configRules = (config.agent?.streamRules || []).filter(r => !filePatterns.has(r.pattern))
-    config.agent.streamRules = [...fileRules, ...configRules]
-  }
-  // code/doc indices isolated by origin (project root dir): search only scoped to this project
-  memory.codeOrigin = cwd
-  // Project layer: sync .thincoder/memory/ dir to index on startup (sync if present, skip otherwise)
-  if (config.memory.projectDir) {
-    memory.projectOrigin = isAbsolute(config.memory.projectDir) ? config.memory.projectDir : join(cwd, config.memory.projectDir)
-    await syncDir(memory, { layer: "project", dir: memory.projectOrigin })
-  }
-  // Team layer (optional): auto-clone on first use; startup only indexes local dir, remote pull via explicit thincoder sync
-  const team = teamConfig(config)
-  if (team) {
-    const { ensureClone } = await import("@thincoder/core/git/gitmem.mjs")
-    await ensureClone(team)
-    await syncDir(memory, { layer: "team", dir: team.dir })
-  }
-  const baseTools = await assembleBuiltinTools({ memory, cwd, projectDir: config.memory.projectDir, author: gitAuthor(), team, model: provider?.model ?? null })
+  /** MCP 连接警告（缝体出参——装配后落 `agent._mcpWarnings`）。 */
+  const warnings = []
+  const agent = await coreAssemble({
+    cwd,
+    deps,
+    // 位次保持：工具装配后、createAgent 前（旧内联序 :64 → :66-110 → :112 逐位同）。
+    toolsFinalize: (baseTools, { config }) => finalizeTools(baseTools, { cwd, config, excludeTools, warnings }),
+  })
+  agent._mcpWarnings = warnings
+  // M1 装配钩子（会话起点①——装配期）：判据 = 会话权威值（`slotData` 槽值优先 + config 回退）；
+  // 附着 agent.manifest 供下游 M2–M9 读面（普通会话 = null）；非 ok 态不抛（启动零拒绝）。
+  // 钩子后移的可观察后果（报明 / 建档晚于 memory sync / MCP 连接 / 工具装配——功能等价，仍在
+  // 进入正常循环之前）见 docs/core/design/MANIFEST.md §2.2。
+  attachManifest(agent, { cwd, slotData })
+  // SESSION.md §6.8 D-S1：assembleAgent 后唯一校验点（TUI/chat 两路径同源）——不抛错不退出，
+  // 标记由调用侧消费（TUI 弹重选 / headless 报错）。空 provider 由 TUI 路径在 startTUI 前清空。
+  validateProvider(agent, agent.config)
+  return agent
+}
 
+/** MCP 合入 + 工具剔除（核 `toolsFinalize` 缝体——CLI 专用；位次 = 工具装配后、`createAgent` 前）。
+ *  连接并发（死服务器不阻塞启动），失败收集为警告（TUI alt-buffer 下 stderr 不可见——经 `agent`
+ *  对象传递）；`warnings` = 出参数组（调用侧装配 `agent._mcpWarnings`）。 */
+async function finalizeTools(baseTools, { cwd, config, excludeTools, warnings }) {
   // MCP servers: connect in parallel (a dead server won't block startup), collect failures as warnings (stderr invisible in TUI, passed via agent object)
   const mcpServers = config.mcp?.servers ?? []
   // Read project-level .mcp.json (standard MCP client convention) — merge into mcpServers
@@ -92,7 +83,6 @@ export async function assembleAgent({ excludeTools = [], slotData } = {}) {
     console.error(`[mcp] Failed to read .mcp.json: ${e.message}`)
   }
   let mcpTools = []
-  const mcpWarnings = []
   if (mcpServers.length) {
     const { connectMcpServer } = await import("@thincoder/core/mcp.mjs")
     const results = await Promise.allSettled(mcpServers.map((srv) => connectMcpServer(srv)))
@@ -104,37 +94,11 @@ export async function assembleAgent({ excludeTools = [], slotData } = {}) {
         const srv = mcpServers[i]
         const msg = `MCP server "${srv.name ?? srv.command}" failed to connect: ${r.reason?.message ?? r.reason}`
         console.error(`[mcp] ${msg}`)
-        mcpWarnings.push(msg)
+        warnings.push(msg)
       }
     }
   }
-
-  const agent = createAgent({
-    provider,
-    tools: applyToolExclusions([...baseTools, ...mcpTools], excludeTools),
-    config,
-    cwd,
-    memory,
-  })
-  agent.providers = providers
-  // MODEL-MERGE-SESSION：config 无 active*——会话运行时起点 = defaultModel 复合解析
-  // （provider 对象带解析后 model——API/spec 消费点零改）；无效 → {} + 原因走 D-S1 标记
-  agent.activeProvider = provider.name ?? ""
-  agent.activeModel = provider.model ?? null
-  agent._mcpWarnings = mcpWarnings
-  // M1 装配钩子（会话起点①——装配期）：判据 = 会话权威值（`slotData` 槽值优先 + config 回退）；
-  // 附着 agent.manifest 供下游 M2–M9 读面（普通会话 = null）；非 ok 态不抛（启动零拒绝）。
-  // 钩子后移的可观察后果（报明 / 建档晚于 memory sync / MCP 连接 / 工具装配——功能等价，仍在
-  // 进入正常循环之前）见 docs/core/design/MANIFEST.md §2.2。
-  attachManifest(agent, { cwd, slotData })
-  // SESSION.md §6.8 D-S1：assembleAgent 后唯一校验点（TUI/chat 两路径同源）——不抛错不退出，
-  // 标记由调用侧消费（TUI 弹重选 / headless 报错）。空 provider 由 TUI 路径在 startTUI 前清空。
-  validateProvider(agent)
-  // defaultModel 无效/未设的具体原因覆盖通用判据文案（providers 存在时更有指导性）
-  if (agent._providerInvalid && config.providerInvalidReason) {
-    agent._providerInvalidReason = config.providerInvalidReason
-  }
-  return agent
+  return applyToolExclusions([...baseTools, ...mcpTools], excludeTools)
 }
 
 /**
@@ -174,42 +138,3 @@ export function attachManifest(agent, { cwd = process.cwd(), slotData } = {}) {
   agent.manifest = r.ok ? r.manifest : null
   return agent.manifest
 }
-
-/**
- * SESSION.md §6.8 D-S1 — provider 有效性校验（assembleAgent 后唯一校验点，TUI/chat 两路径同源）。
- * 判据（评审 #1/#2）：仅 model/baseURL 缺失判 invalid——**不得用 MODEL_SPECS 成员资格判无效**
- * （未知模型 = 受支持场景：自定义端点模型不在 spec 表是常态，误判会让自定义模型用户每次恢复都弹重选）。
- * apiKey 缺失不判（既有 wizard /model 流程处理）。幂等：有效时清标记，无效时置标记 + 原因。
- * 不抛错、不退出。返回 agent 便于链式调用。
- */
-export function validateProvider(agent) {
-  const ok = Boolean(agent.provider?.name && agent.provider.model && agent.provider.baseURL)
-  if (ok) {
-    delete agent._providerInvalid
-    delete agent._providerInvalidReason
-  } else {
-    agent._providerInvalid = true
-    agent._providerInvalidReason = !agent.provider?.name
-      ? "provider 不存在"
-      : !agent.provider.model ? "model 缺失"
-      : "缺少 baseURL"
-  }
-  return agent
-}
-
-/** Read team config and fill in default dir; return null if not configured */
-export function teamConfig(config) {
-  const team = config.memory?.team
-  if (!team?.repo) return null
-  const name = team.name ?? "default"
-  return { name, repo: team.repo, dir: team.dir ?? join(configDir, "teams", name) }
-}
-
-/** Entry author: git config user.name, fallback "unknown" */
-export function gitAuthor() {
-  try {
-    return execSync("git config user.name", { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] }).trim() || "unknown"
-  } catch {
-    return "unknown"
-  }
-}

package/src/cli/memory-command.mjs

@@ -3,10 +3,12 @@ import { loadConfig } from "@thincoder/core/config.mjs"
 import { teamConfig } from "./make-agent.mjs"
 import { put, search, list } from "@thincoder/core/memory/core.mjs"
 import { deleteByUid } from "@thincoder/core/memory/delete.mjs"
+import { sweepMemory, formatSweepReport } from "@thincoder/core/memory/sweep.mjs"
 
-/** thincoder memory <list|search|put|remove> subcommands.
+/** thincoder memory <list|search|put|remove|sweep> subcommands.
  *  opts.dirs: { project, team } layer directories for project/team file deletion (tests inject their own);
- *  falls back to the same config-derived dirs the agent uses. */
+ *  falls back to the same config-derived dirs the agent uses.
+ *  opts.dbPath: 库路径覆盖（sweep 的备份命名依据——缺省 = `config.memory.dbPath` 展开值）。 */
 export async function memoryCommand(memory, args, opts = {}) {
   const [sub, ...rest] = args
 
@@ -57,12 +59,52 @@ export async function memoryCommand(memory, args, opts = {}) {
       }
       break
     }
+    case "sweep": {
+      const parsed = parseSweepArgs(rest)
+      if (parsed.error) {
+        console.error(parsed.error)
+        console.error(SWEEP_USAGE)
+        return 1
+      }
+      try {
+        const result = sweepMemory(memory, { origin: parsed.origin, path: parsed.path, confirm: parsed.confirm, dbPath: opts.dbPath ?? loadConfig().memory.dbPath })
+        for (const line of formatSweepReport(result)) console.log(line)
+        if (result.dryRun) console.log("(dry-run——零写；要落写加 --confirm)")
+      } catch (e) {
+        console.error(e.message)
+        return 1
+      }
+      break
+    }
     default:
-      console.error("Usage: thincoder memory <list|search|put|remove>")
+      console.error("Usage: thincoder memory <list|search|put|remove|sweep>")
       return 1
   }
 }
 
+const SWEEP_USAGE = "Usage: thincoder memory sweep [--origin <o>] [--path <sub>] [--dry-run|--confirm]"
+
+/** sweep 参数面：`--origin <o>` ∕ `--path <sub>`（各两形：空格 ∕ `=`）+ 裸 `--dry-run` ∕ `--confirm`
+ *  （缺省 = 干跑；两者互斥）；`--path` 须与 `--origin` 同用（§6.14 面①-3 存量剪枝窄化档）。 */
+function parseSweepArgs(rest) {
+  let origin = null, path = null, sawDry = false, sawConfirm = false
+  for (let i = 0; i < rest.length; i++) {
+    const a = rest[i]
+    const eq = a.match(/^--(origin|path)=(.*)$/)
+    if (eq) { if (eq[1] === "origin") origin = eq[2]; else path = eq[2]; continue }
+    if (a === "--origin") { origin = rest[++i] ?? ""; continue }
+    if (a === "--path") { path = rest[++i] ?? ""; continue }
+    if (a === "--dry-run") { sawDry = true; continue }
+    if (a === "--confirm") { sawConfirm = true; continue }
+    return { error: `Unknown argument: ${a}` }
+  }
+  if (origin === "") return { error: "--origin 需要一个非空路径" }
+  if (path === "") return { error: "--path 需要一个非空前缀" }
+  if (path !== null && origin === null) return { error: "--path 须与 --origin 同用" }
+  if (sawDry && sawConfirm) return { error: "--dry-run 与 --confirm 互斥" }
+  return { origin, path, confirm: sawConfirm }
+}
+
 /** Layer directories for project/team file deletion — derived from the same config the agent uses. */
 function cliDirs() {
   const config = loadConfig()

package/src/command-interactive.mjs

@@ -0,0 +1,196 @@
+/**
+ * command-interactive.mjs — 交互长驻三命令（chat ∕ tui ∕ acp）——`bin/thincoder.mjs` 命令分发表
+ *   外提（2026-09-28 拆档批 R4 · 纯移动——命令行为零改）：case 块体逐字搬移为函数（唯二机械改 =
+ *   `break` → `return` · 相对 import 路径随住档改指）；依赖经 ctx 注入（`exitSoon` ∕ `noKeyMessage`
+ *   ——bin 装配面注入；先例 = `src/tui/turn-face.mjs` 出档）；分发落点 = `src/command-table.mjs`。
+ */
+import { isAbsolute, join } from "node:path"
+import { runAgent } from "@thincoder/core/agent.mjs"
+import { loadConfig, configPath } from "@thincoder/core/config.mjs"
+// 批 1 CORE-DEFECT-FIXES B3：onWait 相位值域 + 文案单源（消费面禁各自枚举——PROVIDER.md §6.20）
+import { waitStatusText } from "@thincoder/core/provider/wait-status.mjs"
+import { assembleAgent, attachManifest, teamConfig, gitAuthor, validateProvider } from "./cli/make-agent.mjs"
+import { setupWizard } from "./cli/setup-wizard.mjs"
+import { summarize, askPermission } from "./cli/permission.mjs"
+import { recentCrashHint } from "./crash-reports.mjs"
+
+/** chat —— 一次性 agent 运行（原 `bin/thincoder.mjs` `case "chat"` 块体逐字搬移）。 */
+export async function chatCommand(args, ctx) {
+  const { exitSoon, noKeyMessage } = ctx
+  const auto = args.includes("--auto")
+  const prompt = args.filter((a) => a !== "--auto").join(" ").trim()
+  if (!prompt) {
+    console.error('Usage: thincoder chat [--auto] "<prompt>"')
+    exitSoon(1)
+    return
+  }
+
+  // R25（F-R25c）：非交互/chat 模式——上次异常终止提示写 stderr 一行（无匹配不提示）
+  const crashNotice = recentCrashHint()
+  if (crashNotice) console.error(crashNotice)
+
+  const agent = await assembleAgent()
+  // SESSION.md §6.8 D-S4（#841 收正）：headless 无 TUI——按**核统一态分流**（判据单源 = PROVIDER.md §6.22，
+  // 与 TUI 面同式）：**invalid 类**（`state === "invalid"` ∨ `providerInvalidReason` 非空——无渠/key
+  // ⇒ 不可运行）⇒ 可读错误 + 退出码 1（不弹 UI、不崩溃）；**fallback**（无有效 defaultModel 但可运行）
+  // ⇒ stderr 一行明示 + 继续运行（不退出——D-S2 同态同解）。条目结构不全不在本门（负向锁 =
+  // PROVIDER.md:437）——归运行期失败径（stderr + 非 0 退出）。
+  const headlessCfg = agent.config ?? {}
+  const invalidClass = headlessCfg.providerState === "invalid"
+    || (typeof headlessCfg.providerInvalidReason === "string" && headlessCfg.providerInvalidReason !== "")
+  if (invalidClass) {
+    console.error(`[error] 未配置有效渠道（${agent._providerInvalidReason ?? headlessCfg.providerStateReason ?? "provider unavailable"}）。请运行 thincoder 进入 TUI 设置（/config 设置渠道与密钥；或 /model 选择后以会话槽生效），或编辑 ${configPath}`)
+    exitSoon(1)
+    return
+  }
+  if (headlessCfg.providerState === "fallback" && agent.provider?.name) {
+    const m = typeof agent.provider.model === "string" && agent.provider.model ? `:${agent.provider.model}` : ""
+    console.error(`尚未设置默认模型：本次使用 \`${agent.provider.name}${m}\`——/config → 默认模型 设置一次；/model 仅改本会话`)
+  }
+  if (!agent.provider.apiKey) {
+    if (!process.stdin.isTTY) {
+      console.error(noKeyMessage())
+      exitSoon(1)
+      return
+    }
+    const p = await setupWizard()
+    if (!p) {
+      exitSoon(1)
+      return
+    }
+    agent.provider = p
+    agent.activeProvider = p.name
+    // Wizard may have configured an embedding key: attach vector search
+    const fresh = loadConfig()
+    if (fresh.embedding?.apiKey && agent.memory && !agent.memory.embedder) {
+      const { createEmbedder } = await import("@thincoder/core/embedding.mjs")
+      agent.memory.embedder = createEmbedder(fresh.embedding)
+    }
+  }
+  if (auto) agent.autoApprove = true
+  // Accumulate token usage, output to stderr at the end (don't pollute stdout pipe)
+  const usageTotal = { prompt: 0, completion: 0, cacheHit: 0, cacheMiss: 0 }
+  try {
+    await runAgent(agent, prompt, {
+      onToken: (text) => process.stdout.write(text),
+      onWait: (ev) => {
+        const s = waitStatusText(ev)
+        if (s) console.error(`[rate-limit] ${s}`)
+      },
+      onToolCall: (name, toolArgs) => {
+        console.error(`\n[tool] ${name} ${summarize(toolArgs)}`)
+      },
+      onToolResult: (name, result) => {
+        const preview = result.length > 200 ? result.slice(0, 200) + "..." : result
+        console.error(`[done] ${name} -> ${preview.split("\n")[0]}`)
+      },
+      onToolOutput: (name, chunk) => process.stderr.write(chunk),
+      onCompress: () => console.error(`\n[context] Context too long, auto-compacted (early conversation summarized by LLM)`),
+      onTaskUpdate: (items) => {
+        const done = items.filter((i) => i.status === "done").length
+        const current = items.find((i) => i.status === "in_progress")
+        console.error(`[task] ${done}/${items.length}${current ? ` ▶ ${current.title}` : ""}`)
+      },
+      onUsage: (usage) => {
+        usageTotal.prompt += usage.prompt_tokens ?? 0
+        usageTotal.completion += usage.completion_tokens ?? 0
+        usageTotal.cacheHit += usage.prompt_cache_hit_tokens ?? 0
+        usageTotal.cacheMiss += usage.prompt_cache_miss_tokens ?? 0
+      },
+      onPermissionRequest: (name, toolArgs) => (agent.autoApprove ? true : askPermission(name, toolArgs)),
+    })
+    process.stdout.write("\n")
+    if (usageTotal.prompt > 0) {
+      const cacheTotal = usageTotal.cacheHit + usageTotal.cacheMiss
+      const hitPart = cacheTotal > 0 ? ` cache-hit ${Math.round((usageTotal.cacheHit / cacheTotal) * 100)}%` : ""
+      console.error(`[usage] prompt ${usageTotal.prompt} + completion ${usageTotal.completion}${hitPart}`)
+    }
+  } catch (error) {
+    // 用 name 判断而非 instanceof：不依赖"与 runAgent 同一个模块实例"这一隐式约定
+    if (error.name === "ContinueError") {
+      console.error(`\n[paused] Agent stopped after ${error.turn} turns. Run in TUI to continue.`)
+      exitSoon(0)
+    } else {
+      console.error(`\n[error] ${error.message}`)
+      exitSoon(1)
+    }
+  }
+}
+
+/** tui ∕ 无参默认 —— 交互 TUI 启动（原 `case "tui": case undefined:` 块体逐字搬移）。 */
+export async function tuiCommand(ctx) {
+  const { exitSoon } = ctx
+  // 恢复上次的会话（同一项目目录）；provider 按保存的名字切回（用户上次可能换过模型）
+  // 2026-09-05 §6.10（R4）：恢复决策按本端记录 resumeSlot（D-2 ①②③）——manifest active
+  // 只作"无记录端"的一次性继承源，不再作本端恢复第一依据（D-6）。
+  // 2026-09-18（装配门禁批 #30 · KD-M1-13 / KD-M1-15）：resumeSlot **前移至装配之前**——
+  // 装配期模式门判据 = 会话权威值（槽优先 + config 回退）；恢复记录经 slotData 形参进
+  // 装配钩子（同进程同一调用前移 ⇒ 零新增写动作；钩子内不调 resumeSlot——非纯读）。
+  const { resumeSlot, applySession, sessionDescriptor } = await import("@thincoder/core/session.mjs")
+  // F-MI7：resumeSlot = async（探测束不阻塞事件循环）——此处必须 await
+  const { slot, data } = await resumeSlot(process.cwd())
+  const agent = await assembleAgent({ slotData: data })
+  // SESSION.md §6.8 D-S1（#841 收正）：TUI 路径**仅在 `state === "invalid"`**（无渠/key）于 startTUI
+  // 前置 `agent.provider = null`——空 provider 不流入 runAgent（崩溃源：chat() 缺 model → 网关 400
+  // 或 fetch("undefined/...") TypeError）；`fallback` 态 provider 有效——不清（可运行 + 明示）。
+  if (agent.config?.providerState === "invalid") agent.provider = null
+  const config = loadConfig()
+  if (data) {
+    // applySession 内部已按槽复合重算 compactThreshold（auto 时）——不再需要 switched 分支
+    // TUI-OOM-ROOTCAUSE（SESSION.md §6.14）：传 slot → 绑定记录存储（身份核验 + 对账）
+    // ——人读线 = 尾窗（磁盘为准）；未传 = 模式 F（全量数组）
+    applySession(agent, data, { slot })
+    // SESSION.md §6.11（2026-09-08——N6 评审 🔴 修复）：process restarted 句 = 进程级
+    // 信号——仅本启动 resume 路径设一次（真进程重启恢复盘上会话）；/session 切换与 ACP
+    // 加载走同一 applySession 收敛但不设（不误报进程重启）。prepareRun 发句即清——进程
+    // 内一次。resumed:yes 独立由 applySession 的恢复事件武装（data.history 非空）。
+    agent._processRestartPending = true
+  }
+  // D-3 钉槽：applySession 清 _slot 后立即钉回恢复槽——首保存必落恢复槽（消除
+  // "load → 首回合保存"窗口内并发方翻 active 导致的静默迁移）；/new 经 resetSessionState
+  // 清 _slot（newSession 已认领 + 写记录，语义保留）
+  agent._slot = slot
+  // M1 重估点（会话起点②——applySession 之后 · KD-M1-13 取值点②）：CLI 的工程模式权威值 =
+  // 会话槽（/eng 只写槽不写 config.json）；此时 agent.config.agent.engineering 已由
+  // applySession 按槽订正 ⇒ 与装配期判据同值 ⇒ 幂等重估（值同 ⇒ 无副作用）。
+  attachManifest(agent)
+  // D-S3 优先级补全：applySession 可能已用会话中的有效 provider 修复（config 无效 + 会话有效）——
+  // 修复后复验清除标记，仅当两者都无效才弹重选（validateProvider 幂等）
+  if (agent._providerInvalid) validateProvider(agent)
+  // MCP 连接失败在 TUI alt-buffer 下 stderr 不可见，注入为下一条 user 消息后的提醒
+  if (agent._mcpWarnings?.length) {
+    agent._pendingReminders = agent._pendingReminders ?? []
+    agent._pendingReminders.push(
+      `[System reminder: ${agent._mcpWarnings.length} MCP server(s) failed to connect at startup:\n` +
+      agent._mcpWarnings.map((w) => `  - ${w}`).join("\n") +
+      `\nYou can try reconnecting with /mcp connect <name>.]`
+    )
+  }
+  const { startTUI } = await import("./tui.mjs")
+  try {
+    await startTUI(agent, {
+      projectDir: config.memory.projectDir ? (isAbsolute(config.memory.projectDir) ? config.memory.projectDir : join(process.cwd(), config.memory.projectDir)) : null,
+      team: teamConfig(config),
+      author: gitAuthor(),
+      restored: data ? sessionDescriptor(agent, data) : data,
+      // R25（F-R25c）：TUI 启动显示一行"上次运行异常终止"提示（showStartup 渲染——无匹配不传）
+      crashNotice: recentCrashHint() ?? undefined,
+    })
+  } catch (error) {
+    console.error(`[error] ${error.message}`)
+    exitSoon(1)
+  }
+}
+
+/** acp —— Agent Client Protocol 服务（原 `case "acp"` 块体逐字搬移）。 */
+export async function acpCommand(args, ctx) {
+  const { exitSoon } = ctx
+  const { runAcpServer, runAcpLogin } = await import("./acp.mjs")
+  // §11.2 改法 4：`args` 语义 = 追加到已配置的 agent 调用——`--login` = 终端认证流程，
+  // 不进 stdio 服务模式（不带该旗标时行为零变）；退出码语义 = 0 成功 / 非 0 失败。
+  if (args.includes("--login")) {
+    exitSoon(await runAcpLogin())
+    return
+  }
+  await runAcpServer()
+}

package/src/command-table.mjs

@@ -0,0 +1,185 @@
+/**
+ * command-table.mjs — CLI 命令分发表（`bin/thincoder.mjs` 外提——2026-09-28 拆档批 R4 · 纯移动 ·
+ *   命令行为 ∕ USAGE 文本 ∕ 旗标语义零改）：分发骨架 + 八薄命令族（memory ∕ sync ∕ distill ∕
+ *   reindex ∕ completion ∕ upgrade ∕ session ∕ ledger）+ help ∕ version；交互长驻三命令
+ *   （chat ∕ tui ∕ acp）经 `command-interactive.mjs` 承接。依赖经 ctx 注入（`usage` ∕ `version` ∕
+ *   `exitSoon`——bin 装配面注入；先例 = `src/tui/turn-face.mjs` 出档）。
+ */
+import { readFileSync } from "node:fs"
+import { isAbsolute, join } from "node:path"
+import { loadConfig } from "@thincoder/core/config.mjs"
+import { createMemory, syncDir } from "@thincoder/core/memory.mjs"
+import { teamConfig } from "./cli/make-agent.mjs"
+import { memoryCommand } from "./cli/memory-command.mjs"
+import { distillCommand } from "./cli/distill-command.mjs"
+import { chatCommand, tuiCommand, acpCommand } from "./command-interactive.mjs"
+
+/** 命令分发（原 `bin/thincoder.mjs` 顶层 switch 骨架逐字搬移——命令行为零改）。 */
+export async function runCommandTable(command, args, ctx) {
+  const { usage, version, exitSoon } = ctx
+  switch (command) {
+    case "chat": {
+      await chatCommand(args, ctx)
+      break
+    }
+
+    case "memory": {
+      const config = loadConfig()
+      const memory = createMemory({ dbPath: config.memory.dbPath })
+      if (config.embedding?.apiKey) {
+        const { createEmbedder } = await import("@thincoder/core/embedding.mjs")
+        memory.embedder = createEmbedder(config.embedding)
+      }
+      if (config.memory.projectDir) {
+        memory.projectOrigin = isAbsolute(config.memory.projectDir) ? config.memory.projectDir : join(process.cwd(), config.memory.projectDir)
+      }
+      const code = await memoryCommand(memory, args)
+      if (code) exitSoon(code)
+      break
+    }
+
+    case "sync": {
+      const config = loadConfig()
+      const team = teamConfig(config)
+      if (!team) {
+        console.error("Team memory not configured. Set memory.team in ~/.thincoder/config.json:")
+        console.error('  "team": { "name": "myteam", "repo": "git@github.com:org/team-memory.git" }')
+        exitSoon(1)
+        break
+      }
+      const memory = createMemory({ dbPath: config.memory.dbPath })
+      const { ensureClone, pullTeam } = await import("@thincoder/core/git/gitmem.mjs")
+      try {
+        const cloned = await ensureClone(team)
+        if (cloned) console.log(`Cloned team repo to ${team.dir}`)
+        await pullTeam(team.dir)
+        const stats = await syncDir(memory, { layer: "team", dir: team.dir })
+        console.log(`Synced. Index: +${stats.added} ~${stats.updated} -${stats.removed}`)
+      } catch (error) {
+        console.error(`[error] ${error.message}`)
+        exitSoon(1)
+      }
+      break
+    }
+
+    case "distill": {
+      const code = await distillCommand(args, exitSoon)
+      if (code) exitSoon(code)
+      break
+    }
+
+    case "reindex": {
+      const config = loadConfig()
+      const memory = createMemory({ dbPath: config.memory.dbPath })
+      // files 层（project/team 的 markdown 索引）全量重建；索引是易失品，真相在 markdown
+      memory.db.prepare(`DELETE FROM files`).run()
+      const cwd = process.cwd()
+      let total = { added: 0, removed: 0 }
+      if (config.memory.projectDir) {
+        const s = await syncDir(memory, { layer: "project", dir: isAbsolute(config.memory.projectDir) ? config.memory.projectDir : join(cwd, config.memory.projectDir) })
+        total.added += s.added
+      }
+      const team = teamConfig(config)
+      if (team) {
+        const { ensureClone } = await import("@thincoder/core/git/gitmem.mjs")
+        await ensureClone(team)
+        const s = await syncDir(memory, { layer: "team", dir: team.dir })
+        total.added += s.added
+      }
+      console.log(`Reindexed ${total.added} markdown entries (project${team ? " + team" : ""}). Vectors will be lazily regenerated on next search.`)
+      break
+    }
+
+    case "tui":
+    case undefined: {
+      await tuiCommand(ctx)
+      break
+    }
+
+    case "completion": {
+      const shell = args[0]
+      if (!["bash", "zsh", "fish"].includes(shell)) {
+        console.error(`Usage: thincoder completion <bash|zsh|fish>`)
+        exitSoon(1)
+        break
+      }
+      // §11.2 交付行数债（2026-09-08——500 行硬限触碰执行）：直写段逐字迁出
+      // src/completions.mjs（脚本字节不变——printCompletion 发射）
+      const { printCompletion } = await import("./completions.mjs")
+      printCompletion(shell)
+      break
+    }
+
+    case "upgrade": {
+      const pkg = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8"))
+      const local = pkg.version
+      const { checkForUpdate } = await import("./upgrade.mjs")
+      const result = await checkForUpdate(local)
+      if (!result) {
+        console.error("[upgrade] Unable to query npm registry — check your network connection and that npm is installed")
+        exitSoon(1)
+        break
+      }
+      if (!result.newer) {
+        console.log(`ThinCoder ${local} is already the latest.`)
+      } else {
+        console.log(`Upgrading: ${local} → ${result.latest}`)
+        const { execSync } = await import("node:child_process")
+        execSync("npm install -g thincoder@latest", { stdio: "inherit" })
+        console.log(`Upgraded to ${result.latest}`)
+      }
+      break
+    }
+
+    case "acp": {
+      await acpCommand(args, ctx)
+      break
+    }
+
+    case "session": {
+      // SESSION.md §6.12 / §6.17：会话目录 GC 显式面（冷 cwd 90 天面 + 三合取存量组全量面）——
+      // 双端同面（2026-09-21 端差注销：VS Code 端命令 `thincoder.sessionGc` 走同一核数据面）。
+      // SESSION.md §6.19 D-SE46（2026-09-22 会话索引批）：`session index` = 派生索引库显式面
+      // （--status 读数 / --rebuild 全量重扫）——同一 `session` 分发族（壳侧分发，实现在核）。
+      if (args[0] === "index") {
+        const { runSessionIndex } = await import("@thincoder/core/session-index-cmd.mjs")
+        process.exitCode = await runSessionIndex(args)
+        break
+      }
+      const { runSessionGc } = await import("@thincoder/core/session-gc.mjs")
+      process.exitCode = await runSessionGc(args)
+      break
+    }
+
+    case "ledger": {
+      // LEDGER.md §2.2（2026-09-25 批）：台账存量收正面——变体键合并迁移（migrate）/ 残档审计（audit）；
+      // 核内实现（ledger-migrate.mjs），壳侧只分发（先例 = `session gc` 双档：--dry-run 只读 / --confirm 执行）。
+      if (args[0] === "migrate" || args[0] === "audit") {
+        const m = await import("@thincoder/core/ledger-migrate.mjs")
+        process.exitCode = await (args[0] === "migrate" ? m.runLedgerMigrate(args) : m.runLedgerAudit(args))
+        break
+      }
+      console.error("Usage: thincoder ledger migrate --dry-run | --confirm [--from <key>] | thincoder ledger audit [--root <dir>]")
+      exitSoon(1)
+      break
+    }
+
+    case "--help":
+    case "-h": {
+      process.stdout.write(usage)
+      break
+    }
+
+    case "--version":
+    case "-v": {
+      console.log(version)
+      break
+    }
+
+    default: {
+      console.error(`Unknown command: ${command}\n`)
+      process.stdout.write(usage)
+      exitSoon(1)
+    }
+  }
+}