@qwen-code/qwen-code 0.19.12 → 0.20.0-nightly.20260720.0c271659d

package/chunks/{chunk-NALRQ3SG.js → chunk-Y5534U4G.js}

@@ -2,14 +2,16 @@
 "use strict";
 import {
   listCommand
-} from "./chunk-ETN2G32U.js";
+} from "./chunk-DR5AUNJ2.js";
 import {
   ObservedChannelContactStore
-} from "./chunk-QSG4ZFG4.js";
+} from "./chunk-KTUQMDEP.js";
+import {
+  escapeAnsiCtrlCodes
+} from "./chunk-RS7MT2QG.js";
 import {
-  escapeAnsiCtrlCodes,
   stringWidth
-} from "./chunk-J6NT5YTN.js";
+} from "./chunk-H2XVO6NE.js";
 import {
   require_undici
 } from "./chunk-L573Z2QZ.js";
@@ -18,18 +20,18 @@ import {
 } from "./chunk-RXFQM6FQ.js";
 import {
   serveCommand
-} from "./chunk-DJ4VHAFJ.js";
+} from "./chunk-3ZL6YMO2.js";
 import {
   getErrorMessage as getErrorMessage2
-} from "./chunk-UZC5VPOJ.js";
+} from "./chunk-IDGTC5AS.js";
 import {
   collectProviderModelsForProtocol,
   getAuthTypeFromEnv,
   resolveCliGenerationConfig
-} from "./chunk-HVGJWOR6.js";
+} from "./chunk-JBCFW3IL.js";
 import {
   resolvePath
-} from "./chunk-F2RR4HO2.js";
+} from "./chunk-BVLROR2T.js";
 import {
   channelLoopPath,
   createChannel,
@@ -43,17 +45,17 @@ import {
   registerToolCallDispatch,
   selectFirstModel,
   sessionsPath
-} from "./chunk-HD6EGS5K.js";
+} from "./chunk-VWLLDHAY.js";
 import {
   getExtensionManager,
   requestChoicePluginNonInteractive,
   requestConsentNonInteractive,
   requestConsentOrFail,
   resolveExtensionCommandScope
-} from "./chunk-RKUMFUFM.js";
+} from "./chunk-LTQ5C5AB.js";
 import {
   parseChannelConfig
-} from "./chunk-EFAXBOQO.js";
+} from "./chunk-YWEW33JY.js";
 import {
   findCliEntryPath
 } from "./chunk-V6WHFGST.js";
@@ -75,7 +77,7 @@ import {
   isChannelWebhookTaskMessage,
   normalizeWorkerDiagnostic,
   sanitizeWorkerDiagnostic
-} from "./chunk-I7RRHHYG.js";
+} from "./chunk-Y2ENGUD6.js";
 import {
   normalizeServeChannelSelection
 } from "./chunk-TJTKSVIV.js";
@@ -88,14 +90,14 @@ import {
   signalService,
   waitForExit,
   writeServiceInfo
-} from "./chunk-HCCR43AY.js";
+} from "./chunk-RFIAR4YL.js";
 import {
   DEFAULT_BASE_URL,
   buildHeaders,
   clearAccount,
   loadAccount,
   saveAccount
-} from "./chunk-BABX5XRO.js";
+} from "./chunk-2HOVDT7W.js";
 import {
   AcpBridge,
   ChannelLoopScheduler,
@@ -105,34 +107,34 @@ import {
   SessionRouter,
   sanitizeLogText,
   sanitizePromptText
-} from "./chunk-BKNPMEN6.js";
+} from "./chunk-NIJEXGV6.js";
 import {
   assembleMcpServers,
   getPendingGatedMcpServers,
   mcpCommand
-} from "./chunk-4MPYGENG.js";
+} from "./chunk-DCCW7CRR.js";
 import {
   loadSettings
-} from "./chunk-6IITZE7O.js";
+} from "./chunk-2YJLFCYI.js";
 import {
   detectSystemLanguage,
   getCurrentLanguage,
   initializeI18n,
   resolveLanguageSetting,
   t
-} from "./chunk-TKASNYDS.js";
+} from "./chunk-3QR5MOHP.js";
 import {
   loadEnvironment
-} from "./chunk-PR5XQ73G.js";
+} from "./chunk-NQVA6O7F.js";
 import {
   getCliVersion
-} from "./chunk-GLH2NTPB.js";
+} from "./chunk-SQMTULHJ.js";
 import {
   getPackageJson
 } from "./chunk-VJNBRRZG.js";
 import {
   isWorkspaceTrusted
-} from "./chunk-GMUPIMHF.js";
+} from "./chunk-RS5JPH6Y.js";
 import {
   require_strip_json_comments
 } from "./chunk-ALGGS7UH.js";
@@ -156,6 +158,7 @@ import {
   addChannelMemoryEntries,
   checkForExtensionUpdate,
   clearChannelMemory,
+  getChannelMemoryRevision,
   getScopedEnvContents,
   ideContextStore,
   isBareMode,
@@ -175,7 +178,7 @@ import {
   unquoteCStylePath,
   updateChannelMemoryEntry,
   updateSetting
-} from "./chunk-GCY7QTCE.js";
+} from "./chunk-JDPCOUZ3.js";
 import {
   nextFireTime,
   parseCron
@@ -185,14 +188,14 @@ import {
   getAllGeminiMdFilenames,
   resolveTelemetrySettings,
   setGeminiMdFilename
-} from "./chunk-CPU6I5YV.js";
+} from "./chunk-I6JUVU7J.js";
 import {
   SchemaValidator,
   ToolNames
-} from "./chunk-ANRANWVE.js";
+} from "./chunk-OP4MOGXF.js";
 import {
   isTlsVerificationDisabled
-} from "./chunk-4CHDYDG3.js";
+} from "./chunk-6EFTQYW7.js";
 import {
   FatalConfigError,
   FatalSandboxError,
@@ -200,7 +203,7 @@ import {
   createDebugLogger,
   getErrorMessage,
   isNodeError
-} from "./chunk-UE5TZ55T.js";
+} from "./chunk-C27BYUX6.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -1920,6 +1923,7 @@ function channelMemoryOptions(getBridge, cwd) {
   return {
     channelMemory: {
       readChannelMemory,
+      getChannelMemoryRevision,
       listChannelMemoryEntries,
       addChannelMemoryEntries,
       updateChannelMemoryEntry,
@@ -2364,7 +2368,7 @@ var stopCommand = {
     if (argv["daemon-url"]) {
       const token = argv.token ?? process.env[QWEN_SERVER_TOKEN_ENV] ?? process.env[QWEN_DAEMON_TOKEN_ENV];
       try {
-        const sdk = await import("./daemon-ZW6LHOXT.js");
+        const sdk = await import("./daemon-EE5T3KOW.js");
         const client = new sdk.DaemonClient({
           baseUrl: argv["daemon-url"],
           ...token ? { token } : {}
@@ -2550,7 +2554,7 @@ var statusCommand = {
     if (argv["daemon-url"]) {
       const token = argv.token ?? process.env[QWEN_SERVER_TOKEN_ENV] ?? process.env[QWEN_DAEMON_TOKEN_ENV];
       try {
-        const sdk = await import("./daemon-ZW6LHOXT.js");
+        const sdk = await import("./daemon-EE5T3KOW.js");
         const client = new sdk.DaemonClient({
           baseUrl: argv["daemon-url"],
           ...token ? { token } : {}
@@ -2661,7 +2665,7 @@ var reloadCommand = {
     const token = resolveToken(argv.token);
     let sdk;
     try {
-      sdk = await import("./daemon-ZW6LHOXT.js");
+      sdk = await import("./daemon-EE5T3KOW.js");
     } catch (err) {
       writeStderrLine(
         `[Channel] Failed to load daemon SDK: ${safeChannelCommandErrorMessage(err)}`
@@ -2741,7 +2745,7 @@ var setCommand2 = {
     const selection = names[0] === "all" ? { mode: "all" } : { mode: "names", names };
     let sdk;
     try {
-      sdk = await import("./daemon-ZW6LHOXT.js");
+      sdk = await import("./daemon-EE5T3KOW.js");
     } catch (error) {
       writeStderrLine(
         `[Channel] Failed to load daemon SDK: ${safeChannelCommandErrorMessage(error)}`
@@ -2864,7 +2868,7 @@ function createDaemonChannelBridgeFacade(bridge, opts) {
 }
 __name(createDaemonChannelBridgeFacade, "createDaemonChannelBridgeFacade");
 async function loadDaemonSdk() {
-  return await import("./daemon-ZW6LHOXT.js");
+  return await import("./daemon-EE5T3KOW.js");
 }
 __name(loadDaemonSdk, "loadDaemonSdk");
 function selectedChannelNames(channelsConfig, selection) {
@@ -3086,6 +3090,7 @@ async function runChannelDaemonWorker(opts) {
             router: createdRouter,
             channelMemory: {
               readChannelMemory,
+              getChannelMemoryRevision,
               listChannelMemoryEntries,
               addChannelMemoryEntries,
               updateChannelMemoryEntry,
@@ -5165,6 +5170,11 @@ function coverageFromTranscripts(planPath, env = process.env) {
   const idleAgents = [];
   const unopenedAgents = [];
   const rewrittenPrompts = [];
+  const disclosures = [];
+  const disclose = /* @__PURE__ */ __name((subject, reason) => {
+    disclosures.push({ subject, reason });
+    return `${subject} \u2014 ${reason}`;
+  }, "disclose");
   const covered = /* @__PURE__ */ new Set();
   const uncoverable = /* @__PURE__ */ new Set();
   const rosterForRun = requiredAgents(plan);
@@ -5215,14 +5225,20 @@ function coverageFromTranscripts(planPath, env = process.env) {
         rewrittenThisRecord = true;
         if (!nothingBuiltAtAll && !superseded(rec, chunk)) {
           rewrittenPrompts.push(
-            `${name} \u2014 ran on a prompt the run wrote itself (none was built for this chunk), so the brief with its method and rules never reached it`
+            disclose(
+              name,
+              "ran on a prompt the run wrote itself (none was built for this chunk), so the brief with its method and rules never reached it"
+            )
           );
         }
       } else if (!wasDeliveredVerbatim(rec.launchPrompt, b)) {
         rewrittenThisRecord = true;
         if (!superseded(rec, chunk)) {
           rewrittenPrompts.push(
-            `${name} \u2014 launched with a prompt that is not the one the CLI built`
+            disclose(
+              name,
+              "launched with a prompt that is not the one the CLI built"
+            )
           );
         }
       }
@@ -5256,7 +5272,10 @@ function coverageFromTranscripts(planPath, env = process.env) {
   const nobodyBuiltAnything = roster.length > 1 && briefless.length === roster.length;
   if (nobodyBuiltAnything) {
     missingRoles.push(
-      `every dimension \u2014 none of the ${roster.length} required agents is on record as launched with a prompt this skill built, so this diff was reviewed, if at all, from prompts the run wrote for itself: no record shows the severity bar, the finding format or this project's own rules reaching an agent`
+      disclose(
+        "every dimension",
+        `none of the ${roster.length} required agents is on record as launched with a prompt this skill built, so this diff was reviewed, if at all, from prompts the run wrote for itself: no record shows the severity bar, the finding format or this project's own rules reaching an agent`
+      )
     );
   }
   const buildable = roster.filter((r) => builtOf(r.key) !== void 0);
@@ -5300,7 +5319,10 @@ function coverageFromTranscripts(planPath, env = process.env) {
     if (b === void 0) {
       if (!nobodyBuiltAnything) {
         missingRoles.push(
-          `${roleLabel(req)} \u2014 no record shows its brief reaching an agent, so this dimension was reviewed, if at all, from a prompt the run wrote for itself`
+          disclose(
+            roleLabel(req),
+            "no record shows its brief reaching an agent, so this dimension was reviewed, if at all, from a prompt the run wrote for itself"
+          )
         );
       }
       missingRoleSelectors.push(selectorOf(req));
@@ -5311,7 +5333,10 @@ function coverageFromTranscripts(planPath, env = process.env) {
     if (pick2 === void 0) {
       const anyMatch = candidatesOf[buildableIdx].length > 0;
       missingRoles.push(
-        anyMatch ? `${roleLabel(req)} \u2014 its prompt reached only an agent already credited with another block; one agent was given several blocks, and one transcript cannot certify two dimensions` : `${roleLabel(req)} \u2014 its prompt was built, but no agent on record was launched with it`
+        disclose(
+          roleLabel(req),
+          anyMatch ? "its prompt reached only an agent already credited with another block; one agent was given several blocks, and one transcript cannot certify two dimensions" : "its prompt was built, but no agent on record was launched with it"
+        )
       );
       missingRoleSelectors.push(selectorOf(req));
       continue;
@@ -5322,7 +5347,10 @@ function coverageFromTranscripts(planPath, env = process.env) {
     );
     if (!opened) {
       unreadBriefs.push(
-        `${roleLabel(req)} \u2014 never opened its brief (${brief}), so it reviewed without the instructions it was launched to follow`
+        disclose(
+          roleLabel(req),
+          `never opened its brief (${brief}), so it reviewed without the instructions it was launched to follow`
+        )
       );
     }
   }
@@ -5342,6 +5370,7 @@ function coverageFromTranscripts(planPath, env = process.env) {
     rewrittenPrompts,
     missingRoles,
     missingRoleSelectors,
+    disclosures,
     unreadBriefs,
     missingChunks,
     uncoverableChunks: [...uncoverable].sort((a, b) => a - b),
@@ -5349,7 +5378,10 @@ function coverageFromTranscripts(planPath, env = process.env) {
   };
 }
 __name(coverageFromTranscripts, "coverageFromTranscripts");
-var rebuildFix = /* @__PURE__ */ __name((role, noun) => `build the prompt with \`"\${QWEN_CODE_CLI:-qwen}" review agent-prompt --plan <plan> --role ${role} --findings <file> [--rules <rules file>]\` ` + (role === "reverse-audit" ? `(an early round with nothing confirmed passes an empty file; ` : `(pass the shard's findings, never an empty file \u2014 a verifier that sees no findings verifies nothing; `) + `pass --rules whenever the review loaded any, or the rebuilt brief silently drops the project rules) and launch an agent with EXACTLY what it prints \u2014 no ${noun} number, no summary of your own, no rewording`, "rebuildFix");
+var rebuildFix = /* @__PURE__ */ __name((role, noun) => `build the prompt with \`"\${QWEN_CODE_CLI:-qwen}" review agent-prompt --plan <plan> --role ${role} --findings <file> [--rules <rules file>] [--round <k>]\` ` + (role === "reverse-audit" ? `(an early round with nothing confirmed passes an empty file; ` : `(pass the shard's findings, never an empty file \u2014 a verifier that sees no findings verifies nothing; `) + `pass --rules whenever the review loaded any, or the rebuilt brief silently drops the project rules) and launch an agent with EXACTLY what it prints \u2014 no hand-added ${noun} number` + // --round bakes in a ROUND number. Verify's noun is "shard", and a
+// parenthetical claiming --round bakes it in would send the reader to the
+// wrong flag — shards are already told apart by their findings digest.
+(role === "reverse-audit" ? ` (--round bakes it in)` : ``) + `, no summary of your own, no rewording`, "rebuildFix");
 var REVERSE_AUDIT_GAP = {
   // Not "no auditor ran": a run that skipped the builder and hand-wrote the
   // launch leaves no brief file to open, so this shape is reached before the
@@ -5443,12 +5475,14 @@ function verificationGaps(planPath, opts, env = process.env) {
       )}`
     );
   }
+  let unverifiedFindings = false;
   if (opts.postsFindings) {
     const verifyKeys = [...built.keys()].filter(
       (k) => k === "verify" || k.startsWith("verify--")
     );
     const verify = bestDelivery(verifyKeys);
     if (verify !== "ok") {
+      unverifiedFindings = true;
       gaps.push(`verification \u2014 ${VERIFY_GAP[verify].gap}`);
       remediation.push(
         `verification: ${VERIFY_GAP[verify].fix.replace(
@@ -5460,14 +5494,44 @@ function verificationGaps(planPath, opts, env = process.env) {
       );
     }
   }
-  return { ok: gaps.length === 0, gaps, remediation };
+  return { ok: gaps.length === 0, gaps, remediation, unverifiedFindings };
 }
 __name(verificationGaps, "verificationGaps");
 
+// packages/cli/src/commands/review/lib/inline-counts.ts
+init_esbuild_shims();
+var CRITICAL_PREFIX = "**[Critical]**";
+var SUGGESTION_PREFIX = "**[Suggestion]**";
+function severityOf(c) {
+  const body = typeof c?.body === "string" ? c.body.trimStart() : "";
+  if (body.startsWith(CRITICAL_PREFIX)) return "critical";
+  if (body.startsWith(SUGGESTION_PREFIX)) return "suggestion";
+  return null;
+}
+__name(severityOf, "severityOf");
+function countInlineFindings(comments) {
+  let criticalsInline = 0;
+  let suggestionsInline = 0;
+  for (const c of comments) {
+    const severity = severityOf(c);
+    if (severity === "critical") criticalsInline++;
+    else if (severity === "suggestion") suggestionsInline++;
+  }
+  return { criticalsInline, suggestionsInline };
+}
+__name(countInlineFindings, "countInlineFindings");
+function unmarkedComments(comments) {
+  const out = [];
+  comments.forEach((c, i) => {
+    if (severityOf(c) === null) out.push(i);
+  });
+  return out;
+}
+__name(unmarkedComments, "unmarkedComments");
+
 // packages/cli/src/commands/review/compose-review.ts
-var CRITICAL_MARKER = "**[Critical]**";
 function withMarker(line) {
-  return line.startsWith(CRITICAL_MARKER) ? line : `${CRITICAL_MARKER} ${line}`;
+  return line.startsWith(CRITICAL_PREFIX) ? line : `${CRITICAL_PREFIX} ${line}`;
 }
 __name(withMarker, "withMarker");
 function toCount(value, field) {
@@ -5523,13 +5587,21 @@ function composeReview(input) {
     input.unreviewedDimensions,
     "unreviewedDimensions"
   );
+  const coverageEntries = [];
   const remediation = [];
   const planRef = input.planPath ? shellQuotePath(input.planPath) : "<plan>";
   const missingReceipts = [];
+  const nonDeterministicBodyCriticals = bodyCriticals.filter(
+    (x) => !/\[(?:build|test)\]/i.test(x)
+  ).length;
+  const criticalsNeedingVerify = criticalsInline + nonDeterministicBodyCriticals;
+  let criticalsUnverified = false;
   if (!input.planPath) {
-    unreviewed.push(
-      "coverage \u2014 no plan was given, so this run cannot show that any of the diff was read"
-    );
+    coverageEntries.push({
+      subject: "coverage",
+      reason: "no plan was given, so this run cannot show that any of the diff was read"
+    });
+    criticalsUnverified = criticalsNeedingVerify >= 1;
   } else {
     try {
       const cov = coverageFromTranscripts(input.planPath, input.env);
@@ -5542,9 +5614,10 @@ function composeReview(input) {
         if (!already) uncoverable.push(prefix);
       }
       for (const label2 of cov.idleAgents) {
-        unreviewed.push(
-          `${label2} \u2014 the agent made no tool call: it read nothing`
-        );
+        coverageEntries.push({
+          subject: label2,
+          reason: "the agent made no tool call: it read nothing"
+        });
       }
       if (cov.idleAgents.length > 0) {
         remediation.push(
@@ -5552,9 +5625,10 @@ function composeReview(input) {
         );
       }
       for (const label2 of cov.blindAgents) {
-        unreviewed.push(
-          `${label2} \u2014 launched with a prompt that never named the diff file, so it could not have read it`
-        );
+        coverageEntries.push({
+          subject: label2,
+          reason: "launched with a prompt that never named the diff file, so it could not have read it"
+        });
       }
       if (cov.blindAgents.length > 0) {
         remediation.push(
@@ -5562,34 +5636,27 @@ function composeReview(input) {
         );
       }
       for (const label2 of cov.unopenedAgents) {
-        unreviewed.push(
-          `${label2} \u2014 pointed at diff lines it never opened: it made tool calls, but none of them read the diff`
-        );
+        coverageEntries.push({
+          subject: label2,
+          reason: "pointed at diff lines it never opened: it made tool calls, but none of them read the diff"
+        });
       }
       if (cov.unopenedAgents.length > 0) {
         remediation.push(
           "agents that never opened the diff: relaunch each with the same printed prompt \u2014 the prompt already names the diff and its ranges; the read is what proves the review happened"
         );
       }
-      for (const label2 of cov.rewrittenPrompts) {
-        unreviewed.push(label2);
-      }
+      coverageEntries.push(...cov.disclosures);
       if (cov.rewrittenPrompts.length > 0) {
         remediation.push(
           `rewritten launches: re-run \`"\${QWEN_CODE_CLI:-qwen}" review agent-prompt --plan ${planRef} --chunk <id>\` (or \`--role <r>\`, with \`--file <path>\` for an invariant agent) \`[--rules <rules file>]\` for each named agent and pass its output unedited \u2014 copy it, do not retype it. Pass --rules whenever the review loaded any, or the rebuilt brief silently drops the project rules`
         );
       }
-      for (const label2 of cov.missingRoles) {
-        unreviewed.push(label2);
-      }
       if (cov.missingRoles.length > 0) {
         remediation.push(
           `missing briefs: build every required prompt in one call \u2014 \`"\${QWEN_CODE_CLI:-qwen}" review agent-prompt --plan ${planRef} --roster [--rules <rules file>]\` \u2014 and launch one agent per block it prints, verbatim; \`--role <n>\` or \`--chunk <id>\` rebuilds a single one. Pass --rules whenever the review loaded any`
         );
       }
-      for (const label2 of cov.unreadBriefs) {
-        unreviewed.push(label2);
-      }
       if (cov.unreadBriefs.length > 0) {
         remediation.push(
           "unread briefs: relaunch each agent with the same printed prompt \u2014 the agent must OPEN the brief file the prompt names; that read is the receipt"
@@ -5597,23 +5664,35 @@ function composeReview(input) {
       }
     } catch (err) {
       const why = err instanceof TranscriptsUnavailableError ? `could not read the agents' transcripts (${err.message})` : `the plan could not be used (${err.message})`;
-      unreviewed.push(
-        `coverage \u2014 ${why}, so this run cannot show that any of the diff was read`
-      );
+      coverageEntries.push({
+        subject: "coverage",
+        reason: `${why}, so this run cannot show that any of the diff was read`
+      });
     }
     try {
-      const findingsToVerify = criticalsInline + suggestionsInline + bodyCriticals.filter((c2) => !/\[(?:build|test)\]/i.test(c2)).length;
+      const findingsToVerify = criticalsInline + suggestionsInline + nonDeterministicBodyCriticals;
       const verification = verificationGaps(
         input.planPath,
         { postsFindings: findingsToVerify > 0 },
         input.env
       );
-      for (const gap of verification.gaps) unreviewed.push(gap);
+      for (const gap of verification.gaps) {
+        const cut = gap.indexOf(" \u2014 ");
+        coverageEntries.push(
+          cut === -1 ? { subject: gap, reason: "" } : {
+            subject: gap.slice(0, cut),
+            reason: gap.slice(cut + " \u2014 ".length)
+          }
+        );
+      }
       remediation.push(...verification.remediation);
+      criticalsUnverified = verification.unverifiedFindings && criticalsNeedingVerify >= 1;
     } catch (err) {
-      unreviewed.push(
-        `verification \u2014 could not check that Step 4 and Step 5 ran (${err.message})`
-      );
+      coverageEntries.push({
+        subject: "verification",
+        reason: `could not check that Step 4 and Step 5 ran (${err.message})`
+      });
+      criticalsUnverified = criticalsNeedingVerify >= 1;
     }
   }
   const contextUnavailable = toBool(
@@ -5652,17 +5731,24 @@ function composeReview(input) {
   if (cannotTell.length > 0) cappedBy.push("cannot-tell-existing-critical");
   if (missingReceipts.length > 0) cappedBy.push("chunk-nobody-read");
   if (uncoverable.length > 0) cappedBy.push("uncoverable-chunk");
-  if (unreviewed.length > 0) cappedBy.push("unreviewed-dimension");
+  if (unreviewed.length + coverageEntries.length > 0) {
+    cappedBy.push("unreviewed-dimension");
+  }
   if (contextUnavailable) cappedBy.push("context-unavailable");
+  if (criticalsUnverified) cappedBy.push("criticals-unverified");
   let event = baseEvent;
   if (event === "APPROVE" && cappedBy.length > 0) event = "COMMENT";
+  const deterministicBodyCriticals = bodyCriticals.length - nonDeterministicBodyCriticals;
+  if (event === "REQUEST_CHANGES" && criticalsUnverified && deterministicBodyCriticals === 0) {
+    event = "COMMENT";
+  }
   let downgraded = false;
   let downgradedFrom = null;
   if (event === "APPROVE" && downgradeApprove) {
     event = "COMMENT";
     downgraded = true;
     downgradedFrom = "Approve";
-  } else if (event === "REQUEST_CHANGES" && downgradeRequestChanges) {
+  } else if ((event === "REQUEST_CHANGES" || baseEvent === "REQUEST_CHANGES" && criticalsUnverified) && downgradeRequestChanges) {
     event = "COMMENT";
     downgraded = true;
     downgradedFrom = "Request changes";
@@ -5676,25 +5762,56 @@ ${footer}`, "finish");
     remediation.push(
       `chunks nobody read: build each with \`"\${QWEN_CODE_CLI:-qwen}" review agent-prompt --plan ${planRef} --chunk <id> [--rules <rules file>]\` \u2014 or the whole fan-out with \`--roster\` \u2014 and launch one agent per block, verbatim`
     );
-    notReviewedParts.push(
-      `Not reviewed: ${missingReceipts.map((id) => `chunk ${id}`).join(", ")} \u2014 no agent reported covering these; nobody read them.`
+    const disclosedSubjects = new Set(coverageEntries.map((e) => e.subject));
+    const unexplainedReceipts = missingReceipts.filter(
+      (id) => !disclosedSubjects.has(`chunk ${id}`)
     );
+    if (unexplainedReceipts.length > 0) {
+      notReviewedParts.push(
+        `Not reviewed: ${unexplainedReceipts.map((id) => `chunk ${id}`).join(", ")} \u2014 no agent reported covering these; nobody read them.`
+      );
+    }
   }
   if (uncoverable.length > 0) {
     notReviewedParts.push(
       `Not reviewed: ${uncoverable.join(", ")} \u2014 a line there exceeds the read limit.`
     );
   }
-  const whiffedDimensions = unreviewed.filter((d) => !d.includes(" \u2014 "));
-  const explainedDimensions = unreviewed.filter((d) => d.includes(" \u2014 "));
+  const covEntries = coverageEntries;
+  const callerLeft = [];
+  const seenCaller = /* @__PURE__ */ new Set();
+  for (const d of unreviewed) {
+    if (seenCaller.has(d)) continue;
+    seenCaller.add(d);
+    const echoesCoverage = covEntries.some(
+      (e) => d === e.subject || d.startsWith(`${e.subject} \u2014 `)
+    );
+    if (!echoesCoverage) callerLeft.push(d);
+  }
+  const whiffedDimensions = callerLeft.filter((d) => !d.includes(" \u2014 "));
+  const explainedCaller = callerLeft.filter((d) => d.includes(" \u2014 "));
   if (whiffedDimensions.length > 0) {
     notReviewedParts.push(
       `Not reviewed: ${whiffedDimensions.join(", ")} \u2014 the agent returned no evidence of its walk twice.`
     );
   }
-  for (const d of explainedDimensions) {
+  for (const d of explainedCaller) {
     notReviewedParts.push(`Not reviewed: ${d}.`);
   }
+  const seenSubjects = /* @__PURE__ */ new Set();
+  const byReason = /* @__PURE__ */ new Map();
+  for (const { subject, reason } of covEntries) {
+    if (seenSubjects.has(subject)) continue;
+    seenSubjects.add(subject);
+    const subjects = byReason.get(reason) ?? [];
+    subjects.push(subject);
+    byReason.set(reason, subjects);
+  }
+  for (const [reason, subjects] of byReason) {
+    notReviewedParts.push(
+      reason ? `Not reviewed: ${subjects.join(", ")} \u2014 ${reason}.` : `Not reviewed: ${subjects.join(", ")}.`
+    );
+  }
   const cannotTellBlock = cannotTell.length === 0 ? [] : [
     `Unresolved, please confirm: ${cannotTell.map((l) => withMarker(l)).join(" ")}`
   ];
@@ -5738,7 +5855,7 @@ ${footer}`, "finish");
   if (contextUnavailable) {
     clauses.push(contextUnavailableClause);
   } else {
-    const canCertify = !downgraded && !downgradeApprove && !downgradeRequestChanges && c === 0 && cannotTell.length === 0 && uncoverable.length === 0 && unreviewed.length === 0 && // A missing receipt caps the event but was left out of certification, so a
+    const canCertify = !downgraded && !downgradeApprove && !downgradeRequestChanges && c === 0 && cannotTell.length === 0 && uncoverable.length === 0 && unreviewed.length + coverageEntries.length === 0 && // A missing receipt caps the event but was left out of certification, so a
     // body could open "Reviewed — no blockers." two lines above "nobody read
     // them." Nothing nobody read can be certified blocker-free.
     missingReceipts.length === 0;
@@ -5747,12 +5864,12 @@ ${footer}`, "finish");
   if (suggestionsInline > 0) clauses.push("Suggestions are inline.");
   if (suggestionsDiscarded > 0) {
     clauses.push(
-      `${suggestionsDiscarded} Suggestion-level finding(s) could not be anchored to the diff; see the terminal output.`
+      `${suggestionsDiscarded} Suggestion-level finding(s) could not be anchored to a changed line and were dropped; nothing further to act on here.`
     );
   }
   clauses.push(...cannotTellBlock);
   clauses.push(...notReviewedParts);
-  if (downgradedFrom === "Request changes") {
+  if (downgradedFrom === "Request changes" || criticalsUnverified) {
     clauses.push(...bodyCriticalBlock);
   }
   return {
@@ -5766,22 +5883,72 @@ ${footer}`, "finish");
   };
 }
 __name(composeReview, "composeReview");
+function readDraftedComments(path3) {
+  let raw;
+  try {
+    raw = readFileSync6(path3, "utf8");
+  } catch (err) {
+    throw new Error(
+      `compose-review: cannot read the comments file ${path3}: ${err.message}. Pass the drafted inline comments \u2014 the same array the review payload will carry \u2014 or a file containing [] when nothing anchors inline.`
+    );
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch (err) {
+    throw new Error(
+      `compose-review: the comments file ${path3} is not JSON: ${err.message}`
+    );
+  }
+  const comments = Array.isArray(parsed) ? parsed : parsed?.comments;
+  if (!Array.isArray(comments)) {
+    throw new Error(
+      `compose-review: the comments file ${path3} must be a JSON array of comment objects, or a review payload with a \`comments\` array.`
+    );
+  }
+  const unmarked = unmarkedComments(comments);
+  if (unmarked.length > 0) {
+    throw new Error(
+      `compose-review: comments[${unmarked.join(", ")}] in ${path3} open with neither ${CRITICAL_PREFIX} nor ${SUGGESTION_PREFIX}. Every inline comment is a finding and carries its severity first \u2014 an unmarked body would be counted as neither, and a blocker that weighs nothing approves the review it should block. Fix the draft, not the counts.`
+    );
+  }
+  return comments;
+}
+__name(readDraftedComments, "readDraftedComments");
 var composeReviewCommand = {
   command: "compose-review",
-  describe: "Compute the review event and body from the finding counts and run states (the Step 7 invariant, as code); reads the state JSON from --input or stdin",
+  describe: "Compute the review event and body from the drafted comments and run states (the Step 7 invariant, as code); reads the state JSON from --input or stdin",
   builder: /* @__PURE__ */ __name((yargs) => yargs.option("input", {
     type: "string",
     describe: "Path to the state JSON (omit to read stdin)"
+  }).option("comments", {
+    type: "string",
+    demandOption: true,
+    describe: "Path to the drafted inline comments JSON (the review payload, or its bare comments array). The inline counts are counted from it, never typed \u2014 pass a file containing [] when nothing anchors inline."
   }).option("out", {
     type: "string",
     describe: "Also write the {event, body} JSON to this path"
   }), "builder"),
   handler: /* @__PURE__ */ __name((argv) => {
-    const { input, out } = argv;
+    const { input, comments, out } = argv;
+    if (!comments) {
+      throw new Error(
+        "compose-review: --comments is required \u2014 the inline counts are counted from the drafted comments file, never typed. Pass a file containing [] when nothing anchors inline."
+      );
+    }
     const raw = readFileSync6(input ?? 0, "utf8");
     const parsed = JSON.parse(raw);
     delete parsed.env;
-    const result = composeReview(parsed);
+    if (parsed.criticalsInline !== void 0 || parsed.suggestionsInline !== void 0) {
+      throw new Error(
+        "compose-review: `criticalsInline` / `suggestionsInline` are counted from the --comments file, not taken from the state JSON. Remove them. (A dogfooded run moved its one Critical from `bodyCriticals` to an inline comment, dropped the count on the way, and the verdict line read Approve over a blocker.)"
+      );
+    }
+    const drafted = readDraftedComments(comments);
+    const result = composeReview({
+      ...parsed,
+      ...countInlineFindings(drafted)
+    });
     const json = JSON.stringify(
       { ...result, verdictLine: verdictLine(result) },
       null,
@@ -5812,7 +5979,9 @@ function verdictLine(r) {
     "context-unavailable": "the PR's existing discussion could not be read"
   };
   let line = `Verdict: ${label2[r.event]}`;
-  if (r.baseEvent === "APPROVE" && r.event !== "APPROVE") {
+  if (r.baseEvent === "REQUEST_CHANGES" && r.event === "COMMENT" && r.cappedBy.includes("criticals-unverified")) {
+    line += " \u2014 a Request changes was NOT available: its blockers were never verified (they are posted, disclosed as unverified)";
+  } else if (r.baseEvent === "APPROVE" && r.event !== "APPROVE") {
     const reasons = r.cappedBy.map((c) => why[c] ?? c);
     if (r.downgraded) reasons.push("a presubmit check failed");
     line += ` \u2014 an Approve was NOT available: ${reasons.join("; ")}`;
@@ -7326,6 +7495,10 @@ var loadRulesCommand = {
 // packages/cli/src/commands/review/presubmit.ts
 init_esbuild_shims();
 import { writeFileSync as writeFileSync9, readFileSync as readFileSync8 } from "node:fs";
+function verdictStamp(run2) {
+  return run2.completed_at ?? run2.started_at ?? "";
+}
+__name(verdictStamp, "verdictStamp");
 var FAIL_CONCLUSIONS = /* @__PURE__ */ new Set([
   "failure",
   "cancelled",
@@ -7371,13 +7544,21 @@ function classifyCi(checkRuns, statuses) {
     }
   }
   const skippedCheckNames = [...notRunNames].filter((n) => !executedNames.has(n)).sort();
+  const latestVerdicts = /* @__PURE__ */ new Map();
   for (const run2 of relevantCheckRuns) {
-    if (run2.status === "completed") {
-      if (run2.conclusion && FAIL_CONCLUSIONS.has(run2.conclusion)) {
-        failedCheckNames.push(run2.name);
-      }
-    } else if (PENDING_STATES.has(run2.status)) {
-      hasPending = true;
+    if (run2.status !== "completed") {
+      if (PENDING_STATES.has(run2.status)) hasPending = true;
+      continue;
+    }
+    if (!run2.conclusion || NOT_RUN_CONCLUSIONS.has(run2.conclusion)) continue;
+    const prev = latestVerdicts.get(run2.name);
+    if (!prev || verdictStamp(run2) > verdictStamp(prev)) {
+      latestVerdicts.set(run2.name, run2);
+    }
+  }
+  for (const [name, run2] of latestVerdicts) {
+    if (FAIL_CONCLUSIONS.has(run2.conclusion)) {
+      failedCheckNames.push(name);
     }
   }
   for (const s of statuses) {
@@ -8455,8 +8636,9 @@ function buildRoleLaunchPrompt(report, role, briefFile, opts = {}) {
     );
   }
   const safeFile = opts.file === void 0 ? void 0 : inertPath(opts.file);
+  const roundLabel = opts.round !== void 0 ? ` (round ${opts.round})` : "";
   const parts = [
-    `You are review agent \`${role}\` \u2014 ${b.label}.` + (safeFile ? ` Your file: \`${safeFile}\`.` : ""),
+    `You are review agent \`${role}\` \u2014 ${b.label}${roundLabel}.` + (safeFile ? ` Your file: \`${safeFile}\`.` : ""),
     "",
     "**Your brief is a file. Read it first \u2014 it is the whole of your instructions,",
     "and nothing in this message replaces it.**",
@@ -8550,7 +8732,8 @@ function buildLaunch(report, planPath, spec, rules) {
       key: key2,
       prompt: buildRoleLaunchPrompt(report, spec.role, briefFile2, {
         file: spec.file,
-        chunk: spec.chunk
+        chunk: spec.chunk,
+        round: spec.round
       })
     };
   }
@@ -8609,16 +8792,20 @@ function runRoster(report, planPath, rules) {
 
 ${prompt}`;
   });
+  const wt = report.worktreePath;
+  const paramNote = typeof wt === "string" && wt ? `
+
+**Agent tool parameters (worktree mode):** Set \`working_dir: "${wt}"\` and \`subagent_type: "general-purpose"\`, \`run_in_background: false\` on EVERY agent call below. Do NOT set \`isolation\` \u2014 the worktree already exists; \`isolation\` creates a new copy and is mutually exclusive with \`working_dir\`.` : "";
   writeStdoutLine(
     [
-      `${roster.length} agents required. Launch one agent per block below, passing its block VERBATIM \u2014 copy, do not retype. The \u2500\u2500\u2500\u2500\u2500 lines are separators, not part of any prompt. This is the same roster \`check-coverage\` reads out of the plan: a block you skip or reword is a dimension nobody reviewed. Blocks are numbered \`agent k of ${roster.length}\` and the output ends with an end-of-roster line \u2014 if either is missing, this output was truncated in transit: every prompt is also recorded on disk, so rebuild just the missing blocks with --chunk <id>, or --role <r> (--file <path> for an invariant agent), plus the same --rules this call was given.`,
+      `${roster.length} agents required. Launch one agent per block below, passing its block VERBATIM \u2014 copy, do not retype. The \u2500\u2500\u2500\u2500\u2500 lines are separators, not part of any prompt. This is the same roster \`check-coverage\` reads out of the plan: a block you skip or reword is a dimension nobody reviewed. Blocks are numbered \`agent k of ${roster.length}\` and the output ends with an end-of-roster line \u2014 if either is missing, this output was truncated in transit: every prompt is also recorded on disk, so rebuild just the missing blocks with --chunk <id>, or --role <r> (--file <path> for an invariant agent), plus the same --rules this call was given.` + paramNote,
       ...blocks,
       `\u2500\u2500\u2500\u2500\u2500 end of roster \u2014 ${roster.length} agents \u2500\u2500\u2500\u2500\u2500`
     ].join("\n\n")
   );
 }
 __name(runRoster, "runRoster");
-function runAllChunks(report, planPath, role, findingsContent, rules) {
+function runAllChunks(report, planPath, role, findingsContent, rules, round) {
   if (!Array.isArray(report.chunks) || report.chunks.length === 0) {
     throw new Error("agent-prompt: the plan has no `chunks[]`.");
   }
@@ -8630,12 +8817,13 @@ function runAllChunks(report, planPath, role, findingsContent, rules) {
     );
   }
   const digest = findingsDigest(findingsContent, rules);
+  const roundPart = round !== void 0 ? `--round-${round}` : "";
   const blocks = chunks.map((c, i) => {
-    const key = `${role}--chunk-${c.id}--${digest}`;
+    const key = `${role}--chunk-${c.id}${roundPart}--${digest}`;
     const { prompt } = buildLaunch(
       report,
       planPath,
-      { role, chunk: c.id, key },
+      { role, chunk: c.id, key, round },
       rules
     );
     const printed = foldFindings(role, findingsContent, prompt);
@@ -8659,19 +8847,20 @@ function runAgentPrompt(args) {
   const hasFile = typeof args.file === "string" && args.file.length > 0;
   const hasFindings = typeof args.findings === "string" && args.findings.length > 0;
   const hasWhole = !!args.wholeDiff;
+  const hasRound = args.round !== void 0;
   const bad = /* @__PURE__ */ __name((msg) => {
     throw new Error(`agent-prompt: ${msg}`);
   }, "bad");
   if (args.roster) {
-    if (hasChunk || hasRole || hasFile || hasFindings || hasWhole || args.allChunks) {
+    if (hasChunk || hasRole || hasFile || hasFindings || hasWhole || args.allChunks || hasRound) {
       bad(
-        "--roster builds every prompt the plan requires; it takes no --chunk, --role, --file, --findings, --whole-diff or --all-chunks. (Step 4/5 verify and reverse-audit prompts are built per round, with --role and --findings.)"
+        "--roster builds every prompt the plan requires; it takes no --chunk, --role, --file, --findings, --whole-diff, --all-chunks or --round. (Step 4/5 verify and reverse-audit prompts are built per round, with --role and --findings.)"
       );
     }
   } else if (hasWhole) {
-    if (hasChunk || hasRole || hasFile || hasFindings || args.allChunks) {
+    if (hasChunk || hasRole || hasFile || hasFindings || args.allChunks || hasRound) {
       bad(
-        "--whole-diff builds the diff-reading block alone; it takes no --chunk, --role, --file, --findings or --all-chunks."
+        "--whole-diff builds the diff-reading block alone; it takes no --chunk, --role, --file, --findings, --all-chunks or --round."
       );
     }
   } else if (hasRole) {
@@ -8717,6 +8906,21 @@ function runAgentPrompt(args) {
         `--findings folds a findings list into the prompt, only for a role that takes one (${findingRoles.join(", ")}); role "${role}" does not.`
       );
     }
+    if (hasRound) {
+      if (!BRIEFS[role]?.acceptsFindings) {
+        const roundRoles = Object.keys(BRIEFS).filter(
+          (r) => BRIEFS[r].acceptsFindings
+        );
+        bad(
+          `--round labels one round of a findings role (${roundRoles.join(", ")}); role "${role}" runs once and does not take it.`
+        );
+      }
+      if (!Number.isSafeInteger(args.round) || args.round < 1) {
+        bad(
+          `--round is a 1-based round number (--round 1, --round 2, \u2026); got "${args.round}".`
+        );
+      }
+    }
   } else if (hasFindings) {
     const findingRoles = Object.keys(BRIEFS).filter(
       (r) => BRIEFS[r].acceptsFindings
@@ -8733,6 +8937,13 @@ function runAgentPrompt(args) {
     bad(
       "--all-chunks builds one auditor block per chunk for a per-chunk findings role; it needs --role <role> and --findings <file> (--role reverse-audit for a Step 5 round)."
     );
+  } else if (hasRound) {
+    const roundRoles = Object.keys(BRIEFS).filter(
+      (r) => BRIEFS[r].acceptsFindings
+    );
+    bad(
+      `--round labels one round of a findings role; it needs ${roundRoles.map((r) => `--role ${r}`).join(" / ")} and --findings <file>.`
+    );
   } else if (!hasChunk) {
     bad(
       "pass exactly one of --roster (every prompt the plan requires, in one call), --chunk <id> (a Step 3B territory agent), --role <role> (a named agent), or --whole-diff (the diff-reading block on its own)."
@@ -8782,7 +8993,8 @@ function runAgentPrompt(args) {
       args.plan,
       args.role,
       findingsContent,
-      rules
+      rules,
+      args.round
     );
     return;
   }
@@ -8795,7 +9007,8 @@ function runAgentPrompt(args) {
     let keyOverride;
     if (findingsContent !== void 0 && args.role) {
       const base = typeof args.chunk === "number" ? `${args.role}--chunk-${args.chunk}` : args.role;
-      keyOverride = `${base}--${findingsDigest(findingsContent, rules)}`;
+      const roundPart = args.round !== void 0 ? `--round-${args.round}` : "";
+      keyOverride = `${base}${roundPart}--${findingsDigest(findingsContent, rules)}`;
     }
     ({ key, prompt } = buildLaunch(
       report,
@@ -8804,7 +9017,8 @@ function runAgentPrompt(args) {
         role: args.role,
         chunk: args.chunk,
         file: args.file,
-        key: keyOverride
+        key: keyOverride,
+        round: args.round
       } : { chunk: args.chunk },
       rules
     ));
@@ -8846,6 +9060,9 @@ var agentPromptCommand = {
   }).option("findings", {
     type: "string",
     describe: "Path to a file of findings to fold into a --role verify (the shard it rules on) / --role reverse-audit (the cumulative confirmed list) prompt, so you paste ONE block. The findings are part of the recorded prompt (keyed per findings digest), so a launch that drops them matches no record \u2014 paste the whole output verbatim, do not add a round number or reword it."
+  }).option("round", {
+    type: "number",
+    describe: "Which round of a findings role this is (1-based). The CLI bakes it into the identity line and the record key, so pass it here instead of writing a round label into the prompt yourself \u2014 a hand-added label reads as a rewritten launch."
   }), "builder"),
   handler: /* @__PURE__ */ __name((argv) => {
     runAgentPrompt({
@@ -8857,7 +9074,8 @@ var agentPromptCommand = {
       roster: argv["roster"] === true,
       allChunks: argv["all-chunks"] === true,
       rules: argv["rules"],
-      findings: argv["findings"]
+      findings: argv["findings"],
+      round: argv["round"]
     });
   }, "handler")
 };
@@ -9455,8 +9673,6 @@ function isDiffLine(n) {
   return typeof n === "number" && Number.isSafeInteger(n) && n > 0;
 }
 __name(isDiffLine, "isDiffLine");
-var CRITICAL_PREFIX = "**[Critical]**";
-var SUGGESTION_PREFIX = "**[Suggestion]**";
 function authorization(args) {
   if (args.userAuthorized) {
     return { ok: true, why: "the user asked for this review to be published" };
@@ -9517,12 +9733,7 @@ __name(authorization, "authorization");
 function compose(payload) {
   const comments = payload.comments ?? [];
   const state = payload.state ?? {};
-  const criticalsInline = comments.filter(
-    (c) => (c.body ?? "").trimStart().startsWith(CRITICAL_PREFIX)
-  ).length;
-  const suggestionsInline = comments.filter(
-    (c) => (c.body ?? "").trimStart().startsWith(SUGGESTION_PREFIX)
-  ).length;
+  const { criticalsInline, suggestionsInline } = countInlineFindings(comments);
   const { env: _dropped, ...rest } = state;
   void _dropped;
   const r = composeReview({
@@ -9566,6 +9777,11 @@ function inconsistencies(payload, event) {
     const at = `comments[${i}]`;
     if (!c.path) problems.push(`${at} has no \`path\``);
     if (!c.body) problems.push(`${at} has no \`body\` \u2014 an empty comment`);
+    if (c.body && severityOf(c) === null) {
+      problems.push(
+        `${at} opens with neither ${CRITICAL_PREFIX} nor ${SUGGESTION_PREFIX} \u2014 the verdict counts comments by their severity marker, and an unmarked one weighs nothing in it`
+      );
+    }
     if (!isDiffLine(c.line)) {
       problems.push(
         `${at} has no usable \`line\` (${JSON.stringify(c.line)}) \u2014 a line is a positive whole number; resolve its anchor first`
@@ -10313,10 +10529,10 @@ var updateCommand3 = {
       stdioHelpers,
       { updateEventEmitter }
     ] = await Promise.all([
-      import("./settings-JC3VC53L.js"),
-      import("./updateCheck-AHTHWLAM.js"),
-      import("./installationInfo-LROMXYLX.js"),
-      import("./standalone-update-UUJWJWYY.js"),
+      import("./settings-H5O22TGQ.js"),
+      import("./updateCheck-EKIPND4B.js"),
+      import("./installationInfo-3UETF773.js"),
+      import("./standalone-update-UC6CWBLH.js"),
       import("./stdioHelpers-HGIYTWAY.js"),
       import("./updateEventEmitter-5MKC7BLQ.js")
     ]);