sparkecoder 0.1.139 → 0.1.140

package/dist/db/index.d.ts

@@ -1,5 +1,5 @@
-import { C as Checkpoint, F as FileBackup, M as ModelMessage, a as Message, S as Session, L as LoadedSkill, T as TodoItem, b as ToolExecution, A as ActiveStream, I as IndexStatusRecord, c as IndexedChunk, d as SubagentExecution, e as SubagentStep, f as Terminal } from '../schema-Dz-wABVY.js';
-export { N as NewActiveStream, g as NewCheckpoint, h as NewFileBackup, i as NewIndexStatusRecord, j as NewIndexedChunk, k as NewMessage, l as NewSession, m as NewSubagentExecution, n as NewTerminal, o as NewTodoItem, p as NewToolExecution, q as SessionConfig, r as TaskConfig, s as TaskMcpServerSummary, t as TaskSkillSummary, U as UserContentPart, u as UserFilePart, v as UserImagePart, w as UserModelMessage, x as UserTextPart } from '../schema-Dz-wABVY.js';
+import { C as Checkpoint, F as FileBackup, M as ModelMessage, a as Message, S as Session, L as LoadedSkill, T as TodoItem, b as ToolExecution, A as ActiveStream, I as IndexStatusRecord, c as IndexedChunk, d as SubagentExecution, e as SubagentStep, f as Terminal } from '../schema-BSz4MzhJ.js';
+export { N as NewActiveStream, g as NewCheckpoint, h as NewFileBackup, i as NewIndexStatusRecord, j as NewIndexedChunk, k as NewMessage, l as NewSession, m as NewSubagentExecution, n as NewTerminal, o as NewTodoItem, p as NewToolExecution, q as SessionConfig, r as TaskConfig, s as TaskMcpServerSummary, t as TaskSkillSummary, U as UserContentPart, u as UserFilePart, v as UserImagePart, w as UserModelMessage, x as UserTextPart } from '../schema-BSz4MzhJ.js';
 import 'drizzle-orm/sqlite-core';
 
 /**

package/dist/{index-BAsQWqZj.d.ts → index-Cl_eUatM.d.ts}

@@ -1,7 +1,7 @@
 import { ModelMessage, streamText } from 'ai';
-import { S as Session, b as ToolExecution, r as TaskConfig } from './schema-Dz-wABVY.js';
+import { S as Session, b as ToolExecution, r as TaskConfig } from './schema-BSz4MzhJ.js';
 import { z } from 'zod';
-import { B as BashToolProgress, W as WriteFileProgress, S as SearchToolProgress } from './search-CVVfuBPZ.js';
+import { B as BashToolProgress, W as WriteFileProgress, S as SearchToolProgress } from './search-DOzC4ojH.js';
 
 declare const ToolApprovalConfigSchema: z.ZodObject<{
     bash: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
@@ -39,25 +39,25 @@ declare const SessionConfigSchema: z.ZodObject<{
         iterations: z.ZodOptional<z.ZodNumber>;
         parentTaskId: z.ZodOptional<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
-        status: "running" | "completed" | "failed";
+        status: "completed" | "failed" | "running";
         enabled: boolean;
         outputSchema: Record<string, unknown>;
-        webhookUrl?: string | undefined;
+        error?: string | undefined;
         maxIterations?: number | undefined;
+        webhookUrl?: string | undefined;
+        parentTaskId?: string | undefined;
         result?: unknown;
-        error?: string | undefined;
         iterations?: number | undefined;
-        parentTaskId?: string | undefined;
     }, {
-        status: "running" | "completed" | "failed";
+        status: "completed" | "failed" | "running";
         enabled: boolean;
         outputSchema: Record<string, unknown>;
-        webhookUrl?: string | undefined;
+        error?: string | undefined;
         maxIterations?: number | undefined;
+        webhookUrl?: string | undefined;
+        parentTaskId?: string | undefined;
         result?: unknown;
-        error?: string | undefined;
         iterations?: number | undefined;
-        parentTaskId?: string | undefined;
     }>>;
     role: z.ZodOptional<z.ZodEnum<["orchestrator", "worker", "chat"]>>;
     personality: z.ZodOptional<z.ZodString>;
@@ -88,17 +88,17 @@ declare const SessionConfigSchema: z.ZodObject<{
         enabled: boolean;
         id: string;
         name: string;
-        cron: string;
-        prompt: string;
         createdAt: string;
+        prompt: string;
+        cron: string;
         replyChannel?: string | undefined;
         lastFiredAt?: string | undefined;
     }, {
         id: string;
         name: string;
-        cron: string;
-        prompt: string;
         createdAt: string;
+        prompt: string;
+        cron: string;
         enabled?: boolean | undefined;
         replyChannel?: string | undefined;
         lastFiredAt?: string | undefined;
@@ -113,19 +113,19 @@ declare const SessionConfigSchema: z.ZodObject<{
         lastHitAt: z.ZodOptional<z.ZodString>;
         createdAt: z.ZodString;
     }, "strip", z.ZodTypeAny, {
+        token: string;
         id: string;
         name: string;
         createdAt: string;
-        token: string;
         wake: "now" | "next";
         hitCount: number;
         template?: string | undefined;
         lastHitAt?: string | undefined;
     }, {
+        token: string;
         id: string;
         name: string;
         createdAt: string;
-        token: string;
         wake?: "now" | "next" | undefined;
         template?: string | undefined;
         hitCount?: number | undefined;
@@ -135,90 +135,90 @@ declare const SessionConfigSchema: z.ZodObject<{
     maxContextChars: number;
     toolApprovals?: Record<string, boolean> | undefined;
     approvalWebhook?: string | undefined;
-    skillsDirectory?: string | undefined;
+    webhooks?: {
+        token: string;
+        id: string;
+        name: string;
+        createdAt: string;
+        wake: "now" | "next";
+        hitCount: number;
+        template?: string | undefined;
+        lastHitAt?: string | undefined;
+    }[] | undefined;
+    slack?: {
+        channel?: string | undefined;
+        threadTs?: string | undefined;
+        teamId?: string | undefined;
+    } | undefined;
     task?: {
-        status: "running" | "completed" | "failed";
+        status: "completed" | "failed" | "running";
         enabled: boolean;
         outputSchema: Record<string, unknown>;
-        webhookUrl?: string | undefined;
+        error?: string | undefined;
         maxIterations?: number | undefined;
+        webhookUrl?: string | undefined;
+        parentTaskId?: string | undefined;
         result?: unknown;
-        error?: string | undefined;
         iterations?: number | undefined;
-        parentTaskId?: string | undefined;
     } | undefined;
+    skillsDirectory?: string | undefined;
     role?: "orchestrator" | "worker" | "chat" | undefined;
     personality?: string | undefined;
     orchestratorSessionId?: string | undefined;
-    slack?: {
-        channel?: string | undefined;
-        threadTs?: string | undefined;
-        teamId?: string | undefined;
-    } | undefined;
     schedules?: {
         enabled: boolean;
         id: string;
         name: string;
-        cron: string;
-        prompt: string;
         createdAt: string;
+        prompt: string;
+        cron: string;
         replyChannel?: string | undefined;
         lastFiredAt?: string | undefined;
     }[] | undefined;
+}, {
+    toolApprovals?: Record<string, boolean> | undefined;
+    approvalWebhook?: string | undefined;
     webhooks?: {
+        token: string;
         id: string;
         name: string;
         createdAt: string;
-        token: string;
-        wake: "now" | "next";
-        hitCount: number;
+        wake?: "now" | "next" | undefined;
         template?: string | undefined;
+        hitCount?: number | undefined;
         lastHitAt?: string | undefined;
     }[] | undefined;
-}, {
-    toolApprovals?: Record<string, boolean> | undefined;
-    approvalWebhook?: string | undefined;
-    skillsDirectory?: string | undefined;
-    maxContextChars?: number | undefined;
+    slack?: {
+        channel?: string | undefined;
+        threadTs?: string | undefined;
+        teamId?: string | undefined;
+    } | undefined;
     task?: {
-        status: "running" | "completed" | "failed";
+        status: "completed" | "failed" | "running";
         enabled: boolean;
         outputSchema: Record<string, unknown>;
-        webhookUrl?: string | undefined;
+        error?: string | undefined;
         maxIterations?: number | undefined;
+        webhookUrl?: string | undefined;
+        parentTaskId?: string | undefined;
         result?: unknown;
-        error?: string | undefined;
         iterations?: number | undefined;
-        parentTaskId?: string | undefined;
     } | undefined;
+    skillsDirectory?: string | undefined;
+    maxContextChars?: number | undefined;
     role?: "orchestrator" | "worker" | "chat" | undefined;
     personality?: string | undefined;
     orchestratorSessionId?: string | undefined;
-    slack?: {
-        channel?: string | undefined;
-        threadTs?: string | undefined;
-        teamId?: string | undefined;
-    } | undefined;
     schedules?: {
         id: string;
         name: string;
-        cron: string;
-        prompt: string;
         createdAt: string;
+        prompt: string;
+        cron: string;
         enabled?: boolean | undefined;
         replyChannel?: string | undefined;
         lastFiredAt?: string | undefined;
     }[] | undefined;
-    webhooks?: {
-        id: string;
-        name: string;
-        createdAt: string;
-        token: string;
-        wake?: "now" | "next" | undefined;
-        template?: string | undefined;
-        hitCount?: number | undefined;
-        lastHitAt?: string | undefined;
-    }[] | undefined;
 }>;
 declare const SparkcoderConfigSchema: z.ZodObject<{
     defaultModel: z.ZodDefault<z.ZodString>;
@@ -397,12 +397,12 @@ declare const SparkcoderConfigSchema: z.ZodObject<{
             enabled: boolean;
             id: string;
             name: string;
-            createdAt: string;
             transport: "http" | "sse" | "stdio";
-            args?: string[] | undefined;
+            createdAt: string;
             url?: string | undefined;
             headers?: Record<string, string> | undefined;
             command?: string | undefined;
+            args?: string[] | undefined;
             oauth?: {
                 authorizationUrl?: string | undefined;
                 tokenUrl?: string | undefined;
@@ -415,13 +415,13 @@ declare const SparkcoderConfigSchema: z.ZodObject<{
         }, {
             id: string;
             name: string;
-            createdAt: string;
             transport: "http" | "sse" | "stdio";
+            createdAt: string;
             enabled?: boolean | undefined;
-            args?: string[] | undefined;
             url?: string | undefined;
             headers?: Record<string, string> | undefined;
             command?: string | undefined;
+            args?: string[] | undefined;
             oauth?: {
                 authorizationUrl?: string | undefined;
                 tokenUrl?: string | undefined;
@@ -437,12 +437,12 @@ declare const SparkcoderConfigSchema: z.ZodObject<{
             enabled: boolean;
             id: string;
             name: string;
-            createdAt: string;
             transport: "http" | "sse" | "stdio";
-            args?: string[] | undefined;
+            createdAt: string;
             url?: string | undefined;
             headers?: Record<string, string> | undefined;
             command?: string | undefined;
+            args?: string[] | undefined;
             oauth?: {
                 authorizationUrl?: string | undefined;
                 tokenUrl?: string | undefined;
@@ -457,13 +457,13 @@ declare const SparkcoderConfigSchema: z.ZodObject<{
         servers?: {
             id: string;
             name: string;
-            createdAt: string;
             transport: "http" | "sse" | "stdio";
+            createdAt: string;
             enabled?: boolean | undefined;
-            args?: string[] | undefined;
             url?: string | undefined;
             headers?: Record<string, string> | undefined;
             command?: string | undefined;
+            args?: string[] | undefined;
             oauth?: {
                 authorizationUrl?: string | undefined;
                 tokenUrl?: string | undefined;
@@ -506,6 +506,7 @@ declare const SparkcoderConfigSchema: z.ZodObject<{
         allowedEmails?: string[] | undefined;
     }>>;
 }, "strip", z.ZodTypeAny, {
+    defaultModel: string;
     toolApprovals: {
         bash: boolean;
         write_file: boolean;
@@ -513,7 +514,6 @@ declare const SparkcoderConfigSchema: z.ZodObject<{
         load_skill: boolean;
         todo: boolean;
     };
-    defaultModel: string;
     skills: {
         directory: string;
         additionalDirectories: string[];
@@ -533,21 +533,11 @@ declare const SparkcoderConfigSchema: z.ZodObject<{
         intervalHours: number;
     };
     databasePath: string;
+    workingDirectory?: string | undefined;
     approvalWebhook?: string | undefined;
-    slack?: {
-        botToken?: string | undefined;
-        signingSecret?: string | undefined;
-        defaultOrchestratorName?: string | undefined;
-        allowedUsers?: string[] | undefined;
-        allowedChannels?: string[] | undefined;
-        allowDmsFromAnyone?: boolean | undefined;
-        deniedReplyEnabled?: boolean | undefined;
-        deniedReplyTemplate?: string | undefined;
-    } | undefined;
     webhooks?: {
         token?: string | undefined;
     } | undefined;
-    workingDirectory?: string | undefined;
     remoteServer?: {
         url?: string | undefined;
         authKey?: string | undefined;
@@ -560,17 +550,27 @@ declare const SparkcoderConfigSchema: z.ZodObject<{
         httpUrl?: string | undefined;
         namespace?: string | undefined;
     } | undefined;
+    slack?: {
+        botToken?: string | undefined;
+        signingSecret?: string | undefined;
+        defaultOrchestratorName?: string | undefined;
+        allowedUsers?: string[] | undefined;
+        allowedChannels?: string[] | undefined;
+        allowDmsFromAnyone?: boolean | undefined;
+        deniedReplyEnabled?: boolean | undefined;
+        deniedReplyTemplate?: string | undefined;
+    } | undefined;
     mcp?: {
         servers?: {
             enabled: boolean;
             id: string;
             name: string;
-            createdAt: string;
             transport: "http" | "sse" | "stdio";
-            args?: string[] | undefined;
+            createdAt: string;
             url?: string | undefined;
             headers?: Record<string, string> | undefined;
             command?: string | undefined;
+            args?: string[] | undefined;
             oauth?: {
                 authorizationUrl?: string | undefined;
                 tokenUrl?: string | undefined;
@@ -591,6 +591,8 @@ declare const SparkcoderConfigSchema: z.ZodObject<{
         allowedEmails?: string[] | undefined;
     } | undefined;
 }, {
+    defaultModel?: string | undefined;
+    workingDirectory?: string | undefined;
     toolApprovals?: {
         bash?: boolean | undefined;
         write_file?: boolean | undefined;
@@ -599,21 +601,6 @@ declare const SparkcoderConfigSchema: z.ZodObject<{
         todo?: boolean | undefined;
     } | undefined;
     approvalWebhook?: string | undefined;
-    slack?: {
-        botToken?: string | undefined;
-        signingSecret?: string | undefined;
-        defaultOrchestratorName?: string | undefined;
-        allowedUsers?: string[] | undefined;
-        allowedChannels?: string[] | undefined;
-        allowDmsFromAnyone?: boolean | undefined;
-        deniedReplyEnabled?: boolean | undefined;
-        deniedReplyTemplate?: string | undefined;
-    } | undefined;
-    webhooks?: {
-        token?: string | undefined;
-    } | undefined;
-    workingDirectory?: string | undefined;
-    defaultModel?: string | undefined;
     skills?: {
         directory?: string | undefined;
         additionalDirectories?: string[] | undefined;
@@ -628,6 +615,9 @@ declare const SparkcoderConfigSchema: z.ZodObject<{
         host?: string | undefined;
         publicUrl?: string | undefined;
     } | undefined;
+    webhooks?: {
+        token?: string | undefined;
+    } | undefined;
     autoUpdate?: {
         enabled?: boolean | undefined;
         intervalHours?: number | undefined;
@@ -645,17 +635,27 @@ declare const SparkcoderConfigSchema: z.ZodObject<{
         include?: string[] | undefined;
         exclude?: string[] | undefined;
     } | undefined;
+    slack?: {
+        botToken?: string | undefined;
+        signingSecret?: string | undefined;
+        defaultOrchestratorName?: string | undefined;
+        allowedUsers?: string[] | undefined;
+        allowedChannels?: string[] | undefined;
+        allowDmsFromAnyone?: boolean | undefined;
+        deniedReplyEnabled?: boolean | undefined;
+        deniedReplyTemplate?: string | undefined;
+    } | undefined;
     mcp?: {
         servers?: {
             id: string;
             name: string;
-            createdAt: string;
             transport: "http" | "sse" | "stdio";
+            createdAt: string;
             enabled?: boolean | undefined;
-            args?: string[] | undefined;
             url?: string | undefined;
             headers?: Record<string, string> | undefined;
             command?: string | undefined;
+            args?: string[] | undefined;
             oauth?: {
                 authorizationUrl?: string | undefined;
                 tokenUrl?: string | undefined;

package/dist/index.d.ts

@@ -1,11 +1,11 @@
-import { R as ResolvedConfig } from './index-BAsQWqZj.js';
-export { A as Agent, a as AgentOptions, b as AgentRunOptions, c as AgentStreamResult, S as SparkcoderConfig, T as ToolApprovalConfig } from './index-BAsQWqZj.js';
+import { R as ResolvedConfig } from './index-Cl_eUatM.js';
+export { A as Agent, a as AgentOptions, b as AgentRunOptions, c as AgentStreamResult, S as SparkcoderConfig, T as ToolApprovalConfig } from './index-Cl_eUatM.js';
 export { ServerOptions, createApp, startServer, stopServer } from './server/index.js';
 export { checkpointQueries, closeDatabase, fileBackupQueries, getDb, initDatabase, messageQueries, sessionQueries, skillQueries, todoQueries, toolExecutionQueries } from './db/index.js';
-import { F as FileBackup, C as Checkpoint } from './schema-Dz-wABVY.js';
-export { a as Message, M as ModelMessage, S as Session, q as SessionConfig, f as Terminal, T as TodoItem, b as ToolExecution } from './schema-Dz-wABVY.js';
+import { F as FileBackup, C as Checkpoint } from './schema-BSz4MzhJ.js';
+export { a as Message, M as ModelMessage, S as Session, q as SessionConfig, f as Terminal, T as TodoItem, b as ToolExecution } from './schema-BSz4MzhJ.js';
 export { createLoadSkillTool, createReadFileTool, createTodoTool, createTools } from './tools/index.js';
-export { c as createBashTool, a as createWriteFileTool } from './search-CVVfuBPZ.js';
+export { c as createBashTool, a as createWriteFileTool } from './search-DOzC4ojH.js';
 import 'ai';
 import 'zod';
 import 'hono/types';

package/dist/index.js

@@ -7669,6 +7669,105 @@ var init_cap_image_count = __esm({
   }
 });
 
+// src/utils/sanitize-images.ts
+function hasImageMagic(bytes) {
+  if (bytes.length < 12) return false;
+  if (bytes[0] === 137 && bytes[1] === 80 && bytes[2] === 78 && bytes[3] === 71) return true;
+  if (bytes[0] === 255 && bytes[1] === 216 && bytes[2] === 255) return true;
+  if (bytes[0] === 71 && bytes[1] === 73 && bytes[2] === 70 && bytes[3] === 56) return true;
+  if (bytes[0] === 82 && bytes[1] === 73 && bytes[2] === 70 && bytes[3] === 70 && bytes[8] === 87 && bytes[9] === 69 && bytes[10] === 66 && bytes[11] === 80) return true;
+  return false;
+}
+function extractBase64(part) {
+  const raw = typeof part?.data === "string" ? part.data : typeof part?.image === "string" ? part.image : null;
+  if (typeof raw !== "string" || raw.length === 0) return null;
+  if (/^https?:\/\//i.test(raw)) return null;
+  const dataUrl = raw.match(/^data:[^;,]+;base64,([\s\S]*)$/);
+  return dataUrl ? dataUrl[1] : raw;
+}
+function isInvalidImagePart(part) {
+  if (!part || typeof part !== "object") return false;
+  const t = part.type;
+  if (t !== "image" && t !== "image-data" && t !== "media") return false;
+  const mt = part.mediaType;
+  const b64 = extractBase64(part);
+  if (b64 === null) {
+    return typeof mt === "string" && mt.startsWith("image/") && !SUPPORTED_IMAGE_TYPES.includes(mt);
+  }
+  let bytes;
+  try {
+    bytes = Buffer.from(b64, "base64");
+  } catch {
+    return true;
+  }
+  if (bytes.length === 0) return true;
+  return !hasImageMagic(bytes);
+}
+function placeholder() {
+  return { type: "text", text: INVALID_IMAGE_PLACEHOLDER };
+}
+function sanitizeInvalidImages(messages) {
+  if (!Array.isArray(messages) || messages.length === 0) return messages;
+  let mutated = false;
+  let dropped = 0;
+  const out = messages.slice();
+  for (let i = 0; i < out.length; i++) {
+    const msg = out[i];
+    if (!Array.isArray(msg.content)) continue;
+    let contentCloned = false;
+    const ensureCloned = () => {
+      if (contentCloned) return;
+      out[i] = { ...msg, content: [...msg.content] };
+      contentCloned = true;
+    };
+    const content = () => out[i].content;
+    for (let j = 0; j < content().length; j++) {
+      const part = content()[j];
+      if (isInvalidImagePart(part)) {
+        ensureCloned();
+        out[i].content[j] = placeholder();
+        mutated = true;
+        dropped++;
+        continue;
+      }
+      if (part && typeof part === "object" && part.type === "tool-result" && part.output && part.output.type === "content" && Array.isArray(part.output.value)) {
+        const innerValue = part.output.value;
+        let innerMutated = false;
+        const newValue = innerValue.slice();
+        for (let k = 0; k < newValue.length; k++) {
+          if (isInvalidImagePart(newValue[k])) {
+            newValue[k] = placeholder();
+            innerMutated = true;
+            dropped++;
+          }
+        }
+        if (innerMutated) {
+          ensureCloned();
+          out[i].content[j] = {
+            ...part,
+            output: { ...part.output, value: newValue }
+          };
+          mutated = true;
+        }
+      }
+    }
+  }
+  if (mutated) {
+    console.warn(
+      `[sanitize-images] Replaced ${dropped} invalid image part(s) with a text placeholder (non-image bytes / unsupported type) to avoid provider 400 "invalid image" errors.`
+    );
+  }
+  return mutated ? out : messages;
+}
+var SUPPORTED_IMAGE_TYPES, INVALID_IMAGE_PLACEHOLDER;
+var init_sanitize_images = __esm({
+  "src/utils/sanitize-images.ts"() {
+    "use strict";
+    SUPPORTED_IMAGE_TYPES = ["image/jpeg", "image/png", "image/gif", "image/webp"];
+    INVALID_IMAGE_PLACEHOLDER = "[invalid image omitted \u2014 the data was not a valid jpeg/png/gif/webp]";
+  }
+});
+
 // src/agent/model-limits.ts
 function getModelLimits(modelId) {
   const normalized = modelId.trim().toLowerCase();
@@ -7984,6 +8083,7 @@ var init_context = __esm({
     init_prompts();
     init_sanitize_messages();
     init_cap_image_count();
+    init_sanitize_images();
     init_model_limits();
     TOOL_OUTPUT_TRIM_CHARS = 400;
     COMPACTABLE_TOOLS = /* @__PURE__ */ new Set([
@@ -8033,6 +8133,7 @@ ${summaryContent}`
         messages = repairToolPairing(messages);
         messages = ensureToolResultsFollowCalls(messages);
         messages = ensureEndsWithUserOrTool(messages);
+        messages = sanitizeInvalidImages(messages);
         messages = capImageCount(messages);
         messages = this.enforceHardCap(messages);
         return messages;
@@ -8044,28 +8145,35 @@ ${summaryContent}`
        * repairs tool pairing so dropping can't orphan a tool result.
        */
       enforceHardCap(messages) {
-        const { contextWindow } = getModelLimits(this.modelId);
-        const ceiling = Math.max(2e4, Math.floor(contextWindow * 0.9));
+        const { rollingTarget } = getModelLimits(this.modelId);
+        const MAX_MESSAGES = 120;
+        const tokenCeiling = Math.max(2e4, Math.floor(rollingTarget * 1.5));
         const tokens = messages.map((m) => this.messageTokens(m));
         let total = tokens.reduce((a, b) => a + b, 0);
-        if (total <= ceiling) return messages;
         const hasLeadingSummary = messages.length > 0 && messages[0].role === "system";
         const firstBody = hasLeadingSummary ? 1 : 0;
         const lastIndex = messages.length - 1;
+        const bodyCount = messages.length - firstBody;
+        if (bodyCount <= MAX_MESSAGES && total <= tokenCeiling) return messages;
         let start = firstBody;
-        while (start < lastIndex && total > ceiling) {
+        const countDropTarget = messages.length - MAX_MESSAGES;
+        while (start < countDropTarget && start < lastIndex) {
+          total -= tokens[start];
+          start += 1;
+        }
+        while (start < lastIndex && total > tokenCeiling) {
           total -= tokens[start];
           start += 1;
         }
         let out = hasLeadingSummary ? [messages[0], ...messages.slice(start)] : messages.slice(start);
-        if (total > ceiling) {
+        if (total > tokenCeiling) {
           out = out.map((m) => hardTruncateMessageText(m));
         }
         out = repairToolPairing(out);
         out = ensureToolResultsFollowCalls(out);
         out = ensureEndsWithUserOrTool(out);
         console.warn(
-          `[Context] hard cap engaged for ${this.modelId}: trimmed ${messages.length}\u2192${out.length} msgs (ceiling ${ceiling} tokens).`
+          `[Context] hard cap engaged for ${this.modelId}: trimmed ${messages.length}\u2192${out.length} msgs (ceiling ${tokenCeiling} est-tokens / ${MAX_MESSAGES} msgs).`
         );
         return out;
       }