@inkeep/agents-cli 0.0.0-dev-20251105001429 → 0.0.0-dev-20251105034049

package/dist/index.js

@@ -5033,8 +5033,8 @@ var init_contextConfigs = __esm({
   "../packages/agents-core/src/data-access/contextConfigs.ts"() {
     "use strict";
     init_esm_shims();
-    init_conversations();
     init_schema();
+    init_conversations();
   }
 });
 
@@ -218118,8 +218118,8 @@ var init_functionTools = __esm({
   "../packages/agents-core/src/data-access/functionTools.ts"() {
     "use strict";
     init_esm_shims();
-    init_conversations();
     init_schema();
+    init_conversations();
     init_logger();
     logger4 = getLogger("functionTools");
   }
@@ -218184,8 +218184,8 @@ var init_apiKeys = __esm({
     "use strict";
     init_esm_shims();
     init_nanoid();
-    init_logger();
     init_conversations();
+    init_logger();
     scryptAsync = promisify(scrypt);
     logger5 = getLogger("api-key");
     PUBLIC_ID_LENGTH = 12;
@@ -233614,8 +233614,8 @@ var init_artifactComponents = __esm({
   "../packages/agents-core/src/data-access/artifactComponents.ts"() {
     "use strict";
     init_esm_shims();
-    init_conversations();
     init_schema();
+    init_conversations();
     init_props_validation();
   }
 });
@@ -233681,8 +233681,8 @@ var init_contextCache = __esm({
   "../packages/agents-core/src/data-access/contextCache.ts"() {
     "use strict";
     init_esm_shims();
-    init_conversations();
     init_schema();
+    init_conversations();
   }
 });
 
@@ -233703,8 +233703,8 @@ var init_ledgerArtifacts = __esm({
   "../packages/agents-core/src/data-access/ledgerArtifacts.ts"() {
     "use strict";
     init_esm_shims();
-    init_conversations();
     init_schema();
+    init_conversations();
   }
 });
 
@@ -233735,6 +233735,7 @@ var init_projectFull = __esm({
   "../packages/agents-core/src/data-access/projectFull.ts"() {
     "use strict";
     init_esm_shims();
+    init_schema();
     init_logger();
     init_agentFull2();
     init_agents();
@@ -233745,7 +233746,6 @@ var init_projectFull = __esm({
     init_functions();
     init_projects();
     init_tools();
-    init_schema();
     defaultLogger = getLogger("projectFull");
   }
 });
@@ -234634,403 +234634,6 @@ var init_background_version_check = __esm({
   }
 });
 
-// src/commands/pull-v3/utils/component-registry.ts
-function registerAllComponents(project, registry2) {
-  registry2.register(project.id, "project", "index.ts");
-  if (project.credentialReferences) {
-    for (const credId of Object.keys(project.credentialReferences)) {
-      registry2.register(credId, "credential", `credentials/${credId}.ts`);
-    }
-  }
-  if (project.tools) {
-    for (const toolId of Object.keys(project.tools)) {
-      registry2.register(toolId, "tool", `tools/${toolId}.ts`);
-    }
-  }
-  const processedFunctionIds = /* @__PURE__ */ new Set();
-  if (project.functions) {
-    for (const funcId of Object.keys(project.functions)) {
-      registry2.register(funcId, "functionTool", `tools/functions/${funcId}.ts`);
-      processedFunctionIds.add(funcId);
-    }
-  }
-  if (project.functionTools) {
-    for (const funcToolId of Object.keys(project.functionTools)) {
-      if (!processedFunctionIds.has(funcToolId)) {
-        registry2.register(funcToolId, "functionTool", `tools/functions/${funcToolId}.ts`);
-      }
-    }
-  }
-  if (project.dataComponents) {
-    for (const componentId of Object.keys(project.dataComponents)) {
-      registry2.register(componentId, "dataComponent", `data-components/${componentId}.ts`);
-    }
-  }
-  if (project.artifactComponents) {
-    for (const componentId of Object.keys(project.artifactComponents)) {
-      registry2.register(componentId, "artifactComponent", `artifact-components/${componentId}.ts`);
-    }
-  }
-  if (project.externalAgents) {
-    for (const extAgentId of Object.keys(project.externalAgents)) {
-      registry2.register(extAgentId, "externalAgent", `external-agents/${extAgentId}.ts`);
-    }
-  }
-  const statusComponents = extractStatusComponents(project);
-  for (const statusId of Object.keys(statusComponents)) {
-    registry2.register(statusId, "statusComponent", `status-components/${statusId}.ts`);
-  }
-  if (project.agents) {
-    for (const agentId of Object.keys(project.agents)) {
-      registry2.register(agentId, "agent", `agents/${agentId}.ts`);
-    }
-  }
-  const subAgents2 = extractSubAgents(project);
-  for (const subAgentId of Object.keys(subAgents2)) {
-    registry2.register(subAgentId, "subAgent", `agents/sub-agents/${subAgentId}.ts`);
-  }
-  const contextConfigs2 = extractContextConfigs(project);
-  for (const contextId of Object.keys(contextConfigs2)) {
-    registry2.register(contextId, "contextConfig", `context-configs/${contextId}.ts`);
-  }
-}
-function extractStatusComponents(project) {
-  const statusComponents = {};
-  if (project.agents) {
-    for (const [agentId, agentData] of Object.entries(project.agents)) {
-      if (agentData.statusUpdates && agentData.statusUpdates.statusComponents) {
-        for (const statusComp of agentData.statusUpdates.statusComponents) {
-          let statusId;
-          if (typeof statusComp === "string") {
-            statusId = statusComp;
-          } else if (typeof statusComp === "object" && statusComp) {
-            statusId = statusComp.type;
-          } else {
-            continue;
-          }
-          if (statusId && !statusComponents[statusId]) {
-            statusComponents[statusId] = {
-              // Include any other properties from the actual data first
-              ...statusComp,
-              id: statusId,
-              type: statusComp.type || statusId,
-              description: statusComp.description || `Status component for ${statusId}`,
-              detailsSchema: statusComp.detailsSchema
-            };
-          }
-        }
-      }
-    }
-  }
-  return statusComponents;
-}
-function extractSubAgents(project) {
-  const subAgents2 = {};
-  if (project.agents) {
-    for (const [agentId, agentData] of Object.entries(project.agents)) {
-      if (agentData.subAgents) {
-        for (const [subAgentId, subAgentData] of Object.entries(agentData.subAgents)) {
-          subAgents2[subAgentId] = subAgentData;
-        }
-      }
-    }
-  }
-  return subAgents2;
-}
-function extractContextConfigs(project) {
-  const contextConfigs2 = {};
-  if (project.agents) {
-    for (const [agentId, agentData] of Object.entries(project.agents)) {
-      if (agentData.contextConfig) {
-        const contextConfigId = agentData.contextConfig.id;
-        if (contextConfigId) {
-          contextConfigs2[contextConfigId] = agentData.contextConfig;
-        } else {
-          console.warn(`contextConfig for agent ${agentId} is missing required 'id' field`);
-        }
-      }
-    }
-  }
-  return contextConfigs2;
-}
-function findSubAgentWithParent(project, subAgentId) {
-  if (project.agents) {
-    for (const [agentId, agentData] of Object.entries(project.agents)) {
-      if (agentData.subAgents && agentData.subAgents[subAgentId]) {
-        const contextConfigData = agentData.contextConfig?.id ? agentData.contextConfig : void 0;
-        return {
-          subAgentData: agentData.subAgents[subAgentId],
-          parentAgentId: agentId,
-          contextConfigData
-        };
-      }
-    }
-  }
-  return void 0;
-}
-var ComponentRegistry;
-var init_component_registry = __esm({
-  "src/commands/pull-v3/utils/component-registry.ts"() {
-    "use strict";
-    init_esm_shims();
-    ComponentRegistry = class {
-      components = /* @__PURE__ */ new Map();
-      componentsByTypeAndId = /* @__PURE__ */ new Map();
-      // Type-aware lookup
-      usedNames = /* @__PURE__ */ new Set();
-      // Global name registry for uniqueness
-      /**
-       * Register a component with both unique name and file path
-       */
-      register(id, type, filePath, exportName, isInline = false) {
-        const typeKey = `${type}:${id}`;
-        const existing = this.componentsByTypeAndId.get(typeKey);
-        if (existing) {
-          return existing;
-        }
-        let name;
-        let actualExportName;
-        if (exportName) {
-          name = exportName;
-          actualExportName = exportName;
-        } else {
-          const baseName = this.toCamelCase(id);
-          const uniqueName = this.ensureUniqueName(baseName, type);
-          name = uniqueName;
-          actualExportName = uniqueName;
-        }
-        const info = {
-          id,
-          name,
-          type,
-          filePath,
-          exportName: actualExportName,
-          isInline
-        };
-        this.components.set(id, info);
-        this.componentsByTypeAndId.set(typeKey, info);
-        this.usedNames.add(name);
-        if (actualExportName && actualExportName !== name) {
-          this.usedNames.add(actualExportName);
-        }
-        return info;
-      }
-      /**
-       * Get component info by ID and type
-       */
-      get(id, type) {
-        const typeKey = `${type}:${id}`;
-        return this.componentsByTypeAndId.get(typeKey);
-      }
-      /**
-       * Get component info by variable name (since variable names are globally unique)
-       */
-      getByVariableName(variableName) {
-        for (const component of this.componentsByTypeAndId.values()) {
-          if (component.name === variableName) {
-            return component;
-          }
-        }
-        return void 0;
-      }
-      /**
-       * Get unique variable name for a component by ID and type
-       */
-      getVariableName(id, type) {
-        const typeKey = `${type}:${id}`;
-        const result = this.componentsByTypeAndId.get(typeKey)?.name;
-        return result;
-      }
-      /**
-       * Get import statement for a component
-       */
-      getImportStatement(fromFilePath, componentId, componentType) {
-        const component = this.get(componentId, componentType);
-        if (!component) return void 0;
-        const relativePath = this.calculateRelativeImport(fromFilePath, component.filePath);
-        const importStmt = `import { ${component.exportName} } from '${relativePath}';`;
-        return importStmt;
-      }
-      /**
-       * Format an array of references for code generation
-       */
-      formatReferencesForCode(references, componentType, style, indentLevel) {
-        if (!Array.isArray(references) || references.length === 0) {
-          return "[]";
-        }
-        const variableNames = [];
-        for (const ref of references) {
-          const id = this.extractIdFromReference(ref);
-          if (id) {
-            const component = this.get(id, componentType);
-            if (component) {
-              variableNames.push(component.name);
-            } else {
-              console.warn(`ComponentRegistry: Component not found: ${id} (type: ${componentType})`);
-              variableNames.push(this.toCamelCase(id));
-            }
-          }
-        }
-        if (variableNames.length === 0) {
-          return "[]";
-        }
-        if (variableNames.length === 1) {
-          return `[${variableNames[0]}]`;
-        }
-        const { indentation } = style;
-        const indent = indentation.repeat(indentLevel);
-        const lines = ["["];
-        for (let i = 0; i < variableNames.length; i++) {
-          const isLast = i === variableNames.length - 1;
-          lines.push(`${indent}${variableNames[i]}${isLast ? "" : ","}`);
-        }
-        lines.push(`${indentation.repeat(indentLevel - 1)}]`);
-        return lines.join("\n");
-      }
-      /**
-       * Get all import statements needed for a file
-       */
-      getImportsForFile(fromFilePath, referencedComponents) {
-        const imports = [];
-        const seenImports = /* @__PURE__ */ new Set();
-        for (const { id, type } of referencedComponents) {
-          const importStatement = this.getImportStatement(fromFilePath, id, type);
-          if (importStatement && !seenImports.has(importStatement)) {
-            imports.push(importStatement);
-            seenImports.add(importStatement);
-          }
-        }
-        return imports;
-      }
-      /**
-       * Get all component IDs referenced in arrays for import generation
-       */
-      getReferencedComponentIds(referenceArrays) {
-        const componentIds = [];
-        for (const refArray of referenceArrays) {
-          if (Array.isArray(refArray)) {
-            for (const ref of refArray) {
-              const id = this.extractIdFromReference(ref);
-              if (id) {
-                componentIds.push(id);
-              }
-            }
-          }
-        }
-        return componentIds;
-      }
-      /**
-       * Extract ID from a reference (string or object) based on component type
-       */
-      extractIdFromReference(ref) {
-        if (typeof ref === "string") {
-          return ref;
-        } else if (typeof ref === "object" && ref) {
-          if (ref.toolId) return ref.toolId;
-          if (ref.agentId) return ref.agentId;
-          if (ref.externalAgentId) return ref.externalAgentId;
-          if (ref.credentialStoreId) return ref.credentialStoreId;
-          if (ref.type && !ref.agentId && !ref.toolId && !ref.externalAgentId) return ref.type;
-          if (ref.id) return ref.id;
-          if (ref.name) return ref.name;
-          console.warn("ComponentRegistry: Reference without recognized ID field:", ref);
-          return null;
-        }
-        return null;
-      }
-      /**
-       * Convert string to camelCase and ensure it's a valid JavaScript identifier
-       */
-      toCamelCase(str) {
-        return str.toLowerCase().replace(/[-_](.)/g, (_, char) => char.toUpperCase()).replace(/[^a-zA-Z0-9]/g, "").replace(/^[0-9]/, "_$&");
-      }
-      /**
-       * Ensure a name is unique by adding prefixes/suffixes if needed
-       */
-      ensureUniqueName(baseName, type) {
-        let uniqueName = baseName;
-        let counter = 1;
-        while (this.usedNames.has(uniqueName)) {
-          if (counter === 1) {
-            const typePrefix = this.getTypePrefix(type);
-            uniqueName = `${typePrefix}${baseName.charAt(0).toUpperCase() + baseName.slice(1)}`;
-          } else {
-            uniqueName = `${baseName}${counter}`;
-          }
-          counter++;
-          if (counter > 100) {
-            uniqueName = `${baseName}_${Date.now()}`;
-            break;
-          }
-        }
-        return uniqueName;
-      }
-      /**
-       * Get type prefix for uniqueness resolution
-       */
-      getTypePrefix(type) {
-        switch (type) {
-          case "agent":
-            return "agent";
-          case "subAgent":
-            return "sub";
-          case "externalAgent":
-            return "ext";
-          case "tool":
-            return "tool";
-          case "functionTool":
-            return "func";
-          case "dataComponent":
-            return "data";
-          case "artifactComponent":
-            return "artifact";
-          case "credential":
-            return "cred";
-          case "statusComponent":
-            return "status";
-          case "contextConfig":
-            return "context";
-          case "project":
-            return "project";
-          default:
-            return "comp";
-        }
-      }
-      /**
-       * Calculate relative import path between files
-       */
-      calculateRelativeImport(fromPath, toPath) {
-        const fromParts = fromPath.replace(".ts", "").split("/");
-        const toParts = toPath.replace(".ts", "").split("/");
-        fromParts.pop();
-        let relativePath = "";
-        for (let i = 0; i < fromParts.length; i++) {
-          relativePath += "../";
-        }
-        relativePath += toParts.join("/");
-        if (relativePath.startsWith("../")) {
-          return relativePath;
-        } else {
-          return "./" + relativePath;
-        }
-      }
-      /**
-       * Get all components for debugging
-       */
-      getAllComponents() {
-        return Array.from(this.components.values());
-      }
-      /**
-       * Clear all components (for testing)
-       */
-      clear() {
-        this.components.clear();
-        this.usedNames.clear();
-      }
-    };
-  }
-});
-
 // src/commands/pull-v3/utils/generator-utils.ts
 function toCamelCase(str) {
   const result = str.replace(/[-_](.)/g, (_, char) => char.toUpperCase()).replace(/[^a-zA-Z0-9]/g, "").replace(/^[0-9]/, "_$&");
@@ -235147,195 +234750,6 @@ var init_generator_utils = __esm({
   }
 });
 
-// src/commands/pull-v3/components/project-generator.ts
-function generateProjectDefinition(projectId, projectData, style = DEFAULT_STYLE, registry2) {
-  if (!projectId || typeof projectId !== "string") {
-    throw new Error("projectId is required and must be a string");
-  }
-  if (!projectData || typeof projectData !== "object") {
-    throw new Error(`projectData is required for project '${projectId}'`);
-  }
-  const requiredFields = ["name", "models"];
-  const missingFields = requiredFields.filter(
-    (field) => !projectData[field] || projectData[field] === null || projectData[field] === void 0
-  );
-  if (!projectData.models?.base) {
-    missingFields.push("models.base");
-  }
-  if (missingFields.length > 0) {
-    throw new Error(
-      `Missing required fields for project '${projectId}': ${missingFields.join(", ")}`
-    );
-  }
-  const { quotes, semicolons, indentation } = style;
-  const q = quotes === "single" ? "'" : '"';
-  const semi = semicolons ? ";" : "";
-  const projectVarName = toCamelCase(projectId);
-  const lines = [];
-  lines.push(`export const ${projectVarName} = project({`);
-  lines.push(`${indentation}id: ${formatString(projectId, q)},`);
-  lines.push(`${indentation}name: ${formatString(projectData.name, q)},`);
-  if (shouldInclude(projectData.description)) {
-    lines.push(`${indentation}description: ${formatString(projectData.description, q, true)},`);
-  }
-  if (shouldInclude(projectData.models)) {
-    lines.push(`${indentation}models: ${formatObject(projectData.models, style, 2)},`);
-  }
-  if (shouldInclude(projectData.stopWhen)) {
-    lines.push(`${indentation}stopWhen: {`);
-    if (projectData.stopWhen.transferCountIs !== void 0) {
-      lines.push(
-        `${indentation}${indentation}transferCountIs: ${projectData.stopWhen.transferCountIs}, // Max transfers for agents`
-      );
-    }
-    if (projectData.stopWhen.stepCountIs !== void 0) {
-      lines.push(
-        `${indentation}${indentation}stepCountIs: ${projectData.stopWhen.stepCountIs} // Max steps for sub-agents`
-      );
-    }
-    if (lines.length > 1) {
-      const lastLine = lines[lines.length - 1];
-      if (lastLine.includes(",") && (lastLine.includes("//") || lastLine.endsWith(","))) {
-        if (lastLine.includes("//")) {
-          lines[lines.length - 1] = lastLine.replace(", //", " //");
-        } else {
-          lines[lines.length - 1] = lastLine.slice(0, -1);
-        }
-      }
-    }
-    lines.push(`${indentation}},`);
-  }
-  if (shouldInclude(projectData.agents)) {
-    const agentsArray = registry2 ? registry2.formatReferencesForCode(projectData.agents, "agent", style, 2) : "[]";
-    lines.push(`${indentation}agents: () => ${agentsArray},`);
-  }
-  if (shouldInclude(projectData.tools)) {
-    const toolsArray = registry2 ? registry2.formatReferencesForCode(projectData.tools, "tool", style, 2) : "[]";
-    lines.push(`${indentation}tools: () => ${toolsArray},`);
-  }
-  if (shouldInclude(projectData.externalAgents)) {
-    const externalAgentsArray = registry2 ? registry2.formatReferencesForCode(projectData.externalAgents, "externalAgent", style, 2) : "[]";
-    lines.push(`${indentation}externalAgents: () => ${externalAgentsArray},`);
-  }
-  if (shouldInclude(projectData.dataComponents)) {
-    const dataComponentsArray = registry2 ? registry2.formatReferencesForCode(projectData.dataComponents, "dataComponent", style, 2) : "[]";
-    lines.push(`${indentation}dataComponents: () => ${dataComponentsArray},`);
-  }
-  if (shouldInclude(projectData.artifactComponents)) {
-    const artifactComponentsArray = registry2 ? registry2.formatReferencesForCode(
-      projectData.artifactComponents,
-      "artifactComponent",
-      style,
-      2
-    ) : "[]";
-    lines.push(`${indentation}artifactComponents: () => ${artifactComponentsArray},`);
-  }
-  if (shouldInclude(projectData.credentialReferences)) {
-    const credentialReferencesArray = registry2 ? registry2.formatReferencesForCode(projectData.credentialReferences, "credential", style, 2) : "[]";
-    lines.push(`${indentation}credentialReferences: () => ${credentialReferencesArray},`);
-  }
-  removeTrailingComma(lines);
-  lines.push(`})${semi}`);
-  return lines.join("\n");
-}
-function generateProjectImports(projectId, projectData, style = DEFAULT_STYLE, registry2) {
-  const imports = [];
-  imports.push(generateImport(["project"], "@inkeep/agents-sdk", style));
-  if (registry2) {
-    const currentFilePath = "index.ts";
-    const referencedComponents = [];
-    if (projectData.agents) {
-      let agentIds = [];
-      if (Array.isArray(projectData.agents)) {
-        agentIds = projectData.agents;
-      } else if (typeof projectData.agents === "object") {
-        agentIds = Object.keys(projectData.agents);
-      }
-      for (const agentId of agentIds) {
-        referencedComponents.push({ id: agentId, type: "agent" });
-      }
-    }
-    if (projectData.tools) {
-      let toolIds = [];
-      if (Array.isArray(projectData.tools)) {
-        toolIds = projectData.tools;
-      } else if (typeof projectData.tools === "object") {
-        toolIds = Object.keys(projectData.tools);
-      }
-      for (const toolId of toolIds) {
-        let componentType = "tool";
-        if (registry2 && registry2.get(toolId, "functionTool")) {
-          componentType = "functionTool";
-        } else if (registry2 && registry2.get(toolId, "tool")) {
-          componentType = "tool";
-        }
-        referencedComponents.push({ id: toolId, type: componentType });
-      }
-    }
-    if (projectData.externalAgents) {
-      let extAgentIds = [];
-      if (Array.isArray(projectData.externalAgents)) {
-        extAgentIds = projectData.externalAgents;
-      } else if (typeof projectData.externalAgents === "object") {
-        extAgentIds = Object.keys(projectData.externalAgents);
-      }
-      for (const extAgentId of extAgentIds) {
-        referencedComponents.push({ id: extAgentId, type: "externalAgent" });
-      }
-    }
-    if (projectData.dataComponents) {
-      let dataCompIds = [];
-      if (Array.isArray(projectData.dataComponents)) {
-        dataCompIds = projectData.dataComponents;
-      } else if (typeof projectData.dataComponents === "object") {
-        dataCompIds = Object.keys(projectData.dataComponents);
-      }
-      for (const dataCompId of dataCompIds) {
-        referencedComponents.push({ id: dataCompId, type: "dataComponent" });
-      }
-    }
-    if (projectData.artifactComponents) {
-      let artifactCompIds = [];
-      if (Array.isArray(projectData.artifactComponents)) {
-        artifactCompIds = projectData.artifactComponents;
-      } else if (typeof projectData.artifactComponents === "object") {
-        artifactCompIds = Object.keys(projectData.artifactComponents);
-      }
-      for (const artifactCompId of artifactCompIds) {
-        referencedComponents.push({ id: artifactCompId, type: "artifactComponent" });
-      }
-    }
-    if (projectData.credentialReferences) {
-      let credIds = [];
-      if (Array.isArray(projectData.credentialReferences)) {
-        credIds = projectData.credentialReferences;
-      } else if (typeof projectData.credentialReferences === "object") {
-        credIds = Object.keys(projectData.credentialReferences);
-      }
-      for (const credId of credIds) {
-        referencedComponents.push({ id: credId, type: "credential" });
-      }
-    }
-    if (referencedComponents.length > 0) {
-      const componentImports = registry2.getImportsForFile(currentFilePath, referencedComponents);
-      imports.push(...componentImports);
-    }
-  }
-  return imports;
-}
-function generateProjectFile(projectId, projectData, style = DEFAULT_STYLE, registry2) {
-  const imports = generateProjectImports(projectId, projectData, style, registry2);
-  const definition = generateProjectDefinition(projectId, projectData, style, registry2);
-  return generateFileContent(imports, [definition]);
-}
-var init_project_generator = __esm({
-  "src/commands/pull-v3/components/project-generator.ts"() {
-    "use strict";
-    init_esm_shims();
-    init_generator_utils();
-  }
-});
-
 // src/commands/pull-v3/components/agent-generator.ts
 function formatStatusUpdates(statusUpdatesConfig, style, indentLevel, registry2, contextConfigData, agentId) {
   if (!statusUpdatesConfig) {
@@ -235635,546 +235049,514 @@ var init_agent_generator = __esm({
   }
 });
 
-// src/commands/pull-v3/components/sub-agent-generator.ts
-function hasDistinctModels2(subAgentModels, parentModels) {
-  if (!subAgentModels) return false;
-  if (!parentModels) return !!subAgentModels;
-  const modelTypes = ["base", "structuredOutput", "summarizer"];
-  for (const type of modelTypes) {
-    const subAgentModel = subAgentModels[type]?.model;
-    const parentModel = parentModels[type]?.model;
-    if (subAgentModel !== parentModel) {
+// src/commands/pull-v3/components/artifact-component-generator.ts
+import { jsonSchemaToZod } from "json-schema-to-zod";
+function toCamelCase2(str) {
+  return str.toLowerCase().replace(/[-_](.)/g, (_, char) => char.toUpperCase()).replace(/[^a-zA-Z0-9]/g, "").replace(/^[0-9]/, "_$&");
+}
+function formatString2(str, quote = "'", multiline = false) {
+  if (!str) return `${quote}${quote}`;
+  if (multiline && (str.includes("\n") || str.length > 80)) {
+    return `\`${str.replace(/`/g, "\\`")}\``;
+  }
+  return `${quote}${str.replace(new RegExp(quote, "g"), "\\" + quote)}${quote}`;
+}
+function hasInPreviewFields(schema) {
+  if (!schema || typeof schema !== "object" || schema.type !== "object" || !schema.properties) {
+    return false;
+  }
+  for (const prop of Object.values(schema.properties)) {
+    if (prop.inPreview === true) {
       return true;
     }
-    if (subAgentModel && parentModel) {
-      const subAgentOptions = subAgentModels[type]?.providerOptions;
-      const parentOptions = parentModels[type]?.providerOptions;
-      if (subAgentOptions !== parentOptions) {
-        if (!subAgentOptions && !parentOptions) {
-          continue;
-        }
-        if (!subAgentOptions || !parentOptions) {
-          return true;
-        }
-        if (JSON.stringify(subAgentOptions) !== JSON.stringify(parentOptions)) {
-          return true;
-        }
-      }
-    }
   }
   return false;
 }
-function generateSubAgentDefinition(agentId, agentData, style = DEFAULT_STYLE, registry2, parentAgentId, contextConfigData, parentModels) {
-  if (!agentId || typeof agentId !== "string") {
-    throw new Error("agentId is required and must be a string");
+function formatArtifactSchema(schema, style) {
+  if (!schema || typeof schema !== "object") {
+    return "z.any()";
   }
-  if (!agentData || typeof agentData !== "object") {
-    throw new Error(`agentData is required for sub-agent '${agentId}'`);
+  if (schema.type === "object" && schema.properties) {
+    const { indentation } = style;
+    const lines = ["z.object({"];
+    for (const [key, prop] of Object.entries(schema.properties)) {
+      const propCopy = { ...prop };
+      delete propCopy.inPreview;
+      const baseZodType = convertJsonSchemaToZod(propCopy);
+      const finalZodType = prop.inPreview === true ? `preview(${baseZodType})` : baseZodType;
+      lines.push(`${indentation}${key}: ${finalZodType},`);
+    }
+    lines.push("})");
+    if (schema.description) {
+      return lines.join("\n") + `.describe(\`${schema.description}\`)`;
+    }
+    return lines.join("\n");
   }
-  const requiredFields = ["name", "description", "prompt"];
+  return convertJsonSchemaToZod(schema);
+}
+function convertJsonSchemaToZod(schema) {
+  if (!schema || typeof schema !== "object") {
+    return "z.any()";
+  }
+  try {
+    return jsonSchemaToZod(schema);
+  } catch (error) {
+    console.warn("Failed to convert JSON schema to Zod:", error);
+    return "z.any()";
+  }
+}
+function generateArtifactComponentDefinition(componentId, componentData, style = DEFAULT_STYLE2) {
+  if (!componentId || typeof componentId !== "string") {
+    throw new Error("componentId is required and must be a string");
+  }
+  if (!componentData || typeof componentData !== "object") {
+    throw new Error(`componentData is required for artifact component '${componentId}'`);
+  }
+  const requiredFields = ["name", "description", "props"];
   const missingFields = requiredFields.filter(
-    (field) => !agentData[field] || agentData[field] === null || agentData[field] === void 0
+    (field) => !componentData[field] || componentData[field] === null || componentData[field] === void 0
   );
   if (missingFields.length > 0) {
     throw new Error(
-      `Missing required fields for sub-agent '${agentId}': ${missingFields.join(", ")}`
+      `Missing required fields for artifact component '${componentId}': ${missingFields.join(", ")}`
     );
   }
   const { quotes, semicolons, indentation } = style;
   const q = quotes === "single" ? "'" : '"';
   const semi = semicolons ? ";" : "";
-  let agentVarName = toCamelCase(agentId);
-  if (registry2) {
-    const registryVarName = registry2.getVariableName(agentId, "subAgent");
-    if (registryVarName) {
-      agentVarName = registryVarName;
-    }
-  }
+  const componentVarName = toCamelCase2(componentId);
   const lines = [];
-  lines.push(`export const ${agentVarName} = subAgent({`);
-  lines.push(`${indentation}id: ${formatString(agentId, q)},`);
-  lines.push(`${indentation}name: ${formatString(agentData.name, q)},`);
-  lines.push(`${indentation}description: ${formatString(agentData.description, q, true)},`);
-  if (agentData.prompt !== void 0 && agentData.prompt !== null) {
-    if (hasTemplateVariables(agentData.prompt) && parentAgentId && registry2 && contextConfigData) {
-      const contextVarName = registry2.getVariableName(contextConfigData.id, "contextConfig");
-      if (!contextVarName) {
-        throw new Error(
-          `Failed to resolve context config variable name for: ${contextConfigData.id}`
-        );
-      }
-      const headersVarName = "headersSchema";
-      lines.push(
-        `${indentation}prompt: ${formatPromptWithContext(agentData.prompt, contextVarName, headersVarName, contextConfigData, q, true)},`
-      );
+  lines.push(`export const ${componentVarName} = artifactComponent({`);
+  lines.push(`${indentation}id: ${formatString2(componentId, q)},`);
+  lines.push(`${indentation}name: ${formatString2(componentData.name, q)},`);
+  lines.push(`${indentation}description: ${formatString2(componentData.description, q, true)},`);
+  const schema = componentData.props || componentData.schema;
+  if (schema) {
+    const zodSchema = formatArtifactSchema(schema, style);
+    if (zodSchema.includes("\n")) {
+      const schemaLines = zodSchema.split("\n");
+      lines.push(`${indentation}props: ${schemaLines[0]}`);
+      schemaLines.slice(1, -1).forEach((line) => {
+        lines[lines.length - 1] += "\n" + indentation + line;
+      });
+      lines[lines.length - 1] += "\n" + indentation + schemaLines[schemaLines.length - 1] + ",";
     } else {
-      lines.push(`${indentation}prompt: ${formatString(agentData.prompt, q, true)},`);
+      lines.push(`${indentation}props: ${zodSchema},`);
     }
   }
-  if (agentData.models && hasDistinctModels2(agentData.models, parentModels)) {
-    lines.push(`${indentation}models: {`);
-    if (agentData.models.base?.model) {
-      lines.push(`${indentation}${indentation}base: {`);
-      lines.push(
-        `${indentation}${indentation}${indentation}model: ${formatString(agentData.models.base.model, q)}`
-      );
-      if (agentData.models.base.providerOptions) {
-        lines.push(`${indentation}${indentation}${indentation},`);
-        lines.push(
-          `${indentation}${indentation}${indentation}providerOptions: ${JSON.stringify(agentData.models.base.providerOptions)}`
-        );
-      }
-      lines.push(`${indentation}${indentation}},`);
-    }
-    if (agentData.models.structuredOutput?.model) {
-      lines.push(`${indentation}${indentation}structuredOutput: {`);
-      lines.push(
-        `${indentation}${indentation}${indentation}model: ${formatString(agentData.models.structuredOutput.model, q)}`
-      );
-      if (agentData.models.structuredOutput.providerOptions) {
-        lines.push(`${indentation}${indentation}${indentation},`);
-        lines.push(
-          `${indentation}${indentation}${indentation}providerOptions: ${JSON.stringify(agentData.models.structuredOutput.providerOptions)}`
-        );
-      }
-      lines.push(`${indentation}${indentation}},`);
-    }
-    if (agentData.models.summarizer?.model) {
-      lines.push(`${indentation}${indentation}summarizer: {`);
-      lines.push(
-        `${indentation}${indentation}${indentation}model: ${formatString(agentData.models.summarizer.model, q)}`
-      );
-      if (agentData.models.summarizer.providerOptions) {
-        lines.push(`${indentation}${indentation}${indentation},`);
-        lines.push(
-          `${indentation}${indentation}${indentation}providerOptions: ${JSON.stringify(agentData.models.summarizer.providerOptions)}`
-        );
-      }
-      lines.push(`${indentation}${indentation}},`);
-    }
-    removeTrailingComma(lines);
-    lines.push(`${indentation}},`);
+  if (componentData.template) {
+    lines.push(`${indentation}template: ${formatString2(componentData.template, q, true)},`);
   }
-  if (agentData.canUse && Array.isArray(agentData.canUse) && agentData.canUse.length > 0) {
-    const toolReferences = [];
-    if (!registry2) {
-      throw new Error("Registry is required for canUse generation");
-    }
-    for (const toolRelation of agentData.canUse) {
-      const toolId = toolRelation.toolId;
-      let toolVarName = registry2.getVariableName(toolId, "tool");
-      if (!toolVarName) {
-        toolVarName = registry2.getVariableName(toolId, "functionTool");
-      }
-      if (!toolVarName) {
-        throw new Error(
-          `Failed to resolve variable name for tool: ${toolId} (tried both 'tool' and 'functionTool' types)`
-        );
-      }
-      const hasToolSelection = toolRelation.toolSelection && toolRelation.toolSelection.length > 0;
-      const hasHeaders = toolRelation.headers && Object.keys(toolRelation.headers).length > 0;
-      if (hasToolSelection || hasHeaders) {
-        const configLines = [];
-        if (hasToolSelection) {
-          const selectedToolsStr = JSON.stringify(toolRelation.toolSelection);
-          configLines.push(`selectedTools: ${selectedToolsStr}`);
-        }
-        if (hasHeaders) {
-          const headersStr = JSON.stringify(toolRelation.headers);
-          configLines.push(`headers: ${headersStr}`);
-        }
-        const configStr = configLines.join(", ");
-        const finalRef = `${toolVarName}.with({ ${configStr} })`;
-        toolReferences.push(finalRef);
-      } else {
-        toolReferences.push(toolVarName);
-      }
-    }
-    const { indentation: indent } = style;
-    const nestedIndent = indent.repeat(2);
-    if (toolReferences.length === 1) {
-      lines.push(`${indentation}canUse: () => [${toolReferences[0]}],`);
-    } else {
-      lines.push(`${indentation}canUse: () => [`);
-      toolReferences.forEach((ref, index2) => {
-        const isLast = index2 === toolReferences.length - 1;
-        lines.push(`${indentation}${nestedIndent}${ref}${isLast ? "" : ","}`);
-      });
-      lines.push(`${indentation}],`);
-    }
+  if (componentData.contentType) {
+    lines.push(`${indentation}contentType: ${formatString2(componentData.contentType, q)},`);
   }
-  if (agentData.canDelegateTo && Array.isArray(agentData.canDelegateTo) && agentData.canDelegateTo.length > 0) {
-    if (!registry2) {
-      throw new Error("Registry is required for canDelegateTo generation");
-    }
-    const delegateReferences = [];
-    for (const delegateRelation of agentData.canDelegateTo) {
-      let targetAgentId;
-      let targetType;
-      let hasHeaders = false;
-      if (typeof delegateRelation === "string") {
-        targetAgentId = delegateRelation;
-        targetType = "subAgent";
-        hasHeaders = false;
-      } else if (delegateRelation && typeof delegateRelation === "object") {
-        hasHeaders = delegateRelation.headers && Object.keys(delegateRelation.headers).length > 0;
-        if (delegateRelation.externalAgentId) {
-          targetAgentId = delegateRelation.externalAgentId;
-          targetType = "externalAgent";
-        } else if (delegateRelation.agentId) {
-          targetAgentId = delegateRelation.agentId;
-          targetType = "agent";
-        } else if (delegateRelation.subAgentId) {
-          targetAgentId = delegateRelation.subAgentId;
-          targetType = "subAgent";
-        } else {
-          throw new Error(
-            `Delegate relation missing agentId, subAgentId, or externalAgentId: ${JSON.stringify(delegateRelation)}`
-          );
-        }
-      } else {
-        throw new Error(`Invalid delegate relation format: ${JSON.stringify(delegateRelation)}`);
-      }
-      if (!targetAgentId) {
-        throw new Error(
-          `Failed to extract target agent ID from delegate relation: ${JSON.stringify(delegateRelation)}`
-        );
-      }
-      const agentVarName2 = registry2.getVariableName(targetAgentId, targetType);
-      if (!agentVarName2) {
-        throw new Error(
-          `Failed to resolve variable name for delegate ${targetType}: ${targetAgentId}`
+  if (lines.length > 0 && lines[lines.length - 1].endsWith(",")) {
+    lines[lines.length - 1] = lines[lines.length - 1].slice(0, -1);
+  }
+  lines.push(`})${semi}`);
+  return lines.join("\n");
+}
+function generateArtifactComponentImports(componentId, componentData, style = DEFAULT_STYLE2) {
+  const { quotes, semicolons } = style;
+  const q = quotes === "single" ? "'" : '"';
+  const semi = semicolons ? ";" : "";
+  const imports = [];
+  const schema = componentData.props || componentData.schema;
+  const needsPreviewImport = hasInPreviewFields(schema);
+  if (needsPreviewImport) {
+    imports.push(`import { preview } from ${q}@inkeep/agents-core${q}${semi}`);
+  }
+  imports.push(`import { artifactComponent } from ${q}@inkeep/agents-sdk${q}${semi}`);
+  if (schema) {
+    imports.push(`import { z } from ${q}zod${q}${semi}`);
+  }
+  return imports;
+}
+function generateArtifactComponentFile(componentId, componentData, style = DEFAULT_STYLE2) {
+  const imports = generateArtifactComponentImports(componentId, componentData, style);
+  const definition = generateArtifactComponentDefinition(componentId, componentData, style);
+  return imports.join("\n") + "\n\n" + definition + "\n";
+}
+var DEFAULT_STYLE2;
+var init_artifact_component_generator = __esm({
+  "src/commands/pull-v3/components/artifact-component-generator.ts"() {
+    "use strict";
+    init_esm_shims();
+    DEFAULT_STYLE2 = {
+      quotes: "single",
+      semicolons: true,
+      indentation: "  "
+    };
+  }
+});
+
+// src/commands/pull-v3/components/context-config-generator.ts
+import { jsonSchemaToZod as jsonSchemaToZod2 } from "json-schema-to-zod";
+function processFetchConfigTemplates(fetchConfig, headersVarName) {
+  const processValue = (value) => {
+    if (typeof value === "string") {
+      if (hasTemplateVariables(value)) {
+        const convertedStr = value.replace(
+          /\{\{headers\.([^}]+)\}\}/g,
+          `\${${headersVarName}.toTemplate("$1")}`
         );
-      }
-      if (hasHeaders) {
-        const headersStr = JSON.stringify(delegateRelation.headers);
-        const finalRef = `${agentVarName2}.with({ headers: ${headersStr} })`;
-        delegateReferences.push(finalRef);
+        return `\`${convertedStr.replace(/`/g, "\\`")}\``;
       } else {
-        delegateReferences.push(agentVarName2);
+        return `'${value.replace(/'/g, "\\'")}'`;
       }
-    }
-    const { indentation: indent } = style;
-    const nestedIndent = indent.repeat(2);
-    if (delegateReferences.length === 1) {
-      lines.push(`${indentation}canDelegateTo: () => [${delegateReferences[0]}],`);
+    } else if (typeof value === "object" && value !== null) {
+      return processObject(value);
     } else {
-      lines.push(`${indentation}canDelegateTo: () => [`);
-      delegateReferences.forEach((ref, index2) => {
-        const isLast = index2 === delegateReferences.length - 1;
-        lines.push(`${indentation}${nestedIndent}${ref}${isLast ? "" : ","}`);
-      });
-      lines.push(`${indentation}],`);
+      return JSON.stringify(value);
     }
-  }
-  if (agentData.canTransferTo && Array.isArray(agentData.canTransferTo) && agentData.canTransferTo.length > 0) {
-    if (!registry2) {
-      throw new Error("Registry is required for canTransferTo generation");
+  };
+  const processObject = (obj) => {
+    if (Array.isArray(obj)) {
+      const items = obj.map((item) => processValue(item)).join(", ");
+      return `[${items}]`;
     }
-    const transferArray = registry2.formatReferencesForCode(
-      agentData.canTransferTo,
-      "subAgent",
-      style,
-      2
+    const entries = Object.entries(obj).map(([key, val]) => {
+      const processedKey = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(key) ? key : `'${key}'`;
+      return `${processedKey}: ${processValue(val)}`;
+    });
+    return `{
+    ${entries.join(",\n    ")}
+  }`;
+  };
+  return processObject(fetchConfig);
+}
+function generateHeadersDefinition(headersId, headersData, style = DEFAULT_STYLE) {
+  const { quotes, semicolons, indentation } = style;
+  const q = quotes === "single" ? "'" : '"';
+  const semi = semicolons ? ";" : "";
+  const headersVarName = toCamelCase(headersId);
+  const lines = [];
+  lines.push(`const ${headersVarName} = headers({`);
+  if (headersData.schema) {
+    const zodSchema = jsonSchemaToZod2(headersData.schema, { module: "none" });
+    lines.push(`${indentation}schema: ${zodSchema},`);
+  }
+  removeTrailingComma(lines);
+  lines.push(`})${semi}`);
+  return lines.join("\n");
+}
+function generateFetchDefinitionDefinition(fetchId, fetchData, style = DEFAULT_STYLE, headersVarName) {
+  const { quotes, semicolons, indentation } = style;
+  const q = quotes === "single" ? "'" : '"';
+  const semi = semicolons ? ";" : "";
+  const fetchVarName = toCamelCase(fetchId);
+  const lines = [];
+  lines.push(`const ${fetchVarName} = fetchDefinition({`);
+  lines.push(`${indentation}id: ${formatString(fetchData.id || fetchId, q)},`);
+  if (fetchData.name) {
+    lines.push(`${indentation}name: ${formatString(fetchData.name, q)},`);
+  }
+  if (fetchData.trigger) {
+    lines.push(`${indentation}trigger: ${formatString(fetchData.trigger, q)},`);
+  }
+  if (fetchData.fetchConfig) {
+    const processedFetchConfig = processFetchConfigTemplates(
+      fetchData.fetchConfig,
+      headersVarName || "headers"
     );
-    if (!transferArray) {
-      throw new Error(
-        `Failed to resolve variable names for canTransferTo agents: ${agentData.canTransferTo.join(", ")}`
-      );
+    lines.push(`${indentation}fetchConfig: ${processedFetchConfig},`);
+  }
+  if (fetchData.responseSchema) {
+    const zodSchema = jsonSchemaToZod2(fetchData.responseSchema, { module: "none" });
+    lines.push(`${indentation}responseSchema: ${zodSchema},`);
+  }
+  if (fetchData.defaultValue) {
+    if (typeof fetchData.defaultValue === "string") {
+      lines.push(`${indentation}defaultValue: ${formatString(fetchData.defaultValue, q)},`);
+    } else {
+      lines.push(`${indentation}defaultValue: ${JSON.stringify(fetchData.defaultValue)},`);
     }
-    lines.push(`${indentation}canTransferTo: () => ${transferArray},`);
   }
-  if (agentData.dataComponents && Array.isArray(agentData.dataComponents) && agentData.dataComponents.length > 0) {
+  removeTrailingComma(lines);
+  lines.push(`})${semi}`);
+  return lines.join("\n");
+}
+function generateContextConfigDefinition(contextId, contextData, style = DEFAULT_STYLE, registry2, agentId, headersVarName) {
+  if (!contextId || typeof contextId !== "string") {
+    throw new Error("contextId is required and must be a string");
+  }
+  if (!contextData || typeof contextData !== "object") {
+    throw new Error(`contextData is required for context config '${contextId}'`);
+  }
+  const { quotes, semicolons, indentation } = style;
+  const q = quotes === "single" ? "'" : '"';
+  const semi = semicolons ? ";" : "";
+  const contextVarName = (() => {
     if (!registry2) {
-      throw new Error("Registry is required for dataComponents generation");
+      throw new Error("Registry is required for context config variable name generation");
     }
-    const dataComponentsArray = registry2.formatReferencesForCode(
-      agentData.dataComponents,
-      "dataComponent",
-      style,
-      2
-    );
-    if (!dataComponentsArray) {
-      throw new Error(
-        `Failed to resolve variable names for data components: ${agentData.dataComponents.join(", ")}`
-      );
+    const varName = registry2.getVariableName(contextId, "contextConfig");
+    if (!varName) {
+      throw new Error(`Failed to resolve variable name for context config: ${contextId}`);
     }
-    lines.push(`${indentation}dataComponents: () => ${dataComponentsArray},`);
+    return varName;
+  })();
+  const lines = [];
+  lines.push(`const ${contextVarName} = contextConfig({`);
+  if (contextData.id) {
+    lines.push(`${indentation}id: ${formatString(contextData.id, q)},`);
   }
-  if (agentData.artifactComponents && Array.isArray(agentData.artifactComponents) && agentData.artifactComponents.length > 0) {
-    if (!registry2) {
-      throw new Error("Registry is required for artifactComponents generation");
+  if (headersVarName) {
+    lines.push(`${indentation}headers: ${headersVarName},`);
+  } else if (contextData.headers) {
+    lines.push(`${indentation}headers: ${contextData.headers},`);
+  }
+  if (contextData.contextVariables) {
+    const contextVarLines = [`${indentation}contextVariables: {`];
+    for (const [varName, varData] of Object.entries(contextData.contextVariables)) {
+      if (typeof varData === "string") {
+        contextVarLines.push(`${indentation}  ${varName}: ${varData},`);
+      } else if (varData && typeof varData === "object" && (varData.fetchConfig || varData.responseSchema)) {
+        contextVarLines.push(`${indentation}  ${varName},`);
+      }
     }
-    const artifactComponentsArray = registry2.formatReferencesForCode(
-      agentData.artifactComponents,
-      "artifactComponent",
-      style,
-      2
-    );
-    if (!artifactComponentsArray) {
-      throw new Error(
-        `Failed to resolve variable names for artifact components: ${agentData.artifactComponents.join(", ")}`
-      );
+    if (contextVarLines[contextVarLines.length - 1].endsWith(",")) {
+      contextVarLines[contextVarLines.length - 1] = contextVarLines[contextVarLines.length - 1].slice(0, -1);
     }
-    lines.push(`${indentation}artifactComponents: () => ${artifactComponentsArray},`);
-  }
-  if (agentData.stopWhen && agentData.stopWhen.stepCountIs !== void 0) {
-    lines.push(`${indentation}stopWhen: {`);
-    lines.push(
-      `${indentation}${indentation}stepCountIs: ${agentData.stopWhen.stepCountIs} // Max tool calls + LLM responses`
-    );
-    lines.push(`${indentation}},`);
+    contextVarLines.push(`${indentation}},`);
+    lines.push(...contextVarLines);
   }
   removeTrailingComma(lines);
   lines.push(`})${semi}`);
   return lines.join("\n");
 }
-function generateSubAgentImports(agentId, agentData, style = DEFAULT_STYLE, registry2, parentAgentId, contextConfigData) {
+function generateContextConfigImports(contextId, contextData, style = DEFAULT_STYLE) {
   const imports = [];
-  imports.push(generateImport(["subAgent"], "@inkeep/agents-sdk", style));
-  if (hasTemplateVariables(agentData.prompt) && parentAgentId && registry2 && contextConfigData) {
-    const contextConfigId = contextConfigData.id;
-    const currentFilePath = `agents/sub-agents/${agentId}.ts`;
-    const importStatement = registry2.getImportStatement(
-      currentFilePath,
-      contextConfigId,
-      "contextConfig"
-    );
-    if (importStatement) {
-      imports.push(importStatement);
-    }
+  const coreImports = [];
+  if (contextData.headers || hasHeadersInData(contextData)) {
+    coreImports.push("headers");
   }
-  if (registry2) {
-    const currentFilePath = `agents/sub-agents/${agentId}.ts`;
-    const referencedComponents = [];
-    if (Array.isArray(agentData.canUse)) {
-      for (const toolRelation of agentData.canUse) {
-        const toolId = toolRelation.toolId;
-        if (toolId) {
-          let componentType = "tool";
-          if (registry2.get(toolId, "functionTool")) {
-            componentType = "functionTool";
-          } else if (registry2.get(toolId, "tool")) {
-            componentType = "tool";
-          }
-          referencedComponents.push({ id: toolId, type: componentType });
-        }
-      }
-    }
-    if (Array.isArray(agentData.canDelegateTo)) {
-      for (const delegateRelation of agentData.canDelegateTo) {
-        let targetId;
-        let targetType = "agent";
-        if (delegateRelation && typeof delegateRelation === "object") {
-          if (delegateRelation.externalAgentId) {
-            targetId = delegateRelation.externalAgentId;
-            targetType = "externalAgent";
-          } else if (delegateRelation.agentId) {
-            targetId = delegateRelation.agentId;
-            targetType = "agent";
-          } else if (delegateRelation.subAgentId) {
-            targetId = delegateRelation.subAgentId;
-            targetType = "subAgent";
-          }
-        }
-        if (targetId) {
-          referencedComponents.push({ id: targetId, type: targetType });
-        }
-      }
-    }
-    if (Array.isArray(agentData.canTransferTo)) {
-      for (const transferId of agentData.canTransferTo) {
-        if (typeof transferId === "string") {
-          referencedComponents.push({ id: transferId, type: "subAgent" });
-        }
-      }
-    }
-    if (Array.isArray(agentData.dataComponents)) {
-      for (const dataCompId of agentData.dataComponents) {
-        if (typeof dataCompId === "string") {
-          referencedComponents.push({ id: dataCompId, type: "dataComponent" });
-        }
-      }
+  if (contextData.contextVariables && hasFetchDefinitionsInData(contextData)) {
+    coreImports.push("fetchDefinition");
+  }
+  coreImports.push("contextConfig");
+  if (coreImports.length > 0) {
+    imports.push(generateImport(coreImports, "@inkeep/agents-core", style));
+  }
+  if (hasSchemas(contextData)) {
+    imports.push(generateImport(["z"], "zod", style));
+  }
+  return imports;
+}
+function hasHeadersInData(contextData) {
+  return !!contextData.headers || JSON.stringify(contextData).includes("headers");
+}
+function hasFetchDefinitionsInData(contextData) {
+  return JSON.stringify(contextData).includes("fetchDefinition") || contextData.contextVariables && Object.values(contextData.contextVariables).some(
+    (v) => v && typeof v === "object" && (v.fetchConfig || v.responseSchema)
+  );
+}
+function hasSchemas(contextData) {
+  const dataStr = JSON.stringify(contextData).toLowerCase();
+  return dataStr.includes("schema") || dataStr.includes("responseschema");
+}
+function generateContextConfigFile(contextId, contextData, style = DEFAULT_STYLE, registry2, agentId) {
+  const imports = generateContextConfigImports(contextId, contextData, style);
+  const definitions = [];
+  let headersVarName;
+  if (contextData.headersSchema) {
+    if (typeof contextData.headers === "string") {
+      headersVarName = contextData.headers;
+    } else {
+      headersVarName = `${toCamelCase(contextId)}Headers`;
     }
-    if (Array.isArray(agentData.artifactComponents)) {
-      for (const artifactCompId of agentData.artifactComponents) {
-        if (typeof artifactCompId === "string") {
-          referencedComponents.push({ id: artifactCompId, type: "artifactComponent" });
-        }
+    const headersDefinition = generateHeadersDefinition(
+      headersVarName || "headers",
+      { schema: contextData.headersSchema },
+      style
+    );
+    definitions.push(headersDefinition);
+  }
+  if (contextData.contextVariables) {
+    for (const [varName, varData] of Object.entries(contextData.contextVariables)) {
+      if (varData && typeof varData === "object" && (varData.fetchConfig || varData.responseSchema)) {
+        const fetchDefinition2 = generateFetchDefinitionDefinition(
+          varName,
+          varData,
+          style,
+          headersVarName
+        );
+        definitions.push(fetchDefinition2);
       }
     }
-    if (referencedComponents.length > 0) {
-      const componentImports = registry2.getImportsForFile(currentFilePath, referencedComponents);
-      imports.push(...componentImports);
-    }
   }
-  return imports;
-}
-function generateSubAgentFile(agentId, agentData, style = DEFAULT_STYLE, registry2, parentAgentId, contextConfigData, parentModels) {
-  const imports = generateSubAgentImports(
-    agentId,
-    agentData,
+  const contextDefinition = generateContextConfigDefinition(
+    contextId,
+    contextData,
     style,
     registry2,
-    parentAgentId,
-    contextConfigData
-  );
-  const definition = generateSubAgentDefinition(
     agentId,
-    agentData,
-    style,
-    registry2,
-    parentAgentId,
-    contextConfigData,
-    parentModels
+    headersVarName
   );
-  return generateFileContent(imports, [definition]);
+  definitions.push(contextDefinition);
+  const contextVarName = (() => {
+    if (!registry2) {
+      throw new Error("Registry is required for context config variable name generation");
+    }
+    const varName = registry2.getVariableName(contextId, "contextConfig");
+    if (!varName) {
+      throw new Error(`Failed to resolve variable name for context config: ${contextId}`);
+    }
+    return varName;
+  })();
+  const exports = [contextVarName];
+  if (headersVarName) {
+    exports.push(headersVarName);
+  }
+  if (contextData.contextVariables) {
+    for (const [varName, varData] of Object.entries(contextData.contextVariables)) {
+      if (varData && typeof varData === "object" && (varData.fetchConfig || varData.responseSchema)) {
+        exports.push(varName);
+      }
+    }
+  }
+  definitions.push(`export { ${exports.join(", ")} };`);
+  return generateFileContent(imports, definitions);
 }
-var init_sub_agent_generator = __esm({
-  "src/commands/pull-v3/components/sub-agent-generator.ts"() {
+var init_context_config_generator = __esm({
+  "src/commands/pull-v3/components/context-config-generator.ts"() {
     "use strict";
     init_esm_shims();
     init_generator_utils();
   }
 });
 
-// src/commands/pull-v3/components/external-agent-generator.ts
-function generateExternalAgentDefinition(agentId, agentData, style = DEFAULT_STYLE, registry2) {
-  if (!agentId || typeof agentId !== "string") {
-    throw new Error("agentId is required and must be a string");
+// src/commands/pull-v3/components/credential-generator.ts
+function toCamelCase3(str) {
+  return str.toLowerCase().replace(/[-_](.)/g, (_, char) => char.toUpperCase()).replace(/[^a-zA-Z0-9]/g, "").replace(/^[0-9]/, "_$&");
+}
+function formatString3(str, quote = "'", multiline = false) {
+  if (!str) return `${quote}${quote}`;
+  if (multiline && (str.includes("\n") || str.length > 80)) {
+    return `\`${str.replace(/`/g, "\\`")}\``;
   }
-  if (!agentData || typeof agentData !== "object") {
-    throw new Error(`agentData is required for external agent '${agentId}'`);
+  return `${quote}${str.replace(new RegExp(quote, "g"), "\\" + quote)}${quote}`;
+}
+function formatRetrievalParams(retrievalParams, style, indentLevel) {
+  if (!retrievalParams || typeof retrievalParams !== "object") {
+    return "{}";
   }
-  const requiredFields = ["name", "description", "baseUrl"];
+  const { quotes, indentation } = style;
+  const q = quotes === "single" ? "'" : '"';
+  const baseIndent = indentation.repeat(indentLevel);
+  const indent = indentation.repeat(indentLevel + 1);
+  const lines = ["{"];
+  for (const [key, value] of Object.entries(retrievalParams)) {
+    if (typeof value === "string") {
+      lines.push(`${indent}${q}${key}${q}: ${formatString3(value, q)},`);
+    } else if (typeof value === "number" || typeof value === "boolean") {
+      lines.push(`${indent}${q}${key}${q}: ${JSON.stringify(value)},`);
+    } else if (typeof value === "object" && value !== null) {
+      lines.push(
+        `${indent}${q}${key}${q}: ${formatRetrievalParams(value, style, indentLevel + 1)},`
+      );
+    }
+  }
+  if (lines.length > 1 && lines[lines.length - 1].endsWith(",")) {
+    lines[lines.length - 1] = lines[lines.length - 1].slice(0, -1);
+  }
+  lines.push(`${baseIndent}}`);
+  return lines.join("\n");
+}
+function generateCredentialDefinition(credentialId, credentialData, style = DEFAULT_STYLE3) {
+  const { quotes, semicolons, indentation } = style;
+  const q = quotes === "single" ? "'" : '"';
+  const semi = semicolons ? ";" : "";
+  const credentialVarName = toCamelCase3(credentialId);
+  const lines = [];
+  lines.push(`export const ${credentialVarName} = credential({`);
+  lines.push(`${indentation}id: ${formatString3(credentialId, q)},`);
+  const requiredFields = ["name", "type", "credentialStoreId"];
   const missingFields = requiredFields.filter(
-    (field) => !agentData[field] || agentData[field] === null || agentData[field] === void 0
+    (field) => !credentialData[field] || credentialData[field] === null || credentialData[field] === void 0
   );
   if (missingFields.length > 0) {
     throw new Error(
-      `Missing required fields for external agent '${agentId}': ${missingFields.join(", ")}`
+      `Missing required fields for credential '${credentialId}': ${missingFields.join(", ")}`
     );
   }
-  const { quotes, semicolons, indentation } = style;
-  const q = quotes === "single" ? "'" : '"';
-  const semi = semicolons ? ";" : "";
-  let agentVarName = toCamelCase(agentId);
-  if (registry2) {
-    const registryVarName = registry2.getVariableName(agentId, "externalAgent");
-    if (registryVarName) {
-      agentVarName = registryVarName;
-    }
-  }
-  const lines = [];
-  lines.push(`export const ${agentVarName} = externalAgent({`);
-  lines.push(`${indentation}id: ${formatString(agentId, q)},`);
-  if (agentData.name !== void 0 && agentData.name !== null) {
-    lines.push(`${indentation}name: ${formatString(agentData.name, q)},`);
-  } else {
-    lines.push(`${indentation}name: ${formatString(agentId, q)},`);
+  lines.push(`${indentation}name: ${formatString3(credentialData.name, q)},`);
+  lines.push(`${indentation}type: ${formatString3(credentialData.type, q)},`);
+  lines.push(
+    `${indentation}credentialStoreId: ${formatString3(credentialData.credentialStoreId, q)},`
+  );
+  if (credentialData.description) {
+    lines.push(`${indentation}description: ${formatString3(credentialData.description, q, true)},`);
   }
-  if (agentData.description !== void 0 && agentData.description !== null) {
-    lines.push(`${indentation}description: ${formatString(agentData.description, q, true)},`);
+  if (credentialData.retrievalParams) {
+    const formattedParams = formatRetrievalParams(credentialData.retrievalParams, style, 1);
+    if (formattedParams.includes("\n")) {
+      lines.push(`${indentation}retrievalParams: ${formattedParams},`);
+    } else {
+      lines.push(`${indentation}retrievalParams: ${formattedParams},`);
+    }
   } else {
-    lines.push(`${indentation}description: ${formatString(`External agent ${agentId}`, q)},`);
-  }
-  if (agentData.baseUrl !== void 0 && agentData.baseUrl !== null) {
-    lines.push(`${indentation}baseUrl: ${formatString(agentData.baseUrl, q)},`);
+    const defaultKey = credentialId.toUpperCase().replace(/-/g, "_");
+    lines.push(`${indentation}retrievalParams: {`);
+    lines.push(`${indentation}${indentation}${q}key${q}: ${formatString3(defaultKey, q)}`);
+    lines.push(`${indentation}},`);
   }
-  if (agentData.credentialReference) {
-    if (typeof agentData.credentialReference === "string") {
-      if (!registry2) {
-        throw new Error("Registry is required for credentialReference generation");
-      }
-      const credentialVar = registry2.getVariableName(agentData.credentialReference, "credential");
-      if (!credentialVar) {
-        throw new Error(
-          `Failed to resolve variable name for credential reference: ${agentData.credentialReference}`
-        );
-      }
-      lines.push(`${indentation}credentialReference: ${credentialVar},`);
-    } else if (typeof agentData.credentialReference === "object") {
-      const credLines = [];
-      if (agentData.credentialReference.id) {
-        credLines.push(
-          `${indentation}${indentation}id: ${formatString(agentData.credentialReference.id, q)},`
-        );
-      }
-      if (agentData.credentialReference.name) {
-        credLines.push(
-          `${indentation}${indentation}name: ${formatString(agentData.credentialReference.name, q)},`
-        );
-      }
-      if (agentData.credentialReference.description) {
-        credLines.push(
-          `${indentation}${indentation}description: ${formatString(agentData.credentialReference.description, q)},`
-        );
-      }
-      if (credLines.length > 0 && credLines[credLines.length - 1].endsWith(",")) {
-        credLines[credLines.length - 1] = credLines[credLines.length - 1].slice(0, -1);
-      }
-      lines.push(`${indentation}credentialReference: {`);
-      lines.push(...credLines);
-      lines.push(`${indentation}},`);
-    }
+  if (lines.length > 0 && lines[lines.length - 1].endsWith(",")) {
+    lines[lines.length - 1] = lines[lines.length - 1].slice(0, -1);
   }
-  removeTrailingComma(lines);
   lines.push(`})${semi}`);
   return lines.join("\n");
 }
-function generateExternalAgentImports(agentId, agentData, style = DEFAULT_STYLE, registry2) {
+function generateCredentialImports(credentialId, credentialData, style = DEFAULT_STYLE3) {
+  const { quotes, semicolons } = style;
+  const q = quotes === "single" ? "'" : '"';
+  const semi = semicolons ? ";" : "";
   const imports = [];
-  imports.push(generateImport(["externalAgent"], "@inkeep/agents-sdk", style));
-  if (agentData.credentialReference && typeof agentData.credentialReference === "string") {
-    if (!registry2) {
-      throw new Error("Registry is required for credential reference imports");
-    }
-    const currentFilePath = `external-agents/${agentId}.ts`;
-    const credentialRefs = [
-      { id: agentData.credentialReference, type: "credential" }
-    ];
-    const componentImports = registry2.getImportsForFile(currentFilePath, credentialRefs);
-    imports.push(...componentImports);
-  }
+  imports.push(`import { credential } from ${q}@inkeep/agents-sdk${q}${semi}`);
   return imports;
 }
-function generateExternalAgentFile(agentId, agentData, style = DEFAULT_STYLE, registry2) {
-  const imports = generateExternalAgentImports(agentId, agentData, style, registry2);
-  const definition = generateExternalAgentDefinition(agentId, agentData, style, registry2);
-  return generateFileContent(imports, [definition]);
+function generateCredentialFile(credentialId, credentialData, style = DEFAULT_STYLE3) {
+  const imports = generateCredentialImports(credentialId, credentialData, style);
+  const definition = generateCredentialDefinition(credentialId, credentialData, style);
+  return imports.join("\n") + "\n\n" + definition + "\n";
 }
-var init_external_agent_generator = __esm({
-  "src/commands/pull-v3/components/external-agent-generator.ts"() {
+var DEFAULT_STYLE3;
+var init_credential_generator = __esm({
+  "src/commands/pull-v3/components/credential-generator.ts"() {
     "use strict";
     init_esm_shims();
-    init_generator_utils();
+    DEFAULT_STYLE3 = {
+      quotes: "single",
+      semicolons: true,
+      indentation: "  "
+    };
   }
 });
 
 // src/commands/pull-v3/components/data-component-generator.ts
-import { jsonSchemaToZod } from "json-schema-to-zod";
-function toCamelCase2(str) {
+import { jsonSchemaToZod as jsonSchemaToZod3 } from "json-schema-to-zod";
+function toCamelCase4(str) {
   return str.toLowerCase().replace(/[-_](.)/g, (_, char) => char.toUpperCase()).replace(/[^a-zA-Z0-9]/g, "").replace(/^[0-9]/, "_$&");
 }
-function formatString2(str, quote = "'", multiline = false) {
+function formatString4(str, quote = "'", multiline = false) {
   if (!str) return `${quote}${quote}`;
   if (multiline && (str.includes("\n") || str.length > 80)) {
     return `\`${str.replace(/`/g, "\\`")}\``;
   }
   return `${quote}${str.replace(new RegExp(quote, "g"), "\\" + quote)}${quote}`;
 }
-function convertJsonSchemaToZod(schema) {
+function convertJsonSchemaToZod2(schema) {
   if (!schema || typeof schema !== "object") {
     return "z.any()";
   }
   try {
-    return jsonSchemaToZod(schema);
+    return jsonSchemaToZod3(schema);
   } catch (error) {
     console.warn("Failed to convert JSON schema to Zod:", error);
     return "z.any()";
   }
 }
-function generateDataComponentDefinition(componentId, componentData, style = DEFAULT_STYLE2) {
+function generateDataComponentDefinition(componentId, componentData, style = DEFAULT_STYLE4) {
   if (!componentId || typeof componentId !== "string") {
     throw new Error("componentId is required and must be a string");
   }
@@ -236193,15 +235575,15 @@ function generateDataComponentDefinition(componentId, componentData, style = DEF
   const { quotes, semicolons, indentation } = style;
   const q = quotes === "single" ? "'" : '"';
   const semi = semicolons ? ";" : "";
-  const componentVarName = toCamelCase2(componentId);
+  const componentVarName = toCamelCase4(componentId);
   const lines = [];
   lines.push(`export const ${componentVarName} = dataComponent({`);
-  lines.push(`${indentation}id: ${formatString2(componentId, q)},`);
-  lines.push(`${indentation}name: ${formatString2(componentData.name, q)},`);
-  lines.push(`${indentation}description: ${formatString2(componentData.description, q, true)},`);
+  lines.push(`${indentation}id: ${formatString4(componentId, q)},`);
+  lines.push(`${indentation}name: ${formatString4(componentData.name, q)},`);
+  lines.push(`${indentation}description: ${formatString4(componentData.description, q, true)},`);
   const schema = componentData.props || componentData.schema;
   if (schema) {
-    const zodSchema = convertJsonSchemaToZod(schema);
+    const zodSchema = convertJsonSchemaToZod2(schema);
     lines.push(`${indentation}props: ${zodSchema},`);
   }
   if (lines.length > 0 && lines[lines.length - 1].endsWith(",")) {
@@ -236210,7 +235592,7 @@ function generateDataComponentDefinition(componentId, componentData, style = DEF
   lines.push(`})${semi}`);
   return lines.join("\n");
 }
-function generateDataComponentImports(componentId, componentData, style = DEFAULT_STYLE2) {
+function generateDataComponentImports(componentId, componentData, style = DEFAULT_STYLE4) {
   const { quotes, semicolons } = style;
   const q = quotes === "single" ? "'" : '"';
   const semi = semicolons ? ";" : "";
@@ -236222,17 +235604,17 @@ function generateDataComponentImports(componentId, componentData, style = DEFAUL
   }
   return imports;
 }
-function generateDataComponentFile(componentId, componentData, style = DEFAULT_STYLE2) {
+function generateDataComponentFile(componentId, componentData, style = DEFAULT_STYLE4) {
   const imports = generateDataComponentImports(componentId, componentData, style);
   const definition = generateDataComponentDefinition(componentId, componentData, style);
   return imports.join("\n") + "\n\n" + definition + "\n";
 }
-var DEFAULT_STYLE2;
+var DEFAULT_STYLE4;
 var init_data_component_generator = __esm({
   "src/commands/pull-v3/components/data-component-generator.ts"() {
     "use strict";
     init_esm_shims();
-    DEFAULT_STYLE2 = {
+    DEFAULT_STYLE4 = {
       quotes: "single",
       semicolons: true,
       indentation: "  "
@@ -236240,140 +235622,209 @@ var init_data_component_generator = __esm({
   }
 });
 
-// src/commands/pull-v3/components/artifact-component-generator.ts
-import { jsonSchemaToZod as jsonSchemaToZod2 } from "json-schema-to-zod";
-function toCamelCase3(str) {
-  return str.toLowerCase().replace(/[-_](.)/g, (_, char) => char.toUpperCase()).replace(/[^a-zA-Z0-9]/g, "").replace(/^[0-9]/, "_$&");
-}
-function formatString3(str, quote = "'", multiline = false) {
+// src/commands/pull-v3/components/environment-generator.ts
+var environment_generator_exports = {};
+__export(environment_generator_exports, {
+  generateEnvironmentFile: () => generateEnvironmentFile,
+  generateEnvironmentIndexDefinition: () => generateEnvironmentIndexDefinition,
+  generateEnvironmentIndexFile: () => generateEnvironmentIndexFile,
+  generateEnvironmentIndexImports: () => generateEnvironmentIndexImports,
+  generateEnvironmentSettingsDefinition: () => generateEnvironmentSettingsDefinition,
+  generateEnvironmentSettingsFile: () => generateEnvironmentSettingsFile,
+  generateEnvironmentSettingsImports: () => generateEnvironmentSettingsImports
+});
+function formatString5(str, quote = "'", multiline = false) {
   if (!str) return `${quote}${quote}`;
   if (multiline && (str.includes("\n") || str.length > 80)) {
     return `\`${str.replace(/`/g, "\\`")}\``;
   }
   return `${quote}${str.replace(new RegExp(quote, "g"), "\\" + quote)}${quote}`;
 }
-function hasInPreviewFields(schema) {
-  if (!schema || typeof schema !== "object" || schema.type !== "object" || !schema.properties) {
-    return false;
+function formatCredentialsObject(credentials, style, indentLevel) {
+  if (!credentials || typeof credentials !== "object") {
+    return "{}";
   }
-  for (const prop of Object.values(schema.properties)) {
-    if (prop.inPreview === true) {
-      return true;
+  const { quotes, indentation } = style;
+  const q = quotes === "single" ? "'" : '"';
+  const baseIndent = indentation.repeat(indentLevel);
+  const indent = indentation.repeat(indentLevel + 1);
+  const nestedIndent = indentation.repeat(indentLevel + 2);
+  const lines = ["{"];
+  for (const [key, credentialData] of Object.entries(credentials)) {
+    lines.push(`${indent}${formatString5(key, q)}: {`);
+    if (credentialData.id) {
+      lines.push(`${nestedIndent}id: ${formatString5(credentialData.id, q)},`);
     }
-  }
-  return false;
-}
-function formatArtifactSchema(schema, style) {
-  if (!schema || typeof schema !== "object") {
-    return "z.any()";
-  }
-  if (schema.type === "object" && schema.properties) {
-    const { indentation } = style;
-    const lines = ["z.object({"];
-    for (const [key, prop] of Object.entries(schema.properties)) {
-      const propCopy = { ...prop };
-      delete propCopy.inPreview;
-      const baseZodType = convertJsonSchemaToZod2(propCopy);
-      const finalZodType = prop.inPreview === true ? `preview(${baseZodType})` : baseZodType;
-      lines.push(`${indentation}${key}: ${finalZodType},`);
+    if (credentialData.name) {
+      lines.push(`${nestedIndent}name: ${formatString5(credentialData.name, q)},`);
     }
-    lines.push("})");
-    if (schema.description) {
-      return lines.join("\n") + `.describe(\`${schema.description}\`)`;
+    if (credentialData.type) {
+      if (typeof credentialData.type === "string") {
+        const enumValue = credentialData.type === "memory" ? "CredentialStoreType.memory" : credentialData.type === "env" ? "CredentialStoreType.env" : credentialData.type === "keychain" ? "CredentialStoreType.keychain" : formatString5(credentialData.type, q);
+        lines.push(`${nestedIndent}type: ${enumValue},`);
+      } else {
+        lines.push(`${nestedIndent}type: ${credentialData.type},`);
+      }
     }
-    return lines.join("\n");
-  }
-  return convertJsonSchemaToZod2(schema);
-}
-function convertJsonSchemaToZod2(schema) {
-  if (!schema || typeof schema !== "object") {
-    return "z.any()";
+    if (credentialData.credentialStoreId) {
+      lines.push(
+        `${nestedIndent}credentialStoreId: ${formatString5(credentialData.credentialStoreId, q)},`
+      );
+    }
+    if (credentialData.description) {
+      lines.push(`${nestedIndent}description: ${formatString5(credentialData.description, q)},`);
+    }
+    if (credentialData.retrievalParams) {
+      lines.push(`${nestedIndent}retrievalParams: {`);
+      for (const [paramKey, paramValue] of Object.entries(credentialData.retrievalParams)) {
+        if (paramValue === null || paramValue === void 0) {
+          continue;
+        }
+        if (typeof paramValue === "string") {
+          lines.push(`${nestedIndent}${indent}${paramKey}: ${formatString5(paramValue, q)},`);
+        } else {
+          lines.push(`${nestedIndent}${indent}${paramKey}: ${JSON.stringify(paramValue)},`);
+        }
+      }
+      const lastLineIndex = lines.length - 1;
+      if (lines[lastLineIndex].endsWith(",")) {
+        lines[lastLineIndex] = lines[lastLineIndex].slice(0, -1);
+      }
+      lines.push(`${nestedIndent}},`);
+    }
+    const lastPropIndex = lines.length - 1;
+    if (lines[lastPropIndex].endsWith(",")) {
+      lines[lastPropIndex] = lines[lastPropIndex].slice(0, -1);
+    }
+    lines.push(`${indent}},`);
   }
-  try {
-    return jsonSchemaToZod2(schema);
-  } catch (error) {
-    console.warn("Failed to convert JSON schema to Zod:", error);
-    return "z.any()";
+  if (lines.length > 1 && lines[lines.length - 1].endsWith(",")) {
+    lines[lines.length - 1] = lines[lines.length - 1].slice(0, -1);
   }
+  lines.push(`${baseIndent}}`);
+  return lines.join("\n");
 }
-function generateArtifactComponentDefinition(componentId, componentData, style = DEFAULT_STYLE3) {
-  if (!componentId || typeof componentId !== "string") {
-    throw new Error("componentId is required and must be a string");
-  }
-  if (!componentData || typeof componentData !== "object") {
-    throw new Error(`componentData is required for artifact component '${componentId}'`);
+function generateEnvironmentSettingsDefinition(environmentName, environmentData, style = DEFAULT_STYLE5) {
+  if (!environmentName || typeof environmentName !== "string") {
+    throw new Error("environmentName is required and must be a string");
   }
-  const requiredFields = ["name", "description", "props"];
-  const missingFields = requiredFields.filter(
-    (field) => !componentData[field] || componentData[field] === null || componentData[field] === void 0
-  );
-  if (missingFields.length > 0) {
-    throw new Error(
-      `Missing required fields for artifact component '${componentId}': ${missingFields.join(", ")}`
-    );
+  if (!environmentData || typeof environmentData !== "object") {
+    throw new Error(`environmentData is required for environment '${environmentName}'`);
   }
   const { quotes, semicolons, indentation } = style;
   const q = quotes === "single" ? "'" : '"';
   const semi = semicolons ? ";" : "";
-  const componentVarName = toCamelCase3(componentId);
   const lines = [];
-  lines.push(`export const ${componentVarName} = artifactComponent({`);
-  lines.push(`${indentation}id: ${formatString3(componentId, q)},`);
-  lines.push(`${indentation}name: ${formatString3(componentData.name, q)},`);
-  lines.push(`${indentation}description: ${formatString3(componentData.description, q, true)},`);
-  const schema = componentData.props || componentData.schema;
-  if (schema) {
-    const zodSchema = formatArtifactSchema(schema, style);
-    if (zodSchema.includes("\n")) {
-      const schemaLines = zodSchema.split("\n");
-      lines.push(`${indentation}props: ${schemaLines[0]}`);
-      schemaLines.slice(1, -1).forEach((line) => {
-        lines[lines.length - 1] += "\n" + indentation + line;
-      });
-      lines[lines.length - 1] += "\n" + indentation + schemaLines[schemaLines.length - 1] + ",";
-    } else {
-      lines.push(`${indentation}props: ${zodSchema},`);
-    }
+  lines.push(`export const ${environmentName} = registerEnvironmentSettings({`);
+  if (environmentData.credentials && Object.keys(environmentData.credentials).length > 0) {
+    const formattedCredentials = formatCredentialsObject(environmentData.credentials, style, 1);
+    lines.push(`${indentation}credentials: ${formattedCredentials},`);
+  } else {
+    lines.push(`${indentation}credentials: {},`);
   }
-  if (componentData.template) {
-    lines.push(`${indentation}template: ${formatString3(componentData.template, q, true)},`);
+  if (lines.length > 1 && lines[lines.length - 1].endsWith(",")) {
+    lines[lines.length - 1] = lines[lines.length - 1].slice(0, -1);
   }
-  if (componentData.contentType) {
-    lines.push(`${indentation}contentType: ${formatString3(componentData.contentType, q)},`);
+  lines.push(`})${semi}`);
+  return lines.join("\n");
+}
+function generateEnvironmentIndexDefinition(environments, style = DEFAULT_STYLE5) {
+  const { quotes, semicolons, indentation } = style;
+  const q = quotes === "single" ? "'" : '"';
+  const semi = semicolons ? ";" : "";
+  const lines = [];
+  lines.push(`export const envSettings = createEnvironmentSettings({`);
+  for (const envName of environments) {
+    lines.push(`${indentation}${envName},`);
   }
-  if (lines.length > 0 && lines[lines.length - 1].endsWith(",")) {
+  if (lines.length > 1 && lines[lines.length - 1].endsWith(",")) {
     lines[lines.length - 1] = lines[lines.length - 1].slice(0, -1);
   }
   lines.push(`})${semi}`);
   return lines.join("\n");
 }
-function generateArtifactComponentImports(componentId, componentData, style = DEFAULT_STYLE3) {
+function generateEnvironmentSettingsImports(environmentName, environmentData, style = DEFAULT_STYLE5) {
   const { quotes, semicolons } = style;
   const q = quotes === "single" ? "'" : '"';
   const semi = semicolons ? ";" : "";
   const imports = [];
-  const schema = componentData.props || componentData.schema;
-  const needsPreviewImport = hasInPreviewFields(schema);
-  if (needsPreviewImport) {
-    imports.push(`import { preview } from ${q}@inkeep/agents-core${q}${semi}`);
+  imports.push(`import { registerEnvironmentSettings } from ${q}@inkeep/agents-sdk${q}${semi}`);
+  const needsCredentialStoreType = environmentData.credentials && Object.values(environmentData.credentials).some(
+    (cred) => typeof cred.type === "string" && ["memory", "env", "keychain"].includes(cred.type)
+  );
+  if (needsCredentialStoreType) {
+    imports.push(`import { CredentialStoreType } from ${q}@inkeep/agents-core${q}${semi}`);
   }
-  imports.push(`import { artifactComponent } from ${q}@inkeep/agents-sdk${q}${semi}`);
-  if (schema) {
-    imports.push(`import { z } from ${q}zod${q}${semi}`);
+  return imports;
+}
+function generateEnvironmentIndexImports(environments, style = DEFAULT_STYLE5) {
+  const { quotes, semicolons } = style;
+  const q = quotes === "single" ? "'" : '"';
+  const semi = semicolons ? ";" : "";
+  const imports = [];
+  imports.push(`import { createEnvironmentSettings } from ${q}@inkeep/agents-sdk${q}${semi}`);
+  for (const envName of environments) {
+    imports.push(`import { ${envName} } from ${q}./${envName}.env${q}${semi}`);
   }
   return imports;
 }
-function generateArtifactComponentFile(componentId, componentData, style = DEFAULT_STYLE3) {
-  const imports = generateArtifactComponentImports(componentId, componentData, style);
-  const definition = generateArtifactComponentDefinition(componentId, componentData, style);
+function generateEnvironmentSettingsFile(environmentName, environmentData, style = DEFAULT_STYLE5) {
+  const imports = generateEnvironmentSettingsImports(environmentName, environmentData, style);
+  const definition = generateEnvironmentSettingsDefinition(environmentName, environmentData, style);
   return imports.join("\n") + "\n\n" + definition + "\n";
 }
-var DEFAULT_STYLE3;
-var init_artifact_component_generator = __esm({
-  "src/commands/pull-v3/components/artifact-component-generator.ts"() {
+function generateEnvironmentIndexFile(environments, style = DEFAULT_STYLE5) {
+  const imports = generateEnvironmentIndexImports(environments, style);
+  const definition = generateEnvironmentIndexDefinition(environments, style);
+  return imports.join("\n") + "\n\n" + definition + "\n";
+}
+function generateEnvironmentFile(environmentName, environmentData, style = DEFAULT_STYLE5, registry2) {
+  if (registry2 && environmentData.credentials && Array.isArray(environmentData.credentials)) {
+    const { quotes, semicolons, indentation } = style;
+    const q = quotes === "single" ? "'" : '"';
+    const semi = semicolons ? ";" : "";
+    const imports = [];
+    const credentialRefs = [];
+    imports.push(`import { registerEnvironmentSettings } from ${q}@inkeep/agents-sdk${q}${semi}`);
+    for (const credentialId of environmentData.credentials) {
+      const credentialComponent = registry2.get(credentialId, "credential");
+      if (credentialComponent) {
+        const relativePath = `../credentials/${credentialId}`;
+        imports.push(`import { ${credentialComponent.name} } from ${q}${relativePath}${q}${semi}`);
+        credentialRefs.push(credentialComponent.name);
+      }
+    }
+    const lines = [];
+    lines.push(...imports);
+    lines.push("");
+    lines.push(`export const ${environmentName} = registerEnvironmentSettings({`);
+    if (credentialRefs.length > 0) {
+      lines.push(`${indentation}credentials: {`);
+      for (let i = 0; i < environmentData.credentials.length; i++) {
+        const credentialId = environmentData.credentials[i];
+        const credentialVarName = credentialRefs[i];
+        const isLast = i === credentialRefs.length - 1;
+        const validKey = registry2.getVariableName(credentialId, "credential");
+        lines.push(
+          `${indentation}${indentation}${validKey}: ${credentialVarName}${isLast ? "" : ","}`
+        );
+      }
+      lines.push(`${indentation}}`);
+    } else {
+      lines.push(`${indentation}credentials: {}`);
+    }
+    lines.push(`})${semi}`);
+    lines.push("");
+    return lines.join("\n");
+  }
+  return generateEnvironmentSettingsFile(environmentName, environmentData, style);
+}
+var DEFAULT_STYLE5;
+var init_environment_generator = __esm({
+  "src/commands/pull-v3/components/environment-generator.ts"() {
     "use strict";
     init_esm_shims();
-    DEFAULT_STYLE3 = {
+    DEFAULT_STYLE5 = {
       quotes: "single",
       semicolons: true,
       indentation: "  "
@@ -236381,102 +235832,116 @@ var init_artifact_component_generator = __esm({
   }
 });
 
-// src/commands/pull-v3/components/status-component-generator.ts
-import { jsonSchemaToZod as jsonSchemaToZod3 } from "json-schema-to-zod";
-function toCamelCase4(str) {
-  return str.toLowerCase().replace(/[-_](.)/g, (_, char) => char.toUpperCase()).replace(/[^a-zA-Z0-9]/g, "").replace(/^[0-9]/, "_$&");
-}
-function formatString4(str, quote = "'", multiline = false) {
-  if (!str) return `${quote}${quote}`;
-  if (multiline && (str.includes("\n") || str.length > 80)) {
-    return `\`${str.replace(/`/g, "\\`")}\``;
-  }
-  return `${quote}${str.replace(new RegExp(quote, "g"), "\\" + quote)}${quote}`;
-}
-function convertJsonSchemaToZod3(schema) {
-  if (!schema || typeof schema !== "object") {
-    return "z.any()";
-  }
-  try {
-    return jsonSchemaToZod3(schema);
-  } catch (error) {
-    console.warn("Failed to convert JSON schema to Zod:", error);
-    return "z.any()";
-  }
-}
-function generateStatusComponentDefinition(componentId, componentData, style = DEFAULT_STYLE4) {
-  if (!componentId || typeof componentId !== "string") {
-    throw new Error("componentId is required and must be a string");
+// src/commands/pull-v3/components/external-agent-generator.ts
+function generateExternalAgentDefinition(agentId, agentData, style = DEFAULT_STYLE, registry2) {
+  if (!agentId || typeof agentId !== "string") {
+    throw new Error("agentId is required and must be a string");
   }
-  if (!componentData || typeof componentData !== "object") {
-    throw new Error(`componentData is required for status component '${componentId}'`);
+  if (!agentData || typeof agentData !== "object") {
+    throw new Error(`agentData is required for external agent '${agentId}'`);
   }
-  const requiredFields = ["type"];
+  const requiredFields = ["name", "description", "baseUrl"];
   const missingFields = requiredFields.filter(
-    (field) => !componentData[field] || componentData[field] === null || componentData[field] === void 0
+    (field) => !agentData[field] || agentData[field] === null || agentData[field] === void 0
   );
   if (missingFields.length > 0) {
     throw new Error(
-      `Missing required fields for status component '${componentId}': ${missingFields.join(", ")}`
+      `Missing required fields for external agent '${agentId}': ${missingFields.join(", ")}`
     );
   }
   const { quotes, semicolons, indentation } = style;
   const q = quotes === "single" ? "'" : '"';
   const semi = semicolons ? ";" : "";
-  const componentVarName = toCamelCase4(componentId);
+  let agentVarName = toCamelCase(agentId);
+  if (registry2) {
+    const registryVarName = registry2.getVariableName(agentId, "externalAgent");
+    if (registryVarName) {
+      agentVarName = registryVarName;
+    }
+  }
   const lines = [];
-  lines.push(`export const ${componentVarName} = statusComponent({`);
-  lines.push(`${indentation}type: ${formatString4(componentData.type, q)},`);
-  if (componentData.description) {
-    lines.push(`${indentation}description: ${formatString4(componentData.description, q, true)},`);
+  lines.push(`export const ${agentVarName} = externalAgent({`);
+  lines.push(`${indentation}id: ${formatString(agentId, q)},`);
+  if (agentData.name !== void 0 && agentData.name !== null) {
+    lines.push(`${indentation}name: ${formatString(agentData.name, q)},`);
+  } else {
+    lines.push(`${indentation}name: ${formatString(agentId, q)},`);
   }
-  const schema = componentData.detailsSchema || componentData.schema;
-  if (schema) {
-    const zodSchema = convertJsonSchemaToZod3(schema);
-    if (zodSchema.includes("\n")) {
-      const schemaLines = zodSchema.split("\n");
-      lines.push(`${indentation}detailsSchema: ${schemaLines[0]}`);
-      schemaLines.slice(1, -1).forEach((line) => {
-        lines[lines.length - 1] += "\n" + indentation + line;
-      });
-      lines[lines.length - 1] += "\n" + indentation + schemaLines[schemaLines.length - 1] + ",";
-    } else {
-      lines.push(`${indentation}detailsSchema: ${zodSchema},`);
-    }
+  if (agentData.description !== void 0 && agentData.description !== null) {
+    lines.push(`${indentation}description: ${formatString(agentData.description, q, true)},`);
+  } else {
+    lines.push(`${indentation}description: ${formatString(`External agent ${agentId}`, q)},`);
   }
-  if (lines.length > 0 && lines[lines.length - 1].endsWith(",")) {
-    lines[lines.length - 1] = lines[lines.length - 1].slice(0, -1);
+  if (agentData.baseUrl !== void 0 && agentData.baseUrl !== null) {
+    lines.push(`${indentation}baseUrl: ${formatString(agentData.baseUrl, q)},`);
   }
+  if (agentData.credentialReference) {
+    if (typeof agentData.credentialReference === "string") {
+      if (!registry2) {
+        throw new Error("Registry is required for credentialReference generation");
+      }
+      const credentialVar = registry2.getVariableName(agentData.credentialReference, "credential");
+      if (!credentialVar) {
+        throw new Error(
+          `Failed to resolve variable name for credential reference: ${agentData.credentialReference}`
+        );
+      }
+      lines.push(`${indentation}credentialReference: ${credentialVar},`);
+    } else if (typeof agentData.credentialReference === "object") {
+      const credLines = [];
+      if (agentData.credentialReference.id) {
+        credLines.push(
+          `${indentation}${indentation}id: ${formatString(agentData.credentialReference.id, q)},`
+        );
+      }
+      if (agentData.credentialReference.name) {
+        credLines.push(
+          `${indentation}${indentation}name: ${formatString(agentData.credentialReference.name, q)},`
+        );
+      }
+      if (agentData.credentialReference.description) {
+        credLines.push(
+          `${indentation}${indentation}description: ${formatString(agentData.credentialReference.description, q)},`
+        );
+      }
+      if (credLines.length > 0 && credLines[credLines.length - 1].endsWith(",")) {
+        credLines[credLines.length - 1] = credLines[credLines.length - 1].slice(0, -1);
+      }
+      lines.push(`${indentation}credentialReference: {`);
+      lines.push(...credLines);
+      lines.push(`${indentation}},`);
+    }
+  }
+  removeTrailingComma(lines);
   lines.push(`})${semi}`);
   return lines.join("\n");
 }
-function generateStatusComponentImports(componentId, componentData, style = DEFAULT_STYLE4) {
-  const { quotes, semicolons } = style;
-  const q = quotes === "single" ? "'" : '"';
-  const semi = semicolons ? ";" : "";
+function generateExternalAgentImports(agentId, agentData, style = DEFAULT_STYLE, registry2) {
   const imports = [];
-  imports.push(`import { statusComponent } from ${q}@inkeep/agents-sdk${q}${semi}`);
-  const schema = componentData.detailsSchema || componentData.schema;
-  if (schema) {
-    imports.push(`import { z } from ${q}zod${q}${semi}`);
+  imports.push(generateImport(["externalAgent"], "@inkeep/agents-sdk", style));
+  if (agentData.credentialReference && typeof agentData.credentialReference === "string") {
+    if (!registry2) {
+      throw new Error("Registry is required for credential reference imports");
+    }
+    const currentFilePath = `external-agents/${agentId}.ts`;
+    const credentialRefs = [
+      { id: agentData.credentialReference, type: "credential" }
+    ];
+    const componentImports = registry2.getImportsForFile(currentFilePath, credentialRefs);
+    imports.push(...componentImports);
   }
   return imports;
 }
-function generateStatusComponentFile(componentId, componentData, style = DEFAULT_STYLE4) {
-  const imports = generateStatusComponentImports(componentId, componentData, style);
-  const definition = generateStatusComponentDefinition(componentId, componentData, style);
-  return imports.join("\n") + "\n\n" + definition + "\n";
+function generateExternalAgentFile(agentId, agentData, style = DEFAULT_STYLE, registry2) {
+  const imports = generateExternalAgentImports(agentId, agentData, style, registry2);
+  const definition = generateExternalAgentDefinition(agentId, agentData, style, registry2);
+  return generateFileContent(imports, [definition]);
 }
-var DEFAULT_STYLE4;
-var init_status_component_generator = __esm({
-  "src/commands/pull-v3/components/status-component-generator.ts"() {
+var init_external_agent_generator = __esm({
+  "src/commands/pull-v3/components/external-agent-generator.ts"() {
     "use strict";
     init_esm_shims();
-    DEFAULT_STYLE4 = {
-      quotes: "single",
-      semicolons: true,
-      indentation: "  "
-    };
+    init_generator_utils();
   }
 });
 
@@ -236485,7 +235950,7 @@ import { jsonSchemaToZod as jsonSchemaToZod4 } from "json-schema-to-zod";
 function toCamelCase5(str) {
   return str.toLowerCase().replace(/[-_](.)/g, (_, char) => char.toUpperCase()).replace(/[^a-zA-Z0-9]/g, "").replace(/^[0-9]/, "_$&");
 }
-function formatString5(str, quote = "'", multiline = false) {
+function formatString6(str, quote = "'", multiline = false) {
   if (!str) return `${quote}${quote}`;
   if (multiline && (str.includes("\n") || str.length > 80)) {
     return `\`${str.replace(/`/g, "\\`")}\``;
@@ -236515,7 +235980,7 @@ ${indentation}  ${executeCode.replace(/\n/g, `
 ${indentation}  `)}
 ${indentation}}`;
 }
-function generateFunctionToolDefinition(toolId, toolData, style = DEFAULT_STYLE5) {
+function generateFunctionToolDefinition(toolId, toolData, style = DEFAULT_STYLE6) {
   if (!toolId || typeof toolId !== "string") {
     throw new Error("toolId is required and must be a string");
   }
@@ -236537,9 +236002,9 @@ function generateFunctionToolDefinition(toolId, toolData, style = DEFAULT_STYLE5
   const toolVarName = toCamelCase5(toolId);
   const lines = [];
   lines.push(`export const ${toolVarName} = functionTool({`);
-  lines.push(`${indentation}name: ${formatString5(toolData.name, q)},`);
+  lines.push(`${indentation}name: ${formatString6(toolData.name, q)},`);
   if (toolData.description) {
-    lines.push(`${indentation}description: ${formatString5(toolData.description, q, true)},`);
+    lines.push(`${indentation}description: ${formatString6(toolData.description, q, true)},`);
   }
   const inputSchema = toolData.inputSchema || toolData.schema;
   if (inputSchema) {
@@ -236567,7 +236032,7 @@ function generateFunctionToolDefinition(toolId, toolData, style = DEFAULT_STYLE5
   const result = lines.join("\n");
   return result;
 }
-function generateFunctionToolImports(toolId, toolData, style = DEFAULT_STYLE5) {
+function generateFunctionToolImports(toolId, toolData, style = DEFAULT_STYLE6) {
   const { quotes, semicolons } = style;
   const q = quotes === "single" ? "'" : '"';
   const semi = semicolons ? ";" : "";
@@ -236575,17 +236040,17 @@ function generateFunctionToolImports(toolId, toolData, style = DEFAULT_STYLE5) {
   imports.push(`import { functionTool } from ${q}@inkeep/agents-sdk${q}${semi}`);
   return imports;
 }
-function generateFunctionToolFile(toolId, toolData, style = DEFAULT_STYLE5) {
+function generateFunctionToolFile(toolId, toolData, style = DEFAULT_STYLE6) {
   const imports = generateFunctionToolImports(toolId, toolData, style);
   const definition = generateFunctionToolDefinition(toolId, toolData, style);
   return imports.join("\n") + "\n\n" + definition + "\n";
 }
-var DEFAULT_STYLE5;
+var DEFAULT_STYLE6;
 var init_function_tool_generator = __esm({
   "src/commands/pull-v3/components/function-tool-generator.ts"() {
     "use strict";
     init_esm_shims();
-    DEFAULT_STYLE5 = {
+    DEFAULT_STYLE6 = {
       quotes: "single",
       semicolons: true,
       indentation: "  "
@@ -236597,14 +236062,14 @@ var init_function_tool_generator = __esm({
 function toCamelCase6(str) {
   return str.toLowerCase().replace(/[-_](.)/g, (_, char) => char.toUpperCase()).replace(/[^a-zA-Z0-9]/g, "").replace(/^[0-9]/, "_$&");
 }
-function formatString6(str, quote = "'", multiline = false) {
+function formatString7(str, quote = "'", multiline = false) {
   if (!str) return `${quote}${quote}`;
   if (multiline && (str.includes("\n") || str.length > 80)) {
     return `\`${str.replace(/`/g, "\\`")}\``;
   }
   return `${quote}${str.replace(new RegExp(quote, "g"), "\\" + quote)}${quote}`;
 }
-function generateMcpToolDefinition(toolId, toolData, style = DEFAULT_STYLE6, registry2) {
+function generateMcpToolDefinition(toolId, toolData, style = DEFAULT_STYLE7, registry2) {
   if (!toolId || typeof toolId !== "string") {
     throw new Error("toolId is required and must be a string");
   }
@@ -236630,14 +236095,14 @@ function generateMcpToolDefinition(toolId, toolData, style = DEFAULT_STYLE6, reg
   const toolVarName = toCamelCase6(toolId);
   const lines = [];
   lines.push(`export const ${toolVarName} = mcpTool({`);
-  lines.push(`${indentation}id: ${formatString6(toolId, q)},`);
-  lines.push(`${indentation}name: ${formatString6(toolData.name, q)},`);
-  lines.push(`${indentation}serverUrl: ${formatString6(serverUrl, q)},`);
+  lines.push(`${indentation}id: ${formatString7(toolId, q)},`);
+  lines.push(`${indentation}name: ${formatString7(toolData.name, q)},`);
+  lines.push(`${indentation}serverUrl: ${formatString7(serverUrl, q)},`);
   if (toolData.description) {
-    lines.push(`${indentation}description: ${formatString6(toolData.description, q, true)},`);
+    lines.push(`${indentation}description: ${formatString7(toolData.description, q, true)},`);
   }
   if (toolData.imageUrl) {
-    lines.push(`${indentation}imageUrl: ${formatString6(toolData.imageUrl, q)},`);
+    lines.push(`${indentation}imageUrl: ${formatString7(toolData.imageUrl, q)},`);
   }
   if (toolData.headers && typeof toolData.headers === "object") {
     const headersStr = JSON.stringify(toolData.headers, null, 2);
@@ -236657,7 +236122,7 @@ function generateMcpToolDefinition(toolId, toolData, style = DEFAULT_STYLE6, reg
   } else if (toolData.credentialReferenceId && registry2) {
     const validKey = registry2.getVariableName(toolData.credentialReferenceId, "credential");
     lines.push(
-      `${indentation}credential: envSettings.getEnvironmentCredential(${formatString6(validKey, q)}),`
+      `${indentation}credential: envSettings.getEnvironmentCredential(${formatString7(validKey, q)}),`
     );
   }
   if (lines.length > 0 && lines[lines.length - 1].endsWith(",")) {
@@ -236666,7 +236131,7 @@ function generateMcpToolDefinition(toolId, toolData, style = DEFAULT_STYLE6, reg
   lines.push(`})${semi}`);
   return lines.join("\n");
 }
-function generateMcpToolImports(toolId, toolData, style = DEFAULT_STYLE6) {
+function generateMcpToolImports(toolId, toolData, style = DEFAULT_STYLE7) {
   const { quotes, semicolons } = style;
   const q = quotes === "single" ? "'" : '"';
   const semi = semicolons ? ";" : "";
@@ -236677,17 +236142,17 @@ function generateMcpToolImports(toolId, toolData, style = DEFAULT_STYLE6) {
   }
   return imports;
 }
-function generateMcpToolFile(toolId, toolData, style = DEFAULT_STYLE6, registry2) {
+function generateMcpToolFile(toolId, toolData, style = DEFAULT_STYLE7, registry2) {
   const imports = generateMcpToolImports(toolId, toolData, style);
   const definition = generateMcpToolDefinition(toolId, toolData, style, registry2);
   return imports.join("\n") + "\n\n" + definition + "\n";
 }
-var DEFAULT_STYLE6;
+var DEFAULT_STYLE7;
 var init_mcp_tool_generator = __esm({
   "src/commands/pull-v3/components/mcp-tool-generator.ts"() {
     "use strict";
     init_esm_shims();
-    DEFAULT_STYLE6 = {
+    DEFAULT_STYLE7 = {
       quotes: "single",
       semicolons: true,
       indentation: "  "
@@ -236695,124 +236160,200 @@ var init_mcp_tool_generator = __esm({
   }
 });
 
-// src/commands/pull-v3/components/credential-generator.ts
-function toCamelCase7(str) {
-  return str.toLowerCase().replace(/[-_](.)/g, (_, char) => char.toUpperCase()).replace(/[^a-zA-Z0-9]/g, "").replace(/^[0-9]/, "_$&");
-}
-function formatString7(str, quote = "'", multiline = false) {
-  if (!str) return `${quote}${quote}`;
-  if (multiline && (str.includes("\n") || str.length > 80)) {
-    return `\`${str.replace(/`/g, "\\`")}\``;
+// src/commands/pull-v3/components/project-generator.ts
+function generateProjectDefinition(projectId, projectData, style = DEFAULT_STYLE, registry2) {
+  if (!projectId || typeof projectId !== "string") {
+    throw new Error("projectId is required and must be a string");
   }
-  return `${quote}${str.replace(new RegExp(quote, "g"), "\\" + quote)}${quote}`;
-}
-function formatRetrievalParams(retrievalParams, style, indentLevel) {
-  if (!retrievalParams || typeof retrievalParams !== "object") {
-    return "{}";
+  if (!projectData || typeof projectData !== "object") {
+    throw new Error(`projectData is required for project '${projectId}'`);
   }
-  const { quotes, indentation } = style;
-  const q = quotes === "single" ? "'" : '"';
-  const baseIndent = indentation.repeat(indentLevel);
-  const indent = indentation.repeat(indentLevel + 1);
-  const lines = ["{"];
-  for (const [key, value] of Object.entries(retrievalParams)) {
-    if (typeof value === "string") {
-      lines.push(`${indent}${q}${key}${q}: ${formatString7(value, q)},`);
-    } else if (typeof value === "number" || typeof value === "boolean") {
-      lines.push(`${indent}${q}${key}${q}: ${JSON.stringify(value)},`);
-    } else if (typeof value === "object" && value !== null) {
-      lines.push(
-        `${indent}${q}${key}${q}: ${formatRetrievalParams(value, style, indentLevel + 1)},`
-      );
-    }
+  const requiredFields = ["name", "models"];
+  const missingFields = requiredFields.filter(
+    (field) => !projectData[field] || projectData[field] === null || projectData[field] === void 0
+  );
+  if (!projectData.models?.base) {
+    missingFields.push("models.base");
   }
-  if (lines.length > 1 && lines[lines.length - 1].endsWith(",")) {
-    lines[lines.length - 1] = lines[lines.length - 1].slice(0, -1);
+  if (missingFields.length > 0) {
+    throw new Error(
+      `Missing required fields for project '${projectId}': ${missingFields.join(", ")}`
+    );
   }
-  lines.push(`${baseIndent}}`);
-  return lines.join("\n");
-}
-function generateCredentialDefinition(credentialId, credentialData, style = DEFAULT_STYLE7) {
   const { quotes, semicolons, indentation } = style;
   const q = quotes === "single" ? "'" : '"';
   const semi = semicolons ? ";" : "";
-  const credentialVarName = toCamelCase7(credentialId);
+  const projectVarName = toCamelCase(projectId);
   const lines = [];
-  lines.push(`export const ${credentialVarName} = credential({`);
-  lines.push(`${indentation}id: ${formatString7(credentialId, q)},`);
-  const requiredFields = ["name", "type", "credentialStoreId"];
-  const missingFields = requiredFields.filter(
-    (field) => !credentialData[field] || credentialData[field] === null || credentialData[field] === void 0
-  );
-  if (missingFields.length > 0) {
-    throw new Error(
-      `Missing required fields for credential '${credentialId}': ${missingFields.join(", ")}`
-    );
+  lines.push(`export const ${projectVarName} = project({`);
+  lines.push(`${indentation}id: ${formatString(projectId, q)},`);
+  lines.push(`${indentation}name: ${formatString(projectData.name, q)},`);
+  if (shouldInclude(projectData.description)) {
+    lines.push(`${indentation}description: ${formatString(projectData.description, q, true)},`);
   }
-  lines.push(`${indentation}name: ${formatString7(credentialData.name, q)},`);
-  lines.push(`${indentation}type: ${formatString7(credentialData.type, q)},`);
-  lines.push(
-    `${indentation}credentialStoreId: ${formatString7(credentialData.credentialStoreId, q)},`
-  );
-  if (credentialData.description) {
-    lines.push(`${indentation}description: ${formatString7(credentialData.description, q, true)},`);
+  if (shouldInclude(projectData.models)) {
+    lines.push(`${indentation}models: ${formatObject(projectData.models, style, 2)},`);
   }
-  if (credentialData.retrievalParams) {
-    const formattedParams = formatRetrievalParams(credentialData.retrievalParams, style, 1);
-    if (formattedParams.includes("\n")) {
-      lines.push(`${indentation}retrievalParams: ${formattedParams},`);
-    } else {
-      lines.push(`${indentation}retrievalParams: ${formattedParams},`);
+  if (shouldInclude(projectData.stopWhen)) {
+    lines.push(`${indentation}stopWhen: {`);
+    if (projectData.stopWhen.transferCountIs !== void 0) {
+      lines.push(
+        `${indentation}${indentation}transferCountIs: ${projectData.stopWhen.transferCountIs}, // Max transfers for agents`
+      );
+    }
+    if (projectData.stopWhen.stepCountIs !== void 0) {
+      lines.push(
+        `${indentation}${indentation}stepCountIs: ${projectData.stopWhen.stepCountIs} // Max steps for sub-agents`
+      );
+    }
+    if (lines.length > 1) {
+      const lastLine = lines[lines.length - 1];
+      if (lastLine.includes(",") && (lastLine.includes("//") || lastLine.endsWith(","))) {
+        if (lastLine.includes("//")) {
+          lines[lines.length - 1] = lastLine.replace(", //", " //");
+        } else {
+          lines[lines.length - 1] = lastLine.slice(0, -1);
+        }
+      }
     }
-  } else {
-    const defaultKey = credentialId.toUpperCase().replace(/-/g, "_");
-    lines.push(`${indentation}retrievalParams: {`);
-    lines.push(`${indentation}${indentation}${q}key${q}: ${formatString7(defaultKey, q)}`);
     lines.push(`${indentation}},`);
   }
-  if (lines.length > 0 && lines[lines.length - 1].endsWith(",")) {
-    lines[lines.length - 1] = lines[lines.length - 1].slice(0, -1);
+  if (shouldInclude(projectData.agents)) {
+    const agentsArray = registry2 ? registry2.formatReferencesForCode(projectData.agents, "agent", style, 2) : "[]";
+    lines.push(`${indentation}agents: () => ${agentsArray},`);
+  }
+  if (shouldInclude(projectData.tools)) {
+    const toolsArray = registry2 ? registry2.formatReferencesForCode(projectData.tools, "tool", style, 2) : "[]";
+    lines.push(`${indentation}tools: () => ${toolsArray},`);
+  }
+  if (shouldInclude(projectData.externalAgents)) {
+    const externalAgentsArray = registry2 ? registry2.formatReferencesForCode(projectData.externalAgents, "externalAgent", style, 2) : "[]";
+    lines.push(`${indentation}externalAgents: () => ${externalAgentsArray},`);
+  }
+  if (shouldInclude(projectData.dataComponents)) {
+    const dataComponentsArray = registry2 ? registry2.formatReferencesForCode(projectData.dataComponents, "dataComponent", style, 2) : "[]";
+    lines.push(`${indentation}dataComponents: () => ${dataComponentsArray},`);
+  }
+  if (shouldInclude(projectData.artifactComponents)) {
+    const artifactComponentsArray = registry2 ? registry2.formatReferencesForCode(
+      projectData.artifactComponents,
+      "artifactComponent",
+      style,
+      2
+    ) : "[]";
+    lines.push(`${indentation}artifactComponents: () => ${artifactComponentsArray},`);
+  }
+  if (shouldInclude(projectData.credentialReferences)) {
+    const credentialReferencesArray = registry2 ? registry2.formatReferencesForCode(projectData.credentialReferences, "credential", style, 2) : "[]";
+    lines.push(`${indentation}credentialReferences: () => ${credentialReferencesArray},`);
   }
+  removeTrailingComma(lines);
   lines.push(`})${semi}`);
   return lines.join("\n");
 }
-function generateCredentialImports(credentialId, credentialData, style = DEFAULT_STYLE7) {
-  const { quotes, semicolons } = style;
-  const q = quotes === "single" ? "'" : '"';
-  const semi = semicolons ? ";" : "";
+function generateProjectImports(projectId, projectData, style = DEFAULT_STYLE, registry2) {
   const imports = [];
-  imports.push(`import { credential } from ${q}@inkeep/agents-sdk${q}${semi}`);
+  imports.push(generateImport(["project"], "@inkeep/agents-sdk", style));
+  if (registry2) {
+    const currentFilePath = "index.ts";
+    const referencedComponents = [];
+    if (projectData.agents) {
+      let agentIds = [];
+      if (Array.isArray(projectData.agents)) {
+        agentIds = projectData.agents;
+      } else if (typeof projectData.agents === "object") {
+        agentIds = Object.keys(projectData.agents);
+      }
+      for (const agentId of agentIds) {
+        referencedComponents.push({ id: agentId, type: "agent" });
+      }
+    }
+    if (projectData.tools) {
+      let toolIds = [];
+      if (Array.isArray(projectData.tools)) {
+        toolIds = projectData.tools;
+      } else if (typeof projectData.tools === "object") {
+        toolIds = Object.keys(projectData.tools);
+      }
+      for (const toolId of toolIds) {
+        let componentType = "tool";
+        if (registry2 && registry2.get(toolId, "functionTool")) {
+          componentType = "functionTool";
+        } else if (registry2 && registry2.get(toolId, "tool")) {
+          componentType = "tool";
+        }
+        referencedComponents.push({ id: toolId, type: componentType });
+      }
+    }
+    if (projectData.externalAgents) {
+      let extAgentIds = [];
+      if (Array.isArray(projectData.externalAgents)) {
+        extAgentIds = projectData.externalAgents;
+      } else if (typeof projectData.externalAgents === "object") {
+        extAgentIds = Object.keys(projectData.externalAgents);
+      }
+      for (const extAgentId of extAgentIds) {
+        referencedComponents.push({ id: extAgentId, type: "externalAgent" });
+      }
+    }
+    if (projectData.dataComponents) {
+      let dataCompIds = [];
+      if (Array.isArray(projectData.dataComponents)) {
+        dataCompIds = projectData.dataComponents;
+      } else if (typeof projectData.dataComponents === "object") {
+        dataCompIds = Object.keys(projectData.dataComponents);
+      }
+      for (const dataCompId of dataCompIds) {
+        referencedComponents.push({ id: dataCompId, type: "dataComponent" });
+      }
+    }
+    if (projectData.artifactComponents) {
+      let artifactCompIds = [];
+      if (Array.isArray(projectData.artifactComponents)) {
+        artifactCompIds = projectData.artifactComponents;
+      } else if (typeof projectData.artifactComponents === "object") {
+        artifactCompIds = Object.keys(projectData.artifactComponents);
+      }
+      for (const artifactCompId of artifactCompIds) {
+        referencedComponents.push({ id: artifactCompId, type: "artifactComponent" });
+      }
+    }
+    if (projectData.credentialReferences) {
+      let credIds = [];
+      if (Array.isArray(projectData.credentialReferences)) {
+        credIds = projectData.credentialReferences;
+      } else if (typeof projectData.credentialReferences === "object") {
+        credIds = Object.keys(projectData.credentialReferences);
+      }
+      for (const credId of credIds) {
+        referencedComponents.push({ id: credId, type: "credential" });
+      }
+    }
+    if (referencedComponents.length > 0) {
+      const componentImports = registry2.getImportsForFile(currentFilePath, referencedComponents);
+      imports.push(...componentImports);
+    }
+  }
   return imports;
 }
-function generateCredentialFile(credentialId, credentialData, style = DEFAULT_STYLE7) {
-  const imports = generateCredentialImports(credentialId, credentialData, style);
-  const definition = generateCredentialDefinition(credentialId, credentialData, style);
-  return imports.join("\n") + "\n\n" + definition + "\n";
+function generateProjectFile(projectId, projectData, style = DEFAULT_STYLE, registry2) {
+  const imports = generateProjectImports(projectId, projectData, style, registry2);
+  const definition = generateProjectDefinition(projectId, projectData, style, registry2);
+  return generateFileContent(imports, [definition]);
 }
-var DEFAULT_STYLE7;
-var init_credential_generator = __esm({
-  "src/commands/pull-v3/components/credential-generator.ts"() {
+var init_project_generator = __esm({
+  "src/commands/pull-v3/components/project-generator.ts"() {
     "use strict";
     init_esm_shims();
-    DEFAULT_STYLE7 = {
-      quotes: "single",
-      semicolons: true,
-      indentation: "  "
-    };
+    init_generator_utils();
   }
 });
 
-// src/commands/pull-v3/components/environment-generator.ts
-var environment_generator_exports = {};
-__export(environment_generator_exports, {
-  generateEnvironmentFile: () => generateEnvironmentFile,
-  generateEnvironmentIndexDefinition: () => generateEnvironmentIndexDefinition,
-  generateEnvironmentIndexFile: () => generateEnvironmentIndexFile,
-  generateEnvironmentIndexImports: () => generateEnvironmentIndexImports,
-  generateEnvironmentSettingsDefinition: () => generateEnvironmentSettingsDefinition,
-  generateEnvironmentSettingsFile: () => generateEnvironmentSettingsFile,
-  generateEnvironmentSettingsImports: () => generateEnvironmentSettingsImports
-});
+// src/commands/pull-v3/components/status-component-generator.ts
+import { jsonSchemaToZod as jsonSchemaToZod5 } from "json-schema-to-zod";
+function toCamelCase7(str) {
+  return str.toLowerCase().replace(/[-_](.)/g, (_, char) => char.toUpperCase()).replace(/[^a-zA-Z0-9]/g, "").replace(/^[0-9]/, "_$&");
+}
 function formatString8(str, quote = "'", multiline = false) {
   if (!str) return `${quote}${quote}`;
   if (multiline && (str.includes("\n") || str.length > 80)) {
@@ -236820,188 +236361,83 @@ function formatString8(str, quote = "'", multiline = false) {
   }
   return `${quote}${str.replace(new RegExp(quote, "g"), "\\" + quote)}${quote}`;
 }
-function formatCredentialsObject(credentials, style, indentLevel) {
-  if (!credentials || typeof credentials !== "object") {
-    return "{}";
-  }
-  const { quotes, indentation } = style;
-  const q = quotes === "single" ? "'" : '"';
-  const baseIndent = indentation.repeat(indentLevel);
-  const indent = indentation.repeat(indentLevel + 1);
-  const nestedIndent = indentation.repeat(indentLevel + 2);
-  const lines = ["{"];
-  for (const [key, credentialData] of Object.entries(credentials)) {
-    lines.push(`${indent}${formatString8(key, q)}: {`);
-    if (credentialData.id) {
-      lines.push(`${nestedIndent}id: ${formatString8(credentialData.id, q)},`);
-    }
-    if (credentialData.name) {
-      lines.push(`${nestedIndent}name: ${formatString8(credentialData.name, q)},`);
-    }
-    if (credentialData.type) {
-      if (typeof credentialData.type === "string") {
-        const enumValue = credentialData.type === "memory" ? "CredentialStoreType.memory" : credentialData.type === "env" ? "CredentialStoreType.env" : credentialData.type === "keychain" ? "CredentialStoreType.keychain" : formatString8(credentialData.type, q);
-        lines.push(`${nestedIndent}type: ${enumValue},`);
-      } else {
-        lines.push(`${nestedIndent}type: ${credentialData.type},`);
-      }
-    }
-    if (credentialData.credentialStoreId) {
-      lines.push(
-        `${nestedIndent}credentialStoreId: ${formatString8(credentialData.credentialStoreId, q)},`
-      );
-    }
-    if (credentialData.description) {
-      lines.push(`${nestedIndent}description: ${formatString8(credentialData.description, q)},`);
-    }
-    if (credentialData.retrievalParams) {
-      lines.push(`${nestedIndent}retrievalParams: {`);
-      for (const [paramKey, paramValue] of Object.entries(credentialData.retrievalParams)) {
-        if (paramValue === null || paramValue === void 0) {
-          continue;
-        }
-        if (typeof paramValue === "string") {
-          lines.push(`${nestedIndent}${indent}${paramKey}: ${formatString8(paramValue, q)},`);
-        } else {
-          lines.push(`${nestedIndent}${indent}${paramKey}: ${JSON.stringify(paramValue)},`);
-        }
-      }
-      const lastLineIndex = lines.length - 1;
-      if (lines[lastLineIndex].endsWith(",")) {
-        lines[lastLineIndex] = lines[lastLineIndex].slice(0, -1);
-      }
-      lines.push(`${nestedIndent}},`);
-    }
-    const lastPropIndex = lines.length - 1;
-    if (lines[lastPropIndex].endsWith(",")) {
-      lines[lastPropIndex] = lines[lastPropIndex].slice(0, -1);
-    }
-    lines.push(`${indent}},`);
+function convertJsonSchemaToZod3(schema) {
+  if (!schema || typeof schema !== "object") {
+    return "z.any()";
   }
-  if (lines.length > 1 && lines[lines.length - 1].endsWith(",")) {
-    lines[lines.length - 1] = lines[lines.length - 1].slice(0, -1);
+  try {
+    return jsonSchemaToZod5(schema);
+  } catch (error) {
+    console.warn("Failed to convert JSON schema to Zod:", error);
+    return "z.any()";
   }
-  lines.push(`${baseIndent}}`);
-  return lines.join("\n");
 }
-function generateEnvironmentSettingsDefinition(environmentName, environmentData, style = DEFAULT_STYLE8) {
-  if (!environmentName || typeof environmentName !== "string") {
-    throw new Error("environmentName is required and must be a string");
-  }
-  if (!environmentData || typeof environmentData !== "object") {
-    throw new Error(`environmentData is required for environment '${environmentName}'`);
+function generateStatusComponentDefinition(componentId, componentData, style = DEFAULT_STYLE8) {
+  if (!componentId || typeof componentId !== "string") {
+    throw new Error("componentId is required and must be a string");
   }
-  const { quotes, semicolons, indentation } = style;
-  const q = quotes === "single" ? "'" : '"';
-  const semi = semicolons ? ";" : "";
-  const lines = [];
-  lines.push(`export const ${environmentName} = registerEnvironmentSettings({`);
-  if (environmentData.credentials && Object.keys(environmentData.credentials).length > 0) {
-    const formattedCredentials = formatCredentialsObject(environmentData.credentials, style, 1);
-    lines.push(`${indentation}credentials: ${formattedCredentials},`);
-  } else {
-    lines.push(`${indentation}credentials: {},`);
+  if (!componentData || typeof componentData !== "object") {
+    throw new Error(`componentData is required for status component '${componentId}'`);
   }
-  if (lines.length > 1 && lines[lines.length - 1].endsWith(",")) {
-    lines[lines.length - 1] = lines[lines.length - 1].slice(0, -1);
+  const requiredFields = ["type"];
+  const missingFields = requiredFields.filter(
+    (field) => !componentData[field] || componentData[field] === null || componentData[field] === void 0
+  );
+  if (missingFields.length > 0) {
+    throw new Error(
+      `Missing required fields for status component '${componentId}': ${missingFields.join(", ")}`
+    );
   }
-  lines.push(`})${semi}`);
-  return lines.join("\n");
-}
-function generateEnvironmentIndexDefinition(environments, style = DEFAULT_STYLE8) {
   const { quotes, semicolons, indentation } = style;
   const q = quotes === "single" ? "'" : '"';
   const semi = semicolons ? ";" : "";
+  const componentVarName = toCamelCase7(componentId);
   const lines = [];
-  lines.push(`export const envSettings = createEnvironmentSettings({`);
-  for (const envName of environments) {
-    lines.push(`${indentation}${envName},`);
+  lines.push(`export const ${componentVarName} = statusComponent({`);
+  lines.push(`${indentation}type: ${formatString8(componentData.type, q)},`);
+  if (componentData.description) {
+    lines.push(`${indentation}description: ${formatString8(componentData.description, q, true)},`);
   }
-  if (lines.length > 1 && lines[lines.length - 1].endsWith(",")) {
+  const schema = componentData.detailsSchema || componentData.schema;
+  if (schema) {
+    const zodSchema = convertJsonSchemaToZod3(schema);
+    if (zodSchema.includes("\n")) {
+      const schemaLines = zodSchema.split("\n");
+      lines.push(`${indentation}detailsSchema: ${schemaLines[0]}`);
+      schemaLines.slice(1, -1).forEach((line) => {
+        lines[lines.length - 1] += "\n" + indentation + line;
+      });
+      lines[lines.length - 1] += "\n" + indentation + schemaLines[schemaLines.length - 1] + ",";
+    } else {
+      lines.push(`${indentation}detailsSchema: ${zodSchema},`);
+    }
+  }
+  if (lines.length > 0 && lines[lines.length - 1].endsWith(",")) {
     lines[lines.length - 1] = lines[lines.length - 1].slice(0, -1);
   }
   lines.push(`})${semi}`);
   return lines.join("\n");
 }
-function generateEnvironmentSettingsImports(environmentName, environmentData, style = DEFAULT_STYLE8) {
-  const { quotes, semicolons } = style;
-  const q = quotes === "single" ? "'" : '"';
-  const semi = semicolons ? ";" : "";
-  const imports = [];
-  imports.push(`import { registerEnvironmentSettings } from ${q}@inkeep/agents-sdk${q}${semi}`);
-  const needsCredentialStoreType = environmentData.credentials && Object.values(environmentData.credentials).some(
-    (cred) => typeof cred.type === "string" && ["memory", "env", "keychain"].includes(cred.type)
-  );
-  if (needsCredentialStoreType) {
-    imports.push(`import { CredentialStoreType } from ${q}@inkeep/agents-core${q}${semi}`);
-  }
-  return imports;
-}
-function generateEnvironmentIndexImports(environments, style = DEFAULT_STYLE8) {
+function generateStatusComponentImports(componentId, componentData, style = DEFAULT_STYLE8) {
   const { quotes, semicolons } = style;
   const q = quotes === "single" ? "'" : '"';
   const semi = semicolons ? ";" : "";
   const imports = [];
-  imports.push(`import { createEnvironmentSettings } from ${q}@inkeep/agents-sdk${q}${semi}`);
-  for (const envName of environments) {
-    imports.push(`import { ${envName} } from ${q}./${envName}.env${q}${semi}`);
+  imports.push(`import { statusComponent } from ${q}@inkeep/agents-sdk${q}${semi}`);
+  const schema = componentData.detailsSchema || componentData.schema;
+  if (schema) {
+    imports.push(`import { z } from ${q}zod${q}${semi}`);
   }
   return imports;
 }
-function generateEnvironmentSettingsFile(environmentName, environmentData, style = DEFAULT_STYLE8) {
-  const imports = generateEnvironmentSettingsImports(environmentName, environmentData, style);
-  const definition = generateEnvironmentSettingsDefinition(environmentName, environmentData, style);
-  return imports.join("\n") + "\n\n" + definition + "\n";
-}
-function generateEnvironmentIndexFile(environments, style = DEFAULT_STYLE8) {
-  const imports = generateEnvironmentIndexImports(environments, style);
-  const definition = generateEnvironmentIndexDefinition(environments, style);
+function generateStatusComponentFile(componentId, componentData, style = DEFAULT_STYLE8) {
+  const imports = generateStatusComponentImports(componentId, componentData, style);
+  const definition = generateStatusComponentDefinition(componentId, componentData, style);
   return imports.join("\n") + "\n\n" + definition + "\n";
 }
-function generateEnvironmentFile(environmentName, environmentData, style = DEFAULT_STYLE8, registry2) {
-  if (registry2 && environmentData.credentials && Array.isArray(environmentData.credentials)) {
-    const { quotes, semicolons, indentation } = style;
-    const q = quotes === "single" ? "'" : '"';
-    const semi = semicolons ? ";" : "";
-    const imports = [];
-    const credentialRefs = [];
-    imports.push(`import { registerEnvironmentSettings } from ${q}@inkeep/agents-sdk${q}${semi}`);
-    for (const credentialId of environmentData.credentials) {
-      const credentialComponent = registry2.get(credentialId, "credential");
-      if (credentialComponent) {
-        const relativePath = `../credentials/${credentialId}`;
-        imports.push(`import { ${credentialComponent.name} } from ${q}${relativePath}${q}${semi}`);
-        credentialRefs.push(credentialComponent.name);
-      }
-    }
-    const lines = [];
-    lines.push(...imports);
-    lines.push("");
-    lines.push(`export const ${environmentName} = registerEnvironmentSettings({`);
-    if (credentialRefs.length > 0) {
-      lines.push(`${indentation}credentials: {`);
-      for (let i = 0; i < environmentData.credentials.length; i++) {
-        const credentialId = environmentData.credentials[i];
-        const credentialVarName = credentialRefs[i];
-        const isLast = i === credentialRefs.length - 1;
-        const validKey = registry2.getVariableName(credentialId, "credential");
-        lines.push(
-          `${indentation}${indentation}${validKey}: ${credentialVarName}${isLast ? "" : ","}`
-        );
-      }
-      lines.push(`${indentation}}`);
-    } else {
-      lines.push(`${indentation}credentials: {}`);
-    }
-    lines.push(`})${semi}`);
-    lines.push("");
-    return lines.join("\n");
-  }
-  return generateEnvironmentSettingsFile(environmentName, environmentData, style);
-}
 var DEFAULT_STYLE8;
-var init_environment_generator = __esm({
-  "src/commands/pull-v3/components/environment-generator.ts"() {
+var init_status_component_generator = __esm({
+  "src/commands/pull-v3/components/status-component-generator.ts"() {
     "use strict";
     init_esm_shims();
     DEFAULT_STYLE8 = {
@@ -237012,245 +236448,809 @@ var init_environment_generator = __esm({
   }
 });
 
-// src/commands/pull-v3/components/context-config-generator.ts
-import { jsonSchemaToZod as jsonSchemaToZod5 } from "json-schema-to-zod";
-function processFetchConfigTemplates(fetchConfig, headersVarName) {
-  const processValue = (value) => {
-    if (typeof value === "string") {
-      if (hasTemplateVariables(value)) {
-        const convertedStr = value.replace(
-          /\{\{headers\.([^}]+)\}\}/g,
-          `\${${headersVarName}.toTemplate("$1")}`
-        );
-        return `\`${convertedStr.replace(/`/g, "\\`")}\``;
-      } else {
-        return `'${value.replace(/'/g, "\\'")}'`;
-      }
-    } else if (typeof value === "object" && value !== null) {
-      return processObject(value);
-    } else {
-      return JSON.stringify(value);
+// src/commands/pull-v3/components/sub-agent-generator.ts
+function hasDistinctModels2(subAgentModels, parentModels) {
+  if (!subAgentModels) return false;
+  if (!parentModels) return !!subAgentModels;
+  const modelTypes = ["base", "structuredOutput", "summarizer"];
+  for (const type of modelTypes) {
+    const subAgentModel = subAgentModels[type]?.model;
+    const parentModel = parentModels[type]?.model;
+    if (subAgentModel !== parentModel) {
+      return true;
     }
-  };
-  const processObject = (obj) => {
-    if (Array.isArray(obj)) {
-      const items = obj.map((item) => processValue(item)).join(", ");
-      return `[${items}]`;
+    if (subAgentModel && parentModel) {
+      const subAgentOptions = subAgentModels[type]?.providerOptions;
+      const parentOptions = parentModels[type]?.providerOptions;
+      if (subAgentOptions !== parentOptions) {
+        if (!subAgentOptions && !parentOptions) {
+          continue;
+        }
+        if (!subAgentOptions || !parentOptions) {
+          return true;
+        }
+        if (JSON.stringify(subAgentOptions) !== JSON.stringify(parentOptions)) {
+          return true;
+        }
+      }
     }
-    const entries = Object.entries(obj).map(([key, val]) => {
-      const processedKey = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(key) ? key : `'${key}'`;
-      return `${processedKey}: ${processValue(val)}`;
-    });
-    return `{
-    ${entries.join(",\n    ")}
-  }`;
-  };
-  return processObject(fetchConfig);
-}
-function generateHeadersDefinition(headersId, headersData, style = DEFAULT_STYLE) {
-  const { quotes, semicolons, indentation } = style;
-  const q = quotes === "single" ? "'" : '"';
-  const semi = semicolons ? ";" : "";
-  const headersVarName = toCamelCase(headersId);
-  const lines = [];
-  lines.push(`const ${headersVarName} = headers({`);
-  if (headersData.schema) {
-    const zodSchema = jsonSchemaToZod5(headersData.schema, { module: "none" });
-    lines.push(`${indentation}schema: ${zodSchema},`);
   }
-  removeTrailingComma(lines);
-  lines.push(`})${semi}`);
-  return lines.join("\n");
+  return false;
 }
-function generateFetchDefinitionDefinition(fetchId, fetchData, style = DEFAULT_STYLE, headersVarName) {
-  const { quotes, semicolons, indentation } = style;
-  const q = quotes === "single" ? "'" : '"';
-  const semi = semicolons ? ";" : "";
-  const fetchVarName = toCamelCase(fetchId);
-  const lines = [];
-  lines.push(`const ${fetchVarName} = fetchDefinition({`);
-  lines.push(`${indentation}id: ${formatString(fetchData.id || fetchId, q)},`);
-  if (fetchData.name) {
-    lines.push(`${indentation}name: ${formatString(fetchData.name, q)},`);
+function generateSubAgentDefinition(agentId, agentData, style = DEFAULT_STYLE, registry2, parentAgentId, contextConfigData, parentModels) {
+  if (!agentId || typeof agentId !== "string") {
+    throw new Error("agentId is required and must be a string");
   }
-  if (fetchData.trigger) {
-    lines.push(`${indentation}trigger: ${formatString(fetchData.trigger, q)},`);
+  if (!agentData || typeof agentData !== "object") {
+    throw new Error(`agentData is required for sub-agent '${agentId}'`);
   }
-  if (fetchData.fetchConfig) {
-    const processedFetchConfig = processFetchConfigTemplates(
-      fetchData.fetchConfig,
-      headersVarName || "headers"
+  const requiredFields = ["name", "description", "prompt"];
+  const missingFields = requiredFields.filter(
+    (field) => !agentData[field] || agentData[field] === null || agentData[field] === void 0
+  );
+  if (missingFields.length > 0) {
+    throw new Error(
+      `Missing required fields for sub-agent '${agentId}': ${missingFields.join(", ")}`
     );
-    lines.push(`${indentation}fetchConfig: ${processedFetchConfig},`);
   }
-  if (fetchData.responseSchema) {
-    const zodSchema = jsonSchemaToZod5(fetchData.responseSchema, { module: "none" });
-    lines.push(`${indentation}responseSchema: ${zodSchema},`);
+  const { quotes, semicolons, indentation } = style;
+  const q = quotes === "single" ? "'" : '"';
+  const semi = semicolons ? ";" : "";
+  let agentVarName = toCamelCase(agentId);
+  if (registry2) {
+    const registryVarName = registry2.getVariableName(agentId, "subAgent");
+    if (registryVarName) {
+      agentVarName = registryVarName;
+    }
   }
-  if (fetchData.defaultValue) {
-    if (typeof fetchData.defaultValue === "string") {
-      lines.push(`${indentation}defaultValue: ${formatString(fetchData.defaultValue, q)},`);
+  const lines = [];
+  lines.push(`export const ${agentVarName} = subAgent({`);
+  lines.push(`${indentation}id: ${formatString(agentId, q)},`);
+  lines.push(`${indentation}name: ${formatString(agentData.name, q)},`);
+  lines.push(`${indentation}description: ${formatString(agentData.description, q, true)},`);
+  if (agentData.prompt !== void 0 && agentData.prompt !== null) {
+    if (hasTemplateVariables(agentData.prompt) && parentAgentId && registry2 && contextConfigData) {
+      const contextVarName = registry2.getVariableName(contextConfigData.id, "contextConfig");
+      if (!contextVarName) {
+        throw new Error(
+          `Failed to resolve context config variable name for: ${contextConfigData.id}`
+        );
+      }
+      const headersVarName = "headersSchema";
+      lines.push(
+        `${indentation}prompt: ${formatPromptWithContext(agentData.prompt, contextVarName, headersVarName, contextConfigData, q, true)},`
+      );
     } else {
-      lines.push(`${indentation}defaultValue: ${JSON.stringify(fetchData.defaultValue)},`);
+      lines.push(`${indentation}prompt: ${formatString(agentData.prompt, q, true)},`);
     }
   }
-  removeTrailingComma(lines);
-  lines.push(`})${semi}`);
-  return lines.join("\n");
-}
-function generateContextConfigDefinition(contextId, contextData, style = DEFAULT_STYLE, registry2, agentId, headersVarName) {
-  if (!contextId || typeof contextId !== "string") {
-    throw new Error("contextId is required and must be a string");
+  if (agentData.models && hasDistinctModels2(agentData.models, parentModels)) {
+    lines.push(`${indentation}models: {`);
+    if (agentData.models.base?.model) {
+      lines.push(`${indentation}${indentation}base: {`);
+      lines.push(
+        `${indentation}${indentation}${indentation}model: ${formatString(agentData.models.base.model, q)}`
+      );
+      if (agentData.models.base.providerOptions) {
+        lines.push(`${indentation}${indentation}${indentation},`);
+        lines.push(
+          `${indentation}${indentation}${indentation}providerOptions: ${JSON.stringify(agentData.models.base.providerOptions)}`
+        );
+      }
+      lines.push(`${indentation}${indentation}},`);
+    }
+    if (agentData.models.structuredOutput?.model) {
+      lines.push(`${indentation}${indentation}structuredOutput: {`);
+      lines.push(
+        `${indentation}${indentation}${indentation}model: ${formatString(agentData.models.structuredOutput.model, q)}`
+      );
+      if (agentData.models.structuredOutput.providerOptions) {
+        lines.push(`${indentation}${indentation}${indentation},`);
+        lines.push(
+          `${indentation}${indentation}${indentation}providerOptions: ${JSON.stringify(agentData.models.structuredOutput.providerOptions)}`
+        );
+      }
+      lines.push(`${indentation}${indentation}},`);
+    }
+    if (agentData.models.summarizer?.model) {
+      lines.push(`${indentation}${indentation}summarizer: {`);
+      lines.push(
+        `${indentation}${indentation}${indentation}model: ${formatString(agentData.models.summarizer.model, q)}`
+      );
+      if (agentData.models.summarizer.providerOptions) {
+        lines.push(`${indentation}${indentation}${indentation},`);
+        lines.push(
+          `${indentation}${indentation}${indentation}providerOptions: ${JSON.stringify(agentData.models.summarizer.providerOptions)}`
+        );
+      }
+      lines.push(`${indentation}${indentation}},`);
+    }
+    removeTrailingComma(lines);
+    lines.push(`${indentation}},`);
   }
-  if (!contextData || typeof contextData !== "object") {
-    throw new Error(`contextData is required for context config '${contextId}'`);
+  if (agentData.canUse && Array.isArray(agentData.canUse) && agentData.canUse.length > 0) {
+    const toolReferences = [];
+    if (!registry2) {
+      throw new Error("Registry is required for canUse generation");
+    }
+    for (const toolRelation of agentData.canUse) {
+      const toolId = toolRelation.toolId;
+      let toolVarName = registry2.getVariableName(toolId, "tool");
+      if (!toolVarName) {
+        toolVarName = registry2.getVariableName(toolId, "functionTool");
+      }
+      if (!toolVarName) {
+        throw new Error(
+          `Failed to resolve variable name for tool: ${toolId} (tried both 'tool' and 'functionTool' types)`
+        );
+      }
+      const hasToolSelection = toolRelation.toolSelection && toolRelation.toolSelection.length > 0;
+      const hasHeaders = toolRelation.headers && Object.keys(toolRelation.headers).length > 0;
+      if (hasToolSelection || hasHeaders) {
+        const configLines = [];
+        if (hasToolSelection) {
+          const selectedToolsStr = JSON.stringify(toolRelation.toolSelection);
+          configLines.push(`selectedTools: ${selectedToolsStr}`);
+        }
+        if (hasHeaders) {
+          const headersStr = JSON.stringify(toolRelation.headers);
+          configLines.push(`headers: ${headersStr}`);
+        }
+        const configStr = configLines.join(", ");
+        const finalRef = `${toolVarName}.with({ ${configStr} })`;
+        toolReferences.push(finalRef);
+      } else {
+        toolReferences.push(toolVarName);
+      }
+    }
+    const { indentation: indent } = style;
+    const nestedIndent = indent.repeat(2);
+    if (toolReferences.length === 1) {
+      lines.push(`${indentation}canUse: () => [${toolReferences[0]}],`);
+    } else {
+      lines.push(`${indentation}canUse: () => [`);
+      toolReferences.forEach((ref, index2) => {
+        const isLast = index2 === toolReferences.length - 1;
+        lines.push(`${indentation}${nestedIndent}${ref}${isLast ? "" : ","}`);
+      });
+      lines.push(`${indentation}],`);
+    }
   }
-  const { quotes, semicolons, indentation } = style;
-  const q = quotes === "single" ? "'" : '"';
-  const semi = semicolons ? ";" : "";
-  const contextVarName = (() => {
+  if (agentData.canDelegateTo && Array.isArray(agentData.canDelegateTo) && agentData.canDelegateTo.length > 0) {
     if (!registry2) {
-      throw new Error("Registry is required for context config variable name generation");
+      throw new Error("Registry is required for canDelegateTo generation");
     }
-    const varName = registry2.getVariableName(contextId, "contextConfig");
-    if (!varName) {
-      throw new Error(`Failed to resolve variable name for context config: ${contextId}`);
+    const delegateReferences = [];
+    for (const delegateRelation of agentData.canDelegateTo) {
+      let targetAgentId;
+      let targetType;
+      let hasHeaders = false;
+      if (typeof delegateRelation === "string") {
+        targetAgentId = delegateRelation;
+        targetType = "subAgent";
+        hasHeaders = false;
+      } else if (delegateRelation && typeof delegateRelation === "object") {
+        hasHeaders = delegateRelation.headers && Object.keys(delegateRelation.headers).length > 0;
+        if (delegateRelation.externalAgentId) {
+          targetAgentId = delegateRelation.externalAgentId;
+          targetType = "externalAgent";
+        } else if (delegateRelation.agentId) {
+          targetAgentId = delegateRelation.agentId;
+          targetType = "agent";
+        } else if (delegateRelation.subAgentId) {
+          targetAgentId = delegateRelation.subAgentId;
+          targetType = "subAgent";
+        } else {
+          throw new Error(
+            `Delegate relation missing agentId, subAgentId, or externalAgentId: ${JSON.stringify(delegateRelation)}`
+          );
+        }
+      } else {
+        throw new Error(`Invalid delegate relation format: ${JSON.stringify(delegateRelation)}`);
+      }
+      if (!targetAgentId) {
+        throw new Error(
+          `Failed to extract target agent ID from delegate relation: ${JSON.stringify(delegateRelation)}`
+        );
+      }
+      const agentVarName2 = registry2.getVariableName(targetAgentId, targetType);
+      if (!agentVarName2) {
+        throw new Error(
+          `Failed to resolve variable name for delegate ${targetType}: ${targetAgentId}`
+        );
+      }
+      if (hasHeaders) {
+        const headersStr = JSON.stringify(delegateRelation.headers);
+        const finalRef = `${agentVarName2}.with({ headers: ${headersStr} })`;
+        delegateReferences.push(finalRef);
+      } else {
+        delegateReferences.push(agentVarName2);
+      }
+    }
+    const { indentation: indent } = style;
+    const nestedIndent = indent.repeat(2);
+    if (delegateReferences.length === 1) {
+      lines.push(`${indentation}canDelegateTo: () => [${delegateReferences[0]}],`);
+    } else {
+      lines.push(`${indentation}canDelegateTo: () => [`);
+      delegateReferences.forEach((ref, index2) => {
+        const isLast = index2 === delegateReferences.length - 1;
+        lines.push(`${indentation}${nestedIndent}${ref}${isLast ? "" : ","}`);
+      });
+      lines.push(`${indentation}],`);
     }
-    return varName;
-  })();
-  const lines = [];
-  lines.push(`const ${contextVarName} = contextConfig({`);
-  if (contextData.id) {
-    lines.push(`${indentation}id: ${formatString(contextData.id, q)},`);
   }
-  if (headersVarName) {
-    lines.push(`${indentation}headers: ${headersVarName},`);
-  } else if (contextData.headers) {
-    lines.push(`${indentation}headers: ${contextData.headers},`);
+  if (agentData.canTransferTo && Array.isArray(agentData.canTransferTo) && agentData.canTransferTo.length > 0) {
+    if (!registry2) {
+      throw new Error("Registry is required for canTransferTo generation");
+    }
+    const transferArray = registry2.formatReferencesForCode(
+      agentData.canTransferTo,
+      "subAgent",
+      style,
+      2
+    );
+    if (!transferArray) {
+      throw new Error(
+        `Failed to resolve variable names for canTransferTo agents: ${agentData.canTransferTo.join(", ")}`
+      );
+    }
+    lines.push(`${indentation}canTransferTo: () => ${transferArray},`);
   }
-  if (contextData.contextVariables) {
-    const contextVarLines = [`${indentation}contextVariables: {`];
-    for (const [varName, varData] of Object.entries(contextData.contextVariables)) {
-      if (typeof varData === "string") {
-        contextVarLines.push(`${indentation}  ${varName}: ${varData},`);
-      } else if (varData && typeof varData === "object" && (varData.fetchConfig || varData.responseSchema)) {
-        contextVarLines.push(`${indentation}  ${varName},`);
-      }
+  if (agentData.dataComponents && Array.isArray(agentData.dataComponents) && agentData.dataComponents.length > 0) {
+    if (!registry2) {
+      throw new Error("Registry is required for dataComponents generation");
     }
-    if (contextVarLines[contextVarLines.length - 1].endsWith(",")) {
-      contextVarLines[contextVarLines.length - 1] = contextVarLines[contextVarLines.length - 1].slice(0, -1);
+    const dataComponentsArray = registry2.formatReferencesForCode(
+      agentData.dataComponents,
+      "dataComponent",
+      style,
+      2
+    );
+    if (!dataComponentsArray) {
+      throw new Error(
+        `Failed to resolve variable names for data components: ${agentData.dataComponents.join(", ")}`
+      );
     }
-    contextVarLines.push(`${indentation}},`);
-    lines.push(...contextVarLines);
+    lines.push(`${indentation}dataComponents: () => ${dataComponentsArray},`);
+  }
+  if (agentData.artifactComponents && Array.isArray(agentData.artifactComponents) && agentData.artifactComponents.length > 0) {
+    if (!registry2) {
+      throw new Error("Registry is required for artifactComponents generation");
+    }
+    const artifactComponentsArray = registry2.formatReferencesForCode(
+      agentData.artifactComponents,
+      "artifactComponent",
+      style,
+      2
+    );
+    if (!artifactComponentsArray) {
+      throw new Error(
+        `Failed to resolve variable names for artifact components: ${agentData.artifactComponents.join(", ")}`
+      );
+    }
+    lines.push(`${indentation}artifactComponents: () => ${artifactComponentsArray},`);
+  }
+  if (agentData.stopWhen && agentData.stopWhen.stepCountIs !== void 0) {
+    lines.push(`${indentation}stopWhen: {`);
+    lines.push(
+      `${indentation}${indentation}stepCountIs: ${agentData.stopWhen.stepCountIs} // Max tool calls + LLM responses`
+    );
+    lines.push(`${indentation}},`);
   }
   removeTrailingComma(lines);
   lines.push(`})${semi}`);
   return lines.join("\n");
 }
-function generateContextConfigImports(contextId, contextData, style = DEFAULT_STYLE) {
+function generateSubAgentImports(agentId, agentData, style = DEFAULT_STYLE, registry2, parentAgentId, contextConfigData) {
   const imports = [];
-  const coreImports = [];
-  if (contextData.headers || hasHeadersInData(contextData)) {
-    coreImports.push("headers");
-  }
-  if (contextData.contextVariables && hasFetchDefinitionsInData(contextData)) {
-    coreImports.push("fetchDefinition");
-  }
-  coreImports.push("contextConfig");
-  if (coreImports.length > 0) {
-    imports.push(generateImport(coreImports, "@inkeep/agents-core", style));
+  imports.push(generateImport(["subAgent"], "@inkeep/agents-sdk", style));
+  if (hasTemplateVariables(agentData.prompt) && parentAgentId && registry2 && contextConfigData) {
+    const contextConfigId = contextConfigData.id;
+    const currentFilePath = `agents/sub-agents/${agentId}.ts`;
+    const importStatement = registry2.getImportStatement(
+      currentFilePath,
+      contextConfigId,
+      "contextConfig"
+    );
+    if (importStatement) {
+      imports.push(importStatement);
+    }
   }
-  if (hasSchemas(contextData)) {
-    imports.push(generateImport(["z"], "zod", style));
+  if (registry2) {
+    const currentFilePath = `agents/sub-agents/${agentId}.ts`;
+    const referencedComponents = [];
+    if (Array.isArray(agentData.canUse)) {
+      for (const toolRelation of agentData.canUse) {
+        const toolId = toolRelation.toolId;
+        if (toolId) {
+          let componentType = "tool";
+          if (registry2.get(toolId, "functionTool")) {
+            componentType = "functionTool";
+          } else if (registry2.get(toolId, "tool")) {
+            componentType = "tool";
+          }
+          referencedComponents.push({ id: toolId, type: componentType });
+        }
+      }
+    }
+    if (Array.isArray(agentData.canDelegateTo)) {
+      for (const delegateRelation of agentData.canDelegateTo) {
+        let targetId;
+        let targetType = "agent";
+        if (delegateRelation && typeof delegateRelation === "object") {
+          if (delegateRelation.externalAgentId) {
+            targetId = delegateRelation.externalAgentId;
+            targetType = "externalAgent";
+          } else if (delegateRelation.agentId) {
+            targetId = delegateRelation.agentId;
+            targetType = "agent";
+          } else if (delegateRelation.subAgentId) {
+            targetId = delegateRelation.subAgentId;
+            targetType = "subAgent";
+          }
+        }
+        if (targetId) {
+          referencedComponents.push({ id: targetId, type: targetType });
+        }
+      }
+    }
+    if (Array.isArray(agentData.canTransferTo)) {
+      for (const transferId of agentData.canTransferTo) {
+        if (typeof transferId === "string") {
+          referencedComponents.push({ id: transferId, type: "subAgent" });
+        }
+      }
+    }
+    if (Array.isArray(agentData.dataComponents)) {
+      for (const dataCompId of agentData.dataComponents) {
+        if (typeof dataCompId === "string") {
+          referencedComponents.push({ id: dataCompId, type: "dataComponent" });
+        }
+      }
+    }
+    if (Array.isArray(agentData.artifactComponents)) {
+      for (const artifactCompId of agentData.artifactComponents) {
+        if (typeof artifactCompId === "string") {
+          referencedComponents.push({ id: artifactCompId, type: "artifactComponent" });
+        }
+      }
+    }
+    if (referencedComponents.length > 0) {
+      const componentImports = registry2.getImportsForFile(currentFilePath, referencedComponents);
+      imports.push(...componentImports);
+    }
   }
   return imports;
 }
-function hasHeadersInData(contextData) {
-  return !!contextData.headers || JSON.stringify(contextData).includes("headers");
-}
-function hasFetchDefinitionsInData(contextData) {
-  return JSON.stringify(contextData).includes("fetchDefinition") || contextData.contextVariables && Object.values(contextData.contextVariables).some(
-    (v) => v && typeof v === "object" && (v.fetchConfig || v.responseSchema)
+function generateSubAgentFile(agentId, agentData, style = DEFAULT_STYLE, registry2, parentAgentId, contextConfigData, parentModels) {
+  const imports = generateSubAgentImports(
+    agentId,
+    agentData,
+    style,
+    registry2,
+    parentAgentId,
+    contextConfigData
   );
+  const definition = generateSubAgentDefinition(
+    agentId,
+    agentData,
+    style,
+    registry2,
+    parentAgentId,
+    contextConfigData,
+    parentModels
+  );
+  return generateFileContent(imports, [definition]);
 }
-function hasSchemas(contextData) {
-  const dataStr = JSON.stringify(contextData).toLowerCase();
-  return dataStr.includes("schema") || dataStr.includes("responseschema");
-}
-function generateContextConfigFile(contextId, contextData, style = DEFAULT_STYLE, registry2, agentId) {
-  const imports = generateContextConfigImports(contextId, contextData, style);
-  const definitions = [];
-  let headersVarName;
-  if (contextData.headersSchema) {
-    if (typeof contextData.headers === "string") {
-      headersVarName = contextData.headers;
-    } else {
-      headersVarName = `${toCamelCase(contextId)}Headers`;
+var init_sub_agent_generator = __esm({
+  "src/commands/pull-v3/components/sub-agent-generator.ts"() {
+    "use strict";
+    init_esm_shims();
+    init_generator_utils();
+  }
+});
+
+// src/commands/pull-v3/utils/component-registry.ts
+function registerAllComponents(project, registry2) {
+  registry2.register(project.id, "project", "index.ts");
+  if (project.credentialReferences) {
+    for (const credId of Object.keys(project.credentialReferences)) {
+      registry2.register(credId, "credential", `credentials/${credId}.ts`);
     }
-    const headersDefinition = generateHeadersDefinition(
-      headersVarName || "headers",
-      { schema: contextData.headersSchema },
-      style
-    );
-    definitions.push(headersDefinition);
   }
-  if (contextData.contextVariables) {
-    for (const [varName, varData] of Object.entries(contextData.contextVariables)) {
-      if (varData && typeof varData === "object" && (varData.fetchConfig || varData.responseSchema)) {
-        const fetchDefinition2 = generateFetchDefinitionDefinition(
-          varName,
-          varData,
-          style,
-          headersVarName
-        );
-        definitions.push(fetchDefinition2);
+  if (project.tools) {
+    for (const toolId of Object.keys(project.tools)) {
+      registry2.register(toolId, "tool", `tools/${toolId}.ts`);
+    }
+  }
+  const processedFunctionIds = /* @__PURE__ */ new Set();
+  if (project.functions) {
+    for (const funcId of Object.keys(project.functions)) {
+      registry2.register(funcId, "functionTool", `tools/functions/${funcId}.ts`);
+      processedFunctionIds.add(funcId);
+    }
+  }
+  if (project.functionTools) {
+    for (const funcToolId of Object.keys(project.functionTools)) {
+      if (!processedFunctionIds.has(funcToolId)) {
+        registry2.register(funcToolId, "functionTool", `tools/functions/${funcToolId}.ts`);
       }
     }
   }
-  const contextDefinition = generateContextConfigDefinition(
-    contextId,
-    contextData,
-    style,
-    registry2,
-    agentId,
-    headersVarName
-  );
-  definitions.push(contextDefinition);
-  const contextVarName = (() => {
-    if (!registry2) {
-      throw new Error("Registry is required for context config variable name generation");
+  if (project.dataComponents) {
+    for (const componentId of Object.keys(project.dataComponents)) {
+      registry2.register(componentId, "dataComponent", `data-components/${componentId}.ts`);
     }
-    const varName = registry2.getVariableName(contextId, "contextConfig");
-    if (!varName) {
-      throw new Error(`Failed to resolve variable name for context config: ${contextId}`);
+  }
+  if (project.artifactComponents) {
+    for (const componentId of Object.keys(project.artifactComponents)) {
+      registry2.register(componentId, "artifactComponent", `artifact-components/${componentId}.ts`);
     }
-    return varName;
-  })();
-  const exports = [contextVarName];
-  if (headersVarName) {
-    exports.push(headersVarName);
   }
-  if (contextData.contextVariables) {
-    for (const [varName, varData] of Object.entries(contextData.contextVariables)) {
-      if (varData && typeof varData === "object" && (varData.fetchConfig || varData.responseSchema)) {
-        exports.push(varName);
+  if (project.externalAgents) {
+    for (const extAgentId of Object.keys(project.externalAgents)) {
+      registry2.register(extAgentId, "externalAgent", `external-agents/${extAgentId}.ts`);
+    }
+  }
+  const statusComponents = extractStatusComponents(project);
+  for (const statusId of Object.keys(statusComponents)) {
+    registry2.register(statusId, "statusComponent", `status-components/${statusId}.ts`);
+  }
+  if (project.agents) {
+    for (const agentId of Object.keys(project.agents)) {
+      registry2.register(agentId, "agent", `agents/${agentId}.ts`);
+    }
+  }
+  const subAgents2 = extractSubAgents(project);
+  for (const subAgentId of Object.keys(subAgents2)) {
+    registry2.register(subAgentId, "subAgent", `agents/sub-agents/${subAgentId}.ts`);
+  }
+  const contextConfigs2 = extractContextConfigs(project);
+  for (const contextId of Object.keys(contextConfigs2)) {
+    registry2.register(contextId, "contextConfig", `context-configs/${contextId}.ts`);
+  }
+}
+function extractStatusComponents(project) {
+  const statusComponents = {};
+  if (project.agents) {
+    for (const [agentId, agentData] of Object.entries(project.agents)) {
+      if (agentData.statusUpdates && agentData.statusUpdates.statusComponents) {
+        for (const statusComp of agentData.statusUpdates.statusComponents) {
+          let statusId;
+          if (typeof statusComp === "string") {
+            statusId = statusComp;
+          } else if (typeof statusComp === "object" && statusComp) {
+            statusId = statusComp.type;
+          } else {
+            continue;
+          }
+          if (statusId && !statusComponents[statusId]) {
+            statusComponents[statusId] = {
+              // Include any other properties from the actual data first
+              ...statusComp,
+              id: statusId,
+              type: statusComp.type || statusId,
+              description: statusComp.description || `Status component for ${statusId}`,
+              detailsSchema: statusComp.detailsSchema
+            };
+          }
+        }
       }
     }
   }
-  definitions.push(`export { ${exports.join(", ")} };`);
-  return generateFileContent(imports, definitions);
+  return statusComponents;
 }
-var init_context_config_generator = __esm({
-  "src/commands/pull-v3/components/context-config-generator.ts"() {
+function extractSubAgents(project) {
+  const subAgents2 = {};
+  if (project.agents) {
+    for (const [agentId, agentData] of Object.entries(project.agents)) {
+      if (agentData.subAgents) {
+        for (const [subAgentId, subAgentData] of Object.entries(agentData.subAgents)) {
+          subAgents2[subAgentId] = subAgentData;
+        }
+      }
+    }
+  }
+  return subAgents2;
+}
+function extractContextConfigs(project) {
+  const contextConfigs2 = {};
+  if (project.agents) {
+    for (const [agentId, agentData] of Object.entries(project.agents)) {
+      if (agentData.contextConfig) {
+        const contextConfigId = agentData.contextConfig.id;
+        if (contextConfigId) {
+          contextConfigs2[contextConfigId] = agentData.contextConfig;
+        } else {
+          console.warn(`contextConfig for agent ${agentId} is missing required 'id' field`);
+        }
+      }
+    }
+  }
+  return contextConfigs2;
+}
+function findSubAgentWithParent(project, subAgentId) {
+  if (project.agents) {
+    for (const [agentId, agentData] of Object.entries(project.agents)) {
+      if (agentData.subAgents && agentData.subAgents[subAgentId]) {
+        const contextConfigData = agentData.contextConfig?.id ? agentData.contextConfig : void 0;
+        return {
+          subAgentData: agentData.subAgents[subAgentId],
+          parentAgentId: agentId,
+          contextConfigData
+        };
+      }
+    }
+  }
+  return void 0;
+}
+var ComponentRegistry;
+var init_component_registry = __esm({
+  "src/commands/pull-v3/utils/component-registry.ts"() {
     "use strict";
     init_esm_shims();
-    init_generator_utils();
+    ComponentRegistry = class {
+      components = /* @__PURE__ */ new Map();
+      componentsByTypeAndId = /* @__PURE__ */ new Map();
+      // Type-aware lookup
+      usedNames = /* @__PURE__ */ new Set();
+      // Global name registry for uniqueness
+      /**
+       * Register a component with both unique name and file path
+       */
+      register(id, type, filePath, exportName, isInline = false) {
+        const typeKey = `${type}:${id}`;
+        const existing = this.componentsByTypeAndId.get(typeKey);
+        if (existing) {
+          return existing;
+        }
+        let name;
+        let actualExportName;
+        if (exportName) {
+          name = exportName;
+          actualExportName = exportName;
+        } else {
+          const baseName = this.toCamelCase(id);
+          const uniqueName = this.ensureUniqueName(baseName, type);
+          name = uniqueName;
+          actualExportName = uniqueName;
+        }
+        const info = {
+          id,
+          name,
+          type,
+          filePath,
+          exportName: actualExportName,
+          isInline
+        };
+        this.components.set(id, info);
+        this.componentsByTypeAndId.set(typeKey, info);
+        this.usedNames.add(name);
+        if (actualExportName && actualExportName !== name) {
+          this.usedNames.add(actualExportName);
+        }
+        return info;
+      }
+      /**
+       * Get component info by ID and type
+       */
+      get(id, type) {
+        const typeKey = `${type}:${id}`;
+        return this.componentsByTypeAndId.get(typeKey);
+      }
+      /**
+       * Get component info by variable name (since variable names are globally unique)
+       */
+      getByVariableName(variableName) {
+        for (const component of this.componentsByTypeAndId.values()) {
+          if (component.name === variableName) {
+            return component;
+          }
+        }
+        return void 0;
+      }
+      /**
+       * Get unique variable name for a component by ID and type
+       */
+      getVariableName(id, type) {
+        const typeKey = `${type}:${id}`;
+        const result = this.componentsByTypeAndId.get(typeKey)?.name;
+        return result;
+      }
+      /**
+       * Get import statement for a component
+       */
+      getImportStatement(fromFilePath, componentId, componentType) {
+        const component = this.get(componentId, componentType);
+        if (!component) return void 0;
+        const relativePath = this.calculateRelativeImport(fromFilePath, component.filePath);
+        const importStmt = `import { ${component.exportName} } from '${relativePath}';`;
+        return importStmt;
+      }
+      /**
+       * Format an array of references for code generation
+       */
+      formatReferencesForCode(references, componentType, style, indentLevel) {
+        if (!Array.isArray(references) || references.length === 0) {
+          return "[]";
+        }
+        const variableNames = [];
+        for (const ref of references) {
+          const id = this.extractIdFromReference(ref);
+          if (id) {
+            const component = this.get(id, componentType);
+            if (component) {
+              variableNames.push(component.name);
+            } else {
+              console.warn(`ComponentRegistry: Component not found: ${id} (type: ${componentType})`);
+              variableNames.push(this.toCamelCase(id));
+            }
+          }
+        }
+        if (variableNames.length === 0) {
+          return "[]";
+        }
+        if (variableNames.length === 1) {
+          return `[${variableNames[0]}]`;
+        }
+        const { indentation } = style;
+        const indent = indentation.repeat(indentLevel);
+        const lines = ["["];
+        for (let i = 0; i < variableNames.length; i++) {
+          const isLast = i === variableNames.length - 1;
+          lines.push(`${indent}${variableNames[i]}${isLast ? "" : ","}`);
+        }
+        lines.push(`${indentation.repeat(indentLevel - 1)}]`);
+        return lines.join("\n");
+      }
+      /**
+       * Get all import statements needed for a file
+       */
+      getImportsForFile(fromFilePath, referencedComponents) {
+        const imports = [];
+        const seenImports = /* @__PURE__ */ new Set();
+        for (const { id, type } of referencedComponents) {
+          const importStatement = this.getImportStatement(fromFilePath, id, type);
+          if (importStatement && !seenImports.has(importStatement)) {
+            imports.push(importStatement);
+            seenImports.add(importStatement);
+          }
+        }
+        return imports;
+      }
+      /**
+       * Get all component IDs referenced in arrays for import generation
+       */
+      getReferencedComponentIds(referenceArrays) {
+        const componentIds = [];
+        for (const refArray of referenceArrays) {
+          if (Array.isArray(refArray)) {
+            for (const ref of refArray) {
+              const id = this.extractIdFromReference(ref);
+              if (id) {
+                componentIds.push(id);
+              }
+            }
+          }
+        }
+        return componentIds;
+      }
+      /**
+       * Extract ID from a reference (string or object) based on component type
+       */
+      extractIdFromReference(ref) {
+        if (typeof ref === "string") {
+          return ref;
+        } else if (typeof ref === "object" && ref) {
+          if (ref.toolId) return ref.toolId;
+          if (ref.agentId) return ref.agentId;
+          if (ref.externalAgentId) return ref.externalAgentId;
+          if (ref.credentialStoreId) return ref.credentialStoreId;
+          if (ref.type && !ref.agentId && !ref.toolId && !ref.externalAgentId) return ref.type;
+          if (ref.id) return ref.id;
+          if (ref.name) return ref.name;
+          console.warn("ComponentRegistry: Reference without recognized ID field:", ref);
+          return null;
+        }
+        return null;
+      }
+      /**
+       * Convert string to camelCase and ensure it's a valid JavaScript identifier
+       */
+      toCamelCase(str) {
+        return str.toLowerCase().replace(/[-_](.)/g, (_, char) => char.toUpperCase()).replace(/[^a-zA-Z0-9]/g, "").replace(/^[0-9]/, "_$&");
+      }
+      /**
+       * Ensure a name is unique by adding prefixes/suffixes if needed
+       */
+      ensureUniqueName(baseName, type) {
+        let uniqueName = baseName;
+        let counter = 1;
+        while (this.usedNames.has(uniqueName)) {
+          if (counter === 1) {
+            const typePrefix = this.getTypePrefix(type);
+            uniqueName = `${typePrefix}${baseName.charAt(0).toUpperCase() + baseName.slice(1)}`;
+          } else {
+            uniqueName = `${baseName}${counter}`;
+          }
+          counter++;
+          if (counter > 100) {
+            uniqueName = `${baseName}_${Date.now()}`;
+            break;
+          }
+        }
+        return uniqueName;
+      }
+      /**
+       * Get type prefix for uniqueness resolution
+       */
+      getTypePrefix(type) {
+        switch (type) {
+          case "agent":
+            return "agent";
+          case "subAgent":
+            return "sub";
+          case "externalAgent":
+            return "ext";
+          case "tool":
+            return "tool";
+          case "functionTool":
+            return "func";
+          case "dataComponent":
+            return "data";
+          case "artifactComponent":
+            return "artifact";
+          case "credential":
+            return "cred";
+          case "statusComponent":
+            return "status";
+          case "contextConfig":
+            return "context";
+          case "project":
+            return "project";
+          default:
+            return "comp";
+        }
+      }
+      /**
+       * Calculate relative import path between files
+       */
+      calculateRelativeImport(fromPath, toPath) {
+        const fromParts = fromPath.replace(".ts", "").split("/");
+        const toParts = toPath.replace(".ts", "").split("/");
+        fromParts.pop();
+        let relativePath = "";
+        for (let i = 0; i < fromParts.length; i++) {
+          relativePath += "../";
+        }
+        relativePath += toParts.join("/");
+        if (relativePath.startsWith("../")) {
+          return relativePath;
+        } else {
+          return "./" + relativePath;
+        }
+      }
+      /**
+       * Get all components for debugging
+       */
+      getAllComponents() {
+        return Array.from(this.components.values());
+      }
+      /**
+       * Clear all components (for testing)
+       */
+      clear() {
+        this.components.clear();
+        this.usedNames.clear();
+      }
+    };
   }
 });
 
 // src/commands/pull-v3/introspect-generator.ts
-import { writeFileSync as writeFileSync3, mkdirSync } from "fs";
-import { join as join6, dirname as dirname5 } from "path";
+import { mkdirSync, writeFileSync as writeFileSync3 } from "fs";
+import { dirname as dirname5, join as join6 } from "path";
 import chalk8 from "chalk";
 function ensureDir(filePath) {
   const dir = dirname5(filePath);
@@ -237489,20 +237489,20 @@ var init_introspect_generator = __esm({
   "src/commands/pull-v3/introspect-generator.ts"() {
     "use strict";
     init_esm_shims();
-    init_component_registry();
-    init_generator_utils();
-    init_project_generator();
     init_agent_generator();
-    init_sub_agent_generator();
-    init_external_agent_generator();
-    init_data_component_generator();
     init_artifact_component_generator();
-    init_status_component_generator();
-    init_function_tool_generator();
-    init_mcp_tool_generator();
+    init_context_config_generator();
     init_credential_generator();
+    init_data_component_generator();
     init_environment_generator();
-    init_context_config_generator();
+    init_external_agent_generator();
+    init_function_tool_generator();
+    init_mcp_tool_generator();
+    init_project_generator();
+    init_status_component_generator();
+    init_sub_agent_generator();
+    init_component_registry();
+    init_generator_utils();
   }
 });
 
@@ -238493,8 +238493,8 @@ __export(component_parser_exports, {
   findComponentById: () => findComponentById,
   getAllLocalComponentIds: () => getAllLocalComponentIds
 });
-import { existsSync as existsSync7, readFileSync as readFileSync3, readdirSync as readdirSync2, statSync } from "fs";
-import { join as join8, extname as extname2, relative } from "path";
+import { existsSync as existsSync7, readdirSync as readdirSync2, readFileSync as readFileSync3, statSync } from "fs";
+import { extname as extname2, join as join8, relative } from "path";
 function parseFileForComponents(filePath, projectRoot, debug = false) {
   if (!existsSync7(filePath)) {
     return [];
@@ -238858,6 +238858,281 @@ var init_component_parser = __esm({
   }
 });
 
+// src/commands/pull-v3/targeted-typescript-placeholders.ts
+import { randomBytes as randomBytes2 } from "crypto";
+function generatePlaceholderId() {
+  return randomBytes2(4).toString("hex").toUpperCase();
+}
+function createTargetedTypeScriptPlaceholders(content, debug = false) {
+  const replacements = {};
+  let processedContent = content;
+  let replacedFields = 0;
+  const originalSize = content.length;
+  const promptRegex = /(\s+prompt:\s*)((['"`])([^]*?)\3)/g;
+  processedContent = processedContent.replace(promptRegex, (match2, prefix, fullValue) => {
+    if (fullValue.length >= MIN_REPLACEMENT_LENGTH) {
+      const placeholder = `<PROMPT_${generatePlaceholderId()}>`;
+      replacements[placeholder] = fullValue;
+      replacedFields++;
+      return `${prefix}${placeholder}`;
+    }
+    return match2;
+  });
+  const descriptionRegex = /(\s+description:\s*)((['"`])([^]*?)\3)/g;
+  processedContent = processedContent.replace(descriptionRegex, (match2, prefix, fullValue) => {
+    if (fullValue.length >= MIN_REPLACEMENT_LENGTH) {
+      const placeholder = `<DESC_${generatePlaceholderId()}>`;
+      replacements[placeholder] = fullValue;
+      replacedFields++;
+      return `${prefix}${placeholder}`;
+    }
+    return match2;
+  });
+  const inputSchemaRegex = /(\s+inputSchema:\s*)(\{[^{}]*(?:\{[^{}]*\}[^{}]*)*\})/g;
+  processedContent = processedContent.replace(inputSchemaRegex, (match2, prefix, schemaObject) => {
+    if (schemaObject.length >= MIN_REPLACEMENT_LENGTH) {
+      const placeholder = `<INPUT_SCHEMA_${generatePlaceholderId()}>`;
+      replacements[placeholder] = schemaObject;
+      replacedFields++;
+      return `${prefix}${placeholder}`;
+    }
+    return match2;
+  });
+  const detailsSchemaRegex = /(\s+detailsSchema:\s*)(z\.object\(\{[^]*?\}\)(?:\.[^,}\s]+)*)/g;
+  processedContent = processedContent.replace(detailsSchemaRegex, (match2, prefix, schemaObject) => {
+    if (schemaObject.length >= MIN_REPLACEMENT_LENGTH) {
+      const placeholder = `<DETAILS_SCHEMA_${generatePlaceholderId()}>`;
+      replacements[placeholder] = schemaObject;
+      replacedFields++;
+      return `${prefix}${placeholder}`;
+    }
+    return match2;
+  });
+  const propsRegex = /(\s+props:\s*)(z\.object\(\{[^]*?\}\)(?:\.[^,}\s]+)*)/g;
+  processedContent = processedContent.replace(propsRegex, (match2, prefix, propsObject) => {
+    if (propsObject.length >= MIN_REPLACEMENT_LENGTH) {
+      const placeholder = `<PROPS_${generatePlaceholderId()}>`;
+      replacements[placeholder] = propsObject;
+      replacedFields++;
+      return `${prefix}${placeholder}`;
+    }
+    return match2;
+  });
+  const processedSize = processedContent.length;
+  const savings = originalSize - processedSize;
+  const savingsPercentage = originalSize > 0 ? savings / originalSize * 100 : 0;
+  return {
+    processedContent,
+    replacements,
+    stats: {
+      originalSize,
+      processedSize,
+      savings,
+      savingsPercentage,
+      replacedFields
+    }
+  };
+}
+function restoreTargetedTypeScriptPlaceholders(content, replacements) {
+  let restoredContent = content;
+  const sortedPlaceholders = Object.keys(replacements).sort((a, b) => b.length - a.length);
+  for (const placeholder of sortedPlaceholders) {
+    const originalValue = replacements[placeholder];
+    restoredContent = restoredContent.replace(placeholder, originalValue);
+  }
+  return restoredContent;
+}
+var MIN_REPLACEMENT_LENGTH;
+var init_targeted_typescript_placeholders = __esm({
+  "src/commands/pull-v3/targeted-typescript-placeholders.ts"() {
+    "use strict";
+    init_esm_shims();
+    MIN_REPLACEMENT_LENGTH = 10;
+  }
+});
+
+// src/commands/pull-v3/utils/model-provider-detector.ts
+import { anthropic } from "@ai-sdk/anthropic";
+import { google } from "@ai-sdk/google";
+import { openai } from "@ai-sdk/openai";
+function getAvailableModel() {
+  for (const config of PROVIDER_CONFIGS) {
+    const hasKey = config.envVars.some((envVar) => {
+      const value = process.env[envVar];
+      return value && value.trim() !== "";
+    });
+    if (hasKey) {
+      switch (config.name) {
+        case "anthropic":
+          return anthropic(config.model);
+        case "openai":
+          return openai(config.model);
+        case "google":
+          return google(config.model);
+        default:
+          throw new Error(`Unknown provider: ${config.name}`);
+      }
+    }
+  }
+  throw new Error(
+    "No API keys detected. Please set ANTHROPIC_API_KEY, OPENAI_API_KEY, or GOOGLE_API_KEY"
+  );
+}
+var PROVIDER_CONFIGS;
+var init_model_provider_detector = __esm({
+  "src/commands/pull-v3/utils/model-provider-detector.ts"() {
+    "use strict";
+    init_esm_shims();
+    PROVIDER_CONFIGS = [
+      {
+        name: "anthropic",
+        envVars: ["ANTHROPIC_API_KEY"],
+        model: "claude-sonnet-4-5"
+      },
+      {
+        name: "openai",
+        envVars: ["OPENAI_API_KEY"],
+        model: "gpt-4.1"
+      },
+      {
+        name: "google",
+        envVars: ["GOOGLE_API_KEY", "GOOGLE_GENERATIVE_AI_API_KEY"],
+        model: "gemini-2.5-flash"
+      }
+    ];
+  }
+});
+
+// src/commands/pull-v3/llm-content-merger.ts
+import { generateText } from "ai";
+import chalk10 from "chalk";
+function stripCodeFences(content) {
+  content = content.replace(/^```(?:typescript|ts|javascript|js)?\s*\n?/i, "");
+  content = content.replace(/\n?```\s*$/i, "");
+  return content;
+}
+function estimateTokens(text3) {
+  return Math.ceil(text3.length / 4);
+}
+function calculateCostEstimate(promptTokens, completionTokens) {
+  const promptCost = promptTokens / 1e6 * 3;
+  const completionCost = completionTokens / 1e6 * 15;
+  return promptCost + completionCost;
+}
+async function mergeComponentsWithLLM(request) {
+  const { oldContent, newContent, modifiedComponents, filePath } = request;
+  const componentList = modifiedComponents.map((c) => `- ${c.componentType}:${c.componentId}`).join("\n");
+  const prompt = `You are a TypeScript code expert tasked with intelligently merging component updates.
+
+## Task
+Merge the OLD file content with NEW component definitions, preserving the original file structure while updating only the modified components.
+
+## Modified Components to Update
+${componentList}
+
+## Instructions
+0. **Please ensure you focus changes to minimize git diff size.** We want a clean git history.
+1. **Preserve original structure**: Keep imports, exports, comments, and overall file organization
+2. **Update only modified components**: Replace the specified components with their new versions
+3. **Maintain code style**: Match the original formatting, indentation, and style
+4. **Improve schemas**: Use better zod schemas from the new content where applicable. E.g. if the new content uses something like z.union([z.null(), z.string()]), use z.string().nullable() instead. 
+5. **Keep variable names**: Preserve original variable names and declarations
+6. **Preserve non-component code**: Keep any non-component logic, comments, or utilities
+7. **Please leave all imports at the top of the file.** Don't use .js imports, use .ts imports instead. (import example from './example')
+8. **Format JavaScript functions for maximum readability**:
+   - When you see compressed/minified function code like \`async({params})=>{...code...}\`, expand and prettify it
+   - Add proper line breaks, spacing, and indentation to make the function readable
+   - Ensure all braces \`{}\`, parentheses \`()\`, and syntax are properly balanced and valid
+   - Format the function code following TypeScript/JavaScript best practices
+   - Make sure the final code is compilable and syntactically correct
+   - Example: \`async({a,b})=>{return a+b}\` should become:
+     \`\`\`
+     async ({ a, b }) => {
+       return a + b;
+     }
+     \`\`\`
+
+## OLD Content:
+\`\`\`typescript
+${oldContent}
+\`\`\`
+
+## NEW Component Definitions:
+\`\`\`typescript
+${newContent}
+\`\`\`
+
+## Output
+Provide the merged TypeScript file that:
+- Keeps the original file structure
+- Updates ONLY the modified components listed above
+- Maintains consistent code style
+- Uses improved schemas where beneficial
+- Preserves all imports, exports, and other code
+- **Formats all function code beautifully with proper spacing, line breaks, and indentation**
+- **Ensures all syntax is valid and compilable TypeScript/JavaScript**
+- Start the code immidiately with the first line of the file, skip any backticks or other formatting announcing that it is a code block or typescript file.
+- Please follow biomes.dev code style.
+
+Return only the merged TypeScript code without any explanation or markdown formatting.`;
+  try {
+    const oldPlaceholders = createTargetedTypeScriptPlaceholders(oldContent);
+    const newPlaceholders = createTargetedTypeScriptPlaceholders(newContent);
+    const processedPrompt = prompt.replace(oldContent, oldPlaceholders.processedContent).replace(newContent, newPlaceholders.processedContent);
+    const estimatedPromptTokens = estimateTokens(processedPrompt);
+    const result = await generateText({
+      model: getAvailableModel(),
+      prompt: processedPrompt
+    });
+    let mergedContent = result.text.trim();
+    mergedContent = stripCodeFences(mergedContent);
+    const estimatedCompletionTokens = estimateTokens(mergedContent);
+    const totalTokens = estimatedPromptTokens + estimatedCompletionTokens;
+    const estimatedCost = calculateCostEstimate(estimatedPromptTokens, estimatedCompletionTokens);
+    console.log(
+      chalk10.gray(
+        `   \u{1F4B0} LLM usage: ~${totalTokens.toLocaleString()} tokens ($${estimatedCost.toFixed(4)})`
+      )
+    );
+    const allReplacements = {
+      ...oldPlaceholders.replacements,
+      ...newPlaceholders.replacements
+    };
+    if (Object.keys(allReplacements).length > 0) {
+      mergedContent = restoreTargetedTypeScriptPlaceholders(mergedContent, allReplacements);
+    }
+    const changes = modifiedComponents.map((c) => `Updated ${c.componentType}:${c.componentId}`);
+    return {
+      mergedContent,
+      changes,
+      success: true,
+      usage: {
+        promptTokens: estimatedPromptTokens,
+        completionTokens: estimatedCompletionTokens,
+        totalTokens,
+        estimatedCost
+      }
+    };
+  } catch (error) {
+    const errorMsg = error instanceof Error ? error.message : String(error);
+    return {
+      mergedContent: oldContent,
+      // Fallback to original
+      changes: [],
+      success: false,
+      error: errorMsg
+    };
+  }
+}
+var init_llm_content_merger = __esm({
+  "src/commands/pull-v3/llm-content-merger.ts"() {
+    "use strict";
+    init_esm_shims();
+    init_targeted_typescript_placeholders();
+    init_model_provider_detector();
+  }
+});
+
 // src/commands/pull-v3/project-validator.ts
 var project_validator_exports = {};
 __export(project_validator_exports, {
@@ -238875,7 +239150,7 @@ import {
   writeFileSync as writeFileSync4
 } from "fs";
 import { basename as basename2, dirname as dirname6, join as join9 } from "path";
-import chalk10 from "chalk";
+import chalk11 from "chalk";
 function getComponentFromProject(project, componentType, componentId) {
   switch (componentType) {
     case "credentials":
@@ -238922,18 +239197,18 @@ async function validateProjectEquivalence(tempDir, remoteProject) {
     if (!hasChanges) {
       return true;
     } else {
-      console.log(chalk10.yellow(`      \u{1F504} Found differences:`));
+      console.log(chalk11.yellow(`      \u{1F504} Found differences:`));
       for (const [componentType, changes] of Object.entries(comparison.componentChanges)) {
         const totalChanges = changes.added.length + changes.modified.length + changes.deleted.length;
         if (totalChanges > 0) {
-          console.log(chalk10.cyan(`         ${componentType}: ${totalChanges} changes`));
+          console.log(chalk11.cyan(`         ${componentType}: ${totalChanges} changes`));
           if (changes.added.length > 0) {
-            console.log(chalk10.green(`           \u2795 Added: ${changes.added.join(", ")}`));
+            console.log(chalk11.green(`           \u2795 Added: ${changes.added.join(", ")}`));
           }
           if (changes.modified.length > 0) {
-            console.log(chalk10.yellow(`           \u{1F4DD} Modified: ${changes.modified.join(", ")}`));
+            console.log(chalk11.yellow(`           \u{1F4DD} Modified: ${changes.modified.join(", ")}`));
             for (const modifiedId of changes.modified) {
-              console.log(chalk10.gray(`              ${modifiedId} detailed differences:`));
+              console.log(chalk11.gray(`              ${modifiedId} detailed differences:`));
               const generatedComponent = getComponentFromProject(
                 tempProjectDefinition,
                 componentType,
@@ -238945,15 +239220,15 @@ async function validateProjectEquivalence(tempDir, remoteProject) {
                 modifiedId
               );
               console.log(
-                chalk10.gray(`Generated Component: ${JSON.stringify(generatedComponent, null, 2)}`)
+                chalk11.gray(`Generated Component: ${JSON.stringify(generatedComponent, null, 2)}`)
               );
               console.log(
-                chalk10.gray(`Remote Component: ${JSON.stringify(remoteComponent, null, 2)}`)
+                chalk11.gray(`Remote Component: ${JSON.stringify(remoteComponent, null, 2)}`)
               );
             }
           }
           if (changes.deleted.length > 0) {
-            console.log(chalk10.red(`           \u2796 Deleted: ${changes.deleted.join(", ")}`));
+            console.log(chalk11.red(`           \u2796 Deleted: ${changes.deleted.join(", ")}`));
           }
         }
       }
@@ -238961,7 +239236,7 @@ async function validateProjectEquivalence(tempDir, remoteProject) {
     }
   } catch (error) {
     const errorMsg = error instanceof Error ? error.message : String(error);
-    console.log(chalk10.red(`   \u274C Project validation failed: ${errorMsg}`));
+    console.log(chalk11.red(`   \u274C Project validation failed: ${errorMsg}`));
     return false;
   }
 }
@@ -238971,14 +239246,14 @@ async function validateTempDirectory(originalProjectRoot, tempDirName, remotePro
   const equivalenceSuccess = await validateProjectEquivalence(tempDir, remoteProject);
   if (equivalenceSuccess) {
     console.log(
-      chalk10.yellow(`
+      chalk11.yellow(`
 \u2753 Would you like to overwrite your project files with the generated files?`)
     );
     console.log(
-      chalk10.gray(`   This will replace your current files with the validated generated ones.`)
+      chalk11.gray(`   This will replace your current files with the validated generated ones.`)
     );
-    console.log(chalk10.green(`   [Y] Yes - Replace files and clean up temp directory`));
-    console.log(chalk10.red(`   [N] No - Keep temp directory for manual review`));
+    console.log(chalk11.green(`   [Y] Yes - Replace files and clean up temp directory`));
+    console.log(chalk11.red(`   [N] No - Keep temp directory for manual review`));
     return new Promise((resolve5) => {
       process.stdin.removeAllListeners("data");
       process.stdin.setMaxListeners(15);
@@ -238991,53 +239266,53 @@ async function validateTempDirectory(originalProjectRoot, tempDirName, remotePro
         process.stdin.removeAllListeners("data");
         const normalizedKey = key.toLowerCase();
         if (normalizedKey === "y") {
-          console.log(chalk10.green(`
+          console.log(chalk11.green(`
 \u2705 Selected: Yes - Replacing files...`));
           overwriteProjectFiles(originalProjectRoot, tempDirName, tempDir);
-          console.log(chalk10.green(`
+          console.log(chalk11.green(`
 \u{1F389} Pull completed successfully!`));
           process.exit(0);
         } else if (normalizedKey === "n") {
-          console.log(chalk10.yellow(`
+          console.log(chalk11.yellow(`
 \u274C Selected: No - Files not replaced`));
-          console.log(chalk10.gray(`\u{1F4C2} Generated files remain in: ${tempDirName}`));
-          console.log(chalk10.gray(`   You can manually review and copy files as needed.`));
-          console.log(chalk10.cyan(`
+          console.log(chalk11.gray(`\u{1F4C2} Generated files remain in: ${tempDirName}`));
+          console.log(chalk11.gray(`   You can manually review and copy files as needed.`));
+          console.log(chalk11.cyan(`
 \u2705 Pull completed - temp directory preserved for review.`));
           process.exit(0);
         } else {
-          console.log(chalk10.red(`
+          console.log(chalk11.red(`
 \u274C Invalid key: "${key}". Please press Y or N.`));
           console.log(
-            chalk10.gray(`\u{1F4C2} Files not replaced. Generated files remain in: ${tempDirName}`)
+            chalk11.gray(`\u{1F4C2} Files not replaced. Generated files remain in: ${tempDirName}`)
           );
           console.log(
-            chalk10.yellow(`
+            chalk11.yellow(`
 \u26A0\uFE0F Pull completed with invalid input - temp directory preserved.`)
           );
           process.exit(0);
         }
       };
       process.stdin.on("data", onKeypress);
-      process.stdout.write(chalk10.cyan("\nPress [Y] for Yes or [N] for No: "));
+      process.stdout.write(chalk11.cyan("\nPress [Y] for Yes or [N] for No: "));
     });
   } else {
-    console.log(chalk10.yellow(`   \u26A0\uFE0F Generated project differs from remote project`));
-    console.log(chalk10.gray(`   \u{1F4A1} This might be expected if there are structural changes`));
-    console.log(chalk10.gray(`   \u{1F4C2} Generated files available in: ${tempDirName} for manual review`));
+    console.log(chalk11.yellow(`   \u26A0\uFE0F Generated project differs from remote project`));
+    console.log(chalk11.gray(`   \u{1F4A1} This might be expected if there are structural changes`));
+    console.log(chalk11.gray(`   \u{1F4C2} Generated files available in: ${tempDirName} for manual review`));
     if (compilationSuccess) {
-      console.log(chalk10.yellow(`
+      console.log(chalk11.yellow(`
 \u2705 Compilation successful, but project structure differs.`));
       console.log(
-        chalk10.cyan(`
+        chalk11.cyan(`
 \u2705 Pull completed - please review generated files in temp directory.`)
       );
       process.exit(0);
     } else {
-      console.log(chalk10.red(`
+      console.log(chalk11.red(`
 \u274C Validation failed - please check the generated files.`));
       console.log(
-        chalk10.yellow(`
+        chalk11.yellow(`
 \u26A0\uFE0F Pull completed with validation errors - temp directory preserved.`)
       );
       process.exit(1);
@@ -239063,27 +239338,27 @@ function overwriteProjectFiles(originalProjectRoot, tempDirName, tempDir) {
           copyFileSync(sourcePath, targetPath);
           filesReplaced++;
           const relativePath = targetPath.replace(originalProjectRoot + "/", "");
-          console.log(chalk10.green(`   \u2705 Replaced: ${relativePath}`));
+          console.log(chalk11.green(`   \u2705 Replaced: ${relativePath}`));
         }
       }
     };
     var copyRecursively = copyRecursively2;
-    console.log(chalk10.cyan(`
+    console.log(chalk11.cyan(`
 \u{1F504} Replacing project files with generated files...`));
     let filesReplaced = 0;
     copyRecursively2(tempDir, originalProjectRoot);
-    console.log(chalk10.cyan(`
+    console.log(chalk11.cyan(`
 \u{1F9F9} Cleaning up temp directory...`));
     rmSync(tempDir, { recursive: true, force: true });
-    console.log(chalk10.green(`
+    console.log(chalk11.green(`
 \u{1F389} Successfully replaced ${filesReplaced} files!`));
-    console.log(chalk10.gray(`   Your project files have been updated with the generated content.`));
-    console.log(chalk10.gray(`   Temp directory cleaned up.`));
+    console.log(chalk11.gray(`   Your project files have been updated with the generated content.`));
+    console.log(chalk11.gray(`   Temp directory cleaned up.`));
   } catch (error) {
     const errorMsg = error instanceof Error ? error.message : String(error);
-    console.log(chalk10.red(`
+    console.log(chalk11.red(`
 \u274C Failed to overwrite project files: ${errorMsg}`));
-    console.log(chalk10.yellow(`   Generated files remain in: ${tempDirName} for manual review`));
+    console.log(chalk11.yellow(`   Generated files remain in: ${tempDirName} for manual review`));
   }
 }
 var init_project_validator = __esm({
@@ -239096,298 +239371,23 @@ var init_project_validator = __esm({
   }
 });
 
-// src/commands/pull-v3/targeted-typescript-placeholders.ts
-import { randomBytes as randomBytes2 } from "crypto";
-function generatePlaceholderId() {
-  return randomBytes2(4).toString("hex").toUpperCase();
-}
-function createTargetedTypeScriptPlaceholders(content, debug = false) {
-  const replacements = {};
-  let processedContent = content;
-  let replacedFields = 0;
-  const originalSize = content.length;
-  const promptRegex = /(\s+prompt:\s*)((['"`])([^]*?)\3)/g;
-  processedContent = processedContent.replace(promptRegex, (match2, prefix, fullValue) => {
-    if (fullValue.length >= MIN_REPLACEMENT_LENGTH) {
-      const placeholder = `<PROMPT_${generatePlaceholderId()}>`;
-      replacements[placeholder] = fullValue;
-      replacedFields++;
-      return `${prefix}${placeholder}`;
-    }
-    return match2;
-  });
-  const descriptionRegex = /(\s+description:\s*)((['"`])([^]*?)\3)/g;
-  processedContent = processedContent.replace(descriptionRegex, (match2, prefix, fullValue) => {
-    if (fullValue.length >= MIN_REPLACEMENT_LENGTH) {
-      const placeholder = `<DESC_${generatePlaceholderId()}>`;
-      replacements[placeholder] = fullValue;
-      replacedFields++;
-      return `${prefix}${placeholder}`;
-    }
-    return match2;
-  });
-  const inputSchemaRegex = /(\s+inputSchema:\s*)(\{[^{}]*(?:\{[^{}]*\}[^{}]*)*\})/g;
-  processedContent = processedContent.replace(inputSchemaRegex, (match2, prefix, schemaObject) => {
-    if (schemaObject.length >= MIN_REPLACEMENT_LENGTH) {
-      const placeholder = `<INPUT_SCHEMA_${generatePlaceholderId()}>`;
-      replacements[placeholder] = schemaObject;
-      replacedFields++;
-      return `${prefix}${placeholder}`;
-    }
-    return match2;
-  });
-  const detailsSchemaRegex = /(\s+detailsSchema:\s*)(z\.object\(\{[^]*?\}\)(?:\.[^,}\s]+)*)/g;
-  processedContent = processedContent.replace(detailsSchemaRegex, (match2, prefix, schemaObject) => {
-    if (schemaObject.length >= MIN_REPLACEMENT_LENGTH) {
-      const placeholder = `<DETAILS_SCHEMA_${generatePlaceholderId()}>`;
-      replacements[placeholder] = schemaObject;
-      replacedFields++;
-      return `${prefix}${placeholder}`;
-    }
-    return match2;
-  });
-  const propsRegex = /(\s+props:\s*)(z\.object\(\{[^]*?\}\)(?:\.[^,}\s]+)*)/g;
-  processedContent = processedContent.replace(propsRegex, (match2, prefix, propsObject) => {
-    if (propsObject.length >= MIN_REPLACEMENT_LENGTH) {
-      const placeholder = `<PROPS_${generatePlaceholderId()}>`;
-      replacements[placeholder] = propsObject;
-      replacedFields++;
-      return `${prefix}${placeholder}`;
-    }
-    return match2;
-  });
-  const processedSize = processedContent.length;
-  const savings = originalSize - processedSize;
-  const savingsPercentage = originalSize > 0 ? savings / originalSize * 100 : 0;
-  return {
-    processedContent,
-    replacements,
-    stats: {
-      originalSize,
-      processedSize,
-      savings,
-      savingsPercentage,
-      replacedFields
-    }
-  };
-}
-function restoreTargetedTypeScriptPlaceholders(content, replacements) {
-  let restoredContent = content;
-  const sortedPlaceholders = Object.keys(replacements).sort((a, b) => b.length - a.length);
-  for (const placeholder of sortedPlaceholders) {
-    const originalValue = replacements[placeholder];
-    restoredContent = restoredContent.replace(placeholder, originalValue);
-  }
-  return restoredContent;
-}
-var MIN_REPLACEMENT_LENGTH;
-var init_targeted_typescript_placeholders = __esm({
-  "src/commands/pull-v3/targeted-typescript-placeholders.ts"() {
-    "use strict";
-    init_esm_shims();
-    MIN_REPLACEMENT_LENGTH = 10;
-  }
-});
-
-// src/commands/pull-v3/utils/model-provider-detector.ts
-import { anthropic } from "@ai-sdk/anthropic";
-import { openai } from "@ai-sdk/openai";
-import { google } from "@ai-sdk/google";
-function getAvailableModel() {
-  for (const config of PROVIDER_CONFIGS) {
-    const hasKey = config.envVars.some((envVar) => {
-      const value = process.env[envVar];
-      return value && value.trim() !== "";
-    });
-    if (hasKey) {
-      switch (config.name) {
-        case "anthropic":
-          return anthropic(config.model);
-        case "openai":
-          return openai(config.model);
-        case "google":
-          return google(config.model);
-        default:
-          throw new Error(`Unknown provider: ${config.name}`);
-      }
-    }
-  }
-  throw new Error(
-    "No API keys detected. Please set ANTHROPIC_API_KEY, OPENAI_API_KEY, or GOOGLE_API_KEY"
-  );
-}
-var PROVIDER_CONFIGS;
-var init_model_provider_detector = __esm({
-  "src/commands/pull-v3/utils/model-provider-detector.ts"() {
-    "use strict";
-    init_esm_shims();
-    PROVIDER_CONFIGS = [
-      {
-        name: "anthropic",
-        envVars: ["ANTHROPIC_API_KEY"],
-        model: "claude-sonnet-4-5"
-      },
-      {
-        name: "openai",
-        envVars: ["OPENAI_API_KEY"],
-        model: "gpt-4.1"
-      },
-      {
-        name: "google",
-        envVars: ["GOOGLE_API_KEY", "GOOGLE_GENERATIVE_AI_API_KEY"],
-        model: "gemini-2.5-flash"
-      }
-    ];
-  }
-});
-
-// src/commands/pull-v3/llm-content-merger.ts
-import { generateText } from "ai";
-import chalk11 from "chalk";
-function stripCodeFences(content) {
-  content = content.replace(/^```(?:typescript|ts|javascript|js)?\s*\n?/i, "");
-  content = content.replace(/\n?```\s*$/i, "");
-  return content;
-}
-function estimateTokens(text3) {
-  return Math.ceil(text3.length / 4);
-}
-function calculateCostEstimate(promptTokens, completionTokens) {
-  const promptCost = promptTokens / 1e6 * 3;
-  const completionCost = completionTokens / 1e6 * 15;
-  return promptCost + completionCost;
-}
-async function mergeComponentsWithLLM(request) {
-  const { oldContent, newContent, modifiedComponents, filePath } = request;
-  const componentList = modifiedComponents.map((c) => `- ${c.componentType}:${c.componentId}`).join("\n");
-  const prompt = `You are a TypeScript code expert tasked with intelligently merging component updates.
-
-## Task
-Merge the OLD file content with NEW component definitions, preserving the original file structure while updating only the modified components.
-
-## Modified Components to Update
-${componentList}
-
-## Instructions
-0. **Please ensure you focus changes to minimize git diff size.** We want a clean git history.
-1. **Preserve original structure**: Keep imports, exports, comments, and overall file organization
-2. **Update only modified components**: Replace the specified components with their new versions
-3. **Maintain code style**: Match the original formatting, indentation, and style
-4. **Improve schemas**: Use better zod schemas from the new content where applicable. E.g. if the new content uses something like z.union([z.null(), z.string()]), use z.string().nullable() instead. 
-5. **Keep variable names**: Preserve original variable names and declarations
-6. **Preserve non-component code**: Keep any non-component logic, comments, or utilities
-7. **Please leave all imports at the top of the file.** Don't use .js imports, use .ts imports instead. (import example from './example')
-8. **Format JavaScript functions for maximum readability**:
-   - When you see compressed/minified function code like \`async({params})=>{...code...}\`, expand and prettify it
-   - Add proper line breaks, spacing, and indentation to make the function readable
-   - Ensure all braces \`{}\`, parentheses \`()\`, and syntax are properly balanced and valid
-   - Format the function code following TypeScript/JavaScript best practices
-   - Make sure the final code is compilable and syntactically correct
-   - Example: \`async({a,b})=>{return a+b}\` should become:
-     \`\`\`
-     async ({ a, b }) => {
-       return a + b;
-     }
-     \`\`\`
-
-## OLD Content:
-\`\`\`typescript
-${oldContent}
-\`\`\`
-
-## NEW Component Definitions:
-\`\`\`typescript
-${newContent}
-\`\`\`
-
-## Output
-Provide the merged TypeScript file that:
-- Keeps the original file structure
-- Updates ONLY the modified components listed above
-- Maintains consistent code style
-- Uses improved schemas where beneficial
-- Preserves all imports, exports, and other code
-- **Formats all function code beautifully with proper spacing, line breaks, and indentation**
-- **Ensures all syntax is valid and compilable TypeScript/JavaScript**
-- Start the code immidiately with the first line of the file, skip any backticks or other formatting announcing that it is a code block or typescript file.
-- Please follow biomes.dev code style.
-
-Return only the merged TypeScript code without any explanation or markdown formatting.`;
-  try {
-    const oldPlaceholders = createTargetedTypeScriptPlaceholders(oldContent);
-    const newPlaceholders = createTargetedTypeScriptPlaceholders(newContent);
-    const processedPrompt = prompt.replace(oldContent, oldPlaceholders.processedContent).replace(newContent, newPlaceholders.processedContent);
-    const estimatedPromptTokens = estimateTokens(processedPrompt);
-    const result = await generateText({
-      model: getAvailableModel(),
-      prompt: processedPrompt
-    });
-    let mergedContent = result.text.trim();
-    mergedContent = stripCodeFences(mergedContent);
-    const estimatedCompletionTokens = estimateTokens(mergedContent);
-    const totalTokens = estimatedPromptTokens + estimatedCompletionTokens;
-    const estimatedCost = calculateCostEstimate(estimatedPromptTokens, estimatedCompletionTokens);
-    console.log(
-      chalk11.gray(
-        `   \u{1F4B0} LLM usage: ~${totalTokens.toLocaleString()} tokens ($${estimatedCost.toFixed(4)})`
-      )
-    );
-    const allReplacements = {
-      ...oldPlaceholders.replacements,
-      ...newPlaceholders.replacements
-    };
-    if (Object.keys(allReplacements).length > 0) {
-      mergedContent = restoreTargetedTypeScriptPlaceholders(mergedContent, allReplacements);
-    }
-    const changes = modifiedComponents.map((c) => `Updated ${c.componentType}:${c.componentId}`);
-    return {
-      mergedContent,
-      changes,
-      success: true,
-      usage: {
-        promptTokens: estimatedPromptTokens,
-        completionTokens: estimatedCompletionTokens,
-        totalTokens,
-        estimatedCost
-      }
-    };
-  } catch (error) {
-    const errorMsg = error instanceof Error ? error.message : String(error);
-    return {
-      mergedContent: oldContent,
-      // Fallback to original
-      changes: [],
-      success: false,
-      error: errorMsg
-    };
-  }
-}
-var init_llm_content_merger = __esm({
-  "src/commands/pull-v3/llm-content-merger.ts"() {
-    "use strict";
-    init_esm_shims();
-    init_targeted_typescript_placeholders();
-    init_model_provider_detector();
-  }
-});
-
 // src/commands/pull-v3/component-updater.ts
 var component_updater_exports = {};
 __export(component_updater_exports, {
   copyProjectToTemp: () => copyProjectToTemp,
   updateModifiedComponents: () => updateModifiedComponents
 });
+import { spawn as spawn2 } from "child_process";
 import {
+  copyFileSync as copyFileSync2,
+  existsSync as existsSync9,
   mkdirSync as mkdirSync3,
-  readFileSync as readFileSync5,
-  writeFileSync as writeFileSync5,
   readdirSync as readdirSync4,
+  readFileSync as readFileSync5,
   statSync as statSync3,
-  copyFileSync as copyFileSync2,
-  existsSync as existsSync9
+  writeFileSync as writeFileSync5
 } from "fs";
-import { dirname as dirname7, join as join10, extname as extname3 } from "path";
-import { spawn as spawn2 } from "child_process";
+import { dirname as dirname7, extname as extname3, join as join10 } from "path";
 import chalk12 from "chalk";
 function copyProjectToTemp(projectRoot, tempDirName) {
   const tempDir = join10(projectRoot, tempDirName);
@@ -239822,7 +239822,6 @@ var init_component_updater = __esm({
   "src/commands/pull-v3/component-updater.ts"() {
     "use strict";
     init_esm_shims();
-    init_project_validator();
     init_agent_generator();
     init_artifact_component_generator();
     init_context_config_generator();
@@ -239836,6 +239835,7 @@ var init_component_updater = __esm({
     init_status_component_generator();
     init_sub_agent_generator();
     init_llm_content_merger();
+    init_project_validator();
     init_component_registry();
   }
 });
@@ -239845,7 +239845,7 @@ var new_component_generator_exports = {};
 __export(new_component_generator_exports, {
   createNewComponents: () => createNewComponents
 });
-import { mkdirSync as mkdirSync4, writeFileSync as writeFileSync6, existsSync as existsSync10 } from "fs";
+import { existsSync as existsSync10, mkdirSync as mkdirSync4, writeFileSync as writeFileSync6 } from "fs";
 import { dirname as dirname8, join as join11 } from "path";
 import chalk13 from "chalk";
 function toKebabCase(id) {
@@ -240049,7 +240049,7 @@ async function createNewComponents(comparison, remoteProject, localRegistry, pat
         } else if (componentType === "functions") {
           componentData = remoteProject.functions?.[componentId];
         } else if (componentType === "functionTools") {
-          let functionToolData = remoteProject.functionTools?.[componentId] || remoteProject.functions?.[componentId];
+          const functionToolData = remoteProject.functionTools?.[componentId] || remoteProject.functions?.[componentId];
           if (functionToolData && "functionId" in functionToolData && functionToolData.functionId && remoteProject.functions?.[functionToolData.functionId]) {
             const functionData = remoteProject.functions[functionToolData.functionId];
             componentData = { ...functionData, ...functionToolData };
@@ -241545,8 +241545,8 @@ async function devCommand(options) {
 init_esm_shims();
 import { existsSync as existsSync3, readdirSync, writeFileSync as writeFileSync2 } from "fs";
 import { basename, dirname as dirname2, join as join3, resolve } from "path";
-import chalk4 from "chalk";
 import * as p3 from "@clack/prompts";
+import chalk4 from "chalk";
 function findProjectRoot(startPath) {
   let currentPath = resolve(startPath);
   const root = dirname2(currentPath);
@@ -241702,15 +241702,15 @@ Note: Config file created in ${configDir}`));
 // src/commands/list-agents.ts
 init_esm_shims();
 init_api();
+import * as p5 from "@clack/prompts";
 import chalk6 from "chalk";
 import Table from "cli-table3";
-import * as p5 from "@clack/prompts";
 
 // src/utils/cli-pipeline.ts
 init_esm_shims();
 init_config();
-import chalk5 from "chalk";
 import * as p4 from "@clack/prompts";
+import chalk5 from "chalk";
 async function initializeCommand(options = {}) {
   const {
     configPath,
@@ -242037,8 +242037,8 @@ async function pushCommand(options) {
 
 // src/commands/update.ts
 init_esm_shims();
-import chalk16 from "chalk";
 import * as p8 from "@clack/prompts";
+import chalk16 from "chalk";
 
 // src/utils/package-manager.ts
 init_esm_shims();