codebuff 1.0.176 → 1.0.177

package/dist/common/actions.d.ts

@@ -4,13 +4,13 @@ export declare const FileChangeSchema: z.ZodObject<{
     path: z.ZodString;
     content: z.ZodString;
 }, "strip", z.ZodTypeAny, {
+    type: "patch" | "file";
     path: string;
     content: string;
-    type: "file" | "patch";
 }, {
+    type: "patch" | "file";
     path: string;
     content: string;
-    type: "file" | "patch";
 }>;
 export type FileChange = z.infer<typeof FileChangeSchema>;
 export declare const CHANGES: z.ZodArray<z.ZodObject<{
@@ -18,13 +18,13 @@ export declare const CHANGES: z.ZodArray<z.ZodObject<{
     path: z.ZodString;
     content: z.ZodString;
 }, "strip", z.ZodTypeAny, {
+    type: "patch" | "file";
     path: string;
     content: string;
-    type: "file" | "patch";
 }, {
+    type: "patch" | "file";
     path: string;
     content: string;
-    type: "file" | "patch";
 }>, "many">;
 export type FileChanges = z.infer<typeof CHANGES>;
 export declare const ToolCallSchema: z.ZodObject<{
@@ -110,15 +110,15 @@ export declare const CLIENT_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
                 type: "ephemeral";
             }>>;
         }, "strip", z.ZodTypeAny, {
-            content: string;
             type: "tool_result";
+            content: string;
             tool_use_id: string;
             cache_control?: {
                 type: "ephemeral";
             } | undefined;
         }, {
-            content: string;
             type: "tool_result";
+            content: string;
             tool_use_id: string;
             cache_control?: {
                 type: "ephemeral";
@@ -182,8 +182,8 @@ export declare const CLIENT_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
                 type: "ephemeral";
             } | undefined;
         } | {
-            content: string;
             type: "tool_result";
+            content: string;
             tool_use_id: string;
             cache_control?: {
                 type: "ephemeral";
@@ -216,8 +216,8 @@ export declare const CLIENT_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
                 type: "ephemeral";
             } | undefined;
         } | {
-            content: string;
             type: "tool_result";
+            content: string;
             tool_use_id: string;
             cache_control?: {
                 type: "ephemeral";
@@ -349,44 +349,17 @@ export declare const CLIENT_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
         path: z.ZodString;
         content: z.ZodString;
     }, "strip", z.ZodTypeAny, {
+        type: "patch" | "file";
         path: string;
         content: string;
-        type: "file" | "patch";
     }, {
+        type: "patch" | "file";
         path: string;
         content: string;
-        type: "file" | "patch";
     }>, "many">;
     costMode: z.ZodDefault<z.ZodOptional<z.ZodEnum<["lite", "normal", "max"]>>>;
 }, "strip", z.ZodTypeAny, {
     type: "user-input";
-    fileContext: {
-        currentWorkingDirectory: string;
-        fileTree: import("./util/file").FileTreeNode[];
-        fileTokenScores: Record<string, Record<string, number>>;
-        knowledgeFiles: Record<string, string>;
-        gitChanges: {
-            status: string;
-            diff: string;
-            diffCached: string;
-            lastCommitMessages: string;
-        };
-        changesSinceLastChat: Record<string, string>;
-        shellConfigFiles: Record<string, string>;
-        systemInfo: {
-            platform: string;
-            shell: string;
-            nodeVersion: string;
-            arch: string;
-            homedir: string;
-            cpus: number;
-        };
-        fileVersions: {
-            path: string;
-            content: string;
-        }[][];
-        userKnowledgeFiles?: Record<string, string> | undefined;
-    };
     fingerprintId: string;
     userInputId: string;
     messages: {
@@ -405,8 +378,8 @@ export declare const CLIENT_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
                 type: "ephemeral";
             } | undefined;
         } | {
-            content: string;
             type: "tool_result";
+            content: string;
             tool_use_id: string;
             cache_control?: {
                 type: "ephemeral";
@@ -424,15 +397,6 @@ export declare const CLIENT_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
         })[];
         role: "user" | "assistant";
     }[];
-    changesAlreadyApplied: {
-        path: string;
-        content: string;
-        type: "file" | "patch";
-    }[];
-    costMode: "max" | "lite" | "normal";
-    authToken?: string | undefined;
-}, {
-    type: "user-input";
     fileContext: {
         currentWorkingDirectory: string;
         fileTree: import("./util/file").FileTreeNode[];
@@ -460,6 +424,15 @@ export declare const CLIENT_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
         }[][];
         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: {
@@ -478,8 +451,8 @@ export declare const CLIENT_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
                 type: "ephemeral";
             } | undefined;
         } | {
-            content: string;
             type: "tool_result";
+            content: string;
             tool_use_id: string;
             cache_control?: {
                 type: "ephemeral";
@@ -497,13 +470,40 @@ export declare const CLIENT_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
         })[];
         role: "user" | "assistant";
     }[];
+    fileContext: {
+        currentWorkingDirectory: string;
+        fileTree: import("./util/file").FileTreeNode[];
+        fileTokenScores: Record<string, Record<string, number>>;
+        knowledgeFiles: Record<string, string>;
+        gitChanges: {
+            status: string;
+            diff: string;
+            diffCached: string;
+            lastCommitMessages: string;
+        };
+        changesSinceLastChat: Record<string, string>;
+        shellConfigFiles: Record<string, string>;
+        systemInfo: {
+            platform: string;
+            shell: string;
+            nodeVersion: string;
+            arch: string;
+            homedir: string;
+            cpus: number;
+        };
+        fileVersions: {
+            path: string;
+            content: string;
+        }[][];
+        userKnowledgeFiles?: Record<string, string> | undefined;
+    };
     changesAlreadyApplied: {
+        type: "patch" | "file";
         path: string;
         content: string;
-        type: "file" | "patch";
     }[];
     authToken?: string | undefined;
-    costMode?: "max" | "lite" | "normal" | undefined;
+    costMode?: "lite" | "normal" | "max" | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"prompt">;
     promptId: z.ZodString;
@@ -686,15 +686,15 @@ export declare const CLIENT_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
                     type: "ephemeral";
                 }>>;
             }, "strip", z.ZodTypeAny, {
-                content: string;
                 type: "tool_result";
+                content: string;
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
                 } | undefined;
             }, {
-                content: string;
                 type: "tool_result";
+                content: string;
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
@@ -758,8 +758,8 @@ export declare const CLIENT_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
                     type: "ephemeral";
                 } | undefined;
             } | {
-                content: string;
                 type: "tool_result";
+                content: string;
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
@@ -792,8 +792,8 @@ export declare const CLIENT_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
                     type: "ephemeral";
                 } | undefined;
             } | {
-                content: string;
                 type: "tool_result";
+                content: string;
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
@@ -812,7 +812,6 @@ export declare const CLIENT_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
             role: "user" | "assistant";
         }>, "many">;
     }, "strip", z.ZodTypeAny, {
-        agentContext: string;
         fileContext: {
             currentWorkingDirectory: string;
             fileTree: import("./util/file").FileTreeNode[];
@@ -840,6 +839,7 @@ export declare const CLIENT_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
             }[][];
             userKnowledgeFiles?: Record<string, string> | undefined;
         };
+        agentContext: string;
         messageHistory: {
             content: string | ({
                 type: "text";
@@ -856,8 +856,8 @@ export declare const CLIENT_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
                     type: "ephemeral";
                 } | undefined;
             } | {
-                content: string;
                 type: "tool_result";
+                content: string;
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
@@ -876,7 +876,6 @@ export declare const CLIENT_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
             role: "user" | "assistant";
         }[];
     }, {
-        agentContext: string;
         fileContext: {
             currentWorkingDirectory: string;
             fileTree: import("./util/file").FileTreeNode[];
@@ -904,6 +903,7 @@ export declare const CLIENT_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
             }[][];
             userKnowledgeFiles?: Record<string, string> | undefined;
         };
+        agentContext: string;
         messageHistory: {
             content: string | ({
                 type: "text";
@@ -920,8 +920,8 @@ export declare const CLIENT_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
                     type: "ephemeral";
                 } | undefined;
             } | {
-                content: string;
                 type: "tool_result";
+                content: string;
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
@@ -956,10 +956,9 @@ export declare const CLIENT_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
 }, "strip", z.ZodTypeAny, {
     type: "prompt";
     fingerprintId: string;
-    costMode: "max" | "lite" | "normal";
+    costMode: "lite" | "normal" | "max";
     promptId: string;
     agentState: {
-        agentContext: string;
         fileContext: {
             currentWorkingDirectory: string;
             fileTree: import("./util/file").FileTreeNode[];
@@ -987,6 +986,7 @@ export declare const CLIENT_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
             }[][];
             userKnowledgeFiles?: Record<string, string> | undefined;
         };
+        agentContext: string;
         messageHistory: {
             content: string | ({
                 type: "text";
@@ -1003,8 +1003,8 @@ export declare const CLIENT_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
                     type: "ephemeral";
                 } | undefined;
             } | {
-                content: string;
                 type: "tool_result";
+                content: string;
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
@@ -1035,7 +1035,6 @@ export declare const CLIENT_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
     fingerprintId: string;
     promptId: string;
     agentState: {
-        agentContext: string;
         fileContext: {
             currentWorkingDirectory: string;
             fileTree: import("./util/file").FileTreeNode[];
@@ -1063,6 +1062,7 @@ export declare const CLIENT_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
             }[][];
             userKnowledgeFiles?: Record<string, string> | undefined;
         };
+        agentContext: string;
         messageHistory: {
             content: string | ({
                 type: "text";
@@ -1079,8 +1079,8 @@ export declare const CLIENT_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
                     type: "ephemeral";
                 } | undefined;
             } | {
-                content: string;
                 type: "tool_result";
+                content: string;
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
@@ -1105,7 +1105,7 @@ export declare const CLIENT_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
         result: string;
     }[];
     authToken?: string | undefined;
-    costMode?: "max" | "lite" | "normal" | undefined;
+    costMode?: "lite" | "normal" | "max" | undefined;
     prompt?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"read-files-response">;
@@ -1234,6 +1234,7 @@ export declare const CLIENT_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
     }>;
 }, "strip", z.ZodTypeAny, {
     type: "init";
+    fingerprintId: string;
     fileContext: {
         currentWorkingDirectory: string;
         fileTree: import("./util/file").FileTreeNode[];
@@ -1261,10 +1262,10 @@ export declare const CLIENT_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
         }[][];
         userKnowledgeFiles?: Record<string, string> | undefined;
     };
-    fingerprintId: string;
     authToken?: string | undefined;
 }, {
     type: "init";
+    fingerprintId: string;
     fileContext: {
         currentWorkingDirectory: string;
         fileTree: import("./util/file").FileTreeNode[];
@@ -1292,7 +1293,6 @@ export declare const CLIENT_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
         }[][];
         userKnowledgeFiles?: Record<string, string> | undefined;
     };
-    fingerprintId: string;
     authToken?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"usage">;
@@ -1386,26 +1386,26 @@ export declare const ResponseCompleteSchema: z.ZodObject<z.objectUtil.extendShap
         path: z.ZodString;
         content: z.ZodString;
     }, "strip", z.ZodTypeAny, {
+        type: "patch" | "file";
         path: string;
         content: string;
-        type: "file" | "patch";
     }, {
+        type: "patch" | "file";
         path: string;
         content: string;
-        type: "file" | "patch";
     }>, "many">;
     changesAlreadyApplied: z.ZodArray<z.ZodObject<{
         type: z.ZodEnum<["patch", "file"]>;
         path: z.ZodString;
         content: z.ZodString;
     }, "strip", z.ZodTypeAny, {
+        type: "patch" | "file";
         path: string;
         content: string;
-        type: "file" | "patch";
     }, {
+        type: "patch" | "file";
         path: string;
         content: string;
-        type: "file" | "patch";
     }>, "many">;
     addedFileVersions: z.ZodArray<z.ZodObject<{
         path: z.ZodString;
@@ -1429,15 +1429,15 @@ export declare const ResponseCompleteSchema: z.ZodObject<z.objectUtil.extendShap
     type: "response-complete";
     userInputId: string;
     changesAlreadyApplied: {
+        type: "patch" | "file";
         path: string;
         content: string;
-        type: "file" | "patch";
     }[];
     response: string;
     changes: {
+        type: "patch" | "file";
         path: string;
         content: string;
-        type: "file" | "patch";
     }[];
     addedFileVersions: {
         path: string;
@@ -1454,15 +1454,15 @@ export declare const ResponseCompleteSchema: z.ZodObject<z.objectUtil.extendShap
     type: "response-complete";
     userInputId: string;
     changesAlreadyApplied: {
+        type: "patch" | "file";
         path: string;
         content: string;
-        type: "file" | "patch";
     }[];
     response: string;
     changes: {
+        type: "patch" | "file";
         path: string;
         content: string;
-        type: "file" | "patch";
     }[];
     addedFileVersions: {
         path: string;
@@ -1654,15 +1654,15 @@ export declare const PromptResponseSchema: z.ZodObject<z.objectUtil.extendShape<
                     type: "ephemeral";
                 }>>;
             }, "strip", z.ZodTypeAny, {
-                content: string;
                 type: "tool_result";
+                content: string;
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
                 } | undefined;
             }, {
-                content: string;
                 type: "tool_result";
+                content: string;
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
@@ -1726,8 +1726,8 @@ export declare const PromptResponseSchema: z.ZodObject<z.objectUtil.extendShape<
                     type: "ephemeral";
                 } | undefined;
             } | {
-                content: string;
                 type: "tool_result";
+                content: string;
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
@@ -1760,8 +1760,8 @@ export declare const PromptResponseSchema: z.ZodObject<z.objectUtil.extendShape<
                     type: "ephemeral";
                 } | undefined;
             } | {
-                content: string;
                 type: "tool_result";
+                content: string;
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
@@ -1780,7 +1780,6 @@ export declare const PromptResponseSchema: z.ZodObject<z.objectUtil.extendShape<
             role: "user" | "assistant";
         }>, "many">;
     }, "strip", z.ZodTypeAny, {
-        agentContext: string;
         fileContext: {
             currentWorkingDirectory: string;
             fileTree: import("./util/file").FileTreeNode[];
@@ -1808,6 +1807,7 @@ export declare const PromptResponseSchema: z.ZodObject<z.objectUtil.extendShape<
             }[][];
             userKnowledgeFiles?: Record<string, string> | undefined;
         };
+        agentContext: string;
         messageHistory: {
             content: string | ({
                 type: "text";
@@ -1824,8 +1824,8 @@ export declare const PromptResponseSchema: z.ZodObject<z.objectUtil.extendShape<
                     type: "ephemeral";
                 } | undefined;
             } | {
-                content: string;
                 type: "tool_result";
+                content: string;
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
@@ -1844,7 +1844,6 @@ export declare const PromptResponseSchema: z.ZodObject<z.objectUtil.extendShape<
             role: "user" | "assistant";
         }[];
     }, {
-        agentContext: string;
         fileContext: {
             currentWorkingDirectory: string;
             fileTree: import("./util/file").FileTreeNode[];
@@ -1872,6 +1871,7 @@ export declare const PromptResponseSchema: z.ZodObject<z.objectUtil.extendShape<
             }[][];
             userKnowledgeFiles?: Record<string, string> | undefined;
         };
+        agentContext: string;
         messageHistory: {
             content: string | ({
                 type: "text";
@@ -1888,8 +1888,8 @@ export declare const PromptResponseSchema: z.ZodObject<z.objectUtil.extendShape<
                     type: "ephemeral";
                 } | undefined;
             } | {
-                content: string;
                 type: "tool_result";
+                content: string;
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
@@ -1945,7 +1945,6 @@ export declare const PromptResponseSchema: z.ZodObject<z.objectUtil.extendShape<
     type: "prompt-response";
     promptId: string;
     agentState: {
-        agentContext: string;
         fileContext: {
             currentWorkingDirectory: string;
             fileTree: import("./util/file").FileTreeNode[];
@@ -1973,6 +1972,7 @@ export declare const PromptResponseSchema: z.ZodObject<z.objectUtil.extendShape<
             }[][];
             userKnowledgeFiles?: Record<string, string> | undefined;
         };
+        agentContext: string;
         messageHistory: {
             content: string | ({
                 type: "text";
@@ -1989,8 +1989,8 @@ export declare const PromptResponseSchema: z.ZodObject<z.objectUtil.extendShape<
                     type: "ephemeral";
                 } | undefined;
             } | {
-                content: string;
                 type: "tool_result";
+                content: string;
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
@@ -2029,7 +2029,6 @@ export declare const PromptResponseSchema: z.ZodObject<z.objectUtil.extendShape<
     type: "prompt-response";
     promptId: string;
     agentState: {
-        agentContext: string;
         fileContext: {
             currentWorkingDirectory: string;
             fileTree: import("./util/file").FileTreeNode[];
@@ -2057,6 +2056,7 @@ export declare const PromptResponseSchema: z.ZodObject<z.objectUtil.extendShape<
             }[][];
             userKnowledgeFiles?: Record<string, string> | undefined;
         };
+        agentContext: string;
         messageHistory: {
             content: string | ({
                 type: "text";
@@ -2073,8 +2073,8 @@ export declare const PromptResponseSchema: z.ZodObject<z.objectUtil.extendShape<
                     type: "ephemeral";
                 } | undefined;
             } | {
-                content: string;
                 type: "tool_result";
+                content: string;
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
@@ -2132,26 +2132,26 @@ export declare const SERVER_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
         path: z.ZodString;
         content: z.ZodString;
     }, "strip", z.ZodTypeAny, {
+        type: "patch" | "file";
         path: string;
         content: string;
-        type: "file" | "patch";
     }, {
+        type: "patch" | "file";
         path: string;
         content: string;
-        type: "file" | "patch";
     }>, "many">;
     changesAlreadyApplied: z.ZodArray<z.ZodObject<{
         type: z.ZodEnum<["patch", "file"]>;
         path: z.ZodString;
         content: z.ZodString;
     }, "strip", z.ZodTypeAny, {
+        type: "patch" | "file";
         path: string;
         content: string;
-        type: "file" | "patch";
     }, {
+        type: "patch" | "file";
         path: string;
         content: string;
-        type: "file" | "patch";
     }>, "many">;
     addedFileVersions: z.ZodArray<z.ZodObject<{
         path: z.ZodString;
@@ -2175,15 +2175,15 @@ export declare const SERVER_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
     type: "response-complete";
     userInputId: string;
     changesAlreadyApplied: {
+        type: "patch" | "file";
         path: string;
         content: string;
-        type: "file" | "patch";
     }[];
     response: string;
     changes: {
+        type: "patch" | "file";
         path: string;
         content: string;
-        type: "file" | "patch";
     }[];
     addedFileVersions: {
         path: string;
@@ -2200,15 +2200,15 @@ export declare const SERVER_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
     type: "response-complete";
     userInputId: string;
     changesAlreadyApplied: {
+        type: "patch" | "file";
         path: string;
         content: string;
-        type: "file" | "patch";
     }[];
     response: string;
     changes: {
+        type: "patch" | "file";
         path: string;
         content: string;
-        type: "file" | "patch";
     }[];
     addedFileVersions: {
         path: string;
@@ -2399,15 +2399,15 @@ export declare const SERVER_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
                     type: "ephemeral";
                 }>>;
             }, "strip", z.ZodTypeAny, {
-                content: string;
                 type: "tool_result";
+                content: string;
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
                 } | undefined;
             }, {
-                content: string;
                 type: "tool_result";
+                content: string;
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
@@ -2471,8 +2471,8 @@ export declare const SERVER_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
                     type: "ephemeral";
                 } | undefined;
             } | {
-                content: string;
                 type: "tool_result";
+                content: string;
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
@@ -2505,8 +2505,8 @@ export declare const SERVER_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
                     type: "ephemeral";
                 } | undefined;
             } | {
-                content: string;
                 type: "tool_result";
+                content: string;
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
@@ -2525,7 +2525,6 @@ export declare const SERVER_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
             role: "user" | "assistant";
         }>, "many">;
     }, "strip", z.ZodTypeAny, {
-        agentContext: string;
         fileContext: {
             currentWorkingDirectory: string;
             fileTree: import("./util/file").FileTreeNode[];
@@ -2553,6 +2552,7 @@ export declare const SERVER_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
             }[][];
             userKnowledgeFiles?: Record<string, string> | undefined;
         };
+        agentContext: string;
         messageHistory: {
             content: string | ({
                 type: "text";
@@ -2569,8 +2569,8 @@ export declare const SERVER_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
                     type: "ephemeral";
                 } | undefined;
             } | {
-                content: string;
                 type: "tool_result";
+                content: string;
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
@@ -2589,7 +2589,6 @@ export declare const SERVER_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
             role: "user" | "assistant";
         }[];
     }, {
-        agentContext: string;
         fileContext: {
             currentWorkingDirectory: string;
             fileTree: import("./util/file").FileTreeNode[];
@@ -2617,6 +2616,7 @@ export declare const SERVER_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
             }[][];
             userKnowledgeFiles?: Record<string, string> | undefined;
         };
+        agentContext: string;
         messageHistory: {
             content: string | ({
                 type: "text";
@@ -2633,8 +2633,8 @@ export declare const SERVER_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
                     type: "ephemeral";
                 } | undefined;
             } | {
-                content: string;
                 type: "tool_result";
+                content: string;
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
@@ -2690,7 +2690,6 @@ export declare const SERVER_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
     type: "prompt-response";
     promptId: string;
     agentState: {
-        agentContext: string;
         fileContext: {
             currentWorkingDirectory: string;
             fileTree: import("./util/file").FileTreeNode[];
@@ -2718,6 +2717,7 @@ export declare const SERVER_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
             }[][];
             userKnowledgeFiles?: Record<string, string> | undefined;
         };
+        agentContext: string;
         messageHistory: {
             content: string | ({
                 type: "text";
@@ -2734,8 +2734,8 @@ export declare const SERVER_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
                     type: "ephemeral";
                 } | undefined;
             } | {
-                content: string;
                 type: "tool_result";
+                content: string;
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
@@ -2774,7 +2774,6 @@ export declare const SERVER_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
     type: "prompt-response";
     promptId: string;
     agentState: {
-        agentContext: string;
         fileContext: {
             currentWorkingDirectory: string;
             fileTree: import("./util/file").FileTreeNode[];
@@ -2802,6 +2801,7 @@ export declare const SERVER_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
             }[][];
             userKnowledgeFiles?: Record<string, string> | undefined;
         };
+        agentContext: string;
         messageHistory: {
             content: string | ({
                 type: "text";
@@ -2818,8 +2818,8 @@ export declare const SERVER_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
                     type: "ephemeral";
                 } | undefined;
             } | {
-                content: string;
                 type: "tool_result";
+                content: string;
                 tool_use_id: string;
                 cache_control?: {
                     type: "ephemeral";
@@ -2888,26 +2888,26 @@ export declare const SERVER_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
         path: z.ZodString;
         content: z.ZodString;
     }, "strip", z.ZodTypeAny, {
+        type: "patch" | "file";
         path: string;
         content: string;
-        type: "file" | "patch";
     }, {
+        type: "patch" | "file";
         path: string;
         content: string;
-        type: "file" | "patch";
     }>, "many">;
     changesAlreadyApplied: z.ZodArray<z.ZodObject<{
         type: z.ZodEnum<["patch", "file"]>;
         path: z.ZodString;
         content: z.ZodString;
     }, "strip", z.ZodTypeAny, {
+        type: "patch" | "file";
         path: string;
         content: string;
-        type: "file" | "patch";
     }, {
+        type: "patch" | "file";
         path: string;
         content: string;
-        type: "file" | "patch";
     }>, "many">;
     addedFileVersions: z.ZodArray<z.ZodObject<{
         path: z.ZodString;
@@ -2922,22 +2922,22 @@ export declare const SERVER_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
     resetFileVersions: z.ZodBoolean;
 }, "strip", z.ZodTypeAny, {
     type: "tool-call";
+    userInputId: string;
     data: {
         name: string;
         id: string;
         input: Record<string, any>;
     };
-    userInputId: string;
     changesAlreadyApplied: {
+        type: "patch" | "file";
         path: string;
         content: string;
-        type: "file" | "patch";
     }[];
     response: string;
     changes: {
+        type: "patch" | "file";
         path: string;
         content: string;
-        type: "file" | "patch";
     }[];
     addedFileVersions: {
         path: string;
@@ -2946,22 +2946,22 @@ export declare const SERVER_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
     resetFileVersions: boolean;
 }, {
     type: "tool-call";
+    userInputId: string;
     data: {
         name: string;
         id: string;
         input: Record<string, any>;
     };
-    userInputId: string;
     changesAlreadyApplied: {
+        type: "patch" | "file";
         path: string;
         content: string;
-        type: "file" | "patch";
     }[];
     response: string;
     changes: {
+        type: "patch" | "file";
         path: string;
         content: string;
-        type: "file" | "patch";
     }[];
     addedFileVersions: {
         path: string;
@@ -2974,12 +2974,12 @@ export declare const SERVER_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
     result: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     type: "terminal-command-result";
-    result: string;
     userInputId: string;
+    result: string;
 }, {
     type: "terminal-command-result";
-    result: string;
     userInputId: string;
+    result: string;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"npm-version-status">;
     isUpToDate: z.ZodBoolean;
@@ -3046,11 +3046,11 @@ export declare const SERVER_ACTION_SCHEMA: z.ZodDiscriminatedUnion<"type", [z.Zo
     type: z.ZodLiteral<"action-error">;
     message: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    message: string;
     type: "action-error";
-}, {
     message: string;
+}, {
     type: "action-error";
+    message: string;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"commit-message-response">;
     commitMessage: z.ZodString;