pybao-cli 1.5.14 → 1.5.16

package/dist/{chunk-GWIJUNRO.js → chunk-LE4MSECX.js}

@@ -2,18 +2,18 @@ import { createRequire as __pybCreateRequire } from "node:module";
 const require = __pybCreateRequire(import.meta.url);
 import {
   loadPybAgentSessionMessages
-} from "./chunk-DY2JCWQE.js";
+} from "./chunk-ZGQA3IBT.js";
 import {
   listPybAgentSessions
-} from "./chunk-5GJVTQ6Z.js";
+} from "./chunk-ZVVBLU3R.js";
 import {
   appendSessionCustomTitleRecord,
   appendSessionTagRecord
-} from "./chunk-GP4PJUZ5.js";
+} from "./chunk-DXLMPRXX.js";
 import {
   formatValidationResult,
   validatePluginOrMarketplacePath
-} from "./chunk-CCGXQSUZ.js";
+} from "./chunk-GZBASJQM.js";
 import {
   ConversationTracker,
   appendFinishState,
@@ -21,10 +21,10 @@ import {
   getConversationTrackerForContext,
   isFinishComplete,
   mapFinishReason
-} from "./chunk-2UWY74V2.js";
+} from "./chunk-74PPXIKF.js";
 import {
   FileSystemConversationPersistence
-} from "./chunk-RAWU5JAN.js";
+} from "./chunk-MMTMYYK4.js";
 import {
   beginReplSessionScope
 } from "./chunk-F4AXICO7.js";
@@ -39,7 +39,7 @@ import {
   runStopHooks,
   runUserPromptSubmitHooks,
   updateHookTranscriptForMessages
-} from "./chunk-3O5DLN4S.js";
+} from "./chunk-OTEQDHXR.js";
 import {
   DEFAULT_OUTPUT_STYLE,
   getAvailableOutputStyles,
@@ -48,11 +48,11 @@ import {
   getOutputStyleSystemPromptAdditions,
   resolveOutputStyleName,
   setCurrentOutputStyle
-} from "./chunk-EOZR4EWJ.js";
+} from "./chunk-ZHCJRYGZ.js";
 import {
   fetchCustomModels,
   getModelFeatures
-} from "./chunk-LFCRI4XF.js";
+} from "./chunk-2UIC6KUN.js";
 import {
   getSessionState
 } from "./chunk-XKYHFZEC.js";
@@ -60,7 +60,7 @@ import {
   queryLLM,
   queryQuick,
   verifyApiKey
-} from "./chunk-DPM2NLYC.js";
+} from "./chunk-WCNJUZPB.js";
 import {
   DEFAULT_TIMEOUT_MS,
   FallbackToolUseRejectedMessage,
@@ -74,7 +74,7 @@ import {
   listMCPServers,
   loadMergedSettings,
   normalizeSandboxRuntimeConfigFromSettings
-} from "./chunk-W2IIXSKF.js";
+} from "./chunk-2JDFT27Z.js";
 import {
   addMarketplace,
   disableSkillPlugin,
@@ -87,11 +87,11 @@ import {
   refreshMarketplaceAsync,
   removeMarketplace,
   uninstallSkillPlugin
-} from "./chunk-WGK3XBGW.js";
+} from "./chunk-GDUBW6S3.js";
 import {
   loadToolPermissionContextFromDisk,
   persistToolPermissionUpdateToDisk
-} from "./chunk-656DI2PZ.js";
+} from "./chunk-XC7HSASO.js";
 import {
   applyToolPermissionContextUpdate,
   applyToolPermissionContextUpdates,
@@ -102,13 +102,13 @@ import {
   generateSystemReminders,
   resetReminderSession,
   systemReminderService
-} from "./chunk-P6GUR3BQ.js";
+} from "./chunk-2IP3S5YY.js";
 import {
   clearAgentCache,
   getActiveAgents,
   getAgentByType,
   getAllAgents
-} from "./chunk-G2NQTS2X.js";
+} from "./chunk-OQUAEZWY.js";
 import {
   API_ERROR_MESSAGE_PREFIX,
   CANCEL_MESSAGE,
@@ -145,7 +145,7 @@ import {
   reorderMessages,
   resetAutoCompactTelemetry,
   stripSystemMessages
-} from "./chunk-G4URT4VU.js";
+} from "./chunk-EGFEUHPK.js";
 import {
   getRequestStatus,
   setRequestStatus,
@@ -175,7 +175,7 @@ import {
   normalizeFilePath,
   readTextContent,
   writeTextContent
-} from "./chunk-PD3UXMJI.js";
+} from "./chunk-7TRQANX3.js";
 import {
   parseBlockEdits
 } from "./chunk-QWIBSCDN.js";
@@ -185,18 +185,18 @@ import {
   ParserRegistry,
   initParser,
   loadLanguage
-} from "./chunk-6GFXJLN3.js";
+} from "./chunk-7UPV7QTD.js";
 import {
   getSettingsFileCandidates,
   loadSettingsWithLegacyFallback,
   readSettingsFile
-} from "./chunk-JWJC3DE2.js";
+} from "./chunk-TOLIZZNG.js";
 import {
   getCustomCommandDirectories,
   hasCustomCommands,
   loadCustomCommands,
   reloadCustomCommands
-} from "./chunk-633CKZ4H.js";
+} from "./chunk-5NEN4RZF.js";
 import {
   getSessionPlugins
 } from "./chunk-BJSWTHRM.js";
@@ -205,7 +205,7 @@ import {
   buildModelProfileKey,
   getModelManager,
   isDefaultSlowAndCapableModel
-} from "./chunk-RAT3UGPD.js";
+} from "./chunk-PJ6F6UEG.js";
 import {
   getCodeStyle,
   getContext,
@@ -213,16 +213,16 @@ import {
   getIsGit,
   getProjectDocs,
   getProjectStructureStatisticsBlock
-} from "./chunk-3I7K6SG5.js";
+} from "./chunk-VLAJHHDH.js";
 import {
   getRipgrepPath,
   getRipgrepPolicyMode,
   resolveRipgrepPolicy,
   ripGrep
-} from "./chunk-XFCLMIVU.js";
+} from "./chunk-6UUMMCEA.js";
 import {
   getTheme
-} from "./chunk-BLPZN5F3.js";
+} from "./chunk-IW5UFMRQ.js";
 import {
   DEFAULT_GLOBAL_CONFIG,
   enableConfigs,
@@ -235,7 +235,7 @@ import {
   saveGlobalConfig,
   setAllPointersToModel,
   setModelPointer
-} from "./chunk-EL45JJXX.js";
+} from "./chunk-T2TMNQ7H.js";
 import {
   AbortError
 } from "./chunk-RQVLBMP7.js";
@@ -244,7 +244,7 @@ import {
   getCurrentRequest,
   logUserFriendly,
   markPhase
-} from "./chunk-7RAZGTUT.js";
+} from "./chunk-GF2MQGGQ.js";
 import {
   ASCII_LOGO,
   BunShell,
@@ -285,10 +285,10 @@ import {
   setCwd,
   shouldApplyToolOutputTruncation,
   truncateToolOutput
-} from "./chunk-RE4W2ZJB.js";
+} from "./chunk-TKUXXEIH.js";
 import {
   MACRO
-} from "./chunk-YDZG5W4V.js";
+} from "./chunk-ZVKBWRCR.js";
 import {
   __export
 } from "./chunk-I3J4JYES.js";
@@ -469,7 +469,7 @@ var getCommandSubcommandPrefix = memoize(
 var getCommandPrefix = memoize(
   async (command4, abortSignal) => {
     const { systemPrompt, userPrompt } = buildBashCommandPrefixDetectionPrompt(command4);
-    const { API_ERROR_MESSAGE_PREFIX: API_ERROR_MESSAGE_PREFIX2, queryQuick: queryQuick2 } = await import("./llm-BPQNYHE3.js");
+    const { API_ERROR_MESSAGE_PREFIX: API_ERROR_MESSAGE_PREFIX2, queryQuick: queryQuick2 } = await import("./llm-NAYVED3B.js");
     const response = await queryQuick2({
       systemPrompt,
       userPrompt,
@@ -4271,7 +4271,7 @@ function formatParseError(error) {
   return error instanceof Error ? error.message : String(error);
 }
 async function defaultGateQuery(args) {
-  const { API_ERROR_MESSAGE_PREFIX: API_ERROR_MESSAGE_PREFIX2, queryLLM: queryLLM2 } = await import("./llm-BPQNYHE3.js");
+  const { API_ERROR_MESSAGE_PREFIX: API_ERROR_MESSAGE_PREFIX2, queryLLM: queryLLM2 } = await import("./llm-NAYVED3B.js");
   const queryLLMFn = args.queryLLMOverride ?? queryLLM2;
   const messages = [
     {
@@ -6664,7 +6664,7 @@ var FileEditTool = {
     const originalFileContent = currentFileContent;
     let totalPatch = [];
     const { SmartEdit } = await import("./smart-edit-AWHJDSU6.js");
-    const { findLspAnchor } = await import("./lspAnchor-GVGHDYX4.js");
+    const { findLspAnchor } = await import("./lspAnchor-AAJRSC4H.js");
     for (const op of editOperations) {
       const normalizedSearch = normalizeLineEndings(op.search);
       const normalizedReplace = normalizeLineEndings(op.replace);
@@ -12149,7 +12149,7 @@ async function createAndStoreApiKey(accessToken) {
       }
       saveGlobalConfig(config2);
       try {
-        const { resetAnthropicClient } = await import("./llm-BPQNYHE3.js");
+        const { resetAnthropicClient } = await import("./llm-NAYVED3B.js");
         resetAnthropicClient();
       } catch {
       }
@@ -16573,7 +16573,7 @@ async function refreshPluginRuntimeFromInstalls() {
   const existingRoots = getSessionPlugins().map((p) => p.rootDir);
   const dirs = Array.from(/* @__PURE__ */ new Set([...existingRoots, ...installedRoots]));
   if (dirs.length === 0) return [];
-  const { configureSessionPlugins } = await import("./pluginRuntime-QWYITTNV.js");
+  const { configureSessionPlugins } = await import("./pluginRuntime-VS4AI72Y.js");
   const { errors } = await configureSessionPlugins({ pluginDirs: dirs });
   return errors;
 }
@@ -17248,7 +17248,7 @@ async function call(onDone, context) {
     ModelConfig,
     {
       onClose: () => {
-        import("./model-73TIVV4A.js").then(({ reloadModelManager: reloadModelManager2 }) => {
+        import("./model-TIZ3I4PF.js").then(({ reloadModelManager: reloadModelManager2 }) => {
           reloadModelManager2();
           triggerModelConfigChange();
           onDone();
@@ -25557,7 +25557,7 @@ function useStatusLine() {
 // src/ui/components/PromptInput.tsx
 async function interpretHashCommand(input) {
   try {
-    const { queryQuick: queryQuick2 } = await import("./llm-BPQNYHE3.js");
+    const { queryQuick: queryQuick2 } = await import("./llm-NAYVED3B.js");
     const systemPrompt = [
       "You're helping the user structure notes that will be added to their PYB.md file.",
       "Format the user's input into a well-structured note that will be useful for later reference.",
@@ -25870,7 +25870,7 @@ function PromptInput({
     if (messages2.length) {
       if (mode === "bash") {
         onQuery(messages2, newAbortController).then(async () => {
-          const { getCwd: getCwd2 } = await import("./state-KCGPU2FP.js");
+          const { getCwd: getCwd2 } = await import("./state-WMWNA6WF.js");
           setCurrentPwd(getCwd2());
         });
       } else {
@@ -30872,6 +30872,84 @@ function resolveSessionEngineReplaySample(replaySeed) {
   return hash % 100;
 }
 
+// src/app/queryRuntime/lifecycle.ts
+var TOOL_PROGRESS_OPEN_TAG = ["<tool", "-progress>"].join("");
+var TOOL_PROGRESS_CLOSE_TAG = ["</tool", "-progress>"].join("");
+function isTextBlock(block) {
+  return Boolean(
+    block && typeof block === "object" && block.type === "text"
+  );
+}
+function isToolResultBlock(block) {
+  return Boolean(
+    block && typeof block === "object" && block.type === "tool_result"
+  );
+}
+function inferIsNewSessionForAutoCompact(messages) {
+  const naturalMessages = messages.filter(
+    (message) => message?.type === "user" || message?.type === "assistant"
+  );
+  const hasCompactionMarker = naturalMessages.some(
+    (message) => message?.compaction?.type === "compaction"
+  );
+  return !hasCompactionMarker && naturalMessages.length <= 2;
+}
+function extractUserPromptTextFromMessages(messages) {
+  const last2 = messages[messages.length - 1];
+  if (!last2 || typeof last2 !== "object" || last2.type !== "user") {
+    return null;
+  }
+  const content = last2.message?.content;
+  if (typeof content === "string") {
+    return content;
+  }
+  if (!Array.isArray(content)) {
+    return null;
+  }
+  const hasToolResult = content.some((block) => isToolResultBlock(block));
+  if (hasToolResult) {
+    return null;
+  }
+  return content.filter(isTextBlock).map((block) => String(block.text ?? "")).join("");
+}
+function resolveLifecycleTokensFromUsage(usage) {
+  if (!usage || typeof usage !== "object") {
+    return void 0;
+  }
+  const usageLike = usage;
+  const input = Number.isFinite(Number(usageLike.input_tokens)) ? Number(usageLike.input_tokens) : void 0;
+  const output = Number.isFinite(Number(usageLike.output_tokens)) ? Number(usageLike.output_tokens) : void 0;
+  if (input === void 0 && output === void 0) {
+    return void 0;
+  }
+  return {
+    ...input === void 0 ? {} : { input },
+    ...output === void 0 ? {} : { output },
+    total: (input ?? 0) + (output ?? 0)
+  };
+}
+function resolveLifecycleTokensFromAssistantMessage(assistantMessage) {
+  if (!assistantMessage || typeof assistantMessage !== "object") {
+    return void 0;
+  }
+  const message = assistantMessage.message;
+  if (!message || typeof message !== "object") {
+    return void 0;
+  }
+  return resolveLifecycleTokensFromUsage(
+    message.usage
+  );
+}
+function resolveStopHookSignal(args) {
+  const hookEvent = args.agentId && args.agentId !== "main" ? "SubagentStop" : "Stop";
+  const rawStopReason = args.assistantMessage && typeof args.assistantMessage === "object" && args.assistantMessage.message ? args.assistantMessage.message?.stop_reason ?? args.assistantMessage.message?.stopReason : void 0;
+  const stopReason = rawStopReason ?? "end_turn";
+  return {
+    hookEvent,
+    stopReason: String(stopReason ?? "")
+  };
+}
+
 // src/app/queryRuntime/toolInput.ts
 function normalizeToolInput(tool, input) {
   switch (tool) {
@@ -30913,39 +30991,124 @@ function preprocessToolInput(tool, input) {
   return input;
 }
 
-// src/app/queryRuntime/lifecycle.ts
-var TOOL_PROGRESS_OPEN_TAG = ["<tool", "-progress>"].join("");
-var TOOL_PROGRESS_CLOSE_TAG = ["</tool", "-progress>"].join("");
-function inferIsNewSessionForAutoCompact(messages) {
-  const naturalMessages = messages.filter(
-    (message) => message?.type === "user" || message?.type === "assistant"
+// src/app/queryRuntime/stopHooks.ts
+async function runStopHookAttempt(args) {
+  const stopOutcome = await runStopHooks({
+    hookEvent: args.hookEvent,
+    reason: args.stopReason,
+    retryEntryKey: buildRetryEntryKey([
+      args.context.sessionId,
+      args.context.parentSessionId,
+      args.context.childSessionId,
+      args.context.agentId,
+      args.stopReason
+    ]),
+    retryAttempt: args.stopHookAttempts,
+    sessionId: args.context.sessionId,
+    parentSessionId: args.context.parentSessionId,
+    childSessionId: args.context.childSessionId,
+    agentId: args.context.agentId,
+    permissionMode: args.context.options?.toolPermissionContext?.mode,
+    cwd: getCwd(),
+    transcriptPath: getHookTranscriptPath(args.context),
+    safeMode: args.context.options?.safeMode ?? false,
+    stopHookActive: args.stopHookActive,
+    signal: args.context.abortController.signal
+  });
+  if (stopOutcome.systemMessages.length > 0) {
+    queueHookSystemMessages(args.context, stopOutcome.systemMessages);
+  }
+  if (stopOutcome.additionalContexts.length > 0) {
+    queueHookAdditionalContexts(args.context, stopOutcome.additionalContexts);
+  }
+  if (stopOutcome.decision !== "block") {
+    return {
+      shouldRetry: false,
+      nextStopHookAttempts: args.stopHookAttempts
+    };
+  }
+  queueHookSystemMessages(args.context, [stopOutcome.message]);
+  const maxStopHookAttempts = args.maxStopHookAttempts ?? 5;
+  if (args.stopHookAttempts < maxStopHookAttempts) {
+    return {
+      shouldRetry: true,
+      nextStopHookAttempts: args.stopHookAttempts + 1
+    };
+  }
+  return {
+    shouldRetry: false,
+    nextStopHookAttempts: args.stopHookAttempts
+  };
+}
+
+// src/app/queryRuntime/assistantOutput.ts
+function buildAssistantMessageForParent(args) {
+  if (!args.parentMessageUuid) {
+    return args.assistantMessage;
+  }
+  return appendFinishState(args.assistantMessage, {
+    finish: args.finish,
+    parentID: args.parentMessageUuid,
+    ...args.markCompletedAtOnComplete && isFinishComplete(args.finish) ? { completedAt: Date.now() } : {}
+  });
+}
+
+// src/app/queryRuntime/toolQueue.ts
+function isToolResultErrorBlock(block) {
+  return Boolean(
+    block && typeof block === "object" && block.type === "tool_result" && block.is_error === true
   );
-  const hasCompactionMarker = naturalMessages.some(
-    (message) => message?.compaction?.type === "compaction"
+}
+function isToolUseLikeBlock(block) {
+  return Boolean(
+    block && typeof block === "object" && (block.type === "tool_use" || block.type === "server_tool_use" || block.type === "mcp_tool_use")
   );
-  return !hasCompactionMarker && naturalMessages.length <= 2;
 }
-function extractUserPromptTextFromMessages(messages) {
-  const last2 = messages[messages.length - 1];
-  if (!last2 || typeof last2 !== "object" || last2.type !== "user") {
-    return null;
+function createQueuedWaitingProgressMessage(args) {
+  return createProgressMessage(
+    args.toolUseId,
+    args.siblingToolUseIDs,
+    createAssistantMessage(`${args.openTag}Waiting\u2026${args.closeTag}`),
+    [],
+    args.tools,
+    { progressState: "queued_waiting" }
+  );
+}
+function resolveToolQueueContextModifier(message) {
+  if (message.type !== "user") {
+    return void 0;
   }
-  const content = last2.message?.content;
-  if (typeof content === "string") {
-    return content;
+  const modifyContext = message.toolUseResult?.contextModifier?.modifyContext;
+  return typeof modifyContext === "function" ? modifyContext : void 0;
+}
+function isToolQueueNextTurnMessage(message) {
+  return message.type === "user" || message.type === "assistant";
+}
+function canExecuteToolWithCurrentExecutions(args) {
+  return args.executingEntries.length === 0 || args.nextIsConcurrencySafe && args.executingEntries.every((entry) => entry.isConcurrencySafe);
+}
+function shouldWaitForToolQueueProgress(args) {
+  return args.hasExecutingTools && !args.hasCompletedResults && !args.hasPendingProgress;
+}
+function resolveToolQueueUserMessageErrorState(message) {
+  if (message.type !== "user") {
+    return { toolErrored: false };
   }
+  const content = message.message?.content;
   if (!Array.isArray(content)) {
-    return null;
+    return { toolErrored: false };
   }
-  const hasToolResult = content.some(
-    (block) => block && typeof block === "object" && block.type === "tool_result"
+  const errorBlocks = content.filter(
+    (block) => isToolResultErrorBlock(block)
   );
-  if (hasToolResult) {
-    return null;
+  if (errorBlocks.length === 0) {
+    return { toolErrored: false };
+  }
+  const fatalBlock = errorBlocks.find((block) => block.error_class === "fatal");
+  if (fatalBlock && typeof fatalBlock.tool_use_id === "string") {
+    return { toolErrored: true, fatalToolUseId: fatalBlock.tool_use_id };
   }
-  return content.filter(
-    (block) => block && typeof block === "object" && block.type === "text"
-  ).map((block) => String(block.text ?? "")).join("");
+  return { toolErrored: true };
 }
 
 // src/utils/session/singleFactLayer.ts
@@ -31465,9 +31628,6 @@ async function* checkPermissionsAndCallTool(args) {
 }
 
 // src/app/query.ts
-function isToolUseLikeBlock(block) {
-  return block && typeof block === "object" && (block.type === "tool_use" || block.type === "server_tool_use" || block.type === "mcp_tool_use");
-}
 var __isToolUseLikeBlockForTests = isToolUseLikeBlock;
 var reminderChannelRounds = [];
 var ToolUseQueue = class {
@@ -31507,7 +31667,10 @@ var ToolUseQueue = class {
   }
   canExecuteTool(isConcurrencySafe) {
     const executing = this.tools.filter((t) => t.status === "executing");
-    return executing.length === 0 || isConcurrencySafe && executing.every((t) => t.isConcurrencySafe);
+    return canExecuteToolWithCurrentExecutions({
+      executingEntries: executing,
+      nextIsConcurrencySafe: isConcurrencySafe
+    });
   }
   async processQueue() {
     for (const entry of this.tools) {
@@ -31518,16 +31681,13 @@ var ToolUseQueue = class {
         if (!entry.queuedProgressEmitted) {
           entry.queuedProgressEmitted = true;
           entry.pendingProgress.push(
-            createProgressMessage(
-              entry.id,
-              this.siblingToolUseIDs,
-              createAssistantMessage(
-                `${TOOL_PROGRESS_OPEN_TAG}Waiting\u2026${TOOL_PROGRESS_CLOSE_TAG}`
-              ),
-              [],
-              this.toolUseContext.options.tools,
-              { progressState: "queued_waiting" }
-            )
+            createQueuedWaitingProgressMessage({
+              toolUseId: entry.id,
+              siblingToolUseIDs: this.siblingToolUseIDs,
+              tools: this.toolUseContext.options.tools,
+              openTag: TOOL_PROGRESS_OPEN_TAG,
+              closeTag: TOOL_PROGRESS_CLOSE_TAG
+            })
           );
           if (this.progressAvailableResolve) {
             this.progressAvailableResolve();
@@ -31586,21 +31746,12 @@ var ToolUseQueue = class {
           );
           break;
         }
-        if (message.type === "user" && Array.isArray(message.message.content) && message.message.content.some(
-          (block) => block.type === "tool_result" && block.is_error === true
-        )) {
-          const fatal = message.message.content.some(
-            (block) => block.type === "tool_result" && block.is_error === true && block.error_class === "fatal"
-          );
-          if (fatal) {
+        const errorState = resolveToolQueueUserMessageErrorState(message);
+        if (errorState.toolErrored) {
+          if (errorState.fatalToolUseId) {
             this.hasFatalErrored = true;
             if (!this.fatalToolUseId) {
-              const fatalBlock = message.message.content.find(
-                (block) => block.type === "tool_result" && block.is_error === true && block.error_class === "fatal" && typeof block.tool_use_id === "string"
-              );
-              if (fatalBlock) {
-                this.fatalToolUseId = fatalBlock.tool_use_id;
-              }
+              this.fatalToolUseId = errorState.fatalToolUseId;
             }
           }
           toolErrored = true;
@@ -31613,10 +31764,9 @@ var ToolUseQueue = class {
           }
         } else {
           results.push(message);
-          if (message.type === "user" && message.toolUseResult?.contextModifier) {
-            contextModifiers.push(
-              message.toolUseResult.contextModifier.modifyContext
-            );
+          const modifyContext = resolveToolQueueContextModifier(message);
+          if (modifyContext) {
+            contextModifiers.push(modifyContext);
           }
         }
       }
@@ -31670,7 +31820,11 @@ var ToolUseQueue = class {
       for (const message of this.getCompletedResults()) {
         yield message;
       }
-      if (this.hasExecutingTools() && !this.hasCompletedResults() && !this.hasPendingProgress()) {
+      if (shouldWaitForToolQueueProgress({
+        hasExecutingTools: this.hasExecutingTools(),
+        hasCompletedResults: this.hasCompletedResults(),
+        hasPendingProgress: this.hasPendingProgress()
+      })) {
         const promises = this.tools.filter((t) => t.status === "executing" && t.promise).map((t) => t.promise);
         const progressPromise = new Promise((resolve13) => {
           this.progressAvailableResolve = resolve13;
@@ -31997,10 +32151,7 @@ async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseCo
       fullSystemPrompt.push(effectiveSystemReminders);
       fullSystemPrompt.push("\n---\n");
     }
-    const planModeAdditions = getPlanModeSystemPromptAdditions(
-      messages,
-      toolUseContext
-    );
+    const planModeAdditions = getPlanModeSystemPromptAdditions(messages, toolUseContext);
     if (planModeAdditions.length > 0) {
       fullSystemPrompt.push(...planModeAdditions);
     }
@@ -32132,17 +32283,12 @@ async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseCo
     const shouldSkipPermissionCheck = result.shouldSkipPermissionCheck;
     const parentUserMessage = findNaturalUserMessageForParent(messages);
     const toolUseMessages = assistantMessage.message.content.filter(isToolUseLikeBlock);
-    const usage = assistantMessage.message?.usage;
-    const lifecycleTokens = usage && typeof usage === "object" ? {
-      ...Number.isFinite(Number(usage.input_tokens)) ? { input: Number(usage.input_tokens) } : {},
-      ...Number.isFinite(Number(usage.output_tokens)) ? { output: Number(usage.output_tokens) } : {},
-      ...Number.isFinite(Number(usage.input_tokens)) || Number.isFinite(Number(usage.output_tokens)) ? {
-        total: Number(usage.input_tokens ?? 0) + Number(usage.output_tokens ?? 0)
-      } : {}
-    } : void 0;
+    const lifecycleTokens = resolveLifecycleTokensFromAssistantMessage(assistantMessage);
     if (!toolUseMessages.length) {
-      const stopHookEvent = toolUseContext.agentId && toolUseContext.agentId !== "main" ? "SubagentStop" : "Stop";
-      const stopReason = assistantMessage.message?.stop_reason || assistantMessage.message?.stopReason || "end_turn";
+      const { hookEvent: stopHookEvent, stopReason } = resolveStopHookSignal({
+        agentId: toolUseContext.agentId,
+        assistantMessage
+      });
       const finish = mapFinishReason(stopReason);
       lifecycleEvents.finishStep({
         stepId,
@@ -32153,69 +32299,37 @@ async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseCo
         costUSD: assistantMessage.costUSD,
         ...lifecycleTokens ? { tokens: lifecycleTokens } : {}
       });
-      const stopOutcome = await runStopHooks({
+      const stopHookResult = await runStopHookAttempt({
+        context: toolUseContext,
         hookEvent: stopHookEvent,
-        reason: String(stopReason ?? ""),
-        retryEntryKey: buildRetryEntryKey([
-          toolUseContext.sessionId,
-          toolUseContext.parentSessionId,
-          toolUseContext.childSessionId,
-          toolUseContext.agentId,
-          String(stopReason ?? "")
-        ]),
-        retryAttempt: stopHookAttempts,
-        sessionId: toolUseContext.sessionId,
-        parentSessionId: toolUseContext.parentSessionId,
-        childSessionId: toolUseContext.childSessionId,
-        agentId: toolUseContext.agentId,
-        permissionMode: toolUseContext.options?.toolPermissionContext?.mode,
-        cwd: getCwd(),
-        transcriptPath: getHookTranscriptPath(toolUseContext),
-        safeMode: toolUseContext.options?.safeMode ?? false,
+        stopReason,
         stopHookActive,
-        signal: toolUseContext.abortController.signal
+        stopHookAttempts
       });
-      if (stopOutcome.systemMessages.length > 0) {
-        queueHookSystemMessages(toolUseContext, stopOutcome.systemMessages);
-      }
-      if (stopOutcome.additionalContexts.length > 0) {
-        queueHookAdditionalContexts(
+      if (stopHookResult.shouldRetry) {
+        yield* await queryCore(
+          [...messages, assistantMessage],
+          systemPrompt,
+          context,
+          canUseTool,
           toolUseContext,
-          stopOutcome.additionalContexts
+          getBinaryFeedbackResponse,
+          {
+            stopHookActive: true,
+            stopHookAttempts: stopHookResult.nextStopHookAttempts,
+            startupEmitted: true
+          }
         );
-      }
-      if (stopOutcome.decision === "block") {
-        queueHookSystemMessages(toolUseContext, [stopOutcome.message]);
-        const MAX_STOP_HOOK_ATTEMPTS = 5;
-        if (stopHookAttempts < MAX_STOP_HOOK_ATTEMPTS) {
-          yield* await queryCore(
-            [...messages, assistantMessage],
-            systemPrompt,
-            context,
-            canUseTool,
-            toolUseContext,
-            getBinaryFeedbackResponse,
-            {
-              stopHookActive: true,
-              stopHookAttempts: stopHookAttempts + 1,
-              startupEmitted: true
-            }
-          );
-          return;
-        }
-      }
-      if (!parentUserMessage?.uuid) {
-        sessionContext?.setIdle();
-        yield assistantMessage;
         return;
       }
-      const enrichedAssistantMessage = appendFinishState(assistantMessage, {
+      const enrichedAssistantMessage = buildAssistantMessageForParent({
+        assistantMessage,
         finish,
-        parentID: parentUserMessage.uuid,
-        ...isFinishComplete(finish) ? { completedAt: Date.now() } : {}
+        parentMessageUuid: parentUserMessage?.uuid,
+        markCompletedAtOnComplete: true
       });
-      const completedQueryId = parentUserMessage.queryId || parentUserMessage.uuid;
-      if (conversationTrackingConfig.enabled && conversationTrackingConfig.markCompletion && isFinishComplete(enrichedAssistantMessage.finish) && completedQueryId) {
+      const completedQueryId = parentUserMessage?.queryId || parentUserMessage?.uuid;
+      if (parentUserMessage?.uuid && conversationTrackingConfig.enabled && conversationTrackingConfig.markCompletion && isFinishComplete(enrichedAssistantMessage.finish) && completedQueryId) {
         const completed = tracker.completeQuery(
           completedQueryId,
           enrichedAssistantMessage,
@@ -32229,15 +32343,11 @@ async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseCo
       sessionContext?.setIdle();
       return;
     }
-    if (!parentUserMessage?.uuid) {
-      yield assistantMessage;
-    } else {
-      const enrichedAssistantMessage = appendFinishState(assistantMessage, {
-        finish: "tool_calls",
-        parentID: parentUserMessage.uuid
-      });
-      yield enrichedAssistantMessage;
-    }
+    yield buildAssistantMessageForParent({
+      assistantMessage,
+      finish: "tool_calls",
+      parentMessageUuid: parentUserMessage?.uuid
+    });
     lifecycleEvents.finishStep({
       stepId,
       requestId,
@@ -32261,7 +32371,7 @@ async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseCo
     const toolMessagesForNextTurn = [];
     for await (const message of toolQueue.getRemainingResults()) {
       yield message;
-      if (message.type !== "progress") {
+      if (isToolQueueNextTurnMessage(message)) {
         toolMessagesForNextTurn.push(message);
       }
     }
@@ -32271,22 +32381,18 @@ async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseCo
       yield createAssistantMessage(INTERRUPT_MESSAGE_FOR_TOOL_USE);
       return;
     }
-    try {
-      yield* await queryCore(
-        [...messages, assistantMessage, ...toolMessagesForNextTurn],
-        systemPrompt,
-        context,
-        canUseTool,
-        toolUseContext,
-        getBinaryFeedbackResponse,
-        {
-          ...hookState ?? {},
-          startupEmitted: true
-        }
-      );
-    } catch (error) {
-      throw error;
-    }
+    yield* await queryCore(
+      [...messages, assistantMessage, ...toolMessagesForNextTurn],
+      systemPrompt,
+      context,
+      canUseTool,
+      toolUseContext,
+      getBinaryFeedbackResponse,
+      {
+        ...hookState ?? {},
+        startupEmitted: true
+      }
+    );
   } catch (error) {
     sessionContext?.setErrored();
     throw error;
@@ -33550,7 +33656,7 @@ import { homedir as homedir8 } from "os";
 // src/commands/agents/generation.ts
 import { randomUUID as randomUUID6 } from "crypto";
 async function generateAgentWithClaude(prompt) {
-  const { queryModel } = await import("./llm-BPQNYHE3.js");
+  const { queryModel } = await import("./llm-NAYVED3B.js");
   const systemPrompt = `You are an expert at creating AI agent configurations. Based on the user's description, generate a specialized agent configuration.
 
 Return your response as a JSON object with exactly these fields: