@tractorscorch/clank 1.4.6 → 1.4.8

package/CHANGELOG.md

@@ -6,6 +6,22 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
 ---
 
+## [1.4.8] — 2026-03-22
+
+### Fixed
+- **Model hangs permanently after tool calls** — provider timeout was bypassed when the engine passed its own AbortSignal (always); now uses `AbortSignal.any()` to combine the caller's signal with a hard 120s timeout so hung models are detected and reported instead of blocking forever
+- **No retry on timeout** — engine no longer retries when a model times out (was doubling the wait to 240s with no chance of success); timeouts propagate immediately as errors
+
+---
+
+## [1.4.7] — 2026-03-22
+
+### Fixed
+- **Tool calling crashes gateway** — context compaction could split tool call / tool result message pairs, sending orphaned messages to Ollama which returns 400 errors and corrupts the session permanently; compaction now drops complete pairs together
+- **Orphaned tool result safety net** — Ollama provider now filters out orphaned tool results before sending to the API, preventing 400 errors even if compaction misses a pair
+
+---
+
 ## [1.4.6] — 2026-03-22
 
 ### Fixed

package/README.md

@@ -9,7 +9,7 @@
 </p>
 
 <p align="center">
-  <a href="https://github.com/ItsTrag1c/Clank/releases/latest"><img src="https://img.shields.io/badge/version-1.4.6-blue.svg" alt="Version" /></a>
+  <a href="https://github.com/ItsTrag1c/Clank/releases/latest"><img src="https://img.shields.io/badge/version-1.4.8-blue.svg" alt="Version" /></a>
   <a href="https://opensource.org/licenses/MIT"><img src="https://img.shields.io/badge/License-MIT-blue.svg" alt="License" /></a>
   <a href="https://www.npmjs.com/package/@tractorscorch/clank"><img src="https://img.shields.io/npm/v/@tractorscorch/clank.svg" alt="npm" /></a>
   <a href="https://github.com/ItsTrag1c/Clank/stargazers"><img src="https://img.shields.io/github/stars/ItsTrag1c/Clank.svg" alt="Stars" /></a>
@@ -75,7 +75,7 @@ That's it. Setup auto-detects your local models, configures the gateway, and get
 | Platform | Download |
 |----------|----------|
 | **npm** (all platforms) | `npm install -g @tractorscorch/clank` |
-| **macOS** (Apple Silicon) | [Clank_1.4.6_macos](https://github.com/ItsTrag1c/Clank/releases/latest/download/Clank_1.4.6_macos) |
+| **macOS** (Apple Silicon) | [Clank_1.4.8_macos](https://github.com/ItsTrag1c/Clank/releases/latest/download/Clank_1.4.8_macos) |
 
 ## Features
 

package/dist/index.js

@@ -216,6 +216,8 @@ var init_context_engine = __esm({
       }
       /**
        * Tier 1 aggressive: drop oldest messages when regular compaction isn't enough.
+       * Drops tool call + tool result pairs together to avoid orphaned messages
+       * that cause API errors (Ollama/OpenAI require matching pairs).
        */
       compactTier1Aggressive() {
         const protectedCount = 6;
@@ -223,7 +225,38 @@ var init_context_engine = __esm({
         while (this.estimateTokens() > budget.conversation * 0.7 && this.messages.length > protectedCount + 2) {
           const dropIdx = this.messages.findIndex((m) => m.role !== "system");
           if (dropIdx === -1 || dropIdx >= this.messages.length - protectedCount) break;
-          this.messages.splice(dropIdx, 1);
+          const msg = this.messages[dropIdx];
+          if (msg.role === "assistant" && msg.tool_calls && msg.tool_calls.length > 0) {
+            const toolCallIds = new Set(msg.tool_calls.map((tc) => tc.id));
+            this.messages.splice(dropIdx, 1);
+            for (let i = dropIdx; i < this.messages.length; ) {
+              if (this.messages[i].role === "tool" && toolCallIds.has(this.messages[i].tool_call_id || "")) {
+                this.messages.splice(i, 1);
+              } else {
+                break;
+              }
+            }
+          } else if (msg.role === "tool" && msg.tool_call_id) {
+            const parentIdx = this.messages.findLastIndex(
+              (m, idx) => idx < dropIdx && m.role === "assistant" && m.tool_calls?.some((tc) => tc.id === msg.tool_call_id)
+            );
+            if (parentIdx >= 0) {
+              const parent = this.messages[parentIdx];
+              const parentToolIds = new Set(parent.tool_calls.map((tc) => tc.id));
+              this.messages.splice(parentIdx, 1);
+              for (let i = parentIdx; i < this.messages.length; ) {
+                if (this.messages[i].role === "tool" && parentToolIds.has(this.messages[i].tool_call_id || "")) {
+                  this.messages.splice(i, 1);
+                } else {
+                  break;
+                }
+              }
+            } else {
+              this.messages.splice(dropIdx, 1);
+            }
+          } else {
+            this.messages.splice(dropIdx, 1);
+          }
         }
       }
       /**
@@ -238,7 +271,10 @@ var init_context_engine = __esm({
         if (!this.provider) return;
         const protectedCount = 6;
         if (this.messages.length <= protectedCount + 2) return;
-        const cutoff = Math.max(2, this.messages.length - protectedCount - 2);
+        let cutoff = Math.max(2, this.messages.length - protectedCount - 2);
+        while (cutoff < this.messages.length && this.messages[cutoff].role === "tool") {
+          cutoff++;
+        }
         const toSummarize = this.messages.slice(0, cutoff);
         const toKeep = this.messages.slice(cutoff);
         const conversationText = toSummarize.map((m) => {
@@ -478,11 +514,23 @@ var init_ollama = __esm({
         }));
       }
       async *stream(messages, systemPrompt, tools, signal) {
+        const toolCallIds = /* @__PURE__ */ new Set();
+        for (const msg of messages) {
+          if (msg.role === "assistant" && msg.tool_calls) {
+            for (const tc of msg.tool_calls) toolCallIds.add(tc.id);
+          }
+        }
+        const sanitized = messages.filter((msg) => {
+          if (msg.role === "tool" && msg.tool_call_id && !toolCallIds.has(msg.tool_call_id)) {
+            return false;
+          }
+          return true;
+        });
         const apiMessages = [];
         if (systemPrompt) {
           apiMessages.push({ role: "system", content: systemPrompt });
         }
-        for (const msg of messages) {
+        for (const msg of sanitized) {
           if (msg.role === "tool") {
             apiMessages.push({
               role: "tool",
@@ -513,7 +561,8 @@ var init_ollama = __esm({
         if (this.maxResponseTokens) {
           body.max_tokens = this.maxResponseTokens;
         }
-        const effectiveSignal = signal || AbortSignal.timeout(12e4);
+        const timeoutSignal = AbortSignal.timeout(12e4);
+        const effectiveSignal = signal ? AbortSignal.any([signal, timeoutSignal]) : timeoutSignal;
         const res = await fetch(`${this.baseUrl}/v1/chat/completions`, {
           method: "POST",
           headers: { "Content-Type": "application/json" },
@@ -899,7 +948,8 @@ var init_agent = __esm({
                 streamSuccess = true;
                 break;
               } catch (streamErr) {
-                if (attempt === 0 && !signal.aborted) {
+                const isTimeout = streamErr instanceof Error && (streamErr.name === "TimeoutError" || streamErr.name === "AbortError" || streamErr.message.includes("timed out"));
+                if (attempt === 0 && !signal.aborted && !isTimeout) {
                   this.emit("error", {
                     message: `Model connection failed, retrying... (${streamErr instanceof Error ? streamErr.message : "unknown"})`,
                     recoverable: true
@@ -2709,7 +2759,8 @@ var init_anthropic = __esm({
         if (tools.length > 0) {
           body.tools = this.formatTools(tools);
         }
-        const effectiveSignal = signal || AbortSignal.timeout(9e4);
+        const timeoutSignal = AbortSignal.timeout(9e4);
+        const effectiveSignal = signal ? AbortSignal.any([signal, timeoutSignal]) : timeoutSignal;
         const res = await fetch(`${this.baseUrl}/v1/messages`, {
           method: "POST",
           headers: {
@@ -2936,7 +2987,8 @@ var init_openai = __esm({
         if (this.apiKey) {
           headers["Authorization"] = `Bearer ${this.apiKey}`;
         }
-        const effectiveSignal = signal || AbortSignal.timeout(9e4);
+        const timeoutSignal = AbortSignal.timeout(9e4);
+        const effectiveSignal = signal ? AbortSignal.any([signal, timeoutSignal]) : timeoutSignal;
         const res = await fetch(`${this.baseUrl}/v1/chat/completions`, {
           method: "POST",
           headers,
@@ -3163,7 +3215,8 @@ var init_google = __esm({
           body.tools = this.formatTools(tools);
         }
         const url = `https://generativelanguage.googleapis.com/v1beta/models/${this.model}:streamGenerateContent?key=${this.apiKey}&alt=sse`;
-        const effectiveSignal = signal || AbortSignal.timeout(9e4);
+        const timeoutSignal = AbortSignal.timeout(9e4);
+        const effectiveSignal = signal ? AbortSignal.any([signal, timeoutSignal]) : timeoutSignal;
         const res = await fetch(url, {
           method: "POST",
           headers: { "Content-Type": "application/json" },
@@ -6078,7 +6131,7 @@ var init_server = __esm({
           res.writeHead(200, { "Content-Type": "application/json" });
           res.end(JSON.stringify({
             status: "ok",
-            version: "1.4.6",
+            version: "1.4.8",
             uptime: process.uptime(),
             clients: this.clients.size,
             agents: this.engines.size
@@ -6190,7 +6243,7 @@ var init_server = __esm({
         const hello = {
           type: "hello",
           protocol: PROTOCOL_VERSION,
-          version: "1.4.6",
+          version: "1.4.8",
           agents: this.config.agents.list.map((a) => ({
             id: a.id,
             name: a.name || a.id,
@@ -7584,7 +7637,7 @@ async function runTui(opts) {
   ws.on("open", () => {
     ws.send(JSON.stringify({
       type: "connect",
-      params: { auth: { token }, mode: "tui", version: "1.4.6" }
+      params: { auth: { token }, mode: "tui", version: "1.4.8" }
     }));
   });
   ws.on("message", (data) => {
@@ -8013,7 +8066,7 @@ import { fileURLToPath as fileURLToPath5 } from "url";
 import { dirname as dirname5, join as join19 } from "path";
 var __filename3 = fileURLToPath5(import.meta.url);
 var __dirname3 = dirname5(__filename3);
-var version = "1.4.6";
+var version = "1.4.8";
 try {
   const pkg = JSON.parse(readFileSync(join19(__dirname3, "..", "package.json"), "utf-8"));
   version = pkg.version;