🤖 fix: lint errors and streaming aggregator logic

Change-Id: I10704b13805f557664038ffd2c619158b1556318
Signed-off-by: Thomas Kosiewski <tk@coder.com>

Author: ThomasK33

src/browser/components/ChatInput/index.tsx

@@ -57,7 +57,6 @@ import {
 
 import type { ThinkingLevel } from "@/common/types/thinking";
 import type { MuxFrontendMetadata } from "@/common/types/message";
-import { useWorkspaceStoreRaw } from "@/browser/stores/WorkspaceStore";
 import { useTelemetry } from "@/browser/hooks/useTelemetry";
 import { setTelemetryEnabled } from "@/common/telemetry";
 import { getTokenCountPromise } from "@/browser/utils/tokenizer/rendererClient";
@@ -143,7 +142,6 @@ export const ChatInput: React.FC<ChatInputProps> = (props) => {
   const [mode, setMode] = useMode();
   const { recentModels, addModel, evictModel } = useModelLRU();
   const commandListId = useId();
-  const workspaceStore = useWorkspaceStoreRaw();
   const telemetry = useTelemetry();
   const [vimEnabled, setVimEnabled] = usePersistedState<boolean>(VIM_ENABLED_KEY, false, {
     listener: true,

src/browser/utils/messages/StreamingMessageAggregator.test.ts

@@ -407,9 +407,9 @@ describe("StreamingMessageAggregator", () => {
           scriptName: "demo",
           args: ["--flag"],
           result: BASE_SCRIPT_RESULT,
-        }
+        },
       });
-      
+
       aggregator.addMessage(scriptMessage);
 
       const displayed = aggregator.getDisplayedMessages();
@@ -424,7 +424,7 @@ describe("StreamingMessageAggregator", () => {
 
     test("removes script logs when history is truncated", () => {
       const aggregator = new StreamingMessageAggregator(TEST_CREATED_AT);
-      
+
       const timestamp = Date.now();
       const scriptMessage = createMuxMessage("script-1", "user", "Run script", {
         historySequence: 1,
@@ -438,7 +438,7 @@ describe("StreamingMessageAggregator", () => {
           scriptName: "cleanup",
           args: [],
           result: BASE_SCRIPT_RESULT,
-        }
+        },
       });
 
       aggregator.addMessage(scriptMessage);

src/browser/utils/messages/StreamingMessageAggregator.ts

@@ -3,7 +3,6 @@ import type {
   MuxMetadata,
   MuxImagePart,
   DisplayedMessage,
-  MuxFrontendMetadata,
 } from "@/common/types/message";
 import { createMuxMessage } from "@/common/types/message";
 import type {
@@ -17,7 +16,7 @@ import type {
   ReasoningDeltaEvent,
   ReasoningEndEvent,
 } from "@/common/types/stream";
-import type { TodoItem, StatusSetToolResult, BashToolResult } from "@/common/types/tools";
+import type { TodoItem, StatusSetToolResult } from "@/common/types/tools";
 
 import type { WorkspaceChatMessage, StreamErrorMessage, DeleteMessage } from "@/common/types/ipc";
 import { isInitStart, isInitOutput, isInitEnd, isMuxMessage } from "@/common/types/ipc";
@@ -208,7 +207,7 @@ export class StreamingMessageAggregator {
         return;
       }
     }
-    
+
     // Special handling for script execution messages to ensure correct type identification
     // If we receive a user message that has script metadata, we treat it as a script execution
     // This is redundant with getDisplayedMessages logic but good for consistency
@@ -735,14 +734,31 @@ export class StreamingMessageAggregator {
    */
   getDisplayedMessages(): DisplayedMessage[] {
     if (!this.cachedDisplayedMessages) {
-      let displayedMessages: DisplayedMessage[] = [];
+      const displayedMessages: DisplayedMessage[] = [];
 
       for (const message of this.getAllMessages()) {
         const baseTimestamp = message.metadata?.timestamp;
         // Get historySequence from backend (required field)
         const historySequence = message.metadata?.historySequence ?? 0;
 
-        if (message.role === "user") {
+        if (
+          message.metadata?.muxMetadata?.type === "script-execution" &&
+          (message.role as string) === "user"
+        ) {
+          // Script Execution Message
+          // Type assertion: we know the metadata shape from the check above
+          const scriptMeta = message.metadata.muxMetadata;
+          displayedMessages.push({
+            type: "script-execution",
+            id: message.id,
+            historySequence,
+            timestamp: baseTimestamp ?? message.metadata.timestamp ?? Date.now(),
+            command: scriptMeta.command,
+            scriptName: scriptMeta.scriptName,
+            args: scriptMeta.args,
+            result: scriptMeta.result,
+          });
+        } else if (message.role === "user") {
           // User messages: combine all text parts into single block, extract images
           const content = message.parts
             .filter((p) => p.type === "text")
@@ -780,23 +796,6 @@ export class StreamingMessageAggregator {
             timestamp: baseTimestamp,
             compactionRequest,
           });
-        } else if (
-          message.metadata?.muxMetadata?.type === "script-execution" &&
-          (message.role as string) === "user"
-        ) {
-            // Script Execution Message
-            // Type assertion: we know the metadata shape from the check above
-            const scriptMeta = message.metadata.muxMetadata as Extract<MuxFrontendMetadata, { type: "script-execution" }>;
-            displayedMessages.push({
-            type: "script-execution",
-            id: message.id,
-            historySequence,
-            timestamp: baseTimestamp ?? message.metadata.timestamp ?? Date.now(),
-            command: scriptMeta.command,
-            scriptName: scriptMeta.scriptName,
-            args: scriptMeta.args,
-            result: scriptMeta.result,
-          });
         } else if (message.role === "assistant") {
           // Assistant messages: each part becomes a separate DisplayedMessage
           // Use streamSequence to order parts within this message
@@ -947,7 +946,6 @@ export class StreamingMessageAggregator {
         displayedMessages.unshift(initMessage);
       }
 
-
       // Limit to last N messages for DOM performance
       // Full history is still maintained internally for token counting
       if (displayedMessages.length > MAX_DISPLAYED_MESSAGES) {

src/browser/utils/messages/modelMessageTransform.ts

@@ -216,7 +216,7 @@ export function transformScriptMessagesForLLM(messages: MuxMessage[]): MuxMessag
 
     const scriptMeta = msg.metadata.muxMetadata;
     const exitCode = scriptMeta.result.exitCode;
-    const output = scriptMeta.result.output || "(no output)";
+    const output = scriptMeta.result.output ?? "(no output)";
 
     // Construct a concise representation for the LLM
     const llmContent = `Script '${scriptMeta.scriptName}' executed (exit code ${exitCode}).\nStdout/Stderr:\n${output}`;

src/node/services/historyService.test.ts

@@ -2,7 +2,6 @@ import { describe, it, expect, beforeEach, afterEach } from "bun:test";
 import { HistoryService } from "./historyService";
 import { Config } from "@/node/config";
 import { createMuxMessage } from "@/common/types/message";
-import type { MuxFrontendMetadata } from "@/common/types/message";
 import * as fs from "fs/promises";
 import * as path from "path";
 import * as os from "os";

src/node/services/partialService.test.ts

@@ -3,7 +3,7 @@ import { describe, test, expect, beforeEach, afterEach, mock } from "bun:test";
 import { PartialService } from "./partialService";
 import type { HistoryService } from "./historyService";
 import { Config } from "@/node/config";
-import { createMuxMessage, type MuxMessage, type MuxFrontendMetadata } from "@/common/types/message";
+import { createMuxMessage, type MuxMessage } from "@/common/types/message";
 import { Ok } from "@/common/types/result";
 import * as fs from "fs/promises";
 import * as path from "path";