builder.io 1.6.75 → 1.6.77

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

@@ -1,4 +1,4 @@
-import type { CodeGenTools, ContentMessageItemToolResult, GenerateCompletionStep, ProjectFile } from "$/ai-utils";
+import type { CodeGenTools, CommitMode, ContentMessageItemToolResult, GenerateCompletionStep, ProjectFile } from "$/ai-utils";
 import type { DevToolsSys } from "../core";
 import { type ChildProcessByStdio } from "child_process";
 import type { RunCommandCtx } from "./codegen";
@@ -14,7 +14,6 @@ export interface ToolResolution {
     isError: boolean;
     title?: string;
 }
-export type CommitMode = "commits" | "draft-prs" | "prs";
 export interface FusionContext {
     commandCtx?: RunCommandCtx;
     checkCommand?: string;

package/types/cli/codegen.d.ts

@@ -1,8 +1,8 @@
 import type { DevToolsSys } from "../types";
 import { type Credentials } from "./credentials";
-import type { CodegenFeedback, CodegenTurn, CustomInstruction, GenerateCompletionState, GenerateCompletionStep, GenerateCompletionStepGit, GenerateUserMessage, UserContext } from "$/ai-utils";
+import type { CodegenFeedback, CodegenTurn, CommitMode, CustomInstruction, GenerateCompletionState, GenerateCompletionStep, GenerateCompletionStepGit, GenerateUserMessage, UserContext, WorkspaceConfiguration, WorkspaceFolder } from "$/ai-utils";
 import prettier from "prettier";
-import { type CommitMode, type FusionContext } from "./code-tools";
+import { type FusionContext } from "./code-tools";
 export interface RunCommandCtx {
     command: string;
     state: "running" | "stopped";
@@ -31,13 +31,6 @@ export interface SessionContext {
     createdUnixTime: number;
     updatedUnixTime: number;
 }
-export interface WorkspaceFolder {
-    path: string;
-    name?: string;
-}
-export interface WorkspaceConfiguration {
-    folders: WorkspaceFolder[];
-}
 export interface CodeGenSessionOptionsBase {
     sys: DevToolsSys;
     credentials: Credentials;
@@ -71,13 +64,18 @@ export declare class CodeGenSession {
         error: string;
         details?: undefined;
     } | {
-        success: boolean;
-        error: string;
-        details: string;
-    } | {
+        output: string;
+        upToDate: boolean;
+        createdBranch: boolean;
+        setUpToStream: boolean;
+        status: GenerateCompletionStepGit | null;
         success: boolean;
         error?: undefined;
         details?: undefined;
+    } | {
+        success: boolean;
+        error: string;
+        details: string;
     }>;
     createPR(...args: [
         {
@@ -87,6 +85,11 @@ export declare class CodeGenSession {
             projectId: string;
         }
     ] | [string, string, string, string]): Promise<{
+        output: string;
+        upToDate: boolean;
+        createdBranch: boolean;
+        setUpToStream: boolean;
+        status: GenerateCompletionStepGit | null;
         success: boolean;
         prUrl: any;
         prNumber: any;
@@ -96,12 +99,16 @@ export declare class CodeGenSession {
         success: boolean;
         error: string;
         details: unknown;
-        prUrl?: undefined;
-        prNumber?: undefined;
     }>;
     getCommitMode(): CommitMode | undefined;
     setCommitMode(commitMode: CommitMode): void;
-    pushChanges(pullFirst?: boolean): Promise<void>;
+    pushChanges(pullFirst?: boolean): Promise<{
+        output: string;
+        upToDate: boolean;
+        createdBranch: boolean;
+        setUpToStream: boolean;
+        status: GenerateCompletionStepGit | null;
+    }>;
     hasChangesRelativeToRemote(): Promise<boolean>;
     pullLatestFromRemote(): Promise<void>;
     /**

package/types/cli/index.d.ts

@@ -51,4 +51,8 @@ export interface CLIArgs {
     jsonOutput?: boolean;
     /** Local mode */
     local?: boolean;
+    /** Inlined to builder.config.json file */
+    configJson?: string;
+    /** Server URL */
+    serverUrl?: string;
 }

package/types/cli/launch/InitStateMachine.d.ts

@@ -0,0 +1,92 @@
+import type { DevToolsSys } from "@builder.io/dev-tools/core";
+import { EventEmitter } from "events";
+import type { FusionConfig } from "$/ai-utils";
+export declare enum InitState {
+    IDLE = "IDLE",
+    CHECKING_DIRECTORIES = "CHECKING_DIRECTORIES",
+    CONFIGURING_GIT_REPO = "CONFIGURING_GIT_REPO",
+    CONFIGURING_GIT_USER = "CONFIGURING_GIT_USER",
+    INSTALLING_DEPENDENCIES = "INSTALLING_DEPENDENCIES",
+    STASHING_CHANGES = "STASHING_CHANGES",
+    COMPLETED = "COMPLETED",
+    FAILED = "FAILED",
+    CANCELLED = "CANCELLED"
+}
+export interface InitConfig {
+    fusionConfig: FusionConfig;
+    retryDelayMs?: number;
+    maxRetryDelayMs?: number;
+    sys: DevToolsSys;
+    debug?: boolean;
+}
+export interface InitStatus {
+    state: InitState;
+    progress: number;
+    message: string;
+    error?: string;
+    metadata?: Record<string, any>;
+}
+export interface OperationLogEntry {
+    id: string;
+    operation: string;
+    state: InitState;
+    startTime: number;
+    endTime?: number;
+    duration?: number;
+    status: "started" | "completed" | "failed" | "aborted";
+    error?: string;
+    metadata?: Record<string, any>;
+}
+export interface InitStateMachineEvents {
+    status: (status: InitStatus) => void;
+    operation: (entry: OperationLogEntry) => void;
+    error: (error: string, state: InitState) => void;
+    complete: (success: boolean, finalState: InitState) => void;
+    abort: (state: InitState) => void;
+}
+export interface TypedEventEmitter {
+    on<K extends keyof InitStateMachineEvents>(event: K, listener: InitStateMachineEvents[K]): this;
+    off<K extends keyof InitStateMachineEvents>(event: K, listener: InitStateMachineEvents[K]): this;
+    emit<K extends keyof InitStateMachineEvents>(event: K, ...args: Parameters<InitStateMachineEvents[K]>): boolean;
+}
+export declare class InitStateMachine extends EventEmitter implements TypedEventEmitter {
+    private currentState;
+    private config;
+    private retryCount;
+    private metadata;
+    private abortController;
+    private activeChildProcesses;
+    private readonly baseRetryDelay;
+    private readonly maxRetryDelay;
+    private readonly execAsync;
+    private operationLog;
+    private operationCounter;
+    private readonly repositories;
+    constructor(config: InitConfig);
+    private updateStatus;
+    private sanitizeError;
+    private delay;
+    private calculateRetryDelay;
+    private executeWithRetry;
+    private getProgress;
+    private checkAborted;
+    private checkDirectories;
+    private isGitConfigured;
+    private getGitRemoteUrl;
+    private sanitizeGitRemoteUrl;
+    private cloneRepository;
+    private configureGitRepos;
+    private configureGitUser;
+    private installDependencies;
+    private stashChanges;
+    execute(signal?: AbortSignal): Promise<boolean>;
+    getCurrentState(): InitState;
+    getMetadata(): Record<string, any>;
+    getOperationLog(): OperationLogEntry[];
+    cleanup(): Promise<void>;
+    private startOperation;
+    private completeOperation;
+    private failOperation;
+    private abortOperation;
+    private getPerformanceStats;
+}

package/types/cli/launch/config.d.ts

@@ -0,0 +1,5 @@
+import type { FusionConfig } from "$/ai-utils";
+import type { LaunchArgs } from "../launch";
+import type { InitArgs } from "../launch-init";
+import type { DevToolsSys } from "types";
+export declare function getFusionConfig(sys: DevToolsSys, args: LaunchArgs & InitArgs): Promise<FusionConfig>;

package/types/cli/launch-init-v2.d.ts

@@ -0,0 +1,13 @@
+import type { DevToolsSys } from "@builder.io/dev-tools/core";
+import type { CLIArgs } from "./index";
+export interface InitArgs extends CLIArgs {
+    repoFullName?: string;
+    branchName?: string;
+    githubToken?: string;
+    installCommand?: string;
+    dockerImageType?: "fusion-starter" | "node";
+}
+export declare function runLaunchInitCommandV2({ args, sys, }: {
+    sys: DevToolsSys;
+    args: InitArgs;
+}): Promise<number>;

package/types/cli/launch.d.ts

@@ -1,13 +1,10 @@
 import type { DevToolsSys } from "@builder.io/dev-tools/core";
 import type { CLIArgs } from "./index";
-import { type WorkspaceConfiguration } from "./codegen";
-import { type CommitMode } from "./code-tools";
 /**
  * Large random-ish port number that is unlikely to be used
  */
 export declare const PROXY_PORT = 48752;
 export interface LaunchArgs extends CLIArgs {
-    cwdAgent?: string;
     /** Project ID for the dev server. Only needed when running in a remote container. */
     projectId?: string;
     /** Silent mode for launch command */
@@ -20,6 +17,8 @@ export interface LaunchArgs extends CLIArgs {
     command?: string;
     /** Dev server command to execute (shorthand) */
     c?: string;
+    /** Dev server URL to proxy to (alternative to command + port) */
+    serverUrl?: string;
     /** Use development server instead of production for launch command */
     dev?: boolean;
     /** Skip browser auto-open (flag form) */
@@ -58,17 +57,6 @@ export interface LaunchArgs extends CLIArgs {
      */
     local?: boolean;
 }
-export interface FusionConfig {
-    command: string;
-    projectId?: string;
-    checkCommand?: string;
-    workingDirectory: string;
-    workspace?: WorkspaceConfiguration | string;
-    authenticateProxy: boolean;
-    allowedCommands: string[];
-    commitMode: CommitMode;
-    serverUrl: string;
-}
 export declare function runFusionCommand({ sys, args, }: {
     sys: DevToolsSys;
     args: LaunchArgs;