wave-code 0.10.1 → 0.10.2

package/dist/acp/agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/acp/agent.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,KAAK,KAAK,IAAI,QAAQ,EACtB,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EACzB,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EAUzB,KAAK,qBAAqB,EAC1B,KAAK,6BAA6B,EAClC,KAAK,8BAA8B,EAEpC,MAAM,0BAA0B,CAAC;AAElC,qBAAa,YAAa,YAAW,QAAQ;IAC3C,OAAO,CAAC,MAAM,CAAqC;IACnD,OAAO,CAAC,UAAU,CAAsB;gBAE5B,UAAU,EAAE,mBAAmB;IAI3C,OAAO,CAAC,mBAAmB;IA4B3B,OAAO,CAAC,uBAAuB;YAkBjB,gBAAgB;IASxB,UAAU,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAoBzC,YAAY,IAAI,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;YAI5C,WAAW;IA8CnB,UAAU,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IA8BlE,WAAW,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IA4BrE,YAAY,CAChB,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,oBAAoB,CAAC;IAmB1B,qBAAqB,CACzB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAc7B,SAAS,CACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAO7B,cAAc,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAS5D,sBAAsB,CAC1B,MAAM,EAAE,6BAA6B,GACpC,OAAO,CAAC,8BAA8B,CAAC;IAgBpC,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC;IAiDtD,MAAM,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;YASzC,uBAAuB;YAsGvB,mBAAmB;IA2EjC,OAAO,CAAC,cAAc;IA4BtB,OAAO,CAAC,gBAAgB;IAgBxB,OAAO,CAAC,WAAW;IAmBnB,OAAO,CAAC,eAAe;CAsIxB"}
+{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/acp/agent.ts"],"names":[],"mappings":"AAeA,OAAO,EACL,KAAK,KAAK,IAAI,QAAQ,EACtB,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EACzB,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EAUzB,KAAK,qBAAqB,EAC1B,KAAK,6BAA6B,EAClC,KAAK,8BAA8B,EAEpC,MAAM,0BAA0B,CAAC;AAElC,qBAAa,YAAa,YAAW,QAAQ;IAC3C,OAAO,CAAC,MAAM,CAAqC;IACnD,OAAO,CAAC,UAAU,CAAsB;gBAE5B,UAAU,EAAE,mBAAmB;IAI3C,OAAO,CAAC,mBAAmB;IA4B3B,OAAO,CAAC,uBAAuB;YAkBjB,gBAAgB;IASxB,UAAU,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAoBzC,YAAY,IAAI,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;YAI5C,WAAW;IAiEnB,UAAU,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAalE,WAAW,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAWrE,YAAY,CAChB,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,oBAAoB,CAAC;IAuB1B,qBAAqB,CACzB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAc7B,SAAS,CACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAO7B,cAAc,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAS5D,sBAAsB,CAC1B,MAAM,EAAE,6BAA6B,GACpC,OAAO,CAAC,8BAA8B,CAAC;IAgBpC,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC;IAiDtD,MAAM,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;YASzC,uBAAuB;YAgHvB,mBAAmB;IA6EjC,OAAO,CAAC,cAAc;IAqCtB,OAAO,CAAC,gBAAgB;IAmCxB,OAAO,CAAC,WAAW;IAmBnB,OAAO,CAAC,eAAe;CAgMxB"}

package/dist/acp/agent.js

@@ -1,4 +1,4 @@
-import { Agent as WaveAgent, listSessions as listWaveSessions, deleteSession as deleteWaveSession, } from "wave-agent-sdk";
+import { Agent as WaveAgent, listSessions as listWaveSessions, listAllSessions as listAllWaveSessions, deleteSession as deleteWaveSession, truncateContent, } from "wave-agent-sdk";
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
 import { logger } from "../utils/logger.js";
@@ -86,6 +86,7 @@ export class WaveAcpAgent {
         const agent = await WaveAgent.create({
             workdir: cwd,
             restoreSessionId: sessionId,
+            stream: false,
             canUseTool: (context) => {
                 if (!agentRef.instance) {
                     throw new Error("Agent instance not yet initialized");
@@ -108,17 +109,11 @@ export class WaveAcpAgent {
         this.agents.set(actualSessionId, agent);
         // Update the callbacks object with the correct sessionId
         Object.assign(callbacks, this.createCallbacks(actualSessionId));
-        return agent;
-    }
-    async newSession(params) {
-        const { cwd } = params;
-        logger.info(`Creating new session in ${cwd}`);
-        const agent = await this.createAgent(undefined, cwd);
-        logger.info(`New session created with ID: ${agent.sessionId}`);
         // Send initial available commands after agent creation
+        // Use setImmediate to ensure the client receives the session response before the update
         setImmediate(() => {
             this.connection.sessionUpdate({
-                sessionId: agent.sessionId,
+                sessionId: actualSessionId,
                 update: {
                     sessionUpdate: "available_commands_update",
                     availableCommands: agent.getSlashCommands().map((cmd) => ({
@@ -131,6 +126,13 @@ export class WaveAcpAgent {
                 },
             });
         });
+        return agent;
+    }
+    async newSession(params) {
+        const { cwd } = params;
+        logger.info(`Creating new session in ${cwd}`);
+        const agent = await this.createAgent(undefined, cwd);
+        logger.info(`New session created with ID: ${agent.sessionId}`);
         return {
             sessionId: agent.sessionId,
             modes: this.getSessionModeState(agent),
@@ -141,22 +143,6 @@ export class WaveAcpAgent {
         const { sessionId, cwd } = params;
         logger.info(`Loading session: ${sessionId} in ${cwd}`);
         const agent = await this.createAgent(sessionId, cwd);
-        // Send initial available commands after agent creation
-        setImmediate(() => {
-            this.connection.sessionUpdate({
-                sessionId: agent.sessionId,
-                update: {
-                    sessionUpdate: "available_commands_update",
-                    availableCommands: agent.getSlashCommands().map((cmd) => ({
-                        name: cmd.name,
-                        description: cmd.description,
-                        input: {
-                            hint: "Enter arguments...",
-                        },
-                    })),
-                },
-            });
-        });
         return {
             modes: this.getSessionModeState(agent),
             configOptions: this.getSessionConfigOptions(agent),
@@ -165,16 +151,20 @@ export class WaveAcpAgent {
     async listSessions(params) {
         const { cwd } = params;
         logger.info(`listSessions called with params: ${JSON.stringify(params)}`);
+        let waveSessions;
         if (!cwd) {
-            logger.warn("listSessions called without cwd, returning empty list");
-            return { sessions: [] };
+            logger.info("listSessions called without cwd, listing all sessions");
+            waveSessions = await listAllWaveSessions();
+        }
+        else {
+            logger.info(`Listing sessions for ${cwd}`);
+            waveSessions = await listWaveSessions(cwd);
         }
-        logger.info(`Listing sessions for ${cwd}`);
-        const waveSessions = await listWaveSessions(cwd);
-        logger.info(`Found ${waveSessions.length} sessions for ${cwd}`);
+        logger.info(`Found ${waveSessions.length} sessions`);
         const sessions = waveSessions.map((meta) => ({
             sessionId: meta.id,
             cwd: meta.workdir,
+            title: meta.firstMessage ? truncateContent(meta.firstMessage) : undefined,
             updatedAt: meta.lastActiveAt.toISOString(),
         }));
         return { sessions };
@@ -272,6 +262,21 @@ export class WaveAcpAgent {
         const workdir = agent?.workingDirectory || process.cwd();
         const toolCallId = context.toolCallId ||
             "perm-" + Math.random().toString(36).substring(2, 9);
+        let effectiveName = context.toolName;
+        let effectiveCompactParams = undefined;
+        if (agent?.messages && context.toolCallId) {
+            const toolBlock = agent.messages
+                .flatMap((m) => m.blocks)
+                .find((b) => b.type === "tool" && b.id === context.toolCallId);
+            if (toolBlock) {
+                effectiveName = toolBlock.name || effectiveName;
+                effectiveCompactParams =
+                    toolBlock.compactParams || effectiveCompactParams;
+            }
+        }
+        const displayTitle = effectiveName && effectiveCompactParams
+            ? `${effectiveName}: ${effectiveCompactParams}`
+            : effectiveName || "Tool Call";
         const options = [
             {
                 optionId: "allow_once",
@@ -288,11 +293,6 @@ export class WaveAcpAgent {
                 name: "Reject Once",
                 kind: "reject_once",
             },
-            {
-                optionId: "reject_always",
-                name: "Reject Always",
-                kind: "reject_always",
-            },
         ];
         const content = context.toolName
             ? await this.getToolContentAsync(context.toolName, context.toolInput, workdir)
@@ -308,7 +308,7 @@ export class WaveAcpAgent {
                 sessionId: sessionId,
                 toolCall: {
                     toolCallId,
-                    title: `Permission for ${context.toolName}`,
+                    title: displayTitle,
                     status: "pending",
                     rawInput: context.toolInput,
                     content,
@@ -323,21 +323,15 @@ export class WaveAcpAgent {
             const selectedOptionId = response.outcome.optionId;
             logger.info(`User selected permission option: ${selectedOptionId}`);
             switch (selectedOptionId) {
-                case "allow_once":
-                    return { behavior: "allow" };
                 case "allow_always":
                     return {
                         behavior: "allow",
                         newPermissionRule: `${context.toolName}(*)`,
                     };
+                case "allow_once":
+                    return { behavior: "allow" };
                 case "reject_once":
                     return { behavior: "deny", message: "Rejected by user" };
-                case "reject_always":
-                    return {
-                        behavior: "deny",
-                        message: "Rejected by user",
-                        newPermissionRule: `!${context.toolName}(*)`,
-                    };
                 default:
                     return { behavior: "deny", message: "Unknown option selected" };
             }
@@ -356,7 +350,8 @@ export class WaveAcpAgent {
         if (name === "Write") {
             let oldText = null;
             try {
-                const filePath = parameters.file_path;
+                const filePath = (parameters.file_path ||
+                    parameters.filePath);
                 const fullPath = path.isAbsolute(filePath)
                     ? filePath
                     : path.join(workdir, filePath);
@@ -368,7 +363,7 @@ export class WaveAcpAgent {
             return [
                 {
                     type: "diff",
-                    path: parameters.file_path,
+                    path: (parameters.file_path || parameters.filePath),
                     oldText,
                     newText: parameters.content,
                 },
@@ -378,7 +373,8 @@ export class WaveAcpAgent {
             let oldText = null;
             let newText = null;
             try {
-                const filePath = parameters.file_path;
+                const filePath = (parameters.file_path ||
+                    parameters.filePath);
                 const fullPath = path.isAbsolute(filePath)
                     ? filePath
                     : path.join(workdir, filePath);
@@ -401,7 +397,7 @@ export class WaveAcpAgent {
                 return [
                     {
                         type: "diff",
-                        path: parameters.file_path,
+                        path: (parameters.file_path || parameters.filePath),
                         oldText,
                         newText,
                     },
@@ -411,49 +407,68 @@ export class WaveAcpAgent {
             return [
                 {
                     type: "diff",
-                    path: parameters.file_path,
+                    path: (parameters.file_path || parameters.filePath),
                     oldText: parameters.old_string,
                     newText: parameters.new_string,
                 },
             ];
         }
-        return this.getToolContent(name, parameters);
+        return this.getToolContent(name, parameters, undefined);
     }
-    getToolContent(name, parameters) {
-        if (!parameters)
-            return undefined;
-        if (name === "Write") {
-            return [
-                {
+    getToolContent(name, parameters, shortResult) {
+        const contents = [];
+        if (parameters) {
+            if (name === "Write") {
+                contents.push({
                     type: "diff",
-                    path: parameters.file_path,
+                    path: (parameters.file_path || parameters.filePath),
                     oldText: null,
                     newText: parameters.content,
-                },
-            ];
-        }
-        if (name === "Edit") {
-            return [
-                {
+                });
+            }
+            else if (name === "Edit") {
+                contents.push({
                     type: "diff",
-                    path: parameters.file_path,
+                    path: (parameters.file_path || parameters.filePath),
                     oldText: parameters.old_string,
                     newText: parameters.new_string,
+                });
+            }
+        }
+        if (shortResult) {
+            contents.push({
+                type: "content",
+                content: {
+                    type: "text",
+                    text: shortResult,
                 },
-            ];
+            });
         }
-        return undefined;
+        return contents.length > 0 ? contents : undefined;
     }
-    getToolLocations(name, parameters) {
+    getToolLocations(name, parameters, extraStartLineNumber) {
         if (!parameters)
             return undefined;
-        if (name === "Write" || name === "Edit" || name === "Read") {
-            return [
-                {
-                    path: parameters.file_path,
-                    line: parameters.offset,
-                },
-            ];
+        if (name === "Write" ||
+            name === "Edit" ||
+            name === "Read" ||
+            name === "LSP") {
+            const filePath = (parameters.file_path || parameters.filePath);
+            let line = extraStartLineNumber ??
+                parameters.startLineNumber ??
+                parameters.line ??
+                parameters.offset;
+            if (name === "Write" && line === undefined) {
+                line = 1;
+            }
+            if (filePath) {
+                return [
+                    {
+                        path: filePath,
+                        line: line,
+                    },
+                ];
+            }
         }
         return undefined;
     }
@@ -477,6 +492,7 @@ export class WaveAcpAgent {
     }
     createCallbacks(sessionId) {
         const getAgent = () => this.agents.get(sessionId);
+        const toolStates = new Map();
         return {
             onAssistantContentUpdated: (chunk) => {
                 this.connection.sessionUpdate({
@@ -503,7 +519,29 @@ export class WaveAcpAgent {
                 });
             },
             onToolBlockUpdated: (params) => {
-                const { id, name, stage, success, error, result, parameters } = params;
+                const { id, name, stage, success, error, result, parameters, compactParams, shortResult, startLineNumber, } = params;
+                let state = toolStates.get(id);
+                if (!state) {
+                    state = {};
+                    toolStates.set(id, state);
+                }
+                if (name)
+                    state.name = name;
+                if (compactParams)
+                    state.compactParams = compactParams;
+                if (shortResult)
+                    state.shortResult = shortResult;
+                if (startLineNumber !== undefined)
+                    state.startLineNumber = startLineNumber;
+                const effectiveName = state.name || name;
+                const effectiveCompactParams = state.compactParams || compactParams;
+                const effectiveShortResult = state.shortResult || shortResult;
+                const effectiveStartLineNumber = state.startLineNumber !== undefined
+                    ? state.startLineNumber
+                    : startLineNumber;
+                const displayTitle = effectiveName && effectiveCompactParams
+                    ? `${effectiveName}: ${effectiveCompactParams}`
+                    : effectiveName || "Tool Call";
                 let parsedParameters = undefined;
                 if (parameters) {
                     try {
@@ -513,20 +551,22 @@ export class WaveAcpAgent {
                         // Ignore parse errors during streaming
                     }
                 }
-                const content = name && parsedParameters
-                    ? this.getToolContent(name, parsedParameters)
+                const content = effectiveName && (parsedParameters || effectiveShortResult)
+                    ? this.getToolContent(effectiveName, parsedParameters, effectiveShortResult)
                     : undefined;
-                const locations = name && parsedParameters
-                    ? this.getToolLocations(name, parsedParameters)
+                const locations = effectiveName && parsedParameters
+                    ? this.getToolLocations(effectiveName, parsedParameters, effectiveStartLineNumber)
+                    : undefined;
+                const kind = effectiveName
+                    ? this.getToolKind(effectiveName)
                     : undefined;
-                const kind = name ? this.getToolKind(name) : undefined;
                 if (stage === "start") {
                     this.connection.sessionUpdate({
                         sessionId: sessionId,
                         update: {
                             sessionUpdate: "tool_call",
                             toolCallId: id,
-                            title: name || "Tool Call",
+                            title: displayTitle,
                             status: "pending",
                             content,
                             locations,
@@ -553,7 +593,7 @@ export class WaveAcpAgent {
                         sessionUpdate: "tool_call_update",
                         toolCallId: id,
                         status,
-                        title: name || "Tool Call",
+                        title: displayTitle,
                         rawOutput: result || error,
                         content,
                         locations,
@@ -561,6 +601,9 @@ export class WaveAcpAgent {
                         rawInput: parsedParameters,
                     },
                 });
+                if (stage === "end") {
+                    toolStates.delete(id);
+                }
             },
             onTasksChange: (tasks) => {
                 this.connection.sessionUpdate({

package/dist/components/DiffDisplay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DiffDisplay.d.ts","sourceRoot":"","sources":["../../src/components/DiffDisplay.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkB,MAAM,OAAO,CAAC;AAMvC,UAAU,gBAAgB;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,CA0VlD,CAAC"}
+{"version":3,"file":"DiffDisplay.d.ts","sourceRoot":"","sources":["../../src/components/DiffDisplay.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkB,MAAM,OAAO,CAAC;AAYvC,UAAU,gBAAgB;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,CA6WlD,CAAC"}

package/dist/components/DiffDisplay.js

@@ -1,9 +1,11 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useMemo } from "react";
 import { Box, Text } from "ink";
-import { WRITE_TOOL_NAME, EDIT_TOOL_NAME } from "wave-agent-sdk";
+import { WRITE_TOOL_NAME, EDIT_TOOL_NAME, } from "wave-agent-sdk";
 import { transformToolBlockToChanges } from "../utils/toolParameterTransforms.js";
 import { diffLines, diffWords } from "diff";
+import path from "path";
+import { Markdown } from "./Markdown.js";
 export const DiffDisplay = ({ toolName, parameters, startLineNumber, }) => {
     const showDiff = toolName && [WRITE_TOOL_NAME, EDIT_TOOL_NAME].includes(toolName);
     // Diff detection and transformation using typed parameters
@@ -53,6 +55,23 @@ export const DiffDisplay = ({ toolName, parameters, startLineNumber, }) => {
             };
         }
     };
+    // Render highlighted code for Write tool
+    const renderWriteContent = () => {
+        if (!parameters)
+            return null;
+        try {
+            const parsed = JSON.parse(parameters);
+            const content = parsed.content || "";
+            const filePath = parsed.file_path || "";
+            const ext = path.extname(filePath).slice(1);
+            const markdown = `\`\`\`${ext}\n${content}\n\`\`\``;
+            return _jsx(Markdown, { children: markdown });
+        }
+        catch (error) {
+            console.warn("Error rendering write content:", error);
+            return null;
+        }
+    };
     // Render expanded diff display
     const renderExpandedDiff = () => {
         try {
@@ -197,5 +216,7 @@ export const DiffDisplay = ({ toolName, parameters, startLineNumber, }) => {
     if (!showDiff) {
         return null;
     }
-    return (_jsx(Box, { flexDirection: "column", children: _jsx(Box, { paddingLeft: 2, borderLeft: true, borderColor: "cyan", flexDirection: "column", children: renderExpandedDiff() }) }));
+    return (_jsx(Box, { flexDirection: "column", children: _jsx(Box, { paddingLeft: 2, borderLeft: true, borderColor: "cyan", flexDirection: "column", children: toolName === WRITE_TOOL_NAME
+                ? renderWriteContent()
+                : renderExpandedDiff() }) }));
 };

package/dist/contexts/useChat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useChat.d.ts","sourceRoot":"","sources":["../../src/contexts/useChat.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"useChat.d.ts","sourceRoot":"","sources":["../../src/contexts/useChat.tsx"],"names":[],"mappings":"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"}

package/dist/contexts/useChat.js

@@ -55,6 +55,16 @@ export const ChatProvider = ({ children, bypassPermissions, pluginDirs, tools, w
     // Confirmation too tall state
     const [wasLastDetailsTooTall, setWasLastDetailsTooTall] = useState(0);
     const agentRef = useRef(null);
+    const taskUpdateTimerRef = useRef(null);
+    const debouncedSetTasks = useCallback((newTasks) => {
+        if (taskUpdateTimerRef.current) {
+            clearTimeout(taskUpdateTimerRef.current);
+        }
+        taskUpdateTimerRef.current = setTimeout(() => {
+            setTasks([...newTasks]);
+            taskUpdateTimerRef.current = null;
+        }, 100);
+    }, [setTasks]);
     // Permission confirmation methods with queue support
     const showConfirmation = useCallback(async (toolName, toolInput, suggestedPrefix, hidePersistentOption) => {
         return new Promise((resolve, reject) => {
@@ -95,7 +105,7 @@ export const ChatProvider = ({ children, bypassPermissions, pluginDirs, tools, w
                     setBackgroundTasks([...tasks]);
                 },
                 onTasksChange: (tasks) => {
-                    setTasks([...tasks]);
+                    debouncedSetTasks(tasks);
                 },
                 onSubagentMessagesChange: (subagentId, messages) => {
                     logger.debug("onSubagentMessagesChange", subagentId, messages.length);
@@ -177,10 +187,14 @@ export const ChatProvider = ({ children, bypassPermissions, pluginDirs, tools, w
         workdir,
         worktreeSession,
         model,
+        debouncedSetTasks,
     ]);
     // Cleanup on unmount
     useEffect(() => {
         return () => {
+            if (taskUpdateTimerRef.current) {
+                clearTimeout(taskUpdateTimerRef.current);
+            }
             if (agentRef.current) {
                 try {
                     // Display usage summary before cleanup

package/dist/utils/highlightUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"highlightUtils.d.ts","sourceRoot":"","sources":["../../src/utils/highlightUtils.ts"],"names":[],"mappings":"AA6DA,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAsCvE"}
+{"version":3,"file":"highlightUtils.d.ts","sourceRoot":"","sources":["../../src/utils/highlightUtils.ts"],"names":[],"mappings":"AAqEA,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAsCvE"}

package/dist/utils/highlightUtils.js

@@ -45,6 +45,14 @@ function nodeToAnsi(node) {
         const classes = node.getAttribute("class")?.split(/\s+/) || [];
         for (const className of classes) {
             if (theme[className]) {
+                // If content has newlines, split it and apply style to each line
+                // to ensure ANSI codes are correctly applied when splitting the final string by lines.
+                if (content.includes("\n")) {
+                    return content
+                        .split("\n")
+                        .map((line) => theme[className](line))
+                        .join("\n");
+                }
                 return theme[className](content);
             }
         }

package/dist/utils/toolParameterTransforms.d.ts

@@ -2,11 +2,7 @@
  * Tool parameter transformation utilities for UI rendering
  * Forces type judgment based on tool name using type assertions
  */
-import { type Change, type WriteToolParameters, type EditToolParameters } from "wave-agent-sdk";
-/**
- * Transform Write tool parameters to changes
- */
-export declare function transformWriteParameters(parameters: WriteToolParameters): Change[];
+import { type Change, type EditToolParameters } from "wave-agent-sdk";
 /**
  * Transform Edit tool parameters to changes
  */

package/dist/utils/toolParameterTransforms.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toolParameterTransforms.d.ts","sourceRoot":"","sources":["../../src/utils/toolParameterTransforms.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACL,KAAK,MAAM,EACX,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACxB,MAAM,gBAAgB,CAAC;AAmBxB;;GAEG;AACH,wBAAgB,wBAAwB,CACtC,UAAU,EAAE,mBAAmB,GAC9B,MAAM,EAAE,CAOV;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,kBAAkB,GAC7B,MAAM,EAAE,CAOV;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,eAAe,CAAC,EAAE,MAAM,GACvB,MAAM,EAAE,CA8BV"}
+{"version":3,"file":"toolParameterTransforms.d.ts","sourceRoot":"","sources":["../../src/utils/toolParameterTransforms.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAmBtE;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,kBAAkB,GAC7B,MAAM,EAAE,CAOV;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,eAAe,CAAC,EAAE,MAAM,GACvB,MAAM,EAAE,CA0BV"}

package/dist/utils/toolParameterTransforms.js

@@ -18,17 +18,6 @@ function parseToolParameters(parameters) {
         return {};
     }
 }
-/**
- * Transform Write tool parameters to changes
- */
-export function transformWriteParameters(parameters) {
-    return [
-        {
-            oldContent: "", // No previous content for write operations
-            newContent: parameters.content,
-        },
-    ];
-}
 /**
  * Transform Edit tool parameters to changes
  */
@@ -52,9 +41,6 @@ export function transformToolBlockToChanges(toolName, parameters, startLineNumbe
         const parsedParams = parseToolParameters(parameters);
         let changes = [];
         switch (toolName) {
-            case "Write":
-                changes = transformWriteParameters(parsedParams);
-                break;
             case "Edit":
                 changes = transformEditParameters(parsedParams);
                 break;

package/dist/utils/worktree.js

@@ -1,7 +1,7 @@
 import { execSync } from "node:child_process";
 import * as path from "node:path";
 import * as fs from "node:fs";
-import { getGitRepoRoot, getDefaultRemoteBranch } from "wave-agent-sdk";
+import { getDefaultRemoteBranch, getGitMainRepoRoot } from "wave-agent-sdk";
 export const WORKTREE_DIR = ".wave/worktrees";
 /**
  * Create a new git worktree
@@ -10,7 +10,7 @@ export const WORKTREE_DIR = ".wave/worktrees";
  * @returns Worktree session details
  */
 export function createWorktree(name, cwd) {
-    const repoRoot = getGitRepoRoot(cwd);
+    const repoRoot = getGitMainRepoRoot(cwd);
     const worktreePath = path.join(repoRoot, WORKTREE_DIR, name);
     const branchName = `worktree-${name}`;
     const baseBranch = getDefaultRemoteBranch(cwd);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wave-code",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "description": "CLI-based code assistant powered by AI, built with React and Ink",
   "repository": {
     "type": "git",
@@ -41,7 +41,7 @@
     "yargs": "^17.7.2",
     "@agentclientprotocol/sdk": "0.16.1",
     "zod": "^3.23.8",
-    "wave-agent-sdk": "0.10.1"
+    "wave-agent-sdk": "0.10.2"
   },
   "devDependencies": {
     "@types/react": "^19.1.8",

package/src/acp/agent.ts

@@ -6,7 +6,9 @@ import {
   AgentToolBlockUpdateParams,
   Task,
   listSessions as listWaveSessions,
+  listAllSessions as listAllWaveSessions,
   deleteSession as deleteWaveSession,
+  truncateContent,
 } from "wave-agent-sdk";
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
@@ -137,6 +139,7 @@ export class WaveAcpAgent implements AcpAgent {
     const agent = await WaveAgent.create({
       workdir: cwd,
       restoreSessionId: sessionId,
+      stream: false,
       canUseTool: (context) => {
         if (!agentRef.instance) {
           throw new Error("Agent instance not yet initialized");
@@ -170,19 +173,11 @@ export class WaveAcpAgent implements AcpAgent {
     // Update the callbacks object with the correct sessionId
     Object.assign(callbacks, this.createCallbacks(actualSessionId));
 
-    return agent;
-  }
-
-  async newSession(params: NewSessionRequest): Promise<NewSessionResponse> {
-    const { cwd } = params;
-    logger.info(`Creating new session in ${cwd}`);
-    const agent = await this.createAgent(undefined, cwd);
-    logger.info(`New session created with ID: ${agent.sessionId}`);
-
     // Send initial available commands after agent creation
+    // Use setImmediate to ensure the client receives the session response before the update
     setImmediate(() => {
       this.connection.sessionUpdate({
-        sessionId: agent.sessionId as AcpSessionId,
+        sessionId: actualSessionId as AcpSessionId,
         update: {
           sessionUpdate: "available_commands_update",
           availableCommands: agent.getSlashCommands().map((cmd) => ({
@@ -196,6 +191,15 @@ export class WaveAcpAgent implements AcpAgent {
       });
     });
 
+    return agent;
+  }
+
+  async newSession(params: NewSessionRequest): Promise<NewSessionResponse> {
+    const { cwd } = params;
+    logger.info(`Creating new session in ${cwd}`);
+    const agent = await this.createAgent(undefined, cwd);
+    logger.info(`New session created with ID: ${agent.sessionId}`);
+
     return {
       sessionId: agent.sessionId as AcpSessionId,
       modes: this.getSessionModeState(agent),
@@ -208,23 +212,6 @@ export class WaveAcpAgent implements AcpAgent {
     logger.info(`Loading session: ${sessionId} in ${cwd}`);
     const agent = await this.createAgent(sessionId, cwd);
 
-    // Send initial available commands after agent creation
-    setImmediate(() => {
-      this.connection.sessionUpdate({
-        sessionId: agent.sessionId as AcpSessionId,
-        update: {
-          sessionUpdate: "available_commands_update",
-          availableCommands: agent.getSlashCommands().map((cmd) => ({
-            name: cmd.name,
-            description: cmd.description,
-            input: {
-              hint: "Enter arguments...",
-            },
-          })),
-        },
-      });
-    });
-
     return {
       modes: this.getSessionModeState(agent),
       configOptions: this.getSessionConfigOptions(agent),
@@ -236,17 +223,21 @@ export class WaveAcpAgent implements AcpAgent {
   ): Promise<ListSessionsResponse> {
     const { cwd } = params;
     logger.info(`listSessions called with params: ${JSON.stringify(params)}`);
+
+    let waveSessions;
     if (!cwd) {
-      logger.warn("listSessions called without cwd, returning empty list");
-      return { sessions: [] };
+      logger.info("listSessions called without cwd, listing all sessions");
+      waveSessions = await listAllWaveSessions();
+    } else {
+      logger.info(`Listing sessions for ${cwd}`);
+      waveSessions = await listWaveSessions(cwd);
     }
 
-    logger.info(`Listing sessions for ${cwd}`);
-    const waveSessions = await listWaveSessions(cwd);
-    logger.info(`Found ${waveSessions.length} sessions for ${cwd}`);
+    logger.info(`Found ${waveSessions.length} sessions`);
     const sessions: SessionInfo[] = waveSessions.map((meta) => ({
       sessionId: meta.id as AcpSessionId,
       cwd: meta.workdir,
+      title: meta.firstMessage ? truncateContent(meta.firstMessage) : undefined,
       updatedAt: meta.lastActiveAt.toISOString(),
     }));
     return { sessions };
@@ -378,6 +369,27 @@ export class WaveAcpAgent implements AcpAgent {
       context.toolCallId ||
       "perm-" + Math.random().toString(36).substring(2, 9);
 
+    let effectiveName = context.toolName;
+    let effectiveCompactParams: string | undefined = undefined;
+
+    if (agent?.messages && context.toolCallId) {
+      const toolBlock = agent.messages
+        .flatMap((m) => m.blocks)
+        .find((b) => b.type === "tool" && b.id === context.toolCallId) as
+        | import("wave-agent-sdk").ToolBlock
+        | undefined;
+      if (toolBlock) {
+        effectiveName = toolBlock.name || effectiveName;
+        effectiveCompactParams =
+          toolBlock.compactParams || effectiveCompactParams;
+      }
+    }
+
+    const displayTitle =
+      effectiveName && effectiveCompactParams
+        ? `${effectiveName}: ${effectiveCompactParams}`
+        : effectiveName || "Tool Call";
+
     const options: PermissionOption[] = [
       {
         optionId: "allow_once",
@@ -394,11 +406,6 @@ export class WaveAcpAgent implements AcpAgent {
         name: "Reject Once",
         kind: "reject_once",
       },
-      {
-        optionId: "reject_always",
-        name: "Reject Always",
-        kind: "reject_always",
-      },
     ];
 
     const content = context.toolName
@@ -420,7 +427,7 @@ export class WaveAcpAgent implements AcpAgent {
         sessionId: sessionId as AcpSessionId,
         toolCall: {
           toolCallId,
-          title: `Permission for ${context.toolName}`,
+          title: displayTitle,
           status: "pending",
           rawInput: context.toolInput,
           content,
@@ -438,21 +445,15 @@ export class WaveAcpAgent implements AcpAgent {
       logger.info(`User selected permission option: ${selectedOptionId}`);
 
       switch (selectedOptionId) {
-        case "allow_once":
-          return { behavior: "allow" };
         case "allow_always":
           return {
             behavior: "allow",
             newPermissionRule: `${context.toolName}(*)`,
           };
+        case "allow_once":
+          return { behavior: "allow" };
         case "reject_once":
           return { behavior: "deny", message: "Rejected by user" };
-        case "reject_always":
-          return {
-            behavior: "deny",
-            message: "Rejected by user",
-            newPermissionRule: `!${context.toolName}(*)`,
-          };
         default:
           return { behavior: "deny", message: "Unknown option selected" };
       }
@@ -474,7 +475,8 @@ export class WaveAcpAgent implements AcpAgent {
     if (name === "Write") {
       let oldText: string | null = null;
       try {
-        const filePath = parameters.file_path as string;
+        const filePath = (parameters.file_path ||
+          parameters.filePath) as string;
         const fullPath = path.isAbsolute(filePath)
           ? filePath
           : path.join(workdir, filePath);
@@ -485,7 +487,7 @@ export class WaveAcpAgent implements AcpAgent {
       return [
         {
           type: "diff",
-          path: parameters.file_path as string,
+          path: (parameters.file_path || parameters.filePath) as string,
           oldText,
           newText: parameters.content as string,
         },
@@ -495,7 +497,8 @@ export class WaveAcpAgent implements AcpAgent {
       let oldText: string | null = null;
       let newText: string | null = null;
       try {
-        const filePath = parameters.file_path as string;
+        const filePath = (parameters.file_path ||
+          parameters.filePath) as string;
         const fullPath = path.isAbsolute(filePath)
           ? filePath
           : path.join(workdir, filePath);
@@ -520,7 +523,7 @@ export class WaveAcpAgent implements AcpAgent {
         return [
           {
             type: "diff",
-            path: parameters.file_path as string,
+            path: (parameters.file_path || parameters.filePath) as string,
             oldText,
             newText,
           },
@@ -531,55 +534,83 @@ export class WaveAcpAgent implements AcpAgent {
       return [
         {
           type: "diff",
-          path: parameters.file_path as string,
+          path: (parameters.file_path || parameters.filePath) as string,
           oldText: parameters.old_string as string,
           newText: parameters.new_string as string,
         },
       ];
     }
-    return this.getToolContent(name, parameters);
+    return this.getToolContent(name, parameters, undefined);
   }
 
   private getToolContent(
     name: string,
     parameters: Record<string, unknown> | undefined,
+    shortResult: string | undefined,
   ): ToolCallContent[] | undefined {
-    if (!parameters) return undefined;
-    if (name === "Write") {
-      return [
-        {
+    const contents: ToolCallContent[] = [];
+    if (parameters) {
+      if (name === "Write") {
+        contents.push({
           type: "diff",
-          path: parameters.file_path as string,
+          path: (parameters.file_path || parameters.filePath) as string,
           oldText: null,
           newText: parameters.content as string,
-        },
-      ];
-    }
-    if (name === "Edit") {
-      return [
-        {
+        });
+      } else if (name === "Edit") {
+        contents.push({
           type: "diff",
-          path: parameters.file_path as string,
+          path: (parameters.file_path || parameters.filePath) as string,
           oldText: parameters.old_string as string,
           newText: parameters.new_string as string,
+        });
+      }
+    }
+
+    if (shortResult) {
+      contents.push({
+        type: "content",
+        content: {
+          type: "text",
+          text: shortResult,
         },
-      ];
+      });
     }
-    return undefined;
+
+    return contents.length > 0 ? contents : undefined;
   }
 
   private getToolLocations(
     name: string,
     parameters: Record<string, unknown> | undefined,
+    extraStartLineNumber?: number,
   ): ToolCallLocation[] | undefined {
     if (!parameters) return undefined;
-    if (name === "Write" || name === "Edit" || name === "Read") {
-      return [
-        {
-          path: parameters.file_path as string,
-          line: parameters.offset as number,
-        },
-      ];
+    if (
+      name === "Write" ||
+      name === "Edit" ||
+      name === "Read" ||
+      name === "LSP"
+    ) {
+      const filePath = (parameters.file_path || parameters.filePath) as string;
+      let line =
+        extraStartLineNumber ??
+        (parameters.startLineNumber as number) ??
+        (parameters.line as number) ??
+        (parameters.offset as number);
+
+      if (name === "Write" && line === undefined) {
+        line = 1;
+      }
+
+      if (filePath) {
+        return [
+          {
+            path: filePath,
+            line: line,
+          },
+        ];
+      }
     }
     return undefined;
   }
@@ -605,6 +636,15 @@ export class WaveAcpAgent implements AcpAgent {
 
   private createCallbacks(sessionId: string): AgentOptions["callbacks"] {
     const getAgent = () => this.agents.get(sessionId);
+    const toolStates = new Map<
+      string,
+      {
+        name?: string;
+        compactParams?: string;
+        shortResult?: string;
+        startLineNumber?: number;
+      }
+    >();
     return {
       onAssistantContentUpdated: (chunk: string) => {
         this.connection.sessionUpdate({
@@ -631,7 +671,42 @@ export class WaveAcpAgent implements AcpAgent {
         });
       },
       onToolBlockUpdated: (params: AgentToolBlockUpdateParams) => {
-        const { id, name, stage, success, error, result, parameters } = params;
+        const {
+          id,
+          name,
+          stage,
+          success,
+          error,
+          result,
+          parameters,
+          compactParams,
+          shortResult,
+          startLineNumber,
+        } = params;
+
+        let state = toolStates.get(id);
+        if (!state) {
+          state = {};
+          toolStates.set(id, state);
+        }
+        if (name) state.name = name;
+        if (compactParams) state.compactParams = compactParams;
+        if (shortResult) state.shortResult = shortResult;
+        if (startLineNumber !== undefined)
+          state.startLineNumber = startLineNumber;
+
+        const effectiveName = state.name || name;
+        const effectiveCompactParams = state.compactParams || compactParams;
+        const effectiveShortResult = state.shortResult || shortResult;
+        const effectiveStartLineNumber =
+          state.startLineNumber !== undefined
+            ? state.startLineNumber
+            : startLineNumber;
+
+        const displayTitle =
+          effectiveName && effectiveCompactParams
+            ? `${effectiveName}: ${effectiveCompactParams}`
+            : effectiveName || "Tool Call";
 
         let parsedParameters: Record<string, unknown> | undefined = undefined;
         if (parameters) {
@@ -643,14 +718,24 @@ export class WaveAcpAgent implements AcpAgent {
         }
 
         const content =
-          name && parsedParameters
-            ? this.getToolContent(name, parsedParameters)
+          effectiveName && (parsedParameters || effectiveShortResult)
+            ? this.getToolContent(
+                effectiveName,
+                parsedParameters,
+                effectiveShortResult,
+              )
             : undefined;
         const locations =
-          name && parsedParameters
-            ? this.getToolLocations(name, parsedParameters)
+          effectiveName && parsedParameters
+            ? this.getToolLocations(
+                effectiveName,
+                parsedParameters,
+                effectiveStartLineNumber,
+              )
             : undefined;
-        const kind = name ? this.getToolKind(name) : undefined;
+        const kind = effectiveName
+          ? this.getToolKind(effectiveName)
+          : undefined;
 
         if (stage === "start") {
           this.connection.sessionUpdate({
@@ -658,7 +743,7 @@ export class WaveAcpAgent implements AcpAgent {
             update: {
               sessionUpdate: "tool_call",
               toolCallId: id,
-              title: name || "Tool Call",
+              title: displayTitle,
               status: "pending",
               content,
               locations,
@@ -689,7 +774,7 @@ export class WaveAcpAgent implements AcpAgent {
             sessionUpdate: "tool_call_update",
             toolCallId: id,
             status,
-            title: name || "Tool Call",
+            title: displayTitle,
             rawOutput: result || error,
             content,
             locations,
@@ -697,6 +782,10 @@ export class WaveAcpAgent implements AcpAgent {
             rawInput: parsedParameters,
           },
         });
+
+        if (stage === "end") {
+          toolStates.delete(id);
+        }
       },
       onTasksChange: (tasks) => {
         this.connection.sessionUpdate({

package/src/components/DiffDisplay.tsx

@@ -1,8 +1,14 @@
 import React, { useMemo } from "react";
 import { Box, Text } from "ink";
-import { WRITE_TOOL_NAME, EDIT_TOOL_NAME } from "wave-agent-sdk";
+import {
+  WRITE_TOOL_NAME,
+  EDIT_TOOL_NAME,
+  type WriteToolParameters,
+} from "wave-agent-sdk";
 import { transformToolBlockToChanges } from "../utils/toolParameterTransforms.js";
 import { diffLines, diffWords } from "diff";
+import path from "path";
+import { Markdown } from "./Markdown.js";
 
 interface DiffDisplayProps {
   toolName?: string;
@@ -97,6 +103,23 @@ export const DiffDisplay: React.FC<DiffDisplayProps> = ({
     }
   };
 
+  // Render highlighted code for Write tool
+  const renderWriteContent = () => {
+    if (!parameters) return null;
+    try {
+      const parsed = JSON.parse(parameters) as WriteToolParameters;
+      const content = parsed.content || "";
+      const filePath = parsed.file_path || "";
+      const ext = path.extname(filePath).slice(1);
+
+      const markdown = `\`\`\`${ext}\n${content}\n\`\`\``;
+      return <Markdown>{markdown}</Markdown>;
+    } catch (error) {
+      console.warn("Error rendering write content:", error);
+      return null;
+    }
+  };
+
   // Render expanded diff display
   const renderExpandedDiff = () => {
     try {
@@ -352,7 +375,9 @@ export const DiffDisplay: React.FC<DiffDisplayProps> = ({
   return (
     <Box flexDirection="column">
       <Box paddingLeft={2} borderLeft borderColor="cyan" flexDirection="column">
-        {renderExpandedDiff()}
+        {toolName === WRITE_TOOL_NAME
+          ? renderWriteContent()
+          : renderExpandedDiff()}
       </Box>
     </Box>
   );

package/src/contexts/useChat.tsx

@@ -223,6 +223,20 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
   const [wasLastDetailsTooTall, setWasLastDetailsTooTall] = useState(0);
 
   const agentRef = useRef<Agent | null>(null);
+  const taskUpdateTimerRef = useRef<NodeJS.Timeout | null>(null);
+
+  const debouncedSetTasks = useCallback(
+    (newTasks: Task[]) => {
+      if (taskUpdateTimerRef.current) {
+        clearTimeout(taskUpdateTimerRef.current);
+      }
+      taskUpdateTimerRef.current = setTimeout(() => {
+        setTasks([...newTasks]);
+        taskUpdateTimerRef.current = null;
+      }, 100);
+    },
+    [setTasks],
+  );
 
   // Permission confirmation methods with queue support
   const showConfirmation = useCallback(
@@ -274,7 +288,7 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
           setBackgroundTasks([...tasks]);
         },
         onTasksChange: (tasks) => {
-          setTasks([...tasks]);
+          debouncedSetTasks(tasks);
         },
         onSubagentMessagesChange: (subagentId: string, messages: Message[]) => {
           logger.debug("onSubagentMessagesChange", subagentId, messages.length);
@@ -371,11 +385,16 @@ export const ChatProvider: React.FC<ChatProviderProps> = ({
     workdir,
     worktreeSession,
     model,
+    debouncedSetTasks,
   ]);
 
   // Cleanup on unmount
   useEffect(() => {
     return () => {
+      if (taskUpdateTimerRef.current) {
+        clearTimeout(taskUpdateTimerRef.current);
+      }
+
       if (agentRef.current) {
         try {
           // Display usage summary before cleanup

package/src/utils/highlightUtils.ts

@@ -49,6 +49,14 @@ function nodeToAnsi(node: Node): string {
 
     for (const className of classes) {
       if (theme[className]) {
+        // If content has newlines, split it and apply style to each line
+        // to ensure ANSI codes are correctly applied when splitting the final string by lines.
+        if (content.includes("\n")) {
+          return content
+            .split("\n")
+            .map((line) => theme[className](line))
+            .join("\n");
+        }
         return theme[className](content);
       }
     }

package/src/utils/toolParameterTransforms.ts

@@ -3,11 +3,7 @@
  * Forces type judgment based on tool name using type assertions
  */
 
-import {
-  type Change,
-  type WriteToolParameters,
-  type EditToolParameters,
-} from "wave-agent-sdk";
+import { type Change, type EditToolParameters } from "wave-agent-sdk";
 import { logger } from "./logger.js";
 
 /**
@@ -26,20 +22,6 @@ function parseToolParameters(parameters: string): unknown {
   }
 }
 
-/**
- * Transform Write tool parameters to changes
- */
-export function transformWriteParameters(
-  parameters: WriteToolParameters,
-): Change[] {
-  return [
-    {
-      oldContent: "", // No previous content for write operations
-      newContent: parameters.content,
-    },
-  ];
-}
-
 /**
  * Transform Edit tool parameters to changes
  */
@@ -72,10 +54,6 @@ export function transformToolBlockToChanges(
 
     let changes: Change[] = [];
     switch (toolName) {
-      case "Write":
-        changes = transformWriteParameters(parsedParams as WriteToolParameters);
-        break;
-
       case "Edit":
         changes = transformEditParameters(parsedParams as EditToolParameters);
         break;

package/src/utils/worktree.ts

@@ -1,7 +1,7 @@
 import { execSync } from "node:child_process";
 import * as path from "node:path";
 import * as fs from "node:fs";
-import { getGitRepoRoot, getDefaultRemoteBranch } from "wave-agent-sdk";
+import { getDefaultRemoteBranch, getGitMainRepoRoot } from "wave-agent-sdk";
 
 export interface WorktreeSession {
   name: string;
@@ -22,7 +22,7 @@ export const WORKTREE_DIR = ".wave/worktrees";
  * @returns Worktree session details
  */
 export function createWorktree(name: string, cwd: string): WorktreeSession {
-  const repoRoot = getGitRepoRoot(cwd);
+  const repoRoot = getGitMainRepoRoot(cwd);
   const worktreePath = path.join(repoRoot, WORKTREE_DIR, name);
   const branchName = `worktree-${name}`;
   const baseBranch = getDefaultRemoteBranch(cwd);