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

package/dist/index.js

@@ -234778,7 +234778,7 @@ function formatStatusUpdates(statusUpdatesConfig, style, indentLevel, registry2,
     if (statusComponentIds.length > 0) {
       lines.push(`${indent}${indentation}statusComponents: [`);
       for (const statusCompId of statusComponentIds) {
-        const statusCompVar = registry2?.getVariableName(statusCompId, "statusComponent");
+        const statusCompVar = registry2?.getVariableName(statusCompId, "statusComponents");
         lines.push(`${indent}${indentation}${indentation}${statusCompVar || "undefined"}.config,`);
       }
       lines.push(`${indent}${indentation}],`);
@@ -234787,7 +234787,7 @@ function formatStatusUpdates(statusUpdatesConfig, style, indentLevel, registry2,
   if (statusUpdatesConfig.prompt) {
     if (hasTemplateVariables(statusUpdatesConfig.prompt) && contextConfigData && agentId && registry2) {
       const contextConfigId = contextConfigData.id;
-      const contextVarName = registry2.getVariableName(contextConfigId, "contextConfig");
+      const contextVarName = registry2.getVariableName(contextConfigId, "contextConfigs");
       if (!contextVarName) {
         throw new Error(`Failed to resolve context config variable name for: ${contextConfigId}`);
       }
@@ -234862,7 +234862,7 @@ function generateAgentDefinition(agentId, agentData, style = DEFAULT_STYLE, regi
   const semi = semicolons ? ";" : "";
   let agentVarName = toCamelCase(agentId);
   if (registry2) {
-    const registryVarName = registry2.getVariableName(agentId, "agent");
+    const registryVarName = registry2.getVariableName(agentId, "agents");
     if (registryVarName) {
       agentVarName = registryVarName;
     }
@@ -234877,7 +234877,7 @@ function generateAgentDefinition(agentId, agentData, style = DEFAULT_STYLE, regi
   if (agentData.prompt !== void 0 && agentData.prompt !== null) {
     if (hasTemplateVariables(agentData.prompt) && contextConfigData && registry2) {
       const contextConfigId = contextConfigData.id;
-      const contextVarName = registry2.getVariableName(contextConfigId, "contextConfig");
+      const contextVarName = registry2.getVariableName(contextConfigId, "contextConfigs");
       if (!contextVarName) {
         throw new Error(`Failed to resolve context config variable name for: ${contextConfigId}`);
       }
@@ -234937,7 +234937,7 @@ function generateAgentDefinition(agentId, agentData, style = DEFAULT_STYLE, regi
     if (!registry2) {
       throw new Error("Registry is required for defaultSubAgent generation");
     }
-    const defaultSubAgentVar = registry2.getVariableName(agentData.defaultSubAgentId, "subAgent");
+    const defaultSubAgentVar = registry2.getVariableName(agentData.defaultSubAgentId, "subAgents");
     if (!defaultSubAgentVar) {
       throw new Error(
         `Failed to resolve variable name for default sub-agent: ${agentData.defaultSubAgentId}`
@@ -234950,22 +234950,14 @@ function generateAgentDefinition(agentId, agentData, style = DEFAULT_STYLE, regi
       throw new Error("Registry is required for subAgents generation");
     }
     const subAgentIds = Object.keys(agentData.subAgents);
-    const subAgentsArray = registry2.formatReferencesForCode(subAgentIds, "subAgent", style, 2);
+    const subAgentsArray = registry2.formatReferencesForCode(subAgentIds, "subAgents", style, 2);
     if (!subAgentsArray) {
       throw new Error(`Failed to resolve variable names for sub-agents: ${subAgentIds.join(", ")}`);
     }
     lines.push(`${indentation}subAgents: () => ${subAgentsArray},`);
   }
-  if (agentData.contextConfig) {
-    let contextConfigVar;
-    if (registry2) {
-      const allComponents = registry2.getAllComponents();
-      const contextConfigComponent = allComponents.find((comp) => comp.type === "contextConfig");
-      if (contextConfigComponent) {
-        contextConfigVar = contextConfigComponent.name;
-      } else {
-      }
-    }
+  if (agentData.contextConfig && registry2 && agentData.contextConfig.id) {
+    const contextConfigVar = registry2.getVariableName(agentData.contextConfig.id, "contextConfigs");
     if (contextConfigVar) {
       lines.push(`${indentation}contextConfig: ${contextConfigVar},`);
     } else {
@@ -235004,25 +234996,25 @@ function generateAgentImports(agentId, agentData, style = DEFAULT_STYLE, registr
     if (agentData.subAgents && typeof agentData.subAgents === "object") {
       const subAgentIds = Object.keys(agentData.subAgents);
       referencedComponents.push(
-        ...subAgentIds.map((id) => ({ id, type: "subAgent" }))
+        ...subAgentIds.map((id) => ({ id, type: "subAgents" }))
       );
     }
     if (agentData.statusUpdates && agentData.statusUpdates.statusComponents && Array.isArray(agentData.statusUpdates.statusComponents)) {
       for (const comp of agentData.statusUpdates.statusComponents) {
         if (typeof comp === "string") {
-          referencedComponents.push({ id: comp, type: "statusComponent" });
+          referencedComponents.push({ id: comp, type: "statusComponents" });
         } else if (typeof comp === "object" && comp) {
           const statusId = comp.id || comp.type || comp.name;
-          if (statusId) referencedComponents.push({ id: statusId, type: "statusComponent" });
+          if (statusId) referencedComponents.push({ id: statusId, type: "statusComponents" });
         }
       }
     }
     if (agentData.contextConfig) {
       const contextConfigId = agentData.contextConfig.id;
-      referencedComponents.push({ id: contextConfigId, type: "contextConfig" });
+      referencedComponents.push({ id: contextConfigId, type: "contextConfigs" });
     }
     if (agentData.defaultSubAgentId) {
-      referencedComponents.push({ id: agentData.defaultSubAgentId, type: "subAgent" });
+      referencedComponents.push({ id: agentData.defaultSubAgentId, type: "subAgents" });
     }
     const componentImports = registry2.getImportsForFile(currentFilePath, referencedComponents);
     imports.push(...componentImports);
@@ -235290,7 +235282,7 @@ function generateContextConfigDefinition(contextId, contextData, style = DEFAULT
     if (!registry2) {
       throw new Error("Registry is required for context config variable name generation");
     }
-    const varName = registry2.getVariableName(contextId, "contextConfig");
+    const varName = registry2.getVariableName(contextId, "contextConfigs");
     if (!varName) {
       throw new Error(`Failed to resolve variable name for context config: ${contextId}`);
     }
@@ -235398,7 +235390,7 @@ function generateContextConfigFile(contextId, contextData, style = DEFAULT_STYLE
     if (!registry2) {
       throw new Error("Registry is required for context config variable name generation");
     }
-    const varName = registry2.getVariableName(contextId, "contextConfig");
+    const varName = registry2.getVariableName(contextId, "contextConfigs");
     if (!varName) {
       throw new Error(`Failed to resolve variable name for context config: ${contextId}`);
     }
@@ -235787,7 +235779,7 @@ function generateEnvironmentFile(environmentName, environmentData, style = DEFAU
     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");
+      const credentialComponent = registry2.get(credentialId, "credentials");
       if (credentialComponent) {
         const relativePath = `../credentials/${credentialId}`;
         imports.push(`import { ${credentialComponent.name} } from ${q}${relativePath}${q}${semi}`);
@@ -235804,7 +235796,7 @@ function generateEnvironmentFile(environmentName, environmentData, style = DEFAU
         const credentialId = environmentData.credentials[i];
         const credentialVarName = credentialRefs[i];
         const isLast = i === credentialRefs.length - 1;
-        const validKey = registry2.getVariableName(credentialId, "credential");
+        const validKey = registry2.getVariableName(credentialId, "credentials");
         lines.push(
           `${indentation}${indentation}${validKey}: ${credentialVarName}${isLast ? "" : ","}`
         );
@@ -235854,7 +235846,7 @@ function generateExternalAgentDefinition(agentId, agentData, style = DEFAULT_STY
   const semi = semicolons ? ";" : "";
   let agentVarName = toCamelCase(agentId);
   if (registry2) {
-    const registryVarName = registry2.getVariableName(agentId, "externalAgent");
+    const registryVarName = registry2.getVariableName(agentId, "externalAgents");
     if (registryVarName) {
       agentVarName = registryVarName;
     }
@@ -235880,7 +235872,7 @@ function generateExternalAgentDefinition(agentId, agentData, style = DEFAULT_STY
       if (!registry2) {
         throw new Error("Registry is required for credentialReference generation");
       }
-      const credentialVar = registry2.getVariableName(agentData.credentialReference, "credential");
+      const credentialVar = registry2.getVariableName(agentData.credentialReference, "credentials");
       if (!credentialVar) {
         throw new Error(
           `Failed to resolve variable name for credential reference: ${agentData.credentialReference}`
@@ -235925,7 +235917,7 @@ function generateExternalAgentImports(agentId, agentData, style = DEFAULT_STYLE,
     }
     const currentFilePath = `external-agents/${agentId}.ts`;
     const credentialRefs = [
-      { id: agentData.credentialReference, type: "credential" }
+      { id: agentData.credentialReference, type: "credentials" }
     ];
     const componentImports = registry2.getImportsForFile(currentFilePath, credentialRefs);
     imports.push(...componentImports);
@@ -236097,7 +236089,13 @@ function generateMcpToolDefinition(toolId, toolData, style = DEFAULT_STYLE7, reg
   lines.push(`export const ${toolVarName} = mcpTool({`);
   lines.push(`${indentation}id: ${formatString7(toolId, q)},`);
   lines.push(`${indentation}name: ${formatString7(toolData.name, q)},`);
-  lines.push(`${indentation}serverUrl: ${formatString7(serverUrl, q)},`);
+  if (toolData.config?.mcp && typeof toolData.config.mcp === "object") {
+    const mcpConfig = toolData.config.mcp;
+    lines.push(`${indentation}serverUrl: ${formatString7(mcpConfig.server?.url, q)},`);
+    if (mcpConfig.transport) {
+      lines.push(`${indentation}transport: ${JSON.stringify(mcpConfig.transport, null, 2)},`);
+    }
+  }
   if (toolData.description) {
     lines.push(`${indentation}description: ${formatString7(toolData.description, q, true)},`);
   }
@@ -236120,7 +236118,7 @@ function generateMcpToolDefinition(toolId, toolData, style = DEFAULT_STYLE7, reg
       lines.push(`${indentation}credential: ${toolData.credential},`);
     }
   } else if (toolData.credentialReferenceId && registry2) {
-    const validKey = registry2.getVariableName(toolData.credentialReferenceId, "credential");
+    const validKey = registry2.getVariableName(toolData.credentialReferenceId, "credentials");
     lines.push(
       `${indentation}credential: envSettings.getEnvironmentCredential(${formatString7(validKey, q)}),`
     );
@@ -236219,32 +236217,32 @@ function generateProjectDefinition(projectId, projectData, style = DEFAULT_STYLE
     lines.push(`${indentation}},`);
   }
   if (shouldInclude(projectData.agents)) {
-    const agentsArray = registry2 ? registry2.formatReferencesForCode(projectData.agents, "agent", style, 2) : "[]";
+    const agentsArray = registry2 ? registry2.formatReferencesForCode(projectData.agents, "agents", style, 2) : "[]";
     lines.push(`${indentation}agents: () => ${agentsArray},`);
   }
   if (shouldInclude(projectData.tools)) {
-    const toolsArray = registry2 ? registry2.formatReferencesForCode(projectData.tools, "tool", style, 2) : "[]";
+    const toolsArray = registry2 ? registry2.formatReferencesForCode(projectData.tools, "tools", style, 2) : "[]";
     lines.push(`${indentation}tools: () => ${toolsArray},`);
   }
   if (shouldInclude(projectData.externalAgents)) {
-    const externalAgentsArray = registry2 ? registry2.formatReferencesForCode(projectData.externalAgents, "externalAgent", style, 2) : "[]";
+    const externalAgentsArray = registry2 ? registry2.formatReferencesForCode(projectData.externalAgents, "externalAgents", style, 2) : "[]";
     lines.push(`${indentation}externalAgents: () => ${externalAgentsArray},`);
   }
   if (shouldInclude(projectData.dataComponents)) {
-    const dataComponentsArray = registry2 ? registry2.formatReferencesForCode(projectData.dataComponents, "dataComponent", style, 2) : "[]";
+    const dataComponentsArray = registry2 ? registry2.formatReferencesForCode(projectData.dataComponents, "dataComponents", style, 2) : "[]";
     lines.push(`${indentation}dataComponents: () => ${dataComponentsArray},`);
   }
   if (shouldInclude(projectData.artifactComponents)) {
     const artifactComponentsArray = registry2 ? registry2.formatReferencesForCode(
       projectData.artifactComponents,
-      "artifactComponent",
+      "artifactComponents",
       style,
       2
     ) : "[]";
     lines.push(`${indentation}artifactComponents: () => ${artifactComponentsArray},`);
   }
   if (shouldInclude(projectData.credentialReferences)) {
-    const credentialReferencesArray = registry2 ? registry2.formatReferencesForCode(projectData.credentialReferences, "credential", style, 2) : "[]";
+    const credentialReferencesArray = registry2 ? registry2.formatReferencesForCode(projectData.credentialReferences, "credentials", style, 2) : "[]";
     lines.push(`${indentation}credentialReferences: () => ${credentialReferencesArray},`);
   }
   removeTrailingComma(lines);
@@ -236265,7 +236263,7 @@ function generateProjectImports(projectId, projectData, style = DEFAULT_STYLE, r
         agentIds = Object.keys(projectData.agents);
       }
       for (const agentId of agentIds) {
-        referencedComponents.push({ id: agentId, type: "agent" });
+        referencedComponents.push({ id: agentId, type: "agents" });
       }
     }
     if (projectData.tools) {
@@ -236276,11 +236274,11 @@ function generateProjectImports(projectId, projectData, style = DEFAULT_STYLE, r
         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";
+        let componentType = "tools";
+        if (registry2 && registry2.get(toolId, "functionTools")) {
+          componentType = "functionTools";
+        } else if (registry2 && registry2.get(toolId, "tools")) {
+          componentType = "tools";
         }
         referencedComponents.push({ id: toolId, type: componentType });
       }
@@ -236293,7 +236291,7 @@ function generateProjectImports(projectId, projectData, style = DEFAULT_STYLE, r
         extAgentIds = Object.keys(projectData.externalAgents);
       }
       for (const extAgentId of extAgentIds) {
-        referencedComponents.push({ id: extAgentId, type: "externalAgent" });
+        referencedComponents.push({ id: extAgentId, type: "externalAgents" });
       }
     }
     if (projectData.dataComponents) {
@@ -236304,7 +236302,7 @@ function generateProjectImports(projectId, projectData, style = DEFAULT_STYLE, r
         dataCompIds = Object.keys(projectData.dataComponents);
       }
       for (const dataCompId of dataCompIds) {
-        referencedComponents.push({ id: dataCompId, type: "dataComponent" });
+        referencedComponents.push({ id: dataCompId, type: "dataComponents" });
       }
     }
     if (projectData.artifactComponents) {
@@ -236315,7 +236313,7 @@ function generateProjectImports(projectId, projectData, style = DEFAULT_STYLE, r
         artifactCompIds = Object.keys(projectData.artifactComponents);
       }
       for (const artifactCompId of artifactCompIds) {
-        referencedComponents.push({ id: artifactCompId, type: "artifactComponent" });
+        referencedComponents.push({ id: artifactCompId, type: "artifactComponents" });
       }
     }
     if (projectData.credentialReferences) {
@@ -236326,7 +236324,7 @@ function generateProjectImports(projectId, projectData, style = DEFAULT_STYLE, r
         credIds = Object.keys(projectData.credentialReferences);
       }
       for (const credId of credIds) {
-        referencedComponents.push({ id: credId, type: "credential" });
+        referencedComponents.push({ id: credId, type: "credentials" });
       }
     }
     if (referencedComponents.length > 0) {
@@ -236498,7 +236496,7 @@ function generateSubAgentDefinition(agentId, agentData, style = DEFAULT_STYLE, r
   const semi = semicolons ? ";" : "";
   let agentVarName = toCamelCase(agentId);
   if (registry2) {
-    const registryVarName = registry2.getVariableName(agentId, "subAgent");
+    const registryVarName = registry2.getVariableName(agentId, "subAgents");
     if (registryVarName) {
       agentVarName = registryVarName;
     }
@@ -236510,7 +236508,7 @@ function generateSubAgentDefinition(agentId, agentData, style = DEFAULT_STYLE, r
   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");
+      const contextVarName = registry2.getVariableName(contextConfigData.id, "contextConfigs");
       if (!contextVarName) {
         throw new Error(
           `Failed to resolve context config variable name for: ${contextConfigData.id}`
@@ -236575,13 +236573,13 @@ function generateSubAgentDefinition(agentId, agentData, style = DEFAULT_STYLE, r
     }
     for (const toolRelation of agentData.canUse) {
       const toolId = toolRelation.toolId;
-      let toolVarName = registry2.getVariableName(toolId, "tool");
+      let toolVarName = registry2.getVariableName(toolId, "tools");
       if (!toolVarName) {
-        toolVarName = registry2.getVariableName(toolId, "functionTool");
+        toolVarName = registry2.getVariableName(toolId, "functionTools");
       }
       if (!toolVarName) {
         throw new Error(
-          `Failed to resolve variable name for tool: ${toolId} (tried both 'tool' and 'functionTool' types)`
+          `Failed to resolve variable name for tool: ${toolId} (tried both 'tools' and 'functionTools' types)`
         );
       }
       const hasToolSelection = toolRelation.toolSelection && toolRelation.toolSelection.length > 0;
@@ -236627,19 +236625,19 @@ function generateSubAgentDefinition(agentId, agentData, style = DEFAULT_STYLE, r
       let hasHeaders = false;
       if (typeof delegateRelation === "string") {
         targetAgentId = delegateRelation;
-        targetType = "subAgent";
+        targetType = "subAgents";
         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";
+          targetType = "externalAgents";
         } else if (delegateRelation.agentId) {
           targetAgentId = delegateRelation.agentId;
-          targetType = "agent";
+          targetType = "agents";
         } else if (delegateRelation.subAgentId) {
           targetAgentId = delegateRelation.subAgentId;
-          targetType = "subAgent";
+          targetType = "subAgents";
         } else {
           throw new Error(
             `Delegate relation missing agentId, subAgentId, or externalAgentId: ${JSON.stringify(delegateRelation)}`
@@ -236686,7 +236684,7 @@ function generateSubAgentDefinition(agentId, agentData, style = DEFAULT_STYLE, r
     }
     const transferArray = registry2.formatReferencesForCode(
       agentData.canTransferTo,
-      "subAgent",
+      "subAgents",
       style,
       2
     );
@@ -236703,7 +236701,7 @@ function generateSubAgentDefinition(agentId, agentData, style = DEFAULT_STYLE, r
     }
     const dataComponentsArray = registry2.formatReferencesForCode(
       agentData.dataComponents,
-      "dataComponent",
+      "dataComponents",
       style,
       2
     );
@@ -236720,7 +236718,7 @@ function generateSubAgentDefinition(agentId, agentData, style = DEFAULT_STYLE, r
     }
     const artifactComponentsArray = registry2.formatReferencesForCode(
       agentData.artifactComponents,
-      "artifactComponent",
+      "artifactComponents",
       style,
       2
     );
@@ -236751,7 +236749,7 @@ function generateSubAgentImports(agentId, agentData, style = DEFAULT_STYLE, regi
     const importStatement = registry2.getImportStatement(
       currentFilePath,
       contextConfigId,
-      "contextConfig"
+      "contextConfigs"
     );
     if (importStatement) {
       imports.push(importStatement);
@@ -236764,11 +236762,11 @@ function generateSubAgentImports(agentId, agentData, style = DEFAULT_STYLE, regi
       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";
+          let componentType = "tools";
+          if (registry2.get(toolId, "functionTools")) {
+            componentType = "functionTools";
+          } else if (registry2.get(toolId, "tools")) {
+            componentType = "tools";
           }
           referencedComponents.push({ id: toolId, type: componentType });
         }
@@ -236777,17 +236775,17 @@ function generateSubAgentImports(agentId, agentData, style = DEFAULT_STYLE, regi
     if (Array.isArray(agentData.canDelegateTo)) {
       for (const delegateRelation of agentData.canDelegateTo) {
         let targetId;
-        let targetType = "agent";
+        let targetType = "agents";
         if (delegateRelation && typeof delegateRelation === "object") {
           if (delegateRelation.externalAgentId) {
             targetId = delegateRelation.externalAgentId;
-            targetType = "externalAgent";
+            targetType = "externalAgents";
           } else if (delegateRelation.agentId) {
             targetId = delegateRelation.agentId;
-            targetType = "agent";
+            targetType = "agents";
           } else if (delegateRelation.subAgentId) {
             targetId = delegateRelation.subAgentId;
-            targetType = "subAgent";
+            targetType = "subAgents";
           }
         }
         if (targetId) {
@@ -236798,21 +236796,21 @@ function generateSubAgentImports(agentId, agentData, style = DEFAULT_STYLE, regi
     if (Array.isArray(agentData.canTransferTo)) {
       for (const transferId of agentData.canTransferTo) {
         if (typeof transferId === "string") {
-          referencedComponents.push({ id: transferId, type: "subAgent" });
+          referencedComponents.push({ id: transferId, type: "subAgents" });
         }
       }
     }
     if (Array.isArray(agentData.dataComponents)) {
       for (const dataCompId of agentData.dataComponents) {
         if (typeof dataCompId === "string") {
-          referencedComponents.push({ id: dataCompId, type: "dataComponent" });
+          referencedComponents.push({ id: dataCompId, type: "dataComponents" });
         }
       }
     }
     if (Array.isArray(agentData.artifactComponents)) {
       for (const artifactCompId of agentData.artifactComponents) {
         if (typeof artifactCompId === "string") {
-          referencedComponents.push({ id: artifactCompId, type: "artifactComponent" });
+          referencedComponents.push({ id: artifactCompId, type: "artifactComponents" });
         }
       }
     }
@@ -236856,59 +236854,62 @@ 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`);
+      registry2.register(credId, "credentials", `credentials/${credId}.ts`);
     }
   }
   if (project.tools) {
     for (const toolId of Object.keys(project.tools)) {
-      registry2.register(toolId, "tool", `tools/${toolId}.ts`);
+      registry2.register(toolId, "tools", `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`);
+      registry2.register(funcId, "functionTools", `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`);
+        registry2.register(funcToolId, "functionTools", `tools/functions/${funcToolId}.ts`);
       }
     }
   }
   if (project.dataComponents) {
     for (const componentId of Object.keys(project.dataComponents)) {
-      registry2.register(componentId, "dataComponent", `data-components/${componentId}.ts`);
+      registry2.register(componentId, "dataComponents", `data-components/${componentId}.ts`);
     }
   }
   if (project.artifactComponents) {
     for (const componentId of Object.keys(project.artifactComponents)) {
-      registry2.register(componentId, "artifactComponent", `artifact-components/${componentId}.ts`);
+      registry2.register(componentId, "artifactComponents", `artifact-components/${componentId}.ts`);
     }
   }
   if (project.externalAgents) {
     for (const extAgentId of Object.keys(project.externalAgents)) {
-      registry2.register(extAgentId, "externalAgent", `external-agents/${extAgentId}.ts`);
+      registry2.register(extAgentId, "externalAgents", `external-agents/${extAgentId}.ts`);
     }
   }
   const statusComponents = extractStatusComponents(project);
   for (const statusId of Object.keys(statusComponents)) {
-    registry2.register(statusId, "statusComponent", `status-components/${statusId}.ts`);
+    registry2.register(statusId, "statusComponents", `status-components/${statusId}.ts`);
   }
   if (project.agents) {
     for (const agentId of Object.keys(project.agents)) {
-      registry2.register(agentId, "agent", `agents/${agentId}.ts`);
+      console.log(`\u{1F527} Registering agent: ${agentId}`);
+      registry2.register(agentId, "agents", `agents/${agentId}.ts`);
     }
   }
   const subAgents2 = extractSubAgents(project);
+  console.log(`\u{1F527} Found subAgents:`, Object.keys(subAgents2));
   for (const subAgentId of Object.keys(subAgents2)) {
-    registry2.register(subAgentId, "subAgent", `agents/sub-agents/${subAgentId}.ts`);
+    console.log(`\u{1F527} Registering subAgent: ${subAgentId}`);
+    registry2.register(subAgentId, "subAgents", `agents/sub-agents/${subAgentId}.ts`);
   }
   const contextConfigs2 = extractContextConfigs(project);
   for (const contextId of Object.keys(contextConfigs2)) {
-    registry2.register(contextId, "contextConfig", `context-configs/${contextId}.ts`);
+    registry2.register(contextId, "contextConfigs", `context-configs/${contextId}.ts`);
   }
 }
 function extractStatusComponents(project) {
@@ -237013,6 +237014,9 @@ var init_component_registry = __esm({
         } else {
           const baseName = this.toCamelCase(id);
           const uniqueName = this.ensureUniqueName(baseName, type);
+          console.log(
+            `\u{1F527} Registry: ${type}:${id} -> baseName: "${baseName}" -> uniqueName: "${uniqueName}"`
+          );
           name = uniqueName;
           actualExportName = uniqueName;
         }
@@ -237187,26 +237191,36 @@ var init_component_registry = __esm({
        */
       getTypePrefix(type) {
         switch (type) {
-          case "agent":
+          case "agents":
             return "agent";
-          case "subAgent":
+          case "subAgents":
             return "sub";
-          case "externalAgent":
+          case "externalAgents":
             return "ext";
-          case "tool":
+          case "tools":
             return "tool";
-          case "functionTool":
+          case "functionTools":
             return "func";
-          case "dataComponent":
+          case "functions":
+            return "func";
+          case "dataComponents":
             return "data";
-          case "artifactComponent":
+          case "artifactComponents":
             return "artifact";
-          case "credential":
-            return "cred";
-          case "statusComponent":
+          case "statusComponents":
             return "status";
-          case "contextConfig":
+          case "environments":
+            return "env";
+          case "credentials":
+            return "cred";
+          case "contextConfigs":
             return "context";
+          case "fetchDefinitions":
+            return "fetch";
+          case "headers":
+            return "header";
+          case "models":
+            return "model";
           case "project":
             return "project";
           default:
@@ -237235,13 +237249,14 @@ var init_component_registry = __esm({
        * Get all components for debugging
        */
       getAllComponents() {
-        return Array.from(this.components.values());
+        return Array.from(this.componentsByTypeAndId.values());
       }
       /**
        * Clear all components (for testing)
        */
       clear() {
         this.components.clear();
+        this.componentsByTypeAndId.clear();
         this.usedNames.clear();
       }
     };
@@ -237327,7 +237342,7 @@ async function introspectGenerate(project, paths, environment, debug, options =
         generatedFiles.push(artifactFile);
       }
     }
-    const registeredStatusComponents = registry2.getAllComponents().filter((c) => c.type === "statusComponent");
+    const registeredStatusComponents = registry2.getAllComponents().filter((c) => c.type === "statusComponents");
     if (registeredStatusComponents.length > 0) {
       for (const statusComp of registeredStatusComponents) {
         const statusData = findStatusComponentData(project, statusComp.id);
@@ -237354,7 +237369,7 @@ async function introspectGenerate(project, paths, environment, debug, options =
         generatedFiles.push(extAgentFile);
       }
     }
-    const registeredContextConfigs = registry2.getAllComponents().filter((c) => c.type === "contextConfig");
+    const registeredContextConfigs = registry2.getAllComponents().filter((c) => c.type === "contextConfigs");
     if (registeredContextConfigs.length > 0) {
       for (const contextComp of registeredContextConfigs) {
         const contextData = findContextConfigData(project, contextComp.id);
@@ -237531,7 +237546,7 @@ function createNewProjectComparison(project, debug) {
   if (project.agents) {
     Object.keys(project.agents).forEach((agentId) => {
       changes.push({
-        componentType: "agent",
+        componentType: "agents",
         componentId: agentId,
         changeType: "added"
       });
@@ -237540,7 +237555,7 @@ function createNewProjectComparison(project, debug) {
   if (project.tools) {
     Object.keys(project.tools).forEach((toolId) => {
       changes.push({
-        componentType: "tool",
+        componentType: "tools",
         componentId: toolId,
         changeType: "added"
       });
@@ -237549,7 +237564,7 @@ function createNewProjectComparison(project, debug) {
   if (project.functionTools) {
     Object.keys(project.functionTools).forEach((toolId) => {
       changes.push({
-        componentType: "functionTool",
+        componentType: "functionTools",
         componentId: toolId,
         changeType: "added"
       });
@@ -237558,7 +237573,7 @@ function createNewProjectComparison(project, debug) {
   if (project.functions) {
     Object.keys(project.functions).forEach((funcId) => {
       changes.push({
-        componentType: "function",
+        componentType: "functions",
         componentId: funcId,
         changeType: "added"
       });
@@ -237567,7 +237582,7 @@ function createNewProjectComparison(project, debug) {
   if (project.dataComponents) {
     Object.keys(project.dataComponents).forEach((componentId) => {
       changes.push({
-        componentType: "dataComponent",
+        componentType: "dataComponents",
         componentId,
         changeType: "added"
       });
@@ -237576,7 +237591,7 @@ function createNewProjectComparison(project, debug) {
   if (project.artifactComponents) {
     Object.keys(project.artifactComponents).forEach((componentId) => {
       changes.push({
-        componentType: "artifactComponent",
+        componentType: "artifactComponents",
         componentId,
         changeType: "added"
       });
@@ -237587,7 +237602,7 @@ function createNewProjectComparison(project, debug) {
       if (agentData.subAgents) {
         Object.keys(agentData.subAgents).forEach((subAgentId) => {
           changes.push({
-            componentType: "subAgent",
+            componentType: "subAgents",
             componentId: subAgentId,
             changeType: "added"
           });
@@ -237598,7 +237613,7 @@ function createNewProjectComparison(project, debug) {
   const statusComponents = extractStatusComponentIds(project);
   statusComponents.forEach((componentId) => {
     changes.push({
-      componentType: "statusComponent",
+      componentType: "statusComponents",
       componentId,
       changeType: "added"
     });
@@ -237611,7 +237626,7 @@ function createNewProjectComparison(project, debug) {
           return;
         }
         changes.push({
-          componentType: "contextConfig",
+          componentType: "contextConfigs",
           componentId: contextConfigId,
           changeType: "added"
         });
@@ -237621,7 +237636,7 @@ function createNewProjectComparison(project, debug) {
   if (project.externalAgents) {
     Object.keys(project.externalAgents).forEach((extAgentId) => {
       changes.push({
-        componentType: "externalAgent",
+        componentType: "externalAgents",
         componentId: extAgentId,
         changeType: "added"
       });
@@ -237630,7 +237645,7 @@ function createNewProjectComparison(project, debug) {
   if (project.credentialReferences) {
     Object.keys(project.credentialReferences).forEach((credId) => {
       changes.push({
-        componentType: "credential",
+        componentType: "credentials",
         componentId: credId,
         changeType: "added"
       });
@@ -237704,7 +237719,7 @@ function compareAgents(localAgents, remoteAgents, debug) {
   remoteIds.filter((id) => !localIds.includes(id)).forEach((id) => {
     const agent = remoteAgents[id];
     changes.push({
-      componentType: "agent",
+      componentType: "agents",
       componentId: id,
       changeType: "added",
       summary: `New agent: ${agent.name || id}`
@@ -237713,7 +237728,7 @@ function compareAgents(localAgents, remoteAgents, debug) {
   localIds.filter((id) => !remoteIds.includes(id)).forEach((id) => {
     const agent = localAgents[id];
     changes.push({
-      componentType: "agent",
+      componentType: "agents",
       componentId: id,
       changeType: "deleted",
       summary: `Removed agent: ${agent.name || id}`
@@ -237725,7 +237740,7 @@ function compareAgents(localAgents, remoteAgents, debug) {
     if (fieldChanges.length > 0) {
       const summary = generateAgentChangeSummary(fieldChanges);
       changes.push({
-        componentType: "agent",
+        componentType: "agents",
         componentId: id,
         changeType: "modified",
         changedFields: fieldChanges,
@@ -237758,7 +237773,7 @@ function compareSubAgents(localAgents, remoteAgents, debug) {
   remoteIds.filter((id) => !localIds.includes(id)).forEach((id) => {
     const subAgent = remoteSubAgents[id];
     changes.push({
-      componentType: "subAgent",
+      componentType: "subAgents",
       componentId: id,
       changeType: "added",
       summary: `New subAgent: ${subAgent.name || id}`
@@ -237767,7 +237782,7 @@ function compareSubAgents(localAgents, remoteAgents, debug) {
   localIds.filter((id) => !remoteIds.includes(id)).forEach((id) => {
     const subAgent = localSubAgents[id];
     changes.push({
-      componentType: "subAgent",
+      componentType: "subAgents",
       componentId: id,
       changeType: "deleted",
       summary: `Removed subAgent: ${subAgent.name || id}`
@@ -237779,7 +237794,7 @@ function compareSubAgents(localAgents, remoteAgents, debug) {
     if (fieldChanges.length > 0) {
       const summary = generateSubAgentChangeSummary(fieldChanges);
       changes.push({
-        componentType: "subAgent",
+        componentType: "subAgents",
         componentId: id,
         changeType: "modified",
         changedFields: fieldChanges,
@@ -237805,10 +237820,10 @@ function generateSubAgentChangeSummary(fieldChanges) {
   }
 }
 function compareTools(localTools, remoteTools, debug) {
-  return compareComponentMaps("tool", localTools, remoteTools, debug);
+  return compareComponentMaps("tools", localTools, remoteTools, debug);
 }
 function compareFunctionTools(localFunctionTools, remoteFunctionTools, debug) {
-  return compareComponentMaps("functionTool", localFunctionTools, remoteFunctionTools, debug);
+  return compareComponentMaps("functionTools", localFunctionTools, remoteFunctionTools, debug);
 }
 function compareFunctions(localFunctions, remoteFunctions, debug) {
   const cleanLocalFunctions = {};
@@ -237829,28 +237844,28 @@ function compareFunctions(localFunctions, remoteFunctions, debug) {
       dependencies: func.dependencies
     };
   }
-  return compareComponentMaps("function", cleanLocalFunctions, cleanRemoteFunctions, debug);
+  return compareComponentMaps("functions", cleanLocalFunctions, cleanRemoteFunctions, debug);
 }
 function compareDataComponents(localDataComponents, remoteDataComponents, debug) {
-  return compareComponentMaps("dataComponent", localDataComponents, remoteDataComponents, debug);
+  return compareComponentMaps("dataComponents", localDataComponents, remoteDataComponents, debug);
 }
 function compareArtifactComponents(localArtifactComponents, remoteArtifactComponents, debug) {
   return compareComponentMaps(
-    "artifactComponent",
+    "artifactComponents",
     localArtifactComponents,
     remoteArtifactComponents,
     debug
   );
 }
 function compareCredentials(localCredentials, remoteCredentials, debug) {
-  return compareComponentMaps("credential", localCredentials, remoteCredentials, debug);
+  return compareComponentMaps("credentials", localCredentials, remoteCredentials, debug);
 }
 function compareExternalAgents(localExternalAgents, remoteExternalAgents, debug) {
-  return compareComponentMaps("externalAgent", localExternalAgents, remoteExternalAgents, debug);
+  return compareComponentMaps("externalAgents", localExternalAgents, remoteExternalAgents, debug);
 }
 function compareStatusComponents(localStatusComponents, remoteStatusComponents, debug) {
   return compareComponentMaps(
-    "statusComponent",
+    "statusComponents",
     localStatusComponents,
     remoteStatusComponents,
     debug
@@ -237896,7 +237911,7 @@ function compareProjectFields(localProject, remoteProject, debug) {
       if (fieldChanges.length > 0) {
         const summary = `Project ${field} updated`;
         changes.push({
-          componentType: "contextConfig",
+          componentType: "contextConfigs",
           // Use contextConfig as catch-all for project-level changes
           componentId: `project-${field}`,
           changeType: "modified",
@@ -238218,14 +238233,14 @@ function generateAgentChangeSummary(fieldChanges) {
 function generateComponentSummary(componentType, changeType, component) {
   const name = component?.name || component?.id || "unnamed";
   const action = changeType === "added" ? "Added" : "Removed";
-  if (componentType === "tool") {
+  if (componentType === "tools") {
     const toolType = component?.config?.type || "unknown type";
     return `${action} ${toolType} tool: ${name}`;
   }
   return `${action} ${componentType}: ${name}`;
 }
 function generateComponentChangeSummary(componentType, fieldChanges) {
-  if (componentType === "tool") {
+  if (componentType === "tools") {
     const configChanges = fieldChanges.filter((c) => c.field.startsWith("config"));
     if (configChanges.length > 0) {
       return `Configuration updated (${configChanges.length} changes)`;
@@ -238279,26 +238294,8 @@ function extractStatusComponentsFromProject(project) {
 }
 function groupChangesByType(changes) {
   const result = createEmptyComponentChanges();
-  const typeMapping = {
-    agent: "agents",
-    subAgent: "subAgents",
-    tool: "tools",
-    functionTool: "functionTools",
-    function: "functions",
-    dataComponent: "dataComponents",
-    artifactComponent: "artifactComponents",
-    statusComponent: "statusComponents",
-    environment: "environments",
-    contextConfig: "contextConfigs",
-    fetchDefinition: "fetchDefinitions",
-    header: "headers",
-    credential: "credentials",
-    externalAgent: "externalAgents",
-    models: "models"
-  };
   changes.forEach((change) => {
-    const groupKey = typeMapping[change.componentType];
-    const group = result[groupKey];
+    const group = result[change.componentType];
     if (group && !group[change.changeType].includes(change.componentId)) {
       group[change.changeType].push(change.componentId);
     }
@@ -238341,14 +238338,14 @@ function compareContextConfigs(localProject, remoteProject, localRegistry, debug
     }
     if (!localContextConfig && remoteContextConfig) {
       changes.push({
-        componentType: "contextConfig",
+        componentType: "contextConfigs",
         componentId: contextId,
         changeType: "added",
         summary: `Added contextConfig for agent: ${agentId}`
       });
     } else if (localContextConfig && !remoteContextConfig) {
       changes.push({
-        componentType: "contextConfig",
+        componentType: "contextConfigs",
         componentId: contextId,
         changeType: "deleted",
         summary: `Removed contextConfig for agent: ${agentId}`
@@ -238358,7 +238355,7 @@ function compareContextConfigs(localProject, remoteProject, localRegistry, debug
       const filteredChanges = fieldChanges.filter((change) => change.field !== "id");
       if (filteredChanges.length > 0) {
         changes.push({
-          componentType: "contextConfig",
+          componentType: "contextConfigs",
           componentId: contextId,
           changeType: "modified",
           changedFields: filteredChanges,
@@ -238409,14 +238406,14 @@ function compareFetchDefinitions(localProject, remoteProject, debug) {
     const { local, remote } = configs;
     if (!local && remote) {
       changes.push({
-        componentType: "fetchDefinition",
+        componentType: "fetchDefinitions",
         componentId: fetchId,
         changeType: "added",
         summary: `Added fetchDefinition: ${fetchId}`
       });
     } else if (local && !remote) {
       changes.push({
-        componentType: "fetchDefinition",
+        componentType: "fetchDefinitions",
         componentId: fetchId,
         changeType: "deleted",
         summary: `Removed fetchDefinition: ${fetchId}`
@@ -238426,7 +238423,7 @@ function compareFetchDefinitions(localProject, remoteProject, debug) {
       const remoteStr = JSON.stringify(remote, null, 2);
       if (localStr !== remoteStr) {
         changes.push({
-          componentType: "fetchDefinition",
+          componentType: "fetchDefinitions",
           componentId: fetchId,
           changeType: "modified",
           summary: `Modified fetchDefinition: ${fetchId}`
@@ -238523,8 +238520,8 @@ function parseFileForComponents(filePath, projectRoot, debug = false) {
       const variableName = match2[1];
       const functionName = match2[2];
       const componentId = match2[3];
-      const componentType = COMPONENT_TYPE_MAP[functionName];
-      if (componentType) {
+      const componentType = FUNCTION_NAME_TO_TYPE[functionName];
+      if (componentType && VALID_COMPONENT_TYPES.has(componentType)) {
         const lineNumber = content.substring(0, match2.index).split("\n").length;
         components.push({
           id: componentId,
@@ -238540,8 +238537,8 @@ function parseFileForComponents(filePath, projectRoot, debug = false) {
       const variableName = match2[1];
       const functionName = match2[2];
       const componentId = match2[3];
-      const componentType = COMPONENT_TYPE_MAP[functionName];
-      if (componentType) {
+      const componentType = FUNCTION_NAME_TO_TYPE[functionName];
+      if (componentType && VALID_COMPONENT_TYPES.has(componentType) && componentType === "statusComponents") {
         const lineNumber = content.substring(0, match2.index).split("\n").length;
         components.push({
           id: componentId,
@@ -238557,8 +238554,8 @@ function parseFileForComponents(filePath, projectRoot, debug = false) {
       const variableName = match2[1];
       const functionName = match2[2];
       const componentId = match2[3];
-      const componentType = COMPONENT_TYPE_MAP[functionName];
-      if (componentType && componentType === "functionTool") {
+      const componentType = FUNCTION_NAME_TO_TYPE[functionName];
+      if (VALID_COMPONENT_TYPES.has(componentType) && componentType === "functionTools") {
         const lineNumber = content.substring(0, match2.index).split("\n").length;
         components.push({
           id: componentId,
@@ -238574,8 +238571,8 @@ function parseFileForComponents(filePath, projectRoot, debug = false) {
       const variableName = match2[1];
       const functionName = match2[2];
       const componentId = match2[3];
-      const componentType = COMPONENT_TYPE_MAP[functionName];
-      if (componentType && exportedVariables.has(variableName)) {
+      const componentType = FUNCTION_NAME_TO_TYPE[functionName];
+      if (VALID_COMPONENT_TYPES.has(componentType) && exportedVariables.has(variableName)) {
         const lineNumber = content.substring(0, match2.index).split("\n").length;
         components.push({
           id: componentId,
@@ -238592,8 +238589,8 @@ function parseFileForComponents(filePath, projectRoot, debug = false) {
       const variableName = match2[1];
       const functionName = match2[2];
       const componentId = match2[3];
-      const componentType = COMPONENT_TYPE_MAP[functionName];
-      if (componentType && exportedVariables.has(variableName)) {
+      const componentType = FUNCTION_NAME_TO_TYPE[functionName];
+      if (componentType && VALID_COMPONENT_TYPES.has(componentType) && componentType === "statusComponents" && exportedVariables.has(variableName)) {
         const lineNumber = content.substring(0, match2.index).split("\n").length;
         components.push({
           id: componentId,
@@ -238610,8 +238607,8 @@ function parseFileForComponents(filePath, projectRoot, debug = false) {
       const variableName = match2[1];
       const functionName = match2[2];
       const componentId = match2[3];
-      const componentType = COMPONENT_TYPE_MAP[functionName];
-      if (componentType && componentType === "functionTool" && exportedVariables.has(variableName)) {
+      const componentType = FUNCTION_NAME_TO_TYPE[functionName];
+      if (VALID_COMPONENT_TYPES.has(componentType) && componentType === "functionTools" && exportedVariables.has(variableName)) {
         const lineNumber = content.substring(0, match2.index).split("\n").length;
         components.push({
           id: componentId,
@@ -238628,8 +238625,8 @@ function parseFileForComponents(filePath, projectRoot, debug = false) {
       const variableName = match2[1];
       const functionName = match2[2];
       const componentId = match2[3];
-      const componentType = COMPONENT_TYPE_MAP[functionName];
-      if (componentType && !exportedVariables.has(variableName)) {
+      const componentType = FUNCTION_NAME_TO_TYPE[functionName];
+      if (VALID_COMPONENT_TYPES.has(componentType) && !exportedVariables.has(variableName)) {
         const lineNumber = content.substring(0, match2.index).split("\n").length;
         components.push({
           id: componentId,
@@ -238646,8 +238643,8 @@ function parseFileForComponents(filePath, projectRoot, debug = false) {
       const variableName = match2[1];
       const functionName = match2[2];
       const componentId = match2[3];
-      const componentType = COMPONENT_TYPE_MAP[functionName];
-      if (componentType && !exportedVariables.has(variableName)) {
+      const componentType = FUNCTION_NAME_TO_TYPE[functionName];
+      if (componentType && VALID_COMPONENT_TYPES.has(componentType) && componentType === "statusComponents" && !exportedVariables.has(variableName)) {
         const lineNumber = content.substring(0, match2.index).split("\n").length;
         components.push({
           id: componentId,
@@ -238664,8 +238661,8 @@ function parseFileForComponents(filePath, projectRoot, debug = false) {
       const variableName = match2[1];
       const functionName = match2[2];
       const componentId = match2[3];
-      const componentType = COMPONENT_TYPE_MAP[functionName];
-      if (componentType && componentType === "functionTool" && !exportedVariables.has(variableName)) {
+      const componentType = FUNCTION_NAME_TO_TYPE[functionName];
+      if (componentType && VALID_COMPONENT_TYPES.has(componentType) && componentType === "functionTools" && !exportedVariables.has(variableName)) {
         const lineNumber = content.substring(0, match2.index).split("\n").length;
         components.push({
           id: componentId,
@@ -238678,8 +238675,8 @@ function parseFileForComponents(filePath, projectRoot, debug = false) {
         });
       }
     }
-    const componentTypes = Object.keys(COMPONENT_TYPE_MAP);
-    for (const funcName of componentTypes) {
+    const functionNames = Object.keys(FUNCTION_NAME_TO_TYPE);
+    for (const funcName of functionNames) {
       const inlineIdPattern = new RegExp(
         `(?<!(?:export\\s+)?const\\s+\\w+\\s*=\\s*)\\b${funcName}\\s*\\(\\s*\\{[^}]*?id:\\s*['"\`]([^'"\`]+)['"\`]`,
         "gs"
@@ -238687,7 +238684,7 @@ function parseFileForComponents(filePath, projectRoot, debug = false) {
       let inlineMatch;
       while ((inlineMatch = inlineIdPattern.exec(content)) !== null) {
         const componentId = inlineMatch[1];
-        const componentType = COMPONENT_TYPE_MAP[funcName];
+        const componentType = FUNCTION_NAME_TO_TYPE[funcName];
         const lineNumber = content.substring(0, inlineMatch.index).split("\n").length;
         components.push({
           id: componentId,
@@ -238706,7 +238703,7 @@ function parseFileForComponents(filePath, projectRoot, debug = false) {
         );
         while ((inlineMatch = inlineNamePattern.exec(content)) !== null) {
           const componentId = inlineMatch[1];
-          const componentType = COMPONENT_TYPE_MAP[funcName];
+          const componentType = FUNCTION_NAME_TO_TYPE[funcName];
           const lineNumber = content.substring(0, inlineMatch.index).split("\n").length;
           components.push({
             id: componentId,
@@ -238732,7 +238729,7 @@ function parseFileForComponents(filePath, projectRoot, debug = false) {
         const lineNumber = content.substring(0, envMatch.index).split("\n").length;
         components.push({
           id: credentialId,
-          type: "credential",
+          type: "credentials",
           filePath: relativePath,
           variableName: credentialKey,
           // Use the key name as variable name
@@ -238770,10 +238767,6 @@ function scanProjectForComponents(projectRoot, debug = false) {
   scanDirectory(projectRoot);
   return allComponents;
 }
-function generateVariableName(componentId, componentType) {
-  const camelCase = componentId.toLowerCase().replace(/[-_](.)/g, (_, char) => char.toUpperCase()).replace(/[^a-zA-Z0-9]/g, "").replace(/^[0-9]/, "_$&");
-  return camelCase || `${componentType}Component`;
-}
 function buildComponentRegistryFromParsing(projectRoot, debug = false) {
   const registry2 = new ComponentRegistry();
   const allComponents = scanProjectForComponents(projectRoot, debug);
@@ -238804,12 +238797,12 @@ function buildComponentRegistryFromParsing(projectRoot, debug = false) {
         component.isInline
       );
     } else {
-      const generatedName = generateVariableName(component.id, component.type);
       registry2.register(
         component.id,
         component.type,
         component.filePath,
-        generatedName,
+        void 0,
+        // Let registry handle naming with conflict resolution
         true
         // isInline = true
       );
@@ -238832,28 +238825,42 @@ function getAllLocalComponentIds(projectRoot) {
   const allComponents = scanProjectForComponents(projectRoot, false);
   return new Set(allComponents.map((comp) => comp.id));
 }
-var COMPONENT_TYPE_MAP;
+var VALID_COMPONENT_TYPES, FUNCTION_NAME_TO_TYPE;
 var init_component_parser = __esm({
   "src/commands/pull-v3/component-parser.ts"() {
     "use strict";
     init_esm_shims();
     init_component_registry();
-    COMPONENT_TYPE_MAP = {
+    VALID_COMPONENT_TYPES = /* @__PURE__ */ new Set([
+      "project",
+      "agents",
+      "subAgents",
+      "tools",
+      "functionTools",
+      "dataComponents",
+      "artifactComponents",
+      "statusComponents",
+      "externalAgents",
+      "credentials",
+      "contextConfigs",
+      "fetchDefinitions",
+      "headers"
+    ]);
+    FUNCTION_NAME_TO_TYPE = {
       project: "project",
-      agent: "agent",
-      subAgent: "subAgent",
-      tool: "tool",
-      mcpTool: "tool",
-      // MCP tools are a type of tool
-      functionTool: "functionTool",
-      dataComponent: "dataComponent",
-      artifactComponent: "artifactComponent",
-      statusComponent: "statusComponent",
-      externalAgent: "externalAgent",
-      credential: "credential",
-      contextConfig: "contextConfig",
-      fetchDefinition: "fetchDefinition",
-      headers: "headers"
+      agent: "agents",
+      subAgent: "subAgents",
+      tool: "tools",
+      functionTool: "functionTools",
+      dataComponent: "dataComponents",
+      artifactComponent: "artifactComponents",
+      statusComponent: "statusComponents",
+      externalAgent: "externalAgents",
+      credential: "credentials",
+      contextConfig: "contextConfigs",
+      fetchDefinition: "fetchDefinitions",
+      header: "headers",
+      mcpTool: "tools"
     };
   }
 });
@@ -239851,9 +239858,6 @@ import chalk13 from "chalk";
 function toKebabCase(id) {
   return id.replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase().replace(/[_]/g, "-");
 }
-function generateVariableName2(componentId) {
-  return componentId.toLowerCase().replace(/[-_](.)/g, (_, char) => char.toUpperCase()).replace(/[^a-zA-Z0-9]/g, "").replace(/^[0-9]/, "_$&");
-}
 function determineNewFilePath(componentType, componentId, paths) {
   const fileName = `${toKebabCase(componentId)}.ts`;
   switch (componentType) {
@@ -240000,23 +240004,20 @@ async function createNewComponents(comparison, remoteProject, localRegistry, pat
         (tempDirName ? targetPaths.projectRoot : paths.projectRoot) + "/",
         ""
       );
-      let variableName;
+      let explicitVariableName;
       if (componentType === "contextConfigs") {
         const contextResult = findContextConfigData2(remoteProject, componentId);
         if (contextResult) {
-          variableName = `${toCamelCase(contextResult.agentId)}Context`;
-        } else {
-          variableName = generateVariableName2(componentId);
+          explicitVariableName = `${toCamelCase(contextResult.agentId)}Context`;
         }
-      } else {
-        variableName = generateVariableName2(componentId);
       }
       localRegistry.register(
         componentId,
-        componentType.slice(0, -1),
-        // Remove 's' from plural
+        componentType,
+        // componentType now matches ComponentType directly
         relativePath,
-        variableName,
+        explicitVariableName,
+        // Only provide explicit name for contextConfigs, undefined for others
         false
         // isInline = false (new exported component)
       );
@@ -240103,7 +240104,12 @@ async function createNewComponents(comparison, remoteProject, localRegistry, pat
         }
         writeFileSync6(filePath, content, "utf8");
         const registryEntry = localRegistry.get(componentId, componentType);
-        const variableName = registryEntry?.name || generateVariableName2(componentId);
+        if (!registryEntry) {
+          throw new Error(
+            `Component ${componentId} (${componentType}) was not registered in the registry`
+          );
+        }
+        const variableName = registryEntry.name;
         results.push({
           componentId,
           componentType,
@@ -240231,12 +240237,12 @@ async function generateProjectIndex(projectRoot, remoteProject, localRegistry, p
   const registryComponents = localRegistry.getAllComponents();
   const projectDataWithRegistry = {
     ...remoteProject,
-    agents: registryComponents.filter((c) => c.type === "agent").map((c) => c.id),
-    tools: registryComponents.filter((c) => c.type === "tool").map((c) => c.id),
-    externalAgents: registryComponents.filter((c) => c.type === "externalAgent").map((c) => c.id),
-    dataComponents: registryComponents.filter((c) => c.type === "dataComponent").map((c) => c.id),
-    artifactComponents: registryComponents.filter((c) => c.type === "artifactComponent").map((c) => c.id),
-    credentialReferences: registryComponents.filter((c) => c.type === "credential").map((c) => c.id)
+    agents: registryComponents.filter((c) => c.type === "agents").map((c) => c.id),
+    tools: registryComponents.filter((c) => c.type === "tools").map((c) => c.id),
+    externalAgents: registryComponents.filter((c) => c.type === "externalAgents").map((c) => c.id),
+    dataComponents: registryComponents.filter((c) => c.type === "dataComponents").map((c) => c.id),
+    artifactComponents: registryComponents.filter((c) => c.type === "artifactComponents").map((c) => c.id),
+    credentialReferences: registryComponents.filter((c) => c.type === "credentials").map((c) => c.id)
   };
   const content = generateProjectFile(
     projectId,
@@ -240571,6 +240577,28 @@ async function pullV3Command(options) {
     const { buildComponentRegistryFromParsing: buildComponentRegistryFromParsing2 } = await Promise.resolve().then(() => (init_component_parser(), component_parser_exports));
     const localRegistry = buildComponentRegistryFromParsing2(paths.projectRoot, options.debug);
     s.message("Component registry built");
+    if (options.debug) {
+      console.log(chalk14.cyan("\n\u{1F50D} Component Registry Debug:"));
+      const allComponents = localRegistry.getAllComponents();
+      console.log(chalk14.gray("   Total components registered:"), allComponents.length);
+      const nameGroups = /* @__PURE__ */ new Map();
+      for (const comp of allComponents) {
+        if (!nameGroups.has(comp.name)) {
+          nameGroups.set(comp.name, []);
+        }
+        nameGroups.get(comp.name).push(comp);
+      }
+      for (const [varName, components] of nameGroups.entries()) {
+        if (components.length > 1) {
+          console.log(chalk14.red(`   \u274C Variable name conflict: "${varName}"`));
+          for (const comp of components) {
+            console.log(chalk14.gray(`      - ${comp.type}:${comp.id} -> ${comp.filePath}`));
+          }
+        } else {
+          console.log(chalk14.gray(`   \u2705 ${varName} (${components[0].type}:${components[0].id})`));
+        }
+      }
+    }
     s.start("Comparing projects for changes...");
     const comparison = await compareProjects(
       localProject,
@@ -240613,6 +240641,28 @@ async function pullV3Command(options) {
         options.env || "development",
         tempDirName
       );
+      if (options.debug) {
+        console.log(chalk14.cyan("\n\u{1F50D} Component Registry After Generation:"));
+        const allComponents = localRegistry.getAllComponents();
+        console.log(chalk14.gray("   Total components registered:"), allComponents.length);
+        const nameGroups = /* @__PURE__ */ new Map();
+        for (const comp of allComponents) {
+          if (!nameGroups.has(comp.name)) {
+            nameGroups.set(comp.name, []);
+          }
+          nameGroups.get(comp.name).push(comp);
+        }
+        for (const [varName, components] of nameGroups.entries()) {
+          if (components.length > 1) {
+            console.log(chalk14.red(`   \u274C Variable name conflict: "${varName}"`));
+            for (const comp of components) {
+              console.log(chalk14.gray(`      - ${comp.type}:${comp.id} -> ${comp.filePath}`));
+            }
+          } else {
+            console.log(chalk14.gray(`   \u2705 ${varName} (${components[0].type}:${components[0].id})`));
+          }
+        }
+      }
       const successful = newComponentResults.filter((r) => r.success);
       console.log(chalk14.green(`\u2705 Added ${successful.length} new components to temp directory`));
       s.message("New component files created");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inkeep/agents-cli",
-  "version": "0.0.0-dev-20251105034049",
+  "version": "0.0.0-dev-20251105201335",
   "description": "Inkeep CLI tool",
   "type": "module",
   "main": "./dist/index.js",
@@ -49,8 +49,8 @@
     "ts-morph": "^26.0.0",
     "tsx": "^4.20.5",
     "open": "^10.2.0",
-    "@inkeep/agents-core": "^0.0.0-dev-20251105034049",
-    "@inkeep/agents-sdk": "^0.0.0-dev-20251105034049"
+    "@inkeep/agents-core": "^0.0.0-dev-20251105201335",
+    "@inkeep/agents-sdk": "^0.0.0-dev-20251105201335"
   },
   "devDependencies": {
     "@types/degit": "^2.8.6",
@@ -63,7 +63,7 @@
     "vitest": "^3.2.4"
   },
   "peerDependencies": {
-    "@inkeep/agents-manage-ui": "0.0.0-dev-20251105034049",
+    "@inkeep/agents-manage-ui": "0.0.0-dev-20251105201335",
     "zod": "^4.1.11"
   },
   "engines": {