@builder.io/dev-tools 1.21.10-dev.202601270922.8e39b4484 → 1.21.11-dev.202601271108.1da3cea5e

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, GitRepoContext, 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, 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,12 +12,6 @@ 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;
@@ -53,6 +47,8 @@ export interface CodeGenSessionOptionsBase {
     enabledTools?: (keyof CodeGenToolMap)[];
     modelOverride?: string;
     skipFileDiff?: boolean;
+    agentType?: string;
+    includeMemories?: boolean;
 }
 export interface CodeGenSessionOptionsSession extends CodeGenSessionOptionsBase {
     sessionOrCompletionId?: string;
@@ -61,11 +57,17 @@ export interface CodeGenSessionOptionsInitialUrl extends CodeGenSessionOptionsBa
     initialUrl: string;
 }
 export type CodeGenSessionOptions = CodeGenSessionOptionsSession | CodeGenSessionOptionsInitialUrl;
-export interface SpawnAgentResult {
+export type SpawnAgentResult = SpawnAgentResultSuccess | SpawnAgentResultFailed;
+export interface SpawnAgentResultSuccess {
     success: boolean;
     response: string;
     metadata: ExplorationMetadataToolInput;
     lastTurn?: CodegenTurn;
+    sessionId: string;
+}
+export interface SpawnAgentResultFailed {
+    success: false;
+    response: string;
 }
 export type CodeGenEventEmitter = EventEmitter<{
     step: [GenerateCompletionStep];
@@ -75,12 +77,7 @@ 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>;
@@ -97,21 +94,6 @@ export declare class CodeGenSession {
     loadMoreTurns(): Promise<CodegenTurn[]>;
     setCustomInstructions(instructions: CustomInstruction[]): Promise<void>;
     setCustomAgents(agents: SubAgent[]): Promise<void>;
-    /**
-     * Spawn a named custom agent by ID or name
-     * @param agentNameOrId - The agent's name or ID
-     * @param options - Additional spawning options
-     * @returns SpawnAgentResult
-     */
-    spawnNamedAgent(agentName: string | undefined, options: {
-        prompt: string;
-        user: UserSource;
-        onStep?: (step: GenerateCompletionStep, subagent_type: string) => void;
-        signal?: AbortSignal;
-        maxCompletions?: number;
-        sessionId?: string;
-        mcpServers?: boolean;
-    }): Promise<SpawnAgentResult>;
     pushRepoV2(repoInfo: {
         repoFullName: string;
         repoUrl: string;
@@ -134,8 +116,8 @@ export declare class CodeGenSession {
     /**
      * Get the current commit hash
      */
-    getCurrentCommitHash(branchName?: string, repoPath?: string): Promise<string | undefined>;
-    getCurrentBranch(repoPath?: string): Promise<string>;
+    getCurrentCommitHash(branchName?: string): Promise<string | undefined>;
+    getCurrentBranch(): Promise<string>;
     /**
      * Get the feature branch name
      */
@@ -144,7 +126,7 @@ export declare class CodeGenSession {
      * Get the AI branch name
      */
     getAiBranch(): string;
-    git(args: string[], opts?: string | Partial<RunCommandOptions>): Promise<string>;
+    git(args: string[], opts?: string | RunCommandOptions): Promise<string>;
     setDebug(debug: boolean): void;
     createTerminal(options?: CodegenApiCreateTerminal): Promise<CodegenApiTerminal>;
     emitTerminals(): void;
@@ -194,12 +176,11 @@ export declare class CodeGenSession {
     searchFileTree(options: SearchFileTreeOptions): Promise<SearchFileTreeResult>;
     collectRepoMetrics(opts?: {
         rootPath?: string;
-        folderName?: string;
     }): Promise<RepoMetrics>;
     getSessionId(): string;
     getSpaceId(): string | undefined;
     revertToCommitHash(commitHash: string): Promise<void>;
-    resetToCommitHash(commitHash: string): Promise<void>;
+    resetToCommitHash(commitHash: string, requestRefresh?: boolean): Promise<void>;
     /**
      * Core function to restore the codebase to a state that matches a predicate.
      * This is the main function that handles both git-based and file-based restoration.
@@ -264,22 +245,29 @@ export declare class CodeGenSession {
         state: "installed" | "not-installed" | "install-failed" | "install-aborted";
         shouldProceed: boolean;
     }>;
-    spawnAgent(options: {
+    getNamedAgentConfig(agentName: string | undefined, signal?: AbortSignal): Promise<{
+        success: true;
+        options: CodeGenSessionOptions;
+        resetAfterRun: boolean;
         subagent_type: string;
+    } | {
+        success: false;
+        response: string;
+    }>;
+    /**
+     * Spawn a named custom agent by ID or name
+     * @param agentNameOrId - The agent's name or ID
+     * @param options - Additional spawning options
+     * @returns SpawnAgentResult
+     */
+    spawnNamedAgent(agentName: string | undefined, options: {
         prompt: string;
         user: UserSource;
-        onStep?: (step: GenerateCompletionStep, subagent_type: string) => void;
-        signal?: AbortSignal;
+        signal: AbortSignal;
         maxCompletions?: number;
         sessionId?: string;
+        resume?: string;
         mcpServers?: boolean;
-        tools?: string[];
-        model?: string;
-        mode?: CodeGenMode;
-        includeMemories?: boolean;
-        needDevServer?: boolean;
-        needValidation?: boolean;
-        systemPrompt?: string;
     }): Promise<SpawnAgentResult>;
     setProxyOrigin(proxySrc: string | undefined): void;
     getTurns(): CodegenTurn[];
@@ -323,7 +311,6 @@ 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;
@@ -331,12 +318,12 @@ export declare class CodeGenSession {
     waitUntilBlockingPendingPromises(): Promise<void>;
     waitUntilIdle(): Promise<void>;
     waitForEventLoop(): Promise<void>;
-    commitWorkInProgress(lastTurn: CodegenTurn, changedFiles: string[]): Promise<string | false>;
+    commitWorkInProgress(lastTurn: CodegenTurn, changedFiles: string[]): Promise<string | false | undefined>;
     getChangesReport(): Promise<{
         diff: string;
         files: string[];
     } | undefined>;
-    isCleanWorkTree(repoPath?: string): Promise<boolean>;
+    isCleanWorkTree(): 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")
@@ -380,33 +367,23 @@ 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, repoPathOverride?: string): Promise<string | null>;
+    getFileAtRef(filePath: string, gitRef?: string): Promise<string | null>;
     /**
      * Gets the diff information for a single file including full content
-     * @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)
+     * @param filePath - The file path to get diff for
      * @returns Object with oldContent (from parent branch) and newContent (current)
      */
-    getSingleFileDiff(args: {
-        path: string;
-        folderName?: string;
-    } | string): Promise<{
+    getSingleFileDiff(filePath: string): Promise<{
         oldContent: string | null;
         newContent: string | null;
         action: "create" | "update" | "delete";
     }>;
     /**
      * Discards changes for a specific file by creating a revert commit
-     * @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)
+     * @param filePath - The file path to discard changes for
      * @returns success status, commit hash for reverting, and optional error message
      */
-    discardFileChanges(args: {
-        filePath: string;
-        folderName?: string;
-    } | string): Promise<{
+    discardFileChanges(filePath: string): Promise<{
         success: boolean;
         commitHash?: string;
         error?: string;
@@ -414,12 +391,10 @@ 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;
@@ -481,13 +456,11 @@ 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, folderName, }: {
+    getDiffFromRemote({ numberOfContextLines, includeFilesOnly, filePaths, }: {
         numberOfContextLines?: number;
         includeFilesOnly?: boolean;
         filePaths?: Array<string>;
-        folderName?: string;
     }): Promise<ApplyActionsResult[]>;
     /**
      * Get git diff based on the specified mode
@@ -495,14 +468,12 @@ 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, folderName, }: {
+    getDiff({ mode, numberOfContextLines, includeFilesOnly, filePaths, }: {
         mode: "remote-parent-branch" | "remote-current-branch";
         numberOfContextLines?: number;
         includeFilesOnly?: boolean;
         filePaths?: Array<string>;
-        folderName?: string;
     }): Promise<{
         state: "error" | "success";
         diff?: ApplyActionsResult[];
@@ -511,7 +482,6 @@ 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;
     /**
@@ -519,7 +489,6 @@ 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/agent-parser.d.ts

@@ -14,11 +14,12 @@ export interface SubAgent {
     includeMemories?: boolean;
     needDevServer?: boolean;
     needValidation?: boolean;
+    resetAfterRun?: boolean;
 }
 /**
  * Resolves model shortcut to full model name
- * @param modelOrShortcut - Model name or shortcut
- * @returns Resolved model name or undefined
+ * @param modelOrShortcut - Model name or shortcut (or "inherit" to use parent model)
+ * @returns Resolved model name or undefined (undefined means inherit from parent)
  */
 export declare function resolveModelShortcut(modelOrShortcut?: string): string | undefined;
 /**

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, WorkspaceFolder, EnvironmentVariable, PushChangesArgs, GenerateCompletionStepDevServerState, FusionConfig, GenerateCompletionStepGit } from "$/ai-utils";
+import type { CodeGenInputOptions, CodegenSetLastCompletion, CodegenTurn, GenerateCodeEvent, GenerateUserMessage, GetSessionTurnsResult, UserContext, WorkspaceConfiguration, EnvironmentVariable, PushChangesArgs, GenerateCompletionStepDevServerState, FusionConfig, GenerateCompletionStepGit, WorkspaceFolder } from "$/ai-utils";
 import type { SessionContext } from "../codegen";
 import type { DevServerOrchestrator } from "../launch/dev-server-orchestrator";
 export declare const DEFAULT_MAX_COMPLETIONS = 30;
@@ -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, gitEnabledFolders: WorkspaceFolder[], context: {
+export declare function generateGitStatusReminder(gitStatus: GenerateCompletionStepGit, gitEnabledFolder: WorkspaceFolder | undefined, context: {
     trigger: "session-start" | "sync-success" | "push-success" | "pull-success";
     syncedBranches?: string[];
     pushedToRemote?: boolean;

package/types/common/ast/component-input-types.d.ts

@@ -17,7 +17,7 @@ export declare const NUMBER_TYPES: string[];
 export declare const BOOLEAN_TYPES: string[];
 export declare const ARRAY_TYPES: string[];
 export declare const OBJECT_TYPES: string[];
-export declare function getPrimitiveType(t: string): "string" | "number" | "boolean" | "object" | "array";
+export declare function getPrimitiveType(t: string): "string" | "boolean" | "object" | "number" | "array";
 export declare function removeQuotes(text: string): string;
 export declare const resolveType: (sys: DevToolsSys, checker: ts.TypeChecker, type: ts.Type) => string[] | undefined;
 export declare const typeToString: (sys: DevToolsSys, checker: ts.TypeChecker, type: ts.Type) => string;

package/types/common/utils.d.ts

@@ -19,7 +19,7 @@ export declare function clone<T>(obj: T): T;
 export declare function shouldSkipFolder(sys: DevToolsSys, skipFolders: Set<string>, fileName: string): boolean;
 export declare function getPackageManager(): string;
 export declare function isWindows(): boolean;
-export declare function builderNpxPackage(): "@builder.io/agent" | "\"@builder.io/dev-tools\"" | "builder.io";
+export declare function builderNpxPackage(): "builder.io" | "@builder.io/agent" | "\"@builder.io/dev-tools\"";
 /**
  * Sanitizes a component name for use in filesystem paths by replacing invalid characters with underscores
  * @param name The component name to sanitize