builder.io 1.17.27 → 1.17.29

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

@@ -1,7 +1,8 @@
-import type { AccessResult, CodeGenPosition, CodeGenTools, CodegenTurn, ContentMessageItemToolResult, FusionConfig, GenerateCompletionStep, Permission, ProjectFile, UserSource, WorkspaceFolder } from "$/ai-utils";
+import type { AccessResult, CodeGenPosition, CodeGenTools, CodegenTurn, ContentMessageItemImage, ContentMessageItemText, ContentMessageItemToolResult, FusionConfig, GenerateCompletionStep, Permission, ProjectFile, UserSource, WorkspaceFolder } from "$/ai-utils";
 import type { DevToolsSys } from "../core";
 import { type DevServerOrchestrator } from "./launch/dev-server-orchestrator";
 import type { CodeGenEventEmitter } from "./codegen";
+import { CodeGenSession } from "./codegen";
 import type { Credentials } from "./credentials";
 import type { LocalMCPClientManager } from "./mcp-local";
 export interface LLMToolCalls {
@@ -11,7 +12,7 @@ export interface LLMToolCalls {
     abortController: AbortController;
 }
 export interface ToolResolution {
-    toolResult: string;
+    toolResult: string | (ContentMessageItemText | ContentMessageItemImage)[];
     isError: boolean;
     title?: string;
 }
@@ -34,6 +35,7 @@ export interface ToolContext extends Partial<FusionContext> {
     workingDirectory: string;
     allowedCommands: RegExp[];
     localMCPManager: LocalMCPClientManager | undefined;
+    session: CodeGenSession;
     getAllFiles: (options: {
         getDotFiles?: boolean;
         pattern?: string;

package/types/cli/codegen.d.ts

@@ -1,14 +1,16 @@
 import type { DevToolsSys } from "../types";
 import { type Credentials } from "./credentials";
-import type { CodegenFeedback, CodeGenToolMap, CodegenTurn, CustomInstruction, FusionConfig, GenerateCompletionState, GenerateCompletionStep, GenerateCompletionStepGit, GenerateUserMessage, SessionMode, UserContext, WorkspaceConfiguration, WorkspaceFolder, LoadWholeSessionOptions, LoadWholeSessionResult, LoadHistoryResult, CodeGenMode, ApplyActionsResult, PrivacyMode, CodeGenPosition, BackupGitRepoResult, PushChangesArgs, CodegenApiResult, CodegenApiTerminal, ConfigureDevOrchestratorOpts, ConfigureDevOrchestratorUpdates, RepoMetrics, CodegenApiCreateTerminal } 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, PushChangesArgs, CodegenApiResult, CodegenApiTerminal, ConfigureDevOrchestratorOpts, ConfigureDevOrchestratorUpdates, RepoMetrics, SetImportantFilesToolInput, MCPServerConfig, CodegenApiCreateTerminal } from "$/ai-utils";
 import prettier from "prettier";
 import { type FusionContext, type ToolResolution } from "./code-tools";
+import { type SubAgent } from "./utils/agent-discovery";
 import EventEmitter from "node:events";
 import { type RunCommandOptions } from "./utils/git";
 export interface SessionContext {
     sessionId: string;
     turns: CodegenTurn[];
     customInstructions: CustomInstruction[];
+    customAgents: SubAgent[];
     userContext: UserContext;
     prettierConfig: prettier.Config | null;
     state: GenerateCompletionState;
@@ -27,6 +29,10 @@ export interface CodeGenSessionOptionsBase {
     mode: CodeGenMode;
     privacyMode?: PrivacyMode;
     builtInCustomInstructions?: CustomInstruction[];
+    builtInCustomAgents?: SubAgent[];
+    builtInMCPServerConfig?: MCPServerConfig;
+    autoImportLocalMCPs?: boolean;
+    systemPromptOverride?: string;
     fusionContext?: FusionContext;
     fusionConfig?: FusionConfig;
     workingDirectory?: string;
@@ -41,6 +47,15 @@ export interface CodeGenSessionOptionsInitialUrl extends CodeGenSessionOptionsBa
     initialUrl: string;
 }
 export type CodeGenSessionOptions = CodeGenSessionOptionsSession | CodeGenSessionOptionsInitialUrl;
+export interface SpawnAgentResult {
+    success: boolean;
+    response: string;
+    importantFiles: SetImportantFilesToolInput;
+    lastTurn?: CodegenTurn;
+}
+export { type SubAgent } from "./utils/agent-discovery";
+export { resolveModelShortcut } from "./utils/agent-parser";
+export { getCustomAgents } from "./utils/agent-discovery";
 export type CodeGenEventEmitter = EventEmitter<{
     step: [GenerateCompletionStep];
     idle: [];
@@ -61,6 +76,21 @@ export declare class CodeGenSession {
     loadWholeSession(opts?: LoadWholeSessionOptions): Promise<LoadWholeSessionResult>;
     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) => void;
+        signal?: AbortSignal;
+        maxCompletions?: number;
+        sessionId?: string;
+    }): Promise<SpawnAgentResult>;
     pushRepoV2(repoInfo: {
         repoFullName: string;
         repoUrl: string;
@@ -198,6 +228,18 @@ export declare class CodeGenSession {
     waitUntilState(state: GenerateCompletionState, timeout?: number): Promise<void>;
     clearSession(): Promise<void>;
     sendMessage(message: GenerateUserMessage): Promise<void>;
+    spawnAgent(options: {
+        prompt: string;
+        user: UserSource;
+        onStep?: (step: GenerateCompletionStep) => void;
+        signal?: AbortSignal;
+        maxCompletions?: number;
+        sessionId?: string;
+        tools?: string[];
+        model?: string;
+        mode?: CodeGenMode;
+        systemPrompt?: string;
+    }): Promise<SpawnAgentResult>;
     getTurns(): CodegenTurn[];
     getSessionContext(): SessionContext;
     runSetupCommand(): Promise<import("$/ai-utils").SetupCommandResult | undefined>;
@@ -363,25 +405,3 @@ export declare class CodeGenSession {
      */
     private getDiffFromParentBranch;
 }
-export declare function getUserContext(sys: DevToolsSys, gitWorkingDirectory?: string): Promise<UserContext>;
-export declare function makeAsyncIterator<T>(): readonly [AsyncGenerator<T, void, void>, (event: T) => void, () => void];
-/**
- * Loads a workspace configuration from a JSON file
- * @param sys DevToolsSys instance
- * @param workspaceFile Path to the workspace JSON file
- * @returns The workspace configuration and working directory
- */
-export declare function loadWorkspace(sys: DevToolsSys, workspaceFile: string): Promise<{
-    workspace: WorkspaceConfiguration;
-    workingDirectory: string;
-}>;
-export declare function keepAlive(): () => void;
-export declare class BashError extends Error {
-    readonly code: number | string | undefined;
-    readonly stdout: string;
-    readonly stderr: string;
-    readonly command: string;
-    constructor(command: string, code: number | string | undefined, stdout: string, stderr: string, opts?: {
-        cause?: Error;
-    });
-}

package/types/cli/index.d.ts

@@ -37,9 +37,9 @@ export interface CLIArgs {
      * where the design system name is different than the npm package name.
      * Example: --designSystemPackage=@adobe/react-spectrum --designSystemName="Adobe React Spectrum"
      *
-     * This flag can also be used with includeDirectories to specify a name for design systems
+     * This flag can also be used with addDirectory to specify a name for design systems
      * that are not npm packages.
-     * Example: --includeDirectories="path/to/swift/ui/components" --designSystemName="Native UI"
+     * Example: --addDirectory "path/to/swift/ui/components" --designSystemName="Native UI"
      **/
     designSystemName?: string;
     /**
@@ -47,8 +47,19 @@ export interface CLIArgs {
      * Use this when component implementations live in a different place
      * than the workspace package you are indexing.
      * Example: --includeDirectories "packages/foo, packages/bar"
+     *
+     * @deprecated Use addDirectory instead
      **/
     includeDirectories?: string;
+    /**
+     * Additional directories to look in for repo indexing.
+     * Use this when component implementations live in a different place
+     * than the workspace package you are indexing.
+     *
+     * @alias add
+     * Example: --addDirectory "../docs" --addDirectory "../../bar"
+     */
+    addDirectory?: string | string[];
     /** The scope of the design system to index */
     scope?: DesignSystemScope;
     /** Token to use for figma */
@@ -102,4 +113,23 @@ export interface CLIArgs {
     app?: boolean;
     /** Skip browser auto-open (flag form) */
     open?: boolean;
+    /**
+     * Glob pattern(s) to include for repo indexing access control.
+     * When specified, only these patterns will be accessible by default.
+     * Can be a single string or array of strings (when flag is repeated).
+     * Example: --include "src/components/*.tsx" --include "src/lib/*.ts"
+     */
+    include?: string | string[];
+    /**
+     * Glob pattern(s) to exclude for repo indexing access control.
+     * These patterns will be denied access even if included.
+     * Can be a single string or array of strings (when flag is repeated).
+     * Example: --exclude "*.test.ts" --exclude "__tests__/**"
+     */
+    exclude?: string | string[];
+    /**
+     * Extra instructions to be taken into account during repo indexing.
+     * Example: --instructions "Do not index mapper files."
+     */
+    instructions?: string;
 }

package/types/cli/mcp-local.d.ts

@@ -8,7 +8,7 @@
  * - Tools are prefixed with server name: `mcp__servername__toolname`
  * - This prevents conflicts with built-in tools and other MCP tools
  */
-import type { MCPClientStatus } from "$/ai-utils";
+import type { MCPClientStatus, MCPServerConfig } from "$/ai-utils";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import type { DevToolsSys } from "../core";
 import { type ChildProcess } from "child_process";
@@ -76,6 +76,4 @@ export declare function applyEnvSubstitution(serverConfig: Omit<MCPServerStdioDe
  * Servers from fusionConfig will be merged with servers from mcp.json
  * If a server with the same name exists in both, fusionConfig takes precedence
  */
-export declare function loadMCPConfig(sys: DevToolsSys, workingDirectory: string, fusionConfig?: {
-    mcpServers?: Record<string, Omit<MCPServerStdioDefinition, "name">>;
-}): Promise<MCPServerStdioDefinition[]>;
+export declare function loadMCPConfig(sys: DevToolsSys, workingDirectory: string, serverConfigs: MCPServerConfig, autoImportLocalMCPs: boolean): Promise<MCPServerStdioDefinition[]>;

package/types/cli/repo-connect/git-detector.d.ts

@@ -14,7 +14,7 @@ export interface GitInfo {
 /**
  * Detect git repository information
  */
-export declare function detectGitInfo(sys: DevToolsSys): Promise<GitInfo>;
+export declare function detectGitInfo(sys: DevToolsSys): Promise<GitInfo | undefined>;
 /**
  * Display git info in a user-friendly format
  */

package/types/cli/repo-indexing/component-discovery.d.ts

@@ -9,6 +9,9 @@ export declare const discoverComponents: (sys: DevToolsSys, credentials: Credent
     workspaceConfig?: WorkspaceConfiguration;
     debug?: boolean;
     specificComponents?: string[];
+    include?: string | string[];
+    exclude?: string | string[];
+    instructions?: string;
 }) => Promise<{
     numComponentsFound: number;
     componentsToIndex: ComponentTask[];

package/types/cli/repo-indexing/component-indexing.d.ts

@@ -8,6 +8,9 @@ export declare const processComponent: (sys: DevToolsSys, credentials: Credentia
     designSystemVersion?: string;
     workspaceConfig?: WorkspaceConfiguration;
     debug?: boolean;
+    include?: string | string[];
+    exclude?: string | string[];
+    instructions?: string;
 }) => Promise<void>;
 export declare const processAgent: (sys: DevToolsSys, credentials: Credentials, discoveredComponents: ComponentTask[], opts: {
     hasIcons?: boolean;

package/types/cli/repo-indexing/icons.d.ts

@@ -5,6 +5,9 @@ export declare const discoverIcons: (sys: DevToolsSys, credentials: Credentials,
     designSystemPackage?: string;
     workspaceConfig?: WorkspaceConfiguration;
     debug?: boolean;
+    include?: string | string[];
+    exclude?: string | string[];
+    instructions?: string;
 }) => Promise<{
     icons: string[];
     usage: string;

package/types/cli/repo-indexing/installation.d.ts

@@ -7,6 +7,9 @@ export declare const discoverInstallation: (sys: DevToolsSys, credentials: Crede
     designSystemVersion?: string;
     workspaceConfig?: WorkspaceConfiguration;
     debug?: boolean;
+    include?: string | string[];
+    exclude?: string | string[];
+    instructions?: string;
 }) => Promise<{
     hash: string;
     relevantFiles: string[];

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

@@ -1,6 +1,6 @@
 import type { DevToolsSys } from "../../core";
 import { type Credentials } from "../credentials";
-import type { DesignSystem, GenerateUserMessage, WorkspaceConfiguration, UpdateDesignSystemInput, DesignSystemScope, DisplayDesignSystem, IndexDocumentV1 } from "$/ai-utils";
+import type { DesignSystem, GenerateUserMessage, WorkspaceConfiguration, UpdateDesignSystemInput, DesignSystemScope, DisplayDesignSystem, IndexDocumentV1, AclPolicy } from "$/ai-utils";
 export declare const AGENT_FILE = "AGENTS.md";
 export declare const ICONS_FILE = "icons.mdx";
 export declare const TOKENS_FILE = "tokens.mdx";
@@ -10,6 +10,25 @@ export interface UserSettings {
     isAdminInOrganization: boolean;
     email: string;
 }
+interface GetAllDesignSystemsOpts {
+    /**
+     * If true, only design systems that the user has permission to edit will be
+     * returned. If false, all design systems that the user has permission to edit
+     * as well as design systems that the user has permission to read but not edit
+     * will be returned. Defaults to false.
+     */
+    onlyEditAccess?: boolean;
+    /**
+     * If true, design systems that are scoped to the global space will be included.
+     * Defaults to false.
+     */
+    includeGlobalScopeDesignSystems?: boolean;
+    /**
+     * If true, the # of component docs in each design system will also be returned.
+     * Defaults to false.
+     */
+    includeDocumentCount?: boolean;
+}
 export declare const promptForDesignSystemScope: (credentials: Credentials, userSettings: UserSettings | null, selectedScope?: DesignSystemScope) => Promise<DesignSystemScope | undefined>;
 export declare const parseDesignSystem: (sys: DevToolsSys, designSystemPackage?: string) => Promise<{
     name: any;
@@ -29,26 +48,45 @@ export declare const runCodeGen: (sys: DevToolsSys, credentials: Credentials, se
      * for writing large files that would otherwise consume a lot of tokens.
      */
     expectFile?: "tool" | string;
-}, metadata?: any) => Promise<string>;
-interface GetAllDesignSystemsOpts {
     /**
-     * If true, only design systems that the user has permission to edit will be
-     * returned. If false, all design systems that the user has permission to edit
-     * as well as design systems that the user has permission to read but not edit
-     * will be returned. Defaults to false.
+     * Glob pattern(s) to include for access control.
+     * When specified, only these patterns will be accessible by default.
+     * Can be a single string or array of strings.
      */
-    onlyEditAccess?: boolean;
+    include?: string | string[];
     /**
-     * If true, design systems that are scoped to the global space will be included.
-     * Defaults to false.
+     * Glob pattern(s) to exclude for access control.
+     * These patterns will be denied access even if included.
+     * Can be a single string or array of strings.
      */
-    includeGlobalScopeDesignSystems?: boolean;
+    exclude?: string | string[];
     /**
-     * If true, the # of component docs in each design system will also be returned.
-     * Defaults to false.
+     * Extra instructions to be taken into account during repo indexing.
      */
-    includeDocumentCount?: boolean;
-}
+    instructions?: string;
+}, metadata?: any) => Promise<string>;
+/**
+ * Generates an ACL policy for repo indexing based on include/exclude patterns.
+ *
+ * @param include - Glob pattern(s) to include. When specified, only these patterns
+ *                  will be accessible by default. Can be a single string or array.
+ * @param exclude - Glob pattern(s) to exclude. These patterns will be denied access
+ *                  even if included. Can be a single string or array.
+ * @returns AclPolicy object with entries and denyDescription
+ *
+ * @example
+ * ```typescript
+ * // Allow only src directory, exclude tests
+ * const policy = generateRepoIndexingAclPolicy(
+ *   ["src/**\/*", "lib/**\/*"],
+ *   ["**\/*.test.ts", "**\/__tests__/**"]
+ * );
+ *
+ * // Single pattern
+ * const policy2 = generateRepoIndexingAclPolicy("src/**\/*", "dist/**");
+ * ```
+ */
+export declare const generateRepoIndexingAclPolicy: (include?: string | string[], exclude?: string | string[]) => AclPolicy;
 export declare function getAllDesignSystems(credentials: Credentials, opts: {
     includeDocumentCount: true;
 } & Omit<GetAllDesignSystemsOpts, "includeDocumentCount">): Promise<DisplayDesignSystem[]>;
@@ -62,6 +100,9 @@ export declare const addDesignSystem: (credentials: Credentials, body: {
     designSystemPackage?: string;
     status: string;
     scope: DesignSystemScope;
+    gitOriginUrl: string | undefined;
+    gitRelativePath: string | undefined;
+    cliArgs: string[];
 }) => Promise<any>;
 export declare const updateDesignSystem: (credentials: Credentials, body: UpdateDesignSystemInput) => Promise<any>;
 export declare const checkRepoIndexingFolder: (sys: DevToolsSys) => Promise<boolean>;

package/types/cli/repo-indexing/repo-indexing-utils.test.d.ts

@@ -0,0 +1 @@
+export {};

package/types/cli/repo-indexing/tokens.d.ts

@@ -7,6 +7,9 @@ export declare const discoverTokens: (sys: DevToolsSys, credentials: Credentials
     designSystemPackage?: string;
     workspaceConfig?: WorkspaceConfiguration;
     debug?: boolean;
+    include?: string | string[];
+    exclude?: string | string[];
+    instructions?: string;
 }) => Promise<{
     tokenGroupsToIndex: TokenTask[];
     discoveredTokenGroups: TokenTask[];
@@ -17,4 +20,7 @@ export declare const processTokens: (sys: DevToolsSys, credentials: Credentials,
     designSystemVersion?: string;
     debug?: boolean;
     workspaceConfig?: WorkspaceConfiguration;
+    include?: string | string[];
+    exclude?: string | string[];
+    instructions?: string;
 }) => Promise<void>;

package/types/cli/utils/agent-discovery.d.ts

@@ -0,0 +1,22 @@
+/**
+ * Agent discovery utilities
+ * Handles finding and loading custom agent definitions from the filesystem
+ */
+import type { DevToolsSys } from "../../types";
+import { type SubAgent } from "./agent-parser";
+export type { SubAgent };
+/**
+ * Get custom agents from the filesystem
+ * Searches for agent definitions in .claude/agents, .builder/agents, and .cursor/agents
+ * @param sys - System utilities
+ * @param projectDir - Project directory (used for relative paths)
+ * @param currentDir - Starting directory for search
+ * @param rootDir - Root directory to stop search
+ * @returns Array of discovered agents
+ */
+export declare function getCustomAgents({ sys, projectDir, currentDir, rootDir, }: {
+    sys: DevToolsSys;
+    projectDir: string;
+    currentDir: string;
+    rootDir: string;
+}): Promise<SubAgent[]>;

package/types/cli/utils/agent-parser.d.ts

@@ -0,0 +1,41 @@
+/**
+ * Agent definition parsing utilities
+ * Handles parsing of custom agent definition files
+ */
+import type { CodeGenMode } from "$/ai-utils";
+export interface SubAgent {
+    name: string;
+    description?: string;
+    systemPrompt?: string;
+    tools?: string[];
+    model?: string;
+    mode?: CodeGenMode;
+    filePath?: string;
+}
+/**
+ * Resolves model shortcut to full model name
+ * @param modelOrShortcut - Model name or shortcut
+ * @returns Resolved model name or undefined
+ */
+export declare function resolveModelShortcut(modelOrShortcut?: string): string | undefined;
+/**
+ * Parses an agent definition file (Markdown with YAML frontmatter)
+ * Expected format (following Claude Code sub-agents format):
+ * ```yaml
+ * ---
+ * name: Agent Name
+ * description: Description of what the agent does
+ * model: sonnet  # Optional: supports shortcuts like sonnet, opus, haiku, mini
+ * tools:         # Optional: list of tools to enable
+ *   - Read
+ *   - Grep
+ *   - WebSearch
+ * mode: quality-v4-agent  # Optional: agent mode
+ * ---
+ * System prompt content here (Markdown)
+ * ```
+ * @param fileContent - The raw file content
+ * @param filePath - The file path (used for fallback name)
+ * @returns Parsed SubAgent or null if parsing fails
+ */
+export declare function parseAgentFile(fileContent: string, filePath: string): SubAgent | null;

package/types/cli/utils/agent-parser.test.d.ts

@@ -0,0 +1 @@
+export {};

package/types/cli/utils/browser-testing-agent.d.ts

@@ -0,0 +1,2 @@
+import type { CustomAgentDefinition } from "$/ai-utils";
+export declare const TEST_AGENT: CustomAgentDefinition;

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

@@ -0,0 +1,70 @@
+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 } from "$/ai-utils";
+import type { SessionContext } from "../codegen";
+export declare const DEFAULT_MAX_COMPLETIONS = 30;
+/**
+ * Merges and deduplicates items by name.
+ * Built-in items come first, discovered items can override them by name.
+ * @param builtIn - Built-in items
+ * @param discovered - Discovered items from project
+ * @returns Deduplicated array with discovered overriding built-in
+ */
+export declare function mergeByName<T extends {
+    name: string;
+}>(builtIn: T[], discovered: T[]): T[];
+export declare function getLastGoodTurn(sessionContext: SessionContext): CodegenTurn | undefined;
+export declare function getLastUserTurn(sessionContext: SessionContext): CodegenTurn | undefined;
+export declare function getLastApplyResultsTurn(sessionContext: SessionContext): CodegenTurn | undefined;
+export declare function getLastOne<T>(array: T[]): T | undefined;
+export declare function inPlaceRemovePendingTurns(turns: CodegenTurn[]): void;
+export declare function restoreConsumedCredit(sys: DevToolsSys, credentials: Credentials, sessionId: string, restoreCredits: number): Promise<void>;
+/**
+ * Analyzes the payload to identify what's making it large
+ */
+export declare function analyzePayloadBreakdown(body: CodeGenInputOptions, jsonString: string): Record<string, any>;
+export declare function completionStream(sys: DevToolsSys, credentials: Credentials, body: CodeGenInputOptions, signal: AbortSignal): AsyncGenerator<GenerateCodeEvent, void, unknown>;
+export declare function codegenEndpoint(sys: DevToolsSys, credentials: Credentials, endpoint: string, body: Record<string, any>): Promise<boolean>;
+export declare function setLastCompletionOfSession(sys: DevToolsSys, credentials: Credentials, data: CodegenSetLastCompletion, _verbose: boolean): Promise<boolean>;
+export declare function getTurnsBySessionId(sys: DevToolsSys, credentials: Credentials, sessionId: string, linear: boolean, completionIdCursor?: string): Promise<GetSessionTurnsResult>;
+export declare const parseCLIURL: (url: string | undefined) => {
+    id: undefined;
+    isInitial: boolean;
+} | {
+    isInitial: boolean;
+    id: string;
+};
+export declare function getUserContext(sys: DevToolsSys, gitWorkingDirectory?: string): Promise<UserContext>;
+export declare function makeAsyncIterator<T>(): readonly [AsyncGenerator<T, void, void>, (event: T) => void, () => void];
+export declare function isAGENTSFile(filePath: string): boolean;
+export declare function isBaseImportantFile(filePath: string): boolean;
+export declare function hasBuildError(text: string): boolean;
+/**
+ * Loads a workspace configuration from a JSON file
+ * @param sys DevToolsSys instance
+ * @param workspaceFile Path to the workspace JSON file
+ * @returns The workspace configuration and working directory
+ */
+export declare function loadWorkspace(sys: DevToolsSys, workspaceFile: string): Promise<{
+    workspace: WorkspaceConfiguration;
+    workingDirectory: string;
+}>;
+export declare function mergeUserMessages(currentMessage: GenerateUserMessage, newMessage: GenerateUserMessage): GenerateUserMessage;
+export declare function keepAlive(): () => void;
+export declare function parseAheadBehind(line: string): {
+    ahead: number;
+    behind: number;
+};
+export declare class BashError extends Error {
+    readonly code: number | string | undefined;
+    readonly stdout: string;
+    readonly stderr: string;
+    readonly command: string;
+    constructor(command: string, code: number | string | undefined, stdout: string, stderr: string, opts?: {
+        cause?: Error;
+    });
+}
+export declare function mergeEnvironmentVariables(envVariables: EnvironmentVariable[], extraEnvVariables: EnvironmentVariable[]): EnvironmentVariable[];
+export declare function processPushChangesArgs(opts: PushChangesArgs): import("$/ai-utils").PushChangesOptions;
+export declare function getErrorMessage(err: unknown): string;

package/types/cli/utils/rules-discovery.d.ts

@@ -0,0 +1,26 @@
+/**
+ * Custom instruction/rules discovery utilities
+ * Handles finding and loading custom instructions from the filesystem
+ */
+import type { DevToolsSys } from "../../types";
+import type { CustomInstruction } from "$/ai-utils";
+/**
+ * Get custom instructions from the filesystem
+ * Searches for instruction files in:
+ * - .cursor/rules/
+ * - .builder/rules/
+ * - .cursorrules, .builderrules, .windsurfrules
+ * - .github/copilot-instructions.md
+ *
+ * @param sys - System utilities
+ * @param projectDir - Project directory (used for relative paths)
+ * @param currentDir - Starting directory for search
+ * @param rootDir - Root directory to stop search
+ * @returns Array of discovered custom instructions
+ */
+export declare function getCustomInstructions({ sys, projectDir, currentDir, rootDir, }: {
+    sys: DevToolsSys;
+    projectDir: string;
+    currentDir: string;
+    rootDir: string;
+}): Promise<CustomInstruction[]>;

package/types/cli/utils/rules-parser.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Custom instruction/rules parsing utilities
+ * Handles parsing of custom instruction files (.mdc, .cursorrules, etc.)
+ */
+import type { CustomInstruction } from "$/ai-utils";
+/**
+ * Parse a custom instruction file
+ * Supports both:
+ * - .mdc files with YAML frontmatter
+ * - Plain text files (.cursorrules, .builderrules, etc.)
+ *
+ * @param fileContent - Raw file content
+ * @param filePath - File path (for generating name and id)
+ * @param hashFunction - Optional hash function for generating unique IDs
+ * @returns Parsed CustomInstruction or null
+ */
+export declare function parseCustomInstructionFile(fileContent: string, filePath: string, hashFunction?: (content: string) => string): CustomInstruction | null;

package/types/cli/utils/rules-parser.test.d.ts

@@ -0,0 +1 @@
+export {};

package/types/cli/utils/yaml-frontmatter.d.ts

@@ -0,0 +1,32 @@
+/**
+ * Generic YAML frontmatter parser for Markdown files
+ * Supports both simple key-value pairs and arrays
+ */
+export interface YamlFrontmatterResult<T = Record<string, any>> {
+    frontmatter: T;
+    body: string;
+}
+/**
+ * Checks if content has YAML frontmatter
+ */
+export declare function hasYamlFrontmatter(content: string): boolean;
+/**
+ * Parses YAML frontmatter from a string
+ * Handles simple YAML: key-value pairs, arrays, and comments
+ */
+export declare function parseYamlFrontmatter(yamlContent: string): Record<string, any>;
+/**
+ * Extracts YAML frontmatter and body from Markdown content
+ * @param content - The raw Markdown content with frontmatter
+ * @returns Object with frontmatter and body, or null if no frontmatter found
+ */
+export declare function extractYamlFrontmatter(content: string): {
+    frontmatterContent: string;
+    body: string;
+} | null;
+/**
+ * Parse Markdown file with YAML frontmatter
+ * @param content - The raw file content
+ * @returns Parsed frontmatter and body
+ */
+export declare function parseMarkdownWithYaml<T = Record<string, any>>(content: string): YamlFrontmatterResult<T>;

package/types/cli/utils/yaml-frontmatter.test.d.ts

@@ -0,0 +1 @@
+export {};