@verboo/code 0.15.3 → 0.15.5

package/dist/cli.mjs

@@ -117942,7 +117942,7 @@ function getClaudeCodeUserAgent() {
   return `claude-code/${"99.0.0"}`;
 }
 function getVerbooCodeUserAgent() {
-  const version2 = "0.15.3";
+  const version2 = "0.15.5";
   return `verboo-code/${version2}`;
 }
 
@@ -188341,6 +188341,372 @@ var init_contextPartitioning = __esm(() => {
   ];
 });
 
+// src/utils/messages/toolPairing.ts
+function getToolUseId(block2) {
+  if (typeof block2 === "object" && block2 !== null && "type" in block2 && block2.type === "tool_use" && "id" in block2 && typeof block2.id === "string") {
+    return block2.id;
+  }
+  return null;
+}
+function getToolResultId(block2) {
+  if (typeof block2 === "object" && block2 !== null && "type" in block2 && block2.type === "tool_result" && "tool_use_id" in block2 && typeof block2.tool_use_id === "string") {
+    return block2.tool_use_id;
+  }
+  return null;
+}
+function getServerToolUseId(block2) {
+  if (typeof block2 === "object" && block2 !== null && "type" in block2 && (block2.type === "server_tool_use" || block2.type === "mcp_tool_use") && "id" in block2 && typeof block2.id === "string") {
+    return block2.id;
+  }
+  return null;
+}
+function getToolUseIdReference(block2) {
+  if (typeof block2 === "object" && block2 !== null && "tool_use_id" in block2 && typeof block2.tool_use_id === "string") {
+    return block2.tool_use_id;
+  }
+  return null;
+}
+function getToolResultIdsFromUserMessage(message) {
+  if (!Array.isArray(message.message.content)) {
+    return [];
+  }
+  return message.message.content.map((block2) => getToolResultId(block2)).filter((id) => id !== null);
+}
+function isUserOrAssistantMessage(message) {
+  return message.type === "user" || message.type === "assistant";
+}
+function getToolUseIdsFromAssistantMessage(message) {
+  if (message.type !== "assistant") {
+    return [];
+  }
+  const content = message.message.content;
+  if (!Array.isArray(content)) {
+    return [];
+  }
+  return content.map((block2) => getToolUseId(block2)).filter((id) => id !== null);
+}
+function getToolResultIdsFromMessage(message) {
+  if (message.type !== "user") {
+    return [];
+  }
+  const content = message.message.content;
+  if (!Array.isArray(content)) {
+    return [];
+  }
+  return content.map((block2) => getToolResultId(block2)).filter((id) => id !== null);
+}
+function collectToolUseIdsInRange(messages, start, end) {
+  const ids = new Set;
+  for (let i3 = start;i3 < end; i3++) {
+    for (const id of getToolUseIdsFromAssistantMessage(messages[i3])) {
+      ids.add(id);
+    }
+  }
+  return ids;
+}
+function collectToolResultIdsInRange(messages, start, end) {
+  const ids = new Set;
+  for (let i3 = start;i3 < end; i3++) {
+    for (const id of getToolResultIdsFromMessage(messages[i3])) {
+      ids.add(id);
+    }
+  }
+  return ids;
+}
+function clampRangeIndex(index, min, max2) {
+  if (!Number.isFinite(index))
+    return min;
+  return Math.max(min, Math.min(max2, Math.trunc(index)));
+}
+function findToolUseMessageIndex(messages, toolUseId, fromInclusive, toExclusive) {
+  for (let i3 = toExclusive - 1;i3 >= fromInclusive; i3--) {
+    if (getToolUseIdsFromAssistantMessage(messages[i3]).includes(toolUseId)) {
+      return i3;
+    }
+  }
+  return -1;
+}
+function findToolResultMessageIndex(messages, toolUseId, fromInclusive, toExclusive) {
+  for (let i3 = fromInclusive;i3 < toExclusive; i3++) {
+    if (getToolResultIdsFromMessage(messages[i3]).includes(toolUseId)) {
+      return i3;
+    }
+  }
+  return -1;
+}
+function findEarliestAssistantWithSameMessageId(messages, messageId, fromInclusive, toExclusive) {
+  let result = -1;
+  for (let i3 = fromInclusive;i3 < toExclusive; i3++) {
+    const message = messages[i3];
+    if (message.type === "assistant" && message.message.id === messageId) {
+      result = i3;
+      break;
+    }
+  }
+  return result;
+}
+function findLatestAssistantWithSameMessageId(messages, messageId, fromInclusive, toExclusive) {
+  let result = -1;
+  for (let i3 = fromInclusive;i3 < toExclusive; i3++) {
+    const message = messages[i3];
+    if (message.type === "assistant" && message.message.id === messageId) {
+      result = i3;
+    }
+  }
+  return result;
+}
+function getPairingIssueKinds(messages) {
+  const pairable = messages.filter(isUserOrAssistantMessage);
+  if (pairable.length === 0)
+    return [];
+  const validation = validateToolResultPairing(pairable);
+  return [...new Set(validation.issues.map((issue2) => issue2.kind))];
+}
+function messageHasToolResult(message) {
+  return message ? getToolResultIdsFromMessage(message).length > 0 : false;
+}
+function selectToolPairSafeMessageRange(messages, requestedStart, requestedEnd, options2) {
+  const messageList = [...messages];
+  const minStart = clampRangeIndex(options2.minStart ?? 0, 0, messageList.length);
+  const maxEnd = clampRangeIndex(options2.maxEnd ?? messageList.length, minStart, messageList.length);
+  const clampedStart = clampRangeIndex(requestedStart, minStart, maxEnd);
+  const clampedEnd = clampRangeIndex(requestedEnd, clampedStart, maxEnd);
+  const maxExtraMessages = options2.maxExtraMessages === undefined ? messageList.length : Math.max(0, Math.trunc(options2.maxExtraMessages));
+  let expansionMinStart = Math.max(minStart, clampedStart - maxExtraMessages);
+  let expansionMaxEnd = Math.min(maxEnd, clampedEnd + maxExtraMessages);
+  let start = clampedStart;
+  let end = clampedEnd;
+  const requestedMessages = messageList.slice(clampedStart, clampedEnd);
+  const issueKinds = getPairingIssueKinds(requestedMessages);
+  const requestedStartedWithToolResult = messageHasToolResult(messageList[clampedStart]);
+  for (let guard = 0;guard < messageList.length * 2 + 2; guard++) {
+    let changed = false;
+    for (let i3 = start;i3 < end; i3++) {
+      const message = messageList[i3];
+      if (!message)
+        continue;
+      if (message.type !== "assistant")
+        continue;
+      const messageId = message.message.id;
+      if (!messageId)
+        continue;
+      const earlier = findEarliestAssistantWithSameMessageId(messageList, messageId, 0, start);
+      if (earlier !== -1) {
+        if (earlier >= expansionMinStart) {
+          start = earlier;
+        } else {
+          const lastInRange = findLatestAssistantWithSameMessageId(messageList, messageId, start, end);
+          start = lastInRange + 1;
+          expansionMinStart = Math.max(expansionMinStart, start);
+        }
+        changed = true;
+        break;
+      }
+      const later = findLatestAssistantWithSameMessageId(messageList, messageId, end, messageList.length);
+      if (later !== -1) {
+        if (later < expansionMaxEnd) {
+          end = later + 1;
+        } else {
+          const firstInRange = findEarliestAssistantWithSameMessageId(messageList, messageId, start, end);
+          end = firstInRange;
+          expansionMaxEnd = Math.min(expansionMaxEnd, end);
+        }
+        changed = true;
+        break;
+      }
+    }
+    if (changed)
+      continue;
+    const toolUseIds = collectToolUseIdsInRange(messageList, start, end);
+    const toolResultIds = collectToolResultIdsInRange(messageList, start, end);
+    for (let i3 = start;i3 < end; i3++) {
+      const resultIds = getToolResultIdsFromMessage(messageList[i3]);
+      const orphanedResultId = resultIds.find((id) => !toolUseIds.has(id));
+      if (!orphanedResultId)
+        continue;
+      const toolUseIndex = findToolUseMessageIndex(messageList, orphanedResultId, expansionMinStart, start);
+      if (toolUseIndex !== -1) {
+        start = toolUseIndex;
+        changed = true;
+        break;
+      }
+      start = i3 + 1;
+      expansionMinStart = Math.max(expansionMinStart, start);
+      changed = true;
+      break;
+    }
+    if (changed)
+      continue;
+    for (let i3 = start;i3 < end; i3++) {
+      const toolUseIdsForMessage = getToolUseIdsFromAssistantMessage(messageList[i3]);
+      const missingToolUseId = toolUseIdsForMessage.find((id) => !toolResultIds.has(id));
+      if (!missingToolUseId)
+        continue;
+      const toolResultIndex = findToolResultMessageIndex(messageList, missingToolUseId, end, expansionMaxEnd);
+      if (toolResultIndex !== -1) {
+        end = toolResultIndex + 1;
+        changed = true;
+        break;
+      }
+      const hasResultOutsideRange = findToolResultMessageIndex(messageList, missingToolUseId, 0, messageList.length) !== -1;
+      if (options2.allowPendingToolUse && !hasResultOutsideRange)
+        continue;
+      end = i3;
+      expansionMaxEnd = Math.min(expansionMaxEnd, end);
+      changed = true;
+      break;
+    }
+    if (!changed)
+      break;
+  }
+  const selectedMessages = messageList.slice(start, end);
+  const diagnostics = {
+    projectionName: options2.projectionName,
+    querySource: options2.querySource,
+    messageCountBefore: clampedEnd - clampedStart,
+    messageCountAfter: selectedMessages.length,
+    requestedRange: { start: clampedStart, end: clampedEnd },
+    adjustedRange: { start, end },
+    issueKinds,
+    requestedStartedWithToolResult,
+    adjusted: start !== clampedStart || end !== clampedEnd
+  };
+  if (diagnostics.adjusted || issueKinds.length > 0) {
+    logForDebugging(`[messageProjection] tool-pair-safe range projection=${options2.projectionName} ` + `querySource=${options2.querySource ?? "unknown"} ` + `before=${diagnostics.messageCountBefore} after=${diagnostics.messageCountAfter} ` + `requested=${clampedStart}:${clampedEnd} adjusted=${start}:${end} ` + `issueKinds=${issueKinds.join(",") || "none"} ` + `requestedStartedWithToolResult=${requestedStartedWithToolResult}`);
+  }
+  return {
+    messages: selectedMessages,
+    start,
+    end,
+    diagnostics
+  };
+}
+function validateToolResultPairing(messages, context = {}) {
+  const issues = [];
+  const seenToolUses = new Map;
+  for (let i3 = 0;i3 < messages.length; i3++) {
+    const msg = messages[i3];
+    if (msg.type === "user") {
+      if (messages[i3 - 1]?.type === "assistant") {
+        continue;
+      }
+      for (const toolUseId of getToolResultIdsFromUserMessage(msg)) {
+        issues.push({
+          kind: "orphaned_tool_result",
+          toolUseId,
+          userIndex: i3
+        });
+      }
+      continue;
+    }
+    const uniqueToolUseIds = new Set;
+    const serverResultIds = new Set;
+    const assistantContent = Array.isArray(msg.message.content) ? msg.message.content : [];
+    for (const block2 of assistantContent) {
+      const toolUseIdReference = getToolUseIdReference(block2);
+      if (toolUseIdReference !== null) {
+        serverResultIds.add(toolUseIdReference);
+      }
+    }
+    for (const block2 of assistantContent) {
+      const toolUseId = getToolUseId(block2);
+      if (toolUseId !== null) {
+        const firstSeen = seenToolUses.get(toolUseId);
+        if (firstSeen) {
+          issues.push({
+            kind: "duplicate_tool_use",
+            toolUseId,
+            assistantIndex: i3,
+            assistantMessageId: msg.message.id,
+            duplicateOfAssistantIndex: firstSeen.assistantIndex,
+            duplicateOfAssistantMessageId: firstSeen.assistantMessageId
+          });
+        } else {
+          seenToolUses.set(toolUseId, {
+            assistantIndex: i3,
+            assistantMessageId: msg.message.id
+          });
+        }
+        uniqueToolUseIds.add(toolUseId);
+      }
+      const serverToolUseId = getServerToolUseId(block2);
+      if (serverToolUseId !== null && !serverResultIds.has(serverToolUseId)) {
+        issues.push({
+          kind: "server_tool_use_without_result",
+          toolUseId: serverToolUseId,
+          assistantIndex: i3,
+          assistantMessageId: msg.message.id
+        });
+      }
+    }
+    const nextMsg = messages[i3 + 1];
+    const toolResultIds = nextMsg?.type === "user" ? getToolResultIdsFromUserMessage(nextMsg) : [];
+    const toolResultIdSet = new Set(toolResultIds);
+    const toolUseIdSet = new Set(uniqueToolUseIds);
+    const seenToolResultIds = new Set;
+    for (const toolResultId of toolResultIds) {
+      if (seenToolResultIds.has(toolResultId)) {
+        issues.push({
+          kind: "duplicate_tool_result",
+          toolUseId: toolResultId,
+          assistantIndex: i3,
+          assistantMessageId: msg.message.id,
+          userIndex: i3 + 1
+        });
+      }
+      seenToolResultIds.add(toolResultId);
+    }
+    for (const toolUseId of toolUseIdSet) {
+      if (!toolResultIdSet.has(toolUseId)) {
+        issues.push({
+          kind: "missing_tool_result",
+          toolUseId,
+          assistantIndex: i3,
+          assistantMessageId: msg.message.id
+        });
+      }
+    }
+    for (const toolResultId of toolResultIdSet) {
+      if (!toolUseIdSet.has(toolResultId)) {
+        issues.push({
+          kind: "orphaned_tool_result",
+          toolUseId: toolResultId,
+          assistantIndex: i3,
+          assistantMessageId: msg.message.id,
+          userIndex: i3 + 1
+        });
+      }
+    }
+  }
+  return {
+    valid: issues.length === 0,
+    context,
+    issues
+  };
+}
+function formatToolResultPairingIssue(issue2) {
+  const parts = [`kind=${issue2.kind}`, `tool_use_id=${issue2.toolUseId}`];
+  if (issue2.assistantIndex !== undefined) {
+    parts.push(`assistant_index=${issue2.assistantIndex}`);
+  }
+  if (issue2.assistantMessageId !== undefined) {
+    parts.push(`assistant_message_id=${issue2.assistantMessageId}`);
+  }
+  if (issue2.userIndex !== undefined) {
+    parts.push(`user_index=${issue2.userIndex}`);
+  }
+  if (issue2.duplicateOfAssistantIndex !== undefined) {
+    parts.push(`duplicate_of_assistant_index=${issue2.duplicateOfAssistantIndex}`);
+  }
+  if (issue2.duplicateOfAssistantMessageId !== undefined) {
+    parts.push(`duplicate_of_assistant_message_id=${issue2.duplicateOfAssistantMessageId}`);
+  }
+  return parts.join(",");
+}
+var init_toolPairing = __esm(() => {
+  init_debug();
+});
+
 // src/utils/relevancePruning.ts
 function extractKeywords(text) {
   const words = text.toLowerCase().split(/\s+/);
@@ -188427,8 +188793,13 @@ function pruneByRelevance(messages, options2) {
   if (messages.length <= preserveRecent) {
     return messages;
   }
-  const recentMessages = messages.slice(-preserveRecent);
-  const olderMessages = messages.slice(0, -preserveRecent);
+  const requestedRecentStart = Math.max(0, messages.length - preserveRecent);
+  const recentRange = selectToolPairSafeMessageRange(messages, requestedRecentStart, messages.length, {
+    projectionName: "relevance_pruning_recent",
+    querySource: "compact"
+  });
+  const recentMessages = recentRange.messages;
+  const olderMessages = messages.slice(0, recentRange.start);
   const olderGroups = groupMessagesByApiRound(olderMessages);
   const scored = [];
   for (const group of olderGroups) {
@@ -188458,6 +188829,7 @@ function pruneByRelevance(messages, options2) {
 var STOP_WORDS;
 var init_relevancePruning = __esm(() => {
   init_tokenEstimation();
+  init_toolPairing();
   STOP_WORDS = new Set([
     "the",
     "and",
@@ -211232,6 +211604,24 @@ var init_headlessProfiler = __esm(() => {
   SHOULD_PROFILE2 = DETAILED_PROFILING2 || STATSIG_LOGGING_SAMPLED2;
 });
 
+// src/query/model.ts
+function resolveQueryTurnModel({
+  permissionMode,
+  turnModel,
+  sessionModel,
+  exceeds200kTokens = false
+}) {
+  const requestedModel = turnModel ?? parseUserSpecifiedModel(sessionModel ?? getDefaultMainLoopModelSetting());
+  return getRuntimeMainLoopModel({
+    permissionMode,
+    mainLoopModel: requestedModel,
+    exceeds200kTokens
+  });
+}
+var init_model2 = __esm(() => {
+  init_model();
+});
+
 // src/tools/SleepTool/prompt.ts
 var SLEEP_TOOL_NAME = "Sleep", SLEEP_TOOL_PROMPT;
 var init_prompt8 = __esm(() => {
@@ -385171,6 +385561,39 @@ function getNextImagePasteId(messages) {
   }
   return maxId + 1;
 }
+function messageContainsToolResult(message, toolUseId) {
+  return message.type === "user" && Array.isArray(message.message.content) && message.message.content.some((block2) => block2.type === "tool_result" && block2.tool_use_id === toolUseId);
+}
+function createMissingToolResultMessage(toolUseId, assistantMessage2) {
+  const errorMessage2 = "Tool execution ended without returning a result. The tool was not run again.";
+  return {
+    message: createUserMessage({
+      content: [
+        {
+          type: "tool_result",
+          content: `<tool_use_error>${errorMessage2}</tool_use_error>`,
+          is_error: true,
+          tool_use_id: toolUseId
+        }
+      ],
+      toolUseResult: errorMessage2,
+      sourceToolAssistantUUID: assistantMessage2.uuid
+    })
+  };
+}
+async function* ensureTerminalToolResult(updates, toolUseId, assistantMessage2, onMissing = () => {}) {
+  let hasTerminalToolResult = false;
+  for await (const update of updates) {
+    if (messageContainsToolResult(update.message, toolUseId)) {
+      hasTerminalToolResult = true;
+    }
+    yield update;
+  }
+  if (!hasTerminalToolResult) {
+    onMissing();
+    yield createMissingToolResultMessage(toolUseId, assistantMessage2);
+  }
+}
 function findMcpServerConnection(toolName, mcpClients) {
   if (!toolName.startsWith("mcp__")) {
     return;
@@ -385246,6 +385669,7 @@ async function* runToolUse(toolUse, assistantMessage2, canUseTool, toolUseContex
     return;
   }
   const toolInput = toolUse.input;
+  let hasTerminalToolResult = false;
   try {
     if (toolUseContext.abortController.signal.aborted) {
       logEvent("tengu_tool_use_cancelled", {
@@ -385282,7 +385706,21 @@ async function* runToolUse(toolUse, assistantMessage2, canUseTool, toolUseContex
       toolUseId: toolUse.id,
       inputKeys: Object.keys(toolInput ?? {})
     }), { level: "debug" });
-    for await (const update of streamedCheckPermissionsAndCallTool(tool, toolUse.id, toolInput, toolUseContext, canUseTool, assistantMessage2, messageId, requestId, mcpServerType, mcpServerBaseUrl)) {
+    const toolUpdates = streamedCheckPermissionsAndCallTool(tool, toolUse.id, toolInput, toolUseContext, canUseTool, assistantMessage2, messageId, requestId, mcpServerType, mcpServerBaseUrl);
+    for await (const update of ensureTerminalToolResult(toolUpdates, toolUse.id, assistantMessage2, () => {
+      const sanitizedToolName = sanitizeToolNameForAnalytics(tool.name);
+      logEvent("tengu_tool_result_missing_at_execution", {
+        toolName: sanitizedToolName,
+        toolUseID: toolUse.id,
+        model: toolUseContext.options.mainLoopModel,
+        querySource: toolUseContext.options.querySource ?? "unknown",
+        isMcp: tool.isMcp ?? false
+      });
+      logError2(new Error(`runToolUse: ${sanitizedToolName} completed without a tool_result`));
+    })) {
+      if (messageContainsToolResult(update.message, toolUse.id)) {
+        hasTerminalToolResult = true;
+      }
       yield update;
     }
     logForDebugging(JSON.stringify({
@@ -385295,20 +385733,22 @@ async function* runToolUse(toolUse, assistantMessage2, canUseTool, toolUseContex
     const errorMessage2 = error42 instanceof Error ? error42.message : String(error42);
     const toolInfo = tool ? ` (${tool.name})` : "";
     const detailedError = `Error calling tool${toolInfo}: ${errorMessage2}`;
-    yield {
-      message: createUserMessage({
-        content: [
-          {
-            type: "tool_result",
-            content: `<tool_use_error>${detailedError}</tool_use_error>`,
-            is_error: true,
-            tool_use_id: toolUse.id
-          }
-        ],
-        toolUseResult: detailedError,
-        sourceToolAssistantUUID: assistantMessage2.uuid
-      })
-    };
+    if (!hasTerminalToolResult) {
+      yield {
+        message: createUserMessage({
+          content: [
+            {
+              type: "tool_result",
+              content: `<tool_use_error>${detailedError}</tool_use_error>`,
+              is_error: true,
+              tool_use_id: toolUse.id
+            }
+          ],
+          toolUseResult: detailedError,
+          sourceToolAssistantUUID: assistantMessage2.uuid
+        })
+      };
+    }
   }
 }
 function streamedCheckPermissionsAndCallTool(tool, toolUseID, input, toolUseContext, canUseTool, assistantMessage2, messageId, requestId, mcpServerType, mcpServerBaseUrl) {
@@ -388265,10 +388705,11 @@ async function* queryLoop(params, consumedCommandUuids) {
       let streamingToolExecutor = useStreamingToolExecution ? new StreamingToolExecutor(toolUseContext.options.tools, canUseTool, toolUseContext) : null;
       const appState = toolUseContext.getAppState();
       const permissionMode = appState.toolPermissionContext.mode;
-      const appStateMainLoopModel = appState.mainLoopModelForSession ?? appState.mainLoopModel ?? getDefaultMainLoopModelSetting();
-      let currentModel = getRuntimeMainLoopModel({
+      const sessionModel = appState.mainLoopModelForSession ?? appState.mainLoopModel;
+      let currentModel = resolveQueryTurnModel({
         permissionMode,
-        mainLoopModel: parseUserSpecifiedModel(appStateMainLoopModel),
+        turnModel: toolUseContext.options.mainLoopModel,
+        sessionModel,
         exceeds200kTokens: permissionMode === "plan" && doesMostRecentAssistantMessageExceed200k(messagesForQuery)
       });
       queryCheckpoint("query_setup_end");
@@ -388991,6 +389432,7 @@ var init_query2 = __esm(() => {
   init_messageQueueManager();
   init_headlessProfiler();
   init_model();
+  init_model2();
   init_tokens();
   init_context();
   init_growthbook();
@@ -389080,7 +389522,7 @@ function getAnthropicEnvMetadata() {
 function getBuildAgeMinutes() {
   if (false)
     ;
-  const buildTime = new Date("2026-08-07T00:37:19.823Z").getTime();
+  const buildTime = new Date("2026-08-08T15:44:34.132Z").getTime();
   if (isNaN(buildTime))
     return;
   return Math.floor((Date.now() - buildTime) / 60000);
@@ -390421,8 +390863,14 @@ async function partialCompactConversation(allMessages, pivotIndex, context, cach
   logMemoryDiagnostics("compact-start", memoryDiagExtra);
   maybeLogMemoryHighWatermark("compact-start", memoryDiagExtra);
   try {
-    const messagesToSummarize = direction === "up_to" ? allMessages.slice(0, pivotIndex) : allMessages.slice(pivotIndex);
-    const messagesToKeep = direction === "up_to" ? allMessages.slice(pivotIndex).filter((m) => m.type !== "progress" && !isCompactBoundaryMessage(m) && !(m.type === "user" && m.isCompactSummary)) : allMessages.slice(0, pivotIndex).filter((m) => m.type !== "progress");
+    const requestedStart = direction === "up_to" ? 0 : pivotIndex;
+    const requestedEnd = direction === "up_to" ? pivotIndex : allMessages.length;
+    const summarizeRange = selectToolPairSafeMessageRange(allMessages, requestedStart, requestedEnd, {
+      projectionName: "partial_compact",
+      querySource: "compact"
+    });
+    const messagesToSummarize = summarizeRange.messages;
+    const messagesToKeep = direction === "up_to" ? allMessages.slice(summarizeRange.end).filter((m) => m.type !== "progress" && !isCompactBoundaryMessage(m) && !(m.type === "user" && m.isCompactSummary)) : allMessages.slice(0, summarizeRange.start).filter((m) => m.type !== "progress");
     if (messagesToSummarize.length === 0) {
       throw new Error(direction === "up_to" ? "Nothing to summarize before the selected message." : "Nothing to summarize after the selected message.");
     }
@@ -405047,7 +405495,7 @@ function createToolUseSummaryMessage(summary, precedingToolUseIds) {
     timestamp: new Date().toISOString()
   };
 }
-function ensureToolResultPairing(messages) {
+function ensureToolResultPairing(messages, context = {}) {
   const result = [];
   let repaired = false;
   const allSeenToolUseIds = new Set;
@@ -405187,6 +405635,7 @@ function ensureToolResultPairing(messages) {
     }
   }
   if (repaired) {
+    const validation = validateToolResultPairing(messages, context);
     const messageTypes = messages.map((m, idx) => {
       if (m.type === "assistant") {
         const toolUses = m.message.content.filter((b) => b.type === "tool_use").map((b) => b.id);
@@ -405209,14 +405658,26 @@ function ensureToolResultPairing(messages) {
       return `[${idx}] ${m.type}`;
     });
     if (getStrictToolResultPairing()) {
-      throw new Error(`ensureToolResultPairing: tool_use/tool_result pairing mismatch detected (strict mode). ` + `Refusing to repair — would inject synthetic placeholders into model context. ` + `Message structure: ${messageTypes.join("; ")}. See inc-4977.`);
+      throw new Error(`ensureToolResultPairing: tool_use/tool_result pairing mismatch detected (strict mode). ` + `Refusing to repair — would inject synthetic placeholders into model context. ` + `Phase: ${validation.context.phase ?? "unknown"}. ` + `Issues: ${validation.issues.map(formatToolResultPairingIssue).join("; ") || "none"}. ` + `Message structure: ${messageTypes.join("; ")}. See inc-4977.`);
     }
+    const issueKinds = [
+      ...new Set(validation.issues.map((issue2) => issue2.kind))
+    ].join(",");
+    const issueSummary = validation.issues.map(formatToolResultPairingIssue).join("; ") || "none";
+    const diagnosticContext = `Phase: ${validation.context.phase ?? "unknown"}. ` + `Query source: ${validation.context.querySource ?? "unknown"}. ` + `Provider: ${validation.context.provider ?? "unknown"}. ` + `Model: ${validation.context.model ?? "unknown"}. ` + `Issues: ${issueSummary}.`;
     logEvent("tengu_tool_result_pairing_repaired", {
       messageCount: messages.length,
       repairedMessageCount: result.length,
+      issueCount: validation.issues.length,
+      phase: validation.context.phase ?? "unknown",
+      querySource: validation.context.querySource ?? "unknown",
+      agentId: validation.context.agentId ?? "none",
+      model: validation.context.model ?? "unknown",
+      provider: validation.context.provider ?? "unknown",
+      issueKinds: issueKinds || "none",
       messageTypes: messageTypes.join("; ")
     });
-    logError2(new Error(`ensureToolResultPairing: repaired missing tool_result blocks (${messages.length} -> ${result.length} messages). Message structure: ${messageTypes.join("; ")}`));
+    logError2(new Error(`ensureToolResultPairing: repaired missing tool_result blocks (${messages.length} -> ${result.length} messages). ${diagnosticContext} Message structure: ${messageTypes.join("; ")}`));
   }
   return result;
 }
@@ -405340,11 +405801,13 @@ var init_messages3 = __esm(() => {
   init_imageValidation();
   init_json();
   init_log3();
+  init_toolPairing();
   init_permissionRuleParser();
   init_planModeV2();
   init_stringUtils();
   init_tasks();
   init_toolSearch();
+  init_toolPairing();
   DENIAL_WORKAROUND_GUIDANCE = `IMPORTANT: You *may* attempt to accomplish this action using other tools that might naturally be used to accomplish this goal, ` + `e.g. using head instead of cat. But you *should not* attempt to work around this denial in malicious ways, ` + `e.g. do not use your ability to run tests to execute non-test actions. ` + `You should only try to work around this restriction in reasonable ways that do not attempt to bypass the intent behind this denial. ` + `If you believe this capability is essential to complete the user's request, STOP and explain to the user ` + `what you were trying to do and why you need this permission. Let the user decide how to proceed.`;
   SYNTHETIC_MESSAGES = new Set([
     INTERRUPT_MESSAGE,
@@ -417485,7 +417948,13 @@ async function* queryModel(messages, systemPrompt, thinkingConfig, tools, signal
       }
     });
   }
-  messagesForAPI = ensureToolResultPairing(messagesForAPI);
+  messagesForAPI = ensureToolResultPairing(messagesForAPI, {
+    phase: "api_before_repair",
+    querySource: options2.querySource,
+    agentId: options2.agentId,
+    model: options2.model,
+    provider: getAPIProvider()
+  });
   if (!betas.includes(ADVISOR_BETA_HEADER)) {
     messagesForAPI = stripAdvisorBlocks(messagesForAPI);
   }
@@ -430741,7 +431210,7 @@ function buildPrimarySection() {
   });
   return [{
     label: "Version",
-    value: "0.15.3"
+    value: "0.15.5"
   }, {
     label: "Session name",
     value: nameValue
@@ -444627,7 +445096,7 @@ function getReleaseTagUrl(version2 = publicBuildVersion) {
   return `${VERBOO_RELEASES_URL}/tag/v${normalizePublicVersion(version2)}`;
 }
 function getPublicBuildVersion() {
-  return "0.15.3";
+  return "0.15.5";
 }
 var import_semver10, VERBOO_RELEASES_URL = "https://github.com/verbeux-ai/code/releases", fallbackBuildVersion, publicBuildVersion;
 var init_version = __esm(() => {
@@ -496020,7 +496489,7 @@ var init_bridge_kick = __esm(() => {
 var call66 = async () => {
   return {
     type: "text",
-    value: `${"99.0.0"} (built ${"2026-08-07T00:37:19.823Z"})`
+    value: `${"99.0.0"} (built ${"2026-08-08T15:44:34.132Z"})`
   };
 }, version2, version_default;
 var init_version2 = __esm(() => {
@@ -500452,7 +500921,7 @@ var React123, jsx_runtime354, call74 = async (onDone, context2, args) => {
     onDone
   });
 };
-var init_model2 = __esm(() => {
+var init_model3 = __esm(() => {
   init_source2();
   init_ModelPicker();
   init_xml();
@@ -500486,7 +500955,7 @@ var init_model2 = __esm(() => {
 
 // src/commands/model/index.ts
 var model_default;
-var init_model3 = __esm(() => {
+var init_model4 = __esm(() => {
   init_immediateCommand();
   init_model();
   model_default = {
@@ -500499,7 +500968,7 @@ var init_model3 = __esm(() => {
     get immediate() {
       return shouldInferenceConfigCommandBeImmediate();
     },
-    load: () => Promise.resolve().then(() => (init_model2(), exports_model2))
+    load: () => Promise.resolve().then(() => (init_model3(), exports_model2))
   };
 });
 
@@ -508306,7 +508775,7 @@ var init_commands2 = __esm(() => {
   init_env2();
   init_exit2();
   init_export2();
-  init_model3();
+  init_model4();
   init_tag2();
   init_output_style();
   init_remote_env2();
@@ -520286,7 +520755,7 @@ function printStartupScreen(modelOverride) {
   const home = process.env.HOME || process.env.USERPROFILE || "";
   const cwd2 = process.cwd();
   const displayCwd = home && cwd2.startsWith(home) ? `~${cwd2.slice(home.length)}` : cwd2;
-  const version3 = "0.15.3";
+  const version3 = "0.15.5";
   const columns = process.stdout.columns ?? STARTUP_LOGO_MIN_COLUMNS;
   process.stdout.write(renderStartupScreen(p, version3, displayCwd, columns));
 }
@@ -539530,7 +539999,7 @@ var init_routerRateLimitHook = __esm(() => {
 function getSemverPart(version3) {
   return `${import_semver13.major(version3, { loose: true })}.${import_semver13.minor(version3, { loose: true })}.${import_semver13.patch(version3, { loose: true })}`;
 }
-function useUpdateNotification(updatedVersion, initialVersion = "0.15.3") {
+function useUpdateNotification(updatedVersion, initialVersion = "0.15.5") {
   const [lastNotifiedSemver, setLastNotifiedSemver] = import_react227.useState(() => getSemverPart(initialVersion));
   const [pendingNotification2, setPendingNotification] = import_react227.useState(null);
   if (updatedVersion) {
@@ -539570,7 +540039,7 @@ function AutoUpdater({
       return;
     }
     if (false) {}
-    const currentVersion = "0.15.3";
+    const currentVersion = "0.15.5";
     const channel2 = getInitialSettings()?.autoUpdatesChannel ?? "latest";
     let latestVersion = await getLatestVersion(channel2);
     const isDisabled = isAutoUpdaterDisabled();
@@ -539923,17 +540392,17 @@ function PackageManagerAutoUpdater(t0) {
       const maxVersion = await getMaxVersion();
       if (maxVersion && latest && gt(latest, maxVersion)) {
         logForDebugging(`PackageManagerAutoUpdater: maxVersion ${maxVersion} is set, capping update from ${latest} to ${maxVersion}`);
-        if (gte("0.15.3", maxVersion)) {
-          logForDebugging(`PackageManagerAutoUpdater: current version ${"0.15.3"} is already at or above maxVersion ${maxVersion}, skipping update`);
+        if (gte("0.15.5", maxVersion)) {
+          logForDebugging(`PackageManagerAutoUpdater: current version ${"0.15.5"} is already at or above maxVersion ${maxVersion}, skipping update`);
           setUpdateAvailable(false);
           return;
         }
         latest = maxVersion;
       }
-      const hasUpdate = latest && !gte("0.15.3", latest) && !shouldSkipVersion(latest);
+      const hasUpdate = latest && !gte("0.15.5", latest) && !shouldSkipVersion(latest);
       setUpdateAvailable(!!hasUpdate);
       if (hasUpdate) {
-        logForDebugging(`PackageManagerAutoUpdater: Update available ${"0.15.3"} -> ${latest}`);
+        logForDebugging(`PackageManagerAutoUpdater: Update available ${"0.15.5"} -> ${latest}`);
       }
     };
     $2[0] = t1;
@@ -539967,7 +540436,7 @@ function PackageManagerAutoUpdater(t0) {
       wrap: "truncate",
       children: [
         "currentVersion: ",
-        "0.15.3"
+        "0.15.5"
       ]
     });
     $2[3] = verbose;
@@ -555985,10 +556454,10 @@ async function autoUpdateCliInBackground() {
       return;
     const channel2 = getInitialSettings()?.autoUpdatesChannel ?? "latest";
     const latest = await getLatestVersion(channel2);
-    if (!latest || gte("0.15.3", latest))
+    if (!latest || gte("0.15.5", latest))
       return;
     writeToStdout(`
-Nova versão disponível: ${latest} (atual: ${"0.15.3"})
+Nova versão disponível: ${latest} (atual: ${"0.15.5"})
 `);
     writeToStdout(`Atualizando automaticamente...
 `);
@@ -561921,7 +562390,13 @@ async function generateAwaySummary(messages, signal) {
   }
   try {
     const memory2 = await getSessionMemoryContent();
-    const recent = messages.slice(-RECENT_MESSAGE_WINDOW);
+    const requestedStart = Math.max(0, messages.length - RECENT_MESSAGE_WINDOW);
+    const recentRange = selectToolPairSafeMessageRange(messages, requestedStart, messages.length, {
+      projectionName: "away_summary",
+      querySource: "away_summary",
+      maxExtraMessages: RECENT_MESSAGE_WINDOW
+    });
+    const recent = [...recentRange.messages];
     recent.push(createUserMessage({ content: buildAwaySummaryPrompt(memory2) }));
     const response = await queryModelWithoutStreaming({
       messages: recent,
@@ -574201,7 +574676,7 @@ function WelcomeV2() {
             dimColor: true,
             children: [
               "v",
-              "0.15.3",
+              "0.15.5",
               " "
             ]
           })
@@ -574388,7 +574863,7 @@ function WelcomeV2() {
           dimColor: true,
           children: [
             "v",
-            "0.15.3",
+            "0.15.5",
             " "
           ]
         })
@@ -574604,7 +575079,7 @@ function AppleTerminalWelcomeV2(t0) {
         dimColor: true,
         children: [
           "v",
-          "0.15.3",
+          "0.15.5",
           " "
         ]
       });
@@ -574813,7 +575288,7 @@ function AppleTerminalWelcomeV2(t0) {
       dimColor: true,
       children: [
         "v",
-        "0.15.3",
+        "0.15.5",
         " "
       ]
     });
@@ -593269,7 +593744,7 @@ __export(exports_update, {
 });
 async function update() {
   logEvent("tengu_update_check", {});
-  writeToStdout(`Current version: ${"0.15.3"}
+  writeToStdout(`Current version: ${"0.15.5"}
 `);
   const channel2 = getInitialSettings()?.autoUpdatesChannel ?? "latest";
   writeToStdout(`Checking for updates to ${channel2} version...
@@ -593354,8 +593829,8 @@ async function update() {
       writeToStdout(`Verboo Code is managed by Homebrew.
 `);
       const latest = await getLatestVersion(channel2);
-      if (latest && !gte("0.15.3", latest)) {
-        writeToStdout(`Update available: ${"0.15.3"} → ${latest}
+      if (latest && !gte("0.15.5", latest)) {
+        writeToStdout(`Update available: ${"0.15.5"} → ${latest}
 `);
         writeToStdout(`
 `);
@@ -593371,8 +593846,8 @@ async function update() {
       writeToStdout(`Verboo Code is managed by winget.
 `);
       const latest = await getLatestVersion(channel2);
-      if (latest && !gte("0.15.3", latest)) {
-        writeToStdout(`Update available: ${"0.15.3"} → ${latest}
+      if (latest && !gte("0.15.5", latest)) {
+        writeToStdout(`Update available: ${"0.15.5"} → ${latest}
 `);
         writeToStdout(`
 `);
@@ -593388,8 +593863,8 @@ async function update() {
       writeToStdout(`Verboo Code is managed by apk.
 `);
       const latest = await getLatestVersion(channel2);
-      if (latest && !gte("0.15.3", latest)) {
-        writeToStdout(`Update available: ${"0.15.3"} → ${latest}
+      if (latest && !gte("0.15.5", latest)) {
+        writeToStdout(`Update available: ${"0.15.5"} → ${latest}
 `);
         writeToStdout(`
 `);
@@ -593442,11 +593917,11 @@ async function update() {
 `);
         await gracefulShutdown(1);
       }
-      if (result.latestVersion === "0.15.3") {
-        writeToStdout(source_default.green(`Verboo Code is up to date (${"0.15.3"})`) + `
+      if (result.latestVersion === "0.15.5") {
+        writeToStdout(source_default.green(`Verboo Code is up to date (${"0.15.5"})`) + `
 `);
       } else {
-        writeToStdout(source_default.green(`Successfully updated from ${"0.15.3"} to version ${result.latestVersion}`) + `
+        writeToStdout(source_default.green(`Successfully updated from ${"0.15.5"} to version ${result.latestVersion}`) + `
 `);
         await regenerateCompletionCache();
       }
@@ -593506,12 +593981,12 @@ async function update() {
 `);
     await gracefulShutdown(1);
   }
-  if (latestVersion === "0.15.3") {
-    writeToStdout(source_default.green(`Verboo Code is up to date (${"0.15.3"})`) + `
+  if (latestVersion === "0.15.5") {
+    writeToStdout(source_default.green(`Verboo Code is up to date (${"0.15.5"})`) + `
 `);
     await gracefulShutdown(0);
   }
-  writeToStdout(`New version available: ${latestVersion} (current: ${"0.15.3"})
+  writeToStdout(`New version available: ${latestVersion} (current: ${"0.15.5"})
 `);
   writeToStdout(`Installing update...
 `);
@@ -593556,7 +594031,7 @@ async function update() {
   logForDebugging(`update: Installation status: ${status2}`);
   switch (status2) {
     case "success":
-      writeToStdout(source_default.green(`Successfully updated from ${"0.15.3"} to version ${latestVersion}`) + `
+      writeToStdout(source_default.green(`Successfully updated from ${"0.15.5"} to version ${latestVersion}`) + `
 `);
       await regenerateCompletionCache();
       break;
@@ -594875,7 +595350,7 @@ ${customInstructions}` : customInstructions;
       is_native_binary: isInBundledMode()
     });
     logMemoryDiagnostics("start", {
-      version: "0.15.3",
+      version: "0.15.5",
       debug: debug2,
       debugToStderr,
       print: print ?? false,
@@ -595686,7 +596161,7 @@ Usage: verboo --remote "your task description"`, () => gracefulShutdown(1));
         pendingHookMessages
       }, renderAndRun);
     }
-  }).version(`0.15.3 (${cliDesc})`, "-v, --version", "Output the version number");
+  }).version(`0.15.5 (${cliDesc})`, "-v, --version", "Output the version number");
   program2.option("-w, --worktree [name]", "Create a new git worktree for this session (optionally specify a name)");
   program2.option("--tmux", "Create a tmux session for the worktree (requires --worktree). Uses iTerm2 native panes when available; use --tmux=classic for traditional tmux.");
   if (canUserConfigureAdvisor()) {
@@ -596267,7 +596742,7 @@ if (false) {}
 async function main2() {
   const args = process.argv.slice(2);
   if (args.length === 1 && (args[0] === "--version" || args[0] === "-v" || args[0] === "-V")) {
-    console.log(`${"0.15.3"} (Verboo Code)`);
+    console.log(`${"0.15.5"} (Verboo Code)`);
     return;
   }
   if (!IS_VERBOO_CLI && args.includes("--provider")) {
@@ -596441,4 +596916,4 @@ async function main2() {
 }
 main2();
 
-//# debugId=AD4F17ADE1D4CF4564756E2164756E21
+//# debugId=239F034E22FCB0DD64756E2164756E21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@verboo/code",
-  "version": "0.15.3",
+  "version": "0.15.5",
   "description": "Verboo Code — coding agent for the Verboo platform",
   "type": "module",
   "bin": {