npm - codebuff - Versions diffs - 1.0.173 → 1.0.174 - Mend

codebuff 1.0.173 → 1.0.174

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (22) hide show

package/dist/checkpoint-file-manager.d.ts +14 -3
package/dist/checkpoint-file-manager.js +65 -41
package/dist/checkpoint-file-manager.js.map +1 -1
package/dist/checkpoints.d.ts +2 -0
package/dist/checkpoints.js +15 -2
package/dist/checkpoints.js.map +1 -1
package/dist/cli.d.ts +1 -1
package/dist/cli.js +6 -1
package/dist/cli.js.map +1 -1
package/dist/client.d.ts +12 -12
package/dist/common/actions.d.ts +168 -168
package/dist/common/constants.d.ts +3 -3
package/dist/common/constants.js +1 -8
package/dist/common/constants.js.map +1 -1
package/dist/common/types/agent-state.d.ts +34 -34
package/dist/common/types/message.d.ts +24 -24
package/dist/common/websockets/websocket-schema.d.ts +451 -451
package/dist/index.js +1 -3
package/dist/index.js.map +1 -1
package/dist/worker-script-project-context.js +5 -1
package/dist/worker-script-project-context.js.map +1 -1
package/package.json +1 -1

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

@@ -95,16 +95,16 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     }>>;
                 }, "strip", z.ZodTypeAny, {
                     type: "tool_use";
-                    name: string;
                     id: string;
+                    name: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 }, {
                     type: "tool_use";
-                    name: string;
                     id: string;
+                    name: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -142,12 +142,12 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         data: z.ZodString;
                     }, "strip", z.ZodTypeAny, {
                         type: "base64";
-                        data: string;
                         media_type: "image/jpeg";
+                        data: string;
                     }, {
                         type: "base64";
-                        data: string;
                         media_type: "image/jpeg";
+                        data: string;
                     }>;
                     cache_control: z.ZodOptional<z.ZodObject<{
                         type: z.ZodLiteral<"ephemeral">;
@@ -160,8 +160,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     type: "image";
                     source: {
                         type: "base64";
-                        data: string;
                         media_type: "image/jpeg";
+                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
@@ -170,14 +170,15 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     type: "image";
                     source: {
                         type: "base64";
-                        data: string;
                         media_type: "image/jpeg";
+                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 }>]>, "many">]>;
             }, "strip", z.ZodTypeAny, {
+                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -186,8 +187,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    name: string;
                     id: string;
+                    name: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -203,15 +204,15 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     type: "image";
                     source: {
                         type: "base64";
-                        data: string;
                         media_type: "image/jpeg";
+                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 })[];
-                role: "user" | "assistant";
             }, {
+                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -220,8 +221,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    name: string;
                     id: string;
+                    name: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -237,14 +238,13 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     type: "image";
                     source: {
                         type: "base64";
-                        data: string;
                         media_type: "image/jpeg";
+                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 })[];
-                role: "user" | "assistant";
             }>, "many">;
             fileContext: z.ZodObject<{
                 currentWorkingDirectory: z.ZodString;
@@ -371,9 +371,37 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
             costMode: z.ZodDefault<z.ZodOptional<z.ZodEnum<["lite", "normal", "max"]>>>;
         }, "strip", z.ZodTypeAny, {
             type: "user-input";
+            fileContext: {
+                currentWorkingDirectory: string;
+                fileTree: import("../util/file").FileTreeNode[];
+                fileTokenScores: Record<string, Record<string, number>>;
+                knowledgeFiles: Record<string, string>;
+                gitChanges: {
+                    diff: string;
+                    status: string;
+                    diffCached: string;
+                    lastCommitMessages: string;
+                };
+                changesSinceLastChat: Record<string, string>;
+                shellConfigFiles: Record<string, string>;
+                systemInfo: {
+                    platform: string;
+                    shell: string;
+                    nodeVersion: string;
+                    arch: string;
+                    homedir: string;
+                    cpus: number;
+                };
+                fileVersions: {
+                    path: string;
+                    content: string;
+                }[][];
+                userKnowledgeFiles?: Record<string, string> | undefined;
+            };
             fingerprintId: string;
             userInputId: string;
             messages: {
+                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -382,8 +410,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    name: string;
                     id: string;
+                    name: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -399,15 +427,23 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     type: "image";
                     source: {
                         type: "base64";
-                        data: string;
                         media_type: "image/jpeg";
+                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 })[];
-                role: "user" | "assistant";
             }[];
+            changesAlreadyApplied: {
+                type: "patch" | "file";
+                path: string;
+                content: string;
+            }[];
+            costMode: "lite" | "normal" | "max";
+            authToken?: string | undefined;
+        }, {
+            type: "user-input";
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -435,18 +471,10 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
-            changesAlreadyApplied: {
-                type: "patch" | "file";
-                path: string;
-                content: string;
-            }[];
-            costMode: "lite" | "normal" | "max";
-            authToken?: string | undefined;
-        }, {
-            type: "user-input";
             fingerprintId: string;
             userInputId: string;
             messages: {
+                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -455,8 +483,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    name: string;
                     id: string;
+                    name: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -472,42 +500,14 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     type: "image";
                     source: {
                         type: "base64";
-                        data: string;
                         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;
-                    diffCached: string;
-                    lastCommitMessages: string;
-                };
-                changesSinceLastChat: Record<string, string>;
-                shellConfigFiles: Record<string, string>;
-                systemInfo: {
-                    platform: string;
-                    shell: string;
-                    nodeVersion: string;
-                    arch: string;
-                    homedir: string;
-                    cpus: number;
-                };
-                fileVersions: {
-                    path: string;
-                    content: string;
-                }[][];
-                userKnowledgeFiles?: Record<string, string> | undefined;
-            };
             changesAlreadyApplied: {
                 type: "patch" | "file";
                 path: string;
@@ -671,16 +671,16 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         }>>;
                     }, "strip", z.ZodTypeAny, {
                         type: "tool_use";
-                        name: string;
                         id: string;
+                        name: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     }, {
                         type: "tool_use";
-                        name: string;
                         id: string;
+                        name: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -718,12 +718,12 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                             data: z.ZodString;
                         }, "strip", z.ZodTypeAny, {
                             type: "base64";
-                            data: string;
                             media_type: "image/jpeg";
+                            data: string;
                         }, {
                             type: "base64";
-                            data: string;
                             media_type: "image/jpeg";
+                            data: string;
                         }>;
                         cache_control: z.ZodOptional<z.ZodObject<{
                             type: z.ZodLiteral<"ephemeral">;
@@ -736,8 +736,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         type: "image";
                         source: {
                             type: "base64";
-                            data: string;
                             media_type: "image/jpeg";
+                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
@@ -746,14 +746,15 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         type: "image";
                         source: {
                             type: "base64";
-                            data: string;
                             media_type: "image/jpeg";
+                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     }>]>, "many">]>;
                 }, "strip", z.ZodTypeAny, {
+                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -762,8 +763,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        name: string;
                         id: string;
+                        name: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -779,15 +780,15 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         type: "image";
                         source: {
                             type: "base64";
-                            data: string;
                             media_type: "image/jpeg";
+                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
-                    role: "user" | "assistant";
                 }, {
+                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -796,8 +797,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        name: string;
                         id: string;
+                        name: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -813,16 +814,16 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         type: "image";
                         source: {
                             type: "base64";
-                            data: string;
                             media_type: "image/jpeg";
+                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
-                    role: "user" | "assistant";
                 }>, "many">;
             }, "strip", z.ZodTypeAny, {
+                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
@@ -850,8 +851,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
-                agentContext: string;
                 messageHistory: {
+                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -860,8 +861,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        name: string;
                         id: string;
+                        name: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -877,16 +878,16 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         type: "image";
                         source: {
                             type: "base64";
-                            data: string;
                             media_type: "image/jpeg";
+                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
-                    role: "user" | "assistant";
                 }[];
             }, {
+                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
@@ -914,8 +915,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
-                agentContext: string;
                 messageHistory: {
+                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -924,8 +925,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        name: string;
                         id: string;
+                        name: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -941,14 +942,13 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         type: "image";
                         source: {
                             type: "base64";
-                            data: string;
                             media_type: "image/jpeg";
+                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
-                    role: "user" | "assistant";
                 }[];
             }>;
             toolResults: z.ZodArray<z.ZodObject<{
@@ -956,12 +956,12 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 result: z.ZodString;
                 id: z.ZodString;
             }, "strip", z.ZodTypeAny, {
-                name: string;
                 id: string;
+                name: string;
                 result: string;
             }, {
-                name: string;
                 id: string;
+                name: string;
                 result: string;
             }>, "many">;
         }, "strip", z.ZodTypeAny, {
@@ -970,6 +970,7 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
             costMode: "lite" | "normal" | "max";
             promptId: string;
             agentState: {
+                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
@@ -997,8 +998,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
-                agentContext: string;
                 messageHistory: {
+                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -1007,8 +1008,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        name: string;
                         id: string;
+                        name: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -1024,19 +1025,18 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         type: "image";
                         source: {
                             type: "base64";
-                            data: string;
                             media_type: "image/jpeg";
+                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
-                    role: "user" | "assistant";
                 }[];
             };
             toolResults: {
-                name: string;
                 id: string;
+                name: string;
                 result: string;
             }[];
             authToken?: string | undefined;
@@ -1046,6 +1046,7 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
             fingerprintId: string;
             promptId: string;
             agentState: {
+                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
@@ -1073,8 +1074,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
-                agentContext: string;
                 messageHistory: {
+                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -1083,8 +1084,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        name: string;
                         id: string;
+                        name: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -1100,19 +1101,18 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         type: "image";
                         source: {
                             type: "base64";
-                            data: string;
                             media_type: "image/jpeg";
+                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
-                    role: "user" | "assistant";
                 }[];
             };
             toolResults: {
-                name: string;
                 id: string;
+                name: string;
                 result: string;
             }[];
             authToken?: string | undefined;
@@ -1245,7 +1245,6 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
             }>;
         }, "strip", z.ZodTypeAny, {
             type: "init";
-            fingerprintId: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -1273,10 +1272,10 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
+            fingerprintId: string;
             authToken?: string | undefined;
         }, {
             type: "init";
-            fingerprintId: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -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">;
@@ -1337,9 +1337,37 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
         type: "action";
         data: {
             type: "user-input";
+            fileContext: {
+                currentWorkingDirectory: string;
+                fileTree: import("../util/file").FileTreeNode[];
+                fileTokenScores: Record<string, Record<string, number>>;
+                knowledgeFiles: Record<string, string>;
+                gitChanges: {
+                    diff: string;
+                    status: string;
+                    diffCached: string;
+                    lastCommitMessages: string;
+                };
+                changesSinceLastChat: Record<string, string>;
+                shellConfigFiles: Record<string, string>;
+                systemInfo: {
+                    platform: string;
+                    shell: string;
+                    nodeVersion: string;
+                    arch: string;
+                    homedir: string;
+                    cpus: number;
+                };
+                fileVersions: {
+                    path: string;
+                    content: string;
+                }[][];
+                userKnowledgeFiles?: Record<string, string> | undefined;
+            };
             fingerprintId: string;
             userInputId: string;
             messages: {
+                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -1348,8 +1376,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    name: string;
                     id: string;
+                    name: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -1365,42 +1393,14 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     type: "image";
                     source: {
                         type: "base64";
-                        data: string;
                         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;
-                    diffCached: string;
-                    lastCommitMessages: string;
-                };
-                changesSinceLastChat: Record<string, string>;
-                shellConfigFiles: Record<string, string>;
-                systemInfo: {
-                    platform: string;
-                    shell: string;
-                    nodeVersion: string;
-                    arch: string;
-                    homedir: string;
-                    cpus: number;
-                };
-                fileVersions: {
-                    path: string;
-                    content: string;
-                }[][];
-                userKnowledgeFiles?: Record<string, string> | undefined;
-            };
             changesAlreadyApplied: {
                 type: "patch" | "file";
                 path: string;
@@ -1414,6 +1414,7 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
             costMode: "lite" | "normal" | "max";
             promptId: string;
             agentState: {
+                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
@@ -1441,8 +1442,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
-                agentContext: string;
                 messageHistory: {
+                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -1451,8 +1452,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        name: string;
                         id: string;
+                        name: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -1468,19 +1469,18 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         type: "image";
                         source: {
                             type: "base64";
-                            data: string;
                             media_type: "image/jpeg";
+                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
-                    role: "user" | "assistant";
                 }[];
             };
             toolResults: {
-                name: string;
                 id: string;
+                name: string;
                 result: string;
             }[];
             authToken?: string | undefined;
@@ -1491,7 +1491,6 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
             requestId?: string | undefined;
         } | {
             type: "init";
-            fingerprintId: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -1519,6 +1518,7 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
+            fingerprintId: string;
             authToken?: string | undefined;
         } | {
             type: "usage";
@@ -1535,43 +1535,6 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
         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";
-                        data: string;
-                        media_type: "image/jpeg";
-                    };
-                    cache_control?: {
-                        type: "ephemeral";
-                    } | undefined;
-                })[];
-                role: "user" | "assistant";
-            }[];
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -1599,6 +1562,43 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
+            fingerprintId: string;
+            userInputId: string;
+            messages: {
+                role: "user" | "assistant";
+                content: string | ({
+                    type: "text";
+                    text: string;
+                    cache_control?: {
+                        type: "ephemeral";
+                    } | undefined;
+                } | {
+                    type: "tool_use";
+                    id: string;
+                    name: 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;
+                })[];
+            }[];
             changesAlreadyApplied: {
                 type: "patch" | "file";
                 path: string;
@@ -1611,6 +1611,7 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
             fingerprintId: string;
             promptId: string;
             agentState: {
+                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
@@ -1638,8 +1639,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
-                agentContext: string;
                 messageHistory: {
+                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -1648,8 +1649,8 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        name: string;
                         id: string;
+                        name: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -1665,19 +1666,18 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                         type: "image";
                         source: {
                             type: "base64";
-                            data: string;
                             media_type: "image/jpeg";
+                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
-                    role: "user" | "assistant";
                 }[];
             };
             toolResults: {
-                name: string;
                 id: string;
+                name: string;
                 result: string;
             }[];
             authToken?: string | undefined;
@@ -1689,7 +1689,6 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
             requestId?: string | undefined;
         } | {
             type: "init";
-            fingerprintId: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -1717,6 +1716,7 @@ export declare const CLIENT_MESSAGE_SCHEMAS: {
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
+            fingerprintId: string;
             authToken?: string | undefined;
         } | {
             type: "usage";
@@ -1822,16 +1822,16 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }>>;
             }, "strip", z.ZodTypeAny, {
                 type: "tool_use";
-                name: string;
                 id: string;
+                name: string;
                 input: Record<string, any>;
                 cache_control?: {
                     type: "ephemeral";
                 } | undefined;
             }, {
                 type: "tool_use";
-                name: string;
                 id: string;
+                name: string;
                 input: Record<string, any>;
                 cache_control?: {
                     type: "ephemeral";
@@ -1869,12 +1869,12 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     data: z.ZodString;
                 }, "strip", z.ZodTypeAny, {
                     type: "base64";
-                    data: string;
                     media_type: "image/jpeg";
+                    data: string;
                 }, {
                     type: "base64";
-                    data: string;
                     media_type: "image/jpeg";
+                    data: string;
                 }>;
                 cache_control: z.ZodOptional<z.ZodObject<{
                     type: z.ZodLiteral<"ephemeral">;
@@ -1887,8 +1887,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 type: "image";
                 source: {
                     type: "base64";
-                    data: string;
                     media_type: "image/jpeg";
+                    data: string;
                 };
                 cache_control?: {
                     type: "ephemeral";
@@ -1897,14 +1897,15 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 type: "image";
                 source: {
                     type: "base64";
-                    data: string;
                     media_type: "image/jpeg";
+                    data: string;
                 };
                 cache_control?: {
                     type: "ephemeral";
                 } | undefined;
             }>]>, "many">]>;
         }, "strip", z.ZodTypeAny, {
+            role: "user" | "assistant";
             content: string | ({
                 type: "text";
                 text: string;
@@ -1913,8 +1914,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 } | undefined;
             } | {
                 type: "tool_use";
-                name: string;
                 id: string;
+                name: string;
                 input: Record<string, any>;
                 cache_control?: {
                     type: "ephemeral";
@@ -1930,15 +1931,15 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 type: "image";
                 source: {
                     type: "base64";
-                    data: string;
                     media_type: "image/jpeg";
+                    data: string;
                 };
                 cache_control?: {
                     type: "ephemeral";
                 } | undefined;
             })[];
-            role: "user" | "assistant";
         }, {
+            role: "user" | "assistant";
             content: string | ({
                 type: "text";
                 text: string;
@@ -1947,8 +1948,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 } | undefined;
             } | {
                 type: "tool_use";
-                name: string;
                 id: string;
+                name: string;
                 input: Record<string, any>;
                 cache_control?: {
                     type: "ephemeral";
@@ -1964,14 +1965,13 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 type: "image";
                 source: {
                     type: "base64";
-                    data: string;
                     media_type: "image/jpeg";
+                    data: string;
                 };
                 cache_control?: {
                     type: "ephemeral";
                 } | undefined;
             })[];
-            role: "user" | "assistant";
         }>, "many">;
         fileContext: z.ZodObject<{
             currentWorkingDirectory: z.ZodString;
@@ -2098,9 +2098,37 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         costMode: z.ZodDefault<z.ZodOptional<z.ZodEnum<["lite", "normal", "max"]>>>;
     }, "strip", z.ZodTypeAny, {
         type: "user-input";
+        fileContext: {
+            currentWorkingDirectory: string;
+            fileTree: import("../util/file").FileTreeNode[];
+            fileTokenScores: Record<string, Record<string, number>>;
+            knowledgeFiles: Record<string, string>;
+            gitChanges: {
+                diff: string;
+                status: string;
+                diffCached: string;
+                lastCommitMessages: string;
+            };
+            changesSinceLastChat: Record<string, string>;
+            shellConfigFiles: Record<string, string>;
+            systemInfo: {
+                platform: string;
+                shell: string;
+                nodeVersion: string;
+                arch: string;
+                homedir: string;
+                cpus: number;
+            };
+            fileVersions: {
+                path: string;
+                content: string;
+            }[][];
+            userKnowledgeFiles?: Record<string, string> | undefined;
+        };
         fingerprintId: string;
         userInputId: string;
         messages: {
+            role: "user" | "assistant";
             content: string | ({
                 type: "text";
                 text: string;
@@ -2109,8 +2137,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 } | undefined;
             } | {
                 type: "tool_use";
-                name: string;
                 id: string;
+                name: string;
                 input: Record<string, any>;
                 cache_control?: {
                     type: "ephemeral";
@@ -2126,15 +2154,23 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 type: "image";
                 source: {
                     type: "base64";
-                    data: string;
                     media_type: "image/jpeg";
+                    data: string;
                 };
                 cache_control?: {
                     type: "ephemeral";
                 } | undefined;
             })[];
-            role: "user" | "assistant";
         }[];
+        changesAlreadyApplied: {
+            type: "patch" | "file";
+            path: string;
+            content: string;
+        }[];
+        costMode: "lite" | "normal" | "max";
+        authToken?: string | undefined;
+    }, {
+        type: "user-input";
         fileContext: {
             currentWorkingDirectory: string;
             fileTree: import("../util/file").FileTreeNode[];
@@ -2162,18 +2198,10 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             }[][];
             userKnowledgeFiles?: Record<string, string> | undefined;
         };
-        changesAlreadyApplied: {
-            type: "patch" | "file";
-            path: string;
-            content: string;
-        }[];
-        costMode: "lite" | "normal" | "max";
-        authToken?: string | undefined;
-    }, {
-        type: "user-input";
         fingerprintId: string;
         userInputId: string;
         messages: {
+            role: "user" | "assistant";
             content: string | ({
                 type: "text";
                 text: string;
@@ -2182,8 +2210,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 } | undefined;
             } | {
                 type: "tool_use";
-                name: string;
                 id: string;
+                name: string;
                 input: Record<string, any>;
                 cache_control?: {
                     type: "ephemeral";
@@ -2199,42 +2227,14 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 type: "image";
                 source: {
                     type: "base64";
-                    data: string;
                     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;
-                diffCached: string;
-                lastCommitMessages: string;
-            };
-            changesSinceLastChat: Record<string, string>;
-            shellConfigFiles: Record<string, string>;
-            systemInfo: {
-                platform: string;
-                shell: string;
-                nodeVersion: string;
-                arch: string;
-                homedir: string;
-                cpus: number;
-            };
-            fileVersions: {
-                path: string;
-                content: string;
-            }[][];
-            userKnowledgeFiles?: Record<string, string> | undefined;
-        };
         changesAlreadyApplied: {
             type: "patch" | "file";
             path: string;
@@ -2398,16 +2398,16 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     }>>;
                 }, "strip", z.ZodTypeAny, {
                     type: "tool_use";
-                    name: string;
                     id: string;
+                    name: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 }, {
                     type: "tool_use";
-                    name: string;
                     id: string;
+                    name: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -2445,12 +2445,12 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         data: z.ZodString;
                     }, "strip", z.ZodTypeAny, {
                         type: "base64";
-                        data: string;
                         media_type: "image/jpeg";
+                        data: string;
                     }, {
                         type: "base64";
-                        data: string;
                         media_type: "image/jpeg";
+                        data: string;
                     }>;
                     cache_control: z.ZodOptional<z.ZodObject<{
                         type: z.ZodLiteral<"ephemeral">;
@@ -2463,8 +2463,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "image";
                     source: {
                         type: "base64";
-                        data: string;
                         media_type: "image/jpeg";
+                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
@@ -2473,14 +2473,15 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "image";
                     source: {
                         type: "base64";
-                        data: string;
                         media_type: "image/jpeg";
+                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 }>]>, "many">]>;
             }, "strip", z.ZodTypeAny, {
+                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -2489,8 +2490,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    name: string;
                     id: string;
+                    name: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -2506,15 +2507,15 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "image";
                     source: {
                         type: "base64";
-                        data: string;
                         media_type: "image/jpeg";
+                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 })[];
-                role: "user" | "assistant";
             }, {
+                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -2523,8 +2524,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    name: string;
                     id: string;
+                    name: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -2540,16 +2541,16 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "image";
                     source: {
                         type: "base64";
-                        data: string;
                         media_type: "image/jpeg";
+                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 })[];
-                role: "user" | "assistant";
             }>, "many">;
         }, "strip", z.ZodTypeAny, {
+            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -2577,8 +2578,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
-            agentContext: string;
             messageHistory: {
+                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -2587,8 +2588,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    name: string;
                     id: string;
+                    name: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -2604,16 +2605,16 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "image";
                     source: {
                         type: "base64";
-                        data: string;
                         media_type: "image/jpeg";
+                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 })[];
-                role: "user" | "assistant";
             }[];
         }, {
+            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -2641,8 +2642,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
-            agentContext: string;
             messageHistory: {
+                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -2651,8 +2652,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    name: string;
                     id: string;
+                    name: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -2668,14 +2669,13 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "image";
                     source: {
                         type: "base64";
-                        data: string;
                         media_type: "image/jpeg";
+                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 })[];
-                role: "user" | "assistant";
             }[];
         }>;
         toolResults: z.ZodArray<z.ZodObject<{
@@ -2683,12 +2683,12 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             result: z.ZodString;
             id: z.ZodString;
         }, "strip", z.ZodTypeAny, {
-            name: string;
             id: string;
+            name: string;
             result: string;
         }, {
-            name: string;
             id: string;
+            name: string;
             result: string;
         }>, "many">;
     }, "strip", z.ZodTypeAny, {
@@ -2697,6 +2697,7 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         costMode: "lite" | "normal" | "max";
         promptId: string;
         agentState: {
+            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -2724,8 +2725,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
-            agentContext: string;
             messageHistory: {
+                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -2734,8 +2735,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    name: string;
                     id: string;
+                    name: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -2751,19 +2752,18 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "image";
                     source: {
                         type: "base64";
-                        data: string;
                         media_type: "image/jpeg";
+                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 })[];
-                role: "user" | "assistant";
             }[];
         };
         toolResults: {
-            name: string;
             id: string;
+            name: string;
             result: string;
         }[];
         authToken?: string | undefined;
@@ -2773,6 +2773,7 @@ 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[];
@@ -2800,8 +2801,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
-            agentContext: string;
             messageHistory: {
+                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -2810,8 +2811,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    name: string;
                     id: string;
+                    name: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -2827,19 +2828,18 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "image";
                     source: {
                         type: "base64";
-                        data: string;
                         media_type: "image/jpeg";
+                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 })[];
-                role: "user" | "assistant";
             }[];
         };
         toolResults: {
-            name: string;
             id: string;
+            name: string;
             result: string;
         }[];
         authToken?: string | undefined;
@@ -2972,7 +2972,6 @@ 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[];
@@ -3000,10 +2999,10 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             }[][];
             userKnowledgeFiles?: Record<string, string> | undefined;
         };
+        fingerprintId: string;
         authToken?: string | undefined;
     }, {
         type: "init";
-        fingerprintId: string;
         fileContext: {
             currentWorkingDirectory: string;
             fileTree: import("../util/file").FileTreeNode[];
@@ -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">;
@@ -3064,9 +3064,37 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
     type: "action";
     data: {
         type: "user-input";
+        fileContext: {
+            currentWorkingDirectory: string;
+            fileTree: import("../util/file").FileTreeNode[];
+            fileTokenScores: Record<string, Record<string, number>>;
+            knowledgeFiles: Record<string, string>;
+            gitChanges: {
+                diff: string;
+                status: string;
+                diffCached: string;
+                lastCommitMessages: string;
+            };
+            changesSinceLastChat: Record<string, string>;
+            shellConfigFiles: Record<string, string>;
+            systemInfo: {
+                platform: string;
+                shell: string;
+                nodeVersion: string;
+                arch: string;
+                homedir: string;
+                cpus: number;
+            };
+            fileVersions: {
+                path: string;
+                content: string;
+            }[][];
+            userKnowledgeFiles?: Record<string, string> | undefined;
+        };
         fingerprintId: string;
         userInputId: string;
         messages: {
+            role: "user" | "assistant";
             content: string | ({
                 type: "text";
                 text: string;
@@ -3075,8 +3103,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 } | undefined;
             } | {
                 type: "tool_use";
-                name: string;
                 id: string;
+                name: string;
                 input: Record<string, any>;
                 cache_control?: {
                     type: "ephemeral";
@@ -3092,42 +3120,14 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 type: "image";
                 source: {
                     type: "base64";
-                    data: string;
                     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;
-                diffCached: string;
-                lastCommitMessages: string;
-            };
-            changesSinceLastChat: Record<string, string>;
-            shellConfigFiles: Record<string, string>;
-            systemInfo: {
-                platform: string;
-                shell: string;
-                nodeVersion: string;
-                arch: string;
-                homedir: string;
-                cpus: number;
-            };
-            fileVersions: {
-                path: string;
-                content: string;
-            }[][];
-            userKnowledgeFiles?: Record<string, string> | undefined;
-        };
         changesAlreadyApplied: {
             type: "patch" | "file";
             path: string;
@@ -3141,6 +3141,7 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         costMode: "lite" | "normal" | "max";
         promptId: string;
         agentState: {
+            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -3168,8 +3169,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
-            agentContext: string;
             messageHistory: {
+                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -3178,8 +3179,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    name: string;
                     id: string;
+                    name: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -3195,19 +3196,18 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "image";
                     source: {
                         type: "base64";
-                        data: string;
                         media_type: "image/jpeg";
+                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 })[];
-                role: "user" | "assistant";
             }[];
         };
         toolResults: {
-            name: string;
             id: string;
+            name: string;
             result: string;
         }[];
         authToken?: string | undefined;
@@ -3218,7 +3218,6 @@ 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[];
@@ -3246,6 +3245,7 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             }[][];
             userKnowledgeFiles?: Record<string, string> | undefined;
         };
+        fingerprintId: string;
         authToken?: string | undefined;
     } | {
         type: "usage";
@@ -3262,9 +3262,37 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
     type: "action";
     data: {
         type: "user-input";
+        fileContext: {
+            currentWorkingDirectory: string;
+            fileTree: import("../util/file").FileTreeNode[];
+            fileTokenScores: Record<string, Record<string, number>>;
+            knowledgeFiles: Record<string, string>;
+            gitChanges: {
+                diff: string;
+                status: string;
+                diffCached: string;
+                lastCommitMessages: string;
+            };
+            changesSinceLastChat: Record<string, string>;
+            shellConfigFiles: Record<string, string>;
+            systemInfo: {
+                platform: string;
+                shell: string;
+                nodeVersion: string;
+                arch: string;
+                homedir: string;
+                cpus: number;
+            };
+            fileVersions: {
+                path: string;
+                content: string;
+            }[][];
+            userKnowledgeFiles?: Record<string, string> | undefined;
+        };
         fingerprintId: string;
         userInputId: string;
         messages: {
+            role: "user" | "assistant";
             content: string | ({
                 type: "text";
                 text: string;
@@ -3273,8 +3301,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 } | undefined;
             } | {
                 type: "tool_use";
-                name: string;
                 id: string;
+                name: string;
                 input: Record<string, any>;
                 cache_control?: {
                     type: "ephemeral";
@@ -3290,42 +3318,14 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 type: "image";
                 source: {
                     type: "base64";
-                    data: string;
                     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;
-                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;
-        };
+                    type: "ephemeral";
+                } | undefined;
+            })[];
+        }[];
         changesAlreadyApplied: {
             type: "patch" | "file";
             path: string;
@@ -3338,6 +3338,7 @@ 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[];
@@ -3365,8 +3366,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
-            agentContext: string;
             messageHistory: {
+                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -3375,8 +3376,8 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    name: string;
                     id: string;
+                    name: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -3392,19 +3393,18 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "image";
                     source: {
                         type: "base64";
-                        data: string;
                         media_type: "image/jpeg";
+                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 })[];
-                role: "user" | "assistant";
             }[];
         };
         toolResults: {
-            name: string;
             id: string;
+            name: string;
             result: string;
         }[];
         authToken?: string | undefined;
@@ -3416,7 +3416,6 @@ 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[];
@@ -3444,6 +3443,7 @@ export declare const CLIENT_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             }[][];
             userKnowledgeFiles?: Record<string, string> | undefined;
         };
+        fingerprintId: string;
         authToken?: string | undefined;
     } | {
         type: "usage";
@@ -3468,13 +3468,13 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
     }, "strip", z.ZodTypeAny, {
         type: "ack";
         success: boolean;
-        error?: string | undefined;
         txid?: number | undefined;
+        error?: string | undefined;
     }, {
         type: "ack";
         success: boolean;
-        error?: string | undefined;
         txid?: number | undefined;
+        error?: string | undefined;
     }>;
     action: z.ZodObject<{
         type: z.ZodLiteral<"action">;
@@ -3740,16 +3740,16 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         }>>;
                     }, "strip", z.ZodTypeAny, {
                         type: "tool_use";
-                        name: string;
                         id: string;
+                        name: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     }, {
                         type: "tool_use";
-                        name: string;
                         id: string;
+                        name: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -3787,12 +3787,12 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                             data: z.ZodString;
                         }, "strip", z.ZodTypeAny, {
                             type: "base64";
-                            data: string;
                             media_type: "image/jpeg";
+                            data: string;
                         }, {
                             type: "base64";
-                            data: string;
                             media_type: "image/jpeg";
+                            data: string;
                         }>;
                         cache_control: z.ZodOptional<z.ZodObject<{
                             type: z.ZodLiteral<"ephemeral">;
@@ -3805,8 +3805,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         type: "image";
                         source: {
                             type: "base64";
-                            data: string;
                             media_type: "image/jpeg";
+                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
@@ -3815,14 +3815,15 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         type: "image";
                         source: {
                             type: "base64";
-                            data: string;
                             media_type: "image/jpeg";
+                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     }>]>, "many">]>;
                 }, "strip", z.ZodTypeAny, {
+                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -3831,8 +3832,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        name: string;
                         id: string;
+                        name: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -3848,15 +3849,15 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         type: "image";
                         source: {
                             type: "base64";
-                            data: string;
                             media_type: "image/jpeg";
+                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
-                    role: "user" | "assistant";
                 }, {
+                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -3865,8 +3866,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        name: string;
                         id: string;
+                        name: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -3882,16 +3883,16 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         type: "image";
                         source: {
                             type: "base64";
-                            data: string;
                             media_type: "image/jpeg";
+                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
-                    role: "user" | "assistant";
                 }>, "many">;
             }, "strip", z.ZodTypeAny, {
+                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
@@ -3919,8 +3920,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
-                agentContext: string;
                 messageHistory: {
+                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -3929,8 +3930,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        name: string;
                         id: string;
+                        name: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -3946,16 +3947,16 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         type: "image";
                         source: {
                             type: "base64";
-                            data: string;
                             media_type: "image/jpeg";
+                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
-                    role: "user" | "assistant";
                 }[];
             }, {
+                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
@@ -3983,8 +3984,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
-                agentContext: string;
                 messageHistory: {
+                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -3993,8 +3994,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        name: string;
                         id: string;
+                        name: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -4010,14 +4011,13 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         type: "image";
                         source: {
                             type: "base64";
-                            data: string;
                             media_type: "image/jpeg";
+                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
-                    role: "user" | "assistant";
                 }[];
             }>;
             toolCalls: z.ZodArray<z.ZodObject<{
@@ -4025,12 +4025,12 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                 parameters: z.ZodRecord<z.ZodString, z.ZodString>;
                 id: z.ZodString;
             }, "strip", z.ZodTypeAny, {
-                name: string;
                 id: string;
+                name: string;
                 parameters: Record<string, string>;
             }, {
-                name: string;
                 id: string;
+                name: string;
                 parameters: Record<string, string>;
             }>, "many">;
             toolResults: z.ZodArray<z.ZodObject<{
@@ -4038,12 +4038,12 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                 result: z.ZodString;
                 id: z.ZodString;
             }, "strip", z.ZodTypeAny, {
-                name: string;
                 id: string;
+                name: string;
                 result: string;
             }, {
-                name: string;
                 id: string;
+                name: string;
                 result: string;
             }>, "many">;
         }, {
@@ -4057,6 +4057,7 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             type: "prompt-response";
             promptId: string;
             agentState: {
+                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
@@ -4084,8 +4085,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
-                agentContext: string;
                 messageHistory: {
+                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -4094,8 +4095,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        name: string;
                         id: string;
+                        name: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -4111,24 +4112,23 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         type: "image";
                         source: {
                             type: "base64";
-                            data: string;
                             media_type: "image/jpeg";
+                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
-                    role: "user" | "assistant";
                 }[];
             };
             toolResults: {
-                name: string;
                 id: string;
+                name: string;
                 result: string;
             }[];
             toolCalls: {
-                name: string;
                 id: string;
+                name: string;
                 parameters: Record<string, string>;
             }[];
             usage?: number | undefined;
@@ -4141,6 +4141,7 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             type: "prompt-response";
             promptId: string;
             agentState: {
+                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
@@ -4168,8 +4169,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
-                agentContext: string;
                 messageHistory: {
+                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -4178,8 +4179,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        name: string;
                         id: string;
+                        name: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -4195,24 +4196,23 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         type: "image";
                         source: {
                             type: "base64";
-                            data: string;
                             media_type: "image/jpeg";
+                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
-                    role: "user" | "assistant";
                 }[];
             };
             toolResults: {
-                name: string;
                 id: string;
+                name: string;
                 result: string;
             }[];
             toolCalls: {
-                name: string;
                 id: string;
+                name: string;
                 parameters: Record<string, string>;
             }[];
             usage?: number | undefined;
@@ -4242,12 +4242,12 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                 id: z.ZodString;
                 input: z.ZodRecord<z.ZodString, z.ZodAny>;
             }, "strip", z.ZodTypeAny, {
-                name: string;
                 id: string;
+                name: string;
                 input: Record<string, any>;
             }, {
-                name: string;
                 id: string;
+                name: string;
                 input: Record<string, any>;
             }>;
             changes: z.ZodArray<z.ZodObject<{
@@ -4290,8 +4290,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
         }, "strip", z.ZodTypeAny, {
             type: "tool-call";
             data: {
-                name: string;
                 id: string;
+                name: string;
                 input: Record<string, any>;
             };
             userInputId: string;
@@ -4314,8 +4314,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
         }, {
             type: "tool-call";
             data: {
-                name: string;
                 id: string;
+                name: string;
                 input: Record<string, any>;
             };
             userInputId: string;
@@ -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;
@@ -4475,6 +4475,7 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             type: "prompt-response";
             promptId: string;
             agentState: {
+                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
@@ -4502,8 +4503,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
-                agentContext: string;
                 messageHistory: {
+                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -4512,8 +4513,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        name: string;
                         id: string;
+                        name: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -4529,24 +4530,23 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         type: "image";
                         source: {
                             type: "base64";
-                            data: string;
                             media_type: "image/jpeg";
+                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
-                    role: "user" | "assistant";
                 }[];
             };
             toolResults: {
-                name: string;
                 id: string;
+                name: string;
                 result: string;
             }[];
             toolCalls: {
-                name: string;
                 id: string;
+                name: string;
                 parameters: Record<string, string>;
             }[];
             usage?: number | undefined;
@@ -4566,8 +4566,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
         } | {
             type: "tool-call";
             data: {
-                name: string;
                 id: string;
+                name: string;
                 input: Record<string, any>;
             };
             userInputId: string;
@@ -4589,8 +4589,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             resetFileVersions: boolean;
         } | {
             type: "terminal-command-result";
-            userInputId: string;
             result: string;
+            userInputId: string;
         } | {
             type: "npm-version-status";
             isUpToDate: boolean;
@@ -4649,6 +4649,7 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             type: "prompt-response";
             promptId: string;
             agentState: {
+                agentContext: string;
                 fileContext: {
                     currentWorkingDirectory: string;
                     fileTree: import("../util/file").FileTreeNode[];
@@ -4676,8 +4677,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                     }[][];
                     userKnowledgeFiles?: Record<string, string> | undefined;
                 };
-                agentContext: string;
                 messageHistory: {
+                    role: "user" | "assistant";
                     content: string | ({
                         type: "text";
                         text: string;
@@ -4686,8 +4687,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         } | undefined;
                     } | {
                         type: "tool_use";
-                        name: string;
                         id: string;
+                        name: string;
                         input: Record<string, any>;
                         cache_control?: {
                             type: "ephemeral";
@@ -4703,24 +4704,23 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
                         type: "image";
                         source: {
                             type: "base64";
-                            data: string;
                             media_type: "image/jpeg";
+                            data: string;
                         };
                         cache_control?: {
                             type: "ephemeral";
                         } | undefined;
                     })[];
-                    role: "user" | "assistant";
                 }[];
             };
             toolResults: {
-                name: string;
                 id: string;
+                name: string;
                 result: string;
             }[];
             toolCalls: {
-                name: string;
                 id: string;
+                name: string;
                 parameters: Record<string, string>;
             }[];
             usage?: number | undefined;
@@ -4740,8 +4740,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
         } | {
             type: "tool-call";
             data: {
-                name: string;
                 id: string;
+                name: string;
                 input: Record<string, any>;
             };
             userInputId: string;
@@ -4763,8 +4763,8 @@ export declare const SERVER_MESSAGE_SCHEMAS: {
             resetFileVersions: boolean;
         } | {
             type: "terminal-command-result";
-            userInputId: string;
             result: string;
+            userInputId: string;
         } | {
             type: "npm-version-status";
             isUpToDate: boolean;
@@ -4786,13 +4786,13 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     type: "ack";
     success: boolean;
-    error?: string | undefined;
     txid?: number | undefined;
+    error?: string | undefined;
 }, {
     type: "ack";
     success: boolean;
-    error?: string | undefined;
     txid?: number | undefined;
+    error?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"action">;
     data: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
@@ -5057,16 +5057,16 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     }>>;
                 }, "strip", z.ZodTypeAny, {
                     type: "tool_use";
-                    name: string;
                     id: string;
+                    name: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 }, {
                     type: "tool_use";
-                    name: string;
                     id: string;
+                    name: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -5104,12 +5104,12 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                         data: z.ZodString;
                     }, "strip", z.ZodTypeAny, {
                         type: "base64";
-                        data: string;
                         media_type: "image/jpeg";
+                        data: string;
                     }, {
                         type: "base64";
-                        data: string;
                         media_type: "image/jpeg";
+                        data: string;
                     }>;
                     cache_control: z.ZodOptional<z.ZodObject<{
                         type: z.ZodLiteral<"ephemeral">;
@@ -5122,8 +5122,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "image";
                     source: {
                         type: "base64";
-                        data: string;
                         media_type: "image/jpeg";
+                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
@@ -5132,14 +5132,15 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "image";
                     source: {
                         type: "base64";
-                        data: string;
                         media_type: "image/jpeg";
+                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 }>]>, "many">]>;
             }, "strip", z.ZodTypeAny, {
+                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -5148,8 +5149,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    name: string;
                     id: string;
+                    name: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -5165,15 +5166,15 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "image";
                     source: {
                         type: "base64";
-                        data: string;
                         media_type: "image/jpeg";
+                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 })[];
-                role: "user" | "assistant";
             }, {
+                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -5182,8 +5183,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    name: string;
                     id: string;
+                    name: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -5199,16 +5200,16 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "image";
                     source: {
                         type: "base64";
-                        data: string;
                         media_type: "image/jpeg";
+                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 })[];
-                role: "user" | "assistant";
             }>, "many">;
         }, "strip", z.ZodTypeAny, {
+            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -5236,8 +5237,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
-            agentContext: string;
             messageHistory: {
+                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -5246,8 +5247,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    name: string;
                     id: string;
+                    name: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -5263,16 +5264,16 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "image";
                     source: {
                         type: "base64";
-                        data: string;
                         media_type: "image/jpeg";
+                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 })[];
-                role: "user" | "assistant";
             }[];
         }, {
+            agentContext: string;
             fileContext: {
                 currentWorkingDirectory: string;
                 fileTree: import("../util/file").FileTreeNode[];
@@ -5300,8 +5301,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
-            agentContext: string;
             messageHistory: {
+                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -5310,8 +5311,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    name: string;
                     id: string;
+                    name: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -5327,14 +5328,13 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "image";
                     source: {
                         type: "base64";
-                        data: string;
                         media_type: "image/jpeg";
+                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 })[];
-                role: "user" | "assistant";
             }[];
         }>;
         toolCalls: z.ZodArray<z.ZodObject<{
@@ -5342,12 +5342,12 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             parameters: z.ZodRecord<z.ZodString, z.ZodString>;
             id: z.ZodString;
         }, "strip", z.ZodTypeAny, {
-            name: string;
             id: string;
+            name: string;
             parameters: Record<string, string>;
         }, {
-            name: string;
             id: string;
+            name: string;
             parameters: Record<string, string>;
         }>, "many">;
         toolResults: z.ZodArray<z.ZodObject<{
@@ -5355,12 +5355,12 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             result: z.ZodString;
             id: z.ZodString;
         }, "strip", z.ZodTypeAny, {
-            name: string;
             id: string;
+            name: string;
             result: string;
         }, {
-            name: string;
             id: string;
+            name: string;
             result: string;
         }>, "many">;
     }, {
@@ -5374,6 +5374,7 @@ 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[];
@@ -5401,8 +5402,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
-            agentContext: string;
             messageHistory: {
+                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -5411,8 +5412,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    name: string;
                     id: string;
+                    name: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -5428,24 +5429,23 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "image";
                     source: {
                         type: "base64";
-                        data: string;
                         media_type: "image/jpeg";
+                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 })[];
-                role: "user" | "assistant";
             }[];
         };
         toolResults: {
-            name: string;
             id: string;
+            name: string;
             result: string;
         }[];
         toolCalls: {
-            name: string;
             id: string;
+            name: string;
             parameters: Record<string, string>;
         }[];
         usage?: number | undefined;
@@ -5458,6 +5458,7 @@ 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[];
@@ -5485,8 +5486,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
-            agentContext: string;
             messageHistory: {
+                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -5495,8 +5496,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    name: string;
                     id: string;
+                    name: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -5512,24 +5513,23 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "image";
                     source: {
                         type: "base64";
-                        data: string;
                         media_type: "image/jpeg";
+                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 })[];
-                role: "user" | "assistant";
             }[];
         };
         toolResults: {
-            name: string;
             id: string;
+            name: string;
             result: string;
         }[];
         toolCalls: {
-            name: string;
             id: string;
+            name: string;
             parameters: Record<string, string>;
         }[];
         usage?: number | undefined;
@@ -5559,12 +5559,12 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
             id: z.ZodString;
             input: z.ZodRecord<z.ZodString, z.ZodAny>;
         }, "strip", z.ZodTypeAny, {
-            name: string;
             id: string;
+            name: string;
             input: Record<string, any>;
         }, {
-            name: string;
             id: string;
+            name: string;
             input: Record<string, any>;
         }>;
         changes: z.ZodArray<z.ZodObject<{
@@ -5607,8 +5607,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
     }, "strip", z.ZodTypeAny, {
         type: "tool-call";
         data: {
-            name: string;
             id: string;
+            name: string;
             input: Record<string, any>;
         };
         userInputId: string;
@@ -5631,8 +5631,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
     }, {
         type: "tool-call";
         data: {
-            name: string;
             id: string;
+            name: string;
             input: Record<string, any>;
         };
         userInputId: string;
@@ -5658,12 +5658,12 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
         result: z.ZodString;
     }, "strip", z.ZodTypeAny, {
         type: "terminal-command-result";
-        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;
@@ -5792,6 +5792,7 @@ 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[];
@@ -5819,8 +5820,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
-            agentContext: string;
             messageHistory: {
+                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -5829,8 +5830,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    name: string;
                     id: string;
+                    name: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -5846,24 +5847,23 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "image";
                     source: {
                         type: "base64";
-                        data: string;
                         media_type: "image/jpeg";
+                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 })[];
-                role: "user" | "assistant";
             }[];
         };
         toolResults: {
-            name: string;
             id: string;
+            name: string;
             result: string;
         }[];
         toolCalls: {
-            name: string;
             id: string;
+            name: string;
             parameters: Record<string, string>;
         }[];
         usage?: number | undefined;
@@ -5883,8 +5883,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
     } | {
         type: "tool-call";
         data: {
-            name: string;
             id: string;
+            name: string;
             input: Record<string, any>;
         };
         userInputId: string;
@@ -5906,8 +5906,8 @@ 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;
@@ -5966,6 +5966,7 @@ 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[];
@@ -5993,8 +5994,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                 }[][];
                 userKnowledgeFiles?: Record<string, string> | undefined;
             };
-            agentContext: string;
             messageHistory: {
+                role: "user" | "assistant";
                 content: string | ({
                     type: "text";
                     text: string;
@@ -6003,8 +6004,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     } | undefined;
                 } | {
                     type: "tool_use";
-                    name: string;
                     id: string;
+                    name: string;
                     input: Record<string, any>;
                     cache_control?: {
                         type: "ephemeral";
@@ -6020,24 +6021,23 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
                     type: "image";
                     source: {
                         type: "base64";
-                        data: string;
                         media_type: "image/jpeg";
+                        data: string;
                     };
                     cache_control?: {
                         type: "ephemeral";
                     } | undefined;
                 })[];
-                role: "user" | "assistant";
             }[];
         };
         toolResults: {
-            name: string;
             id: string;
+            name: string;
             result: string;
         }[];
         toolCalls: {
-            name: string;
             id: string;
+            name: string;
             parameters: Record<string, string>;
         }[];
         usage?: number | undefined;
@@ -6057,8 +6057,8 @@ export declare const SERVER_MESSAGE_SCHEMA: z.ZodUnion<[z.ZodObject<{
     } | {
         type: "tool-call";
         data: {
-            name: string;
             id: string;
+            name: string;
             input: Record<string, any>;
         };
         userInputId: string;
@@ -6080,8 +6080,8 @@ 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;