builder.io 1.11.31 → 1.11.32

package/types/cli/codegen.d.ts

@@ -1,6 +1,6 @@
 import type { DevToolsSys } from "../types";
 import { type Credentials } from "./credentials";
-import type { CodegenFeedback, CodeGenToolMap, CodegenTurn, CustomInstruction, FusionConfig, GenerateCompletionState, GenerateCompletionStep, GenerateCompletionStepGit, GenerateUserMessage, UserContext, WorkspaceConfiguration, WorkspaceFolder, LoadWholeSessionOptions, LoadWholeSessionResult, LoadHistoryResult, CodeGenMode, ApplyActionsResult, PrivacyMode, CodeGenPosition, BackupGitRepoResult } from "$/ai-utils";
+import type { CodegenFeedback, CodeGenToolMap, CodegenTurn, CustomInstruction, FusionConfig, GenerateCompletionState, GenerateCompletionStep, GenerateCompletionStepGit, GenerateUserMessage, UserContext, WorkspaceConfiguration, WorkspaceFolder, LoadWholeSessionOptions, LoadWholeSessionResult, LoadHistoryResult, CodeGenMode, ApplyActionsResult, PrivacyMode, CodeGenPosition, BackupGitRepoResult, PushChangesArgs, CodegenApiResult } from "$/ai-utils";
 import prettier from "prettier";
 import { type FusionContext, type ToolResolution } from "./code-tools";
 import EventEmitter from "node:events";
@@ -60,35 +60,7 @@ export declare class CodeGenSession {
     pushRepoV2(repoInfo: {
         repoFullName: string;
         repoUrl: string;
-    }): Promise<{
-        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;
-        createdBranch: boolean;
-        setUpToStream: boolean;
-        status: GenerateCompletionStepGit | null;
-        success: boolean;
-        message?: undefined;
-        error?: undefined;
-        details?: undefined;
-    } | {
-        success: boolean;
-        error: string;
-        details: string;
-    }>;
+    }): Promise<CodegenApiResult>;
     zipFolder(folderName: string): Promise<string>;
     archiveProject(): Promise<string>;
     isIdle(): boolean;
@@ -98,59 +70,10 @@ export declare class CodeGenSession {
         error: Error;
     }>;
     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<{
-        success: boolean;
-        message: string;
-        conflicts?: undefined;
-    } | {
-        success: boolean;
-        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<{
-        success: boolean;
-        message: string;
-        conflicts?: undefined;
-    } | {
-        success: boolean;
-        conflicts: boolean;
-        message: string;
-    }>;
+    pushChanges(opts: PushChangesArgs): Promise<CodegenApiResult>;
+    pullLatestFromRemote(): Promise<CodegenApiResult>;
+    abortMerge(emitStatus?: boolean): Promise<CodegenApiResult>;
+    syncChangesFromRemote(): Promise<CodegenApiResult>;
     /**
      * Get the current commit hash
      */
@@ -165,13 +88,6 @@ export declare class CodeGenSession {
      */
     getAiBranch(): string;
     git(args: string[], opts?: string | RunCommandOptions): Promise<string>;
-    /**
-     * Helper to run git commands
-     */
-    runCheckCommand(): Promise<{
-        code: number;
-        logs: string;
-    } | null>;
     setDebug(debug: boolean): void;
     getAllFiles(options?: {
         getDotFiles?: boolean;
@@ -202,14 +118,6 @@ export declare class CodeGenSession {
         undone: string[] | null;
         message: string;
     }>;
-    restoreHEAD(): Promise<{
-        undone: string[] | null;
-        message: string;
-    }>;
-    restoreAll(): Promise<{
-        undone: string[] | null;
-        message: string;
-    }>;
     restoreFromCompletionId({ location, completionId, forceReplay, }: {
         location: "before" | "after";
         completionId: string;
@@ -423,7 +331,8 @@ export declare class BashError extends Error {
     readonly code: number | string | undefined;
     readonly stdout: string;
     readonly stderr: string;
-    constructor(message: string, code: number | string | undefined, stdout: string, stderr: string, opts: {
+    readonly command: string;
+    constructor(command: string, code: number | string | undefined, stdout: string, stderr: string, opts?: {
         cause?: Error;
     });
 }