codebuff 1.0.330 → 1.0.332

package/dist/common/websockets/websocket-schema.d.ts

@@ -279,16 +279,16 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 }[] | undefined;
             }>;
             toolResults: z.ZodArray<z.ZodObject<{
-                name: z.ZodString;
+                toolName: z.ZodString;
+                toolCallId: z.ZodString;
                 result: z.ZodString;
-                id: z.ZodString;
             }, "strip", z.ZodTypeAny, {
-                name: string;
-                id: string;
+                toolName: string;
+                toolCallId: string;
                 result: string;
             }, {
-                name: string;
-                id: string;
+                toolName: string;
+                toolCallId: string;
                 result: string;
             }>, "many">;
             model: z.ZodOptional<z.ZodString>;
@@ -341,8 +341,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 agentStepsRemaining: number;
             };
             toolResults: {
-                name: string;
-                id: string;
+                toolName: string;
+                toolCallId: string;
                 result: string;
             }[];
             prompt?: string | undefined;
@@ -396,8 +396,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 }[] | undefined;
             };
             toolResults: {
-                name: string;
-                id: string;
+                toolName: string;
+                toolCallId: string;
                 result: string;
             }[];
             prompt?: string | undefined;
@@ -406,446 +406,90 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
             model?: string | undefined;
             repoUrl?: string | undefined;
         }>, z.ZodObject<{
-            type: z.ZodLiteral<"manager-prompt">;
-            promptId: z.ZodString;
-            prompt: z.ZodOptional<z.ZodString>;
-            agentState: z.ZodObject<{
-                agentContext: z.ZodString;
-                fileContext: z.ZodObject<{
-                    projectRoot: z.ZodString;
-                    cwd: z.ZodString;
-                    fileTree: z.ZodArray<z.ZodType<import("../util/file").FileTreeNode, z.ZodTypeDef, import("../util/file").FileTreeNode>, "many">;
-                    fileTokenScores: z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodNumber>>;
-                    tokenCallers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodArray<z.ZodString, "many">>>>;
-                    knowledgeFiles: z.ZodRecord<z.ZodString, z.ZodString>;
-                    userKnowledgeFiles: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
-                    gitChanges: z.ZodObject<{
-                        status: z.ZodString;
-                        diff: z.ZodString;
-                        diffCached: z.ZodString;
-                        lastCommitMessages: z.ZodString;
-                    }, "strip", z.ZodTypeAny, {
-                        status: string;
-                        diff: string;
-                        diffCached: string;
-                        lastCommitMessages: string;
-                    }, {
-                        status: string;
-                        diff: string;
-                        diffCached: string;
-                        lastCommitMessages: string;
-                    }>;
-                    changesSinceLastChat: z.ZodRecord<z.ZodString, z.ZodString>;
-                    shellConfigFiles: z.ZodRecord<z.ZodString, z.ZodString>;
-                    systemInfo: z.ZodObject<{
-                        platform: z.ZodString;
-                        shell: z.ZodString;
-                        nodeVersion: z.ZodString;
-                        arch: z.ZodString;
-                        homedir: z.ZodString;
-                        cpus: z.ZodNumber;
-                    }, "strip", z.ZodTypeAny, {
-                        platform: string;
-                        shell: string;
-                        nodeVersion: string;
-                        arch: string;
-                        homedir: string;
-                        cpus: number;
-                    }, {
-                        platform: string;
-                        shell: string;
-                        nodeVersion: string;
-                        arch: string;
-                        homedir: string;
-                        cpus: number;
-                    }>;
-                    fileVersions: z.ZodOptional<z.ZodArray<z.ZodArray<z.ZodObject<{
-                        path: z.ZodString;
-                        content: z.ZodString;
-                    }, "strip", z.ZodTypeAny, {
-                        path: string;
-                        content: string;
-                    }, {
-                        path: string;
-                        content: string;
-                    }>, "many">, "many">>;
+            type: z.ZodLiteral<"read-files-response">;
+            files: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodString, z.ZodNull]>>;
+            requestId: z.ZodOptional<z.ZodString>;
+        }, "strip", z.ZodTypeAny, {
+            type: "read-files-response";
+            files: Record<string, string | null>;
+            requestId?: string | undefined;
+        }, {
+            type: "read-files-response";
+            files: Record<string, string | null>;
+            requestId?: string | undefined;
+        }>, z.ZodObject<{
+            type: z.ZodLiteral<"init">;
+            fingerprintId: z.ZodString;
+            authToken: z.ZodOptional<z.ZodString>;
+            fileContext: z.ZodObject<{
+                projectRoot: z.ZodString;
+                cwd: z.ZodString;
+                fileTree: z.ZodArray<z.ZodType<import("../util/file").FileTreeNode, z.ZodTypeDef, import("../util/file").FileTreeNode>, "many">;
+                fileTokenScores: z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodNumber>>;
+                tokenCallers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodArray<z.ZodString, "many">>>>;
+                knowledgeFiles: z.ZodRecord<z.ZodString, z.ZodString>;
+                userKnowledgeFiles: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+                gitChanges: z.ZodObject<{
+                    status: z.ZodString;
+                    diff: z.ZodString;
+                    diffCached: z.ZodString;
+                    lastCommitMessages: z.ZodString;
                 }, "strip", z.ZodTypeAny, {
-                    projectRoot: string;
-                    cwd: string;
-                    fileTree: import("../util/file").FileTreeNode[];
-                    fileTokenScores: Record<string, Record<string, number>>;
-                    knowledgeFiles: Record<string, string>;
-                    gitChanges: {
-                        status: string;
-                        diff: string;
-                        diffCached: string;
-                        lastCommitMessages: string;
-                    };
-                    changesSinceLastChat: Record<string, string>;
-                    shellConfigFiles: Record<string, string>;
-                    systemInfo: {
-                        platform: string;
-                        shell: string;
-                        nodeVersion: string;
-                        arch: string;
-                        homedir: string;
-                        cpus: number;
-                    };
-                    tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-                    userKnowledgeFiles?: Record<string, string> | undefined;
-                    fileVersions?: {
-                        path: string;
-                        content: string;
-                    }[][] | undefined;
+                    status: string;
+                    diff: string;
+                    diffCached: string;
+                    lastCommitMessages: string;
                 }, {
-                    projectRoot: string;
-                    cwd: string;
-                    fileTree: import("../util/file").FileTreeNode[];
-                    fileTokenScores: Record<string, Record<string, number>>;
-                    knowledgeFiles: Record<string, string>;
-                    gitChanges: {
-                        status: string;
-                        diff: string;
-                        diffCached: string;
-                        lastCommitMessages: string;
-                    };
-                    changesSinceLastChat: Record<string, string>;
-                    shellConfigFiles: Record<string, string>;
-                    systemInfo: {
-                        platform: string;
-                        shell: string;
-                        nodeVersion: string;
-                        arch: string;
-                        homedir: string;
-                        cpus: number;
-                    };
-                    tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-                    userKnowledgeFiles?: Record<string, string> | undefined;
-                    fileVersions?: {
-                        path: string;
-                        content: string;
-                    }[][] | undefined;
+                    status: string;
+                    diff: string;
+                    diffCached: string;
+                    lastCommitMessages: string;
                 }>;
-                messageHistory: z.ZodArray<z.ZodIntersection<z.ZodType<import("ai").CoreMessage, z.ZodTypeDef, import("ai").CoreMessage>, z.ZodObject<{
-                    timeToLive: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"agentStep">, z.ZodLiteral<"userPrompt">]>>;
+                changesSinceLastChat: z.ZodRecord<z.ZodString, z.ZodString>;
+                shellConfigFiles: z.ZodRecord<z.ZodString, z.ZodString>;
+                systemInfo: z.ZodObject<{
+                    platform: z.ZodString;
+                    shell: z.ZodString;
+                    nodeVersion: z.ZodString;
+                    arch: z.ZodString;
+                    homedir: z.ZodString;
+                    cpus: z.ZodNumber;
                 }, "strip", z.ZodTypeAny, {
-                    timeToLive?: "agentStep" | "userPrompt" | undefined;
+                    platform: string;
+                    shell: string;
+                    nodeVersion: string;
+                    arch: string;
+                    homedir: string;
+                    cpus: number;
                 }, {
-                    timeToLive?: "agentStep" | "userPrompt" | undefined;
-                }>>, "many">;
-                agents: z.ZodDefault<z.ZodArray<z.ZodType<{
-                    agentId: string;
-                    agentName: import("../types/agent-state").AgentTemplateName;
-                    agents: import("../types/agent-state").SubagentState[];
-                    messageHistory: import("../types/message").CodebuffMessage[];
-                }, z.ZodTypeDef, {
-                    agentId: string;
-                    agentName: import("../types/agent-state").AgentTemplateName;
-                    agents: import("../types/agent-state").SubagentState[];
-                    messageHistory: import("../types/message").CodebuffMessage[];
-                }>, "many">>;
-                agentStepsRemaining: z.ZodNumber;
+                    platform: string;
+                    shell: string;
+                    nodeVersion: string;
+                    arch: string;
+                    homedir: string;
+                    cpus: number;
+                }>;
+                fileVersions: z.ZodOptional<z.ZodArray<z.ZodArray<z.ZodObject<{
+                    path: z.ZodString;
+                    content: z.ZodString;
+                }, "strip", z.ZodTypeAny, {
+                    path: string;
+                    content: string;
+                }, {
+                    path: string;
+                    content: string;
+                }>, "many">, "many">>;
             }, "strip", z.ZodTypeAny, {
-                agentContext: string;
-                fileContext: {
-                    projectRoot: string;
-                    cwd: string;
-                    fileTree: import("../util/file").FileTreeNode[];
-                    fileTokenScores: Record<string, Record<string, number>>;
-                    knowledgeFiles: Record<string, string>;
-                    gitChanges: {
-                        status: string;
-                        diff: string;
-                        diffCached: string;
-                        lastCommitMessages: string;
-                    };
-                    changesSinceLastChat: Record<string, string>;
-                    shellConfigFiles: Record<string, string>;
-                    systemInfo: {
-                        platform: string;
-                        shell: string;
-                        nodeVersion: string;
-                        arch: string;
-                        homedir: string;
-                        cpus: number;
-                    };
-                    tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-                    userKnowledgeFiles?: Record<string, string> | undefined;
-                    fileVersions?: {
-                        path: string;
-                        content: string;
-                    }[][] | undefined;
-                };
-                messageHistory: (import("ai").CoreMessage & {
-                    timeToLive?: "agentStep" | "userPrompt" | undefined;
-                })[];
-                agents: {
-                    agentId: string;
-                    agentName: import("../types/agent-state").AgentTemplateName;
-                    agents: import("../types/agent-state").SubagentState[];
-                    messageHistory: import("../types/message").CodebuffMessage[];
-                }[];
-                agentStepsRemaining: number;
-            }, {
-                agentContext: string;
-                fileContext: {
-                    projectRoot: string;
-                    cwd: string;
-                    fileTree: import("../util/file").FileTreeNode[];
-                    fileTokenScores: Record<string, Record<string, number>>;
-                    knowledgeFiles: Record<string, string>;
-                    gitChanges: {
-                        status: string;
-                        diff: string;
-                        diffCached: string;
-                        lastCommitMessages: string;
-                    };
-                    changesSinceLastChat: Record<string, string>;
-                    shellConfigFiles: Record<string, string>;
-                    systemInfo: {
-                        platform: string;
-                        shell: string;
-                        nodeVersion: string;
-                        arch: string;
-                        homedir: string;
-                        cpus: number;
-                    };
-                    tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-                    userKnowledgeFiles?: Record<string, string> | undefined;
-                    fileVersions?: {
-                        path: string;
-                        content: string;
-                    }[][] | undefined;
-                };
-                messageHistory: (import("ai").CoreMessage & {
-                    timeToLive?: "agentStep" | "userPrompt" | undefined;
-                })[];
-                agentStepsRemaining: number;
-                agents?: {
-                    agentId: string;
-                    agentName: import("../types/agent-state").AgentTemplateName;
-                    agents: import("../types/agent-state").SubagentState[];
-                    messageHistory: import("../types/message").CodebuffMessage[];
-                }[] | undefined;
-            }>;
-            toolResults: z.ZodArray<z.ZodObject<{
-                name: z.ZodString;
-                result: z.ZodString;
-                id: z.ZodString;
-            }, "strip", z.ZodTypeAny, {
-                name: string;
-                id: string;
-                result: string;
-            }, {
-                name: string;
-                id: string;
-                result: string;
-            }>, "many">;
-            fingerprintId: z.ZodString;
-            authToken: z.ZodOptional<z.ZodString>;
-            costMode: z.ZodDefault<z.ZodOptional<z.ZodEnum<["lite", "normal", "max", "experimental", "ask"]>>>;
-            model: z.ZodOptional<z.ZodString>;
-            cwd: z.ZodOptional<z.ZodString>;
-            repoName: z.ZodOptional<z.ZodString>;
-        }, "strip", z.ZodTypeAny, {
-            type: "manager-prompt";
-            promptId: string;
-            fingerprintId: string;
-            costMode: "max" | "lite" | "normal" | "experimental" | "ask";
-            agentState: {
-                agentContext: string;
-                fileContext: {
-                    projectRoot: string;
-                    cwd: string;
-                    fileTree: import("../util/file").FileTreeNode[];
-                    fileTokenScores: Record<string, Record<string, number>>;
-                    knowledgeFiles: Record<string, string>;
-                    gitChanges: {
-                        status: string;
-                        diff: string;
-                        diffCached: string;
-                        lastCommitMessages: string;
-                    };
-                    changesSinceLastChat: Record<string, string>;
-                    shellConfigFiles: Record<string, string>;
-                    systemInfo: {
-                        platform: string;
-                        shell: string;
-                        nodeVersion: string;
-                        arch: string;
-                        homedir: string;
-                        cpus: number;
-                    };
-                    tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-                    userKnowledgeFiles?: Record<string, string> | undefined;
-                    fileVersions?: {
-                        path: string;
-                        content: string;
-                    }[][] | undefined;
-                };
-                messageHistory: (import("ai").CoreMessage & {
-                    timeToLive?: "agentStep" | "userPrompt" | undefined;
-                })[];
-                agents: {
-                    agentId: string;
-                    agentName: import("../types/agent-state").AgentTemplateName;
-                    agents: import("../types/agent-state").SubagentState[];
-                    messageHistory: import("../types/message").CodebuffMessage[];
-                }[];
-                agentStepsRemaining: number;
-            };
-            toolResults: {
-                name: string;
-                id: string;
-                result: string;
-            }[];
-            cwd?: string | undefined;
-            prompt?: string | undefined;
-            authToken?: string | undefined;
-            model?: string | undefined;
-            repoName?: string | undefined;
-        }, {
-            type: "manager-prompt";
-            promptId: string;
-            fingerprintId: string;
-            agentState: {
-                agentContext: string;
-                fileContext: {
-                    projectRoot: string;
-                    cwd: string;
-                    fileTree: import("../util/file").FileTreeNode[];
-                    fileTokenScores: Record<string, Record<string, number>>;
-                    knowledgeFiles: Record<string, string>;
-                    gitChanges: {
-                        status: string;
-                        diff: string;
-                        diffCached: string;
-                        lastCommitMessages: string;
-                    };
-                    changesSinceLastChat: Record<string, string>;
-                    shellConfigFiles: Record<string, string>;
-                    systemInfo: {
-                        platform: string;
-                        shell: string;
-                        nodeVersion: string;
-                        arch: string;
-                        homedir: string;
-                        cpus: number;
-                    };
-                    tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-                    userKnowledgeFiles?: Record<string, string> | undefined;
-                    fileVersions?: {
-                        path: string;
-                        content: string;
-                    }[][] | undefined;
-                };
-                messageHistory: (import("ai").CoreMessage & {
-                    timeToLive?: "agentStep" | "userPrompt" | undefined;
-                })[];
-                agentStepsRemaining: number;
-                agents?: {
-                    agentId: string;
-                    agentName: import("../types/agent-state").AgentTemplateName;
-                    agents: import("../types/agent-state").SubagentState[];
-                    messageHistory: import("../types/message").CodebuffMessage[];
-                }[] | undefined;
-            };
-            toolResults: {
-                name: string;
-                id: string;
-                result: string;
-            }[];
-            cwd?: string | undefined;
-            prompt?: string | undefined;
-            authToken?: string | undefined;
-            costMode?: "max" | "lite" | "normal" | "experimental" | "ask" | undefined;
-            model?: string | undefined;
-            repoName?: string | undefined;
-        }>, z.ZodObject<{
-            type: z.ZodLiteral<"read-files-response">;
-            files: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodString, z.ZodNull]>>;
-            requestId: z.ZodOptional<z.ZodString>;
-        }, "strip", z.ZodTypeAny, {
-            type: "read-files-response";
-            files: Record<string, string | null>;
-            requestId?: string | undefined;
-        }, {
-            type: "read-files-response";
-            files: Record<string, string | null>;
-            requestId?: string | undefined;
-        }>, z.ZodObject<{
-            type: z.ZodLiteral<"init">;
-            fingerprintId: z.ZodString;
-            authToken: z.ZodOptional<z.ZodString>;
-            fileContext: z.ZodObject<{
-                projectRoot: z.ZodString;
-                cwd: z.ZodString;
-                fileTree: z.ZodArray<z.ZodType<import("../util/file").FileTreeNode, z.ZodTypeDef, import("../util/file").FileTreeNode>, "many">;
-                fileTokenScores: z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodNumber>>;
-                tokenCallers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodArray<z.ZodString, "many">>>>;
-                knowledgeFiles: z.ZodRecord<z.ZodString, z.ZodString>;
-                userKnowledgeFiles: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
-                gitChanges: z.ZodObject<{
-                    status: z.ZodString;
-                    diff: z.ZodString;
-                    diffCached: z.ZodString;
-                    lastCommitMessages: z.ZodString;
-                }, "strip", z.ZodTypeAny, {
-                    status: string;
-                    diff: string;
-                    diffCached: string;
-                    lastCommitMessages: string;
-                }, {
-                    status: string;
-                    diff: string;
-                    diffCached: string;
-                    lastCommitMessages: string;
-                }>;
-                changesSinceLastChat: z.ZodRecord<z.ZodString, z.ZodString>;
-                shellConfigFiles: z.ZodRecord<z.ZodString, z.ZodString>;
-                systemInfo: z.ZodObject<{
-                    platform: z.ZodString;
-                    shell: z.ZodString;
-                    nodeVersion: z.ZodString;
-                    arch: z.ZodString;
-                    homedir: z.ZodString;
-                    cpus: z.ZodNumber;
-                }, "strip", z.ZodTypeAny, {
-                    platform: string;
-                    shell: string;
-                    nodeVersion: string;
-                    arch: string;
-                    homedir: string;
-                    cpus: number;
-                }, {
-                    platform: string;
-                    shell: string;
-                    nodeVersion: string;
-                    arch: string;
-                    homedir: string;
-                    cpus: number;
-                }>;
-                fileVersions: z.ZodOptional<z.ZodArray<z.ZodArray<z.ZodObject<{
-                    path: z.ZodString;
-                    content: z.ZodString;
-                }, "strip", z.ZodTypeAny, {
-                    path: string;
-                    content: string;
-                }, {
-                    path: string;
-                    content: string;
-                }>, "many">, "many">>;
-            }, "strip", z.ZodTypeAny, {
-                projectRoot: string;
-                cwd: string;
-                fileTree: import("../util/file").FileTreeNode[];
-                fileTokenScores: Record<string, Record<string, number>>;
-                knowledgeFiles: Record<string, string>;
-                gitChanges: {
-                    status: string;
-                    diff: string;
-                    diffCached: string;
-                    lastCommitMessages: string;
+                projectRoot: string;
+                cwd: string;
+                fileTree: import("../util/file").FileTreeNode[];
+                fileTokenScores: Record<string, Record<string, number>>;
+                knowledgeFiles: Record<string, string>;
+                gitChanges: {
+                    status: string;
+                    diff: string;
+                    diffCached: string;
+                    lastCommitMessages: string;
                 };
                 changesSinceLastChat: Record<string, string>;
                 shellConfigFiles: Record<string, string>;
@@ -895,7 +539,6 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
             repoUrl: z.ZodOptional<z.ZodString>;
         }, "strip", z.ZodTypeAny, {
             type: "init";
-            fingerprintId: string;
             fileContext: {
                 projectRoot: string;
                 cwd: string;
@@ -925,11 +568,11 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     content: string;
                 }[][] | undefined;
             };
+            fingerprintId: string;
             authToken?: string | undefined;
             repoUrl?: string | undefined;
         }, {
             type: "init";
-            fingerprintId: string;
             fileContext: {
                 projectRoot: string;
                 cwd: string;
@@ -959,6 +602,7 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     content: string;
                 }[][] | undefined;
             };
+            fingerprintId: string;
             authToken?: string | undefined;
             repoUrl?: string | undefined;
         }>, z.ZodObject<{
@@ -1027,78 +671,20 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 agentStepsRemaining: number;
             };
             toolResults: {
-                name: string;
-                id: string;
+                toolName: string;
+                toolCallId: string;
                 result: string;
             }[];
             prompt?: string | undefined;
             authToken?: string | undefined;
             model?: string | undefined;
             repoUrl?: string | undefined;
-        } | {
-            type: "manager-prompt";
-            promptId: string;
-            fingerprintId: string;
-            costMode: "max" | "lite" | "normal" | "experimental" | "ask";
-            agentState: {
-                agentContext: string;
-                fileContext: {
-                    projectRoot: string;
-                    cwd: string;
-                    fileTree: import("../util/file").FileTreeNode[];
-                    fileTokenScores: Record<string, Record<string, number>>;
-                    knowledgeFiles: Record<string, string>;
-                    gitChanges: {
-                        status: string;
-                        diff: string;
-                        diffCached: string;
-                        lastCommitMessages: string;
-                    };
-                    changesSinceLastChat: Record<string, string>;
-                    shellConfigFiles: Record<string, string>;
-                    systemInfo: {
-                        platform: string;
-                        shell: string;
-                        nodeVersion: string;
-                        arch: string;
-                        homedir: string;
-                        cpus: number;
-                    };
-                    tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-                    userKnowledgeFiles?: Record<string, string> | undefined;
-                    fileVersions?: {
-                        path: string;
-                        content: string;
-                    }[][] | undefined;
-                };
-                messageHistory: (import("ai").CoreMessage & {
-                    timeToLive?: "agentStep" | "userPrompt" | undefined;
-                })[];
-                agents: {
-                    agentId: string;
-                    agentName: import("../types/agent-state").AgentTemplateName;
-                    agents: import("../types/agent-state").SubagentState[];
-                    messageHistory: import("../types/message").CodebuffMessage[];
-                }[];
-                agentStepsRemaining: number;
-            };
-            toolResults: {
-                name: string;
-                id: string;
-                result: string;
-            }[];
-            cwd?: string | undefined;
-            prompt?: string | undefined;
-            authToken?: string | undefined;
-            model?: string | undefined;
-            repoName?: string | undefined;
         } | {
             type: "read-files-response";
             files: Record<string, string | null>;
             requestId?: string | undefined;
         } | {
             type: "init";
-            fingerprintId: string;
             fileContext: {
                 projectRoot: string;
                 cwd: string;
@@ -1128,6 +714,7 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     content: string;
                 }[][] | undefined;
             };
+            fingerprintId: string;
             authToken?: string | undefined;
             repoUrl?: string | undefined;
         } | {
@@ -1186,8 +773,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 }[] | undefined;
             };
             toolResults: {
-                name: string;
-                id: string;
+                toolName: string;
+                toolCallId: string;
                 result: string;
             }[];
             prompt?: string | undefined;
@@ -1195,70 +782,12 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
             costMode?: "max" | "lite" | "normal" | "experimental" | "ask" | undefined;
             model?: string | undefined;
             repoUrl?: string | undefined;
-        } | {
-            type: "manager-prompt";
-            promptId: string;
-            fingerprintId: string;
-            agentState: {
-                agentContext: string;
-                fileContext: {
-                    projectRoot: string;
-                    cwd: string;
-                    fileTree: import("../util/file").FileTreeNode[];
-                    fileTokenScores: Record<string, Record<string, number>>;
-                    knowledgeFiles: Record<string, string>;
-                    gitChanges: {
-                        status: string;
-                        diff: string;
-                        diffCached: string;
-                        lastCommitMessages: string;
-                    };
-                    changesSinceLastChat: Record<string, string>;
-                    shellConfigFiles: Record<string, string>;
-                    systemInfo: {
-                        platform: string;
-                        shell: string;
-                        nodeVersion: string;
-                        arch: string;
-                        homedir: string;
-                        cpus: number;
-                    };
-                    tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-                    userKnowledgeFiles?: Record<string, string> | undefined;
-                    fileVersions?: {
-                        path: string;
-                        content: string;
-                    }[][] | undefined;
-                };
-                messageHistory: (import("ai").CoreMessage & {
-                    timeToLive?: "agentStep" | "userPrompt" | undefined;
-                })[];
-                agentStepsRemaining: number;
-                agents?: {
-                    agentId: string;
-                    agentName: import("../types/agent-state").AgentTemplateName;
-                    agents: import("../types/agent-state").SubagentState[];
-                    messageHistory: import("../types/message").CodebuffMessage[];
-                }[] | undefined;
-            };
-            toolResults: {
-                name: string;
-                id: string;
-                result: string;
-            }[];
-            cwd?: string | undefined;
-            prompt?: string | undefined;
-            authToken?: string | undefined;
-            costMode?: "max" | "lite" | "normal" | "experimental" | "ask" | undefined;
-            model?: string | undefined;
-            repoName?: string | undefined;
         } | {
             type: "read-files-response";
             files: Record<string, string | null>;
             requestId?: string | undefined;
         } | {
             type: "init";
-            fingerprintId: string;
             fileContext: {
                 projectRoot: string;
                 cwd: string;
@@ -1288,6 +817,7 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     content: string;
                 }[][] | undefined;
             };
+            fingerprintId: string;
             authToken?: string | undefined;
             repoUrl?: string | undefined;
         } | {
@@ -1574,16 +1104,16 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             }[] | undefined;
         }>;
         toolResults: z.ZodArray<z.ZodObject<{
-            name: z.ZodString;
+            toolName: z.ZodString;
+            toolCallId: z.ZodString;
             result: z.ZodString;
-            id: z.ZodString;
         }, "strip", z.ZodTypeAny, {
-            name: string;
-            id: string;
+            toolName: string;
+            toolCallId: string;
             result: string;
         }, {
-            name: string;
-            id: string;
+            toolName: string;
+            toolCallId: string;
             result: string;
         }>, "many">;
         model: z.ZodOptional<z.ZodString>;
@@ -1636,8 +1166,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             agentStepsRemaining: number;
         };
         toolResults: {
-            name: string;
-            id: string;
+            toolName: string;
+            toolCallId: string;
             result: string;
         }[];
         prompt?: string | undefined;
@@ -1691,8 +1221,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             }[] | undefined;
         };
         toolResults: {
-            name: string;
-            id: string;
+            toolName: string;
+            toolCallId: string;
             result: string;
         }[];
         prompt?: string | undefined;
@@ -1701,146 +1231,229 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         model?: string | undefined;
         repoUrl?: string | undefined;
     }>, z.ZodObject<{
-        type: z.ZodLiteral<"manager-prompt">;
-        promptId: z.ZodString;
-        prompt: z.ZodOptional<z.ZodString>;
-        agentState: z.ZodObject<{
-            agentContext: z.ZodString;
-            fileContext: z.ZodObject<{
-                projectRoot: z.ZodString;
-                cwd: z.ZodString;
-                fileTree: z.ZodArray<z.ZodType<import("../util/file").FileTreeNode, z.ZodTypeDef, import("../util/file").FileTreeNode>, "many">;
-                fileTokenScores: z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodNumber>>;
-                tokenCallers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodArray<z.ZodString, "many">>>>;
-                knowledgeFiles: z.ZodRecord<z.ZodString, z.ZodString>;
-                userKnowledgeFiles: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
-                gitChanges: z.ZodObject<{
-                    status: z.ZodString;
-                    diff: z.ZodString;
-                    diffCached: z.ZodString;
-                    lastCommitMessages: z.ZodString;
-                }, "strip", z.ZodTypeAny, {
-                    status: string;
-                    diff: string;
-                    diffCached: string;
-                    lastCommitMessages: string;
-                }, {
-                    status: string;
-                    diff: string;
-                    diffCached: string;
-                    lastCommitMessages: string;
-                }>;
-                changesSinceLastChat: z.ZodRecord<z.ZodString, z.ZodString>;
-                shellConfigFiles: z.ZodRecord<z.ZodString, z.ZodString>;
-                systemInfo: z.ZodObject<{
-                    platform: z.ZodString;
-                    shell: z.ZodString;
-                    nodeVersion: z.ZodString;
-                    arch: z.ZodString;
-                    homedir: z.ZodString;
-                    cpus: z.ZodNumber;
-                }, "strip", z.ZodTypeAny, {
-                    platform: string;
-                    shell: string;
-                    nodeVersion: string;
-                    arch: string;
-                    homedir: string;
-                    cpus: number;
-                }, {
-                    platform: string;
-                    shell: string;
-                    nodeVersion: string;
-                    arch: string;
-                    homedir: string;
-                    cpus: number;
-                }>;
-                fileVersions: z.ZodOptional<z.ZodArray<z.ZodArray<z.ZodObject<{
-                    path: z.ZodString;
-                    content: z.ZodString;
-                }, "strip", z.ZodTypeAny, {
-                    path: string;
-                    content: string;
-                }, {
-                    path: string;
-                    content: string;
-                }>, "many">, "many">>;
+        type: z.ZodLiteral<"read-files-response">;
+        files: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodString, z.ZodNull]>>;
+        requestId: z.ZodOptional<z.ZodString>;
+    }, "strip", z.ZodTypeAny, {
+        type: "read-files-response";
+        files: Record<string, string | null>;
+        requestId?: string | undefined;
+    }, {
+        type: "read-files-response";
+        files: Record<string, string | null>;
+        requestId?: string | undefined;
+    }>, z.ZodObject<{
+        type: z.ZodLiteral<"init">;
+        fingerprintId: z.ZodString;
+        authToken: z.ZodOptional<z.ZodString>;
+        fileContext: z.ZodObject<{
+            projectRoot: z.ZodString;
+            cwd: z.ZodString;
+            fileTree: z.ZodArray<z.ZodType<import("../util/file").FileTreeNode, z.ZodTypeDef, import("../util/file").FileTreeNode>, "many">;
+            fileTokenScores: z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodNumber>>;
+            tokenCallers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodArray<z.ZodString, "many">>>>;
+            knowledgeFiles: z.ZodRecord<z.ZodString, z.ZodString>;
+            userKnowledgeFiles: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+            gitChanges: z.ZodObject<{
+                status: z.ZodString;
+                diff: z.ZodString;
+                diffCached: z.ZodString;
+                lastCommitMessages: z.ZodString;
             }, "strip", z.ZodTypeAny, {
-                projectRoot: string;
-                cwd: string;
-                fileTree: import("../util/file").FileTreeNode[];
-                fileTokenScores: Record<string, Record<string, number>>;
-                knowledgeFiles: Record<string, string>;
-                gitChanges: {
-                    status: string;
-                    diff: string;
-                    diffCached: string;
-                    lastCommitMessages: string;
-                };
-                changesSinceLastChat: Record<string, string>;
-                shellConfigFiles: Record<string, string>;
-                systemInfo: {
-                    platform: string;
-                    shell: string;
-                    nodeVersion: string;
-                    arch: string;
-                    homedir: string;
-                    cpus: number;
-                };
-                tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-                userKnowledgeFiles?: Record<string, string> | undefined;
-                fileVersions?: {
-                    path: string;
-                    content: string;
-                }[][] | undefined;
+                status: string;
+                diff: string;
+                diffCached: string;
+                lastCommitMessages: string;
             }, {
-                projectRoot: string;
-                cwd: string;
-                fileTree: import("../util/file").FileTreeNode[];
-                fileTokenScores: Record<string, Record<string, number>>;
-                knowledgeFiles: Record<string, string>;
-                gitChanges: {
-                    status: string;
-                    diff: string;
-                    diffCached: string;
-                    lastCommitMessages: string;
-                };
-                changesSinceLastChat: Record<string, string>;
-                shellConfigFiles: Record<string, string>;
-                systemInfo: {
-                    platform: string;
-                    shell: string;
-                    nodeVersion: string;
-                    arch: string;
-                    homedir: string;
-                    cpus: number;
-                };
-                tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-                userKnowledgeFiles?: Record<string, string> | undefined;
-                fileVersions?: {
-                    path: string;
-                    content: string;
-                }[][] | undefined;
+                status: string;
+                diff: string;
+                diffCached: string;
+                lastCommitMessages: string;
             }>;
-            messageHistory: z.ZodArray<z.ZodIntersection<z.ZodType<import("ai").CoreMessage, z.ZodTypeDef, import("ai").CoreMessage>, z.ZodObject<{
-                timeToLive: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"agentStep">, z.ZodLiteral<"userPrompt">]>>;
+            changesSinceLastChat: z.ZodRecord<z.ZodString, z.ZodString>;
+            shellConfigFiles: z.ZodRecord<z.ZodString, z.ZodString>;
+            systemInfo: z.ZodObject<{
+                platform: z.ZodString;
+                shell: z.ZodString;
+                nodeVersion: z.ZodString;
+                arch: z.ZodString;
+                homedir: z.ZodString;
+                cpus: z.ZodNumber;
             }, "strip", z.ZodTypeAny, {
-                timeToLive?: "agentStep" | "userPrompt" | undefined;
-            }, {
-                timeToLive?: "agentStep" | "userPrompt" | undefined;
-            }>>, "many">;
-            agents: z.ZodDefault<z.ZodArray<z.ZodType<{
-                agentId: string;
-                agentName: import("../types/agent-state").AgentTemplateName;
-                agents: import("../types/agent-state").SubagentState[];
-                messageHistory: import("../types/message").CodebuffMessage[];
-            }, z.ZodTypeDef, {
-                agentId: string;
-                agentName: import("../types/agent-state").AgentTemplateName;
-                agents: import("../types/agent-state").SubagentState[];
-                messageHistory: import("../types/message").CodebuffMessage[];
-            }>, "many">>;
-            agentStepsRemaining: z.ZodNumber;
+                platform: string;
+                shell: string;
+                nodeVersion: string;
+                arch: string;
+                homedir: string;
+                cpus: number;
+            }, {
+                platform: string;
+                shell: string;
+                nodeVersion: string;
+                arch: string;
+                homedir: string;
+                cpus: number;
+            }>;
+            fileVersions: z.ZodOptional<z.ZodArray<z.ZodArray<z.ZodObject<{
+                path: z.ZodString;
+                content: z.ZodString;
+            }, "strip", z.ZodTypeAny, {
+                path: string;
+                content: string;
+            }, {
+                path: string;
+                content: string;
+            }>, "many">, "many">>;
         }, "strip", z.ZodTypeAny, {
+            projectRoot: string;
+            cwd: string;
+            fileTree: import("../util/file").FileTreeNode[];
+            fileTokenScores: Record<string, Record<string, number>>;
+            knowledgeFiles: Record<string, string>;
+            gitChanges: {
+                status: string;
+                diff: string;
+                diffCached: string;
+                lastCommitMessages: string;
+            };
+            changesSinceLastChat: Record<string, string>;
+            shellConfigFiles: Record<string, string>;
+            systemInfo: {
+                platform: string;
+                shell: string;
+                nodeVersion: string;
+                arch: string;
+                homedir: string;
+                cpus: number;
+            };
+            tokenCallers?: Record<string, Record<string, string[]>> | undefined;
+            userKnowledgeFiles?: Record<string, string> | undefined;
+            fileVersions?: {
+                path: string;
+                content: string;
+            }[][] | undefined;
+        }, {
+            projectRoot: string;
+            cwd: string;
+            fileTree: import("../util/file").FileTreeNode[];
+            fileTokenScores: Record<string, Record<string, number>>;
+            knowledgeFiles: Record<string, string>;
+            gitChanges: {
+                status: string;
+                diff: string;
+                diffCached: string;
+                lastCommitMessages: string;
+            };
+            changesSinceLastChat: Record<string, string>;
+            shellConfigFiles: Record<string, string>;
+            systemInfo: {
+                platform: string;
+                shell: string;
+                nodeVersion: string;
+                arch: string;
+                homedir: string;
+                cpus: number;
+            };
+            tokenCallers?: Record<string, Record<string, string[]>> | undefined;
+            userKnowledgeFiles?: Record<string, string> | undefined;
+            fileVersions?: {
+                path: string;
+                content: string;
+            }[][] | undefined;
+        }>;
+        repoUrl: z.ZodOptional<z.ZodString>;
+    }, "strip", z.ZodTypeAny, {
+        type: "init";
+        fileContext: {
+            projectRoot: string;
+            cwd: string;
+            fileTree: import("../util/file").FileTreeNode[];
+            fileTokenScores: Record<string, Record<string, number>>;
+            knowledgeFiles: Record<string, string>;
+            gitChanges: {
+                status: string;
+                diff: string;
+                diffCached: string;
+                lastCommitMessages: string;
+            };
+            changesSinceLastChat: Record<string, string>;
+            shellConfigFiles: Record<string, string>;
+            systemInfo: {
+                platform: string;
+                shell: string;
+                nodeVersion: string;
+                arch: string;
+                homedir: string;
+                cpus: number;
+            };
+            tokenCallers?: Record<string, Record<string, string[]>> | undefined;
+            userKnowledgeFiles?: Record<string, string> | undefined;
+            fileVersions?: {
+                path: string;
+                content: string;
+            }[][] | undefined;
+        };
+        fingerprintId: string;
+        authToken?: string | undefined;
+        repoUrl?: string | undefined;
+    }, {
+        type: "init";
+        fileContext: {
+            projectRoot: string;
+            cwd: string;
+            fileTree: import("../util/file").FileTreeNode[];
+            fileTokenScores: Record<string, Record<string, number>>;
+            knowledgeFiles: Record<string, string>;
+            gitChanges: {
+                status: string;
+                diff: string;
+                diffCached: string;
+                lastCommitMessages: string;
+            };
+            changesSinceLastChat: Record<string, string>;
+            shellConfigFiles: Record<string, string>;
+            systemInfo: {
+                platform: string;
+                shell: string;
+                nodeVersion: string;
+                arch: string;
+                homedir: string;
+                cpus: number;
+            };
+            tokenCallers?: Record<string, Record<string, string[]>> | undefined;
+            userKnowledgeFiles?: Record<string, string> | undefined;
+            fileVersions?: {
+                path: string;
+                content: string;
+            }[][] | undefined;
+        };
+        fingerprintId: string;
+        authToken?: string | undefined;
+        repoUrl?: string | undefined;
+    }>, z.ZodObject<{
+        type: z.ZodLiteral<"generate-commit-message">;
+        fingerprintId: z.ZodString;
+        authToken: z.ZodOptional<z.ZodString>;
+        stagedChanges: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        type: "generate-commit-message";
+        fingerprintId: string;
+        stagedChanges: string;
+        authToken?: string | undefined;
+    }, {
+        type: "generate-commit-message";
+        fingerprintId: string;
+        stagedChanges: string;
+        authToken?: string | undefined;
+    }>]>;
+}, "strip", z.ZodTypeAny, {
+    type: "action";
+    data: {
+        type: "prompt";
+        promptId: string;
+        fingerprintId: string;
+        costMode: "max" | "lite" | "normal" | "experimental" | "ask";
+        agentState: {
             agentContext: string;
             fileContext: {
                 projectRoot: string;
@@ -1881,7 +1494,68 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 messageHistory: import("../types/message").CodebuffMessage[];
             }[];
             agentStepsRemaining: number;
-        }, {
+        };
+        toolResults: {
+            toolName: string;
+            toolCallId: string;
+            result: string;
+        }[];
+        prompt?: string | undefined;
+        authToken?: string | undefined;
+        model?: string | undefined;
+        repoUrl?: string | undefined;
+    } | {
+        type: "read-files-response";
+        files: Record<string, string | null>;
+        requestId?: string | undefined;
+    } | {
+        type: "init";
+        fileContext: {
+            projectRoot: string;
+            cwd: string;
+            fileTree: import("../util/file").FileTreeNode[];
+            fileTokenScores: Record<string, Record<string, number>>;
+            knowledgeFiles: Record<string, string>;
+            gitChanges: {
+                status: string;
+                diff: string;
+                diffCached: string;
+                lastCommitMessages: string;
+            };
+            changesSinceLastChat: Record<string, string>;
+            shellConfigFiles: Record<string, string>;
+            systemInfo: {
+                platform: string;
+                shell: string;
+                nodeVersion: string;
+                arch: string;
+                homedir: string;
+                cpus: number;
+            };
+            tokenCallers?: Record<string, Record<string, string[]>> | undefined;
+            userKnowledgeFiles?: Record<string, string> | undefined;
+            fileVersions?: {
+                path: string;
+                content: string;
+            }[][] | undefined;
+        };
+        fingerprintId: string;
+        authToken?: string | undefined;
+        repoUrl?: string | undefined;
+    } | {
+        type: "generate-commit-message";
+        fingerprintId: string;
+        stagedChanges: string;
+        authToken?: string | undefined;
+    };
+    txid: number;
+}, {
+    type: "action";
+    data: {
+        type: "prompt";
+        promptId: string;
+        fingerprintId: string;
+        agentState: {
             agentContext: string;
             fileContext: {
                 projectRoot: string;
@@ -1922,275 +1596,23 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 agents: import("../types/agent-state").SubagentState[];
                 messageHistory: import("../types/message").CodebuffMessage[];
             }[] | undefined;
-        }>;
-        toolResults: z.ZodArray<z.ZodObject<{
-            name: z.ZodString;
-            result: z.ZodString;
-            id: z.ZodString;
-        }, "strip", z.ZodTypeAny, {
-            name: string;
-            id: string;
-            result: string;
-        }, {
-            name: string;
-            id: string;
-            result: string;
-        }>, "many">;
-        fingerprintId: z.ZodString;
-        authToken: z.ZodOptional<z.ZodString>;
-        costMode: z.ZodDefault<z.ZodOptional<z.ZodEnum<["lite", "normal", "max", "experimental", "ask"]>>>;
-        model: z.ZodOptional<z.ZodString>;
-        cwd: z.ZodOptional<z.ZodString>;
-        repoName: z.ZodOptional<z.ZodString>;
-    }, "strip", z.ZodTypeAny, {
-        type: "manager-prompt";
-        promptId: string;
-        fingerprintId: string;
-        costMode: "max" | "lite" | "normal" | "experimental" | "ask";
-        agentState: {
-            agentContext: string;
-            fileContext: {
-                projectRoot: string;
-                cwd: string;
-                fileTree: import("../util/file").FileTreeNode[];
-                fileTokenScores: Record<string, Record<string, number>>;
-                knowledgeFiles: Record<string, string>;
-                gitChanges: {
-                    status: string;
-                    diff: string;
-                    diffCached: string;
-                    lastCommitMessages: string;
-                };
-                changesSinceLastChat: Record<string, string>;
-                shellConfigFiles: Record<string, string>;
-                systemInfo: {
-                    platform: string;
-                    shell: string;
-                    nodeVersion: string;
-                    arch: string;
-                    homedir: string;
-                    cpus: number;
-                };
-                tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-                userKnowledgeFiles?: Record<string, string> | undefined;
-                fileVersions?: {
-                    path: string;
-                    content: string;
-                }[][] | undefined;
-            };
-            messageHistory: (import("ai").CoreMessage & {
-                timeToLive?: "agentStep" | "userPrompt" | undefined;
-            })[];
-            agents: {
-                agentId: string;
-                agentName: import("../types/agent-state").AgentTemplateName;
-                agents: import("../types/agent-state").SubagentState[];
-                messageHistory: import("../types/message").CodebuffMessage[];
-            }[];
-            agentStepsRemaining: number;
-        };
-        toolResults: {
-            name: string;
-            id: string;
-            result: string;
-        }[];
-        cwd?: string | undefined;
-        prompt?: string | undefined;
-        authToken?: string | undefined;
-        model?: string | undefined;
-        repoName?: string | undefined;
-    }, {
-        type: "manager-prompt";
-        promptId: string;
-        fingerprintId: string;
-        agentState: {
-            agentContext: string;
-            fileContext: {
-                projectRoot: string;
-                cwd: string;
-                fileTree: import("../util/file").FileTreeNode[];
-                fileTokenScores: Record<string, Record<string, number>>;
-                knowledgeFiles: Record<string, string>;
-                gitChanges: {
-                    status: string;
-                    diff: string;
-                    diffCached: string;
-                    lastCommitMessages: string;
-                };
-                changesSinceLastChat: Record<string, string>;
-                shellConfigFiles: Record<string, string>;
-                systemInfo: {
-                    platform: string;
-                    shell: string;
-                    nodeVersion: string;
-                    arch: string;
-                    homedir: string;
-                    cpus: number;
-                };
-                tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-                userKnowledgeFiles?: Record<string, string> | undefined;
-                fileVersions?: {
-                    path: string;
-                    content: string;
-                }[][] | undefined;
-            };
-            messageHistory: (import("ai").CoreMessage & {
-                timeToLive?: "agentStep" | "userPrompt" | undefined;
-            })[];
-            agentStepsRemaining: number;
-            agents?: {
-                agentId: string;
-                agentName: import("../types/agent-state").AgentTemplateName;
-                agents: import("../types/agent-state").SubagentState[];
-                messageHistory: import("../types/message").CodebuffMessage[];
-            }[] | undefined;
-        };
-        toolResults: {
-            name: string;
-            id: string;
+        };
+        toolResults: {
+            toolName: string;
+            toolCallId: string;
             result: string;
         }[];
-        cwd?: string | undefined;
         prompt?: string | undefined;
         authToken?: string | undefined;
         costMode?: "max" | "lite" | "normal" | "experimental" | "ask" | undefined;
         model?: string | undefined;
-        repoName?: string | undefined;
-    }>, z.ZodObject<{
-        type: z.ZodLiteral<"read-files-response">;
-        files: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodString, z.ZodNull]>>;
-        requestId: z.ZodOptional<z.ZodString>;
-    }, "strip", z.ZodTypeAny, {
-        type: "read-files-response";
-        files: Record<string, string | null>;
-        requestId?: string | undefined;
-    }, {
+        repoUrl?: string | undefined;
+    } | {
         type: "read-files-response";
         files: Record<string, string | null>;
         requestId?: string | undefined;
-    }>, z.ZodObject<{
-        type: z.ZodLiteral<"init">;
-        fingerprintId: z.ZodString;
-        authToken: z.ZodOptional<z.ZodString>;
-        fileContext: z.ZodObject<{
-            projectRoot: z.ZodString;
-            cwd: z.ZodString;
-            fileTree: z.ZodArray<z.ZodType<import("../util/file").FileTreeNode, z.ZodTypeDef, import("../util/file").FileTreeNode>, "many">;
-            fileTokenScores: z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodNumber>>;
-            tokenCallers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodArray<z.ZodString, "many">>>>;
-            knowledgeFiles: z.ZodRecord<z.ZodString, z.ZodString>;
-            userKnowledgeFiles: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
-            gitChanges: z.ZodObject<{
-                status: z.ZodString;
-                diff: z.ZodString;
-                diffCached: z.ZodString;
-                lastCommitMessages: z.ZodString;
-            }, "strip", z.ZodTypeAny, {
-                status: string;
-                diff: string;
-                diffCached: string;
-                lastCommitMessages: string;
-            }, {
-                status: string;
-                diff: string;
-                diffCached: string;
-                lastCommitMessages: string;
-            }>;
-            changesSinceLastChat: z.ZodRecord<z.ZodString, z.ZodString>;
-            shellConfigFiles: z.ZodRecord<z.ZodString, z.ZodString>;
-            systemInfo: z.ZodObject<{
-                platform: z.ZodString;
-                shell: z.ZodString;
-                nodeVersion: z.ZodString;
-                arch: z.ZodString;
-                homedir: z.ZodString;
-                cpus: z.ZodNumber;
-            }, "strip", z.ZodTypeAny, {
-                platform: string;
-                shell: string;
-                nodeVersion: string;
-                arch: string;
-                homedir: string;
-                cpus: number;
-            }, {
-                platform: string;
-                shell: string;
-                nodeVersion: string;
-                arch: string;
-                homedir: string;
-                cpus: number;
-            }>;
-            fileVersions: z.ZodOptional<z.ZodArray<z.ZodArray<z.ZodObject<{
-                path: z.ZodString;
-                content: z.ZodString;
-            }, "strip", z.ZodTypeAny, {
-                path: string;
-                content: string;
-            }, {
-                path: string;
-                content: string;
-            }>, "many">, "many">>;
-        }, "strip", z.ZodTypeAny, {
-            projectRoot: string;
-            cwd: string;
-            fileTree: import("../util/file").FileTreeNode[];
-            fileTokenScores: Record<string, Record<string, number>>;
-            knowledgeFiles: Record<string, string>;
-            gitChanges: {
-                status: string;
-                diff: string;
-                diffCached: string;
-                lastCommitMessages: string;
-            };
-            changesSinceLastChat: Record<string, string>;
-            shellConfigFiles: Record<string, string>;
-            systemInfo: {
-                platform: string;
-                shell: string;
-                nodeVersion: string;
-                arch: string;
-                homedir: string;
-                cpus: number;
-            };
-            tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-            userKnowledgeFiles?: Record<string, string> | undefined;
-            fileVersions?: {
-                path: string;
-                content: string;
-            }[][] | undefined;
-        }, {
-            projectRoot: string;
-            cwd: string;
-            fileTree: import("../util/file").FileTreeNode[];
-            fileTokenScores: Record<string, Record<string, number>>;
-            knowledgeFiles: Record<string, string>;
-            gitChanges: {
-                status: string;
-                diff: string;
-                diffCached: string;
-                lastCommitMessages: string;
-            };
-            changesSinceLastChat: Record<string, string>;
-            shellConfigFiles: Record<string, string>;
-            systemInfo: {
-                platform: string;
-                shell: string;
-                nodeVersion: string;
-                arch: string;
-                homedir: string;
-                cpus: number;
-            };
-            tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-            userKnowledgeFiles?: Record<string, string> | undefined;
-            fileVersions?: {
-                path: string;
-                content: string;
-            }[][] | undefined;
-        }>;
-        repoUrl: z.ZodOptional<z.ZodString>;
-    }, "strip", z.ZodTypeAny, {
+    } | {
         type: "init";
-        fingerprintId: string;
         fileContext: {
             projectRoot: string;
             cwd: string;
@@ -2220,867 +1642,147 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 content: string;
             }[][] | undefined;
         };
+        fingerprintId: string;
         authToken?: string | undefined;
         repoUrl?: string | undefined;
-    }, {
-        type: "init";
+    } | {
+        type: "generate-commit-message";
         fingerprintId: string;
-        fileContext: {
-            projectRoot: string;
-            cwd: string;
-            fileTree: import("../util/file").FileTreeNode[];
-            fileTokenScores: Record<string, Record<string, number>>;
-            knowledgeFiles: Record<string, string>;
-            gitChanges: {
-                status: string;
-                diff: string;
-                diffCached: string;
-                lastCommitMessages: string;
-            };
-            changesSinceLastChat: Record<string, string>;
-            shellConfigFiles: Record<string, string>;
-            systemInfo: {
-                platform: string;
-                shell: string;
-                nodeVersion: string;
-                arch: string;
-                homedir: string;
-                cpus: number;
-            };
-            tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-            userKnowledgeFiles?: Record<string, string> | undefined;
-            fileVersions?: {
-                path: string;
-                content: string;
-            }[][] | undefined;
-        };
-        authToken?: string | undefined;
-        repoUrl?: string | undefined;
-    }>, z.ZodObject<{
-        type: z.ZodLiteral<"generate-commit-message">;
-        fingerprintId: z.ZodString;
-        authToken: z.ZodOptional<z.ZodString>;
-        stagedChanges: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        type: "generate-commit-message";
-        fingerprintId: string;
-        stagedChanges: string;
-        authToken?: string | undefined;
-    }, {
-        type: "generate-commit-message";
-        fingerprintId: string;
-        stagedChanges: string;
-        authToken?: string | undefined;
-    }>]>;
-}, "strip", z.ZodTypeAny, {
-    type: "action";
-    data: {
-        type: "prompt";
-        promptId: string;
-        fingerprintId: string;
-        costMode: "max" | "lite" | "normal" | "experimental" | "ask";
-        agentState: {
-            agentContext: string;
-            fileContext: {
-                projectRoot: string;
-                cwd: string;
-                fileTree: import("../util/file").FileTreeNode[];
-                fileTokenScores: Record<string, Record<string, number>>;
-                knowledgeFiles: Record<string, string>;
-                gitChanges: {
-                    status: string;
-                    diff: string;
-                    diffCached: string;
-                    lastCommitMessages: string;
-                };
-                changesSinceLastChat: Record<string, string>;
-                shellConfigFiles: Record<string, string>;
-                systemInfo: {
-                    platform: string;
-                    shell: string;
-                    nodeVersion: string;
-                    arch: string;
-                    homedir: string;
-                    cpus: number;
-                };
-                tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-                userKnowledgeFiles?: Record<string, string> | undefined;
-                fileVersions?: {
-                    path: string;
-                    content: string;
-                }[][] | undefined;
-            };
-            messageHistory: (import("ai").CoreMessage & {
-                timeToLive?: "agentStep" | "userPrompt" | undefined;
-            })[];
-            agents: {
-                agentId: string;
-                agentName: import("../types/agent-state").AgentTemplateName;
-                agents: import("../types/agent-state").SubagentState[];
-                messageHistory: import("../types/message").CodebuffMessage[];
-            }[];
-            agentStepsRemaining: number;
-        };
-        toolResults: {
-            name: string;
-            id: string;
-            result: string;
-        }[];
-        prompt?: string | undefined;
-        authToken?: string | undefined;
-        model?: string | undefined;
-        repoUrl?: string | undefined;
-    } | {
-        type: "manager-prompt";
-        promptId: string;
-        fingerprintId: string;
-        costMode: "max" | "lite" | "normal" | "experimental" | "ask";
-        agentState: {
-            agentContext: string;
-            fileContext: {
-                projectRoot: string;
-                cwd: string;
-                fileTree: import("../util/file").FileTreeNode[];
-                fileTokenScores: Record<string, Record<string, number>>;
-                knowledgeFiles: Record<string, string>;
-                gitChanges: {
-                    status: string;
-                    diff: string;
-                    diffCached: string;
-                    lastCommitMessages: string;
-                };
-                changesSinceLastChat: Record<string, string>;
-                shellConfigFiles: Record<string, string>;
-                systemInfo: {
-                    platform: string;
-                    shell: string;
-                    nodeVersion: string;
-                    arch: string;
-                    homedir: string;
-                    cpus: number;
-                };
-                tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-                userKnowledgeFiles?: Record<string, string> | undefined;
-                fileVersions?: {
-                    path: string;
-                    content: string;
-                }[][] | undefined;
-            };
-            messageHistory: (import("ai").CoreMessage & {
-                timeToLive?: "agentStep" | "userPrompt" | undefined;
-            })[];
-            agents: {
-                agentId: string;
-                agentName: import("../types/agent-state").AgentTemplateName;
-                agents: import("../types/agent-state").SubagentState[];
-                messageHistory: import("../types/message").CodebuffMessage[];
-            }[];
-            agentStepsRemaining: number;
-        };
-        toolResults: {
-            name: string;
-            id: string;
-            result: string;
-        }[];
-        cwd?: string | undefined;
-        prompt?: string | undefined;
-        authToken?: string | undefined;
-        model?: string | undefined;
-        repoName?: string | undefined;
-    } | {
-        type: "read-files-response";
-        files: Record<string, string | null>;
-        requestId?: string | undefined;
-    } | {
-        type: "init";
-        fingerprintId: string;
-        fileContext: {
-            projectRoot: string;
-            cwd: string;
-            fileTree: import("../util/file").FileTreeNode[];
-            fileTokenScores: Record<string, Record<string, number>>;
-            knowledgeFiles: Record<string, string>;
-            gitChanges: {
-                status: string;
-                diff: string;
-                diffCached: string;
-                lastCommitMessages: string;
-            };
-            changesSinceLastChat: Record<string, string>;
-            shellConfigFiles: Record<string, string>;
-            systemInfo: {
-                platform: string;
-                shell: string;
-                nodeVersion: string;
-                arch: string;
-                homedir: string;
-                cpus: number;
-            };
-            tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-            userKnowledgeFiles?: Record<string, string> | undefined;
-            fileVersions?: {
-                path: string;
-                content: string;
-            }[][] | undefined;
-        };
-        authToken?: string | undefined;
-        repoUrl?: string | undefined;
-    } | {
-        type: "generate-commit-message";
-        fingerprintId: string;
-        stagedChanges: string;
-        authToken?: string | undefined;
-    };
-    txid: number;
-}, {
-    type: "action";
-    data: {
-        type: "prompt";
-        promptId: string;
-        fingerprintId: string;
-        agentState: {
-            agentContext: string;
-            fileContext: {
-                projectRoot: string;
-                cwd: string;
-                fileTree: import("../util/file").FileTreeNode[];
-                fileTokenScores: Record<string, Record<string, number>>;
-                knowledgeFiles: Record<string, string>;
-                gitChanges: {
-                    status: string;
-                    diff: string;
-                    diffCached: string;
-                    lastCommitMessages: string;
-                };
-                changesSinceLastChat: Record<string, string>;
-                shellConfigFiles: Record<string, string>;
-                systemInfo: {
-                    platform: string;
-                    shell: string;
-                    nodeVersion: string;
-                    arch: string;
-                    homedir: string;
-                    cpus: number;
-                };
-                tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-                userKnowledgeFiles?: Record<string, string> | undefined;
-                fileVersions?: {
-                    path: string;
-                    content: string;
-                }[][] | undefined;
-            };
-            messageHistory: (import("ai").CoreMessage & {
-                timeToLive?: "agentStep" | "userPrompt" | undefined;
-            })[];
-            agentStepsRemaining: number;
-            agents?: {
-                agentId: string;
-                agentName: import("../types/agent-state").AgentTemplateName;
-                agents: import("../types/agent-state").SubagentState[];
-                messageHistory: import("../types/message").CodebuffMessage[];
-            }[] | undefined;
-        };
-        toolResults: {
-            name: string;
-            id: string;
-            result: string;
-        }[];
-        prompt?: string | undefined;
-        authToken?: string | undefined;
-        costMode?: "max" | "lite" | "normal" | "experimental" | "ask" | undefined;
-        model?: string | undefined;
-        repoUrl?: string | undefined;
-    } | {
-        type: "manager-prompt";
-        promptId: string;
-        fingerprintId: string;
-        agentState: {
-            agentContext: string;
-            fileContext: {
-                projectRoot: string;
-                cwd: string;
-                fileTree: import("../util/file").FileTreeNode[];
-                fileTokenScores: Record<string, Record<string, number>>;
-                knowledgeFiles: Record<string, string>;
-                gitChanges: {
-                    status: string;
-                    diff: string;
-                    diffCached: string;
-                    lastCommitMessages: string;
-                };
-                changesSinceLastChat: Record<string, string>;
-                shellConfigFiles: Record<string, string>;
-                systemInfo: {
-                    platform: string;
-                    shell: string;
-                    nodeVersion: string;
-                    arch: string;
-                    homedir: string;
-                    cpus: number;
-                };
-                tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-                userKnowledgeFiles?: Record<string, string> | undefined;
-                fileVersions?: {
-                    path: string;
-                    content: string;
-                }[][] | undefined;
-            };
-            messageHistory: (import("ai").CoreMessage & {
-                timeToLive?: "agentStep" | "userPrompt" | undefined;
-            })[];
-            agentStepsRemaining: number;
-            agents?: {
-                agentId: string;
-                agentName: import("../types/agent-state").AgentTemplateName;
-                agents: import("../types/agent-state").SubagentState[];
-                messageHistory: import("../types/message").CodebuffMessage[];
-            }[] | undefined;
-        };
-        toolResults: {
-            name: string;
-            id: string;
-            result: string;
-        }[];
-        cwd?: string | undefined;
-        prompt?: string | undefined;
-        authToken?: string | undefined;
-        costMode?: "max" | "lite" | "normal" | "experimental" | "ask" | undefined;
-        model?: string | undefined;
-        repoName?: string | undefined;
-    } | {
-        type: "read-files-response";
-        files: Record<string, string | null>;
-        requestId?: string | undefined;
-    } | {
-        type: "init";
-        fingerprintId: string;
-        fileContext: {
-            projectRoot: string;
-            cwd: string;
-            fileTree: import("../util/file").FileTreeNode[];
-            fileTokenScores: Record<string, Record<string, number>>;
-            knowledgeFiles: Record<string, string>;
-            gitChanges: {
-                status: string;
-                diff: string;
-                diffCached: string;
-                lastCommitMessages: string;
-            };
-            changesSinceLastChat: Record<string, string>;
-            shellConfigFiles: Record<string, string>;
-            systemInfo: {
-                platform: string;
-                shell: string;
-                nodeVersion: string;
-                arch: string;
-                homedir: string;
-                cpus: number;
-            };
-            tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-            userKnowledgeFiles?: Record<string, string> | undefined;
-            fileVersions?: {
-                path: string;
-                content: string;
-            }[][] | undefined;
-        };
-        authToken?: string | undefined;
-        repoUrl?: string | undefined;
-    } | {
-        type: "generate-commit-message";
-        fingerprintId: string;
-        stagedChanges: string;
-        authToken?: string | undefined;
-    };
-    txid: number;
-}>]>;
-export type ClientMessageType = keyof typeof CLIENT_MESSAGE_SCHEMAS;
-export type ClientMessage<T extends ClientMessageType = ClientMessageType> = z.infer<(typeof CLIENT_MESSAGE_SCHEMAS)[T]>;
-export declare const SERVER_MESSAGE_SCHEMAS: {
-    ack: z.ZodObject<{
-        type: z.ZodLiteral<"ack">;
-        txid: z.ZodOptional<z.ZodNumber>;
-        success: z.ZodBoolean;
-        error: z.ZodOptional<z.ZodString>;
-    }, "strip", z.ZodTypeAny, {
-        type: "ack";
-        success: boolean;
-        error?: string | undefined;
-        txid?: number | undefined;
-    }, {
-        type: "ack";
-        success: boolean;
-        error?: string | undefined;
-        txid?: number | undefined;
-    }>;
-    action: z.ZodObject<{
-        type: z.ZodLiteral<"action">;
-        data: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
-            type: z.ZodLiteral<"response-chunk">;
-            userInputId: z.ZodString;
-            chunk: z.ZodString;
-        }, "strip", z.ZodTypeAny, {
-            type: "response-chunk";
-            userInputId: string;
-            chunk: string;
-        }, {
-            type: "response-chunk";
-            userInputId: string;
-            chunk: string;
-        }>, z.ZodObject<z.objectUtil.extendShape<{
-            type: z.ZodLiteral<"response-complete">;
-            userInputId: z.ZodString;
-            response: z.ZodString;
-            changes: z.ZodArray<z.ZodObject<{
-                type: z.ZodEnum<["patch", "file"]>;
-                path: z.ZodString;
-                content: z.ZodString;
-            }, "strip", z.ZodTypeAny, {
-                path: string;
-                content: string;
-                type: "file" | "patch";
-            }, {
-                path: string;
-                content: string;
-                type: "file" | "patch";
-            }>, "many">;
-            changesAlreadyApplied: z.ZodArray<z.ZodObject<{
-                type: z.ZodEnum<["patch", "file"]>;
-                path: z.ZodString;
-                content: z.ZodString;
-            }, "strip", z.ZodTypeAny, {
-                path: string;
-                content: string;
-                type: "file" | "patch";
-            }, {
-                path: string;
-                content: string;
-                type: "file" | "patch";
-            }>, "many">;
-            addedFileVersions: z.ZodArray<z.ZodObject<{
-                path: z.ZodString;
-                content: z.ZodString;
-            }, "strip", z.ZodTypeAny, {
-                path: string;
-                content: string;
-            }, {
-                path: string;
-                content: string;
-            }>, "many">;
-            resetFileVersions: z.ZodBoolean;
-        }, {
-            usage: z.ZodOptional<z.ZodNumber>;
-            remainingBalance: z.ZodOptional<z.ZodNumber>;
-            balanceBreakdown: z.ZodOptional<z.ZodOptional<z.ZodRecord<z.ZodEnum<["free", ...("free" | "referral" | "purchase" | "admin" | "organization")[]]>, z.ZodNumber>>>;
-            next_quota_reset: z.ZodOptional<z.ZodNullable<z.ZodDate>>;
-            autoTopupAdded: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
-        }>, "strip", z.ZodTypeAny, {
-            type: "response-complete";
-            userInputId: string;
-            response: string;
-            changes: {
-                path: string;
-                content: string;
-                type: "file" | "patch";
-            }[];
-            changesAlreadyApplied: {
-                path: string;
-                content: string;
-                type: "file" | "patch";
-            }[];
-            addedFileVersions: {
-                path: string;
-                content: string;
-            }[];
-            resetFileVersions: boolean;
-            usage?: number | undefined;
-            remainingBalance?: number | undefined;
-            balanceBreakdown?: Partial<Record<"free" | "referral" | "purchase" | "admin" | "organization", number>> | undefined;
-            next_quota_reset?: Date | null | undefined;
-            autoTopupAdded?: number | undefined;
-        }, {
-            type: "response-complete";
-            userInputId: string;
-            response: string;
-            changes: {
-                path: string;
-                content: string;
-                type: "file" | "patch";
-            }[];
-            changesAlreadyApplied: {
-                path: string;
-                content: string;
-                type: "file" | "patch";
-            }[];
-            addedFileVersions: {
-                path: string;
-                content: string;
-            }[];
-            resetFileVersions: boolean;
-            usage?: number | undefined;
-            remainingBalance?: number | undefined;
-            balanceBreakdown?: Partial<Record<"free" | "referral" | "purchase" | "admin" | "organization", number>> | undefined;
-            next_quota_reset?: Date | null | undefined;
-            autoTopupAdded?: number | undefined;
-        }>, z.ZodObject<{
-            type: z.ZodLiteral<"prompt-response">;
-            promptId: z.ZodString;
-            agentState: z.ZodObject<{
-                agentContext: z.ZodString;
-                fileContext: z.ZodObject<{
-                    projectRoot: z.ZodString;
-                    cwd: z.ZodString;
-                    fileTree: z.ZodArray<z.ZodType<import("../util/file").FileTreeNode, z.ZodTypeDef, import("../util/file").FileTreeNode>, "many">;
-                    fileTokenScores: z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodNumber>>;
-                    tokenCallers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodArray<z.ZodString, "many">>>>;
-                    knowledgeFiles: z.ZodRecord<z.ZodString, z.ZodString>;
-                    userKnowledgeFiles: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
-                    gitChanges: z.ZodObject<{
-                        status: z.ZodString;
-                        diff: z.ZodString;
-                        diffCached: z.ZodString;
-                        lastCommitMessages: z.ZodString;
-                    }, "strip", z.ZodTypeAny, {
-                        status: string;
-                        diff: string;
-                        diffCached: string;
-                        lastCommitMessages: string;
-                    }, {
-                        status: string;
-                        diff: string;
-                        diffCached: string;
-                        lastCommitMessages: string;
-                    }>;
-                    changesSinceLastChat: z.ZodRecord<z.ZodString, z.ZodString>;
-                    shellConfigFiles: z.ZodRecord<z.ZodString, z.ZodString>;
-                    systemInfo: z.ZodObject<{
-                        platform: z.ZodString;
-                        shell: z.ZodString;
-                        nodeVersion: z.ZodString;
-                        arch: z.ZodString;
-                        homedir: z.ZodString;
-                        cpus: z.ZodNumber;
-                    }, "strip", z.ZodTypeAny, {
-                        platform: string;
-                        shell: string;
-                        nodeVersion: string;
-                        arch: string;
-                        homedir: string;
-                        cpus: number;
-                    }, {
-                        platform: string;
-                        shell: string;
-                        nodeVersion: string;
-                        arch: string;
-                        homedir: string;
-                        cpus: number;
-                    }>;
-                    fileVersions: z.ZodOptional<z.ZodArray<z.ZodArray<z.ZodObject<{
-                        path: z.ZodString;
-                        content: z.ZodString;
-                    }, "strip", z.ZodTypeAny, {
-                        path: string;
-                        content: string;
-                    }, {
-                        path: string;
-                        content: string;
-                    }>, "many">, "many">>;
-                }, "strip", z.ZodTypeAny, {
-                    projectRoot: string;
-                    cwd: string;
-                    fileTree: import("../util/file").FileTreeNode[];
-                    fileTokenScores: Record<string, Record<string, number>>;
-                    knowledgeFiles: Record<string, string>;
-                    gitChanges: {
-                        status: string;
-                        diff: string;
-                        diffCached: string;
-                        lastCommitMessages: string;
-                    };
-                    changesSinceLastChat: Record<string, string>;
-                    shellConfigFiles: Record<string, string>;
-                    systemInfo: {
-                        platform: string;
-                        shell: string;
-                        nodeVersion: string;
-                        arch: string;
-                        homedir: string;
-                        cpus: number;
-                    };
-                    tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-                    userKnowledgeFiles?: Record<string, string> | undefined;
-                    fileVersions?: {
-                        path: string;
-                        content: string;
-                    }[][] | undefined;
-                }, {
-                    projectRoot: string;
-                    cwd: string;
-                    fileTree: import("../util/file").FileTreeNode[];
-                    fileTokenScores: Record<string, Record<string, number>>;
-                    knowledgeFiles: Record<string, string>;
-                    gitChanges: {
-                        status: string;
-                        diff: string;
-                        diffCached: string;
-                        lastCommitMessages: string;
-                    };
-                    changesSinceLastChat: Record<string, string>;
-                    shellConfigFiles: Record<string, string>;
-                    systemInfo: {
-                        platform: string;
-                        shell: string;
-                        nodeVersion: string;
-                        arch: string;
-                        homedir: string;
-                        cpus: number;
-                    };
-                    tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-                    userKnowledgeFiles?: Record<string, string> | undefined;
-                    fileVersions?: {
-                        path: string;
-                        content: string;
-                    }[][] | undefined;
-                }>;
-                messageHistory: z.ZodArray<z.ZodIntersection<z.ZodType<import("ai").CoreMessage, z.ZodTypeDef, import("ai").CoreMessage>, z.ZodObject<{
-                    timeToLive: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"agentStep">, z.ZodLiteral<"userPrompt">]>>;
-                }, "strip", z.ZodTypeAny, {
-                    timeToLive?: "agentStep" | "userPrompt" | undefined;
-                }, {
-                    timeToLive?: "agentStep" | "userPrompt" | undefined;
-                }>>, "many">;
-                agents: z.ZodDefault<z.ZodArray<z.ZodType<{
-                    agentId: string;
-                    agentName: import("../types/agent-state").AgentTemplateName;
-                    agents: import("../types/agent-state").SubagentState[];
-                    messageHistory: import("../types/message").CodebuffMessage[];
-                }, z.ZodTypeDef, {
-                    agentId: string;
-                    agentName: import("../types/agent-state").AgentTemplateName;
-                    agents: import("../types/agent-state").SubagentState[];
-                    messageHistory: import("../types/message").CodebuffMessage[];
-                }>, "many">>;
-                agentStepsRemaining: z.ZodNumber;
+        stagedChanges: string;
+        authToken?: string | undefined;
+    };
+    txid: number;
+}>]>;
+export type ClientMessageType = keyof typeof CLIENT_MESSAGE_SCHEMAS;
+export type ClientMessage<T extends ClientMessageType = ClientMessageType> = z.infer<(typeof CLIENT_MESSAGE_SCHEMAS)[T]>;
+export declare const SERVER_MESSAGE_SCHEMAS: {
+    ack: z.ZodObject<{
+        type: z.ZodLiteral<"ack">;
+        txid: z.ZodOptional<z.ZodNumber>;
+        success: z.ZodBoolean;
+        error: z.ZodOptional<z.ZodString>;
+    }, "strip", z.ZodTypeAny, {
+        type: "ack";
+        success: boolean;
+        error?: string | undefined;
+        txid?: number | undefined;
+    }, {
+        type: "ack";
+        success: boolean;
+        error?: string | undefined;
+        txid?: number | undefined;
+    }>;
+    action: z.ZodObject<{
+        type: z.ZodLiteral<"action">;
+        data: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
+            type: z.ZodLiteral<"response-chunk">;
+            userInputId: z.ZodString;
+            chunk: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            type: "response-chunk";
+            userInputId: string;
+            chunk: string;
+        }, {
+            type: "response-chunk";
+            userInputId: string;
+            chunk: string;
+        }>, z.ZodObject<z.objectUtil.extendShape<{
+            type: z.ZodLiteral<"response-complete">;
+            userInputId: z.ZodString;
+            response: z.ZodString;
+            changes: z.ZodArray<z.ZodObject<{
+                type: z.ZodEnum<["patch", "file"]>;
+                path: z.ZodString;
+                content: z.ZodString;
             }, "strip", z.ZodTypeAny, {
-                agentContext: string;
-                fileContext: {
-                    projectRoot: string;
-                    cwd: string;
-                    fileTree: import("../util/file").FileTreeNode[];
-                    fileTokenScores: Record<string, Record<string, number>>;
-                    knowledgeFiles: Record<string, string>;
-                    gitChanges: {
-                        status: string;
-                        diff: string;
-                        diffCached: string;
-                        lastCommitMessages: string;
-                    };
-                    changesSinceLastChat: Record<string, string>;
-                    shellConfigFiles: Record<string, string>;
-                    systemInfo: {
-                        platform: string;
-                        shell: string;
-                        nodeVersion: string;
-                        arch: string;
-                        homedir: string;
-                        cpus: number;
-                    };
-                    tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-                    userKnowledgeFiles?: Record<string, string> | undefined;
-                    fileVersions?: {
-                        path: string;
-                        content: string;
-                    }[][] | undefined;
-                };
-                messageHistory: (import("ai").CoreMessage & {
-                    timeToLive?: "agentStep" | "userPrompt" | undefined;
-                })[];
-                agents: {
-                    agentId: string;
-                    agentName: import("../types/agent-state").AgentTemplateName;
-                    agents: import("../types/agent-state").SubagentState[];
-                    messageHistory: import("../types/message").CodebuffMessage[];
-                }[];
-                agentStepsRemaining: number;
+                path: string;
+                type: "patch" | "file";
+                content: string;
             }, {
-                agentContext: string;
-                fileContext: {
-                    projectRoot: string;
-                    cwd: string;
-                    fileTree: import("../util/file").FileTreeNode[];
-                    fileTokenScores: Record<string, Record<string, number>>;
-                    knowledgeFiles: Record<string, string>;
-                    gitChanges: {
-                        status: string;
-                        diff: string;
-                        diffCached: string;
-                        lastCommitMessages: string;
-                    };
-                    changesSinceLastChat: Record<string, string>;
-                    shellConfigFiles: Record<string, string>;
-                    systemInfo: {
-                        platform: string;
-                        shell: string;
-                        nodeVersion: string;
-                        arch: string;
-                        homedir: string;
-                        cpus: number;
-                    };
-                    tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-                    userKnowledgeFiles?: Record<string, string> | undefined;
-                    fileVersions?: {
-                        path: string;
-                        content: string;
-                    }[][] | undefined;
-                };
-                messageHistory: (import("ai").CoreMessage & {
-                    timeToLive?: "agentStep" | "userPrompt" | undefined;
-                })[];
-                agentStepsRemaining: number;
-                agents?: {
-                    agentId: string;
-                    agentName: import("../types/agent-state").AgentTemplateName;
-                    agents: import("../types/agent-state").SubagentState[];
-                    messageHistory: import("../types/message").CodebuffMessage[];
-                }[] | undefined;
-            }>;
-            toolCalls: z.ZodArray<z.ZodObject<{
-                name: z.ZodString;
-                parameters: z.ZodRecord<z.ZodString, z.ZodString>;
-                id: z.ZodString;
+                path: string;
+                type: "patch" | "file";
+                content: string;
+            }>, "many">;
+            changesAlreadyApplied: z.ZodArray<z.ZodObject<{
+                type: z.ZodEnum<["patch", "file"]>;
+                path: z.ZodString;
+                content: z.ZodString;
             }, "strip", z.ZodTypeAny, {
-                name: string;
-                id: string;
-                parameters: Record<string, string>;
+                path: string;
+                type: "patch" | "file";
+                content: string;
             }, {
-                name: string;
-                id: string;
-                parameters: Record<string, string>;
+                path: string;
+                type: "patch" | "file";
+                content: string;
             }>, "many">;
-            toolResults: z.ZodArray<z.ZodObject<{
-                name: z.ZodString;
-                result: z.ZodString;
-                id: z.ZodString;
+            addedFileVersions: z.ZodArray<z.ZodObject<{
+                path: z.ZodString;
+                content: z.ZodString;
             }, "strip", z.ZodTypeAny, {
-                name: string;
-                id: string;
-                result: string;
+                path: string;
+                content: string;
             }, {
-                name: string;
-                id: string;
-                result: string;
+                path: string;
+                content: string;
             }>, "many">;
-        }, "strip", z.ZodTypeAny, {
-            type: "prompt-response";
-            promptId: string;
-            agentState: {
-                agentContext: string;
-                fileContext: {
-                    projectRoot: string;
-                    cwd: string;
-                    fileTree: import("../util/file").FileTreeNode[];
-                    fileTokenScores: Record<string, Record<string, number>>;
-                    knowledgeFiles: Record<string, string>;
-                    gitChanges: {
-                        status: string;
-                        diff: string;
-                        diffCached: string;
-                        lastCommitMessages: string;
-                    };
-                    changesSinceLastChat: Record<string, string>;
-                    shellConfigFiles: Record<string, string>;
-                    systemInfo: {
-                        platform: string;
-                        shell: string;
-                        nodeVersion: string;
-                        arch: string;
-                        homedir: string;
-                        cpus: number;
-                    };
-                    tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-                    userKnowledgeFiles?: Record<string, string> | undefined;
-                    fileVersions?: {
-                        path: string;
-                        content: string;
-                    }[][] | undefined;
-                };
-                messageHistory: (import("ai").CoreMessage & {
-                    timeToLive?: "agentStep" | "userPrompt" | undefined;
-                })[];
-                agents: {
-                    agentId: string;
-                    agentName: import("../types/agent-state").AgentTemplateName;
-                    agents: import("../types/agent-state").SubagentState[];
-                    messageHistory: import("../types/message").CodebuffMessage[];
-                }[];
-                agentStepsRemaining: number;
-            };
-            toolResults: {
-                name: string;
-                id: string;
-                result: string;
+            resetFileVersions: z.ZodBoolean;
+        }, {
+            usage: z.ZodOptional<z.ZodNumber>;
+            remainingBalance: z.ZodOptional<z.ZodNumber>;
+            balanceBreakdown: z.ZodOptional<z.ZodOptional<z.ZodRecord<z.ZodEnum<["free", ...("free" | "referral" | "purchase" | "admin" | "organization")[]]>, z.ZodNumber>>>;
+            next_quota_reset: z.ZodOptional<z.ZodNullable<z.ZodDate>>;
+            autoTopupAdded: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
+        }>, "strip", z.ZodTypeAny, {
+            type: "response-complete";
+            userInputId: string;
+            response: string;
+            changes: {
+                path: string;
+                type: "patch" | "file";
+                content: string;
             }[];
-            toolCalls: {
-                name: string;
-                id: string;
-                parameters: Record<string, string>;
+            changesAlreadyApplied: {
+                path: string;
+                type: "patch" | "file";
+                content: string;
+            }[];
+            addedFileVersions: {
+                path: string;
+                content: string;
             }[];
+            resetFileVersions: boolean;
+            usage?: number | undefined;
+            remainingBalance?: number | undefined;
+            balanceBreakdown?: Partial<Record<"free" | "referral" | "purchase" | "admin" | "organization", number>> | undefined;
+            next_quota_reset?: Date | null | undefined;
+            autoTopupAdded?: number | undefined;
         }, {
-            type: "prompt-response";
-            promptId: string;
-            agentState: {
-                agentContext: string;
-                fileContext: {
-                    projectRoot: string;
-                    cwd: string;
-                    fileTree: import("../util/file").FileTreeNode[];
-                    fileTokenScores: Record<string, Record<string, number>>;
-                    knowledgeFiles: Record<string, string>;
-                    gitChanges: {
-                        status: string;
-                        diff: string;
-                        diffCached: string;
-                        lastCommitMessages: string;
-                    };
-                    changesSinceLastChat: Record<string, string>;
-                    shellConfigFiles: Record<string, string>;
-                    systemInfo: {
-                        platform: string;
-                        shell: string;
-                        nodeVersion: string;
-                        arch: string;
-                        homedir: string;
-                        cpus: number;
-                    };
-                    tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-                    userKnowledgeFiles?: Record<string, string> | undefined;
-                    fileVersions?: {
-                        path: string;
-                        content: string;
-                    }[][] | undefined;
-                };
-                messageHistory: (import("ai").CoreMessage & {
-                    timeToLive?: "agentStep" | "userPrompt" | undefined;
-                })[];
-                agentStepsRemaining: number;
-                agents?: {
-                    agentId: string;
-                    agentName: import("../types/agent-state").AgentTemplateName;
-                    agents: import("../types/agent-state").SubagentState[];
-                    messageHistory: import("../types/message").CodebuffMessage[];
-                }[] | undefined;
-            };
-            toolResults: {
-                name: string;
-                id: string;
-                result: string;
+            type: "response-complete";
+            userInputId: string;
+            response: string;
+            changes: {
+                path: string;
+                type: "patch" | "file";
+                content: string;
             }[];
-            toolCalls: {
-                name: string;
-                id: string;
-                parameters: Record<string, string>;
+            changesAlreadyApplied: {
+                path: string;
+                type: "patch" | "file";
+                content: string;
+            }[];
+            addedFileVersions: {
+                path: string;
+                content: string;
             }[];
+            resetFileVersions: boolean;
+            usage?: number | undefined;
+            remainingBalance?: number | undefined;
+            balanceBreakdown?: Partial<Record<"free" | "referral" | "purchase" | "admin" | "organization", number>> | undefined;
+            next_quota_reset?: Date | null | undefined;
+            autoTopupAdded?: number | undefined;
         }>, z.ZodObject<{
-            type: z.ZodLiteral<"manager-prompt-response">;
+            type: z.ZodLiteral<"prompt-response">;
             promptId: z.ZodString;
             agentState: z.ZodObject<{
                 agentContext: z.ZodString;
@@ -3302,33 +2004,33 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                 }[] | undefined;
             }>;
             toolCalls: z.ZodArray<z.ZodObject<{
-                name: z.ZodString;
-                parameters: z.ZodRecord<z.ZodString, z.ZodString>;
-                id: z.ZodString;
+                toolName: z.ZodString;
+                args: z.ZodRecord<z.ZodString, z.ZodString>;
+                toolCallId: z.ZodString;
             }, "strip", z.ZodTypeAny, {
-                name: string;
-                id: string;
-                parameters: Record<string, string>;
+                toolName: string;
+                args: Record<string, string>;
+                toolCallId: string;
             }, {
-                name: string;
-                id: string;
-                parameters: Record<string, string>;
+                toolName: string;
+                args: Record<string, string>;
+                toolCallId: string;
             }>, "many">;
             toolResults: z.ZodArray<z.ZodObject<{
-                name: z.ZodString;
+                toolName: z.ZodString;
+                toolCallId: z.ZodString;
                 result: z.ZodString;
-                id: z.ZodString;
             }, "strip", z.ZodTypeAny, {
-                name: string;
-                id: string;
+                toolName: string;
+                toolCallId: string;
                 result: string;
             }, {
-                name: string;
-                id: string;
+                toolName: string;
+                toolCallId: string;
                 result: string;
             }>, "many">;
         }, "strip", z.ZodTypeAny, {
-            type: "manager-prompt-response";
+            type: "prompt-response";
             promptId: string;
             agentState: {
                 agentContext: string;
@@ -3373,17 +2075,17 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                 agentStepsRemaining: number;
             };
             toolResults: {
-                name: string;
-                id: string;
+                toolName: string;
+                toolCallId: string;
                 result: string;
             }[];
             toolCalls: {
-                name: string;
-                id: string;
-                parameters: Record<string, string>;
+                toolName: string;
+                args: Record<string, string>;
+                toolCallId: string;
             }[];
         }, {
-            type: "manager-prompt-response";
+            type: "prompt-response";
             promptId: string;
             agentState: {
                 agentContext: string;
@@ -3428,14 +2130,14 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                 }[] | undefined;
             };
             toolResults: {
-                name: string;
-                id: string;
+                toolName: string;
+                toolCallId: string;
                 result: string;
             }[];
             toolCalls: {
-                name: string;
-                id: string;
-                parameters: Record<string, string>;
+                toolName: string;
+                args: Record<string, string>;
+                toolCallId: string;
             }[];
         }>, z.ZodObject<{
             type: z.ZodLiteral<"read-files">;
@@ -3454,17 +2156,17 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             userInputId: z.ZodString;
             response: z.ZodString;
             data: z.ZodObject<{
-                name: z.ZodString;
-                id: z.ZodString;
-                input: z.ZodRecord<z.ZodString, z.ZodAny>;
+                toolName: z.ZodString;
+                args: z.ZodRecord<z.ZodString, z.ZodString>;
+                toolCallId: z.ZodString;
             }, "strip", z.ZodTypeAny, {
-                name: string;
-                id: string;
-                input: Record<string, any>;
+                toolName: string;
+                args: Record<string, string>;
+                toolCallId: string;
             }, {
-                name: string;
-                id: string;
-                input: Record<string, any>;
+                toolName: string;
+                args: Record<string, string>;
+                toolCallId: string;
             }>;
             changes: z.ZodArray<z.ZodObject<{
                 type: z.ZodEnum<["patch", "file"]>;
@@ -3472,12 +2174,12 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                 content: z.ZodString;
             }, "strip", z.ZodTypeAny, {
                 path: string;
+                type: "patch" | "file";
                 content: string;
-                type: "file" | "patch";
             }, {
                 path: string;
+                type: "patch" | "file";
                 content: string;
-                type: "file" | "patch";
             }>, "many">;
             changesAlreadyApplied: z.ZodArray<z.ZodObject<{
                 type: z.ZodEnum<["patch", "file"]>;
@@ -3485,12 +2187,12 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                 content: z.ZodString;
             }, "strip", z.ZodTypeAny, {
                 path: string;
+                type: "patch" | "file";
                 content: string;
-                type: "file" | "patch";
             }, {
                 path: string;
+                type: "patch" | "file";
                 content: string;
-                type: "file" | "patch";
             }>, "many">;
             addedFileVersions: z.ZodArray<z.ZodObject<{
                 path: z.ZodString;
@@ -3509,13 +2211,13 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             response: string;
             changes: {
                 path: string;
+                type: "patch" | "file";
                 content: string;
-                type: "file" | "patch";
             }[];
             changesAlreadyApplied: {
                 path: string;
+                type: "patch" | "file";
                 content: string;
-                type: "file" | "patch";
             }[];
             addedFileVersions: {
                 path: string;
@@ -3523,9 +2225,9 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             }[];
             resetFileVersions: boolean;
             data: {
-                name: string;
-                id: string;
-                input: Record<string, any>;
+                toolName: string;
+                args: Record<string, string>;
+                toolCallId: string;
             };
         }, {
             type: "tool-call";
@@ -3533,13 +2235,13 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             response: string;
             changes: {
                 path: string;
+                type: "patch" | "file";
                 content: string;
-                type: "file" | "patch";
             }[];
             changesAlreadyApplied: {
                 path: string;
+                type: "patch" | "file";
                 content: string;
-                type: "file" | "patch";
             }[];
             addedFileVersions: {
                 path: string;
@@ -3547,9 +2249,9 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             }[];
             resetFileVersions: boolean;
             data: {
-                name: string;
-                id: string;
-                input: Record<string, any>;
+                toolName: string;
+                args: Record<string, string>;
+                toolCallId: string;
             };
         }>, z.ZodObject<{
             type: z.ZodLiteral<"terminal-command-result">;
@@ -3684,13 +2386,13 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             response: string;
             changes: {
                 path: string;
+                type: "patch" | "file";
                 content: string;
-                type: "file" | "patch";
             }[];
             changesAlreadyApplied: {
                 path: string;
+                type: "patch" | "file";
                 content: string;
-                type: "file" | "patch";
             }[];
             addedFileVersions: {
                 path: string;
@@ -3752,69 +2454,14 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                 agentStepsRemaining: number;
             };
             toolResults: {
-                name: string;
-                id: string;
-                result: string;
-            }[];
-            toolCalls: {
-                name: string;
-                id: string;
-                parameters: Record<string, string>;
-            }[];
-        } | {
-            type: "manager-prompt-response";
-            promptId: string;
-            agentState: {
-                agentContext: string;
-                fileContext: {
-                    projectRoot: string;
-                    cwd: string;
-                    fileTree: import("../util/file").FileTreeNode[];
-                    fileTokenScores: Record<string, Record<string, number>>;
-                    knowledgeFiles: Record<string, string>;
-                    gitChanges: {
-                        status: string;
-                        diff: string;
-                        diffCached: string;
-                        lastCommitMessages: string;
-                    };
-                    changesSinceLastChat: Record<string, string>;
-                    shellConfigFiles: Record<string, string>;
-                    systemInfo: {
-                        platform: string;
-                        shell: string;
-                        nodeVersion: string;
-                        arch: string;
-                        homedir: string;
-                        cpus: number;
-                    };
-                    tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-                    userKnowledgeFiles?: Record<string, string> | undefined;
-                    fileVersions?: {
-                        path: string;
-                        content: string;
-                    }[][] | undefined;
-                };
-                messageHistory: (import("ai").CoreMessage & {
-                    timeToLive?: "agentStep" | "userPrompt" | undefined;
-                })[];
-                agents: {
-                    agentId: string;
-                    agentName: import("../types/agent-state").AgentTemplateName;
-                    agents: import("../types/agent-state").SubagentState[];
-                    messageHistory: import("../types/message").CodebuffMessage[];
-                }[];
-                agentStepsRemaining: number;
-            };
-            toolResults: {
-                name: string;
-                id: string;
+                toolName: string;
+                toolCallId: string;
                 result: string;
             }[];
             toolCalls: {
-                name: string;
-                id: string;
-                parameters: Record<string, string>;
+                toolName: string;
+                args: Record<string, string>;
+                toolCallId: string;
             }[];
         } | {
             type: "response-chunk";
@@ -3830,13 +2477,13 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             response: string;
             changes: {
                 path: string;
+                type: "patch" | "file";
                 content: string;
-                type: "file" | "patch";
             }[];
             changesAlreadyApplied: {
                 path: string;
+                type: "patch" | "file";
                 content: string;
-                type: "file" | "patch";
             }[];
             addedFileVersions: {
                 path: string;
@@ -3844,9 +2491,9 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             }[];
             resetFileVersions: boolean;
             data: {
-                name: string;
-                id: string;
-                input: Record<string, any>;
+                toolName: string;
+                args: Record<string, string>;
+                toolCallId: string;
             };
         } | {
             type: "terminal-command-result";
@@ -3889,13 +2536,13 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             response: string;
             changes: {
                 path: string;
+                type: "patch" | "file";
                 content: string;
-                type: "file" | "patch";
             }[];
             changesAlreadyApplied: {
                 path: string;
+                type: "patch" | "file";
                 content: string;
-                type: "file" | "patch";
             }[];
             addedFileVersions: {
                 path: string;
@@ -3957,69 +2604,14 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                 }[] | undefined;
             };
             toolResults: {
-                name: string;
-                id: string;
-                result: string;
-            }[];
-            toolCalls: {
-                name: string;
-                id: string;
-                parameters: Record<string, string>;
-            }[];
-        } | {
-            type: "manager-prompt-response";
-            promptId: string;
-            agentState: {
-                agentContext: string;
-                fileContext: {
-                    projectRoot: string;
-                    cwd: string;
-                    fileTree: import("../util/file").FileTreeNode[];
-                    fileTokenScores: Record<string, Record<string, number>>;
-                    knowledgeFiles: Record<string, string>;
-                    gitChanges: {
-                        status: string;
-                        diff: string;
-                        diffCached: string;
-                        lastCommitMessages: string;
-                    };
-                    changesSinceLastChat: Record<string, string>;
-                    shellConfigFiles: Record<string, string>;
-                    systemInfo: {
-                        platform: string;
-                        shell: string;
-                        nodeVersion: string;
-                        arch: string;
-                        homedir: string;
-                        cpus: number;
-                    };
-                    tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-                    userKnowledgeFiles?: Record<string, string> | undefined;
-                    fileVersions?: {
-                        path: string;
-                        content: string;
-                    }[][] | undefined;
-                };
-                messageHistory: (import("ai").CoreMessage & {
-                    timeToLive?: "agentStep" | "userPrompt" | undefined;
-                })[];
-                agentStepsRemaining: number;
-                agents?: {
-                    agentId: string;
-                    agentName: import("../types/agent-state").AgentTemplateName;
-                    agents: import("../types/agent-state").SubagentState[];
-                    messageHistory: import("../types/message").CodebuffMessage[];
-                }[] | undefined;
-            };
-            toolResults: {
-                name: string;
-                id: string;
+                toolName: string;
+                toolCallId: string;
                 result: string;
             }[];
             toolCalls: {
-                name: string;
-                id: string;
-                parameters: Record<string, string>;
+                toolName: string;
+                args: Record<string, string>;
+                toolCallId: string;
             }[];
         } | {
             type: "response-chunk";
@@ -4035,13 +2627,13 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             response: string;
             changes: {
                 path: string;
+                type: "patch" | "file";
                 content: string;
-                type: "file" | "patch";
             }[];
             changesAlreadyApplied: {
                 path: string;
+                type: "patch" | "file";
                 content: string;
-                type: "file" | "patch";
             }[];
             addedFileVersions: {
                 path: string;
@@ -4049,9 +2641,9 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             }[];
             resetFileVersions: boolean;
             data: {
-                name: string;
-                id: string;
-                input: Record<string, any>;
+                toolName: string;
+                args: Record<string, string>;
+                toolCallId: string;
             };
         } | {
             type: "terminal-command-result";
@@ -4100,464 +2692,106 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         userInputId: string;
         chunk: string;
     }, {
-        type: "response-chunk";
-        userInputId: string;
-        chunk: string;
-    }>, z.ZodObject<z.objectUtil.extendShape<{
-        type: z.ZodLiteral<"response-complete">;
-        userInputId: z.ZodString;
-        response: z.ZodString;
-        changes: z.ZodArray<z.ZodObject<{
-            type: z.ZodEnum<["patch", "file"]>;
-            path: z.ZodString;
-            content: z.ZodString;
-        }, "strip", z.ZodTypeAny, {
-            path: string;
-            content: string;
-            type: "file" | "patch";
-        }, {
-            path: string;
-            content: string;
-            type: "file" | "patch";
-        }>, "many">;
-        changesAlreadyApplied: z.ZodArray<z.ZodObject<{
-            type: z.ZodEnum<["patch", "file"]>;
-            path: z.ZodString;
-            content: z.ZodString;
-        }, "strip", z.ZodTypeAny, {
-            path: string;
-            content: string;
-            type: "file" | "patch";
-        }, {
-            path: string;
-            content: string;
-            type: "file" | "patch";
-        }>, "many">;
-        addedFileVersions: z.ZodArray<z.ZodObject<{
-            path: z.ZodString;
-            content: z.ZodString;
-        }, "strip", z.ZodTypeAny, {
-            path: string;
-            content: string;
-        }, {
-            path: string;
-            content: string;
-        }>, "many">;
-        resetFileVersions: z.ZodBoolean;
-    }, {
-        usage: z.ZodOptional<z.ZodNumber>;
-        remainingBalance: z.ZodOptional<z.ZodNumber>;
-        balanceBreakdown: z.ZodOptional<z.ZodOptional<z.ZodRecord<z.ZodEnum<["free", ...("free" | "referral" | "purchase" | "admin" | "organization")[]]>, z.ZodNumber>>>;
-        next_quota_reset: z.ZodOptional<z.ZodNullable<z.ZodDate>>;
-        autoTopupAdded: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
-    }>, "strip", z.ZodTypeAny, {
-        type: "response-complete";
-        userInputId: string;
-        response: string;
-        changes: {
-            path: string;
-            content: string;
-            type: "file" | "patch";
-        }[];
-        changesAlreadyApplied: {
-            path: string;
-            content: string;
-            type: "file" | "patch";
-        }[];
-        addedFileVersions: {
-            path: string;
-            content: string;
-        }[];
-        resetFileVersions: boolean;
-        usage?: number | undefined;
-        remainingBalance?: number | undefined;
-        balanceBreakdown?: Partial<Record<"free" | "referral" | "purchase" | "admin" | "organization", number>> | undefined;
-        next_quota_reset?: Date | null | undefined;
-        autoTopupAdded?: number | undefined;
-    }, {
-        type: "response-complete";
+        type: "response-chunk";
         userInputId: string;
-        response: string;
-        changes: {
-            path: string;
-            content: string;
-            type: "file" | "patch";
-        }[];
-        changesAlreadyApplied: {
+        chunk: string;
+    }>, z.ZodObject<z.objectUtil.extendShape<{
+        type: z.ZodLiteral<"response-complete">;
+        userInputId: z.ZodString;
+        response: z.ZodString;
+        changes: z.ZodArray<z.ZodObject<{
+            type: z.ZodEnum<["patch", "file"]>;
+            path: z.ZodString;
+            content: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
             path: string;
+            type: "patch" | "file";
             content: string;
-            type: "file" | "patch";
-        }[];
-        addedFileVersions: {
+        }, {
             path: string;
+            type: "patch" | "file";
             content: string;
-        }[];
-        resetFileVersions: boolean;
-        usage?: number | undefined;
-        remainingBalance?: number | undefined;
-        balanceBreakdown?: Partial<Record<"free" | "referral" | "purchase" | "admin" | "organization", number>> | undefined;
-        next_quota_reset?: Date | null | undefined;
-        autoTopupAdded?: number | undefined;
-    }>, z.ZodObject<{
-        type: z.ZodLiteral<"prompt-response">;
-        promptId: z.ZodString;
-        agentState: z.ZodObject<{
-            agentContext: z.ZodString;
-            fileContext: z.ZodObject<{
-                projectRoot: z.ZodString;
-                cwd: z.ZodString;
-                fileTree: z.ZodArray<z.ZodType<import("../util/file").FileTreeNode, z.ZodTypeDef, import("../util/file").FileTreeNode>, "many">;
-                fileTokenScores: z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodNumber>>;
-                tokenCallers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodArray<z.ZodString, "many">>>>;
-                knowledgeFiles: z.ZodRecord<z.ZodString, z.ZodString>;
-                userKnowledgeFiles: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
-                gitChanges: z.ZodObject<{
-                    status: z.ZodString;
-                    diff: z.ZodString;
-                    diffCached: z.ZodString;
-                    lastCommitMessages: z.ZodString;
-                }, "strip", z.ZodTypeAny, {
-                    status: string;
-                    diff: string;
-                    diffCached: string;
-                    lastCommitMessages: string;
-                }, {
-                    status: string;
-                    diff: string;
-                    diffCached: string;
-                    lastCommitMessages: string;
-                }>;
-                changesSinceLastChat: z.ZodRecord<z.ZodString, z.ZodString>;
-                shellConfigFiles: z.ZodRecord<z.ZodString, z.ZodString>;
-                systemInfo: z.ZodObject<{
-                    platform: z.ZodString;
-                    shell: z.ZodString;
-                    nodeVersion: z.ZodString;
-                    arch: z.ZodString;
-                    homedir: z.ZodString;
-                    cpus: z.ZodNumber;
-                }, "strip", z.ZodTypeAny, {
-                    platform: string;
-                    shell: string;
-                    nodeVersion: string;
-                    arch: string;
-                    homedir: string;
-                    cpus: number;
-                }, {
-                    platform: string;
-                    shell: string;
-                    nodeVersion: string;
-                    arch: string;
-                    homedir: string;
-                    cpus: number;
-                }>;
-                fileVersions: z.ZodOptional<z.ZodArray<z.ZodArray<z.ZodObject<{
-                    path: z.ZodString;
-                    content: z.ZodString;
-                }, "strip", z.ZodTypeAny, {
-                    path: string;
-                    content: string;
-                }, {
-                    path: string;
-                    content: string;
-                }>, "many">, "many">>;
-            }, "strip", z.ZodTypeAny, {
-                projectRoot: string;
-                cwd: string;
-                fileTree: import("../util/file").FileTreeNode[];
-                fileTokenScores: Record<string, Record<string, number>>;
-                knowledgeFiles: Record<string, string>;
-                gitChanges: {
-                    status: string;
-                    diff: string;
-                    diffCached: string;
-                    lastCommitMessages: string;
-                };
-                changesSinceLastChat: Record<string, string>;
-                shellConfigFiles: Record<string, string>;
-                systemInfo: {
-                    platform: string;
-                    shell: string;
-                    nodeVersion: string;
-                    arch: string;
-                    homedir: string;
-                    cpus: number;
-                };
-                tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-                userKnowledgeFiles?: Record<string, string> | undefined;
-                fileVersions?: {
-                    path: string;
-                    content: string;
-                }[][] | undefined;
-            }, {
-                projectRoot: string;
-                cwd: string;
-                fileTree: import("../util/file").FileTreeNode[];
-                fileTokenScores: Record<string, Record<string, number>>;
-                knowledgeFiles: Record<string, string>;
-                gitChanges: {
-                    status: string;
-                    diff: string;
-                    diffCached: string;
-                    lastCommitMessages: string;
-                };
-                changesSinceLastChat: Record<string, string>;
-                shellConfigFiles: Record<string, string>;
-                systemInfo: {
-                    platform: string;
-                    shell: string;
-                    nodeVersion: string;
-                    arch: string;
-                    homedir: string;
-                    cpus: number;
-                };
-                tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-                userKnowledgeFiles?: Record<string, string> | undefined;
-                fileVersions?: {
-                    path: string;
-                    content: string;
-                }[][] | undefined;
-            }>;
-            messageHistory: z.ZodArray<z.ZodIntersection<z.ZodType<import("ai").CoreMessage, z.ZodTypeDef, import("ai").CoreMessage>, z.ZodObject<{
-                timeToLive: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"agentStep">, z.ZodLiteral<"userPrompt">]>>;
-            }, "strip", z.ZodTypeAny, {
-                timeToLive?: "agentStep" | "userPrompt" | undefined;
-            }, {
-                timeToLive?: "agentStep" | "userPrompt" | undefined;
-            }>>, "many">;
-            agents: z.ZodDefault<z.ZodArray<z.ZodType<{
-                agentId: string;
-                agentName: import("../types/agent-state").AgentTemplateName;
-                agents: import("../types/agent-state").SubagentState[];
-                messageHistory: import("../types/message").CodebuffMessage[];
-            }, z.ZodTypeDef, {
-                agentId: string;
-                agentName: import("../types/agent-state").AgentTemplateName;
-                agents: import("../types/agent-state").SubagentState[];
-                messageHistory: import("../types/message").CodebuffMessage[];
-            }>, "many">>;
-            agentStepsRemaining: z.ZodNumber;
-        }, "strip", z.ZodTypeAny, {
-            agentContext: string;
-            fileContext: {
-                projectRoot: string;
-                cwd: string;
-                fileTree: import("../util/file").FileTreeNode[];
-                fileTokenScores: Record<string, Record<string, number>>;
-                knowledgeFiles: Record<string, string>;
-                gitChanges: {
-                    status: string;
-                    diff: string;
-                    diffCached: string;
-                    lastCommitMessages: string;
-                };
-                changesSinceLastChat: Record<string, string>;
-                shellConfigFiles: Record<string, string>;
-                systemInfo: {
-                    platform: string;
-                    shell: string;
-                    nodeVersion: string;
-                    arch: string;
-                    homedir: string;
-                    cpus: number;
-                };
-                tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-                userKnowledgeFiles?: Record<string, string> | undefined;
-                fileVersions?: {
-                    path: string;
-                    content: string;
-                }[][] | undefined;
-            };
-            messageHistory: (import("ai").CoreMessage & {
-                timeToLive?: "agentStep" | "userPrompt" | undefined;
-            })[];
-            agents: {
-                agentId: string;
-                agentName: import("../types/agent-state").AgentTemplateName;
-                agents: import("../types/agent-state").SubagentState[];
-                messageHistory: import("../types/message").CodebuffMessage[];
-            }[];
-            agentStepsRemaining: number;
-        }, {
-            agentContext: string;
-            fileContext: {
-                projectRoot: string;
-                cwd: string;
-                fileTree: import("../util/file").FileTreeNode[];
-                fileTokenScores: Record<string, Record<string, number>>;
-                knowledgeFiles: Record<string, string>;
-                gitChanges: {
-                    status: string;
-                    diff: string;
-                    diffCached: string;
-                    lastCommitMessages: string;
-                };
-                changesSinceLastChat: Record<string, string>;
-                shellConfigFiles: Record<string, string>;
-                systemInfo: {
-                    platform: string;
-                    shell: string;
-                    nodeVersion: string;
-                    arch: string;
-                    homedir: string;
-                    cpus: number;
-                };
-                tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-                userKnowledgeFiles?: Record<string, string> | undefined;
-                fileVersions?: {
-                    path: string;
-                    content: string;
-                }[][] | undefined;
-            };
-            messageHistory: (import("ai").CoreMessage & {
-                timeToLive?: "agentStep" | "userPrompt" | undefined;
-            })[];
-            agentStepsRemaining: number;
-            agents?: {
-                agentId: string;
-                agentName: import("../types/agent-state").AgentTemplateName;
-                agents: import("../types/agent-state").SubagentState[];
-                messageHistory: import("../types/message").CodebuffMessage[];
-            }[] | undefined;
-        }>;
-        toolCalls: z.ZodArray<z.ZodObject<{
-            name: z.ZodString;
-            parameters: z.ZodRecord<z.ZodString, z.ZodString>;
-            id: z.ZodString;
+        }>, "many">;
+        changesAlreadyApplied: z.ZodArray<z.ZodObject<{
+            type: z.ZodEnum<["patch", "file"]>;
+            path: z.ZodString;
+            content: z.ZodString;
         }, "strip", z.ZodTypeAny, {
-            name: string;
-            id: string;
-            parameters: Record<string, string>;
+            path: string;
+            type: "patch" | "file";
+            content: string;
         }, {
-            name: string;
-            id: string;
-            parameters: Record<string, string>;
+            path: string;
+            type: "patch" | "file";
+            content: string;
         }>, "many">;
-        toolResults: z.ZodArray<z.ZodObject<{
-            name: z.ZodString;
-            result: z.ZodString;
-            id: z.ZodString;
+        addedFileVersions: z.ZodArray<z.ZodObject<{
+            path: z.ZodString;
+            content: z.ZodString;
         }, "strip", z.ZodTypeAny, {
-            name: string;
-            id: string;
-            result: string;
+            path: string;
+            content: string;
         }, {
-            name: string;
-            id: string;
-            result: string;
+            path: string;
+            content: string;
         }>, "many">;
-    }, "strip", z.ZodTypeAny, {
-        type: "prompt-response";
-        promptId: string;
-        agentState: {
-            agentContext: string;
-            fileContext: {
-                projectRoot: string;
-                cwd: string;
-                fileTree: import("../util/file").FileTreeNode[];
-                fileTokenScores: Record<string, Record<string, number>>;
-                knowledgeFiles: Record<string, string>;
-                gitChanges: {
-                    status: string;
-                    diff: string;
-                    diffCached: string;
-                    lastCommitMessages: string;
-                };
-                changesSinceLastChat: Record<string, string>;
-                shellConfigFiles: Record<string, string>;
-                systemInfo: {
-                    platform: string;
-                    shell: string;
-                    nodeVersion: string;
-                    arch: string;
-                    homedir: string;
-                    cpus: number;
-                };
-                tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-                userKnowledgeFiles?: Record<string, string> | undefined;
-                fileVersions?: {
-                    path: string;
-                    content: string;
-                }[][] | undefined;
-            };
-            messageHistory: (import("ai").CoreMessage & {
-                timeToLive?: "agentStep" | "userPrompt" | undefined;
-            })[];
-            agents: {
-                agentId: string;
-                agentName: import("../types/agent-state").AgentTemplateName;
-                agents: import("../types/agent-state").SubagentState[];
-                messageHistory: import("../types/message").CodebuffMessage[];
-            }[];
-            agentStepsRemaining: number;
-        };
-        toolResults: {
-            name: string;
-            id: string;
-            result: string;
+        resetFileVersions: z.ZodBoolean;
+    }, {
+        usage: z.ZodOptional<z.ZodNumber>;
+        remainingBalance: z.ZodOptional<z.ZodNumber>;
+        balanceBreakdown: z.ZodOptional<z.ZodOptional<z.ZodRecord<z.ZodEnum<["free", ...("free" | "referral" | "purchase" | "admin" | "organization")[]]>, z.ZodNumber>>>;
+        next_quota_reset: z.ZodOptional<z.ZodNullable<z.ZodDate>>;
+        autoTopupAdded: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
+    }>, "strip", z.ZodTypeAny, {
+        type: "response-complete";
+        userInputId: string;
+        response: string;
+        changes: {
+            path: string;
+            type: "patch" | "file";
+            content: string;
         }[];
-        toolCalls: {
-            name: string;
-            id: string;
-            parameters: Record<string, string>;
+        changesAlreadyApplied: {
+            path: string;
+            type: "patch" | "file";
+            content: string;
+        }[];
+        addedFileVersions: {
+            path: string;
+            content: string;
         }[];
+        resetFileVersions: boolean;
+        usage?: number | undefined;
+        remainingBalance?: number | undefined;
+        balanceBreakdown?: Partial<Record<"free" | "referral" | "purchase" | "admin" | "organization", number>> | undefined;
+        next_quota_reset?: Date | null | undefined;
+        autoTopupAdded?: number | undefined;
     }, {
-        type: "prompt-response";
-        promptId: string;
-        agentState: {
-            agentContext: string;
-            fileContext: {
-                projectRoot: string;
-                cwd: string;
-                fileTree: import("../util/file").FileTreeNode[];
-                fileTokenScores: Record<string, Record<string, number>>;
-                knowledgeFiles: Record<string, string>;
-                gitChanges: {
-                    status: string;
-                    diff: string;
-                    diffCached: string;
-                    lastCommitMessages: string;
-                };
-                changesSinceLastChat: Record<string, string>;
-                shellConfigFiles: Record<string, string>;
-                systemInfo: {
-                    platform: string;
-                    shell: string;
-                    nodeVersion: string;
-                    arch: string;
-                    homedir: string;
-                    cpus: number;
-                };
-                tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-                userKnowledgeFiles?: Record<string, string> | undefined;
-                fileVersions?: {
-                    path: string;
-                    content: string;
-                }[][] | undefined;
-            };
-            messageHistory: (import("ai").CoreMessage & {
-                timeToLive?: "agentStep" | "userPrompt" | undefined;
-            })[];
-            agentStepsRemaining: number;
-            agents?: {
-                agentId: string;
-                agentName: import("../types/agent-state").AgentTemplateName;
-                agents: import("../types/agent-state").SubagentState[];
-                messageHistory: import("../types/message").CodebuffMessage[];
-            }[] | undefined;
-        };
-        toolResults: {
-            name: string;
-            id: string;
-            result: string;
+        type: "response-complete";
+        userInputId: string;
+        response: string;
+        changes: {
+            path: string;
+            type: "patch" | "file";
+            content: string;
         }[];
-        toolCalls: {
-            name: string;
-            id: string;
-            parameters: Record<string, string>;
+        changesAlreadyApplied: {
+            path: string;
+            type: "patch" | "file";
+            content: string;
+        }[];
+        addedFileVersions: {
+            path: string;
+            content: string;
         }[];
+        resetFileVersions: boolean;
+        usage?: number | undefined;
+        remainingBalance?: number | undefined;
+        balanceBreakdown?: Partial<Record<"free" | "referral" | "purchase" | "admin" | "organization", number>> | undefined;
+        next_quota_reset?: Date | null | undefined;
+        autoTopupAdded?: number | undefined;
     }>, z.ZodObject<{
-        type: z.ZodLiteral<"manager-prompt-response">;
+        type: z.ZodLiteral<"prompt-response">;
         promptId: z.ZodString;
         agentState: z.ZodObject<{
             agentContext: z.ZodString;
@@ -4779,33 +3013,33 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             }[] | undefined;
         }>;
         toolCalls: z.ZodArray<z.ZodObject<{
-            name: z.ZodString;
-            parameters: z.ZodRecord<z.ZodString, z.ZodString>;
-            id: z.ZodString;
+            toolName: z.ZodString;
+            args: z.ZodRecord<z.ZodString, z.ZodString>;
+            toolCallId: z.ZodString;
         }, "strip", z.ZodTypeAny, {
-            name: string;
-            id: string;
-            parameters: Record<string, string>;
+            toolName: string;
+            args: Record<string, string>;
+            toolCallId: string;
         }, {
-            name: string;
-            id: string;
-            parameters: Record<string, string>;
+            toolName: string;
+            args: Record<string, string>;
+            toolCallId: string;
         }>, "many">;
         toolResults: z.ZodArray<z.ZodObject<{
-            name: z.ZodString;
+            toolName: z.ZodString;
+            toolCallId: z.ZodString;
             result: z.ZodString;
-            id: z.ZodString;
         }, "strip", z.ZodTypeAny, {
-            name: string;
-            id: string;
+            toolName: string;
+            toolCallId: string;
             result: string;
         }, {
-            name: string;
-            id: string;
+            toolName: string;
+            toolCallId: string;
             result: string;
         }>, "many">;
     }, "strip", z.ZodTypeAny, {
-        type: "manager-prompt-response";
+        type: "prompt-response";
         promptId: string;
         agentState: {
             agentContext: string;
@@ -4850,17 +3084,17 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             agentStepsRemaining: number;
         };
         toolResults: {
-            name: string;
-            id: string;
+            toolName: string;
+            toolCallId: string;
             result: string;
         }[];
         toolCalls: {
-            name: string;
-            id: string;
-            parameters: Record<string, string>;
+            toolName: string;
+            args: Record<string, string>;
+            toolCallId: string;
         }[];
     }, {
-        type: "manager-prompt-response";
+        type: "prompt-response";
         promptId: string;
         agentState: {
             agentContext: string;
@@ -4905,14 +3139,14 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             }[] | undefined;
         };
         toolResults: {
-            name: string;
-            id: string;
+            toolName: string;
+            toolCallId: string;
             result: string;
         }[];
         toolCalls: {
-            name: string;
-            id: string;
-            parameters: Record<string, string>;
+            toolName: string;
+            args: Record<string, string>;
+            toolCallId: string;
         }[];
     }>, z.ZodObject<{
         type: z.ZodLiteral<"read-files">;
@@ -4931,17 +3165,17 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         userInputId: z.ZodString;
         response: z.ZodString;
         data: z.ZodObject<{
-            name: z.ZodString;
-            id: z.ZodString;
-            input: z.ZodRecord<z.ZodString, z.ZodAny>;
+            toolName: z.ZodString;
+            args: z.ZodRecord<z.ZodString, z.ZodString>;
+            toolCallId: z.ZodString;
         }, "strip", z.ZodTypeAny, {
-            name: string;
-            id: string;
-            input: Record<string, any>;
+            toolName: string;
+            args: Record<string, string>;
+            toolCallId: string;
         }, {
-            name: string;
-            id: string;
-            input: Record<string, any>;
+            toolName: string;
+            args: Record<string, string>;
+            toolCallId: string;
         }>;
         changes: z.ZodArray<z.ZodObject<{
             type: z.ZodEnum<["patch", "file"]>;
@@ -4949,12 +3183,12 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             content: z.ZodString;
         }, "strip", z.ZodTypeAny, {
             path: string;
+            type: "patch" | "file";
             content: string;
-            type: "file" | "patch";
         }, {
             path: string;
+            type: "patch" | "file";
             content: string;
-            type: "file" | "patch";
         }>, "many">;
         changesAlreadyApplied: z.ZodArray<z.ZodObject<{
             type: z.ZodEnum<["patch", "file"]>;
@@ -4962,12 +3196,12 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             content: z.ZodString;
         }, "strip", z.ZodTypeAny, {
             path: string;
+            type: "patch" | "file";
             content: string;
-            type: "file" | "patch";
         }, {
             path: string;
+            type: "patch" | "file";
             content: string;
-            type: "file" | "patch";
         }>, "many">;
         addedFileVersions: z.ZodArray<z.ZodObject<{
             path: z.ZodString;
@@ -4986,13 +3220,13 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         response: string;
         changes: {
             path: string;
+            type: "patch" | "file";
             content: string;
-            type: "file" | "patch";
         }[];
         changesAlreadyApplied: {
             path: string;
+            type: "patch" | "file";
             content: string;
-            type: "file" | "patch";
         }[];
         addedFileVersions: {
             path: string;
@@ -5000,9 +3234,9 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         }[];
         resetFileVersions: boolean;
         data: {
-            name: string;
-            id: string;
-            input: Record<string, any>;
+            toolName: string;
+            args: Record<string, string>;
+            toolCallId: string;
         };
     }, {
         type: "tool-call";
@@ -5010,13 +3244,13 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         response: string;
         changes: {
             path: string;
+            type: "patch" | "file";
             content: string;
-            type: "file" | "patch";
         }[];
         changesAlreadyApplied: {
             path: string;
+            type: "patch" | "file";
             content: string;
-            type: "file" | "patch";
         }[];
         addedFileVersions: {
             path: string;
@@ -5024,9 +3258,9 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         }[];
         resetFileVersions: boolean;
         data: {
-            name: string;
-            id: string;
-            input: Record<string, any>;
+            toolName: string;
+            args: Record<string, string>;
+            toolCallId: string;
         };
     }>, z.ZodObject<{
         type: z.ZodLiteral<"terminal-command-result">;
@@ -5161,13 +3395,13 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         response: string;
         changes: {
             path: string;
+            type: "patch" | "file";
             content: string;
-            type: "file" | "patch";
         }[];
         changesAlreadyApplied: {
             path: string;
+            type: "patch" | "file";
             content: string;
-            type: "file" | "patch";
         }[];
         addedFileVersions: {
             path: string;
@@ -5229,69 +3463,14 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             agentStepsRemaining: number;
         };
         toolResults: {
-            name: string;
-            id: string;
-            result: string;
-        }[];
-        toolCalls: {
-            name: string;
-            id: string;
-            parameters: Record<string, string>;
-        }[];
-    } | {
-        type: "manager-prompt-response";
-        promptId: string;
-        agentState: {
-            agentContext: string;
-            fileContext: {
-                projectRoot: string;
-                cwd: string;
-                fileTree: import("../util/file").FileTreeNode[];
-                fileTokenScores: Record<string, Record<string, number>>;
-                knowledgeFiles: Record<string, string>;
-                gitChanges: {
-                    status: string;
-                    diff: string;
-                    diffCached: string;
-                    lastCommitMessages: string;
-                };
-                changesSinceLastChat: Record<string, string>;
-                shellConfigFiles: Record<string, string>;
-                systemInfo: {
-                    platform: string;
-                    shell: string;
-                    nodeVersion: string;
-                    arch: string;
-                    homedir: string;
-                    cpus: number;
-                };
-                tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-                userKnowledgeFiles?: Record<string, string> | undefined;
-                fileVersions?: {
-                    path: string;
-                    content: string;
-                }[][] | undefined;
-            };
-            messageHistory: (import("ai").CoreMessage & {
-                timeToLive?: "agentStep" | "userPrompt" | undefined;
-            })[];
-            agents: {
-                agentId: string;
-                agentName: import("../types/agent-state").AgentTemplateName;
-                agents: import("../types/agent-state").SubagentState[];
-                messageHistory: import("../types/message").CodebuffMessage[];
-            }[];
-            agentStepsRemaining: number;
-        };
-        toolResults: {
-            name: string;
-            id: string;
+            toolName: string;
+            toolCallId: string;
             result: string;
         }[];
         toolCalls: {
-            name: string;
-            id: string;
-            parameters: Record<string, string>;
+            toolName: string;
+            args: Record<string, string>;
+            toolCallId: string;
         }[];
     } | {
         type: "response-chunk";
@@ -5307,13 +3486,13 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         response: string;
         changes: {
             path: string;
+            type: "patch" | "file";
             content: string;
-            type: "file" | "patch";
         }[];
         changesAlreadyApplied: {
             path: string;
+            type: "patch" | "file";
             content: string;
-            type: "file" | "patch";
         }[];
         addedFileVersions: {
             path: string;
@@ -5321,9 +3500,9 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         }[];
         resetFileVersions: boolean;
         data: {
-            name: string;
-            id: string;
-            input: Record<string, any>;
+            toolName: string;
+            args: Record<string, string>;
+            toolCallId: string;
         };
     } | {
         type: "terminal-command-result";
@@ -5366,13 +3545,13 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         response: string;
         changes: {
             path: string;
+            type: "patch" | "file";
             content: string;
-            type: "file" | "patch";
         }[];
         changesAlreadyApplied: {
             path: string;
+            type: "patch" | "file";
             content: string;
-            type: "file" | "patch";
         }[];
         addedFileVersions: {
             path: string;
@@ -5434,69 +3613,14 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             }[] | undefined;
         };
         toolResults: {
-            name: string;
-            id: string;
-            result: string;
-        }[];
-        toolCalls: {
-            name: string;
-            id: string;
-            parameters: Record<string, string>;
-        }[];
-    } | {
-        type: "manager-prompt-response";
-        promptId: string;
-        agentState: {
-            agentContext: string;
-            fileContext: {
-                projectRoot: string;
-                cwd: string;
-                fileTree: import("../util/file").FileTreeNode[];
-                fileTokenScores: Record<string, Record<string, number>>;
-                knowledgeFiles: Record<string, string>;
-                gitChanges: {
-                    status: string;
-                    diff: string;
-                    diffCached: string;
-                    lastCommitMessages: string;
-                };
-                changesSinceLastChat: Record<string, string>;
-                shellConfigFiles: Record<string, string>;
-                systemInfo: {
-                    platform: string;
-                    shell: string;
-                    nodeVersion: string;
-                    arch: string;
-                    homedir: string;
-                    cpus: number;
-                };
-                tokenCallers?: Record<string, Record<string, string[]>> | undefined;
-                userKnowledgeFiles?: Record<string, string> | undefined;
-                fileVersions?: {
-                    path: string;
-                    content: string;
-                }[][] | undefined;
-            };
-            messageHistory: (import("ai").CoreMessage & {
-                timeToLive?: "agentStep" | "userPrompt" | undefined;
-            })[];
-            agentStepsRemaining: number;
-            agents?: {
-                agentId: string;
-                agentName: import("../types/agent-state").AgentTemplateName;
-                agents: import("../types/agent-state").SubagentState[];
-                messageHistory: import("../types/message").CodebuffMessage[];
-            }[] | undefined;
-        };
-        toolResults: {
-            name: string;
-            id: string;
+            toolName: string;
+            toolCallId: string;
             result: string;
         }[];
         toolCalls: {
-            name: string;
-            id: string;
-            parameters: Record<string, string>;
+            toolName: string;
+            args: Record<string, string>;
+            toolCallId: string;
         }[];
     } | {
         type: "response-chunk";
@@ -5512,13 +3636,13 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         response: string;
         changes: {
             path: string;
+            type: "patch" | "file";
             content: string;
-            type: "file" | "patch";
         }[];
         changesAlreadyApplied: {
             path: string;
+            type: "patch" | "file";
             content: string;
-            type: "file" | "patch";
         }[];
         addedFileVersions: {
             path: string;
@@ -5526,9 +3650,9 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         }[];
         resetFileVersions: boolean;
         data: {
-            name: string;
-            id: string;
-            input: Record<string, any>;
+            toolName: string;
+            args: Record<string, string>;
+            toolCallId: string;
         };
     } | {
         type: "terminal-command-result";