codecane 1.0.177 → 1.0.179

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

@@ -70,14 +70,14 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         type: "ephemeral";
                     }>>;
                 }, "strip", z.ZodTypeAny, {
-                    type: "text";
                     text: string;
+                    type: "text";
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 }, {
-                    type: "text";
                     text: string;
+                    type: "text";
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
@@ -141,13 +141,13 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         media_type: z.ZodLiteral<"image/jpeg">;
                         data: z.ZodString;
                     }, "strip", z.ZodTypeAny, {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     }, {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     }>;
                     cache_control: z.ZodOptional<z.ZodObject<{
                         type: z.ZodLiteral<"ephemeral">;
@@ -159,9 +159,9 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 }, "strip", z.ZodTypeAny, {
                     type: "image";
                     source: {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
@@ -169,9 +169,9 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 }, {
                     type: "image";
                     source: {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
@@ -179,8 +179,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 }>]>, "many">]>;
             }, "strip", z.ZodTypeAny, {
                 content: string | ({
-                    type: "text";
                     text: string;
+                    type: "text";
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
@@ -202,9 +202,9 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 } | {
                     type: "image";
                     source: {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
@@ -213,8 +213,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 role: "user" | "assistant";
             }, {
                 content: string | ({
-                    type: "text";
                     text: string;
+                    type: "text";
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
@@ -236,9 +236,9 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 } | {
                     type: "image";
                     source: {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
@@ -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,23 +360,50 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 path: z.ZodString;
                 content: z.ZodString;
             }, "strip", z.ZodTypeAny, {
-                type: "patch" | "file";
                 path: string;
+                type: "file" | "patch";
                 content: string;
             }, {
-                type: "patch" | "file";
                 path: string;
+                type: "file" | "patch";
                 content: string;
             }>, "many">;
             costMode: z.ZodDefault<z.ZodOptional<z.ZodEnum<["lite", "normal", "max"]>>>;
         }, "strip", z.ZodTypeAny, {
             type: "user-input";
+            fileContext: {
+                currentWorkingDirectory: string;
+                fileTree: import("../util/file").FileTreeNode[];
+                fileTokenScores: Record<string, Record<string, number>>;
+                knowledgeFiles: Record<string, string>;
+                gitChanges: {
+                    status: string;
+                    diff: string;
+                    diffCached: string;
+                    lastCommitMessages: string;
+                };
+                changesSinceLastChat: Record<string, string>;
+                shellConfigFiles: Record<string, string>;
+                systemInfo: {
+                    platform: string;
+                    shell: string;
+                    nodeVersion: string;
+                    arch: string;
+                    homedir: string;
+                    cpus: number;
+                };
+                fileVersions: {
+                    path: string;
+                    content: string;
+                }[][];
+                userKnowledgeFiles?: Record<string, string> | undefined;
+            };
             fingerprintId: string;
             userInputId: string;
             messages: {
                 content: string | ({
-                    type: "text";
                     text: string;
+                    type: "text";
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
@@ -398,9 +425,9 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 } | {
                     type: "image";
                     source: {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
@@ -408,14 +435,23 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 })[];
                 role: "user" | "assistant";
             }[];
+            changesAlreadyApplied: {
+                path: string;
+                type: "file" | "patch";
+                content: string;
+            }[];
+            costMode: "max" | "lite" | "normal";
+            authToken?: string | undefined;
+        }, {
+            type: "user-input";
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -435,21 +471,12 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
-            changesAlreadyApplied: {
-                type: "patch" | "file";
-                path: string;
-                content: string;
-            }[];
-            costMode: "lite" | "normal" | "max";
-            authToken?: string | undefined;
-        }, {
-            type: "user-input";
             fingerprintId: string;
             userInputId: string;
             messages: {
                 content: string | ({
-                    type: "text";
                     text: string;
+                    type: "text";
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
@@ -471,9 +498,9 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 } | {
                     type: "image";
                     source: {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
@@ -481,40 +508,13 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 })[];
                 role: "user" | "assistant";
             }[];
-            fileContext: {
-                currentWorkingDirectory: string;
-                fileTree: import("../util/file").FileTreeNode[];
-                fileTokenScores: Record<string, Record<string, number>>;
-                knowledgeFiles: Record<string, string>;
-                gitChanges: {
-                    diff: string;
-                    status: string;
-                    diffCached: string;
-                    lastCommitMessages: string;
-                };
-                changesSinceLastChat: Record<string, string>;
-                shellConfigFiles: Record<string, string>;
-                systemInfo: {
-                    platform: string;
-                    shell: string;
-                    nodeVersion: string;
-                    arch: string;
-                    homedir: string;
-                    cpus: number;
-                };
-                fileVersions: {
-                    path: string;
-                    content: string;
-                }[][];
-                userKnowledgeFiles?: Record<string, string> | undefined;
-            };
             changesAlreadyApplied: {
-                type: "patch" | "file";
                 path: string;
+                type: "file" | "patch";
                 content: string;
             }[];
             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;
                     };
@@ -646,14 +646,14 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         }>>;
                     }, "strip", z.ZodTypeAny, {
-                        type: "text";
                         text: string;
+                        type: "text";
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     }, {
-                        type: "text";
                         text: string;
+                        type: "text";
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
@@ -717,13 +717,13 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                             media_type: z.ZodLiteral<"image/jpeg">;
                             data: z.ZodString;
                         }, "strip", z.ZodTypeAny, {
+                            data: string;
                             type: "base64";
                             media_type: "image/jpeg";
-                            data: string;
                         }, {
+                            data: string;
                             type: "base64";
                             media_type: "image/jpeg";
-                            data: string;
                         }>;
                         cache_control: z.ZodOptional<z.ZodObject<{
                             type: z.ZodLiteral<"ephemeral">;
@@ -735,9 +735,9 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     }, "strip", z.ZodTypeAny, {
                         type: "image";
                         source: {
+                            data: string;
                             type: "base64";
                             media_type: "image/jpeg";
-                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
@@ -745,9 +745,9 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     }, {
                         type: "image";
                         source: {
+                            data: string;
                             type: "base64";
                             media_type: "image/jpeg";
-                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
@@ -755,8 +755,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     }>]>, "many">]>;
                 }, "strip", z.ZodTypeAny, {
                     content: string | ({
-                        type: "text";
                         text: string;
+                        type: "text";
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
@@ -778,9 +778,9 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     } | {
                         type: "image";
                         source: {
+                            data: string;
                             type: "base64";
                             media_type: "image/jpeg";
-                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
@@ -789,8 +789,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     role: "user" | "assistant";
                 }, {
                     content: string | ({
-                        type: "text";
                         text: string;
+                        type: "text";
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
@@ -812,9 +812,9 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     } | {
                         type: "image";
                         source: {
+                            data: string;
                             type: "base64";
                             media_type: "image/jpeg";
-                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
@@ -823,14 +823,15 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     role: "user" | "assistant";
                 }>, "many">;
             }, "strip", z.ZodTypeAny, {
+                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
                     fileTokenScores: Record<string, Record<string, number>>;
                     knowledgeFiles: Record<string, string>;
                     gitChanges: {
-                        diff: string;
                         status: string;
+                        diff: string;
                         diffCached: string;
                         lastCommitMessages: string;
                     };
@@ -850,11 +851,10 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
-                agentContext: string;
                 messageHistory: {
                     content: string | ({
-                        type: "text";
                         text: string;
+                        type: "text";
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
@@ -876,9 +876,9 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     } | {
                         type: "image";
                         source: {
+                            data: string;
                             type: "base64";
                             media_type: "image/jpeg";
-                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
@@ -887,14 +887,15 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     role: "user" | "assistant";
                 }[];
             }, {
+                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
                     fileTokenScores: Record<string, Record<string, number>>;
                     knowledgeFiles: Record<string, string>;
                     gitChanges: {
-                        diff: string;
                         status: string;
+                        diff: string;
                         diffCached: string;
                         lastCommitMessages: string;
                     };
@@ -914,11 +915,10 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
-                agentContext: string;
                 messageHistory: {
                     content: string | ({
-                        type: "text";
                         text: string;
+                        type: "text";
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
@@ -940,9 +940,9 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     } | {
                         type: "image";
                         source: {
+                            data: string;
                             type: "base64";
                             media_type: "image/jpeg";
-                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
@@ -967,17 +967,18 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
         }, "strip", z.ZodTypeAny, {
             type: "prompt";
             fingerprintId: string;
-            costMode: "lite" | "normal" | "max";
+            costMode: "max" | "lite" | "normal";
             promptId: string;
             agentState: {
+                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
                     fileTokenScores: Record<string, Record<string, number>>;
                     knowledgeFiles: Record<string, string>;
                     gitChanges: {
-                        diff: string;
                         status: string;
+                        diff: string;
                         diffCached: string;
                         lastCommitMessages: string;
                     };
@@ -997,11 +998,10 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
-                agentContext: string;
                 messageHistory: {
                     content: string | ({
-                        type: "text";
                         text: string;
+                        type: "text";
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
@@ -1023,9 +1023,9 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     } | {
                         type: "image";
                         source: {
+                            data: string;
                             type: "base64";
                             media_type: "image/jpeg";
-                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
@@ -1046,14 +1046,15 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
             fingerprintId: string;
             promptId: string;
             agentState: {
+                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
                     fileTokenScores: Record<string, Record<string, number>>;
                     knowledgeFiles: Record<string, string>;
                     gitChanges: {
-                        diff: string;
                         status: string;
+                        diff: string;
                         diffCached: string;
                         lastCommitMessages: string;
                     };
@@ -1073,11 +1074,10 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
-                agentContext: string;
                 messageHistory: {
                     content: string | ({
-                        type: "text";
                         text: string;
+                        type: "text";
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
@@ -1099,9 +1099,9 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     } | {
                         type: "image";
                         source: {
+                            data: string;
                             type: "base64";
                             media_type: "image/jpeg";
-                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
@@ -1116,7 +1116,7 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 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;
                 };
@@ -1245,15 +1245,14 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
             }>;
         }, "strip", z.ZodTypeAny, {
             type: "init";
-            fingerprintId: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -1273,18 +1272,18 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
+            fingerprintId: string;
             authToken?: string | undefined;
         }, {
             type: "init";
-            fingerprintId: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -1304,6 +1303,7 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
+            fingerprintId: string;
             authToken?: string | undefined;
         }>, z.ZodObject<{
             type: z.ZodLiteral<"usage">;
@@ -1334,15 +1334,41 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
             authToken?: string | undefined;
         }>]>;
     }, "strip", z.ZodTypeAny, {
-        type: "action";
         data: {
             type: "user-input";
+            fileContext: {
+                currentWorkingDirectory: string;
+                fileTree: import("../util/file").FileTreeNode[];
+                fileTokenScores: Record<string, Record<string, number>>;
+                knowledgeFiles: Record<string, string>;
+                gitChanges: {
+                    status: string;
+                    diff: string;
+                    diffCached: string;
+                    lastCommitMessages: string;
+                };
+                changesSinceLastChat: Record<string, string>;
+                shellConfigFiles: Record<string, string>;
+                systemInfo: {
+                    platform: string;
+                    shell: string;
+                    nodeVersion: string;
+                    arch: string;
+                    homedir: string;
+                    cpus: number;
+                };
+                fileVersions: {
+                    path: string;
+                    content: string;
+                }[][];
+                userKnowledgeFiles?: Record<string, string> | undefined;
+            };
             fingerprintId: string;
             userInputId: string;
             messages: {
                 content: string | ({
-                    type: "text";
                     text: string;
+                    type: "text";
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
@@ -1364,9 +1390,9 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 } | {
                     type: "image";
                     source: {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
@@ -1374,54 +1400,28 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 })[];
                 role: "user" | "assistant";
             }[];
-            fileContext: {
-                currentWorkingDirectory: string;
-                fileTree: import("../util/file").FileTreeNode[];
-                fileTokenScores: Record<string, Record<string, number>>;
-                knowledgeFiles: Record<string, string>;
-                gitChanges: {
-                    diff: string;
-                    status: string;
-                    diffCached: string;
-                    lastCommitMessages: string;
-                };
-                changesSinceLastChat: Record<string, string>;
-                shellConfigFiles: Record<string, string>;
-                systemInfo: {
-                    platform: string;
-                    shell: string;
-                    nodeVersion: string;
-                    arch: string;
-                    homedir: string;
-                    cpus: number;
-                };
-                fileVersions: {
-                    path: string;
-                    content: string;
-                }[][];
-                userKnowledgeFiles?: Record<string, string> | undefined;
-            };
             changesAlreadyApplied: {
-                type: "patch" | "file";
                 path: string;
+                type: "file" | "patch";
                 content: string;
             }[];
-            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;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
                     fileTokenScores: Record<string, Record<string, number>>;
                     knowledgeFiles: Record<string, string>;
                     gitChanges: {
-                        diff: string;
                         status: string;
+                        diff: string;
                         diffCached: string;
                         lastCommitMessages: string;
                     };
@@ -1441,11 +1441,10 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
-                agentContext: string;
                 messageHistory: {
                     content: string | ({
-                        type: "text";
                         text: string;
+                        type: "text";
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
@@ -1467,9 +1466,9 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     } | {
                         type: "image";
                         source: {
+                            data: string;
                             type: "base64";
                             media_type: "image/jpeg";
-                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
@@ -1491,15 +1490,14 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
             requestId?: string | undefined;
         } | {
             type: "init";
-            fingerprintId: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -1519,6 +1517,7 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
+            fingerprintId: string;
             authToken?: string | undefined;
         } | {
             type: "usage";
@@ -1530,17 +1529,44 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
             stagedChanges: string;
             authToken?: string | undefined;
         };
+        type: "action";
         txid: number;
     }, {
-        type: "action";
         data: {
             type: "user-input";
-            fingerprintId: string;
+            fileContext: {
+                currentWorkingDirectory: string;
+                fileTree: import("../util/file").FileTreeNode[];
+                fileTokenScores: Record<string, Record<string, number>>;
+                knowledgeFiles: Record<string, string>;
+                gitChanges: {
+                    status: string;
+                    diff: string;
+                    diffCached: string;
+                    lastCommitMessages: string;
+                };
+                changesSinceLastChat: Record<string, string>;
+                shellConfigFiles: Record<string, string>;
+                systemInfo: {
+                    platform: string;
+                    shell: string;
+                    nodeVersion: string;
+                    arch: string;
+                    homedir: string;
+                    cpus: number;
+                };
+                fileVersions: {
+                    path: string;
+                    content: string;
+                }[][];
+                userKnowledgeFiles?: Record<string, string> | undefined;
+            };
+            fingerprintId: string;
             userInputId: string;
             messages: {
                 content: string | ({
-                    type: "text";
                     text: string;
+                    type: "text";
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
@@ -1562,9 +1588,9 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 } | {
                     type: "image";
                     source: {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
@@ -1572,53 +1598,27 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 })[];
                 role: "user" | "assistant";
             }[];
-            fileContext: {
-                currentWorkingDirectory: string;
-                fileTree: import("../util/file").FileTreeNode[];
-                fileTokenScores: Record<string, Record<string, number>>;
-                knowledgeFiles: Record<string, string>;
-                gitChanges: {
-                    diff: string;
-                    status: string;
-                    diffCached: string;
-                    lastCommitMessages: string;
-                };
-                changesSinceLastChat: Record<string, string>;
-                shellConfigFiles: Record<string, string>;
-                systemInfo: {
-                    platform: string;
-                    shell: string;
-                    nodeVersion: string;
-                    arch: string;
-                    homedir: string;
-                    cpus: number;
-                };
-                fileVersions: {
-                    path: string;
-                    content: string;
-                }[][];
-                userKnowledgeFiles?: Record<string, string> | undefined;
-            };
             changesAlreadyApplied: {
-                type: "patch" | "file";
                 path: string;
+                type: "file" | "patch";
                 content: string;
             }[];
             authToken?: string | undefined;
-            costMode?: "lite" | "normal" | "max" | undefined;
+            costMode?: "max" | "lite" | "normal" | undefined;
         } | {
             type: "prompt";
             fingerprintId: string;
             promptId: string;
             agentState: {
+                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
                     fileTokenScores: Record<string, Record<string, number>>;
                     knowledgeFiles: Record<string, string>;
                     gitChanges: {
-                        diff: string;
                         status: string;
+                        diff: string;
                         diffCached: string;
                         lastCommitMessages: string;
                     };
@@ -1638,11 +1638,10 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
-                agentContext: string;
                 messageHistory: {
                     content: string | ({
-                        type: "text";
                         text: string;
+                        type: "text";
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
@@ -1664,9 +1663,9 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     } | {
                         type: "image";
                         source: {
+                            data: string;
                             type: "base64";
                             media_type: "image/jpeg";
-                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
@@ -1681,7 +1680,7 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 result: string;
             }[];
             authToken?: string | undefined;
-            costMode?: "lite" | "normal" | "max" | undefined;
+            costMode?: "max" | "lite" | "normal" | undefined;
             prompt?: string | undefined;
         } | {
             type: "read-files-response";
@@ -1689,15 +1688,14 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
             requestId?: string | undefined;
         } | {
             type: "init";
-            fingerprintId: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -1717,6 +1715,7 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
+            fingerprintId: string;
             authToken?: string | undefined;
         } | {
             type: "usage";
@@ -1728,6 +1727,7 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
             stagedChanges: string;
             authToken?: string | undefined;
         };
+        type: "action";
         txid: number;
     }>;
 };
@@ -1797,14 +1797,14 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "ephemeral";
                 }>>;
             }, "strip", z.ZodTypeAny, {
-                type: "text";
                 text: string;
+                type: "text";
                 cache_control?: {
                     type: "ephemeral";
                 } | undefined;
             }, {
-                type: "text";
                 text: string;
+                type: "text";
                 cache_control?: {
                     type: "ephemeral";
                 } | undefined;
@@ -1868,13 +1868,13 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     media_type: z.ZodLiteral<"image/jpeg">;
                     data: z.ZodString;
                 }, "strip", z.ZodTypeAny, {
+                    data: string;
                     type: "base64";
                     media_type: "image/jpeg";
-                    data: string;
                 }, {
+                    data: string;
                     type: "base64";
                     media_type: "image/jpeg";
-                    data: string;
                 }>;
                 cache_control: z.ZodOptional<z.ZodObject<{
                     type: z.ZodLiteral<"ephemeral">;
@@ -1886,9 +1886,9 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             }, "strip", z.ZodTypeAny, {
                 type: "image";
                 source: {
+                    data: string;
                     type: "base64";
                     media_type: "image/jpeg";
-                    data: string;
                 };
                 cache_control?: {
                     type: "ephemeral";
@@ -1896,9 +1896,9 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             }, {
                 type: "image";
                 source: {
+                    data: string;
                     type: "base64";
                     media_type: "image/jpeg";
-                    data: string;
                 };
                 cache_control?: {
                     type: "ephemeral";
@@ -1906,8 +1906,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             }>]>, "many">]>;
         }, "strip", z.ZodTypeAny, {
             content: string | ({
-                type: "text";
                 text: string;
+                type: "text";
                 cache_control?: {
                     type: "ephemeral";
                 } | undefined;
@@ -1929,9 +1929,9 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             } | {
                 type: "image";
                 source: {
+                    data: string;
                     type: "base64";
                     media_type: "image/jpeg";
-                    data: string;
                 };
                 cache_control?: {
                     type: "ephemeral";
@@ -1940,8 +1940,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             role: "user" | "assistant";
         }, {
             content: string | ({
-                type: "text";
                 text: string;
+                type: "text";
                 cache_control?: {
                     type: "ephemeral";
                 } | undefined;
@@ -1963,9 +1963,9 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             } | {
                 type: "image";
                 source: {
+                    data: string;
                     type: "base64";
                     media_type: "image/jpeg";
-                    data: string;
                 };
                 cache_control?: {
                     type: "ephemeral";
@@ -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,23 +2087,50 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             path: z.ZodString;
             content: z.ZodString;
         }, "strip", z.ZodTypeAny, {
-            type: "patch" | "file";
             path: string;
+            type: "file" | "patch";
             content: string;
         }, {
-            type: "patch" | "file";
             path: string;
+            type: "file" | "patch";
             content: string;
         }>, "many">;
         costMode: z.ZodDefault<z.ZodOptional<z.ZodEnum<["lite", "normal", "max"]>>>;
     }, "strip", z.ZodTypeAny, {
         type: "user-input";
+        fileContext: {
+            currentWorkingDirectory: string;
+            fileTree: import("../util/file").FileTreeNode[];
+            fileTokenScores: Record<string, Record<string, number>>;
+            knowledgeFiles: Record<string, string>;
+            gitChanges: {
+                status: string;
+                diff: string;
+                diffCached: string;
+                lastCommitMessages: string;
+            };
+            changesSinceLastChat: Record<string, string>;
+            shellConfigFiles: Record<string, string>;
+            systemInfo: {
+                platform: string;
+                shell: string;
+                nodeVersion: string;
+                arch: string;
+                homedir: string;
+                cpus: number;
+            };
+            fileVersions: {
+                path: string;
+                content: string;
+            }[][];
+            userKnowledgeFiles?: Record<string, string> | undefined;
+        };
         fingerprintId: string;
         userInputId: string;
         messages: {
             content: string | ({
-                type: "text";
                 text: string;
+                type: "text";
                 cache_control?: {
                     type: "ephemeral";
                 } | undefined;
@@ -2125,9 +2152,9 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             } | {
                 type: "image";
                 source: {
+                    data: string;
                     type: "base64";
                     media_type: "image/jpeg";
-                    data: string;
                 };
                 cache_control?: {
                     type: "ephemeral";
@@ -2135,14 +2162,23 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             })[];
             role: "user" | "assistant";
         }[];
+        changesAlreadyApplied: {
+            path: string;
+            type: "file" | "patch";
+            content: string;
+        }[];
+        costMode: "max" | "lite" | "normal";
+        authToken?: string | undefined;
+    }, {
+        type: "user-input";
         fileContext: {
             currentWorkingDirectory: string;
             fileTree: import("../util/file").FileTreeNode[];
             fileTokenScores: Record<string, Record<string, number>>;
             knowledgeFiles: Record<string, string>;
             gitChanges: {
-                diff: string;
                 status: string;
+                diff: string;
                 diffCached: string;
                 lastCommitMessages: string;
             };
@@ -2162,21 +2198,12 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             }[][];
             userKnowledgeFiles?: Record<string, string> | undefined;
         };
-        changesAlreadyApplied: {
-            type: "patch" | "file";
-            path: string;
-            content: string;
-        }[];
-        costMode: "lite" | "normal" | "max";
-        authToken?: string | undefined;
-    }, {
-        type: "user-input";
         fingerprintId: string;
         userInputId: string;
         messages: {
             content: string | ({
-                type: "text";
                 text: string;
+                type: "text";
                 cache_control?: {
                     type: "ephemeral";
                 } | undefined;
@@ -2198,9 +2225,9 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             } | {
                 type: "image";
                 source: {
+                    data: string;
                     type: "base64";
                     media_type: "image/jpeg";
-                    data: string;
                 };
                 cache_control?: {
                     type: "ephemeral";
@@ -2208,40 +2235,13 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             })[];
             role: "user" | "assistant";
         }[];
-        fileContext: {
-            currentWorkingDirectory: string;
-            fileTree: import("../util/file").FileTreeNode[];
-            fileTokenScores: Record<string, Record<string, number>>;
-            knowledgeFiles: Record<string, string>;
-            gitChanges: {
-                diff: string;
-                status: string;
-                diffCached: string;
-                lastCommitMessages: string;
-            };
-            changesSinceLastChat: Record<string, string>;
-            shellConfigFiles: Record<string, string>;
-            systemInfo: {
-                platform: string;
-                shell: string;
-                nodeVersion: string;
-                arch: string;
-                homedir: string;
-                cpus: number;
-            };
-            fileVersions: {
-                path: string;
-                content: string;
-            }[][];
-            userKnowledgeFiles?: Record<string, string> | undefined;
-        };
         changesAlreadyApplied: {
-            type: "patch" | "file";
             path: string;
+            type: "file" | "patch";
             content: string;
         }[];
         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;
                 };
@@ -2373,14 +2373,14 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     }>>;
                 }, "strip", z.ZodTypeAny, {
-                    type: "text";
                     text: string;
+                    type: "text";
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 }, {
-                    type: "text";
                     text: string;
+                    type: "text";
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
@@ -2444,13 +2444,13 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         media_type: z.ZodLiteral<"image/jpeg">;
                         data: z.ZodString;
                     }, "strip", z.ZodTypeAny, {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     }, {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     }>;
                     cache_control: z.ZodOptional<z.ZodObject<{
                         type: z.ZodLiteral<"ephemeral">;
@@ -2462,9 +2462,9 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }, "strip", z.ZodTypeAny, {
                     type: "image";
                     source: {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
@@ -2472,9 +2472,9 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }, {
                     type: "image";
                     source: {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
@@ -2482,8 +2482,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }>]>, "many">]>;
             }, "strip", z.ZodTypeAny, {
                 content: string | ({
-                    type: "text";
                     text: string;
+                    type: "text";
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
@@ -2505,9 +2505,9 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 } | {
                     type: "image";
                     source: {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
@@ -2516,8 +2516,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 role: "user" | "assistant";
             }, {
                 content: string | ({
-                    type: "text";
                     text: string;
+                    type: "text";
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
@@ -2539,9 +2539,9 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 } | {
                     type: "image";
                     source: {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
@@ -2550,14 +2550,15 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 role: "user" | "assistant";
             }>, "many">;
         }, "strip", z.ZodTypeAny, {
+            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -2577,11 +2578,10 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
-            agentContext: string;
             messageHistory: {
                 content: string | ({
-                    type: "text";
                     text: string;
+                    type: "text";
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
@@ -2603,9 +2603,9 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 } | {
                     type: "image";
                     source: {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
@@ -2614,14 +2614,15 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 role: "user" | "assistant";
             }[];
         }, {
+            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -2641,11 +2642,10 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
-            agentContext: string;
             messageHistory: {
                 content: string | ({
-                    type: "text";
                     text: string;
+                    type: "text";
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
@@ -2667,9 +2667,9 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 } | {
                     type: "image";
                     source: {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
@@ -2694,17 +2694,18 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
     }, "strip", z.ZodTypeAny, {
         type: "prompt";
         fingerprintId: string;
-        costMode: "lite" | "normal" | "max";
+        costMode: "max" | "lite" | "normal";
         promptId: string;
         agentState: {
+            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -2724,11 +2725,10 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
-            agentContext: string;
             messageHistory: {
                 content: string | ({
-                    type: "text";
                     text: string;
+                    type: "text";
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
@@ -2750,9 +2750,9 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 } | {
                     type: "image";
                     source: {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
@@ -2773,14 +2773,15 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         fingerprintId: string;
         promptId: string;
         agentState: {
+            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -2800,11 +2801,10 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
-            agentContext: string;
             messageHistory: {
                 content: string | ({
-                    type: "text";
                     text: string;
+                    type: "text";
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
@@ -2826,9 +2826,9 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 } | {
                     type: "image";
                     source: {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
@@ -2843,7 +2843,7 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             result: string;
         }[];
         authToken?: string | undefined;
-        costMode?: "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;
             };
@@ -2972,15 +2972,14 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         }>;
     }, "strip", z.ZodTypeAny, {
         type: "init";
-        fingerprintId: string;
         fileContext: {
             currentWorkingDirectory: string;
             fileTree: import("../util/file").FileTreeNode[];
             fileTokenScores: Record<string, Record<string, number>>;
             knowledgeFiles: Record<string, string>;
             gitChanges: {
-                diff: string;
                 status: string;
+                diff: string;
                 diffCached: string;
                 lastCommitMessages: string;
             };
@@ -3000,18 +2999,18 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             }[][];
             userKnowledgeFiles?: Record<string, string> | undefined;
         };
+        fingerprintId: string;
         authToken?: string | undefined;
     }, {
         type: "init";
-        fingerprintId: string;
         fileContext: {
             currentWorkingDirectory: string;
             fileTree: import("../util/file").FileTreeNode[];
             fileTokenScores: Record<string, Record<string, number>>;
             knowledgeFiles: Record<string, string>;
             gitChanges: {
-                diff: string;
                 status: string;
+                diff: string;
                 diffCached: string;
                 lastCommitMessages: string;
             };
@@ -3031,6 +3030,7 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             }[][];
             userKnowledgeFiles?: Record<string, string> | undefined;
         };
+        fingerprintId: string;
         authToken?: string | undefined;
     }>, z.ZodObject<{
         type: z.ZodLiteral<"usage">;
@@ -3061,15 +3061,41 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         authToken?: string | undefined;
     }>]>;
 }, "strip", z.ZodTypeAny, {
-    type: "action";
     data: {
         type: "user-input";
+        fileContext: {
+            currentWorkingDirectory: string;
+            fileTree: import("../util/file").FileTreeNode[];
+            fileTokenScores: Record<string, Record<string, number>>;
+            knowledgeFiles: Record<string, string>;
+            gitChanges: {
+                status: string;
+                diff: string;
+                diffCached: string;
+                lastCommitMessages: string;
+            };
+            changesSinceLastChat: Record<string, string>;
+            shellConfigFiles: Record<string, string>;
+            systemInfo: {
+                platform: string;
+                shell: string;
+                nodeVersion: string;
+                arch: string;
+                homedir: string;
+                cpus: number;
+            };
+            fileVersions: {
+                path: string;
+                content: string;
+            }[][];
+            userKnowledgeFiles?: Record<string, string> | undefined;
+        };
         fingerprintId: string;
         userInputId: string;
         messages: {
             content: string | ({
-                type: "text";
                 text: string;
+                type: "text";
                 cache_control?: {
                     type: "ephemeral";
                 } | undefined;
@@ -3091,9 +3117,9 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             } | {
                 type: "image";
                 source: {
+                    data: string;
                     type: "base64";
                     media_type: "image/jpeg";
-                    data: string;
                 };
                 cache_control?: {
                     type: "ephemeral";
@@ -3101,54 +3127,28 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             })[];
             role: "user" | "assistant";
         }[];
-        fileContext: {
-            currentWorkingDirectory: string;
-            fileTree: import("../util/file").FileTreeNode[];
-            fileTokenScores: Record<string, Record<string, number>>;
-            knowledgeFiles: Record<string, string>;
-            gitChanges: {
-                diff: string;
-                status: string;
-                diffCached: string;
-                lastCommitMessages: string;
-            };
-            changesSinceLastChat: Record<string, string>;
-            shellConfigFiles: Record<string, string>;
-            systemInfo: {
-                platform: string;
-                shell: string;
-                nodeVersion: string;
-                arch: string;
-                homedir: string;
-                cpus: number;
-            };
-            fileVersions: {
-                path: string;
-                content: string;
-            }[][];
-            userKnowledgeFiles?: Record<string, string> | undefined;
-        };
         changesAlreadyApplied: {
-            type: "patch" | "file";
             path: string;
+            type: "file" | "patch";
             content: string;
         }[];
-        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;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -3168,11 +3168,10 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
-            agentContext: string;
             messageHistory: {
                 content: string | ({
-                    type: "text";
                     text: string;
+                    type: "text";
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
@@ -3194,9 +3193,9 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 } | {
                     type: "image";
                     source: {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
@@ -3218,15 +3217,14 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         requestId?: string | undefined;
     } | {
         type: "init";
-        fingerprintId: string;
         fileContext: {
             currentWorkingDirectory: string;
             fileTree: import("../util/file").FileTreeNode[];
             fileTokenScores: Record<string, Record<string, number>>;
             knowledgeFiles: Record<string, string>;
             gitChanges: {
-                diff: string;
                 status: string;
+                diff: string;
                 diffCached: string;
                 lastCommitMessages: string;
             };
@@ -3246,6 +3244,7 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             }[][];
             userKnowledgeFiles?: Record<string, string> | undefined;
         };
+        fingerprintId: string;
         authToken?: string | undefined;
     } | {
         type: "usage";
@@ -3257,56 +3256,19 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         stagedChanges: string;
         authToken?: string | undefined;
     };
+    type: "action";
     txid: number;
 }, {
-    type: "action";
     data: {
         type: "user-input";
-        fingerprintId: string;
-        userInputId: string;
-        messages: {
-            content: string | ({
-                type: "text";
-                text: string;
-                cache_control?: {
-                    type: "ephemeral";
-                } | undefined;
-            } | {
-                type: "tool_use";
-                name: string;
-                id: string;
-                input: Record<string, any>;
-                cache_control?: {
-                    type: "ephemeral";
-                } | undefined;
-            } | {
-                type: "tool_result";
-                content: string;
-                tool_use_id: string;
-                cache_control?: {
-                    type: "ephemeral";
-                } | undefined;
-            } | {
-                type: "image";
-                source: {
-                    type: "base64";
-                    media_type: "image/jpeg";
-                    data: string;
-                };
-                cache_control?: {
-                    type: "ephemeral";
-                } | undefined;
-            })[];
-            role: "user" | "assistant";
-        }[];
         fileContext: {
             currentWorkingDirectory: string;
             fileTree: import("../util/file").FileTreeNode[];
             fileTokenScores: Record<string, Record<string, number>>;
             knowledgeFiles: Record<string, string>;
             gitChanges: {
-                diff: string;
                 status: string;
+                diff: string;
                 diffCached: string;
                 lastCommitMessages: string;
             };
@@ -3326,26 +3288,64 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             }[][];
             userKnowledgeFiles?: Record<string, string> | undefined;
         };
+        fingerprintId: string;
+        userInputId: string;
+        messages: {
+            content: string | ({
+                text: string;
+                type: "text";
+                cache_control?: {
+                    type: "ephemeral";
+                } | undefined;
+            } | {
+                type: "tool_use";
+                name: string;
+                id: string;
+                input: Record<string, any>;
+                cache_control?: {
+                    type: "ephemeral";
+                } | undefined;
+            } | {
+                type: "tool_result";
+                content: string;
+                tool_use_id: string;
+                cache_control?: {
+                    type: "ephemeral";
+                } | undefined;
+            } | {
+                type: "image";
+                source: {
+                    data: string;
+                    type: "base64";
+                    media_type: "image/jpeg";
+                };
+                cache_control?: {
+                    type: "ephemeral";
+                } | undefined;
+            })[];
+            role: "user" | "assistant";
+        }[];
         changesAlreadyApplied: {
-            type: "patch" | "file";
             path: string;
+            type: "file" | "patch";
             content: string;
         }[];
         authToken?: string | undefined;
-        costMode?: "lite" | "normal" | "max" | undefined;
+        costMode?: "max" | "lite" | "normal" | undefined;
     } | {
         type: "prompt";
         fingerprintId: string;
         promptId: string;
         agentState: {
+            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -3365,11 +3365,10 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
-            agentContext: string;
             messageHistory: {
                 content: string | ({
-                    type: "text";
                     text: string;
+                    type: "text";
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
@@ -3391,9 +3390,9 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 } | {
                     type: "image";
                     source: {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
@@ -3408,7 +3407,7 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             result: string;
         }[];
         authToken?: string | undefined;
-        costMode?: "lite" | "normal" | "max" | undefined;
+        costMode?: "max" | "lite" | "normal" | undefined;
         prompt?: string | undefined;
     } | {
         type: "read-files-response";
@@ -3416,15 +3415,14 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         requestId?: string | undefined;
     } | {
         type: "init";
-        fingerprintId: string;
         fileContext: {
             currentWorkingDirectory: string;
             fileTree: import("../util/file").FileTreeNode[];
             fileTokenScores: Record<string, Record<string, number>>;
             knowledgeFiles: Record<string, string>;
             gitChanges: {
-                diff: string;
                 status: string;
+                diff: string;
                 diffCached: string;
                 lastCommitMessages: string;
             };
@@ -3444,6 +3442,7 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             }[][];
             userKnowledgeFiles?: Record<string, string> | undefined;
         };
+        fingerprintId: string;
         authToken?: string | undefined;
     } | {
         type: "usage";
@@ -3455,6 +3454,7 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         stagedChanges: string;
         authToken?: string | undefined;
     };
+    type: "action";
     txid: number;
 }>]>;
 export type ClientMessageType = keyof typeof CLIENT_MESSAGE_SCHEMAS;
@@ -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,12 +3499,12 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                 path: z.ZodString;
                 content: z.ZodString;
             }, "strip", z.ZodTypeAny, {
-                type: "patch" | "file";
                 path: string;
+                type: "file" | "patch";
                 content: string;
             }, {
-                type: "patch" | "file";
                 path: string;
+                type: "file" | "patch";
                 content: string;
             }>, "many">;
             changesAlreadyApplied: z.ZodArray<z.ZodObject<{
@@ -3512,12 +3512,12 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                 path: z.ZodString;
                 content: z.ZodString;
             }, "strip", z.ZodTypeAny, {
-                type: "patch" | "file";
                 path: string;
+                type: "file" | "patch";
                 content: string;
             }, {
-                type: "patch" | "file";
                 path: string;
+                type: "file" | "patch";
                 content: string;
             }>, "many">;
             addedFileVersions: z.ZodArray<z.ZodObject<{
@@ -3542,14 +3542,14 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             type: "response-complete";
             userInputId: string;
             changesAlreadyApplied: {
-                type: "patch" | "file";
                 path: string;
+                type: "file" | "patch";
                 content: string;
             }[];
             response: string;
             changes: {
-                type: "patch" | "file";
                 path: string;
+                type: "file" | "patch";
                 content: string;
             }[];
             addedFileVersions: {
@@ -3567,14 +3567,14 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             type: "response-complete";
             userInputId: string;
             changesAlreadyApplied: {
-                type: "patch" | "file";
                 path: string;
+                type: "file" | "patch";
                 content: string;
             }[];
             response: string;
             changes: {
-                type: "patch" | "file";
                 path: string;
+                type: "file" | "patch";
                 content: string;
             }[];
             addedFileVersions: {
@@ -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;
                     };
@@ -3715,14 +3715,14 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                             type: "ephemeral";
                         }>>;
                     }, "strip", z.ZodTypeAny, {
-                        type: "text";
                         text: string;
+                        type: "text";
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     }, {
-                        type: "text";
                         text: string;
+                        type: "text";
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
@@ -3786,13 +3786,13 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                             media_type: z.ZodLiteral<"image/jpeg">;
                             data: z.ZodString;
                         }, "strip", z.ZodTypeAny, {
+                            data: string;
                             type: "base64";
                             media_type: "image/jpeg";
-                            data: string;
                         }, {
+                            data: string;
                             type: "base64";
                             media_type: "image/jpeg";
-                            data: string;
                         }>;
                         cache_control: z.ZodOptional<z.ZodObject<{
                             type: z.ZodLiteral<"ephemeral">;
@@ -3804,9 +3804,9 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     }, "strip", z.ZodTypeAny, {
                         type: "image";
                         source: {
+                            data: string;
                             type: "base64";
                             media_type: "image/jpeg";
-                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
@@ -3814,9 +3814,9 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     }, {
                         type: "image";
                         source: {
+                            data: string;
                             type: "base64";
                             media_type: "image/jpeg";
-                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
@@ -3824,8 +3824,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     }>]>, "many">]>;
                 }, "strip", z.ZodTypeAny, {
                     content: string | ({
-                        type: "text";
                         text: string;
+                        type: "text";
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
@@ -3847,9 +3847,9 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     } | {
                         type: "image";
                         source: {
+                            data: string;
                             type: "base64";
                             media_type: "image/jpeg";
-                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
@@ -3858,8 +3858,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     role: "user" | "assistant";
                 }, {
                     content: string | ({
-                        type: "text";
                         text: string;
+                        type: "text";
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
@@ -3881,9 +3881,9 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     } | {
                         type: "image";
                         source: {
+                            data: string;
                             type: "base64";
                             media_type: "image/jpeg";
-                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
@@ -3892,14 +3892,15 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     role: "user" | "assistant";
                 }>, "many">;
             }, "strip", z.ZodTypeAny, {
+                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
                     fileTokenScores: Record<string, Record<string, number>>;
                     knowledgeFiles: Record<string, string>;
                     gitChanges: {
-                        diff: string;
                         status: string;
+                        diff: string;
                         diffCached: string;
                         lastCommitMessages: string;
                     };
@@ -3919,11 +3920,10 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
-                agentContext: string;
                 messageHistory: {
                     content: string | ({
-                        type: "text";
                         text: string;
+                        type: "text";
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
@@ -3945,9 +3945,9 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     } | {
                         type: "image";
                         source: {
+                            data: string;
                             type: "base64";
                             media_type: "image/jpeg";
-                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
@@ -3956,14 +3956,15 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     role: "user" | "assistant";
                 }[];
             }, {
+                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
                     fileTokenScores: Record<string, Record<string, number>>;
                     knowledgeFiles: Record<string, string>;
                     gitChanges: {
-                        diff: string;
                         status: string;
+                        diff: string;
                         diffCached: string;
                         lastCommitMessages: string;
                     };
@@ -3983,11 +3984,10 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
-                agentContext: string;
                 messageHistory: {
                     content: string | ({
-                        type: "text";
                         text: string;
+                        type: "text";
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
@@ -4009,9 +4009,9 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     } | {
                         type: "image";
                         source: {
+                            data: string;
                             type: "base64";
                             media_type: "image/jpeg";
-                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
@@ -4057,14 +4057,15 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             type: "prompt-response";
             promptId: string;
             agentState: {
+                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
                     fileTokenScores: Record<string, Record<string, number>>;
                     knowledgeFiles: Record<string, string>;
                     gitChanges: {
-                        diff: string;
                         status: string;
+                        diff: string;
                         diffCached: string;
                         lastCommitMessages: string;
                     };
@@ -4084,11 +4085,10 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
-                agentContext: string;
                 messageHistory: {
                     content: string | ({
-                        type: "text";
                         text: string;
+                        type: "text";
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
@@ -4110,9 +4110,9 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     } | {
                         type: "image";
                         source: {
+                            data: string;
                             type: "base64";
                             media_type: "image/jpeg";
-                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
@@ -4141,14 +4141,15 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             type: "prompt-response";
             promptId: string;
             agentState: {
+                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
                     fileTokenScores: Record<string, Record<string, number>>;
                     knowledgeFiles: Record<string, string>;
                     gitChanges: {
-                        diff: string;
                         status: string;
+                        diff: string;
                         diffCached: string;
                         lastCommitMessages: string;
                     };
@@ -4168,11 +4169,10 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
-                agentContext: string;
                 messageHistory: {
                     content: string | ({
-                        type: "text";
                         text: string;
+                        type: "text";
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
@@ -4194,9 +4194,9 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     } | {
                         type: "image";
                         source: {
+                            data: string;
                             type: "base64";
                             media_type: "image/jpeg";
-                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
@@ -4255,12 +4255,12 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                 path: z.ZodString;
                 content: z.ZodString;
             }, "strip", z.ZodTypeAny, {
-                type: "patch" | "file";
                 path: string;
+                type: "file" | "patch";
                 content: string;
             }, {
-                type: "patch" | "file";
                 path: string;
+                type: "file" | "patch";
                 content: string;
             }>, "many">;
             changesAlreadyApplied: z.ZodArray<z.ZodObject<{
@@ -4268,12 +4268,12 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                 path: z.ZodString;
                 content: z.ZodString;
             }, "strip", z.ZodTypeAny, {
-                type: "patch" | "file";
                 path: string;
+                type: "file" | "patch";
                 content: string;
             }, {
-                type: "patch" | "file";
                 path: string;
+                type: "file" | "patch";
                 content: string;
             }>, "many">;
             addedFileVersions: z.ZodArray<z.ZodObject<{
@@ -4288,22 +4288,22 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             }>, "many">;
             resetFileVersions: z.ZodBoolean;
         }, "strip", z.ZodTypeAny, {
-            type: "tool-call";
-            userInputId: string;
             data: {
                 name: string;
                 id: string;
                 input: Record<string, any>;
             };
+            type: "tool-call";
+            userInputId: string;
             changesAlreadyApplied: {
-                type: "patch" | "file";
                 path: string;
+                type: "file" | "patch";
                 content: string;
             }[];
             response: string;
             changes: {
-                type: "patch" | "file";
                 path: string;
+                type: "file" | "patch";
                 content: string;
             }[];
             addedFileVersions: {
@@ -4312,22 +4312,22 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             }[];
             resetFileVersions: boolean;
         }, {
-            type: "tool-call";
-            userInputId: string;
             data: {
                 name: string;
                 id: string;
                 input: Record<string, any>;
             };
+            type: "tool-call";
+            userInputId: string;
             changesAlreadyApplied: {
-                type: "patch" | "file";
                 path: string;
+                type: "file" | "patch";
                 content: string;
             }[];
             response: string;
             changes: {
-                type: "patch" | "file";
                 path: string;
+                type: "file" | "patch";
                 content: string;
             }[];
             addedFileVersions: {
@@ -4341,12 +4341,12 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             result: z.ZodString;
         }, "strip", z.ZodTypeAny, {
             type: "terminal-command-result";
-            userInputId: string;
             result: string;
+            userInputId: string;
         }, {
             type: "terminal-command-result";
-            userInputId: string;
             result: string;
+            userInputId: string;
         }>, z.ZodObject<{
             type: z.ZodLiteral<"npm-version-status">;
             isUpToDate: z.ZodBoolean;
@@ -4413,11 +4413,11 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             type: z.ZodLiteral<"action-error">;
             message: z.ZodString;
         }, "strip", z.ZodTypeAny, {
-            type: "action-error";
             message: string;
-        }, {
             type: "action-error";
+        }, {
             message: string;
+            type: "action-error";
         }>, z.ZodObject<{
             type: z.ZodLiteral<"commit-message-response">;
             commitMessage: z.ZodString;
@@ -4429,7 +4429,6 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             commitMessage: string;
         }>]>;
     }, "strip", z.ZodTypeAny, {
-        type: "action";
         data: {
             type: "usage-response";
             usage: number;
@@ -4450,14 +4449,14 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             type: "response-complete";
             userInputId: string;
             changesAlreadyApplied: {
-                type: "patch" | "file";
                 path: string;
+                type: "file" | "patch";
                 content: string;
             }[];
             response: string;
             changes: {
-                type: "patch" | "file";
                 path: string;
+                type: "file" | "patch";
                 content: string;
             }[];
             addedFileVersions: {
@@ -4475,14 +4474,15 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             type: "prompt-response";
             promptId: string;
             agentState: {
+                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
                     fileTokenScores: Record<string, Record<string, number>>;
                     knowledgeFiles: Record<string, string>;
                     gitChanges: {
-                        diff: string;
                         status: string;
+                        diff: string;
                         diffCached: string;
                         lastCommitMessages: string;
                     };
@@ -4502,11 +4502,10 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
-                agentContext: string;
                 messageHistory: {
                     content: string | ({
-                        type: "text";
                         text: string;
+                        type: "text";
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
@@ -4528,9 +4527,9 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     } | {
                         type: "image";
                         source: {
+                            data: string;
                             type: "base64";
                             media_type: "image/jpeg";
-                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
@@ -4564,22 +4563,22 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             requestId: string;
             filePaths: string[];
         } | {
-            type: "tool-call";
-            userInputId: string;
             data: {
                 name: string;
                 id: string;
                 input: Record<string, any>;
             };
+            type: "tool-call";
+            userInputId: string;
             changesAlreadyApplied: {
-                type: "patch" | "file";
                 path: string;
+                type: "file" | "patch";
                 content: string;
             }[];
             response: string;
             changes: {
-                type: "patch" | "file";
                 path: string;
+                type: "file" | "patch";
                 content: string;
             }[];
             addedFileVersions: {
@@ -4589,21 +4588,21 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             resetFileVersions: boolean;
         } | {
             type: "terminal-command-result";
-            userInputId: string;
             result: string;
+            userInputId: string;
         } | {
             type: "npm-version-status";
             isUpToDate: boolean;
             latestVersion: string;
         } | {
-            type: "action-error";
             message: string;
+            type: "action-error";
         } | {
             type: "commit-message-response";
             commitMessage: string;
         };
-    }, {
         type: "action";
+    }, {
         data: {
             type: "usage-response";
             usage: number;
@@ -4624,14 +4623,14 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             type: "response-complete";
             userInputId: string;
             changesAlreadyApplied: {
-                type: "patch" | "file";
                 path: string;
+                type: "file" | "patch";
                 content: string;
             }[];
             response: string;
             changes: {
-                type: "patch" | "file";
                 path: string;
+                type: "file" | "patch";
                 content: string;
             }[];
             addedFileVersions: {
@@ -4649,14 +4648,15 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             type: "prompt-response";
             promptId: string;
             agentState: {
+                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
                     fileTokenScores: Record<string, Record<string, number>>;
                     knowledgeFiles: Record<string, string>;
                     gitChanges: {
-                        diff: string;
                         status: string;
+                        diff: string;
                         diffCached: string;
                         lastCommitMessages: string;
                     };
@@ -4676,11 +4676,10 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
-                agentContext: string;
                 messageHistory: {
                     content: string | ({
-                        type: "text";
                         text: string;
+                        type: "text";
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
@@ -4702,9 +4701,9 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     } | {
                         type: "image";
                         source: {
+                            data: string;
                             type: "base64";
                             media_type: "image/jpeg";
-                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
@@ -4738,22 +4737,22 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             requestId: string;
             filePaths: string[];
         } | {
-            type: "tool-call";
-            userInputId: string;
             data: {
                 name: string;
                 id: string;
                 input: Record<string, any>;
             };
+            type: "tool-call";
+            userInputId: string;
             changesAlreadyApplied: {
-                type: "patch" | "file";
                 path: string;
+                type: "file" | "patch";
                 content: string;
             }[];
             response: string;
             changes: {
-                type: "patch" | "file";
                 path: string;
+                type: "file" | "patch";
                 content: string;
             }[];
             addedFileVersions: {
@@ -4763,19 +4762,20 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             resetFileVersions: boolean;
         } | {
             type: "terminal-command-result";
-            userInputId: string;
             result: string;
+            userInputId: string;
         } | {
             type: "npm-version-status";
             isUpToDate: boolean;
             latestVersion: string;
         } | {
-            type: "action-error";
             message: string;
+            type: "action-error";
         } | {
             type: "commit-message-response";
             commitMessage: string;
         };
+        type: "action";
     }>;
 };
 export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
@@ -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,12 +4816,12 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             path: z.ZodString;
             content: z.ZodString;
         }, "strip", z.ZodTypeAny, {
-            type: "patch" | "file";
             path: string;
+            type: "file" | "patch";
             content: string;
         }, {
-            type: "patch" | "file";
             path: string;
+            type: "file" | "patch";
             content: string;
         }>, "many">;
         changesAlreadyApplied: z.ZodArray<z.ZodObject<{
@@ -4829,12 +4829,12 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             path: z.ZodString;
             content: z.ZodString;
         }, "strip", z.ZodTypeAny, {
-            type: "patch" | "file";
             path: string;
+            type: "file" | "patch";
             content: string;
         }, {
-            type: "patch" | "file";
             path: string;
+            type: "file" | "patch";
             content: string;
         }>, "many">;
         addedFileVersions: z.ZodArray<z.ZodObject<{
@@ -4859,14 +4859,14 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         type: "response-complete";
         userInputId: string;
         changesAlreadyApplied: {
-            type: "patch" | "file";
             path: string;
+            type: "file" | "patch";
             content: string;
         }[];
         response: string;
         changes: {
-            type: "patch" | "file";
             path: string;
+            type: "file" | "patch";
             content: string;
         }[];
         addedFileVersions: {
@@ -4884,14 +4884,14 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         type: "response-complete";
         userInputId: string;
         changesAlreadyApplied: {
-            type: "patch" | "file";
             path: string;
+            type: "file" | "patch";
             content: string;
         }[];
         response: string;
         changes: {
-            type: "patch" | "file";
             path: string;
+            type: "file" | "patch";
             content: string;
         }[];
         addedFileVersions: {
@@ -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;
                 };
@@ -5032,14 +5032,14 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         type: "ephemeral";
                     }>>;
                 }, "strip", z.ZodTypeAny, {
-                    type: "text";
                     text: string;
+                    type: "text";
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 }, {
-                    type: "text";
                     text: string;
+                    type: "text";
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
@@ -5103,13 +5103,13 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         media_type: z.ZodLiteral<"image/jpeg">;
                         data: z.ZodString;
                     }, "strip", z.ZodTypeAny, {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     }, {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     }>;
                     cache_control: z.ZodOptional<z.ZodObject<{
                         type: z.ZodLiteral<"ephemeral">;
@@ -5121,9 +5121,9 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }, "strip", z.ZodTypeAny, {
                     type: "image";
                     source: {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
@@ -5131,9 +5131,9 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }, {
                     type: "image";
                     source: {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
@@ -5141,8 +5141,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }>]>, "many">]>;
             }, "strip", z.ZodTypeAny, {
                 content: string | ({
-                    type: "text";
                     text: string;
+                    type: "text";
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
@@ -5164,9 +5164,9 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 } | {
                     type: "image";
                     source: {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
@@ -5175,8 +5175,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 role: "user" | "assistant";
             }, {
                 content: string | ({
-                    type: "text";
                     text: string;
+                    type: "text";
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
@@ -5198,9 +5198,9 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 } | {
                     type: "image";
                     source: {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
@@ -5209,14 +5209,15 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 role: "user" | "assistant";
             }>, "many">;
         }, "strip", z.ZodTypeAny, {
+            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -5236,11 +5237,10 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
-            agentContext: string;
             messageHistory: {
                 content: string | ({
-                    type: "text";
                     text: string;
+                    type: "text";
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
@@ -5262,9 +5262,9 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 } | {
                     type: "image";
                     source: {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
@@ -5273,14 +5273,15 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 role: "user" | "assistant";
             }[];
         }, {
+            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -5300,11 +5301,10 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
-            agentContext: string;
             messageHistory: {
                 content: string | ({
-                    type: "text";
                     text: string;
+                    type: "text";
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
@@ -5326,9 +5326,9 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 } | {
                     type: "image";
                     source: {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
@@ -5374,14 +5374,15 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         type: "prompt-response";
         promptId: string;
         agentState: {
+            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -5401,11 +5402,10 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
-            agentContext: string;
             messageHistory: {
                 content: string | ({
-                    type: "text";
                     text: string;
+                    type: "text";
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
@@ -5427,9 +5427,9 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 } | {
                     type: "image";
                     source: {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
@@ -5458,14 +5458,15 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         type: "prompt-response";
         promptId: string;
         agentState: {
+            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -5485,11 +5486,10 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
-            agentContext: string;
             messageHistory: {
                 content: string | ({
-                    type: "text";
                     text: string;
+                    type: "text";
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
@@ -5511,9 +5511,9 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 } | {
                     type: "image";
                     source: {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
@@ -5572,12 +5572,12 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             path: z.ZodString;
             content: z.ZodString;
         }, "strip", z.ZodTypeAny, {
-            type: "patch" | "file";
             path: string;
+            type: "file" | "patch";
             content: string;
         }, {
-            type: "patch" | "file";
             path: string;
+            type: "file" | "patch";
             content: string;
         }>, "many">;
         changesAlreadyApplied: z.ZodArray<z.ZodObject<{
@@ -5585,12 +5585,12 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             path: z.ZodString;
             content: z.ZodString;
         }, "strip", z.ZodTypeAny, {
-            type: "patch" | "file";
             path: string;
+            type: "file" | "patch";
             content: string;
         }, {
-            type: "patch" | "file";
             path: string;
+            type: "file" | "patch";
             content: string;
         }>, "many">;
         addedFileVersions: z.ZodArray<z.ZodObject<{
@@ -5605,22 +5605,22 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         }>, "many">;
         resetFileVersions: z.ZodBoolean;
     }, "strip", z.ZodTypeAny, {
-        type: "tool-call";
-        userInputId: string;
         data: {
             name: string;
             id: string;
             input: Record<string, any>;
         };
+        type: "tool-call";
+        userInputId: string;
         changesAlreadyApplied: {
-            type: "patch" | "file";
             path: string;
+            type: "file" | "patch";
             content: string;
         }[];
         response: string;
         changes: {
-            type: "patch" | "file";
             path: string;
+            type: "file" | "patch";
             content: string;
         }[];
         addedFileVersions: {
@@ -5629,22 +5629,22 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         }[];
         resetFileVersions: boolean;
     }, {
-        type: "tool-call";
-        userInputId: string;
         data: {
             name: string;
             id: string;
             input: Record<string, any>;
         };
+        type: "tool-call";
+        userInputId: string;
         changesAlreadyApplied: {
-            type: "patch" | "file";
             path: string;
+            type: "file" | "patch";
             content: string;
         }[];
         response: string;
         changes: {
-            type: "patch" | "file";
             path: string;
+            type: "file" | "patch";
             content: string;
         }[];
         addedFileVersions: {
@@ -5658,12 +5658,12 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         result: z.ZodString;
     }, "strip", z.ZodTypeAny, {
         type: "terminal-command-result";
-        userInputId: string;
         result: string;
+        userInputId: string;
     }, {
         type: "terminal-command-result";
-        userInputId: string;
         result: string;
+        userInputId: string;
     }>, z.ZodObject<{
         type: z.ZodLiteral<"npm-version-status">;
         isUpToDate: z.ZodBoolean;
@@ -5730,11 +5730,11 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         type: z.ZodLiteral<"action-error">;
         message: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        type: "action-error";
         message: string;
-    }, {
         type: "action-error";
+    }, {
         message: string;
+        type: "action-error";
     }>, z.ZodObject<{
         type: z.ZodLiteral<"commit-message-response">;
         commitMessage: z.ZodString;
@@ -5746,7 +5746,6 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         commitMessage: string;
     }>]>;
 }, "strip", z.ZodTypeAny, {
-    type: "action";
     data: {
         type: "usage-response";
         usage: number;
@@ -5767,14 +5766,14 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         type: "response-complete";
         userInputId: string;
         changesAlreadyApplied: {
-            type: "patch" | "file";
             path: string;
+            type: "file" | "patch";
             content: string;
         }[];
         response: string;
         changes: {
-            type: "patch" | "file";
             path: string;
+            type: "file" | "patch";
             content: string;
         }[];
         addedFileVersions: {
@@ -5792,14 +5791,15 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         type: "prompt-response";
         promptId: string;
         agentState: {
+            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -5819,11 +5819,10 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
-            agentContext: string;
             messageHistory: {
                 content: string | ({
-                    type: "text";
                     text: string;
+                    type: "text";
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
@@ -5845,9 +5844,9 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 } | {
                     type: "image";
                     source: {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
@@ -5881,22 +5880,22 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         requestId: string;
         filePaths: string[];
     } | {
-        type: "tool-call";
-        userInputId: string;
         data: {
             name: string;
             id: string;
             input: Record<string, any>;
         };
+        type: "tool-call";
+        userInputId: string;
         changesAlreadyApplied: {
-            type: "patch" | "file";
             path: string;
+            type: "file" | "patch";
             content: string;
         }[];
         response: string;
         changes: {
-            type: "patch" | "file";
             path: string;
+            type: "file" | "patch";
             content: string;
         }[];
         addedFileVersions: {
@@ -5906,21 +5905,21 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         resetFileVersions: boolean;
     } | {
         type: "terminal-command-result";
-        userInputId: string;
         result: string;
+        userInputId: string;
     } | {
         type: "npm-version-status";
         isUpToDate: boolean;
         latestVersion: string;
     } | {
-        type: "action-error";
         message: string;
+        type: "action-error";
     } | {
         type: "commit-message-response";
         commitMessage: string;
     };
-}, {
     type: "action";
+}, {
     data: {
         type: "usage-response";
         usage: number;
@@ -5941,14 +5940,14 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         type: "response-complete";
         userInputId: string;
         changesAlreadyApplied: {
-            type: "patch" | "file";
             path: string;
+            type: "file" | "patch";
             content: string;
         }[];
         response: string;
         changes: {
-            type: "patch" | "file";
             path: string;
+            type: "file" | "patch";
             content: string;
         }[];
         addedFileVersions: {
@@ -5966,14 +5965,15 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         type: "prompt-response";
         promptId: string;
         agentState: {
+            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
                 fileTokenScores: Record<string, Record<string, number>>;
                 knowledgeFiles: Record<string, string>;
                 gitChanges: {
-                    diff: string;
                     status: string;
+                    diff: string;
                     diffCached: string;
                     lastCommitMessages: string;
                 };
@@ -5993,11 +5993,10 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
-            agentContext: string;
             messageHistory: {
                 content: string | ({
-                    type: "text";
                     text: string;
+                    type: "text";
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
@@ -6019,9 +6018,9 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 } | {
                     type: "image";
                     source: {
+                        data: string;
                         type: "base64";
                         media_type: "image/jpeg";
-                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
@@ -6055,22 +6054,22 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         requestId: string;
         filePaths: string[];
     } | {
-        type: "tool-call";
-        userInputId: string;
         data: {
             name: string;
             id: string;
             input: Record<string, any>;
         };
+        type: "tool-call";
+        userInputId: string;
         changesAlreadyApplied: {
-            type: "patch" | "file";
             path: string;
+            type: "file" | "patch";
             content: string;
         }[];
         response: string;
         changes: {
-            type: "patch" | "file";
             path: string;
+            type: "file" | "patch";
             content: string;
         }[];
         addedFileVersions: {
@@ -6080,19 +6079,20 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         resetFileVersions: boolean;
     } | {
         type: "terminal-command-result";
-        userInputId: string;
         result: string;
+        userInputId: string;
     } | {
         type: "npm-version-status";
         isUpToDate: boolean;
         latestVersion: string;
     } | {
-        type: "action-error";
         message: string;
+        type: "action-error";
     } | {
         type: "commit-message-response";
         commitMessage: string;
     };
+    type: "action";
 }>]>;
 export type ServerMessageType = keyof typeof SERVER_MESSAGE_SCHEMAS;
 export type ServerMessage<T extends ServerMessageType = ServerMessageType> = z.infer<(typeof SERVER_MESSAGE_SCHEMAS)[T]>;