thincoder 0.12.60 → 0.12.61

package/src/agent-tools/escalate-async.mjs

@@ -25,13 +25,14 @@
  *   domain still follows the consuming turn's tier — no family exception).
  */
 import { relative, isAbsolute } from "node:path"
-import { runAgent, createAgent, CODER_OVERLAY, DEFAULT_SUBAGENT_TURNS } from "../agent.mjs"
+import { runAgent, createAgent, DEFAULT_SUBAGENT_TURNS } from "../agent.mjs"
 import { runWithContinue, TURN_CAP_MARK, wrapChildCallbacks } from "../agent/spawn-child.mjs"
 import { logEvent } from "../log.mjs"
+import { deathLine } from "../abort-provenance.mjs"
 import {
-  mergeChildMutations, runningPoolCount, poolDomainOf, poolLimitsFor, ASYNC_POOL_LIMITS,
+  mergeChildMutations, runningPoolCount, poolDomainOf, poolLimitsFor, ASYNC_POOL_LIMITS, enqueueAsk,
 } from "./subagent-async.mjs"
-import { refreshQueuedTokens } from "./subagent-scheduler.mjs"
+import { refreshQueuedTokens, nextSubagentId } from "./subagent-scheduler.mjs"
 import { mutationSeqOf } from "./advisor-async.mjs"
 // ASYNC-RESULT-CONTAINER.md D3/D6：settle 公共收尾单点 + child signal 构建单点
 import { buildChildSignal, settleAsyncEntry } from "./async-settle.mjs"
@@ -146,12 +147,13 @@ export function launchEscalateAsync(parent, ctx, launch) {
   // counter at launch — the returned id stays stable while the entry sits queued.
   // The [model] token (TUI block creation) is DEFERRED to actual start so queued
   // flights don't paint an empty panel block (subagent-parity).
-  parent._subAgentCounter = (parent._subAgentCounter ?? 0) + 1
-  const relayPrefix = `escalate#${parent._subAgentCounter}/`
-  const id = parent._subAgentCounter
+  // SUBAGENT-ID-COUNTER-AGENT（2026-09-09）：取号统一走 nextSubagentId（池活续号
+  // 兜底——counter 载体= agent 本体 _subAgentCounter——跨 run/跨压缩存活）。
+  const id = nextSubagentId(parent)
+  const relayPrefix = `escalate#${id}/`
   const entry = {
     id, role: "escalate", relayPrefix,
-    _pool: poolDomainOf("escalate"), // other — shares the domain with explore/plan/coder (§24 D-24a)
+    _pool: poolDomainOf("escalate"), // other — shares the domain with explore/plan/coder (§11.1 D-24a)
     status: "queued",
     position: undefined,
     report: null, error: null, done: false, cancelled: false,
@@ -173,8 +175,9 @@ export function launchEscalateAsync(parent, ctx, launch) {
   // D6 buildChildSignal 单点（ASYNC-RESULT-CONTAINER.md——D5 同款：_sessionSignal 兜底）。
   const baseSignal = buildChildSignal(parent, ctx)
   if (baseSignal) {
-    if (baseSignal.aborted) ctrl.abort()
-    else baseSignal.addEventListener("abort", () => ctrl.abort(), { once: true })
+    // §20.3 站点 #10（第 24 批）：hop 逐跳保 reason
+    if (baseSignal.aborted) ctrl.abort(baseSignal.reason)
+    else baseSignal.addEventListener("abort", () => ctrl.abort(baseSignal.reason), { once: true })
   }
   // Turn mirror (⟦ev⟧turn from the child runAgent → entry.turn/maxTurns — status parity).
   const flight = async () => {
@@ -189,7 +192,7 @@ export function launchEscalateAsync(parent, ctx, launch) {
       config: parent.config,
       cwd: parent.cwd,
       memory: parent.memory,
-      overlay: CODER_OVERLAY,
+      // G3（施工②）：overlay 摘除——coder 人格槽由 assemblePrompt 场景表承载（G3 映射）。
       role: "coder",
     })
     entry.childAgent = child // settle 分类/status touched 摘要绑定（start 时刻）
@@ -220,8 +223,7 @@ export function launchEscalateAsync(parent, ctx, launch) {
       : async (name, toolArgs) => {
           if (!ctx.onPermissionRequest) return false
           const ask = () => ctx.onPermissionRequest(`escalate/${name}`, toolArgs)
-          parent._permQueue = (parent._permQueue ?? Promise.resolve()).then(ask, ask)
-          return parent._permQueue
+          return enqueueAsk(parent, "_permQueue", ask)
         }
     const report = await runWithContinue(
       (childAgent, input, cbs, opts) => runner(childAgent, input, cbs, opts),
@@ -252,7 +254,8 @@ export function launchEscalateAsync(parent, ctx, launch) {
         // 运行失败/中止：错误文本落 entry.error（子代理同款——cancel 分支忽略它；
         // Ctrl+I 中止的残条目由收尾消化带错误文本——不落空 "(no report)" digest）。
         const child = entry.childAgent
-        entry.error = `escalate (${tag}) error: ${e?.message ?? String(e)}\nPartial output: ${(child?._capturedOutput ?? "").slice(0, 2000)}`
+        // §20.3 第 3 条合成器（第 24 批）：原 message 前缀逐字保留 + 来源后缀
+        entry.error = `escalate (${tag}) error: ${deathLine(e, entry.controller?.signal)}\nPartial output: ${(child?._capturedOutput ?? "").slice(0, 2000)}`
       })
       .finally(() => {
         // settle 公共收尾单点（ASYNC-RESULT-CONTAINER.md D3——settleAsyncEntry）：日志三连

package/src/agent-tools/read-history.mjs

@@ -26,12 +26,14 @@
  * filter surface; path = "cwd:<dir>" → list every slot stored for that directory
  * (slot number + full file path + title/message count/updatedAt — no dead-slot
  * filtering, v1 decision). Single-file retrieval is guarded by a line-scan cap
- * (READ_HISTORY_SCAN_MAX) — an oversized file is refused before it is read whole.
+ * (READ_HISTORY_SCAN_MAX — an oversized file is refused before it is read whole)
+ * plus a message-count cap (READ_HISTORY_MAX_MESSAGES = 50,000 — L24 双保险第二道).
  *
  * readonly: true — planMode pass / no permission ask. Registered depth-0 only:
  * subagents get their own throwaway history, so querying "the session" from a
  * child would be semantically confusing (SESSION.md §9.5 refinement 1 + §13 T-R19.4).
- * Mirrored 1:1 in thincoder-vscode/src/agent-tools/read-history.mjs.
+ * §13 R19 extension mirrored per SESSION.md §13 — double-end isomorphic, no
+ * cross-end byte test (thincoder-vscode/src/agent-tools/read-history.mjs).
  */
 
 import { openSync, readSync, closeSync, readFileSync, existsSync, statSync } from "node:fs"
@@ -46,6 +48,10 @@ const VALID_ROLES = new Set(["user", "assistant", "tool"])
 /** 单槽检索行扫护栏（SESSION.md §13 D-R19a——评审 #3 定稿：超限不再读全文，返回定稿错误文案）。 */
 export const READ_HISTORY_SCAN_MAX = 200_000
 
+/** L24 消息数预算（评审 #2 钉死——双保险第二道）：行扫按物理 \n 行计——JSON 单行槽
+ *  行扫不设防——parse 后 history 数组长度超限即拒（同款定稿文案——双端同常量同文案）。 */
+export const READ_HISTORY_MAX_MESSAGES = 50_000
+
 /** 超限错误文案（SESSION.md §13——逐字定稿——T-R19.7 断言）。 */
 const TOO_LARGE_ERROR = JSON.stringify({ error: "session too large — refine keyword or since/until" })
 
@@ -181,6 +187,10 @@ function querySessionFile(pathArg, { role, kwRe, tool, since, until, direction,
   if (!data || typeof data !== "object" || !Array.isArray(data.history)) {
     return `Error: ${file} is not a valid session file (no history array)`
   }
+  if (data.history.length > READ_HISTORY_MAX_MESSAGES) {
+    // L24 消息数第二道（parse 后——行扫按物理行、单行 JSON 槽行扫不设防——超限同款拒绝）。
+    return TOO_LARGE_ERROR
+  }
   const matched = data.history.filter((m) => matches(m, { role, kwRe, tool, since, until }))
   return formatMatches(matched, direction, limit)
 }
@@ -222,7 +232,7 @@ export const readHistoryTool = {
     "Cross-session (path, optional): a session file path deep-queries THAT session's history with the same filters " +
     "(relative paths resolve against the project cwd); \"cwd:<dir>\" lists every session slot stored for that directory — " +
     "one line per slot: slot number + full session file path + title + message count + updatedAt; copy a listed file path into path= to deep-query it. " +
-    "A session file over 200,000 lines is refused (\"session too large\") instead of being read whole.\n" +
+    "A session file over 50,000 messages or 200,000 lines is refused (\"session too large\") instead of being read whole.\n" +
     SEARCH_FAMILY_GUIDE,
   parameters: {
     type: "object",

package/src/agent-tools/review-streak.mjs

@@ -0,0 +1,93 @@
+/**
+ * review-streak.mjs — design-review failure streak guard（第 33 批——2026-09-11）。
+ *
+ * 同一 doc-set 的 design 评审**连续**未产出可用结算（宿主截断尾五 kind + 陈旧结算 +
+ * 凭证落盘失败 + 无报告结算）达 `MAX_DESIGN_REVIEW_STREAK` 次 ⇒ 后续发起被拒
+ * （工具层预检 + `runAdvisorReview` 内防线两级——零 LLM / 不耗轮次 / 不置「评审已覆盖」）。
+ * 设计权威 = `docs/design/ADVISOR-CONVERGENCE.md` §17（需求 = requirements 档 §12 F28/F29 + N20/N21）。
+ *
+ * 中立模块（**不 import 任何 src/ 模块**——打断潜在环，§17.5 模块图）：
+ *  - `normAbs` 自 advisor-settle.mjs 迁入（原处 re-export——既有 import 面零变）；
+ *  - `docSetKey` 自 advisor-async.mjs 迁入（原为私有——零 import 面）。
+ * 分类单源：`designReviewOutcome` 为异步结算 / 同步面两计数点共用（D-SK8——防两处分类漂移）。
+ * 载体 = 会话级内存 `agent._designReviewStreaks`（Map——不落盘、不进 session 文件；
+ * eng 模式切换不清护栏——与 `_advisorRuns` 刻意不同步，§17.9 #5 定案）。
+ */
+import { join } from "node:path"
+
+/** 连续未产出可用结算的阈值（三振——§17.2 表 1 选定 N=3；`MAX_ADVISOR_ROUNDS` 零改动）。 */
+export const MAX_DESIGN_REVIEW_STREAK = 3
+
+/** ABS 归一（cwd 相对 → cwd 拼接）——陈旧判定 / 冻结拦截 / doc-set 键同源（§14.14 E-4）。 */
+export function normAbs(p, cwd) {
+  const s = String(p)
+  return /^[a-zA-Z]:[\\/]/.test(s) || s.startsWith("/") || s.startsWith("\\\\") ? s : join(cwd, s)
+}
+
+/** Canonical scope key for design reviews — the document multi-set
+ *  (order-insensitive, ABS-path normalized — launch 与 continuation 的写法差异
+ *  ("./docs/x.md" vs "docs/x.md"、反斜杠) 不误建新实例).
+ *  第 33 批自 advisor-async.mjs 逐字迁入（护栏与实例续跑同锚单源）。 */
+export function docSetKey(documents, cwd) {
+  const list = [...new Set((documents ?? [])
+    .filter((d) => typeof d === "string" && d.trim())
+    .map((d) => normAbs(d, cwd)))]
+  return JSON.stringify(list.sort())
+}
+
+/** 护栏适用的键判据：空清单（`[]` / `null` 的 `docSetKey` 产出 = "[]"）不适用——不计数、
+ *  不停止（§17.9 #3 登记；fail-open 于此面）。 */
+export function designReviewStreakApplies(key) {
+  return typeof key === "string" && key.length > 0 && key !== "[]"
+}
+
+/**
+ * 结算分类（纯函数单源——§17.3 优先级表，自上而下首个命中；输入 = 宿主可见事实，
+ * **零 LLM 输出解析**，N20）。neutral = 无信息事件（取消 / 中断 / 拒发）——不打断连续计数。
+ * @param {{launchRefused?: boolean, stale?: boolean, hasResult?: boolean,
+ *          incomplete?: string|null, persistFailed?: boolean}} input
+ * @returns {{reset: boolean, count: string|null}} reset=true 计数复位；count=需加一的类名；
+ *   两者皆空 = neutral（不动计数）。
+ */
+export function designReviewOutcome(input) {
+  const { launchRefused = false, stale = false, hasResult = true, incomplete = null, persistFailed = false } = input ?? {}
+  if (launchRefused) return { reset: false, count: null } // 1. 未发起请求（无尝试发生——§14.4 既有语义）
+  if (stale) return { reset: false, count: "stale" } // 2. 陈旧结算（未产出可用凭证）
+  if (!hasResult) return { reset: false, count: "no_report" } // 3. 无报告（fail-closed）
+  if (incomplete && incomplete !== "interrupted") return { reset: false, count: String(incomplete) } // 4. 宿主截断尾五 kind
+  if (incomplete === "interrupted") return { reset: false, count: null } // 5. 用户 / 系统中断类（与 cancelled 同族）
+  if (persistFailed) return { reset: false, count: "no_credential" } // 6. pass 但槽落盘失败（无可用凭证）
+  return { reset: true, count: null } // 7. 可用判决（pass 且落盘成功 / changes-required）——连续链断点
+}
+
+/** 记录只读视图（停止判定与结论表的数据源）；空清单键 / 无载体 ⇒ null。 */
+export function designReviewStreakRecord(agent, key) {
+  if (!designReviewStreakApplies(key)) return null
+  const streaks = agent?._designReviewStreaks
+  return streaks instanceof Map ? (streaks.get(key) ?? null) : null
+}
+
+/** 计数落账（§17.4）：reset ⇒ 删除该键记录；count ⇒ `{count: prev+1, log: […].slice(-N)}`；
+ *  neutral ⇒ 不动。载体懒初始化。 */
+export function noteDesignReviewOutcome(agent, key, outcome) {
+  if (!agent || !designReviewStreakApplies(key) || !outcome) return
+  if (outcome.reset) {
+    if (agent._designReviewStreaks instanceof Map) agent._designReviewStreaks.delete(key)
+    return
+  }
+  if (typeof outcome.count !== "string" || !outcome.count) return
+  const streaks = agent._designReviewStreaks instanceof Map
+    ? agent._designReviewStreaks
+    : (agent._designReviewStreaks = new Map())
+  const prev = streaks.get(key)
+  streaks.set(key, {
+    count: (prev?.count ?? 0) + 1,
+    log: [...(prev?.log ?? []), outcome.count].slice(-MAX_DESIGN_REVIEW_STREAK),
+  })
+}
+
+/** 停止判定：记录达阈值即停；空清单键恒 false。停止不可自解除（复位仅经可用判决——被拒后
+ *  无法发生；会话结束随载体清零）。 */
+export function designReviewStreakStopped(agent, key) {
+  return (designReviewStreakRecord(agent, key)?.count ?? 0) >= MAX_DESIGN_REVIEW_STREAK
+}

package/src/agent-tools/settings.mjs

@@ -4,8 +4,10 @@
  * 语义：set = 写盘（config.json——磁盘真相最小化：只写被设的键——默认值不固化）+
  * 热应用（ctx.agent.config 内存对象立即更新——回合边界键下回合生效）。
  * 护栏：敏感键（路径段含 apiKey/key/token/secret/password）回显/错误文本永不出现明文
- * （••••（masked）——防密钥泄漏进会话历史/trace）；已知键类型校验（类型表自动派生自
- * config.mjs DEFAULTS——不手写防漂移）；set 侧效走审批门（dispatch 动作级分类）。
+ * （••••（masked）——防密钥泄漏进会话历史/trace）；已知键类型校验——非 null 叶子类型表
+ * 自动派生自 config.mjs DEFAULTS（不手写防漂移——F-S1.5/N-S1.5）；null 默认值键与同族键
+ * 走显式形状表（_NULL_LEAF_SHAPES 相等面 / _SIBLING_SHAPES 存在性面——按各自真实消费形态
+ * 校验，完备性机械锁 + 一次性警告；SETTINGS-TOOL.md §8）；set 侧效走审批门（dispatch 动作级分类）。
  */
 import { DEFAULTS, configPath, writeConfigAtomic } from "../config.mjs"
 
@@ -17,19 +19,128 @@ function isSensitiveKey(path) {
   return SENSITIVE_SEGMENT.test(path)
 }
 
+/* ─── 形状层（第 8 批 2026-09-11——SETTINGS-TOOL.md §8.3；两表结构：相等面 / 存在性面） ─── */
+
 /**
- * 类型表：递归遍历 DEFAULTS——叶子（非对象/数组值）记 `路径 → typeof 默认值`。
- * 数组（providersList 等）不递归（下标元素无类型约束——全量域）；对象节递归到叶子。
+ * null 叶子形状表——唯一「逐键手写形状」面（完备性锁的**相等面**：键集 == _nullLeafPaths(DEFAULTS)）。
+ * 表值 = 形状规格：接受集 = 该键真实消费形态 ∪ `null`（显式清除——消费面均有「未设置」态）；
+ * 不可消费形态（应用侧读不出写入值）→ 拒绝（违例抛错，磁盘/内存零变化）。
  */
-function buildTypeMap(obj, prefix = "", out = {}) {
+const _NULL_LEAF_SHAPES = {
+  defaultModel: { kind: "nonEmptyString", providerModel: true, expects: 'non-empty string ("provider:model" composite)' },
+  "agent.subagentModel": { kind: "nonEmptyString", expects: "non-empty string" },
+  shell: { kind: "nonEmptyString", expects: "non-empty string" },
+  "memory.team": { kind: "team", expects: "object { repo: string, name?, dir? }" },
+}
+
+/** 同族/跨端形状表（**存在性断言面**——不参与完备性锁的集合相等）。W3 同族：`agent.subagentModels`
+ *  默认 `{}` ⇒ 派生表零条目 ⇒ 零约束（字符串被静默忽略——回落 subagentModel）。 */
+const _SIBLING_SHAPES = {
+  "agent.subagentModels": { kind: "roleMap", expects: "object of role→non-empty string" },
+}
+
+/** 派生：递归遍历默认值对象——叶子（非对象/数组值）记 `路径 → typeof 默认值`（旧语义逐字保留：
+ *  null 叶子记 "object"，其约束由形状表接管）；数组不递归（下标元素无类型约束——全量域）。 */
+function _deriveTypes(obj, prefix = "", out = {}) {
   for (const [k, v] of Object.entries(obj)) {
     const p = prefix ? `${prefix}.${k}` : k
-    if (v !== null && typeof v === "object" && !Array.isArray(v)) buildTypeMap(v, p, out)
+    if (v !== null && typeof v === "object" && !Array.isArray(v)) _deriveTypes(v, p, out)
     else out[p] = Array.isArray(v) ? "array" : typeof v
   }
   return out
 }
-const TYPE_MAP = buildTypeMap(DEFAULTS)
+
+/** 类型表 = 派生 + 可选 `patch` 覆盖（测试缝——非 null 叶子逐键与派生结果相等；T-S2.15）。 */
+function _buildShapeTable(obj, patch = null) {
+  const out = _deriveTypes(obj)
+  return patch ? Object.assign(out, patch) : out
+}
+const TYPE_MAP = _buildShapeTable(DEFAULTS)
+
+/** null 叶子路径枚举（数组不递归——与派生表同域）。 */
+function _nullLeafPaths(obj, prefix = "", out = []) {
+  for (const [k, v] of Object.entries(obj)) {
+    const p = prefix ? `${prefix}.${k}` : k
+    if (v === null) out.push(p)
+    else if (typeof v === "object" && !Array.isArray(v)) _nullLeafPaths(v, p, out)
+  }
+  return out
+}
+
+/** 完备性锁（N-S1.5）：未声明的 null 叶子 = 形状表漂移——返回键名 + 一次性警告列出键名。 */
+let _shapeWarned = false
+function _checkShapeCompleteness(defaults, warn = console.warn) {
+  const declared = new Set(Object.keys(_NULL_LEAF_SHAPES))
+  const missing = _nullLeafPaths(defaults).filter((p) => !declared.has(p))
+  if (missing.length && !_shapeWarned) {
+    _shapeWarned = true
+    warn(`[settings] null-default keys missing from _NULL_LEAF_SHAPES: ${missing.join(", ")} — declare their real consumption shape (SETTINGS-TOOL.md §8.3; N-S1.5 completeness lock)`)
+  }
+  return missing
+}
+_checkShapeCompleteness(DEFAULTS) // 装载自检——形状表必须覆盖全部 null 叶子（漂移即警告）
+
+/** 值位渲染（错误文本——敏感键命中时遮罩：N-S1.2 / D-S2.4——明文零进错误句）。 */
+function _shownValue(path, value) {
+  return isSensitiveKey(path) ? MASKED : JSON.stringify(value)
+}
+
+function _kindOf(value) {
+  return value === null ? "null" : Array.isArray(value) ? "array" : typeof value
+}
+
+function _expectsError(path, expects, value) {
+  return new Error(`settings set: "${path}" expects ${expects} — got ${_kindOf(value)} (${_shownValue(path, value)})`)
+}
+
+/** 形状校验（形状表命中键——`null` 在 _checkKnownKeyValue 已放行）。 */
+function _checkShape(path, spec, value) {
+  if (spec.kind === "team") {
+    if (!value || typeof value !== "object" || Array.isArray(value)) throw _expectsError(path, spec.expects, value)
+    if (typeof value.repo !== "string" || !value.repo.trim()) {
+      throw new Error(`settings set: "${path}" requires a non-empty "repo" (team layer stays off without it) — got ${_shownValue(path, value)}`)
+    }
+    for (const k of ["name", "dir"]) {
+      if (value[k] !== undefined && (typeof value[k] !== "string" || !value[k].trim())) throw _expectsError(path, spec.expects, value)
+    }
+    return
+  }
+  if (spec.kind === "roleMap") {
+    if (!value || typeof value !== "object" || Array.isArray(value)) throw _expectsError(path, spec.expects, value)
+    for (const v of Object.values(value)) {
+      if (typeof v !== "string" || !v.trim()) throw _expectsError(path, spec.expects, value)
+    }
+    return
+  }
+  // nonEmptyString —— defaultModel 另加 provider:model 形态面（与 model-ref.mjs:25-36 同判据；
+  // 存在性面不查——D-S2.5）
+  if (typeof value !== "string" || !value.trim()) throw _expectsError(path, spec.expects, value)
+  if (spec.providerModel) {
+    const sep = value.indexOf(":")
+    if (sep <= 0 || !value.slice(sep + 1)) throw _expectsError(path, spec.expects, value)
+  }
+}
+
+/**
+ * 已知键值校验（set 写盘前；违例抛错——磁盘/内存零变化）：
+ * ① 形状表命中键（`_NULL_LEAF_SHAPES` / `_SIBLING_SHAPES` **两表都查**——表值 = 形状规格）→ 形状校验
+ *    （`null` = 显式清除，放行）；② 非 null 叶子（派生表值 = `typeof` 串）→ 既有语义逐字保留
+ *    （`want === "array"` 跳过 / `null` + `want === "object"` 放行）；③ 未知键 → 原样通过（全量域）。
+ */
+function _checkKnownKeyValue(path, value) {
+  const spec = _NULL_LEAF_SHAPES[path] ?? _SIBLING_SHAPES[path]
+  if (spec) {
+    if (value === null) return // 显式清除 = 有效动作（消费面均有「未设置」态——D-S2.3）
+    return _checkShape(path, spec, value)
+  }
+  const want = TYPE_MAP[path]
+  if (want && want !== "array") {
+    const got = value === null ? "null" : typeof value
+    if (got !== want && !(value === null && want === "object")) throw _expectsError(path, want, value)
+  }
+}
+
+/* ─── 既有工具面 helpers（第 8 批零改动） ─── */
 
 /** 点分路径解析（含数组数字段）——逐段下钻；返回 { ok, value } 或缺失段信息 */
 function resolvePath(obj, path) {
@@ -80,7 +191,9 @@ function parseValue(raw) {
     const v = JSON.parse(s)
     // JSON 顶层标量都接受；解析失败（裸字符串）→ 字符串字面
     if (typeof v === "number" || typeof v === "boolean" || v === null || Array.isArray(v) || typeof v === "object") return v
-    return s // "abc"（带引号传的字符串）——JSON.parse 成功但返回字符串——保持解析结果
+    // "abc"（带引号传的字符串）——JSON.parse 成功但返回字符串：返回**解析值**（去引号）
+    // ——两端统一 ①（2026-09-11 用户裁定；SETTINGS-TOOL.md §9.3）。
+    return v
   } catch {
     return s // 裸 abc → 字符串字面
   }
@@ -95,7 +208,7 @@ export function settingsTool(opts = {}) {
       "Adjust ThinCoder runtime configuration — persisted to config.json AND hot-applied to the live agent config.\n" +
       "Actions: list (all keys + values, flattened) | get <key> | set <key> <value> — dot paths into config.json (agent.maxTurns, traces.enabled, providers.0.model, any nesting).\n" +
       "set persists to disk (only the set key is written — defaults are never baked in) and takes effect in the running session immediately (turn-boundary keys apply next turn); the value survives restarts.\n" +
-      "Known keys are type-checked against the built-in defaults (agent.maxTurns must be a number, traces.enabled a boolean); unknown keys under a known section are stored as given. Values parse as JSON first (true/false/numbers/objects/arrays), else stay strings.\n" +
+      "Known keys are type-checked: scalar keys against the built-in defaults (agent.maxTurns a number, traces.enabled a boolean); keys whose default is null against their real consumption shape — defaultModel \"provider:model\", agent.subagentModel / shell non-empty string, memory.team object with a repo — so a value the app would silently drop is refused (null clears the key). Unknown keys under a known section are stored as given. Values parse as JSON first (true/false/numbers/objects/arrays), else stay strings.\n" +
       "SENSITIVE keys (path segment contains apiKey/key/token/secret/password) are NEVER echoed in plaintext — list/get/set replies show ••••（masked）; setting a sensitive key is allowed and stored, but never echoed back.\n" +
       "list/get are read-only (planMode ok, no approval); set is a side effect (approval gate). The /config TUI command is the human equivalent.",
     parameters: {
@@ -130,14 +243,8 @@ export function settingsTool(opts = {}) {
       // set
       if (!args.key || args.value === undefined) throw new Error("settings set: key and value are required")
       const value = parseValue(args.value)
-      // 已知键类型校验（类型表派生自 DEFAULTS——未知键 JSON 原样）
-      const want = TYPE_MAP[String(args.key)]
-      if (want && want !== "array") {
-        const got = value === null ? "null" : typeof value
-        if (got !== want && !(value === null && want === "object")) {
-          throw new Error(`settings set: "${args.key}" expects ${want} — got ${got} (${JSON.stringify(args.value)})`)
-        }
-      }
+      // 已知键校验（形状表两表都查 + 派生类型表——SETTINGS-TOOL.md §8.3；未知键 JSON 原样）
+      _checkKnownKeyValue(String(args.key), value)
       // 写盘（D-F5b：磁盘真相最小化——writeConfigAtomic 磁盘新鲜读 + 只改被设键 + mtime
       // 门控——默认不固化；冲突/畸形抛错，内存不热应用（零虚假成功））+ 热应用（内存对象）
       const r = await writeConfigAtomic(cfgPath, (disk) => {
@@ -150,3 +257,9 @@ export function settingsTool(opts = {}) {
     },
   }
 }
+
+/**
+ * 测试缝导出（`_` 前缀——config.mjs `_setConfigPathForTest` 先例；SETTINGS-TOOL.md §8.3 第 6 条）：
+ * `_checkShapeCompleteness` = 完备性锁的运行时面（T-S2.14「一次性警告列出键名」的机械断言缝）。
+ */
+export { _buildShapeTable, _nullLeafPaths, _NULL_LEAF_SHAPES, _SIBLING_SHAPES, _checkKnownKeyValue, _checkShapeCompleteness }

package/src/agent-tools/subagent-actions.mjs

@@ -12,7 +12,7 @@
  * CONTAINER.md D1 落地（池访问点改 getAsyncPool accessor）。
  */
 import { isAbsolute, relative } from "node:path"
-import { runAgent, createAgent, CODER_OVERLAY, DEFAULT_SUBAGENT_TURNS } from "../agent.mjs"
+import { runAgent, createAgent, DEFAULT_SUBAGENT_TURNS } from "../agent.mjs"
 import {
   runWithContinue, TURN_CAP_MARK, makeRelay, wrapChildCallbacks,
   ensureChildApiKey, clampEffort,
@@ -77,6 +77,15 @@ function shortTouchedPath(f, cwd) {
 }
 
 function statusFields(entry, cwd) {
+  // §18.3 #1（第 10 批——双池并表）：评审池条目专属字段面——role 区分两池；子代理条目
+  // 字段面零变化（NFR-B2）。reviewType(design|code) / round / elapsedSec——与子代理
+  // 的 turn/maxTurns 而非（评审无子回合预算语义）。
+  if (entry.role === "advisor") {
+    const base = { id: String(entry.id), role: entry.role, reviewType: entry.reviewType ?? null, round: entry.round ?? entry.run?.round ?? null }
+    if (entry.model != null) base.model = entry.model
+    if (entry.startedAt) base.elapsedSec = Math.max(0, Math.round((Date.now() - entry.startedAt) / 1000))
+    return base
+  }
   const base = { id: String(entry.id), role: entry.role }
   if (entry.status === "running") {
     base.model = entry.model ?? null
@@ -104,7 +113,7 @@ export function executeStatusAction(args, ctx) {
   const { id } = args ?? {}
   if (id !== undefined && id !== null && String(id) !== "") {
     const key = String(id)
-    // §24 D-24b: by-id queries fall through to the advisor pool (shared counter —
+    // §11.2 D-24b: by-id queries fall through to the advisor pool (shared counter —
     // ids are unique across both pools; role identifies the kind).
     const entry = map.get(key) ?? advisors.get(key)
     if (!entry) {
@@ -172,7 +181,7 @@ export function executeStatusAction(args, ctx) {
 }
 
 // ═══════════════════════════════════════════════════════════════════════════
-// SUBAGENT-OBSERVE-SEND（docs/design/SUBAGENT-OBSERVE-SEND.md——CLI 端）
+// SUBAGENT-OBSERVE-SEND（SUBAGENT-OBSERVE-SEND.md——CLI 端）
 // observe（D1——readonly 查询）+ send（D2——控制类豁免注入引导）——动作执行器。
 // 目标 = 父自身 spawn 的异步子代理池条目（_asyncSubagents——非 advisor/escalate——
 // 后者共享 id 计数但非"读写子代理"，错误路径明示）。
@@ -289,7 +298,7 @@ export function executeSendAction(args, ctx) {
   const entry = getAsyncPool(agent, "subagent")?.get(key)
   if (!entry) {
     if (getAsyncPool(agent, "advisor")?.has(key)) {
-      return JSON.stringify({ status: "error", error: `id ${key} is an async ADVISOR review — send is for async subagents; you cannot inject direction into a running review (AGENT-LOOP.md §7.2)` })
+      return JSON.stringify({ status: "error", error: `id ${key} is an async ADVISOR review — send is for async subagents; you cannot inject direction into a running review (AGENT-LOOP.md §7.2) — track it with action:'status' (role:"advisor") or wait for its report to arrive automatically` })
     }
     return JSON.stringify({ status: "error", error: `unknown async subagent id: ${key}` })
   }
@@ -388,13 +397,13 @@ export async function executeEscalateAction(args, ctx) {
   let escT0 = Date.now()
   try {
     // 全写路径（role "coder"）：权限经父 onPermissionRequest，mutations merge 回父
+    // G3（施工②）：overlay 摘除——coder 人格槽由 assemblePrompt 场景表承载（G3 映射）。
     child = createAgent({
       provider,
       tools: parent.tools,
       config: parent.config,
       cwd: parent.cwd,
       memory: parent.memory,
-      overlay: CODER_OVERLAY,
       role: "coder",
     })
     child._logId = escId // LOGGING：子内事件归属（escalate#N）
@@ -423,7 +432,7 @@ export async function executeEscalateAction(args, ctx) {
       child, task, { ...childCallbacks, onPermissionRequest: parent.autoApprove ? async () => true : (ctx.onPermissionRequest ?? null) },
       runOpts,
       {
-        // escalate has NO permQueue: prompts go straight to the user (T-L spec).
+        // sync escalate has NO permQueue——async 飞行权限走 _permQueue（escalate-async.mjs）: prompts go straight to the user (T-L spec).
         askContinue: (e) => (ctx.onPermissionRequest
           ? ctx.onPermissionRequest("continue", { turns: e.turn, agent: tag })
           : Promise.resolve(false)),