wave-agent-sdk 0.2.1 → 0.5.0

package/dist/managers/backgroundTaskManager.js

@@ -0,0 +1,249 @@
+import { spawn } from "child_process";
+import { stripAnsiColors } from "../utils/stringUtils.js";
+import { logger } from "../utils/globalLogger.js";
+export class BackgroundTaskManager {
+    constructor(options) {
+        this.tasks = new Map();
+        this.nextId = 1;
+        this.callbacks = options.callbacks || {};
+        this.workdir = options.workdir;
+    }
+    notifyTasksChange() {
+        this.callbacks.onTasksChange?.(Array.from(this.tasks.values()));
+    }
+    generateId() {
+        return `task_${this.nextId++}`;
+    }
+    addTask(task) {
+        this.tasks.set(task.id, task);
+        this.notifyTasksChange();
+    }
+    getTask(id) {
+        return this.tasks.get(id);
+    }
+    getAllTasks() {
+        return Array.from(this.tasks.values());
+    }
+    startShell(command, timeout) {
+        const id = this.generateId();
+        const startTime = Date.now();
+        const child = spawn(command, {
+            shell: true,
+            stdio: "pipe",
+            cwd: this.workdir,
+            env: {
+                ...process.env,
+            },
+        });
+        const shell = {
+            id,
+            type: "shell",
+            process: child,
+            command,
+            startTime,
+            status: "running",
+            stdout: "",
+            stderr: "",
+        };
+        this.tasks.set(id, shell);
+        this.notifyTasksChange();
+        // Set up timeout if specified
+        let timeoutHandle;
+        if (timeout && timeout > 0) {
+            timeoutHandle = setTimeout(() => {
+                if (shell.status === "running") {
+                    this.stopTask(id);
+                }
+            }, timeout);
+        }
+        const onStdout = (data) => {
+            shell.stdout += stripAnsiColors(data.toString());
+            this.notifyTasksChange();
+        };
+        const onStderr = (data) => {
+            shell.stderr += stripAnsiColors(data.toString());
+            this.notifyTasksChange();
+        };
+        const onExit = (code) => {
+            if (timeoutHandle) {
+                clearTimeout(timeoutHandle);
+            }
+            shell.status = code === 0 ? "completed" : "failed";
+            shell.exitCode = code ?? 0;
+            shell.endTime = Date.now();
+            shell.runtime = shell.endTime - startTime;
+            this.notifyTasksChange();
+        };
+        const onError = (error) => {
+            if (timeoutHandle) {
+                clearTimeout(timeoutHandle);
+            }
+            shell.status = "failed";
+            shell.stderr += `\nProcess error: ${stripAnsiColors(error.message)}`;
+            shell.exitCode = 1;
+            shell.endTime = Date.now();
+            shell.runtime = shell.endTime - startTime;
+            this.notifyTasksChange();
+        };
+        child.stdout?.on("data", onStdout);
+        child.stderr?.on("data", onStderr);
+        child.on("exit", onExit);
+        child.on("error", onError);
+        const detach = () => {
+            child.stdout?.off("data", onStdout);
+            child.stderr?.off("data", onStderr);
+            child.off("exit", onExit);
+            child.off("error", onError);
+            if (timeoutHandle) {
+                clearTimeout(timeoutHandle);
+            }
+            this.tasks.delete(id);
+            this.notifyTasksChange();
+        };
+        return { id, child, detach };
+    }
+    adoptProcess(child, command, initialStdout = "", initialStderr = "") {
+        const id = this.generateId();
+        const startTime = Date.now();
+        const shell = {
+            id,
+            type: "shell",
+            process: child,
+            command,
+            startTime,
+            status: "running",
+            stdout: initialStdout,
+            stderr: initialStderr,
+        };
+        this.tasks.set(id, shell);
+        this.notifyTasksChange();
+        child.stdout?.on("data", (data) => {
+            shell.stdout += stripAnsiColors(data.toString());
+            this.notifyTasksChange();
+        });
+        child.stderr?.on("data", (data) => {
+            shell.stderr += stripAnsiColors(data.toString());
+            this.notifyTasksChange();
+        });
+        child.on("exit", (code) => {
+            shell.status = code === 0 ? "completed" : "failed";
+            shell.exitCode = code ?? 0;
+            shell.endTime = Date.now();
+            shell.runtime = shell.endTime - startTime;
+            this.notifyTasksChange();
+        });
+        child.on("error", (error) => {
+            shell.status = "failed";
+            shell.stderr += `\nProcess error: ${stripAnsiColors(error.message)}`;
+            shell.exitCode = 1;
+            shell.endTime = Date.now();
+            shell.runtime = shell.endTime - startTime;
+            this.notifyTasksChange();
+        });
+        return id;
+    }
+    getOutput(id, filter) {
+        const task = this.tasks.get(id);
+        if (!task) {
+            return null;
+        }
+        let stdout = task.stdout;
+        let stderr = task.stderr;
+        // Apply regex filter if provided
+        if (filter) {
+            try {
+                const regex = new RegExp(filter);
+                stdout = stdout
+                    .split("\n")
+                    .filter((line) => regex.test(line))
+                    .join("\n");
+                stderr = stderr
+                    .split("\n")
+                    .filter((line) => regex.test(line))
+                    .join("\n");
+            }
+            catch (error) {
+                logger.warn(`Invalid filter regex: ${filter}`, error);
+            }
+        }
+        return {
+            stdout,
+            stderr,
+            status: task.status,
+        };
+    }
+    stopTask(id) {
+        const task = this.tasks.get(id);
+        if (!task || task.status !== "running") {
+            return false;
+        }
+        if (task.type === "shell") {
+            const shell = task;
+            try {
+                // Try to kill process group first
+                if (shell.process.pid) {
+                    process.kill(-shell.process.pid, "SIGTERM");
+                    // Force kill after timeout
+                    setTimeout(() => {
+                        if (shell.status === "running" &&
+                            shell.process.pid &&
+                            !shell.process.killed) {
+                            try {
+                                process.kill(-shell.process.pid, "SIGKILL");
+                            }
+                            catch (error) {
+                                logger.error("Failed to force kill process:", error);
+                            }
+                        }
+                    }, 1000);
+                }
+                shell.status = "killed";
+                shell.endTime = Date.now();
+                shell.runtime = shell.endTime - shell.startTime;
+                this.notifyTasksChange();
+                return true;
+            }
+            catch {
+                // Fallback to direct process kill
+                try {
+                    shell.process.kill("SIGTERM");
+                    setTimeout(() => {
+                        if (!shell.process.killed) {
+                            shell.process.kill("SIGKILL");
+                        }
+                    }, 1000);
+                    shell.status = "killed";
+                    shell.endTime = Date.now();
+                    shell.runtime = shell.endTime - shell.startTime;
+                    this.notifyTasksChange();
+                    return true;
+                }
+                catch (directKillError) {
+                    logger.error("Failed to kill child process:", directKillError);
+                    return false;
+                }
+            }
+        }
+        else if (task.type === "subagent") {
+            // Subagent termination logic will be handled by aborting the AI loop
+            // which is already managed by the SubagentManager and AIManager.
+            // Here we just update the status.
+            task.status = "killed";
+            task.endTime = Date.now();
+            task.runtime = task.endTime - task.startTime;
+            this.notifyTasksChange();
+            return true;
+        }
+        return false;
+    }
+    cleanup() {
+        // Kill all running tasks
+        for (const [id, task] of this.tasks) {
+            if (task.status === "running") {
+                this.stopTask(id);
+            }
+        }
+        this.tasks.clear();
+        this.notifyTasksChange();
+    }
+}

package/dist/managers/bashManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bashManager.d.ts","sourceRoot":"","sources":["../../src/managers/bashManager.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,MAAM,WAAW,kBAAkB;IACjC,cAAc,EAAE,cAAc,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,WAAW;IACtB,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,cAAc,CAAiB;IAChC,gBAAgB,UAAS;IAChC,OAAO,CAAC,cAAc,CAA6B;gBAEvC,OAAO,EAAE,kBAAkB;IAKvC,OAAO,CAAC,iBAAiB;IAIZ,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA4DtD,YAAY,IAAI,IAAI;CAO5B"}
+{"version":3,"file":"bashManager.d.ts","sourceRoot":"","sources":["../../src/managers/bashManager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,MAAM,WAAW,kBAAkB;IACjC,cAAc,EAAE,cAAc,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,WAAW;IACtB,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,cAAc,CAAiB;IAChC,gBAAgB,UAAS;IAChC,OAAO,CAAC,cAAc,CAA6B;gBAEvC,OAAO,EAAE,kBAAkB;IAKvC,OAAO,CAAC,iBAAiB;IAIZ,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAyDtD,YAAY,IAAI,IAAI;CAO5B"}

package/dist/managers/bashManager.js

@@ -1,5 +1,4 @@
 import { spawn } from "child_process";
-import { addBashCommandToHistory } from "../utils/bashHistory.js";
 export class BashManager {
     constructor(options) {
         this.isCommandRunning = false;
@@ -40,8 +39,6 @@ export class BashManager {
             });
             child.on("exit", (code, signal) => {
                 const exitCode = code === null && signal ? 130 : (code ?? 0);
-                // Add command to bash history
-                addBashCommandToHistory(command, this.workdir);
                 this.messageManager.completeCommandMessage(command, exitCode);
                 this.setCommandRunning(false);
                 this.currentProcess = null;

package/dist/managers/foregroundTaskManager.d.ts

@@ -0,0 +1,9 @@
+import { ForegroundTask, IForegroundTaskManager } from "../types/processes.js";
+export declare class ForegroundTaskManager implements IForegroundTaskManager {
+    private activeForegroundTasks;
+    registerForegroundTask(task: ForegroundTask): void;
+    unregisterForegroundTask(id: string): void;
+    backgroundCurrentTask(): Promise<void>;
+    hasActiveTasks(): boolean;
+}
+//# sourceMappingURL=foregroundTaskManager.d.ts.map

package/dist/managers/foregroundTaskManager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"foregroundTaskManager.d.ts","sourceRoot":"","sources":["../../src/managers/foregroundTaskManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAE/E,qBAAa,qBAAsB,YAAW,sBAAsB;IAClE,OAAO,CAAC,qBAAqB,CAAwB;IAE9C,sBAAsB,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI;IAIlD,wBAAwB,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAMpC,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAO5C,cAAc,IAAI,OAAO;CAGjC"}

package/dist/managers/foregroundTaskManager.js

@@ -0,0 +1,20 @@
+export class ForegroundTaskManager {
+    constructor() {
+        this.activeForegroundTasks = [];
+    }
+    registerForegroundTask(task) {
+        this.activeForegroundTasks.push(task);
+    }
+    unregisterForegroundTask(id) {
+        this.activeForegroundTasks = this.activeForegroundTasks.filter((t) => t.id !== id);
+    }
+    async backgroundCurrentTask() {
+        const task = this.activeForegroundTasks.pop();
+        if (task) {
+            await task.backgroundHandler();
+        }
+    }
+    hasActiveTasks() {
+        return this.activeForegroundTasks.length > 0;
+    }
+}

package/dist/managers/liveConfigManager.d.ts

@@ -75,7 +75,7 @@ export declare class LiveConfigManager {
         watchedFiles: {
             path: string;
             isActive: boolean;
-            method: "native" | "polling" | "failed";
+            method: "failed" | "native" | "polling";
             errorCount: number;
         }[];
     };

package/dist/managers/liveConfigManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"liveConfigManager.d.ts","sourceRoot":"","sources":["../../src/managers/liveConfigManager.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAMhD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAOhE,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAG3E,OAAO,KAAK,EAEV,iBAAiB,EAClB,MAAM,2BAA2B,CAAC;AAEnC,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;CAC7C;AAED,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAc;IAC3C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAoB;IACvD,OAAO,CAAC,aAAa,CAAkB;IACvC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAuB;IAG5D,OAAO,CAAC,oBAAoB,CAAkC;IAC9D,OAAO,CAAC,sBAAsB,CAAkC;IAGhE,OAAO,CAAC,WAAW,CAAqB;IACxC,OAAO,CAAC,eAAe,CAAC,CAAW;IACnC,OAAO,CAAC,kBAAkB,CAAC,CAAW;IACtC,OAAO,CAAC,UAAU,CAAkB;IACpC,OAAO,CAAC,gBAAgB,CAAkB;gBAE9B,OAAO,EAAE,wBAAwB;IAW7C;;;;OAIG;YACW,kBAAkB;IA6DhC;;OAEG;IACH,uBAAuB,IAAI,iBAAiB,GAAG,IAAI;IAInD;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBjC;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB/B;;;OAGG;YACW,mBAAmB;IAmNjC;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAK1C;;OAEG;IACH,gBAAgB,IAAI,OAAO;IAI3B;;OAEG;IACH,gBAAgB;;;;;;;;;;;;IAgBhB,OAAO,CAAC,sBAAsB;YAMhB,gBAAgB;IA8C9B;;OAEG;IACH,OAAO,CAAC,qBAAqB;IA4F7B,OAAO,CAAC,aAAa;IAuDrB;;;OAGG;IACH,OAAO,CAAC,qBAAqB;CAQ9B"}
+{"version":3,"file":"liveConfigManager.d.ts","sourceRoot":"","sources":["../../src/managers/liveConfigManager.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAOhD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAOhE,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAG3E,OAAO,KAAK,EAEV,iBAAiB,EAClB,MAAM,2BAA2B,CAAC;AAEnC,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;CAC7C;AAED,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAc;IAC3C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAoB;IACvD,OAAO,CAAC,aAAa,CAAkB;IACvC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAuB;IAG5D,OAAO,CAAC,oBAAoB,CAAkC;IAC9D,OAAO,CAAC,sBAAsB,CAAkC;IAGhE,OAAO,CAAC,WAAW,CAAqB;IACxC,OAAO,CAAC,eAAe,CAAC,CAAW;IACnC,OAAO,CAAC,kBAAkB,CAAC,CAAW;IACtC,OAAO,CAAC,UAAU,CAAkB;IACpC,OAAO,CAAC,gBAAgB,CAAkB;gBAE9B,OAAO,EAAE,wBAAwB;IAW7C;;;;OAIG;YACW,kBAAkB;IA6DhC;;OAEG;IACH,uBAAuB,IAAI,iBAAiB,GAAG,IAAI;IAInD;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBjC;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB/B;;;OAGG;YACW,mBAAmB;IAmNjC;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAK1C;;OAEG;IACH,gBAAgB,IAAI,OAAO;IAI3B;;OAEG;IACH,gBAAgB;;;;;;;;;;;;IAgBhB,OAAO,CAAC,sBAAsB;YAMhB,gBAAgB;IA8C9B;;OAEG;IACH,OAAO,CAAC,qBAAqB;IA4F7B,OAAO,CAAC,aAAa;IAuDrB;;;OAGG;IACH,OAAO,CAAC,qBAAqB;CAQ9B"}

package/dist/managers/lspManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lspManager.d.ts","sourceRoot":"","sources":["../../src/managers/lspManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAS,MAAM,eAAe,CAAC;AACpD,OAAO,EACL,MAAM,EAEN,eAAe,EACf,WAAW,EAEZ,MAAM,mBAAmB,CAAC;AAI3B,UAAU,UAAU;IAClB,OAAO,EAAE,YAAY,CAAC;IACtB,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,GAAG,CAClB,MAAM,EACN;QAAE,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;QAAC,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;KAAE,CAC1E,CAAC;IACF,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC1B;AAED,qBAAa,UAAW,YAAW,WAAW;IAC5C,OAAO,CAAC,SAAS,CAAsC;IACvD,OAAO,CAAC,OAAO,CAAc;IAC7B,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,MAAM,CAAiB;gBAEnB,OAAO,GAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAO;IAIvC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKhD,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,GAAG,IAAI;YAKjD,UAAU;IAclB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;YA0BvD,WAAW;IAoGzB,OAAO,CAAC,aAAa;YAiBP,WAAW;YA0CX,gBAAgB;IAgBxB,OAAO,CAAC,IAAI,EAAE;QAClB,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;KACnB,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAoJ5C,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAqB/B"}
+{"version":3,"file":"lspManager.d.ts","sourceRoot":"","sources":["../../src/managers/lspManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAS,MAAM,eAAe,CAAC;AACpD,OAAO,EACL,MAAM,EAEN,eAAe,EACf,WAAW,EAEZ,MAAM,mBAAmB,CAAC;AAI3B,UAAU,UAAU;IAClB,OAAO,EAAE,YAAY,CAAC;IACtB,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,GAAG,CAClB,MAAM,EACN;QAAE,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;QAAC,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;KAAE,CAC1E,CAAC;IACF,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC1B;AAED,qBAAa,UAAW,YAAW,WAAW;IAC5C,OAAO,CAAC,SAAS,CAAsC;IACvD,OAAO,CAAC,OAAO,CAAc;IAC7B,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,MAAM,CAAiB;gBAEnB,OAAO,GAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAO;IAIvC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKhD,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,GAAG,IAAI;YAKjD,UAAU;IAclB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;YA0BvD,WAAW;IAoGzB,OAAO,CAAC,aAAa;YAiBP,WAAW;YA0CX,gBAAgB;IAgBxB,OAAO,CAAC,IAAI,EAAE;QAClB,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;KACnB,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAoJ5C,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAuB/B"}

package/dist/managers/lspManager.js

@@ -310,7 +310,9 @@ export class LspManager {
                 await this.sendRequest(lspProc, "shutdown", {}, timeout);
                 await this.sendNotification(lspProc, "exit", {});
                 // Give it a moment to exit
-                await new Promise((resolve) => setTimeout(resolve, 100));
+                if (timeout > 100) {
+                    await new Promise((resolve) => setTimeout(resolve, 100));
+                }
             }
             catch (error) {
                 this.logger?.debug(`Failed to gracefully shutdown LSP for ${language}: ${error}`);

package/dist/managers/messageManager.d.ts

@@ -1,8 +1,9 @@
 import { UserMessageParams, type AgentToolBlockUpdateParams } from "../utils/messageOperations.js";
 import type { SubagentConfiguration } from "../utils/subagentParser.js";
-import type { Logger, Message, Usage } from "../types/index.js";
+import type { Logger, Message, Usage, SlashCommand } from "../types/index.js";
 import { SessionData } from "../services/session.js";
 import { ChatCompletionMessageFunctionToolCall } from "openai/resources.js";
+import type { MemoryRuleManager } from "./MemoryRuleManager.js";
 export interface MessageManagerCallbacks {
     onMessagesChange?: (messages: Message[]) => void;
     onSessionIdChange?: (sessionId: string) => void;
@@ -21,6 +22,9 @@ export interface MessageManagerCallbacks {
     onAddCommandOutputMessage?: (command: string) => void;
     onUpdateCommandOutputMessage?: (command: string, output: string) => void;
     onCompleteCommandMessage?: (command: string, exitCode: number) => void;
+    onSlashCommandsChange?: (commands: SlashCommand[]) => void;
+    onInfoBlockAdded?: (content: string) => void;
+    onShowRewind?: () => void;
     onSubAgentBlockAdded?: (subagentId: string, parameters: {
         description: string;
         prompt: string;
@@ -34,6 +38,7 @@ export interface MessageManagerOptions {
     logger?: Logger;
     sessionType?: "main" | "subagent";
     subagentType?: string;
+    memoryRuleManager?: MemoryRuleManager;
 }
 export declare class MessageManager {
     private sessionId;
@@ -47,6 +52,7 @@ export declare class MessageManager {
     private transcriptPath;
     private savedMessageCount;
     private filesInContext;
+    private memoryRuleManager?;
     private sessionType;
     private subagentType?;
     constructor(options: MessageManagerOptions);
@@ -61,6 +67,10 @@ export declare class MessageManager {
     getFilesInContext(): string[];
     getSessionDir(): string;
     getTranscriptPath(): string;
+    /**
+     * Get combined memory content (project memory + user memory + modular rules)
+     */
+    getCombinedMemory(): Promise<string>;
     /**
      * Compute the transcript path using cached encoded workdir
      * Called during construction and when sessionId changes
@@ -82,6 +92,14 @@ export declare class MessageManager {
      * Clear messages and input history
      */
     clearMessages(): void;
+    /**
+     * Trigger the rewind UI callback
+     */
+    triggerShowRewind(): void;
+    /**
+     * Trigger slash commands change callback
+     */
+    triggerSlashCommandsChange(commands: SlashCommand[]): void;
     initializeFromSession(sessionData: SessionData): void;
     addToInputHistory(input: string): void;
     clearInputHistory(): void;
@@ -90,22 +108,24 @@ export declare class MessageManager {
     mergeAssistantAdditionalFields(additionalFields: Record<string, unknown>): void;
     updateToolBlock(params: AgentToolBlockUpdateParams): void;
     addErrorBlock(error: string): void;
+    addInfoBlock(content: string): void;
     /**
      * Compress messages and update session, delete compressed messages, only keep compressed messages and subsequent messages
      */
     compressMessagesAndUpdateSession(insertIndex: number, compressedContent: string, usage?: Usage): void;
-    addMemoryBlock(content: string, success: boolean, type: "project" | "user", storagePath: string): void;
+    addFileHistoryBlock(snapshots: import("../types/reversion.js").FileSnapshot[]): void;
     addCommandOutputMessage(command: string): void;
     updateCommandOutputMessage(command: string, output: string): void;
     completeCommandMessage(command: string, exitCode: number): void;
-    addSubagentBlock(subagentId: string, subagentName: string, sessionId: string, configuration: SubagentConfiguration, status: "active" | "completed" | "error" | undefined, parameters: {
+    addSubagentBlock(subagentId: string, subagentName: string, sessionId: string, configuration: SubagentConfiguration, status: "active" | "completed" | "error" | "aborted" | undefined, parameters: {
         description: string;
         prompt: string;
         subagent_type: string;
-    }): void;
+    }, runInBackground?: boolean): void;
     updateSubagentBlock(subagentId: string, updates: Partial<{
         status: "active" | "completed" | "error" | "aborted";
         sessionId: string;
+        runInBackground: boolean;
     }>): void;
     /**
      * Trigger usage change callback with all usage data from assistant messages
@@ -127,6 +147,16 @@ export declare class MessageManager {
      * Used for hook error handling when the user prompt needs to be erased
      */
     removeLastUserMessage(): void;
+    /**
+     * Truncate history to a specific index and revert file changes.
+     * @param index - The index of the user message to truncate to.
+     * @param reversionManager - Optional ReversionManager to handle file rollbacks.
+     */
+    truncateHistory(index: number, reversionManager?: import("./reversionManager.js").ReversionManager): Promise<void>;
+    /**
+     * Rewrite the session file with the current messages.
+     */
+    private rewriteSessionFile;
     /**
      * Updates the set of files mentioned in the conversation.
      */

package/dist/managers/messageManager.d.ts.map

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

package/dist/managers/messageManager.js

@@ -1,4 +1,4 @@
-import { addAssistantMessageToMessages, updateToolBlockInMessage, addErrorBlockToMessage, addUserMessageToMessages, extractUserInputHistory, addMemoryBlockToMessage, addCommandOutputMessage, updateCommandOutputInMessage, completeCommandInMessage, addSubagentBlockToMessage, updateSubagentBlockInMessage, removeLastUserMessage, } from "../utils/messageOperations.js";
+import { addAssistantMessageToMessages, updateToolBlockInMessage, addErrorBlockToMessage, addUserMessageToMessages, extractUserInputHistory, addCommandOutputMessage, updateCommandOutputInMessage, completeCommandInMessage, addSubagentBlockToMessage, updateSubagentBlockInMessage, removeLastUserMessage, } from "../utils/messageOperations.js";
 import { join } from "path";
 import { appendMessages, createSession, generateSessionId, SESSION_DIR, } from "../services/session.js";
 import { pathEncoder } from "../utils/pathEncoder.js";
@@ -16,6 +16,7 @@ export class MessageManager {
         this.savedMessageCount = 0; // Initialize saved message count tracker
         this.sessionType = options.sessionType || "main";
         this.subagentType = options.subagentType;
+        this.memoryRuleManager = options.memoryRuleManager;
         // Compute and cache the transcript path
         this.transcriptPath = this.computeTranscriptPath();
     }
@@ -47,6 +48,25 @@ export class MessageManager {
     getTranscriptPath() {
         return this.transcriptPath;
     }
+    /**
+     * Get combined memory content (project memory + user memory + modular rules)
+     */
+    async getCombinedMemory() {
+        const memory = await import("../services/memory.js");
+        let combined = await memory.getCombinedMemoryContent(this.workdir);
+        if (this.memoryRuleManager) {
+            const filesInContext = this.getFilesInContext();
+            const activeRules = this.memoryRuleManager.getActiveRules(filesInContext);
+            if (activeRules.length > 0) {
+                this.logger?.debug(`Active modular rules (${activeRules.length}): ${activeRules.map((r) => r.id).join(", ")}`);
+                if (combined) {
+                    combined += "\n\n";
+                }
+                combined += activeRules.map((r) => r.content).join("\n\n");
+            }
+        }
+        return combined;
+    }
     /**
      * Compute the transcript path using cached encoded workdir
      * Called during construction and when sessionId changes
@@ -130,6 +150,18 @@ export class MessageManager {
         this.setlatestTotalTokens(0);
         this.savedMessageCount = 0; // Reset saved message count
     }
+    /**
+     * Trigger the rewind UI callback
+     */
+    triggerShowRewind() {
+        this.callbacks.onShowRewind?.();
+    }
+    /**
+     * Trigger slash commands change callback
+     */
+    triggerSlashCommandsChange(commands) {
+        this.callbacks.onSlashCommandsChange?.(commands);
+    }
     // Initialize state from session data
     initializeFromSession(sessionData) {
         this.setSessionId(sessionData.id);
@@ -228,6 +260,17 @@ export class MessageManager {
         this.setMessages(newMessages);
         this.callbacks.onErrorBlockAdded?.(error);
     }
+    addInfoBlock(content) {
+        const lastMessage = this.messages[this.messages.length - 1];
+        if (lastMessage && lastMessage.role === "assistant") {
+            lastMessage.blocks.push({
+                type: "info",
+                content,
+            });
+            this.setMessages([...this.messages]);
+            this.callbacks.onInfoBlockAdded?.(content);
+        }
+    }
     /**
      * Compress messages and update session, delete compressed messages, only keep compressed messages and subsequent messages
      */
@@ -259,16 +302,17 @@ export class MessageManager {
         // Trigger compression callback, insertIndex remains unchanged
         this.callbacks.onCompressBlockAdded?.(insertIndex, compressedContent);
     }
-    addMemoryBlock(content, success, type, storagePath) {
-        const newMessages = addMemoryBlockToMessage({
-            messages: this.messages,
-            content,
-            isSuccess: success,
-            memoryType: type,
-            storagePath,
-        });
-        this.setMessages(newMessages);
-        this.callbacks.onMemoryBlockAdded?.(content, success, type, storagePath);
+    addFileHistoryBlock(snapshots) {
+        if (snapshots.length === 0)
+            return;
+        const lastMessage = this.messages[this.messages.length - 1];
+        if (lastMessage && lastMessage.role === "assistant") {
+            lastMessage.blocks.push({
+                type: "file_history",
+                snapshots,
+            });
+            this.setMessages([...this.messages]);
+        }
     }
     // Bash command related message operations
     addCommandOutputMessage(command) {
@@ -298,7 +342,7 @@ export class MessageManager {
         this.callbacks.onCompleteCommandMessage?.(command, exitCode);
     }
     // Subagent block methods
-    addSubagentBlock(subagentId, subagentName, sessionId, configuration, status = "active", parameters) {
+    addSubagentBlock(subagentId, subagentName, sessionId, configuration, status = "active", parameters, runInBackground) {
         const params = {
             messages: this.messages,
             subagentId,
@@ -306,6 +350,7 @@ export class MessageManager {
             sessionId,
             status,
             configuration,
+            runInBackground,
         };
         const updatedMessages = addSubagentBlockToMessage(params);
         this.setMessages(updatedMessages);
@@ -319,7 +364,9 @@ export class MessageManager {
             subagentId,
             status: updates.status || "active",
         };
-        this.callbacks.onSubAgentBlockUpdated?.(params.subagentId, params.status);
+        if (updates.status) {
+            this.callbacks.onSubAgentBlockUpdated?.(params.subagentId, params.status);
+        }
     }
     /**
      * Trigger usage change callback with all usage data from assistant messages
@@ -413,6 +460,50 @@ export class MessageManager {
         const newMessages = removeLastUserMessage(this.messages);
         this.setMessages(newMessages);
     }
+    /**
+     * Truncate history to a specific index and revert file changes.
+     * @param index - The index of the user message to truncate to.
+     * @param reversionManager - Optional ReversionManager to handle file rollbacks.
+     */
+    async truncateHistory(index, reversionManager) {
+        if (index < 0 || index >= this.messages.length) {
+            throw new Error(`Invalid message index: ${index}`);
+        }
+        // Identify messages to be removed
+        const messagesToRemove = this.messages.slice(index);
+        const messageIdsToRemove = messagesToRemove
+            .map((m) => m.id)
+            .filter((id) => !!id);
+        // Revert file changes if manager is provided
+        if (reversionManager && messageIdsToRemove.length > 0) {
+            await reversionManager.revertTo(messageIdsToRemove, this.messages);
+        }
+        // Truncate messages in memory
+        const newMessages = this.messages.slice(0, index);
+        this.setMessages(newMessages);
+        // Update persistence: rewrite the session file
+        await this.rewriteSessionFile(newMessages);
+        // Update saved message count
+        this.savedMessageCount = newMessages.length;
+    }
+    /**
+     * Rewrite the session file with the current messages.
+     */
+    async rewriteSessionFile(messages) {
+        try {
+            const { writeFile } = await import("fs/promises");
+            const sessionMessages = messages.map((message) => ({
+                ...message,
+                timestamp: new Date().toISOString(),
+            }));
+            const content = sessionMessages.map((m) => JSON.stringify(m)).join("\n") +
+                (sessionMessages.length > 0 ? "\n" : "");
+            await writeFile(this.transcriptPath, content, "utf8");
+        }
+        catch (error) {
+            this.logger?.error("Failed to rewrite session file:", error);
+        }
+    }
     /**
      * Updates the set of files mentioned in the conversation.
      */