thincoder 0.12.62 → 0.12.63

package/src/advisor/truncate.mjs

@@ -1,57 +0,0 @@
-/**
- * truncate.mjs — advisor 工具结果的行感知双端截断（DUAL-END-TRUNCATION F-2，
- * DUAL-END-TRUNCATION.md，2026-09-09——CLI/VSC 双端逐字同构镜像）。
- *
- * 原 run.mjs 内联截断为纯头向（line-aware 从首行累加至 64K break）——评审尾部
- * 结论/裁决被切。现改头尾双保：头行累加至预算 ~60% → 中段省略注 → 尾行累加至
- * 剩余 ~40%（保尾结论——与 read 工具 C 方案 / offload 双端预览同构的
- * "头+尾保留、中段截断"策略——共享设计语言、分别实现）。
- *
- * 纯函数无导入：maxChars 由调用方传入（run.mjs 传 MAX_RESULT_CHARS）。
- */
-
-/** advisor 截断头占比——头行累加至此份额后切中段，尾自动取剩余预算（设计 §4 ≈0.6）。 */
-export const ADVISOR_HEAD_RATIO = 0.6
-
-/** 尾部预算预留（字符）：中段省略注 + offset 续读提示的保守预留——注的位数只减不增
- *  （middle ≤ totalChars——超大结果位数可达 ~10 位——200 字符仍宽松覆盖注+提示 ≤ ~140；
- *  差额留给尾行）。 */
-const NOTE_RESERVE_CHARS = 200
-
-/**
- * 行感知双端截断：result > maxChars → 头 + `… (truncated: K more lines, TOTAL chars
- * total)` + 尾 + offset 续读提示；≤ maxChars 原样返回（无假截断注）。K = 头尾之间
- * 的中段行数——头(≤60%) + 尾(≤余预算) 均行级累加、绝不半行切开；中段存在时 K ≥ 1
- * （防御：K ≤ 0 时静默返回头尾拼合——不谎报截断）。
- */
-export function truncateAdvisorResult(result, maxChars) {
-  if (result.length <= maxChars) return result
-  const totalChars = result.length
-  const lines = result.split("\n")
-  const headBudget = Math.floor(maxChars * ADVISOR_HEAD_RATIO)
-  let head = ""
-  let headLines = 0
-  let chars = 0
-  while (headLines < lines.length && chars + lines[headLines].length + 1 <= headBudget) {
-    chars += lines[headLines].length + 1
-    head += lines[headLines] + "\n"
-    headLines++
-  }
-  const tailBudget = Math.max(0, maxChars - chars - NOTE_RESERVE_CHARS)
-  let tail = ""
-  let tailChars = 0
-  let tailStart = lines.length
-  while (tailStart > headLines && tailChars + lines[tailStart - 1].length + 1 <= tailBudget) {
-    tailChars += lines[tailStart - 1].length + 1
-    tailStart--
-    tail = lines[tailStart] + "\n" + tail
-  }
-  const middle = tailStart - headLines
-  if (middle <= 0) return head + tail // 头尾已覆盖全部行——绝不产生假截断注
-  return (
-    head +
-    `\n… (truncated: ${middle} more lines, ${totalChars} chars total)\n` +
-    tail +
-    `To see more content, use: read(path, offset=${headLines + 1}, limit=200)`
-  )
-}

package/src/advisor.mjs

@@ -1,290 +0,0 @@
-/**
- * advisor.mjs — advisor system-prompt selection, follow-up building, session assembly.
- * User-message building lives in advisor/messages.mjs; execution (tool loop, provider
- * resolution, review entry) in advisor/run.mjs; history extraction in advisor/history.mjs.
- * Path classification (code / doc / temp) and the project declaration surface live in
- * ../conventions.mjs — the single authority every gate consumes (repos.mjs included).
- *
- * The advisor runs as a read-only exploration sub-agent with tools
- * (read, glob, grep, ls, lsp, code_search) — ZERO git, every round. The change
- * surface comes from the review scope (paths / _touchedFiles), never from git;
- * verification is `read`-only with quoted-line evidence (7d49a52, d3be613).
- *
- * Config:
- *   { advisor: { enabled: true, provider: "deepseek", model: "deepseek-chat" } }
- *   provider + model are optional — defaults to the main agent's provider/model.
- *
- * Convergence protocol:
- *   Round 1: full review → produces a numbered issue table.
- *   Agent responds with a response table per issue (fix claims).
- *   Round 2: semi-convergence — verifies the prior table + can flag obvious new issues.
- *   Round 3+: strict convergence — only checks the prior issue table.
- *   The prior issue table IS injected into rounds 2+ (decision 2026-08-05,
- *   reversed) — it is the ONLY complete verification list: the agent response
- *   table covers only issues the agent chose to answer, so skipped issues would
- *   silently escape convergence without it. The fix-claim table travels as a
- *   focus reference only. Restatement risk is handled mechanically:
- *   host-verified citations reject references that do not match the current
- *   disk state, and fresh sessions exclude old read data.
- *   Each round replaces the system prompt (ROUND1 → ROUND2 → ROUND3) so the
- *   round-1 full-scope mandate can't bleed into later rounds, plus a mechanical
- *   cap (MAX_ADVISOR_ROUNDS in run.mjs) refuses a 6th review call outright.
- *   Rounds 2+ also declare all earlier diffs STALE and require read-verified
- *   file:line evidence for any unfixed/new finding — see docs/design/ADVISOR-CONVERGENCE.md.
- *
- * Session memory (agent._advisorSession):
- *   RETAINED for initialization compatibility but NEVER read (decision d698434):
- *   every review round builds a fresh [system, user] session — round 2+ must not
- *   reuse round 1's messages, because the old read outputs are the anchoring
- *   source of re-review false reports and a token sink. Convergence data (prior
- *   issue table + agent response table) travels via buildAdvisorFollowUp.
- *   The field is reset by runAgent; the write sites are harmless leftovers.
- *
- * Project customisation: .thincoder/advisor.md in the project root.
- */
-import { readFileSync } from "node:fs"
-import { join, dirname } from "node:path"
-import { fileURLToPath } from "node:url"
-import { extractAgentResponseTable } from "./advisor/history.mjs"
-import { buildAdvisorUserMessage, resolveScopeFiles, buildObjectDeclarationBlock, buildDesignApprovalBlock } from "./advisor/messages.mjs"
-import { buildConvergenceBody } from "./advisor/convergence.mjs"
-import { escapeLiteralEscapes } from "./escape.mjs"
-// Re-export for run.mjs and tests (keeps their imports from "../advisor.mjs" stable)
-export { ADVISOR_MD_PATH, extractAgentResponseTable, extractConversationBackground } from "./advisor/history.mjs"
-export { buildAdvisorUserMessage } from "./advisor/messages.mjs"
-export { buildObjectDeclarationBlock, buildDesignApprovalBlock } from "./advisor/messages.mjs"
-
-const __dirname = dirname(fileURLToPath(import.meta.url))
-
-// ────────────────────────────────────────
-// Prompt files — loaded at module init
-// ────────────────────────────────────────
-
-function loadPrompt(file, name) {
-  try {
-    return readFileSync(join(__dirname, "prompts", file), "utf8")
-  } catch {
-    throw new Error(`${name} missing from the installation (prompts/${file}) — reinstall thincoder or restore the file`)
-  }
-}
-
-const ADVISOR_ROUND1 = loadPrompt("advisor-round1.md", "advisor-round1.md")
-// ROUND2/3 are used whenever a convergence round (round 2+) is being built:
-// in-run session continuation replaces the system prompt with them, and a
-// rebuilt fresh session (e.g. after a failed review) also selects them via
-// buildAdvisorSystemPrompt when _advisorRound > 0.
-const ADVISOR_ROUND2 = loadPrompt("advisor-round2.md", "advisor-round2.md")
-const ADVISOR_ROUND3 = loadPrompt("advisor-round3.md", "advisor-round3.md")
-// Design-review prompt — hard-loaded like the round prompts (decision
-// 2026-08-21): a missing file means a broken installation, and silently
-// degrading to a lesser in-code prompt would quietly strip the approval-signal
-// and citation rules, disabling design approval entirely. loadPrompt throws.
-const ADVISOR_DESIGN = loadPrompt("advisor-design.md", "advisor-design.md")
-
-// ────────────────────────────────────────
-// System prompt building
-// ────────────────────────────────────────
-
-/**
- * Build the system prompt for an advisor review session.
- * @param {Object} agent — the parent agent
- * @param {Object|null} [prior] — prior review output (full text; decision 2026-08-08)
- * @param {string} [reviewType] — "design" for design review, undefined/"code" for code review
- * @returns {string} the system prompt
- */
-/** Append local time so the reviewer knows "now" (same grounding as the agent loop). */
-function withTime(prompt) {
-  const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone || "local"
-  return prompt + `\n\nCurrent time: ${new Date().toLocaleString("sv-SE")} (${timeZone}).`
-}
-
-export function buildAdvisorSystemPrompt(agent, prior, reviewType) {
-  // Round decision is DETERMINISTIC (decision 2026-08-08): _advisorRound > 0
-  // with a stored review output means convergence (round 2+); 0 means round 1.
-  // No prior-table parsing, no all-clear phrase matching — the round counter
-  // and the stored output are the only inputs. A restarted process has
-  // _advisorRound 0 → conservative full re-review.
-  const hasPrior = (agent._advisorRound || 0) > 0 && (prior ?? agent._lastAdvisorOutput)
-  // Design review: round 1 uses the dedicated design-review prompt (full scope +
-  // approval token); rounds 2+ converge like code reviews (verify agent fix claims).
-  if (reviewType === "design") {
-    if (!hasPrior) {
-      return ADVISOR_DESIGN
-    }
-    const round = (agent._advisorRound || 0) + 1
-    if (round === 2) return ADVISOR_ROUND2
-    return ADVISOR_ROUND3
-  }
-  if (!hasPrior) return ADVISOR_ROUND1
-  const round = (agent._advisorRound || 0) + 1
-  if (round === 2) return ADVISOR_ROUND2
-  return ADVISOR_ROUND3
-}
-
-// ────────────────────────────────────────
-// Follow-up building (round 2+)
-// ────────────────────────────────────────
-
-/**
- * Build a follow-up user message for round 2+ — the agent's response table +
- * round-aware instructions, without re-sending the full round-1 context.
- * Deliberately NO git information injected (no diff snapshot, no git context):
- * git output misled re-reviews — committed fixes never show in `git diff HEAD`,
- * so the model read "no changes" as "no fixes". Verification is `read`-only.
- * NOTE: the caller (prepareAdvisorMessages) applies escapeLiteralEscapes to
- * the return value — direct callers must do the same (the prior table and
- * agent response can quote literal "\x"/"\u" sequences).
- * @param {Object} agent — the parent agent (history used for the response table)
- * @param {Object|null} prior — prior issue table (extracted from history when null)
- * @param {string[]|null} [scopeFiles] — review surface for the no-response fallback (cwd-relative)
- * @param {Object|null} [object] — review-object declaration (§18.8): mechanically
- *   prepended to the round-2+ follow-up so every round stays anchored (T-OA2).
- * @returns {string} the follow-up user message — or a plain "System reminder: …"
- *   fresh-review fallback (NO brackets — some OpenAI-compatible servers parse
- *   '['-prefixed content as structured data / expand escapes) when no prior
- *   review exists at all (caller misuse; the response-table extraction would
- *   otherwise scan history from index 0 and could match an unrelated stale table)
- */
-export function buildAdvisorFollowUp(agent, prior, scopeFiles = null, object = null) {
-  // Convergence follow-up REQUIRES a prior review record — the full output of
-  // the last review, injected VERBATIM (decision 2026-08-08: the model
-  // understands the review output; no table/header/phrase parsing). The caller
-  // usually passes it; fall back to the stored agent._lastAdvisorOutput.
-  const p = prior ?? agent._lastAdvisorOutput
-  if (!p) {
-    // Plain "System reminder:" prefix (no brackets) — same convention as the
-    // round-1 path (some OpenAI-compatible servers parse '['-prefixed content
-    // as structured data / expand escapes; see prepareAdvisorMessages).
-    return "System reminder: convergence follow-up requested without a prior review — perform a fresh full review."
-  }
-  // Convergence semantics require round >= 2 (round 1 is the full review, not
-  // verification). A direct caller with _advisorRound 0 would otherwise get a
-  // meaningless "Round 1 — Strict Verification".
-  if ((agent._advisorRound || 0) < 1) {
-    return "System reminder: convergence follow-up requested at round 1 — a full review is already in progress; no prior verification exists yet."
-  }
-  const noResponseFallback = scopeFiles?.length
-    ? "(Agent did not provide a response table — perform a fresh review of: " + scopeFiles.slice(0, 10).join(", ") + ")"
-    : "(Agent did not provide a response table — perform a fresh full review; the review surface is unknown, ask the user for the file list)"
-  const response = extractAgentResponseTable(agent.history) || noResponseFallback
-  const round = (agent._advisorRound || 0) + 1
-  // Review-object declaration FIRST (T-OA2 — round 2+ stays anchored, no re-archaeology).
-  const declaration = buildObjectDeclarationBlock(object)
-  return (declaration ? declaration + "\n" : "") + buildConvergenceBody(p, response, round, scopeFiles)
-}
-
-/**
- * Resolve the review surface for the convergence fallback — moved to
- * messages.mjs so the legacy path shares it (see there).
- */
-
-// escapeLiteralEscapes 已抽到 ./escape.mjs（advisor 与主 agent 发送路径共用），
-// 这里 re-export 保持既有 import 稳定。
-export { escapeLiteralEscapes }
-
-
-/**
- * Build the advisor conversation for this run.
- * EVERY call builds a fresh [system, user] session (decision d698434) — no
- * session reuse across rounds: round 1 = full scope (ROUND1 prompt), rounds
- * 2+ = convergence (ROUND2/ROUND3 prompt + fix-claims follow-up).
- * @param {Object} agent — the parent agent
- * @param {string} [reviewType] — "design" or "code" (default)
- * @param {string|null} [designToken] — design-review approval token (design only)
- * @param {string[]|null} [documents] — design review only: explicit list of doc paths to review (passed through to buildAdvisorUserMessage)
- * @param {string[]|null} [paths] — code review only: explicit list of file/dir paths to review
- * @param {Object|null} [object] — review-object declaration (§18.8 D-OA1): passed through
- *   to the user-message builders; mechanically injected at the start of every review
- *   round (round 1 design/code + round 2+ follow-up). Absent → legacy behavior.
- * @param {string|null} [designId] — §29.1 F2a: injected next to the design token in
- *   the Approval Signal (round 1 + round 2+ — both values, verbatim anchor).
- */
-export function prepareAdvisorMessages(agent, reviewType, designToken = null, documents = null, paths = null, priorParam = null, object = null, designId = null) {
-  // Deterministic convergence state (decision 2026-08-08): round 2+ requires
-  // _advisorRound > 0 AND a stored prior review output. No history parsing.
-  // priorParam (direct callers) wins over the stored output — same derivation
-  // as buildAdvisorSystemPrompt (single source of truth for round semantics).
-  const prior = (agent._advisorRound || 0) > 0 ? (priorParam ?? agent._lastAdvisorOutput) : null
-
-  // Design review round 1: the dedicated full-scope review with the approval
-  // token (an independent gate — it runs even when a prior review exists, e.g.
-  // after a failed design review). Fresh session.
-  if (reviewType === "design" && (agent._advisorRound || 0) === 0) {
-    return [
-      { role: "system", content: withTime(buildAdvisorSystemPrompt(agent, prior, reviewType)) },
-      { role: "user", content: escapeLiteralEscapes(buildAdvisorUserMessage(agent, prior, reviewType, designToken, documents, paths, object, designId)) },
-    ]
-  }
-
-  // Every round is a FRESH session (decision d698434): round 2+ must NOT reuse
-  // round 1's messages — the old read outputs are the top anchoring source of
-  // re-review false reports (the model quoted pre-fix file content instead of
-  // re-reading) and a token sink. The agent response table (fix claims) is
-  // injected through buildAdvisorFollowUp instead; the system prompt carries
-  // the round (ROUND2/ROUND3) via buildAdvisorSystemPrompt.
-  // No prior review output: reset ONLY when this run made no code changes (user
-  // decision 2026-08-05: any loop that modified code must NOT reset — the
-  // advisor guard WILL push back, so the convergence round must keep advancing
-  // toward the cap; a run with no mutations has no push-back risk and a reset
-  // is safe). Deterministic runtime state (`_mutatedThisRun`) decides — never
-  // model output (phrases/table headers drift; three rounds of false reports
-  // proved it). Either way the message is a fresh full review (no prior output
-  // exists without a completed review) — only the round counter differs.
-  if (!prior || (agent._advisorRound || 0) === 0) {
-    if (!(agent._mutatedThisRun ?? false)) {
-      // New review cycle (first review, all-clear, or no code changes): reset
-      // the round so the cycle gets its own 5-round budget.
-      agent._advisorRound = 0
-    }
-    // Mutations exist → KEEP the round (cap keeps advancing through retries).
-    const user = buildAdvisorUserMessage(agent, prior, reviewType, designToken, documents, paths, object, designId)
-    return [
-      { role: "system", content: withTime(buildAdvisorSystemPrompt(agent, prior, reviewType)) },
-      {
-        role: "user",
-        // NOTE (2026-08-06): the leading prefix is a PLAIN "System reminder:",
-        // NOT "[System reminder: ...]" — some OpenAI-compatible servers try to
-        // parse content that STARTS with '[' as structured content (or expand
-        // escape sequences in it). A literal "\x" inside the conversation
-        // background (e.g. the parent agent quoting escape sequences) then
-        // fails server-side as "unexpected end of hex escape" → 400. Plain
-        // prefix keeps the review message a plain string everywhere.
-        // The whole content also passes through escapeLiteralEscapes (below)
-        // so literal "\x"/"\u" quoted by the parent agent can never form an
-        // invalid escape when the server expands them.
-        content: escapeLiteralEscapes(`System reminder: no prior issue table is being carried into this review (first review, app restart, or session clear) — start with a fresh full review.\n\n${user}`),
-      },
-    ]
-  }
-
-  // Convergence rounds (2+): fresh [system(ROUND2/3), user(prior table + fix
-  // claims)]. buildAdvisorFollowUp carries BOTH the prior issue table (the
-  // only complete verification list — decision 2026-08-05, reversed) and the
-  // agent's fix-claim table (focus reference). buildAdvisorSystemPrompt
-  // selects ROUND2 for round 2, ROUND3 for rounds 3+ — a failed review retry
-  // keeps _advisorRound so the convergence prompt matches the attempt count.
-  // scopeFiles gives the fallback (agent gave no response table) a concrete
-  // review surface.
-  const scopeFiles = resolveScopeFiles(agent, paths)
-  const followUp = buildAdvisorFollowUp(agent, prior, scopeFiles, object)
-  // §11.2 D-24b (design round 2+ — async fix-round continuations must be able to
-  // re-approve): re-anchor the review scope (the convergence follow-up carries no
-  // document list) and inject the round's design token with the approval signal.
-  if (reviewType === "design") {
-    const docList = Array.isArray(documents)
-      ? documents.filter((d) => typeof d === "string" && d.trim())
-      : []
-    const scopeBlock = docList.length > 0
-      ? `\n\n## Documents to Review\nThe documents below are the review scope. Review ONLY these files — do not scan git diff or read any other files.\n${docList.map((d) => `- ${d} — Read this file in full`).join("\n")}`
-      : ""
-    const tokenBlock = designToken ? `\n\n${buildDesignApprovalBlock(designToken, designId)}` : ""
-    return [
-      { role: "system", content: withTime(buildAdvisorSystemPrompt(agent, prior, reviewType)) },
-      { role: "user", content: escapeLiteralEscapes(followUp + scopeBlock + tokenBlock) },
-    ]
-  }
-  return [
-    { role: "system", content: withTime(buildAdvisorSystemPrompt(agent, prior, reviewType)) },
-    { role: "user", content: escapeLiteralEscapes(followUp) },
-  ]
-}

package/src/agent/completion.mjs

@@ -1,146 +0,0 @@
-/**
- * agent/completion.mjs — handle model response with no tool calls
- *
- * Checks: pending tasks, verify guard, advisor guard.
- * Returns { action: 'continue' | 'done', content?, guardPushbacks, honestReminderInjected, advisorPushbacks }
- */
-import { hasCodeMutations } from "../advisor/repos.mjs"
-import { pushReal } from "../context.mjs"
-import { MAX_ADVISOR_ROUNDS } from "../advisor/run.mjs"
-import { advisorReviewPending, effectiveAdvisorRound } from "../agent-tools/advisor-async.mjs"
-
-const MAX_VERIFY_PUSHBACKS = 2
-const MAX_VERIFY_RETRIES = 3
-const MAX_ADVISOR_PUSHBACKS = 3
-const MAX_EMPTY_RETRIES = 2
-
-/**
- * Handle a model turn with zero tool calls. May push back (verify/advisor/pending tasks)
- * or accept the completion.
- *
- * @param {object} agent
- * @param {object} response - chat response with .content, .toolCalls
- * @param {number} depth - agent nesting depth (0 = top-level)
- * @param {number} turn - current turn index
- * @param {number} guardPushbacks - verify guard pushback count (mutated)
- * @param {boolean} honestReminderInjected - whether exhausted-verify reminder was already sent (mutated)
- * @param {number} advisorPushbacks - advisor guard pushback count (mutated)
- * @param {object} callbacks - { onTurnEnd }
- */
-export function handleCompletion(agent, response, depth, turn, guardPushbacks, honestReminderInjected, advisorPushbacks, callbacks) {
-  if (!response.content) {
-    // Transient empty response (reasoning exhausted / output truncated): instead of
-    // aborting the whole turn, inject a reminder and let the model respond again.
-    // Bounded — after MAX_EMPTY_RETRIES consecutive empties, surface the original error.
-    const retries = agent._emptyRetries ?? 0
-    if (retries < MAX_EMPTY_RETRIES) {
-      agent._emptyRetries = retries + 1
-      agent.history.push({
-        role: "user",
-        content: "[System reminder: your last response was empty — the provider returned no content (likely reasoning was exhausted or output was truncated). Respond again, continuing your work from where you left off.]",
-      })
-      callbacks.onTurnEnd?.(agent, turn)
-      return { action: "continue", guardPushbacks, honestReminderInjected, advisorPushbacks }
-    }
-    throw new Error(
-      "LLM returned empty response (likely reasoning exhausted or output truncated). " +
-      "Try lowering reasoning effort if this persists (/think in TUI). " +
-      `Provider: ${agent.provider.model}`
-    )
-  }
-
-  // Pending tasks: remind the model ONCE before it declares itself done.
-  // Deliberately capped at one pushback (reported pain: unbounded looping when a
-  // pending item can't be resolved). After the single reminder the model is free
-  // to finish — updating the task list (task tool) resets the budget, so a fresh
-  // list state earns one fresh reminder.
-  if (depth === 0 && agent.tasks.some((t) => t.status === "pending") && (agent._taskPushbacks ?? 0) < 1) {
-    agent._taskPushbacks = (agent._taskPushbacks ?? 0) + 1
-    const pending = agent.tasks.filter((t) => t.status === "pending").map((t) => t.title).join(", ")
-    pushReal(agent, { role: "assistant", content: response.content })
-    agent.history.push({
-      role: "user",
-      content: `[System reminder: you still have pending tasks: ${pending}. Update their status with the task tool before finishing — if they're done, mark them done; if they're not applicable, remove them. (This is your only reminder — if you choose not to, finish anyway.)]`,
-    })
-    callbacks.onTurnEnd?.(agent, turn)
-    return { action: "continue", guardPushbacks, honestReminderInjected, advisorPushbacks }
-  }
-
-  // --- verify guard: push model to verify mutated files before completion ---
-  // OPT-IN ONLY (verifyGuard: true). Engineering mode is excluded because it
-  // uses flow-driven review, not per-turn mechanical pushback (ENGINEERING-MODE.md §2.3).
-  // Backward compat: also accept root-level verifyGuard
-  const verifyGuard = agent.config?.agent?.verifyGuard ?? agent.config?.verifyGuard
-  if (depth === 0 && verifyGuard === true && !agent.config?.agent?.engineering) {
-    // Not verified yet → pushback to run verify
-    if (agent._mutatedThisRun && !agent._verifiedThisRun && hasCodeMutations(agent) && guardPushbacks < MAX_VERIFY_PUSHBACKS) {
-      guardPushbacks++
-      pushReal(agent, { role: "assistant", content: response.content })
-      agent.history.push({
-        role: "user",
-        content: "[System reminder: you modified files in this run but have not verified the changes. Before finishing: run the project's verification yourself (per its AGENTS.md test method), then call verify declaring the outcome via verification.status. verify mechanically gates on your declaration. If verification is genuinely impossible here, say so explicitly in your reply.]",
-      })
-      callbacks.onTurnEnd?.(agent, turn)
-      return { action: "continue", guardPushbacks, honestReminderInjected, advisorPushbacks }
-    }
-    // Verified but not passed → pushback to fix/complete (up to MAX_VERIFY_RETRIES).
-    // _verifyPassed === false means the declaration was failed, skipped without a
-    // reason, or not declared — not necessarily that a test failed.
-    if (agent._verifiedThisRun && agent._verifyPassed === false && agent._verifyRetries < MAX_VERIFY_RETRIES) {
-      agent._verifyRetries++
-      pushReal(agent, { role: "assistant", content: response.content })
-      agent.history.push({
-        role: "user",
-        content: `[System reminder: (retry ${agent._verifyRetries}/${MAX_VERIFY_RETRIES}) verify was not passed — either your verification declared failed, was skipped without a reason, or was not declared. Fix or complete your verification, then call verify again declaring the outcome. If you cannot fix after ${MAX_VERIFY_RETRIES} attempts, explain honestly what's blocking you.]`,
-      })
-      callbacks.onTurnEnd?.(agent, turn)
-      return { action: "continue", guardPushbacks, honestReminderInjected, advisorPushbacks }
-    }
-    // Exhausted retries — inject honesty reminder once
-    if (agent._verifiedThisRun && agent._verifyPassed === false && agent._verifyRetries >= MAX_VERIFY_RETRIES) {
-      if (honestReminderInjected) {
-        pushReal(agent, { role: "assistant", content: response.content })
-        return { action: "done", content: response.content, guardPushbacks, honestReminderInjected, advisorPushbacks }
-      }
-      honestReminderInjected = true
-      pushReal(agent, { role: "assistant", content: response.content })
-      agent.history.push({
-        role: "user",
-        content: `[System reminder: ${MAX_VERIFY_RETRIES} verify attempts exhausted. You have not passed verification. Either state explicitly that your verification could not be completed, or run verify again once it is. If your verification could not be completed, say so explicitly in your reply to the user — state what you tried and what you believe is blocking you, and do not present the work as complete; the user needs to know it is unfinished.]`,
-      })
-      callbacks.onTurnEnd?.(agent, turn)
-      return { action: "continue", guardPushbacks, honestReminderInjected, advisorPushbacks }
-    }
-  }
-
-  // --- advisor guard: review of mutated files before completion ---
-  // OPT-IN ONLY (advisor.guard === true, default OFF — 2026-08-21 semantic
-  // refactor), and NEVER in engineering mode. The advisor tool itself is always
-  // available; this guard only controls whether completion is pushed back.
-  const cfg = agent.config?.advisor
-  const advisorReview = cfg?.guard === true
-  if (depth === 0 && advisorReview && !agent.config?.agent?.engineering) {
-    // §11.2 D-24b (T-24b4 — guard timing): an async review that is still in flight
-    // (or queued in the advisor pool) means the review was launched — the guard
-    // does NOT push back while it is pending (未决不算未评审); once it settles
-    // non-stale it marks _calledAdvisorThisRun, and a STALE settle leaves the
-    // mark unset so the guard pushes back here again (fix #2 — no silent skip).
-    const pending = advisorReviewPending(agent)
-    const rounds = effectiveAdvisorRound(agent)
-    if (!pending && agent._mutatedThisRun && !agent._calledAdvisorThisRun && hasCodeMutations(agent)
-        && advisorPushbacks < MAX_ADVISOR_PUSHBACKS
-        && rounds < MAX_ADVISOR_ROUNDS) {
-      advisorPushbacks++
-      pushReal(agent, { role: "assistant", content: response.content })
-      agent.history.push({
-        role: "user",
-        content: `[System reminder: you changed code in this run and MUST get an advisor review before finishing (round ${rounds + 1}). Call the \`advisor\` tool now. This is required, not optional — do not skip it even if you believe the changes are trivial — the review will be quick either way. After the review, produce a response table for every issue found (see discipline rules for format).]`,
-      })
-      callbacks.onTurnEnd?.(agent, turn)
-      return { action: "continue", guardPushbacks, honestReminderInjected, advisorPushbacks }
-    }
-  }
-
-  pushReal(agent, { role: "assistant", content: response.content })
-  return { action: "done", content: response.content, guardPushbacks, honestReminderInjected, advisorPushbacks }
-}