wave-agent-sdk 0.14.0 → 0.14.2

package/dist/services/MarketplaceService.js

@@ -3,14 +3,21 @@ import * as path from "path";
 import * as crypto from "crypto";
 import { getPluginsDir } from "../utils/configPaths.js";
 import { GitService } from "./GitService.js";
+import { ConfigurationService } from "./configurationService.js";
+import { logger } from "../utils/globalLogger.js";
 /**
  * Marketplace Service
  *
  * Handles local plugin marketplace registration, plugin installation,
  * and state management for installed plugins.
+ *
+ * Marketplace declarations are now scoped (user/project/local) via settings files.
+ * known_marketplaces.json is kept as a cache for installLocation/lastUpdated metadata.
  */
 export class MarketplaceService {
-    constructor() {
+    constructor(workdir = process.cwd(), configurationService = new ConfigurationService()) {
+        this.workdir = workdir;
+        this.configurationService = configurationService;
         this.pluginsDir = getPluginsDir();
         this.knownMarketplacesPath = path.join(this.pluginsDir, "known_marketplaces.json");
         this.installedPluginsPath = path.join(this.pluginsDir, "installed_plugins.json");
@@ -20,6 +27,7 @@ export class MarketplaceService {
         this.marketplacesDir = path.join(this.pluginsDir, "marketplaces");
         this.gitService = new GitService();
         this.ensureDirectoryStructure();
+        this.runMigration();
     }
     /**
      * Ensures the required directory structure exists in ~/.wave/plugins
@@ -31,6 +39,32 @@ export class MarketplaceService {
             }
         });
     }
+    /**
+     * Backwards compatibility migration: migrate entries from known_marketplaces.json
+     * to user-level settings if they aren't already declared there.
+     */
+    async runMigration() {
+        try {
+            const cacheRegistry = await this.getCacheRegistry();
+            const scopedMarketplaces = this.configurationService.getMergedMarketplaces(this.workdir);
+            const userMarketplaces = this.configurationService.getScopedMarketplaces(this.workdir, "user");
+            const entriesToMigrate = (cacheRegistry?.marketplaces ?? []).filter((m) => !scopedMarketplaces[m.name] && !userMarketplaces[m.name]);
+            if (entriesToMigrate.length > 0) {
+                for (const m of entriesToMigrate) {
+                    if (m.name === MarketplaceService.BUILTIN_MARKETPLACE.name)
+                        continue;
+                    const config = {
+                        source: m.source,
+                        autoUpdate: m.autoUpdate,
+                    };
+                    await this.configurationService.addMarketplaceToScope(this.workdir, "user", m.name, config);
+                }
+            }
+        }
+        catch {
+            // Migration failure should not block startup
+        }
+    }
     /**
      * Check if a lock file is stale by reading its PID and checking if the process is alive.
      * Returns true if the lock is stale and safe to remove.
@@ -41,17 +75,16 @@ export class MarketplaceService {
             const pid = parseInt(content.trim(), 10);
             if (isNaN(pid))
                 return true;
-            // Check if the process is still running
             try {
                 process.kill(pid, 0);
-                return false; // Process exists, lock is valid
+                return false;
             }
             catch {
-                return true; // Process doesn't exist, lock is stale
+                return true;
             }
         }
         catch {
-            return true; // Can't read lock file, assume stale
+            return true;
         }
     }
     /**
@@ -63,7 +96,7 @@ export class MarketplaceService {
             return await fn();
         }
         let lockFd;
-        const maxRetries = 600; // 60 seconds total
+        const maxRetries = 600;
         const retryDelay = 100;
         for (let i = 0; i < maxRetries; i++) {
             try {
@@ -75,7 +108,6 @@ export class MarketplaceService {
                     typeof error === "object" &&
                     "code" in error &&
                     error.code === "EEXIST") {
-                    // Check for stale lock every 60 retries (every ~6 seconds)
                     if (i > 0 && i % 60 === 0) {
                         const stale = await this.isStaleLock();
                         if (stale) {
@@ -92,7 +124,6 @@ export class MarketplaceService {
         if (!lockFd) {
             throw new Error(`Failed to acquire marketplace lock after ${maxRetries} retries. If no other wave-agent process is running, please delete ${this.lockPath}`);
         }
-        // Write PID into the lock file for stale lock detection
         await fs.writeFile(this.lockPath, String(process.pid), "utf-8");
         MarketplaceService.isLockedInProcess = true;
         try {
@@ -105,37 +136,86 @@ export class MarketplaceService {
         }
     }
     /**
-     * Loads the known marketplaces registry
+     * Loads the cache registry from known_marketplaces.json
+     * Returns null if the file doesn't exist or has no parseable content (for first-run detection).
      */
-    async getKnownMarketplaces() {
+    async getCacheRegistry() {
         if (!existsSync(this.knownMarketplacesPath)) {
+            return null;
+        }
+        try {
+            const content = await fs.readFile(this.knownMarketplacesPath, "utf-8");
+            if (!content.trim()) {
+                return null;
+            }
+            return JSON.parse(content);
+        }
+        catch {
+            return null;
+        }
+    }
+    /**
+     * Legacy method: loads known marketplaces with builtin injection.
+     * @deprecated Use listMarketplaces() instead, which combines scoped settings.
+     */
+    async getKnownMarketplaces() {
+        const cache = await this.getCacheRegistry();
+        // If cache is null (file doesn't exist or has no parseable content), inject builtin
+        if (cache === null) {
             return {
                 marketplaces: [
                     {
                         ...MarketplaceService.BUILTIN_MARKETPLACE,
                         isBuiltin: true,
+                        declaredScope: "builtin",
                     },
                 ],
             };
         }
-        try {
-            const content = await fs.readFile(this.knownMarketplacesPath, "utf-8");
-            if (!content.trim()) {
-                return {
-                    marketplaces: [
-                        {
-                            ...MarketplaceService.BUILTIN_MARKETPLACE,
-                            isBuiltin: true,
-                        },
-                    ],
-                };
-            }
-            return JSON.parse(content);
+        // File has valid JSON - respect user's explicit choice even if empty
+        const hasBuiltin = cache.marketplaces.some((m) => m.name === MarketplaceService.BUILTIN_MARKETPLACE.name);
+        return {
+            marketplaces: cache.marketplaces.map((m) => ({
+                ...m,
+                isBuiltin: m.isBuiltin || m.name === MarketplaceService.BUILTIN_MARKETPLACE.name,
+                declaredScope: m.declaredScope ?? (hasBuiltin ? "builtin" : "user"),
+            })),
+        };
+    }
+    /**
+     * Updates the cache registry with metadata for a marketplace
+     */
+    async updateCacheMarketplace(name, metadata) {
+        const registry = await this.getCacheRegistry();
+        const marketplaces = registry?.marketplaces ?? [];
+        const existingIndex = marketplaces.findIndex((m) => m.name === name);
+        if (existingIndex >= 0) {
+            marketplaces[existingIndex] = {
+                ...marketplaces[existingIndex],
+                ...metadata,
+            };
         }
-        catch (error) {
-            console.error("Failed to load known marketplaces:", error);
-            return { marketplaces: [] };
+        else {
+            marketplaces.push({
+                name,
+                source: metadata.source || { source: "directory", path: "" },
+                ...metadata,
+            });
         }
+        const tmpPath = `${this.knownMarketplacesPath}.tmp`;
+        await fs.writeFile(tmpPath, JSON.stringify({ marketplaces }, null, 2));
+        await fs.rename(tmpPath, this.knownMarketplacesPath);
+    }
+    /**
+     * Removes a marketplace from the cache registry
+     */
+    async removeFromCache(name) {
+        const registry = await this.getCacheRegistry();
+        const marketplaces = registry?.marketplaces ?? [];
+        const filtered = marketplaces.filter((m) => m.name !== name);
+        const tmpPath = `${this.knownMarketplacesPath}.tmp`;
+        await fs.writeFile(tmpPath, JSON.stringify({ marketplaces: filtered }, null, 2));
+        await fs.rename(tmpPath, this.knownMarketplacesPath);
     }
     /**
      * Loads the installed plugins registry
@@ -156,14 +236,6 @@ export class MarketplaceService {
             return { plugins: [] };
         }
     }
-    /**
-     * Saves the known marketplaces registry
-     */
-    async saveKnownMarketplaces(registry) {
-        const tmpPath = `${this.knownMarketplacesPath}.tmp`;
-        await fs.writeFile(tmpPath, JSON.stringify(registry, null, 2));
-        await fs.rename(tmpPath, this.knownMarketplacesPath);
-    }
     /**
      * Saves the installed plugins registry
      */
@@ -182,7 +254,6 @@ export class MarketplaceService {
         }
         const content = await fs.readFile(manifestPath, "utf-8");
         const manifest = JSON.parse(content);
-        // Basic validation
         if (!manifest.name ||
             !manifest.plugins ||
             !Array.isArray(manifest.plugins)) {
@@ -193,26 +264,49 @@ export class MarketplaceService {
     /**
      * Resolves the local path for a marketplace
      */
-    getMarketplacePath(marketplace) {
-        if (marketplace.source.source === "directory") {
-            return marketplace.source.path;
+    getMarketplacePath(source) {
+        if (source.source === "directory") {
+            return source.path;
         }
-        else if (marketplace.source.source === "github") {
-            return path.join(this.marketplacesDir, marketplace.source.repo);
+        else if (source.source === "github") {
+            return path.join(this.marketplacesDir, source.repo);
         }
         else {
-            // For general git, use a hash of the URL to avoid path issues
-            const hash = crypto
-                .createHash("md5")
-                .update(marketplace.source.url)
-                .digest("hex");
+            const hash = crypto.createHash("md5").update(source.url).digest("hex");
             return path.join(this.marketplacesDir, hash);
         }
     }
+    /**
+     * Builds a KnownMarketplace from a scoped config, enriched with cache metadata
+     */
+    async buildMarketplaceEntry(name, config, cache, declaredScope) {
+        return {
+            name,
+            source: config.source,
+            autoUpdate: config.autoUpdate ?? cache?.autoUpdate,
+            lastUpdated: cache?.lastUpdated,
+            isBuiltin: name === MarketplaceService.BUILTIN_MARKETPLACE.name,
+            declaredScope,
+        };
+    }
+    /**
+     * Finds which scope declared a marketplace (user, project, local, or builtin)
+     */
+    getMarketplaceDeclaringSource(name) {
+        if (name === MarketplaceService.BUILTIN_MARKETPLACE.name)
+            return "builtin";
+        const scopes = ["local", "project", "user"];
+        for (const scope of scopes) {
+            const scoped = this.configurationService.getScopedMarketplaces(this.workdir, scope);
+            if (scoped[name])
+                return scope;
+        }
+        return null;
+    }
     /**
      * Adds a new marketplace (local directory, GitHub repo, or Git URL)
      */
-    async addMarketplace(input) {
+    async addMarketplace(input, scope = "user") {
         return this.withLock(async () => {
             let marketplace;
             const isFullUrl = input.startsWith("http://") ||
@@ -223,16 +317,15 @@ export class MarketplaceService {
                 (input.includes("/") &&
                     !path.isAbsolute(input) &&
                     !input.startsWith("."))) {
-                // Git or GitHub repo
                 let urlOrRepo = input;
                 let ref;
                 if (input.includes("#")) {
                     [urlOrRepo, ref] = input.split("#");
                 }
-                const tempMarketplace = isFullUrl
-                    ? { name: "", source: { source: "git", url: urlOrRepo, ref } }
-                    : { name: "", source: { source: "github", repo: urlOrRepo, ref } };
-                const targetPath = this.getMarketplacePath(tempMarketplace);
+                const tempSource = isFullUrl
+                    ? { source: "git", url: urlOrRepo, ref }
+                    : { source: "github", repo: urlOrRepo, ref };
+                const targetPath = this.getMarketplacePath(tempSource);
                 if (!existsSync(targetPath)) {
                     try {
                         await this.gitService.clone(urlOrRepo, targetPath, ref);
@@ -258,7 +351,6 @@ export class MarketplaceService {
                 };
             }
             else {
-                // Local directory format
                 const absolutePath = path.resolve(input);
                 let manifest;
                 try {
@@ -274,44 +366,68 @@ export class MarketplaceService {
                     lastUpdated: new Date().toISOString(),
                 };
             }
-            const registry = await this.getKnownMarketplaces();
-            // Check if already exists
-            const existingIndex = registry.marketplaces.findIndex((m) => m.name === marketplace.name);
-            if (existingIndex >= 0) {
-                registry.marketplaces[existingIndex] = marketplace;
-            }
-            else {
-                registry.marketplaces.push(marketplace);
-            }
-            // Ensure builtin is included if we are creating the file for the first time
-            // and it hasn't been explicitly removed yet.
-            // (getKnownMarketplaces already handles the default injection)
-            await this.saveKnownMarketplaces(registry);
+            const config = {
+                source: marketplace.source,
+                autoUpdate: marketplace.autoUpdate,
+            };
+            await this.configurationService.addMarketplaceToScope(this.workdir, scope, marketplace.name, config);
+            // Update cache with metadata
+            await this.updateCacheMarketplace(marketplace.name, {
+                source: marketplace.source,
+                autoUpdate: marketplace.autoUpdate,
+                lastUpdated: marketplace.lastUpdated,
+            });
             return marketplace;
         });
     }
     /**
-     * Lists all registered marketplaces
+     * Lists all registered marketplaces by combining scoped settings + built-in
      */
     async listMarketplaces() {
-        const registry = await this.getKnownMarketplaces();
-        return registry.marketplaces.map((m) => ({
-            ...m,
-            isBuiltin: m.name === MarketplaceService.BUILTIN_MARKETPLACE.name,
-        }));
+        const scopedMarketplaces = this.configurationService.getMergedMarketplaces(this.workdir);
+        const cacheRegistry = await this.getCacheRegistry();
+        const cacheMap = new Map((cacheRegistry?.marketplaces ?? []).map((m) => [m.name, m]));
+        const result = [];
+        // Add built-in marketplace
+        result.push({
+            ...MarketplaceService.BUILTIN_MARKETPLACE,
+            isBuiltin: true,
+            declaredScope: "builtin",
+        });
+        // Add all scoped marketplaces (local overrides project overrides user)
+        for (const [name, config] of Object.entries(scopedMarketplaces)) {
+            if (name === MarketplaceService.BUILTIN_MARKETPLACE.name)
+                continue;
+            const cache = cacheMap.get(name);
+            const declaredScope = this.getMarketplaceDeclaringSource(name);
+            result.push(await this.buildMarketplaceEntry(name, config, cache, declaredScope));
+        }
+        // Add cache entries not yet in scoped settings (backwards compatibility)
+        for (const [name, cache] of cacheMap.entries()) {
+            if (name === MarketplaceService.BUILTIN_MARKETPLACE.name)
+                continue;
+            if (scopedMarketplaces[name])
+                continue;
+            result.push({
+                ...cache,
+                isBuiltin: false,
+                declaredScope: cache.declaredScope ?? "user",
+            });
+        }
+        return result;
     }
     /**
-     * Removes a marketplace by name
+     * Removes a marketplace by name from the specified scope
      */
-    async removeMarketplace(name) {
+    async removeMarketplace(name, scope) {
         return this.withLock(async () => {
-            const registry = await this.getKnownMarketplaces();
-            const initialCount = registry.marketplaces.length;
-            registry.marketplaces = registry.marketplaces.filter((m) => m.name !== name);
-            if (registry.marketplaces.length === initialCount) {
-                throw new Error(`Marketplace ${name} not found`);
+            const targetScope = scope || this.getMarketplaceDeclaringSource(name) || "user";
+            if (targetScope === "builtin") {
+                throw new Error("Cannot remove built-in marketplace");
             }
-            await this.saveKnownMarketplaces(registry);
+            await this.configurationService.removeMarketplaceFromScope(this.workdir, targetScope, name);
+            // Also remove from cache
+            await this.removeFromCache(name);
         });
     }
     /**
@@ -319,10 +435,10 @@ export class MarketplaceService {
      */
     async updateMarketplace(name, options) {
         return this.withLock(async () => {
-            const registry = await this.getKnownMarketplaces();
+            const marketplaces = await this.listMarketplaces();
             const toUpdate = name
-                ? registry.marketplaces.filter((m) => m.name === name)
-                : registry.marketplaces;
+                ? marketplaces.filter((m) => m.name === name)
+                : marketplaces;
             if (name && toUpdate.length === 0) {
                 throw new Error(`Marketplace ${name} not found`);
             }
@@ -336,7 +452,7 @@ export class MarketplaceService {
                             console.warn(`Skipping update for Git/GitHub marketplace "${marketplace.name}" because Git is not installed.`);
                             continue;
                         }
-                        const targetPath = this.getMarketplacePath(marketplace);
+                        const targetPath = this.getMarketplacePath(marketplace.source);
                         if (existsSync(targetPath)) {
                             await this.gitService.pull(targetPath);
                         }
@@ -351,16 +467,19 @@ export class MarketplaceService {
                             await this.gitService.clone(url, targetPath, marketplace.source.ref);
                         }
                     }
-                    // For directory source, we just re-validate the manifest
-                    const manifest = await this.loadMarketplaceManifest(this.getMarketplacePath(marketplace));
+                    const manifest = await this.loadMarketplaceManifest(this.getMarketplacePath(marketplace.source));
                     marketplace.lastUpdated = new Date().toISOString();
+                    // Update cache metadata
+                    await this.updateCacheMarketplace(marketplace.name, {
+                        lastUpdated: marketplace.lastUpdated,
+                    });
                     if (options?.updatePlugins) {
                         const installedRegistry = await this.getInstalledPlugins();
                         const pluginsToUpdate = installedRegistry.plugins.filter((p) => p.marketplace === marketplace.name);
                         for (const plugin of pluginsToUpdate) {
                             const pluginEntry = manifest.plugins.find((p) => p.name === plugin.name);
                             if (!pluginEntry) {
-                                console.warn(`Plugin "${plugin.name}" no longer found in marketplace "${marketplace.name}". Uninstalling...`);
+                                logger.warn(`Plugin "${plugin.name}" no longer found in marketplace "${marketplace.name}". Uninstalling...`);
                                 try {
                                     await this.uninstallPlugin(`${plugin.name}@${plugin.marketplace}`, plugin.projectPath);
                                 }
@@ -387,7 +506,6 @@ export class MarketplaceService {
             if (errors.length > 0) {
                 throw new Error(`Some marketplaces failed to update:\n${errors.join("\n")}`);
             }
-            await this.saveKnownMarketplaces(registry);
         });
     }
     /**
@@ -395,16 +513,18 @@ export class MarketplaceService {
      */
     async autoUpdateAll() {
         return this.withLock(async () => {
-            const registry = await this.getKnownMarketplaces();
-            const toAutoUpdate = registry.marketplaces.filter((m) => m.autoUpdate);
-            for (const marketplace of toAutoUpdate) {
+            const scopedMarketplaces = this.configurationService.getMergedMarketplaces(this.workdir);
+            const toAutoUpdate = Object.entries(scopedMarketplaces)
+                .filter(([, config]) => config.autoUpdate)
+                .map(([name]) => name);
+            for (const marketplaceName of toAutoUpdate) {
                 try {
-                    await this.updateMarketplace(marketplace.name, {
+                    await this.updateMarketplace(marketplaceName, {
                         updatePlugins: true,
                     });
                 }
                 catch (error) {
-                    console.error(`Auto-update failed for marketplace "${marketplace.name}":`, error);
+                    console.error(`Auto-update failed for marketplace "${marketplaceName}":`, error);
                 }
             }
         });
@@ -414,13 +534,19 @@ export class MarketplaceService {
      */
     async toggleAutoUpdate(name, enabled) {
         return this.withLock(async () => {
-            const registry = await this.getKnownMarketplaces();
-            const marketplace = registry.marketplaces.find((m) => m.name === name);
-            if (!marketplace) {
+            const declaringSource = this.getMarketplaceDeclaringSource(name);
+            if (!declaringSource || declaringSource === "builtin") {
+                throw new Error(`Marketplace ${name} not found`);
+            }
+            const scoped = this.configurationService.getScopedMarketplaces(this.workdir, declaringSource);
+            const config = scoped[name];
+            if (!config) {
                 throw new Error(`Marketplace ${name} not found`);
             }
-            marketplace.autoUpdate = enabled;
-            await this.saveKnownMarketplaces(registry);
+            config.autoUpdate = enabled;
+            await this.configurationService.addMarketplaceToScope(this.workdir, declaringSource, name, config);
+            // Also update cache
+            await this.updateCacheMarketplace(name, { autoUpdate: enabled });
         });
     }
     /**
@@ -437,7 +563,7 @@ export class MarketplaceService {
             if (!marketplace) {
                 throw new Error(`Marketplace ${marketplaceName} not found`);
             }
-            const marketplacePath = this.getMarketplacePath(marketplace);
+            const marketplacePath = this.getMarketplacePath(marketplace.source);
             const manifest = await this.loadMarketplaceManifest(marketplacePath);
             const pluginEntry = manifest.plugins.find((p) => p.name === pluginName);
             if (!pluginEntry) {
@@ -470,12 +596,11 @@ export class MarketplaceService {
                 const pluginManifestContent = await fs.readFile(pluginManifestPath, "utf-8");
                 const pluginManifest = JSON.parse(pluginManifestContent);
                 const version = pluginManifest.version || "1.0.0";
-                // Atomic installation
                 const tmpPluginDir = path.join(this.tmpDir, `${pluginName}-${Date.now()}`);
                 try {
                     if (isGitSource) {
                         await fs.rename(pluginSrcPath, tmpPluginDir);
-                        tempCloneDir = undefined; // Already moved
+                        tempCloneDir = undefined;
                     }
                     else {
                         await fs.cp(pluginSrcPath, tmpPluginDir, { recursive: true });
@@ -507,7 +632,6 @@ export class MarketplaceService {
                     return installedPlugin;
                 }
                 catch (error) {
-                    // Cleanup tmp dir if it exists
                     if (existsSync(tmpPluginDir)) {
                         await fs.rm(tmpPluginDir, { recursive: true, force: true });
                     }
@@ -515,7 +639,6 @@ export class MarketplaceService {
                 }
             }
             catch (error) {
-                // Cleanup temp clone dir if it exists
                 if (tempCloneDir && existsSync(tempCloneDir)) {
                     await fs.rm(tempCloneDir, { recursive: true, force: true });
                 }
@@ -540,12 +663,9 @@ export class MarketplaceService {
                 throw new Error(`Plugin ${pluginName}@${marketplaceName} is not installed${projectPath ? ` for project ${projectPath}` : ""}`);
             }
             const pluginToRemove = installedRegistry.plugins[pluginIndex];
-            // Remove from registry first
             installedRegistry.plugins.splice(pluginIndex, 1);
             await this.saveInstalledPlugins(installedRegistry);
-            // Check if any other project is still using this same cache path
             const isStillReferenced = installedRegistry.plugins.some((p) => p.cachePath === pluginToRemove.cachePath);
-            // Only remove cached files if no other references exist
             if (!isStillReferenced && existsSync(pluginToRemove.cachePath)) {
                 await fs.rm(pluginToRemove.cachePath, { recursive: true, force: true });
             }

package/dist/services/aiService.d.ts

@@ -37,14 +37,14 @@ export interface CallAgentResult {
     additionalFields?: Record<string, unknown>;
 }
 export declare function callAgent(options: CallAgentOptions): Promise<CallAgentResult>;
-export interface CompressMessagesOptions {
+export interface CompactMessagesOptions {
     gatewayConfig: GatewayConfig;
     modelConfig: ModelConfig;
     messages: ChatCompletionMessageParam[];
     abortSignal?: AbortSignal;
     model?: string;
 }
-export interface CompressMessagesResult {
+export interface CompactMessagesResult {
     content: string;
     usage?: {
         prompt_tokens: number;
@@ -52,7 +52,7 @@ export interface CompressMessagesResult {
         total_tokens: number;
     };
 }
-export declare function compressMessages(options: CompressMessagesOptions): Promise<CompressMessagesResult>;
+export declare function compactMessages(options: CompactMessagesOptions): Promise<CompactMessagesResult>;
 export interface ProcessWebContentOptions {
     gatewayConfig: GatewayConfig;
     modelConfig: ModelConfig;

package/dist/services/aiService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aiService.d.ts","sourceRoot":"","sources":["../../src/services/aiService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"aiService.d.ts","sourceRoot":"","sources":["../../src/services/aiService.ts"],"names":[],"mappings":"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"}

package/dist/services/aiService.js

@@ -5,7 +5,7 @@ import { transformMessagesForClaudeCache, addCacheControlToLastTool, supportsPro
 import * as os from "os";
 import * as fs from "fs";
 import * as path from "path";
-import { COMPRESS_MESSAGES_SYSTEM_PROMPT, WEB_CONTENT_SYSTEM_PROMPT, BTW_SYSTEM_PROMPT, } from "../prompts/index.js";
+import { COMPACT_MESSAGES_SYSTEM_PROMPT, WEB_CONTENT_SYSTEM_PROMPT, BTW_SYSTEM_PROMPT, } from "../prompts/index.js";
 // Global rate limiter state for 1 QPS
 let nextAllowedTime = 0;
 const MIN_INTERVAL = 1000; // 1 second for 1 QPS
@@ -450,7 +450,7 @@ async function processStreamingResponse(stream, onContentUpdate, onToolUpdate, o
     }
     return result;
 }
-export async function compressMessages(options) {
+export async function compactMessages(options) {
     const { gatewayConfig, modelConfig, messages, abortSignal } = options;
     // Apply global 1 QPS rate limit
     if (process.env.NODE_ENV !== "test" ||
@@ -492,7 +492,7 @@ export async function compressMessages(options) {
             messages: [
                 {
                     role: "system",
-                    content: COMPRESS_MESSAGES_SYSTEM_PROMPT,
+                    content: COMPACT_MESSAGES_SYSTEM_PROMPT,
                 },
                 ...cleanedMessages,
                 {
@@ -505,7 +505,7 @@ export async function compressMessages(options) {
         });
         const content = response.choices[0]?.message?.content?.trim();
         if (!content) {
-            throw new Error("Failed to compress conversation history: Empty response from AI");
+            throw new Error("Failed to compact conversation history: Empty response from AI");
         }
         const usage = response.usage
             ? {
@@ -521,10 +521,10 @@ export async function compressMessages(options) {
     }
     catch (error) {
         if (error.name === "AbortError") {
-            logger.info("Compression request was aborted");
-            throw new Error("Compression request was aborted");
+            logger.info("Compaction request was aborted");
+            throw new Error("Compaction request was aborted");
         }
-        logger.error("Failed to compress messages:", error);
+        logger.error("Failed to compact messages:", error);
         throw error;
     }
 }