builder.io 1.6.97 → 1.6.99

package/types/cli/codegen.d.ts

@@ -1,6 +1,6 @@
 import type { DevToolsSys } from "../types";
 import { type Credentials } from "./credentials";
-import type { CodegenFeedback, CodegenTurn, CommitMode, CustomInstruction, GenerateCompletionState, GenerateCompletionStep, GenerateCompletionStepGit, GenerateUserMessage, UserContext, WorkspaceConfiguration, WorkspaceFolder } from "$/ai-utils";
+import type { CodegenFeedback, CodegenTurn, CommitMode, CustomInstruction, GenerateCompletionState, GenerateCompletionStep, GenerateCompletionStepGit, GenerateUserMessage, UserContext, WorkspaceConfiguration, WorkspaceFolder, LoadWholeSessionOptions, LoadWholeSessionResult, LoadHistoryResult } from "$/ai-utils";
 import prettier from "prettier";
 import { type FusionContext } from "./code-tools";
 import EventEmitter from "node:events";
@@ -46,18 +46,8 @@ export declare class CodeGenSession {
     constructor(options: CodeGenSessionOptions);
     get workingDirectory(): string;
     initializeSession(): Promise<void>;
-    loadWholeSession(opts?: {
-        linear?: boolean;
-        getAll?: boolean;
-    }): Promise<{
-        sessionId: string;
-        title: string | undefined;
-        beforeCommit: string | undefined;
-        createdUnixTime: number;
-        updatedUnixTime: number;
-        addedTurns: number;
-        turns: CodegenTurn[];
-    }>;
+    loadHistory(): Promise<LoadHistoryResult>;
+    loadWholeSession(opts?: LoadWholeSessionOptions): Promise<LoadWholeSessionResult>;
     loadMoreTurns(): Promise<CodegenTurn[]>;
     setRepoUrl(repoUrl: string): void;
     getRepoUrl(): string | undefined;
@@ -116,6 +106,15 @@ export declare class CodeGenSession {
     }>;
     hasChangesRelativeToRemote(): Promise<boolean>;
     pullLatestFromRemote(): Promise<void>;
+    syncChangesFromMain(mainBranchName: string): Promise<{
+        success: boolean;
+        message: string;
+        conflicts?: undefined;
+    } | {
+        success: boolean;
+        conflicts: boolean;
+        message: string;
+    }>;
     /**
      * Get the current commit hash
      */
@@ -151,9 +150,19 @@ export declare class CodeGenSession {
      * @param dryRun If true, only simulate the restoration without making changes
      * @returns Array of file paths that were changed
      */
-    restore(location: "before" | "after", predicate: (turn: CodegenTurn | null, index: number) => boolean, dryRun?: boolean): Promise<string[] | null>;
+    restore({ location, predicate, dryRun, forceReplay, }: {
+        location: "before" | "after";
+        predicate: (turn: CodegenTurn | null, index: number) => boolean;
+        dryRun?: boolean;
+        forceReplay?: boolean;
+    }): Promise<string[] | null>;
     restoreHEAD(): Promise<string[] | null>;
     restoreAll(): Promise<string[] | null>;
+    restoreFromCompletionId({ location, completionId, forceReplay, }: {
+        location: "before" | "after";
+        completionId: string;
+        forceReplay?: boolean;
+    }): Promise<string[] | null>;
     restoreBeforeCompletionId(completionId: string): Promise<string[] | null>;
     /**
      * Undo all changes back to the last user message

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

@@ -1,108 +1,64 @@
 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"
-}
+import type { FusionConfig, WorkspaceFolder } from "$/ai-utils";
 export interface InitConfig {
     fusionConfig: FusionConfig;
-    retryDelayMs?: number;
-    maxRetryDelayMs?: number;
     sys: DevToolsSys;
     debug?: boolean;
     runSetupCommand: boolean;
 }
-export declare enum InitErrorType {
-    FATAL = "fatal",
-    SOFT_ERROR = "soft-error",
-    HARD_ERROR = "hard-error"
-}
-export interface InitError {
-    userMessage: string;
-    contextForLLMs?: string;
-    type: InitErrorType;
-}
-export interface InitExecutionResult {
-    success: boolean;
-    errors: InitError[];
-}
 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;
+declare enum InitStateStep {
+    Init = "init",
+    Validation = "validation",
+    CheckDirectories = "check-directories",
+    CreateDirectories = "create-directories",
+    ConfigureGitRepos = "configure-git-repos",
+    CheckExistingGit = "check-existing-git",
+    UpdateRemoteUrl = "update-remote-url",
+    CloneRepo = "clone-repo",
+    ConfigureGitUser = "configure-git-user",
+    InstallDependencies = "install-dependencies",
+    StashChanges = "stash-changes",
+    InitSuccess = "init-success",
+    InitFailed = "init-failed"
 }
-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 interface InitStatusLog {
+    id: number;
+    timestamp: string;
+    type: "status" | "log" | "error" | "complete";
+    message: string;
+    step?: InitStateStep;
+    error?: string;
+    success?: 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;
-    private allInitErrors;
-    constructor(config: InitConfig);
-    private updateStatus;
-    private sanitizeError;
-    private delay;
-    private calculateRetryDelay;
-    private executeWithRetry;
-    private getProgress;
-    private checkAborted;
-    private checkDirectories;
+export declare class InitStateMachine {
+    logIdCounter: number;
+    initStatusLogs: InitStatusLog[];
+    initState: {
+        isRunning: boolean;
+        isComplete: boolean;
+        success: boolean;
+        currentStep: string;
+        error: string | undefined;
+    };
+    init(config: InitConfig, signal?: AbortSignal): Promise<boolean>;
+    addInitLog(type: "status" | "log" | "error" | "complete", message: string, options?: {
+        step?: InitStateStep;
+        error?: string;
+        success?: boolean;
+    }): void;
+    clearInitLogs(): void;
+    step1CheckDirectories(config: InitConfig, repositories: Required<WorkspaceFolder>[], signal?: AbortSignal): Promise<void>;
+    step2ConfigureGitRepositories(config: InitConfig, repositories: Required<WorkspaceFolder>[], signal?: AbortSignal): Promise<void>;
+    step3ConfigureGitUser(config: InitConfig, repositories: Required<WorkspaceFolder>[], signal?: AbortSignal): Promise<void>;
+    step4InstallDependencies(config: InitConfig, signal?: AbortSignal): Promise<void>;
+    step5StashChanges(config: InitConfig, repositories: Required<WorkspaceFolder>[], signal?: AbortSignal): Promise<void>;
     private isGitConfigured;
     private getGitRemoteUrl;
     private sanitizeGitRemoteUrl;
-    private cloneRepository;
-    private configureGitRepos;
-    private configureGitUser;
-    private installDependencies;
-    private stashChanges;
-    execute(signal?: AbortSignal): Promise<InitExecutionResult>;
-    getCurrentState(): InitState;
-    getMetadata(): Record<string, any>;
-    getOperationLog(): OperationLogEntry[];
-    cleanup(): Promise<void>;
-    private startOperation;
-    private completeOperation;
-    private failOperation;
-    private abortOperation;
-    private getPerformanceStats;
+    cloneRepository(repo: Required<WorkspaceFolder>, repoPath: string, debug?: boolean, signal?: AbortSignal): Promise<boolean>;
 }
+export {};

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

@@ -1,4 +1,5 @@
 import { type Express } from "express";
+import type { InitStateMachine } from "./InitStateMachine";
 export declare const BUILDER_ENDPOINT_PREFIX = "/_builder.io";
 export declare const BUILDER_API_ENDPOINT_PREFIX: string;
 /**
@@ -7,10 +8,12 @@ export declare const BUILDER_API_ENDPOINT_PREFIX: string;
 export declare const NON_AUTHENTICATED_ENDPOINTS: {
     readonly STATUS: "/status";
     readonly PROXY_STATUS: "/proxy-status";
+    readonly STATUS_V2: "/status-v2";
 };
-export declare const configureServer: ({ app, validBuilderPrivateKey, authenticateProxy, isLocal, }: {
+export declare const configureServer: ({ app, validBuilderPrivateKey, authenticateProxy, isLocal, initStateMachine, }: {
     app: Express;
     validBuilderPrivateKey: string | undefined;
     authenticateProxy: boolean;
     isLocal: boolean;
+    initStateMachine?: InitStateMachine;
 }) => void;

package/types/cli/utils/repo-indexing-group-prompts.d.ts

@@ -1 +1 @@
-export declare const REPO_INDEXING_GROUP_PROMPT = "# Component Repository Analysis and Grouping\n\n## Objective\nAnalyze the repository to identify and categorize components based on **mandatory architectural interdependency**, creating groups ONLY when components literally cannot function independently and MUST be used together.\n\n## Component Grouping Philosophy - STRICT CRITERIA\n\n### ONLY Group Components That Meet ALL These Requirements:\n\n1. **Mandatory Compositional Architecture**\n   - Components that literally cannot render or function without their counterparts\n   - Parent components that are meaningless without specific child components\n   - Child components that will throw errors or fail without their required parent\n   - Example: `Table` requires `TableHeader`, `TableBody`, `TableRow`, `TableCell` to be functional\n\n2. **Exclusive Required Context Dependencies**\n   - Components that share context where the context is NOT optional\n   - Child components that will fail without the parent's required context\n   - Components with hard-coded provider-consumer relationships that cannot be bypassed\n   - Example: `FormField` + `FormLabel` + `FormControl` sharing required form context\n\n3. **Critical Runtime Dependencies**\n   - Components that reference each other's internal APIs or state directly\n   - Components that communicate through required internal protocols\n   - Components where removing one breaks the others at runtime\n\n### What MUST REMAIN SEPARATE - Even If They Share Code\n\n**Shared Infrastructure \u2260 Interdependency**\n- AreaChart, BarChart, LineChart are SEPARATE even if they use shared cartesian infrastructure\n- Each chart can render independently without the others\n- Shared internal components are implementation details, not architectural coupling\n\n**Thematic Similarity \u2260 Coupling**  \n- Button, IconButton, ToggleButton stay separate (each works alone)\n- Input, Select, TextArea stay separate (independent form controls)\n- Card, Panel, Modal stay separate (independent containers)\n\n**Optional Composition \u2260 Required Composition**\n- Components that CAN work together but don't HAVE to\n- Components where composition is for convenience, not necessity\n\n## Strict Validation Test\nBefore grouping ANY components, ask these questions. ALL must be \"YES\":\n\n1. **Removal Test**: If I remove one component from this group, do the others become non-functional or throw errors?\n2. **Independence Test**: Can ANY component in this group render successfully in complete isolation?\n3. **Context Test**: Do these components share context that is absolutely required (not optional)?\n4. **API Test**: Do these components directly call each other's methods or access each other's internal state?\n\nIf ANY answer is \"NO\" \u2192 DO NOT GROUP\n\n## Examples of CORRECT Grouping\n\n** Table Group** (Critical Coupling)\n```json\n{\n  \"name\": \"Table\",\n  \"components\": [\"Table\", \"TableHeader\", \"TableBody\", \"TableRow\", \"TableCell\"],\n}\n```\nWhy: Table component cannot render without TableHeader, TableBody, etc. Each piece is meaningless alone.\n\n**Form Field Group** (Strong Coupling)  \n```json\n{\n  \"name\": \"FormField\", \n  \"components\": [\"FormField\", \"FormLabel\", \"FormControl\", \"FormMessage\"]\n}\n```\nWhy: These share required form context and cannot function independently.\n\n## Examples of INCORRECT Grouping\n\n** Charts Group** (Shared Infrastructure \u2260 Coupling)\n```json\n// WRONG - Don't do this\n{\n  \"name\": \"Charts\",\n  \"components\": [\"AreaChart\", \"BarChart\", \"LineChart\", \"PieChart\"]\n}\n```\nWhy: Each chart renders independently. Shared infrastructure is an implementation detail.\n\n** Button Group** (Thematic Similarity \u2260 Coupling)\n```json\n// WRONG - Don't do this  \n{\n  \"name\": \"Buttons\",\n  \"components\": [\"Button\", \"IconButton\", \"ToggleButton\"]\n}\n```\nWhy: Each button type works completely independently.\n\n## Default Assumption: KEEP SEPARATE\n- When in doubt, create separate groups for each component\n- Err on the side of independence rather than grouping\n- Most components should end up in individual groups\n\n## Instructions\n\n### 1. Component Discovery\n{{component-discovery}}\n\n### 2. Interdependency Analysis\nFor each component, analyze:\n- **Required Dependencies**: What other components MUST be present for this to work?\n- **Context Requirements**: Does this component require specific context providers?\n- **Compositional Rules**: Are there mandatory parent-child relationships?\n- **Shared State**: Do components communicate through shared internal state?\n\n### 3. Coupling Strength Assessment\nEvaluate coupling strength:\n- **Critical Coupling**: Components cannot function without each other\n- **Strong Coupling**: Components are designed to work together with shared context\n- **Moderate Coupling**: Components enhance each other but can work independently\n- **Weak Coupling**: Components are thematically related but functionally independent\n\n### 4. Group Formation Rules\n- **Group together**: Components with Critical or Strong coupling\n- **Consider grouping**: Components with Moderate coupling (case-by-case basis)\n- **Keep separate**: Components with Weak coupling or functional independence\n\n### 5. Relevant Files Collection\nFor each group, include:\n- Primary component files (.tsx, .ts)\n- Context providers or shared state files\n- Type definition files specific to the group\n- Hook files that bind the components together\n- Test files that test the group as a unit\n- Documentation files specific to the group\n- Example files showing the components working together\n\n## Required Output Format\n\nGenerate a component-groups.json file with this structure:\n\n```json\n{{output-format}}\n```\n\n### Coupling Strength Definitions:\n- **\"critical\"**: Components cannot function without each other (Table group)\n- **\"strong\"**: Components share exclusive context/state (Form group)  \n- **\"moderate\"**: Components enhance each other but can work alone (ButtonGroup + Button)\n- **\"none\"**: Component is functionally independent (standalone Button)\n\n## Quality Requirements\n\n**Be Conservative:**\n- Prefer individual component groups over multi-component groups\n- Only group when there's undeniable architectural interdependency\n- Most components should be individual groups\n\n**Component Coverage:**\n{{component-coverage}}\n- Every component must appear in exactly one group\n- Prefer smaller, focused groups over large, loosely-coupled groups\n- Create individual groups for truly independent components\n\n**Grouping Validation:**\nFor each proposed group, ask:\n1. Would removing any component make the others useless or broken?\n2. Is there a required parent-child rendering relationship?\n3. Do they share mandatory (not optional) context or state?\n\nIf you can't answer \"YES\" confidently to at least one of these, keep components separate.\n\n**File Selection:**\n- Include files that are essential to understanding the group's architecture\n- Focus on files that show interdependencies between components\n- Include context providers, shared hooks, and type definitions\n- Exclude generic utility files unless they're group-specific\n\n## Anti-Patterns to Avoid\n\n**Don't group by theme alone**\n- Wrong: Group Button, IconButton, ToggleButton because they're all \"buttons\"\n- Right: Keep them separate because each works independently\n\n**Don't create mega-groups**  \n- Wrong: Group all form-related components together\n- Right: Group only those that share context (FormField + FormLabel + FormControl)\n\n**Don't group by visual similarity**\n- Wrong: Group Card, Panel, Container because they're all \"containers\"  \n- Right: Keep separate because they serve different architectural purposes\n\n**Don't group by shared infrastructure**\n- Wrong: Group AreaChart, BarChart, LineChart because they use shared cartesian components\n- Right: Keep separate because each chart works independently\n\n## Output Requirements\n- Return ONLY the JSON array\n- No additional commentary or explanation\n- Ensure valid JSON format\n- Include all required fields for each group\n- Validate that every component appears exactly once\n- Most groups should contain only one component";
+export declare const REPO_INDEXING_GROUP_PROMPT: string;

package/types/figma/index.d.ts

@@ -6,6 +6,7 @@ export interface FigmaNode {
     $name: string;
     $type: FigmaNodeType;
     $inputs: readonly FigmaComponentInput[];
+    inputs: readonly FigmaComponentInput[];
     $componentName?: string;
     $rawNode: SceneNode;
     /** Represents the text content of the node and its descendants */
@@ -38,6 +39,7 @@ export interface BaseFigmaProps {
     $imageUrl: string;
     /** Direct children of the root component node or instance */
     $children: readonly FigmaNode[];
+    $getInputs: () => readonly FigmaComponentInput[];
     /** Recursively finds the first figma child with the given name */
     $findOneByName(name: string | RegExp): FigmaNode | undefined;
     /** Recursively finds the first node that matches the callback */