wave-code 0.6.5 → 0.7.1

package/src/components/MessageBlockItem.tsx

@@ -0,0 +1,83 @@
+import React from "react";
+import { Box, Text } from "ink";
+import type { Message, MessageBlock } from "wave-agent-sdk";
+import { MessageSource } from "wave-agent-sdk";
+import { CommandOutputDisplay } from "./CommandOutputDisplay.js";
+import { ToolDisplay } from "./ToolDisplay.js";
+import { CompressDisplay } from "./CompressDisplay.js";
+import { ReasoningDisplay } from "./ReasoningDisplay.js";
+import { Markdown } from "./Markdown.js";
+
+export interface MessageBlockItemProps {
+  block: MessageBlock;
+  message: Message;
+  isExpanded: boolean;
+  paddingTop?: number;
+}
+
+export const MessageBlockItem = ({
+  block,
+  message,
+  isExpanded,
+  paddingTop = 0,
+}: MessageBlockItemProps) => {
+  return (
+    <Box flexDirection="column" paddingTop={paddingTop}>
+      {block.type === "text" && block.content.trim() && (
+        <Box>
+          {block.customCommandContent && (
+            <Text color="cyan" bold>
+              ${" "}
+            </Text>
+          )}
+          {block.source === MessageSource.HOOK && (
+            <Text color="magenta" bold>
+              ~{" "}
+            </Text>
+          )}
+          {message.role === "user" ? (
+            <Text backgroundColor="gray" color="white">
+              {block.content}
+            </Text>
+          ) : (
+            <Markdown>{block.content}</Markdown>
+          )}
+        </Box>
+      )}
+
+      {block.type === "error" && (
+        <Box>
+          <Text color="red">Error: {block.content}</Text>
+        </Box>
+      )}
+
+      {block.type === "command_output" && (
+        <CommandOutputDisplay block={block} isExpanded={isExpanded} />
+      )}
+
+      {block.type === "tool" && (
+        <ToolDisplay block={block} isExpanded={isExpanded} />
+      )}
+
+      {block.type === "image" && (
+        <Box>
+          <Text color="magenta" bold>
+            # Image
+          </Text>
+          {block.imageUrls && block.imageUrls.length > 0 && (
+            <Text color="gray" dimColor>
+              {" "}
+              ({block.imageUrls.length})
+            </Text>
+          )}
+        </Box>
+      )}
+
+      {block.type === "compress" && (
+        <CompressDisplay block={block} isExpanded={isExpanded} />
+      )}
+
+      {block.type === "reasoning" && <ReasoningDisplay block={block} />}
+    </Box>
+  );
+};

package/src/components/MessageList.tsx

@@ -1,23 +1,19 @@
 import React from "react";
 import { Box, Text, Static } from "ink";
 import type { Message } from "wave-agent-sdk";
-import { MessageItem } from "./MessageItem.js";
+import { MessageBlockItem } from "./MessageBlockItem.js";
 
 export interface MessageListProps {
   messages: Message[];
-  isLoading?: boolean;
-  isCommandRunning?: boolean;
   isExpanded?: boolean;
-  forceStaticLastMessage?: boolean;
+  hideDynamicBlocks?: boolean;
 }
 
 export const MessageList = React.memo(
   ({
     messages,
-    isLoading = false,
-    isCommandRunning = false,
     isExpanded = false,
-    forceStaticLastMessage = false,
+    hideDynamicBlocks = false,
   }: MessageListProps) => {
     // Empty message state
     if (messages.length === 0) {
@@ -38,59 +34,66 @@ export const MessageList = React.memo(
       ? messages.slice(-maxExpandedMessages)
       : messages;
 
-    // Compute which messages to render statically vs dynamically
-    const lastMessage = displayMessages[displayMessages.length - 1];
-    const hasNonEndTool = lastMessage?.blocks.some(
-      (block) => block.type === "tool" && block.stage !== "end",
-    );
-    const hasRunningCommand = lastMessage?.blocks.some(
-      (block) => block.type === "command_output" && block.isRunning,
-    );
-    const shouldRenderLastDynamic =
-      !forceStaticLastMessage &&
-      (isLoading || isCommandRunning || hasNonEndTool || hasRunningCommand);
-    const staticMessages = shouldRenderLastDynamic
-      ? displayMessages.slice(0, -1)
-      : displayMessages;
-    const dynamicMessages =
-      shouldRenderLastDynamic && displayMessages.length > 0
-        ? [displayMessages[displayMessages.length - 1]]
-        : [];
+    // Flatten messages into blocks with metadata
+    const allBlocks = displayMessages.flatMap((message, index) => {
+      const messageIndex = shouldLimitMessages
+        ? messages.length - maxExpandedMessages + index
+        : index;
+      return message.blocks.map((block, blockIndex) => ({
+        block,
+        message,
+        isLastMessage: messageIndex === messages.length - 1,
+        // Unique key for each block to help Static component
+        key: `${message.id || messageIndex}-${blockIndex}`,
+      }));
+    });
+
+    // Determine which blocks are static vs dynamic
+    const blocksWithStatus = allBlocks.map((item) => {
+      const { block, isLastMessage } = item;
+      const isDynamic =
+        isLastMessage &&
+        ((block.type === "tool" && block.stage !== "end") ||
+          (block.type === "command_output" && block.isRunning));
+      return { ...item, isDynamic };
+    });
+
+    const staticBlocks = blocksWithStatus.filter((b) => !b.isDynamic);
+    const dynamicBlocks = hideDynamicBlocks
+      ? []
+      : blocksWithStatus.filter((b) => b.isDynamic);
 
     return (
       <Box flexDirection="column" paddingBottom={1}>
-        {/* Static messages */}
-        <Static items={staticMessages}>
-          {(message, key) => {
-            // Get previous message
-            const previousMessage =
-              key > 0 ? staticMessages[key - 1] : undefined;
-            return (
-              <MessageItem
-                key={key}
-                message={message}
-                shouldShowHeader={previousMessage?.role !== message.role}
+        {/* Static blocks */}
+        {staticBlocks.length > 0 && (
+          <Static items={staticBlocks}>
+            {(item) => (
+              <MessageBlockItem
+                key={item.key}
+                block={item.block}
+                message={item.message}
                 isExpanded={isExpanded}
+                paddingTop={1}
               />
-            );
-          }}
-        </Static>
+            )}
+          </Static>
+        )}
 
-        {/* Dynamic messages */}
-        {dynamicMessages.map((message, index) => {
-          const messageIndex = staticMessages.length + index;
-          const previousMessage =
-            messageIndex > 0 ? displayMessages[messageIndex - 1] : undefined;
-          return (
-            <Box key={`dynamic-${index}`}>
-              <MessageItem
-                message={message}
-                shouldShowHeader={previousMessage?.role !== message.role}
+        {/* Dynamic blocks */}
+        {dynamicBlocks.length > 0 && (
+          <Box flexDirection="column">
+            {dynamicBlocks.map((item) => (
+              <MessageBlockItem
+                key={item.key}
+                block={item.block}
+                message={item.message}
                 isExpanded={isExpanded}
+                paddingTop={1}
               />
-            </Box>
-          );
-        })}
+            ))}
+          </Box>
+        )}
       </Box>
     );
   },

package/src/components/PluginDetail.tsx

@@ -36,42 +36,41 @@ export const PluginDetail: React.FC = () => {
       );
       actions.setView(isFromDiscover ? "DISCOVER" : "INSTALLED");
     } else if (key.upArrow) {
-      if (isInstalledAndEnabled) {
-        setSelectedActionIndex((prev) =>
-          prev > 0 ? prev - 1 : INSTALLED_ACTIONS.length - 1,
-        );
-      } else {
-        setSelectedScopeIndex((prev) =>
-          prev > 0 ? prev - 1 : SCOPES.length - 1,
-        );
-      }
+      setSelectedActionIndex((prev) =>
+        prev > 0 ? prev - 1 : INSTALLED_ACTIONS.length - 1,
+      );
+      setSelectedScopeIndex((prev) =>
+        prev > 0 ? prev - 1 : SCOPES.length - 1,
+      );
     } else if (key.downArrow) {
-      if (isInstalledAndEnabled) {
-        setSelectedActionIndex((prev) =>
-          prev < INSTALLED_ACTIONS.length - 1 ? prev + 1 : 0,
-        );
-      } else {
-        setSelectedScopeIndex((prev) =>
-          prev < SCOPES.length - 1 ? prev + 1 : 0,
-        );
-      }
+      setSelectedActionIndex((prev) =>
+        prev < INSTALLED_ACTIONS.length - 1 ? prev + 1 : 0,
+      );
+      setSelectedScopeIndex((prev) =>
+        prev < SCOPES.length - 1 ? prev + 1 : 0,
+      );
     } else if (key.return && plugin) {
       if (isInstalledAndEnabled) {
-        const action = INSTALLED_ACTIONS[selectedActionIndex].id;
-        if (action === "uninstall") {
-          actions.uninstallPlugin(plugin.name, plugin.marketplace);
-        } else {
-          actions.updatePlugin(plugin.name, plugin.marketplace);
-        }
-        actions.setView("INSTALLED");
+        setSelectedActionIndex((prev) => {
+          const action = INSTALLED_ACTIONS[prev].id;
+          if (action === "uninstall") {
+            actions.uninstallPlugin(plugin.name, plugin.marketplace);
+          } else {
+            actions.updatePlugin(plugin.name, plugin.marketplace);
+          }
+          return prev;
+        });
       } else {
-        actions.installPlugin(
-          plugin.name,
-          plugin.marketplace,
-          SCOPES[selectedScopeIndex].id,
-        );
-        actions.setView("INSTALLED");
+        setSelectedScopeIndex((prev) => {
+          actions.installPlugin(
+            plugin.name,
+            plugin.marketplace,
+            SCOPES[prev].id,
+          );
+          return prev;
+        });
       }
+      actions.setView("INSTALLED");
     }
   });
 

package/src/components/SessionSelector.tsx

@@ -17,9 +17,12 @@ export const SessionSelector: React.FC<SessionSelectorProps> = ({
 
   useInput((input, key) => {
     if (key.return) {
-      if (sessions.length > 0 && selectedIndex < sessions.length) {
-        onSelect(sessions[selectedIndex].id);
-      }
+      setSelectedIndex((prev) => {
+        if (sessions.length > 0 && prev < sessions.length) {
+          onSelect(sessions[prev].id);
+        }
+        return prev;
+      });
       return;
     }
 
@@ -29,12 +32,12 @@ export const SessionSelector: React.FC<SessionSelectorProps> = ({
     }
 
     if (key.upArrow) {
-      setSelectedIndex(Math.max(0, selectedIndex - 1));
+      setSelectedIndex((prev) => Math.max(0, prev - 1));
       return;
     }
 
     if (key.downArrow) {
-      setSelectedIndex(Math.min(sessions.length - 1, selectedIndex + 1));
+      setSelectedIndex((prev) => Math.min(sessions.length - 1, prev + 1));
       return;
     }
   });

package/src/components/TaskList.tsx

@@ -11,10 +11,7 @@ export const TaskList: React.FC = () => {
     return null;
   }
 
-  const getStatusIcon = (status: string, isBlocked: boolean) => {
-    if (isBlocked) {
-      return <Text color="red">🔒</Text>;
-    }
+  const getStatusIcon = (status: string) => {
     switch (status) {
       case "pending":
         return <Text color="gray">□</Text>;
@@ -48,7 +45,7 @@ export const TaskList: React.FC = () => {
 
         return (
           <Box key={task.id} gap={1}>
-            {getStatusIcon(task.status, isBlocked)}
+            {getStatusIcon(task.status)}
             <Text dimColor={isDimmed}>{fullText}</Text>
           </Box>
         );

package/src/components/ToolDisplay.tsx

@@ -131,7 +131,11 @@ export const ToolDisplay: React.FC<ToolDisplayProps> = ({
 
       {/* Diff display - only show after tool execution completes and was successful */}
       {stage === "end" && success && (
-        <DiffDisplay toolName={name} parameters={parameters} />
+        <DiffDisplay
+          toolName={name}
+          parameters={parameters}
+          startLineNumber={block.startLineNumber}
+        />
       )}
     </Box>
   );

package/src/contexts/useChat.tsx

@@ -108,12 +108,14 @@ export interface ChatProviderProps {
   children: React.ReactNode;
   bypassPermissions?: boolean;
   pluginDirs?: string[];
+  tools?: string[];
 }
 
 export const ChatProvider: React.FC<ChatProviderProps> = ({
   children,
   bypassPermissions,
   pluginDirs,
+  tools,
 }) => {
   const { restoreSessionId, continueLastSession } = useAppConfig();
 
@@ -129,6 +131,8 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
 
   // AI State
   const [messages, setMessages] = useState<Message[]>([]);
+  const messagesUpdateTimerRef = useRef<NodeJS.Timeout | null>(null);
+
   const [isLoading, setIsLoading] = useState(false);
   const [latestTotalTokens, setlatestTotalTokens] = useState(0);
   const [sessionId, setSessionId] = useState("");
@@ -225,9 +229,16 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
   useEffect(() => {
     const initializeAgent = async () => {
       const callbacks: AgentCallbacks = {
-        onMessagesChange: (newMessages) => {
+        onMessagesChange: () => {
           if (!isExpandedRef.current) {
-            setMessages([...newMessages]);
+            if (!messagesUpdateTimerRef.current) {
+              messagesUpdateTimerRef.current = setTimeout(() => {
+                if (agentRef.current) {
+                  setMessages([...agentRef.current.messages]);
+                }
+                messagesUpdateTimerRef.current = null;
+              }, 50);
+            }
           }
         },
         onServersChange: (servers) => {
@@ -304,6 +315,7 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
           canUseTool: permissionCallback,
           stream: false, // 关闭流式模式
           plugins: pluginDirs?.map((path) => ({ type: "local", path })),
+          tools,
         });
 
         agentRef.current = agent;
@@ -336,11 +348,15 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
     bypassPermissions,
     showConfirmation,
     pluginDirs,
+    tools,
   ]);
 
   // Cleanup on unmount
   useEffect(() => {
     return () => {
+      if (messagesUpdateTimerRef.current) {
+        clearTimeout(messagesUpdateTimerRef.current);
+      }
       if (agentRef.current) {
         try {
           // Display usage summary before cleanup
@@ -526,6 +542,10 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
       setIsExpanded((prev) => {
         const newExpanded = !prev;
         if (newExpanded) {
+          if (messagesUpdateTimerRef.current) {
+            clearTimeout(messagesUpdateTimerRef.current);
+            messagesUpdateTimerRef.current = null;
+          }
           // Transitioning to EXPANDED: Freeze the current view
           // Deep copy the last message to ensure it doesn't update if the agent is still writing to it
           setMessages((currentMessages) => {

package/src/hooks/usePluginManager.ts

@@ -1,9 +1,6 @@
 import { useState, useCallback, useEffect, useMemo } from "react";
 import {
-  MarketplaceService,
-  PluginScopeManager,
-  ConfigurationService,
-  PluginManager,
+  PluginCore,
   KnownMarketplace,
   InstalledPlugin,
   MarketplacePluginEntry,
@@ -35,25 +32,7 @@ export function usePluginManager(): PluginManagerContextType {
     })[]
   >([]);
 
-  const marketplaceService = useMemo(() => new MarketplaceService(), []);
-  const configurationService = useMemo(() => new ConfigurationService(), []);
-  const pluginManager = useMemo(
-    () =>
-      new PluginManager({
-        workdir: process.cwd(),
-        configurationService,
-      }),
-    [configurationService],
-  );
-  const pluginScopeManager = useMemo(
-    () =>
-      new PluginScopeManager({
-        workdir: process.cwd(),
-        configurationService,
-        pluginManager,
-      }),
-    [configurationService, pluginManager],
-  );
+  const pluginCore = useMemo(() => new PluginCore(), []);
 
   const refresh = useCallback(async () => {
     setState((prev: PluginManagerState) => ({
@@ -63,9 +42,9 @@ export function usePluginManager(): PluginManagerContextType {
     }));
     try {
       const [mks, installed, enabledMap] = await Promise.all([
-        marketplaceService.listMarketplaces(),
-        marketplaceService.getInstalledPlugins(),
-        Promise.resolve(pluginScopeManager.getMergedEnabledPlugins()),
+        pluginCore.listMarketplaces(),
+        pluginCore.getInstalledPlugins(),
+        Promise.resolve(pluginCore.getMergedEnabledPlugins()),
       ]);
 
       setMarketplaces(mks);
@@ -74,7 +53,7 @@ export function usePluginManager(): PluginManagerContextType {
         return {
           ...p,
           enabled: !!enabledMap[pluginId],
-          scope: pluginScopeManager.findPluginScope(pluginId) || undefined,
+          scope: pluginCore.findPluginScope(pluginId) || undefined,
         };
       });
 
@@ -88,8 +67,8 @@ export function usePluginManager(): PluginManagerContextType {
       })[] = [];
       for (const mk of mks) {
         try {
-          const manifest = await marketplaceService.loadMarketplaceManifest(
-            marketplaceService.getMarketplacePath(mk),
+          const manifest = await pluginCore.loadMarketplaceManifest(
+            pluginCore.getMarketplacePath(mk),
           );
           manifest.plugins.forEach((p) => {
             const pluginId = `${p.name}@${mk.name}`;
@@ -120,7 +99,7 @@ export function usePluginManager(): PluginManagerContextType {
         error: error instanceof Error ? error.message : String(error),
       }));
     }
-  }, [marketplaceService, pluginScopeManager]);
+  }, [pluginCore]);
 
   useEffect(() => {
     refresh();
@@ -142,7 +121,7 @@ export function usePluginManager(): PluginManagerContextType {
         error: null,
       }));
       try {
-        await marketplaceService.addMarketplace(source);
+        await pluginCore.addMarketplace(source);
         await refresh();
       } catch (error) {
         setState((prev: PluginManagerState) => ({
@@ -152,7 +131,7 @@ export function usePluginManager(): PluginManagerContextType {
         }));
       }
     },
-    [marketplaceService, refresh],
+    [pluginCore, refresh],
   );
 
   const removeMarketplace = useCallback(
@@ -163,7 +142,7 @@ export function usePluginManager(): PluginManagerContextType {
         error: null,
       }));
       try {
-        await marketplaceService.removeMarketplace(name);
+        await pluginCore.removeMarketplace(name);
         await refresh();
       } catch (error) {
         setState((prev: PluginManagerState) => ({
@@ -173,7 +152,7 @@ export function usePluginManager(): PluginManagerContextType {
         }));
       }
     },
-    [marketplaceService, refresh],
+    [pluginCore, refresh],
   );
 
   const updateMarketplace = useCallback(
@@ -184,7 +163,7 @@ export function usePluginManager(): PluginManagerContextType {
         error: null,
       }));
       try {
-        await marketplaceService.updateMarketplace(name);
+        await pluginCore.updateMarketplace(name);
         await refresh();
       } catch (error) {
         setState((prev: PluginManagerState) => ({
@@ -194,7 +173,7 @@ export function usePluginManager(): PluginManagerContextType {
         }));
       }
     },
-    [marketplaceService, refresh],
+    [pluginCore, refresh],
   );
 
   const installPlugin = useCallback(
@@ -210,9 +189,7 @@ export function usePluginManager(): PluginManagerContextType {
       }));
       try {
         const pluginId = `${name}@${marketplace}`;
-        const workdir = process.cwd();
-        await marketplaceService.installPlugin(pluginId, workdir);
-        await pluginScopeManager.enablePlugin(scope, pluginId);
+        await pluginCore.installPlugin(pluginId, scope);
         await refresh();
       } catch (error) {
         setState((prev: PluginManagerState) => ({
@@ -222,7 +199,7 @@ export function usePluginManager(): PluginManagerContextType {
         }));
       }
     },
-    [marketplaceService, pluginScopeManager, refresh],
+    [pluginCore, refresh],
   );
 
   const uninstallPlugin = useCallback(
@@ -234,20 +211,7 @@ export function usePluginManager(): PluginManagerContextType {
       }));
       try {
         const pluginId = `${name}@${marketplace}`;
-        const workdir = process.cwd();
-
-        // 1. Remove from global registry and potentially clean up cache
-        await marketplaceService.uninstallPlugin(pluginId, workdir);
-
-        // 2. Find the scope where it's currently enabled and remove it from there
-        const scope = pluginScopeManager.findPluginScope(pluginId);
-        if (scope) {
-          await configurationService.removeEnabledPlugin(
-            workdir,
-            scope,
-            pluginId,
-          );
-        }
+        await pluginCore.uninstallPlugin(pluginId);
         await refresh();
       } catch (error) {
         setState((prev: PluginManagerState) => ({
@@ -257,7 +221,7 @@ export function usePluginManager(): PluginManagerContextType {
         }));
       }
     },
-    [configurationService, marketplaceService, pluginScopeManager, refresh],
+    [pluginCore, refresh],
   );
 
   const updatePlugin = useCallback(
@@ -269,7 +233,7 @@ export function usePluginManager(): PluginManagerContextType {
       }));
       try {
         const pluginId = `${name}@${marketplace}`;
-        await marketplaceService.updatePlugin(pluginId);
+        await pluginCore.updatePlugin(pluginId);
         await refresh();
       } catch (error) {
         setState((prev: PluginManagerState) => ({
@@ -279,7 +243,7 @@ export function usePluginManager(): PluginManagerContextType {
         }));
       }
     },
-    [marketplaceService, refresh],
+    [pluginCore, refresh],
   );
 
   return {