codebuff 1.0.168 → 1.0.170

package/dist/common/types/agent-state.d.ts

@@ -5,12 +5,12 @@ export declare const ToolCallSchema: z.ZodObject<{
     parameters: z.ZodRecord<z.ZodString, z.ZodString>;
     id: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    id: string;
     name: string;
+    id: string;
     parameters: Record<string, string>;
 }, {
-    id: string;
     name: string;
+    id: string;
     parameters: Record<string, string>;
 }>;
 export type ToolCall = z.infer<typeof ToolCallSchema>;
@@ -19,12 +19,12 @@ export declare const ToolResultSchema: z.ZodObject<{
     result: z.ZodString;
     id: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    id: string;
     name: string;
+    id: string;
     result: string;
 }, {
-    id: string;
     name: string;
+    id: string;
     result: string;
 }>;
 export type ToolResult = z.infer<typeof ToolResultSchema>;
@@ -42,13 +42,13 @@ export declare const AgentStateSchema: z.ZodObject<{
             diffCached: z.ZodString;
             lastCommitMessages: z.ZodString;
         }, "strip", z.ZodTypeAny, {
-            diff: string;
             status: string;
+            diff: string;
             diffCached: string;
             lastCommitMessages: string;
         }, {
-            diff: string;
             status: string;
+            diff: string;
             diffCached: string;
             lastCommitMessages: string;
         }>;
@@ -92,8 +92,8 @@ export declare const AgentStateSchema: z.ZodObject<{
         fileTokenScores: Record<string, Record<string, number>>;
         knowledgeFiles: Record<string, string>;
         gitChanges: {
-            diff: string;
             status: string;
+            diff: string;
             diffCached: string;
             lastCommitMessages: string;
         };
@@ -118,8 +118,8 @@ export declare const AgentStateSchema: z.ZodObject<{
         fileTokenScores: Record<string, Record<string, number>>;
         knowledgeFiles: Record<string, string>;
         gitChanges: {
-            diff: string;
             status: string;
+            diff: string;
             diffCached: string;
             lastCommitMessages: string;
         };
@@ -177,16 +177,16 @@ export declare const AgentStateSchema: z.ZodObject<{
             }>>;
         }, "strip", z.ZodTypeAny, {
             type: "tool_use";
-            id: string;
             name: string;
+            id: string;
             input: Record<string, any>;
             cache_control?: {
                 type: "ephemeral";
             } | undefined;
         }, {
             type: "tool_use";
-            id: string;
             name: string;
+            id: string;
             input: Record<string, any>;
             cache_control?: {
                 type: "ephemeral";
@@ -203,15 +203,15 @@ export declare const AgentStateSchema: z.ZodObject<{
                 type: "ephemeral";
             }>>;
         }, "strip", z.ZodTypeAny, {
-            type: "tool_result";
             content: string;
+            type: "tool_result";
             tool_use_id: string;
             cache_control?: {
                 type: "ephemeral";
             } | undefined;
         }, {
-            type: "tool_result";
             content: string;
+            type: "tool_result";
             tool_use_id: string;
             cache_control?: {
                 type: "ephemeral";
@@ -260,7 +260,6 @@ export declare const AgentStateSchema: z.ZodObject<{
             } | undefined;
         }>]>, "many">]>;
     }, "strip", z.ZodTypeAny, {
-        role: "user" | "assistant";
         content: string | ({
             type: "text";
             text: string;
@@ -269,15 +268,15 @@ export declare const AgentStateSchema: z.ZodObject<{
             } | undefined;
         } | {
             type: "tool_use";
-            id: string;
             name: string;
+            id: string;
             input: Record<string, any>;
             cache_control?: {
                 type: "ephemeral";
             } | undefined;
         } | {
-            type: "tool_result";
             content: string;
+            type: "tool_result";
             tool_use_id: string;
             cache_control?: {
                 type: "ephemeral";
@@ -293,8 +292,8 @@ export declare const AgentStateSchema: z.ZodObject<{
                 type: "ephemeral";
             } | undefined;
         })[];
-    }, {
         role: "user" | "assistant";
+    }, {
         content: string | ({
             type: "text";
             text: string;
@@ -303,15 +302,15 @@ export declare const AgentStateSchema: z.ZodObject<{
             } | undefined;
         } | {
             type: "tool_use";
-            id: string;
             name: string;
+            id: string;
             input: Record<string, any>;
             cache_control?: {
                 type: "ephemeral";
             } | undefined;
         } | {
-            type: "tool_result";
             content: string;
+            type: "tool_result";
             tool_use_id: string;
             cache_control?: {
                 type: "ephemeral";
@@ -327,6 +326,7 @@ export declare const AgentStateSchema: z.ZodObject<{
                 type: "ephemeral";
             } | undefined;
         })[];
+        role: "user" | "assistant";
     }>, "many">;
 }, "strip", z.ZodTypeAny, {
     agentContext: string;
@@ -336,8 +336,8 @@ export declare const AgentStateSchema: z.ZodObject<{
         fileTokenScores: Record<string, Record<string, number>>;
         knowledgeFiles: Record<string, string>;
         gitChanges: {
-            diff: string;
             status: string;
+            diff: string;
             diffCached: string;
             lastCommitMessages: string;
         };
@@ -358,7 +358,6 @@ export declare const AgentStateSchema: z.ZodObject<{
         userKnowledgeFiles?: Record<string, string> | undefined;
     };
     messageHistory: {
-        role: "user" | "assistant";
         content: string | ({
             type: "text";
             text: string;
@@ -367,15 +366,15 @@ export declare const AgentStateSchema: z.ZodObject<{
             } | undefined;
         } | {
             type: "tool_use";
-            id: string;
             name: string;
+            id: string;
             input: Record<string, any>;
             cache_control?: {
                 type: "ephemeral";
             } | undefined;
         } | {
-            type: "tool_result";
             content: string;
+            type: "tool_result";
             tool_use_id: string;
             cache_control?: {
                 type: "ephemeral";
@@ -391,6 +390,7 @@ export declare const AgentStateSchema: z.ZodObject<{
                 type: "ephemeral";
             } | undefined;
         })[];
+        role: "user" | "assistant";
     }[];
 }, {
     agentContext: string;
@@ -400,8 +400,8 @@ export declare const AgentStateSchema: z.ZodObject<{
         fileTokenScores: Record<string, Record<string, number>>;
         knowledgeFiles: Record<string, string>;
         gitChanges: {
-            diff: string;
             status: string;
+            diff: string;
             diffCached: string;
             lastCommitMessages: string;
         };
@@ -422,7 +422,6 @@ export declare const AgentStateSchema: z.ZodObject<{
         userKnowledgeFiles?: Record<string, string> | undefined;
     };
     messageHistory: {
-        role: "user" | "assistant";
         content: string | ({
             type: "text";
             text: string;
@@ -431,15 +430,15 @@ export declare const AgentStateSchema: z.ZodObject<{
             } | undefined;
         } | {
             type: "tool_use";
-            id: string;
             name: string;
+            id: string;
             input: Record<string, any>;
             cache_control?: {
                 type: "ephemeral";
             } | undefined;
         } | {
-            type: "tool_result";
             content: string;
+            type: "tool_result";
             tool_use_id: string;
             cache_control?: {
                 type: "ephemeral";
@@ -455,6 +454,7 @@ export declare const AgentStateSchema: z.ZodObject<{
                 type: "ephemeral";
             } | undefined;
         })[];
+        role: "user" | "assistant";
     }[];
 }>;
 export type AgentState = z.infer<typeof AgentStateSchema>;

package/dist/common/types/message.d.ts

@@ -35,16 +35,16 @@ declare const MessageContentObjectSchema: z.ZodUnion<[z.ZodObject<{
     }>>;
 }, "strip", z.ZodTypeAny, {
     type: "tool_use";
-    id: string;
     name: string;
+    id: string;
     input: Record<string, any>;
     cache_control?: {
         type: "ephemeral";
     } | undefined;
 }, {
     type: "tool_use";
-    id: string;
     name: string;
+    id: string;
     input: Record<string, any>;
     cache_control?: {
         type: "ephemeral";
@@ -61,15 +61,15 @@ declare const MessageContentObjectSchema: z.ZodUnion<[z.ZodObject<{
         type: "ephemeral";
     }>>;
 }, "strip", z.ZodTypeAny, {
-    type: "tool_result";
     content: string;
+    type: "tool_result";
     tool_use_id: string;
     cache_control?: {
         type: "ephemeral";
     } | undefined;
 }, {
-    type: "tool_result";
     content: string;
+    type: "tool_result";
     tool_use_id: string;
     cache_control?: {
         type: "ephemeral";
@@ -155,16 +155,16 @@ export declare const MessageSchema: z.ZodObject<{
         }>>;
     }, "strip", z.ZodTypeAny, {
         type: "tool_use";
-        id: string;
         name: string;
+        id: string;
         input: Record<string, any>;
         cache_control?: {
             type: "ephemeral";
         } | undefined;
     }, {
         type: "tool_use";
-        id: string;
         name: string;
+        id: string;
         input: Record<string, any>;
         cache_control?: {
             type: "ephemeral";
@@ -181,15 +181,15 @@ export declare const MessageSchema: z.ZodObject<{
             type: "ephemeral";
         }>>;
     }, "strip", z.ZodTypeAny, {
-        type: "tool_result";
         content: string;
+        type: "tool_result";
         tool_use_id: string;
         cache_control?: {
             type: "ephemeral";
         } | undefined;
     }, {
-        type: "tool_result";
         content: string;
+        type: "tool_result";
         tool_use_id: string;
         cache_control?: {
             type: "ephemeral";
@@ -238,7 +238,6 @@ export declare const MessageSchema: z.ZodObject<{
         } | undefined;
     }>]>, "many">]>;
 }, "strip", z.ZodTypeAny, {
-    role: "user" | "assistant";
     content: string | ({
         type: "text";
         text: string;
@@ -247,15 +246,15 @@ export declare const MessageSchema: z.ZodObject<{
         } | undefined;
     } | {
         type: "tool_use";
-        id: string;
         name: string;
+        id: string;
         input: Record<string, any>;
         cache_control?: {
             type: "ephemeral";
         } | undefined;
     } | {
-        type: "tool_result";
         content: string;
+        type: "tool_result";
         tool_use_id: string;
         cache_control?: {
             type: "ephemeral";
@@ -271,8 +270,8 @@ export declare const MessageSchema: z.ZodObject<{
             type: "ephemeral";
         } | undefined;
     })[];
-}, {
     role: "user" | "assistant";
+}, {
     content: string | ({
         type: "text";
         text: string;
@@ -281,15 +280,15 @@ export declare const MessageSchema: z.ZodObject<{
         } | undefined;
     } | {
         type: "tool_use";
-        id: string;
         name: string;
+        id: string;
         input: Record<string, any>;
         cache_control?: {
             type: "ephemeral";
         } | undefined;
     } | {
-        type: "tool_result";
         content: string;
+        type: "tool_result";
         tool_use_id: string;
         cache_control?: {
             type: "ephemeral";
@@ -305,6 +304,7 @@ export declare const MessageSchema: z.ZodObject<{
             type: "ephemeral";
         } | undefined;
     })[];
+    role: "user" | "assistant";
 }>;
 export type Message = z.infer<typeof MessageSchema>;
 export type MessageContentObject = z.infer<typeof MessageContentObjectSchema>;

package/dist/common/util/changes.js

@@ -12,7 +12,7 @@ function applyChanges(projectRoot, changes) {
     const created = [];
     const modified = [];
     for (const change of changes) {
-        const { filePath, content, type } = change;
+        const { path: filePath, content, type } = change;
         const fullPath = path_1.default.join(projectRoot, filePath);
         try {
             const fileExists = fs_1.default.existsSync(fullPath);
@@ -37,13 +37,13 @@ function applyChanges(projectRoot, changes) {
             }
         }
         catch (error) {
-            console.error(`Failed to apply patch to ${filePath}:`, error, content);
+            console.error(`Failed to apply patch to ${path_1.default}:`, error, content);
         }
     }
     return { created, modified };
 }
 async function applyAndRevertChanges(projectRoot, changes, onApply) {
-    const filesChanged = changes.map((change) => change.filePath);
+    const filesChanged = changes.map((change) => change.path);
     const files = Object.fromEntries(filesChanged.map((filePath) => {
         const fullPath = path_1.default.join(projectRoot, filePath);
         const oldContent = fs_1.default.existsSync(fullPath)

package/dist/common/util/changes.js.map

@@ -1 +1 @@
-{"version":3,"file":"changes.js","sourceRoot":"","sources":["../../src/util/changes.ts"],"names":[],"mappings":";;;;;AAKA,oCAiCC;AAED,sDA8BC;AAtED,4CAAmB;AACnB,gDAAuB;AAEvB,mCAAoC;AAEpC,SAAgB,YAAY,CAAC,WAAmB,EAAE,OAAoB;IACpE,MAAM,OAAO,GAAa,EAAE,CAAA;IAC5B,MAAM,QAAQ,GAAa,EAAE,CAAA;IAE7B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,MAAM,CAAA;QAC1C,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAA;QACjD,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;YAC1C,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,qDAAqD;gBACrD,MAAM,OAAO,GAAG,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;gBACtC,YAAE,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;YAC5C,CAAC;YAED,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;gBACpB,YAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;YACrC,CAAC;iBAAM,CAAC;gBACN,MAAM,UAAU,GAAG,YAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;gBACrD,MAAM,UAAU,GAAG,IAAA,kBAAU,EAAC,UAAU,EAAE,OAAO,CAAC,CAAA;gBAClD,YAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAA;YACxC,CAAC;YACD,IAAI,UAAU,EAAE,CAAC;gBACf,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YACzB,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YACxB,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,4BAA4B,QAAQ,GAAG,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;QACxE,CAAC;IACH,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAA;AAC9B,CAAC;AAEM,KAAK,UAAU,qBAAqB,CACzC,WAAmB,EACnB,OAAoB,EACpB,OAA4B;IAE5B,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;IAC7D,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAC9B,YAAY,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC5B,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAA;QACjD,MAAM,UAAU,GAAG,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC;YACxC,CAAC,CAAC,YAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC;YACpC,CAAC,CAAC,kBAAkB,CAAA;QACtB,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAA;IAC/B,CAAC,CAAC,CACH,CAAA;IACD,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;IAClC,IAAI,CAAC;QACH,MAAM,OAAO,EAAE,CAAA;IACjB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAA;IAClD,CAAC;IACD,KAAK,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAC3D,IAAI,UAAU,KAAK,kBAAkB,EAAE,CAAC;YACtC,IAAI,YAAE,CAAC,UAAU,CAAC,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC;gBACpD,YAAE,CAAC,UAAU,CAAC,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAA;YACjD,CAAC;QACH,CAAC;aAAM,CAAC;YACN,YAAE,CAAC,aAAa,CAAC,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,UAAU,CAAC,CAAA;QAChE,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"changes.js","sourceRoot":"","sources":["../../src/util/changes.ts"],"names":[],"mappings":"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"}

package/dist/common/util/constants.d.ts

@@ -0,0 +1 @@
+export declare function getModelForMode(mode: string): string;

package/dist/common/util/constants.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getModelForMode = getModelForMode;
+function getModelForMode(mode) {
+    return 'claude-3-sonnet';
+}
+//# sourceMappingURL=constants.js.map

package/dist/common/util/constants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/util/constants.ts"],"names":[],"mappings":";;AAAA,0CAEC;AAFD,SAAgB,eAAe,CAAC,IAAY;IAC1C,OAAO,iBAAiB,CAAA;AAC1B,CAAC"}

package/dist/common/util/credentials.d.ts

@@ -10,15 +10,15 @@ export declare const userSchema: z.ZodObject<{
     email: string;
     name: string | null;
     id: string;
-    authToken: string;
     fingerprintId: string;
+    authToken: string;
     fingerprintHash: string;
 }, {
     email: string;
     name: string | null;
     id: string;
-    authToken: string;
     fingerprintId: string;
+    authToken: string;
     fingerprintHash: string;
 }>;
 export type User = z.infer<typeof userSchema>;

package/dist/common/util/file.d.ts

@@ -137,15 +137,19 @@ export declare const ProjectFileContextSchema: z.ZodObject<{
 }>;
 export type ProjectFileContext = z.infer<typeof ProjectFileContextSchema>;
 export declare const createFileBlock: (filePath: string, content: string) => string;
-export declare const createFileBlockWithoutPath: (content: string) => string;
 export declare const fileRegex: RegExp;
 export declare const fileWithNoPathRegex: RegExp;
 export declare const parseFileBlocks: (fileBlocks: string) => Record<string, string>;
-export declare const parseFileBlocksWithoutPath: (fileBlocks: string) => string[];
 export declare const createMarkdownFileBlock: (filePath: string, content: string) => string;
 export declare const createSearchReplaceBlock: (search: string, replace: string) => string;
 export declare function printFileTree(nodes: FileTreeNode[], depth?: number): string;
 export declare function printFileTreeWithTokens(nodes: FileTreeNode[], fileTokenScores: Record<string, Record<string, number>>, path?: string[]): string;
+/**
+ * Ensures the given file contents ends with a newline character.
+ * @param contents - The file contents
+ * @returns the file contents with a newline character.
+ */
+export declare const ensureEndsWithNewline: (contents: string | null) => string | null;
 export declare const ensureDirectoryExists: (baseDir: string) => void;
 /**
  * Removes markdown code block syntax if present, including any language tag

package/dist/common/util/file.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cleanMarkdownCodeBlock = exports.ensureDirectoryExists = exports.createSearchReplaceBlock = exports.createMarkdownFileBlock = exports.parseFileBlocksWithoutPath = exports.parseFileBlocks = exports.fileWithNoPathRegex = exports.fileRegex = exports.createFileBlockWithoutPath = exports.createFileBlock = exports.ProjectFileContextSchema = exports.FileVersionSchema = exports.FileTreeNodeSchema = void 0;
+exports.cleanMarkdownCodeBlock = exports.ensureDirectoryExists = exports.ensureEndsWithNewline = exports.createSearchReplaceBlock = exports.createMarkdownFileBlock = exports.parseFileBlocks = exports.fileWithNoPathRegex = exports.fileRegex = exports.createFileBlock = exports.ProjectFileContextSchema = exports.FileVersionSchema = exports.FileTreeNodeSchema = void 0;
 exports.printFileTree = printFileTree;
 exports.printFileTreeWithTokens = printFileTreeWithTokens;
 exports.isValidFilePath = isValidFilePath;
@@ -64,23 +64,18 @@ exports.ProjectFileContextSchema = zod_1.z.object({
     fileVersions: zod_1.z.array(zod_1.z.array(exports.FileVersionSchema)),
 });
 const createFileBlock = (filePath, content) => {
+    const tagName = 'write_file';
     return ('<' +
-        `edit_file path="${filePath}">
+        `${tagName}>
+<path>${filePath}</path>
+<content>
 ${content}
-</edit_file` +
-        '>');
+</content>
+</${tagName}>`);
 };
 exports.createFileBlock = createFileBlock;
-const createFileBlockWithoutPath = (content) => {
-    return ('<' +
-        `edit_file>
-${content}
-</edit_file` +
-        '>');
-};
-exports.createFileBlockWithoutPath = createFileBlockWithoutPath;
-exports.fileRegex = /<edit_file path="([^"]+)">([\s\S]*?)<\/edit_file>/g;
-exports.fileWithNoPathRegex = /<edit_file>([\s\S]*?)<\/edit_file>/g;
+exports.fileRegex = /<write_file>\s*<path>([^<]+)<\/path>\s*<content>([\s\S]*?)<\/content>\s*<\/write_file>/g;
+exports.fileWithNoPathRegex = /<write_file>([\s\S]*?)<\/write_file>/g;
 const parseFileBlocks = (fileBlocks) => {
     let fileMatch;
     const files = {};
@@ -93,16 +88,6 @@ const parseFileBlocks = (fileBlocks) => {
     return files;
 };
 exports.parseFileBlocks = parseFileBlocks;
-const parseFileBlocksWithoutPath = (fileBlocks) => {
-    let fileMatch;
-    const files = [];
-    while ((fileMatch = exports.fileWithNoPathRegex.exec(fileBlocks)) !== null) {
-        const [, fileContent] = fileMatch;
-        files.push(fileContent.startsWith('\n') ? fileContent.slice(1) : fileContent);
-    }
-    return files;
-};
-exports.parseFileBlocksWithoutPath = parseFileBlocksWithoutPath;
 const createMarkdownFileBlock = (filePath, content) => {
     return `\`\`\`${filePath}\n${content}\n\`\`\``;
 };
@@ -152,6 +137,22 @@ function printFileTreeWithTokens(nodes, fileTokenScores, path = []) {
     }
     return result;
 }
+/**
+ * Ensures the given file contents ends with a newline character.
+ * @param contents - The file contents
+ * @returns the file contents with a newline character.
+ */
+const ensureEndsWithNewline = (contents) => {
+    if (contents === null || contents === '') {
+        // Leave empty file as is
+        return contents;
+    }
+    if (contents.endsWith('\n')) {
+        return contents;
+    }
+    return contents + '\n';
+};
+exports.ensureEndsWithNewline = ensureEndsWithNewline;
 const ensureDirectoryExists = (baseDir) => {
     if (!fs.existsSync(baseDir)) {
         fs.mkdirSync(baseDir, { recursive: true });

package/dist/common/util/file.js.map

@@ -1 +1 @@
-{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/util/file.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/util/file.ts"],"names":[],"mappings":"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"}

package/dist/common/util/git.js

@@ -65,7 +65,7 @@ function stageAllChanges() {
 }
 function stagePatches(dir, changes) {
     try {
-        const fileNames = changes.map((change) => change.filePath);
+        const fileNames = changes.map((change) => change.path);
         const existingFileNames = fileNames.filter((filePath) => fs.existsSync(path.join(dir, filePath)));
         if (existingFileNames.length === 0) {
             return false;

package/dist/common/util/git.js.map

@@ -1 +1 @@
-{"version":3,"file":"git.js","sourceRoot":"","sources":["../../src/util/git.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAKA,4CAOC;AAED,4CAMC;AAED,sCAIC;AAED,0CAOC;AAED,oCAiBC;AAtDD,iDAAwC;AACxC,uCAAwB;AACxB,2CAA4B;AAG5B,SAAgB,gBAAgB;IAC9B,IAAI,CAAC;QACH,IAAA,wBAAQ,EAAC,2BAA2B,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAA;QAC1D,OAAO,KAAK,CAAA;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC;AAED,SAAgB,gBAAgB;IAC9B,IAAI,CAAC;QACH,OAAO,IAAA,wBAAQ,EAAC,mBAAmB,CAAC,CAAC,QAAQ,EAAE,CAAA;IACjD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,EAAE,CAAA;IACX,CAAC;AACH,CAAC;AAED,SAAgB,aAAa,CAAC,aAAqB;IACjD,IAAI,CAAC;QACH,IAAA,wBAAQ,EAAC,kBAAkB,aAAa,GAAG,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAA;IACnE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC,CAAA,CAAC;AACpB,CAAC;AAED,SAAgB,eAAe;IAC7B,IAAI,CAAC;QACH,IAAA,wBAAQ,EAAC,YAAY,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;QACzC,OAAO,gBAAgB,EAAE,CAAA;IAC3B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC;AAED,SAAgB,YAAY,CAAC,GAAW,EAAE,OAAoB;IAC5D,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QAC1D,MAAM,iBAAiB,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CACtD,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CACxC,CAAA;QAED,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnC,OAAO,KAAK,CAAA;QACd,CAAC;QAED,IAAA,wBAAQ,EAAC,WAAW,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAA;QAChE,OAAO,gBAAgB,EAAE,CAAA;IAC3B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAA;QAC9C,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC"}
+{"version":3,"file":"git.js","sourceRoot":"","sources":["../../src/util/git.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAKA,4CAOC;AAED,4CAMC;AAED,sCAIC;AAED,0CAOC;AAED,oCAiBC;AAtDD,iDAAwC;AACxC,uCAAwB;AACxB,2CAA4B;AAG5B,SAAgB,gBAAgB;IAC9B,IAAI,CAAC;QACH,IAAA,wBAAQ,EAAC,2BAA2B,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAA;QAC1D,OAAO,KAAK,CAAA;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC;AAED,SAAgB,gBAAgB;IAC9B,IAAI,CAAC;QACH,OAAO,IAAA,wBAAQ,EAAC,mBAAmB,CAAC,CAAC,QAAQ,EAAE,CAAA;IACjD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,EAAE,CAAA;IACX,CAAC;AACH,CAAC;AAED,SAAgB,aAAa,CAAC,aAAqB;IACjD,IAAI,CAAC;QACH,IAAA,wBAAQ,EAAC,kBAAkB,aAAa,GAAG,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAA;IACnE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC,CAAA,CAAC;AACpB,CAAC;AAED,SAAgB,eAAe;IAC7B,IAAI,CAAC;QACH,IAAA,wBAAQ,EAAC,YAAY,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;QACzC,OAAO,gBAAgB,EAAE,CAAA;IAC3B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC;AAED,SAAgB,YAAY,CAAC,GAAW,EAAE,OAAoB;IAC5D,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QACtD,MAAM,iBAAiB,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CACtD,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CACxC,CAAA;QAED,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnC,OAAO,KAAK,CAAA;QACd,CAAC;QAED,IAAA,wBAAQ,EAAC,WAAW,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAA;QAChE,OAAO,gBAAgB,EAAE,CAAA;IAC3B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAA;QAC9C,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC"}

package/dist/common/util/helpers.d.ts

@@ -0,0 +1 @@
+export declare const sleep: (ms: number) => Promise<unknown>;

package/dist/common/util/helpers.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sleep = void 0;
+const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
+exports.sleep = sleep;
+//# sourceMappingURL=helpers.js.map

package/dist/common/util/helpers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/util/helpers.ts"],"names":[],"mappings":";;;AAAO,MAAM,KAAK,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;AAA7D,QAAA,KAAK,SAAwD"}

package/dist/common/util/messages.d.ts

@@ -1,4 +1,4 @@
-import { Message } from '../actions';
+import { Message } from '../types/message';
 /**
  * Limits the total number of screenshots across all messages to maxCount,
  * keeping only the most recent ones.

package/dist/common/util/promise.d.ts

@@ -7,3 +7,11 @@ export declare function withRetry<T>(operation: () => Promise<T>, options?: {
 }): Promise<T>;
 export declare const mapAsync: <T, U>(items: T[], f: (item: T, index: number) => Promise<U>, maxConcurrentRequests?: number) => Promise<U[]>;
 export declare const sleep: (ms: number) => Promise<unknown>;
+/**
+ * Wraps a promise with a timeout
+ * @param promise The promise to wrap
+ * @param timeoutMs Timeout in milliseconds
+ * @param timeoutMessage Optional message for the timeout error
+ * @returns A promise that resolves with the result of the original promise or rejects with a timeout error
+ */
+export declare function withTimeout<T>(promise: Promise<T>, timeoutMs: number, timeoutMessage?: string): Promise<T>;