pybao-cli 1.5.24 → 1.5.25

package/dist/{chunk-UOVFEY6P.js → chunk-Z75SOPJ5.js}

@@ -5,11 +5,11 @@ import {
   appendSessionJsonlFromMessage,
   appendSessionTagRecord,
   listPybAgentSessions
-} from "./chunk-DGOZRLG4.js";
+} from "./chunk-I377E5OW.js";
 import {
   formatValidationResult,
   validatePluginOrMarketplacePath
-} from "./chunk-T4BBPE5F.js";
+} from "./chunk-3JZI3ZBU.js";
 import {
   ConversationTracker,
   appendFinishState,
@@ -17,16 +17,16 @@ import {
   getConversationTrackerForContext,
   isFinishComplete,
   mapFinishReason
-} from "./chunk-MVWCFCWA.js";
+} from "./chunk-HL6ARNBJ.js";
 import {
   FileSystemConversationPersistence
-} from "./chunk-L6HMG5TD.js";
+} from "./chunk-FXUTVJRS.js";
 import {
   beginReplSessionScope
 } from "./chunk-F4AXICO7.js";
 import {
   loadPybAgentSessionMessages
-} from "./chunk-DSMH3DDQ.js";
+} from "./chunk-VJFKQQTV.js";
 import {
   drainHookSystemPromptAdditions,
   getHookTranscriptPath,
@@ -38,7 +38,7 @@ import {
   runStopHooks,
   runUserPromptSubmitHooks,
   updateHookTranscriptForMessages
-} from "./chunk-6FXN7WXV.js";
+} from "./chunk-CVPWG3IX.js";
 import {
   DEFAULT_OUTPUT_STYLE,
   getAvailableOutputStyles,
@@ -47,11 +47,11 @@ import {
   getOutputStyleSystemPromptAdditions,
   resolveOutputStyleName,
   setCurrentOutputStyle
-} from "./chunk-NNGD2UJL.js";
+} from "./chunk-SAVBIJ5O.js";
 import {
   fetchCustomModels,
   getModelFeatures
-} from "./chunk-5LOOKSJJ.js";
+} from "./chunk-OZBYDL7N.js";
 import {
   getSessionState
 } from "./chunk-XKYHFZEC.js";
@@ -59,7 +59,7 @@ import {
   queryLLM,
   queryQuick,
   verifyApiKey
-} from "./chunk-DQPL53A3.js";
+} from "./chunk-NSPYODPF.js";
 import {
   DEFAULT_TIMEOUT_MS,
   FallbackToolUseRejectedMessage,
@@ -73,7 +73,7 @@ import {
   listMCPServers,
   loadMergedSettings,
   normalizeSandboxRuntimeConfigFromSettings
-} from "./chunk-PFHTQ2ON.js";
+} from "./chunk-BDHA3QOT.js";
 import {
   addMarketplace,
   disableSkillPlugin,
@@ -86,11 +86,11 @@ import {
   refreshMarketplaceAsync,
   removeMarketplace,
   uninstallSkillPlugin
-} from "./chunk-UUM4Q5S6.js";
+} from "./chunk-SVRRQBLT.js";
 import {
   loadToolPermissionContextFromDisk,
   persistToolPermissionUpdateToDisk
-} from "./chunk-T5ZQLE6E.js";
+} from "./chunk-IBRK4QMC.js";
 import {
   applyToolPermissionContextUpdate,
   applyToolPermissionContextUpdates,
@@ -101,13 +101,13 @@ import {
   generateSystemReminders,
   resetReminderSession,
   systemReminderService
-} from "./chunk-JU3X54OB.js";
+} from "./chunk-V4UJI656.js";
 import {
   clearAgentCache,
   getActiveAgents,
   getAgentByType,
   getAllAgents
-} from "./chunk-7G3CESAX.js";
+} from "./chunk-K3DSRWYV.js";
 import {
   API_ERROR_MESSAGE_PREFIX,
   CANCEL_MESSAGE,
@@ -144,7 +144,7 @@ import {
   reorderMessages,
   resetAutoCompactTelemetry,
   stripSystemMessages
-} from "./chunk-S7HIIXVN.js";
+} from "./chunk-VGFXCETY.js";
 import {
   getRequestStatus,
   setRequestStatus,
@@ -174,7 +174,7 @@ import {
   normalizeFilePath,
   readTextContent,
   writeTextContent
-} from "./chunk-4RFXQVAB.js";
+} from "./chunk-HSAO34GP.js";
 import {
   parseBlockEdits
 } from "./chunk-QWIBSCDN.js";
@@ -184,18 +184,18 @@ import {
   ParserRegistry,
   initParser,
   loadLanguage
-} from "./chunk-QPX3VRTH.js";
+} from "./chunk-BOOTTYGZ.js";
 import {
   getSettingsFileCandidates,
   loadSettingsWithLegacyFallback,
   readSettingsFile
-} from "./chunk-UJ2SNURP.js";
+} from "./chunk-6PW6SJXE.js";
 import {
   getCustomCommandDirectories,
   hasCustomCommands,
   loadCustomCommands,
   reloadCustomCommands
-} from "./chunk-W2DOITEM.js";
+} from "./chunk-TO2NPV6U.js";
 import {
   getSessionPlugins
 } from "./chunk-BJSWTHRM.js";
@@ -204,7 +204,7 @@ import {
   buildModelProfileKey,
   getModelManager,
   isDefaultSlowAndCapableModel
-} from "./chunk-AIYDVZNU.js";
+} from "./chunk-3COHIXJE.js";
 import {
   getCodeStyle,
   getContext,
@@ -212,16 +212,16 @@ import {
   getIsGit,
   getProjectDocs,
   getProjectStructureStatisticsBlock
-} from "./chunk-FBTRKZNM.js";
+} from "./chunk-THSULC47.js";
 import {
   getRipgrepPath,
   getRipgrepPolicyMode,
   resolveRipgrepPolicy,
   ripGrep
-} from "./chunk-XVF7DL3L.js";
+} from "./chunk-KNPPPVBG.js";
 import {
   getTheme
-} from "./chunk-7XKF4NS5.js";
+} from "./chunk-RBLKS6FX.js";
 import {
   DEFAULT_GLOBAL_CONFIG,
   enableConfigs,
@@ -234,7 +234,7 @@ import {
   saveGlobalConfig,
   setAllPointersToModel,
   setModelPointer
-} from "./chunk-AXW3EAEG.js";
+} from "./chunk-LGQJPZKC.js";
 import {
   AbortError
 } from "./chunk-RQVLBMP7.js";
@@ -243,7 +243,7 @@ import {
   getCurrentRequest,
   logUserFriendly,
   markPhase
-} from "./chunk-H25IY2QB.js";
+} from "./chunk-3RKGBZUV.js";
 import {
   ASCII_LOGO,
   BunShell,
@@ -284,10 +284,10 @@ import {
   setCwd,
   shouldApplyToolOutputTruncation,
   truncateToolOutput
-} from "./chunk-2LDISGV5.js";
+} from "./chunk-WLEPTDKU.js";
 import {
   MACRO
-} from "./chunk-7PKIDZYX.js";
+} from "./chunk-KP3LQCMR.js";
 import {
   __export
 } from "./chunk-I3J4JYES.js";
@@ -468,7 +468,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-HPPHTPDB.js");
+    const { API_ERROR_MESSAGE_PREFIX: API_ERROR_MESSAGE_PREFIX2, queryQuick: queryQuick2 } = await import("./llm-KOMOHPJY.js");
     const response = await queryQuick2({
       systemPrompt,
       userPrompt,
@@ -4270,7 +4270,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-HPPHTPDB.js");
+  const { API_ERROR_MESSAGE_PREFIX: API_ERROR_MESSAGE_PREFIX2, queryLLM: queryLLM2 } = await import("./llm-KOMOHPJY.js");
   const queryLLMFn = args.queryLLMOverride ?? queryLLM2;
   const messages = [
     {
@@ -6663,7 +6663,7 @@ var FileEditTool = {
     const originalFileContent = currentFileContent;
     let totalPatch = [];
     const { SmartEdit } = await import("./smart-edit-AWHJDSU6.js");
-    const { findLspAnchor } = await import("./lspAnchor-ZCANLR6C.js");
+    const { findLspAnchor } = await import("./lspAnchor-CY46EOLW.js");
     for (const op of editOperations) {
       const normalizedSearch = normalizeLineEndings(op.search);
       const normalizedReplace = normalizeLineEndings(op.replace);
@@ -12148,7 +12148,7 @@ async function createAndStoreApiKey(accessToken) {
       }
       saveGlobalConfig(config2);
       try {
-        const { resetAnthropicClient } = await import("./llm-HPPHTPDB.js");
+        const { resetAnthropicClient } = await import("./llm-KOMOHPJY.js");
         resetAnthropicClient();
       } catch {
       }
@@ -16572,7 +16572,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-HM55RXJW.js");
+  const { configureSessionPlugins } = await import("./pluginRuntime-LD6VPBWN.js");
   const { errors } = await configureSessionPlugins({ pluginDirs: dirs });
   return errors;
 }
@@ -17247,7 +17247,7 @@ async function call(onDone, context) {
     ModelConfig,
     {
       onClose: () => {
-        import("./model-QGIJDQKV.js").then(({ reloadModelManager: reloadModelManager2 }) => {
+        import("./model-R7YMMBAR.js").then(({ reloadModelManager: reloadModelManager2 }) => {
           reloadModelManager2();
           triggerModelConfigChange();
           onDone();
@@ -25818,7 +25818,7 @@ function useStatusLine() {
 // src/ui/components/PromptInput.tsx
 async function interpretHashCommand(input) {
   try {
-    const { queryQuick: queryQuick2 } = await import("./llm-HPPHTPDB.js");
+    const { queryQuick: queryQuick2 } = await import("./llm-KOMOHPJY.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.",
@@ -26131,7 +26131,7 @@ function PromptInput({
     if (messages2.length) {
       if (mode === "bash") {
         onQuery(messages2, newAbortController).then(async () => {
-          const { getCwd: getCwd2 } = await import("./state-66VUERW2.js");
+          const { getCwd: getCwd2 } = await import("./state-RM2QGI3K.js");
           setCurrentPwd(getCwd2());
         });
       } else {
@@ -29779,6 +29779,76 @@ function filterAfterCompactionBoundary(messages, options) {
 }
 
 // src/utils/session/toolOutputLifecycle.ts
+var TOOL_NAME_ALIAS_TO_CANONICAL = {
+  skill: "skill",
+  "ms-office-suite:skill": "skill"
+};
+function normalizeToolName(name3) {
+  const raw = String(name3 ?? "").trim().toLowerCase();
+  if (!raw) return "";
+  return TOOL_NAME_ALIAS_TO_CANONICAL[raw] ?? raw;
+}
+function parseToolNameList(value) {
+  if (Array.isArray(value)) {
+    return value.map((item) => normalizeToolName(item)).filter(Boolean);
+  }
+  const raw = String(value ?? "").trim();
+  if (!raw) return [];
+  return raw.split(/[,\n;]/g).map((item) => normalizeToolName(item)).filter(Boolean);
+}
+function resolveProtectedToolNames(toolUseContext) {
+  const sessionRaw = toolUseContext?.toolOutputLifecycleConfig?.protectedToolNames ?? toolUseContext?.toolOutputLifecycleProtectedToolNames;
+  const projectRaw = toolUseContext?.toolOutputLifecycleProjectProtectedToolNames ?? process.env.PYB_TOOL_OUTPUT_LIFECYCLE_PROTECTED_TOOL_NAMES;
+  const emergencyRaw = toolUseContext?.toolOutputLifecycleConfig?.allowDisableSkillProtection ?? process.env.PYB_TOOL_OUTPUT_LIFECYCLE_ALLOW_DISABLE_SKILL_PROTECTION;
+  const emergencySkillProtectionDisabled = parseBooleanFlag4(emergencyRaw) === true;
+  const sessionList = parseToolNameList(sessionRaw);
+  const projectList = parseToolNameList(projectRaw);
+  const source = sessionList.length > 0 ? "session" : projectList.length > 0 ? "project" : "default";
+  const base = source === "session" ? sessionList : source === "project" ? projectList : ["skill"];
+  const resolved = new Set(base);
+  if (!emergencySkillProtectionDisabled) {
+    resolved.add("skill");
+  }
+  return {
+    protectedToolNames: Array.from(resolved),
+    source,
+    emergencySkillProtectionDisabled
+  };
+}
+function shouldProtectToolResult(toolName, protectedToolNames) {
+  return Boolean(toolName && protectedToolNames.has(toolName));
+}
+function buildToolUseNameIndex(messages) {
+  const index = /* @__PURE__ */ new Map();
+  let conflictCount = 0;
+  for (const message of messages) {
+    if (message.type !== "assistant") continue;
+    const content = message?.message?.content;
+    if (!Array.isArray(content)) continue;
+    for (const block of content) {
+      if (!block || typeof block !== "object") continue;
+      if (block.type !== "tool_use" && block.type !== "server_tool_use" && block.type !== "mcp_tool_use") {
+        continue;
+      }
+      const id = String(block.id ?? "").trim();
+      const nextName = normalizeToolName(block.name);
+      if (!id || !nextName) continue;
+      const prevName = index.get(id);
+      if (prevName && prevName !== nextName) {
+        conflictCount += 1;
+      }
+      index.set(id, nextName);
+    }
+  }
+  return { index, conflictCount };
+}
+function resolveToolNameForToolResult(block, toolUseNameIndex) {
+  if (!block || typeof block !== "object" || block.type !== "tool_result") return null;
+  const toolUseId = String(block.tool_use_id ?? "").trim();
+  if (!toolUseId) return null;
+  const resolved = toolUseNameIndex.get(toolUseId);
+  return resolved ? normalizeToolName(resolved) : null;
+}
 function parseBooleanFlag4(value) {
   const raw = String(value ?? "").trim().toLowerCase();
   if (["1", "true", "yes", "on"].includes(raw)) return true;
@@ -29802,6 +29872,7 @@ function resolveToolOutputLifecycleConfig(toolUseContext) {
   const l3AgeTurns = Number.isFinite(Number(l3AgeTurnsRaw)) ? Math.max(maxAgeTurns + 1, Number(l3AgeTurnsRaw)) : Math.max(maxAgeTurns + 2, 6);
   const l1MinChars = Number.isFinite(Number(l1MinCharsRaw)) ? Math.max(120, Number(l1MinCharsRaw)) : 500;
   const l3MinChars = Number.isFinite(Number(l3MinCharsRaw)) ? Math.max(l1MinChars, Number(l3MinCharsRaw)) : 1800;
+  const protectedToolNames = resolveProtectedToolNames(toolUseContext);
   return {
     enabled,
     source,
@@ -29810,7 +29881,10 @@ function resolveToolOutputLifecycleConfig(toolUseContext) {
     protectFailedResultTurns,
     l3AgeTurns,
     l1MinChars,
-    l3MinChars
+    l3MinChars,
+    protectedToolNames: protectedToolNames.protectedToolNames,
+    protectedToolNamesSource: protectedToolNames.source,
+    emergencySkillProtectionDisabled: protectedToolNames.emergencySkillProtectionDisabled
   };
 }
 function getMessageText3(message) {
@@ -29954,6 +30028,30 @@ function applyToolOutputLifecycle(messages, options) {
   const beforeTokens = estimateMessagesTokens(messagesForAging);
   const totalToolResultBlocksBefore = countToolResultBlocks(messagesForAging);
   const pruneMarker = resolveLatestPruneMarkerState(messagesForAging);
+  const toolUseName = buildToolUseNameIndex(messagesForAging);
+  const protectedToolNames = new Set(
+    parseToolNameList(options.protectedToolNames ?? ["skill"])
+  );
+  let toolNameResolvedCount = 0;
+  let toolNameUnresolvedCount = 0;
+  let potentialProtectedSkillBlocks = 0;
+  let protectedByToolNameBlocks = 0;
+  let protectedToolNameMissBlocks = 0;
+  for (const message of messagesForAging) {
+    if (message.type !== "user") continue;
+    const content = message?.message?.content;
+    if (!Array.isArray(content)) continue;
+    for (const block of content) {
+      if (!block || typeof block !== "object" || block.type !== "tool_result") continue;
+      const resolved = resolveToolNameForToolResult(block, toolUseName.index);
+      if (resolved) {
+        toolNameResolvedCount += 1;
+        if (resolved === "skill") potentialProtectedSkillBlocks += 1;
+      } else {
+        toolNameUnresolvedCount += 1;
+      }
+    }
+  }
   if (!options.enabled) {
     return {
       messages: messagesForAging,
@@ -29976,7 +30074,13 @@ function applyToolOutputLifecycle(messages, options) {
         tokenDelta: 0,
         pruneMarkerConsumed: pruneMarker.consumed,
         pruneMarkerWarnings: pruneMarker.warnings,
-        pruneMarkerConflictEventName: pruneMarker.warnings > 0 ? PRUNE_MARKER_CONFLICT_EVENT : null
+        pruneMarkerConflictEventName: pruneMarker.warnings > 0 ? PRUNE_MARKER_CONFLICT_EVENT : null,
+        toolNameResolvedCount,
+        toolNameUnresolvedCount,
+        toolNameConflictCount: toolUseName.conflictCount,
+        potentialProtectedSkillBlocks,
+        protectedByToolNameBlocks,
+        protectedToolNameMissBlocks
       }
     };
   }
@@ -30007,6 +30111,14 @@ function applyToolOutputLifecycle(messages, options) {
       if (ageTurns <= options.maxAgeTurns) {
         return block;
       }
+      const resolvedToolName = resolveToolNameForToolResult(block, toolUseName.index);
+      if (resolvedToolName) {
+        if (shouldProtectToolResult(resolvedToolName, protectedToolNames)) {
+          protectedByToolNameBlocks += 1;
+          return block;
+        }
+        protectedToolNameMissBlocks += 1;
+      }
       const isError = Boolean(block.is_error);
       if (isError && ageTurns <= options.protectFailedResultTurns) {
         skippedFailedBlocks += 1;
@@ -30098,7 +30210,13 @@ function applyToolOutputLifecycle(messages, options) {
       ),
       pruneMarkerConsumed: pruneMarker.consumed,
       pruneMarkerWarnings: pruneMarker.warnings,
-      pruneMarkerConflictEventName: pruneMarker.warnings > 0 ? PRUNE_MARKER_CONFLICT_EVENT : null
+      pruneMarkerConflictEventName: pruneMarker.warnings > 0 ? PRUNE_MARKER_CONFLICT_EVENT : null,
+      toolNameResolvedCount,
+      toolNameUnresolvedCount,
+      toolNameConflictCount: toolUseName.conflictCount,
+      potentialProtectedSkillBlocks,
+      protectedByToolNameBlocks,
+      protectedToolNameMissBlocks
     }
   };
 }
@@ -32400,7 +32518,8 @@ async function* runQuerySessionRuntimeLoop(messages, systemPrompt, context, canU
         protectFailedResultTurns: lifecycleConfig.protectFailedResultTurns,
         l3AgeTurns: lifecycleConfig.l3AgeTurns,
         l1MinChars: lifecycleConfig.l1MinChars,
-        l3MinChars: lifecycleConfig.l3MinChars
+        l3MinChars: lifecycleConfig.l3MinChars,
+        protectedToolNames: lifecycleConfig.protectedToolNames
       });
       messages = lifecycleResult.messages;
       if (lifecycleConfig.enabled) {
@@ -32418,6 +32537,9 @@ async function* runQuerySessionRuntimeLoop(messages, systemPrompt, context, canU
           beforeTokens: lifecycleResult.report.beforeTokens,
           afterTokens: lifecycleResult.report.afterTokens,
           tokenDelta: lifecycleResult.report.tokenDelta,
+          protectedByToolNameBlocks: lifecycleResult.report.protectedByToolNameBlocks,
+          protectedToolNameMissBlocks: lifecycleResult.report.protectedToolNameMissBlocks,
+          protectedToolNamesSource: lifecycleConfig.protectedToolNamesSource,
           pruneMarkerConsumed: lifecycleResult.report.pruneMarkerConsumed,
           pruneMarkerWarnings: lifecycleResult.report.pruneMarkerWarnings
         });
@@ -32437,6 +32559,9 @@ async function* runQuerySessionRuntimeLoop(messages, systemPrompt, context, canU
           beforeTokens: lifecycleResult.report.beforeTokens,
           afterTokens: lifecycleResult.report.afterTokens,
           tokenDelta: lifecycleResult.report.tokenDelta,
+          protectedByToolNameBlocks: lifecycleResult.report.protectedByToolNameBlocks,
+          protectedToolNameMissBlocks: lifecycleResult.report.protectedToolNameMissBlocks,
+          protectedToolNamesSource: lifecycleConfig.protectedToolNamesSource,
           pruneMarkerConsumed: lifecycleResult.report.pruneMarkerConsumed,
           pruneMarkerWarnings: lifecycleResult.report.pruneMarkerWarnings
         });
@@ -34043,7 +34168,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-HPPHTPDB.js");
+  const { queryModel } = await import("./llm-KOMOHPJY.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: