edge-pi-cli 0.1.1 → 0.1.3

package/dist/modes/interactive/interactive-mode.js

@@ -139,7 +139,7 @@ class InteractiveMode {
     // UI Setup
     // ========================================================================
     initUI() {
-        const { provider, modelId, skills = [], contextFiles = [], prompts = [], verbose, sessionManager } = this.options;
+        const { provider, modelId, skills = [], contextFiles = [], prompts = [], verbose } = this.options;
         this.ui = new TUI(new ProcessTerminal());
         // Header
         this.headerContainer = new Container();
@@ -159,8 +159,8 @@ class InteractiveMode {
         this.headerContainer.addChild(new Spacer(1));
         this.headerContainer.addChild(new Text(`${logo}\n${hints}`, 1, 0));
         this.headerContainer.addChild(new Spacer(1));
-        if (verbose && sessionManager?.getSessionFile()) {
-            this.headerContainer.addChild(new Text(chalk.dim(`Session: ${sessionManager.getSessionFile()}`), 1, 0));
+        if (verbose && this.agent.sessionManager?.getSessionFile()) {
+            this.headerContainer.addChild(new Text(chalk.dim(`Session: ${this.agent.sessionManager.getSessionFile()}`), 1, 0));
         }
         // Show loaded context, skills, and prompts at startup
         this.showLoadedResources(contextFiles, skills, prompts);
@@ -271,7 +271,6 @@ class InteractiveMode {
                 if (!text)
                     return;
                 if (this.isStreaming) {
-                    this.agent.followUp({ role: "user", content: [{ type: "text", text }] });
                     this.followUpMessages.push(text);
                     this.editor.setText("");
                     this.updatePendingMessagesDisplay();
@@ -373,7 +372,6 @@ class InteractiveMode {
         await this.streamPrompt(expanded, images);
     }
     async handleBashCommand(command, excludeFromContext) {
-        const { sessionManager } = this.options;
         this.bashAbortController = new AbortController();
         this.isBashRunning = true;
         this.bashComponent = new BashExecutionComponent(command, this.ui, excludeFromContext);
@@ -396,7 +394,7 @@ class InteractiveMode {
                 const msgText = `Ran \`${command}\`\n\n\`\`\`\n${result.output.trimEnd()}\n\`\`\``;
                 const userMsg = { role: "user", content: [{ type: "text", text: msgText }] };
                 this.agent.setMessages([...this.agent.messages, userMsg]);
-                sessionManager?.appendMessage(userMsg);
+                this.agent.sessionManager?.appendMessage(userMsg);
             }
         }
         finally {
@@ -491,8 +489,6 @@ class InteractiveMode {
     async streamPrompt(prompt, images) {
         this.isStreaming = true;
         this.updatePendingMessagesDisplay();
-        const { sessionManager } = this.options;
-        const messagesBefore = this.agent.messages.length;
         // Build image parts from clipboard images
         const imageParts = (images ?? []).map((img) => ({
             type: "image",
@@ -574,25 +570,8 @@ class InteractiveMode {
             }
             if (errorDisplayed)
                 return;
-            // Get final response and update messages
-            const response = await result.response;
-            const responseMessages = response.messages;
-            this.agent.setMessages([
-                ...this.agent.messages.slice(0, messagesBefore),
-                ...buildUserMessage(prompt, imageParts),
-                ...responseMessages,
-            ]);
-            // Save to session
-            if (sessionManager) {
-                const userMsg = {
-                    role: "user",
-                    content: [{ type: "text", text: prompt }, ...imageParts],
-                };
-                sessionManager.appendMessage(userMsg);
-                for (const msg of responseMessages) {
-                    sessionManager.appendMessage(msg);
-                }
-            }
+            // Wait for stream to complete — the agent auto-updates messages and persists to session
+            await result.response;
             // Update footer token stats
             this.updateFooterTokens();
             // Check for auto-compaction after successful response
@@ -673,9 +652,6 @@ class InteractiveMode {
         const restored = [...this.steeringMessages, ...this.followUpMessages];
         this.steeringMessages = [];
         this.followUpMessages = [];
-        // Force agent to drop its internal queue too if possible, but edge-pi agent doesn't expose that yet.
-        // However, steering messages are consumed immediately by the agent loop so they might already be gone.
-        // Follow-ups are managed here in the loop, so clearing this array stops them.
         return restored;
     }
     // ========================================================================
@@ -775,7 +751,7 @@ class InteractiveMode {
     async executeCompaction(isAuto) {
         if (this.isCompacting)
             return undefined;
-        const { sessionManager } = this.options;
+        const sessionManager = this.agent.sessionManager;
         // Build path entries from session if available, otherwise from agent messages
         const pathEntries = sessionManager ? sessionManager.getBranch() : this.buildSessionEntriesFromMessages();
         if (pathEntries.length < 2) {
@@ -1200,7 +1176,7 @@ class InteractiveMode {
             const sessions = [];
             for (const file of files) {
                 // Skip the current session file
-                if (this.options.sessionManager?.getSessionFile() === file.path)
+                if (this.agent.sessionManager?.getSessionFile() === file.path)
                     continue;
                 const preview = this.getSessionPreview(file.path);
                 const timestamp = new Date(file.mtime).toLocaleString();
@@ -1296,20 +1272,16 @@ class InteractiveMode {
         if (!session)
             return;
         try {
-            // Open the selected session
+            // Open the selected session and set on agent (auto-restores messages)
             const sessionDir = this.options.sessionDir;
             const newSessionManager = SessionManagerClass.open(selected, sessionDir);
-            // Rebuild agent messages from session context
-            const context = newSessionManager.buildSessionContext();
-            this.agent.setMessages(context.messages);
-            // Update session manager reference
-            this.options.sessionManager = newSessionManager;
+            this.agent.sessionManager = newSessionManager;
             // Rebuild the chat UI
             this.chatContainer.clear();
             this.rebuildChatFromSession();
             // Update footer tokens
             this.updateFooterTokens();
-            const msgCount = context.messages.length;
+            const msgCount = this.agent.messages.length;
             this.showStatus(chalk.green(`Resumed session (${msgCount} messages)`));
         }
         catch (error) {
@@ -1373,13 +1345,6 @@ class InteractiveMode {
 // ============================================================================
 // Helpers
 // ============================================================================
-function buildUserMessage(text, imageParts) {
-    const content = [{ type: "text", text }];
-    if (imageParts && imageParts.length > 0) {
-        content.push(...imageParts);
-    }
-    return [{ role: "user", content }];
-}
 function extractTextFromMessage(msg) {
     if (msg.role === "user") {
         const content = msg.content;