codebuff 1.0.174 → 1.0.176

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";
@@ -121,15 +121,15 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         type: "ephemeral";
                     }>>;
                 }, "strip", z.ZodTypeAny, {
-                    type: "tool_result";
                     content: string;
+                    type: "tool_result";
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 }, {
-                    type: "tool_result";
                     content: string;
+                    type: "tool_result";
                     tool_use_id: string;
                     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,15 +186,15 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 } | {
-                    type: "tool_result";
                     content: string;
+                    type: "tool_result";
                     tool_use_id: string;
                     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,15 +220,15 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 } | {
-                    type: "tool_result";
                     content: string;
+                    type: "tool_result";
                     tool_use_id: string;
                     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;
@@ -258,13 +258,13 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     diffCached: z.ZodString;
                     lastCommitMessages: z.ZodString;
                 }, "strip", z.ZodTypeAny, {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 }, {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 }>;
@@ -308,8 +308,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -334,8 +334,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -360,13 +360,13 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 path: z.ZodString;
                 content: z.ZodString;
             }, "strip", z.ZodTypeAny, {
-                type: "patch" | "file";
                 path: string;
                 content: string;
+                type: "file" | "patch";
             }, {
-                type: "patch" | "file";
                 path: string;
                 content: string;
+                type: "file" | "patch";
             }>, "many">;
             costMode: z.ZodDefault<z.ZodOptional<z.ZodEnum<["lite", "normal", "max"]>>>;
         }, "strip", z.ZodTypeAny, {
@@ -377,8 +377,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -401,7 +401,6 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
             fingerprintId: string;
             userInputId: string;
             messages: {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -410,15 +409,15 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 } | {
-                    type: "tool_result";
                     content: string;
+                    type: "tool_result";
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -434,13 +433,14 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         type: "ephemeral";
                     } | undefined;
                 })[];
+                role: "user" | "assistant";
             }[];
             changesAlreadyApplied: {
-                type: "patch" | "file";
                 path: string;
                 content: string;
+                type: "file" | "patch";
             }[];
-            costMode: "lite" | "normal" | "max";
+            costMode: "max" | "lite" | "normal";
             authToken?: string | undefined;
         }, {
             type: "user-input";
@@ -450,8 +450,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -474,7 +474,6 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
             fingerprintId: string;
             userInputId: string;
             messages: {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -483,15 +482,15 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 } | {
-                    type: "tool_result";
                     content: string;
+                    type: "tool_result";
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -507,14 +506,15 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         type: "ephemeral";
                     } | undefined;
                 })[];
+                role: "user" | "assistant";
             }[];
             changesAlreadyApplied: {
-                type: "patch" | "file";
                 path: string;
                 content: string;
+                type: "file" | "patch";
             }[];
             authToken?: string | undefined;
-            costMode?: "lite" | "normal" | "max" | undefined;
+            costMode?: "max" | "lite" | "normal" | undefined;
         }>, z.ZodObject<{
             type: z.ZodLiteral<"prompt">;
             promptId: z.ZodString;
@@ -536,13 +536,13 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         diffCached: z.ZodString;
                         lastCommitMessages: z.ZodString;
                     }, "strip", z.ZodTypeAny, {
-                        diff: string;
                         status: string;
+                        diff: string;
                         diffCached: string;
                         lastCommitMessages: string;
                     }, {
-                        diff: string;
                         status: string;
+                        diff: string;
                         diffCached: string;
                         lastCommitMessages: string;
                     }>;
@@ -586,8 +586,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     fileTokenScores: Record<string, Record<string, number>>;
                     knowledgeFiles: Record<string, string>;
                     gitChanges: {
-                        diff: string;
                         status: string;
+                        diff: string;
                         diffCached: string;
                         lastCommitMessages: string;
                     };
@@ -612,8 +612,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     fileTokenScores: Record<string, Record<string, number>>;
                     knowledgeFiles: Record<string, string>;
                     gitChanges: {
-                        diff: string;
                         status: string;
+                        diff: string;
                         diffCached: string;
                         lastCommitMessages: 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";
@@ -697,15 +697,15 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         }>>;
                     }, "strip", z.ZodTypeAny, {
-                        type: "tool_result";
                         content: string;
+                        type: "tool_result";
                         tool_use_id: string;
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     }, {
-                        type: "tool_result";
                         content: string;
+                        type: "tool_result";
                         tool_use_id: string;
                         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,15 +762,15 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     } | {
-                        type: "tool_result";
                         content: string;
+                        type: "tool_result";
                         tool_use_id: string;
                         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,15 +796,15 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     } | {
-                        type: "tool_result";
                         content: string;
+                        type: "tool_result";
                         tool_use_id: string;
                         cache_control?: {
                             type: "ephemeral";
@@ -821,6 +820,7 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
+                    role: "user" | "assistant";
                 }>, "many">;
             }, "strip", z.ZodTypeAny, {
                 agentContext: string;
@@ -830,8 +830,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     fileTokenScores: Record<string, Record<string, number>>;
                     knowledgeFiles: Record<string, string>;
                     gitChanges: {
-                        diff: string;
                         status: string;
+                        diff: string;
                         diffCached: string;
                         lastCommitMessages: string;
                     };
@@ -852,7 +852,6 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
                 messageHistory: {
-                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -861,15 +860,15 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     } | {
-                        type: "tool_result";
                         content: string;
+                        type: "tool_result";
                         tool_use_id: string;
                         cache_control?: {
                             type: "ephemeral";
@@ -885,6 +884,7 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
+                    role: "user" | "assistant";
                 }[];
             }, {
                 agentContext: string;
@@ -894,8 +894,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     fileTokenScores: Record<string, Record<string, number>>;
                     knowledgeFiles: Record<string, string>;
                     gitChanges: {
-                        diff: string;
                         status: string;
+                        diff: string;
                         diffCached: string;
                         lastCommitMessages: string;
                     };
@@ -916,7 +916,6 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
                 messageHistory: {
-                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -925,15 +924,15 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     } | {
-                        type: "tool_result";
                         content: string;
+                        type: "tool_result";
                         tool_use_id: string;
                         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,18 +956,18 @@ 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, {
             type: "prompt";
             fingerprintId: string;
-            costMode: "lite" | "normal" | "max";
+            costMode: "max" | "lite" | "normal";
             promptId: string;
             agentState: {
                 agentContext: string;
@@ -977,8 +977,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     fileTokenScores: Record<string, Record<string, number>>;
                     knowledgeFiles: Record<string, string>;
                     gitChanges: {
-                        diff: string;
                         status: string;
+                        diff: string;
                         diffCached: string;
                         lastCommitMessages: string;
                     };
@@ -999,7 +999,6 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
                 messageHistory: {
-                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -1008,15 +1007,15 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     } | {
-                        type: "tool_result";
                         content: string;
+                        type: "tool_result";
                         tool_use_id: string;
                         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;
@@ -1053,8 +1053,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     fileTokenScores: Record<string, Record<string, number>>;
                     knowledgeFiles: Record<string, string>;
                     gitChanges: {
-                        diff: string;
                         status: string;
+                        diff: string;
                         diffCached: string;
                         lastCommitMessages: string;
                     };
@@ -1075,7 +1075,6 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
                 messageHistory: {
-                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -1084,15 +1083,15 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     } | {
-                        type: "tool_result";
                         content: string;
+                        type: "tool_result";
                         tool_use_id: string;
                         cache_control?: {
                             type: "ephemeral";
@@ -1108,15 +1107,16 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
+                    role: "user" | "assistant";
                 }[];
             };
             toolResults: {
-                id: string;
                 name: string;
+                id: string;
                 result: string;
             }[];
             authToken?: string | undefined;
-            costMode?: "lite" | "normal" | "max" | undefined;
+            costMode?: "max" | "lite" | "normal" | undefined;
             prompt?: string | undefined;
         }>, z.ZodObject<{
             type: z.ZodLiteral<"read-files-response">;
@@ -1146,13 +1146,13 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     diffCached: z.ZodString;
                     lastCommitMessages: z.ZodString;
                 }, "strip", z.ZodTypeAny, {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 }, {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 }>;
@@ -1196,8 +1196,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -1222,8 +1222,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -1251,8 +1251,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -1282,8 +1282,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -1343,8 +1343,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -1367,7 +1367,6 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
             fingerprintId: string;
             userInputId: string;
             messages: {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -1376,15 +1375,15 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 } | {
-                    type: "tool_result";
                     content: string;
+                    type: "tool_result";
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -1400,18 +1399,19 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         type: "ephemeral";
                     } | undefined;
                 })[];
+                role: "user" | "assistant";
             }[];
             changesAlreadyApplied: {
-                type: "patch" | "file";
                 path: string;
                 content: string;
+                type: "file" | "patch";
             }[];
-            costMode: "lite" | "normal" | "max";
+            costMode: "max" | "lite" | "normal";
             authToken?: string | undefined;
         } | {
             type: "prompt";
             fingerprintId: string;
-            costMode: "lite" | "normal" | "max";
+            costMode: "max" | "lite" | "normal";
             promptId: string;
             agentState: {
                 agentContext: string;
@@ -1421,8 +1421,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     fileTokenScores: Record<string, Record<string, number>>;
                     knowledgeFiles: Record<string, string>;
                     gitChanges: {
-                        diff: string;
                         status: string;
+                        diff: string;
                         diffCached: string;
                         lastCommitMessages: string;
                     };
@@ -1443,7 +1443,6 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
                 messageHistory: {
-                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -1452,15 +1451,15 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     } | {
-                        type: "tool_result";
                         content: string;
+                        type: "tool_result";
                         tool_use_id: string;
                         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;
@@ -1497,8 +1497,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -1541,8 +1541,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -1565,7 +1565,6 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
             fingerprintId: string;
             userInputId: string;
             messages: {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -1574,15 +1573,15 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    id: string;
                     name: string;
+                    id: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 } | {
-                    type: "tool_result";
                     content: string;
+                    type: "tool_result";
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -1598,14 +1597,15 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         type: "ephemeral";
                     } | undefined;
                 })[];
+                role: "user" | "assistant";
             }[];
             changesAlreadyApplied: {
-                type: "patch" | "file";
                 path: string;
                 content: string;
+                type: "file" | "patch";
             }[];
             authToken?: string | undefined;
-            costMode?: "lite" | "normal" | "max" | undefined;
+            costMode?: "max" | "lite" | "normal" | undefined;
         } | {
             type: "prompt";
             fingerprintId: string;
@@ -1618,8 +1618,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     fileTokenScores: Record<string, Record<string, number>>;
                     knowledgeFiles: Record<string, string>;
                     gitChanges: {
-                        diff: string;
                         status: string;
+                        diff: string;
                         diffCached: string;
                         lastCommitMessages: string;
                     };
@@ -1640,7 +1640,6 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
                 messageHistory: {
-                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -1649,15 +1648,15 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     } | {
-                        type: "tool_result";
                         content: string;
+                        type: "tool_result";
                         tool_use_id: string;
                         cache_control?: {
                             type: "ephemeral";
@@ -1673,15 +1672,16 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
+                    role: "user" | "assistant";
                 }[];
             };
             toolResults: {
-                id: string;
                 name: string;
+                id: string;
                 result: string;
             }[];
             authToken?: string | undefined;
-            costMode?: "lite" | "normal" | "max" | undefined;
+            costMode?: "max" | "lite" | "normal" | undefined;
             prompt?: string | undefined;
         } | {
             type: "read-files-response";
@@ -1695,8 +1695,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -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";
@@ -1848,15 +1848,15 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "ephemeral";
                 }>>;
             }, "strip", z.ZodTypeAny, {
-                type: "tool_result";
                 content: string;
+                type: "tool_result";
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
                 } | undefined;
             }, {
-                type: "tool_result";
                 content: string;
+                type: "tool_result";
                 tool_use_id: string;
                 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,15 +1913,15 @@ 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";
                 } | undefined;
             } | {
-                type: "tool_result";
                 content: string;
+                type: "tool_result";
                 tool_use_id: string;
                 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,15 +1947,15 @@ 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";
                 } | undefined;
             } | {
-                type: "tool_result";
                 content: string;
+                type: "tool_result";
                 tool_use_id: string;
                 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;
@@ -1985,13 +1985,13 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 diffCached: z.ZodString;
                 lastCommitMessages: z.ZodString;
             }, "strip", z.ZodTypeAny, {
-                diff: string;
                 status: string;
+                diff: string;
                 diffCached: string;
                 lastCommitMessages: string;
             }, {
-                diff: string;
                 status: string;
+                diff: string;
                 diffCached: string;
                 lastCommitMessages: string;
             }>;
@@ -2035,8 +2035,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             fileTokenScores: Record<string, Record<string, number>>;
             knowledgeFiles: Record<string, string>;
             gitChanges: {
-                diff: string;
                 status: string;
+                diff: string;
                 diffCached: string;
                 lastCommitMessages: string;
             };
@@ -2061,8 +2061,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             fileTokenScores: Record<string, Record<string, number>>;
             knowledgeFiles: Record<string, string>;
             gitChanges: {
-                diff: string;
                 status: string;
+                diff: string;
                 diffCached: string;
                 lastCommitMessages: string;
             };
@@ -2087,13 +2087,13 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             path: z.ZodString;
             content: z.ZodString;
         }, "strip", z.ZodTypeAny, {
-            type: "patch" | "file";
             path: string;
             content: string;
+            type: "file" | "patch";
         }, {
-            type: "patch" | "file";
             path: string;
             content: string;
+            type: "file" | "patch";
         }>, "many">;
         costMode: z.ZodDefault<z.ZodOptional<z.ZodEnum<["lite", "normal", "max"]>>>;
     }, "strip", z.ZodTypeAny, {
@@ -2104,8 +2104,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             fileTokenScores: Record<string, Record<string, number>>;
             knowledgeFiles: Record<string, string>;
             gitChanges: {
-                diff: string;
                 status: string;
+                diff: string;
                 diffCached: string;
                 lastCommitMessages: string;
             };
@@ -2128,7 +2128,6 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         fingerprintId: string;
         userInputId: string;
         messages: {
-            role: "user" | "assistant";
             content: string | ({
                 type: "text";
                 text: string;
@@ -2137,15 +2136,15 @@ 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";
                 } | undefined;
             } | {
-                type: "tool_result";
                 content: string;
+                type: "tool_result";
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
@@ -2161,13 +2160,14 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "ephemeral";
                 } | undefined;
             })[];
+            role: "user" | "assistant";
         }[];
         changesAlreadyApplied: {
-            type: "patch" | "file";
             path: string;
             content: string;
+            type: "file" | "patch";
         }[];
-        costMode: "lite" | "normal" | "max";
+        costMode: "max" | "lite" | "normal";
         authToken?: string | undefined;
     }, {
         type: "user-input";
@@ -2177,8 +2177,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             fileTokenScores: Record<string, Record<string, number>>;
             knowledgeFiles: Record<string, string>;
             gitChanges: {
-                diff: string;
                 status: string;
+                diff: string;
                 diffCached: string;
                 lastCommitMessages: string;
             };
@@ -2201,7 +2201,6 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         fingerprintId: string;
         userInputId: string;
         messages: {
-            role: "user" | "assistant";
             content: string | ({
                 type: "text";
                 text: string;
@@ -2210,15 +2209,15 @@ 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";
                 } | undefined;
             } | {
-                type: "tool_result";
                 content: string;
+                type: "tool_result";
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
@@ -2234,14 +2233,15 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "ephemeral";
                 } | undefined;
             })[];
+            role: "user" | "assistant";
         }[];
         changesAlreadyApplied: {
-            type: "patch" | "file";
             path: string;
             content: string;
+            type: "file" | "patch";
         }[];
         authToken?: string | undefined;
-        costMode?: "lite" | "normal" | "max" | undefined;
+        costMode?: "max" | "lite" | "normal" | undefined;
     }>, z.ZodObject<{
         type: z.ZodLiteral<"prompt">;
         promptId: z.ZodString;
@@ -2263,13 +2263,13 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     diffCached: z.ZodString;
                     lastCommitMessages: z.ZodString;
                 }, "strip", z.ZodTypeAny, {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 }, {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 }>;
@@ -2313,8 +2313,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -2339,8 +2339,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: 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";
@@ -2424,15 +2424,15 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     }>>;
                 }, "strip", z.ZodTypeAny, {
-                    type: "tool_result";
                     content: string;
+                    type: "tool_result";
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 }, {
-                    type: "tool_result";
                     content: string;
+                    type: "tool_result";
                     tool_use_id: string;
                     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,15 +2489,15 @@ 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";
                     } | undefined;
                 } | {
-                    type: "tool_result";
                     content: string;
+                    type: "tool_result";
                     tool_use_id: string;
                     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,15 +2523,15 @@ 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";
                     } | undefined;
                 } | {
-                    type: "tool_result";
                     content: string;
+                    type: "tool_result";
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -2548,6 +2547,7 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 })[];
+                role: "user" | "assistant";
             }>, "many">;
         }, "strip", z.ZodTypeAny, {
             agentContext: string;
@@ -2557,8 +2557,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -2579,7 +2579,6 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
             messageHistory: {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -2588,15 +2587,15 @@ 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";
                     } | undefined;
                 } | {
-                    type: "tool_result";
                     content: string;
+                    type: "tool_result";
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -2612,6 +2611,7 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 })[];
+                role: "user" | "assistant";
             }[];
         }, {
             agentContext: string;
@@ -2621,8 +2621,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -2643,7 +2643,6 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
             messageHistory: {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -2652,15 +2651,15 @@ 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";
                     } | undefined;
                 } | {
-                    type: "tool_result";
                     content: string;
+                    type: "tool_result";
                     tool_use_id: string;
                     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,18 +2683,18 @@ 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, {
         type: "prompt";
         fingerprintId: string;
-        costMode: "lite" | "normal" | "max";
+        costMode: "max" | "lite" | "normal";
         promptId: string;
         agentState: {
             agentContext: string;
@@ -2704,8 +2704,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -2726,7 +2726,6 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
             messageHistory: {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -2735,15 +2734,15 @@ 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";
                     } | undefined;
                 } | {
-                    type: "tool_result";
                     content: string;
+                    type: "tool_result";
                     tool_use_id: string;
                     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;
@@ -2780,8 +2780,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -2802,7 +2802,6 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
             messageHistory: {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -2811,15 +2810,15 @@ 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";
                     } | undefined;
                 } | {
-                    type: "tool_result";
                     content: string;
+                    type: "tool_result";
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -2835,15 +2834,16 @@ 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;
-        costMode?: "lite" | "normal" | "max" | undefined;
+        costMode?: "max" | "lite" | "normal" | undefined;
         prompt?: string | undefined;
     }>, z.ZodObject<{
         type: z.ZodLiteral<"read-files-response">;
@@ -2873,13 +2873,13 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 diffCached: z.ZodString;
                 lastCommitMessages: z.ZodString;
             }, "strip", z.ZodTypeAny, {
-                diff: string;
                 status: string;
+                diff: string;
                 diffCached: string;
                 lastCommitMessages: string;
             }, {
-                diff: string;
                 status: string;
+                diff: string;
                 diffCached: string;
                 lastCommitMessages: string;
             }>;
@@ -2923,8 +2923,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             fileTokenScores: Record<string, Record<string, number>>;
             knowledgeFiles: Record<string, string>;
             gitChanges: {
-                diff: string;
                 status: string;
+                diff: string;
                 diffCached: string;
                 lastCommitMessages: string;
             };
@@ -2949,8 +2949,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             fileTokenScores: Record<string, Record<string, number>>;
             knowledgeFiles: Record<string, string>;
             gitChanges: {
-                diff: string;
                 status: string;
+                diff: string;
                 diffCached: string;
                 lastCommitMessages: string;
             };
@@ -2978,8 +2978,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             fileTokenScores: Record<string, Record<string, number>>;
             knowledgeFiles: Record<string, string>;
             gitChanges: {
-                diff: string;
                 status: string;
+                diff: string;
                 diffCached: string;
                 lastCommitMessages: string;
             };
@@ -3009,8 +3009,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             fileTokenScores: Record<string, Record<string, number>>;
             knowledgeFiles: Record<string, string>;
             gitChanges: {
-                diff: string;
                 status: string;
+                diff: string;
                 diffCached: string;
                 lastCommitMessages: string;
             };
@@ -3070,8 +3070,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             fileTokenScores: Record<string, Record<string, number>>;
             knowledgeFiles: Record<string, string>;
             gitChanges: {
-                diff: string;
                 status: string;
+                diff: string;
                 diffCached: string;
                 lastCommitMessages: string;
             };
@@ -3094,7 +3094,6 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         fingerprintId: string;
         userInputId: string;
         messages: {
-            role: "user" | "assistant";
             content: string | ({
                 type: "text";
                 text: string;
@@ -3103,15 +3102,15 @@ 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";
                 } | undefined;
             } | {
-                type: "tool_result";
                 content: string;
+                type: "tool_result";
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
@@ -3127,18 +3126,19 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "ephemeral";
                 } | undefined;
             })[];
+            role: "user" | "assistant";
         }[];
         changesAlreadyApplied: {
-            type: "patch" | "file";
             path: string;
             content: string;
+            type: "file" | "patch";
         }[];
-        costMode: "lite" | "normal" | "max";
+        costMode: "max" | "lite" | "normal";
         authToken?: string | undefined;
     } | {
         type: "prompt";
         fingerprintId: string;
-        costMode: "lite" | "normal" | "max";
+        costMode: "max" | "lite" | "normal";
         promptId: string;
         agentState: {
             agentContext: string;
@@ -3148,8 +3148,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -3170,7 +3170,6 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
             messageHistory: {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -3179,15 +3178,15 @@ 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";
                     } | undefined;
                 } | {
-                    type: "tool_result";
                     content: string;
+                    type: "tool_result";
                     tool_use_id: string;
                     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;
@@ -3224,8 +3224,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             fileTokenScores: Record<string, Record<string, number>>;
             knowledgeFiles: Record<string, string>;
             gitChanges: {
-                diff: string;
                 status: string;
+                diff: string;
                 diffCached: string;
                 lastCommitMessages: string;
             };
@@ -3268,8 +3268,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             fileTokenScores: Record<string, Record<string, number>>;
             knowledgeFiles: Record<string, string>;
             gitChanges: {
-                diff: string;
                 status: string;
+                diff: string;
                 diffCached: string;
                 lastCommitMessages: string;
             };
@@ -3292,7 +3292,6 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         fingerprintId: string;
         userInputId: string;
         messages: {
-            role: "user" | "assistant";
             content: string | ({
                 type: "text";
                 text: string;
@@ -3301,15 +3300,15 @@ 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";
                 } | undefined;
             } | {
-                type: "tool_result";
                 content: string;
+                type: "tool_result";
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
@@ -3325,14 +3324,15 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "ephemeral";
                 } | undefined;
             })[];
+            role: "user" | "assistant";
         }[];
         changesAlreadyApplied: {
-            type: "patch" | "file";
             path: string;
             content: string;
+            type: "file" | "patch";
         }[];
         authToken?: string | undefined;
-        costMode?: "lite" | "normal" | "max" | undefined;
+        costMode?: "max" | "lite" | "normal" | undefined;
     } | {
         type: "prompt";
         fingerprintId: string;
@@ -3345,8 +3345,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -3367,7 +3367,6 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
             messageHistory: {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -3376,15 +3375,15 @@ 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";
                     } | undefined;
                 } | {
-                    type: "tool_result";
                     content: string;
+                    type: "tool_result";
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -3400,15 +3399,16 @@ 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;
-        costMode?: "lite" | "normal" | "max" | undefined;
+        costMode?: "max" | "lite" | "normal" | undefined;
         prompt?: string | undefined;
     } | {
         type: "read-files-response";
@@ -3422,8 +3422,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             fileTokenScores: Record<string, Record<string, number>>;
             knowledgeFiles: Record<string, string>;
             gitChanges: {
-                diff: string;
                 status: string;
+                diff: string;
                 diffCached: string;
                 lastCommitMessages: string;
             };
@@ -3468,13 +3468,13 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
     }, "strip", z.ZodTypeAny, {
         type: "ack";
         success: boolean;
-        txid?: number | undefined;
         error?: string | undefined;
+        txid?: number | undefined;
     }, {
         type: "ack";
         success: boolean;
-        txid?: number | undefined;
         error?: string | undefined;
+        txid?: number | undefined;
     }>;
     action: z.ZodObject<{
         type: z.ZodLiteral<"action">;
@@ -3499,26 +3499,26 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                 path: z.ZodString;
                 content: z.ZodString;
             }, "strip", z.ZodTypeAny, {
-                type: "patch" | "file";
                 path: string;
                 content: string;
+                type: "file" | "patch";
             }, {
-                type: "patch" | "file";
                 path: string;
                 content: string;
+                type: "file" | "patch";
             }>, "many">;
             changesAlreadyApplied: z.ZodArray<z.ZodObject<{
                 type: z.ZodEnum<["patch", "file"]>;
                 path: z.ZodString;
                 content: z.ZodString;
             }, "strip", z.ZodTypeAny, {
-                type: "patch" | "file";
                 path: string;
                 content: string;
+                type: "file" | "patch";
             }, {
-                type: "patch" | "file";
                 path: string;
                 content: string;
+                type: "file" | "patch";
             }>, "many">;
             addedFileVersions: z.ZodArray<z.ZodObject<{
                 path: z.ZodString;
@@ -3542,15 +3542,15 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             type: "response-complete";
             userInputId: string;
             changesAlreadyApplied: {
-                type: "patch" | "file";
                 path: string;
                 content: string;
+                type: "file" | "patch";
             }[];
             response: string;
             changes: {
-                type: "patch" | "file";
                 path: string;
                 content: string;
+                type: "file" | "patch";
             }[];
             addedFileVersions: {
                 path: string;
@@ -3567,15 +3567,15 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             type: "response-complete";
             userInputId: string;
             changesAlreadyApplied: {
-                type: "patch" | "file";
                 path: string;
                 content: string;
+                type: "file" | "patch";
             }[];
             response: string;
             changes: {
-                type: "patch" | "file";
                 path: string;
                 content: string;
+                type: "file" | "patch";
             }[];
             addedFileVersions: {
                 path: string;
@@ -3605,13 +3605,13 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         diffCached: z.ZodString;
                         lastCommitMessages: z.ZodString;
                     }, "strip", z.ZodTypeAny, {
-                        diff: string;
                         status: string;
+                        diff: string;
                         diffCached: string;
                         lastCommitMessages: string;
                     }, {
-                        diff: string;
                         status: string;
+                        diff: string;
                         diffCached: string;
                         lastCommitMessages: string;
                     }>;
@@ -3655,8 +3655,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     fileTokenScores: Record<string, Record<string, number>>;
                     knowledgeFiles: Record<string, string>;
                     gitChanges: {
-                        diff: string;
                         status: string;
+                        diff: string;
                         diffCached: string;
                         lastCommitMessages: string;
                     };
@@ -3681,8 +3681,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     fileTokenScores: Record<string, Record<string, number>>;
                     knowledgeFiles: Record<string, string>;
                     gitChanges: {
-                        diff: string;
                         status: string;
+                        diff: string;
                         diffCached: string;
                         lastCommitMessages: string;
                     };
@@ -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";
@@ -3766,15 +3766,15 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         }>>;
                     }, "strip", z.ZodTypeAny, {
-                        type: "tool_result";
                         content: string;
+                        type: "tool_result";
                         tool_use_id: string;
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     }, {
-                        type: "tool_result";
                         content: string;
+                        type: "tool_result";
                         tool_use_id: string;
                         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,15 +3831,15 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     } | {
-                        type: "tool_result";
                         content: string;
+                        type: "tool_result";
                         tool_use_id: string;
                         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,15 +3865,15 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     } | {
-                        type: "tool_result";
                         content: string;
+                        type: "tool_result";
                         tool_use_id: string;
                         cache_control?: {
                             type: "ephemeral";
@@ -3890,6 +3889,7 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
+                    role: "user" | "assistant";
                 }>, "many">;
             }, "strip", z.ZodTypeAny, {
                 agentContext: string;
@@ -3899,8 +3899,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     fileTokenScores: Record<string, Record<string, number>>;
                     knowledgeFiles: Record<string, string>;
                     gitChanges: {
-                        diff: string;
                         status: string;
+                        diff: string;
                         diffCached: string;
                         lastCommitMessages: string;
                     };
@@ -3921,7 +3921,6 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
                 messageHistory: {
-                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -3930,15 +3929,15 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     } | {
-                        type: "tool_result";
                         content: string;
+                        type: "tool_result";
                         tool_use_id: string;
                         cache_control?: {
                             type: "ephemeral";
@@ -3954,6 +3953,7 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
+                    role: "user" | "assistant";
                 }[];
             }, {
                 agentContext: string;
@@ -3963,8 +3963,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     fileTokenScores: Record<string, Record<string, number>>;
                     knowledgeFiles: Record<string, string>;
                     gitChanges: {
-                        diff: string;
                         status: string;
+                        diff: string;
                         diffCached: string;
                         lastCommitMessages: string;
                     };
@@ -3985,7 +3985,6 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
                 messageHistory: {
-                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -3994,15 +3993,15 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     } | {
-                        type: "tool_result";
                         content: string;
+                        type: "tool_result";
                         tool_use_id: string;
                         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">;
         }, {
@@ -4064,8 +4064,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     fileTokenScores: Record<string, Record<string, number>>;
                     knowledgeFiles: Record<string, string>;
                     gitChanges: {
-                        diff: string;
                         status: string;
+                        diff: string;
                         diffCached: string;
                         lastCommitMessages: string;
                     };
@@ -4086,7 +4086,6 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
                 messageHistory: {
-                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -4095,15 +4094,15 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     } | {
-                        type: "tool_result";
                         content: string;
+                        type: "tool_result";
                         tool_use_id: string;
                         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;
@@ -4148,8 +4148,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     fileTokenScores: Record<string, Record<string, number>>;
                     knowledgeFiles: Record<string, string>;
                     gitChanges: {
-                        diff: string;
                         status: string;
+                        diff: string;
                         diffCached: string;
                         lastCommitMessages: string;
                     };
@@ -4170,7 +4170,6 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
                 messageHistory: {
-                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -4179,15 +4178,15 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     } | {
-                        type: "tool_result";
                         content: string;
+                        type: "tool_result";
                         tool_use_id: string;
                         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<{
@@ -4255,26 +4255,26 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                 path: z.ZodString;
                 content: z.ZodString;
             }, "strip", z.ZodTypeAny, {
-                type: "patch" | "file";
                 path: string;
                 content: string;
+                type: "file" | "patch";
             }, {
-                type: "patch" | "file";
                 path: string;
                 content: string;
+                type: "file" | "patch";
             }>, "many">;
             changesAlreadyApplied: z.ZodArray<z.ZodObject<{
                 type: z.ZodEnum<["patch", "file"]>;
                 path: z.ZodString;
                 content: z.ZodString;
             }, "strip", z.ZodTypeAny, {
-                type: "patch" | "file";
                 path: string;
                 content: string;
+                type: "file" | "patch";
             }, {
-                type: "patch" | "file";
                 path: string;
                 content: string;
+                type: "file" | "patch";
             }>, "many">;
             addedFileVersions: z.ZodArray<z.ZodObject<{
                 path: z.ZodString;
@@ -4290,21 +4290,21 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
         }, "strip", z.ZodTypeAny, {
             type: "tool-call";
             data: {
-                id: string;
                 name: string;
+                id: string;
                 input: Record<string, any>;
             };
             userInputId: string;
             changesAlreadyApplied: {
-                type: "patch" | "file";
                 path: string;
                 content: string;
+                type: "file" | "patch";
             }[];
             response: string;
             changes: {
-                type: "patch" | "file";
                 path: string;
                 content: string;
+                type: "file" | "patch";
             }[];
             addedFileVersions: {
                 path: string;
@@ -4314,21 +4314,21 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
         }, {
             type: "tool-call";
             data: {
-                id: string;
                 name: string;
+                id: string;
                 input: Record<string, any>;
             };
             userInputId: string;
             changesAlreadyApplied: {
-                type: "patch" | "file";
                 path: string;
                 content: string;
+                type: "file" | "patch";
             }[];
             response: string;
             changes: {
-                type: "patch" | "file";
                 path: string;
                 content: string;
+                type: "file" | "patch";
             }[];
             addedFileVersions: {
                 path: string;
@@ -4413,11 +4413,11 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             type: z.ZodLiteral<"action-error">;
             message: z.ZodString;
         }, "strip", z.ZodTypeAny, {
-            type: "action-error";
             message: string;
-        }, {
             type: "action-error";
+        }, {
             message: string;
+            type: "action-error";
         }>, z.ZodObject<{
             type: z.ZodLiteral<"commit-message-response">;
             commitMessage: z.ZodString;
@@ -4450,15 +4450,15 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             type: "response-complete";
             userInputId: string;
             changesAlreadyApplied: {
-                type: "patch" | "file";
                 path: string;
                 content: string;
+                type: "file" | "patch";
             }[];
             response: string;
             changes: {
-                type: "patch" | "file";
                 path: string;
                 content: string;
+                type: "file" | "patch";
             }[];
             addedFileVersions: {
                 path: string;
@@ -4482,8 +4482,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     fileTokenScores: Record<string, Record<string, number>>;
                     knowledgeFiles: Record<string, string>;
                     gitChanges: {
-                        diff: string;
                         status: string;
+                        diff: string;
                         diffCached: string;
                         lastCommitMessages: string;
                     };
@@ -4504,7 +4504,6 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
                 messageHistory: {
-                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -4513,15 +4512,15 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     } | {
-                        type: "tool_result";
                         content: string;
+                        type: "tool_result";
                         tool_use_id: string;
                         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;
@@ -4566,21 +4566,21 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
         } | {
             type: "tool-call";
             data: {
-                id: string;
                 name: string;
+                id: string;
                 input: Record<string, any>;
             };
             userInputId: string;
             changesAlreadyApplied: {
-                type: "patch" | "file";
                 path: string;
                 content: string;
+                type: "file" | "patch";
             }[];
             response: string;
             changes: {
-                type: "patch" | "file";
                 path: string;
                 content: string;
+                type: "file" | "patch";
             }[];
             addedFileVersions: {
                 path: string;
@@ -4596,8 +4596,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             isUpToDate: boolean;
             latestVersion: string;
         } | {
-            type: "action-error";
             message: string;
+            type: "action-error";
         } | {
             type: "commit-message-response";
             commitMessage: string;
@@ -4624,15 +4624,15 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             type: "response-complete";
             userInputId: string;
             changesAlreadyApplied: {
-                type: "patch" | "file";
                 path: string;
                 content: string;
+                type: "file" | "patch";
             }[];
             response: string;
             changes: {
-                type: "patch" | "file";
                 path: string;
                 content: string;
+                type: "file" | "patch";
             }[];
             addedFileVersions: {
                 path: string;
@@ -4656,8 +4656,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     fileTokenScores: Record<string, Record<string, number>>;
                     knowledgeFiles: Record<string, string>;
                     gitChanges: {
-                        diff: string;
                         status: string;
+                        diff: string;
                         diffCached: string;
                         lastCommitMessages: string;
                     };
@@ -4678,7 +4678,6 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
                 messageHistory: {
-                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -4687,15 +4686,15 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        id: string;
                         name: string;
+                        id: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     } | {
-                        type: "tool_result";
                         content: string;
+                        type: "tool_result";
                         tool_use_id: string;
                         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;
@@ -4740,21 +4740,21 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
         } | {
             type: "tool-call";
             data: {
-                id: string;
                 name: string;
+                id: string;
                 input: Record<string, any>;
             };
             userInputId: string;
             changesAlreadyApplied: {
-                type: "patch" | "file";
                 path: string;
                 content: string;
+                type: "file" | "patch";
             }[];
             response: string;
             changes: {
-                type: "patch" | "file";
                 path: string;
                 content: string;
+                type: "file" | "patch";
             }[];
             addedFileVersions: {
                 path: string;
@@ -4770,8 +4770,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             isUpToDate: boolean;
             latestVersion: string;
         } | {
-            type: "action-error";
             message: string;
+            type: "action-error";
         } | {
             type: "commit-message-response";
             commitMessage: string;
@@ -4786,13 +4786,13 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     type: "ack";
     success: boolean;
-    txid?: number | undefined;
     error?: string | undefined;
+    txid?: number | undefined;
 }, {
     type: "ack";
     success: boolean;
-    txid?: number | undefined;
     error?: string | undefined;
+    txid?: number | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"action">;
     data: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
@@ -4816,26 +4816,26 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             path: z.ZodString;
             content: z.ZodString;
         }, "strip", z.ZodTypeAny, {
-            type: "patch" | "file";
             path: string;
             content: string;
+            type: "file" | "patch";
         }, {
-            type: "patch" | "file";
             path: string;
             content: string;
+            type: "file" | "patch";
         }>, "many">;
         changesAlreadyApplied: z.ZodArray<z.ZodObject<{
             type: z.ZodEnum<["patch", "file"]>;
             path: z.ZodString;
             content: z.ZodString;
         }, "strip", z.ZodTypeAny, {
-            type: "patch" | "file";
             path: string;
             content: string;
+            type: "file" | "patch";
         }, {
-            type: "patch" | "file";
             path: string;
             content: string;
+            type: "file" | "patch";
         }>, "many">;
         addedFileVersions: z.ZodArray<z.ZodObject<{
             path: z.ZodString;
@@ -4859,15 +4859,15 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         type: "response-complete";
         userInputId: string;
         changesAlreadyApplied: {
-            type: "patch" | "file";
             path: string;
             content: string;
+            type: "file" | "patch";
         }[];
         response: string;
         changes: {
-            type: "patch" | "file";
             path: string;
             content: string;
+            type: "file" | "patch";
         }[];
         addedFileVersions: {
             path: string;
@@ -4884,15 +4884,15 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         type: "response-complete";
         userInputId: string;
         changesAlreadyApplied: {
-            type: "patch" | "file";
             path: string;
             content: string;
+            type: "file" | "patch";
         }[];
         response: string;
         changes: {
-            type: "patch" | "file";
             path: string;
             content: string;
+            type: "file" | "patch";
         }[];
         addedFileVersions: {
             path: string;
@@ -4922,13 +4922,13 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     diffCached: z.ZodString;
                     lastCommitMessages: z.ZodString;
                 }, "strip", z.ZodTypeAny, {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 }, {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 }>;
@@ -4972,8 +4972,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -4998,8 +4998,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -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";
@@ -5083,15 +5083,15 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     }>>;
                 }, "strip", z.ZodTypeAny, {
-                    type: "tool_result";
                     content: string;
+                    type: "tool_result";
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 }, {
-                    type: "tool_result";
                     content: string;
+                    type: "tool_result";
                     tool_use_id: string;
                     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,15 +5148,15 @@ 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";
                     } | undefined;
                 } | {
-                    type: "tool_result";
                     content: string;
+                    type: "tool_result";
                     tool_use_id: string;
                     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,15 +5182,15 @@ 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";
                     } | undefined;
                 } | {
-                    type: "tool_result";
                     content: string;
+                    type: "tool_result";
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -5207,6 +5206,7 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 })[];
+                role: "user" | "assistant";
             }>, "many">;
         }, "strip", z.ZodTypeAny, {
             agentContext: string;
@@ -5216,8 +5216,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -5238,7 +5238,6 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
             messageHistory: {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -5247,15 +5246,15 @@ 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";
                     } | undefined;
                 } | {
-                    type: "tool_result";
                     content: string;
+                    type: "tool_result";
                     tool_use_id: string;
                     cache_control?: {
                         type: "ephemeral";
@@ -5271,6 +5270,7 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     } | undefined;
                 })[];
+                role: "user" | "assistant";
             }[];
         }, {
             agentContext: string;
@@ -5280,8 +5280,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -5302,7 +5302,6 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
             messageHistory: {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -5311,15 +5310,15 @@ 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";
                     } | undefined;
                 } | {
-                    type: "tool_result";
                     content: string;
+                    type: "tool_result";
                     tool_use_id: string;
                     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">;
     }, {
@@ -5381,8 +5381,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -5403,7 +5403,6 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
             messageHistory: {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -5412,15 +5411,15 @@ 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";
                     } | undefined;
                 } | {
-                    type: "tool_result";
                     content: string;
+                    type: "tool_result";
                     tool_use_id: string;
                     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;
@@ -5465,8 +5465,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -5487,7 +5487,6 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
             messageHistory: {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -5496,15 +5495,15 @@ 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";
                     } | undefined;
                 } | {
-                    type: "tool_result";
                     content: string;
+                    type: "tool_result";
                     tool_use_id: string;
                     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<{
@@ -5572,26 +5572,26 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             path: z.ZodString;
             content: z.ZodString;
         }, "strip", z.ZodTypeAny, {
-            type: "patch" | "file";
             path: string;
             content: string;
+            type: "file" | "patch";
         }, {
-            type: "patch" | "file";
             path: string;
             content: string;
+            type: "file" | "patch";
         }>, "many">;
         changesAlreadyApplied: z.ZodArray<z.ZodObject<{
             type: z.ZodEnum<["patch", "file"]>;
             path: z.ZodString;
             content: z.ZodString;
         }, "strip", z.ZodTypeAny, {
-            type: "patch" | "file";
             path: string;
             content: string;
+            type: "file" | "patch";
         }, {
-            type: "patch" | "file";
             path: string;
             content: string;
+            type: "file" | "patch";
         }>, "many">;
         addedFileVersions: z.ZodArray<z.ZodObject<{
             path: z.ZodString;
@@ -5607,21 +5607,21 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
     }, "strip", z.ZodTypeAny, {
         type: "tool-call";
         data: {
-            id: string;
             name: string;
+            id: string;
             input: Record<string, any>;
         };
         userInputId: string;
         changesAlreadyApplied: {
-            type: "patch" | "file";
             path: string;
             content: string;
+            type: "file" | "patch";
         }[];
         response: string;
         changes: {
-            type: "patch" | "file";
             path: string;
             content: string;
+            type: "file" | "patch";
         }[];
         addedFileVersions: {
             path: string;
@@ -5631,21 +5631,21 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
     }, {
         type: "tool-call";
         data: {
-            id: string;
             name: string;
+            id: string;
             input: Record<string, any>;
         };
         userInputId: string;
         changesAlreadyApplied: {
-            type: "patch" | "file";
             path: string;
             content: string;
+            type: "file" | "patch";
         }[];
         response: string;
         changes: {
-            type: "patch" | "file";
             path: string;
             content: string;
+            type: "file" | "patch";
         }[];
         addedFileVersions: {
             path: string;
@@ -5730,11 +5730,11 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         type: z.ZodLiteral<"action-error">;
         message: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        type: "action-error";
         message: string;
-    }, {
         type: "action-error";
+    }, {
         message: string;
+        type: "action-error";
     }>, z.ZodObject<{
         type: z.ZodLiteral<"commit-message-response">;
         commitMessage: z.ZodString;
@@ -5767,15 +5767,15 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         type: "response-complete";
         userInputId: string;
         changesAlreadyApplied: {
-            type: "patch" | "file";
             path: string;
             content: string;
+            type: "file" | "patch";
         }[];
         response: string;
         changes: {
-            type: "patch" | "file";
             path: string;
             content: string;
+            type: "file" | "patch";
         }[];
         addedFileVersions: {
             path: string;
@@ -5799,8 +5799,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -5821,7 +5821,6 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
             messageHistory: {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -5830,15 +5829,15 @@ 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";
                     } | undefined;
                 } | {
-                    type: "tool_result";
                     content: string;
+                    type: "tool_result";
                     tool_use_id: string;
                     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;
@@ -5883,21 +5883,21 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
     } | {
         type: "tool-call";
         data: {
-            id: string;
             name: string;
+            id: string;
             input: Record<string, any>;
         };
         userInputId: string;
         changesAlreadyApplied: {
-            type: "patch" | "file";
             path: string;
             content: string;
+            type: "file" | "patch";
         }[];
         response: string;
         changes: {
-            type: "patch" | "file";
             path: string;
             content: string;
+            type: "file" | "patch";
         }[];
         addedFileVersions: {
             path: string;
@@ -5913,8 +5913,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         isUpToDate: boolean;
         latestVersion: string;
     } | {
-        type: "action-error";
         message: string;
+        type: "action-error";
     } | {
         type: "commit-message-response";
         commitMessage: string;
@@ -5941,15 +5941,15 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         type: "response-complete";
         userInputId: string;
         changesAlreadyApplied: {
-            type: "patch" | "file";
             path: string;
             content: string;
+            type: "file" | "patch";
         }[];
         response: string;
         changes: {
-            type: "patch" | "file";
             path: string;
             content: string;
+            type: "file" | "patch";
         }[];
         addedFileVersions: {
             path: string;
@@ -5973,8 +5973,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -5995,7 +5995,6 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
             messageHistory: {
-                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -6004,15 +6003,15 @@ 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";
                     } | undefined;
                 } | {
-                    type: "tool_result";
                     content: string;
+                    type: "tool_result";
                     tool_use_id: string;
                     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;
@@ -6057,21 +6057,21 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
     } | {
         type: "tool-call";
         data: {
-            id: string;
             name: string;
+            id: string;
             input: Record<string, any>;
         };
         userInputId: string;
         changesAlreadyApplied: {
-            type: "patch" | "file";
             path: string;
             content: string;
+            type: "file" | "patch";
         }[];
         response: string;
         changes: {
-            type: "patch" | "file";
             path: string;
             content: string;
+            type: "file" | "patch";
         }[];
         addedFileVersions: {
             path: string;
@@ -6087,8 +6087,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         isUpToDate: boolean;
         latestVersion: string;
     } | {
-        type: "action-error";
         message: string;
+        type: "action-error";
     } | {
         type: "commit-message-response";
         commitMessage: string;