wave-agent-sdk 0.5.0 → 0.6.1

package/dist/managers/backgroundTaskManager.js

@@ -44,6 +44,29 @@ export class BackgroundTaskManager {
             status: "running",
             stdout: "",
             stderr: "",
+            onStop: () => {
+                try {
+                    if (child.pid) {
+                        process.kill(-child.pid, "SIGTERM");
+                        setTimeout(() => {
+                            if (child.pid && !child.killed) {
+                                try {
+                                    process.kill(-child.pid, "SIGKILL");
+                                }
+                                catch (error) {
+                                    logger.error("Failed to force kill process:", error);
+                                }
+                            }
+                        }, 1000);
+                    }
+                    else {
+                        child.kill("SIGTERM");
+                    }
+                }
+                catch {
+                    child.kill("SIGTERM");
+                }
+            },
         };
         this.tasks.set(id, shell);
         this.notifyTasksChange();
@@ -114,6 +137,29 @@ export class BackgroundTaskManager {
             status: "running",
             stdout: initialStdout,
             stderr: initialStderr,
+            onStop: () => {
+                try {
+                    if (child.pid) {
+                        process.kill(-child.pid, "SIGTERM");
+                        setTimeout(() => {
+                            if (child.pid && !child.killed) {
+                                try {
+                                    process.kill(-child.pid, "SIGKILL");
+                                }
+                                catch (error) {
+                                    logger.error("Failed to force kill process:", error);
+                                }
+                            }
+                        }, 1000);
+                    }
+                    else {
+                        child.kill("SIGTERM");
+                    }
+                }
+                catch {
+                    child.kill("SIGTERM");
+                }
+            },
         };
         this.tasks.set(id, shell);
         this.notifyTasksChange();
@@ -177,64 +223,24 @@ export class BackgroundTaskManager {
         if (!task || task.status !== "running") {
             return false;
         }
-        if (task.type === "shell") {
-            const shell = task;
+        if (task.onStop) {
             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);
+                const result = task.onStop();
+                if (result instanceof Promise) {
+                    result.catch((error) => {
+                        logger.error("Error in background task onStop callback:", error);
+                    });
                 }
-                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;
-                }
+            catch (error) {
+                logger.error("Error in background task onStop callback:", error);
             }
         }
-        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;
+        task.status = "killed";
+        task.endTime = Date.now();
+        task.runtime = task.endTime - task.startTime;
+        this.notifyTasksChange();
+        return true;
     }
     cleanup() {
         // Kill all running tasks

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

@@ -1 +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"}
+{"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;IAQ5C,cAAc,IAAI,OAAO;CAGjC"}

package/dist/managers/foregroundTaskManager.js

@@ -9,8 +9,9 @@ export class ForegroundTaskManager {
         this.activeForegroundTasks = this.activeForegroundTasks.filter((t) => t.id !== id);
     }
     async backgroundCurrentTask() {
-        const task = this.activeForegroundTasks.pop();
-        if (task) {
+        const tasks = [...this.activeForegroundTasks].reverse();
+        this.activeForegroundTasks = [];
+        for (const task of tasks) {
             await task.backgroundHandler();
         }
     }

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

@@ -1 +1 @@
-{"version":3,"file":"mcpManager.d.ts","sourceRoot":"","sources":["../../src/managers/mcpManager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AAEjE,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,KAAK,EACV,MAAM,EACN,eAAe,EACf,SAAS,EACT,OAAO,EACP,eAAe,EAChB,MAAM,mBAAmB,CAAC;AAQ3B,MAAM,WAAW,mBAAmB;IAClC,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,IAAI,CAAC;CACxD;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,CAAC,EAAE,mBAAmB,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,UAAU;IACrB,OAAO,CAAC,MAAM,CAA0B;IACxC,OAAO,CAAC,OAAO,CAA2C;IAC1D,OAAO,CAAC,WAAW,CAAyC;IAC5D,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,OAAO,CAAc;IAC7B,OAAO,CAAC,SAAS,CAAsB;IACvC,OAAO,CAAC,MAAM,CAAC,CAAS;gBAEZ,OAAO,GAAE,iBAAsB;IAK3C;;OAEG;IACG,UAAU,CACd,OAAO,EAAE,MAAM,EACf,WAAW,GAAE,OAAe,GAC3B,OAAO,CAAC,IAAI,CAAC;IA4CV,kBAAkB,IAAI,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;IAO/C,UAAU,IAAI,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;IA0CvC,UAAU,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;IAWrD,SAAS,IAAI,SAAS,GAAG,IAAI;IAI7B,aAAa,IAAI,eAAe,EAAE;IAIlC,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS;IAIpD,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,IAAI;IASzE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,GAAG,OAAO;IAyBzD,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAgB7B,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA4F7C,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA2BtD,oBAAoB,IAAI,OAAO,EAAE;IAW3B,cAAc,CAClB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,OAAO,CAAC;QACT,OAAO,EAAE,OAAO,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,MAAM,CAAC,EAAE,KAAK,CAAC;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,SAAS,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;KACtD,CAAC;YAqCY,uBAAuB;IA8D/B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAS9B;;OAEG;IACH,iBAAiB,IAAI,UAAU,EAAE;IAuBjC;;OAEG;IACH,iBAAiB,IAAI,0BAA0B,EAAE;IAIjD;;OAEG;IACG,wBAAwB,CAC5B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,UAAU,CAAC;IActB;;OAEG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;CAcjC"}
+{"version":3,"file":"mcpManager.d.ts","sourceRoot":"","sources":["../../src/managers/mcpManager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AAEjE,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,KAAK,EACV,MAAM,EACN,eAAe,EACf,SAAS,EACT,OAAO,EACP,eAAe,EAChB,MAAM,mBAAmB,CAAC;AAQ3B,MAAM,WAAW,mBAAmB;IAClC,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,IAAI,CAAC;CACxD;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,CAAC,EAAE,mBAAmB,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,UAAU;IACrB,OAAO,CAAC,MAAM,CAA0B;IACxC,OAAO,CAAC,OAAO,CAA2C;IAC1D,OAAO,CAAC,WAAW,CAAyC;IAC5D,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,OAAO,CAAc;IAC7B,OAAO,CAAC,SAAS,CAAsB;IACvC,OAAO,CAAC,MAAM,CAAC,CAAS;gBAEZ,OAAO,GAAE,iBAAsB;IAK3C;;OAEG;IACG,UAAU,CACd,OAAO,EAAE,MAAM,EACf,WAAW,GAAE,OAAe,GAC3B,OAAO,CAAC,IAAI,CAAC;IA4CV,kBAAkB,IAAI,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;IAO/C,UAAU,IAAI,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;IA0CvC,UAAU,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;IAWrD,SAAS,IAAI,SAAS,GAAG,IAAI;IAI7B,aAAa,IAAI,eAAe,EAAE;IAIlC,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS;IAIpD,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,IAAI;IASzE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,GAAG,OAAO;IAyBzD,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAgB7B,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA4F7C,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA2BtD,oBAAoB,IAAI,OAAO,EAAE;IAW3B,cAAc,CAClB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,OAAO,CAAC;QACT,OAAO,EAAE,OAAO,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,MAAM,CAAC,EAAE,KAAK,CAAC;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,SAAS,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;KACtD,CAAC;YAqCY,uBAAuB;IA8D/B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAS9B;;OAEG;IACH,iBAAiB,IAAI,UAAU,EAAE;IA0BjC;;OAEG;IACH,iBAAiB,IAAI,0BAA0B,EAAE;IAIjD;;OAEG;IACG,wBAAwB,CAC5B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,UAAU,CAAC;IActB;;OAEG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;CAcjC"}

package/dist/managers/messageManager.d.ts

@@ -8,7 +8,6 @@ export interface MessageManagerCallbacks {
     onMessagesChange?: (messages: Message[]) => void;
     onSessionIdChange?: (sessionId: string) => void;
     onLatestTotalTokensChange?: (latestTotalTokens: number) => void;
-    onUserInputHistoryChange?: (history: string[]) => void;
     onUsagesChange?: (usages: Usage[]) => void;
     onUserMessageAdded?: (params: UserMessageParams) => void;
     onAssistantMessageAdded?: () => void;
@@ -16,7 +15,7 @@ export interface MessageManagerCallbacks {
     onAssistantReasoningUpdated?: (chunk: string, accumulated: string) => void;
     onToolBlockUpdated?: (params: AgentToolBlockUpdateParams) => void;
     onErrorBlockAdded?: (error: string) => void;
-    onCompressBlockAdded?: (insertIndex: number, content: string) => void;
+    onCompressBlockAdded?: (content: string) => void;
     onCompressionStateChange?: (isCompressing: boolean) => void;
     onMemoryBlockAdded?: (content: string, success: boolean, type: "project" | "user", storagePath: string) => void;
     onAddCommandOutputMessage?: (command: string) => void;
@@ -31,6 +30,8 @@ export interface MessageManagerCallbacks {
         subagent_type: string;
     }) => void;
     onSubAgentBlockUpdated?: (subagentId: string, status: "active" | "completed" | "error" | "aborted") => void;
+    onFileHistoryBlockAdded?: (snapshots: import("../types/reversion.js").FileSnapshot[]) => void;
+    onSubagentTaskStopRequested?: (subagentId: string) => void;
 }
 export interface MessageManagerOptions {
     callbacks: MessageManagerCallbacks;
@@ -42,9 +43,10 @@ export interface MessageManagerOptions {
 }
 export declare class MessageManager {
     private sessionId;
+    private rootSessionId;
+    private parentSessionId?;
     private messages;
     private latestTotalTokens;
-    private userInputHistory;
     private workdir;
     private encodedWorkdir;
     private logger?;
@@ -57,9 +59,10 @@ export declare class MessageManager {
     private subagentType?;
     constructor(options: MessageManagerOptions);
     getSessionId(): string;
+    getRootSessionId(): string;
+    getParentSessionId(): string | undefined;
     getMessages(): Message[];
     getlatestTotalTokens(): number;
-    getUserInputHistory(): string[];
     getWorkdir(): string;
     /**
      * Returns all files mentioned in the current conversation context.
@@ -87,9 +90,8 @@ export declare class MessageManager {
      */
     saveSession(): Promise<void>;
     setlatestTotalTokens(latestTotalTokens: number): void;
-    setUserInputHistory(userInputHistory: string[]): void;
     /**
-     * Clear messages and input history
+     * Clear messages
      */
     clearMessages(): void;
     /**
@@ -101,8 +103,6 @@ export declare class MessageManager {
      */
     triggerSlashCommandsChange(commands: SlashCommand[]): void;
     initializeFromSession(sessionData: SessionData): void;
-    addToInputHistory(input: string): void;
-    clearInputHistory(): void;
     addUserMessage(params: UserMessageParams): void;
     addAssistantMessage(content?: string, toolCalls?: ChatCompletionMessageFunctionToolCall[], usage?: Usage, additionalFields?: Record<string, unknown>): void;
     mergeAssistantAdditionalFields(additionalFields: Record<string, unknown>): void;
@@ -110,9 +110,9 @@ export declare class MessageManager {
     addErrorBlock(error: string): void;
     addInfoBlock(content: string): void;
     /**
-     * Compress messages and update session, delete compressed messages, only keep compressed messages and subsequent messages
+     * Compress messages and update session, delete compressed messages, only keep compressed messages and last 3 messages
      */
-    compressMessagesAndUpdateSession(insertIndex: number, compressedContent: string, usage?: Usage): void;
+    compressMessagesAndUpdateSession(compressedContent: string, usage?: Usage): void;
     addFileHistoryBlock(snapshots: import("../types/reversion.js").FileSnapshot[]): void;
     addCommandOutputMessage(command: string): void;
     updateCommandOutputMessage(command: string, output: string): void;
@@ -147,6 +147,10 @@ export declare class MessageManager {
      * Used for hook error handling when the user prompt needs to be erased
      */
     removeLastUserMessage(): void;
+    getFullMessageThread(): Promise<{
+        messages: Message[];
+        sessionIds: string[];
+    }>;
     /**
      * Truncate history to a specific index and revert file changes.
      * @param index - The index of the user message to truncate to.

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":"AAAA,OAAO,EAWL,iBAAiB,EAGjB,KAAK,0BAA0B,EAChC,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAE9E,OAAO,EAIL,WAAW,EAEZ,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,qCAAqC,EAAE,MAAM,qBAAqB,CAAC;AAC5E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAGhE,MAAM,WAAW,uBAAuB;IACtC,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IACjD,iBAAiB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAChD,yBAAyB,CAAC,EAAE,CAAC,iBAAiB,EAAE,MAAM,KAAK,IAAI,CAAC;IAChE,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,IAAI,CAAC;IAE3C,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAEzD,uBAAuB,CAAC,EAAE,MAAM,IAAI,CAAC;IAErC,yBAAyB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;IAEzE,2BAA2B,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3E,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,0BAA0B,KAAK,IAAI,CAAC;IAClE,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,oBAAoB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACjD,wBAAwB,CAAC,EAAE,CAAC,aAAa,EAAE,OAAO,KAAK,IAAI,CAAC;IAC5D,kBAAkB,CAAC,EAAE,CACnB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,SAAS,GAAG,MAAM,EACxB,WAAW,EAAE,MAAM,KAChB,IAAI,CAAC;IAEV,yBAAyB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACtD,4BAA4B,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACzE,wBAAwB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IACvE,qBAAqB,CAAC,EAAE,CAAC,QAAQ,EAAE,YAAY,EAAE,KAAK,IAAI,CAAC;IAC3D,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAE7C,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IAE1B,oBAAoB,CAAC,EAAE,CACrB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE;QACV,WAAW,EAAE,MAAM,CAAC;QACpB,MAAM,EAAE,MAAM,CAAC;QACf,aAAa,EAAE,MAAM,CAAC;KACvB,KACE,IAAI,CAAC;IACV,sBAAsB,CAAC,EAAE,CACvB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,QAAQ,GAAG,WAAW,GAAG,OAAO,GAAG,SAAS,KACjD,IAAI,CAAC;IACV,uBAAuB,CAAC,EAAE,CACxB,SAAS,EAAE,OAAO,uBAAuB,EAAE,YAAY,EAAE,KACtD,IAAI,CAAC;IACV,2BAA2B,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;CAC5D;AAED,MAAM,WAAW,qBAAqB;IACpC,SAAS,EAAE,uBAAuB,CAAC;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;IAClC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;CACvC;AAED,qBAAa,cAAc;IAEzB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,eAAe,CAAC,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAY;IAC5B,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,SAAS,CAA0B;IAC3C,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,cAAc,CAA0B;IAChD,OAAO,CAAC,iBAAiB,CAAC,CAAoB;IAC9C,OAAO,CAAC,WAAW,CAAsB;IACzC,OAAO,CAAC,YAAY,CAAC,CAAS;gBAElB,OAAO,EAAE,qBAAqB;IAmBnC,YAAY,IAAI,MAAM;IAItB,gBAAgB,IAAI,MAAM;IAI1B,kBAAkB,IAAI,MAAM,GAAG,SAAS;IAIxC,WAAW,IAAI,OAAO,EAAE;IAIxB,oBAAoB,IAAI,MAAM;IAI9B,UAAU,IAAI,MAAM;IAI3B;;OAEG;IACI,iBAAiB,IAAI,MAAM,EAAE;IAI7B,aAAa,IAAI,MAAM;IAIvB,iBAAiB,IAAI,MAAM;IAIlC;;OAEG;IACU,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;IAqBjD;;;OAGG;IACH,OAAO,CAAC,qBAAqB;IAStB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAY5C;;OAEG;YACW,qBAAqB;IAQ5B,WAAW,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI;IAM7C;;OAEG;IACU,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAiClC,oBAAoB,CAAC,iBAAiB,EAAE,MAAM,GAAG,IAAI;IAQ5D;;OAEG;IACI,aAAa,IAAI,IAAI;IAQ5B;;OAEG;IACI,iBAAiB,IAAI,IAAI;IAIhC;;OAEG;IACI,0BAA0B,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,IAAI;IAK1D,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI;IAcrD,cAAc,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI;IAW/C,mBAAmB,CACxB,OAAO,CAAC,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,qCAAqC,EAAE,EACnD,KAAK,CAAC,EAAE,KAAK,EACb,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,IAAI;IAsBA,8BAA8B,CACnC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACxC,IAAI;IA+BA,eAAe,CAAC,MAAM,EAAE,0BAA0B,GAAG,IAAI;IAWzD,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IASlC,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAY1C;;OAEG;IACI,gCAAgC,CACrC,iBAAiB,EAAE,MAAM,EACzB,KAAK,CAAC,EAAE,KAAK,GACZ,IAAI;IAqCA,mBAAmB,CACxB,SAAS,EAAE,OAAO,uBAAuB,EAAE,YAAY,EAAE,GACxD,IAAI;IAeA,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAS9C,0BAA0B,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAUjE,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAW/D,gBAAgB,CACrB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,qBAAqB,EACpC,MAAM,EAAE,QAAQ,GAAG,WAAW,GAAG,OAAO,GAAG,SAAS,YAAW,EAC/D,UAAU,EAAE;QACV,WAAW,EAAE,MAAM,CAAC;QACpB,MAAM,EAAE,MAAM,CAAC;QACf,aAAa,EAAE,MAAM,CAAC;KACvB,EACD,eAAe,CAAC,EAAE,OAAO,GACxB,IAAI;IAeA,mBAAmB,CACxB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,CAAC;QACf,MAAM,EAAE,QAAQ,GAAG,WAAW,GAAG,OAAO,GAAG,SAAS,CAAC;QACrD,SAAS,EAAE,MAAM,CAAC;QAClB,eAAe,EAAE,OAAO,CAAC;KAC1B,CAAC,GACD,IAAI;IAiBP;;OAEG;IACI,kBAAkB,IAAI,IAAI;IAUjC;;;;OAIG;IACI,2BAA2B,CAAC,qBAAqB,EAAE,MAAM,GAAG,IAAI;IA6CvE;;;OAGG;IACI,6BAA6B,CAAC,uBAAuB,EAAE,MAAM,GAAG,IAAI;IA8C3E;;;OAGG;IACI,qBAAqB,IAAI,IAAI;IAKvB,oBAAoB,IAAI,OAAO,CAAC;QAC3C,QAAQ,EAAE,OAAO,EAAE,CAAC;QACpB,UAAU,EAAE,MAAM,EAAE,CAAC;KACtB,CAAC;IAKF;;;;OAIG;IACU,eAAe,CAC1B,KAAK,EAAE,MAAM,EACb,gBAAgB,CAAC,EAAE,OAAO,uBAAuB,EAAE,gBAAgB,GAClE,OAAO,CAAC,IAAI,CAAC;IA2GhB;;OAEG;YACW,kBAAkB;IAoBhC;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAyB5B,OAAO,CAAC,sBAAsB;CA4B/B"}

package/dist/managers/messageManager.js

@@ -1,4 +1,4 @@
-import { addAssistantMessageToMessages, updateToolBlockInMessage, addErrorBlockToMessage, addUserMessageToMessages, extractUserInputHistory, addCommandOutputMessage, updateCommandOutputInMessage, completeCommandInMessage, addSubagentBlockToMessage, updateSubagentBlockInMessage, removeLastUserMessage, } from "../utils/messageOperations.js";
+import { addAssistantMessageToMessages, updateToolBlockInMessage, addErrorBlockToMessage, addUserMessageToMessages, 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";
@@ -6,9 +6,9 @@ export class MessageManager {
     constructor(options) {
         this.filesInContext = new Set(); // Track files mentioned in the conversation
         this.sessionId = generateSessionId();
+        this.rootSessionId = this.sessionId;
         this.messages = [];
         this.latestTotalTokens = 0;
-        this.userInputHistory = [];
         this.workdir = options.workdir;
         this.encodedWorkdir = pathEncoder.encodeSync(this.workdir); // Cache encoded workdir
         this.callbacks = options.callbacks;
@@ -24,15 +24,18 @@ export class MessageManager {
     getSessionId() {
         return this.sessionId;
     }
+    getRootSessionId() {
+        return this.rootSessionId;
+    }
+    getParentSessionId() {
+        return this.parentSessionId;
+    }
     getMessages() {
         return [...this.messages];
     }
     getlatestTotalTokens() {
         return this.latestTotalTokens;
     }
-    getUserInputHistory() {
-        return [...this.userInputHistory];
-    }
     getWorkdir() {
         return this.workdir;
     }
@@ -122,7 +125,7 @@ export class MessageManager {
             }
             // Use JSONL format for new sessions
             await appendMessages(this.sessionId, unsavedMessages, // Only append new messages
-            this.workdir, this.sessionType);
+            this.workdir, this.sessionType, this.rootSessionId, this.parentSessionId);
             // Update the saved message count
             this.savedMessageCount = this.messages.length;
         }
@@ -136,17 +139,13 @@ export class MessageManager {
             this.callbacks.onLatestTotalTokensChange?.(latestTotalTokens);
         }
     }
-    setUserInputHistory(userInputHistory) {
-        this.userInputHistory = [...userInputHistory];
-        this.callbacks.onUserInputHistoryChange?.(this.userInputHistory);
-    }
     /**
-     * Clear messages and input history
+     * Clear messages
      */
     clearMessages() {
         this.setMessages([]);
-        this.setUserInputHistory([]);
         this.setSessionId(generateSessionId());
+        this.rootSessionId = this.sessionId;
         this.setlatestTotalTokens(0);
         this.savedMessageCount = 0; // Reset saved message count
     }
@@ -165,29 +164,15 @@ export class MessageManager {
     // Initialize state from session data
     initializeFromSession(sessionData) {
         this.setSessionId(sessionData.id);
+        this.rootSessionId = sessionData.rootSessionId || sessionData.id;
+        this.parentSessionId = sessionData.parentSessionId;
         this.setMessages([...sessionData.messages]);
         this.updateFilesInContext(sessionData.messages);
         this.setlatestTotalTokens(sessionData.metadata.latestTotalTokens);
-        // Extract user input history from session messages
-        this.setUserInputHistory(extractUserInputHistory(sessionData.messages));
         // Set saved message count to the number of loaded messages since they're already saved
         // This must be done after setSessionId which resets it to 0
         this.savedMessageCount = sessionData.messages.length;
     }
-    // Add to input history
-    addToInputHistory(input) {
-        // Avoid adding duplicate inputs
-        if (this.userInputHistory.length > 0 &&
-            this.userInputHistory[this.userInputHistory.length - 1] === input) {
-            return;
-        }
-        // Limit history records, keep the latest 100
-        this.setUserInputHistory([...this.userInputHistory, input].slice(-100));
-    }
-    // Clear input history
-    clearInputHistory() {
-        this.setUserInputHistory([]);
-    }
     // Encapsulated message operation functions
     addUserMessage(params) {
         const newMessages = addUserMessageToMessages({
@@ -236,17 +221,7 @@ export class MessageManager {
     updateToolBlock(params) {
         const newMessages = updateToolBlockInMessage({
             messages: this.messages,
-            id: params.id,
-            parameters: params.parameters,
-            result: params.result,
-            success: params.success,
-            error: params.error,
-            stage: params.stage,
-            name: params.name,
-            shortResult: params.shortResult,
-            images: params.images,
-            compactParams: params.compactParams,
-            parametersChunk: params.parametersChunk,
+            ...params,
         });
         this.setMessages(newMessages);
         this.callbacks.onToolBlockUpdated?.(params);
@@ -272,10 +247,11 @@ export class MessageManager {
         }
     }
     /**
-     * Compress messages and update session, delete compressed messages, only keep compressed messages and subsequent messages
+     * Compress messages and update session, delete compressed messages, only keep compressed messages and last 3 messages
      */
-    compressMessagesAndUpdateSession(insertIndex, compressedContent, usage) {
-        const currentMessages = this.messages;
+    compressMessagesAndUpdateSession(compressedContent, usage) {
+        // Get last 3 messages to preserve
+        const lastThreeMessages = this.messages.slice(-3);
         // Create compressed message
         const compressMessage = {
             role: "assistant",
@@ -288,19 +264,20 @@ export class MessageManager {
             ],
             ...(usage && { usage }),
         };
-        // Convert negative index to positive index
-        const actualIndex = insertIndex < 0 ? currentMessages.length + insertIndex : insertIndex;
-        // Build new message array: keep compressed message and all messages from actualIndex onwards
-        const newMessages = [
-            compressMessage,
-            ...currentMessages.slice(actualIndex),
-        ];
-        // Update sessionId
+        // Build new message array: keep the compressed message and last 3 messages
+        const newMessages = [compressMessage, ...lastThreeMessages];
+        // Update sessionId and parentSessionId
+        const oldSessionId = this.sessionId;
         this.setSessionId(generateSessionId());
+        this.parentSessionId = oldSessionId;
+        // Trigger task list update if this is the main session to ensure continuity
+        if (this.sessionType === "main") {
+            this.callbacks.onSessionIdChange?.(this.sessionId);
+        }
         // Set new message list
         this.setMessages(newMessages);
-        // Trigger compression callback, insertIndex remains unchanged
-        this.callbacks.onCompressBlockAdded?.(insertIndex, compressedContent);
+        // Trigger compression callback
+        this.callbacks.onCompressBlockAdded?.(compressedContent);
     }
     addFileHistoryBlock(snapshots) {
         if (snapshots.length === 0)
@@ -312,6 +289,7 @@ export class MessageManager {
                 snapshots,
             });
             this.setMessages([...this.messages]);
+            this.callbacks.onFileHistoryBlockAdded?.(snapshots);
         }
     }
     // Bash command related message operations
@@ -460,31 +438,93 @@ export class MessageManager {
         const newMessages = removeLastUserMessage(this.messages);
         this.setMessages(newMessages);
     }
+    async getFullMessageThread() {
+        const { loadFullMessageThread } = await import("../services/session.js");
+        return loadFullMessageThread(this.sessionId, this.workdir);
+    }
     /**
      * 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) {
+        const { messages, sessionIds } = await this.getFullMessageThread();
+        if (index < 0 || index >= messages.length) {
             throw new Error(`Invalid message index: ${index}`);
         }
-        // Identify messages to be removed
-        const messagesToRemove = this.messages.slice(index);
+        // Find which session the index belongs to
+        let targetSessionId = this.sessionId;
+        let targetIndexInSession = index;
+        // We need to be careful here because loadFullMessageThread might have removed "compress" blocks
+        // Let's re-calculate based on the actual messages returned.
+        // Actually, it's easier to just load sessions one by one again or keep track of counts.
+        // For simplicity, let's assume we want to truncate the WHOLE thread.
+        // If the index is in a previous session, we need to:
+        // 1. Load that session.
+        // 2. Truncate it.
+        // 3. Make it the current session.
+        // 4. Delete/Invalidate subsequent sessions.
+        // To correctly map 'index' to a session, we need to know the message count of each session
+        // as they appear in the concatenated 'messages' array.
+        let remainingIndex = index;
+        const { loadSessionFromJsonl } = await import("../services/session.js");
+        for (const sid of sessionIds) {
+            const sessionData = await loadSessionFromJsonl(sid, this.workdir);
+            if (!sessionData)
+                continue;
+            const sessionMessages = sessionData.messages;
+            // If this is not the first session in the thread, it might have a compress block at the start
+            // that was removed in getFullMessageThread.
+            const hasCompressBlock = sessionMessages[0]?.blocks.some((b) => b.type === "compress");
+            const effectiveMessages = hasCompressBlock && sid !== sessionIds[0]
+                ? sessionMessages.slice(1)
+                : sessionMessages;
+            if (remainingIndex < effectiveMessages.length) {
+                targetSessionId = sid;
+                targetIndexInSession = hasCompressBlock
+                    ? remainingIndex + 1
+                    : remainingIndex;
+                break;
+            }
+            remainingIndex -= effectiveMessages.length;
+        }
+        // Load the target session to perform truncation
+        const targetSessionData = await loadSessionFromJsonl(targetSessionId, this.workdir);
+        if (!targetSessionData)
+            throw new Error(`Target session ${targetSessionId} not found`);
+        // Identify messages to be removed (from the whole thread)
+        const messagesToRemove = 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);
+            await reversionManager.revertTo(messageIdsToRemove, 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);
+        // Truncate messages in the target session
+        const newMessagesInSession = targetSessionData.messages.slice(0, targetIndexInSession);
+        // Identify subagent tasks to stop
+        for (const message of messagesToRemove) {
+            for (const block of message.blocks) {
+                if (block.type === "subagent" && block.subagentId) {
+                    this.callbacks.onSubagentTaskStopRequested?.(block.subagentId);
+                }
+            }
+        }
+        // Update target session file
+        this.sessionId = targetSessionId;
+        this.rootSessionId = targetSessionData.rootSessionId || targetSessionId;
+        this.parentSessionId = targetSessionData.parentSessionId;
+        this.transcriptPath = this.computeTranscriptPath();
+        await this.rewriteSessionFile(newMessagesInSession);
+        // Update in-memory messages to the truncated session messages
+        // We do NOT include ancestor messages here to avoid exceeding context limits.
+        // The 'compress' block at the start of the session (if any) already summarizes them.
+        this.setMessages(newMessagesInSession);
         // Update saved message count
-        this.savedMessageCount = newMessages.length;
+        this.savedMessageCount = newMessagesInSession.length;
+        // Notify session ID change if it changed
+        this.callbacks.onSessionIdChange?.(this.sessionId);
     }
     /**
      * Rewrite the session file with the current messages.

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

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

package/dist/managers/permissionManager.js

@@ -230,31 +230,24 @@ export class PermissionManager {
                 if (targetPath) {
                     const { isInside, resolvedPath } = this.isInsideSafeZone(targetPath, workdir);
                     if (!isInside) {
-                        this.logger?.warn("File operation outside the Safe Zone in acceptEdits mode", {
+                        this.logger?.info("File operation outside the Safe Zone in acceptEdits mode, falling back to manual confirmation", {
                             toolName: context.toolName,
                             targetPath,
                             resolvedPath,
                         });
-                        return {
-                            behavior: "deny",
-                            message: `Tool '${context.toolName}' attempted to modify a file outside the Safe Zone: ${targetPath}. Operations outside the Safe Zone always require manual confirmation.`,
-                        };
+                        // Fall through to normal permission check flow to trigger confirmation prompt
+                    }
+                    else {
+                        this.logger?.debug("Permission automatically accepted for tool in acceptEdits mode", {
+                            toolName: context.toolName,
+                        });
+                        return { behavior: "allow" };
                     }
                 }
-                this.logger?.debug("Permission automatically accepted for tool in acceptEdits mode", {
-                    toolName: context.toolName,
-                });
-                return { behavior: "allow" };
             }
         }
         // 1.3 If plan mode, allow Read-only tools and Edit/Write for plan file
         if (context.permissionMode === "plan") {
-            if (context.toolName === BASH_TOOL_NAME) {
-                return {
-                    behavior: "deny",
-                    message: "Bash commands are not allowed in plan mode.",
-                };
-            }
             const writeTools = [
                 EDIT_TOOL_NAME,
                 MULTI_EDIT_TOOL_NAME,
@@ -368,6 +361,23 @@ export class PermissionManager {
             toolInput,
             suggestedPrefix,
         };
+        // Set hidePersistentOption for out-of-bounds file operations
+        const fileTools = [
+            EDIT_TOOL_NAME,
+            MULTI_EDIT_TOOL_NAME,
+            DELETE_FILE_TOOL_NAME,
+            WRITE_TOOL_NAME,
+        ];
+        if (fileTools.includes(toolName)) {
+            const targetPath = (toolInput?.file_path || toolInput?.target_file);
+            const workdir = toolInput?.workdir;
+            if (targetPath) {
+                const { isInside } = this.isInsideSafeZone(targetPath, workdir);
+                if (!isInside) {
+                    context.hidePersistentOption = true;
+                }
+            }
+        }
         // Set hidePersistentOption for dangerous or out-of-bounds bash commands
         if (toolName === BASH_TOOL_NAME && toolInput?.command) {
             const command = String(toolInput.command);

package/dist/managers/planManager.d.ts

@@ -9,7 +9,7 @@ export declare class PlanManager {
     /**
      * Ensures the plan directory exists and generates a new plan file path with a random name
      */
-    getOrGeneratePlanFilePath(): Promise<{
+    getOrGeneratePlanFilePath(seed?: string): Promise<{
         path: string;
         name: string;
     }>;

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

@@ -1 +1 @@
-{"version":3,"file":"planManager.d.ts","sourceRoot":"","sources":["../../src/managers/planManager.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;GAEG;AACH,qBAAa,WAAW;IAGV,OAAO,CAAC,MAAM,CAAC;IAF3B,OAAO,CAAC,OAAO,CAAS;gBAEJ,MAAM,CAAC,EAAE,MAAM,YAAA;IAInC;;OAEG;IACU,yBAAyB,IAAI,OAAO,CAAC;QAChD,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IAgBF;;OAEG;IACI,UAAU,IAAI,MAAM;CAG5B"}
+{"version":3,"file":"planManager.d.ts","sourceRoot":"","sources":["../../src/managers/planManager.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;GAEG;AACH,qBAAa,WAAW;IAGV,OAAO,CAAC,MAAM,CAAC;IAF3B,OAAO,CAAC,OAAO,CAAS;gBAEJ,MAAM,CAAC,EAAE,MAAM,YAAA;IAInC;;OAEG;IACU,yBAAyB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;QAC7D,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IAgBF;;OAEG;IACI,UAAU,IAAI,MAAM;CAG5B"}