@corbat-tech/coco 2.8.0 → 2.8.1

package/dist/cli/index.js

@@ -1012,22 +1012,38 @@ var init_anthropic = __esm({
       async *stream(messages, options) {
         this.ensureInitialized();
         try {
-          const stream = await this.client.messages.stream({
-            model: options?.model ?? this.config.model ?? DEFAULT_MODEL,
-            max_tokens: options?.maxTokens ?? this.config.maxTokens ?? 8192,
-            temperature: options?.temperature ?? this.config.temperature ?? 0,
-            system: this.extractSystem(messages, options?.system),
-            messages: this.convertMessages(messages)
-          });
-          for await (const event of stream) {
-            if (event.type === "content_block_delta") {
-              const delta = event.delta;
-              if (delta.type === "text_delta" && delta.text) {
-                yield { type: "text", text: delta.text };
+          const stream = await this.client.messages.stream(
+            {
+              model: options?.model ?? this.config.model ?? DEFAULT_MODEL,
+              max_tokens: options?.maxTokens ?? this.config.maxTokens ?? 8192,
+              temperature: options?.temperature ?? this.config.temperature ?? 0,
+              system: this.extractSystem(messages, options?.system),
+              messages: this.convertMessages(messages)
+            },
+            { signal: options?.signal }
+          );
+          const streamTimeout = this.config.timeout ?? 12e4;
+          let lastActivityTime = Date.now();
+          const checkTimeout = () => {
+            if (Date.now() - lastActivityTime > streamTimeout) {
+              throw new Error(`Stream timeout: No response from LLM for ${streamTimeout / 1e3}s`);
+            }
+          };
+          const timeoutInterval = setInterval(checkTimeout, 5e3);
+          try {
+            for await (const event of stream) {
+              lastActivityTime = Date.now();
+              if (event.type === "content_block_delta") {
+                const delta = event.delta;
+                if (delta.type === "text_delta" && delta.text) {
+                  yield { type: "text", text: delta.text };
+                }
               }
             }
+            yield { type: "done" };
+          } finally {
+            clearInterval(timeoutInterval);
           }
-          yield { type: "done" };
         } catch (error) {
           throw this.handleError(error);
         }
@@ -1038,90 +1054,106 @@ var init_anthropic = __esm({
       async *streamWithTools(messages, options) {
         this.ensureInitialized();
         try {
-          const stream = await this.client.messages.stream({
-            model: options?.model ?? this.config.model ?? DEFAULT_MODEL,
-            max_tokens: options?.maxTokens ?? this.config.maxTokens ?? 8192,
-            temperature: options?.temperature ?? this.config.temperature ?? 0,
-            system: this.extractSystem(messages, options?.system),
-            messages: this.convertMessages(messages),
-            tools: this.convertTools(options.tools),
-            tool_choice: options.toolChoice ? this.convertToolChoice(options.toolChoice) : void 0
-          });
+          const stream = await this.client.messages.stream(
+            {
+              model: options?.model ?? this.config.model ?? DEFAULT_MODEL,
+              max_tokens: options?.maxTokens ?? this.config.maxTokens ?? 8192,
+              temperature: options?.temperature ?? this.config.temperature ?? 0,
+              system: this.extractSystem(messages, options?.system),
+              messages: this.convertMessages(messages),
+              tools: this.convertTools(options.tools),
+              tool_choice: options.toolChoice ? this.convertToolChoice(options.toolChoice) : void 0
+            },
+            { signal: options?.signal }
+          );
           let currentToolCall = null;
           let currentToolInputJson = "";
-          for await (const event of stream) {
-            if (event.type === "content_block_start") {
-              const contentBlock = event.content_block;
-              if (contentBlock.type === "tool_use") {
+          const streamTimeout = this.config.timeout ?? 12e4;
+          let lastActivityTime = Date.now();
+          const checkTimeout = () => {
+            if (Date.now() - lastActivityTime > streamTimeout) {
+              throw new Error(`Stream timeout: No response from LLM for ${streamTimeout / 1e3}s`);
+            }
+          };
+          const timeoutInterval = setInterval(checkTimeout, 5e3);
+          try {
+            for await (const event of stream) {
+              lastActivityTime = Date.now();
+              if (event.type === "content_block_start") {
+                const contentBlock = event.content_block;
+                if (contentBlock.type === "tool_use") {
+                  if (currentToolCall) {
+                    getLogger().warn(
+                      `[Anthropic] content_block_stop missing for tool '${currentToolCall.name}' \u2014 finalizing early to prevent data bleed.`
+                    );
+                    try {
+                      currentToolCall.input = currentToolInputJson ? JSON.parse(currentToolInputJson) : {};
+                    } catch {
+                      currentToolCall.input = {};
+                    }
+                    yield {
+                      type: "tool_use_end",
+                      toolCall: { ...currentToolCall }
+                    };
+                  }
+                  currentToolCall = {
+                    id: contentBlock.id,
+                    name: contentBlock.name
+                  };
+                  currentToolInputJson = "";
+                  yield {
+                    type: "tool_use_start",
+                    toolCall: { ...currentToolCall }
+                  };
+                }
+              } else if (event.type === "content_block_delta") {
+                const delta = event.delta;
+                if (delta.type === "text_delta" && delta.text) {
+                  yield { type: "text", text: delta.text };
+                } else if (delta.type === "input_json_delta" && delta.partial_json) {
+                  currentToolInputJson += delta.partial_json;
+                  yield {
+                    type: "tool_use_delta",
+                    toolCall: {
+                      ...currentToolCall
+                    },
+                    text: delta.partial_json
+                  };
+                }
+              } else if (event.type === "content_block_stop") {
                 if (currentToolCall) {
-                  getLogger().warn(
-                    `[Anthropic] content_block_stop missing for tool '${currentToolCall.name}' \u2014 finalizing early to prevent data bleed.`
-                  );
                   try {
                     currentToolCall.input = currentToolInputJson ? JSON.parse(currentToolInputJson) : {};
                   } catch {
-                    currentToolCall.input = {};
+                    let repaired = false;
+                    if (currentToolInputJson) {
+                      try {
+                        currentToolCall.input = JSON.parse(jsonrepair(currentToolInputJson));
+                        repaired = true;
+                        getLogger().debug(`Repaired JSON for tool ${currentToolCall.name}`);
+                      } catch {
+                      }
+                    }
+                    if (!repaired) {
+                      getLogger().warn(
+                        `Failed to parse tool call arguments for ${currentToolCall.name}: ${currentToolInputJson?.slice(0, 300)}`
+                      );
+                      currentToolCall.input = {};
+                    }
                   }
                   yield {
                     type: "tool_use_end",
                     toolCall: { ...currentToolCall }
                   };
+                  currentToolCall = null;
+                  currentToolInputJson = "";
                 }
-                currentToolCall = {
-                  id: contentBlock.id,
-                  name: contentBlock.name
-                };
-                currentToolInputJson = "";
-                yield {
-                  type: "tool_use_start",
-                  toolCall: { ...currentToolCall }
-                };
-              }
-            } else if (event.type === "content_block_delta") {
-              const delta = event.delta;
-              if (delta.type === "text_delta" && delta.text) {
-                yield { type: "text", text: delta.text };
-              } else if (delta.type === "input_json_delta" && delta.partial_json) {
-                currentToolInputJson += delta.partial_json;
-                yield {
-                  type: "tool_use_delta",
-                  toolCall: {
-                    ...currentToolCall
-                  },
-                  text: delta.partial_json
-                };
-              }
-            } else if (event.type === "content_block_stop") {
-              if (currentToolCall) {
-                try {
-                  currentToolCall.input = currentToolInputJson ? JSON.parse(currentToolInputJson) : {};
-                } catch {
-                  let repaired = false;
-                  if (currentToolInputJson) {
-                    try {
-                      currentToolCall.input = JSON.parse(jsonrepair(currentToolInputJson));
-                      repaired = true;
-                      getLogger().debug(`Repaired JSON for tool ${currentToolCall.name}`);
-                    } catch {
-                    }
-                  }
-                  if (!repaired) {
-                    getLogger().warn(
-                      `Failed to parse tool call arguments for ${currentToolCall.name}: ${currentToolInputJson?.slice(0, 300)}`
-                    );
-                    currentToolCall.input = {};
-                  }
-                }
-                yield {
-                  type: "tool_use_end",
-                  toolCall: { ...currentToolCall }
-                };
-                currentToolCall = null;
-                currentToolInputJson = "";
               }
             }
+            yield { type: "done" };
+          } finally {
+            clearInterval(timeoutInterval);
           }
-          yield { type: "done" };
         } catch (error) {
           throw this.handleError(error);
         }
@@ -6564,7 +6596,7 @@ CONVERSATION:
        * @param provider - The LLM provider to use for summarization
        * @returns Compacted messages with summary replacing older messages
        */
-      async compact(messages, provider) {
+      async compact(messages, provider, signal) {
         const conversationMessages = messages.filter((m) => m.role !== "system");
         if (conversationMessages.length <= this.config.preserveLastN) {
           return {
@@ -6596,7 +6628,7 @@ CONVERSATION:
         }
         const originalTokens = this.estimateTokens(messages, provider);
         const conversationText = this.formatMessagesForSummary(messagesToSummarize);
-        const summary = await this.generateSummary(conversationText, provider);
+        const summary = await this.generateSummary(conversationText, provider, signal);
         const systemMessages = messages.filter((m) => m.role === "system");
         const summaryMessage = {
           role: "user",
@@ -6650,16 +6682,30 @@ ${summary}
       /**
        * Generate a summary of the conversation using the LLM
        */
-      async generateSummary(conversationText, provider) {
+      async generateSummary(conversationText, provider, signal) {
+        if (signal?.aborted) return "[Compaction cancelled]";
         const prompt = COMPACTION_PROMPT + conversationText;
         try {
-          const response = await provider.chat([{ role: "user", content: prompt }], {
+          const chatPromise = provider.chat([{ role: "user", content: prompt }], {
             maxTokens: this.config.summaryMaxTokens,
             temperature: 0.3
             // Lower temperature for more consistent summaries
           });
+          if (signal) {
+            const abortPromise = new Promise((_, reject) => {
+              signal.addEventListener(
+                "abort",
+                () => reject(new DOMException("Aborted", "AbortError")),
+                { once: true }
+              );
+            });
+            const response2 = await Promise.race([chatPromise, abortPromise]);
+            return response2.content;
+          }
+          const response = await chatPromise;
           return response.content;
         } catch (error) {
+          if (error instanceof DOMException && error.name === "AbortError") throw error;
           const errorMessage = error instanceof Error ? error.message : String(error);
           return `[Summary generation failed: ${errorMessage}. Previous conversation had ${conversationText.length} characters.]`;
         }
@@ -6795,7 +6841,14 @@ function addMessage(session, message) {
   session.messages.push(message);
   const maxMessages = session.config.ui.maxHistorySize * 2;
   if (session.messages.length > maxMessages) {
-    session.messages = session.messages.slice(-session.config.ui.maxHistorySize);
+    let sliceStart = session.messages.length - session.config.ui.maxHistorySize;
+    while (sliceStart > 0 && sliceStart < session.messages.length) {
+      const msg = session.messages[sliceStart];
+      const isToolResult = Array.isArray(msg?.content) && msg.content.length > 0 && msg.content[0]?.type === "tool_result";
+      if (!isToolResult) break;
+      sliceStart--;
+    }
+    session.messages = session.messages.slice(sliceStart);
   }
 }
 function substituteDynamicContext(body, cwd) {
@@ -7062,7 +7115,7 @@ function updateContextTokens(session, provider) {
   }
   session.contextManager.setUsedTokens(totalTokens);
 }
-async function checkAndCompactContext(session, provider) {
+async function checkAndCompactContext(session, provider, signal) {
   if (!session.contextManager) {
     initializeContextManager(session, provider);
   }
@@ -7074,7 +7127,7 @@ async function checkAndCompactContext(session, provider) {
     preserveLastN: 4,
     summaryMaxTokens: 1e3
   });
-  const result = await compactor.compact(session.messages, provider);
+  const result = await compactor.compact(session.messages, provider, signal);
   if (result.wasCompacted) {
     const compactedNonSystem = result.messages.filter((m) => m.role !== "system");
     session.messages = compactedNonSystem;
@@ -44590,7 +44643,8 @@ async function executeAgentTurn(session, userMessage, provider, toolRegistry, op
     const toolCallBuilders = /* @__PURE__ */ new Map();
     for await (const chunk of provider.streamWithTools(messages, {
       tools,
-      maxTokens: session.config.provider.maxTokens
+      maxTokens: session.config.provider.maxTokens,
+      signal: options.signal
     })) {
       if (options.signal?.aborted) {
         break;
@@ -44864,7 +44918,8 @@ async function executeAgentTurn(session, userMessage, provider, toolRegistry, op
         const finalMessages = getConversationContext(session, toolRegistry);
         for await (const chunk of provider.streamWithTools(finalMessages, {
           tools: [],
-          maxTokens: session.config.provider.maxTokens
+          maxTokens: session.config.provider.maxTokens,
+          signal: options.signal
         })) {
           if (options.signal?.aborted) break;
           if (chunk.type === "text" && chunk.text) {
@@ -46059,16 +46114,33 @@ async function startRepl(options = {}) {
       const usageBefore = getContextUsagePercent(session);
       let usageForDisplay = usageBefore;
       try {
-        const compactionResult = await checkAndCompactContext(session, provider);
-        if (compactionResult?.wasCompacted) {
-          usageForDisplay = getContextUsagePercent(session);
-          console.log(
-            chalk25.dim(
-              `Context compacted (${usageBefore.toFixed(0)}% -> ${usageForDisplay.toFixed(0)}%)`
-            )
+        const compactAbort = new AbortController();
+        const compactTimeout = setTimeout(() => compactAbort.abort(), 3e4);
+        const compactSigint = () => compactAbort.abort();
+        process.once("SIGINT", compactSigint);
+        const compactSpinner = createSpinner("Compacting context");
+        compactSpinner.start();
+        try {
+          const compactionResult = await checkAndCompactContext(
+            session,
+            provider,
+            compactAbort.signal
           );
-          warned75 = false;
-          warned90 = false;
+          if (compactionResult?.wasCompacted) {
+            usageForDisplay = getContextUsagePercent(session);
+            compactSpinner.stop(
+              `Context compacted (${usageBefore.toFixed(0)}% \u2192 ${usageForDisplay.toFixed(0)}%)`
+            );
+            warned75 = false;
+            warned90 = false;
+          } else {
+            compactSpinner.clear();
+          }
+        } catch {
+          compactSpinner.clear();
+        } finally {
+          clearTimeout(compactTimeout);
+          process.off("SIGINT", compactSigint);
         }
       } catch {
       }