wave-agent-sdk 0.0.6 → 0.0.8

package/dist/utils/messageOperations.d.ts

@@ -1,18 +1,18 @@
 import type { Message, Usage } from "../types/index.js";
+import { MessageSource } from "../types/index.js";
+import type { SubagentConfiguration } from "./subagentParser.js";
 import { ChatCompletionMessageFunctionToolCall } from "openai/resources.js";
-export interface AddUserMessageParams {
-    messages: Message[];
+export interface UserMessageParams {
     content: string;
     images?: Array<{
         path: string;
         mimeType: string;
     }>;
-    customCommandBlock?: {
-        type: "custom_command";
-        commandName: string;
-        content: string;
-        originalInput?: string;
-    };
+    customCommandContent?: string;
+    source?: MessageSource;
+}
+export interface AddUserMessageParams extends UserMessageParams {
+    messages: Message[];
 }
 export interface UpdateToolBlockParams {
     messages: Message[];
@@ -21,7 +21,14 @@ export interface UpdateToolBlockParams {
     result?: string;
     success?: boolean;
     error?: string;
-    isRunning?: boolean;
+    /**
+     * Tool execution stage:
+     * - 'start': Tool call initiated during AI streaming
+     * - 'streaming': Tool parameters being received incrementally
+     * - 'running': Tool execution in progress
+     * - 'end': Tool execution completed with final result
+     */
+    stage: "start" | "streaming" | "running" | "end";
     name?: string;
     shortResult?: string;
     images?: Array<{
@@ -29,18 +36,9 @@ export interface UpdateToolBlockParams {
         mediaType?: string;
     }>;
     compactParams?: string;
+    parametersChunk?: string;
 }
-export interface AgentToolBlockUpdateParams {
-    toolId: string;
-    args?: string;
-    result?: string;
-    success?: boolean;
-    error?: string;
-    isRunning?: boolean;
-    name?: string;
-    shortResult?: string;
-    compactParams?: string;
-}
+export type AgentToolBlockUpdateParams = Omit<UpdateToolBlockParams, "messages">;
 export interface AddDiffBlockParams {
     messages: Message[];
     path: string;
@@ -77,6 +75,7 @@ export interface CompleteCommandParams {
 }
 /**
  * Extract text content from user messages in the messages array
+ * Excludes messages with source HOOK to prevent hook-generated content from entering user history
  */
 export declare const extractUserInputHistory: (messages: Message[]) => string[];
 /**
@@ -85,10 +84,10 @@ export declare const extractUserInputHistory: (messages: Message[]) => string[];
  * @returns base64 format image data URL
  */
 export declare const convertImageToBase64: (imagePath: string) => string;
-export declare const addUserMessageToMessages: ({ messages, content, images, customCommandBlock, }: AddUserMessageParams) => Message[];
-export declare const addAssistantMessageToMessages: (messages: Message[], content?: string, toolCalls?: ChatCompletionMessageFunctionToolCall[], usage?: Usage) => Message[];
+export declare const addUserMessageToMessages: ({ messages, content, images, customCommandContent, source, }: AddUserMessageParams) => Message[];
+export declare const addAssistantMessageToMessages: (messages: Message[], content?: string, toolCalls?: ChatCompletionMessageFunctionToolCall[], usage?: Usage, metadata?: Record<string, unknown>) => Message[];
 export declare const addDiffBlockToMessage: ({ messages, path, diffResult, }: AddDiffBlockParams) => Message[];
-export declare const updateToolBlockInMessage: ({ messages, id, parameters, result, success, error, isRunning, name, shortResult, images, compactParams, }: UpdateToolBlockParams) => Message[];
+export declare const updateToolBlockInMessage: ({ messages, id, parameters, result, success, error, stage, name, shortResult, images, compactParams, parametersChunk, }: UpdateToolBlockParams) => Message[];
 export declare const addErrorBlockToMessage: ({ messages, error, }: AddErrorBlockParams) => Message[];
 export declare const addMemoryBlockToMessage: ({ messages, content, isSuccess, memoryType, storagePath, }: AddMemoryBlockParams) => Message[];
 /**
@@ -120,18 +119,19 @@ export interface AddSubagentBlockParams {
     subagentId: string;
     subagentName: string;
     status: "active" | "completed" | "error" | "aborted";
-    subagentMessages?: Message[];
+    sessionId: string;
+    configuration: SubagentConfiguration;
 }
 export interface UpdateSubagentBlockParams {
     messages: Message[];
     subagentId: string;
     status: "active" | "completed" | "error" | "aborted";
-    subagentMessages: Message[];
+    sessionId?: string;
 }
-export declare const addSubagentBlockToMessage: ({ messages, subagentId, subagentName, status, subagentMessages, }: AddSubagentBlockParams) => Message[];
+export declare const addSubagentBlockToMessage: ({ messages, subagentId, subagentName, status, sessionId, configuration, }: AddSubagentBlockParams) => Message[];
 export declare const updateSubagentBlockInMessage: (messages: Message[], subagentId: string, updates: Partial<{
     status: "active" | "completed" | "error" | "aborted";
-    messages: Message[];
+    sessionId: string;
 }>) => Message[];
 /**
  * Removes the last user message from the messages array

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

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

package/dist/utils/messageOperations.js

@@ -1,14 +1,17 @@
+import { MessageSource } from "../types/index.js";
 import { readFileSync } from "fs";
 import { extname } from "path";
+import { logger } from "./globalLogger.js";
 /**
  * Extract text content from user messages in the messages array
+ * Excludes messages with source HOOK to prevent hook-generated content from entering user history
  */
 export const extractUserInputHistory = (messages) => {
     return messages
         .filter((message) => message.role === "user")
         .map((message) => {
-        // Extract all text block content and merge
-        const textBlocks = message.blocks.filter((block) => block.type === "text");
+        // Extract text block content, excluding HOOK-sourced blocks
+        const textBlocks = message.blocks.filter((block) => block.type === "text" && block.source !== MessageSource.HOOK);
         return textBlocks
             .map((block) => block.content)
             .join(" ")
@@ -50,22 +53,23 @@ export const convertImageToBase64 = (imagePath) => {
         const base64String = imageBuffer.toString("base64");
         return `data:${mimeType};base64,${base64String}`;
     }
-    catch {
-        // logger.error(`Failed to convert image to base64: ${imagePath}`, error);
+    catch (error) {
+        logger.error(`Failed to convert image to base64: ${imagePath}`, error);
         // Return an error placeholder or throw error
         return `data:image/png;base64,`; // Empty base64, avoid program crash
     }
 };
 // Add user message
-export const addUserMessageToMessages = ({ messages, content, images, customCommandBlock, }) => {
+export const addUserMessageToMessages = ({ messages, content, images, customCommandContent, source, }) => {
     const blocks = [];
-    // If there's a custom command block, use it instead of text content
-    if (customCommandBlock) {
-        blocks.push(customCommandBlock);
-    }
-    else {
-        blocks.push({ type: "text", content });
-    }
+    // Create text block with optional customCommandContent and source
+    const textBlock = {
+        type: "text",
+        content,
+        ...(customCommandContent && { customCommandContent }),
+        ...(source && { source }),
+    };
+    blocks.push(textBlock);
     // If there are images, add image block
     if (images && images.length > 0) {
         const imageUrls = images.map((img) => img.path);
@@ -81,7 +85,7 @@ export const addUserMessageToMessages = ({ messages, content, images, customComm
     return [...messages, userMessage];
 };
 // Add assistant message (support one-time addition of answer and tool calls)
-export const addAssistantMessageToMessages = (messages, content, toolCalls, usage) => {
+export const addAssistantMessageToMessages = (messages, content, toolCalls, usage, metadata) => {
     const blocks = [];
     // If there's answer content, add text block
     if (content) {
@@ -96,7 +100,7 @@ export const addAssistantMessageToMessages = (messages, content, toolCalls, usag
                 result: "",
                 id: toolCall.id || "",
                 name: toolCall.function?.name || "",
-                isRunning: false,
+                stage: "start",
             });
         });
     }
@@ -104,6 +108,7 @@ export const addAssistantMessageToMessages = (messages, content, toolCalls, usag
         role: "assistant",
         blocks,
         usage, // Include usage data if provided
+        ...(metadata ? { metadata: { ...metadata } } : {}),
     };
     return [...messages, initialAssistantMessage];
 };
@@ -125,7 +130,7 @@ export const addDiffBlockToMessage = ({ messages, path, diffResult, }) => {
     return newMessages;
 };
 // Update Tool Block of the last assistant message
-export const updateToolBlockInMessage = ({ messages, id, parameters, result, success, error, isRunning, name, shortResult, images, compactParams, }) => {
+export const updateToolBlockInMessage = ({ messages, id, parameters, result, success, error, stage, name, shortResult, images, compactParams, parametersChunk, }) => {
     const newMessages = [...messages];
     // Find the last assistant message
     for (let i = newMessages.length - 1; i >= 0; i--) {
@@ -144,26 +149,30 @@ export const updateToolBlockInMessage = ({ messages, id, parameters, result, suc
                         toolBlock.success = success;
                     if (error !== undefined)
                         toolBlock.error = error;
-                    if (isRunning !== undefined)
-                        toolBlock.isRunning = isRunning;
+                    if (stage !== undefined)
+                        toolBlock.stage = stage;
                     if (compactParams !== undefined)
                         toolBlock.compactParams = compactParams;
+                    if (parametersChunk !== undefined)
+                        toolBlock.parametersChunk = parametersChunk;
                 }
             }
-            else if (result !== undefined) {
+            else {
                 // If existing block not found, create new one
+                // This handles cases where we're streaming tool parameters before execution
                 newMessages[i].blocks.push({
                     type: "tool",
                     parameters: parameters,
-                    result: result,
+                    result: result || "",
                     shortResult: shortResult,
                     images: images, // Add image data
                     id: id,
                     name: name || "unknown",
                     success: success,
                     error: error,
-                    isRunning: isRunning ?? false,
+                    stage: stage ?? "start",
                     compactParams: compactParams,
+                    parametersChunk: parametersChunk,
                 });
             }
             break;
@@ -174,23 +183,23 @@ export const updateToolBlockInMessage = ({ messages, id, parameters, result, suc
 // Add Error Block to the last assistant message
 export const addErrorBlockToMessage = ({ messages, error, }) => {
     const newMessages = [...messages];
-    // Find the last assistant message
-    let assistantMessageFound = false;
-    for (let i = newMessages.length - 1; i >= 0; i--) {
-        if (newMessages[i].role === "assistant") {
-            newMessages[i].blocks = [
-                ...newMessages[i].blocks,
+    // Check if the last message is an assistant message
+    const lastMessage = newMessages[newMessages.length - 1];
+    if (lastMessage && lastMessage.role === "assistant") {
+        // Create a new message object with the error block added
+        newMessages[newMessages.length - 1] = {
+            ...lastMessage,
+            blocks: [
+                ...lastMessage.blocks,
                 {
                     type: "error",
                     content: error,
                 },
-            ];
-            assistantMessageFound = true;
-            break;
-        }
+            ],
+        };
     }
-    // If no assistant message found, create a new assistant message with only error block
-    if (!assistantMessageFound) {
+    else {
+        // If the last message is not an assistant message, create a new assistant message
         newMessages.push({
             role: "assistant",
             blocks: [
@@ -333,7 +342,7 @@ export const completeCommandInMessage = ({ messages, command, exitCode, }) => {
     }
     return newMessages;
 };
-export const addSubagentBlockToMessage = ({ messages, subagentId, subagentName, status, subagentMessages = [], }) => {
+export const addSubagentBlockToMessage = ({ messages, subagentId, subagentName, status, sessionId, configuration, }) => {
     const newMessages = [...messages];
     // Find the last assistant message or create one
     let lastAssistantMessage = newMessages[newMessages.length - 1];
@@ -351,7 +360,8 @@ export const addSubagentBlockToMessage = ({ messages, subagentId, subagentName,
         subagentId,
         subagentName,
         status,
-        messages: subagentMessages,
+        sessionId,
+        configuration,
     });
     return newMessages;
 };
@@ -366,8 +376,8 @@ export const updateSubagentBlockInMessage = (messages, subagentId, updates) => {
                     if (updates.status !== undefined) {
                         block.status = updates.status;
                     }
-                    if (updates.messages !== undefined) {
-                        block.messages = updates.messages;
+                    if (updates.sessionId !== undefined) {
+                        block.sessionId = updates.sessionId;
                     }
                     return newMessages;
                 }

package/dist/utils/pathEncoder.d.ts

@@ -0,0 +1,104 @@
+/**
+ * Path encoding utility for converting working directory paths to filesystem-safe names
+ * Handles cross-platform directory name encoding for project-based session organization
+ */
+/**
+ * Project directory information
+ */
+export interface ProjectDirectory {
+    readonly originalPath: string;
+    readonly encodedName: string;
+    readonly encodedPath: string;
+    readonly pathHash?: string;
+    readonly isSymbolicLink: boolean;
+}
+/**
+ * Path encoding configuration options
+ */
+export interface PathEncodingOptions {
+    maxLength?: number;
+    pathSeparatorReplacement?: string;
+    spaceReplacement?: string;
+    invalidCharReplacement?: string;
+    preserveCase?: boolean;
+    hashLength?: number;
+}
+/**
+ * Platform-specific filesystem constraints
+ */
+export interface FilesystemConstraints {
+    readonly maxDirectoryNameLength: number;
+    readonly maxPathLength: number;
+    readonly invalidCharacters: string[];
+    readonly reservedNames: string[];
+    readonly caseSensitive: boolean;
+}
+/**
+ * Path validation result
+ */
+export interface PathValidationResult {
+    readonly isValid: boolean;
+    readonly errors: string[];
+    readonly warnings: string[];
+    readonly suggestedFix?: string;
+}
+/**
+ * PathEncoder class for converting working directory paths to filesystem-safe names
+ */
+export declare class PathEncoder {
+    private readonly options;
+    private readonly constraints;
+    constructor(options?: PathEncodingOptions);
+    /**
+     * Encode a working directory path to a filesystem-safe directory name
+     */
+    encode(originalPath: string): Promise<string>;
+    /**
+     * Synchronously encode a path to a filesystem-safe directory name
+     * Note: Does not resolve symbolic links - use encode() for full path resolution
+     */
+    encodeSync(pathToEncode: string): string;
+    /**
+     * Decode an encoded directory name back to original path (limited functionality)
+     * Note: This is best-effort as encoding is lossy
+     */
+    decode(encodedName: string): Promise<string | null>;
+    /**
+     * Synchronously decode an encoded directory name back to original path (limited functionality)
+     * Note: This is best-effort as encoding is lossy
+     */
+    decodeSync(encodedName: string): string | null;
+    /**
+     * Resolve symbolic links and normalize path before encoding
+     */
+    resolvePath(path: string): Promise<string>;
+    /**
+     * Create project directory entity from original path
+     */
+    createProjectDirectory(originalPath: string, baseSessionDir: string): Promise<ProjectDirectory>;
+    /**
+     * Validate that an encoded name is filesystem-safe
+     */
+    validateEncodedName(encodedName: string): boolean;
+    /**
+     * Handle encoding collisions by generating unique names
+     */
+    resolveCollision(baseName: string, existingNames: Set<string>): string;
+    /**
+     * Get platform-specific filesystem constraints
+     */
+    private getFilesystemConstraints;
+    /**
+     * Generate hash for collision resolution
+     */
+    private generateHash;
+    /**
+     * Expand tilde (~) to home directory
+     */
+    private expandTilde;
+}
+/**
+ * Default PathEncoder instance
+ */
+export declare const pathEncoder: PathEncoder;
+//# sourceMappingURL=pathEncoder.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"pathEncoder.d.ts","sourceRoot":"","sources":["../../src/utils/pathEncoder.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;CAClC;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,sBAAsB,EAAE,MAAM,CAAC;IACxC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,iBAAiB,EAAE,MAAM,EAAE,CAAC;IACrC,QAAQ,CAAC,aAAa,EAAE,MAAM,EAAE,CAAC;IACjC,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;CACjC;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;IAC5B,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;CAChC;AAED;;GAEG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgC;IACxD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAwB;gBAExC,OAAO,GAAE,mBAAwB;IAY7C;;OAEG;IACG,MAAM,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAMnD;;;OAGG;IACH,UAAU,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IAyCxC;;;OAGG;IACG,MAAM,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAIzD;;;OAGG;IACH,UAAU,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAgC9C;;OAEG;IACG,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAiBhD;;OAEG;IACG,sBAAsB,CAC1B,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,gBAAgB,CAAC;IA0C5B;;OAEG;IACH,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO;IA+BjD;;OAEG;IACH,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM;IAqBtE;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAsDhC;;OAEG;IACH,OAAO,CAAC,YAAY;IAOpB;;OAEG;IACH,OAAO,CAAC,WAAW;CAMpB;AAED;;GAEG;AACH,eAAO,MAAM,WAAW,aAAoB,CAAC"}