@inkeep/agents-cli 0.60.0 → 0.61.0

package/dist/commands/pull-v4/introspect/index.js

@@ -2,7 +2,9 @@ import { ManagementApiClient } from "../../../api.js";
 import { initializeCommand } from "../../../utils/cli-pipeline.js";
 import { performBackgroundVersionCheck } from "../../../utils/background-version-check.js";
 import { loadProject } from "../../../utils/project-loader.js";
+import { readProjectState, writeProjectState } from "../../../utils/state.js";
 import { introspectGenerate } from "../introspect-generator.js";
+import { getTempBranchSuffix } from "@inkeep/agents-core";
 import { join, resolve } from "node:path";
 import * as p from "@clack/prompts";
 import { existsSync, mkdirSync } from "node:fs";
@@ -78,7 +80,6 @@ async function pullV4Command(options) {
 	console.log(styleText("blue", "\nInkeep Pull:"));
 	if (options.introspect) console.log(styleText("gray", "  Introspect mode • Complete regeneration • No comparison needed"));
 	else console.log(styleText("gray", "  Smart comparison • Detect all changes • Targeted updates"));
-	const s = p.spinner();
 	try {
 		const { config, isCI } = await initializeCommand({
 			configPath: options.config,
@@ -89,20 +90,17 @@ async function pullV4Command(options) {
 			logConfig: true,
 			quiet: options.quiet
 		});
-		s.start("Detecting project...");
 		let projectDir;
 		let projectId;
 		let localProjectForId = null;
 		const currentDir = process.cwd();
 		if (existsSync(join(currentDir, "index.ts"))) {
 			projectDir = currentDir;
-			s.start("Loading local project...");
 			try {
 				localProjectForId = await loadProject(projectDir);
 				const localProjectId = localProjectForId.getId();
 				if (options.project) {
 					if (localProjectId !== options.project) {
-						s.stop("Project ID mismatch");
 						console.error(styleText("red", `Local project ID "${localProjectId}" doesn't match --project "${options.project}"`));
 						console.error(styleText("yellow", "Either remove --project flag or ensure it matches the local project ID"));
 						if (batchMode) return {
@@ -113,14 +111,12 @@ async function pullV4Command(options) {
 					}
 				}
 				projectId = localProjectId;
-				s.stop(`Using local project: ${projectId}`);
+				console.log(styleText("green", `◆ Using local project: ${projectId}`));
 			} catch (error) {
-				s.stop("Failed to load local project");
 				throw new Error(`Could not load local project: ${error instanceof Error ? error.message : String(error)}`);
 			}
 		} else {
 			if (!options.project) {
-				s.stop("No index.ts found in current directory");
 				console.error(styleText("yellow", "Please run this command from a directory containing index.ts or use --project <project-id>"));
 				if (batchMode) return {
 					success: false,
@@ -131,23 +127,74 @@ async function pullV4Command(options) {
 			const projectPath = resolve(currentDir, options.project);
 			if (existsSync(join(projectPath, "index.ts"))) {
 				projectDir = projectPath;
-				s.start("Loading project from specified path...");
 				try {
 					localProjectForId = await loadProject(projectDir);
 					projectId = localProjectForId.getId();
-					s.stop(`Using project from path: ${projectId}`);
+					console.log(styleText("green", `◆ Using project from path: ${projectId}`));
 				} catch (error) {
-					s.stop("Failed to load project from path");
 					throw new Error(`Could not load project from ${projectPath}: ${error instanceof Error ? error.message : String(error)}`);
 				}
 			} else {
 				projectId = options.project;
 				projectDir = join(currentDir, projectId);
-				s.stop(`Creating new project directory: ${projectDir}`);
+				console.log(styleText("green", `◆ Creating new project directory: ${projectDir}`));
 			}
 		}
-		s.start(`Fetching project: ${projectId}`);
-		const remoteProject = await (await ManagementApiClient.create(config.agentsApiUrl, options.config, config.tenantId, projectId, isCI, config.agentsApiKey)).getFullProject(projectId);
+		const lastPulledHash = readProjectState(projectId)?.lastPulledHash;
+		if (options.debug && lastPulledHash) console.log(styleText("gray", `   Last pulled hash: ${lastPulledHash}`));
+		const apiClient = await ManagementApiClient.create(config.agentsApiUrl, options.config, config.tenantId, projectId, isCI, config.agentsApiKey);
+		let currentMainHash;
+		try {
+			currentMainHash = (await apiClient.getBranch(projectId, "main")).hash;
+		} catch (error) {
+			if (options.debug) console.log(styleText("gray", `   Could not fetch main branch hash: ${error instanceof Error ? error.message : String(error)}`));
+		}
+		if (options.debug && currentMainHash) console.log(styleText("gray", `   Current main hash: ${currentMainHash}`));
+		let remoteProject;
+		if (localProjectForId && lastPulledHash) {
+			const tempBranchName = getTempBranchSuffix("cli-pull");
+			try {
+				await apiClient.createBranch(projectId, {
+					name: tempBranchName,
+					fromCommit: lastPulledHash
+				});
+				const localProjectDefinition = await localProjectForId.getFullDefinition();
+				await apiClient.pushFullProject(projectId, tempBranchName, localProjectDefinition);
+				const preview = await apiClient.mergePreview(projectId, {
+					sourceBranch: "main",
+					targetBranch: tempBranchName
+				});
+				if (preview.hasConflicts) {
+					const { resolveConflictsInteractive } = await import("../merge-conflicts.js");
+					const resolutions = await resolveConflictsInteractive(preview.conflicts, options);
+					if (resolutions === null) {
+						console.log(styleText("yellow", "Pull cancelled"));
+						return;
+					}
+					await apiClient.mergeExecute(projectId, {
+						sourceBranch: "main",
+						targetBranch: tempBranchName,
+						sourceHash: preview.sourceHash,
+						targetHash: preview.targetHash,
+						resolutions,
+						message: "CLI pull: merge main into local state"
+					});
+				} else await apiClient.mergeExecute(projectId, {
+					sourceBranch: "main",
+					targetBranch: tempBranchName,
+					sourceHash: preview.sourceHash,
+					targetHash: preview.targetHash,
+					message: "CLI pull: merge main into local state"
+				});
+				remoteProject = await apiClient.getFullProject(projectId, tempBranchName);
+			} finally {
+				try {
+					await apiClient.deleteBranch(projectId, tempBranchName, true);
+				} catch (cleanupError) {
+					if (options.debug) console.log(styleText("gray", `   Warning: Could not delete temp branch ${tempBranchName}: ${cleanupError instanceof Error ? cleanupError.message : String(cleanupError)}`));
+				}
+			}
+		} else remoteProject = await apiClient.getFullProject(projectId);
 		if (options.debug && remoteProject.functions) {
 			console.log(styleText("gray", "   📋 Project-level functions from API:"), Object.keys(remoteProject.functions));
 			Object.entries(remoteProject.functions).forEach(([id, data]) => {
@@ -184,7 +231,7 @@ async function pullV4Command(options) {
 			}
 		}
 		enrichCanDelegateToWithTypes(remoteProject);
-		s.message("Project data fetched");
+		console.log(styleText("green", "◆ Project data fetched"));
 		if (options.json) {
 			console.log(JSON.stringify(remoteProject, null, 2));
 			restoreLogLevel();
@@ -192,13 +239,20 @@ async function pullV4Command(options) {
 		}
 		const paths = createProjectStructure(projectDir);
 		await generateProjectSkillsIfPresent(remoteProject, paths.skillsDir);
-		s.start("Starting generating files...");
+		console.log(styleText("gray", "Generating files..."));
 		await introspectGenerate({
 			project: remoteProject,
 			paths,
 			debug: options.debug
 		});
-		s.stop("All files generated");
+		console.log(styleText("green", "◆ All files generated"));
+		try {
+			const mainBranch = await apiClient.getBranch(projectId, "main");
+			writeProjectState(projectId, mainBranch.hash);
+		} catch (error) {
+			console.warn(styleText("yellow", `Warning: Could not save pull state: ${error instanceof Error ? error.message : String(error)}`));
+			console.warn(styleText("yellow", "Future pulls may re-prompt for conflict resolution."));
+		}
 		console.log(styleText("green", "\nProject synced successfully!"));
 		console.log(styleText("gray", `   Location: ${paths.projectRoot}`));
 		console.log(styleText("gray", `   Environment: ${options.env || "development"}`));
@@ -208,7 +262,6 @@ async function pullV4Command(options) {
 		process.exit(0);
 	} catch (error) {
 		const message = error instanceof Error ? error.stack : String(error);
-		s.stop();
 		console.error(styleText("red", `\nError: ${message}`));
 		if (options.debug && error instanceof Error) console.error(styleText("red", error.stack || ""));
 		restoreLogLevel();

package/dist/commands/pull-v4/introspect/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":[],"sources":["../../../../src/commands/pull-v4/introspect/index.ts"],"sourcesContent":["/**\n * Pull v3 - Clean, efficient project generation\n *\n * Step 1: Validate and compile existing code\n * Step 2: Compare project with DB to detect ALL changes\n * Step 3: Classify changes as new vs modified components\n * Step 4: Generate new components deterministically\n * Step 5: Use LLM to correct modified components\n */\n\nimport { EventEmitter } from 'node:events';\nimport { existsSync, mkdirSync } from 'node:fs';\nimport { join, resolve } from 'node:path';\nimport { styleText } from 'node:util';\nimport * as p from '@clack/prompts';\nimport type { FullProjectDefinition } from '@inkeep/agents-core';\n\n// Increase max listeners to prevent warnings during complex CLI flows\n// This is needed because @clack/prompts + multiple interactive prompts + spinners all add listeners\nEventEmitter.defaultMaxListeners = 20;\n\nimport { ManagementApiClient } from '../../../api';\nimport { performBackgroundVersionCheck } from '../../../utils/background-version-check';\nimport { initializeCommand } from '../../../utils/cli-pipeline';\nimport { loadProject } from '../../../utils/project-loader';\nimport { introspectGenerate } from '../introspect-generator';\n\nexport interface PullV3Options {\n  project?: string;\n  config?: string;\n  profile?: string;\n  env?: string;\n  json?: boolean;\n  debug?: boolean;\n  verbose?: boolean;\n  force?: boolean;\n  introspect?: boolean;\n  all?: boolean;\n  tag?: string;\n  quiet?: boolean;\n  /** Internal: used for batch operations to return results instead of calling process.exit() */\n  _batchMode?: boolean;\n}\n\nexport interface PullResult {\n  success: boolean;\n  skipped?: boolean;\n  upToDate?: boolean;\n  error?: string;\n}\n\ninterface BatchPullResult {\n  projectId: string;\n  projectName?: string;\n  targetDir: string;\n  success: boolean;\n  error?: string;\n}\n\ninterface ProjectPaths {\n  projectRoot: string;\n  agentsDir: string;\n  toolsDir: string;\n  dataComponentsDir: string;\n  artifactComponentsDir: string;\n  statusComponentsDir: string;\n  environmentsDir: string;\n  credentialsDir: string;\n  contextConfigsDir: string;\n  externalAgentsDir: string;\n  skillsDir: string;\n}\n\n/**\n * Create project directory structure\n */\nexport function createProjectStructure(projectRoot: string): ProjectPaths {\n  mkdirSync(projectRoot, { recursive: true });\n  return {\n    projectRoot,\n    agentsDir: join(projectRoot, 'agents'),\n    toolsDir: join(projectRoot, 'tools'),\n    dataComponentsDir: join(projectRoot, 'data-components'),\n    artifactComponentsDir: join(projectRoot, 'artifact-components'),\n    statusComponentsDir: join(projectRoot, 'status-components'),\n    environmentsDir: join(projectRoot, 'environments'),\n    credentialsDir: join(projectRoot, 'credentials'),\n    contextConfigsDir: join(projectRoot, 'context-configs'),\n    externalAgentsDir: join(projectRoot, 'external-agents'),\n    skillsDir: join(projectRoot, 'skills'),\n  };\n}\n\n/**\n * Enrich canDelegateTo references with component type information\n */\nexport function enrichCanDelegateToWithTypes(project: FullProjectDefinition): void {\n  const { agents } = project;\n  // Get all available component IDs by type\n  const agentsIdSet = new Set(Object.keys(agents));\n  const subAgentsIdSet = new Set(\n    Object.values(agents).flatMap((agentData) => Object.keys(agentData.subAgents))\n  );\n  const externalAgentsIdSet = new Set(\n    project.externalAgents ? Object.keys(project.externalAgents) : []\n  );\n\n  // Function to enrich a canDelegateTo array\n\n  function enrichCanDelegateToArray(canDelegateTo: unknown[]): unknown[] {\n    return canDelegateTo.map((item) => {\n      // Skip if it's already an object (already has type info)\n      if (typeof item !== 'string') return item;\n      if (agentsIdSet.has(item)) return { agentId: item };\n      if (subAgentsIdSet.has(item)) return { subAgentId: item };\n      if (externalAgentsIdSet.has(item)) return { externalAgentId: item };\n      return item;\n    });\n  }\n\n  // Process all agents\n  for (const { subAgents } of Object.values(project.agents)) {\n    // Process subAgents within agents\n    for (const subAgentData of Object.values(subAgents)) {\n      if (Array.isArray(subAgentData.canDelegateTo)) {\n        // @ts-expect-error\n        subAgentData.canDelegateTo = enrichCanDelegateToArray(subAgentData.canDelegateTo);\n      }\n    }\n  }\n}\n\n/**\n * Main pull v4 command\n * @returns PullResult when in batch mode, otherwise void (exits process)\n */\nexport async function pullV4Command(options: PullV3Options): Promise<PullResult | undefined> {\n  // Handle --all flag for batch operations\n  if (options.all) {\n    await pullAllProjects(options);\n    return;\n  }\n\n  const batchMode = options._batchMode ?? false;\n\n  // Suppress SDK logging for cleaner output\n  const originalLogLevel = process.env.LOG_LEVEL;\n  process.env.LOG_LEVEL = 'silent';\n\n  const restoreLogLevel = () => {\n    if (originalLogLevel !== undefined) {\n      process.env.LOG_LEVEL = originalLogLevel;\n    } else {\n      delete process.env.LOG_LEVEL;\n    }\n  };\n\n  // Background version check (skip in batch mode - already done)\n  if (!batchMode) {\n    performBackgroundVersionCheck();\n  }\n\n  console.log(styleText('blue', '\\nInkeep Pull:'));\n  if (options.introspect) {\n    console.log(\n      styleText('gray', '  Introspect mode • Complete regeneration • No comparison needed')\n    );\n  } else {\n    console.log(styleText('gray', '  Smart comparison • Detect all changes • Targeted updates'));\n  }\n\n  const s = p.spinner();\n\n  try {\n    // Step 1: Load configuration (same as push command)\n    const { config, isCI } = await initializeCommand({\n      configPath: options.config,\n      profileName: options.profile,\n      tag: options.tag,\n      showSpinner: true,\n      spinnerText: 'Loading configuration...',\n      logConfig: true,\n      quiet: options.quiet,\n    });\n\n    // Step 2: Determine project directory and ID\n    s.start('Detecting project...');\n    let projectDir: string;\n    let projectId: string;\n    let localProjectForId: any = null;\n\n    const currentDir = process.cwd();\n    const hasIndexInCurrent = existsSync(join(currentDir, 'index.ts'));\n\n    if (hasIndexInCurrent) {\n      // We're in a project directory\n      projectDir = currentDir;\n\n      s.start('Loading local project...');\n      try {\n        localProjectForId = await loadProject(projectDir);\n        const localProjectId = localProjectForId.getId();\n\n        if (options.project) {\n          // Validate that --project matches local project ID\n          if (localProjectId !== options.project) {\n            s.stop('Project ID mismatch');\n            console.error(\n              styleText(\n                'red',\n                `Local project ID \"${localProjectId}\" doesn't match --project \"${options.project}\"`\n              )\n            );\n            console.error(\n              styleText(\n                'yellow',\n                'Either remove --project flag or ensure it matches the local project ID'\n              )\n            );\n            if (batchMode) {\n              return { success: false, error: 'Project ID mismatch' };\n            }\n            process.exit(1);\n          }\n        }\n\n        projectId = localProjectId;\n        s.stop(`Using local project: ${projectId}`);\n      } catch (error) {\n        s.stop('Failed to load local project');\n        throw new Error(\n          `Could not load local project: ${error instanceof Error ? error.message : String(error)}`\n        );\n      }\n    } else {\n      // No index.ts in current directory\n      if (!options.project) {\n        s.stop('No index.ts found in current directory');\n        console.error(\n          styleText(\n            'yellow',\n            'Please run this command from a directory containing index.ts or use --project <project-id>'\n          )\n        );\n        if (batchMode) {\n          return { success: false, error: 'No index.ts found and no --project specified' };\n        }\n        process.exit(1);\n      }\n\n      // Try --project as directory path first\n      const projectPath = resolve(currentDir, options.project);\n      const hasIndexInPath = existsSync(join(projectPath, 'index.ts'));\n\n      if (hasIndexInPath) {\n        // --project is a valid directory path\n        projectDir = projectPath;\n        s.start('Loading project from specified path...');\n        try {\n          localProjectForId = await loadProject(projectDir);\n          projectId = localProjectForId.getId();\n          s.stop(`Using project from path: ${projectId}`);\n        } catch (error) {\n          s.stop('Failed to load project from path');\n          throw new Error(\n            `Could not load project from ${projectPath}: ${error instanceof Error ? error.message : String(error)}`\n          );\n        }\n      } else {\n        // Treat --project as project ID, create subdirectory\n        projectId = options.project;\n        projectDir = join(currentDir, projectId);\n        s.stop(`Creating new project directory: ${projectDir}`);\n      }\n    }\n\n    // Step 4: Fetch project data from API\n    s.start(`Fetching project: ${projectId}`);\n\n    const apiClient = await ManagementApiClient.create(\n      config.agentsApiUrl,\n      options.config,\n      config.tenantId,\n      projectId,\n      isCI,\n      config.agentsApiKey\n    );\n\n    const remoteProject = await apiClient.getFullProject(projectId);\n\n    if (options.debug && remoteProject.functions) {\n      console.log(\n        styleText('gray', '   📋 Project-level functions from API:'),\n        Object.keys(remoteProject.functions)\n      );\n      Object.entries(remoteProject.functions).forEach(([id, data]: [string, any]) => {\n        console.log(\n          styleText(\n            'gray',\n            `      ${id}: has name=${!!data.name}, has description=${!!data.description}`\n          )\n        );\n      });\n    }\n\n    // Normalize remote project (same as pull-v2 - hoist agent-level functionTools)\n    if (remoteProject.agents) {\n      for (const [agentId, agentData] of Object.entries(remoteProject.agents) as any[]) {\n        if (agentData.functionTools) {\n          remoteProject.functionTools = remoteProject.functionTools || {};\n          Object.assign(remoteProject.functionTools, agentData.functionTools);\n          if (options.debug) {\n            console.log(\n              styleText(\n                'gray',\n                `   Hoisted functionTools from agent ${agentId}: ${Object.keys(agentData.functionTools).join(', ')}`\n              )\n            );\n          }\n        }\n        if (agentData.functions) {\n          remoteProject.functions ||= {};\n          const { functions } = remoteProject;\n          // Only hoist agent functions if project-level functions don't already exist (clean function data)\n          Object.entries(agentData.functions).forEach(([funcId, funcData]: [string, any]) => {\n            // Clean function data - remove functionTool metadata that shouldn't be in functions collection\n            functions[funcId] ||= {\n              id: funcData.id,\n              inputSchema: funcData.inputSchema,\n              executeCode: funcData.executeCode,\n              dependencies: funcData.dependencies,\n              createdAt: '',\n              updatedAt: '',\n            };\n          });\n        }\n      }\n    }\n\n    // Filter out project-level tools from individual agents\n    // The API includes project-level tools in each agent's tools field, but our generated\n    // code structure keeps tools separate and imports them via canUse relationships\n    if (remoteProject.agents && remoteProject.tools) {\n      const projectToolIds = Object.keys(remoteProject.tools);\n\n      for (const agentData of Object.values(remoteProject.agents) as any[]) {\n        if (agentData.tools) {\n          // Filter out any tools that are defined at project level\n          const agentSpecificTools = Object.fromEntries(\n            Object.entries(agentData.tools).filter(([toolId]) => !projectToolIds.includes(toolId))\n          );\n\n          // Only keep tools field if there are agent-specific tools remaining\n          if (Object.keys(agentSpecificTools).length > 0) {\n            agentData.tools = agentSpecificTools;\n          } else {\n            // Remove the tools field entirely if all tools were project-level\n            delete agentData.tools;\n          }\n        }\n      }\n    }\n\n    // Enrich canDelegateTo references with component type information\n    // @ts-expect-error -- fixme Types of property `models` are incompatible.\n    enrichCanDelegateToWithTypes(remoteProject);\n\n    s.message('Project data fetched');\n\n    if (options.json) {\n      console.log(JSON.stringify(remoteProject, null, 2));\n      restoreLogLevel();\n      return;\n    }\n\n    // Step 5: Set up project structure\n    const paths = createProjectStructure(projectDir);\n\n    await generateProjectSkillsIfPresent(remoteProject, paths.skillsDir);\n\n    s.start('Starting generating files...');\n    await introspectGenerate({\n      // @ts-expect-error -- ignore Types of property 'models' are incompatible.\n      project: remoteProject,\n      paths,\n      debug: options.debug,\n    });\n    s.stop('All files generated');\n\n    console.log(styleText('green', '\\nProject synced successfully!'));\n    console.log(styleText('gray', `   Location: ${paths.projectRoot}`));\n    console.log(styleText('gray', `   Environment: ${options.env || 'development'}`));\n    console.log(\n      styleText(\n        'yellow',\n        '⚠️  If you encounter broken code after running `inkeep pull`, please report it at https://github.com/inkeep/agents/issues.'\n      )\n    );\n\n    restoreLogLevel();\n    if (batchMode) {\n      return { success: true };\n    }\n    process.exit(0);\n  } catch (error) {\n    const message = error instanceof Error ? error.stack : String(error);\n    s.stop();\n    console.error(styleText('red', `\\nError: ${message}`));\n    if (options.debug && error instanceof Error) {\n      console.error(styleText('red', error.stack || ''));\n    }\n    restoreLogLevel();\n    if (batchMode) {\n      return { success: false, error: message };\n    }\n    process.exit(1);\n  }\n}\n\n/**\n * Pull all projects for the current tenant\n * Uses smart comparison with LLM merging for existing projects, introspect for new projects\n */\nasync function pullAllProjects(options: PullV3Options): Promise<void> {\n  console.log(styleText('blue', '\\n🔄 Batch Pull: Sequential processing with smart comparison\\n'));\n  console.log(\n    styleText(\n      'gray',\n      '  • Existing projects: Smart comparison + AST merging + confirmation prompts'\n    )\n  );\n  console.log(styleText('gray', '  • New projects: Fresh generation with introspect mode\\n'));\n\n  // Background version check (only once for batch)\n  performBackgroundVersionCheck();\n\n  // Load configuration first\n  const { config, isCI } = await initializeCommand({\n    configPath: options.config,\n    profileName: options.profile,\n    tag: options.tag,\n    showSpinner: true,\n    spinnerText: 'Loading configuration...',\n    logConfig: true,\n    quiet: options.quiet,\n  });\n\n  const s = p.spinner();\n\n  try {\n    // Fetch all projects from the API\n    s.start('Fetching project list from API...');\n    const apiClient = await ManagementApiClient.create(\n      config.agentsApiUrl,\n      options.config,\n      config.tenantId,\n      undefined,\n      isCI,\n      config.agentsApiKey\n    );\n\n    const projects = await apiClient.listAllProjects();\n    s.stop(`Found ${projects.length} project(s)`);\n\n    if (!projects.length) {\n      console.log(styleText('yellow', 'No projects found for this tenant.'));\n      process.exit(0);\n    }\n\n    // Categorize projects\n    const existingProjects: typeof projects = [];\n    const newProjects: typeof projects = [];\n\n    for (const project of projects) {\n      const targetDir = join(process.cwd(), project.id);\n      if (existsSync(join(targetDir, 'index.ts'))) {\n        existingProjects.push(project);\n      } else {\n        newProjects.push(project);\n      }\n    }\n\n    console.log(styleText('gray', '\\nProjects to pull:\\n'));\n    if (existingProjects.length > 0) {\n      console.log(styleText('cyan', '  Existing (smart comparison):'));\n      for (const project of existingProjects) {\n        console.log(styleText('gray', `    • ${project.name || project.id} (${project.id})`));\n      }\n    }\n    if (newProjects.length > 0) {\n      console.log(styleText('cyan', '  New (introspect):'));\n      for (const project of newProjects) {\n        console.log(styleText('gray', `    • ${project.name || project.id} (${project.id})`));\n      }\n    }\n    console.log();\n\n    const results: BatchPullResult[] = [];\n    const total = projects.length;\n\n    for (let i = 0; i < projects.length; i++) {\n      const project = projects[i];\n      const progress = `[${i + 1}/${total}]`;\n\n      console.log(styleText('cyan', `\\n${'─'.repeat(60)}`));\n      console.log(styleText('cyan', `${progress} Pulling ${project.name || project.id}...`));\n\n      const result = await pullSingleProject(project.id, project.name, options, config, isCI);\n      results.push(result);\n\n      if (result.success) {\n        console.log(\n          styleText(\n            'green',\n            `\\n  ✓ ${result.projectName || result.projectId} → ${result.targetDir}`\n          )\n        );\n      } else {\n        console.log(\n          styleText('red', `\\n  ✗ ${result.projectName || result.projectId}: ${result.error}`)\n        );\n      }\n    }\n\n    // Print summary\n    const succeeded = results.filter((r) => r.success).length;\n    const failed = results.filter((r) => !r.success).length;\n\n    console.log(styleText('cyan', `\\n${'═'.repeat(60)}`));\n    console.log(styleText('cyan', '📊 Batch Pull Summary:'));\n    console.log(styleText('green', `  ✓ Succeeded: ${succeeded}`));\n    if (failed > 0) {\n      console.log(styleText('red', `  ✗ Failed: ${failed}`));\n\n      console.log(styleText('red', '\\nFailed projects:'));\n      for (const result of results) {\n        if (!result.success) {\n          console.log(styleText('red', `  • ${result.projectId}: ${result.error}`));\n        }\n      }\n    }\n\n    process.exit(failed > 0 ? 1 : 0);\n  } catch (error) {\n    s.stop();\n    console.error(\n      styleText('red', `\\nError: ${error instanceof Error ? error.message : String(error)}`)\n    );\n    process.exit(1);\n  }\n}\n\n/**\n * Pull a single project (used by batch operations)\n * Uses smart comparison flow for existing projects, introspect for new projects\n */\nexport async function pullSingleProject(\n  projectId: string,\n  projectName: string | undefined,\n  options: PullV3Options,\n  config: any,\n  isCI?: boolean\n): Promise<BatchPullResult> {\n  const targetDir = join(process.cwd(), projectId);\n  const hasExistingProject = existsSync(join(targetDir, 'index.ts'));\n\n  try {\n    if (hasExistingProject) {\n      // Project exists locally - use smart comparison flow with LLM merging and user prompts\n      console.log(styleText('gray', `   📂 Existing project found - using smart comparison mode`));\n\n      // Save current directory and change to project directory\n      const originalDir = process.cwd();\n      process.chdir(targetDir);\n\n      try {\n        // Call the main pull command in batch mode (returns results instead of exiting)\n        const result = await pullV4Command({\n          ...options,\n          project: projectId,\n          all: false, // Don't recurse into batch mode\n          _batchMode: true,\n        });\n\n        // Restore original directory\n        process.chdir(originalDir);\n\n        if (result && typeof result === 'object') {\n          return {\n            projectId,\n            projectName,\n            targetDir,\n            success: result.success,\n            error: result.error,\n          };\n        }\n\n        return {\n          projectId,\n          projectName,\n          targetDir,\n          success: true,\n        };\n      } catch (error) {\n        // Restore original directory even on error\n        process.chdir(originalDir);\n        throw error;\n      }\n    }\n    console.log(styleText('gray', '   New project'));\n\n    // Suppress SDK logging\n    const originalLogLevel = process.env.LOG_LEVEL;\n    process.env.LOG_LEVEL = 'silent';\n\n    const restoreLogLevel = () => {\n      if (originalLogLevel !== undefined) {\n        process.env.LOG_LEVEL = originalLogLevel;\n      } else {\n        delete process.env.LOG_LEVEL;\n      }\n    };\n\n    // Fetch project data from API\n    const apiClient = await ManagementApiClient.create(\n      config.agentsApiUrl,\n      options.config,\n      config.tenantId,\n      projectId,\n      isCI,\n      config.agentsApiKey\n    );\n\n    const remoteProject = await apiClient.getFullProject(projectId);\n    // Create project structure\n    const paths = createProjectStructure(targetDir);\n    await generateProjectSkillsIfPresent(remoteProject, paths.skillsDir);\n\n    // Generate all files using introspect mode for new projects\n    await introspectGenerate({\n      // @ts-expect-error -- ignore Types of property 'models' are incompatible.\n      project: remoteProject,\n      paths,\n    });\n\n    restoreLogLevel();\n\n    return {\n      projectId,\n      projectName: projectName || remoteProject.name,\n      targetDir,\n      success: true,\n    };\n  } catch (error) {\n    return {\n      projectId,\n      projectName,\n      targetDir,\n      success: false,\n      error: error instanceof Error ? error.message : String(error),\n    };\n  }\n}\n\nasync function generateProjectSkillsIfPresent(\n  remoteProject: any,\n  skillsDir: string\n): Promise<void> {\n  const skills = remoteProject.skills ?? {};\n  if (!Object.keys(skills).length) {\n    return;\n  }\n\n  const { generateSkills } = await import('../skill');\n  await generateSkills(skills, skillsDir);\n}\n"],"mappings":"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"}
+{"version":3,"file":"index.js","names":[],"sources":["../../../../src/commands/pull-v4/introspect/index.ts"],"sourcesContent":["/**\n * Pull v3 - Clean, efficient project generation\n *\n * Step 1: Validate and compile existing code\n * Step 2: Compare project with DB to detect ALL changes\n * Step 3: Classify changes as new vs modified components\n * Step 4: Generate new components deterministically\n * Step 5: Use LLM to correct modified components\n */\n\nimport { EventEmitter } from 'node:events';\nimport { existsSync, mkdirSync } from 'node:fs';\nimport { join, resolve } from 'node:path';\nimport { styleText } from 'node:util';\nimport * as p from '@clack/prompts';\nimport { type FullProjectDefinition, getTempBranchSuffix } from '@inkeep/agents-core';\n\n// Increase max listeners to prevent warnings during complex CLI flows\n// This is needed because @clack/prompts + multiple interactive prompts + spinners all add listeners\nEventEmitter.defaultMaxListeners = 20;\n\nimport { ManagementApiClient } from '../../../api';\nimport { performBackgroundVersionCheck } from '../../../utils/background-version-check';\nimport { initializeCommand } from '../../../utils/cli-pipeline';\nimport { loadProject } from '../../../utils/project-loader';\nimport { readProjectState, writeProjectState } from '../../../utils/state';\nimport { introspectGenerate } from '../introspect-generator';\n\nexport interface PullV3Options {\n  project?: string;\n  config?: string;\n  profile?: string;\n  env?: string;\n  json?: boolean;\n  debug?: boolean;\n  verbose?: boolean;\n  force?: boolean;\n  introspect?: boolean;\n  all?: boolean;\n  tag?: string;\n  quiet?: boolean;\n  conflictStrategy?: 'ours' | 'theirs';\n  /** Internal: used for batch operations to return results instead of calling process.exit() */\n  _batchMode?: boolean;\n}\n\nexport interface PullResult {\n  success: boolean;\n  skipped?: boolean;\n  upToDate?: boolean;\n  error?: string;\n}\n\ninterface BatchPullResult {\n  projectId: string;\n  projectName?: string;\n  targetDir: string;\n  success: boolean;\n  error?: string;\n}\n\ninterface ProjectPaths {\n  projectRoot: string;\n  agentsDir: string;\n  toolsDir: string;\n  dataComponentsDir: string;\n  artifactComponentsDir: string;\n  statusComponentsDir: string;\n  environmentsDir: string;\n  credentialsDir: string;\n  contextConfigsDir: string;\n  externalAgentsDir: string;\n  skillsDir: string;\n}\n\n/**\n * Create project directory structure\n */\nexport function createProjectStructure(projectRoot: string): ProjectPaths {\n  mkdirSync(projectRoot, { recursive: true });\n  return {\n    projectRoot,\n    agentsDir: join(projectRoot, 'agents'),\n    toolsDir: join(projectRoot, 'tools'),\n    dataComponentsDir: join(projectRoot, 'data-components'),\n    artifactComponentsDir: join(projectRoot, 'artifact-components'),\n    statusComponentsDir: join(projectRoot, 'status-components'),\n    environmentsDir: join(projectRoot, 'environments'),\n    credentialsDir: join(projectRoot, 'credentials'),\n    contextConfigsDir: join(projectRoot, 'context-configs'),\n    externalAgentsDir: join(projectRoot, 'external-agents'),\n    skillsDir: join(projectRoot, 'skills'),\n  };\n}\n\n/**\n * Enrich canDelegateTo references with component type information\n */\nexport function enrichCanDelegateToWithTypes(project: FullProjectDefinition): void {\n  const { agents } = project;\n  // Get all available component IDs by type\n  const agentsIdSet = new Set(Object.keys(agents));\n  const subAgentsIdSet = new Set(\n    Object.values(agents).flatMap((agentData) => Object.keys(agentData.subAgents))\n  );\n  const externalAgentsIdSet = new Set(\n    project.externalAgents ? Object.keys(project.externalAgents) : []\n  );\n\n  // Function to enrich a canDelegateTo array\n\n  function enrichCanDelegateToArray(canDelegateTo: unknown[]): unknown[] {\n    return canDelegateTo.map((item) => {\n      // Skip if it's already an object (already has type info)\n      if (typeof item !== 'string') return item;\n      if (agentsIdSet.has(item)) return { agentId: item };\n      if (subAgentsIdSet.has(item)) return { subAgentId: item };\n      if (externalAgentsIdSet.has(item)) return { externalAgentId: item };\n      return item;\n    });\n  }\n\n  // Process all agents\n  for (const { subAgents } of Object.values(project.agents)) {\n    // Process subAgents within agents\n    for (const subAgentData of Object.values(subAgents)) {\n      if (Array.isArray(subAgentData.canDelegateTo)) {\n        // @ts-expect-error\n        subAgentData.canDelegateTo = enrichCanDelegateToArray(subAgentData.canDelegateTo);\n      }\n    }\n  }\n}\n\n/**\n * Main pull v4 command\n * @returns PullResult when in batch mode, otherwise void (exits process)\n */\nexport async function pullV4Command(options: PullV3Options): Promise<PullResult | undefined> {\n  // Handle --all flag for batch operations\n  if (options.all) {\n    await pullAllProjects(options);\n    return;\n  }\n\n  const batchMode = options._batchMode ?? false;\n\n  // Suppress SDK logging for cleaner output\n  const originalLogLevel = process.env.LOG_LEVEL;\n  process.env.LOG_LEVEL = 'silent';\n\n  const restoreLogLevel = () => {\n    if (originalLogLevel !== undefined) {\n      process.env.LOG_LEVEL = originalLogLevel;\n    } else {\n      delete process.env.LOG_LEVEL;\n    }\n  };\n\n  // Background version check (skip in batch mode - already done)\n  if (!batchMode) {\n    performBackgroundVersionCheck();\n  }\n\n  console.log(styleText('blue', '\\nInkeep Pull:'));\n  if (options.introspect) {\n    console.log(\n      styleText('gray', '  Introspect mode • Complete regeneration • No comparison needed')\n    );\n  } else {\n    console.log(styleText('gray', '  Smart comparison • Detect all changes • Targeted updates'));\n  }\n\n  try {\n    // Step 1: Load configuration (same as push command)\n    const { config, isCI } = await initializeCommand({\n      configPath: options.config,\n      profileName: options.profile,\n      tag: options.tag,\n      showSpinner: true,\n      spinnerText: 'Loading configuration...',\n      logConfig: true,\n      quiet: options.quiet,\n    });\n    let projectDir: string;\n    let projectId: string;\n    let localProjectForId: any = null;\n\n    const currentDir = process.cwd();\n    const hasIndexInCurrent = existsSync(join(currentDir, 'index.ts'));\n\n    if (hasIndexInCurrent) {\n      // We're in a project directory\n      projectDir = currentDir;\n\n      try {\n        localProjectForId = await loadProject(projectDir);\n        const localProjectId = localProjectForId.getId();\n\n        if (options.project) {\n          // Validate that --project matches local project ID\n          if (localProjectId !== options.project) {\n            console.error(\n              styleText(\n                'red',\n                `Local project ID \"${localProjectId}\" doesn't match --project \"${options.project}\"`\n              )\n            );\n            console.error(\n              styleText(\n                'yellow',\n                'Either remove --project flag or ensure it matches the local project ID'\n              )\n            );\n            if (batchMode) {\n              return { success: false, error: 'Project ID mismatch' };\n            }\n            process.exit(1);\n          }\n        }\n\n        projectId = localProjectId;\n        console.log(styleText('green', `◆ Using local project: ${projectId}`));\n      } catch (error) {\n        throw new Error(\n          `Could not load local project: ${error instanceof Error ? error.message : String(error)}`\n        );\n      }\n    } else {\n      // No index.ts in current directory\n      if (!options.project) {\n        console.error(\n          styleText(\n            'yellow',\n            'Please run this command from a directory containing index.ts or use --project <project-id>'\n          )\n        );\n        if (batchMode) {\n          return { success: false, error: 'No index.ts found and no --project specified' };\n        }\n        process.exit(1);\n      }\n\n      // Try --project as directory path first\n      const projectPath = resolve(currentDir, options.project);\n      const hasIndexInPath = existsSync(join(projectPath, 'index.ts'));\n\n      if (hasIndexInPath) {\n        // --project is a valid directory path\n        projectDir = projectPath;\n        try {\n          localProjectForId = await loadProject(projectDir);\n          projectId = localProjectForId.getId();\n          console.log(styleText('green', `◆ Using project from path: ${projectId}`));\n        } catch (error) {\n          throw new Error(\n            `Could not load project from ${projectPath}: ${error instanceof Error ? error.message : String(error)}`\n          );\n        }\n      } else {\n        // Treat --project as project ID, create subdirectory\n        projectId = options.project;\n        projectDir = join(currentDir, projectId);\n        console.log(styleText('green', `◆ Creating new project directory: ${projectDir}`));\n      }\n    }\n\n    const existingState = readProjectState(projectId);\n    const lastPulledHash = existingState?.lastPulledHash;\n\n    if (options.debug && lastPulledHash) {\n      console.log(styleText('gray', `   Last pulled hash: ${lastPulledHash}`));\n    }\n\n    const apiClient = await ManagementApiClient.create(\n      config.agentsApiUrl,\n      options.config,\n      config.tenantId,\n      projectId,\n      isCI,\n      config.agentsApiKey\n    );\n\n    let currentMainHash: string | undefined;\n    try {\n      const mainBranch = await apiClient.getBranch(projectId, 'main');\n      currentMainHash = mainBranch.hash;\n    } catch (error) {\n      if (options.debug) {\n        console.log(\n          styleText(\n            'gray',\n            `   Could not fetch main branch hash: ${error instanceof Error ? error.message : String(error)}`\n          )\n        );\n      }\n      // Non-fatal: if we can't get the hash, fall through to direct pull\n    }\n\n    if (options.debug && currentMainHash) {\n      console.log(styleText('gray', `   Current main hash: ${currentMainHash}`));\n    }\n\n    let remoteProject: Awaited<ReturnType<typeof apiClient.getFullProject>> | undefined;\n\n    if (localProjectForId && lastPulledHash) {\n      const tempBranchName = getTempBranchSuffix('cli-pull');\n\n      try {\n        await apiClient.createBranch(projectId, {\n          name: tempBranchName,\n          fromCommit: lastPulledHash,\n        });\n\n        const localProjectDefinition = await localProjectForId.getFullDefinition();\n        await apiClient.pushFullProject(projectId, tempBranchName, localProjectDefinition);\n\n        // Merge main INTO temp branch so the temp branch gets a reconciled result\n        // (main's changes + user's local changes). We then pull from the temp branch.\n        // We must NOT merge temp into main — that would push local edits to main.\n        const preview = await apiClient.mergePreview(projectId, {\n          sourceBranch: 'main',\n          targetBranch: tempBranchName,\n        });\n\n        if (preview.hasConflicts) {\n          const { resolveConflictsInteractive } = await import('../merge-conflicts');\n          const resolutions = await resolveConflictsInteractive(preview.conflicts, options);\n\n          if (resolutions === null) {\n            console.log(styleText('yellow', 'Pull cancelled'));\n            return;\n          }\n\n          await apiClient.mergeExecute(projectId, {\n            sourceBranch: 'main',\n            targetBranch: tempBranchName,\n            sourceHash: preview.sourceHash,\n            targetHash: preview.targetHash,\n            resolutions,\n            message: 'CLI pull: merge main into local state',\n          });\n        } else {\n          await apiClient.mergeExecute(projectId, {\n            sourceBranch: 'main',\n            targetBranch: tempBranchName,\n            sourceHash: preview.sourceHash,\n            targetHash: preview.targetHash,\n            message: 'CLI pull: merge main into local state',\n          });\n        }\n        // Fetch the reconciled project from the temp branch before cleanup\n        remoteProject = await apiClient.getFullProject(projectId, tempBranchName);\n      } finally {\n        try {\n          await apiClient.deleteBranch(projectId, tempBranchName, true);\n        } catch (cleanupError) {\n          if (options.debug) {\n            console.log(\n              styleText(\n                'gray',\n                `   Warning: Could not delete temp branch ${tempBranchName}: ${cleanupError instanceof Error ? cleanupError.message : String(cleanupError)}`\n              )\n            );\n          }\n        }\n      }\n    } else {\n      // Todo: we can probably just exit here because there is nothing new to pull\n      remoteProject = await apiClient.getFullProject(projectId);\n    }\n\n    if (options.debug && remoteProject.functions) {\n      console.log(\n        styleText('gray', '   📋 Project-level functions from API:'),\n        Object.keys(remoteProject.functions)\n      );\n      Object.entries(remoteProject.functions).forEach(([id, data]: [string, any]) => {\n        console.log(\n          styleText(\n            'gray',\n            `      ${id}: has name=${!!data.name}, has description=${!!data.description}`\n          )\n        );\n      });\n    }\n\n    // Normalize remote project (same as pull-v2 - hoist agent-level functionTools)\n    if (remoteProject.agents) {\n      for (const [agentId, agentData] of Object.entries(remoteProject.agents) as any[]) {\n        if (agentData.functionTools) {\n          remoteProject.functionTools = remoteProject.functionTools || {};\n          Object.assign(remoteProject.functionTools, agentData.functionTools);\n          if (options.debug) {\n            console.log(\n              styleText(\n                'gray',\n                `   Hoisted functionTools from agent ${agentId}: ${Object.keys(agentData.functionTools).join(', ')}`\n              )\n            );\n          }\n        }\n        if (agentData.functions) {\n          remoteProject.functions ||= {};\n          const { functions } = remoteProject;\n          // Only hoist agent functions if project-level functions don't already exist (clean function data)\n          Object.entries(agentData.functions).forEach(([funcId, funcData]: [string, any]) => {\n            // Clean function data - remove functionTool metadata that shouldn't be in functions collection\n            functions[funcId] ||= {\n              id: funcData.id,\n              inputSchema: funcData.inputSchema,\n              executeCode: funcData.executeCode,\n              dependencies: funcData.dependencies,\n              createdAt: '',\n              updatedAt: '',\n            };\n          });\n        }\n      }\n    }\n\n    // Filter out project-level tools from individual agents\n    // The API includes project-level tools in each agent's tools field, but our generated\n    // code structure keeps tools separate and imports them via canUse relationships\n    if (remoteProject.agents && remoteProject.tools) {\n      const projectToolIds = Object.keys(remoteProject.tools);\n\n      for (const agentData of Object.values(remoteProject.agents) as any[]) {\n        if (agentData.tools) {\n          // Filter out any tools that are defined at project level\n          const agentSpecificTools = Object.fromEntries(\n            Object.entries(agentData.tools).filter(([toolId]) => !projectToolIds.includes(toolId))\n          );\n\n          // Only keep tools field if there are agent-specific tools remaining\n          if (Object.keys(agentSpecificTools).length > 0) {\n            agentData.tools = agentSpecificTools;\n          } else {\n            // Remove the tools field entirely if all tools were project-level\n            delete agentData.tools;\n          }\n        }\n      }\n    }\n\n    // Enrich canDelegateTo references with component type information\n    // @ts-expect-error -- fixme Types of property `models` are incompatible.\n    enrichCanDelegateToWithTypes(remoteProject);\n\n    console.log(styleText('green', '◆ Project data fetched'));\n\n    if (options.json) {\n      console.log(JSON.stringify(remoteProject, null, 2));\n      restoreLogLevel();\n      return;\n    }\n\n    // Step 5: Set up project structure\n    const paths = createProjectStructure(projectDir);\n\n    await generateProjectSkillsIfPresent(remoteProject, paths.skillsDir);\n\n    console.log(styleText('gray', 'Generating files...'));\n    await introspectGenerate({\n      // @ts-expect-error -- ignore Types of property 'models' are incompatible.\n      project: remoteProject,\n      paths,\n      debug: options.debug,\n    });\n    console.log(styleText('green', '◆ All files generated'));\n\n    try {\n      const mainBranch = await apiClient.getBranch(projectId, 'main');\n      writeProjectState(projectId, mainBranch.hash);\n    } catch (error) {\n      console.warn(\n        styleText(\n          'yellow',\n          `Warning: Could not save pull state: ${error instanceof Error ? error.message : String(error)}`\n        )\n      );\n      console.warn(styleText('yellow', 'Future pulls may re-prompt for conflict resolution.'));\n    }\n\n    console.log(styleText('green', '\\nProject synced successfully!'));\n    console.log(styleText('gray', `   Location: ${paths.projectRoot}`));\n    console.log(styleText('gray', `   Environment: ${options.env || 'development'}`));\n    console.log(\n      styleText(\n        'yellow',\n        '⚠️  If you encounter broken code after running `inkeep pull`, please report it at https://github.com/inkeep/agents/issues.'\n      )\n    );\n\n    restoreLogLevel();\n    if (batchMode) {\n      return { success: true };\n    }\n    process.exit(0);\n  } catch (error) {\n    const message = error instanceof Error ? error.stack : String(error);\n    console.error(styleText('red', `\\nError: ${message}`));\n    if (options.debug && error instanceof Error) {\n      console.error(styleText('red', error.stack || ''));\n    }\n    restoreLogLevel();\n    if (batchMode) {\n      return { success: false, error: message };\n    }\n    process.exit(1);\n  }\n}\n\n/**\n * Pull all projects for the current tenant\n * Uses smart comparison with LLM merging for existing projects, introspect for new projects\n */\nasync function pullAllProjects(options: PullV3Options): Promise<void> {\n  console.log(styleText('blue', '\\n🔄 Batch Pull: Sequential processing with smart comparison\\n'));\n  console.log(\n    styleText(\n      'gray',\n      '  • Existing projects: Smart comparison + AST merging + confirmation prompts'\n    )\n  );\n  console.log(styleText('gray', '  • New projects: Fresh generation with introspect mode\\n'));\n\n  // Background version check (only once for batch)\n  performBackgroundVersionCheck();\n\n  // Load configuration first\n  const { config, isCI } = await initializeCommand({\n    configPath: options.config,\n    profileName: options.profile,\n    tag: options.tag,\n    showSpinner: true,\n    spinnerText: 'Loading configuration...',\n    logConfig: true,\n    quiet: options.quiet,\n  });\n\n  const s = p.spinner();\n\n  try {\n    // Fetch all projects from the API\n    s.start('Fetching project list from API...');\n    const apiClient = await ManagementApiClient.create(\n      config.agentsApiUrl,\n      options.config,\n      config.tenantId,\n      undefined,\n      isCI,\n      config.agentsApiKey\n    );\n\n    const projects = await apiClient.listAllProjects();\n    s.stop(`Found ${projects.length} project(s)`);\n\n    if (!projects.length) {\n      console.log(styleText('yellow', 'No projects found for this tenant.'));\n      process.exit(0);\n    }\n\n    // Categorize projects\n    const existingProjects: typeof projects = [];\n    const newProjects: typeof projects = [];\n\n    for (const project of projects) {\n      const targetDir = join(process.cwd(), project.id);\n      if (existsSync(join(targetDir, 'index.ts'))) {\n        existingProjects.push(project);\n      } else {\n        newProjects.push(project);\n      }\n    }\n\n    console.log(styleText('gray', '\\nProjects to pull:\\n'));\n    if (existingProjects.length > 0) {\n      console.log(styleText('cyan', '  Existing (smart comparison):'));\n      for (const project of existingProjects) {\n        console.log(styleText('gray', `    • ${project.name || project.id} (${project.id})`));\n      }\n    }\n    if (newProjects.length > 0) {\n      console.log(styleText('cyan', '  New (introspect):'));\n      for (const project of newProjects) {\n        console.log(styleText('gray', `    • ${project.name || project.id} (${project.id})`));\n      }\n    }\n    console.log();\n\n    const results: BatchPullResult[] = [];\n    const total = projects.length;\n\n    for (let i = 0; i < projects.length; i++) {\n      const project = projects[i];\n      const progress = `[${i + 1}/${total}]`;\n\n      console.log(styleText('cyan', `\\n${'─'.repeat(60)}`));\n      console.log(styleText('cyan', `${progress} Pulling ${project.name || project.id}...`));\n\n      const result = await pullSingleProject(project.id, project.name, options, config, isCI);\n      results.push(result);\n\n      if (result.success) {\n        console.log(\n          styleText(\n            'green',\n            `\\n  ✓ ${result.projectName || result.projectId} → ${result.targetDir}`\n          )\n        );\n      } else {\n        console.log(\n          styleText('red', `\\n  ✗ ${result.projectName || result.projectId}: ${result.error}`)\n        );\n      }\n    }\n\n    // Print summary\n    const succeeded = results.filter((r) => r.success).length;\n    const failed = results.filter((r) => !r.success).length;\n\n    console.log(styleText('cyan', `\\n${'═'.repeat(60)}`));\n    console.log(styleText('cyan', '📊 Batch Pull Summary:'));\n    console.log(styleText('green', `  ✓ Succeeded: ${succeeded}`));\n    if (failed > 0) {\n      console.log(styleText('red', `  ✗ Failed: ${failed}`));\n\n      console.log(styleText('red', '\\nFailed projects:'));\n      for (const result of results) {\n        if (!result.success) {\n          console.log(styleText('red', `  • ${result.projectId}: ${result.error}`));\n        }\n      }\n    }\n\n    process.exit(failed > 0 ? 1 : 0);\n  } catch (error) {\n    s.stop();\n    console.error(\n      styleText('red', `\\nError: ${error instanceof Error ? error.message : String(error)}`)\n    );\n    process.exit(1);\n  }\n}\n\n/**\n * Pull a single project (used by batch operations)\n * Uses smart comparison flow for existing projects, introspect for new projects\n */\nexport async function pullSingleProject(\n  projectId: string,\n  projectName: string | undefined,\n  options: PullV3Options,\n  config: any,\n  isCI?: boolean\n): Promise<BatchPullResult> {\n  const targetDir = join(process.cwd(), projectId);\n  const hasExistingProject = existsSync(join(targetDir, 'index.ts'));\n\n  try {\n    if (hasExistingProject) {\n      // Project exists locally - use smart comparison flow with LLM merging and user prompts\n      console.log(styleText('gray', `   📂 Existing project found - using smart comparison mode`));\n\n      // Save current directory and change to project directory\n      const originalDir = process.cwd();\n      process.chdir(targetDir);\n\n      try {\n        // Call the main pull command in batch mode (returns results instead of exiting)\n        const result = await pullV4Command({\n          ...options,\n          project: projectId,\n          all: false, // Don't recurse into batch mode\n          _batchMode: true,\n        });\n\n        // Restore original directory\n        process.chdir(originalDir);\n\n        if (result && typeof result === 'object') {\n          return {\n            projectId,\n            projectName,\n            targetDir,\n            success: result.success,\n            error: result.error,\n          };\n        }\n\n        return {\n          projectId,\n          projectName,\n          targetDir,\n          success: true,\n        };\n      } catch (error) {\n        // Restore original directory even on error\n        process.chdir(originalDir);\n        throw error;\n      }\n    }\n    console.log(styleText('gray', '   New project'));\n\n    // Suppress SDK logging\n    const originalLogLevel = process.env.LOG_LEVEL;\n    process.env.LOG_LEVEL = 'silent';\n\n    const restoreLogLevel = () => {\n      if (originalLogLevel !== undefined) {\n        process.env.LOG_LEVEL = originalLogLevel;\n      } else {\n        delete process.env.LOG_LEVEL;\n      }\n    };\n\n    // Fetch project data from API\n    const apiClient = await ManagementApiClient.create(\n      config.agentsApiUrl,\n      options.config,\n      config.tenantId,\n      projectId,\n      isCI,\n      config.agentsApiKey\n    );\n\n    const remoteProject = await apiClient.getFullProject(projectId);\n    // Create project structure\n    const paths = createProjectStructure(targetDir);\n    await generateProjectSkillsIfPresent(remoteProject, paths.skillsDir);\n\n    // Generate all files using introspect mode for new projects\n    await introspectGenerate({\n      // @ts-expect-error -- ignore Types of property 'models' are incompatible.\n      project: remoteProject,\n      paths,\n    });\n\n    restoreLogLevel();\n\n    return {\n      projectId,\n      projectName: projectName || remoteProject.name,\n      targetDir,\n      success: true,\n    };\n  } catch (error) {\n    return {\n      projectId,\n      projectName,\n      targetDir,\n      success: false,\n      error: error instanceof Error ? error.message : String(error),\n    };\n  }\n}\n\nasync function generateProjectSkillsIfPresent(\n  remoteProject: any,\n  skillsDir: string\n): Promise<void> {\n  const skills = remoteProject.skills ?? {};\n  if (!Object.keys(skills).length) {\n    return;\n  }\n\n  const { generateSkills } = await import('../skill');\n  await generateSkills(skills, skillsDir);\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAmBA,aAAa,sBAAsB;;;;AA2DnC,SAAgB,uBAAuB,aAAmC;AACxE,WAAU,aAAa,EAAE,WAAW,MAAM,CAAC;AAC3C,QAAO;EACL;EACA,WAAW,KAAK,aAAa,SAAS;EACtC,UAAU,KAAK,aAAa,QAAQ;EACpC,mBAAmB,KAAK,aAAa,kBAAkB;EACvD,uBAAuB,KAAK,aAAa,sBAAsB;EAC/D,qBAAqB,KAAK,aAAa,oBAAoB;EAC3D,iBAAiB,KAAK,aAAa,eAAe;EAClD,gBAAgB,KAAK,aAAa,cAAc;EAChD,mBAAmB,KAAK,aAAa,kBAAkB;EACvD,mBAAmB,KAAK,aAAa,kBAAkB;EACvD,WAAW,KAAK,aAAa,SAAS;EACvC;;;;;AAMH,SAAgB,6BAA6B,SAAsC;CACjF,MAAM,EAAE,WAAW;CAEnB,MAAM,cAAc,IAAI,IAAI,OAAO,KAAK,OAAO,CAAC;CAChD,MAAM,iBAAiB,IAAI,IACzB,OAAO,OAAO,OAAO,CAAC,SAAS,cAAc,OAAO,KAAK,UAAU,UAAU,CAAC,CAC/E;CACD,MAAM,sBAAsB,IAAI,IAC9B,QAAQ,iBAAiB,OAAO,KAAK,QAAQ,eAAe,GAAG,EAAE,CAClE;CAID,SAAS,yBAAyB,eAAqC;AACrE,SAAO,cAAc,KAAK,SAAS;AAEjC,OAAI,OAAO,SAAS,SAAU,QAAO;AACrC,OAAI,YAAY,IAAI,KAAK,CAAE,QAAO,EAAE,SAAS,MAAM;AACnD,OAAI,eAAe,IAAI,KAAK,CAAE,QAAO,EAAE,YAAY,MAAM;AACzD,OAAI,oBAAoB,IAAI,KAAK,CAAE,QAAO,EAAE,iBAAiB,MAAM;AACnE,UAAO;IACP;;AAIJ,MAAK,MAAM,EAAE,eAAe,OAAO,OAAO,QAAQ,OAAO,CAEvD,MAAK,MAAM,gBAAgB,OAAO,OAAO,UAAU,CACjD,KAAI,MAAM,QAAQ,aAAa,cAAc,CAE3C,cAAa,gBAAgB,yBAAyB,aAAa,cAAc;;;;;;AAUzF,eAAsB,cAAc,SAAyD;AAE3F,KAAI,QAAQ,KAAK;AACf,QAAM,gBAAgB,QAAQ;AAC9B;;CAGF,MAAM,YAAY,QAAQ,cAAc;CAGxC,MAAM,mBAAmB,QAAQ,IAAI;AACrC,SAAQ,IAAI,YAAY;CAExB,MAAM,wBAAwB;AAC5B,MAAI,qBAAqB,OACvB,SAAQ,IAAI,YAAY;MAExB,QAAO,QAAQ,IAAI;;AAKvB,KAAI,CAAC,UACH,gCAA+B;AAGjC,SAAQ,IAAI,UAAU,QAAQ,iBAAiB,CAAC;AAChD,KAAI,QAAQ,WACV,SAAQ,IACN,UAAU,QAAQ,mEAAmE,CACtF;KAED,SAAQ,IAAI,UAAU,QAAQ,6DAA6D,CAAC;AAG9F,KAAI;EAEF,MAAM,EAAE,QAAQ,SAAS,MAAM,kBAAkB;GAC/C,YAAY,QAAQ;GACpB,aAAa,QAAQ;GACrB,KAAK,QAAQ;GACb,aAAa;GACb,aAAa;GACb,WAAW;GACX,OAAO,QAAQ;GAChB,CAAC;EACF,IAAI;EACJ,IAAI;EACJ,IAAI,oBAAyB;EAE7B,MAAM,aAAa,QAAQ,KAAK;AAGhC,MAF0B,WAAW,KAAK,YAAY,WAAW,CAAC,EAE3C;AAErB,gBAAa;AAEb,OAAI;AACF,wBAAoB,MAAM,YAAY,WAAW;IACjD,MAAM,iBAAiB,kBAAkB,OAAO;AAEhD,QAAI,QAAQ,SAEV;SAAI,mBAAmB,QAAQ,SAAS;AACtC,cAAQ,MACN,UACE,OACA,qBAAqB,eAAe,6BAA6B,QAAQ,QAAQ,GAClF,CACF;AACD,cAAQ,MACN,UACE,UACA,yEACD,CACF;AACD,UAAI,UACF,QAAO;OAAE,SAAS;OAAO,OAAO;OAAuB;AAEzD,cAAQ,KAAK,EAAE;;;AAInB,gBAAY;AACZ,YAAQ,IAAI,UAAU,SAAS,0BAA0B,YAAY,CAAC;YAC/D,OAAO;AACd,UAAM,IAAI,MACR,iCAAiC,iBAAiB,QAAQ,MAAM,UAAU,OAAO,MAAM,GACxF;;SAEE;AAEL,OAAI,CAAC,QAAQ,SAAS;AACpB,YAAQ,MACN,UACE,UACA,6FACD,CACF;AACD,QAAI,UACF,QAAO;KAAE,SAAS;KAAO,OAAO;KAAgD;AAElF,YAAQ,KAAK,EAAE;;GAIjB,MAAM,cAAc,QAAQ,YAAY,QAAQ,QAAQ;AAGxD,OAFuB,WAAW,KAAK,aAAa,WAAW,CAAC,EAE5C;AAElB,iBAAa;AACb,QAAI;AACF,yBAAoB,MAAM,YAAY,WAAW;AACjD,iBAAY,kBAAkB,OAAO;AACrC,aAAQ,IAAI,UAAU,SAAS,8BAA8B,YAAY,CAAC;aACnE,OAAO;AACd,WAAM,IAAI,MACR,+BAA+B,YAAY,IAAI,iBAAiB,QAAQ,MAAM,UAAU,OAAO,MAAM,GACtG;;UAEE;AAEL,gBAAY,QAAQ;AACpB,iBAAa,KAAK,YAAY,UAAU;AACxC,YAAQ,IAAI,UAAU,SAAS,qCAAqC,aAAa,CAAC;;;EAKtF,MAAM,iBADgB,iBAAiB,UAAU,EACX;AAEtC,MAAI,QAAQ,SAAS,eACnB,SAAQ,IAAI,UAAU,QAAQ,wBAAwB,iBAAiB,CAAC;EAG1E,MAAM,YAAY,MAAM,oBAAoB,OAC1C,OAAO,cACP,QAAQ,QACR,OAAO,UACP,WACA,MACA,OAAO,aACR;EAED,IAAI;AACJ,MAAI;AAEF,sBADmB,MAAM,UAAU,UAAU,WAAW,OAAO,EAClC;WACtB,OAAO;AACd,OAAI,QAAQ,MACV,SAAQ,IACN,UACE,QACA,wCAAwC,iBAAiB,QAAQ,MAAM,UAAU,OAAO,MAAM,GAC/F,CACF;;AAKL,MAAI,QAAQ,SAAS,gBACnB,SAAQ,IAAI,UAAU,QAAQ,yBAAyB,kBAAkB,CAAC;EAG5E,IAAI;AAEJ,MAAI,qBAAqB,gBAAgB;GACvC,MAAM,iBAAiB,oBAAoB,WAAW;AAEtD,OAAI;AACF,UAAM,UAAU,aAAa,WAAW;KACtC,MAAM;KACN,YAAY;KACb,CAAC;IAEF,MAAM,yBAAyB,MAAM,kBAAkB,mBAAmB;AAC1E,UAAM,UAAU,gBAAgB,WAAW,gBAAgB,uBAAuB;IAKlF,MAAM,UAAU,MAAM,UAAU,aAAa,WAAW;KACtD,cAAc;KACd,cAAc;KACf,CAAC;AAEF,QAAI,QAAQ,cAAc;KACxB,MAAM,EAAE,gCAAgC,MAAM,OAAO;KACrD,MAAM,cAAc,MAAM,4BAA4B,QAAQ,WAAW,QAAQ;AAEjF,SAAI,gBAAgB,MAAM;AACxB,cAAQ,IAAI,UAAU,UAAU,iBAAiB,CAAC;AAClD;;AAGF,WAAM,UAAU,aAAa,WAAW;MACtC,cAAc;MACd,cAAc;MACd,YAAY,QAAQ;MACpB,YAAY,QAAQ;MACpB;MACA,SAAS;MACV,CAAC;UAEF,OAAM,UAAU,aAAa,WAAW;KACtC,cAAc;KACd,cAAc;KACd,YAAY,QAAQ;KACpB,YAAY,QAAQ;KACpB,SAAS;KACV,CAAC;AAGJ,oBAAgB,MAAM,UAAU,eAAe,WAAW,eAAe;aACjE;AACR,QAAI;AACF,WAAM,UAAU,aAAa,WAAW,gBAAgB,KAAK;aACtD,cAAc;AACrB,SAAI,QAAQ,MACV,SAAQ,IACN,UACE,QACA,4CAA4C,eAAe,IAAI,wBAAwB,QAAQ,aAAa,UAAU,OAAO,aAAa,GAC3I,CACF;;;QAMP,iBAAgB,MAAM,UAAU,eAAe,UAAU;AAG3D,MAAI,QAAQ,SAAS,cAAc,WAAW;AAC5C,WAAQ,IACN,UAAU,QAAQ,0CAA0C,EAC5D,OAAO,KAAK,cAAc,UAAU,CACrC;AACD,UAAO,QAAQ,cAAc,UAAU,CAAC,SAAS,CAAC,IAAI,UAAyB;AAC7E,YAAQ,IACN,UACE,QACA,SAAS,GAAG,aAAa,CAAC,CAAC,KAAK,KAAK,oBAAoB,CAAC,CAAC,KAAK,cACjE,CACF;KACD;;AAIJ,MAAI,cAAc,OAChB,MAAK,MAAM,CAAC,SAAS,cAAc,OAAO,QAAQ,cAAc,OAAO,EAAW;AAChF,OAAI,UAAU,eAAe;AAC3B,kBAAc,gBAAgB,cAAc,iBAAiB,EAAE;AAC/D,WAAO,OAAO,cAAc,eAAe,UAAU,cAAc;AACnE,QAAI,QAAQ,MACV,SAAQ,IACN,UACE,QACA,uCAAuC,QAAQ,IAAI,OAAO,KAAK,UAAU,cAAc,CAAC,KAAK,KAAK,GACnG,CACF;;AAGL,OAAI,UAAU,WAAW;AACvB,kBAAc,cAAc,EAAE;IAC9B,MAAM,EAAE,cAAc;AAEtB,WAAO,QAAQ,UAAU,UAAU,CAAC,SAAS,CAAC,QAAQ,cAA6B;AAEjF,eAAU,YAAY;MACpB,IAAI,SAAS;MACb,aAAa,SAAS;MACtB,aAAa,SAAS;MACtB,cAAc,SAAS;MACvB,WAAW;MACX,WAAW;MACZ;MACD;;;AAQR,MAAI,cAAc,UAAU,cAAc,OAAO;GAC/C,MAAM,iBAAiB,OAAO,KAAK,cAAc,MAAM;AAEvD,QAAK,MAAM,aAAa,OAAO,OAAO,cAAc,OAAO,CACzD,KAAI,UAAU,OAAO;IAEnB,MAAM,qBAAqB,OAAO,YAChC,OAAO,QAAQ,UAAU,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,eAAe,SAAS,OAAO,CAAC,CACvF;AAGD,QAAI,OAAO,KAAK,mBAAmB,CAAC,SAAS,EAC3C,WAAU,QAAQ;QAGlB,QAAO,UAAU;;;AAQzB,+BAA6B,cAAc;AAE3C,UAAQ,IAAI,UAAU,SAAS,yBAAyB,CAAC;AAEzD,MAAI,QAAQ,MAAM;AAChB,WAAQ,IAAI,KAAK,UAAU,eAAe,MAAM,EAAE,CAAC;AACnD,oBAAiB;AACjB;;EAIF,MAAM,QAAQ,uBAAuB,WAAW;AAEhD,QAAM,+BAA+B,eAAe,MAAM,UAAU;AAEpE,UAAQ,IAAI,UAAU,QAAQ,sBAAsB,CAAC;AACrD,QAAM,mBAAmB;GAEvB,SAAS;GACT;GACA,OAAO,QAAQ;GAChB,CAAC;AACF,UAAQ,IAAI,UAAU,SAAS,wBAAwB,CAAC;AAExD,MAAI;GACF,MAAM,aAAa,MAAM,UAAU,UAAU,WAAW,OAAO;AAC/D,qBAAkB,WAAW,WAAW,KAAK;WACtC,OAAO;AACd,WAAQ,KACN,UACE,UACA,uCAAuC,iBAAiB,QAAQ,MAAM,UAAU,OAAO,MAAM,GAC9F,CACF;AACD,WAAQ,KAAK,UAAU,UAAU,sDAAsD,CAAC;;AAG1F,UAAQ,IAAI,UAAU,SAAS,iCAAiC,CAAC;AACjE,UAAQ,IAAI,UAAU,QAAQ,gBAAgB,MAAM,cAAc,CAAC;AACnE,UAAQ,IAAI,UAAU,QAAQ,mBAAmB,QAAQ,OAAO,gBAAgB,CAAC;AACjF,UAAQ,IACN,UACE,UACA,6HACD,CACF;AAED,mBAAiB;AACjB,MAAI,UACF,QAAO,EAAE,SAAS,MAAM;AAE1B,UAAQ,KAAK,EAAE;UACR,OAAO;EACd,MAAM,UAAU,iBAAiB,QAAQ,MAAM,QAAQ,OAAO,MAAM;AACpE,UAAQ,MAAM,UAAU,OAAO,YAAY,UAAU,CAAC;AACtD,MAAI,QAAQ,SAAS,iBAAiB,MACpC,SAAQ,MAAM,UAAU,OAAO,MAAM,SAAS,GAAG,CAAC;AAEpD,mBAAiB;AACjB,MAAI,UACF,QAAO;GAAE,SAAS;GAAO,OAAO;GAAS;AAE3C,UAAQ,KAAK,EAAE;;;;;;;AAQnB,eAAe,gBAAgB,SAAuC;AACpE,SAAQ,IAAI,UAAU,QAAQ,iEAAiE,CAAC;AAChG,SAAQ,IACN,UACE,QACA,+EACD,CACF;AACD,SAAQ,IAAI,UAAU,QAAQ,4DAA4D,CAAC;AAG3F,gCAA+B;CAG/B,MAAM,EAAE,QAAQ,SAAS,MAAM,kBAAkB;EAC/C,YAAY,QAAQ;EACpB,aAAa,QAAQ;EACrB,KAAK,QAAQ;EACb,aAAa;EACb,aAAa;EACb,WAAW;EACX,OAAO,QAAQ;EAChB,CAAC;CAEF,MAAM,IAAI,EAAE,SAAS;AAErB,KAAI;AAEF,IAAE,MAAM,oCAAoC;EAU5C,MAAM,WAAW,OATC,MAAM,oBAAoB,OAC1C,OAAO,cACP,QAAQ,QACR,OAAO,UACP,QACA,MACA,OAAO,aACR,EAEgC,iBAAiB;AAClD,IAAE,KAAK,SAAS,SAAS,OAAO,aAAa;AAE7C,MAAI,CAAC,SAAS,QAAQ;AACpB,WAAQ,IAAI,UAAU,UAAU,qCAAqC,CAAC;AACtE,WAAQ,KAAK,EAAE;;EAIjB,MAAM,mBAAoC,EAAE;EAC5C,MAAM,cAA+B,EAAE;AAEvC,OAAK,MAAM,WAAW,SAEpB,KAAI,WAAW,KADG,KAAK,QAAQ,KAAK,EAAE,QAAQ,GAAG,EAClB,WAAW,CAAC,CACzC,kBAAiB,KAAK,QAAQ;MAE9B,aAAY,KAAK,QAAQ;AAI7B,UAAQ,IAAI,UAAU,QAAQ,wBAAwB,CAAC;AACvD,MAAI,iBAAiB,SAAS,GAAG;AAC/B,WAAQ,IAAI,UAAU,QAAQ,iCAAiC,CAAC;AAChE,QAAK,MAAM,WAAW,iBACpB,SAAQ,IAAI,UAAU,QAAQ,SAAS,QAAQ,QAAQ,QAAQ,GAAG,IAAI,QAAQ,GAAG,GAAG,CAAC;;AAGzF,MAAI,YAAY,SAAS,GAAG;AAC1B,WAAQ,IAAI,UAAU,QAAQ,sBAAsB,CAAC;AACrD,QAAK,MAAM,WAAW,YACpB,SAAQ,IAAI,UAAU,QAAQ,SAAS,QAAQ,QAAQ,QAAQ,GAAG,IAAI,QAAQ,GAAG,GAAG,CAAC;;AAGzF,UAAQ,KAAK;EAEb,MAAM,UAA6B,EAAE;EACrC,MAAM,QAAQ,SAAS;AAEvB,OAAK,IAAI,IAAI,GAAG,IAAI,SAAS,QAAQ,KAAK;GACxC,MAAM,UAAU,SAAS;GACzB,MAAM,WAAW,IAAI,IAAI,EAAE,GAAG,MAAM;AAEpC,WAAQ,IAAI,UAAU,QAAQ,KAAK,IAAI,OAAO,GAAG,GAAG,CAAC;AACrD,WAAQ,IAAI,UAAU,QAAQ,GAAG,SAAS,WAAW,QAAQ,QAAQ,QAAQ,GAAG,KAAK,CAAC;GAEtF,MAAM,SAAS,MAAM,kBAAkB,QAAQ,IAAI,QAAQ,MAAM,SAAS,QAAQ,KAAK;AACvF,WAAQ,KAAK,OAAO;AAEpB,OAAI,OAAO,QACT,SAAQ,IACN,UACE,SACA,SAAS,OAAO,eAAe,OAAO,UAAU,KAAK,OAAO,YAC7D,CACF;OAED,SAAQ,IACN,UAAU,OAAO,SAAS,OAAO,eAAe,OAAO,UAAU,IAAI,OAAO,QAAQ,CACrF;;EAKL,MAAM,YAAY,QAAQ,QAAQ,MAAM,EAAE,QAAQ,CAAC;EACnD,MAAM,SAAS,QAAQ,QAAQ,MAAM,CAAC,EAAE,QAAQ,CAAC;AAEjD,UAAQ,IAAI,UAAU,QAAQ,KAAK,IAAI,OAAO,GAAG,GAAG,CAAC;AACrD,UAAQ,IAAI,UAAU,QAAQ,yBAAyB,CAAC;AACxD,UAAQ,IAAI,UAAU,SAAS,kBAAkB,YAAY,CAAC;AAC9D,MAAI,SAAS,GAAG;AACd,WAAQ,IAAI,UAAU,OAAO,eAAe,SAAS,CAAC;AAEtD,WAAQ,IAAI,UAAU,OAAO,qBAAqB,CAAC;AACnD,QAAK,MAAM,UAAU,QACnB,KAAI,CAAC,OAAO,QACV,SAAQ,IAAI,UAAU,OAAO,OAAO,OAAO,UAAU,IAAI,OAAO,QAAQ,CAAC;;AAK/E,UAAQ,KAAK,SAAS,IAAI,IAAI,EAAE;UACzB,OAAO;AACd,IAAE,MAAM;AACR,UAAQ,MACN,UAAU,OAAO,YAAY,iBAAiB,QAAQ,MAAM,UAAU,OAAO,MAAM,GAAG,CACvF;AACD,UAAQ,KAAK,EAAE;;;;;;;AAQnB,eAAsB,kBACpB,WACA,aACA,SACA,QACA,MAC0B;CAC1B,MAAM,YAAY,KAAK,QAAQ,KAAK,EAAE,UAAU;CAChD,MAAM,qBAAqB,WAAW,KAAK,WAAW,WAAW,CAAC;AAElE,KAAI;AACF,MAAI,oBAAoB;AAEtB,WAAQ,IAAI,UAAU,QAAQ,6DAA6D,CAAC;GAG5F,MAAM,cAAc,QAAQ,KAAK;AACjC,WAAQ,MAAM,UAAU;AAExB,OAAI;IAEF,MAAM,SAAS,MAAM,cAAc;KACjC,GAAG;KACH,SAAS;KACT,KAAK;KACL,YAAY;KACb,CAAC;AAGF,YAAQ,MAAM,YAAY;AAE1B,QAAI,UAAU,OAAO,WAAW,SAC9B,QAAO;KACL;KACA;KACA;KACA,SAAS,OAAO;KAChB,OAAO,OAAO;KACf;AAGH,WAAO;KACL;KACA;KACA;KACA,SAAS;KACV;YACM,OAAO;AAEd,YAAQ,MAAM,YAAY;AAC1B,UAAM;;;AAGV,UAAQ,IAAI,UAAU,QAAQ,iBAAiB,CAAC;EAGhD,MAAM,mBAAmB,QAAQ,IAAI;AACrC,UAAQ,IAAI,YAAY;EAExB,MAAM,wBAAwB;AAC5B,OAAI,qBAAqB,OACvB,SAAQ,IAAI,YAAY;OAExB,QAAO,QAAQ,IAAI;;EAcvB,MAAM,gBAAgB,OATJ,MAAM,oBAAoB,OAC1C,OAAO,cACP,QAAQ,QACR,OAAO,UACP,WACA,MACA,OAAO,aACR,EAEqC,eAAe,UAAU;EAE/D,MAAM,QAAQ,uBAAuB,UAAU;AAC/C,QAAM,+BAA+B,eAAe,MAAM,UAAU;AAGpE,QAAM,mBAAmB;GAEvB,SAAS;GACT;GACD,CAAC;AAEF,mBAAiB;AAEjB,SAAO;GACL;GACA,aAAa,eAAe,cAAc;GAC1C;GACA,SAAS;GACV;UACM,OAAO;AACd,SAAO;GACL;GACA;GACA;GACA,SAAS;GACT,OAAO,iBAAiB,QAAQ,MAAM,UAAU,OAAO,MAAM;GAC9D;;;AAIL,eAAe,+BACb,eACA,WACe;CACf,MAAM,SAAS,cAAc,UAAU,EAAE;AACzC,KAAI,CAAC,OAAO,KAAK,OAAO,CAAC,OACvB;CAGF,MAAM,EAAE,mBAAmB,MAAM,OAAO;AACxC,OAAM,eAAe,QAAQ,UAAU"}

package/dist/commands/pull-v4/merge-conflicts.js

@@ -0,0 +1,37 @@
+import { formatEntityId } from "./merge-ui/utils.js";
+import { MergeApp } from "./merge-ui/merge-app.js";
+import { styleText } from "node:util";
+import { render } from "ink";
+import { createElement } from "react";
+
+//#region src/commands/pull-v4/merge-conflicts.ts
+async function resolveConflictsInteractive(conflicts, options) {
+	if (options.conflictStrategy) {
+		const pick = options.conflictStrategy;
+		console.log(styleText("gray", `\nAuto-resolving ${conflicts.length} conflict(s) with strategy: ${pick}`));
+		return conflicts.map((conflict) => ({
+			table: conflict.table,
+			primaryKey: conflict.primaryKey,
+			rowDefaultPick: pick
+		}));
+	}
+	const result = await render(createElement(MergeApp, { conflicts })).waitUntilExit();
+	if (result === null) {
+		console.log(styleText("yellow", "\nMerge cancelled."));
+		return null;
+	}
+	const resolutions = result;
+	console.log(styleText("green", `\n✓ Resolved ${resolutions.length} conflict(s):`));
+	for (const res of resolutions) {
+		const entity = formatEntityId(res.primaryKey);
+		const overrides = Object.values(res.columns ?? {}).filter((pick) => pick !== res.rowDefaultPick);
+		const overrideNote = overrides.length > 0 ? ` (${overrides.length} column override(s))` : "";
+		console.log(`  ${styleText("cyan", res.table)} ${styleText("bold", entity)} → ${res.rowDefaultPick}${overrideNote}`);
+	}
+	console.log();
+	return resolutions;
+}
+
+//#endregion
+export { resolveConflictsInteractive };
+//# sourceMappingURL=merge-conflicts.js.map

package/dist/commands/pull-v4/merge-conflicts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-conflicts.js","names":[],"sources":["../../../src/commands/pull-v4/merge-conflicts.ts"],"sourcesContent":["import { styleText } from 'node:util';\nimport type { ConflictItem, ConflictResolution } from '@inkeep/agents-core';\nimport { render } from 'ink';\nimport { createElement } from 'react';\nimport { MergeApp } from './merge-ui/merge-app';\nimport { formatEntityId } from './merge-ui/utils';\n\nexport interface ResolveConflictsOptions {\n  conflictStrategy?: 'ours' | 'theirs';\n}\n\nexport async function resolveConflictsInteractive(\n  conflicts: ConflictItem[],\n  options: ResolveConflictsOptions\n): Promise<ConflictResolution[] | null> {\n  if (options.conflictStrategy) {\n    const pick = options.conflictStrategy;\n    console.log(\n      styleText('gray', `\\nAuto-resolving ${conflicts.length} conflict(s) with strategy: ${pick}`)\n    );\n    return conflicts.map((conflict) => ({\n      table: conflict.table,\n      primaryKey: conflict.primaryKey,\n      rowDefaultPick: pick,\n    }));\n  }\n\n  const instance = render(createElement(MergeApp, { conflicts }));\n  const result = await instance.waitUntilExit();\n\n  if (result === null) {\n    console.log(styleText('yellow', '\\nMerge cancelled.'));\n    return null;\n  }\n\n  const resolutions = result as ConflictResolution[];\n\n  console.log(styleText('green', `\\n✓ Resolved ${resolutions.length} conflict(s):`));\n  for (const res of resolutions) {\n    const entity = formatEntityId(res.primaryKey);\n    const overrides = Object.values(res.columns ?? {}).filter(\n      (pick) => pick !== res.rowDefaultPick\n    );\n    const overrideNote = overrides.length > 0 ? ` (${overrides.length} column override(s))` : '';\n    console.log(\n      `  ${styleText('cyan', res.table)} ${styleText('bold', entity)} → ${res.rowDefaultPick}${overrideNote}`\n    );\n  }\n  console.log();\n\n  return resolutions;\n}\n"],"mappings":";;;;;;;AAWA,eAAsB,4BACpB,WACA,SACsC;AACtC,KAAI,QAAQ,kBAAkB;EAC5B,MAAM,OAAO,QAAQ;AACrB,UAAQ,IACN,UAAU,QAAQ,oBAAoB,UAAU,OAAO,8BAA8B,OAAO,CAC7F;AACD,SAAO,UAAU,KAAK,cAAc;GAClC,OAAO,SAAS;GAChB,YAAY,SAAS;GACrB,gBAAgB;GACjB,EAAE;;CAIL,MAAM,SAAS,MADE,OAAO,cAAc,UAAU,EAAE,WAAW,CAAC,CAAC,CACjC,eAAe;AAE7C,KAAI,WAAW,MAAM;AACnB,UAAQ,IAAI,UAAU,UAAU,qBAAqB,CAAC;AACtD,SAAO;;CAGT,MAAM,cAAc;AAEpB,SAAQ,IAAI,UAAU,SAAS,gBAAgB,YAAY,OAAO,eAAe,CAAC;AAClF,MAAK,MAAM,OAAO,aAAa;EAC7B,MAAM,SAAS,eAAe,IAAI,WAAW;EAC7C,MAAM,YAAY,OAAO,OAAO,IAAI,WAAW,EAAE,CAAC,CAAC,QAChD,SAAS,SAAS,IAAI,eACxB;EACD,MAAM,eAAe,UAAU,SAAS,IAAI,KAAK,UAAU,OAAO,wBAAwB;AAC1F,UAAQ,IACN,KAAK,UAAU,QAAQ,IAAI,MAAM,CAAC,GAAG,UAAU,QAAQ,OAAO,CAAC,KAAK,IAAI,iBAAiB,eAC1F;;AAEH,SAAQ,KAAK;AAEb,QAAO"}

package/dist/commands/pull-v4/merge-ui/column-row.js

@@ -0,0 +1,63 @@
+import { formatValue } from "./utils.js";
+import { Box, Text } from "ink";
+import { jsx, jsxs } from "react/jsx-runtime";
+
+//#region src/commands/pull-v4/merge-ui/column-row.tsx
+function ValueLine({ label, value, isPicked }) {
+	return /* @__PURE__ */ jsx(Box, { children: /* @__PURE__ */ jsxs(Text, {
+		color: isPicked ? "green" : void 0,
+		dimColor: !isPicked,
+		children: [
+			"  ",
+			label,
+			" ",
+			formatValue(value)
+		]
+	}) });
+}
+function ColumnRow({ columnName, oursValue, theirsValue, pick, isFocused, isLast }) {
+	return /* @__PURE__ */ jsxs(Box, {
+		flexDirection: "column",
+		marginBottom: isLast ? 0 : 1,
+		children: [
+			/* @__PURE__ */ jsxs(Box, {
+				justifyContent: "space-between",
+				children: [/* @__PURE__ */ jsxs(Box, { children: [/* @__PURE__ */ jsx(Text, {
+					color: "cyan",
+					children: isFocused ? "▸ " : "  "
+				}), /* @__PURE__ */ jsx(Text, {
+					bold: isFocused,
+					children: columnName
+				})] }), /* @__PURE__ */ jsxs(Box, { children: [
+					/* @__PURE__ */ jsx(Text, {
+						dimColor: !isFocused,
+						children: "pick: "
+					}),
+					/* @__PURE__ */ jsx(Text, {
+						bold: isFocused,
+						color: pick === "ours" ? "blue" : "magenta",
+						children: pick
+					}),
+					isFocused ? /* @__PURE__ */ jsx(Text, {
+						color: "green",
+						children: " ◀"
+					}) : null
+				] })]
+			}),
+			/* @__PURE__ */ jsx(ValueLine, {
+				label: "ours:  ",
+				value: oursValue,
+				isPicked: pick === "ours"
+			}),
+			/* @__PURE__ */ jsx(ValueLine, {
+				label: "theirs:",
+				value: theirsValue,
+				isPicked: pick === "theirs"
+			})
+		]
+	});
+}
+
+//#endregion
+export { ColumnRow };
+//# sourceMappingURL=column-row.js.map

package/dist/commands/pull-v4/merge-ui/column-row.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"column-row.js","names":[],"sources":["../../../../src/commands/pull-v4/merge-ui/column-row.tsx"],"sourcesContent":["import { Box, Text } from 'ink';\nimport type { Side } from './types';\nimport { formatValue } from './utils';\n\ninterface ColumnRowProps {\n  columnName: string;\n  oursValue: unknown;\n  theirsValue: unknown;\n  pick: Side;\n  isFocused: boolean;\n  isLast: boolean;\n}\n\nfunction ValueLine({\n  label,\n  value,\n  isPicked,\n}: {\n  label: string;\n  value: unknown;\n  isPicked: boolean;\n}) {\n  return (\n    <Box>\n      <Text color={isPicked ? 'green' : undefined} dimColor={!isPicked}>\n        {'  '}\n        {label} {formatValue(value)}\n      </Text>\n    </Box>\n  );\n}\n\nexport function ColumnRow({\n  columnName,\n  oursValue,\n  theirsValue,\n  pick,\n  isFocused,\n  isLast,\n}: ColumnRowProps) {\n  return (\n    <Box flexDirection=\"column\" marginBottom={isLast ? 0 : 1}>\n      <Box justifyContent=\"space-between\">\n        <Box>\n          <Text color=\"cyan\">{isFocused ? '▸ ' : '  '}</Text>\n          <Text bold={isFocused}>{columnName}</Text>\n        </Box>\n        <Box>\n          <Text dimColor={!isFocused}>pick: </Text>\n          <Text bold={isFocused} color={pick === 'ours' ? 'blue' : 'magenta'}>\n            {pick}\n          </Text>\n          {isFocused ? <Text color=\"green\"> ◀</Text> : null}\n        </Box>\n      </Box>\n\n      <ValueLine label=\"ours:  \" value={oursValue} isPicked={pick === 'ours'} />\n      <ValueLine label=\"theirs:\" value={theirsValue} isPicked={pick === 'theirs'} />\n    </Box>\n  );\n}\n"],"mappings":";;;;;AAaA,SAAS,UAAU,EACjB,OACA,OACA,YAKC;AACD,QACE,oBAAC,iBACC,qBAAC;EAAK,OAAO,WAAW,UAAU;EAAW,UAAU,CAAC;;GACrD;GACA;GAAM;GAAE,YAAY,MAAM;;GACtB,GACH;;AAIV,SAAgB,UAAU,EACxB,YACA,WACA,aACA,MACA,WACA,UACiB;AACjB,QACE,qBAAC;EAAI,eAAc;EAAS,cAAc,SAAS,IAAI;;GACrD,qBAAC;IAAI,gBAAe;eAClB,qBAAC,kBACC,oBAAC;KAAK,OAAM;eAAQ,YAAY,OAAO;MAAY,EACnD,oBAAC;KAAK,MAAM;eAAY;MAAkB,IACtC,EACN,qBAAC;KACC,oBAAC;MAAK,UAAU,CAAC;gBAAW;OAAa;KACzC,oBAAC;MAAK,MAAM;MAAW,OAAO,SAAS,SAAS,SAAS;gBACtD;OACI;KACN,YAAY,oBAAC;MAAK,OAAM;gBAAQ;OAAS,GAAG;QACzC;KACF;GAEN,oBAAC;IAAU,OAAM;IAAU,OAAO;IAAW,UAAU,SAAS;KAAU;GAC1E,oBAAC;IAAU,OAAM;IAAU,OAAO;IAAa,UAAU,SAAS;KAAY;;GAC1E"}

package/dist/commands/pull-v4/merge-ui/conflict-view.js

@@ -0,0 +1,135 @@
+import { diffTypeColor, formatDiffType, formatEntityId } from "./utils.js";
+import { ColumnRow } from "./column-row.js";
+import { Box, Text } from "ink";
+import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+
+//#region src/commands/pull-v4/merge-ui/conflict-view.tsx
+function ConflictView({ conflict, resolution, changedColumns, focusedColumnIndex, conflictIndex, totalConflicts }) {
+	const entityId = formatEntityId(conflict.primaryKey);
+	const isNullOurs = conflict.ours === null;
+	const isNullTheirs = conflict.theirs === null;
+	function getPickForColumn(col) {
+		return resolution.columnOverrides[col] ?? resolution.rowDefaultPick;
+	}
+	return /* @__PURE__ */ jsx(Box, {
+		flexDirection: "column",
+		children: /* @__PURE__ */ jsxs(Box, {
+			borderStyle: "round",
+			borderColor: "cyan",
+			paddingX: 1,
+			flexDirection: "column",
+			children: [/* @__PURE__ */ jsxs(Box, {
+				marginBottom: 1,
+				children: [
+					/* @__PURE__ */ jsxs(Text, {
+						bold: true,
+						children: [
+							"Conflict ",
+							conflictIndex + 1,
+							"/",
+							totalConflicts,
+							":",
+							" "
+						]
+					}),
+					/* @__PURE__ */ jsx(Text, {
+						color: "cyan",
+						children: conflict.table
+					}),
+					/* @__PURE__ */ jsxs(Text, {
+						bold: true,
+						children: [
+							" \"",
+							entityId,
+							"\""
+						]
+					}),
+					/* @__PURE__ */ jsx(Text, { children: " — local: " }),
+					/* @__PURE__ */ jsx(Text, {
+						color: diffTypeColor(conflict.ourDiffType),
+						children: formatDiffType(conflict.ourDiffType)
+					}),
+					/* @__PURE__ */ jsx(Text, { children: " | remote: " }),
+					/* @__PURE__ */ jsx(Text, {
+						color: diffTypeColor(conflict.theirDiffType),
+						children: formatDiffType(conflict.theirDiffType)
+					})
+				]
+			}), isNullOurs || isNullTheirs ? /* @__PURE__ */ jsxs(Box, {
+				flexDirection: "column",
+				children: [/* @__PURE__ */ jsxs(Box, {
+					marginBottom: 1,
+					children: [
+						/* @__PURE__ */ jsx(Text, { children: " Pick: " }),
+						/* @__PURE__ */ jsxs(Text, {
+							bold: true,
+							color: "cyan",
+							children: [
+								"[",
+								resolution.rowDefaultPick,
+								"]"
+							]
+						}),
+						/* @__PURE__ */ jsx(Text, {
+							dimColor: true,
+							children: " (← for ours, → for theirs)"
+						}),
+						/* @__PURE__ */ jsx(Text, {
+							color: "cyan",
+							children: " ◂"
+						})
+					]
+				}), /* @__PURE__ */ jsxs(Box, {
+					flexDirection: "column",
+					marginLeft: 2,
+					children: [/* @__PURE__ */ jsxs(Text, {
+						color: resolution.rowDefaultPick === "ours" ? "green" : void 0,
+						dimColor: resolution.rowDefaultPick !== "ours",
+						children: ["ours: ", isNullOurs ? "Delete this row (keep local deletion)" : "Keep local version"]
+					}), /* @__PURE__ */ jsxs(Text, {
+						color: resolution.rowDefaultPick === "theirs" ? "green" : void 0,
+						dimColor: resolution.rowDefaultPick !== "theirs",
+						children: [
+							"theirs:",
+							" ",
+							isNullTheirs ? "Delete this row (keep remote deletion)" : "Keep remote version"
+						]
+					})]
+				})]
+			}) : /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsxs(Box, {
+				marginBottom: 1,
+				children: [
+					/* @__PURE__ */ jsx(Text, { children: " Row default: " }),
+					/* @__PURE__ */ jsxs(Text, {
+						bold: true,
+						color: focusedColumnIndex === -1 ? "cyan" : void 0,
+						children: [
+							"[",
+							resolution.rowDefaultPick,
+							"]"
+						]
+					}),
+					/* @__PURE__ */ jsx(Text, {
+						dimColor: true,
+						children: " (← for ours, → for theirs)"
+					}),
+					focusedColumnIndex === -1 && /* @__PURE__ */ jsx(Text, {
+						color: "cyan",
+						children: " ◂"
+					})
+				]
+			}), changedColumns.map((col, i) => /* @__PURE__ */ jsx(ColumnRow, {
+				columnName: col,
+				oursValue: conflict.ours?.[col],
+				theirsValue: conflict.theirs?.[col],
+				pick: getPickForColumn(col),
+				isFocused: focusedColumnIndex === i,
+				isLast: i === changedColumns.length - 1
+			}, col))] })]
+		})
+	});
+}
+
+//#endregion
+export { ConflictView };
+//# sourceMappingURL=conflict-view.js.map

package/dist/commands/pull-v4/merge-ui/conflict-view.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflict-view.js","names":[],"sources":["../../../../src/commands/pull-v4/merge-ui/conflict-view.tsx"],"sourcesContent":["import type { ConflictItem } from '@inkeep/agents-core';\nimport { Box, Text } from 'ink';\nimport { ColumnRow } from './column-row';\nimport type { ConflictResolutionState, Side } from './types';\nimport { diffTypeColor, formatDiffType, formatEntityId } from './utils';\n\ninterface ConflictViewProps {\n  conflict: ConflictItem;\n  resolution: ConflictResolutionState;\n  changedColumns: string[];\n  focusedColumnIndex: number;\n  conflictIndex: number;\n  totalConflicts: number;\n}\n\nexport function ConflictView({\n  conflict,\n  resolution,\n  changedColumns,\n  focusedColumnIndex,\n  conflictIndex,\n  totalConflicts,\n}: ConflictViewProps) {\n  const entityId = formatEntityId(conflict.primaryKey);\n  const isNullOurs = conflict.ours === null;\n  const isNullTheirs = conflict.theirs === null;\n\n  function getPickForColumn(col: string): Side {\n    return resolution.columnOverrides[col] ?? resolution.rowDefaultPick;\n  }\n\n  return (\n    <Box flexDirection=\"column\">\n      <Box borderStyle=\"round\" borderColor=\"cyan\" paddingX={1} flexDirection=\"column\">\n        <Box marginBottom={1}>\n          <Text bold>\n            Conflict {conflictIndex + 1}/{totalConflicts}:{' '}\n          </Text>\n          <Text color=\"cyan\">{conflict.table}</Text>\n          <Text bold> &quot;{entityId}&quot;</Text>\n          <Text> — local: </Text>\n          <Text color={diffTypeColor(conflict.ourDiffType)}>\n            {formatDiffType(conflict.ourDiffType)}\n          </Text>\n          <Text> | remote: </Text>\n          <Text color={diffTypeColor(conflict.theirDiffType)}>\n            {formatDiffType(conflict.theirDiffType)}\n          </Text>\n        </Box>\n\n        {isNullOurs || isNullTheirs ? (\n          <Box flexDirection=\"column\">\n            <Box marginBottom={1}>\n              <Text> Pick: </Text>\n              <Text bold color=\"cyan\">\n                [{resolution.rowDefaultPick}]\n              </Text>\n              <Text dimColor> (← for ours, → for theirs)</Text>\n              <Text color=\"cyan\"> ◂</Text>\n            </Box>\n            <Box flexDirection=\"column\" marginLeft={2}>\n              <Text\n                color={resolution.rowDefaultPick === 'ours' ? 'green' : undefined}\n                dimColor={resolution.rowDefaultPick !== 'ours'}\n              >\n                ours: {isNullOurs ? 'Delete this row (keep local deletion)' : 'Keep local version'}\n              </Text>\n              <Text\n                color={resolution.rowDefaultPick === 'theirs' ? 'green' : undefined}\n                dimColor={resolution.rowDefaultPick !== 'theirs'}\n              >\n                theirs:{' '}\n                {isNullTheirs ? 'Delete this row (keep remote deletion)' : 'Keep remote version'}\n              </Text>\n            </Box>\n          </Box>\n        ) : (\n          <>\n            <Box marginBottom={1}>\n              <Text> Row default: </Text>\n              <Text bold color={focusedColumnIndex === -1 ? 'cyan' : undefined}>\n                [{resolution.rowDefaultPick}]\n              </Text>\n              <Text dimColor> (← for ours, → for theirs)</Text>\n              {focusedColumnIndex === -1 && <Text color=\"cyan\"> ◂</Text>}\n            </Box>\n\n            {changedColumns.map((col, i) => (\n              <ColumnRow\n                key={col}\n                columnName={col}\n                oursValue={conflict.ours?.[col]}\n                theirsValue={conflict.theirs?.[col]}\n                pick={getPickForColumn(col)}\n                isFocused={focusedColumnIndex === i}\n                isLast={i === changedColumns.length - 1}\n              />\n            ))}\n          </>\n        )}\n      </Box>\n    </Box>\n  );\n}\n"],"mappings":";;;;;;AAeA,SAAgB,aAAa,EAC3B,UACA,YACA,gBACA,oBACA,eACA,kBACoB;CACpB,MAAM,WAAW,eAAe,SAAS,WAAW;CACpD,MAAM,aAAa,SAAS,SAAS;CACrC,MAAM,eAAe,SAAS,WAAW;CAEzC,SAAS,iBAAiB,KAAmB;AAC3C,SAAO,WAAW,gBAAgB,QAAQ,WAAW;;AAGvD,QACE,oBAAC;EAAI,eAAc;YACjB,qBAAC;GAAI,aAAY;GAAQ,aAAY;GAAO,UAAU;GAAG,eAAc;cACrE,qBAAC;IAAI,cAAc;;KACjB,qBAAC;MAAK;;OAAK;OACC,gBAAgB;OAAE;OAAE;OAAe;OAAE;;OAC1C;KACP,oBAAC;MAAK,OAAM;gBAAQ,SAAS;OAAa;KAC1C,qBAAC;MAAK;;OAAK;OAAQ;OAAS;;OAAa;KACzC,oBAAC,kBAAK,eAAiB;KACvB,oBAAC;MAAK,OAAO,cAAc,SAAS,YAAY;gBAC7C,eAAe,SAAS,YAAY;OAChC;KACP,oBAAC,kBAAK,gBAAkB;KACxB,oBAAC;MAAK,OAAO,cAAc,SAAS,cAAc;gBAC/C,eAAe,SAAS,cAAc;OAClC;;KACH,EAEL,cAAc,eACb,qBAAC;IAAI,eAAc;eACjB,qBAAC;KAAI,cAAc;;MACjB,oBAAC,kBAAK,YAAc;MACpB,qBAAC;OAAK;OAAK,OAAM;;QAAO;QACpB,WAAW;QAAe;;QACvB;MACP,oBAAC;OAAK;iBAAS;QAAkC;MACjD,oBAAC;OAAK,OAAM;iBAAO;QAAS;;MACxB,EACN,qBAAC;KAAI,eAAc;KAAS,YAAY;gBACtC,qBAAC;MACC,OAAO,WAAW,mBAAmB,SAAS,UAAU;MACxD,UAAU,WAAW,mBAAmB;iBACzC,UACQ,aAAa,0CAA0C;OACzD,EACP,qBAAC;MACC,OAAO,WAAW,mBAAmB,WAAW,UAAU;MAC1D,UAAU,WAAW,mBAAmB;;OACzC;OACS;OACP,eAAe,2CAA2C;;OACtD;MACH;KACF,GAEN,4CACE,qBAAC;IAAI,cAAc;;KACjB,oBAAC,kBAAK,mBAAqB;KAC3B,qBAAC;MAAK;MAAK,OAAO,uBAAuB,KAAK,SAAS;;OAAW;OAC9D,WAAW;OAAe;;OACvB;KACP,oBAAC;MAAK;gBAAS;OAAkC;KAChD,uBAAuB,MAAM,oBAAC;MAAK,OAAM;gBAAO;OAAS;;KACtD,EAEL,eAAe,KAAK,KAAK,MACxB,oBAAC;IAEC,YAAY;IACZ,WAAW,SAAS,OAAO;IAC3B,aAAa,SAAS,SAAS;IAC/B,MAAM,iBAAiB,IAAI;IAC3B,WAAW,uBAAuB;IAClC,QAAQ,MAAM,eAAe,SAAS;MANjC,IAOL,CACF,IACD;IAED;GACF"}