@qwen-code/qwen-code 0.23.1 → 0.23.2-nightly.20260909.2e212144d3

package/chunks/{chunk-PDUMGZ2P.js → chunk-BDAVT6K2.js}

@@ -50,7 +50,7 @@ import {
   listTasks,
   onTasksUpdated,
   unassignTeammateTasks
-} from "./chunk-YHDGABDC.js";
+} from "./chunk-XKBFYTCD.js";
 import {
   CronScheduler,
   DEFAULT_RECURRING_MAX_AGE_DAYS,
@@ -64,7 +64,7 @@ import {
   sendStructuredMessage,
   wrapConfirmWithBadge,
   writeMessage
-} from "./chunk-B54PFQS5.js";
+} from "./chunk-7CLLH5TI.js";
 import {
   AGENT_WORKTREE_SLUG_PATTERN,
   GitWorktreeService,
@@ -102,7 +102,7 @@ import {
   validateTranscriptRecord,
   walkTranscriptUuidChain,
   wrapUserPromptSubmitContext
-} from "./chunk-FDOGGKAA.js";
+} from "./chunk-GSFV5RQW.js";
 import {
   canUseRipgrep,
   resolveBundleDir
@@ -157,7 +157,7 @@ import {
   deriveSessionName,
   patchSessionRecord,
   unregisterSession
-} from "./chunk-B44JBZBB.js";
+} from "./chunk-F4SAL7WM.js";
 import {
   LEADER_NAME,
   MAX_TEAMMATES,
@@ -170,7 +170,7 @@ import {
   readPidNamespaceId,
   sanitizeName,
   writeTeamFile
-} from "./chunk-BF3RUIVP.js";
+} from "./chunk-CH2YDT6X.js";
 import {
   APPROVAL_MODES
 } from "./chunk-JX6XHPTX.js";
@@ -226,7 +226,7 @@ import {
   resolveEffectiveOutputStyle,
   resolveInteractionMode,
   resolveMainSessionOutputStyle
-} from "./chunk-3LPJ776W.js";
+} from "./chunk-2HYOOFDS.js";
 import {
   findGitRoot,
   getCachedGitBranch,
@@ -242,7 +242,7 @@ import {
 import {
   DashScopeOpenAICompatibleProvider,
   selectDashScopeThinkingKnob
-} from "./chunk-VF6D6EGV.js";
+} from "./chunk-HSO6D4KX.js";
 import {
   childLaunchDepth,
   getCurrentAgentDepth,
@@ -279,7 +279,7 @@ import {
 import {
   DEFAULT_OPENAI_BASE_URL,
   DEFAULT_STREAM_MAX_LIFETIME_MS
-} from "./chunk-6YEOCHSE.js";
+} from "./chunk-AXMWHKXA.js";
 import {
   combineAbortSignals,
   createAbortController,
@@ -391,7 +391,7 @@ import {
   updateMCPServerStatus,
   writeLine,
   writeLineSync
-} from "./chunk-6QV7Z74P.js";
+} from "./chunk-FRS3P7MQ.js";
 import {
   getInvocationContext,
   runWithInvocationContext
@@ -399,7 +399,7 @@ import {
 import {
   defaultModalities,
   isTieredEffortWireModel
-} from "./chunk-XBVNNDPK.js";
+} from "./chunk-GSYD7MYP.js";
 import {
   Mutex
 } from "./chunk-VGC4I5JJ.js";
@@ -448,7 +448,7 @@ import {
   knownTokenLimit,
   parsePositiveIntegerEnvValue,
   tokenLimit
-} from "./chunk-FPGTNKCP.js";
+} from "./chunk-F3M6P6IQ.js";
 import {
   AUTH_ENV_MAPPINGS,
   DEFAULT_MODELS,
@@ -461,7 +461,7 @@ import {
   createContentGenerator,
   resetPreloadedContentGenerator,
   resolveContentGeneratorConfigWithSources
-} from "./chunk-N7YQEKGX.js";
+} from "./chunk-EOLGAQ25.js";
 import {
   atomicWriteFile,
   atomicWriteFileSync,
@@ -20734,12 +20734,20 @@ __name(hasOnlyKeys2, "hasOnlyKeys");
 init_esbuild_shims();
 var GOAL_CHECKPOINT_VERIFIER_DEFAULT_TIMEOUT_MS = 18e4;
 var GOAL_CHECKPOINT_VERIFIER_REQUEST_BYTE_LIMIT = 256e3;
+var debugLogger6 = createDebugLogger("GOAL_CHECKPOINT_VERIFIER");
 var GOAL_CHECKPOINT_VERIFIER_SCHEMA = {
   type: "object",
   additionalProperties: false,
   properties: {
     claims: {
       type: "array",
+      // `description` is the only schema-level bound that survives to the
+      // model. Strict normalisation drops `maxLength`/`maxItems` (they are in
+      // OPENAI_STRICT_UNSUPPORTED_SCHEMA_KEYS), and `response_format` is not
+      // sent at all to endpoints that are not official OpenAI -- so the
+      // bounds are also stated in the system prompt and enforced on the way
+      // back in.
+      description: `Cumulative checkpoint claims. The combined UTF-8 size of every claim string must stay within ${GOAL_CHECKPOINT_CLAIM_MAX_BYTES} bytes. A response over that budget is rejected even when each individual claim is within its own length bound.`,
       minItems: 1,
       maxItems: GOAL_CHECKPOINT_CLAIM_LIMIT,
       items: {
@@ -20773,9 +20781,34 @@ var GOAL_CHECKPOINT_VERIFIER_SYSTEM_PROMPT = `You are an independent Goal Eviden
 
 Each output claim must cite one or more input IDs in sourceRefs. Preserve evidence semantics exactly: never change a source proofKind, and do not combine sources with different proofKind values into one claim. "delivered_output" proves only that content was delivered, "external_fact" supports external facts, and "user_input" supports what the user actually said or authorized.
 
-previousClaims are already verified checkpoint claims; to carry one forward, cite its id in sourceRefs. evidence contains the current bounded transcript evidence. Produce a cumulative checkpoint that retains every still-relevant fact needed to judge the Goal objective or a later terminal proposal. Omission may make the Goal impossible to verify, so preserve material progress, decisions, user constraints, external results, and delivered outputs. The combined UTF-8 size of all output claims must stay within ${GOAL_CHECKPOINT_CLAIM_MAX_BYTES} bytes, so compress the sources into dense claims. Do not make a terminal decision.
+previousClaims are already verified checkpoint claims; to carry one forward, cite its id in sourceRefs. evidence contains the current bounded transcript evidence. Produce a cumulative checkpoint that retains every still-relevant fact needed to judge the Goal objective or a later terminal proposal. Omission may make the Goal impossible to verify, so preserve material progress, decisions, user constraints, external results, and delivered outputs. Return at most ${GOAL_CHECKPOINT_CLAIM_LIMIT} claims. The combined UTF-8 size of all output claims must stay within ${GOAL_CHECKPOINT_CLAIM_MAX_BYTES} bytes, and every individual claim must stay within ${GOAL_CHECKPOINT_CLAIM_MAX_CHARACTERS} characters, so compress the sources into dense claims. Do not make a terminal decision.
 
 Return exactly one JSON object with a non-empty claims array. Each claim must contain exactly proofKind, claim, and sourceRefs. Include no markdown fence, preamble, extra key, or commentary.`;
+var GoalCheckpointClaimBudgetError = class extends InvalidGoalCheckpointError {
+  constructor(byteLength2) {
+    super(
+      `Goal checkpoint claims total ${byteLength2} bytes, over the ${GOAL_CHECKPOINT_CLAIM_MAX_BYTES}-byte budget`
+    );
+    this.byteLength = byteLength2;
+    this.name = "GoalCheckpointClaimBudgetError";
+  }
+  static {
+    __name(this, "GoalCheckpointClaimBudgetError");
+  }
+};
+var GoalCheckpointClaimLengthError = class extends InvalidGoalCheckpointError {
+  constructor(claimIndex, characterLength) {
+    super(
+      `Goal checkpoint verifier claim ${claimIndex + 1} is ${characterLength} characters, over the ${GOAL_CHECKPOINT_CLAIM_MAX_CHARACTERS}-character limit`
+    );
+    this.claimIndex = claimIndex;
+    this.characterLength = characterLength;
+    this.name = "GoalCheckpointClaimLengthError";
+  }
+  static {
+    __name(this, "GoalCheckpointClaimLengthError");
+  }
+};
 var GoalCheckpointVerifierInputTooLargeError = class extends Error {
   constructor(byteLength2) {
     super(
@@ -20788,7 +20821,7 @@ var GoalCheckpointVerifierInputTooLargeError = class extends Error {
     __name(this, "GoalCheckpointVerifierInputTooLargeError");
   }
 };
-function verifierContents(input) {
+function verifierContents(input, retryNote) {
   const payload = {
     goal: {
       goalId: input.goal.goalId,
@@ -20809,11 +20842,15 @@ function verifierContents(input) {
     }))
   };
   const text = JSON.stringify(payload);
-  const byteLength2 = Buffer.byteLength(text, "utf8");
+  const parts2 = retryNote ? [{ text }, { text: retryNote }] : [{ text }];
+  const byteLength2 = parts2.reduce(
+    (total, part) => total + Buffer.byteLength(part.text, "utf8"),
+    0
+  );
   if (byteLength2 > GOAL_CHECKPOINT_VERIFIER_REQUEST_BYTE_LIMIT) {
     throw new GoalCheckpointVerifierInputTooLargeError(byteLength2);
   }
-  return [{ role: "user", parts: [{ text }] }];
+  return [{ role: "user", parts: parts2 }];
 }
 __name(verifierContents, "verifierContents");
 function parseGoalCheckpointVerifierText(text) {
@@ -20833,13 +20870,52 @@ function parseGoalCheckpointVerifierText(text) {
   const claims = value["claims"].map(
     (claim, index) => parseClaim(claim, index)
   );
+  const claimBytes = claims.reduce(
+    (total, claim) => total + Buffer.byteLength(claim.claim, "utf8"),
+    0
+  );
+  if (claimBytes > GOAL_CHECKPOINT_CLAIM_MAX_BYTES) {
+    throw new GoalCheckpointClaimBudgetError(claimBytes);
+  }
   return { claims };
 }
 __name(parseGoalCheckpointVerifierText, "parseGoalCheckpointVerifierText");
+function claimBudgetRetryNote(byteLength2) {
+  return `Your previous answer was rejected: its claim strings totalled ${byteLength2} UTF-8 bytes, over the ${GOAL_CHECKPOINT_CLAIM_MAX_BYTES}-byte budget. Return the same coverage within the budget, keeping every individual claim at or under ${GOAL_CHECKPOINT_CLAIM_MAX_CHARACTERS} characters. Merge claims that share a source and state each fact once, cutting restatement rather than facts. Reply with the JSON object only.`;
+}
+__name(claimBudgetRetryNote, "claimBudgetRetryNote");
+function claimLengthRetryNote(claimIndex, characterLength) {
+  return `Your previous answer was rejected: claim ${claimIndex + 1} was ${characterLength} characters, over the ${GOAL_CHECKPOINT_CLAIM_MAX_CHARACTERS}-character limit for a single claim. Return the same coverage with every individual claim at or under ${GOAL_CHECKPOINT_CLAIM_MAX_CHARACTERS} characters and all claims together at or under ${GOAL_CHECKPOINT_CLAIM_MAX_BYTES} UTF-8 bytes. Split the over-long claim into as few additional claims as the budget allows, without exceeding ${GOAL_CHECKPOINT_CLAIM_LIMIT} claims in one checkpoint, or compress it, rather than dropping facts. Reply with the JSON object only.`;
+}
+__name(claimLengthRetryNote, "claimLengthRetryNote");
+function correctiveRetryFor(error3) {
+  if (error3 instanceof GoalCheckpointClaimBudgetError) {
+    return {
+      note: claimBudgetRetryNote(error3.byteLength),
+      debugMessage: "Retrying goal checkpoint verifier after claim budget overrun",
+      debugPayload: {
+        byteLength: error3.byteLength,
+        budgetBytes: GOAL_CHECKPOINT_CLAIM_MAX_BYTES
+      }
+    };
+  }
+  if (error3 instanceof GoalCheckpointClaimLengthError) {
+    return {
+      note: claimLengthRetryNote(error3.claimIndex, error3.characterLength),
+      debugMessage: "Retrying goal checkpoint verifier after a claim overran the per-claim limit",
+      debugPayload: {
+        claimIndex: error3.claimIndex,
+        characterLength: error3.characterLength,
+        limitCharacters: GOAL_CHECKPOINT_CLAIM_MAX_CHARACTERS
+      }
+    };
+  }
+  return void 0;
+}
+__name(correctiveRetryFor, "correctiveRetryFor");
 function createGoalCheckpointVerifier(config3, options2 = {}) {
   const timeoutMs = options2.timeoutMs ?? GOAL_CHECKPOINT_VERIFIER_DEFAULT_TIMEOUT_MS;
   return async (input, attemptSignal) => {
-    const contents = verifierContents(input);
     const timeoutController = new AbortController();
     const timer = setTimeout(() => {
       timeoutController.abort(
@@ -20848,37 +20924,62 @@ function createGoalCheckpointVerifier(config3, options2 = {}) {
     }, timeoutMs);
     const abortSignal = attemptSignal ? AbortSignal.any([attemptSignal, timeoutController.signal]) : timeoutController.signal;
     try {
-      const result = await runSideQuery(config3, {
-        contents,
-        abortSignal,
-        purpose: "goal-checkpoint-verifier",
-        maxAttempts: 1,
-        skipOutputLanguagePreference: true,
-        // Stream so a slow claims generation outlives the provider request
-        // timeout: non-streaming returns no bytes until the whole JSON is
-        // generated, so the SDK timeout (default 120 s) would abort every
-        // attempt past it and retry from zero, leaving any ceiling above
-        // that unreachable. Streamed, the timeout bounds only connect +
-        // first response and the stream guards apply instead.
-        stream: true,
-        systemInstruction: GOAL_CHECKPOINT_VERIFIER_SYSTEM_PROMPT,
-        config: {
-          temperature: 0,
-          responseMimeType: "application/json",
-          responseJsonSchema: GOAL_CHECKPOINT_VERIFIER_SCHEMA,
-          thinkingConfig: { thinkingBudget: 0, includeThoughts: false }
+      let retry;
+      let retryCause;
+      for (; ; ) {
+        const contents = retryContents(input, retry?.note, retryCause);
+        const result = await runSideQuery(config3, {
+          contents,
+          abortSignal,
+          purpose: "goal-checkpoint-verifier",
+          maxAttempts: 1,
+          skipOutputLanguagePreference: true,
+          // Stream so a slow claims generation outlives the provider request
+          // timeout: non-streaming returns no bytes until the whole JSON is
+          // generated, so the SDK timeout (default 120 s) would abort every
+          // attempt past it and retry from zero, leaving any ceiling above
+          // that unreachable. Streamed, the timeout bounds only connect +
+          // first response and the stream guards apply instead.
+          stream: true,
+          systemInstruction: GOAL_CHECKPOINT_VERIFIER_SYSTEM_PROMPT,
+          config: {
+            temperature: 0,
+            responseMimeType: "application/json",
+            responseJsonSchema: GOAL_CHECKPOINT_VERIFIER_SCHEMA,
+            thinkingConfig: { thinkingBudget: 0, includeThoughts: false }
+          }
+          // Parsing stays out of a validate hook: runSideQuery re-wraps hook
+          // failures into plain Errors, erasing the InvalidGoalCheckpointError
+          // class and message the verifier's own tests assert on.
+        });
+        try {
+          return parseGoalCheckpointVerifierText(result.text);
+        } catch (error3) {
+          const corrective = retry === void 0 ? correctiveRetryFor(error3) : void 0;
+          if (!corrective) throw error3;
+          debugLogger6.debug(corrective.debugMessage, corrective.debugPayload);
+          retry = corrective;
+          retryCause = error3;
         }
-        // Parsing stays out of a validate hook: runSideQuery re-wraps hook
-        // failures into plain Errors, erasing the InvalidGoalCheckpointError
-        // class and message the verifier's own tests assert on.
-      });
-      return parseGoalCheckpointVerifierText(result.text);
+      }
     } finally {
       clearTimeout(timer);
     }
   };
 }
 __name(createGoalCheckpointVerifier, "createGoalCheckpointVerifier");
+function retryContents(input, note, retryCause) {
+  if (note === void 0) return verifierContents(input);
+  try {
+    return verifierContents(input, note);
+  } catch (error3) {
+    if (error3 instanceof GoalCheckpointVerifierInputTooLargeError) {
+      throw retryCause;
+    }
+    throw error3;
+  }
+}
+__name(retryContents, "retryContents");
 function parseClaim(value, index) {
   if (!isRecord3(value) || !hasOnlyKeys3(value, ["proofKind", "claim", "sourceRefs"]) || !isGoalEvidenceProofKind(value["proofKind"]) || typeof value["claim"] !== "string" || !Array.isArray(value["sourceRefs"]) || value["sourceRefs"].length === 0 || value["sourceRefs"].length > GOAL_CHECKPOINT_SOURCE_REFERENCE_LIMIT || value["sourceRefs"].some(
     (reference) => typeof reference !== "string" || reference.length === 0
@@ -20888,11 +20989,15 @@ function parseClaim(value, index) {
     );
   }
   const claim = value["claim"].trim();
-  if (!claim || [...claim].length > GOAL_CHECKPOINT_CLAIM_MAX_CHARACTERS) {
+  if (!claim) {
     throw new InvalidGoalCheckpointError(
       `Goal checkpoint verifier claim ${index + 1} is invalid`
     );
   }
+  const characterLength = [...claim].length;
+  if (characterLength > GOAL_CHECKPOINT_CLAIM_MAX_CHARACTERS) {
+    throw new GoalCheckpointClaimLengthError(index, characterLength);
+  }
   return {
     proofKind: value["proofKind"],
     claim,
@@ -21550,7 +21655,7 @@ function createMigratedGoalState(input) {
 __name(createMigratedGoalState, "createMigratedGoalState");
 
 // packages/core/src/goals/goal-runtime.ts
-var debugLogger6 = createDebugLogger("GOAL_RUNTIME");
+var debugLogger7 = createDebugLogger("GOAL_RUNTIME");
 var GOAL_RUNTIME_DISPOSED_MESSAGE = "Goal runtime has been disposed";
 var STALE_GOAL_TURN_MESSAGE = "Goal turn permit is no longer valid";
 var GoalPersistenceUnavailableError = class extends Error {
@@ -21733,6 +21838,11 @@ function createGoalRuntime(options2) {
     continuationQueued = false;
     const scheduledHost = host;
     const continuationContext = snapshot.goal.objective;
+    const usage = {
+      tokensUsed: snapshot.goal.tokensUsed,
+      ...snapshot.goal.tokenBudget === void 0 ? {} : { tokenBudget: snapshot.goal.tokenBudget },
+      turnCount: snapshot.goal.turnCount
+    };
     const verifierFeedback = nextVerifierFeedback;
     nextVerifierFeedback = void 0;
     currentTurnFeedback = verifierFeedback;
@@ -21792,6 +21902,7 @@ function createGoalRuntime(options2) {
         continuationContext,
         ...objectiveUpdated ? { objectiveUpdated } : {},
         ...windDown ? { windDown } : {},
+        usage,
         ...verifierFeedback ? { verifierFeedback } : {}
       });
     } catch {
@@ -22237,7 +22348,7 @@ function createGoalRuntime(options2) {
           );
           return;
         }
-        debugLogger6.debug(
+        debugLogger7.debug(
           "Checkpoint check failed; counted as a stall only if the window overflowed and the check was not a restore replay.",
           `windowTruncated=${window2.truncated}`,
           error3,
@@ -22815,112 +22926,6 @@ ${proposal.reason}`;
 }
 __name(createGoalRuntime, "createGoalRuntime");
 
-// packages/core/src/goals/activeGoalStore.ts
-init_esbuild_shims();
-var store = /* @__PURE__ */ new Map();
-function activeGoalEquals(left, right) {
-  if (left === right) return true;
-  if (!left || !right) return false;
-  return stableActiveGoalKey(left) === stableActiveGoalKey(right);
-}
-__name(activeGoalEquals, "activeGoalEquals");
-function stableActiveGoalKey(goal) {
-  const comparable = {};
-  for (const key of Object.keys(goal).sort()) {
-    if (key === "deferredEvaluations") continue;
-    const value = goal[key];
-    if (value !== void 0) {
-      comparable[key] = value;
-    }
-  }
-  return JSON.stringify(comparable);
-}
-__name(stableActiveGoalKey, "stableActiveGoalKey");
-function getActiveGoal(sessionId) {
-  return store.get(sessionId);
-}
-__name(getActiveGoal, "getActiveGoal");
-function clearActiveGoal(sessionId) {
-  const previous = store.get(sessionId);
-  store.delete(sessionId);
-  return previous;
-}
-__name(clearActiveGoal, "clearActiveGoal");
-var observers = /* @__PURE__ */ new Map();
-function clearGoalTerminalObserver(sessionId) {
-  observers.delete(sessionId);
-}
-__name(clearGoalTerminalObserver, "clearGoalTerminalObserver");
-function notifyGoalTerminal(sessionId, event) {
-  recordLastTerminalEvent(sessionId, event);
-  const observer = observers.get(sessionId);
-  if (!observer) return;
-  try {
-    observer(event);
-  } catch {
-  }
-}
-__name(notifyGoalTerminal, "notifyGoalTerminal");
-var lastTerminal = /* @__PURE__ */ new Map();
-function recordLastTerminalEvent(sessionId, event) {
-  lastTerminal.set(sessionId, event);
-}
-__name(recordLastTerminalEvent, "recordLastTerminalEvent");
-
-// packages/core/src/goals/goalHook.ts
-init_esbuild_shims();
-
-// packages/core/src/goals/goalJudge.ts
-init_esbuild_shims();
-var debugLogger7 = createDebugLogger("GOAL_JUDGE");
-
-// packages/core/src/goals/goalHook.ts
-var debugLogger8 = createDebugLogger("GOAL_HOOK");
-var GOAL_HOOK_TIMEOUT_SECONDS = 30;
-var GOAL_HOOK_TIMEOUT_MS = GOAL_HOOK_TIMEOUT_SECONDS * 1e3;
-var GOAL_HOOK_ID_OUTPUT_KEY = "qwenGoalHookId";
-function getStopHookContinuationReason(output) {
-  const hasGoalOutput = typeof output.hookSpecificOutput?.[GOAL_HOOK_ID_OUTPUT_KEY] === "string";
-  if (!hasGoalOutput) {
-    return output.stopReason || output.reason || "No reason provided";
-  }
-  return [output.stopReason, output.reason].filter(Boolean).join("\n") || "No reason provided";
-}
-__name(getStopHookContinuationReason, "getStopHookContinuationReason");
-function removeGoalFunctionHook(config3, sessionId, goal) {
-  const system = config3.getHookSystem?.();
-  if (!system) return;
-  try {
-    system.removeFunctionHook(sessionId, "Stop" /* Stop */, goal.hookId);
-  } catch (err) {
-    debugLogger8.debug(
-      `Failed to remove goal hook ${goal.hookId}: ${err instanceof Error ? err.message : String(err)}`
-    );
-  }
-}
-__name(removeGoalFunctionHook, "removeGoalFunctionHook");
-function finishGoal(config3, sessionId, goal, event) {
-  clearActiveGoal(sessionId);
-  removeGoalFunctionHook(config3, sessionId, goal);
-  notifyGoalTerminal(sessionId, event);
-  clearGoalTerminalObserver(sessionId);
-}
-__name(finishGoal, "finishGoal");
-function abortGoalForStopHookCap(config3, sessionId, systemMessage) {
-  const goal = getActiveGoal(sessionId);
-  if (!goal) return false;
-  finishGoal(config3, sessionId, goal, {
-    kind: "aborted",
-    condition: goal.condition,
-    iterations: goal.iterations,
-    durationMs: Date.now() - goal.setAt,
-    lastReason: goal.lastReason,
-    systemMessage
-  });
-  return true;
-}
-__name(abortGoalForStopHookCap, "abortGoalForStopHookCap");
-
 // packages/core/src/hooks/stopHookCap.ts
 init_esbuild_shims();
 var DEFAULT_STOP_HOOK_BLOCK_CAP = 8;
@@ -22981,7 +22986,7 @@ import * as fs3 from "node:fs";
 import * as path3 from "node:path";
 import { performance as performance2 } from "node:perf_hooks";
 var SESSION_START_PROFILE_ENV = "QWEN_CODE_PROFILE_SESSION_START";
-var debugLogger9 = createDebugLogger("SESSION_START_PROFILER");
+var debugLogger8 = createDebugLogger("SESSION_START_PROFILER");
 function roundMs(value) {
   return Math.round(value * 100) / 100;
 }
@@ -23124,7 +23129,7 @@ var EnabledSessionStartProfiler = class {
     } catch (error3) {
       const code = isNodeError(error3) ? error3.code : void 0;
       try {
-        debugLogger9.debug("session-start-profiler write failed", {
+        debugLogger8.debug("session-start-profiler write failed", {
           name: error3 instanceof Error ? error3.name : typeof error3,
           message: error3 instanceof Error ? error3.message : void 0,
           ...code ? { code } : {}
@@ -23144,7 +23149,7 @@ function createSessionStartProfiler(source, options2 = {}) {
     return disabledProfiler;
   }
   try {
-    debugLogger9.debug("session-start-profiler enabled", { source });
+    debugLogger8.debug("session-start-profiler enabled", { source });
   } catch {
   }
   return new EnabledSessionStartProfiler(source, {
@@ -23449,7 +23454,7 @@ function jsonStringExceedsByteLength(value, threshold) {
 __name(jsonStringExceedsByteLength, "jsonStringExceedsByteLength");
 
 // packages/core/src/tools/tool-response-finalizer.ts
-var debugLogger10 = createDebugLogger("TOOL_RESPONSE_FINALIZER");
+var debugLogger9 = createDebugLogger("TOOL_RESPONSE_FINALIZER");
 var associatedFinalizerResponses = /* @__PURE__ */ new WeakSet();
 function consumeAssociatedFinalizerEntries(entries) {
   const associated = /* @__PURE__ */ new Set();
@@ -23810,7 +23815,7 @@ async function finalizeToolResponses(config3, entries, promptIds, observeBoundar
     (sum, slot) => sum + slot.text.length,
     0
   );
-  debugLogger10.info(
+  debugLogger9.info(
     `Tool response budget (${budget} chars): reduced ${entriesToPersist.size} result(s) from ${total} to ${finalizedTotal} chars.`
   );
   return finalized;
@@ -24132,7 +24137,7 @@ async function checkPriorRead(cache, filePath, verb, options2 = {}) {
 __name(checkPriorRead, "checkPriorRead");
 
 // packages/core/src/tools/exitPlanMode.ts
-var debugLogger11 = createDebugLogger("EXIT_PLAN_MODE");
+var debugLogger10 = createDebugLogger("EXIT_PLAN_MODE");
 var exitPlanModeToolDescription = `Use this tool when you are in plan mode and have finished presenting your plan and are ready to code. This will prompt the user to exit plan mode.
 
 ## When to Use This Tool
@@ -24225,14 +24230,23 @@ var ExitPlanModeToolInvocation = class extends BaseToolInvocation {
       hideAlwaysAllow: true,
       plan: snapshot.plan,
       prePlanMode: snapshot.prePlanMode,
-      onConfirm: /* @__PURE__ */ __name(async (outcome) => {
+      onConfirm: /* @__PURE__ */ __name(async (outcome, payload) => {
         switch (outcome) {
-          case "restore_previous" /* RestorePrevious */:
+          case "restore_previous" /* RestorePrevious */: {
+            this.approval = void 0;
+            const executionMode = this.config.getPlanExecutionMode?.();
+            if (executionMode !== void 0 && payload?.expectedPlanExecutionMode !== executionMode) {
+              throw new StructuredToolError(
+                "Execution permission changed or was not confirmed. Request plan approval again with the current permission.",
+                "execution_denied" /* EXECUTION_DENIED */
+              );
+            }
             this.approval = {
               snapshot,
-              targetMode: snapshot.prePlanMode
+              targetMode: executionMode ?? snapshot.prePlanMode
             };
             break;
+          }
           case "proceed_always" /* ProceedAlways */:
             this.approval = {
               snapshot,
@@ -24263,7 +24277,7 @@ var ExitPlanModeToolInvocation = class extends BaseToolInvocation {
       return buildSubagentPlanToolBlockedResult(
         ToolNames.EXIT_PLAN_MODE,
         "ExitPlanModeTool",
-        debugLogger11
+        debugLogger10
       );
     }
     if (this.config.getApprovalMode() !== "plan" /* PLAN */ && !this.approval) {
@@ -24305,7 +24319,7 @@ var ExitPlanModeToolInvocation = class extends BaseToolInvocation {
       });
     } catch (error3) {
       const message = error3 instanceof Error ? error3.message : String(error3);
-      debugLogger11.error(
+      debugLogger10.error(
         `[ExitPlanModeTool] Failed to set approval mode to "${targetMode}": ${message}`
       );
       return this.errorResult(
@@ -24412,7 +24426,7 @@ ${llmContent}`,
     try {
       this.config.savePlan(plan);
     } catch (error3) {
-      debugLogger11.warn(
+      debugLogger10.warn(
         `[ExitPlanModeTool] Failed to save plan to disk: ${error3 instanceof Error ? error3.message : String(error3)}`
       );
     }
@@ -24884,6 +24898,21 @@ function compactToolResultDisplay(resultDisplay, purpose) {
   if (resultDisplay === void 0) {
     return resultDisplay;
   }
+  if (typeof resultDisplay === "object" && resultDisplay !== null && "type" in resultDisplay && resultDisplay.type === "ask_user_question_answers") {
+    if (typeof resultDisplay.text !== "string" || !Array.isArray(resultDisplay.answers) || !resultDisplay.answers.every(
+      (entry) => typeof entry === "object" && entry !== null && typeof entry.question === "string" && typeof entry.answer === "string"
+    )) {
+      return resultDisplay;
+    }
+    return {
+      ...resultDisplay,
+      text: compactString(resultDisplay.text, purpose),
+      answers: resultDisplay.answers.map(({ question, answer }) => ({
+        question: compactString(question, purpose),
+        answer: compactString(answer, purpose)
+      }))
+    };
+  }
   if (isFileDiffDisplay(resultDisplay)) {
     return compactFileDiff(resultDisplay, purpose);
   }
@@ -24990,7 +25019,7 @@ init_esbuild_shims();
 init_esbuild_shims();
 import fs5 from "node:fs";
 import path4 from "node:path";
-var debugLogger12 = createDebugLogger("USAGE_HISTORY");
+var debugLogger11 = createDebugLogger("USAGE_HISTORY");
 var MS_PER_DAY = 24 * 60 * 60 * 1e3;
 var LIVE_REBUILD_WINDOW_DAYS = 35;
 function getUsageHistoryPath() {
@@ -25117,13 +25146,13 @@ async function prepareUsageBeforeTranscriptDeletion(transcriptPath) {
         }
       }
     } catch (e) {
-      debugLogger12.debug(
+      debugLogger11.debug(
         `persistUsageBeforeTranscriptDeletion: cannot read history: ${e}`
       );
     }
     return { usagePath, record: summarized.record };
   } catch (e) {
-    debugLogger12.debug(`prepareUsageBeforeTranscriptDeletion: ${e}`);
+    debugLogger11.debug(`prepareUsageBeforeTranscriptDeletion: ${e}`);
     return null;
   }
 }
@@ -25143,7 +25172,7 @@ function commitUsageBeforeTranscriptDeletion(prepared) {
     writeLineSync(prepared.usagePath, prepared.record);
     return true;
   } catch (e) {
-    debugLogger12.debug(`commitUsageBeforeTranscriptDeletion: ${e}`);
+    debugLogger11.debug(`commitUsageBeforeTranscriptDeletion: ${e}`);
     return false;
   }
 }
@@ -25159,7 +25188,7 @@ async function rebuildFromSessionJsonl(options2 = {}) {
   try {
     if (!fs5.existsSync(projectsDir)) return [];
   } catch (e) {
-    debugLogger12.debug(
+    debugLogger11.debug(
       `rebuildFromSessionJsonl: cannot access projectsDir: ${e}`
     );
     return [];
@@ -25170,7 +25199,7 @@ async function rebuildFromSessionJsonl(options2 = {}) {
   try {
     projectDirs = fs5.readdirSync(projectsDir);
   } catch (e) {
-    debugLogger12.debug(`rebuildFromSessionJsonl: cannot read projectsDir: ${e}`);
+    debugLogger11.debug(`rebuildFromSessionJsonl: cannot read projectsDir: ${e}`);
     return [];
   }
   for (const projDir of projectDirs) {
@@ -25179,7 +25208,7 @@ async function rebuildFromSessionJsonl(options2 = {}) {
     try {
       files = fs5.readdirSync(chatsDir).filter((f2) => f2.endsWith(".jsonl") && !f2.endsWith(".ledger.jsonl"));
     } catch (e) {
-      debugLogger12.debug(
+      debugLogger11.debug(
         `rebuildFromSessionJsonl: cannot read chatsDir ${chatsDir}: ${e}`
       );
       continue;
@@ -25191,13 +25220,13 @@ async function rebuildFromSessionJsonl(options2 = {}) {
         try {
           stats = fs5.statSync(filePath);
         } catch (e) {
-          debugLogger12.debug(
+          debugLogger11.debug(
             `rebuildFromSessionJsonl: cannot stat ${filePath}: ${e}`
           );
           continue;
         }
         if (!stats.isFile()) {
-          debugLogger12.debug(
+          debugLogger11.debug(
             `rebuildFromSessionJsonl: skipping non-regular entry ${filePath}`
           );
           continue;
@@ -25215,7 +25244,7 @@ async function rebuildFromSessionJsonl(options2 = {}) {
         if (!summarized.record) continue;
         results.push(summarized.record);
       } catch (e) {
-        debugLogger12.debug(
+        debugLogger11.debug(
           `rebuildFromSessionJsonl: failed to process ${file}: ${e}`
         );
         continue;
@@ -25237,7 +25266,7 @@ function dedupBySessionId(records) {
   const map = /* @__PURE__ */ new Map();
   for (const r of records) map.set(r.sessionId, r);
   if (map.size < records.length) {
-    debugLogger12.debug(
+    debugLogger11.debug(
       `dedupBySessionId: removed ${records.length - map.size} duplicate record(s)`
     );
   }
@@ -25250,7 +25279,7 @@ async function loadUsageHistory(skipSessionInRebuild, options2) {
     const filtered = records.filter((r) => r.version === 1);
     if (filtered.length > 0) return dedupBySessionId(filtered);
   } catch (e) {
-    debugLogger12.debug(`loadUsageHistory: failed to read usage file: ${e}`);
+    debugLogger11.debug(`loadUsageHistory: failed to read usage file: ${e}`);
   }
   return dedupBySessionId(
     await rebuildFromSessionJsonl({
@@ -25266,7 +25295,7 @@ async function loadUsageHistoryWithLive(options2) {
     const records = await read(getUsageHistoryPath());
     persisted = records.filter((r) => r.version === 1);
   } catch (e) {
-    debugLogger12.debug(
+    debugLogger11.debug(
       `loadUsageHistoryWithLive: failed to read usage file: ${e}`
     );
   }
@@ -27234,7 +27263,7 @@ async function fetchGitCommitDetail(cwd, sha) {
 __name(fetchGitCommitDetail, "fetchGitCommitDetail");
 
 // packages/core/src/services/fileHistoryService.ts
-var debugLogger13 = createDebugLogger("FILE_HISTORY");
+var debugLogger12 = createDebugLogger("FILE_HISTORY");
 var MAX_SNAPSHOTS = 100;
 var FILE_HISTORY_DIR = "file-history";
 function serializeSnapshot(s3) {
@@ -27359,14 +27388,14 @@ async function restoreBackup(filePath, backupFileName, sessionId) {
     backupStats = await stat2(backupPath);
   } catch (e) {
     if (isENOENT(e)) {
-      debugLogger13.error(`FileHistory: Backup file not found: ${backupPath}`);
+      debugLogger12.error(`FileHistory: Backup file not found: ${backupPath}`);
       return false;
     }
     throw e;
   }
   const result = await safeCopyFile(backupPath, filePath);
   if (result === "src-missing") {
-    debugLogger13.error(
+    debugLogger12.error(
       `FileHistory: Backup file disappeared during restore: ${backupPath}`
     );
     return false;
@@ -27427,7 +27456,7 @@ async function computeDiffStatsForFile(originalFile, backupFileName, sessionId)
       if (c.removed) deletions += c.count || 0;
     }
   } catch (error3) {
-    debugLogger13.error(`FileHistory: Error generating diffStats: ${error3}`);
+    debugLogger12.error(`FileHistory: Error generating diffStats: ${error3}`);
   }
   return { filesChanged, insertions, deletions };
 }
@@ -27455,7 +27484,7 @@ async function readPathWithSizeGuard(path78, kind) {
       }
       return { kind: "unreadable" };
     }
-    debugLogger13.error(`FileHistory: ${kind} open failed for ${path78}: ${e}`);
+    debugLogger12.error(`FileHistory: ${kind} open failed for ${path78}: ${e}`);
     return { kind: "unreadable" };
   }
   try {
@@ -27467,7 +27496,7 @@ async function readPathWithSizeGuard(path78, kind) {
       const text = await fh.readFile("utf-8");
       return { kind: "ok", content: text, exists: true };
     } catch (e) {
-      debugLogger13.error(`FileHistory: ${kind} read failed for ${path78}: ${e}`);
+      debugLogger12.error(`FileHistory: ${kind} read failed for ${path78}: ${e}`);
       return { kind: "unreadable" };
     }
   } finally {
@@ -27529,7 +27558,7 @@ var FileHistoryService = class {
     try {
       this.onSnapshotUpdated?.(snapshot);
     } catch (error3) {
-      debugLogger13.error(`FileHistory: recordSnapshotUpdate failed: ${error3}`);
+      debugLogger12.error(`FileHistory: recordSnapshotUpdate failed: ${error3}`);
     }
   }
   restoreFromSnapshots(snapshots) {
@@ -27570,7 +27599,7 @@ var FileHistoryService = class {
           try {
             backupPath = resolveBackupPath(name, this.sessionId);
           } catch (e) {
-            debugLogger13.error(
+            debugLogger12.error(
               `FileHistory: rejected backupFileName during validation: ${name}: ${e}`
             );
             return false;
@@ -27595,7 +27624,7 @@ var FileHistoryService = class {
     for (const snapshot of affectedSnapshots) {
       this.recordSnapshotUpdate(snapshot);
     }
-    debugLogger13.warn(
+    debugLogger12.warn(
       `FileHistory: ${missing.size} restored backup file(s) missing on disk`
     );
   }
@@ -27604,7 +27633,7 @@ var FileHistoryService = class {
     const trackingPath = this.maybeShortenFilePath(filePath);
     const mostRecent = this.state.snapshots.at(-1);
     if (!mostRecent) {
-      debugLogger13.error("FileHistory: Missing most recent snapshot");
+      debugLogger12.error("FileHistory: Missing most recent snapshot");
       return;
     }
     const existing = mostRecent.trackedFileBackups[trackingPath];
@@ -27616,7 +27645,7 @@ var FileHistoryService = class {
     try {
       backup = await createBackup(filePath, maxVersion + 1, this.sessionId);
     } catch (error3) {
-      debugLogger13.error(`FileHistory: trackEdit failed: ${error3}`);
+      debugLogger12.error(`FileHistory: trackEdit failed: ${error3}`);
       return;
     }
     if (!this.state.snapshots.includes(mostRecent)) {
@@ -27627,7 +27656,7 @@ var FileHistoryService = class {
       mostRecent.trackedFileBackups[trackingPath] = backup;
       this.state.trackedFiles.add(trackingPath);
       this.recordSnapshotUpdate(mostRecent);
-      debugLogger13.debug(
+      debugLogger12.debug(
         `FileHistory: Tracked file modification for ${filePath}`
       );
     }
@@ -27676,7 +27705,7 @@ var FileHistoryService = class {
               this.sessionId
             );
           } catch (error3) {
-            debugLogger13.error(
+            debugLogger12.error(
               `FileHistory: Failed to backup file ${trackingPath}: ${error3}`
             );
             const previous = mostRecent?.trackedFileBackups[trackingPath];
@@ -27707,7 +27736,7 @@ var FileHistoryService = class {
       this.state.snapshots = this.state.snapshots.slice(overflow);
       await this.cleanupOrphanedBackups(removed);
     }
-    debugLogger13.debug(
+    debugLogger12.debug(
       `FileHistory: Added snapshot for ${promptId}, tracking ${this.state.trackedFiles.size} files`
     );
   }
@@ -27717,7 +27746,7 @@ var FileHistoryService = class {
     if (!targetSnapshot) {
       throw new Error("The selected snapshot was not found");
     }
-    debugLogger13.debug(`FileHistory: Rewinding to snapshot for ${promptId}`);
+    debugLogger12.debug(`FileHistory: Rewinding to snapshot for ${promptId}`);
     const result = await this.applySnapshot(targetSnapshot);
     if (truncateHistory && result.filesFailed.length === 0) {
       const targetIdx = this.state.snapshots.indexOf(targetSnapshot);
@@ -27732,7 +27761,7 @@ var FileHistoryService = class {
         await this.cleanupOrphanedBackups(removed);
       }
     }
-    debugLogger13.debug(`FileHistory: Finished rewinding to ${promptId}`);
+    debugLogger12.debug(`FileHistory: Finished rewinding to ${promptId}`);
     return result;
   }
   async getDiffStats(promptId) {
@@ -27760,7 +27789,7 @@ var FileHistoryService = class {
           }
           return null;
         } catch (error3) {
-          debugLogger13.error(
+          debugLogger12.error(
             `FileHistory: Error computing diff stats: ${error3}`
           );
           return null;
@@ -27806,7 +27835,7 @@ var FileHistoryService = class {
       candidatePaths.length - MAX_TURN_DIFF_FILES
     );
     if (filesOmitted > 0) {
-      debugLogger13.warn(
+      debugLogger12.warn(
         `FileHistory: getTurnDiff truncating ${filesOmitted} files for prompt ${promptId} (cap: ${MAX_TURN_DIFF_FILES})`
       );
     }
@@ -27842,7 +27871,7 @@ var FileHistoryService = class {
     try {
       return await this.computeTurnFileDiffUnsafe(trackingPath, before, after);
     } catch (e) {
-      debugLogger13.error(
+      debugLogger12.error(
         `FileHistory: computeTurnFileDiff failed for ${trackingPath}: ${e}`
       );
       return null;
@@ -27869,14 +27898,14 @@ var FileHistoryService = class {
       this.sessionId
     );
     if (beforeRead.kind === "unreadable") {
-      debugLogger13.warn(
+      debugLogger12.warn(
         `FileHistory: skipping turn diff for ${trackingPath}: before backup unreadable`
       );
       return null;
     }
     const afterRead = afterFromWorktree ? await readEndpointContent(void 0, absoluteFilePath, this.sessionId) : await readEndpointContent(afterBackup, void 0, this.sessionId);
     if (afterRead.kind === "unreadable") {
-      debugLogger13.warn(
+      debugLogger12.warn(
         `FileHistory: skipping turn diff for ${trackingPath}: after ${afterFromWorktree ? "worktree" : "backup"} unreadable`
       );
       return null;
@@ -27986,7 +28015,7 @@ var FileHistoryService = class {
         }
         const backupFileName = targetBackup ? targetBackup.backupFileName : this.getBackupFileNameFirstVersion(trackingPath);
         if (backupFileName === void 0) {
-          debugLogger13.error(
+          debugLogger12.error(
             "FileHistory: Error finding the backup file to apply"
           );
           filesFailed.push(filePath);
@@ -27995,7 +28024,7 @@ var FileHistoryService = class {
         if (backupFileName === null) {
           try {
             await unlink3(filePath);
-            debugLogger13.debug(`FileHistory: Deleted ${filePath}`);
+            debugLogger12.debug(`FileHistory: Deleted ${filePath}`);
             filesChanged.push(filePath);
           } catch (e) {
             if (!isENOENT(e)) throw e;
@@ -28009,7 +28038,7 @@ var FileHistoryService = class {
             this.sessionId
           );
           if (restored) {
-            debugLogger13.debug(
+            debugLogger12.debug(
               `FileHistory: Restored ${filePath} from ${backupFileName}`
             );
             filesChanged.push(filePath);
@@ -28018,7 +28047,7 @@ var FileHistoryService = class {
           }
         }
       } catch (error3) {
-        debugLogger13.error(
+        debugLogger12.error(
           `FileHistory: Error restoring file ${trackingPath}: ${error3}`
         );
         filesFailed.push(this.maybeExpandFilePath(trackingPath));
@@ -28070,7 +28099,7 @@ var FileHistoryService = class {
           await unlink3(resolveBackupPath(name, this.sessionId));
         } catch (e) {
           if (!isENOENT(e)) {
-            debugLogger13.error(`FileHistory: cleanup failed for ${name}: ${e}`);
+            debugLogger12.error(`FileHistory: cleanup failed for ${name}: ${e}`);
           }
         }
       })
@@ -28701,17 +28730,17 @@ var SessionOrganizationService = class {
     return path6.join(this.storage.getProjectDir(), STORE_FILE);
   }
   async listGroups() {
-    const store2 = await this.readStore();
+    const store = await this.readStore();
     return {
-      groups: this.sortGroups(store2.groups),
+      groups: this.sortGroups(store.groups),
       colorOptions: [...GROUP_COLOR_OPTIONS]
     };
   }
   async readSnapshot() {
-    const store2 = await this.readStore();
-    const validGroupIds = new Set(store2.groups.map((group) => group.id));
+    const store = await this.readStore();
+    const validGroupIds = new Set(store.groups.map((group) => group.id));
     const sessions = /* @__PURE__ */ new Map();
-    for (const [sessionId, raw] of Object.entries(store2.sessions)) {
+    for (const [sessionId, raw] of Object.entries(store.sessions)) {
       const view = viewOrganization(raw);
       if (view.groupId !== null && !validGroupIds.has(view.groupId)) {
         this.warnOrphanedGroupReference(sessionId, view.groupId);
@@ -28719,15 +28748,15 @@ var SessionOrganizationService = class {
       }
       sessions.set(sessionId, view);
     }
-    return { groups: this.sortGroups(store2.groups), sessions };
+    return { groups: this.sortGroups(store.groups), sessions };
   }
   async createGroup(input) {
     const name = normalizeGroupName(input.name);
     const color = normalizeGroupColor(input.color);
     return this.withStoreLock(async () => {
-      const store2 = await this.readStore();
-      this.assertGroupNameAvailable(store2.groups, name);
-      if (store2.groups.length >= MAX_GROUPS) {
+      const store = await this.readStore();
+      this.assertGroupNameAvailable(store.groups, name);
+      if (store.groups.length >= MAX_GROUPS) {
         throw new SessionOrganizationError(
           `Maximum number of groups (${MAX_GROUPS}) reached`,
           "group_limit_reached"
@@ -28739,7 +28768,7 @@ var SessionOrganizationService = class {
         name,
         color,
         order: Math.min(
-          store2.groups.reduce(
+          store.groups.reduce(
             (maxOrder, existing) => Math.max(maxOrder, existing.order),
             -1
           ) + 1,
@@ -28748,15 +28777,15 @@ var SessionOrganizationService = class {
         createdAt: now,
         updatedAt: now
       };
-      store2.groups.push(group);
-      await this.writeStore(store2);
+      store.groups.push(group);
+      await this.writeStore(store);
       return group;
     });
   }
   async updateGroup(groupId, input) {
     return this.withStoreLock(async () => {
-      const store2 = await this.readStore();
-      const group = store2.groups.find((candidate) => candidate.id === groupId);
+      const store = await this.readStore();
+      const group = store.groups.find((candidate) => candidate.id === groupId);
       if (!group) {
         throw new SessionOrganizationError(
           `Group not found: ${groupId}`,
@@ -28766,7 +28795,7 @@ var SessionOrganizationService = class {
       }
       if (input.name !== void 0) {
         const name = normalizeGroupName(input.name);
-        this.assertGroupNameAvailable(store2.groups, name, groupId);
+        this.assertGroupNameAvailable(store.groups, name, groupId);
         group.name = name;
       }
       if (input.color !== void 0) {
@@ -28776,34 +28805,34 @@ var SessionOrganizationService = class {
         group.order = normalizeOrder(input.order);
       }
       group.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
-      await this.writeStore(store2);
+      await this.writeStore(store);
       return group;
     });
   }
   async deleteGroup(groupId) {
     return this.withStoreLock(async () => {
-      const store2 = await this.readStore();
-      const before = store2.groups.length;
-      store2.groups = store2.groups.filter((group) => group.id !== groupId);
-      if (store2.groups.length === before) {
+      const store = await this.readStore();
+      const before = store.groups.length;
+      store.groups = store.groups.filter((group) => group.id !== groupId);
+      if (store.groups.length === before) {
         return false;
       }
       const now = (/* @__PURE__ */ new Date()).toISOString();
-      for (const session of Object.values(store2.sessions)) {
+      for (const session of Object.values(store.sessions)) {
         if (session.groupId === groupId) {
           session.groupId = null;
           session.updatedAt = now;
         }
       }
-      await this.writeStore(store2);
+      await this.writeStore(store);
       return true;
     });
   }
   async updateSessionOrganization(sessionId, input) {
     const hasUpdate = input.groupId !== void 0 || input.isPinned !== void 0 || input.color !== void 0;
     return this.withStoreLock(async () => {
-      const store2 = await this.readStore();
-      const current = viewOrganization(store2.sessions[sessionId]);
+      const store = await this.readStore();
+      const current = viewOrganization(store.sessions[sessionId]);
       if (!hasUpdate) {
         return current;
       }
@@ -28815,7 +28844,7 @@ var SessionOrganizationService = class {
         current.color = input.color;
       }
       if (input.groupId !== void 0) {
-        if (input.groupId !== null && !store2.groups.some((group) => group.id === input.groupId)) {
+        if (input.groupId !== null && !store.groups.some((group) => group.id === input.groupId)) {
           throw new SessionOrganizationError(
             `Group not found: ${input.groupId}`,
             "group_not_found",
@@ -28832,35 +28861,35 @@ var SessionOrganizationService = class {
         }
       }
       current.updatedAt = now;
-      store2.sessions[sessionId] = serializeOrganization(current);
-      await this.writeStore(store2);
-      return viewOrganization(store2.sessions[sessionId]);
+      store.sessions[sessionId] = serializeOrganization(current);
+      await this.writeStore(store);
+      return viewOrganization(store.sessions[sessionId]);
     });
   }
   async removeSession(sessionId, options2 = {}) {
     await this.withStoreLock(async () => {
-      const store2 = await this.readStore();
-      if (!Object.prototype.hasOwnProperty.call(store2.sessions, sessionId)) {
+      const store = await this.readStore();
+      if (!Object.prototype.hasOwnProperty.call(store.sessions, sessionId)) {
         return;
       }
-      delete store2.sessions[sessionId];
-      await this.writeStore(store2, options2);
+      delete store.sessions[sessionId];
+      await this.writeStore(store, options2);
     });
   }
   async removeSessions(sessionIds, options2 = {}) {
     const uniqueSessionIds = [...new Set(sessionIds)];
     if (uniqueSessionIds.length === 0) return;
     await this.withStoreLock(async () => {
-      const store2 = await this.readStore();
+      const store = await this.readStore();
       let changed = false;
       for (const sessionId of uniqueSessionIds) {
-        if (Object.prototype.hasOwnProperty.call(store2.sessions, sessionId)) {
-          delete store2.sessions[sessionId];
+        if (Object.prototype.hasOwnProperty.call(store.sessions, sessionId)) {
+          delete store.sessions[sessionId];
           changed = true;
         }
       }
       if (changed) {
-        await this.writeStore(store2, options2);
+        await this.writeStore(store, options2);
       }
     });
   }
@@ -28938,7 +28967,7 @@ var SessionOrganizationService = class {
     );
     return emptyStore();
   }
-  async writeStore(store2, options2 = {}) {
+  async writeStore(store, options2 = {}) {
     await fs7.mkdir(path6.dirname(this.getStorePath()), { recursive: true });
     if (this.readFailed) {
       throw new SessionOrganizationError(
@@ -28950,8 +28979,8 @@ var SessionOrganizationService = class {
       this.getStorePath(),
       {
         schemaVersion: SCHEMA_VERSION,
-        groups: this.sortGroups(store2.groups),
-        sessions: store2.sessions
+        groups: this.sortGroups(store.groups),
+        sessions: store.sessions
       },
       { assertCanCommit: options2.assertCanCommit }
     );
@@ -29238,6 +29267,7 @@ async function watchRepoBranch(cwd, onChange) {
 __name(watchRepoBranch, "watchRepoBranch");
 
 // packages/core/src/utils/git-branches.ts
+var debugLogger13 = createDebugLogger("GIT_BRANCHES");
 var execFileAsync2 = promisify2(execFile2);
 var GIT_TIMEOUT_MS2 = 3e4;
 var MAX_RECENT_BRANCHES = 20;
@@ -29494,6 +29524,11 @@ async function gitCreateBranch(cwd, name, startPoint, env) {
     env
   ).catch(() => "")).trim();
   const originalCommit = originalRef ? "" : (await runGit2(cwd, ["rev-parse", "HEAD"], env).catch(() => "")).trim();
+  const startCommit = (await runGit2(
+    cwd,
+    ["rev-parse", "--verify", `${startPoint || "HEAD"}^{commit}`],
+    env
+  ).catch(() => "")).trim();
   try {
     await runGit2(cwd, args, env);
   } catch (err) {
@@ -29514,8 +29549,17 @@ async function gitCreateBranch(cwd, name, startPoint, env) {
         ).catch(() => {
         });
       }
-      await runGit2(cwd, ["branch", "-D", name], env).catch(() => {
-      });
+      const newHead = (await runGit2(cwd, ["rev-parse", `refs/heads/${name}`], env).catch(
+        () => ""
+      )).trim();
+      if (newHead && newHead !== startCommit) {
+        debugLogger13.warn(
+          `gitCreateBranch: keeping branch "${name}" because it contains commits created after checkout (likely by a failing post-checkout hook)`
+        );
+      } else {
+        await runGit2(cwd, ["branch", "-D", name], env).catch(() => {
+        });
+      }
     }
     throw err;
   }
@@ -31184,6 +31228,10 @@ function collectSessionTurnState(records, sessionId) {
   return accumulator.finish();
 }
 __name(collectSessionTurnState, "collectSessionTurnState");
+function computeInitialTurnFromHistory(records, sessionId) {
+  return collectSessionTurnState(records, sessionId).initialTurn;
+}
+__name(computeInitialTurnFromHistory, "computeInitialTurnFromHistory");
 function getRecordPromptIds(record4) {
   const promptIds = [];
   const recordPromptId = record4.promptId;
@@ -40335,12 +40383,13 @@ var ChatRecordingService = class {
    * @param goalContext Goal identity and turn that own this message
    * @param promptPayload User-authored display text and hook-context provenance
    */
-  recordUserMessage(message, goalContext, promptPayload) {
+  recordUserMessage(message, goalContext, promptPayload, daemonPromptId) {
     try {
       this.trackUserDisplayTextForTitle(promptPayload?.displayText);
       this.turnParentUuids.push(this.lastRecordUuid);
       const record4 = {
         ...this.createBaseRecord("user"),
+        ...daemonPromptId ? { daemonPromptId } : {},
         ...goalContext ? { goalContext: copyGoalContext(goalContext) } : {},
         message: createUserContent(message),
         ...promptPayload ? { systemPayload: promptPayload } : {}
@@ -43084,10 +43133,10 @@ function countAllInlineImages(contents) {
   return count;
 }
 __name(countAllInlineImages, "countAllInlineImages");
-function replaceImagePayloadsInPlace(contents, store2, skipContent) {
+function replaceImagePayloadsInPlace(contents, store, skipContent) {
   const replaced = [];
   for (const part of inlineImageParts(contents, skipContent)) {
-    const stored = store2.put(part);
+    const stored = store.put(part);
     replaced.push(stored);
     part.text = imageReferenceText(stored);
     delete part.inlineData;
@@ -43095,9 +43144,9 @@ function replaceImagePayloadsInPlace(contents, store2, skipContent) {
   return replaced;
 }
 __name(replaceImagePayloadsInPlace, "replaceImagePayloadsInPlace");
-function buildReattachParts(replaced, maxRecentImages, referencedContents = [], store2) {
+function buildReattachParts(replaced, maxRecentImages, referencedContents = [], store) {
   const referencedIds = collectReferencedImageIds(referencedContents);
-  if (replaced.length === 0 && (!store2 || referencedIds.size === 0)) return [];
+  if (replaced.length === 0 && (!store || referencedIds.size === 0)) return [];
   const inlineIds = collectInlineImageIds(referencedContents);
   const last = referencedContents.at(-1);
   const lastReferencedIds = collectReferencedImageIds(
@@ -43106,10 +43155,10 @@ function buildReattachParts(replaced, maxRecentImages, referencedContents = [],
   const candidates = replaced.filter(
     (image) => !inlineIds.has(image.id) && !lastReferencedIds.has(image.id)
   ).map((stored) => ({ stored }));
-  if (store2) {
+  if (store) {
     for (const id of referencedIds) {
       if (inlineIds.has(id) || lastReferencedIds.has(id)) continue;
-      const stored = store2.get(id);
+      const stored = store.get(id);
       if (stored) candidates.push({ stored });
     }
   }
@@ -43117,12 +43166,12 @@ function buildReattachParts(replaced, maxRecentImages, referencedContents = [],
     ({ stored }) => stored
   );
   const reattachLimit = Math.max(maxRecentImages, 1);
-  if (store2) {
+  if (store) {
     for (const id of lastReferencedIds) {
       if (inlineIds.has(id) || recent.some((image) => image.id === id)) {
         continue;
       }
-      const stored = store2.get(id);
+      const stored = store.get(id);
       if (stored) {
         if (recent.length >= reattachLimit) recent.shift();
         recent.push(stored);
@@ -75719,6 +75768,21 @@ function attachJsonlTranscriptWriter(emitter, jsonlPath, options2) {
       agentRound: event.round
     });
   }, "onRoundText");
+  const sessionReadiness = /* @__PURE__ */ new Map();
+  const recordSessionReadiness = /* @__PURE__ */ __name((callId, ready) => {
+    if (sessionReadiness.get(callId) === ready) return;
+    sessionReadiness.set(callId, ready);
+    recordSystem("agent_session_ready", {
+      callId,
+      subagentSessionReady: ready
+    });
+  }, "recordSessionReadiness");
+  const onToolOutputUpdate = /* @__PURE__ */ __name((event) => {
+    const output = event.outputChunk;
+    if (typeof output === "object" && output !== null && "subagentSessionReady" in output && typeof output.subagentSessionReady === "boolean") {
+      recordSessionReadiness(event.callId, output.subagentSessionReady);
+    }
+  }, "onToolOutputUpdate");
   const onToolCall = /* @__PURE__ */ __name((event) => {
     append({
       ...baseFields("assistant"),
@@ -75735,6 +75799,9 @@ function attachJsonlTranscriptWriter(emitter, jsonlPath, options2) {
         ]
       }
     });
+    if (event.name === ToolNames.AGENT) {
+      recordSessionReadiness(event.callId, false);
+    }
   }, "onToolCall");
   const onToolResponsesFinalized = /* @__PURE__ */ __name((event) => {
     for (const response of event.responses) {
@@ -75743,6 +75810,9 @@ function attachJsonlTranscriptWriter(emitter, jsonlPath, options2) {
         message: { role: "user", parts: response.responseParts },
         toolCallResult: {
           callId: response.callId,
+          ...sessionReadiness.has(response.callId) && response.responseParts.some(
+            (part) => part.functionResponse?.response?.["error"]
+          ) ? { status: "error" } : {},
           ...response.durationMs !== void 0 ? { durationMs: response.durationMs } : {}
         }
       });
@@ -75787,12 +75857,14 @@ function attachJsonlTranscriptWriter(emitter, jsonlPath, options2) {
   emitter.on("round_text" /* ROUND_TEXT */, onRoundText);
   emitter.on("stream_text" /* STREAM_TEXT */, appendStreamText);
   emitter.on("tool_call" /* TOOL_CALL */, onToolCall);
+  emitter.on("tool_output_update" /* TOOL_OUTPUT_UPDATE */, onToolOutputUpdate);
   emitter.on("tool_responses_finalized" /* TOOL_RESPONSES_FINALIZED */, onToolResponsesFinalized);
   emitter.on("external_message" /* EXTERNAL_MESSAGE */, onExternalMessage);
   const cleanup = /* @__PURE__ */ __name(() => {
     emitter.off("round_text" /* ROUND_TEXT */, onRoundText);
     emitter.off("stream_text" /* STREAM_TEXT */, appendStreamText);
     emitter.off("tool_call" /* TOOL_CALL */, onToolCall);
+    emitter.off("tool_output_update" /* TOOL_OUTPUT_UPDATE */, onToolOutputUpdate);
     emitter.off(
       "tool_responses_finalized" /* TOOL_RESPONSES_FINALIZED */,
       onToolResponsesFinalized
@@ -77439,6 +77511,7 @@ var AgentToolInvocation = class extends BaseToolInvocation {
         taskDescription: this.params.description,
         taskPrompt: this.params.prompt,
         executionMode: shouldRunInBackground ? "background" : "foreground",
+        subagentSessionReady: false,
         status: "running",
         subagentColor: subagentConfig.color
       };
@@ -77844,6 +77917,7 @@ ${taskPrompt}`;
           depth: launchDepth,
           model: subagentModelId
         });
+        this.updateDisplay({ subagentSessionReady: true }, updateOutput);
         const bgEmitter = bgSubagent.getCore().getEventEmitter();
         let liveToolCallCount = 0;
         const refreshLiveStats = /* @__PURE__ */ __name(() => {
@@ -78436,6 +78510,7 @@ output_file: ${jsonlPath} (for review after the completion notification, not for
           // childLaunchDepth() for the rationale.
           depth: launchDepth
         });
+        this.updateDisplay({ subagentSessionReady: true }, updateOutput);
         const stopHookWarning = await runFramed();
         const terminateMode = subagent.getTerminateMode();
         const finalText = appendStopHookBlockingCapWarning(
@@ -84088,7 +84163,7 @@ function recoverTranscript(records) {
   const stableForBranch = [...filtered];
   while (stableForBranch.length > 0) {
     const last = stableForBranch[stableForBranch.length - 1];
-    if (isWhitespaceOnlyAssistant(last)) {
+    if (isWhitespaceOnlyAssistant(last) || last.type === "system" && last.subtype === "agent_session_ready") {
       stableForBranch.pop();
       continue;
     }
@@ -92660,24 +92735,6 @@ The current date is: ${today}. Note: This is the authoritative current date \u20
       for (const goalEvent of takePendingGoalEvents()) {
         yield goalEvent;
       }
-      const activeGoalAtTurnStart = goalRuntime?.getSnapshot().goal ? void 0 : getActiveGoal(this.config.getSessionId());
-      if (activeGoalAtTurnStart) {
-        yield {
-          type: "active_goal" /* ActiveGoal */,
-          value: activeGoalAtTurnStart
-        };
-      }
-      let lastEmittedActiveGoal2 = activeGoalAtTurnStart;
-      const maybeEmitActiveGoalChange = /* @__PURE__ */ __name((nextActiveGoal) => {
-        if (activeGoalEquals(lastEmittedActiveGoal2, nextActiveGoal)) {
-          return void 0;
-        }
-        lastEmittedActiveGoal2 = nextActiveGoal;
-        return {
-          type: "active_goal" /* ActiveGoal */,
-          value: nextActiveGoal ?? null
-        };
-      }, "maybeEmitActiveGoalChange");
       messageDisplay = hooksEnabled && messageBus && this.config.hasHooksForEvent("MessageDisplay") ? new MessageDisplayDispatcher(
         messageBus,
         signal,
@@ -92889,17 +92946,10 @@ The current date is: ${today}. Note: This is the authoritative current date \u20
         for (const goalEvent of takePendingGoalEvents()) {
           yield goalEvent;
         }
-        const activeGoalAfterStopHook = goalPermit ? void 0 : getActiveGoal(this.config.getSessionId());
         if (signal.aborted) {
           for (const goalEvent of await finalizeInterruptedGoalTurn()) {
             yield goalEvent;
           }
-          const activeGoalEvent2 = maybeEmitActiveGoalChange(
-            activeGoalAfterStopHook
-          );
-          if (activeGoalEvent2) {
-            yield activeGoalEvent2;
-          }
           endCurrentInteraction("cancelled");
           return turn;
         }
@@ -92999,16 +93049,10 @@ The current date is: ${today}. Note: This is the authoritative current date \u20
         }
         if (!goalPermit && (stopOutput?.isBlockingDecision() || stopOutput?.shouldStopExecution())) {
           if (signal.aborted) {
-            const activeGoalEvent3 = maybeEmitActiveGoalChange(
-              activeGoalAfterStopHook
-            );
-            if (activeGoalEvent3) {
-              yield activeGoalEvent3;
-            }
             endCurrentInteraction("cancelled");
             return turn;
           }
-          const continueReason = getStopHookContinuationReason(stopOutput);
+          const continueReason = stopOutput.getEffectiveReason();
           const currentIterationCount = (options2?.stopHookState?.iterationCount ?? 0) + 1;
           const currentReasons = [
             ...options2?.stopHookState?.reasons ?? [],
@@ -93020,18 +93064,6 @@ The current date is: ${today}. Note: This is the authoritative current date \u20
               "Stop",
               stopHookBlockingCap
             );
-            abortGoalForStopHookCap(
-              this.config,
-              this.config.getSessionId(),
-              warning
-            );
-            const activeGoalAfterCap = getActiveGoal(
-              this.config.getSessionId()
-            );
-            const activeGoalEvent3 = maybeEmitActiveGoalChange(activeGoalAfterCap);
-            if (activeGoalEvent3) {
-              yield activeGoalEvent3;
-            }
             yield {
               type: "hook_system_message" /* HookSystemMessage */,
               value: warning
@@ -93049,12 +93081,6 @@ The current date is: ${today}. Note: This is the authoritative current date \u20
             endCurrentInteraction("ok");
             return turn;
           }
-          const activeGoalEvent2 = maybeEmitActiveGoalChange(
-            activeGoalAfterStopHook
-          );
-          if (activeGoalEvent2) {
-            yield activeGoalEvent2;
-          }
           yield {
             type: "stop_hook_loop" /* StopHookLoop */,
             value: {
@@ -93064,42 +93090,11 @@ The current date is: ${today}. Note: This is the authoritative current date \u20
             }
           };
           this.loopDetector.reset(prompt_id);
-          const activeGoal = getActiveGoal(this.config.getSessionId());
-          const hookTurnBudget = activeGoal ? boundedTurns : boundedTurns - 1;
+          const hookTurnBudget = boundedTurns - 1;
           const pendingSteer = await takeSteerInput(hookTurnBudget);
-          const activeGoalAfterSteer = getActiveGoal(
-            this.config.getSessionId()
-          );
-          const activeGoalChanged = activeGoal !== void 0 && activeGoalAfterSteer?.hookId !== activeGoal.hookId;
-          const goalContinuationChanged = activeGoalChanged && stopOutput.hookSpecificOutput?.[GOAL_HOOK_ID_OUTPUT_KEY] === activeGoal.hookId;
-          if (activeGoalChanged) {
-            const activeGoalEvent3 = maybeEmitActiveGoalChange(activeGoalAfterSteer);
-            if (activeGoalEvent3) {
-              yield activeGoalEvent3;
-            }
-          }
-          const discardGoalContinuation = goalContinuationChanged && response.hasNonGoalBlockingStopHook === false;
-          const continuationReasonAfterSteer = discardGoalContinuation ? void 0 : goalContinuationChanged && response.hasNonGoalBlockingStopHook === true ? response.nonGoalBlockingStopReason || "No reason provided" : continueReason;
-          if (!continuationReasonAfterSteer && !pendingSteer) {
-            await this.settlePendingGoalProposal(
-              true,
-              signal,
-              loadGoalRuntime,
-              prompt_id
-            );
-            for (const goalEvent of takePendingGoalEvents()) {
-              yield goalEvent;
-            }
-            endCurrentInteraction("ok");
-            normalCompletion = true;
-            return turn;
-          }
-          const continueRequest = continuationReasonAfterSteer ? [{ text: continuationReasonAfterSteer }] : [];
+          const continueRequest = [{ text: continueReason }];
           if (pendingSteer) {
-            if (continueRequest.length > 0) {
-              continueRequest.push({ text: "\n\n" });
-            }
-            continueRequest.push(...pendingSteer.parts);
+            continueRequest.push({ text: "\n\n" }, ...pendingSteer.parts);
           }
           const pushCountBefore = currentPushCount();
           let hookTurn;
@@ -93113,12 +93108,9 @@ The current date is: ${today}. Note: This is the authoritative current date \u20
                 modelOverride: options2?.modelOverride,
                 getSteerInput: options2?.getSteerInput,
                 steerInput: pendingSteer,
-                stopHookState: discardGoalContinuation ? void 0 : {
+                stopHookState: {
                   iterationCount: currentIterationCount,
-                  reasons: continuationReasonAfterSteer && continuationReasonAfterSteer !== continueReason ? [
-                    ...currentReasons.slice(0, -1),
-                    continuationReasonAfterSteer
-                  ] : currentReasons
+                  reasons: currentReasons
                 }
               },
               hookTurnBudget
@@ -93142,12 +93134,6 @@ The current date is: ${today}. Note: This is the authoritative current date \u20
           normalCompletion = true;
           return hookTurn;
         }
-        const activeGoalEvent = maybeEmitActiveGoalChange(
-          activeGoalAfterStopHook
-        );
-        if (activeGoalEvent) {
-          yield activeGoalEvent;
-        }
         for (const goalEvent of takePendingGoalEvents()) {
           yield goalEvent;
         }
@@ -136916,6 +136902,27 @@ __name(isImageGenerationCapable, "isImageGenerationCapable");
 init_esbuild_shims();
 import { AsyncLocalStorage as AsyncLocalStorage2 } from "node:async_hooks";
 
+// packages/core/src/agents/workflow-failure-lines.ts
+init_esbuild_shims();
+var MAX_FAILURE_LINES = 10;
+var MAX_FAILURE_LINE_CHARS = 400;
+function buildFailureLines(source) {
+  const failed = source.dispatches.filter((d) => d.status === "failed");
+  if (failed.length === 0) return [];
+  const shown = failed.slice(0, MAX_FAILURE_LINES);
+  const lines = shown.map((dispatch) => {
+    const label = stripAnsiAndControl(dispatch.label || "workflow-agent");
+    const error3 = stripAnsiAndControl(dispatch.error || "dispatch failed");
+    return `[${label}] ${error3}`.slice(0, MAX_FAILURE_LINE_CHARS);
+  });
+  const remaining = failed.length - shown.length;
+  if (remaining > 0) {
+    lines.push(`\u2026 and ${remaining} more failures omitted`);
+  }
+  return lines;
+}
+__name(buildFailureLines, "buildFailureLines");
+
 // packages/core/src/agents/workflow-resume-call.ts
 init_esbuild_shims();
 var RESUME_ARGS_CHARS = 300;
@@ -137128,6 +137135,12 @@ var WorkflowRunRegistry = class {
       );
     }
     modelParts.push(`<usage>${escapeXml(buildUsageLine(entry))}</usage>`);
+    const failures = buildFailureLines(entry);
+    if (failures.length > 0) {
+      modelParts.push(
+        `<failures>${escapeXmlElementText(failures.join("\n"))}</failures>`
+      );
+    }
     const recovery = entry.status === "failed" ? buildRecoveryLines(entry) : buildDiagnosticsLines(entry);
     if (recovery.length > 0) {
       const tag2 = entry.status === "failed" ? "recovery" : "diagnostics";
@@ -137227,6 +137240,7 @@ var WorkflowRunRegistry = class {
     entry.dispatches = [];
     entry.agentsDispatched = 0;
     entry.agentsCompleted = 0;
+    entry.agentsRespawned = 0;
     entry.recentLogs = [];
     entry.events = [];
     entry.tokensSpent = 0;
@@ -137626,6 +137640,19 @@ var WorkflowRunRegistry = class {
     entry.agentsCompleted++;
     this.emitStatusChange(entry);
   }
+  /**
+   * A resume re-ran a call the journal already knew about. Counted for the
+   * usage line and written to the log the user reads in `/workflows`, because
+   * "why is it running that agent again?" is the first question a resume
+   * raises and the journal alone cannot answer it out loud.
+   */
+  onResumeRespawn(runId, line) {
+    const entry = this.entries.get(runId);
+    if (!entry || !isActiveWorkflowStatus(entry.status) && entry.status !== "cancelled")
+      return;
+    entry.agentsRespawned = (entry.agentsRespawned ?? 0) + 1;
+    this.onLogAppended(runId, line);
+  }
   /**
    * P5: mirror a `budgetUpdated` emitter event into the entry. Attributes
    * the cumulative delta (`spent - entry.tokensSpent`) to the entry's
@@ -138047,6 +138074,7 @@ function buildUsageLine(entry) {
     `agents_cached=${countByStatus("cached")}`,
     `agents_failed=${countByStatus("failed")}`,
     `agents_cancelled=${countByStatus("cancelled")}`,
+    `agents_respawned=${entry.agentsRespawned ?? 0}`,
     `tokens_spent=${entry.tokensSpent}`,
     `duration_ms=${durationMs}`
   ].join(" ");
@@ -153883,6 +153911,14 @@ var HookPlanner = class {
 // packages/core/src/hooks/hookEventHandler.ts
 init_esbuild_shims();
 var debugLogger110 = createDebugLogger("TRUSTED_HOOKS");
+function normalizeQuestionHookResponse(toolName, response, displayKey) {
+  const display = response[displayKey];
+  if (toolName === ToolNames.ASK_USER_QUESTION && display !== null && typeof display === "object" && "type" in display && display.type === "ask_user_question_answers" && "text" in display && typeof display.text === "string") {
+    return { ...response, [displayKey]: display.text };
+  }
+  return response;
+}
+__name(normalizeQuestionHookResponse, "normalizeQuestionHookResponse");
 var HookEventHandler = class {
   static {
     __name(this, "HookEventHandler");
@@ -154131,7 +154167,11 @@ var HookEventHandler = class {
       permission_mode: permissionMode,
       tool_name: toolName,
       tool_input: toolInput,
-      tool_response: toolResponse,
+      tool_response: normalizeQuestionHookResponse(
+        toolName,
+        toolResponse,
+        "returnDisplay"
+      ),
       tool_use_id: toolUseId,
       ...tool_call_id && { tool_call_id }
     };
@@ -154195,7 +154235,16 @@ var HookEventHandler = class {
     const input = {
       ...this.createBaseInput("PostToolBatch" /* PostToolBatch */),
       permission_mode: permissionMode,
-      tool_calls: toolCalls
+      tool_calls: toolCalls.map(
+        (call) => call.tool_response ? {
+          ...call,
+          tool_response: normalizeQuestionHookResponse(
+            call.tool_name,
+            call.tool_response,
+            "result_display"
+          )
+        } : call
+      )
     };
     return this.executeHooks(
       "PostToolBatch" /* PostToolBatch */,
@@ -161117,6 +161166,7 @@ var Config = class _Config {
   contextRuleExcludes;
   approvalMode;
   prePlanMode;
+  planExecutionMode;
   approvalModeRevision = 0;
   manualPlanExitNoticeEventState = {
     version: 0,
@@ -161822,8 +161872,6 @@ var Config = class _Config {
             }
             let result;
             let stopHookCount;
-            let hasNonGoalBlockingStopHook;
-            let nonGoalBlockingStopReason;
             const input = request.input || {};
             const signal = request.signal;
             switch (request.eventName) {
@@ -161855,18 +161903,6 @@ var Config = class _Config {
                 );
                 result = stopResult.finalOutput ? createHookOutput("Stop", stopResult.finalOutput) : void 0;
                 stopHookCount = stopResult.allOutputs.length;
-                const goalHookId = stopResult.finalOutput?.hookSpecificOutput?.[GOAL_HOOK_ID_OUTPUT_KEY];
-                if (typeof goalHookId === "string") {
-                  const nonGoalBlockingOutputs = stopResult.allOutputs.filter(
-                    (output) => output.hookSpecificOutput?.[GOAL_HOOK_ID_OUTPUT_KEY] !== goalHookId && (output.decision === "block" || output.decision === "deny" || output.continue === false)
-                  );
-                  hasNonGoalBlockingStopHook = nonGoalBlockingOutputs.length > 0;
-                  if (hasNonGoalBlockingStopHook) {
-                    nonGoalBlockingStopReason = nonGoalBlockingOutputs.map(
-                      (output) => output.stopReason || output.reason || "No reason provided"
-                    ).join("\n");
-                  }
-                }
                 break;
               }
               case "MessageDisplay": {
@@ -161981,9 +162017,7 @@ var Config = class _Config {
               success: true,
               output: result,
               // Include stop hook count for Stop events
-              stopHookCount,
-              hasNonGoalBlockingStopHook,
-              nonGoalBlockingStopReason
+              stopHookCount
             });
           } catch (error3) {
             this.debugLogger.warn(`Hook execution failed: ${error3}`);
@@ -162583,6 +162617,9 @@ var Config = class _Config {
       }
     );
     const newContentGeneratorConfig = config3;
+    if (priorReasoning === false && newContentGeneratorConfig.thinkingMandatory !== true) {
+      newContentGeneratorConfig.reasoning = false;
+    }
     this.contentGenerator = await createContentGenerator(
       newContentGeneratorConfig,
       this,
@@ -162591,6 +162628,9 @@ var Config = class _Config {
     this.contentGeneratorConfig = newContentGeneratorConfig;
     this.contentGeneratorConfigSources = sources;
     this.publishModelEnv();
+    if (priorReasoning === false && newContentGeneratorConfig.reasoning === false) {
+      this.modelsConfig.getGenerationConfig().reasoning = false;
+    }
     if (priorReasoningEffort) {
       this.setReasoningEffort(priorReasoningEffort);
     }
@@ -162997,6 +163037,19 @@ var Config = class _Config {
   getCurrentModelRegistryBaseUrl() {
     return this.modelsConfig.getCurrentRegistryBaseUrl();
   }
+  /**
+   * The auth type of the currently selected model, read from `ModelsConfig`
+   * rather than the content generator config.
+   *
+   * Unlike {@link getAuthType}, this is usable before `refreshAuth` has run —
+   * the tool registry is built during `initialize()`, which happens first (the
+   * ACP bridge calls `initialize()` and only later `refreshAuth`). Callers that
+   * need the selected model's provider entry at registry-build time must use
+   * this.
+   */
+  getCurrentAuthType() {
+    return this.modelsConfig.getCurrentAuthType();
+  }
   /**
    * Resolve the effective input modalities of the current primary model. The
    * content generator config always carries resolved modalities (name-based
@@ -163230,15 +163283,19 @@ var Config = class _Config {
    */
   getReasoningEffortOverride() {
     const cfg = this.getContentGeneratorConfig();
-    if (!cfg || !DashScopeOpenAICompatibleProvider.isDashScopeProvider(cfg) || !isTieredEffortWireModel(cfg.model)) {
+    if (!cfg || !DashScopeOpenAICompatibleProvider.isDashScopeProvider(cfg)) {
       return void 0;
     }
+    const configuredReasoning = cfg.authType ? this.getResolvedModelConfig(cfg.authType, cfg.model, cfg.baseUrl)?.capabilities.reasoning : void 0;
+    const tieredModel = isTieredEffortWireModel(cfg.model, configuredReasoning);
+    if (!tieredModel) return void 0;
     const currentEffort = this.getReasoningEffort();
     const selected = selectDashScopeThinkingKnob(
       cfg.model,
       cfg.extra_body,
       cfg.samplingParams,
-      currentEffort
+      currentEffort,
+      tieredModel
     );
     if (!selected || selected.source === "reasoning" || selected.field === "reasoning_effort" && selected.value === currentEffort) {
       return void 0;
@@ -163251,7 +163308,8 @@ var Config = class _Config {
         cfg.model,
         void 0,
         cfg.samplingParams,
-        currentEffort
+        currentEffort,
+        tieredModel
       );
       if (below?.source === "samplingParams" && below.field === "reasoning_effort" && below.value !== currentEffort) {
         return { source: below.source, field: below.field };
@@ -164732,6 +164790,24 @@ var Config = class _Config {
   getPrePlanMode() {
     return this.prePlanMode ?? "default" /* DEFAULT */;
   }
+  getPlanExecutionMode() {
+    return Object.hasOwn(this, "planExecutionMode") ? this.planExecutionMode : void 0;
+  }
+  setPlanMode(enabled, executionMode) {
+    if (isDerivedConfig(this)) {
+      throw new Error("Derived Configs cannot change plan workflow mode");
+    }
+    if (executionMode === "plan" /* PLAN */) {
+      throw new Error("Plan is not an execution approval mode");
+    }
+    if (!this.isTrustedFolder() && executionMode !== "default" /* DEFAULT */) {
+      throw new TrustGateError(
+        "Cannot enable privileged approval modes in an untrusted folder."
+      );
+    }
+    this.setApprovalMode(enabled ? "plan" /* PLAN */ : executionMode);
+    this.planExecutionMode = enabled ? executionMode : void 0;
+  }
   getApprovalModeRevision() {
     return this.approvalModeRevision;
   }
@@ -164792,6 +164868,7 @@ var Config = class _Config {
       this.autoModeDenialState = resetDenialState();
     }
     this.approvalMode = mode;
+    if (mode !== "plan" /* PLAN */) this.planExecutionMode = void 0;
     if (fromMode !== mode) {
       this.approvalModeRevision++;
     }
@@ -166536,35 +166613,35 @@ var Config = class _Config {
     const registerGoalWorkerTools = /* @__PURE__ */ __name(async () => {
       if (options2?.forSubAgent) return;
       await registerLazy(ToolNames.GET_GOAL, async () => {
-        const { GetGoalTool: GetGoalTool2 } = await import("./goal-tools-DFI6YMSD.js");
+        const { GetGoalTool: GetGoalTool2 } = await import("./goal-tools-245ULLQT.js");
         return new GetGoalTool2(this);
       });
       await registerLazy(ToolNames.UPDATE_GOAL, async () => {
-        const { UpdateGoalTool: UpdateGoalTool2 } = await import("./goal-tools-DFI6YMSD.js");
+        const { UpdateGoalTool: UpdateGoalTool2 } = await import("./goal-tools-245ULLQT.js");
         return new UpdateGoalTool2(this);
       });
       if (this.getModelProposedGoals() !== "disabled" && resolveInteractionMode(this) === "interactive") {
         await registerLazy(ToolNames.PROPOSE_GOAL, async () => {
-          const { ProposeGoalTool: ProposeGoalTool2 } = await import("./goal-tools-DFI6YMSD.js");
+          const { ProposeGoalTool: ProposeGoalTool2 } = await import("./goal-tools-245ULLQT.js");
           return new ProposeGoalTool2(this);
         });
       }
     }, "registerGoalWorkerTools");
     if (this.getBareMode()) {
       await registerLazy(ToolNames.READ_FILE, async () => {
-        const { ReadFileTool } = await import("./read-file-KHPQ2MB6.js");
+        const { ReadFileTool } = await import("./read-file-S2NOCBIL.js");
         return new ReadFileTool(this);
       });
       await registerLazy(ToolNames.EDIT, async () => {
-        const { EditTool } = await import("./edit-LB7Z7XK5.js");
+        const { EditTool } = await import("./edit-4IBADZ3O.js");
         return new EditTool(this);
       });
       await registerLazy(ToolNames.NOTEBOOK_EDIT, async () => {
-        const { NotebookEditTool } = await import("./notebook-edit-HGBEKGTE.js");
+        const { NotebookEditTool } = await import("./notebook-edit-YM47A7WO.js");
         return new NotebookEditTool(this);
       });
       await registerLazy(ToolNames.SHELL, async () => {
-        const { ShellTool: ShellTool2 } = await import("./shell-Q5LSQPPY.js");
+        const { ShellTool: ShellTool2 } = await import("./shell-YBVCOPVO.js");
         return new ShellTool2(this);
       });
       await registerGoalWorkerTools();
@@ -166576,7 +166653,7 @@ var Config = class _Config {
     }
     await registerGoalWorkerTools();
     await registerLazy(ToolNames.TOOL_SEARCH, async () => {
-      const { ToolSearchTool } = await import("./tool-search-VXWEOZE7.js");
+      const { ToolSearchTool } = await import("./tool-search-MCDIRPHN.js");
       return new ToolSearchTool(this);
     });
     await registerLazy(ToolNames.READ_MCP_RESOURCE, async () => {
@@ -166584,11 +166661,11 @@ var Config = class _Config {
       return new ReadMcpResourceTool(this);
     });
     await registerLazy(ToolNames.AGENT, async () => {
-      const { AgentTool: AgentTool2 } = await import("./agent-GSUPGEOL.js");
+      const { AgentTool: AgentTool2 } = await import("./agent-EF3IIYE3.js");
       return new AgentTool2(this);
     });
     await registerLazy(ToolNames.LIST_AGENTS, async () => {
-      const { ListAgentsTool } = await import("./list-agents-I5TRH3J7.js");
+      const { ListAgentsTool } = await import("./list-agents-EDPZCGKN.js");
       return new ListAgentsTool(this);
     });
     await registerLazy(ToolNames.TASK_STOP, async () => {
@@ -166596,11 +166673,11 @@ var Config = class _Config {
       return new TaskStopTool(this);
     });
     await registerLazy(ToolNames.SEND_MESSAGE, async () => {
-      const { SendMessageTool } = await import("./send-message-AWKUDJBH.js");
+      const { SendMessageTool } = await import("./send-message-V5T3NMFM.js");
       return new SendMessageTool(this);
     });
     await registerLazy(ToolNames.SKILL, async () => {
-      const { SkillTool } = await import("./skill-75KPJRCM.js");
+      const { SkillTool } = await import("./skill-AXC63EBA.js");
       return new SkillTool(this);
     });
     if (this.isLsToolEnabled()) {
@@ -166610,11 +166687,11 @@ var Config = class _Config {
       });
     }
     await registerLazy(ToolNames.READ_FILE, async () => {
-      const { ReadFileTool } = await import("./read-file-KHPQ2MB6.js");
+      const { ReadFileTool } = await import("./read-file-S2NOCBIL.js");
       return new ReadFileTool(this);
     });
     await registerLazy(ToolNames.ZOOM_IMAGE, async () => {
-      const { ZoomImageTool } = await import("./zoom-image-TDJJY2VZ.js");
+      const { ZoomImageTool } = await import("./zoom-image-BYVIXSNQ.js");
       return new ZoomImageTool(this);
     });
     if (this.getUseRipgrep()) {
@@ -166629,7 +166706,7 @@ var Config = class _Config {
       recordStartupEvent("config_initialize_ripgrep_probe_end");
       if (useRipgrep) {
         await registerLazy(ToolNames.GREP, async () => {
-          const { RipGrepTool } = await import("./ripGrep-NBBVCMG4.js");
+          const { RipGrepTool } = await import("./ripGrep-F6TNOJUO.js");
           return new RipGrepTool(this);
         });
       } else {
@@ -166655,23 +166732,23 @@ var Config = class _Config {
       });
     }
     await registerLazy(ToolNames.GLOB, async () => {
-      const { GlobTool } = await import("./glob-73EDTXUE.js");
+      const { GlobTool } = await import("./glob-ERBD7JYP.js");
       return new GlobTool(this);
     });
     await registerLazy(ToolNames.EDIT, async () => {
-      const { EditTool } = await import("./edit-LB7Z7XK5.js");
+      const { EditTool } = await import("./edit-4IBADZ3O.js");
       return new EditTool(this);
     });
     await registerLazy(ToolNames.NOTEBOOK_EDIT, async () => {
-      const { NotebookEditTool } = await import("./notebook-edit-HGBEKGTE.js");
+      const { NotebookEditTool } = await import("./notebook-edit-YM47A7WO.js");
       return new NotebookEditTool(this);
     });
     await registerLazy(ToolNames.WRITE_FILE, async () => {
-      const { WriteFileTool } = await import("./write-file-L76CGFTQ.js");
+      const { WriteFileTool } = await import("./write-file-DWLKFBTJ.js");
       return new WriteFileTool(this);
     });
     await registerLazy(ToolNames.SHELL, async () => {
-      const { ShellTool: ShellTool2 } = await import("./shell-Q5LSQPPY.js");
+      const { ShellTool: ShellTool2 } = await import("./shell-YBVCOPVO.js");
       return new ShellTool2(this);
     });
     if (this.isTodoWriteEnabled()) {
@@ -166687,19 +166764,19 @@ var Config = class _Config {
     const supportsUserInteraction = resolveInteractionMode(this) !== "headless";
     if (supportsUserInteraction) {
       await registerLazy(ToolNames.ASK_USER_QUESTION, async () => {
-        const { AskUserQuestionTool: AskUserQuestionTool2 } = await import("./askUserQuestion-I5W5S3D6.js");
+        const { AskUserQuestionTool: AskUserQuestionTool2 } = await import("./askUserQuestion-R3TXY77M.js");
         return new AskUserQuestionTool2(this);
       });
     }
     if (!this.sdkMode && (supportsUserInteraction || options2?.forSubAgent)) {
       await registerLazy(ToolNames.EXIT_PLAN_MODE, async () => {
-        const { ExitPlanModeTool: ExitPlanModeTool2 } = await import("./exitPlanMode-A3OKL5UO.js");
+        const { ExitPlanModeTool: ExitPlanModeTool2 } = await import("./exitPlanMode-24J5IHGC.js");
         return new ExitPlanModeTool2(this);
       });
     }
     if (!this.sdkMode && supportsUserInteraction) {
       await registerLazy(ToolNames.ENTER_PLAN_MODE, async () => {
-        const { EnterPlanModeTool } = await import("./enterPlanMode-P6TVUFIY.js");
+        const { EnterPlanModeTool } = await import("./enterPlanMode-YN3GPQU5.js");
         return new EnterPlanModeTool(this);
       });
     }
@@ -166712,7 +166789,7 @@ var Config = class _Config {
       return new ExitWorktreeTool(this);
     });
     await registerLazy(ToolNames.WEB_FETCH, async () => {
-      const { WebFetchTool } = await import("./web-fetch-FMZZYX44.js");
+      const { WebFetchTool } = await import("./web-fetch-QBXAO6VF.js");
       return new WebFetchTool(this);
     });
     if (resolveInteractionMode(this) === "interactive" && !this.sdkMode && !this.getScreenReader() && !options2?.forSubAgent) {
@@ -166721,15 +166798,16 @@ var Config = class _Config {
         return new DisplayImageTool(this);
       });
     }
-    if (this.webSearchSettings?.enabled) {
-      const { evaluateWebSearchGate } = await import("./web-search-3G2KXCX5.js");
+    const hasExplicitWebSearchBackend = !!this.webSearchSettings?.model?.trim() || !!this.webSearchSettings?.baseUrl;
+    if (!this.getBareMode() && !this.isSafeMode() && this.webSearchSettings?.enabled !== false && (this.webSearchSettings?.enabled === true || !hasExplicitWebSearchBackend)) {
+      const { evaluateWebSearchGate } = await import("./web-search-2URQXA3A.js");
       const gate = evaluateWebSearchGate(this);
       if (gate.ok) {
         await registerLazy(ToolNames.WEB_SEARCH, async () => {
-          const { WebSearchTool } = await import("./web-search-3G2KXCX5.js");
+          const { WebSearchTool } = await import("./web-search-2URQXA3A.js");
           return new WebSearchTool(this);
         });
-      } else if (!this.webSearchNoticeEmitted && !options2?.forSubAgent) {
+      } else if (!gate.silent && !this.webSearchNoticeEmitted && !options2?.forSubAgent) {
         this.webSearchNoticeEmitted = true;
         this.warnings.push(gate.notice);
       }
@@ -166737,7 +166815,7 @@ var Config = class _Config {
     await this.registerImageGenerationTool(registry3);
     if (this.isArtifactEnabled()) {
       await registerLazy(ToolNames.ARTIFACT, async () => {
-        const { ArtifactTool } = await import("./artifact-tool-P52OKKEF.js");
+        const { ArtifactTool } = await import("./artifact-tool-G5LHNECG.js");
         return new ArtifactTool(this);
       });
     }
@@ -166780,15 +166858,15 @@ var Config = class _Config {
     }
     if (this.isAgentTeamEnabled()) {
       await registerLazy(ToolNames.TEAM_CREATE, async () => {
-        const { TeamCreateTool } = await import("./team-create-2PATB77U.js");
+        const { TeamCreateTool } = await import("./team-create-BUFLGGSH.js");
         return new TeamCreateTool(this);
       });
       await registerLazy(ToolNames.TEAM_DELETE, async () => {
-        const { TeamDeleteTool } = await import("./team-delete-CBHVBTPB.js");
+        const { TeamDeleteTool } = await import("./team-delete-IQZ6XGFI.js");
         return new TeamDeleteTool(this);
       });
       await registerLazy(ToolNames.TEAM_PLAN_APPROVAL, async () => {
-        const { TeamPlanApprovalTool } = await import("./team-plan-approval-QTANEWOS.js");
+        const { TeamPlanApprovalTool } = await import("./team-plan-approval-OUWWM42U.js");
         return new TeamPlanApprovalTool(this);
       });
       if (!options2?.forSubAgent) {
@@ -166798,26 +166876,26 @@ var Config = class _Config {
         });
       }
       await registerLazy(ToolNames.TASK_CREATE, async () => {
-        const { TaskCreateTool } = await import("./task-create-PMAFST2T.js");
+        const { TaskCreateTool } = await import("./task-create-MWXJFRRM.js");
         return new TaskCreateTool(this);
       });
       await registerLazy(ToolNames.TASK_UPDATE, async () => {
-        const { TaskUpdateTool } = await import("./task-update-JYC57USF.js");
+        const { TaskUpdateTool } = await import("./task-update-2JJJRHMT.js");
         return new TaskUpdateTool(this);
       });
       await registerLazy(ToolNames.TASK_LIST, async () => {
-        const { TaskListTool } = await import("./task-list-R2HSY2NC.js");
+        const { TaskListTool } = await import("./task-list-EYO3FE57.js");
         return new TaskListTool(this);
       });
     }
     if (this.isWorkflowsEnabled()) {
       await registerLazy(ToolNames.WORKFLOW, async () => {
-        const { WorkflowTool } = await import("./workflow-PPZZICQ7.js");
+        const { WorkflowTool } = await import("./workflow-JDD6WDAH.js");
         return new WorkflowTool(this);
       });
     }
     await registerLazy(ToolNames.MONITOR, async () => {
-      const { MonitorTool } = await import("./monitor-BV5XF6LL.js");
+      const { MonitorTool } = await import("./monitor-RKK6GSHG.js");
       return new MonitorTool(this);
     });
     if (this.pendingMcpBudgetCallback) {
@@ -167570,9 +167648,6 @@ export {
   parseGoalSnapshotV2,
   parseGoalStateCause,
   GoalPersistenceUnavailableError,
-  getActiveGoal,
-  getStopHookContinuationReason,
-  abortGoalForStopHookCap,
   checkPriorRead,
   goalTurnContext,
   GetGoalTool,
@@ -167654,6 +167729,7 @@ export {
   replaceSessionPrs,
   buildApiHistoryFromConversation,
   collectSessionTurnState,
+  computeInitialTurnFromHistory,
   SESSION_TRANSCRIPT_MAX_LIMIT,
   SESSION_TRANSCRIPT_MAX_INDEX_BYTES,
   SESSION_TRANSCRIPT_MAX_PAGE_BYTES,
@@ -167875,6 +167951,7 @@ export {
   MAX_CONCURRENT_MONITORS,
   getMonitorOutputPath,
   isImageGenerationCapable,
+  buildFailureLines,
   RESUME_ARGS_TOO_LARGE_NOTE,
   hasUninlinableResumeArgs,
   buildResumeCall,