codebuff 1.0.174 → 1.0.175

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

@@ -95,16 +95,16 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     }>>;
                 }, "strip", z.ZodTypeAny, {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 }, {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -178,7 +178,6 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     } | undefined;
                 }>]>, "many">]>;
             }, "strip", z.ZodTypeAny, {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -187,8 +186,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -211,8 +210,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         type: "ephemeral";
                     } | undefined;
                 })[];
-            }, {
                 role: "user" | "assistant";
+            }, {
                 content: string | ({
                     type: "text";
                     text: string;
@@ -221,8 +220,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -245,6 +244,7 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         type: "ephemeral";
                     } | undefined;
                 })[];
+                role: "user" | "assistant";
             }>, "many">;
             fileContext: z.ZodObject<{
                 currentWorkingDirectory: z.ZodString;
@@ -371,37 +371,9 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
             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: {
-                    diff: string;
-                    status: 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: {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -410,8 +382,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -434,16 +406,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         type: "ephemeral";
                     } | undefined;
                 })[];
+                role: "user" | "assistant";
             }[];
-            changesAlreadyApplied: {
-                type: "patch" | "file";
-                path: string;
-                content: string;
-            }[];
-            costMode: "lite" | "normal" | "max";
-            authToken?: string | undefined;
-        }, {
-            type: "user-input";
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -471,10 +435,18 @@ 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: {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -483,8 +455,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -507,7 +479,35 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         type: "ephemeral";
                     } | undefined;
                 })[];
+                role: "user" | "assistant";
             }[];
+            fileContext: {
+                currentWorkingDirectory: string;
+                fileTree: import("../util/file").FileTreeNode[];
+                fileTokenScores: Record<string, Record<string, number>>;
+                knowledgeFiles: Record<string, string>;
+                gitChanges: {
+                    diff: string;
+                    status: 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;
@@ -671,16 +671,16 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         }>>;
                     }, "strip", z.ZodTypeAny, {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     }, {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -754,7 +754,6 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         } | undefined;
                     }>]>, "many">]>;
                 }, "strip", z.ZodTypeAny, {
-                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -763,8 +762,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -787,8 +786,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
-                }, {
                     role: "user" | "assistant";
+                }, {
                     content: string | ({
                         type: "text";
                         text: string;
@@ -797,8 +796,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -821,9 +820,9 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
+                    role: "user" | "assistant";
                 }>, "many">;
             }, "strip", z.ZodTypeAny, {
-                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
@@ -851,8 +850,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
+                agentContext: string;
                 messageHistory: {
-                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -861,8 +860,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -885,9 +884,9 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
+                    role: "user" | "assistant";
                 }[];
             }, {
-                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
@@ -915,8 +914,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
+                agentContext: string;
                 messageHistory: {
-                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -925,8 +924,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -949,6 +948,7 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
+                    role: "user" | "assistant";
                 }[];
             }>;
             toolResults: z.ZodArray<z.ZodObject<{
@@ -956,12 +956,12 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 result: z.ZodString;
                 id: z.ZodString;
             }, "strip", z.ZodTypeAny, {
-                id: string;
                 name: string;
+                id: string;
                 result: string;
             }, {
-                id: string;
                 name: string;
+                id: string;
                 result: string;
             }>, "many">;
         }, "strip", z.ZodTypeAny, {
@@ -970,7 +970,6 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
             costMode: "lite" | "normal" | "max";
             promptId: string;
             agentState: {
-                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
@@ -998,8 +997,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
+                agentContext: string;
                 messageHistory: {
-                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -1008,8 +1007,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -1032,11 +1031,12 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
+                    role: "user" | "assistant";
                 }[];
             };
             toolResults: {
-                id: string;
                 name: string;
+                id: string;
                 result: string;
             }[];
             authToken?: string | undefined;
@@ -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,8 +1073,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
+                agentContext: string;
                 messageHistory: {
-                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -1084,8 +1083,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -1108,11 +1107,12 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
+                    role: "user" | "assistant";
                 }[];
             };
             toolResults: {
-                id: string;
                 name: string;
+                id: string;
                 result: string;
             }[];
             authToken?: string | undefined;
@@ -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,37 +1337,9 @@ 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: {
-                    diff: string;
-                    status: 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: {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -1376,8 +1348,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -1400,7 +1372,35 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         type: "ephemeral";
                     } | undefined;
                 })[];
+                role: "user" | "assistant";
             }[];
+            fileContext: {
+                currentWorkingDirectory: string;
+                fileTree: import("../util/file").FileTreeNode[];
+                fileTokenScores: Record<string, Record<string, number>>;
+                knowledgeFiles: Record<string, string>;
+                gitChanges: {
+                    diff: string;
+                    status: 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;
@@ -1414,7 +1414,6 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
             costMode: "lite" | "normal" | "max";
             promptId: string;
             agentState: {
-                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
@@ -1442,8 +1441,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
+                agentContext: string;
                 messageHistory: {
-                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -1452,8 +1451,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -1476,11 +1475,12 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
+                    role: "user" | "assistant";
                 }[];
             };
             toolResults: {
-                id: string;
                 name: string;
+                id: string;
                 result: string;
             }[];
             authToken?: string | undefined;
@@ -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,37 +1535,9 @@ 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: {
-                    diff: string;
-                    status: 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: {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -1574,8 +1546,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -1598,7 +1570,35 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         type: "ephemeral";
                     } | undefined;
                 })[];
+                role: "user" | "assistant";
             }[];
+            fileContext: {
+                currentWorkingDirectory: string;
+                fileTree: import("../util/file").FileTreeNode[];
+                fileTokenScores: Record<string, Record<string, number>>;
+                knowledgeFiles: Record<string, string>;
+                gitChanges: {
+                    diff: string;
+                    status: 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;
@@ -1611,7 +1611,6 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
             fingerprintId: string;
             promptId: string;
             agentState: {
-                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
@@ -1639,8 +1638,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
+                agentContext: string;
                 messageHistory: {
-                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -1649,8 +1648,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -1673,11 +1672,12 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
+                    role: "user" | "assistant";
                 }[];
             };
             toolResults: {
-                id: string;
                 name: string;
+                id: string;
                 result: string;
             }[];
             authToken?: string | undefined;
@@ -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";
@@ -1822,16 +1822,16 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }>>;
             }, "strip", z.ZodTypeAny, {
                 type: "tool_use";
-                id: string;
                 name: string;
+                id: string;
                 input: Record<string, any>;
                 cache_control?: {
                     type: "ephemeral";
                 } | undefined;
             }, {
                 type: "tool_use";
-                id: string;
                 name: string;
+                id: string;
                 input: Record<string, any>;
                 cache_control?: {
                     type: "ephemeral";
@@ -1905,7 +1905,6 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 } | undefined;
             }>]>, "many">]>;
         }, "strip", z.ZodTypeAny, {
-            role: "user" | "assistant";
             content: string | ({
                 type: "text";
                 text: string;
@@ -1914,8 +1913,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 } | undefined;
             } | {
                 type: "tool_use";
-                id: string;
                 name: string;
+                id: string;
                 input: Record<string, any>;
                 cache_control?: {
                     type: "ephemeral";
@@ -1938,8 +1937,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "ephemeral";
                 } | undefined;
             })[];
-        }, {
             role: "user" | "assistant";
+        }, {
             content: string | ({
                 type: "text";
                 text: string;
@@ -1948,8 +1947,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 } | undefined;
             } | {
                 type: "tool_use";
-                id: string;
                 name: string;
+                id: string;
                 input: Record<string, any>;
                 cache_control?: {
                     type: "ephemeral";
@@ -1972,6 +1971,7 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "ephemeral";
                 } | undefined;
             })[];
+            role: "user" | "assistant";
         }>, "many">;
         fileContext: z.ZodObject<{
             currentWorkingDirectory: z.ZodString;
@@ -2098,37 +2098,9 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         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: {
-                diff: string;
-                status: 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: {
-            role: "user" | "assistant";
             content: string | ({
                 type: "text";
                 text: string;
@@ -2137,8 +2109,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 } | undefined;
             } | {
                 type: "tool_use";
-                id: string;
                 name: string;
+                id: string;
                 input: Record<string, any>;
                 cache_control?: {
                     type: "ephemeral";
@@ -2161,16 +2133,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "ephemeral";
                 } | undefined;
             })[];
+            role: "user" | "assistant";
         }[];
-        changesAlreadyApplied: {
-            type: "patch" | "file";
-            path: string;
-            content: string;
-        }[];
-        costMode: "lite" | "normal" | "max";
-        authToken?: string | undefined;
-    }, {
-        type: "user-input";
         fileContext: {
             currentWorkingDirectory: string;
             fileTree: import("../util/file").FileTreeNode[];
@@ -2198,10 +2162,18 @@ 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: {
-            role: "user" | "assistant";
             content: string | ({
                 type: "text";
                 text: string;
@@ -2210,8 +2182,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 } | undefined;
             } | {
                 type: "tool_use";
-                id: string;
                 name: string;
+                id: string;
                 input: Record<string, any>;
                 cache_control?: {
                     type: "ephemeral";
@@ -2234,7 +2206,35 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "ephemeral";
                 } | undefined;
             })[];
+            role: "user" | "assistant";
         }[];
+        fileContext: {
+            currentWorkingDirectory: string;
+            fileTree: import("../util/file").FileTreeNode[];
+            fileTokenScores: Record<string, Record<string, number>>;
+            knowledgeFiles: Record<string, string>;
+            gitChanges: {
+                diff: string;
+                status: 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;
@@ -2398,16 +2398,16 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     }>>;
                 }, "strip", z.ZodTypeAny, {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 }, {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -2481,7 +2481,6 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 }>]>, "many">]>;
             }, "strip", z.ZodTypeAny, {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -2490,8 +2489,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -2514,8 +2513,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 })[];
-            }, {
                 role: "user" | "assistant";
+            }, {
                 content: string | ({
                     type: "text";
                     text: string;
@@ -2524,8 +2523,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -2548,9 +2547,9 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 })[];
+                role: "user" | "assistant";
             }>, "many">;
         }, "strip", z.ZodTypeAny, {
-            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -2578,8 +2577,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
+            agentContext: string;
             messageHistory: {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -2588,8 +2587,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -2612,9 +2611,9 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 })[];
+                role: "user" | "assistant";
             }[];
         }, {
-            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -2642,8 +2641,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
+            agentContext: string;
             messageHistory: {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -2652,8 +2651,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -2676,6 +2675,7 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 })[];
+                role: "user" | "assistant";
             }[];
         }>;
         toolResults: z.ZodArray<z.ZodObject<{
@@ -2683,12 +2683,12 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             result: z.ZodString;
             id: z.ZodString;
         }, "strip", z.ZodTypeAny, {
-            id: string;
             name: string;
+            id: string;
             result: string;
         }, {
-            id: string;
             name: string;
+            id: string;
             result: string;
         }>, "many">;
     }, "strip", z.ZodTypeAny, {
@@ -2697,7 +2697,6 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         costMode: "lite" | "normal" | "max";
         promptId: string;
         agentState: {
-            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -2725,8 +2724,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
+            agentContext: string;
             messageHistory: {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -2735,8 +2734,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -2759,11 +2758,12 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 })[];
+                role: "user" | "assistant";
             }[];
         };
         toolResults: {
-            id: string;
             name: string;
+            id: string;
             result: string;
         }[];
         authToken?: string | undefined;
@@ -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,8 +2800,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
+            agentContext: string;
             messageHistory: {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -2811,8 +2810,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -2835,11 +2834,12 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 })[];
+                role: "user" | "assistant";
             }[];
         };
         toolResults: {
-            id: string;
             name: string;
+            id: string;
             result: string;
         }[];
         authToken?: string | undefined;
@@ -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,37 +3064,9 @@ 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: {
-                diff: string;
-                status: 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: {
-            role: "user" | "assistant";
             content: string | ({
                 type: "text";
                 text: string;
@@ -3103,8 +3075,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 } | undefined;
             } | {
                 type: "tool_use";
-                id: string;
                 name: string;
+                id: string;
                 input: Record<string, any>;
                 cache_control?: {
                     type: "ephemeral";
@@ -3127,7 +3099,35 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "ephemeral";
                 } | undefined;
             })[];
+            role: "user" | "assistant";
         }[];
+        fileContext: {
+            currentWorkingDirectory: string;
+            fileTree: import("../util/file").FileTreeNode[];
+            fileTokenScores: Record<string, Record<string, number>>;
+            knowledgeFiles: Record<string, string>;
+            gitChanges: {
+                diff: string;
+                status: 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;
@@ -3141,7 +3141,6 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         costMode: "lite" | "normal" | "max";
         promptId: string;
         agentState: {
-            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -3169,8 +3168,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
+            agentContext: string;
             messageHistory: {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -3179,8 +3178,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -3203,11 +3202,12 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 })[];
+                role: "user" | "assistant";
             }[];
         };
         toolResults: {
-            id: string;
             name: string;
+            id: string;
             result: string;
         }[];
         authToken?: string | undefined;
@@ -3218,50 +3218,7 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         requestId?: string | undefined;
     } | {
         type: "init";
-        fileContext: {
-            currentWorkingDirectory: string;
-            fileTree: import("../util/file").FileTreeNode[];
-            fileTokenScores: Record<string, Record<string, number>>;
-            knowledgeFiles: Record<string, string>;
-            gitChanges: {
-                diff: string;
-                status: 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;
-        authToken?: string | undefined;
-    } | {
-        type: "usage";
-        fingerprintId: string;
-        authToken?: string | undefined;
-    } | {
-        type: "generate-commit-message";
         fingerprintId: string;
-        stagedChanges: string;
-        authToken?: string | undefined;
-    };
-    txid: number;
-}, {
-    type: "action";
-    data: {
-        type: "user-input";
         fileContext: {
             currentWorkingDirectory: string;
             fileTree: import("../util/file").FileTreeNode[];
@@ -3289,10 +3246,25 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             }[][];
             userKnowledgeFiles?: Record<string, string> | undefined;
         };
+        authToken?: string | undefined;
+    } | {
+        type: "usage";
+        fingerprintId: string;
+        authToken?: string | undefined;
+    } | {
+        type: "generate-commit-message";
+        fingerprintId: string;
+        stagedChanges: string;
+        authToken?: string | undefined;
+    };
+    txid: number;
+}, {
+    type: "action";
+    data: {
+        type: "user-input";
         fingerprintId: string;
         userInputId: string;
         messages: {
-            role: "user" | "assistant";
             content: string | ({
                 type: "text";
                 text: string;
@@ -3301,8 +3273,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 } | undefined;
             } | {
                 type: "tool_use";
-                id: string;
                 name: string;
+                id: string;
                 input: Record<string, any>;
                 cache_control?: {
                     type: "ephemeral";
@@ -3325,7 +3297,35 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "ephemeral";
                 } | undefined;
             })[];
+            role: "user" | "assistant";
         }[];
+        fileContext: {
+            currentWorkingDirectory: string;
+            fileTree: import("../util/file").FileTreeNode[];
+            fileTokenScores: Record<string, Record<string, number>>;
+            knowledgeFiles: Record<string, string>;
+            gitChanges: {
+                diff: string;
+                status: 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;
@@ -3338,7 +3338,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[];
@@ -3366,8 +3365,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
+            agentContext: string;
             messageHistory: {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -3376,8 +3375,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -3400,11 +3399,12 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 })[];
+                role: "user" | "assistant";
             }[];
         };
         toolResults: {
-            id: string;
             name: string;
+            id: string;
             result: string;
         }[];
         authToken?: string | undefined;
@@ -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";
@@ -3740,16 +3740,16 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         }>>;
                     }, "strip", z.ZodTypeAny, {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     }, {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -3823,7 +3823,6 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         } | undefined;
                     }>]>, "many">]>;
                 }, "strip", z.ZodTypeAny, {
-                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -3832,8 +3831,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -3856,8 +3855,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
-                }, {
                     role: "user" | "assistant";
+                }, {
                     content: string | ({
                         type: "text";
                         text: string;
@@ -3866,8 +3865,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -3890,9 +3889,9 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
+                    role: "user" | "assistant";
                 }>, "many">;
             }, "strip", z.ZodTypeAny, {
-                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
@@ -3920,8 +3919,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
+                agentContext: string;
                 messageHistory: {
-                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -3930,8 +3929,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -3954,9 +3953,9 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
+                    role: "user" | "assistant";
                 }[];
             }, {
-                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
@@ -3984,8 +3983,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
+                agentContext: string;
                 messageHistory: {
-                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -3994,8 +3993,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -4018,6 +4017,7 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
+                    role: "user" | "assistant";
                 }[];
             }>;
             toolCalls: z.ZodArray<z.ZodObject<{
@@ -4025,12 +4025,12 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                 parameters: z.ZodRecord<z.ZodString, z.ZodString>;
                 id: z.ZodString;
             }, "strip", z.ZodTypeAny, {
-                id: string;
                 name: string;
+                id: string;
                 parameters: Record<string, string>;
             }, {
-                id: string;
                 name: string;
+                id: string;
                 parameters: Record<string, string>;
             }>, "many">;
             toolResults: z.ZodArray<z.ZodObject<{
@@ -4038,12 +4038,12 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                 result: z.ZodString;
                 id: z.ZodString;
             }, "strip", z.ZodTypeAny, {
-                id: string;
                 name: string;
+                id: string;
                 result: string;
             }, {
-                id: string;
                 name: string;
+                id: string;
                 result: string;
             }>, "many">;
         }, {
@@ -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,8 +4084,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
+                agentContext: string;
                 messageHistory: {
-                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -4095,8 +4094,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -4119,16 +4118,17 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
+                    role: "user" | "assistant";
                 }[];
             };
             toolResults: {
-                id: string;
                 name: string;
+                id: string;
                 result: string;
             }[];
             toolCalls: {
-                id: string;
                 name: string;
+                id: string;
                 parameters: Record<string, string>;
             }[];
             usage?: number | undefined;
@@ -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,8 +4168,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
+                agentContext: string;
                 messageHistory: {
-                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -4179,8 +4178,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -4203,16 +4202,17 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
+                    role: "user" | "assistant";
                 }[];
             };
             toolResults: {
-                id: string;
                 name: string;
+                id: string;
                 result: string;
             }[];
             toolCalls: {
-                id: string;
                 name: string;
+                id: string;
                 parameters: Record<string, string>;
             }[];
             usage?: number | undefined;
@@ -4242,12 +4242,12 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                 id: z.ZodString;
                 input: z.ZodRecord<z.ZodString, z.ZodAny>;
             }, "strip", z.ZodTypeAny, {
-                id: string;
                 name: string;
+                id: string;
                 input: Record<string, any>;
             }, {
-                id: string;
                 name: string;
+                id: string;
                 input: Record<string, any>;
             }>;
             changes: z.ZodArray<z.ZodObject<{
@@ -4289,12 +4289,12 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             resetFileVersions: z.ZodBoolean;
         }, "strip", z.ZodTypeAny, {
             type: "tool-call";
+            userInputId: string;
             data: {
-                id: string;
                 name: string;
+                id: string;
                 input: Record<string, any>;
             };
-            userInputId: string;
             changesAlreadyApplied: {
                 type: "patch" | "file";
                 path: string;
@@ -4313,12 +4313,12 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             resetFileVersions: boolean;
         }, {
             type: "tool-call";
+            userInputId: string;
             data: {
-                id: string;
                 name: string;
+                id: string;
                 input: Record<string, any>;
             };
-            userInputId: string;
             changesAlreadyApplied: {
                 type: "patch" | "file";
                 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;
@@ -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,8 +4502,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
+                agentContext: string;
                 messageHistory: {
-                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -4513,8 +4512,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -4537,16 +4536,17 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
+                    role: "user" | "assistant";
                 }[];
             };
             toolResults: {
-                id: string;
                 name: string;
+                id: string;
                 result: string;
             }[];
             toolCalls: {
-                id: string;
                 name: string;
+                id: string;
                 parameters: Record<string, string>;
             }[];
             usage?: number | undefined;
@@ -4565,12 +4565,12 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             filePaths: string[];
         } | {
             type: "tool-call";
+            userInputId: string;
             data: {
-                id: string;
                 name: string;
+                id: string;
                 input: Record<string, any>;
             };
-            userInputId: string;
             changesAlreadyApplied: {
                 type: "patch" | "file";
                 path: string;
@@ -4589,8 +4589,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             resetFileVersions: boolean;
         } | {
             type: "terminal-command-result";
-            result: string;
             userInputId: string;
+            result: string;
         } | {
             type: "npm-version-status";
             isUpToDate: boolean;
@@ -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,8 +4676,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
+                agentContext: string;
                 messageHistory: {
-                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -4687,8 +4686,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -4711,16 +4710,17 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
+                    role: "user" | "assistant";
                 }[];
             };
             toolResults: {
-                id: string;
                 name: string;
+                id: string;
                 result: string;
             }[];
             toolCalls: {
-                id: string;
                 name: string;
+                id: string;
                 parameters: Record<string, string>;
             }[];
             usage?: number | undefined;
@@ -4739,12 +4739,12 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             filePaths: string[];
         } | {
             type: "tool-call";
+            userInputId: string;
             data: {
-                id: string;
                 name: string;
+                id: string;
                 input: Record<string, any>;
             };
-            userInputId: string;
             changesAlreadyApplied: {
                 type: "patch" | "file";
                 path: string;
@@ -4763,8 +4763,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             resetFileVersions: boolean;
         } | {
             type: "terminal-command-result";
-            result: string;
             userInputId: string;
+            result: string;
         } | {
             type: "npm-version-status";
             isUpToDate: boolean;
@@ -5057,16 +5057,16 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     }>>;
                 }, "strip", z.ZodTypeAny, {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 }, {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -5140,7 +5140,6 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 }>]>, "many">]>;
             }, "strip", z.ZodTypeAny, {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -5149,8 +5148,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -5173,8 +5172,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 })[];
-            }, {
                 role: "user" | "assistant";
+            }, {
                 content: string | ({
                     type: "text";
                     text: string;
@@ -5183,8 +5182,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -5207,9 +5206,9 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 })[];
+                role: "user" | "assistant";
             }>, "many">;
         }, "strip", z.ZodTypeAny, {
-            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -5237,8 +5236,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
+            agentContext: string;
             messageHistory: {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -5247,8 +5246,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -5271,9 +5270,9 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 })[];
+                role: "user" | "assistant";
             }[];
         }, {
-            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -5301,8 +5300,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
+            agentContext: string;
             messageHistory: {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -5311,8 +5310,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -5335,6 +5334,7 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 })[];
+                role: "user" | "assistant";
             }[];
         }>;
         toolCalls: z.ZodArray<z.ZodObject<{
@@ -5342,12 +5342,12 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             parameters: z.ZodRecord<z.ZodString, z.ZodString>;
             id: z.ZodString;
         }, "strip", z.ZodTypeAny, {
-            id: string;
             name: string;
+            id: string;
             parameters: Record<string, string>;
         }, {
-            id: string;
             name: string;
+            id: string;
             parameters: Record<string, string>;
         }>, "many">;
         toolResults: z.ZodArray<z.ZodObject<{
@@ -5355,12 +5355,12 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             result: z.ZodString;
             id: z.ZodString;
         }, "strip", z.ZodTypeAny, {
-            id: string;
             name: string;
+            id: string;
             result: string;
         }, {
-            id: string;
             name: string;
+            id: string;
             result: string;
         }>, "many">;
     }, {
@@ -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,8 +5401,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
+            agentContext: string;
             messageHistory: {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -5412,8 +5411,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -5436,16 +5435,17 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 })[];
+                role: "user" | "assistant";
             }[];
         };
         toolResults: {
-            id: string;
             name: string;
+            id: string;
             result: string;
         }[];
         toolCalls: {
-            id: string;
             name: string;
+            id: string;
             parameters: Record<string, string>;
         }[];
         usage?: number | undefined;
@@ -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,8 +5485,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
+            agentContext: string;
             messageHistory: {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -5496,8 +5495,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -5520,16 +5519,17 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 })[];
+                role: "user" | "assistant";
             }[];
         };
         toolResults: {
-            id: string;
             name: string;
+            id: string;
             result: string;
         }[];
         toolCalls: {
-            id: string;
             name: string;
+            id: string;
             parameters: Record<string, string>;
         }[];
         usage?: number | undefined;
@@ -5559,12 +5559,12 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             id: z.ZodString;
             input: z.ZodRecord<z.ZodString, z.ZodAny>;
         }, "strip", z.ZodTypeAny, {
-            id: string;
             name: string;
+            id: string;
             input: Record<string, any>;
         }, {
-            id: string;
             name: string;
+            id: string;
             input: Record<string, any>;
         }>;
         changes: z.ZodArray<z.ZodObject<{
@@ -5606,12 +5606,12 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         resetFileVersions: z.ZodBoolean;
     }, "strip", z.ZodTypeAny, {
         type: "tool-call";
+        userInputId: string;
         data: {
-            id: string;
             name: string;
+            id: string;
             input: Record<string, any>;
         };
-        userInputId: string;
         changesAlreadyApplied: {
             type: "patch" | "file";
             path: string;
@@ -5630,12 +5630,12 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         resetFileVersions: boolean;
     }, {
         type: "tool-call";
+        userInputId: string;
         data: {
-            id: string;
             name: string;
+            id: string;
             input: Record<string, any>;
         };
-        userInputId: string;
         changesAlreadyApplied: {
             type: "patch" | "file";
             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;
@@ -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,8 +5819,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
+            agentContext: string;
             messageHistory: {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -5830,8 +5829,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -5854,16 +5853,17 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 })[];
+                role: "user" | "assistant";
             }[];
         };
         toolResults: {
-            id: string;
             name: string;
+            id: string;
             result: string;
         }[];
         toolCalls: {
-            id: string;
             name: string;
+            id: string;
             parameters: Record<string, string>;
         }[];
         usage?: number | undefined;
@@ -5882,12 +5882,12 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         filePaths: string[];
     } | {
         type: "tool-call";
+        userInputId: string;
         data: {
-            id: string;
             name: string;
+            id: string;
             input: Record<string, any>;
         };
-        userInputId: string;
         changesAlreadyApplied: {
             type: "patch" | "file";
             path: string;
@@ -5906,8 +5906,8 @@ 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;
@@ -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,8 +5993,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
+            agentContext: string;
             messageHistory: {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -6004,8 +6003,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -6028,16 +6027,17 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 })[];
+                role: "user" | "assistant";
             }[];
         };
         toolResults: {
-            id: string;
             name: string;
+            id: string;
             result: string;
         }[];
         toolCalls: {
-            id: string;
             name: string;
+            id: string;
             parameters: Record<string, string>;
         }[];
         usage?: number | undefined;
@@ -6056,12 +6056,12 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         filePaths: string[];
     } | {
         type: "tool-call";
+        userInputId: string;
         data: {
-            id: string;
             name: string;
+            id: string;
             input: Record<string, any>;
         };
-        userInputId: string;
         changesAlreadyApplied: {
             type: "patch" | "file";
             path: string;
@@ -6080,8 +6080,8 @@ 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;