pybao-cli 1.4.81 → 1.4.83

package/dist/{chunk-TVUG5GLX.js → chunk-GKBRHNMB.js}

@@ -1,20 +1,31 @@
 import { createRequire as __pybCreateRequire } from "node:module";
 const require = __pybCreateRequire(import.meta.url);
+import {
+  listPybAgentSessions
+} from "./chunk-EINLEUKA.js";
 import {
   formatValidationResult,
   validatePluginOrMarketplacePath
-} from "./chunk-7ANXEZRS.js";
+} from "./chunk-WGGELTRR.js";
 import {
-  loadPybAgentSessionMessages
-} from "./chunk-FDGIVQNE.js";
+  ConversationTracker,
+  appendFinishState,
+  findNaturalUserMessageForParent,
+  getConversationTrackerForContext,
+  isFinishComplete,
+  mapFinishReason
+} from "./chunk-RMZABYAD.js";
 import {
-  listPybAgentSessions
-} from "./chunk-VW3NZKCP.js";
+  beginReplSessionScope
+} from "./chunk-F4AXICO7.js";
+import {
+  loadPybAgentSessionMessages
+} from "./chunk-FQL6V43W.js";
 import {
   appendSessionCustomTitleRecord,
   appendSessionJsonlFromMessage,
   appendSessionTagRecord
-} from "./chunk-4NNDWUSZ.js";
+} from "./chunk-A5LLPMGS.js";
 import {
   drainHookSystemPromptAdditions,
   getHookTranscriptPath,
@@ -26,7 +37,7 @@ import {
   runStopHooks,
   runUserPromptSubmitHooks,
   updateHookTranscriptForMessages
-} from "./chunk-KH3U5BR5.js";
+} from "./chunk-5KEKIQVC.js";
 import {
   DEFAULT_OUTPUT_STYLE,
   getAvailableOutputStyles,
@@ -35,17 +46,19 @@ import {
   getOutputStyleSystemPromptAdditions,
   resolveOutputStyleName,
   setCurrentOutputStyle
-} from "./chunk-4VUECEM6.js";
+} from "./chunk-IDJMJZP4.js";
 import {
   fetchCustomModels,
-  getModelFeatures,
+  getModelFeatures
+} from "./chunk-53LVQG4V.js";
+import {
   getSessionState
-} from "./chunk-MKNRYFQR.js";
+} from "./chunk-XKYHFZEC.js";
 import {
   queryLLM,
   queryQuick,
   verifyApiKey
-} from "./chunk-BJMVIICS.js";
+} from "./chunk-OUOB2RBI.js";
 import {
   DEFAULT_TIMEOUT_MS,
   FallbackToolUseRejectedMessage,
@@ -59,7 +72,7 @@ import {
   listMCPServers,
   loadMergedSettings,
   normalizeSandboxRuntimeConfigFromSettings
-} from "./chunk-HIZXCXUG.js";
+} from "./chunk-7UTUKVKM.js";
 import {
   addMarketplace,
   disableSkillPlugin,
@@ -72,11 +85,11 @@ import {
   refreshMarketplaceAsync,
   removeMarketplace,
   uninstallSkillPlugin
-} from "./chunk-HNHWG52B.js";
+} from "./chunk-SUHM4MYA.js";
 import {
   loadToolPermissionContextFromDisk,
   persistToolPermissionUpdateToDisk
-} from "./chunk-BX6HNPWQ.js";
+} from "./chunk-FVR53MZY.js";
 import {
   applyToolPermissionContextUpdate,
   applyToolPermissionContextUpdates,
@@ -87,13 +100,13 @@ import {
   generateSystemReminders,
   resetReminderSession,
   systemReminderService
-} from "./chunk-2NFKKANF.js";
+} from "./chunk-5MZZCUQX.js";
 import {
   clearAgentCache,
   getActiveAgents,
   getAgentByType,
   getAllAgents
-} from "./chunk-CLGB56HY.js";
+} from "./chunk-DHJEENK5.js";
 import {
   API_ERROR_MESSAGE_PREFIX,
   CANCEL_MESSAGE,
@@ -124,7 +137,7 @@ import {
   processUserInput,
   reorderMessages,
   stripSystemMessages
-} from "./chunk-H44O47XJ.js";
+} from "./chunk-EUHKG6AJ.js";
 import {
   getRequestStatus,
   setRequestStatus,
@@ -154,7 +167,7 @@ import {
   normalizeFilePath,
   readTextContent,
   writeTextContent
-} from "./chunk-EYY3QDKX.js";
+} from "./chunk-FPCH7C5K.js";
 import {
   parseBlockEdits
 } from "./chunk-QWIBSCDN.js";
@@ -164,18 +177,18 @@ import {
   ParserRegistry,
   initParser,
   loadLanguage
-} from "./chunk-GS4PRJHV.js";
+} from "./chunk-XHQMUJIS.js";
 import {
   getSettingsFileCandidates,
   loadSettingsWithLegacyFallback,
   readSettingsFile
-} from "./chunk-JVF6KNE3.js";
+} from "./chunk-5MEGIDN7.js";
 import {
   getCustomCommandDirectories,
   hasCustomCommands,
   loadCustomCommands,
   reloadCustomCommands
-} from "./chunk-4SWM6FWR.js";
+} from "./chunk-IIZXV4HL.js";
 import {
   getSessionPlugins
 } from "./chunk-BJSWTHRM.js";
@@ -183,7 +196,7 @@ import {
   ModelManager,
   getModelManager,
   isDefaultSlowAndCapableModel
-} from "./chunk-Z73SPR4B.js";
+} from "./chunk-OCIKBYQ4.js";
 import {
   getCodeStyle,
   getContext,
@@ -191,13 +204,13 @@ import {
   getIsGit,
   getProjectDocs,
   getProjectStructureStatisticsBlock
-} from "./chunk-B3NR3UMC.js";
+} from "./chunk-MKSTJEGS.js";
 import {
   ripGrep
-} from "./chunk-37ZXN5M4.js";
+} from "./chunk-KSCBNFN7.js";
 import {
   getTheme
-} from "./chunk-GMKASRN7.js";
+} from "./chunk-TKPY5LGF.js";
 import {
   DEFAULT_GLOBAL_CONFIG,
   enableConfigs,
@@ -210,7 +223,7 @@ import {
   saveGlobalConfig,
   setAllPointersToModel,
   setModelPointer
-} from "./chunk-ZE75JZFY.js";
+} from "./chunk-WSP4AYLZ.js";
 import {
   AbortError
 } from "./chunk-RQVLBMP7.js";
@@ -219,7 +232,7 @@ import {
   getCurrentRequest,
   logUserFriendly,
   markPhase
-} from "./chunk-6XINCIUI.js";
+} from "./chunk-MBIKKOOW.js";
 import {
   ASCII_LOGO,
   BunShell,
@@ -258,10 +271,10 @@ import {
   setCwd,
   shouldApplyToolOutputTruncation,
   truncateToolOutput
-} from "./chunk-UUS77RPP.js";
+} from "./chunk-VRRJXBF3.js";
 import {
   MACRO
-} from "./chunk-CCF52HVZ.js";
+} from "./chunk-GRQ32HWG.js";
 import {
   __export
 } from "./chunk-I3J4JYES.js";
@@ -442,7 +455,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-A3S75CLF.js");
+    const { API_ERROR_MESSAGE_PREFIX: API_ERROR_MESSAGE_PREFIX2, queryQuick: queryQuick2 } = await import("./llm-VAN6WS52.js");
     const response = await queryQuick2({
       systemPrompt,
       userPrompt,
@@ -4244,7 +4257,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-A3S75CLF.js");
+  const { API_ERROR_MESSAGE_PREFIX: API_ERROR_MESSAGE_PREFIX2, queryLLM: queryLLM2 } = await import("./llm-VAN6WS52.js");
   const queryLLMFn = args.queryLLMOverride ?? queryLLM2;
   const messages = [
     {
@@ -6641,7 +6654,7 @@ var FileEditTool = {
     const originalFileContent = currentFileContent;
     let totalPatch = [];
     const { SmartEdit } = await import("./smart-edit-AWHJDSU6.js");
-    const { findLspAnchor } = await import("./lspAnchor-JJJ2WKI7.js");
+    const { findLspAnchor } = await import("./lspAnchor-BLB7II5Y.js");
     for (const op of editOperations) {
       const normalizedSearch = normalizeLineEndings(op.search);
       const normalizedReplace = normalizeLineEndings(op.replace);
@@ -11345,7 +11358,7 @@ async function createAndStoreApiKey(accessToken) {
       }
       saveGlobalConfig(config2);
       try {
-        const { resetAnthropicClient } = await import("./llm-A3S75CLF.js");
+        const { resetAnthropicClient } = await import("./llm-VAN6WS52.js");
         resetAnthropicClient();
       } catch {
       }
@@ -15712,7 +15725,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-KJ3YFO2O.js");
+  const { configureSessionPlugins } = await import("./pluginRuntime-JEJXUSFZ.js");
   const { errors } = await configureSessionPlugins({ pluginDirs: dirs });
   return errors;
 }
@@ -16381,7 +16394,7 @@ async function call(onDone, context) {
     ModelConfig,
     {
       onClose: () => {
-        import("./model-P33QONA2.js").then(({ reloadModelManager: reloadModelManager2 }) => {
+        import("./model-OUTGOGMR.js").then(({ reloadModelManager: reloadModelManager2 }) => {
           reloadModelManager2();
           triggerModelConfigChange();
           onDone();
@@ -24585,7 +24598,7 @@ function useStatusLine() {
 // src/ui/components/PromptInput.tsx
 async function interpretHashCommand(input) {
   try {
-    const { queryQuick: queryQuick2 } = await import("./llm-A3S75CLF.js");
+    const { queryQuick: queryQuick2 } = await import("./llm-VAN6WS52.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.",
@@ -24898,7 +24911,7 @@ function PromptInput({
     if (messages2.length) {
       if (mode === "bash") {
         onQuery(messages2, newAbortController).then(async () => {
-          const { getCwd: getCwd2 } = await import("./state-I7LIGIFJ.js");
+          const { getCwd: getCwd2 } = await import("./state-WVRITIDZ.js");
           setCurrentPwd(getCwd2());
         });
       } else {
@@ -25537,11 +25550,70 @@ if (process.env.NODE_ENV !== "test") {
   }, 0);
 }
 
+// src/utils/session/conversationTrackingBaseline.ts
+var TRUE_VALUES = /* @__PURE__ */ new Set(["1", "true", "yes", "on"]);
+var FALSE_VALUES = /* @__PURE__ */ new Set(["0", "false", "no", "off"]);
+function parseBooleanEnv(raw, fallback) {
+  const normalized = String(raw ?? "").trim().toLowerCase();
+  if (!normalized) return fallback;
+  if (TRUE_VALUES.has(normalized)) return true;
+  if (FALSE_VALUES.has(normalized)) return false;
+  return fallback;
+}
+var DEFAULT_CONFIG2 = {
+  enabled: true,
+  injectSummary: true,
+  markCompletion: true,
+  observabilityEnabled: true
+};
+function getConversationTrackingConfig(env2 = process.env) {
+  return {
+    enabled: parseBooleanEnv(
+      env2.PYB_CONVERSATION_TRACKING_ENABLED,
+      DEFAULT_CONFIG2.enabled
+    ),
+    injectSummary: parseBooleanEnv(
+      env2.PYB_CONVERSATION_SUMMARY_ENABLED,
+      DEFAULT_CONFIG2.injectSummary
+    ),
+    markCompletion: parseBooleanEnv(
+      env2.PYB_CONVERSATION_COMPLETION_ENABLED,
+      DEFAULT_CONFIG2.markCompletion
+    ),
+    observabilityEnabled: parseBooleanEnv(
+      env2.PYB_CONVERSATION_OBSERVABILITY_ENABLED,
+      DEFAULT_CONFIG2.observabilityEnabled
+    )
+  };
+}
+function createConversationTrackingBaselinePayload(input) {
+  return {
+    stage: input.stage,
+    agentId: input.agentId || "main",
+    messageCount: input.messageCount,
+    systemPromptCount: input.systemPromptCount,
+    requestId: input.requestId,
+    flags: {
+      enabled: input.config.enabled,
+      injectSummary: input.config.injectSummary,
+      markCompletion: input.config.markCompletion,
+      observabilityEnabled: input.config.observabilityEnabled
+    },
+    timestamp: Date.now()
+  };
+}
+function logConversationTrackingBaseline(input, deps) {
+  if (!input.config.observabilityEnabled) return;
+  const payload = createConversationTrackingBaselinePayload(input);
+  const stateLogger = deps?.stateLogger ?? debug.state;
+  stateLogger("CONVERSATION_TRACKING_BASELINE", payload, input.requestId);
+}
+
 // src/services/system/systemPrompt.ts
 function isGPT5Model(modelName) {
   return modelName.startsWith("gpt-5");
 }
-function formatSystemPromptWithContext(systemPrompt, context, agentId, skipContextReminders = false) {
+function formatSystemPromptWithContext(systemPrompt, context, agentId, skipContextReminders = false, options) {
   const enhancedPrompt = [...systemPrompt];
   let reminders = "";
   const modelManager = getModelManager();
@@ -25589,6 +25661,19 @@ As you answer the user's questions, you can use the following context:
       )
     );
   }
+  const trackingConfig = getConversationTrackingConfig();
+  if (trackingConfig.enabled && trackingConfig.injectSummary && (!agentId || agentId === "main") && options?.conversationTracker) {
+    const summary = options.conversationTracker.generateConversationSummary({
+      maxEntries: 10,
+      maxEntryChars: 80,
+      maxTotalChars: 2e3
+    });
+    if (summary) {
+      enhancedPrompt.push("\n---\n# \u5BF9\u8BDD\u72B6\u6001\u6458\u8981\n");
+      enhancedPrompt.push(summary);
+      enhancedPrompt.push("\n---\n");
+    }
+  }
   return { systemPrompt: enhancedPrompt, reminders };
 }
 
@@ -25886,6 +25971,12 @@ Important technical decisions made and their rationale. Alternative approaches c
 Focus on information essential for continuing the conversation effectively, including specific details about code, files, errors, and plans.`;
 var AUTO_COMPACT_NOTICE = "Context automatically compressed due to token limit.";
 var RECOVERED_FILE_MARKER = "**Recovered File:";
+var CONVERSATION_SUMMARY_LIMITS = {
+  maxEntries: 10,
+  maxEntryChars: 80,
+  maxTotalChars: 2e3
+};
+var MAX_COMPACTED_QUERY_IDS = 10;
 function getMessageText(message) {
   if (!message || typeof message !== "object") return null;
   if (message.type !== "user" && message.type !== "assistant") return null;
@@ -25935,12 +26026,45 @@ async function shouldAutoCompact(messages) {
   const { isAboveAutoCompactThreshold } = await calculateThresholds(tokenCount);
   return isAboveAutoCompactThreshold;
 }
+function getSummaryContentDiagnostics(content) {
+  if (typeof content === "string") {
+    return {
+      contentKind: "string",
+      stringLength: content.length,
+      preview: content.slice(0, 120)
+    };
+  }
+  if (Array.isArray(content)) {
+    return {
+      contentKind: "array",
+      blockCount: content.length,
+      blockTypes: content.map(
+        (block) => block && typeof block === "object" ? String(block.type ?? "unknown") : typeof block
+      ),
+      firstBlock: content[0]
+    };
+  }
+  return {
+    contentKind: typeof content,
+    value: content
+  };
+}
 async function checkAutoCompact(messages, toolUseContext) {
   if (!await shouldAutoCompact(messages)) {
     return { messages, wasCompacted: false };
   }
   try {
-    const compactedMessages = await executeAutoCompact(messages, toolUseContext);
+    const tracker = getConversationTrackerForContext(toolUseContext);
+    const completedQueryIds = tracker.getCompletedQueries().map((item) => item.queryId).slice(-MAX_COMPACTED_QUERY_IDS);
+    const preservedSummary = tracker.generateConversationSummary(
+      CONVERSATION_SUMMARY_LIMITS
+    );
+    const compactedMessages = await executeAutoCompact(messages, toolUseContext, {
+      preservedSummary,
+      compactedQueryIds: completedQueryIds
+    });
+    tracker.reset();
+    tracker.persist();
     return {
       messages: compactedMessages,
       wasCompacted: true
@@ -25953,7 +26077,7 @@ async function checkAutoCompact(messages, toolUseContext) {
     return { messages, wasCompacted: false };
   }
 }
-async function executeAutoCompact(messages, toolUseContext) {
+async function executeAutoCompact(messages, toolUseContext, options) {
   const previousSummary = findLatestAutoCompactSummary(messages);
   const summaryRequestContent = previousSummary ? `We already have an existing conversation summary:
 
@@ -26006,6 +26130,10 @@ ${COMPRESSION_PROMPT2}` : COMPRESSION_PROMPT2;
   const content = summaryResponse.message.content;
   const summary = typeof content === "string" ? content : content.length > 0 && content[0]?.type === "text" ? content[0].text : null;
   if (!summary) {
+    debug.warn("AUTO_COMPACT_SUMMARY_CONTENT_INVALID", {
+      model: compressionModelPointer,
+      diagnostics: getSummaryContentDiagnostics(content)
+    });
     throw new Error(
       "Failed to generate conversation summary - response did not contain valid text content"
     );
@@ -26023,6 +26151,23 @@ ${COMPRESSION_PROMPT2}` : COMPRESSION_PROMPT2;
     ),
     summaryResponse
   ];
+  compactedMessages[1].compaction = {
+    type: "compaction",
+    auto: true,
+    compactedQueryIds: (options?.compactedQueryIds ?? []).slice(
+      -MAX_COMPACTED_QUERY_IDS
+    ),
+    timestamp: Date.now()
+  };
+  if (options?.preservedSummary) {
+    compactedMessages.push(
+      createAssistantMessage(
+        `<conversation-summary>
+${options.preservedSummary}
+</conversation-summary>`
+      )
+    );
+  }
   if (recoveredFiles.length > 0) {
     for (const file of recoveredFiles) {
       const contentWithLines = addLineNumbers({
@@ -26352,13 +26497,28 @@ async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseCo
       );
     };
     const currentRequest = getCurrentRequest();
+    const conversationTrackingConfig = getConversationTrackingConfig();
     markPhase("QUERY_INIT");
+    logConversationTrackingBaseline({
+      stage: "query_init",
+      agentId: toolUseContext.agentId || "main",
+      messageCount: messages.length,
+      systemPromptCount: systemPrompt.length,
+      requestId: currentRequest?.id,
+      config: conversationTrackingConfig
+    });
     const stopHookActive = hookState?.stopHookActive === true;
     const stopHookAttempts = hookState?.stopHookAttempts ?? 0;
     const { messages: processedMessages, wasCompacted } = await checkAutoCompact(messages, toolUseContext);
     if (wasCompacted) {
       messages = processedMessages;
     }
+    const tracker = getConversationTrackerForContext(toolUseContext);
+    const activeNaturalUserMessage = findNaturalUserMessageForParent(messages);
+    const activeQueryId = activeNaturalUserMessage?.queryId || activeNaturalUserMessage?.uuid;
+    if (conversationTrackingConfig.enabled && activeNaturalUserMessage && activeQueryId) {
+      tracker.startQuery(activeQueryId, activeNaturalUserMessage);
+    }
     if (toolUseContext.agentId === "main") {
       const shell = BunShell.getInstance();
       const notifications = shell.flushBashNotifications();
@@ -26425,7 +26585,9 @@ async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseCo
     const { systemPrompt: fullSystemPrompt, reminders } = formatSystemPromptWithContext(
       systemPrompt,
       context,
-      toolUseContext.agentId
+      toolUseContext.agentId,
+      false,
+      { conversationTracker: tracker }
     );
     const planModeAdditions = getPlanModeSystemPromptAdditions(
       messages,
@@ -26444,6 +26606,14 @@ async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseCo
         fullSystemPrompt.push(...outputStyleAdditions);
       }
     }
+    logConversationTrackingBaseline({
+      stage: "system_prompt_built",
+      agentId: toolUseContext.agentId || "main",
+      messageCount: messages.length,
+      systemPromptCount: fullSystemPrompt.length,
+      requestId: currentRequest?.id,
+      config: conversationTrackingConfig
+    });
     emitReminderEvent("session:startup", {
       agentId: toolUseContext.agentId,
       messages: messages.length,
@@ -26487,10 +26657,12 @@ async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseCo
     }
     const assistantMessage = result.message;
     const shouldSkipPermissionCheck = result.shouldSkipPermissionCheck;
+    const parentUserMessage = findNaturalUserMessageForParent(messages);
     const toolUseMessages = assistantMessage.message.content.filter(isToolUseLikeBlock);
     if (!toolUseMessages.length) {
       const stopHookEvent = toolUseContext.agentId && toolUseContext.agentId !== "main" ? "SubagentStop" : "Stop";
       const stopReason = assistantMessage.message?.stop_reason || assistantMessage.message?.stopReason || "end_turn";
+      const finish = mapFinishReason(stopReason);
       const stopOutcome = await runStopHooks({
         hookEvent: stopHookEvent,
         reason: String(stopReason ?? ""),
@@ -26530,10 +26702,38 @@ async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseCo
           return;
         }
       }
-      yield assistantMessage;
+      if (!parentUserMessage?.uuid) {
+        yield assistantMessage;
+        return;
+      }
+      const enrichedAssistantMessage = appendFinishState(assistantMessage, {
+        finish,
+        parentID: parentUserMessage.uuid,
+        ...isFinishComplete(finish) ? { completedAt: Date.now() } : {}
+      });
+      const completedQueryId = parentUserMessage.queryId || parentUserMessage.uuid;
+      if (conversationTrackingConfig.enabled && conversationTrackingConfig.markCompletion && isFinishComplete(enrichedAssistantMessage.finish) && completedQueryId) {
+        const completed = tracker.completeQuery(
+          completedQueryId,
+          enrichedAssistantMessage,
+          parentUserMessage
+        );
+        if (completed) {
+          tracker.persist();
+        }
+      }
+      yield enrichedAssistantMessage;
       return;
     }
-    yield assistantMessage;
+    if (!parentUserMessage?.uuid) {
+      yield assistantMessage;
+    } else {
+      const enrichedAssistantMessage = appendFinishState(assistantMessage, {
+        finish: "tool_calls",
+        parentID: parentUserMessage.uuid
+      });
+      yield enrichedAssistantMessage;
+    }
     const siblingToolUseIDs = new Set(toolUseMessages.map((_) => _.id));
     const toolQueue = new ToolUseQueue({
       toolDefinitions: toolUseContext.options.tools,
@@ -27357,6 +27557,20 @@ function REPL({
     []
   );
   const readFileTimestamps = useRef13({});
+  const conversationTrackersRef = useRef13(
+    /* @__PURE__ */ new Map()
+  );
+  const getConversationTrackerForKey = useCallback16(
+    (conversationKey2) => {
+      const existing = conversationTrackersRef.current.get(conversationKey2);
+      if (existing) return existing;
+      const created = new ConversationTracker();
+      conversationTrackersRef.current.set(conversationKey2, created);
+      return created;
+    },
+    []
+  );
+  const conversationKey = `${messageLogName}:${forkNumber}`;
   const { status: apiKeyStatus, reverify } = useApiKeyVerification();
   function onCancel() {
     if (!isLoading) {
@@ -27411,56 +27625,124 @@ function REPL({
     if (!initialPrompt) {
       return;
     }
+    const restoreSessionScope = beginReplSessionScope(conversationKey);
     setIsLoading(true);
     const newAbortController = new AbortController();
     setAbortController(newAbortController);
-    const model = new ModelManager(getGlobalConfig()).getModelName("main");
-    const newMessages = await processUserInput(
-      initialPrompt,
-      "prompt",
-      setToolJSX,
-      {
-        abortController: newAbortController,
-        options: {
-          commands,
-          forkNumber,
-          messageLogName,
-          tools,
-          mcpClients,
-          verbose,
-          maxThinkingTokens: 0,
-          toolPermissionContext: getToolPermissionContextForConversationKey({
-            conversationKey: `${messageLogName}:${forkNumber}`,
-            isBypassPermissionsModeAvailable: !(safeMode ?? false)
-          })
+    try {
+      const model = new ModelManager(getGlobalConfig()).getModelName("main");
+      const newMessages = await processUserInput(
+        initialPrompt,
+        "prompt",
+        setToolJSX,
+        {
+          abortController: newAbortController,
+          options: {
+            commands,
+            forkNumber,
+            messageLogName,
+            tools,
+            mcpClients,
+            verbose,
+            maxThinkingTokens: 0,
+            toolPermissionContext: getToolPermissionContextForConversationKey({
+              conversationKey,
+              isBypassPermissionsModeAvailable: !(safeMode ?? false)
+            })
+          },
+          messageId: getLastAssistantMessageId(messages),
+          setForkConvoWithMessagesOnTheNextRender,
+          readFileTimestamps: readFileTimestamps.current
         },
-        messageId: getLastAssistantMessageId(messages),
-        setForkConvoWithMessagesOnTheNextRender,
-        readFileTimestamps: readFileTimestamps.current
-      },
-      null
-    );
-    if (newMessages.length) {
-      for (const message of newMessages) {
-        if (message.type === "user") {
-          addToHistory(initialPrompt);
+        null
+      );
+      if (newMessages.length) {
+        for (const message of newMessages) {
+          if (message.type === "user") {
+            addToHistory(initialPrompt);
+          }
+        }
+        setMessages2((_) => [..._, ...newMessages]);
+        const lastMessage = newMessages[newMessages.length - 1];
+        if (lastMessage.type === "assistant") {
+          return;
         }
+        const [systemPrompt, context, model2, maxThinkingTokens] = await Promise.all([
+          getSystemPrompt({ disableSlashCommands }),
+          getContext(),
+          new ModelManager(getGlobalConfig()).getModelName("main"),
+          getMaxThinkingTokens([...messages, ...newMessages])
+        ]);
+        for await (const message of query(
+          [...messages, ...newMessages],
+          systemPrompt,
+          context,
+          canUseTool,
+          {
+            options: {
+              commands,
+              forkNumber,
+              messageLogName,
+              tools,
+              mcpClients,
+              verbose,
+              safeMode,
+              maxThinkingTokens,
+              toolPermissionContext: getToolPermissionContextForConversationKey({
+                conversationKey,
+                isBypassPermissionsModeAvailable: !(safeMode ?? false)
+              })
+            },
+            messageId: getLastAssistantMessageId([...messages, ...newMessages]),
+            readFileTimestamps: readFileTimestamps.current,
+            abortController: newAbortController,
+            setToolJSX,
+            conversationTracker: getConversationTrackerForKey(conversationKey)
+          },
+          getBinaryFeedbackResponse
+        )) {
+          setMessages2((oldMessages) => [...oldMessages, message]);
+        }
+      } else {
+        addToHistory(initialPrompt);
       }
-      setMessages2((_) => [..._, ...newMessages]);
+      setHaveShownCostDialog(
+        getGlobalConfig().hasAcknowledgedCostThreshold || false
+      );
+    } finally {
+      setIsLoading(false);
+      setAbortController(null);
+      restoreSessionScope();
+    }
+  }
+  async function onQuery(newMessages, passedAbortController) {
+    const restoreSessionScope = beginReplSessionScope(conversationKey);
+    const controllerToUse = passedAbortController || new AbortController();
+    if (!passedAbortController) {
+      setAbortController(controllerToUse);
+    }
+    try {
+      const isPybRequest = newMessages.length > 0 && newMessages[0].type === "user" && "options" in newMessages[0] && newMessages[0].options?.isPybRequest === true;
+      setMessages2((oldMessages) => [...oldMessages, ...newMessages]);
+      markProjectOnboardingComplete();
       const lastMessage = newMessages[newMessages.length - 1];
+      if (lastMessage.type === "user" && typeof lastMessage.message.content === "string") {
+      }
       if (lastMessage.type === "assistant") {
-        setAbortController(null);
-        setIsLoading(false);
+        if (!passedAbortController) {
+          setAbortController(null);
+        }
         return;
       }
-      const [systemPrompt, context, model2, maxThinkingTokens] = await Promise.all([
+      const [systemPrompt, context, model, maxThinkingTokens] = await Promise.all([
         getSystemPrompt({ disableSlashCommands }),
         getContext(),
         new ModelManager(getGlobalConfig()).getModelName("main"),
-        getMaxThinkingTokens([...messages, ...newMessages])
+        getMaxThinkingTokens([...messages, lastMessage])
       ]);
+      let lastAssistantMessage = null;
       for await (const message of query(
-        [...messages, ...newMessages],
+        [...messages, lastMessage],
         systemPrompt,
         context,
         canUseTool,
@@ -27474,99 +27756,40 @@ function REPL({
             verbose,
             safeMode,
             maxThinkingTokens,
+            isPybRequest: isPybRequest || void 0,
             toolPermissionContext: getToolPermissionContextForConversationKey({
-              conversationKey: `${messageLogName}:${forkNumber}`,
+              conversationKey,
               isBypassPermissionsModeAvailable: !(safeMode ?? false)
             })
           },
-          messageId: getLastAssistantMessageId([...messages, ...newMessages]),
+          messageId: getLastAssistantMessageId([...messages, lastMessage]),
           readFileTimestamps: readFileTimestamps.current,
-          abortController: newAbortController,
-          setToolJSX
+          abortController: controllerToUse,
+          setToolJSX,
+          conversationTracker: getConversationTrackerForKey(conversationKey)
         },
         getBinaryFeedbackResponse
       )) {
         setMessages2((oldMessages) => [...oldMessages, message]);
+        if (message.type === "assistant") {
+          lastAssistantMessage = message;
+        }
       }
-    } else {
-      addToHistory(initialPrompt);
-    }
-    setHaveShownCostDialog(
-      getGlobalConfig().hasAcknowledgedCostThreshold || false
-    );
-    setIsLoading(false);
-    setAbortController(null);
-  }
-  async function onQuery(newMessages, passedAbortController) {
-    const controllerToUse = passedAbortController || new AbortController();
-    if (!passedAbortController) {
-      setAbortController(controllerToUse);
-    }
-    const isPybRequest = newMessages.length > 0 && newMessages[0].type === "user" && "options" in newMessages[0] && newMessages[0].options?.isPybRequest === true;
-    setMessages2((oldMessages) => [...oldMessages, ...newMessages]);
-    markProjectOnboardingComplete();
-    const lastMessage = newMessages[newMessages.length - 1];
-    if (lastMessage.type === "user" && typeof lastMessage.message.content === "string") {
-    }
-    if (lastMessage.type === "assistant") {
-      setAbortController(null);
-      setIsLoading(false);
-      return;
-    }
-    const [systemPrompt, context, model, maxThinkingTokens] = await Promise.all(
-      [
-        getSystemPrompt({ disableSlashCommands }),
-        getContext(),
-        new ModelManager(getGlobalConfig()).getModelName("main"),
-        getMaxThinkingTokens([...messages, lastMessage])
-      ]
-    );
-    let lastAssistantMessage = null;
-    for await (const message of query(
-      [...messages, lastMessage],
-      systemPrompt,
-      context,
-      canUseTool,
-      {
-        options: {
-          commands,
-          forkNumber,
-          messageLogName,
-          tools,
-          mcpClients,
-          verbose,
-          safeMode,
-          maxThinkingTokens,
-          isPybRequest: isPybRequest || void 0,
-          toolPermissionContext: getToolPermissionContextForConversationKey({
-            conversationKey: `${messageLogName}:${forkNumber}`,
-            isBypassPermissionsModeAvailable: !(safeMode ?? false)
-          })
-        },
-        messageId: getLastAssistantMessageId([...messages, lastMessage]),
-        readFileTimestamps: readFileTimestamps.current,
-        abortController: controllerToUse,
-        setToolJSX
-      },
-      getBinaryFeedbackResponse
-    )) {
-      setMessages2((oldMessages) => [...oldMessages, message]);
-      if (message.type === "assistant") {
-        lastAssistantMessage = message;
-      }
-    }
-    if (isPybRequest && lastAssistantMessage && lastAssistantMessage.type === "assistant") {
-      try {
-        const content = typeof lastAssistantMessage.message.content === "string" ? lastAssistantMessage.message.content : lastAssistantMessage.message.content.filter((block) => block.type === "text").map((block) => block.type === "text" ? block.text : "").join("\n");
-        if (content && content.trim().length > 0) {
-          handleHashCommand(content);
+      if (isPybRequest && lastAssistantMessage && lastAssistantMessage.type === "assistant") {
+        try {
+          const content = typeof lastAssistantMessage.message.content === "string" ? lastAssistantMessage.message.content : lastAssistantMessage.message.content.filter((block) => block.type === "text").map((block) => block.type === "text" ? block.text : "").join("\n");
+          if (content && content.trim().length > 0) {
+            handleHashCommand(content);
+          }
+        } catch (error) {
+          logError(error);
+          debug.error("REPL_PYB_SAVE_PROJECT_DOCS_ERROR", { error });
         }
-      } catch (error) {
-        logError(error);
-        debug.error("REPL_PYB_SAVE_PROJECT_DOCS_ERROR", { error });
       }
+    } finally {
+      setIsLoading(false);
+      restoreSessionScope();
     }
-    setIsLoading(false);
   }
   useCostSummary();
   useEffect25(() => {
@@ -27745,7 +27968,6 @@ function REPL({
     [messagesJSX, replStaticPrefixLength]
   );
   const showingCostDialog = !isLoading && showCostDialog;
-  const conversationKey = `${messageLogName}:${forkNumber}`;
   return /* @__PURE__ */ React97.createElement(
     PermissionProvider,
     {
@@ -28077,7 +28299,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-A3S75CLF.js");
+  const { queryModel } = await import("./llm-VAN6WS52.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:
@@ -31800,7 +32022,7 @@ NEVER commit changes unless the user explicitly asks you to. It is VERY IMPORTAN
 ` : ""}
 
 # Tool usage policy
-- **Code Analysis & Exploration Priority**: When analyzing OR exploring code blocks, codebases (especially complex multi-repo projects) to understand functionality, mechanisms, logic, OR to locate features, modules, patterns, architecture, prefer to use the Task tool with Explore subagent for thorough multi-step analysis. This reduces context consumption by delegating exploration to specialized agents. For broad analysis scope, launch multiple Explore agents in parallel with different focus areas to maximize efficiency.
+- **Code Analysis & Exploration Priority**:For **complex** codebase exploration tasks (e.g., searching across 3+ directories, requiring multiple search iterations, or investigating cross-module patterns), prefer using the Task tool with Explore subagent. This isolates exploration context in a separate transcript.For simple tasks (reading known files, single-pattern searches), use Ls/Read/Glob/Grep directly for faster results.
 - **File Search Priority**:When doing file search, prefer to use the Task tool for open-ended, multi-step exploration to reduce context usage. For known paths or small scopes, prefer Ls/Lsp/Read/Glob/Grep directly.
 - **File System Exploration Priority**:For file system exploration, decide based on intent: if you need global structure/entry points, prefer LS first; if you have keywords or fuzzy paths, prefer Glob first. If results are too broad, use LS to narrow structure or combine with Grep/LSP. Only use Bash for executing scripts or binaries.
 - You can call multiple tools in a single response. If you intend to call multiple tools and there are no dependencies between them, make all independent tool calls in parallel. Maximize use of parallel tool calls where possible to increase efficiency. However, if some tool calls depend on previous calls to inform dependent values, do NOT call these tools in parallel and instead call them sequentially. For instance, if one operation must complete before another starts, run these operations sequentially instead. Never use placeholders or guess missing parameters in tool calls.