wave-agent-sdk 0.8.4 → 0.9.1

package/dist/services/memory.js

@@ -1,91 +1,150 @@
-import { promises as fs } from "fs";
-import path from "path";
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import { homedir } from "node:os";
 import { USER_MEMORY_FILE, DATA_DIRECTORY } from "../utils/constants.js";
 import { logger } from "../utils/globalLogger.js";
-// Project memory related methods
-// User memory related methods
-export const ensureUserMemoryFile = async () => {
-    try {
-        // Ensure data directory exists
-        await fs.mkdir(DATA_DIRECTORY, { recursive: true });
-        // Check if user memory file exists
+import { getGitCommonDir } from "../utils/gitUtils.js";
+import { pathEncoder } from "../utils/pathEncoder.js";
+export class MemoryService {
+    constructor(container) {
+        this.container = container;
+    }
+    /**
+     * Get the project-specific auto-memory directory.
+     * Uses the git common directory to ensure worktrees share the same memory.
+     */
+    getAutoMemoryDirectory(workdir) {
+        const projectRoot = getGitCommonDir(workdir);
+        const encodedName = pathEncoder.encodeSync(projectRoot);
+        return path.join(homedir(), ".wave", "projects", encodedName, "memory");
+    }
+    /**
+     * Ensure the auto-memory directory and initial MEMORY.md exist.
+     */
+    async ensureAutoMemoryDirectory(workdir) {
+        const memoryDir = this.getAutoMemoryDirectory(workdir);
+        const memoryFile = path.join(memoryDir, "MEMORY.md");
+        try {
+            await fs.mkdir(memoryDir, { recursive: true });
+            try {
+                await fs.access(memoryFile);
+            }
+            catch (error) {
+                if (error.code === "ENOENT") {
+                    const initialContent = "# Project Memory\n\nThis file serves as an index for the project's auto-memory. Wave uses this to track knowledge across sessions.\n\n";
+                    await fs.writeFile(memoryFile, initialContent, "utf-8");
+                    logger.debug(`Created auto-memory file: ${memoryFile}`);
+                }
+                else {
+                    throw error;
+                }
+            }
+        }
+        catch (error) {
+            logger.error("Failed to ensure auto-memory directory:", error);
+            throw new Error(`Failed to ensure auto-memory directory: ${error.message}`);
+        }
+    }
+    /**
+     * Get the first 200 lines of MEMORY.md.
+     */
+    async getAutoMemoryContent(workdir) {
+        const memoryDir = this.getAutoMemoryDirectory(workdir);
+        const memoryFile = path.join(memoryDir, "MEMORY.md");
         try {
-            await fs.access(USER_MEMORY_FILE);
+            const content = await fs.readFile(memoryFile, "utf-8");
+            const lines = content.split("\n").slice(0, 200);
+            return lines.join("\n");
         }
         catch (error) {
-            // File does not exist, create new file
             if (error.code === "ENOENT") {
-                logger.info("Creating new user memory file", {
-                    userMemoryFile: USER_MEMORY_FILE,
-                });
-                const initialContent = "# User Memory\n\nThis is the user-level memory file, recording important information and context across projects.\n\n";
-                await fs.writeFile(USER_MEMORY_FILE, initialContent, "utf-8");
-                logger.debug(`Created user memory file: ${USER_MEMORY_FILE}`);
-            }
-            else {
-                throw error;
+                return "";
             }
+            logger.error("Failed to read auto-memory content:", error);
+            return "";
         }
     }
-    catch (error) {
-        logger.error("Failed to ensure user memory file:", error);
-        throw new Error(`Failed to ensure user memory file: ${error.message}`);
-    }
-};
-export const getUserMemoryContent = async () => {
-    try {
-        await ensureUserMemoryFile();
-        const content = await fs.readFile(USER_MEMORY_FILE, "utf-8");
-        logger.debug("User memory content read successfully", {
-            userMemoryFile: USER_MEMORY_FILE,
-            contentLength: content.length,
-        });
-        return content;
-    }
-    catch (error) {
-        logger.error("Failed to read user memory:", error);
-        return "";
+    async ensureUserMemoryFile() {
+        try {
+            // Ensure data directory exists
+            await fs.mkdir(DATA_DIRECTORY, { recursive: true });
+            // Check if user memory file exists
+            try {
+                await fs.access(USER_MEMORY_FILE);
+            }
+            catch (error) {
+                // File does not exist, create new file
+                if (error.code === "ENOENT") {
+                    logger.info("Creating new user memory file", {
+                        userMemoryFile: USER_MEMORY_FILE,
+                    });
+                    const initialContent = "# User Memory\n\nThis is the user-level memory file, recording important information and context across projects.\n\n";
+                    await fs.writeFile(USER_MEMORY_FILE, initialContent, "utf-8");
+                    logger.debug(`Created user memory file: ${USER_MEMORY_FILE}`);
+                }
+                else {
+                    throw error;
+                }
+            }
+        }
+        catch (error) {
+            logger.error("Failed to ensure user memory file:", error);
+            throw new Error(`Failed to ensure user memory file: ${error.message}`);
+        }
     }
-};
-// Read project memory file content
-export const readMemoryFile = async (workdir) => {
-    const memoryFilePath = path.join(workdir, "AGENTS.md");
-    // Direct file access
-    try {
-        const content = await fs.readFile(memoryFilePath, "utf-8");
-        logger.debug("Memory file read successfully via direct file access", {
-            memoryFilePath,
-            contentLength: content.length,
-        });
-        return content;
+    async getUserMemoryContent() {
+        try {
+            await this.ensureUserMemoryFile();
+            const content = await fs.readFile(USER_MEMORY_FILE, "utf-8");
+            logger.debug("User memory content read successfully", {
+                userMemoryFile: USER_MEMORY_FILE,
+                contentLength: content.length,
+            });
+            return content;
+        }
+        catch (error) {
+            logger.error("Failed to read user memory:", error);
+            return "";
+        }
     }
-    catch (error) {
-        if (error.code === "ENOENT") {
-            logger.debug("Memory file does not exist, returning empty content", {
+    async readMemoryFile(workdir) {
+        const memoryFilePath = path.join(workdir, "AGENTS.md");
+        // Direct file access
+        try {
+            const content = await fs.readFile(memoryFilePath, "utf-8");
+            logger.debug("Memory file read successfully via direct file access", {
                 memoryFilePath,
+                contentLength: content.length,
             });
+            return content;
+        }
+        catch (error) {
+            if (error.code === "ENOENT") {
+                logger.debug("Memory file does not exist, returning empty content", {
+                    memoryFilePath,
+                });
+                return "";
+            }
+            logger.error("Failed to read memory file", { memoryFilePath, error });
             return "";
         }
-        logger.error("Failed to read memory file", { memoryFilePath, error });
-        return "";
-    }
-};
-// Get merged memory content (project memory + user memory)
-export const getCombinedMemoryContent = async (workdir) => {
-    // Read memory file content
-    const memoryContent = await readMemoryFile(workdir);
-    // Read user-level memory content
-    const userMemoryContent = await getUserMemoryContent();
-    // Merge project memory and user memory
-    let combinedMemory = "";
-    if (memoryContent.trim()) {
-        combinedMemory += memoryContent;
     }
-    if (userMemoryContent.trim()) {
-        if (combinedMemory) {
-            combinedMemory += "\n\n";
+    async getCombinedMemoryContent(workdir) {
+        // Read memory file content
+        const memoryContent = await this.readMemoryFile(workdir);
+        // Read user-level memory content
+        const userMemoryContent = await this.getUserMemoryContent();
+        // Merge project memory and user memory
+        let combinedMemory = "";
+        if (memoryContent.trim()) {
+            combinedMemory += memoryContent;
+        }
+        if (userMemoryContent.trim()) {
+            if (combinedMemory) {
+                combinedMemory += "\n\n";
+            }
+            combinedMemory += userMemoryContent;
         }
-        combinedMemory += userMemoryContent;
+        return combinedMemory;
     }
-    return combinedMemory;
-};
+}

package/dist/types/configuration.d.ts

@@ -29,6 +29,8 @@ export interface WaveConfiguration {
     enabledPlugins?: Record<string, boolean>;
     /** Preferred language for agent communication */
     language?: string;
+    /** Whether auto-memory is enabled */
+    autoMemoryEnabled?: boolean;
 }
 /**
  * Legacy alias for backward compatibility - will be deprecated

package/dist/types/configuration.d.ts.map

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

package/dist/types/history.d.ts

@@ -1,5 +1,7 @@
 export interface PromptEntry {
     prompt: string;
     timestamp: number;
+    sessionId?: string;
+    longTextMap?: Record<string, string>;
 }
 //# sourceMappingURL=history.d.ts.map

package/dist/types/history.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"history.d.ts","sourceRoot":"","sources":["../../src/types/history.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB"}
+{"version":3,"file":"history.d.ts","sourceRoot":"","sources":["../../src/types/history.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACtC"}

package/dist/types/hooks.d.ts

@@ -9,6 +9,8 @@ export type HookEvent = "PreToolUse" | "PostToolUse" | "UserPromptSubmit" | "Sto
 export interface HookCommand {
     type: "command";
     command: string;
+    async?: boolean;
+    timeout?: number;
 }
 export interface HookEventConfig {
     matcher?: string;

package/dist/types/hooks.d.ts.map

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

package/dist/types/hooks.js

@@ -36,13 +36,23 @@ export function isValidHookEvent(event) {
     ].includes(event);
 }
 export function isValidHookCommand(cmd) {
-    return (typeof cmd === "object" &&
-        cmd !== null &&
-        "type" in cmd &&
-        cmd.type === "command" &&
-        "command" in cmd &&
-        typeof cmd.command === "string" &&
-        cmd.command.length > 0);
+    if (typeof cmd !== "object" ||
+        cmd === null ||
+        !("type" in cmd) ||
+        cmd.type !== "command" ||
+        !("command" in cmd) ||
+        typeof cmd.command !== "string" ||
+        cmd.command.length === 0) {
+        return false;
+    }
+    const hookCmd = cmd;
+    if ("async" in hookCmd && typeof hookCmd.async !== "boolean") {
+        return false;
+    }
+    if ("timeout" in hookCmd && typeof hookCmd.timeout !== "number") {
+        return false;
+    }
+    return true;
 }
 export function isValidHookEventConfig(config) {
     if (typeof config !== "object" || config === null)

package/dist/utils/containerSetup.d.ts

@@ -2,7 +2,6 @@ import { Container } from "./container.js";
 import { ConfigurationService } from "../services/configurationService.js";
 import type { AgentOptions } from "../types/index.js";
 import type { PermissionMode, Usage, Task, BackgroundTask } from "../types/index.js";
-import type { GatewayConfig, ModelConfig } from "../types/config.js";
 export interface AgentContainerSetupOptions {
     options: AgentOptions;
     workdir: string;
@@ -16,10 +15,6 @@ export interface AgentContainerSetupOptions {
     setPermissionMode: (mode: PermissionMode) => void;
     addPermissionRule: (rule: string) => Promise<void>;
     addUsage: (usage: Usage) => void;
-    getGatewayConfig: () => GatewayConfig;
-    getModelConfig: () => ModelConfig;
-    getMaxInputTokens: () => number;
-    getLanguage: () => string | undefined;
 }
 export declare function setupAgentContainer(setupOptions: AgentContainerSetupOptions): Container;
 //# sourceMappingURL=containerSetup.d.ts.map

package/dist/utils/containerSetup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"containerSetup.d.ts","sourceRoot":"","sources":["../../src/utils/containerSetup.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAoB3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAE3E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EACV,cAAc,EACd,KAAK,EACL,IAAI,EACJ,cAAc,EAEf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAIrE,MAAM,WAAW,0BAA0B;IACzC,OAAO,EAAE,YAAY,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,OAAO,CAAC;IAGhB,uBAAuB,EAAE,CAAC,KAAK,EAAE,cAAc,EAAE,KAAK,IAAI,CAAC;IAC3D,aAAa,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,IAAI,CAAC;IACvC,sBAAsB,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,IAAI,CAAC;IACvD,wBAAwB,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,IAAI,CAAC;IACzD,iBAAiB,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,IAAI,CAAC;IAClD,iBAAiB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACnD,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAGjC,gBAAgB,EAAE,MAAM,aAAa,CAAC;IACtC,cAAc,EAAE,MAAM,WAAW,CAAC;IAClC,iBAAiB,EAAE,MAAM,MAAM,CAAC;IAChC,WAAW,EAAE,MAAM,MAAM,GAAG,SAAS,CAAC;CACvC;AAED,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,0BAA0B,GACvC,SAAS,CAgOX"}
+{"version":3,"file":"containerSetup.d.ts","sourceRoot":"","sources":["../../src/utils/containerSetup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAoB3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAG3E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EACV,cAAc,EACd,KAAK,EACL,IAAI,EACJ,cAAc,EAEf,MAAM,mBAAmB,CAAC;AAI3B,MAAM,WAAW,0BAA0B;IACzC,OAAO,EAAE,YAAY,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,OAAO,CAAC;IAGhB,uBAAuB,EAAE,CAAC,KAAK,EAAE,cAAc,EAAE,KAAK,IAAI,CAAC;IAC3D,aAAa,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,IAAI,CAAC;IACvC,sBAAsB,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,IAAI,CAAC;IACvD,wBAAwB,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,IAAI,CAAC;IACzD,iBAAiB,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,IAAI,CAAC;IAClD,iBAAiB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACnD,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAClC;AAED,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,0BAA0B,GACvC,SAAS,CAiNX"}

package/dist/utils/containerSetup.js

@@ -1,4 +1,3 @@
-import * as fs from "fs/promises";
 import { Container } from "./container.js";
 import { ForegroundTaskManager } from "../managers/foregroundTaskManager.js";
 import { BackgroundTaskManager } from "../managers/backgroundTaskManager.js";
@@ -20,14 +19,17 @@ import { ReversionManager } from "../managers/reversionManager.js";
 import { SubagentManager } from "../managers/subagentManager.js";
 import { LiveConfigManager } from "../managers/liveConfigManager.js";
 import { ReversionService } from "../services/reversionService.js";
+import { MemoryService } from "../services/memory.js";
 import { logger } from "./globalLogger.js";
 export function setupAgentContainer(setupOptions) {
-    const { options, workdir, configurationService, systemPrompt, stream, onBackgroundTasksChange, onTasksChange, onPermissionModeChange, handlePlanModeTransition, setPermissionMode, addPermissionRule, addUsage, getGatewayConfig, getModelConfig, getMaxInputTokens, getLanguage, } = setupOptions;
+    const { options, workdir, configurationService, systemPrompt, stream, onBackgroundTasksChange, onTasksChange, onPermissionModeChange, handlePlanModeTransition, setPermissionMode, addPermissionRule, addUsage, } = setupOptions;
     const callbacks = options.callbacks || {};
     const container = new Container();
     const foregroundTaskManager = new ForegroundTaskManager(container);
     container.register("ForegroundTaskManager", foregroundTaskManager);
     container.register("ConfigurationService", configurationService);
+    const memoryService = new MemoryService(container);
+    container.register("MemoryService", memoryService);
     const memoryRuleManager = new MemoryRuleManager(container, { workdir });
     container.register("MemoryRuleManager", memoryRuleManager);
     const messageManager = new MessageManager(container, {
@@ -74,6 +76,10 @@ export function setupAgentContainer(setupOptions) {
     const lspManager = options.lspManager || new LspManager(container);
     container.register("LspManager", lspManager);
     const permissionManager = new PermissionManager(container, { workdir });
+    if (configurationService.resolveAutoMemoryEnabled()) {
+        const autoMemoryDir = memoryService.getAutoMemoryDirectory(workdir);
+        permissionManager.updateAdditionalDirectories([autoMemoryDir]);
+    }
     container.register("PermissionManager", permissionManager);
     permissionManager.setOnConfiguredDefaultModeChange((mode) => {
         handlePlanModeTransition(mode);
@@ -121,18 +127,9 @@ export function setupAgentContainer(setupOptions) {
             if (decision.clearContext) {
                 messageManager.clearMessages();
                 if (planFilePath) {
-                    try {
-                        const planContent = await fs.readFile(planFilePath, "utf-8");
-                        messageManager.addUserMessage({
-                            content: `Implement the following plan:\n\n${planContent}`,
-                        });
-                    }
-                    catch (error) {
-                        logger.warn("Failed to read plan file for context clearing", {
-                            planFilePath,
-                            error: error instanceof Error ? error.message : String(error),
-                        });
-                    }
+                    messageManager.addUserMessage({
+                        content: `Implement the plan at ${planFilePath}`,
+                    });
                 }
             }
             return decision;
@@ -161,11 +158,6 @@ export function setupAgentContainer(setupOptions) {
             onSubagentMessagesChange: callbacks.onSubagentMessagesChange,
             onSubagentLatestTotalTokensChange: callbacks.onSubagentLatestTotalTokensChange,
         },
-        getGatewayConfig,
-        getModelConfig,
-        getMaxInputTokens,
-        getLanguage,
-        getEnvironmentVars: () => configurationService.getEnvironmentVars(),
         onUsageAdded: (usage) => addUsage(usage),
     });
     container.register("SubagentManager", subagentManager);
@@ -177,11 +169,6 @@ export function setupAgentContainer(setupOptions) {
         workdir,
         systemPrompt,
         stream,
-        getGatewayConfig,
-        getModelConfig,
-        getMaxInputTokens,
-        getLanguage,
-        getEnvironmentVars: () => configurationService.getEnvironmentVars(),
     });
     container.register("AIManager", aiManager);
     const slashCommandManager = new SlashCommandManager(container, { workdir });

package/dist/utils/fileSearch.d.ts

@@ -1,11 +1,6 @@
-import { type Path } from "glob";
 import type { FileItem } from "../types/fileSearch.js";
 /**
- * Convert Path objects to FileItem objects
- */
-export declare const convertPathsToFileItems: (paths: Path[]) => FileItem[];
-/**
- * Search files and directories using glob patterns
+ * Search files and directories using fuzzy matching
  */
 export declare const searchFiles: (query: string, options?: {
     maxResults?: number;

package/dist/utils/fileSearch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fileSearch.d.ts","sourceRoot":"","sources":["../../src/utils/fileSearch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,IAAI,EAAE,MAAM,MAAM,CAAC;AAE9C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAEvD;;GAEG;AACH,eAAO,MAAM,uBAAuB,GAAI,OAAO,IAAI,EAAE,KAAG,QAAQ,EAY/D,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,WAAW,GACtB,OAAO,MAAM,EACb,UAAU;IACR,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,KACA,OAAO,CAAC,QAAQ,EAAE,CAmFpB,CAAC"}
+{"version":3,"file":"fileSearch.d.ts","sourceRoot":"","sources":["../../src/utils/fileSearch.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAqEvD;;GAEG;AACH,eAAO,MAAM,WAAW,GACtB,OAAO,MAAM,EACb,UAAU;IACR,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,KACA,OAAO,CAAC,QAAQ,EAAE,CA+DpB,CAAC"}

package/dist/utils/fileSearch.js

@@ -1,95 +1,124 @@
-import { globIterate } from "glob";
+import { spawn } from "child_process";
+import { rgPath } from "@vscode/ripgrep";
+import fuzzysort from "fuzzysort";
 import { getGlobIgnorePatterns } from "./fileFilter.js";
+import { logger } from "./globalLogger.js";
 /**
- * Convert Path objects to FileItem objects
+ * Execute ripgrep to get all file paths
  */
-export const convertPathsToFileItems = (paths) => {
-    return paths.map((pathObj) => {
-        const isDirectory = pathObj.isDirectory();
-        let path = pathObj.relative();
-        if (isDirectory && !path.endsWith("/")) {
-            path += "/";
-        }
-        return {
-            path,
-            type: isDirectory ? "directory" : "file",
-        };
+async function getAllFiles(workingDirectory) {
+    if (!rgPath) {
+        throw new Error("ripgrep is not available");
+    }
+    const ignorePatterns = getGlobIgnorePatterns(workingDirectory);
+    const rgArgs = ["--files", "--color=never", "--hidden"];
+    for (const pattern of ignorePatterns) {
+        rgArgs.push("--glob", `!${pattern}`);
+    }
+    return new Promise((resolve, reject) => {
+        const child = spawn(rgPath, rgArgs, {
+            cwd: workingDirectory,
+            stdio: ["ignore", "pipe", "pipe"],
+        });
+        let stdout = "";
+        let stderr = "";
+        child.stdout?.on("data", (data) => {
+            stdout += data.toString();
+        });
+        child.stderr?.on("data", (data) => {
+            stderr += data.toString();
+        });
+        child.on("close", (code) => {
+            if (code !== 0 && code !== 1) {
+                reject(new Error(`ripgrep failed: ${stderr}`));
+                return;
+            }
+            const files = stdout
+                .trim()
+                .split("\n")
+                .filter((f) => f.length > 0)
+                .map((f) => f.replace(/\\/g, "/")); // Normalize to forward slashes
+            resolve(files);
+        });
+        child.on("error", (err) => {
+            reject(err);
+        });
     });
-};
+}
+/**
+ * Derive directory paths from file paths
+ */
+function deriveDirectories(files) {
+    const dirs = new Set();
+    for (const file of files) {
+        const parts = file.split("/");
+        // Add all parent directories
+        for (let i = 1; i < parts.length; i++) {
+            const dir = parts.slice(0, i).join("/") + "/";
+            dirs.add(dir);
+        }
+    }
+    return Array.from(dirs);
+}
 /**
- * Search files and directories using glob patterns
+ * Search files and directories using fuzzy matching
  */
 export const searchFiles = async (query, options) => {
     const { maxResults = 10, workingDirectory = process.cwd() } = options || {};
     try {
-        const globOptions = {
-            ignore: getGlobIgnorePatterns(workingDirectory),
-            maxDepth: 10,
-            nocase: true, // Case insensitive
-            dot: true, // Include hidden files and directories
-            cwd: workingDirectory, // Specify search root directory
-            withFileTypes: true, // Get Path objects instead of strings
-        };
-        // Build glob patterns based on query
-        let patterns = [];
+        const files = await getAllFiles(workingDirectory);
         if (!query.trim()) {
-            // When query is empty, show some common file types and directories
-            patterns = [
-                "**/*.{ts,tsx,js,jsx,json,py,java}", // Combine common file extensions
-                "*/", // First level directories
-            ];
-        }
-        else {
-            // Build multiple glob patterns to support more flexible search
-            patterns = [
-                // Match files with filenames containing query
-                `**/*${query}*`,
-                // Match files with query in path (match directory names)
-                `**/${query}*/**/*`,
-                // Match directory names containing query
-                `**/*${query}*/`,
-                // Match directories containing query in path
-                `**/${query}*/`,
-            ];
-        }
-        // Collect results until we reach maxResults
-        const collectedPaths = [];
-        const seenPaths = new Set();
-        // Process each pattern sequentially
-        for (const pattern of patterns) {
-            if (collectedPaths.length >= maxResults) {
-                break;
-            }
-            // Use globIterate to get results one by one
-            const iterator = globIterate(pattern, globOptions);
-            for await (const pathObj of iterator) {
-                if (collectedPaths.length >= maxResults) {
-                    // Stop the iterator when we have enough results
-                    break;
+            // When query is empty, show some common file types and top-level directories
+            const commonExtensions = new Set([
+                "ts",
+                "tsx",
+                "js",
+                "jsx",
+                "json",
+                "py",
+                "java",
+            ]);
+            const results = [];
+            const seenDirs = new Set();
+            for (const file of files) {
+                const parts = file.split("/");
+                if (parts.length > 1) {
+                    const topDir = parts[0] + "/";
+                    if (!seenDirs.has(topDir)) {
+                        seenDirs.add(topDir);
+                        results.push({ path: topDir, type: "directory" });
+                    }
                 }
-                const relativePath = pathObj.relative();
-                if (!seenPaths.has(relativePath)) {
-                    seenPaths.add(relativePath);
-                    collectedPaths.push(pathObj);
+                const ext = file.split(".").pop();
+                if (ext && commonExtensions.has(ext)) {
+                    results.push({ path: file, type: "file" });
                 }
             }
+            // Sort: directories first, then files, then alphabetically
+            return results
+                .sort((a, b) => {
+                if (a.type === "directory" && b.type === "file")
+                    return -1;
+                if (a.type === "file" && b.type === "directory")
+                    return 1;
+                return a.path.localeCompare(b.path);
+            })
+                .slice(0, maxResults);
         }
-        // Sort collected paths: directories first, then files
-        collectedPaths.sort((a, b) => {
-            const aIsDir = a.isDirectory();
-            const bIsDir = b.isDirectory();
-            if (aIsDir && !bIsDir)
-                return -1;
-            if (!aIsDir && bIsDir)
-                return 1;
-            return a.relative().localeCompare(b.relative());
+        const directories = deriveDirectories(files);
+        const allItems = [
+            ...files.map((f) => ({ path: f, type: "file" })),
+            ...directories.map((d) => ({ path: d, type: "directory" })),
+        ];
+        const fuzzyResults = fuzzysort.go(query, allItems, {
+            key: "path",
+            limit: maxResults,
+            threshold: 0,
         });
-        // Convert to FileItems
-        const fileItems = convertPathsToFileItems(collectedPaths);
-        return fileItems;
+        return fuzzyResults.map((res) => res.obj);
     }
     catch (error) {
-        console.error("Glob search error:", error);
+        logger.error("Fuzzy search error:", error);
         return [];
     }
 };