titan-agent 6.5.2 → 7.0.0

package/dist/agent/agentLoop.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 import { chat, chatStream } from "../providers/router.js";
 import { executeTools } from "./toolRunner.js";
+import { runWithSession } from "../watch/sessionContext.js";
 import { drainPendingResults, getAgentInbox, claimWakeupRequest } from "./agentWakeup.js";
 import { setCurrentSessionId } from "./agent.js";
 import { hasActionDirectives, compileActions } from "./actionCompiler.js";
@@ -448,6 +449,7 @@ async function runAgentLoop(ctx) {
   let responseValidationRetried = false;
   let emptyResponseRetried = false;
   let forceWriteOnNextThink = false;
+  let loopBreakerActive = false;
   let budgetWarningSent = false;
   let pendingToolCalls = [];
   let pendingAssistantContent = "";
@@ -1072,7 +1074,7 @@ ${gateText}` : gateText;
         let toolResults = [];
         try {
           const toolExecStart = Date.now();
-          toolResults = await executeTools(pendingToolCalls, ctx.channel);
+          toolResults = await runWithSession({ sessionId: ctx.sessionId, agentId: ctx.agentId }, () => executeTools(pendingToolCalls, ctx.channel));
           fireSpan(traceCtx, "tool_execution", Date.now() - toolExecStart, { round: String(round), tools: pendingToolCalls.map((t) => t.function.name).join(",") });
         } catch (err) {
           logger.error(COMPONENT, `Tool execution error: ${err.message}`);
@@ -1235,6 +1237,7 @@ Examples: use read_file instead of cat/head/tail/grep, and edit_file instead of
             });
             phase = "respond";
             loopBroken = true;
+            loopBreakerActive = true;
             break;
           }
           if ((tr.name === "shell" || tr.name === "list_dir" || tr.name === "read_file") && round >= 3) {
@@ -1306,6 +1309,7 @@ Examples: use read_file instead of cat/head/tail/grep, and edit_file instead of
           logger.info(COMPONENT, `[Verifier] Injected feedback for ${verifierFlags.length} failed tool call(s)`);
         }
         if (loopBroken) {
+          round++;
           break;
         }
         if (ctx.reflectionEnabled && toolResults.length > 0) {
@@ -1552,7 +1556,7 @@ Examples: use read_file instead of cat/head/tail/grep, and edit_file instead of
         result.modelUsed = response.model;
         result.promptTokens += response.usage?.promptTokens || 0;
         result.completionTokens += response.usage?.completionTokens || 0;
-        if (response.toolCalls && response.toolCalls.length > 0) {
+        if (response.toolCalls && response.toolCalls.length > 0 && !loopBreakerActive) {
           logger.warn(
             COMPONENT,
             `[RespondPhaseToolCall] Model emitted ${response.toolCalls.length} tool call(s) in respond phase \u2014 routing back to think phase to execute (Hunt #39)`