builder.io 1.11.12 → 1.11.13

package/types/cli/backup.d.ts

@@ -17,6 +17,7 @@ interface BackupGitRepoOptions {
     isConnectedToProvider: boolean;
     debug: boolean;
     forcedFullBackup: boolean;
+    canAbortMerge: boolean;
 }
 /**
  * Creates a backup of git repository changes made by the AI system.
@@ -30,10 +31,10 @@ interface BackupGitRepoOptions {
  * The aiBranch is where the AI creates commits as work progresses, while featureBranch
  * is the base branch where work started (usually "main").
  */
-export declare function backupGitRepo({ sys, credentials, projectId, branchName, repoPath, aiBranch, featureBranch, workspace, isConnectedToProvider, debug, forcedFullBackup, }: BackupGitRepoOptions): Promise<BackupGitRepoResult>;
+export declare function backupGitRepo({ sys, credentials, projectId, branchName, repoPath, aiBranch, featureBranch, workspace, isConnectedToProvider, debug, forcedFullBackup, canAbortMerge, }: BackupGitRepoOptions): Promise<BackupGitRepoResult>;
 type InitialCommitHashResult = {
     initialBranch: string;
-    initialCommitHash: undefined;
+    initialCommitHash: string | undefined;
     partial: false;
     forcedFullBackup: true;
 } | {

package/types/cli/code-tools.d.ts

@@ -1,4 +1,4 @@
-import type { CodeGenPosition, CodeGenTools, CodegenTurn, ContentMessageItemToolResult, FusionConfig, GenerateCompletionStep, ProjectFile, UserSource, WorkspaceFolder } from "$/ai-utils";
+import type { AccessResult, CodeGenPosition, CodeGenTools, CodegenTurn, ContentMessageItemToolResult, FusionConfig, GenerateCompletionStep, Permission, ProjectFile, UserSource, WorkspaceFolder } from "$/ai-utils";
 import type { DevToolsSys } from "../core";
 import { type DevServerOrchestrator } from "./launch/dev-server-orchestrator";
 import type { CodeGenEventEmitter } from "./codegen";
@@ -61,10 +61,16 @@ export interface ToolContext extends Partial<FusionContext> {
     patchFusionConfig: (patch: Partial<FusionConfig>) => void;
     passThrough: (toolCall: LLMToolCalls, signal: AbortSignal) => Promise<ToolResolution>;
     readFile: (filePath: string) => Promise<string | null>;
-    writeFile: (filePath: string, content: string | Uint8Array) => Promise<boolean>;
-    deleteFile: (filePath: string) => Promise<boolean>;
-    fileExists: (filePath: string) => Promise<boolean>;
+    writeFile: (filePath: string, content: string | Uint8Array) => Promise<string | null>;
+    deleteFile: (filePath: string) => Promise<string | null>;
+    fileExists: (filePath: string) => Promise<{
+        absolutePath: string | undefined;
+        recommendedPath: string | undefined;
+        workspaceFolder: WorkspaceFolder | undefined;
+        virtual: boolean;
+    }>;
     listDir: (dirPath: string) => Promise<string[]>;
+    evaluateAccess: (resource: string, permission: Permission) => AccessResult;
     stat: (filePath: string) => Promise<{
         isDirectory: () => boolean;
         isFile: () => boolean;

package/types/cli/codegen.d.ts

@@ -63,6 +63,16 @@ export declare class CodeGenSession {
         success: boolean;
         error: string;
         details?: undefined;
+    } | {
+        success: boolean;
+        message: string;
+        output?: undefined;
+        upToDate?: undefined;
+        createdBranch?: undefined;
+        setUpToStream?: undefined;
+        status?: undefined;
+        error?: undefined;
+        details?: undefined;
     } | {
         output: string;
         upToDate: boolean;
@@ -70,6 +80,7 @@ export declare class CodeGenSession {
         setUpToStream: boolean;
         status: GenerateCompletionStepGit | null;
         success: boolean;
+        message?: undefined;
         error?: undefined;
         details?: undefined;
     } | {
@@ -87,11 +98,21 @@ export declare class CodeGenSession {
     }>;
     getCommitMode(): import("$/ai-utils").CommitMode;
     pushChanges(pullFirst?: boolean): Promise<{
+        success: boolean;
+        message: string;
+        output?: undefined;
+        upToDate?: undefined;
+        createdBranch?: undefined;
+        setUpToStream?: undefined;
+        status?: undefined;
+    } | {
         output: string;
         upToDate: boolean;
         createdBranch: boolean;
         setUpToStream: boolean;
         status: GenerateCompletionStepGit | null;
+        success?: undefined;
+        message?: undefined;
     }>;
     hasChangesRelativeToRemote(): Promise<boolean>;
     pullLatestFromRemote(): Promise<{
@@ -103,11 +124,32 @@ export declare class CodeGenSession {
         conflicts: boolean;
         message: string;
     }>;
+    abortMerge(emitStatus?: boolean): Promise<{
+        success: boolean;
+        message: string;
+    }>;
+    syncChangesFromRemote(): Promise<{
+        success: boolean;
+        message: string;
+        conflicts?: undefined;
+    } | {
+        success: boolean;
+        conflicts: boolean;
+        message: string;
+    }>;
     syncChangesFromMain(arg: string | {
         mainBranchName: string;
         allowUnrelatedHistory?: boolean;
         pullCurrentBranch?: boolean;
-    }): Promise<void>;
+    }): Promise<{
+        success: boolean;
+        message: string;
+        conflicts?: undefined;
+    } | {
+        success: boolean;
+        conflicts: boolean;
+        message: string;
+    }>;
     /**
      * Get the current commit hash
      */
@@ -242,7 +284,7 @@ export declare class CodeGenSession {
     connectToEventLoop(shouldReplay: boolean, onStep: (step: GenerateCompletionStep) => void): () => void;
     waitUntilIdle(): Promise<void>;
     waitForEventLoop(): Promise<void>;
-    commitWorkInProgress(lastTurn: CodegenTurn): Promise<string | undefined>;
+    commitWorkInProgress(lastTurn: CodegenTurn, changedFiles: string[]): Promise<string | false | undefined>;
     getChangesReport(): Promise<{
         diff: string;
         files: string[];
@@ -275,7 +317,12 @@ export declare class CodeGenSession {
      * @param filePath A file path that may include a workspace prefix
      * @returns True if the file exists, false otherwise
      */
-    fileExists(filePath: string): Promise<boolean>;
+    fileExists(filePath: string): Promise<{
+        absolutePath: string | undefined;
+        recommendedPath: string | undefined;
+        workspaceFolder: WorkspaceFolder | undefined;
+        virtual: boolean;
+    }>;
     /**
      * Reads a file from the workspace synchronously
      * @param filePath A file path that may include a workspace prefix
@@ -288,7 +335,7 @@ export declare class CodeGenSession {
      * @param content The content to write
      * @returns True if the write was successful, false otherwise
      */
-    writeFile(filePath: string, content: string | Uint8Array): Promise<boolean>;
+    writeFile(filePath: string, content: string | Uint8Array): Promise<string | null>;
     /**
      * Lists files in a directory in the workspace
      * @param dirPath A directory path that may include a workspace prefix
@@ -300,7 +347,7 @@ export declare class CodeGenSession {
      * @param filePath A file path that may include a workspace prefix
      * @returns The file stats or null if the file doesn't exist
      */
-    stat(filePath: string): Promise<{
+    stat(filePath: string, skipAclCheck?: boolean): Promise<{
         isDirectory: () => boolean;
         isFile: () => boolean;
     } | null>;
@@ -309,7 +356,7 @@ export declare class CodeGenSession {
      * @param filePath A file path that may include a workspace prefix
      * @returns True if the delete was successful, false otherwise
      */
-    deleteFile(filePath: string): Promise<boolean>;
+    deleteFile(filePath: string): Promise<string | null>;
     getLinesStats(): {
         net: number;
         added: number;