@phuetz/code-buddy 1.6.1 → 2.1.0

package/dist/config/secret-ref.d.ts

@@ -1,17 +1,36 @@
 /**
  * SecretRef — Resolve secret references in config values.
  *
- * Supports three reference types in config string values:
+ * Built-in reference types in config string values:
  * - ${env:NAME}       — Environment variable
  * - ${file:/path}     — File contents (trimmed)
  * - ${exec:command}   — Command stdout (trimmed, 5s timeout)
+ * - ${op:vault/item/field} — 1Password via the `op` CLI
+ * - a WHOLE value of the form `op://vault/item/field` is also resolved
+ *   through 1Password (Hermes-parity: their native secret notation).
+ *
+ * The type set is PLUGGABLE (Hermes SecretSource parity): call
+ * `registerSecretSource({ id, resolve })` to add a source; `${<id>:ref}`
+ * then resolves through it. Built-ins are pre-registered and can be
+ * overridden for tests.
  *
  * References can appear anywhere in a string value and are resolved
  * recursively through nested objects/arrays.
  */
+/** A pluggable secret source (Hermes SecretSource parity). */
+export interface SecretSource {
+    /** Reference type, used as `${<id>:...}` in config values. */
+    id: string;
+    /** Resolve a reference; return null/'' on failure (never throw). */
+    resolve(ref: string): Promise<string | null>;
+}
+/** Register (or override) a secret source. */
+export declare function registerSecretSource(source: SecretSource): void;
+/** Registered source ids (for diagnostics). */
+export declare function getSecretSourceIds(): string[];
 /**
- * Resolve all `${env:...}`, `${file:...}`, and `${exec:...}` patterns
- * in a single string value.
+ * Resolve all `${<source>:...}` patterns in a single string value, plus the
+ * whole-value `op://…` 1Password notation.
  */
 export declare function resolveSecretRef(value: string): Promise<string>;
 /**

package/dist/config/secret-ref.js

@@ -1,63 +1,124 @@
 /**
  * SecretRef — Resolve secret references in config values.
  *
- * Supports three reference types in config string values:
+ * Built-in reference types in config string values:
  * - ${env:NAME}       — Environment variable
  * - ${file:/path}     — File contents (trimmed)
  * - ${exec:command}   — Command stdout (trimmed, 5s timeout)
+ * - ${op:vault/item/field} — 1Password via the `op` CLI
+ * - a WHOLE value of the form `op://vault/item/field` is also resolved
+ *   through 1Password (Hermes-parity: their native secret notation).
+ *
+ * The type set is PLUGGABLE (Hermes SecretSource parity): call
+ * `registerSecretSource({ id, resolve })` to add a source; `${<id>:ref}`
+ * then resolves through it. Built-ins are pre-registered and can be
+ * overridden for tests.
  *
  * References can appear anywhere in a string value and are resolved
  * recursively through nested objects/arrays.
  */
 import * as fs from 'fs/promises';
-import { execSync } from 'child_process';
+import { execSync, execFileSync } from 'child_process';
 import { logger } from '../utils/logger.js';
-// Matches ${env:NAME}, ${file:/path/to/secret}, ${exec:command args}
-const SECRET_REF_PATTERN = /\$\{(env|file|exec):([^}]+)\}/g;
-/**
- * Resolve a single secret reference token.
- * Returns the resolved value or empty string on failure.
- */
-async function resolveToken(type, ref) {
-    switch (type) {
-        case 'env': {
-            const value = process.env[ref];
-            if (value === undefined) {
-                logger.warn(`SecretRef: environment variable "${ref}" is not set`, { source: 'SecretRef' });
-                return '';
-            }
-            return value;
+// Matches ${<source-id>:<ref>} for any registered source id.
+const SECRET_REF_PATTERN = /\$\{([a-z][\w-]*):([^}]+)\}/g;
+const sources = new Map();
+/** Register (or override) a secret source. */
+export function registerSecretSource(source) {
+    sources.set(source.id, source);
+}
+/** Registered source ids (for diagnostics). */
+export function getSecretSourceIds() {
+    return [...sources.keys()];
+}
+/** Resolve a 1Password `op://` reference through the official CLI. */
+async function resolveOnePassword(ref) {
+    const uri = ref.startsWith('op://') ? ref : `op://${ref}`;
+    try {
+        // execFile (no shell) — the ref can never be interpreted as shell syntax.
+        const stdout = execFileSync('op', ['read', uri], {
+            timeout: 10_000,
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+        return stdout.trim();
+    }
+    catch (error) {
+        const notFound = error.code === 'ENOENT';
+        logger.warn(notFound
+            ? `SecretRef: "${uri}" requires the 1Password CLI (op) — install it and run \`op signin\``
+            : `SecretRef: 1Password read failed for "${uri}"`, { source: 'SecretRef' });
+        return null;
+    }
+}
+// Built-in sources.
+registerSecretSource({
+    id: 'env',
+    async resolve(ref) {
+        const value = process.env[ref];
+        if (value === undefined) {
+            logger.warn(`SecretRef: environment variable "${ref}" is not set`, { source: 'SecretRef' });
+            return null;
         }
-        case 'file': {
-            try {
-                const content = await fs.readFile(ref, 'utf-8');
-                return content.trim();
-            }
-            catch {
-                logger.warn(`SecretRef: failed to read file "${ref}"`, { source: 'SecretRef' });
-                return '';
-            }
+        return value;
+    },
+});
+registerSecretSource({
+    id: 'file',
+    async resolve(ref) {
+        try {
+            const content = await fs.readFile(ref, 'utf-8');
+            return content.trim();
+        }
+        catch {
+            logger.warn(`SecretRef: failed to read file "${ref}"`, { source: 'SecretRef' });
+            return null;
+        }
+    },
+});
+registerSecretSource({
+    id: 'exec',
+    async resolve(ref) {
+        try {
+            const stdout = execSync(ref, { timeout: 5000, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] });
+            return stdout.trim();
         }
-        case 'exec': {
-            try {
-                const stdout = execSync(ref, { timeout: 5000, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] });
-                return stdout.trim();
-            }
-            catch {
-                logger.warn(`SecretRef: failed to execute command "${ref}"`, { source: 'SecretRef' });
-                return '';
-            }
+        catch {
+            logger.warn(`SecretRef: failed to execute command "${ref}"`, { source: 'SecretRef' });
+            return null;
         }
-        default:
-            logger.warn(`SecretRef: unknown reference type "${type}"`, { source: 'SecretRef' });
-            return '';
+    },
+});
+registerSecretSource({ id: 'op', resolve: resolveOnePassword });
+/**
+ * Resolve a single secret reference token via the registered sources.
+ * Returns the resolved value, null for an unknown source, or an empty string
+ * when a known source fails. Keeping those cases distinct prevents a typo in a
+ * source id from silently erasing configuration text.
+ */
+async function resolveToken(type, ref) {
+    const source = sources.get(type);
+    if (!source) {
+        logger.warn(`SecretRef: unknown reference type "${type}"`, { source: 'SecretRef' });
+        return null;
+    }
+    try {
+        return (await source.resolve(ref)) ?? '';
+    }
+    catch {
+        logger.warn(`SecretRef: source "${type}" threw while resolving`, { source: 'SecretRef' });
+        return '';
     }
 }
 /**
- * Resolve all `${env:...}`, `${file:...}`, and `${exec:...}` patterns
- * in a single string value.
+ * Resolve all `${<source>:...}` patterns in a single string value, plus the
+ * whole-value `op://…` 1Password notation.
  */
 export async function resolveSecretRef(value) {
+    // Whole-value 1Password notation (`op://vault/item/field`).
+    if (value.startsWith('op://')) {
+        return (await resolveOnePassword(value)) ?? '';
+    }
     // Quick check — avoid async work if no refs present
     if (!value.includes('${')) {
         return value;
@@ -83,7 +144,8 @@ export async function resolveSecretRef(value) {
     let result = value;
     for (const m of matches) {
         const resolved = await resolveToken(m.type, m.ref);
-        result = result.replace(m.full, resolved);
+        if (resolved !== null)
+            result = result.replace(m.full, resolved);
     }
     return result;
 }

package/dist/config/toml-config.d.ts

@@ -111,6 +111,18 @@ export interface AgentBehaviorConfig {
     /** Editor model for tool execution and edits */
     editor_model?: string;
 }
+/** Advanced product areas which can be hidden from the focused CLI surface. */
+export type AdvancedCapability = 'companion' | 'film' | 'sensory' | 'robot' | 'vision_train';
+/**
+ * Controls discoverability of optional product areas.
+ *
+ * This only narrows the surface when a profile explicitly asks for it. The
+ * default is an empty list so existing installations keep every command and
+ * tool they had before the focused onboarding profile was introduced.
+ */
+export interface FeatureSurfaceConfig {
+    hidden_capabilities?: AdvancedCapability[];
+}
 /**
  * Model pairs configuration for architect/editor split.
  * The architect model handles planning and reasoning while
@@ -340,7 +352,7 @@ export interface SessionsTomlConfig {
 }
 /**
  * Enterprise modules configuration (Phase K — top #3 audit OpenClaw,
- * audit `claude-et-patrice/propositions/AUDIT-OPENCLAW-HERITAGE-2026-05-02.md`).
+ * audit du dépôt privé de passation, `propositions/AUDIT-OPENCLAW-HERITAGE-2026-05-02.md`).
  *
  * `initializeNativeEngineModules()` in `src/openclaw/index.ts` instantiates
  * 6 enterprise modules. Audit (2026-05-02) revealed 5/6 of them have
@@ -424,7 +436,7 @@ export interface MultiAgentSystemConfig {
 /**
  * Autonomous Fleet Protocol v0.1 — Phase (d).18.
  * Native TypeScript port of the Python wrapper
- * `claude-et-patrice/tools/heartbeat_tick.py`. When `enabled=true`, Code
+ * the handover repo's `tools/heartbeat_tick.py`. When `enabled=true`, Code
  * Buddy schedules its own fleet ticks (independent of HeartbeatEngine):
  * pull repo, pick claimable task, claim atomically, run agent, append
  * worklog, mark completed. See AUTONOMOUS-FLEET-PROTOCOL-2026-05-02 v0.1.
@@ -432,9 +444,9 @@ export interface MultiAgentSystemConfig {
 export interface AutonomousFleetConfig {
     /** Whether the autonomous tick starts at boot (default: false). */
     enabled?: boolean;
-    /** Absolute path to the claude-et-patrice repo (the fleet bus). */
+    /** Absolute path to the private handover repository (the fleet bus). */
     repo_path?: string;
-    /** Host identifier broadcast in claims, e.g. `ministar/grok-cli`. */
+    /** Host identifier broadcast in claims, e.g. `hub/grok-cli`. */
     host?: string;
     /** Tick interval in minutes (default: 30). */
     interval_minutes?: number;
@@ -509,6 +521,8 @@ export interface CodeBuddyConfig {
     agent: AgentBehaviorConfig;
     /** External integrations */
     integrations: IntegrationsConfig;
+    /** Optional feature discoverability / exposure controls */
+    surface: FeatureSurfaceConfig;
     /** Model pairs for architect/editor split */
     model_pairs?: ModelPairsConfig;
     /** Active-LLM registry: auto-failover across live logins + "together" */
@@ -635,4 +649,6 @@ declare class ConfigManager {
     }): Promise<import('./config-mutator.js').ConfigSetResult[]>;
 }
 export declare function getConfigManager(): ConfigManager;
+/** Reset the singleton so profile-sensitive tests and embedded runtimes can reload cleanly. */
+export declare function resetConfigManager(): void;
 export type { ConfigManager };

package/dist/config/toml-config.js

@@ -145,6 +145,14 @@ export const DEFAULT_CONFIG = {
             max_context_tokens: 200000,
             description: 'Claude Haiku 4.5 (64K output, fastest)',
         },
+        'gpt-5.6-sol': {
+            provider: 'openai',
+            model_id: 'gpt-5.6-sol',
+            price_per_m_input: 5.0,
+            price_per_m_output: 30.0,
+            max_context_tokens: 1050000,
+            description: 'GPT-5.6 Sol (1.05M context, 128K output, vision, max reasoning)',
+        },
         'gpt-5': {
             provider: 'openai',
             model_id: 'gpt-5',
@@ -261,10 +269,30 @@ export const DEFAULT_CONFIG = {
         default_prompt: 'default',
     },
     integrations: {
-        rtk_enabled: true,
+        // Legacy pre-execution RTK wrapping is opt-in. Explicit `true` values in
+        // existing config files remain supported, but the safe default keeps the
+        // logical command intact for policy/sandbox evaluation.
+        rtk_enabled: false,
         rtk_min_output_length: 500,
         icm_enabled: true,
     },
+    // Additive profiles: no profile keeps the historical full surface. `core`
+    // is deliberately opt-in, while `all` is the explicit escape hatch.
+    surface: {
+        hidden_capabilities: [],
+    },
+    profiles: {
+        core: {
+            surface: {
+                hidden_capabilities: ['companion', 'film', 'sensory', 'robot', 'vision_train'],
+            },
+        },
+        all: {
+            surface: {
+                hidden_capabilities: [],
+            },
+        },
+    },
 };
 // ============================================================================
 // TOML Parser/Serializer (Simple Implementation)
@@ -537,12 +565,18 @@ class ConfigManager {
         if (partial.integrations) {
             this.config.integrations = { ...this.config.integrations, ...partial.integrations };
         }
+        if (partial.surface) {
+            this.config.surface = { ...this.config.surface, ...partial.surface };
+        }
         if (partial.model_pairs) {
             this.config.model_pairs = { ...this.config.model_pairs, ...partial.model_pairs };
         }
         if (partial.llm) {
             this.config.llm = { ...this.config.llm, ...partial.llm };
         }
+        if (partial.profiles) {
+            this.config.profiles = { ...this.config.profiles, ...partial.profiles };
+        }
     }
     /**
      * Get current config
@@ -654,7 +688,7 @@ class ConfigManager {
                 `Available profiles: ${Object.keys(cfg.profiles ?? {}).join(', ') || '(none defined)'}`);
         }
         this.mergeConfig(profile);
-        logger.info(`Applied config profile: ${profileName}`, { source: 'ConfigManager' });
+        logger.debug(`Applied config profile: ${profileName}`, { source: 'ConfigManager' });
     }
     /**
      * Reload configuration
@@ -713,4 +747,8 @@ export function getConfigManager() {
     }
     return configManagerInstance;
 }
+/** Reset the singleton so profile-sensitive tests and embedded runtimes can reload cleanly. */
+export function resetConfigManager() {
+    configManagerInstance = null;
+}
 //# sourceMappingURL=toml-config.js.map

package/dist/context/auto-compact-threshold.d.ts

@@ -2,7 +2,7 @@
  * Adaptive auto-compact threshold helper.
  *
  * Derived from the comparative audit Claude Code source vs Code Buddy
- * SmartCompactionEngine (claude-et-patrice/propositions/AUDIT-COMPACTION-CLAUDE-CODE-2026-05-04.md).
+ * SmartCompactionEngine (le dépôt privé de passation, propositions/AUDIT-COMPACTION-CLAUDE-CODE-2026-05-04.md).
  * Recommended #1 in the audit — adaptive buffer per model, scope M.
  *
  * Problem

package/dist/context/auto-compact-threshold.js

@@ -2,7 +2,7 @@
  * Adaptive auto-compact threshold helper.
  *
  * Derived from the comparative audit Claude Code source vs Code Buddy
- * SmartCompactionEngine (claude-et-patrice/propositions/AUDIT-COMPACTION-CLAUDE-CODE-2026-05-04.md).
+ * SmartCompactionEngine (le dépôt privé de passation, propositions/AUDIT-COMPACTION-CLAUDE-CODE-2026-05-04.md).
  * Recommended #1 in the audit — adaptive buffer per model, scope M.
  *
  * Problem

package/dist/context/codebase-map.js

@@ -1,8 +1,9 @@
 import fs from "fs-extra";
 import * as path from "path";
-import { exec } from "child_process";
+import { execFile } from "child_process";
 import { promisify } from "util";
-const execAsync = promisify(exec);
+import { getRipgrepPath } from '../utils/ripgrep-path.js';
+const execFileAsync = promisify(execFile);
 const LANGUAGE_EXTENSIONS = {
     ts: "TypeScript",
     tsx: "TypeScript (React)",
@@ -100,9 +101,13 @@ export class CodebaseMapper {
         return this.map;
     }
     async getAllFiles() {
-        const ignoreDirsArg = IGNORED_DIRS.map((d) => `--glob '!${d}'`).join(" ");
         try {
-            const { stdout } = await execAsync(`rg --files ${ignoreDirsArg} "${this.rootDir}"`, { maxBuffer: 10 * 1024 * 1024 });
+            const ignoreArgs = IGNORED_DIRS.flatMap((directory) => [
+                "--glob",
+                `!**/${directory}/**`,
+            ]);
+            const rgBinary = getRipgrepPath().replace(/\.asar([\\/])/, ".asar.unpacked$1");
+            const { stdout } = await execFileAsync(rgBinary, ["--files", ...ignoreArgs, "--", this.rootDir], { encoding: "utf-8", maxBuffer: 10 * 1024 * 1024 });
             return stdout.trim().split("\n").filter(Boolean);
         }
         catch (_error) {

package/dist/context/codebase-rag/codebase-rag.js

@@ -20,6 +20,7 @@ import { createVectorStore, InMemoryVectorStore } from "./vector-store.js";
 import { getErrorMessage } from "../../types/index.js";
 import { getCrossEncoderReranker } from "../cross-encoder-reranker.js";
 import { getMetrics } from "../../metrics/metrics-collector.js";
+import { readJsonAtomic, writeJsonAtomic } from "../../utils/atomic-write.js";
 /**
  * Main Codebase RAG class
  */
@@ -729,11 +730,11 @@ export class CodebaseRAG extends EventEmitter {
             ...chunk,
             embedding: undefined, // Don't save embeddings to chunk file
         }));
-        await fsPromises.writeFile(path.join(dir, "chunks.json"), JSON.stringify(chunks), "utf-8");
+        await writeJsonAtomic(path.join(dir, "chunks.json"), chunks);
         // Save file index
-        await fsPromises.writeFile(path.join(dir, "file-index.json"), JSON.stringify(Object.fromEntries(this.fileIndex)), "utf-8");
+        await writeJsonAtomic(path.join(dir, "file-index.json"), Object.fromEntries(this.fileIndex));
         // Save stats
-        await fsPromises.writeFile(path.join(dir, "stats.json"), JSON.stringify(this.indexStats), "utf-8");
+        await writeJsonAtomic(path.join(dir, "stats.json"), this.indexStats);
         // Vector store saves itself
         if (this.vectorStore instanceof InMemoryVectorStore) {
             await this.vectorStore.saveToDisk();
@@ -754,7 +755,7 @@ export class CodebaseRAG extends EventEmitter {
             const chunksPath = path.join(dir, "chunks.json");
             const chunksExists = await fsPromises.access(chunksPath).then(() => true).catch(() => false);
             if (chunksExists) {
-                const chunks = JSON.parse(await fsPromises.readFile(chunksPath, "utf-8"));
+                const chunks = await readJsonAtomic(chunksPath, []);
                 for (const chunk of chunks) {
                     this.chunkStore.set(chunk.id, chunk);
                 }
@@ -763,14 +764,14 @@ export class CodebaseRAG extends EventEmitter {
             const fileIndexPath = path.join(dir, "file-index.json");
             const fileIndexExists = await fsPromises.access(fileIndexPath).then(() => true).catch(() => false);
             if (fileIndexExists) {
-                const fileIndex = JSON.parse(await fsPromises.readFile(fileIndexPath, "utf-8"));
+                const fileIndex = await readJsonAtomic(fileIndexPath, {});
                 this.fileIndex = new Map(Object.entries(fileIndex));
             }
             // Load stats
             const statsPath = path.join(dir, "stats.json");
             const statsExists = await fsPromises.access(statsPath).then(() => true).catch(() => false);
             if (statsExists) {
-                this.indexStats = JSON.parse(await fsPromises.readFile(statsPath, "utf-8"));
+                this.indexStats = await readJsonAtomic(statsPath, this.indexStats);
                 this.indexStats.lastUpdated = new Date(this.indexStats.lastUpdated);
             }
             return true;

package/dist/context/codebase-rag/hnsw-store.js

@@ -15,6 +15,7 @@ import { EventEmitter } from "events";
 import * as fs from "fs";
 import * as path from "path";
 import { logger } from "../../utils/logger.js";
+import { readJsonAtomic, writeJsonAtomic } from "../../utils/atomic-write.js";
 /**
  * Default HNSW configuration
  * Optimized for code embeddings (768-1024 dimensions)
@@ -491,7 +492,7 @@ export class HNSWVectorStore extends EventEmitter {
         if (!fs.existsSync(dir)) {
             fs.mkdirSync(dir, { recursive: true });
         }
-        fs.writeFileSync(filePath, JSON.stringify(data));
+        await writeJsonAtomic(filePath, data);
         logger.debug(`HNSW index saved: ${this.nodes.size} vectors`);
     }
     /**
@@ -501,10 +502,14 @@ export class HNSWVectorStore extends EventEmitter {
         if (!fs.existsSync(filePath)) {
             throw new Error(`Index file not found: ${filePath}`);
         }
-        const data = JSON.parse(fs.readFileSync(filePath, "utf-8"));
+        const data = await readJsonAtomic(filePath, null, {
+            isValid: (value) => Boolean(value && typeof value === 'object' && Array.isArray(value.nodes)),
+        });
+        if (!data)
+            throw new Error(`Index file is empty or unreadable: ${filePath}`);
         this.config = { ...DEFAULT_HNSW_CONFIG, ...data.config };
-        this.entryPoint = data.entryPoint;
-        this.maxLevel = data.maxLevel;
+        this.entryPoint = data.entryPoint ?? null;
+        this.maxLevel = data.maxLevel ?? 0;
         this.nodes.clear();
         for (const nodeData of data.nodes) {
             const node = {

package/dist/context/codebase-rag/vector-store.js

@@ -9,6 +9,7 @@ import { cosineSimilarity } from "./embeddings.js";
 import fs from "fs";
 import path from "path";
 import { logger } from "../../utils/logger.js";
+import { readJsonAtomicSync, writeJsonAtomicSync } from "../../utils/atomic-write.js";
 /**
  * Simple in-memory vector store
  */
@@ -141,7 +142,7 @@ export class InMemoryVectorStore {
         if (!fs.existsSync(dir)) {
             fs.mkdirSync(dir, { recursive: true });
         }
-        fs.writeFileSync(this.persistPath, JSON.stringify(data), "utf-8");
+        writeJsonAtomicSync(this.persistPath, data);
         this.dirty = false;
     }
     /**
@@ -151,9 +152,8 @@ export class InMemoryVectorStore {
         if (!this.persistPath || !fs.existsSync(this.persistPath))
             return;
         try {
-            const content = fs.readFileSync(this.persistPath, "utf-8");
-            const data = JSON.parse(content);
-            if (data.version === 1 && Array.isArray(data.vectors)) {
+            const data = readJsonAtomicSync(this.persistPath, null);
+            if (data?.version === 1 && Array.isArray(data.vectors)) {
                 for (const entry of data.vectors) {
                     this.vectors.set(entry.id, entry);
                 }

package/dist/context/compaction/parallel-summarizer.js

@@ -15,6 +15,7 @@ const _SUMMARIZE_PROMPT = `Summarize the following conversation segment concisel
 2. Important facts discussed
 3. Unresolved questions or TODOs
 4. Technical details that would be needed for context
+5. Failed attempts and dead-ends: what was tried, why it failed (the error), and what NOT to retry — as important as what succeeded
 
 Be concise but complete. Output only the summary, no preamble.
 

package/dist/context/compression.js

@@ -4,6 +4,8 @@
  * Provides various strategies to reduce the token count of a conversation
  * while maintaining its coherence and essential instructions.
  */
+import { estimateImageUrlTokens } from './token-counter.js';
+import { repairToolCallPairs } from './transcript-repair.js';
 /**
  * Context Compression Engine.
  * Implements a multi-stage approach to context reduction:
@@ -40,10 +42,10 @@ export class ContextCompressor {
         }
         // Clone to avoid mutation
         let processedMessages = [...messages];
-        const systemMessage = options.preserveSystemPrompt ? processedMessages.find(m => m.role === 'system') : null;
+        const systemMessages = options.preserveSystemPrompt ? processedMessages.filter(m => m.role === 'system') : [];
         const recentCount = options.preserveRecentMessages !== undefined ? options.preserveRecentMessages : 2;
-        // Filter out system message if we're preserving it separately to add back later
-        if (systemMessage) {
+        // Filter out system messages if we're preserving them separately to add back later
+        if (systemMessages.length > 0) {
             processedMessages = processedMessages.filter(m => m.role !== 'system');
         }
         // Separate recent messages
@@ -53,15 +55,15 @@ export class ContextCompressor {
         olderMessages = this.truncateToolOutputs(olderMessages);
         // Reassemble to check if we're good
         let currentSet = [];
-        if (systemMessage) {
-            currentSet.push(systemMessage);
+        if (systemMessages.length > 0) {
+            currentSet.push(...systemMessages);
         }
         currentSet.push(...olderMessages, ...recentMessages);
         let currentTokens = this.countTotalTokens(currentSet);
         if (currentTokens <= tokenLimit) {
             return {
                 compressed: true,
-                messages: currentSet,
+                messages: repairToolCallPairs(currentSet),
                 tokensReduced: initialTokens - currentTokens,
                 strategy: 'tool_truncation'
             };
@@ -85,8 +87,8 @@ export class ContextCompressor {
         if (olderStartIndex > 0) {
             olderMessages = olderMessages.slice(olderStartIndex);
             currentSet = [];
-            if (systemMessage) {
-                currentSet.push(systemMessage);
+            if (systemMessages.length > 0) {
+                currentSet.push(...systemMessages);
             }
             currentSet.push(...olderMessages, ...recentMessages);
         }
@@ -102,7 +104,7 @@ export class ContextCompressor {
         }
         return {
             compressed: true,
-            messages: currentSet,
+            messages: repairToolCallPairs(currentSet),
             tokensReduced: initialTokens - currentTokens,
             strategy: 'sliding_window'
         };
@@ -113,20 +115,17 @@ export class ContextCompressor {
     countTotalTokens(messages) {
         const tokenMessages = messages.map(msg => ({
             role: msg.role,
-            content: typeof msg.content === 'string' ? msg.content : null,
+            content: typeof msg.content === 'string' || Array.isArray(msg.content) ? msg.content : null,
             tool_calls: 'tool_calls' in msg ? msg.tool_calls : undefined,
         }));
-        return this.tokenCounter.countMessageTokens(tokenMessages);
+        const imageTokens = messages.reduce((total, message) => total + estimateImageUrlTokens(message.content), 0);
+        return this.tokenCounter.countMessageTokens(tokenMessages) + imageTokens;
     }
     /**
      * Helper to count tokens for a single message (for incremental calculations).
      */
     countSingleMessageTokens(msg) {
-        return this.tokenCounter.countMessageTokens([{
-                role: msg.role,
-                content: typeof msg.content === 'string' ? msg.content : null,
-                tool_calls: 'tool_calls' in msg ? msg.tool_calls : undefined,
-            }]);
+        return this.countTotalTokens([msg]);
     }
     /**
      * Strategy: Truncate long content from tool messages.
@@ -152,11 +151,11 @@ export class ContextCompressor {
         // This is a "save the ship" strategy
         const result = [];
         let currentTokens = 0;
-        // Always keep system if present
-        const system = messages.find(m => m.role === 'system');
-        if (system) {
-            result.push(system);
-            currentTokens += this.countTotalTokens([system]);
+        // Always keep all system messages if present
+        const systemMessages = messages.filter(m => m.role === 'system');
+        if (systemMessages.length > 0) {
+            result.push(...systemMessages);
+            currentTokens += this.countTotalTokens(systemMessages);
         }
         // Try to add from most recent backwards
         const reverseMsgs = [...messages].reverse().filter(m => m.role !== 'system');
@@ -170,15 +169,12 @@ export class ContextCompressor {
                 break;
             }
         }
-        // Ensure system is first
-        if (system && result[0] !== system) {
-            // Should already be handled but safety check
-            const idx = result.indexOf(system);
-            if (idx >= 0)
-                result.splice(idx, 1);
-            result.unshift(system);
+        // Ensure system messages are first, in original order
+        if (systemMessages.length > 0) {
+            const nonSystem = result.filter(m => m.role !== 'system');
+            return repairToolCallPairs([...systemMessages, ...nonSystem]);
         }
-        return result;
+        return repairToolCallPairs(result);
     }
 }
 //# sourceMappingURL=compression.js.map