codebuff 1.0.176 → 1.0.177

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

@@ -121,15 +121,15 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         type: "ephemeral";
                     }>>;
                 }, "strip", z.ZodTypeAny, {
-                    content: string;
                     type: "tool_result";
+                    content: string;
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 }, {
-                    content: string;
                     type: "tool_result";
+                    content: string;
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -193,8 +193,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         type: "ephemeral";
                     } | undefined;
                 } | {
-                    content: string;
                     type: "tool_result";
+                    content: string;
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -227,8 +227,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         type: "ephemeral";
                     } | undefined;
                 } | {
-                    content: string;
                     type: "tool_result";
+                    content: string;
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -360,44 +360,17 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 path: z.ZodString;
                 content: z.ZodString;
             }, "strip", z.ZodTypeAny, {
+                type: "patch" | "file";
                 path: string;
                 content: string;
-                type: "file" | "patch";
             }, {
+                type: "patch" | "file";
                 path: string;
                 content: string;
-                type: "file" | "patch";
             }>, "many">;
             costMode: z.ZodDefault<z.ZodOptional<z.ZodEnum<["lite", "normal", "max"]>>>;
         }, "strip", z.ZodTypeAny, {
             type: "user-input";
-            fileContext: {
-                currentWorkingDirectory: 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;
-                };
-                fileVersions: {
-                    path: string;
-                    content: string;
-                }[][];
-                userKnowledgeFiles?: Record<string, string> | undefined;
-            };
             fingerprintId: string;
             userInputId: string;
             messages: {
@@ -416,8 +389,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         type: "ephemeral";
                     } | undefined;
                 } | {
-                    content: string;
                     type: "tool_result";
+                    content: string;
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -435,15 +408,6 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 })[];
                 role: "user" | "assistant";
             }[];
-            changesAlreadyApplied: {
-                path: string;
-                content: string;
-                type: "file" | "patch";
-            }[];
-            costMode: "max" | "lite" | "normal";
-            authToken?: string | undefined;
-        }, {
-            type: "user-input";
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -471,6 +435,15 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
+            changesAlreadyApplied: {
+                type: "patch" | "file";
+                path: string;
+                content: string;
+            }[];
+            costMode: "lite" | "normal" | "max";
+            authToken?: string | undefined;
+        }, {
+            type: "user-input";
             fingerprintId: string;
             userInputId: string;
             messages: {
@@ -489,8 +462,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         type: "ephemeral";
                     } | undefined;
                 } | {
-                    content: string;
                     type: "tool_result";
+                    content: string;
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -508,13 +481,40 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 })[];
                 role: "user" | "assistant";
             }[];
+            fileContext: {
+                currentWorkingDirectory: 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;
+                };
+                fileVersions: {
+                    path: string;
+                    content: string;
+                }[][];
+                userKnowledgeFiles?: Record<string, string> | undefined;
+            };
             changesAlreadyApplied: {
+                type: "patch" | "file";
                 path: string;
                 content: string;
-                type: "file" | "patch";
             }[];
             authToken?: string | undefined;
-            costMode?: "max" | "lite" | "normal" | undefined;
+            costMode?: "lite" | "normal" | "max" | undefined;
         }>, z.ZodObject<{
             type: z.ZodLiteral<"prompt">;
             promptId: z.ZodString;
@@ -697,15 +697,15 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         }>>;
                     }, "strip", z.ZodTypeAny, {
-                        content: string;
                         type: "tool_result";
+                        content: string;
                         tool_use_id: string;
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     }, {
-                        content: string;
                         type: "tool_result";
+                        content: string;
                         tool_use_id: string;
                         cache_control?: {
                             type: "ephemeral";
@@ -769,8 +769,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     } | {
-                        content: string;
                         type: "tool_result";
+                        content: string;
                         tool_use_id: string;
                         cache_control?: {
                             type: "ephemeral";
@@ -803,8 +803,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     } | {
-                        content: string;
                         type: "tool_result";
+                        content: string;
                         tool_use_id: string;
                         cache_control?: {
                             type: "ephemeral";
@@ -823,7 +823,6 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     role: "user" | "assistant";
                 }>, "many">;
             }, "strip", z.ZodTypeAny, {
-                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
@@ -851,6 +850,7 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
+                agentContext: string;
                 messageHistory: {
                     content: string | ({
                         type: "text";
@@ -867,8 +867,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     } | {
-                        content: string;
                         type: "tool_result";
+                        content: string;
                         tool_use_id: string;
                         cache_control?: {
                             type: "ephemeral";
@@ -887,7 +887,6 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     role: "user" | "assistant";
                 }[];
             }, {
-                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
@@ -915,6 +914,7 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
+                agentContext: string;
                 messageHistory: {
                     content: string | ({
                         type: "text";
@@ -931,8 +931,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     } | {
-                        content: string;
                         type: "tool_result";
+                        content: string;
                         tool_use_id: string;
                         cache_control?: {
                             type: "ephemeral";
@@ -967,10 +967,9 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
         }, "strip", z.ZodTypeAny, {
             type: "prompt";
             fingerprintId: string;
-            costMode: "max" | "lite" | "normal";
+            costMode: "lite" | "normal" | "max";
             promptId: string;
             agentState: {
-                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
@@ -998,6 +997,7 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
+                agentContext: string;
                 messageHistory: {
                     content: string | ({
                         type: "text";
@@ -1014,8 +1014,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     } | {
-                        content: string;
                         type: "tool_result";
+                        content: string;
                         tool_use_id: string;
                         cache_control?: {
                             type: "ephemeral";
@@ -1046,7 +1046,6 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
             fingerprintId: string;
             promptId: string;
             agentState: {
-                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
@@ -1074,6 +1073,7 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
+                agentContext: string;
                 messageHistory: {
                     content: string | ({
                         type: "text";
@@ -1090,8 +1090,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     } | {
-                        content: string;
                         type: "tool_result";
+                        content: string;
                         tool_use_id: string;
                         cache_control?: {
                             type: "ephemeral";
@@ -1116,7 +1116,7 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 result: string;
             }[];
             authToken?: string | undefined;
-            costMode?: "max" | "lite" | "normal" | undefined;
+            costMode?: "lite" | "normal" | "max" | undefined;
             prompt?: string | undefined;
         }>, z.ZodObject<{
             type: z.ZodLiteral<"read-files-response">;
@@ -1245,6 +1245,7 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
             }>;
         }, "strip", z.ZodTypeAny, {
             type: "init";
+            fingerprintId: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -1272,10 +1273,10 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
-            fingerprintId: string;
             authToken?: string | undefined;
         }, {
             type: "init";
+            fingerprintId: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -1303,7 +1304,6 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
-            fingerprintId: string;
             authToken?: string | undefined;
         }>, z.ZodObject<{
             type: z.ZodLiteral<"usage">;
@@ -1337,33 +1337,6 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
         type: "action";
         data: {
             type: "user-input";
-            fileContext: {
-                currentWorkingDirectory: 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;
-                };
-                fileVersions: {
-                    path: string;
-                    content: string;
-                }[][];
-                userKnowledgeFiles?: Record<string, string> | undefined;
-            };
             fingerprintId: string;
             userInputId: string;
             messages: {
@@ -1382,8 +1355,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         type: "ephemeral";
                     } | undefined;
                 } | {
-                    content: string;
                     type: "tool_result";
+                    content: string;
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -1401,20 +1374,46 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 })[];
                 role: "user" | "assistant";
             }[];
+            fileContext: {
+                currentWorkingDirectory: 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;
+                };
+                fileVersions: {
+                    path: string;
+                    content: string;
+                }[][];
+                userKnowledgeFiles?: Record<string, string> | undefined;
+            };
             changesAlreadyApplied: {
+                type: "patch" | "file";
                 path: string;
                 content: string;
-                type: "file" | "patch";
             }[];
-            costMode: "max" | "lite" | "normal";
+            costMode: "lite" | "normal" | "max";
             authToken?: string | undefined;
         } | {
             type: "prompt";
             fingerprintId: string;
-            costMode: "max" | "lite" | "normal";
+            costMode: "lite" | "normal" | "max";
             promptId: string;
             agentState: {
-                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
@@ -1442,6 +1441,7 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
+                agentContext: string;
                 messageHistory: {
                     content: string | ({
                         type: "text";
@@ -1458,8 +1458,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     } | {
-                        content: string;
                         type: "tool_result";
+                        content: string;
                         tool_use_id: string;
                         cache_control?: {
                             type: "ephemeral";
@@ -1491,6 +1491,7 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
             requestId?: string | undefined;
         } | {
             type: "init";
+            fingerprintId: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -1518,7 +1519,6 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
-            fingerprintId: string;
             authToken?: string | undefined;
         } | {
             type: "usage";
@@ -1535,33 +1535,6 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
         type: "action";
         data: {
             type: "user-input";
-            fileContext: {
-                currentWorkingDirectory: 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;
-                };
-                fileVersions: {
-                    path: string;
-                    content: string;
-                }[][];
-                userKnowledgeFiles?: Record<string, string> | undefined;
-            };
             fingerprintId: string;
             userInputId: string;
             messages: {
@@ -1580,8 +1553,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         type: "ephemeral";
                     } | undefined;
                 } | {
-                    content: string;
                     type: "tool_result";
+                    content: string;
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -1599,19 +1572,45 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 })[];
                 role: "user" | "assistant";
             }[];
+            fileContext: {
+                currentWorkingDirectory: 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;
+                };
+                fileVersions: {
+                    path: string;
+                    content: string;
+                }[][];
+                userKnowledgeFiles?: Record<string, string> | undefined;
+            };
             changesAlreadyApplied: {
+                type: "patch" | "file";
                 path: string;
                 content: string;
-                type: "file" | "patch";
             }[];
             authToken?: string | undefined;
-            costMode?: "max" | "lite" | "normal" | undefined;
+            costMode?: "lite" | "normal" | "max" | undefined;
         } | {
             type: "prompt";
             fingerprintId: string;
             promptId: string;
             agentState: {
-                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
@@ -1639,6 +1638,7 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
+                agentContext: string;
                 messageHistory: {
                     content: string | ({
                         type: "text";
@@ -1655,8 +1655,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     } | {
-                        content: string;
                         type: "tool_result";
+                        content: string;
                         tool_use_id: string;
                         cache_control?: {
                             type: "ephemeral";
@@ -1681,7 +1681,7 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 result: string;
             }[];
             authToken?: string | undefined;
-            costMode?: "max" | "lite" | "normal" | undefined;
+            costMode?: "lite" | "normal" | "max" | undefined;
             prompt?: string | undefined;
         } | {
             type: "read-files-response";
@@ -1689,6 +1689,7 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
             requestId?: string | undefined;
         } | {
             type: "init";
+            fingerprintId: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -1716,7 +1717,6 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
-            fingerprintId: string;
             authToken?: string | undefined;
         } | {
             type: "usage";
@@ -1848,15 +1848,15 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "ephemeral";
                 }>>;
             }, "strip", z.ZodTypeAny, {
-                content: string;
                 type: "tool_result";
+                content: string;
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
                 } | undefined;
             }, {
-                content: string;
                 type: "tool_result";
+                content: string;
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
@@ -1920,8 +1920,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "ephemeral";
                 } | undefined;
             } | {
-                content: string;
                 type: "tool_result";
+                content: string;
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
@@ -1954,8 +1954,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "ephemeral";
                 } | undefined;
             } | {
-                content: string;
                 type: "tool_result";
+                content: string;
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
@@ -2087,44 +2087,17 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             path: z.ZodString;
             content: z.ZodString;
         }, "strip", z.ZodTypeAny, {
+            type: "patch" | "file";
             path: string;
             content: string;
-            type: "file" | "patch";
         }, {
+            type: "patch" | "file";
             path: string;
             content: string;
-            type: "file" | "patch";
         }>, "many">;
         costMode: z.ZodDefault<z.ZodOptional<z.ZodEnum<["lite", "normal", "max"]>>>;
     }, "strip", z.ZodTypeAny, {
         type: "user-input";
-        fileContext: {
-            currentWorkingDirectory: 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;
-            };
-            fileVersions: {
-                path: string;
-                content: string;
-            }[][];
-            userKnowledgeFiles?: Record<string, string> | undefined;
-        };
         fingerprintId: string;
         userInputId: string;
         messages: {
@@ -2143,8 +2116,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "ephemeral";
                 } | undefined;
             } | {
-                content: string;
                 type: "tool_result";
+                content: string;
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
@@ -2162,15 +2135,6 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             })[];
             role: "user" | "assistant";
         }[];
-        changesAlreadyApplied: {
-            path: string;
-            content: string;
-            type: "file" | "patch";
-        }[];
-        costMode: "max" | "lite" | "normal";
-        authToken?: string | undefined;
-    }, {
-        type: "user-input";
         fileContext: {
             currentWorkingDirectory: string;
             fileTree: import("../util/file").FileTreeNode[];
@@ -2198,6 +2162,15 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             }[][];
             userKnowledgeFiles?: Record<string, string> | undefined;
         };
+        changesAlreadyApplied: {
+            type: "patch" | "file";
+            path: string;
+            content: string;
+        }[];
+        costMode: "lite" | "normal" | "max";
+        authToken?: string | undefined;
+    }, {
+        type: "user-input";
         fingerprintId: string;
         userInputId: string;
         messages: {
@@ -2216,8 +2189,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "ephemeral";
                 } | undefined;
             } | {
-                content: string;
                 type: "tool_result";
+                content: string;
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
@@ -2235,13 +2208,40 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             })[];
             role: "user" | "assistant";
         }[];
+        fileContext: {
+            currentWorkingDirectory: 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;
+            };
+            fileVersions: {
+                path: string;
+                content: string;
+            }[][];
+            userKnowledgeFiles?: Record<string, string> | undefined;
+        };
         changesAlreadyApplied: {
+            type: "patch" | "file";
             path: string;
             content: string;
-            type: "file" | "patch";
         }[];
         authToken?: string | undefined;
-        costMode?: "max" | "lite" | "normal" | undefined;
+        costMode?: "lite" | "normal" | "max" | undefined;
     }>, z.ZodObject<{
         type: z.ZodLiteral<"prompt">;
         promptId: z.ZodString;
@@ -2424,15 +2424,15 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     }>>;
                 }, "strip", z.ZodTypeAny, {
-                    content: string;
                     type: "tool_result";
+                    content: string;
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 }, {
-                    content: string;
                     type: "tool_result";
+                    content: string;
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -2496,8 +2496,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 } | {
-                    content: string;
                     type: "tool_result";
+                    content: string;
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -2530,8 +2530,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 } | {
-                    content: string;
                     type: "tool_result";
+                    content: string;
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -2550,7 +2550,6 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 role: "user" | "assistant";
             }>, "many">;
         }, "strip", z.ZodTypeAny, {
-            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -2578,6 +2577,7 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
+            agentContext: string;
             messageHistory: {
                 content: string | ({
                     type: "text";
@@ -2594,8 +2594,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 } | {
-                    content: string;
                     type: "tool_result";
+                    content: string;
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -2614,7 +2614,6 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 role: "user" | "assistant";
             }[];
         }, {
-            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -2642,6 +2641,7 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
+            agentContext: string;
             messageHistory: {
                 content: string | ({
                     type: "text";
@@ -2658,8 +2658,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 } | {
-                    content: string;
                     type: "tool_result";
+                    content: string;
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -2694,10 +2694,9 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
     }, "strip", z.ZodTypeAny, {
         type: "prompt";
         fingerprintId: string;
-        costMode: "max" | "lite" | "normal";
+        costMode: "lite" | "normal" | "max";
         promptId: string;
         agentState: {
-            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -2725,6 +2724,7 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
+            agentContext: string;
             messageHistory: {
                 content: string | ({
                     type: "text";
@@ -2741,8 +2741,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 } | {
-                    content: string;
                     type: "tool_result";
+                    content: string;
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -2773,7 +2773,6 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         fingerprintId: string;
         promptId: string;
         agentState: {
-            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -2801,6 +2800,7 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
+            agentContext: string;
             messageHistory: {
                 content: string | ({
                     type: "text";
@@ -2817,8 +2817,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 } | {
-                    content: string;
                     type: "tool_result";
+                    content: string;
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -2843,7 +2843,7 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             result: string;
         }[];
         authToken?: string | undefined;
-        costMode?: "max" | "lite" | "normal" | undefined;
+        costMode?: "lite" | "normal" | "max" | undefined;
         prompt?: string | undefined;
     }>, z.ZodObject<{
         type: z.ZodLiteral<"read-files-response">;
@@ -2972,6 +2972,7 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         }>;
     }, "strip", z.ZodTypeAny, {
         type: "init";
+        fingerprintId: string;
         fileContext: {
             currentWorkingDirectory: string;
             fileTree: import("../util/file").FileTreeNode[];
@@ -2999,10 +3000,10 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             }[][];
             userKnowledgeFiles?: Record<string, string> | undefined;
         };
-        fingerprintId: string;
         authToken?: string | undefined;
     }, {
         type: "init";
+        fingerprintId: string;
         fileContext: {
             currentWorkingDirectory: string;
             fileTree: import("../util/file").FileTreeNode[];
@@ -3030,7 +3031,6 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             }[][];
             userKnowledgeFiles?: Record<string, string> | undefined;
         };
-        fingerprintId: string;
         authToken?: string | undefined;
     }>, z.ZodObject<{
         type: z.ZodLiteral<"usage">;
@@ -3064,33 +3064,6 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
     type: "action";
     data: {
         type: "user-input";
-        fileContext: {
-            currentWorkingDirectory: 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;
-            };
-            fileVersions: {
-                path: string;
-                content: string;
-            }[][];
-            userKnowledgeFiles?: Record<string, string> | undefined;
-        };
         fingerprintId: string;
         userInputId: string;
         messages: {
@@ -3109,8 +3082,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "ephemeral";
                 } | undefined;
             } | {
-                content: string;
                 type: "tool_result";
+                content: string;
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
@@ -3128,20 +3101,46 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             })[];
             role: "user" | "assistant";
         }[];
+        fileContext: {
+            currentWorkingDirectory: 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;
+            };
+            fileVersions: {
+                path: string;
+                content: string;
+            }[][];
+            userKnowledgeFiles?: Record<string, string> | undefined;
+        };
         changesAlreadyApplied: {
+            type: "patch" | "file";
             path: string;
             content: string;
-            type: "file" | "patch";
         }[];
-        costMode: "max" | "lite" | "normal";
+        costMode: "lite" | "normal" | "max";
         authToken?: string | undefined;
     } | {
         type: "prompt";
         fingerprintId: string;
-        costMode: "max" | "lite" | "normal";
+        costMode: "lite" | "normal" | "max";
         promptId: string;
         agentState: {
-            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -3169,6 +3168,7 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
+            agentContext: string;
             messageHistory: {
                 content: string | ({
                     type: "text";
@@ -3185,8 +3185,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 } | {
-                    content: string;
                     type: "tool_result";
+                    content: string;
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -3218,6 +3218,7 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         requestId?: string | undefined;
     } | {
         type: "init";
+        fingerprintId: string;
         fileContext: {
             currentWorkingDirectory: string;
             fileTree: import("../util/file").FileTreeNode[];
@@ -3245,7 +3246,6 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             }[][];
             userKnowledgeFiles?: Record<string, string> | undefined;
         };
-        fingerprintId: string;
         authToken?: string | undefined;
     } | {
         type: "usage";
@@ -3262,33 +3262,6 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
     type: "action";
     data: {
         type: "user-input";
-        fileContext: {
-            currentWorkingDirectory: 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;
-            };
-            fileVersions: {
-                path: string;
-                content: string;
-            }[][];
-            userKnowledgeFiles?: Record<string, string> | undefined;
-        };
         fingerprintId: string;
         userInputId: string;
         messages: {
@@ -3307,8 +3280,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "ephemeral";
                 } | undefined;
             } | {
-                content: string;
                 type: "tool_result";
+                content: string;
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
@@ -3326,19 +3299,45 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             })[];
             role: "user" | "assistant";
         }[];
+        fileContext: {
+            currentWorkingDirectory: 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;
+            };
+            fileVersions: {
+                path: string;
+                content: string;
+            }[][];
+            userKnowledgeFiles?: Record<string, string> | undefined;
+        };
         changesAlreadyApplied: {
+            type: "patch" | "file";
             path: string;
             content: string;
-            type: "file" | "patch";
         }[];
         authToken?: string | undefined;
-        costMode?: "max" | "lite" | "normal" | undefined;
+        costMode?: "lite" | "normal" | "max" | undefined;
     } | {
         type: "prompt";
         fingerprintId: string;
         promptId: string;
         agentState: {
-            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -3366,6 +3365,7 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
+            agentContext: string;
             messageHistory: {
                 content: string | ({
                     type: "text";
@@ -3382,8 +3382,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 } | {
-                    content: string;
                     type: "tool_result";
+                    content: string;
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -3408,7 +3408,7 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             result: string;
         }[];
         authToken?: string | undefined;
-        costMode?: "max" | "lite" | "normal" | undefined;
+        costMode?: "lite" | "normal" | "max" | undefined;
         prompt?: string | undefined;
     } | {
         type: "read-files-response";
@@ -3416,6 +3416,7 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         requestId?: string | undefined;
     } | {
         type: "init";
+        fingerprintId: string;
         fileContext: {
             currentWorkingDirectory: string;
             fileTree: import("../util/file").FileTreeNode[];
@@ -3443,7 +3444,6 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             }[][];
             userKnowledgeFiles?: Record<string, string> | undefined;
         };
-        fingerprintId: string;
         authToken?: string | undefined;
     } | {
         type: "usage";
@@ -3468,13 +3468,13 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
     }, "strip", z.ZodTypeAny, {
         type: "ack";
         success: boolean;
-        error?: string | undefined;
         txid?: number | undefined;
+        error?: string | undefined;
     }, {
         type: "ack";
         success: boolean;
-        error?: string | undefined;
         txid?: number | undefined;
+        error?: string | undefined;
     }>;
     action: z.ZodObject<{
         type: z.ZodLiteral<"action">;
@@ -3499,26 +3499,26 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                 path: z.ZodString;
                 content: z.ZodString;
             }, "strip", z.ZodTypeAny, {
+                type: "patch" | "file";
                 path: string;
                 content: string;
-                type: "file" | "patch";
             }, {
+                type: "patch" | "file";
                 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, {
+                type: "patch" | "file";
                 path: string;
                 content: string;
-                type: "file" | "patch";
             }, {
+                type: "patch" | "file";
                 path: string;
                 content: string;
-                type: "file" | "patch";
             }>, "many">;
             addedFileVersions: z.ZodArray<z.ZodObject<{
                 path: z.ZodString;
@@ -3542,15 +3542,15 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             type: "response-complete";
             userInputId: string;
             changesAlreadyApplied: {
+                type: "patch" | "file";
                 path: string;
                 content: string;
-                type: "file" | "patch";
             }[];
             response: string;
             changes: {
+                type: "patch" | "file";
                 path: string;
                 content: string;
-                type: "file" | "patch";
             }[];
             addedFileVersions: {
                 path: string;
@@ -3567,15 +3567,15 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             type: "response-complete";
             userInputId: string;
             changesAlreadyApplied: {
+                type: "patch" | "file";
                 path: string;
                 content: string;
-                type: "file" | "patch";
             }[];
             response: string;
             changes: {
+                type: "patch" | "file";
                 path: string;
                 content: string;
-                type: "file" | "patch";
             }[];
             addedFileVersions: {
                 path: string;
@@ -3766,15 +3766,15 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         }>>;
                     }, "strip", z.ZodTypeAny, {
-                        content: string;
                         type: "tool_result";
+                        content: string;
                         tool_use_id: string;
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     }, {
-                        content: string;
                         type: "tool_result";
+                        content: string;
                         tool_use_id: string;
                         cache_control?: {
                             type: "ephemeral";
@@ -3838,8 +3838,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     } | {
-                        content: string;
                         type: "tool_result";
+                        content: string;
                         tool_use_id: string;
                         cache_control?: {
                             type: "ephemeral";
@@ -3872,8 +3872,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     } | {
-                        content: string;
                         type: "tool_result";
+                        content: string;
                         tool_use_id: string;
                         cache_control?: {
                             type: "ephemeral";
@@ -3892,7 +3892,6 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     role: "user" | "assistant";
                 }>, "many">;
             }, "strip", z.ZodTypeAny, {
-                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
@@ -3920,6 +3919,7 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
+                agentContext: string;
                 messageHistory: {
                     content: string | ({
                         type: "text";
@@ -3936,8 +3936,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     } | {
-                        content: string;
                         type: "tool_result";
+                        content: string;
                         tool_use_id: string;
                         cache_control?: {
                             type: "ephemeral";
@@ -3956,7 +3956,6 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     role: "user" | "assistant";
                 }[];
             }, {
-                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
@@ -3984,6 +3983,7 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
+                agentContext: string;
                 messageHistory: {
                     content: string | ({
                         type: "text";
@@ -4000,8 +4000,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     } | {
-                        content: string;
                         type: "tool_result";
+                        content: string;
                         tool_use_id: string;
                         cache_control?: {
                             type: "ephemeral";
@@ -4057,7 +4057,6 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             type: "prompt-response";
             promptId: string;
             agentState: {
-                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
@@ -4085,6 +4084,7 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
+                agentContext: string;
                 messageHistory: {
                     content: string | ({
                         type: "text";
@@ -4101,8 +4101,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     } | {
-                        content: string;
                         type: "tool_result";
+                        content: string;
                         tool_use_id: string;
                         cache_control?: {
                             type: "ephemeral";
@@ -4141,7 +4141,6 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             type: "prompt-response";
             promptId: string;
             agentState: {
-                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
@@ -4169,6 +4168,7 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
+                agentContext: string;
                 messageHistory: {
                     content: string | ({
                         type: "text";
@@ -4185,8 +4185,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     } | {
-                        content: string;
                         type: "tool_result";
+                        content: string;
                         tool_use_id: string;
                         cache_control?: {
                             type: "ephemeral";
@@ -4255,26 +4255,26 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                 path: z.ZodString;
                 content: z.ZodString;
             }, "strip", z.ZodTypeAny, {
+                type: "patch" | "file";
                 path: string;
                 content: string;
-                type: "file" | "patch";
             }, {
+                type: "patch" | "file";
                 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, {
+                type: "patch" | "file";
                 path: string;
                 content: string;
-                type: "file" | "patch";
             }, {
+                type: "patch" | "file";
                 path: string;
                 content: string;
-                type: "file" | "patch";
             }>, "many">;
             addedFileVersions: z.ZodArray<z.ZodObject<{
                 path: z.ZodString;
@@ -4289,22 +4289,22 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             resetFileVersions: z.ZodBoolean;
         }, "strip", z.ZodTypeAny, {
             type: "tool-call";
+            userInputId: string;
             data: {
                 name: string;
                 id: string;
                 input: Record<string, any>;
             };
-            userInputId: string;
             changesAlreadyApplied: {
+                type: "patch" | "file";
                 path: string;
                 content: string;
-                type: "file" | "patch";
             }[];
             response: string;
             changes: {
+                type: "patch" | "file";
                 path: string;
                 content: string;
-                type: "file" | "patch";
             }[];
             addedFileVersions: {
                 path: string;
@@ -4313,22 +4313,22 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             resetFileVersions: boolean;
         }, {
             type: "tool-call";
+            userInputId: string;
             data: {
                 name: string;
                 id: string;
                 input: Record<string, any>;
             };
-            userInputId: string;
             changesAlreadyApplied: {
+                type: "patch" | "file";
                 path: string;
                 content: string;
-                type: "file" | "patch";
             }[];
             response: string;
             changes: {
+                type: "patch" | "file";
                 path: string;
                 content: string;
-                type: "file" | "patch";
             }[];
             addedFileVersions: {
                 path: string;
@@ -4341,12 +4341,12 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             result: z.ZodString;
         }, "strip", z.ZodTypeAny, {
             type: "terminal-command-result";
-            result: string;
             userInputId: string;
+            result: string;
         }, {
             type: "terminal-command-result";
-            result: string;
             userInputId: string;
+            result: string;
         }>, z.ZodObject<{
             type: z.ZodLiteral<"npm-version-status">;
             isUpToDate: z.ZodBoolean;
@@ -4413,11 +4413,11 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             type: z.ZodLiteral<"action-error">;
             message: z.ZodString;
         }, "strip", z.ZodTypeAny, {
-            message: string;
             type: "action-error";
-        }, {
             message: string;
+        }, {
             type: "action-error";
+            message: string;
         }>, z.ZodObject<{
             type: z.ZodLiteral<"commit-message-response">;
             commitMessage: z.ZodString;
@@ -4450,15 +4450,15 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             type: "response-complete";
             userInputId: string;
             changesAlreadyApplied: {
+                type: "patch" | "file";
                 path: string;
                 content: string;
-                type: "file" | "patch";
             }[];
             response: string;
             changes: {
+                type: "patch" | "file";
                 path: string;
                 content: string;
-                type: "file" | "patch";
             }[];
             addedFileVersions: {
                 path: string;
@@ -4475,7 +4475,6 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             type: "prompt-response";
             promptId: string;
             agentState: {
-                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
@@ -4503,6 +4502,7 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
+                agentContext: string;
                 messageHistory: {
                     content: string | ({
                         type: "text";
@@ -4519,8 +4519,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     } | {
-                        content: string;
                         type: "tool_result";
+                        content: string;
                         tool_use_id: string;
                         cache_control?: {
                             type: "ephemeral";
@@ -4565,22 +4565,22 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             filePaths: string[];
         } | {
             type: "tool-call";
+            userInputId: string;
             data: {
                 name: string;
                 id: string;
                 input: Record<string, any>;
             };
-            userInputId: string;
             changesAlreadyApplied: {
+                type: "patch" | "file";
                 path: string;
                 content: string;
-                type: "file" | "patch";
             }[];
             response: string;
             changes: {
+                type: "patch" | "file";
                 path: string;
                 content: string;
-                type: "file" | "patch";
             }[];
             addedFileVersions: {
                 path: string;
@@ -4589,15 +4589,15 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             resetFileVersions: boolean;
         } | {
             type: "terminal-command-result";
-            result: string;
             userInputId: string;
+            result: string;
         } | {
             type: "npm-version-status";
             isUpToDate: boolean;
             latestVersion: string;
         } | {
-            message: string;
             type: "action-error";
+            message: string;
         } | {
             type: "commit-message-response";
             commitMessage: string;
@@ -4624,15 +4624,15 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             type: "response-complete";
             userInputId: string;
             changesAlreadyApplied: {
+                type: "patch" | "file";
                 path: string;
                 content: string;
-                type: "file" | "patch";
             }[];
             response: string;
             changes: {
+                type: "patch" | "file";
                 path: string;
                 content: string;
-                type: "file" | "patch";
             }[];
             addedFileVersions: {
                 path: string;
@@ -4649,7 +4649,6 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             type: "prompt-response";
             promptId: string;
             agentState: {
-                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
@@ -4677,6 +4676,7 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
+                agentContext: string;
                 messageHistory: {
                     content: string | ({
                         type: "text";
@@ -4693,8 +4693,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     } | {
-                        content: string;
                         type: "tool_result";
+                        content: string;
                         tool_use_id: string;
                         cache_control?: {
                             type: "ephemeral";
@@ -4739,22 +4739,22 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             filePaths: string[];
         } | {
             type: "tool-call";
+            userInputId: string;
             data: {
                 name: string;
                 id: string;
                 input: Record<string, any>;
             };
-            userInputId: string;
             changesAlreadyApplied: {
+                type: "patch" | "file";
                 path: string;
                 content: string;
-                type: "file" | "patch";
             }[];
             response: string;
             changes: {
+                type: "patch" | "file";
                 path: string;
                 content: string;
-                type: "file" | "patch";
             }[];
             addedFileVersions: {
                 path: string;
@@ -4763,15 +4763,15 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             resetFileVersions: boolean;
         } | {
             type: "terminal-command-result";
-            result: string;
             userInputId: string;
+            result: string;
         } | {
             type: "npm-version-status";
             isUpToDate: boolean;
             latestVersion: string;
         } | {
-            message: string;
             type: "action-error";
+            message: string;
         } | {
             type: "commit-message-response";
             commitMessage: string;
@@ -4786,13 +4786,13 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     type: "ack";
     success: boolean;
-    error?: string | undefined;
     txid?: number | undefined;
+    error?: string | undefined;
 }, {
     type: "ack";
     success: boolean;
-    error?: string | undefined;
     txid?: number | undefined;
+    error?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"action">;
     data: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
@@ -4816,26 +4816,26 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             path: z.ZodString;
             content: z.ZodString;
         }, "strip", z.ZodTypeAny, {
+            type: "patch" | "file";
             path: string;
             content: string;
-            type: "file" | "patch";
         }, {
+            type: "patch" | "file";
             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, {
+            type: "patch" | "file";
             path: string;
             content: string;
-            type: "file" | "patch";
         }, {
+            type: "patch" | "file";
             path: string;
             content: string;
-            type: "file" | "patch";
         }>, "many">;
         addedFileVersions: z.ZodArray<z.ZodObject<{
             path: z.ZodString;
@@ -4859,15 +4859,15 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         type: "response-complete";
         userInputId: string;
         changesAlreadyApplied: {
+            type: "patch" | "file";
             path: string;
             content: string;
-            type: "file" | "patch";
         }[];
         response: string;
         changes: {
+            type: "patch" | "file";
             path: string;
             content: string;
-            type: "file" | "patch";
         }[];
         addedFileVersions: {
             path: string;
@@ -4884,15 +4884,15 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         type: "response-complete";
         userInputId: string;
         changesAlreadyApplied: {
+            type: "patch" | "file";
             path: string;
             content: string;
-            type: "file" | "patch";
         }[];
         response: string;
         changes: {
+            type: "patch" | "file";
             path: string;
             content: string;
-            type: "file" | "patch";
         }[];
         addedFileVersions: {
             path: string;
@@ -5083,15 +5083,15 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     }>>;
                 }, "strip", z.ZodTypeAny, {
-                    content: string;
                     type: "tool_result";
+                    content: string;
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 }, {
-                    content: string;
                     type: "tool_result";
+                    content: string;
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -5155,8 +5155,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 } | {
-                    content: string;
                     type: "tool_result";
+                    content: string;
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -5189,8 +5189,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 } | {
-                    content: string;
                     type: "tool_result";
+                    content: string;
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -5209,7 +5209,6 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 role: "user" | "assistant";
             }>, "many">;
         }, "strip", z.ZodTypeAny, {
-            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -5237,6 +5236,7 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
+            agentContext: string;
             messageHistory: {
                 content: string | ({
                     type: "text";
@@ -5253,8 +5253,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 } | {
-                    content: string;
                     type: "tool_result";
+                    content: string;
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -5273,7 +5273,6 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 role: "user" | "assistant";
             }[];
         }, {
-            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -5301,6 +5300,7 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
+            agentContext: string;
             messageHistory: {
                 content: string | ({
                     type: "text";
@@ -5317,8 +5317,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 } | {
-                    content: string;
                     type: "tool_result";
+                    content: string;
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -5374,7 +5374,6 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         type: "prompt-response";
         promptId: string;
         agentState: {
-            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -5402,6 +5401,7 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
+            agentContext: string;
             messageHistory: {
                 content: string | ({
                     type: "text";
@@ -5418,8 +5418,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 } | {
-                    content: string;
                     type: "tool_result";
+                    content: string;
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -5458,7 +5458,6 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         type: "prompt-response";
         promptId: string;
         agentState: {
-            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -5486,6 +5485,7 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
+            agentContext: string;
             messageHistory: {
                 content: string | ({
                     type: "text";
@@ -5502,8 +5502,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 } | {
-                    content: string;
                     type: "tool_result";
+                    content: string;
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -5572,26 +5572,26 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             path: z.ZodString;
             content: z.ZodString;
         }, "strip", z.ZodTypeAny, {
+            type: "patch" | "file";
             path: string;
             content: string;
-            type: "file" | "patch";
         }, {
+            type: "patch" | "file";
             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, {
+            type: "patch" | "file";
             path: string;
             content: string;
-            type: "file" | "patch";
         }, {
+            type: "patch" | "file";
             path: string;
             content: string;
-            type: "file" | "patch";
         }>, "many">;
         addedFileVersions: z.ZodArray<z.ZodObject<{
             path: z.ZodString;
@@ -5606,22 +5606,22 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         resetFileVersions: z.ZodBoolean;
     }, "strip", z.ZodTypeAny, {
         type: "tool-call";
+        userInputId: string;
         data: {
             name: string;
             id: string;
             input: Record<string, any>;
         };
-        userInputId: string;
         changesAlreadyApplied: {
+            type: "patch" | "file";
             path: string;
             content: string;
-            type: "file" | "patch";
         }[];
         response: string;
         changes: {
+            type: "patch" | "file";
             path: string;
             content: string;
-            type: "file" | "patch";
         }[];
         addedFileVersions: {
             path: string;
@@ -5630,22 +5630,22 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         resetFileVersions: boolean;
     }, {
         type: "tool-call";
+        userInputId: string;
         data: {
             name: string;
             id: string;
             input: Record<string, any>;
         };
-        userInputId: string;
         changesAlreadyApplied: {
+            type: "patch" | "file";
             path: string;
             content: string;
-            type: "file" | "patch";
         }[];
         response: string;
         changes: {
+            type: "patch" | "file";
             path: string;
             content: string;
-            type: "file" | "patch";
         }[];
         addedFileVersions: {
             path: string;
@@ -5658,12 +5658,12 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         result: z.ZodString;
     }, "strip", z.ZodTypeAny, {
         type: "terminal-command-result";
-        result: string;
         userInputId: string;
+        result: string;
     }, {
         type: "terminal-command-result";
-        result: string;
         userInputId: string;
+        result: string;
     }>, z.ZodObject<{
         type: z.ZodLiteral<"npm-version-status">;
         isUpToDate: z.ZodBoolean;
@@ -5730,11 +5730,11 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         type: z.ZodLiteral<"action-error">;
         message: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        message: string;
         type: "action-error";
-    }, {
         message: string;
+    }, {
         type: "action-error";
+        message: string;
     }>, z.ZodObject<{
         type: z.ZodLiteral<"commit-message-response">;
         commitMessage: z.ZodString;
@@ -5767,15 +5767,15 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         type: "response-complete";
         userInputId: string;
         changesAlreadyApplied: {
+            type: "patch" | "file";
             path: string;
             content: string;
-            type: "file" | "patch";
         }[];
         response: string;
         changes: {
+            type: "patch" | "file";
             path: string;
             content: string;
-            type: "file" | "patch";
         }[];
         addedFileVersions: {
             path: string;
@@ -5792,7 +5792,6 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         type: "prompt-response";
         promptId: string;
         agentState: {
-            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -5820,6 +5819,7 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
+            agentContext: string;
             messageHistory: {
                 content: string | ({
                     type: "text";
@@ -5836,8 +5836,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 } | {
-                    content: string;
                     type: "tool_result";
+                    content: string;
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -5882,22 +5882,22 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         filePaths: string[];
     } | {
         type: "tool-call";
+        userInputId: string;
         data: {
             name: string;
             id: string;
             input: Record<string, any>;
         };
-        userInputId: string;
         changesAlreadyApplied: {
+            type: "patch" | "file";
             path: string;
             content: string;
-            type: "file" | "patch";
         }[];
         response: string;
         changes: {
+            type: "patch" | "file";
             path: string;
             content: string;
-            type: "file" | "patch";
         }[];
         addedFileVersions: {
             path: string;
@@ -5906,15 +5906,15 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         resetFileVersions: boolean;
     } | {
         type: "terminal-command-result";
-        result: string;
         userInputId: string;
+        result: string;
     } | {
         type: "npm-version-status";
         isUpToDate: boolean;
         latestVersion: string;
     } | {
-        message: string;
         type: "action-error";
+        message: string;
     } | {
         type: "commit-message-response";
         commitMessage: string;
@@ -5941,15 +5941,15 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         type: "response-complete";
         userInputId: string;
         changesAlreadyApplied: {
+            type: "patch" | "file";
             path: string;
             content: string;
-            type: "file" | "patch";
         }[];
         response: string;
         changes: {
+            type: "patch" | "file";
             path: string;
             content: string;
-            type: "file" | "patch";
         }[];
         addedFileVersions: {
             path: string;
@@ -5966,7 +5966,6 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         type: "prompt-response";
         promptId: string;
         agentState: {
-            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -5994,6 +5993,7 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
+            agentContext: string;
             messageHistory: {
                 content: string | ({
                     type: "text";
@@ -6010,8 +6010,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 } | {
-                    content: string;
                     type: "tool_result";
+                    content: string;
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -6056,22 +6056,22 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         filePaths: string[];
     } | {
         type: "tool-call";
+        userInputId: string;
         data: {
             name: string;
             id: string;
             input: Record<string, any>;
         };
-        userInputId: string;
         changesAlreadyApplied: {
+            type: "patch" | "file";
             path: string;
             content: string;
-            type: "file" | "patch";
         }[];
         response: string;
         changes: {
+            type: "patch" | "file";
             path: string;
             content: string;
-            type: "file" | "patch";
         }[];
         addedFileVersions: {
             path: string;
@@ -6080,15 +6080,15 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         resetFileVersions: boolean;
     } | {
         type: "terminal-command-result";
-        result: string;
         userInputId: string;
+        result: string;
     } | {
         type: "npm-version-status";
         isUpToDate: boolean;
         latestVersion: string;
     } | {
-        message: string;
         type: "action-error";
+        message: string;
     } | {
         type: "commit-message-response";
         commitMessage: string;