wave-code 0.10.4 → 0.11.1

package/src/contexts/useChat.tsx

@@ -25,6 +25,7 @@ import {
 } from "wave-agent-sdk";
 import { logger } from "../utils/logger.js";
 import { displayUsageSummary } from "../utils/usageSummary.js";
+import { expandLongTextPlaceholders } from "../managers/inputHandlers.js";
 
 import { BaseAppProps } from "../types.js";
 
@@ -41,16 +42,17 @@ export interface ChatContextType {
   queuedMessages: Array<{
     content: string;
     images?: Array<{ path: string; mimeType: string }>;
+    longTextMap?: Record<string, string>;
   }>;
   // AI functionality
   sessionId: string;
   sendMessage: (
     content: string,
     images?: Array<{ path: string; mimeType: string }>,
+    longTextMap?: Record<string, string>,
   ) => Promise<void>;
   abortMessage: () => void;
   latestTotalTokens: number;
-  clearMessages: () => void;
   // MCP functionality
   mcpServers: McpServerStatus[];
   connectMcpServer: (serverName: string) => Promise<boolean>;
@@ -59,9 +61,12 @@ export interface ChatContextType {
   backgroundTasks: BackgroundTask[];
   // Tasks
   tasks: Task[];
-  getBackgroundTaskOutput: (
-    taskId: string,
-  ) => { stdout: string; stderr: string; status: string } | null;
+  getBackgroundTaskOutput: (taskId: string) => {
+    stdout: string;
+    stderr: string;
+    status: string;
+    outputPath?: string;
+  } | null;
   stopBackgroundTask: (taskId: string) => boolean;
   // Slash Command functionality
   slashCommands: SlashCommand[];
@@ -128,6 +133,8 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
   permissionMode: initialPermissionMode,
   pluginDirs,
   tools,
+  allowedTools,
+  disallowedTools,
   workdir,
   worktreeSession,
   version,
@@ -149,6 +156,7 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
     Array<{
       content: string;
       images?: Array<{ path: string; mimeType: string }>;
+      longTextMap?: Record<string, string>;
     }>
   >([]);
 
@@ -349,6 +357,8 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
           stream: false, // 关闭流式模式
           plugins: pluginDirs?.map((path) => ({ type: "local", path })),
           tools,
+          allowedTools,
+          disallowedTools,
           workdir,
           worktreeName: worktreeSession?.name,
           isNewWorktree: worktreeSession?.isNew,
@@ -387,6 +397,8 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
     showConfirmation,
     pluginDirs,
     tools,
+    allowedTools,
+    disallowedTools,
     workdir,
     worktreeSession,
     model,
@@ -421,6 +433,7 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
     async (
       content: string,
       images?: Array<{ path: string; mimeType: string }>,
+      longTextMap?: Record<string, string>,
     ) => {
       // Check if there's content to send (text content or image attachments)
       const hasTextContent = content.trim();
@@ -429,40 +442,41 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
       if (!hasTextContent && !hasImageAttachments) return;
 
       if (isLoading || isCommandRunning) {
-        setQueuedMessages((prev) => [...prev, { content, images }]);
+        setQueuedMessages((prev) => [
+          ...prev,
+          { content, images, longTextMap },
+        ]);
         return;
       }
 
       try {
-        // Handle bash mode - check if it's a bash command (starts with ! and only one line)
-        if (content.startsWith("!") && !content.includes("\n")) {
-          const command = content.substring(1).trim();
-          if (!command) return;
-
-          // In bash mode, don't add user message to UI, directly execute command
-          // Executing bash command will automatically add assistant message
-
-          // Set command running state
-          setIsCommandRunning(true);
+        const expandedContent = longTextMap
+          ? expandLongTextPlaceholders(content, longTextMap)
+          : content;
 
-          try {
-            await agentRef.current?.executeBashCommand(command);
-          } finally {
-            // Clear command running state
-            setIsCommandRunning(false);
+        // Handle bash mode - check if it's a bash command (starts with ! and only one line)
+        if (
+          expandedContent.startsWith("!") &&
+          !expandedContent.includes("\n") &&
+          !hasImageAttachments
+        ) {
+          const command = expandedContent.substring(1).trim();
+          if (command) {
+            setIsCommandRunning(true);
+            try {
+              await agentRef.current?.executeBashCommand(command);
+            } finally {
+              setIsCommandRunning(false);
+            }
+            return;
           }
-
-          return;
         }
 
-        // Handle normal AI message and slash commands
-        // Slash commands are now handled internally in agent.sendMessage
-
         // Set loading state
         setIsLoading(true);
 
         try {
-          await agentRef.current?.sendMessage(content, images);
+          await agentRef.current?.sendMessage(expandedContent, images);
         } finally {
           // Clear loading state
           setIsLoading(false);
@@ -480,7 +494,11 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
     if (!isLoading && !isCommandRunning && queuedMessages.length > 0) {
       const nextMessage = queuedMessages[0];
       setQueuedMessages((prev) => prev.slice(1));
-      sendMessage(nextMessage.content, nextMessage.images);
+      sendMessage(
+        nextMessage.content,
+        nextMessage.images,
+        nextMessage.longTextMap,
+      );
     }
   }, [isLoading, isCommandRunning, queuedMessages, sendMessage]);
 
@@ -490,11 +508,6 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
     agentRef.current?.abortMessage();
   }, []);
 
-  const clearMessages = useCallback(() => {
-    setQueuedMessages([]);
-    agentRef.current?.clearMessages();
-  }, []);
-
   // Permission management methods
   const setPermissionMode = useCallback((mode: PermissionMode) => {
     setPermissionModeState((prev) => {
@@ -643,8 +656,10 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
     }
 
     // Handle ESC key to cancel confirmation
-    if (key.escape && isConfirmationVisible) {
-      handleConfirmationCancel();
+    if (key.escape) {
+      if (isConfirmationVisible) {
+        handleConfirmationCancel();
+      }
     }
   });
 
@@ -659,7 +674,6 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
     sessionId,
     sendMessage,
     abortMessage,
-    clearMessages,
     latestTotalTokens,
     isCompressing,
     mcpServers,

package/src/hooks/useInputManager.ts

@@ -70,7 +70,10 @@ export const useInputManager = (
           /\r/g,
           "\n",
         );
-        dispatch({ type: "COMPRESS_AND_INSERT_TEXT", payload: processedInput });
+        dispatch({
+          type: "INSERT_TEXT_WITH_PLACEHOLDER",
+          payload: processedInput,
+        });
         dispatch({ type: "END_PASTE" });
         dispatch({ type: "RESET_HISTORY_NAVIGATION" });
       }, pasteDebounceDelay);

package/src/index.ts

@@ -77,6 +77,18 @@ export async function main() {
         type: "string",
         global: false,
       })
+      .option("allowed-tools", {
+        description:
+          "Specify a comma-separated list of tools to always allow (e.g., 'Bash(ls),Read')",
+        type: "string",
+        global: false,
+      })
+      .option("disallowed-tools", {
+        description:
+          "Specify a comma-separated list of tools to always disallow (e.g., 'Bash(rm *),Write')",
+        type: "string",
+        global: false,
+      })
       .option("model", {
         description: "Specify the AI model to use",
         type: "string",
@@ -234,10 +246,34 @@ export async function main() {
     const parseTools = (tools: string | undefined): string[] | undefined => {
       if (tools === undefined || tools === "default") return undefined;
       if (tools === "") return [];
-      return tools.split(",").map((t) => t.trim());
+
+      // Improved parsing to handle commas inside parentheses
+      const result: string[] = [];
+      let current = "";
+      let depth = 0;
+      for (let i = 0; i < tools.length; i++) {
+        const char = tools[i];
+        if (char === "(") depth++;
+        else if (char === ")") depth--;
+
+        if (char === "," && depth === 0) {
+          result.push(current.trim());
+          current = "";
+        } else {
+          current += char;
+        }
+      }
+      if (current.trim()) {
+        result.push(current.trim());
+      }
+      return result;
     };
 
     const tools = parseTools(argv.tools as string | undefined);
+    const allowedTools = parseTools(argv.allowedTools as string | undefined);
+    const disallowedTools = parseTools(
+      argv.disallowedTools as string | undefined,
+    );
 
     // Resolve plugin directories to absolute paths before any worktree logic
     const pluginDirs = (argv.pluginDir as string[] | undefined)?.map((dir) =>
@@ -290,6 +326,8 @@ export async function main() {
         permissionMode: argv.permissionMode as PermissionMode | undefined,
         pluginDirs,
         tools,
+        allowedTools,
+        disallowedTools,
         worktreeSession,
         workdir,
         version,
@@ -311,6 +349,8 @@ export async function main() {
         permissionMode: argv.permissionMode as PermissionMode | undefined,
         pluginDirs,
         tools,
+        allowedTools,
+        disallowedTools,
         worktreeSession,
         workdir,
         version,
@@ -325,6 +365,8 @@ export async function main() {
       permissionMode: argv.permissionMode as PermissionMode | undefined,
       pluginDirs,
       tools,
+      allowedTools,
+      disallowedTools,
       worktreeSession,
       workdir,
       version,

package/src/managers/inputHandlers.ts

@@ -54,10 +54,6 @@ export const handleSubmit = async (
     const contentWithPlaceholders = state.inputText
       .replace(imageRegex, "")
       .trim();
-    const cleanContent = expandLongTextPlaceholders(
-      contentWithPlaceholders,
-      state.longTextMap,
-    );
 
     PromptHistoryManager.addEntry(
       contentWithPlaceholders,
@@ -69,8 +65,9 @@ export const handleSubmit = async (
     });
 
     callbacks.onSendMessage?.(
-      cleanContent,
+      contentWithPlaceholders,
       referencedImages.length > 0 ? referencedImages : undefined,
+      state.longTextMap,
     );
     dispatch({ type: "CLEAR_INPUT" });
     dispatch({ type: "RESET_HISTORY_NAVIGATION" });
@@ -322,7 +319,7 @@ export const handleCommandSelect = (
       if (callbacks.onSendMessage && callbacks.onHasSlashCommand?.(command)) {
         const fullCommand = `/${command}`;
         try {
-          await callbacks.onSendMessage(fullCommand);
+          await callbacks.onSendMessage(fullCommand, undefined, {});
           commandExecuted = true;
         } catch (error) {
           console.error("Failed to execute slash command:", error);
@@ -330,10 +327,11 @@ export const handleCommandSelect = (
       }
 
       if (!commandExecuted) {
-        if (command === "clear") {
-          callbacks.onClearMessages?.();
-        } else if (command === "tasks") {
-          dispatch({ type: "SET_SHOW_BACKGROUND_TASK_MANAGER", payload: true });
+        if (command === "tasks") {
+          dispatch({
+            type: "SET_SHOW_BACKGROUND_TASK_MANAGER",
+            payload: true,
+          });
         } else if (command === "mcp") {
           dispatch({ type: "SET_SHOW_MCP_MANAGER", payload: true });
         } else if (command === "rewind") {

package/src/managers/inputReducer.ts

@@ -37,10 +37,10 @@ export interface InputManagerCallbacks {
   onSendMessage?: (
     content: string,
     images?: Array<{ path: string; mimeType: string }>,
+    longTextMap?: Record<string, string>,
   ) => void | Promise<void>;
   onHasSlashCommand?: (commandId: string) => boolean;
   onAbortMessage?: () => void;
-  onClearMessages?: () => void;
   onBackgroundCurrentTask?: () => void;
   onPermissionModeChange?: (mode: PermissionMode) => void;
   sessionId?: string;
@@ -147,7 +147,7 @@ export type InputAction =
   | { type: "SET_SHOW_PLUGIN_MANAGER"; payload: boolean }
   | { type: "SET_PERMISSION_MODE"; payload: PermissionMode }
   | { type: "SET_SELECTOR_JUST_USED"; payload: boolean }
-  | { type: "COMPRESS_AND_INSERT_TEXT"; payload: string }
+  | { type: "INSERT_TEXT_WITH_PLACEHOLDER"; payload: string }
   | { type: "CLEAR_LONG_TEXT_MAP" }
   | { type: "CLEAR_INPUT" }
   | { type: "START_PASTE"; payload: { buffer: string; cursorPosition: number } }
@@ -342,16 +342,16 @@ export function inputReducer(
       return { ...state, permissionMode: action.payload };
     case "SET_SELECTOR_JUST_USED":
       return { ...state, selectorJustUsed: action.payload };
-    case "COMPRESS_AND_INSERT_TEXT": {
+    case "INSERT_TEXT_WITH_PLACEHOLDER": {
       let textToInsert = action.payload;
       let newLongTextCounter = state.longTextCounter;
       const newLongTextMap = { ...state.longTextMap };
 
       if (textToInsert.length > 200) {
         newLongTextCounter += 1;
-        const compressedLabel = `[LongText#${newLongTextCounter}]`;
-        newLongTextMap[compressedLabel] = textToInsert;
-        textToInsert = compressedLabel;
+        const placeholderLabel = `[LongText#${newLongTextCounter}]`;
+        newLongTextMap[placeholderLabel] = textToInsert;
+        textToInsert = placeholderLabel;
       }
 
       const beforeCursor = state.inputText.substring(0, state.cursorPosition);

package/src/print-cli.ts

@@ -41,13 +41,15 @@ export async function startPrintCli(options: PrintCliOptions): Promise<void> {
     permissionMode,
     pluginDirs,
     tools,
+    allowedTools,
+    disallowedTools,
     worktreeSession,
     workdir,
     model,
   } = options;
 
   if (
-    (!message || message.trim() === "") &&
+    (typeof message !== "string" || message.trim() === "") &&
     !continueLastSession &&
     !restoreSessionId
   ) {
@@ -149,13 +151,15 @@ export async function startPrintCli(options: PrintCliOptions): Promise<void> {
         permissionMode || (bypassPermissions ? "bypassPermissions" : undefined),
       plugins: pluginDirs?.map((path) => ({ type: "local", path })),
       tools,
+      allowedTools,
+      disallowedTools,
       workdir,
       model,
       // 保持流式模式以获得更好的命令行用户体验
     });
 
     // Send message if provided and not empty
-    if (message && message.trim() !== "") {
+    if (typeof message === "string" && message.trim() !== "") {
       await agent.sendMessage(message);
     }
 

package/src/types.ts

@@ -6,6 +6,8 @@ export interface BaseAppProps {
   permissionMode?: PermissionMode;
   pluginDirs?: string[];
   tools?: string[];
+  allowedTools?: string[];
+  disallowedTools?: string[];
   worktreeSession?: WorktreeSession;
   workdir?: string;
   version?: string;