@builder.io/dev-tools 1.21.15 → 1.21.16

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, SessionMode, UserContext, UserSource, WorkspaceFolder, LoadWholeSessionOptions, LoadWholeSessionResult, LoadHistoryResult, CodeGenMode, ApplyActionsResult, PrivacyMode, CodeGenPosition, BackupGitRepoResult, SuggestedActionBuildError, PushChangesArgs, CodegenApiResult, CodegenApiTerminal, ConfigureDevOrchestratorOpts, ConfigureDevOrchestratorUpdates, RepoMetrics, FolderWatchEvent, MCPServerConfig, CodegenApiCreateTerminal, SyncChangesFromRemote, SearchFilesOptions, SearchFilesResult, SearchFileTreeOptions, SearchFileTreeResult, ExplorationMetadataToolInput, CodegenAbortOptions, MessageUpdateOptions, SystemReminderObj } from "$/ai-utils";
+import type { CodegenFeedback, CodeGenToolMap, CodegenTurn, CustomInstruction, FusionConfig, GenerateCompletionState, GenerateCompletionStep, GenerateCompletionStepGit, GenerateUserMessage, SessionMode, UserContext, UserSource, WorkspaceFolder, LoadWholeSessionOptions, LoadWholeSessionResult, LoadHistoryResult, CodeGenMode, ApplyActionsResult, PrivacyMode, CodeGenPosition, BackupGitRepoResult, SuggestedActionBuildError, PushChangesArgs, CodegenApiResult, CodegenApiTerminal, ConfigureDevOrchestratorOpts, ConfigureDevOrchestratorUpdates, RepoMetrics, FolderWatchEvent, MCPServerConfig, CodegenApiCreateTerminal, SyncChangesFromRemote, SearchFilesOptions, SearchFilesResult, SearchFileTreeOptions, SearchFileTreeResult, ExplorationMetadataToolInput, CodegenAbortOptions, MessageUpdateOptions, GitRepoContext, SystemReminderObj } from "$/ai-utils";
 import { type FusionContext, type ToolResolution } from "./code-tools";
 import { type SubAgent } from "./utils/agent-discovery";
 import EventEmitter from "node:events";
@@ -12,6 +12,12 @@ export interface SyncChangesFromBranches {
     allowUnrelatedHistory: boolean;
     fastForward: "never" | "required" | "auto";
     requestRefresh?: boolean;
+    /**
+     * When true, compute the remote branch per-repo using #getRemoteBranch(ctx)
+     * instead of using the passed branches array. This handles multi-repo
+     * scenarios where each repo may have a different feature branch.
+     */
+    syncRemoteBranch?: boolean;
 }
 export interface SessionContext {
     sessionId: string;
@@ -77,7 +83,12 @@ export declare class CodeGenSession {
     #private;
     constructor(options: CodeGenSessionOptions);
     get fusionConfig(): FusionConfig | undefined;
+    /** Returns the first git-enabled folder for backwards compatibility */
     get gitEnabledFolder(): WorkspaceFolder | undefined;
+    /** Returns all git-enabled folders */
+    get gitEnabledFolders(): WorkspaceFolder[];
+    /** Returns runtime git repo contexts for all enabled repos */
+    get gitRepoContexts(): readonly GitRepoContext[];
     get workingDirectory(): string;
     getSessionMode(): SessionMode;
     switchSessionMode(newMode: SessionMode): Promise<void>;
@@ -117,8 +128,8 @@ export declare class CodeGenSession {
     /**
      * Get the current commit hash
      */
-    getCurrentCommitHash(branchName?: string): Promise<string | undefined>;
-    getCurrentBranch(): Promise<string>;
+    getCurrentCommitHash(branchName?: string, repoPath?: string): Promise<string | undefined>;
+    getCurrentBranch(repoPath?: string): Promise<string>;
     /**
      * Get the feature branch name
      */
@@ -127,7 +138,7 @@ export declare class CodeGenSession {
      * Get the AI branch name
      */
     getAiBranch(): string;
-    git(args: string[], opts?: string | RunCommandOptions): Promise<string>;
+    git(args: string[], opts?: string | Partial<RunCommandOptions>): Promise<string>;
     setDebug(debug: boolean): void;
     createTerminal(options?: CodegenApiCreateTerminal): Promise<CodegenApiTerminal>;
     emitTerminals(): void;
@@ -177,6 +188,7 @@ export declare class CodeGenSession {
     searchFileTree(options: SearchFileTreeOptions): Promise<SearchFileTreeResult>;
     collectRepoMetrics(opts?: {
         rootPath?: string;
+        folderName?: string;
     }): Promise<RepoMetrics>;
     getSessionId(): string;
     getSpaceId(): string | undefined;
@@ -312,6 +324,7 @@ export declare class CodeGenSession {
     manualCommit(options: {
         add: string;
         commitMessage: string;
+        folderName?: string;
     }): Promise<boolean>;
     getLastSuggestedAction(): SuggestedActionBuildError | undefined;
     connectToEventLoop(shouldReplay: boolean, onStep: (step: GenerateCompletionStep) => void): () => void;
@@ -319,12 +332,12 @@ export declare class CodeGenSession {
     waitUntilBlockingPendingPromises(signal?: AbortSignal): Promise<void>;
     waitUntilIdle(signal?: AbortSignal): Promise<void>;
     waitForEventLoop(): Promise<void>;
-    commitWorkInProgress(lastTurn: CodegenTurn, changedFiles: string[]): Promise<string | false | undefined>;
+    commitWorkInProgress(lastTurn: CodegenTurn, changedFiles: string[]): Promise<string | false>;
     getChangesReport(): Promise<{
         diff: string;
         files: string[];
     } | undefined>;
-    isCleanWorkTree(): Promise<boolean>;
+    isCleanWorkTree(repoPath?: string): Promise<boolean>;
     /**
      * Resolves a workspace file path to its actual file system path
      * @param filePath A file path that may include a workspace prefix (e.g., "workspace1/path/to/file.js")
@@ -368,23 +381,33 @@ export declare class CodeGenSession {
      * @param gitRef - The git reference (branch, commit, tag) - defaults to parent branch
      * @returns The file content at that reference, or null if not found
      */
-    getFileAtRef(filePath: string, gitRef?: string): Promise<string | null>;
+    getFileAtRef(filePath: string, gitRef?: string, repoPathOverride?: string): Promise<string | null>;
     /**
      * Gets the diff information for a single file including full content
-     * @param filePath - The file path to get diff for
+     * @param args - Either an options object or a file path string (legacy)
+     * @param opts.path - The file path, can be folder-prefixed (e.g., 'builder-anime-works/client/App.tsx') or relative
+     * @param opts.folderName - Optional folder name (deprecated, prefer folder-prefixed path)
      * @returns Object with oldContent (from parent branch) and newContent (current)
      */
-    getSingleFileDiff(filePath: string): Promise<{
+    getSingleFileDiff(args: {
+        path: string;
+        folderName?: string;
+    } | string): Promise<{
         oldContent: string | null;
         newContent: string | null;
         action: "create" | "update" | "delete";
     }>;
     /**
      * Discards changes for a specific file by creating a revert commit
-     * @param filePath - The file path to discard changes for
+     * @param args - Either an options object or a file path string (legacy)
+     * @param opts.filePath - The file path, can be folder-prefixed (e.g., 'builder-anime-works/client/App.tsx')
+     * @param opts.folderName - Optional folder name (deprecated, prefer folder-prefixed path)
      * @returns success status, commit hash for reverting, and optional error message
      */
-    discardFileChanges(filePath: string): Promise<{
+    discardFileChanges(args: {
+        filePath: string;
+        folderName?: string;
+    } | string): Promise<{
         success: boolean;
         commitHash?: string;
         error?: string;
@@ -392,10 +415,12 @@ export declare class CodeGenSession {
     /**
      * Reverts a discard commit using git revert
      * @param commitHash - The commit hash to revert
+     * @param folderName - Optional folder name to target specific repo (more efficient)
      * @returns success status and optional error message
      */
     revertDiscard(options: {
         commitHash: string;
+        folderName?: string;
     }): Promise<{
         success: boolean;
         error?: string;
@@ -457,11 +482,13 @@ export declare class CodeGenSession {
      * @param numberOfContextLines - Optional number of context lines to include in the diff
      * @param includeFilesOnly - If true, only return filePath and action properties
      * @param filePaths - Optional array of file paths to limit the diff to specific files
+     * @param folderName - Optional folder name to specify which repo to get diff from
      */
-    getDiffFromRemote({ numberOfContextLines, includeFilesOnly, filePaths, }: {
+    getDiffFromRemote({ numberOfContextLines, includeFilesOnly, filePaths, folderName, }: {
         numberOfContextLines?: number;
         includeFilesOnly?: boolean;
         filePaths?: Array<string>;
+        folderName?: string;
     }): Promise<ApplyActionsResult[]>;
     /**
      * Get git diff based on the specified mode
@@ -469,12 +496,14 @@ export declare class CodeGenSession {
      * @param numberOfContextLines - Optional number of context lines to include in the diff (e.g., 999 for -U999)
      * @param includeFilesOnly - If true, only return filePath and action properties
      * @param filePaths - Optional array of file paths to limit the diff to specific files
+     * @param folderName - Optional folder name to specify which repo to get diff from
      */
-    getDiff({ mode, numberOfContextLines, includeFilesOnly, filePaths, }: {
+    getDiff({ mode, numberOfContextLines, includeFilesOnly, filePaths, folderName, }: {
         mode: "remote-parent-branch" | "remote-current-branch";
         numberOfContextLines?: number;
         includeFilesOnly?: boolean;
         filePaths?: Array<string>;
+        folderName?: string;
     }): Promise<{
         state: "error" | "success";
         diff?: ApplyActionsResult[];
@@ -483,6 +512,7 @@ export declare class CodeGenSession {
     /**
      * Get the default branch name from remote repository
      * Falls back to checking common default branch names
+     * @param repoPath - Optional repo path to check default branch for
      */
     private getDefaultBranch;
     /**
@@ -490,6 +520,7 @@ export declare class CodeGenSession {
      * @param numberOfContextLines - Optional number of context lines to include in the diff
      * @param includeFilesOnly - If true, only return filePath and action properties
      * @param filePaths - Optional array of file paths to limit the diff to specific files
+     * @param folderName - Optional folder name to specify which repo to get diff from
      */
     private getDiffFromParentBranch;
 }

package/types/cli/utils/codegen-utils.d.ts

@@ -1,7 +1,7 @@
 import type { DevToolsSys } from "../../core";
 import { type Credentials } from "../credentials";
 export { getCustomInstructions } from "./rules-discovery";
-import type { CodeGenInputOptions, CodegenSetLastCompletion, CodegenTurn, GenerateCodeEvent, GenerateUserMessage, GetSessionTurnsResult, UserContext, WorkspaceConfiguration, EnvironmentVariable, PushChangesArgs, GenerateCompletionStepDevServerState, FusionConfig, GenerateCompletionStepGit, WorkspaceFolder } from "$/ai-utils";
+import type { CodeGenInputOptions, CodegenSetLastCompletion, CodegenTurn, GenerateCodeEvent, GenerateUserMessage, GetSessionTurnsResult, UserContext, WorkspaceConfiguration, WorkspaceFolder, EnvironmentVariable, PushChangesArgs, GenerateCompletionStepDevServerState, FusionConfig, GenerateCompletionStepGit } from "$/ai-utils";
 import type { SessionContext } from "../codegen";
 import type { DevServerOrchestrator } from "../launch/dev-server-orchestrator";
 export declare const DEFAULT_MAX_COMPLETIONS = 40;
@@ -80,7 +80,7 @@ export declare function moveArrayElement<T>(arr: T[], old_index: number, new_ind
 export declare function canCollapseWorkspace(workspace: WorkspaceConfiguration | undefined): boolean;
 export declare function computeRecommendedRootDir(workspace: WorkspaceConfiguration | undefined): string;
 export declare const getEnvironmentVariablesPrompt: (envs: EnvironmentVariable[]) => string;
-export declare function generateGitStatusReminder(gitStatus: GenerateCompletionStepGit, gitEnabledFolder: WorkspaceFolder | undefined, context: {
+export declare function generateGitStatusReminder(gitStatus: GenerateCompletionStepGit, gitEnabledFolders: WorkspaceFolder[], context: {
     trigger: "session-start" | "sync-success" | "push-success" | "pull-success";
     syncedBranches?: string[];
     pushedToRemote?: boolean;