thincoder 0.12.62 → 0.12.64

package/src/cli/make-agent.mjs

@@ -1,14 +1,14 @@
 import { execSync } from "node:child_process"
 import { isAbsolute, join } from "node:path"
-import { createAgent } from "../agent.mjs"
-import { loadConfig, configDir } from "../config.mjs"
-import { createMemory, memoryTools, syncDir, codeSearchTool, docSearchTool } from "../memory.mjs"
-import { settingsTool } from "../agent-tools/settings.mjs"
-import { repoOutlineTool } from "../tools/repomap.mjs"
-import { builtinTools } from "../tools/index.mjs"
-import { discoverRules } from "../rules.mjs"
-// R10 L2（MULTI-INSTANCE-COLLAB §2a.4 D-L2b）：peer_instances 只读工具——挂感知模块导出
-import { peerInstancesTool } from "../peer-instances.mjs"
+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"
+import { resolveEngineeringManifest, projectView } from "@thincoder/core/manifest.mjs"
 
 /** 第 27 批 §12.3⑤（R-A1.1）：装配期工具剔除——按 `name` 过滤的纯函数（机验锚）。
  *  恒等语义：空列表 / 零命中 → 原数组原样返回（零意外剔除——T15）。
@@ -21,13 +21,13 @@ export function applyToolExclusions(tools, excludeTools = []) {
 }
 
 /** Assemble an agent with memory, MCP tools, and code/doc indices attached (sync all layers, then return) */
-export async function assembleAgent({ excludeTools = [] } = {}) {
+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("../proxy.mjs")
+  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
@@ -35,7 +35,7 @@ export async function assembleAgent({ excludeTools = [] } = {}) {
   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("../embedding.mjs")
+    const { createEmbedder } = await import("@thincoder/core/embedding.mjs")
     memory.embedder = createEmbedder(config.embedding)
   }
   const cwd = process.cwd()
@@ -57,11 +57,11 @@ export async function assembleAgent({ excludeTools = [] } = {}) {
   // 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("../git/gitmem.mjs")
+    const { ensureClone } = await import("@thincoder/core/git/gitmem.mjs")
     await ensureClone(team)
     await syncDir(memory, { layer: "team", dir: team.dir })
   }
-  const baseTools = [...builtinTools, ...memoryTools(memory, { cwd, projectDir: config.memory.projectDir, author: gitAuthor(), team }), codeSearchTool(memory), docSearchTool(memory), repoOutlineTool(memory.db, cwd), settingsTool(), peerInstancesTool]
+  const baseTools = await assembleBuiltinTools({ memory, cwd, projectDir: config.memory.projectDir, author: gitAuthor(), team, model: provider?.model ?? null })
 
   // 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 ?? []
@@ -94,7 +94,7 @@ export async function assembleAgent({ excludeTools = [] } = {}) {
   let mcpTools = []
   const mcpWarnings = []
   if (mcpServers.length) {
-    const { connectMcpServer } = await import("../mcp.mjs")
+    const { connectMcpServer } = await import("@thincoder/core/mcp.mjs")
     const results = await Promise.allSettled(mcpServers.map((srv) => connectMcpServer(srv)))
     for (let i = 0; i < results.length; i++) {
       const r = results[i]
@@ -122,7 +122,12 @@ export async function assembleAgent({ excludeTools = [] } = {}) {
   agent.activeProvider = provider.name ?? ""
   agent.activeModel = provider.model ?? null
   agent._mcpWarnings = mcpWarnings
-  // SESSION.md §8 D-S1：assembleAgent 后唯一校验点（TUI/chat 两路径同源）——不抛错不退出，
+  // 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 存在时更有指导性）
@@ -133,7 +138,45 @@ export async function assembleAgent({ excludeTools = [] } = {}) {
 }
 
 /**
- * SESSION.md §8 D-S1 — provider 有效性校验（assembleAgent 后唯一校验点，TUI/chat 两路径同源）。
+ * M1 装配钩子（docs/core/design/MANIFEST.md §2.2 两端装配钩子——CLI 端）：
+ * 会话起点调用（装配期 ① + `bin` 启动恢复后重估 ②——幂等：重估即重读，无状态位）。
+ *
+ * 模式门（判据单源 = 会话权威值，槽优先 + config 回退——KD-M1-12 / KD-M1-13）：
+ * 「恢复槽带 `engineering` 字段 ? 槽值 : `agent.config.agent.engineering`」（槽字段在场判据
+ * 与 `applySession` 同款——`thincoder-core/session.mjs:314-317`）。普通会话 → **装配钩子
+ * 零 manifest I/O**（不读 / 不拒 / 不建档）+ `agent.manifest = null`（清残留附着——复用
+ * agent 跨模式防陈旧）。
+ *
+ * 工程模式分支 = 核单源决策树 `resolveEngineeringManifest`（KD-M1-20）；**非 fatal**
+ * （KD-M1-25 / M1-29——**启动零拒绝**）：档合法 / 梯②④⑤ 缺档（轻动作就地建档，`writer:'main'`）
+ * ⇒ 附着；歧义（≥2 候选）/ 档非法 / 建档失败 ⇒ **不抛**——`agent.manifest = null` + 记
+ * `agent._projectView`（形状 = `projectView` 返回面 + `created` 建档标记——§2.2 钩子段）。
+ * 需要项目参数者各自报明（情境行 §2.6 / 动作侧各自报错——§2.9 C）。
+ *
+ * `slotData` = 恢复槽记录，由调用方经**参数注入**（`bin` TUI 分支既有 `resumeSlot` 调用
+ * 前移——KD-M1-15：钩子内不调 `resumeSlot`（该函数非纯读：GC / 认领 / 端标写）；`chat` /
+ * ACP 装配无会话 ⇒ 不传 ⇒ config 回退）。重估点不传（`applySession` 已按槽订正 config）。
+ * @param {object} agent — createAgent 产物（读 agent.config；写 agent.manifest / agent._projectView）
+ * @param {{cwd?: string, slotData?: object|null}} [opts]
+ * @returns {object|null} 附着后的 manifest / 非 ok 态与普通会话 null
+ */
+export function attachManifest(agent, { cwd = process.cwd(), slotData } = {}) {
+  const slotEng = slotData?.engineering
+  const engineering = slotEng !== undefined ? slotEng === true : agent.config?.agent?.engineering === true
+  if (!engineering) {
+    agent.manifest = null // 清残留附着（KD-M1-12）——普通会话不读 / 不拒 / 不建档
+    return null
+  }
+  // 决策树（writer 显式 'main'——写门 fail-closed 缺省拒，KD-M1-3；漏传 ⇒ 缺档格退化
+  // `init-failed`）。任何非 ok 态都不抛（KD-M1-25）。
+  const r = resolveEngineeringManifest(cwd, { writer: "main" })
+  agent._projectView = { ...projectView(cwd), created: r.ok && r.created === true }
+  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 流程处理）。幂等：有效时清标记，无效时置标记 + 原因。

package/src/cli/memory-command.mjs

@@ -1,8 +1,8 @@
 import { isAbsolute, join } from "node:path"
-import { loadConfig } from "../config.mjs"
+import { loadConfig } from "@thincoder/core/config.mjs"
 import { teamConfig } from "./make-agent.mjs"
-import { put, search, list } from "../memory/core.mjs"
-import { deleteByUid } from "../memory/delete.mjs"
+import { put, search, list } from "@thincoder/core/memory/core.mjs"
+import { deleteByUid } from "@thincoder/core/memory/delete.mjs"
 
 /** thincoder memory <list|search|put|remove> subcommands.
  *  opts.dirs: { project, team } layer directories for project/team file deletion (tests inject their own);

package/src/cli/permission.mjs

@@ -1,48 +1,4 @@
-import { createInterface } from "node:readline"
-
-/** CLI tool arg summary (truncated long JSON) */
-export function summarize(toolArgs) {
-  const s = JSON.stringify(toolArgs)
-  return s.length > 120 ? s.slice(0, 120) + "..." : s
-}
-
-/** Permission request key info (per-tool customized), aligned with TUI formatPermission. name may include sub-agent prefix ("coder/bash") — extract basename for matching */
-export function formatPermission(name, args) {
-  const cap = (s, n = 1000) => (s.length > n ? `${s.slice(0, n)}…(共 ${s.length} 字符)` : s)
-  const base = name.includes("/") ? name.split("/").pop() : name
-  if (base === "bash") return cap(args.command ?? "")
-  if (base === "write") return `${args.path}（写入 ${(args.content ?? "").length} 字符）\n${cap(args.content ?? "", 1000)}`
-  if (base === "edit") {
-    const oldLines = cap(args.old_string ?? "", 500).split("\n").map((l) => `- ${l}`).join("\n")
-    const newLines = cap(args.new_string ?? "", 500).split("\n").map((l) => `+ ${l}`).join("\n")
-    return `${args.path}\n${oldLines}\n  ↓\n${newLines}`
-  }
-  if (base === "delete") return `${args.path}${args.force ? "（force：跟踪文件也删）" : ""}`
-  if (base === "subagent") return cap(args.task ?? "", 500)
-  if (base === "memory") {
-    // §6 action-routed preview: put shows content, batch delete/clear show the gate args
-    const action = String(args.action ?? "")
-    if (action === "put") return `[${args.type ?? ""}] ${args.title ?? ""}\n${cap(args.content ?? "", 500)}`
-    if (action === "delete") return args.id ? `id=${args.id}${args.layer ? ` layer=${args.layer}` : ""}` : `batch delete layer=${args.layer ?? ""} type=${args.type ?? ""} keyword=${args.keyword ?? ""} confirm=${args.confirm}`
-    if (action === "clear") return `clear layer=${args.layer ?? ""} confirm=${args.confirm}`
-    return cap(summarize(args), 300)
-  }
-  return cap(summarize(args), 300)
-}
-
-/** Permission confirmation: interactive y/n on TTY; non-interactive defaults to deny (safety-first) */
-export async function askPermission(name, toolArgs) {
-  if (!process.stdin.isTTY) {
-    console.error(`\n[deny] ${name} (non-interactive, side-effect tools require a TTY)`)
-    return false
-  }
-  const rl = createInterface({ input: process.stdin, output: process.stderr })
-  try {
-    const answer = await new Promise((resolve) => {
-      rl.question(`\n[allow?] ${name}\n${formatPermission(name, toolArgs)}\n(y/N) `, resolve)
-    })
-    return answer.trim().toLowerCase() === "y"
-  } finally {
-    rl.close()
-  }
-}
+/** permission.mjs — CLI 转口档（P2 机制层端差批 §2.20）：闸语义 + 每工具请示文案单源 = 核
+ *  `permission.mjs`（#165 落点——本端零第二实现）；展示面由核的 `io.ask` 缝承载。
+ *  导出面与核逐字对齐，保既有 import 面（`bin/thincoder.mjs` · `distill-command.mjs`）。 */
+export { summarize, formatPermission, askPermission } from "@thincoder/core/permission.mjs"

package/src/cli/setup-wizard.mjs

@@ -1,5 +1,5 @@
 import { createInterface } from "node:readline"
-import { configPath, writeConfigAtomic, PROVIDER_PRESETS } from "../config.mjs"
+import { configPath, writeConfigAtomic, PROVIDER_PRESETS } from "@thincoder/core/config.mjs"
 import { probeChannelModels } from "../tui/model-catalog.mjs"
 
 /** First-time setup (TTY chat / distill): ask a few questions to configure a provider, save to disk, return runtime provider. Cancel returns null. */

package/src/completions.mjs

@@ -21,7 +21,7 @@ export function printCompletion(shell) {
     distill) COMPREPLY=( \\$(compgen -W "--yes --layer=" -- "\\$cur") ) ;;
     completion) COMPREPLY=( \\$(compgen -W "bash zsh fish" -- "\\$cur") ) ;;
     *)
-      COMPREPLY=( \\$(compgen -W "chat acp memory sync reindex distill upgrade completion session -v --version -h --help" -- "\\$cur") ) ;;
+      COMPREPLY=( \\$(compgen -W "tui chat acp memory sync reindex distill upgrade completion session -v --version -h --help" -- "\\$cur") ) ;;
   esac
 }
 complete -F _thincoder thincoder
@@ -39,6 +39,7 @@ _thincoder() {
   case "\\$state" in
     cmd)
       _values 'command' \\
+        'tui[Launch the interactive TUI]' \\
         'chat[One-shot agent run with tools]' \\
         'acp[Agent Client Protocol server for IDEs]' \\
         'memory[Manage long-term memory]' \\
@@ -69,6 +70,7 @@ _thincoder
 complete -c thincoder -f
 
 # Subcommands
+complete -c thincoder -a tui      -d 'Launch the interactive TUI'
 complete -c thincoder -a chat     -d 'One-shot agent run with tools'
 complete -c thincoder -a memory   -d 'Manage long-term memory'
 complete -c thincoder -a sync     -d 'Sync team memory repo'

package/src/crash-reports.mjs

@@ -27,7 +27,7 @@ import { chmodSync, existsSync, mkdirSync, readdirSync, statSync, unlinkSync, wr
 import { join } from "node:path"
 // F3① 命名空间 import：API 缺失（旧 Node）降级为调用期异常并被武装 try 吞掉——不做 import 期硬失败
 import * as v8 from "node:v8"
-import { configDir } from "./config.mjs"
+import { configDir } from "@thincoder/core/config.mjs"
 
 /** F3② 关值集合（trim + 大小写不敏感）；其余取值（未设 / 空串 / 未知串）默认开——fail-open 向取证。 */
 const HEAP_SNAPSHOT_OFF_VALUES = new Set(["0", "false", "off", "no"])

package/src/distill.mjs

@@ -4,10 +4,10 @@
  * Absolutely no automatic storage at session end.
  */
 
-import { chat } from "./provider/index.mjs"
-import { loadConfig } from "./config.mjs"
-import { put, putMarkdown } from "./memory.mjs"
-import { commitAndPush } from "./git/gitmem.mjs"
+import { chat } from "@thincoder/core/provider/index.mjs"
+import { loadConfig } from "@thincoder/core/config.mjs"
+import { put, putMarkdown } from "@thincoder/core/memory.mjs"
+import { commitAndPush } from "@thincoder/core/git/gitmem.mjs"
 
 const DISTILL_PROMPT = `You are a knowledge extractor. Read the following agent work session log and extract knowledge worth remembering across sessions.
 

package/src/heap-watch.mjs

@@ -16,7 +16,7 @@
  * 直驱（零等待）；失败面全吞（采样抛错不阻断——样本失败静默跳过本次）。
  */
 import { getHeapStatistics } from "node:v8"
-import { logEvent } from "./log.mjs"
+import { logEvent } from "@thincoder/core/log.mjs"
 
 /** 关值集合（单点判定——§3.2 同约定复用）。 */
 export const HEAP_WATCH_OFF = new Set(["0", "false", "off", "no"])

package/src/prompt-injections.mjs

@@ -0,0 +1,20 @@
+/**
+ * prompt-injections.mjs — the CLI end's prompt-anchor value table.
+ *
+ * The core's single resolution face (`@thincoder/core/prompt-files.mjs`) owns the anchors
+ * (`{{inject:<name>}}` in `thincoder-core/prompts/` + `thincoder-core/tool-docs/`); this end
+ * supplies the values. The table is registered ONCE at the process entry (`bin/thincoder.mjs`)
+ * — before any assembly — via `configurePromptInjections`.
+ *
+ * 2026-09-17 消端差：提示词面（persona / discipline / common）注入锚全消——导航注记删
+ * （正文自足）、端特有段通用化并入核内正文、文档地图路径统一写死 `docs/README.md`。
+ * 剩 = 工具面 2 锚（bash-terminal-face / question-ui-face——真实工具差异，待工具面 review 处置）。
+ */
+
+/** 工具面 2 锚（锚名 → 本端取值）。 */
+export const CLI_PROMPT_INJECTIONS = {
+  // bash 宿主终端面——CLI 无 terminal 参数（工具面 review 再统一）
+  "bash-terminal-face": "",
+  // question 工具可用性行（核内正文该行已移出正文、锚原位替换——本端填回 CLI 措辞）
+  "question-ui-face": "- Availability: this tool needs an interactive UI — in contexts without one (headless runs, subagent children) it returns an error instead of asking; put the question in your reply text instead.",
+}

package/src/tui/agent-turn.mjs

@@ -14,13 +14,13 @@
  * 递归回本文件（函数级静态环——模块求值期无顶层调用，环安全——session-slots ↔
  * session.mjs 同款先例）。
  */
-import { runAgent, ContinueError } from "../agent.mjs"
-import { saveSession } from "../session.mjs"
+import { runAgent, ContinueError } from "@thincoder/core/agent.mjs"
+import { saveSession } from "@thincoder/core/session.mjs"
 import { ansi, C } from "./ansi.mjs"
 import { buildToolCallbacks, sweepToolBlocks } from "./tool-events.mjs"
 import { freezeAllSubTasks } from "./subagent-blocks.mjs" // freezeReclaimDigestedBlocks 随 §17 段迁 suspension-drive.mjs
-import { ensureSessionTitle } from "../generate-title.mjs"
-import { logEvent, errText } from "../log.mjs"
+import { ensureSessionTitle } from "@thincoder/core/generate-title.mjs"
+import { logEvent, errText } from "@thincoder/core/log.mjs"
 import { suspensionSession, poolLive } from "./suspension-drive.mjs"
 
 /** Exit-flush bound for the async end-of-run distillation (SEND-STALL-DISTILL §2.5):
@@ -28,6 +28,10 @@ import { suspensionSession, poolLive } from "./suspension-drive.mjs"
  *  never let shutdown hang on the background summary call. */
 const DISTILL_FLUSH_TIMEOUT_MS = 5000
 
+/** Provider 失败面 URL 脱敏（X8——判据与 VSC `panel-turn-loop.mjs:153` 同式；两端各自持有
+ *  字面 = 双写登记——单源化须动 VSC/核写域，出本批射程，见批档 §2.3）。 */
+const PROVIDER_URL_RE = /https?:\/\/[^\s,)"]+/g
+
 /**
  * 第 33 批（TUI §14.3(d)——纯函数，供测试直驱）：回合链尾「需要用户」谓词——agent 已停
  * 且无自动续跑 ⇒ 置 attention 位。排除项语义（F13）：`skipSession`（digest / 会话内回合
@@ -45,6 +49,8 @@ export function userNeededAtTurnEnd(state, agent, skipSession) {
  * user/auto；result ok/stopped/error）。内层经 _logOutcome 载具回传终止原因（中止/
  * turn-cap 拒绝/错误 vs 正常完成）——嵌套回合（队列递归/挂起会话内 digest 轮）各自
  * 新开载具（每次包装调用独立），互不串扰。err:internal = 逃出内层的未分类异常。
+ * @returns {Promise<"ok"|"stopped"|"error">} 本回合终态（同一载具外化——X9 消化轮
+ *  收尾可见行的 ok/aborted 判据；VSC digest end ok 旗标同口径）。
  */
 export async function runAgentTurn(ctx, text, opts = {}) {
   const kind = opts?.autoTurn ? "auto" : "user"
@@ -55,8 +61,8 @@ export async function runAgentTurn(ctx, text, opts = {}) {
   const t0 = Date.now()
   logEvent("turn:start", { kind })
   try {
-    const result = await runAgentTurnInner(ctx, text, runOpts)
-    return result
+    await runAgentTurnInner(ctx, text, runOpts)
+    return carrier.result ?? "ok"
   } catch (e) {
     carrier.result = "error"
     logEvent("err:internal", { msg: errText(e, 200), where: "runAgentTurn" })
@@ -68,7 +74,7 @@ export async function runAgentTurn(ctx, text, opts = {}) {
 
 /** runAgentTurn 本体（LOGGING 包装之外——见上方包装器）。 */
 async function runAgentTurnInner(ctx, text, opts) {
-  const { autoTurn = false, skipSession = false } = opts ?? {}
+  const { autoTurn = false, skipSession = false, upstreamTurn = false } = opts ?? {} // upstreamTurn：上行 ask 唤醒轮旗标（§6.27.12.5 D/I——透传核 runAgent，仅供域文本选择）
   const { agent, state, pushLine, pushLabel, render, scheduleRender, ensureAssistantLabel, askPermission, askBatchPermission, askQuestion, handleSlash } = ctx
   // 可注入覆盖（测试用）；默认走真实实现
   const runAgentImpl = ctx.runAgent ?? runAgent
@@ -144,7 +150,7 @@ async function runAgentTurnInner(ctx, text, opts) {
   try {
     for (let resume = false; ; resume = true) {
       try {
-        await runAgentImpl(agent, text, callbacks, { signal: state.controller.signal, resume, autoTurn, suspDriven: true })
+        await runAgentImpl(agent, text, callbacks, { signal: state.controller.signal, resume, autoTurn, upstreamTurn, suspDriven: true })
         flushStream()
         break // Normal completion, exit loop
       } catch (error) {
@@ -216,7 +222,32 @@ async function runAgentTurnInner(ctx, text, opts) {
           state.controller = makeController()
           continue
         }
-        pushLine(`[error] ${error.message}`, C.error)
+        // X8（2026-09-20 端差·显示面消差批）：provider 失败面 = 友好首行（判据同 VSC
+        // panel-turn-loop.mjs:152-153：原文首行 + URL 脱敏）+ 诊断两行（Provider/Model）+ Retry
+        // 询问（复用 permission 机制——同意 ⇒ 重建 controller + resume 重入，与 ContinueError
+        // 同法；拒绝 ⇒ 现状 break，[error] 行保留）。
+        const rawMsg = error?.message || String(error)
+        const errLine = rawMsg.split("\n")[0].replace(PROVIDER_URL_RE, "[endpoint]")
+        // X8 跟进②（用户 2026-09-20 裁定）：原文余行 = **log-only**（表面零膨胀——不增 UI 行）。
+        // `head` 与 `err` **同过脱敏管道**（PROVIDER_URL_RE ⇒ `[endpoint]`——LOGGING.md §6.3
+        // D-LG4「URL 不入事件」）**先脱敏后截断**（防截断留 URL 残段），自限 ≤200（`err` 200 +
+        // `head` 200 + 固定字段 < 512——log.mjs NF-L2）；无余行 ⇒ 传 `null`（勿传空串）。
+        const restRaw = rawMsg.split("\n").slice(1).map((l) => l.trim()).filter(Boolean).join(" / ")
+        const restSan = restRaw.replace(PROVIDER_URL_RE, "[endpoint]")
+        logEvent("err:provider", { err: errLine, head: restSan ? (restSan.length > 200 ? restSan.slice(0, 199) + "…" : restSan) : null })
+        pushLine(`[error] ${errLine}`, C.error)
+        pushLine(`→ Provider: ${agent.provider?.baseURL}`, C.dim)
+        pushLine(`→ Model: ${agent.provider?.model}`, C.dim)
+        const willRetry = await new Promise((resolve) => {
+          state.permission = { name: "retry", args: { message: errLine }, resolve }
+          state.status = "Retry after provider error?"
+          render()
+        })
+        state.permission = null
+        if (willRetry) {
+          state.controller = makeController()
+          continue
+        }
         if (opts?._logOutcome) opts._logOutcome.result = "error"
         break
       }

package/src/tui/cmd-advisor.mjs

@@ -3,7 +3,7 @@
  *  ctx: { agent, showPicker, pushLine, pushLabel, persistRaw } */
 import { readFileSync } from "node:fs"
 import { ansi, C } from "./ansi.mjs"
-import { activeSlot, slotPath } from "../session.mjs"
+import { activeSlot, slotPath } from "@thincoder/core/session.mjs"
 import { writeSessionFile } from "./cmd-eng.mjs"
 
 export async function handleAdvisorCommand(ctx) {
@@ -98,7 +98,7 @@ export async function handleAdvisorCommand(ctx) {
         pushLabel("❯ Advisor", ansi.bold + C.tool)
         pushLine("Thinking: using main model settings", C.tool)
       } else if (c.action === "think_on") {
-        const { specForModel } = await import("../config.mjs")
+        const { specForModel } = await import("@thincoder/core/config.mjs")
         const spec = specForModel(getEffectiveModel(agent, cfg))
         cfg.thinking = { type: spec.thinkEnabledValue ?? "enabled" }
         if (spec.thinkApi === "effort") delete cfg.thinking
@@ -106,7 +106,7 @@ export async function handleAdvisorCommand(ctx) {
         pushLabel("❯ Advisor", ansi.bold + C.tool)
         pushLine(`Thinking: ON`, C.tool)
       } else if (c.action === "think_off") {
-        const { specForModel } = await import("../config.mjs")
+        const { specForModel } = await import("@thincoder/core/config.mjs")
         const spec = specForModel(getEffectiveModel(agent, cfg))
         const isCustomThink = (spec.thinkEnabledValue ?? "enabled") !== "enabled"
         cfg.thinking = isCustomThink ? null : { type: "disabled" }
@@ -179,7 +179,7 @@ function getEffectiveModel(agent, cfg) {
 }
 
 async function fetchAdvisorModels(agent) {
-  const { listModels } = await import("../provider/index.mjs")
+  const { listModels } = await import("@thincoder/core/provider/index.mjs")
   const result = new Map()
   await Promise.all((agent.providers || []).map(async (p) => {
     try {
@@ -223,7 +223,7 @@ function buildModelEntries(agent, cfg, cache) {
 }
 
 async function buildThinkingEntries(agent, cfg) {
-  const { specForModel } = await import("../config.mjs")
+  const { specForModel } = await import("@thincoder/core/config.mjs")
   const providerForDefaults = cfg.provider
     ? agent.providers?.find(p => p.name === cfg.provider) || agent.provider
     : agent.provider

package/src/tui/cmd-config.mjs

@@ -23,7 +23,7 @@ export function poolCur(pl, defaults) {
 /** /config command: view and set agent/embedding/proxy config. */
 export async function handleConfigCommand(ctx, args = []) {
   const { agent, pushLine, pushLabel, showPicker, askQuestion, persistRaw, maskKey, pickModelForSlot } = ctx
-  const { configPath, DEFAULTS } = await import("../config.mjs")
+  const { configPath, DEFAULTS } = await import("@thincoder/core/config.mjs")
   let ac = agent.config?.agent ?? {}
   let ec = agent.config?.embedding ?? {}
   let tc = agent.config?.traces ?? {}
@@ -43,7 +43,7 @@ export async function handleConfigCommand(ctx, args = []) {
     agent.config.embedding ??= {}
     agent.config.embedding.apiKey = embKey
     if (agent.memory) {
-      const { createEmbedder } = await import("../embedding.mjs")
+      const { createEmbedder } = await import("@thincoder/core/embedding.mjs")
       agent.memory.embedder = createEmbedder(agent.config.embedding)
     }
     pushLabel("❯ Config", ansi.bold + C.tool)
@@ -55,8 +55,8 @@ export async function handleConfigCommand(ctx, args = []) {
    *  MODEL-MERGE-SESSION 三支改写（cfg 无 active*）：运行时由「会话槽复合仍在 providers 中 →
    *  保持槽值」或「config defaultModel（新会话起点）」决定——不再有渠道默认字段可回退。 */
   async function reloadConfig() {
-    const { loadConfig } = await import("../config.mjs")
-    const { injectProxy } = await import("../proxy.mjs")
+    const { loadConfig } = await import("@thincoder/core/config.mjs")
+    const { injectProxy } = await import("@thincoder/core/proxy.mjs")
     const cfg = loadConfig()
     injectProxy(cfg.providersList, cfg)
     const sessionName = agent.activeProvider
@@ -82,7 +82,7 @@ export async function handleConfigCommand(ctx, args = []) {
     // 运行时重建后同步注入结果（cfg.provider 系 loadConfig 内建——injectProxy 后建）
     agent.provider.proxyUri = cfg.providersList.find((p) => p.name === agent.activeProvider)?.proxyUri
     if (agent.config?.agent?.compactThresholdAuto) {
-      const { resolveCompactThreshold } = await import("../config.mjs")
+      const { resolveCompactThreshold } = await import("@thincoder/core/config.mjs")
       agent.config.agent.compactThreshold = resolveCompactThreshold(null, agent.provider).value
     }
   }
@@ -136,8 +136,8 @@ export async function handleConfigCommand(ctx, args = []) {
           pushLabel("❯ Config", ansi.bold + C.tool)
           pushLine(`proxy.${key} = ${!pc[key] ? "on" : "off"}`, C.tool)
         } else if (c.action === "test") {
-          const { proxyFetch, resolveWebProxy } = await import("../proxy.mjs")
-          const { UA } = await import("../tools/web.mjs")
+          const { proxyFetch, resolveWebProxy } = await import("@thincoder/core/proxy.mjs")
+          const { UA } = await import("@thincoder/core/tools/web.mjs")
           const uri = resolveWebProxy({ agent })
           pushLabel("❯ Config", ansi.bold + C.tool)
           pushLine(`Testing ${uri ? `via proxy ${uri}` : "direct (no proxy)"}...`, C.dim)
@@ -170,7 +170,7 @@ export async function handleConfigCommand(ctx, args = []) {
 
   /** 会诊/飞刀候选池子菜单：列出 / 添加 / 编辑 effort / 删除 consultModels 条目。 */
   async function pickEffort(current, model) {
-    const { specForModel } = await import("../config.mjs")
+    const { specForModel } = await import("@thincoder/core/config.mjs")
     const enumList = model ? specForModel(model).reasoningEffortEnum : null
     // The model's reasoning-effort enum is HETEROGENEOUS across providers (deepseek:
     // low/high/max; qwen3.8-max: xhigh/medium/low; kimi: 7 levels). A fixed

package/src/tui/cmd-eng.mjs

@@ -1,15 +1,18 @@
 /** /eng command: toggle engineering mode.
- *  No prerequisites (FR11): the mode works on any project — no methodology file,
- *  no docs tree, no git. The retired gate demanded a methodology file and offered
- *  to create it from a template that no longer ships — that option crashed
- *  (PORTABILITY P14). ctx: { agent, pushLine, pushLabel } */
+ *  No retired-concept prerequisites (FR11 收正口径 — `docs/core/requirements/PORTABILITY.md:62`):
+ *  no methodology file, no docs tree. The **repo-root anchor（git）= E2 既有入口前提**：
+ *  非锚 cwd 上 ON = fail-closed 拒翻 + 明示原因、模式保持 OFF（#41 —
+ *  `docs/core/design/MANIFEST.md` §2.8 F2/F3；判定面 = 入口决策树单源）。
+ *  ctx: { agent, pushLine, pushLabel } */
 import { readFileSync, writeFileSync, mkdirSync, renameSync, unlinkSync } from "node:fs"
 import { dirname } from "node:path"
 import { ansi, C } from "./ansi.mjs"
-import { activeSlot, slotPath } from "../session.mjs"
-import { purgeExpiredDesignTokens } from "../token-ttl.mjs"
+import { activeSlot, slotPath } from "@thincoder/core/session.mjs"
+import { purgeExpiredDesignTokens } from "@thincoder/core/token-ttl.mjs"
+import { resolveEngineeringManifest } from "@thincoder/core/manifest.mjs"
 
-import { ENG_OFF_REMINDER } from "../agent.mjs"
+import { ENG_OFF_REMINDER } from "@thincoder/core/agent.mjs"
+import { clearPlanMode } from "@thincoder/core/agent-tools/plan.mjs"
 
 /** Atomic slot write (same shape as session.mjs writeSessionFile — kept local to avoid a
  *  private-import; cmd-advisor's guard toggle shares this helper). */
@@ -29,9 +32,26 @@ export async function handleEngCommand(ctx) {
   const { agent, pushLine, pushLabel } = ctx
   agent.config.agent ??= {}
 
-  // Toggle on/off — no prerequisite check (FR11: engineering mode depends on no
-  // project file at all; a missing docs tree or git repo must not block it).
+  // No retired-concept prerequisite check (FR11 收正口径；退场原因见档头注)。ON 方向的门
+  // = 入口决策树（下方）；OFF 方向恒放行（F2 表 OFF 行——零 manifest I/O）。
+  //
+  // #41 先判后翻（MANIFEST.md §2.8 F2/F3 · KD-M1-21）：**ON 方向**先走入口决策树单源
+  // （resolveEngineeringManifest——KD-M1-20），判据通过才写态；OFF 方向零改（F2 表 OFF 行）。
+  // 拒 ⇒ warn 行 + **零标签**（标签 = 成功回显——拒时零标签防假成功）+ 零副作用
+  // （模式未翻 / token 未清 / `_advisorRuns` 未重置 / 提醒未入列 / 槽未写）。
+  // 准 ⇒ 缺档格就地建档（writer:'main'）+ `agent.manifest` ← 结果（相位行当回合起活）。
+  if (!agent.config.agent.engineering) {
+    const r = resolveEngineeringManifest(agent.cwd ?? process.cwd(), { writer: "main" })
+    if (!r.ok) {
+      pushLine(`Engineering mode not enabled — ${r.message} (mode unchanged)`, C.warn)
+      return
+    }
+    agent.manifest = r.manifest
+  }
   agent.config.agent.engineering = !agent.config.agent.engineering
+  // FR31 ③ / KD10（翻转点②·CLI `/eng`）：ON ⇒ 清 plan 残留（内存位 + 未注入的 plan 提示语）；
+  // OFF 方向不动（普通模式零改——FR31 边界）。提示行仅在真清到东西时出（不喧宾）。
+  const planReset = agent.config.agent.engineering ? clearPlanMode(agent) : false
   // §11.2 D-24b: per-review instances die with the mode (fresh convergence cycles
   // on the next toggle).
   agent._advisorRuns = new Map()
@@ -52,6 +72,9 @@ export async function handleEngCommand(ctx) {
   pushLine(`Engineering mode: ${agent.config.agent.engineering ? "ON" : "OFF"} (session)`, C.tool)
   if (agent.config.agent.engineering) {
     pushLine(`  → design-before-code enforced (design review + user approval before code)`, C.dim)
+    if (planReset) {
+      pushLine(`  → plan mode reset (engineering mode excludes plan mode)`, C.dim)
+    }
     if (clearedExpired > 0) {
       pushLine(`  → cleared ${clearedExpired} expired design token${clearedExpired === 1 ? "" : "s"}; valid tokens from prior reviews stay usable`, C.dim)
     }
@@ -64,6 +87,8 @@ export async function handleEngCommand(ctx) {
  * VS Code, per-session; config.json is just the initial default, no mirror write).
  * The in-memory agent.config.agent.engineering (already flipped) stays the live authority for
  * this process; saveSession also round-trips it on every turn-end write.
+ * 槽写也担 FR31 ③ 的槽位收正（T12）：ON 时 `data.planMode = false`——否则下次装载/恢复
+ * 把 plan-active 推回 UI（半状态复活面；验收判据 = 「内存 + 槽位」双清零）。OFF 方向零改。
  */
 async function persistEngineering(agent) {
   const slot = activeSlot(agent.cwd)
@@ -72,6 +97,7 @@ async function persistEngineering(agent) {
     const data = JSON.parse(readFileSync(p, "utf8"))
     if (data && typeof data === "object" && Array.isArray(data.history)) {
       data.engineering = agent.config.agent.engineering
+      if (agent.config.agent.engineering) data.planMode = false
       writeSessionFile(p, data)
     }
   } catch { /* slot missing/unreadable — in-memory flag already flipped; saveSession persists at turn end */ }