wave-agent-sdk 0.0.6 → 0.0.8

package/dist/managers/messageManager.d.ts

@@ -1,5 +1,7 @@
-import { type AgentToolBlockUpdateParams } from "../utils/messageOperations.js";
+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 { SessionData } from "../services/session.js";
 import { ChatCompletionMessageFunctionToolCall } from "openai/resources.js";
 export interface MessageManagerCallbacks {
     onMessagesChange?: (messages: Message[]) => void;
@@ -7,18 +9,15 @@ export interface MessageManagerCallbacks {
     onLatestTotalTokensChange?: (latestTotalTokens: number) => void;
     onUserInputHistoryChange?: (history: string[]) => void;
     onUsagesChange?: (usages: Usage[]) => void;
-    onUserMessageAdded?: (content: string, images?: Array<{
-        path: string;
-        mimeType: string;
-    }>) => void;
-    onAssistantMessageAdded?: (content?: string, toolCalls?: ChatCompletionMessageFunctionToolCall[]) => void;
+    onUserMessageAdded?: (params: UserMessageParams) => void;
+    onAssistantMessageAdded?: () => void;
+    onAssistantContentUpdated?: (chunk: string, accumulated: string) => void;
     onToolBlockUpdated?: (params: AgentToolBlockUpdateParams) => void;
     onDiffBlockAdded?: (filePath: string, diffResult: string) => void;
     onErrorBlockAdded?: (error: string) => void;
     onCompressBlockAdded?: (insertIndex: number, content: string) => void;
     onCompressionStateChange?: (isCompressing: boolean) => void;
     onMemoryBlockAdded?: (content: string, success: boolean, type: "project" | "user", storagePath: string) => void;
-    onCustomCommandAdded?: (commandName: string, content: string, originalInput?: string) => void;
     onAddCommandOutputMessage?: (command: string) => void;
     onUpdateCommandOutputMessage?: (command: string, output: string) => void;
     onCompleteCommandMessage?: (command: string, exitCode: number) => void;
@@ -27,17 +26,15 @@ export interface MessageManagerCallbacks {
         prompt: string;
         subagent_type: string;
     }) => void;
-    onSubAgentBlockUpdated?: (subagentId: string, messages: Message[], status: "active" | "completed" | "error" | "aborted") => void;
+    onSubAgentBlockUpdated?: (subagentId: string, status: "active" | "completed" | "error" | "aborted") => void;
 }
 export interface MessageManagerOptions {
     callbacks: MessageManagerCallbacks;
     workdir: string;
     logger?: Logger;
-    /**
-     * Custom session directory path
-     * @default join(homedir(), ".wave", "sessions")
-     */
-    sessionDir?: string;
+    sessionType?: "main" | "subagent";
+    parentSessionId?: string;
+    subagentType?: string;
 }
 export declare class MessageManager {
     private sessionId;
@@ -46,16 +43,33 @@ export declare class MessageManager {
     private userInputHistory;
     private sessionStartTime;
     private workdir;
+    private encodedWorkdir;
     private logger?;
     private callbacks;
-    private sessionDir?;
+    private transcriptPath;
+    private savedMessageCount;
+    private sessionType;
+    private parentSessionId?;
+    private subagentType?;
     constructor(options: MessageManagerOptions);
     getSessionId(): string;
     getMessages(): Message[];
     getlatestTotalTokens(): number;
     getUserInputHistory(): string[];
+    getSessionStartTime(): string;
+    getWorkdir(): string;
+    getSessionDir(): string;
     getTranscriptPath(): string;
+    /**
+     * Compute the transcript path using cached encoded workdir
+     * Called during construction and when sessionId changes
+     */
+    private computeTranscriptPath;
     setSessionId(sessionId: string): void;
+    /**
+     * Create session if needed (async helper)
+     */
+    private createSessionIfNeeded;
     setMessages(messages: Message[]): void;
     /**
      * Save current session
@@ -71,15 +85,12 @@ export declare class MessageManager {
      * Clear messages and input history
      */
     clearMessages(): void;
-    initializeFromSession(sessionId: string, messages: Message[], latestTotalTokens: number): void;
+    initializeFromSession(sessionData: SessionData): void;
     addToInputHistory(input: string): void;
     clearInputHistory(): void;
-    addUserMessage(content: string, images?: Array<{
-        path: string;
-        mimeType: string;
-    }>): void;
-    addCustomCommandMessage(commandName: string, content: string, originalInput?: string): void;
-    addAssistantMessage(content?: string, toolCalls?: ChatCompletionMessageFunctionToolCall[], usage?: Usage): void;
+    addUserMessage(params: UserMessageParams): void;
+    addAssistantMessage(content?: string, toolCalls?: ChatCompletionMessageFunctionToolCall[], usage?: Usage, metadata?: Record<string, unknown>): void;
+    mergeAssistantMetadata(metadata: Record<string, unknown>): void;
     updateToolBlock(params: AgentToolBlockUpdateParams): void;
     addDiffBlock(filePath: string, diffResult: Array<{
         value: string;
@@ -90,24 +101,30 @@ export declare class MessageManager {
     /**
      * Compress messages and update session, delete compressed messages, only keep compressed messages and subsequent messages
      */
-    compressMessagesAndUpdateSession(insertIndex: number, compressedContent: string): void;
+    compressMessagesAndUpdateSession(insertIndex: number, compressedContent: string, usage?: Usage): void;
     addMemoryBlock(content: string, success: boolean, type: "project" | "user", storagePath: string): void;
     addCommandOutputMessage(command: string): void;
     updateCommandOutputMessage(command: string, output: string): void;
     completeCommandMessage(command: string, exitCode: number): void;
-    addSubagentBlock(subagentId: string, subagentName: string, status: "active" | "completed" | "error" | undefined, subagentMessages: Message[] | undefined, parameters: {
+    addSubagentBlock(subagentId: string, subagentName: string, sessionId: string, configuration: SubagentConfiguration, status: "active" | "completed" | "error" | undefined, parameters: {
         description: string;
         prompt: string;
         subagent_type: string;
     }): void;
     updateSubagentBlock(subagentId: string, updates: Partial<{
         status: "active" | "completed" | "error" | "aborted";
-        messages: Message[];
+        sessionId: string;
     }>): void;
     /**
      * Trigger usage change callback with all usage data from assistant messages
      */
     triggerUsageChange(): void;
+    /**
+     * Update the current assistant message content during streaming
+     * This method updates the last assistant message's content without creating a new message
+     * FR-001: Tracks and provides both chunk (new content) and accumulated (total content)
+     */
+    updateCurrentMessageContent(newAccumulatedContent: string): void;
     /**
      * Remove the last user message from the conversation
      * Used for hook error handling when the user prompt needs to be erased

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,17 +1,24 @@
-import { randomUUID } from "crypto";
 import { addAssistantMessageToMessages, updateToolBlockInMessage, addErrorBlockToMessage, addDiffBlockToMessage, addUserMessageToMessages, extractUserInputHistory, addMemoryBlockToMessage, addCommandOutputMessage, updateCommandOutputInMessage, completeCommandInMessage, addSubagentBlockToMessage, updateSubagentBlockInMessage, removeLastUserMessage, } from "../utils/messageOperations.js";
-import { cleanupExpiredSessions, getLatestSession, loadSession, saveSession, getSessionFilePath, } from "../services/session.js";
+import { join } from "path";
+import { cleanupExpiredSessionsFromJsonl, getLatestSessionFromJsonl, loadSessionFromJsonl, appendMessages, createSession, generateSessionId, SESSION_DIR, } from "../services/session.js";
+import { pathEncoder } from "../utils/pathEncoder.js";
 export class MessageManager {
     constructor(options) {
-        this.sessionId = randomUUID();
+        this.sessionId = generateSessionId();
         this.messages = [];
         this.latestTotalTokens = 0;
         this.userInputHistory = [];
         this.sessionStartTime = new Date().toISOString();
         this.workdir = options.workdir;
+        this.encodedWorkdir = pathEncoder.encodeSync(this.workdir); // Cache encoded workdir
         this.callbacks = options.callbacks;
         this.logger = options.logger;
-        this.sessionDir = options.sessionDir;
+        this.savedMessageCount = 0; // Initialize saved message count tracker
+        this.sessionType = options.sessionType || "main";
+        this.parentSessionId = options.parentSessionId;
+        this.subagentType = options.subagentType;
+        // Compute and cache the transcript path
+        this.transcriptPath = this.computeTranscriptPath();
     }
     // Getter methods
     getSessionId() {
@@ -26,16 +33,50 @@ export class MessageManager {
     getUserInputHistory() {
         return [...this.userInputHistory];
     }
+    getSessionStartTime() {
+        return this.sessionStartTime;
+    }
+    getWorkdir() {
+        return this.workdir;
+    }
+    getSessionDir() {
+        return SESSION_DIR;
+    }
     getTranscriptPath() {
-        return getSessionFilePath(this.sessionId, this.sessionDir);
+        return this.transcriptPath;
+    }
+    /**
+     * Compute the transcript path using cached encoded workdir
+     * Called during construction and when sessionId changes
+     */
+    computeTranscriptPath() {
+        const baseDir = join(SESSION_DIR, this.encodedWorkdir);
+        // All sessions now go in the same directory
+        // Session type is determined by metadata, not file path
+        return join(baseDir, `${this.sessionId}.jsonl`);
     }
     // Setter methods, will trigger callbacks
     setSessionId(sessionId) {
         if (this.sessionId !== sessionId) {
             this.sessionId = sessionId;
+            // Reset saved message count for new session
+            this.savedMessageCount = 0;
+            // Recompute transcript path since session ID changed
+            this.transcriptPath = this.computeTranscriptPath();
             this.callbacks.onSessionIdChange?.(sessionId);
         }
     }
+    /**
+     * Create session if needed (async helper)
+     */
+    async createSessionIfNeeded() {
+        try {
+            await createSession(this.sessionId, this.workdir, this.sessionType, this.parentSessionId, this.subagentType);
+        }
+        catch (error) {
+            this.logger?.error("Failed to create session:", error);
+        }
+    }
     setMessages(messages) {
         this.messages = [...messages];
         this.callbacks.onMessagesChange?.([...messages]);
@@ -45,7 +86,22 @@ export class MessageManager {
      */
     async saveSession() {
         try {
-            await saveSession(this.sessionId, this.messages, this.workdir, this.latestTotalTokens, this.sessionStartTime, this.sessionDir);
+            // Only save messages that haven't been saved yet
+            const unsavedMessages = this.messages.slice(this.savedMessageCount);
+            if (unsavedMessages.length === 0) {
+                // No new messages to save
+                return;
+            }
+            // Create session if needed (only when we have messages to save)
+            if (this.savedMessageCount === 0) {
+                // This is the first time saving messages, so create the session
+                await this.createSessionIfNeeded();
+            }
+            // Use JSONL format for new sessions
+            await appendMessages(this.sessionId, unsavedMessages, // Only append new messages
+            this.workdir);
+            // Update the saved message count
+            this.savedMessageCount = this.messages.length;
         }
         catch (error) {
             this.logger?.error("Failed to save session:", error);
@@ -56,26 +112,25 @@ export class MessageManager {
      */
     async handleSessionRestoration(restoreSessionId, continueLastSession) {
         // Clean up expired sessions first
-        try {
-            await cleanupExpiredSessions(this.workdir, this.sessionDir);
-        }
-        catch (error) {
+        cleanupExpiredSessionsFromJsonl(this.workdir).catch((error) => {
             this.logger?.warn("Failed to cleanup expired sessions:", error);
-        }
+        });
         if (!restoreSessionId && !continueLastSession) {
             return;
         }
         try {
             let sessionToRestore = null;
             if (restoreSessionId) {
-                sessionToRestore = await loadSession(restoreSessionId, this.sessionDir);
+                // Use only JSONL format - no legacy support
+                sessionToRestore = await loadSessionFromJsonl(restoreSessionId, this.workdir);
                 if (!sessionToRestore) {
                     console.error(`Session not found: ${restoreSessionId}`);
                     process.exit(1);
                 }
             }
             else if (continueLastSession) {
-                sessionToRestore = await getLatestSession(this.workdir, this.sessionDir);
+                // Use only JSONL format - no legacy support
+                sessionToRestore = await getLatestSessionFromJsonl(this.workdir);
                 if (!sessionToRestore) {
                     console.error(`No previous session found for workdir: ${this.workdir}`);
                     process.exit(1);
@@ -84,7 +139,7 @@ export class MessageManager {
             if (sessionToRestore) {
                 console.log(`Restoring session: ${sessionToRestore.id}`);
                 // Initialize from session data
-                this.initializeFromSession(sessionToRestore.id, sessionToRestore.messages, sessionToRestore.metadata.latestTotalTokens);
+                this.initializeFromSession(sessionToRestore);
             }
         }
         catch (error) {
@@ -108,17 +163,23 @@ export class MessageManager {
     clearMessages() {
         this.setMessages([]);
         this.setUserInputHistory([]);
-        this.setSessionId(randomUUID());
+        this.setSessionId(generateSessionId());
         this.setlatestTotalTokens(0);
         this.sessionStartTime = new Date().toISOString();
+        this.savedMessageCount = 0; // Reset saved message count
     }
     // Initialize state from session data
-    initializeFromSession(sessionId, messages, latestTotalTokens) {
-        this.setSessionId(sessionId);
-        this.setMessages([...messages]);
-        this.setlatestTotalTokens(latestTotalTokens);
+    initializeFromSession(sessionData) {
+        this.setSessionId(sessionData.id);
+        this.setMessages([...sessionData.messages]);
+        this.setlatestTotalTokens(sessionData.metadata.latestTotalTokens);
+        // Restore the original session start time
+        this.sessionStartTime = sessionData.metadata.startedAt;
         // Extract user input history from session messages
-        this.setUserInputHistory(extractUserInputHistory(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) {
@@ -135,49 +196,68 @@ export class MessageManager {
         this.setUserInputHistory([]);
     }
     // Encapsulated message operation functions
-    addUserMessage(content, images) {
+    addUserMessage(params) {
         const newMessages = addUserMessageToMessages({
             messages: this.messages,
-            content,
-            images,
+            ...params,
         });
         this.setMessages(newMessages);
-        this.callbacks.onUserMessageAdded?.(content, images);
+        this.callbacks.onUserMessageAdded?.(params);
+        // Note: Subagent-specific callbacks are now handled by SubagentManager
     }
-    addCustomCommandMessage(commandName, content, originalInput) {
-        const newMessages = addUserMessageToMessages({
-            messages: this.messages,
-            content: "", // Empty content, as we will use CustomCommandBlock
-            customCommandBlock: {
-                type: "custom_command",
-                commandName,
-                content,
-                originalInput,
-            },
-        });
+    addAssistantMessage(content, toolCalls, usage, metadata) {
+        const metadataRecord = metadata
+            ? Object.fromEntries(Object.entries(metadata).filter(([, value]) => value !== undefined))
+            : undefined;
+        const newMessages = addAssistantMessageToMessages(this.messages, content, toolCalls, usage, metadataRecord);
         this.setMessages(newMessages);
-        this.callbacks.onCustomCommandAdded?.(commandName, content, originalInput);
+        this.callbacks.onAssistantMessageAdded?.();
+        // Note: Subagent-specific callbacks are now handled by SubagentManager
     }
-    addAssistantMessage(content, toolCalls, usage) {
-        const newMessages = addAssistantMessageToMessages(this.messages, content, toolCalls, usage);
-        this.setMessages(newMessages);
-        this.callbacks.onAssistantMessageAdded?.(content, toolCalls);
+    mergeAssistantMetadata(metadata) {
+        if (!metadata || Object.keys(metadata).length === 0) {
+            return;
+        }
+        const newMessages = [...this.messages];
+        for (let i = newMessages.length - 1; i >= 0; i--) {
+            const message = newMessages[i];
+            if (message.role === "assistant") {
+                const mergedMetadata = {
+                    ...(message.metadata || {}),
+                };
+                for (const [key, value] of Object.entries(metadata)) {
+                    if (value === undefined) {
+                        continue;
+                    }
+                    mergedMetadata[key] = value;
+                }
+                if (Object.keys(mergedMetadata).length === 0) {
+                    return;
+                }
+                message.metadata = mergedMetadata;
+                this.setMessages(newMessages);
+                return;
+            }
+        }
     }
     updateToolBlock(params) {
         const newMessages = updateToolBlockInMessage({
             messages: this.messages,
-            id: params.toolId,
-            parameters: params.args || "",
+            id: params.id,
+            parameters: params.parameters,
             result: params.result,
             success: params.success,
             error: params.error,
-            isRunning: params.isRunning,
+            stage: params.stage,
             name: params.name,
             shortResult: params.shortResult,
+            images: params.images,
             compactParams: params.compactParams,
+            parametersChunk: params.parametersChunk,
         });
         this.setMessages(newMessages);
         this.callbacks.onToolBlockUpdated?.(params);
+        // Note: Subagent-specific callbacks are now handled by SubagentManager
     }
     addDiffBlock(filePath, diffResult) {
         const newMessages = addDiffBlockToMessage({
@@ -199,7 +279,7 @@ export class MessageManager {
     /**
      * Compress messages and update session, delete compressed messages, only keep compressed messages and subsequent messages
      */
-    compressMessagesAndUpdateSession(insertIndex, compressedContent) {
+    compressMessagesAndUpdateSession(insertIndex, compressedContent, usage) {
         const currentMessages = this.messages;
         // Create compressed message
         const compressMessage = {
@@ -208,8 +288,10 @@ export class MessageManager {
                 {
                     type: "compress",
                     content: compressedContent,
+                    sessionId: this.sessionId,
                 },
             ],
+            ...(usage && { usage }),
         };
         // Convert negative index to positive index
         const actualIndex = insertIndex < 0 ? currentMessages.length + insertIndex : insertIndex;
@@ -219,7 +301,7 @@ export class MessageManager {
             ...currentMessages.slice(actualIndex),
         ];
         // Update sessionId
-        this.setSessionId(randomUUID());
+        this.setSessionId(generateSessionId());
         // Set new message list
         this.setMessages(newMessages);
         // Trigger compression callback, insertIndex remains unchanged
@@ -264,13 +346,14 @@ export class MessageManager {
         this.callbacks.onCompleteCommandMessage?.(command, exitCode);
     }
     // Subagent block methods
-    addSubagentBlock(subagentId, subagentName, status = "active", subagentMessages = [], parameters) {
+    addSubagentBlock(subagentId, subagentName, sessionId, configuration, status = "active", parameters) {
         const params = {
             messages: this.messages,
             subagentId,
             subagentName,
+            sessionId,
             status,
-            subagentMessages,
+            configuration,
         };
         const updatedMessages = addSubagentBlockToMessage(params);
         this.setMessages(updatedMessages);
@@ -283,9 +366,8 @@ export class MessageManager {
             messages: this.messages,
             subagentId,
             status: updates.status || "active",
-            subagentMessages: updates.messages || [],
         };
-        this.callbacks.onSubAgentBlockUpdated?.(params.subagentId, params.messages, params.status);
+        this.callbacks.onSubAgentBlockUpdated?.(params.subagentId, params.status);
     }
     /**
      * Trigger usage change callback with all usage data from assistant messages
@@ -299,6 +381,43 @@ export class MessageManager {
         }
         this.callbacks.onUsagesChange?.(usages);
     }
+    /**
+     * Update the current assistant message content during streaming
+     * This method updates the last assistant message's content without creating a new message
+     * FR-001: Tracks and provides both chunk (new content) and accumulated (total content)
+     */
+    updateCurrentMessageContent(newAccumulatedContent) {
+        if (this.messages.length === 0)
+            return;
+        const lastMessage = this.messages[this.messages.length - 1];
+        if (lastMessage.role !== "assistant")
+            return;
+        // Get the current content to calculate the chunk
+        const textBlockIndex = lastMessage.blocks.findIndex((block) => block.type === "text");
+        const currentContent = textBlockIndex >= 0
+            ? lastMessage.blocks[textBlockIndex].content || ""
+            : "";
+        // Calculate the chunk (new content since last update)
+        const chunk = newAccumulatedContent.slice(currentContent.length);
+        if (textBlockIndex >= 0) {
+            // Update existing text block
+            lastMessage.blocks[textBlockIndex] = {
+                type: "text",
+                content: newAccumulatedContent,
+            };
+        }
+        else {
+            // Add new text block if none exists
+            lastMessage.blocks.unshift({
+                type: "text",
+                content: newAccumulatedContent,
+            });
+        }
+        // FR-001: Trigger callbacks with chunk and accumulated content
+        this.callbacks.onAssistantContentUpdated?.(chunk, newAccumulatedContent);
+        // Note: Subagent-specific callbacks are now handled by SubagentManager
+        this.callbacks.onMessagesChange?.([...this.messages]); // Still need to notify of changes
+    }
     /**
      * Remove the last user message from the conversation
      * Used for hook error handling when the user prompt needs to be erased

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

@@ -1 +1 @@
-{"version":3,"file":"slashCommandManager.d.ts","sourceRoot":"","sources":["../../src/managers/slashCommandManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EACV,YAAY,EACZ,kBAAkB,EAClB,MAAM,EACP,MAAM,mBAAmB,CAAC;AAkB3B,MAAM,WAAW,0BAA0B;IACzC,cAAc,EAAE,cAAc,CAAC;IAC/B,SAAS,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,QAAQ,CAAmC;IACnD,OAAO,CAAC,cAAc,CAAyC;IAC/D,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,MAAM,CAAC,CAAS;gBAEZ,OAAO,EAAE,0BAA0B;IAU/C,OAAO,CAAC,yBAAyB;IAYjC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAwC1B;;OAEG;IACI,oBAAoB,IAAI,IAAI;IAWnC;;OAEG;IACH,OAAO,CAAC,eAAe;IAIvB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAIzB;;OAEG;IACI,WAAW,IAAI,YAAY,EAAE;IAIpC;;OAEG;IACI,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAI9D;;OAEG;IACU,cAAc,CACzB,SAAS,EAAE,MAAM,EACjB,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,OAAO,CAAC;IAenB;;;OAGG;IACI,4BAA4B,CAAC,KAAK,EAAE,MAAM,GAAG;QAClD,OAAO,EAAE,OAAO,CAAC;QACjB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,IAAI,CAAC,EAAE,MAAM,CAAC;KACf;IAeD;;OAEG;IACI,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAI7C;;OAEG;IACI,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS;IAI1E;;OAEG;IACI,iBAAiB,IAAI,kBAAkB,EAAE;IAIhD;;OAEG;YACW,+BAA+B;IA2E7C;;OAEG;IACI,mBAAmB,IAAI,IAAI;CAInC"}
+{"version":3,"file":"slashCommandManager.d.ts","sourceRoot":"","sources":["../../src/managers/slashCommandManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EACV,YAAY,EACZ,kBAAkB,EAClB,MAAM,EACP,MAAM,mBAAmB,CAAC;AAkB3B,MAAM,WAAW,0BAA0B;IACzC,cAAc,EAAE,cAAc,CAAC;IAC/B,SAAS,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,QAAQ,CAAmC;IACnD,OAAO,CAAC,cAAc,CAAyC;IAC/D,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,MAAM,CAAC,CAAS;gBAEZ,OAAO,EAAE,0BAA0B;IAU/C,OAAO,CAAC,yBAAyB;IAejC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAwC1B;;OAEG;IACI,oBAAoB,IAAI,IAAI;IAWnC;;OAEG;IACH,OAAO,CAAC,eAAe;IAIvB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAIzB;;OAEG;IACI,WAAW,IAAI,YAAY,EAAE;IAIpC;;OAEG;IACI,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAI9D;;OAEG;IACU,cAAc,CACzB,SAAS,EAAE,MAAM,EACjB,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,OAAO,CAAC;IAenB;;;OAGG;IACI,4BAA4B,CAAC,KAAK,EAAE,MAAM,GAAG;QAClD,OAAO,EAAE,OAAO,CAAC;QACjB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,IAAI,CAAC,EAAE,MAAM,CAAC;KACf;IAeD;;OAEG;IACI,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAI7C;;OAEG;IACI,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS;IAI1E;;OAEG;IACI,iBAAiB,IAAI,kBAAkB,EAAE;IAIhD;;OAEG;YACW,+BAA+B;IA0E7C;;OAEG;IACI,mBAAmB,IAAI,IAAI;CAInC"}

package/dist/managers/slashCommandManager.js

@@ -20,9 +20,12 @@ export class SlashCommandManager {
         this.registerCommand({
             id: "clear",
             name: "clear",
-            description: "Clear the chat session",
+            description: "Clear the chat session and terminal",
             handler: () => {
+                // Clear chat messages
                 this.messageManager.clearMessages();
+                // Clear terminal screen
+                process.stdout.write("\x1Bc");
             },
         });
     }
@@ -181,11 +184,14 @@ export class SlashCommandManager {
             const finalContent = bashResults.length > 0
                 ? replaceBashCommandsWithOutput(processedContent, bashResults)
                 : processedContent;
-            // Add custom command block to show the command being executed
+            // Add custom command message to show the command being executed
             const originalInput = args
                 ? `/${commandName} ${args}`
                 : `/${commandName}`;
-            this.messageManager.addCustomCommandMessage(commandName, finalContent, originalInput);
+            this.messageManager.addUserMessage({
+                content: originalInput,
+                customCommandContent: finalContent,
+            });
             // Execute the AI conversation with custom configuration
             await this.aiManager.sendAIMessage({
                 model: config?.model,