wave-agent-sdk 0.18.7 → 0.19.1

package/dist/utils/convertMessagesForAPI.js

@@ -36,9 +36,11 @@ function safeToolArguments(args) {
  * Convert message format to API call format, stopping when a compacted message is encountered.
  * Messages with no meaningful content or tool calls are filtered out.
  * @param messages Message list
+ * @param options Optional conversion options (e.g. supportsVision)
  * @returns Converted API message format list
  */
-export function convertMessagesForAPI(messages) {
+export function convertMessagesForAPI(messages, options) {
+    const supportsVision = options?.supportsVision !== false;
     const recentMessages = [];
     const startIndex = messages.length - 1;
     for (let i = startIndex; i >= 0; i--) {
@@ -66,49 +68,57 @@ export function convertMessagesForAPI(messages) {
             const toolBlocks = message.blocks.filter((block) => block.type === "tool");
             const completedToolIds = new Set(); // Record completed tool IDs
             if (toolBlocks.length > 0) {
+                // Collect image user messages to place after all tool messages
+                const imageUserMessages = [];
                 toolBlocks.forEach((toolBlock) => {
                     // Only add completed tool blocks (i.e., stage is 'end')
                     if (toolBlock.id && toolBlock.stage === "end") {
                         completedToolIds.add(toolBlock.id);
-                        // Check for image data
+                        // Always add a proper tool message to satisfy tool_call_id pairing
+                        recentMessages.unshift({
+                            tool_call_id: toolBlock.id,
+                            role: "tool",
+                            content: stripAnsiColors(toolBlock.result || ""),
+                        });
+                        // If there are images, also prepare a user message with image content
                         if (toolBlock.images && toolBlock.images.length > 0) {
-                            // If there is an image, create a user message instead of a tool message
-                            const contentParts = [];
-                            // Add tool result as text
-                            const toolResultText = `Tool result for ${toolBlock.name || "unknown tool"}:\n${stripAnsiColors(toolBlock.result || "")}`;
-                            contentParts.push({
-                                type: "text",
-                                text: toolResultText,
-                            });
-                            // Add image
-                            toolBlock.images.forEach((image) => {
-                                const imageUrl = image.data.startsWith("data:")
-                                    ? image.data
-                                    : `data:${image.mediaType || "image/png"};base64,${image.data}`;
-                                contentParts.push({
-                                    type: "image_url",
-                                    image_url: {
-                                        url: imageUrl,
-                                        detail: "auto",
-                                    },
+                            if (supportsVision) {
+                                const contentParts = [];
+                                toolBlock.images.forEach((image) => {
+                                    const imageUrl = image.data.startsWith("data:")
+                                        ? image.data
+                                        : `data:${image.mediaType || "image/png"};base64,${image.data}`;
+                                    contentParts.push({
+                                        type: "image_url",
+                                        image_url: {
+                                            url: imageUrl,
+                                            detail: "auto",
+                                        },
+                                    });
                                 });
-                            });
-                            // Add user message
-                            recentMessages.unshift({
-                                role: "user",
-                                content: contentParts,
-                            });
-                        }
-                        else {
-                            // Normal tool message
-                            recentMessages.unshift({
-                                tool_call_id: toolBlock.id,
-                                role: "tool",
-                                content: stripAnsiColors(toolBlock.result || ""),
-                            });
+                                imageUserMessages.push({
+                                    role: "user",
+                                    content: contentParts,
+                                });
+                            }
+                            else {
+                                // Non-vision model: replace images with a text placeholder
+                                imageUserMessages.push({
+                                    role: "user",
+                                    content: "[Tool returned an image, but the current model does not support image recognition]",
+                                });
+                            }
                         }
                     }
                 });
+                // Insert image user messages after all tool messages but before the
+                // assistant message (which will be unshifted next). Since tool messages
+                // were unshifted to the front, we splice images right after them.
+                if (imageUserMessages.length > 0) {
+                    // Tool messages are at indices 0..N-1, existing messages start at N
+                    const toolMsgCount = completedToolIds.size;
+                    recentMessages.splice(toolMsgCount, 0, ...imageUserMessages);
+                }
             }
             // Construct the content of the assistant message
             let content = "";
@@ -180,28 +190,37 @@ export function convertMessagesForAPI(messages) {
                 if (block.type === "image" &&
                     block.imageUrls &&
                     block.imageUrls.length > 0) {
-                    block.imageUrls.forEach((imageUrl) => {
-                        // Check if it's already base64, convert if not
-                        let finalImageUrl = imageUrl;
-                        if (!imageUrl.startsWith("data:image/")) {
-                            // If it's a file path, it needs to be converted to base64
-                            try {
-                                finalImageUrl = convertImageToBase64(imageUrl);
-                            }
-                            catch (error) {
-                                logger.error("Failed to convert image path to base64:", imageUrl, error);
-                                // Skip this image, do not add to content
-                                return;
-                            }
-                        }
+                    if (!supportsVision) {
+                        // Non-vision model: replace images with a text placeholder
                         contentParts.push({
-                            type: "image_url",
-                            image_url: {
-                                url: finalImageUrl,
-                                detail: "auto",
-                            },
+                            type: "text",
+                            text: "[User shared an image, but the current model does not support image recognition]",
                         });
-                    });
+                    }
+                    else {
+                        block.imageUrls.forEach((imageUrl) => {
+                            // Check if it's already base64, convert if not
+                            let finalImageUrl = imageUrl;
+                            if (!imageUrl.startsWith("data:image/")) {
+                                // If it's a file path, it needs to be converted to base64
+                                try {
+                                    finalImageUrl = convertImageToBase64(imageUrl);
+                                }
+                                catch (error) {
+                                    logger.error("Failed to convert image path to base64:", imageUrl, error);
+                                    // Skip this image, do not add to content
+                                    return;
+                                }
+                            }
+                            contentParts.push({
+                                type: "image_url",
+                                image_url: {
+                                    url: finalImageUrl,
+                                    detail: "auto",
+                                },
+                            });
+                        });
+                    }
                 }
                 // If there is a tool block in user message, add its result
                 if (block.type === "tool" && block.stage === "end" && block.result) {

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

@@ -1 +1 @@
-{"version":3,"file":"mcpUtils.d.ts","sourceRoot":"","sources":["../../src/utils/mcpUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,KAAK,EAAE,UAAU,EAAc,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAgDlE;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,GACjB,0BAA0B,CAgB5B;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,CACX,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,WAAW,KAClB,OAAO,CAAC;IACX,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACtD,CAAC,GACD,UAAU,CAiCZ;AAED;;GAEG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,eAAe,EAAE,GACzB,eAAe,GAAG,SAAS,CAK7B"}
+{"version":3,"file":"mcpUtils.d.ts","sourceRoot":"","sources":["../../src/utils/mcpUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,KAAK,EAAE,UAAU,EAAc,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAgDlE;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,GACjB,0BAA0B,CAgB5B;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,CACX,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,WAAW,KAClB,OAAO,CAAC;IACX,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACtD,CAAC,GACD,UAAU,CAiCZ;AAED;;GAEG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,eAAe,EAAE,GACzB,eAAe,GAAG,SAAS,CAM7B"}

package/dist/utils/mcpUtils.js

@@ -84,5 +84,6 @@ export function createMcpToolPlugin(mcpTool, serverName, executeTool) {
  * Find which server a tool belongs to
  */
 export function findToolServer(toolName, servers) {
-    return servers.find((s) => s.status === "connected" && s.tools?.some((t) => t.name === toolName));
+    return servers.find((s) => (s.status === "connected" || s.status === "reconnecting") &&
+        s.tools?.some((t) => t.name === toolName));
 }

package/dist/utils/modelCapabilities.d.ts

@@ -0,0 +1,22 @@
+/**
+ * Model Capability Detection
+ *
+ * Pure declarative capability accessors. Capabilities are configured per-model
+ * via the `capabilities` field in `ModelConfig` (settings.json), not via regex
+ * or environment variables.
+ */
+import type { ModelCapabilities } from "../types/config.js";
+/**
+ * Determines if a model supports prompt caching.
+ * @param capabilities - Declarative model capabilities
+ * @returns True if promptCaching is explicitly enabled (default: false)
+ */
+export declare function supportsPromptCaching(capabilities?: ModelCapabilities): boolean;
+/**
+ * Determines if a model supports image/vision recognition.
+ * Opt-out semantics: by default all models are assumed to support vision.
+ * @param capabilities - Declarative model capabilities
+ * @returns True unless vision is explicitly disabled (default: true)
+ */
+export declare function supportsVision(capabilities?: ModelCapabilities): boolean;
+//# sourceMappingURL=modelCapabilities.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"modelCapabilities.d.ts","sourceRoot":"","sources":["../../src/utils/modelCapabilities.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAE5D;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,YAAY,CAAC,EAAE,iBAAiB,GAC/B,OAAO,CAET;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,YAAY,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAExE"}

package/dist/utils/modelCapabilities.js

@@ -0,0 +1,24 @@
+/**
+ * Model Capability Detection
+ *
+ * Pure declarative capability accessors. Capabilities are configured per-model
+ * via the `capabilities` field in `ModelConfig` (settings.json), not via regex
+ * or environment variables.
+ */
+/**
+ * Determines if a model supports prompt caching.
+ * @param capabilities - Declarative model capabilities
+ * @returns True if promptCaching is explicitly enabled (default: false)
+ */
+export function supportsPromptCaching(capabilities) {
+    return capabilities?.promptCaching ?? false;
+}
+/**
+ * Determines if a model supports image/vision recognition.
+ * Opt-out semantics: by default all models are assumed to support vision.
+ * @param capabilities - Declarative model capabilities
+ * @returns True unless vision is explicitly disabled (default: true)
+ */
+export function supportsVision(capabilities) {
+    return capabilities?.vision ?? true;
+}

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

@@ -1 +1 @@
-{"version":3,"file":"skillParser.d.ts","sourceRoot":"","sources":["../../src/utils/skillParser.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,eAAe,EACf,iBAAiB,EAEjB,aAAa,EACd,MAAM,mBAAmB,CAAC;AAE3B;;GAEG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,iBAAsB,GAC9B,eAAe,CAkGjB;AAyDD;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,aAAa,GAAG,MAAM,EAAE,CAwCvE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAOtD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAa5E"}
+{"version":3,"file":"skillParser.d.ts","sourceRoot":"","sources":["../../src/utils/skillParser.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,eAAe,EACf,iBAAiB,EAEjB,aAAa,EACd,MAAM,mBAAmB,CAAC;AAE3B;;GAEG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,iBAAsB,GAC9B,eAAe,CAoGjB;AAyDD;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,aAAa,GAAG,MAAM,EAAE,CAwCvE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAOtD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAa5E"}

package/dist/utils/skillParser.js

@@ -38,7 +38,9 @@ export function parseSkillFile(filePath, options = {}) {
         const skillType = skillPath.includes("/.wave/skills") ||
             skillPath.includes("\\.wave\\skills") ||
             skillPath.includes("/.claude/skills") ||
-            skillPath.includes("\\.claude\\skills")
+            skillPath.includes("\\.claude\\skills") ||
+            skillPath.includes("/.agents/skills") ||
+            skillPath.includes("\\.agents\\skills")
             ? "project"
             : "personal";
         // Extract allowed tools

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wave-agent-sdk",
-  "version": "0.18.7",
+  "version": "0.19.1",
   "description": "SDK for building AI-powered development tools and agents",
   "keywords": [
     "ai",

package/src/agent.ts

@@ -41,6 +41,7 @@ import { SkillManager } from "./managers/skillManager.js";
 import { TaskManager } from "./services/taskManager.js";
 import { btw } from "./services/aiService.js";
 import { convertMessagesForAPI } from "./utils/convertMessagesForAPI.js";
+import { supportsVision } from "./utils/modelCapabilities.js";
 import { parseTaskNotificationXml } from "./utils/notificationXml.js";
 import { InitializationService } from "./services/initializationService.js";
 import { InteractionService } from "./services/interactionService.js";
@@ -598,17 +599,20 @@ export class Agent {
       options,
     );
 
-    // Initialize OpenTelemetry (non-blocking, graceful degradation)
+    // Initialize OpenTelemetry (awaited to ensure ALS context is ready before
+    // startInteractionSpan is called, preventing trace context fragmentation)
     const telemetryConfig = this.configurationService.resolveTelemetryConfig();
-    initializeTelemetry(telemetryConfig).catch((error) => {
+    try {
+      await initializeTelemetry(telemetryConfig);
+    } catch (error) {
       this.logger?.warn("Telemetry initialization failed:", error);
-    });
+    }
 
     // Log session_start event
     try {
       const modelConfig = this.getModelConfig();
       if (modelConfig.model) {
-        logOTelEvent("session_start", {
+        await logOTelEvent("session_start", {
           sessionId: this.messageManager.getSessionId(),
           model: modelConfig.model,
           workdir: this.workdir,
@@ -992,7 +996,9 @@ export class Agent {
    * @returns Promise that resolves to the AI's answer
    */
   public async askBtw(question: string): Promise<string> {
-    const messages = convertMessagesForAPI(this.messageManager.getMessages());
+    const messages = convertMessagesForAPI(this.messageManager.getMessages(), {
+      supportsVision: supportsVision(this.getModelConfig().capabilities),
+    });
     const result = await btw({
       gatewayConfig: this.getGatewayConfig(),
       modelConfig: this.getModelConfig(),

package/src/index.ts

@@ -14,6 +14,7 @@ export * from "./managers/messageQueue.js";
 // Export all utilities
 export * from "./utils/bashParser.js";
 export * from "./utils/convertMessagesForAPI.js";
+export * from "./utils/modelCapabilities.js";
 export * from "./utils/fileSearch.js";
 export * from "./utils/globalLogger.js";
 export * from "./utils/mcpUtils.js";

package/src/managers/aiManager.ts

@@ -1,6 +1,7 @@
 import { type CallAgentOptions } from "../services/aiService.js";
 import * as aiService from "../services/aiService.js";
 import { convertMessagesForAPI } from "../utils/convertMessagesForAPI.js";
+import { supportsVision } from "../utils/modelCapabilities.js";
 import { parseTaskNotificationXml } from "../utils/notificationXml.js";
 import { calculateComprehensiveTotalTokens } from "../utils/tokenCalculation.js";
 import { estimateTokens } from "../utils/tokenEstimate.js";
@@ -45,6 +46,7 @@ import {
   endInteractionSpan,
   startLLMRequestSpan,
   endLLMRequestSpan,
+  resetTracingState,
 } from "../telemetry/sessionTracing.js";
 import { logOTelEvent } from "../telemetry/events.js";
 
@@ -492,7 +494,7 @@ export class AIManager {
       );
 
       // 7. Execute message reconstruction
-      this.messageManager.compactMessagesAndUpdateSession(
+      await this.messageManager.compactMessagesAndUpdateSession(
         enhancedSummary,
         compactUsage,
       );
@@ -523,6 +525,9 @@ export class AIManager {
 
       this.consecutiveCompactionFailures = 0;
 
+      // Reset incremental tracing state after compaction
+      resetTracingState();
+
       // 9. Log OTEL event
       logOTelEvent("compaction", {
         beforeTokens: String(messagesToCompact.length),
@@ -838,7 +843,10 @@ export class AIManager {
 
           // Get recent message history
           const rawMessages = this.messageManager.getMessages();
-          const recentMessages = convertMessagesForAPI(rawMessages);
+          const currentModelConfig = this.getModelConfig();
+          const recentMessages = convertMessagesForAPI(rawMessages, {
+            supportsVision: supportsVision(currentModelConfig.capabilities),
+          });
 
           // Track if assistant message has been created
           let assistantMessageCreated = false;
@@ -953,6 +961,17 @@ export class AIManager {
 
           llmSpan = startLLMRequestSpan(
             model || this.getModelConfig().model || "",
+            {
+              context: "interaction",
+              systemPrompt:
+                typeof callAgentOptions.systemPrompt === "string"
+                  ? callAgentOptions.systemPrompt
+                  : undefined,
+              inputMessages: callAgentOptions.messages,
+              toolsSchema: callAgentOptions.tools
+                ? JSON.stringify(callAgentOptions.tools)
+                : undefined,
+            },
           );
 
           const result = await aiService.callAgent(callAgentOptions);
@@ -966,6 +985,7 @@ export class AIManager {
             outputTokens: result.usage?.completion_tokens,
             cacheReadTokens: result.usage?.cache_read_input_tokens,
             cacheCreationTokens: result.usage?.cache_creation_input_tokens,
+            modelOutput: result.content,
           });
 
           const createdByStreaming = assistantMessageCreated;

package/src/managers/mcpManager.ts

@@ -725,11 +725,17 @@ export class McpManager {
     }
   }
 
-  // Get all tools from connected servers
+  // Get all tools from connected servers.
+  // "reconnecting" servers retain their last-known tool snapshot so that
+  // transient SSE disconnects don't churn the tool list (which would bust
+  // the prompt cache). Tools are only dropped once the server truly fails
+  // (status "error"/"disconnected").
   getAllConnectedTools(): McpTool[] {
     const allTools: McpTool[] = [];
     for (const server of this.servers.values()) {
-      if (server.status === "connected" && server.tools) {
+      const usable =
+        server.status === "connected" || server.status === "reconnecting";
+      if (usable && server.tools) {
         allTools.push(...server.tools);
       }
     }

package/src/managers/messageManager.ts

@@ -94,8 +94,6 @@ export interface MessageManagerOptions {
 export class MessageManager {
   // Private state properties
   private sessionId: string;
-  private rootSessionId: string;
-  private parentSessionId?: string;
   private messages: Message[];
   private latestTotalTokens: number;
   private workdir: string;
@@ -118,7 +116,6 @@ export class MessageManager {
     options: MessageManagerOptions,
   ) {
     this.sessionId = generateSessionId();
-    this.rootSessionId = this.sessionId;
     this.messages = [];
     this.latestTotalTokens = 0;
     this.workdir = options.workdir;
@@ -152,11 +149,7 @@ export class MessageManager {
   }
 
   public getRootSessionId(): string {
-    return this.rootSessionId;
-  }
-
-  public getParentSessionId(): string | undefined {
-    return this.parentSessionId;
+    return this.sessionId;
   }
 
   public getMessages(): Message[] {
@@ -358,8 +351,6 @@ export class MessageManager {
         unsavedMessages,
         this.workdir,
         this.sessionType,
-        this.rootSessionId,
-        this.parentSessionId,
       );
 
       // Update the saved message count
@@ -383,7 +374,6 @@ export class MessageManager {
   public clearMessages(): void {
     this.setMessages([]);
     const newSessionId = generateSessionId();
-    this.rootSessionId = newSessionId;
     this.setSessionId(newSessionId);
     this.setlatestTotalTokens(0);
     this.savedMessageCount = 0; // Reset saved message count
@@ -399,8 +389,6 @@ export class MessageManager {
   // Initialize state from session data
   public initializeFromSession(sessionData: SessionData): void {
     this.setSessionId(sessionData.id);
-    this.rootSessionId = sessionData.rootSessionId || sessionData.id;
-    this.parentSessionId = sessionData.parentSessionId;
     this.setMessages([...sessionData.messages]);
     this.setlatestTotalTokens(sessionData.metadata.latestTotalTokens);
 
@@ -563,12 +551,13 @@ export class MessageManager {
   }
 
   /**
-   * Compact messages and update session, delete compacted messages, only keep compacted messages and last 3 messages
+   * Compact messages and update session — append compact message to same file (append-only).
+   * After compaction, in-memory messages are [compactMessage, ...lastThreeMessages].
    */
-  public compactMessagesAndUpdateSession(
+  public async compactMessagesAndUpdateSession(
     compactedContent: string,
     usage?: Usage,
-  ): void {
+  ): Promise<void> {
     // Get last 2 API rounds to preserve (structurally safe boundary)
     const lastThreeMessages = getLastApiRounds(this.messages, 2);
 
@@ -580,23 +569,27 @@ export class MessageManager {
         {
           type: "compact",
           content: compactedContent,
-          sessionId: this.sessionId,
         },
       ],
       timestamp: new Date().toISOString(),
       ...(usage && { usage }),
     };
 
-    // Build new message array: keep the compacted message and last 3 messages
+    // Build new message array: keep the compacted message and last messages
     const newMessages: Message[] = [compactMessage, ...lastThreeMessages];
 
-    // Update sessionId and parentSessionId
-    const oldSessionId = this.sessionId;
-    this.setSessionId(generateSessionId());
-    this.parentSessionId = oldSessionId;
+    // APPEND to the same session file (append-only, like Claude Code)
+    const { appendMessages } = await import("../services/session.js");
+    await appendMessages(
+      this.sessionId,
+      newMessages,
+      this.workdir,
+      this.sessionType,
+    );
 
-    // Set new message list
+    // Update in-memory state
     this.setMessages(newMessages);
+    this.savedMessageCount = newMessages.length;
 
     // Clear and rebuild loaded rule IDs from remaining meta messages
     this.clearLoadedRuleIds();
@@ -911,101 +904,26 @@ export class MessageManager {
     index: number,
     reversionManager?: import("./reversionManager.js").ReversionManager,
   ): Promise<void> {
-    const { messages, sessionIds } = await this.getFullMessageThread();
+    const { messages } = await this.getFullMessageThread();
 
     if (index < 0 || index >= messages.length) {
       throw new Error(`Invalid message index: ${index}`);
     }
 
-    // Find which session the index belongs to
-    let targetSessionId = this.sessionId;
-    let targetIndexInSession = index;
-
-    // We need to be careful here because loadFullMessageThread might have removed "compact" blocks
-    // Let's re-calculate based on the actual messages returned.
-    // Actually, it's easier to just load sessions one by one again or keep track of counts.
-
-    // For simplicity, let's assume we want to truncate the WHOLE thread.
-    // If the index is in a previous session, we need to:
-    // 1. Load that session.
-    // 2. Truncate it.
-    // 3. Make it the current session.
-    // 4. Delete/Invalidate subsequent sessions.
-
-    // To correctly map 'index' to a session, we need to know the message count of each session
-    // as they appear in the concatenated 'messages' array.
-
-    let remainingIndex = index;
-    const { loadSessionFromJsonl } = await import("../services/session.js");
-
-    for (const sid of sessionIds) {
-      const sessionData = await loadSessionFromJsonl(sid, this.workdir);
-      if (!sessionData) continue;
-
-      const sessionMessages = sessionData.messages;
-      // If this is not the first session in the thread, it might have a compact block at the start
-      // that was removed in getFullMessageThread.
-      const hasCompactBlock = sessionMessages[0]?.blocks.some(
-        (b) => b.type === "compact",
-      );
-      const effectiveMessages =
-        hasCompactBlock && sid !== sessionIds[0]
-          ? sessionMessages.slice(1)
-          : sessionMessages;
-
-      if (remainingIndex < effectiveMessages.length) {
-        targetSessionId = sid;
-        targetIndexInSession = hasCompactBlock
-          ? remainingIndex + 1
-          : remainingIndex;
-        break;
-      }
-      remainingIndex -= effectiveMessages.length;
-    }
-
-    // Load the target session to perform truncation
-    const targetSessionData = await loadSessionFromJsonl(
-      targetSessionId,
-      this.workdir,
-    );
-    if (!targetSessionData)
-      throw new Error(`Target session ${targetSessionId} not found`);
-
-    // Identify messages to be removed (from the whole thread)
+    const newMessages = messages.slice(0, index);
     const messagesToRemove = messages.slice(index);
     const messageIdsToRemove = messagesToRemove
       .map((m) => m.id as string)
       .filter((id) => !!id);
 
-    // Revert file changes if manager is provided
     if (reversionManager && messageIdsToRemove.length > 0) {
       await reversionManager.revertTo(messageIdsToRemove, messages);
     }
 
-    // Truncate messages in the target session
-    const newMessagesInSession = targetSessionData.messages.slice(
-      0,
-      targetIndexInSession,
-    );
-
-    // Update target session file
-    this.sessionId = targetSessionId;
-    this.rootSessionId = targetSessionData.rootSessionId || targetSessionId;
-    this.parentSessionId = targetSessionData.parentSessionId;
-    this.transcriptPath = this.computeTranscriptPath();
-
-    await this.rewriteSessionFile(newMessagesInSession);
-
-    // Update in-memory messages to the truncated session messages
-    // We do NOT include ancestor messages here to avoid exceeding context limits.
-    // The 'compact' block at the start of the session (if any) already summarizes them.
-    this.setMessages(newMessagesInSession);
-
-    // Update saved message count
-    this.savedMessageCount = newMessagesInSession.length;
-
-    // Notify session ID change if it changed
-    this.callbacks.onSessionIdChange?.(this.sessionId);
+    // Rewrite file with truncated messages
+    await this.rewriteSessionFile(newMessages);
+    this.setMessages(newMessages);
+    this.savedMessageCount = newMessages.length;
   }
 
   /**