thincoder 0.12.60 → 0.12.61

package/src/agent/dispatch.mjs

@@ -5,18 +5,18 @@ import { logEvent, errText, headText } from "../log.mjs"
 import { offloadToolResult, FILE_MUTATORS } from "./helpers.mjs"
 import { runHooks } from "../hooks.mjs"
 import { snapshotForUndo } from "../tui/cmd-undo.mjs"
-import { isDocFile } from "../advisor/repos.mjs"
+import { isCodePath, loadConventions } from "../conventions.mjs"
 // R10 L3 (MULTI-INSTANCE-COLLAB §2a.5 D-L3b)：写工具钩子——peerCollabNote（执行前冲突
 // 检测——软提示不阻止）+ recordPeerWrites（成功后累积本回合写足迹——回合末 flush）。
 import { PEER_WRITE_TOOLS, peerCollabNote, recordPeerWrites } from "../peer-domains.mjs"
 import { writeFileSync, mkdirSync, existsSync } from "node:fs"
-import { join, resolve } from "node:path"
+import { join, resolve, relative } from "node:path"
 import { homedir } from "node:os"
 // §29 fix A（AGENT-LOOP.md §29——2026-09-07）：FILE_MUTATORS 的 mutation-seq 记账从
 // 批后提交（record-results noteMutations）移到执行成功即刻——唯一记账点（取代批后段
 // + agent.mjs 中断分支记账——不双计）——同消息 [写 + async advisor launch] 时 launch 前
 // 完成的写在 launchSeq 之前落地 → settle 不再误判 stale（§29 症状根因）。
-import { noteMutations } from "../agent-tools/advisor-async.mjs"
+import { noteMutations, inflightDesignReviewConflict } from "../agent-tools/advisor-async.mjs"
 import { anyLiveDesignSlot } from "../token-ttl.mjs"
 
 const ERRORS_DIR = join(homedir(), ".thincoder", "tool-errors")
@@ -182,11 +182,13 @@ export async function executeToolCalls(agent, toolByName, toolCalls, callbacks,
     // Engineering mode PARENT gate: the parent agent must not touch code files
     // before the design review passed. Signaled by a live design slot (design-review
     // approval — persists in the session slot, survives across turns; _engDesignReviewed
-    // is eng-coder-only and reset per run). Exemptions cover ONLY design artifacts
-    // (docs/** and root-level docs like METHODOLOGY.md/README.md/AGENTS.md/
-    // LICENSE) — writing them IS the design/methodology step. Everything under
-    // src/ (incl. src/prompts/*.md) is product code, not documentation, and
-    // needs a design token. Mechanically blocks "talk then code".
+    // is eng-coder-only and reset per run). Exemptions = the non-code classes of
+    // src/conventions.mjs (documentation and temp scratch files) — writing a design
+    // document IS the design step. Anything inside a declared code segment (default:
+    // src — incl. src/prompts/*.md) is product code, not documentation, and needs a
+    // design token. The project can declare its own code paths (.thincoder/
+    // conventions.json) so a non-src layout is not silently exempted. Mechanically
+    // blocks "talk then code".
     // DESIGN-TOKEN-SETTLEMENT D3（2026-09-08）：资格判据 = 权威槽"任一活槽存在"
     // （anyLiveDesignSlot——查内存 Map，miss 回读槽文件——单值镜像 `_engDesignToken`
     // 已退役，门禁不再读镜像——AC4）。
@@ -194,14 +196,45 @@ export async function executeToolCalls(agent, toolByName, toolCalls, callbacks,
         && !anyLiveDesignSlot(agent)
         && FILE_MUTATORS.has(toolCall.name)) {
       const paths = tool.touchedPaths ? tool.touchedPaths(args) : [args.path]
+      const conv = loadConventions(agent.cwd)
       // Unknown/missing paths (non-string, e.g. no path argument) are treated
-      // as code — cannot tell what they touch, so block conservatively.
-      const touchesCode = paths.some((p) => typeof p !== "string" || /^src[\\/]/.test(p) || !isDocFile(p))
+      // as code — cannot tell what they touch, so block conservatively. Known
+      // paths go through the single shared classifier: a declared code segment
+      // (default: "src") at ANY depth, else anything that is not documentation.
+      const touchesCode = paths.some((p) => typeof p !== "string" || isCodePath(p, conv))
       if (touchesCode) {
+        // Undeclared project → point at the declaration file (§4.3 降级可见契约).
+        const convNote = conv.declared
+          ? ""
+          : ` — this path was classified as product code by the default conventions (code paths: ${conv.codePaths.join(", ")}); declare project conventions in .thincoder/conventions.json to adjust.`
         prepared.push({
           toolCall, tool, denied: true,
           reason: "engineering design gate",
-          hint: "Engineering mode: write the design document in docs/ first, then call advisor with type='design' to review it, and wait for user approval. Implementation is done by eng-coder subagents.",
+          hint: `Engineering mode: write the design document first（location per your project's document conventions）, then call advisor with type='design' to review it, and wait for user approval. Implementation is done by eng-coder subagents.${convNote}`,
+        })
+        continue
+      }
+    }
+
+    // E（第 11 批·F17/§14.14 E-3d）：D5 冻结窗口写前拦截——设计评审在途（点火 → 结算）期间，
+    // 父侧对被审文件集（声明文档集 + 批次档）的写入会被拒绝：在途写使本轮结算 stale——pass 轮
+    // = token 直接丢失（实证：第 10 批 id=20 整轮作废）。工具面 = FILE_MUTATORS（与变更记账
+    // 同集——不记入日志的写面既不判 stale 也不拦）；判据与 reviewIsStale 同源
+    // （inflightDesignReviewConflict——同 docAbs / 同 normAbs；仅扫 running 未取消的设计条目）。
+    // 位置：只读 / autoApprove 短路之前——审批不得绕过冻结；拒绝 = 可见 denied + 逃生门
+    // （先 cancel → 改 → 重发）。
+    if (FILE_MUTATORS.has(toolCall.name)) {
+      let touched = []
+      try { touched = tool.touchedPaths ? tool.touchedPaths(args) : [args.path] } catch { touched = [] }
+      const absPaths = (touched ?? [])
+        .filter((p) => typeof p === "string" && p)
+        .map((p) => resolve(agent.cwd, p))
+      const conflict = inflightDesignReviewConflict(agent, absPaths)
+      if (conflict) {
+        prepared.push({
+          toolCall, tool, denied: true,
+          reason: "d5 freeze window",
+          hint: `write refused — design review #${conflict.id} is in flight over ${relative(agent.cwd, conflict.path)} (D5 freeze window). A write now would settle it stale — no token for a pass (the round is lost). Wait for the report, or cancel the review first (subagent action:'cancel' id:'${conflict.id}') and re-launch after the change.`,
         })
         continue
       }
@@ -293,6 +326,8 @@ export async function executeToolCalls(agent, toolByName, toolCalls, callbacks,
         ? "Error: plan mode is active — only read-only tools are allowed. Exit plan mode first."
         : item.reason === "engineering design gate"
           ? `Error: design review required before any file modification. ${item.hint}`
+          : item.reason === "d5 freeze window"
+          ? `Error: ${item.hint}`
           : item.reason === "denied by user"
           ? "Error: permission denied by user"
           : item.reason === "blocked by PreToolUse hook"
@@ -352,7 +387,7 @@ export async function executeToolCalls(agent, toolByName, toolCalls, callbacks,
         depth,
         signal,
         callbacks,
-        // §24 D-24b: per-call id — the advisor tool marker-keys its launch so
+        // §11.2 D-24b: per-call id — the advisor tool marker-keys its launch so
         // recordToolResults can split async-ack accounting from sync settles.
         _toolCallId: item.toolCall.id,
         onOutput: (chunk) => callbacks.onToolOutput?.(item.toolCall.name, chunk, item.toolCall.id),

package/src/agent/helpers.mjs

@@ -6,7 +6,8 @@ import { readFileSync, readdirSync } from "node:fs"
 import { homedir } from "node:os"
 import { writeFile, mkdir, readdir, stat, unlink } from "node:fs/promises"
 import { join } from "node:path"
-import { execSync } from "node:child_process"
+import { execFile } from "node:child_process"
+import { promisify } from "node:util"
 
 /** Single source for the AUTO-mode reminder (was duplicated in agent.mjs +
  *  setup.mjs — consult P2, 2026-08-30). */
@@ -138,20 +139,65 @@ export async function offloadToolResult(text, callId, dir = join(configDir, "too
   }
 }
 
-/** Collect git branch, recent commits, and working tree status as context text */
-export function collectGitContext(cwd) {
+// 失败冷却 v1（用户裁——GIT-ASYNC L21）：真失败/超时后 30s 内跳过该 cwd 的收集——
+// 病态 repo 周期拖慢变一次性。VSC setup-reminders.mjs 同构镜像。
+const GIT_FAILURE_COOLDOWN_MS = 30_000
+/** cwd → 最近一次 git 收集失败的 ts。评审 #2：访问时惰性清 >30s 旧条目（防无界累积）。 */
+const gitFailureCooldowns = new Map()
+// maxBuffer 沿用 execSync 默认现值 1 MiB（评审 #1——防大输出仓 ENOBUFS 翻转 → "" 破字节 parity）
+const GIT_MAX_BUFFER = 1024 * 1024
+
+const execFileAsync = promisify(execFile)
+
+/** 冷却检查 + 惰性清扫：冷却期内的 cwd 返回 true（调用方直接 "" 跳过）。 */
+function gitCooldownActive(cwd) {
+  const now = Date.now()
+  const lastFailure = gitFailureCooldowns.get(cwd)
+  if (lastFailure === undefined) return false
+  if (now - lastFailure >= GIT_FAILURE_COOLDOWN_MS) {
+    gitFailureCooldowns.delete(cwd) // 惰性清过期条目
+    return false
+  }
+  return true
+}
+
+/** Test seams — cooldown Map 状态控制（生产从不调用）：
+ *  `_gitFailureCooldownForTests(cwd, ts)` 读（ts 省略）或写 ts；`_clear…` 删条目。 */
+export function _gitFailureCooldownForTests(cwd, ts) {
+  if (ts !== undefined) gitFailureCooldowns.set(cwd, ts)
+  return gitFailureCooldowns.get(cwd)
+}
+export function _clearGitFailureCooldownForTests(cwd) {
+  gitFailureCooldowns.delete(cwd)
+}
+
+/** Git context 纯格式化（branch/log/status = trim 后原串）——独立导出供单测锁字节
+ *  parity（现拼装逐字节保留——detached/dirty>20 截断/clean 三形态——VSC 镜像）。 */
+export function composeGitContext({ branch, log, status }) {
+  const dirty = status ? status.split("\n").length : 0
+  return [
+    `Git context: on branch \`${branch || "(detached)"}\`${dirty ? `, ${dirty} uncommitted change(s)` : ", working tree clean"}.`,
+    log ? `Recent commits:\n${log}` : "",
+    status ? `Uncommitted:\n${status.split("\n").slice(0, MAX_GIT_CHANGES_DISPLAY).join("\n")}${dirty > MAX_GIT_CHANGES_DISPLAY ? `\n… (${dirty - MAX_GIT_CHANGES_DISPLAY} more)` : ""}` : "",
+  ].filter(Boolean).join("\n")
+}
+
+/** Collect git branch, recent commits, and working tree status as context text.
+ *  GIT-ASYNC L21：3×execSync 串行（最坏 15s 阻塞）→ 3×execFile 并行（Promise.all——
+ *  最坏 = 单次 5s 超时——事件循环不冻结）。单 catch → "" 保持 all-or-nothing（任一
+ *  失败/超时 → 整段不注入——非 git 快失败同路径）；catch 记冷却 ts——30s 内跳过。 */
+export async function collectGitContext(cwd) {
+  if (gitCooldownActive(cwd)) return ""
   try {
-    const opts = { cwd, encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout: GIT_TIMEOUT_MS }
-    const branch = execSync("git branch --show-current", opts).trim()
-    const log = execSync("git --no-pager log --oneline -5", opts).trim()
-    const status = execSync("git status --short", opts).trim()
-    const dirty = status ? status.split("\n").length : 0
-    return [
-      `Git context: on branch \`${branch || "(detached)"}\`${dirty ? `, ${dirty} uncommitted change(s)` : ", working tree clean"}.`,
-      log ? `Recent commits:\n${log}` : "",
-      status ? `Uncommitted:\n${status.split("\n").slice(0, MAX_GIT_CHANGES_DISPLAY).join("\n")}${dirty > MAX_GIT_CHANGES_DISPLAY ? `\n… (${dirty - MAX_GIT_CHANGES_DISPLAY} more)` : ""}` : "",
-    ].filter(Boolean).join("\n")
+    const opts = { cwd, encoding: "utf8", timeout: GIT_TIMEOUT_MS, windowsHide: true, maxBuffer: GIT_MAX_BUFFER }
+    const [branch, log, status] = await Promise.all([
+      execFileAsync("git", ["branch", "--show-current"], opts).then((r) => r.stdout.trim()),
+      execFileAsync("git", ["--no-pager", "log", "--oneline", "-5"], opts).then((r) => r.stdout.trim()),
+      execFileAsync("git", ["status", "--short"], opts).then((r) => r.stdout.trim()),
+    ])
+    return composeGitContext({ branch, log, status })
   } catch {
+    gitFailureCooldowns.set(cwd, Date.now()) // 真失败/超时——冷却 30s
     return ""
   }
 }
@@ -164,6 +210,18 @@ export class ContinueError extends Error {
   }
 }
 
+/** 跨段累计编号帧（TURN-CAP-CONTINUE.md §19.3——第 19 批 TURN-ACROSS-SEGMENTS）：
+ *  唯一计算点（纯函数）——把链内累计序数换算成面向消费面的编号载荷。
+ *  - seq      = 该轮链内累计序数（1 起——`agent._turnSeq` 每轮 +1，续跑不重置）
+ *  - turn     = 段内轮号（0 起——段内帽判定的循环变量）
+ *  - maxTurns = 本段预算（段内帽判定值——原样传入）
+ *  返回 { turn, maxTurns }：turn = seq（累计已跑轮数）；maxTurns = 段前累计 + 本段预算
+ *  = seq - turn - 1 + maxTurns（差额项 = 本段开始前的链内累计）。
+ *  段内帽判定不读本帧（只读段内 turn / maxTurns——N6 零机制改动）。 */
+export function turnFrame(seq, turn, maxTurns) {
+  return { turn: seq, maxTurns: seq - turn - 1 + maxTurns }
+}
+
 /** Repair malformed conversation history: remove orphan tool messages and fill missing tool results */
 export function repairHistory(history) {
   const out = []

package/src/agent/record-results.mjs

@@ -16,7 +16,11 @@
  *    invalidate verify only (user decision 2026-08-08: reviews trigger on
  *    code mutations, not environment changes).
  *  - advisor calls always advance _advisorRound (convergence budget counts
- *    attempts, not successes).
+ *    attempts, not successes). §15 F16 (2026-09-11 第 13 批): the SYNC
+ *    called-mark is gated by the single incomplete-tail predicate
+ *    (advisorIncompleteMarker) — a truncated-then-settled CODE review must not
+ *    count as covered (the guard re-pushes); design reviews keep the mark
+ *    (no code face — settle-side `failureVerdict` parity).
  *  - Mutations feed _touchedFiles and fire-and-forget memory reindex.
  */
 import { pushReal } from "../context.mjs"
@@ -24,7 +28,7 @@ import { specForModel } from "../config.mjs"
 import { FILE_MUTATORS } from "./helpers.mjs"
 import { resolve } from "node:path"
 import { advisorRuns, stripApprovedSuffix } from "../agent-tools/advisor-async.mjs"
-import { looksLikeReviewOutput } from "../advisor/run.mjs"
+import { looksLikeReviewOutput, advisorIncompleteMarker } from "../advisor/run.mjs"
 
 let _reindexFile = null
 
@@ -96,7 +100,7 @@ export async function recordToolResults(agent, toolByName, results) {
       }
       if (toolCall.name === "verify") agent._verifiedThisRun = true
       if (toolCall.name === "advisor") {
-        // §24 D-24b (settle accounting split — fix #2): an ASYNC launch returns an
+        // §11.2 D-24b (settle accounting split — fix #2): an ASYNC launch returns an
         // ack and settles later — the settle callback owns its called/round/token
         // accounting. Only the SYNC path (depth>0 / explicit async:false) accounts
         // here — per-review instance round++ (marker-keyed by tool call id) + the
@@ -111,10 +115,14 @@ export async function recordToolResults(agent, toolByName, results) {
         } else if (asyncAck) {
           agent._advisorAsyncAcks.delete(toolCall.id)
         } else {
-          agent._calledAdvisorThisRun = true
           const reviewId = agent._advisorSyncCalls?.get(toolCall.id)
+          const run = reviewId !== undefined ? advisorRuns(agent).get(reviewId) : undefined
+          // F16 同步面（第 13 批 §15.2——ADVISOR-CONVERGENCE.md §15）：未完成尾 + 非设计面
+          // （含类型不可判——run 缺失的 legacy 直调）⇒ 不置「已覆盖」（与 settle 面
+          // 逐条 parity；设计评审保持计入——无代码面）。
+          const incomplete = advisorIncompleteMarker(String(result))
+          if (!(incomplete && run?.reviewType !== "design")) agent._calledAdvisorThisRun = true
           if (reviewId !== undefined) {
-            const run = advisorRuns(agent).get(reviewId)
             if (run) {
               run.round++
               agent._advisorRound = run.round

package/src/agent/relay-prefix.mjs

@@ -0,0 +1,39 @@
+/**
+ * relay-prefix.mjs — relay 前缀（`role#id/`）文法**单一权威**（第 27 批 §12.3①——R-A2.3）。
+ *
+ * 零依赖（不 import 任何模块）——TUI（`src/tui/`）与 ACP（`src/acp/`）双向可导入，无环；
+ * 生成侧 `src/agent/spawn-child.mjs` 再导出（枢纽）。文法 = 自
+ * `src/tui/subagent-blocks.mjs` 逐字迁入（第 27 批 §12.3②——零语义改动）。
+ */
+
+/** `role#id/` prefix router — hyphen included since the eng-coder fix (2026-08-21). */
+export const RELAY_PREFIX_RE = /^([\w-]+)#(\d+)\//
+
+/** 嵌套 relay 前缀通用解析（循环解析任意深度——显示契约 docs/design/TUI.md §6）：
+ *  `eng-coder#2/explore#1/read` → { head（块路由）, inner[], label（inner 链——R23：
+ *  子块折叠键/外层 currentTool 全路径用）, rest }。
+ *  单层 = inner[]/label ""——与既有单段匹配语义零改；无前缀 → null。 */
+export function parseRelayPath(text) {
+  const segments = []
+  let rest = String(text)
+  for (;;) {
+    const m = rest.match(RELAY_PREFIX_RE)
+    if (!m) break
+    segments.push(`${m[1]}#${m[2]}`)
+    rest = rest.slice(m[0].length)
+  }
+  if (segments.length === 0) return null
+  return {
+    head: segments[0],
+    inner: segments.slice(1),
+    label: segments.slice(1).join("/"),
+    rest,
+  }
+}
+
+/** 构造向单一实现（本批统一的两处构造点——`makeRelay` 与 async 取号分支共用；
+ * 另两处字面构造（escalate/advisor async）不在本批声明面——批次档 §2 修正轮登记，如需收敛另批）：
+ *  `relayPrefixOf("coder", 3)` → `"coder#3/"`。 */
+export function relayPrefixOf(label, id) {
+  return `${label}#${id}/`
+}

package/src/agent/run-stages.mjs

@@ -16,6 +16,8 @@ import { getAsyncPool } from "../agent-tools/async-settle.mjs"
 // R10 L3 (MULTI-INSTANCE-COLLAB §2a.5 D-L3a)：回合末域登记 flush（写工具钩子累积 →
 // 整写一次本实例 peers 文件——无写入跳过；失败容忍不抛）
 import { flushPeerDomains } from "../peer-domains.mjs"
+// 第 30 批 D1（Stop 钩子——AGENT-LOOP.md §21）：主会话 run 终止事件（触发块见 finalizeAgentTurn）
+import { runHooks } from "../hooks.mjs"
 
 /**
  * 响应后置提醒注入（2026-09-05 实践轮——自 runAgent 响应处理链提取，verbatim）：
@@ -113,16 +115,29 @@ export async function injectTurnReminders(agent, ctx) {
 }
 
 /**
- * 回合收尾（2026-09-05 实践轮——自 runAgent finally 提取，verbatim + 签名化）：
- * consult 清理（无孤儿烧 token 的 consult children）→ async 池回合尾分流（Ctrl+C
- * 清池不注入 / ContinueError 留池续跑 / 其余 collectSettledAsync）→ auto-turn guard
- * 标记继承（对象字段清单——正常结束才继承；中止丢弃；ContinueError 由续跑快照）。
+ * 回合收尾（2026-09-05 实践轮——自 runAgent finally 提取，verbatim + 签名化）：写足迹
+ * flush → Stop 钩子（第 30 批 D1——ctx.depth === 0 的主会话 run 终止事件，
+ * fire-and-forget）→ consult 清理（无孤儿烧 token 的 consult children）→ async 池回合尾
+ * 分流（Ctrl+C 清池不注入 / ContinueError 留池续跑 / 其余 collectSettledAsync）→ auto-turn
+ * guard 标记继承（对象字段清单——正常结束才继承；中止丢弃；ContinueError 由续跑快照）。
  */
 export async function finalizeAgentTurn(agent, ctx) {
-  const { signal, autoTurn, suspDriven, thrownError } = ctx
+  const { signal, autoTurn, suspDriven, thrownError, depth } = ctx
   // R10 L3（MULTI-INSTANCE-COLLAB §2a.5 D-L3a）：回合末登记 flush——本回合写足迹整写
   // 一次（首行执行：收尾链后续任何异常都不吞登记）；无写入 → 跳过（hot 窗口自然衰减）。
   flushPeerDomains(agent)
+  // 第 30 批 D1（Stop 钩子）：主会话 run 终止 → fire-and-forget（非阻塞；失败静默——与 PostToolUse 同语义）。
+  // 排除用户中止（Ctrl+C / Ctrl+I——中止后 TUI 重建 controller 续跑或已显式停回合）与 AbortError 展开。
+  if (depth === 0 && !signal?.aborted && thrownError?.name !== "AbortError") {
+    runHooks("Stop", {
+      agent,
+      error: thrownError && !(thrownError instanceof ContinueError) ? thrownError : undefined,
+      extra: {
+        turn: agent._currentTurn ?? 0,
+        reason: thrownError instanceof ContinueError ? "maxTurns" : thrownError ? "error" : "done",
+      },
+    }).catch(() => {})
+  }
   // R17（AGENT-LOOP.md §25 D-R17a）: consultation sessions are cross-turn
   // background work now — NO unconditional turn-end cleanup (the old rule aborted
   // leftover consult children at every turn end because check-loop consumption was
@@ -163,7 +178,7 @@ export async function finalizeAgentTurn(agent, ctx) {
     // keep _asyncSubagents/_asyncAdvisors/_consultSessions — the resumed run continues them
   } else {
     const injectedAdvisor = await collectSettledAsync(agent, { suspDriven })
-    // §24 D-24b: a normally-ended USER run with no review/child activity closes
+    // §11.2 D-24b: a normally-ended USER run with no review/child activity closes
     // the OPEN code instances — the converged/abandoned thread must not burn the
     // 5-round cap of a later task (the next code review starts a fresh round 1).
     // Digest auto-turns are exempt (their disposition precedes the fix round).

package/src/agent/setup-reminders.mjs

@@ -4,7 +4,10 @@
  *
  * One unified transient user reminder per turn covers the whole self-awareness
  * family: env identity (R8 — §10 D-1 END 常量先例：静态常量，不做 cmdline 判别),
- * engineering mode (R9), active model (R11), restart awareness (R5 resumed).
+ * engineering mode (R9), active model (R11), session slot (F1), restart awareness
+ * (R5 resumed). §11.2（2026-09-08）：resumed 按会话跟踪——恢复事件由 session.mjs
+ * applySession 武装（agent._envResumed——载入历史非空 = 恢复）；进程重启句独立走
+ * agent._processRestartPending（bin 启动 resume 路径设）——双信号互不绑门（N6）。
  * Change awareness needs no dedicated injection — every turn carries the
  * CURRENT state, so a mode/model flip shows up in the next turn's line.
  * git is NOT a field here (§11.1: CLI 不重复注入 clean|dirty 摘要) — the rich
@@ -16,26 +19,30 @@
 import { END } from "../session-slots.mjs"
 import { peerInstances } from "../peer-instances.mjs"
 
-/** env-state line builder — pure, unit-testable. */
-export function envStateLine({ mode, model, resumed }) {
-  return `[System reminder: env: ${END}, mode: ${mode}, model: ${model}, resumed: ${resumed ? "yes" : "no"}.]`
+/** env-state line builder — pure, unit-testable.
+ *  §11.2（F1）：slot 字段入行——位置在 model 后 resumed 前（N3：无绑定 → 显式 null——
+ *  不读 manifest active 共享指针——粘性 _slot 才是"本 agent 之槽"）。 */
+export function envStateLine({ mode, model, slot, resumed }) {
+  return `[System reminder: env: ${END}, mode: ${mode}, model: ${model}, slot: ${slot}, resumed: ${resumed ? "yes" : "no"}.]`
 }
 
 /**
  * Push the per-turn env-state reminder (setup.mjs calls it for depth-0 runs —
- * the line describes the MAIN agent's host/mode/model identity). resumed=yes
- * exactly once: the first turn after a restored session (setup.mjs sets
- * agent._envResumed alongside the `process restarted` reminder); consumed here
- * so every later turn reads resumed=no (T-E5).
+ * the line describes the MAIN agent's host/mode/model/slot identity). resumed=yes
+ * exactly once per session restore: applySession (session.mjs) arms
+ * agent._envResumed when restored history is non-empty; consumed here so every
+ * later turn reads resumed=no（§11.2 F2——每次恢复一次；/new 与空历史槽切换不武装——
+ * F3 伪触发消除）。slot = 粘性 agent._slot（§11.2 N2/N3——无绑定显式 null）。
  * Degrades safely: activeModel null → provider.model → "unknown" (T-E12);
  * a missing config/history never throws (T-E13).
  */
 export function pushEnvStateReminder(agent) {
   const mode = agent.config?.agent?.engineering ? "eng" : "normal"
   const model = agent.activeModel ?? agent.provider?.model ?? "unknown"
+  const slot = agent._slot ?? null
   const resumed = agent._envResumed === true
   agent._envResumed = false
-  agent.history.push({ role: "user", content: envStateLine({ mode, model, resumed }), transient: true })
+  agent.history.push({ role: "user", content: envStateLine({ mode, model, slot, resumed }), transient: true })
 }
 
 /**