pybao-cli 1.4.97 → 1.4.99

package/dist/{chunk-JKP2RIBC.js → chunk-KZ7I6E5P.js}

@@ -2,11 +2,11 @@ import { createRequire as __pybCreateRequire } from "node:module";
 const require = __pybCreateRequire(import.meta.url);
 import {
   listPybAgentSessions
-} from "./chunk-PZTJUV4A.js";
+} from "./chunk-NXLRKKFH.js";
 import {
   formatValidationResult,
   validatePluginOrMarketplacePath
-} from "./chunk-DODMRDRY.js";
+} from "./chunk-2CLRREZ5.js";
 import {
   ConversationTracker,
   appendFinishState,
@@ -14,18 +14,18 @@ import {
   getConversationTrackerForContext,
   isFinishComplete,
   mapFinishReason
-} from "./chunk-JFQY2HV5.js";
+} from "./chunk-MMZ2MWHJ.js";
 import {
   beginReplSessionScope
 } from "./chunk-F4AXICO7.js";
 import {
   loadPybAgentSessionMessages
-} from "./chunk-VXUWHEDL.js";
+} from "./chunk-GIH6DDF7.js";
 import {
   appendSessionCustomTitleRecord,
   appendSessionJsonlFromMessage,
   appendSessionTagRecord
-} from "./chunk-A53N6YJI.js";
+} from "./chunk-KK5DOHDD.js";
 import {
   drainHookSystemPromptAdditions,
   getHookTranscriptPath,
@@ -37,7 +37,7 @@ import {
   runStopHooks,
   runUserPromptSubmitHooks,
   updateHookTranscriptForMessages
-} from "./chunk-HV4NI23F.js";
+} from "./chunk-6KPO3O64.js";
 import {
   DEFAULT_OUTPUT_STYLE,
   getAvailableOutputStyles,
@@ -46,11 +46,11 @@ import {
   getOutputStyleSystemPromptAdditions,
   resolveOutputStyleName,
   setCurrentOutputStyle
-} from "./chunk-EVDTKHQS.js";
+} from "./chunk-4MZJNA2D.js";
 import {
   fetchCustomModels,
   getModelFeatures
-} from "./chunk-6AJ2CWOM.js";
+} from "./chunk-7SPP4L5F.js";
 import {
   getSessionState
 } from "./chunk-XKYHFZEC.js";
@@ -58,7 +58,7 @@ import {
   queryLLM,
   queryQuick,
   verifyApiKey
-} from "./chunk-6LUGSV66.js";
+} from "./chunk-ZXADEAK4.js";
 import {
   DEFAULT_TIMEOUT_MS,
   FallbackToolUseRejectedMessage,
@@ -72,7 +72,7 @@ import {
   listMCPServers,
   loadMergedSettings,
   normalizeSandboxRuntimeConfigFromSettings
-} from "./chunk-JHCUUDEB.js";
+} from "./chunk-YH7ZOG3I.js";
 import {
   addMarketplace,
   disableSkillPlugin,
@@ -85,11 +85,11 @@ import {
   refreshMarketplaceAsync,
   removeMarketplace,
   uninstallSkillPlugin
-} from "./chunk-53JGT3P4.js";
+} from "./chunk-JEGVTLOH.js";
 import {
   loadToolPermissionContextFromDisk,
   persistToolPermissionUpdateToDisk
-} from "./chunk-TCW74O5N.js";
+} from "./chunk-7KDTFITN.js";
 import {
   applyToolPermissionContextUpdate,
   applyToolPermissionContextUpdates,
@@ -100,13 +100,13 @@ import {
   generateSystemReminders,
   resetReminderSession,
   systemReminderService
-} from "./chunk-O7CYKDDE.js";
+} from "./chunk-TG2B47KG.js";
 import {
   clearAgentCache,
   getActiveAgents,
   getAgentByType,
   getAllAgents
-} from "./chunk-TDEIIGZD.js";
+} from "./chunk-PDQTREWL.js";
 import {
   API_ERROR_MESSAGE_PREFIX,
   CANCEL_MESSAGE,
@@ -137,7 +137,7 @@ import {
   processUserInput,
   reorderMessages,
   stripSystemMessages
-} from "./chunk-EDTKZHPB.js";
+} from "./chunk-7QIWZIVM.js";
 import {
   getRequestStatus,
   setRequestStatus,
@@ -167,7 +167,7 @@ import {
   normalizeFilePath,
   readTextContent,
   writeTextContent
-} from "./chunk-6TMRUFNH.js";
+} from "./chunk-A2IPV5PR.js";
 import {
   parseBlockEdits
 } from "./chunk-QWIBSCDN.js";
@@ -177,26 +177,27 @@ import {
   ParserRegistry,
   initParser,
   loadLanguage
-} from "./chunk-I6JG3ZBH.js";
+} from "./chunk-ZXO6OMWV.js";
 import {
   getSettingsFileCandidates,
   loadSettingsWithLegacyFallback,
   readSettingsFile
-} from "./chunk-ZETRMTIG.js";
+} from "./chunk-7SDAA35I.js";
 import {
   getCustomCommandDirectories,
   hasCustomCommands,
   loadCustomCommands,
   reloadCustomCommands
-} from "./chunk-A6QAWMSQ.js";
+} from "./chunk-GNDMDOGM.js";
 import {
   getSessionPlugins
 } from "./chunk-BJSWTHRM.js";
 import {
   ModelManager,
+  buildModelProfileKey,
   getModelManager,
   isDefaultSlowAndCapableModel
-} from "./chunk-AL6K5BMH.js";
+} from "./chunk-5TCQKGL7.js";
 import {
   getCodeStyle,
   getContext,
@@ -204,16 +205,16 @@ import {
   getIsGit,
   getProjectDocs,
   getProjectStructureStatisticsBlock
-} from "./chunk-WSATR4WL.js";
+} from "./chunk-2IO7WUI7.js";
 import {
   getRipgrepPath,
   getRipgrepPolicyMode,
   resolveRipgrepPolicy,
   ripGrep
-} from "./chunk-RBT4E5DV.js";
+} from "./chunk-TYOT7UVX.js";
 import {
   getTheme
-} from "./chunk-QMUFX7IJ.js";
+} from "./chunk-6E6QBP52.js";
 import {
   DEFAULT_GLOBAL_CONFIG,
   enableConfigs,
@@ -226,7 +227,7 @@ import {
   saveGlobalConfig,
   setAllPointersToModel,
   setModelPointer
-} from "./chunk-VPVZHCOG.js";
+} from "./chunk-WAQ72XDO.js";
 import {
   AbortError
 } from "./chunk-RQVLBMP7.js";
@@ -235,7 +236,7 @@ import {
   getCurrentRequest,
   logUserFriendly,
   markPhase
-} from "./chunk-LR2N7KMQ.js";
+} from "./chunk-DKQIGPXB.js";
 import {
   ASCII_LOGO,
   BunShell,
@@ -276,10 +277,10 @@ import {
   setCwd,
   shouldApplyToolOutputTruncation,
   truncateToolOutput
-} from "./chunk-Y2CH5HCU.js";
+} from "./chunk-VKXOAPOS.js";
 import {
   MACRO
-} from "./chunk-YIXTSVYD.js";
+} from "./chunk-3BPXWAOJ.js";
 import {
   __export
 } from "./chunk-I3J4JYES.js";
@@ -460,7 +461,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-HPGYRNBC.js");
+    const { API_ERROR_MESSAGE_PREFIX: API_ERROR_MESSAGE_PREFIX2, queryQuick: queryQuick2 } = await import("./llm-RCPJRG2F.js");
     const response = await queryQuick2({
       systemPrompt,
       userPrompt,
@@ -4262,7 +4263,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-HPGYRNBC.js");
+  const { API_ERROR_MESSAGE_PREFIX: API_ERROR_MESSAGE_PREFIX2, queryLLM: queryLLM2 } = await import("./llm-RCPJRG2F.js");
   const queryLLMFn = args.queryLLMOverride ?? queryLLM2;
   const messages = [
     {
@@ -5945,13 +5946,6 @@ var FileFreshnessService = class {
       const conflict = !isFresh;
       if (conflict) {
         this.state.editConflicts.add(filePath);
-        emitReminderEvent("file:conflict", {
-          filePath,
-          lastRead: recorded.lastRead,
-          lastModified: recorded.lastModified,
-          currentModified: currentStats.mtimeMs,
-          sizeDiff: currentStats.size - recorded.size
-        });
       }
       return {
         isFresh,
@@ -6005,34 +5999,6 @@ var FileFreshnessService = class {
       });
     }
   }
-  generateFileModificationReminder(filePath) {
-    const recorded = this.state.readTimestamps.get(filePath);
-    if (!recorded) {
-      return null;
-    }
-    try {
-      if (!existsSync3(filePath)) {
-        return `Note: ${filePath} was deleted since last read.`;
-      }
-      const currentStats = statSync2(filePath);
-      const isModified = currentStats.mtimeMs > recorded.lastModified;
-      if (!isModified) {
-        return null;
-      }
-      const TIME_TOLERANCE_MS = 100;
-      if (recorded.lastAgentEdit && recorded.lastAgentEdit >= recorded.lastModified - TIME_TOLERANCE_MS) {
-        return null;
-      }
-      return `Note: ${filePath} was modified externally since last read. The file may have changed outside of this session.`;
-    } catch (error) {
-      logError(error);
-      debug.warn("FILE_FRESHNESS_CHECK_MODIFICATION_FAILED", {
-        filePath,
-        error: error instanceof Error ? error.message : String(error)
-      });
-      return null;
-    }
-  }
   getConflictedFiles() {
     return Array.from(this.state.editConflicts);
   }
@@ -6066,7 +6032,6 @@ var FileFreshnessService = class {
 var fileFreshnessService = new FileFreshnessService();
 var recordFileRead = (filePath) => fileFreshnessService.recordFileRead(filePath);
 var recordFileEdit = (filePath, content) => fileFreshnessService.recordFileEdit(filePath, content);
-var generateFileModificationReminder = (filePath) => fileFreshnessService.generateFileModificationReminder(filePath);
 var resetFileFreshnessSession = () => fileFreshnessService.resetSession();
 
 // src/tools/filesystem/NotebookEditTool/NotebookEditTool.tsx
@@ -6659,7 +6624,7 @@ var FileEditTool = {
     const originalFileContent = currentFileContent;
     let totalPatch = [];
     const { SmartEdit } = await import("./smart-edit-AWHJDSU6.js");
-    const { findLspAnchor } = await import("./lspAnchor-YNYJ7E7M.js");
+    const { findLspAnchor } = await import("./lspAnchor-C676SQ6E.js");
     for (const op of editOperations) {
       const normalizedSearch = normalizeLineEndings(op.search);
       const normalizedReplace = normalizeLineEndings(op.replace);
@@ -7690,14 +7655,6 @@ var FileReadTool = {
       timestamp: Date.now()
     });
     readFileTimestamps[fullFilePath] = statSync7(fullFilePath).mtimeMs;
-    const modificationReminder = generateFileModificationReminder(fullFilePath);
-    if (modificationReminder) {
-      emitReminderEvent("file:modified", {
-        filePath: fullFilePath,
-        reminder: modificationReminder,
-        timestamp: Date.now()
-      });
-    }
     if (IMAGE_EXTENSIONS.has(ext)) {
       const data2 = await readImage(fullFilePath, ext);
       yield {
@@ -11941,7 +11898,7 @@ async function createAndStoreApiKey(accessToken) {
       }
       saveGlobalConfig(config2);
       try {
-        const { resetAnthropicClient } = await import("./llm-HPGYRNBC.js");
+        const { resetAnthropicClient } = await import("./llm-RCPJRG2F.js");
         resetAnthropicClient();
       } catch {
       }
@@ -15138,11 +15095,12 @@ Please check your API key and try again, or press Tab to manually enter model na
     if (!modelId) {
       return;
     }
-    setModelPointer("main", modelId);
+    const profileKey = buildModelProfileKey(selectedProvider, modelId);
+    setModelPointer("main", profileKey);
     if (isOnboarding) {
-      setAllPointersToModel(modelId);
+      setAllPointersToModel(profileKey);
     } else if (targetPointer && targetPointer !== "main") {
-      setModelPointer(targetPointer, modelId);
+      setModelPointer(targetPointer, profileKey);
     }
     onDone();
   }
@@ -16364,7 +16322,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-TFQEES5T.js");
+  const { configureSessionPlugins } = await import("./pluginRuntime-NQ6GKMG6.js");
   const { errors } = await configureSessionPlugins({ pluginDirs: dirs });
   return errors;
 }
@@ -16700,10 +16658,10 @@ function ModelListManager({ onClose }) {
   const availableModels = modelManager.getAvailableModels();
   const menuItems = React40.useMemo(() => {
     const modelItems = availableModels.map((model) => ({
-      id: model.modelName,
+      id: buildModelProfileKey(model.provider, model.modelName),
       name: model.name,
       provider: model.provider,
-      usedBy: getModelUsage(model.modelName),
+      usedBy: getModelUsage(model.provider, model.modelName),
       type: "model"
     }));
     return [
@@ -16717,18 +16675,19 @@ function ModelListManager({ onClose }) {
       ...modelItems
     ];
   }, [availableModels, config2.modelPointers, refreshKey]);
-  function getModelUsage(modelName) {
+  function getModelUsage(provider, modelName) {
     const usage = [];
     const pointers = ["main", "task", "compact", "quick"];
+    const profileKey = buildModelProfileKey(provider, modelName);
     pointers.forEach((pointer) => {
-      if (config2.modelPointers?.[pointer] === modelName) {
+      if (config2.modelPointers?.[pointer] === profileKey || config2.modelPointers?.[pointer] === modelName) {
         usage.push(pointer);
       }
     });
     return usage;
   }
-  const handleDeleteModel = (modelName) => {
-    modelManager.removeModel(modelName);
+  const handleDeleteModel = (modelRef) => {
+    modelManager.removeModel(modelRef);
     setRefreshKey((prev) => prev + 1);
     setIsDeleteMode(false);
   };
@@ -16760,7 +16719,9 @@ function ModelListManager({ onClose }) {
             setIsDeleteMode(false);
             return;
           }
-          if (config2.modelPointers?.main === item.id) {
+          const mainPointer = config2.modelPointers?.main;
+          const deletingMain = mainPointer === item.id || mainPointer && item.id.includes(":") && mainPointer === item.id.split(":").slice(1).join(":");
+          if (deletingMain) {
             setIsDeleteMode(false);
             return;
           }
@@ -16840,7 +16801,10 @@ function ModelConfig({ onClose }) {
   }, [selectedIndex]);
   const availableModels = React41.useMemo(() => {
     const profiles = modelManager.getAvailableModels();
-    return profiles.map((p) => ({ id: p.modelName, name: p.name }));
+    return profiles.map((p) => ({
+      id: buildModelProfileKey(p.provider, p.modelName),
+      name: p.name
+    }));
   }, [modelManager, refreshKey]);
   const menuItems = React41.useMemo(() => {
     const modelSettings = [
@@ -16937,7 +16901,7 @@ function ModelConfig({ onClose }) {
             return;
           }
           const currentIndex = setting.options.findIndex(
-            (opt) => opt.id === setting.value
+            (opt) => opt.id === setting.value || opt.id.endsWith(`:${setting.value}`)
           );
           const nextIndex = (currentIndex + 1) % setting.options.length;
           const nextOption = setting.options[nextIndex];
@@ -17033,7 +16997,7 @@ async function call(onDone, context) {
     ModelConfig,
     {
       onClose: () => {
-        import("./model-YUVFO4IF.js").then(({ reloadModelManager: reloadModelManager2 }) => {
+        import("./model-AJTLB6V4.js").then(({ reloadModelManager: reloadModelManager2 }) => {
           reloadModelManager2();
           triggerModelConfigChange();
           onDone();
@@ -25237,7 +25201,7 @@ function useStatusLine() {
 // src/ui/components/PromptInput.tsx
 async function interpretHashCommand(input) {
   try {
-    const { queryQuick: queryQuick2 } = await import("./llm-HPGYRNBC.js");
+    const { queryQuick: queryQuick2 } = await import("./llm-RCPJRG2F.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.",
@@ -25550,7 +25514,7 @@ function PromptInput({
     if (messages2.length) {
       if (mode === "bash") {
         onQuery(messages2, newAbortController).then(async () => {
-          const { getCwd: getCwd2 } = await import("./state-B5WH4G7E.js");
+          const { getCwd: getCwd2 } = await import("./state-6FI3TEMZ.js");
           setCurrentPwd(getCwd2());
         });
       } else {
@@ -26422,7 +26386,26 @@ function isGPT5Model(modelName) {
 }
 function formatSystemPromptWithContext(systemPrompt, context, agentId, skipContextReminders = false, options) {
   const enhancedPrompt = [...systemPrompt];
-  let reminders = "";
+  let userReminders = "";
+  let systemReminders = "";
+  let userReminderMessages = [];
+  let systemReminderMessages = [];
+  const mentionTypes = /* @__PURE__ */ new Set(["agent_mention", "file_mention", "ask_model_mention"]);
+  const splitReminderChannels = (items) => {
+    const user = [];
+    const system = [];
+    for (const item of items) {
+      if (!item?.type) {
+        throw new Error("REMINDER_CHANNEL_CLASSIFICATION_FAILED");
+      }
+      if (mentionTypes.has(item.type)) {
+        user.push(item);
+      } else {
+        system.push(item);
+      }
+    }
+    return { user, system };
+  };
   const modelManager = getModelManager();
   const modelProfile = modelManager.getModel("main");
   if (modelProfile && isGPT5Model(modelProfile.modelName)) {
@@ -26450,7 +26433,15 @@ function formatSystemPromptWithContext(systemPrompt, context, agentId, skipConte
     }
     const reminderMessages = generateSystemReminders(hasContext, agentId);
     if (reminderMessages.length > 0) {
-      reminders = reminderMessages.map((r) => r.content).join("\n") + "\n";
+      const channels = splitReminderChannels(reminderMessages);
+      userReminderMessages = channels.user;
+      systemReminderMessages = channels.system;
+      if (channels.user.length > 0) {
+        userReminders = channels.user.map((r) => r.content).join("\n") + "\n";
+      }
+      if (channels.system.length > 0) {
+        systemReminders = channels.system.map((r) => r.content).join("\n") + "\n";
+      }
     }
     enhancedPrompt.push(
       `
@@ -26495,7 +26486,81 @@ As you answer the user's questions, you can use the following context:
       enhancedPrompt.push("\n---\n");
     }
   }
-  return { systemPrompt: enhancedPrompt, reminders };
+  return {
+    systemPrompt: enhancedPrompt,
+    userReminders,
+    systemReminders,
+    userReminderMessages,
+    systemReminderMessages
+  };
+}
+
+// src/services/system/reminderChannelMetrics.ts
+function isMentionReminder(reminder) {
+  return reminder.type === "agent_mention" || reminder.type === "file_mention" || reminder.type === "ask_model_mention";
+}
+function extractReminderTypes(reminderMessages) {
+  const types = /* @__PURE__ */ new Set();
+  for (const reminder of reminderMessages) {
+    if (isMentionReminder(reminder)) {
+      types.add("mention");
+      continue;
+    }
+    types.add(reminder.type);
+  }
+  return Array.from(types);
+}
+function buildReminderChannelMetrics(userReminderMessages, systemReminderMessages) {
+  const mentionInUser = userReminderMessages.filter(isMentionReminder).length;
+  const mentionInSystem = systemReminderMessages.filter(isMentionReminder).length;
+  const mentionTotal = mentionInUser + mentionInSystem;
+  const nonMentionInUser = userReminderMessages.length - mentionInUser;
+  return {
+    mention_in_user_ratio: mentionTotal === 0 ? 1 : mentionInUser / mentionTotal,
+    non_mention_in_user_count: nonMentionInUser,
+    user_channel_reminder_count: userReminderMessages.length,
+    system_channel_reminder_count: systemReminderMessages.length
+  };
+}
+function evaluateReminderChannelClosure(rounds, requiredRounds = 3) {
+  const recentRounds = rounds.slice(-requiredRounds);
+  const failedRoundIndexes = [];
+  recentRounds.forEach((round, index) => {
+    if (round.non_mention_in_user_count !== 0 || Math.abs(round.mention_in_user_ratio - 1) > 1e-9) {
+      failedRoundIndexes.push(index);
+    }
+  });
+  return {
+    passed: recentRounds.length === requiredRounds && failedRoundIndexes.length === 0,
+    roundCount: recentRounds.length,
+    failedRoundIndexes
+  };
+}
+
+// src/services/system/reminderFlags.ts
+function toBool2(value) {
+  if (value == null) return void 0;
+  const normalized = String(value).trim().toLowerCase();
+  if (["1", "true", "yes", "on"].includes(normalized)) return true;
+  if (["0", "false", "no", "off"].includes(normalized)) return false;
+  return void 0;
+}
+function resolveReminderChannelFlags(env2 = process.env) {
+  const reminderEnabled = toBool2(env2.PYB_REMINDER_ENABLED) ?? true;
+  if (!reminderEnabled) {
+    return {
+      reminderEnabled: false,
+      userChannelEnabled: false,
+      systemChannelEnabled: false
+    };
+  }
+  const userChannelEnabled = toBool2(env2.PYB_REMINDER_USER_CHANNEL_ENABLED) ?? true;
+  const systemChannelEnabled = toBool2(env2.PYB_REMINDER_SYSTEM_CHANNEL_ENABLED) ?? true;
+  return {
+    reminderEnabled,
+    userChannelEnabled,
+    systemChannelEnabled
+  };
 }
 
 // src/services/system/taskWatcher.ts
@@ -28080,6 +28145,7 @@ 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 = [];
 function createSyntheticToolUseErrorMessage(args) {
   const { toolUseId, reason, rootToolUseId } = args;
   if (reason === "user_interrupted") {
@@ -28465,13 +28531,29 @@ async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseCo
     }
     markPhase("SYSTEM_PROMPT_BUILD");
     hydratePlanSlugFromMessages(messages, toolUseContext);
-    const { systemPrompt: fullSystemPrompt, reminders } = formatSystemPromptWithContext(
+    const {
+      systemPrompt: fullSystemPrompt,
+      userReminders,
+      systemReminders,
+      userReminderMessages,
+      systemReminderMessages
+    } = formatSystemPromptWithContext(
       systemPrompt,
       context,
       toolUseContext.agentId,
       false,
       { conversationTracker: tracker, agentType: toolUseContext.agentType }
     );
+    const flags = resolveReminderChannelFlags();
+    const effectiveUserReminderMessages = flags.reminderEnabled && flags.userChannelEnabled ? userReminderMessages : [];
+    const effectiveSystemReminderMessages = flags.reminderEnabled && flags.systemChannelEnabled ? systemReminderMessages : [];
+    const effectiveUserReminders = flags.reminderEnabled && flags.userChannelEnabled ? userReminders : "";
+    const effectiveSystemReminders = flags.reminderEnabled && flags.systemChannelEnabled ? systemReminders : "";
+    if (effectiveSystemReminders) {
+      fullSystemPrompt.push("\n---\n# System Reminders\n");
+      fullSystemPrompt.push(effectiveSystemReminders);
+      fullSystemPrompt.push("\n---\n");
+    }
     const planModeAdditions = getPlanModeSystemPromptAdditions(
       messages,
       toolUseContext
@@ -28497,15 +28579,50 @@ async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseCo
       requestId: currentRequest?.id,
       config: conversationTrackingConfig
     });
-    emitReminderEvent("session:startup", {
-      agentId: toolUseContext.agentId,
-      messages: messages.length,
-      timestamp: Date.now()
-    });
+    if (!hookState?.startupEmitted) {
+      emitReminderEvent("session:startup", {
+        agentId: toolUseContext.agentId,
+        messages: messages.length,
+        timestamp: Date.now()
+      });
+    }
     if (!toolUseContext.agentId || toolUseContext.agentId === "main") {
       startWatchingTaskList();
     }
-    if (reminders && messages.length > 0) {
+    const reminderMessages = [
+      ...effectiveUserReminderMessages,
+      ...effectiveSystemReminderMessages
+    ];
+    const rawReminderCount = userReminderMessages.length + systemReminderMessages.length;
+    if (reminderMessages.length > 0) {
+      const metrics = buildReminderChannelMetrics(
+        effectiveUserReminderMessages,
+        effectiveSystemReminderMessages
+      );
+      reminderChannelRounds.push(metrics);
+      if (reminderChannelRounds.length > 20) {
+        reminderChannelRounds.shift();
+      }
+      const closure = evaluateReminderChannelClosure(reminderChannelRounds, 3);
+      logUserFriendly("REMINDER_INJECTION_SUMMARY", {
+        queryId: activeQueryId,
+        reminderTypes: extractReminderTypes(reminderMessages),
+        userReminderCount: effectiveUserReminderMessages.length,
+        systemReminderCount: effectiveSystemReminderMessages.length,
+        rawReminderCount,
+        user_channel_reminder_count: metrics.user_channel_reminder_count,
+        system_channel_reminder_count: metrics.system_channel_reminder_count,
+        mention_in_user_ratio: metrics.mention_in_user_ratio,
+        non_mention_in_user_count: metrics.non_mention_in_user_count,
+        closure_three_round_passed: closure.passed,
+        closure_three_round_window_count: closure.roundCount,
+        closure_three_round_failed_indexes: closure.failedRoundIndexes,
+        reminder_enabled: flags.reminderEnabled,
+        reminder_user_channel_enabled: flags.userChannelEnabled,
+        reminder_system_channel_enabled: flags.systemChannelEnabled
+      });
+    }
+    if (effectiveUserReminders && messages.length > 0) {
       for (let i = messages.length - 1; i >= 0; i--) {
         const msg = messages[i];
         if (msg?.type === "user") {
@@ -28514,9 +28631,9 @@ async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseCo
             ...lastUserMessage,
             message: {
               ...lastUserMessage.message,
-              content: typeof lastUserMessage.message.content === "string" ? reminders + lastUserMessage.message.content : [
+              content: typeof lastUserMessage.message.content === "string" ? effectiveUserReminders + lastUserMessage.message.content : [
                 ...Array.isArray(lastUserMessage.message.content) ? lastUserMessage.message.content : [],
-                { type: "text", text: reminders }
+                { type: "text", text: effectiveUserReminders }
               ]
             }
           };
@@ -28579,7 +28696,8 @@ async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseCo
             getBinaryFeedbackResponse,
             {
               stopHookActive: true,
-              stopHookAttempts: stopHookAttempts + 1
+              stopHookAttempts: stopHookAttempts + 1,
+              startupEmitted: true
             }
           );
           return;
@@ -28648,7 +28766,10 @@ async function* queryCore(messages, systemPrompt, context, canUseTool, toolUseCo
         canUseTool,
         toolUseContext,
         getBinaryFeedbackResponse,
-        hookState
+        {
+          ...hookState ?? {},
+          startupEmitted: true
+        }
       );
     } catch (error) {
       throw error;
@@ -30187,7 +30308,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-HPGYRNBC.js");
+  const { queryModel } = await import("./llm-RCPJRG2F.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: