@inkeep/agents-cli 0.33.0 → 0.33.1

package/dist/index.js

@@ -14067,7 +14067,7 @@ var require_typescript = __commonJS({
         SymbolDisplayPartKind: () => SymbolDisplayPartKind,
         SymbolFlags: () => SymbolFlags,
         SymbolFormatFlags: () => SymbolFormatFlags,
-        SyntaxKind: () => SyntaxKind,
+        SyntaxKind: () => SyntaxKind2,
         Ternary: () => Ternary,
         ThrottledCancellationToken: () => ThrottledCancellationToken,
         TokenClass: () => TokenClass,
@@ -17954,7 +17954,7 @@ Node ${formatSyntaxKind(node.kind)} was unexpected.`,
         function formatSyntaxKind(kind) {
           return formatEnum(
             kind,
-            SyntaxKind,
+            SyntaxKind2,
             /*isFlags*/
             false
           );
@@ -19402,7 +19402,7 @@ ${lanes.join("\n")}
       })(tracingEnabled || (tracingEnabled = {}));
       var startTracing = tracingEnabled.startTracing;
       var dumpTracingLegend = tracingEnabled.dumpLegend;
-      var SyntaxKind = /* @__PURE__ */ ((SyntaxKind5) => {
+      var SyntaxKind2 = /* @__PURE__ */ ((SyntaxKind5) => {
         SyntaxKind5[SyntaxKind5["Unknown"] = 0] = "Unknown";
         SyntaxKind5[SyntaxKind5["EndOfFileToken"] = 1] = "EndOfFileToken";
         SyntaxKind5[SyntaxKind5["SingleLineCommentTrivia"] = 2] = "SingleLineCommentTrivia";
@@ -19908,7 +19908,7 @@ ${lanes.join("\n")}
           /* LastKeyword */
         ] = "LastContextualKeyword";
         return SyntaxKind5;
-      })(SyntaxKind || {});
+      })(SyntaxKind2 || {});
       var NodeFlags = /* @__PURE__ */ ((NodeFlags3) => {
         NodeFlags3[NodeFlags3["None"] = 0] = "None";
         NodeFlags3[NodeFlags3["Let"] = 1] = "Let";
@@ -35992,7 +35992,7 @@ ${lanes.join("\n")}
           this.checker = checker;
         }
       }
-      function Node4(kind, pos, end) {
+      function Node42(kind, pos, end) {
         this.pos = pos;
         this.end = end;
         this.kind = kind;
@@ -36031,11 +36031,11 @@ ${lanes.join("\n")}
         this.skipTrivia = skipTrivia2 || ((pos) => pos);
       }
       var objectAllocator = {
-        getNodeConstructor: () => Node4,
+        getNodeConstructor: () => Node42,
         getTokenConstructor: () => Token,
         getIdentifierConstructor: () => Identifier2,
-        getPrivateIdentifierConstructor: () => Node4,
-        getSourceFileConstructor: () => Node4,
+        getPrivateIdentifierConstructor: () => Node42,
+        getSourceFileConstructor: () => Node42,
         getSymbolConstructor: () => Symbol4,
         getTypeConstructor: () => Type3,
         getSignatureConstructor: () => Signature2,
@@ -209570,7 +209570,7 @@ ${options.prefix}` : "\n" : options.prefix
         SymbolDisplayPartKind: () => SymbolDisplayPartKind,
         SymbolFlags: () => SymbolFlags,
         SymbolFormatFlags: () => SymbolFormatFlags,
-        SyntaxKind: () => SyntaxKind,
+        SyntaxKind: () => SyntaxKind2,
         Ternary: () => Ternary,
         ThrottledCancellationToken: () => ThrottledCancellationToken,
         TokenClass: () => TokenClass,
@@ -211813,7 +211813,7 @@ ${options.prefix}` : "\n" : options.prefix
         LogLevel: () => LogLevel2,
         Msg: () => Msg,
         OpenFileInfoTelemetryEvent: () => OpenFileInfoTelemetryEvent,
-        Project: () => Project2,
+        Project: () => Project22,
         ProjectInfoTelemetryEvent: () => ProjectInfoTelemetryEvent,
         ProjectKind: () => ProjectKind,
         ProjectLanguageServiceStateEvent: () => ProjectLanguageServiceStateEvent,
@@ -213269,7 +213269,7 @@ ${options.prefix}` : "\n" : options.prefix
         }
         return !arrayIsEqualTo(imports1, imports2);
       }
-      var Project2 = class _Project {
+      var Project22 = class _Project {
         /** @internal */
         constructor(projectName, projectKind, projectService, hasExplicitListOfFiles, lastFileExceededProgramSize, compilerOptions, compileOnSaveEnabled, watchOptions, directoryStructureHost, currentDirectory) {
           this.projectKind = projectKind;
@@ -214938,7 +214938,7 @@ ${options.prefix}` : "\n" : options.prefix
           return unresolvedImports || emptyArray2;
         });
       }
-      var InferredProject2 = class extends Project2 {
+      var InferredProject2 = class extends Project22 {
         /** @internal */
         constructor(projectService, compilerOptions, watchOptions, projectRootPath, currentDirectory, typeAcquisition) {
           super(
@@ -215030,7 +215030,7 @@ ${options.prefix}` : "\n" : options.prefix
           };
         }
       };
-      var AuxiliaryProject = class extends Project2 {
+      var AuxiliaryProject = class extends Project22 {
         constructor(hostProject) {
           super(
             hostProject.projectService.newAuxiliaryProjectName(),
@@ -215056,7 +215056,7 @@ ${options.prefix}` : "\n" : options.prefix
           return;
         }
       };
-      var _AutoImportProviderProject = class _AutoImportProviderProject2 extends Project2 {
+      var _AutoImportProviderProject = class _AutoImportProviderProject2 extends Project22 {
         /** @internal */
         constructor(hostProject, initialRootNames, compilerOptions) {
           super(
@@ -215325,7 +215325,7 @@ ${options.prefix}` : "\n" : options.prefix
         noLib: true
       };
       var AutoImportProviderProject = _AutoImportProviderProject;
-      var ConfiguredProject2 = class extends Project2 {
+      var ConfiguredProject2 = class extends Project22 {
         /** @internal */
         constructor(configFileName, canonicalConfigFilePath, projectService, cachedDirectoryStructureHost, pendingUpdateReason) {
           super(
@@ -215527,7 +215527,7 @@ ${options.prefix}` : "\n" : options.prefix
           );
         }
       };
-      var ExternalProject = class extends Project2 {
+      var ExternalProject = class extends Project22 {
         /** @internal */
         constructor(externalProjectName, projectService, compilerOptions, lastFileExceededProgramSize, compileOnSaveEnabled, projectFilePath, watchOptions) {
           super(
@@ -219314,7 +219314,7 @@ Dynamic files must always be opened with service's current directory or service
             return;
           }
           if (this.host.importPlugin) {
-            const importPromise = Project2.importServicePluginAsync(
+            const importPromise = Project22.importServicePluginAsync(
               pluginConfigEntry,
               searchPaths,
               this.host,
@@ -219328,7 +219328,7 @@ Dynamic files must always be opened with service's current directory or service
           }
           this.endEnablePlugin(
             project,
-            Project2.importServicePluginSync(
+            Project22.importServicePluginSync(
               pluginConfigEntry,
               searchPaths,
               this.host,
@@ -224552,7 +224552,7 @@ Additional information: BADCLIENT: Bad error code, ${badCode} not found in range
         LogLevel: () => LogLevel2,
         Msg: () => Msg,
         OpenFileInfoTelemetryEvent: () => OpenFileInfoTelemetryEvent,
-        Project: () => Project2,
+        Project: () => Project22,
         ProjectInfoTelemetryEvent: () => ProjectInfoTelemetryEvent,
         ProjectKind: () => ProjectKind,
         ProjectLanguageServiceStateEvent: () => ProjectLanguageServiceStateEvent,
@@ -226534,7 +226534,7 @@ var require_codegen = __commonJS({
       AND: new code_1._Code("&&"),
       ADD: new code_1._Code("+")
     };
-    var Node3 = class {
+    var Node5 = class {
       optimizeNodes() {
         return this;
       }
@@ -226542,7 +226542,7 @@ var require_codegen = __commonJS({
         return this;
       }
     };
-    var Def = class extends Node3 {
+    var Def = class extends Node5 {
       constructor(varKind, name2, rhs) {
         super();
         this.varKind = varKind;
@@ -226565,7 +226565,7 @@ var require_codegen = __commonJS({
         return this.rhs instanceof code_1._CodeOrName ? this.rhs.names : {};
       }
     };
-    var Assign = class extends Node3 {
+    var Assign = class extends Node5 {
       constructor(lhs, rhs, sideEffects) {
         super();
         this.lhs = lhs;
@@ -226595,7 +226595,7 @@ var require_codegen = __commonJS({
         return `${this.lhs} ${this.op}= ${this.rhs};` + _n2;
       }
     };
-    var Label = class extends Node3 {
+    var Label = class extends Node5 {
       constructor(label) {
         super();
         this.label = label;
@@ -226605,7 +226605,7 @@ var require_codegen = __commonJS({
         return `${this.label}:` + _n2;
       }
     };
-    var Break = class extends Node3 {
+    var Break = class extends Node5 {
       constructor(label) {
         super();
         this.label = label;
@@ -226616,7 +226616,7 @@ var require_codegen = __commonJS({
         return `break${label};` + _n2;
       }
     };
-    var Throw = class extends Node3 {
+    var Throw = class extends Node5 {
       constructor(error) {
         super();
         this.error = error;
@@ -226628,7 +226628,7 @@ var require_codegen = __commonJS({
         return this.error.names;
       }
     };
-    var AnyCode = class extends Node3 {
+    var AnyCode = class extends Node5 {
       constructor(code) {
         super();
         this.code = code;
@@ -226647,7 +226647,7 @@ var require_codegen = __commonJS({
         return this.code instanceof code_1._CodeOrName ? this.code.names : {};
       }
     };
-    var ParentNode = class extends Node3 {
+    var ParentNode = class extends Node5 {
       constructor(nodes = []) {
         super();
         this.nodes = nodes;
@@ -235263,6 +235263,171 @@ var init_project_loader = __esm({
   }
 });
 
+// src/utils/json-comparator.ts
+function compareJsonObjects(obj1, obj2, options = {}) {
+  const {
+    ignoreArrayOrder = true,
+    ignoreCase = false,
+    ignoreWhitespace = false,
+    ignorePaths = []
+  } = options;
+  const differences = [];
+  const stats = {
+    totalKeys: 0,
+    differentKeys: 0,
+    missingKeys: 0,
+    extraKeys: 0
+  };
+  function normalizeValue(value) {
+    if (typeof value === "string") {
+      let normalized = value;
+      if (ignoreCase) {
+        normalized = normalized.toLowerCase();
+      }
+      if (ignoreWhitespace) {
+        normalized = normalized.trim().replace(/\s+/g, " ");
+      }
+      return normalized;
+    }
+    return value;
+  }
+  function shouldIgnorePath(path5) {
+    return ignorePaths.some((ignorePath) => {
+      if (ignorePath.endsWith("*")) {
+        return path5.startsWith(ignorePath.slice(0, -1));
+      }
+      return path5 === ignorePath;
+    });
+  }
+  function compareValues(value1, value2, path5 = "") {
+    if (shouldIgnorePath(path5)) {
+      return true;
+    }
+    if (value1 === null || value1 === void 0) {
+      if (value2 === null || value2 === void 0) {
+        return true;
+      }
+      differences.push({
+        path: path5,
+        type: "different",
+        value1,
+        value2,
+        description: `Null/undefined mismatch: ${value1} vs ${value2}`
+      });
+      return false;
+    }
+    if (value2 === null || value2 === void 0) {
+      differences.push({
+        path: path5,
+        type: "different",
+        value1,
+        value2,
+        description: `Null/undefined mismatch: ${value1} vs ${value2}`
+      });
+      return false;
+    }
+    if (typeof value1 !== typeof value2) {
+      differences.push({
+        path: path5,
+        type: "type_mismatch",
+        value1,
+        value2,
+        description: `Type mismatch: ${typeof value1} vs ${typeof value2}`
+      });
+      return false;
+    }
+    if (typeof value1 !== "object") {
+      const normalized1 = normalizeValue(value1);
+      const normalized2 = normalizeValue(value2);
+      if (normalized1 !== normalized2) {
+        differences.push({
+          path: path5,
+          type: "different",
+          value1,
+          value2,
+          description: `Value mismatch: ${value1} vs ${value2}`
+        });
+        return false;
+      }
+      return true;
+    }
+    if (Array.isArray(value1) && Array.isArray(value2)) {
+      if (value1.length !== value2.length) {
+        differences.push({
+          path: path5,
+          type: "different",
+          value1: value1.length,
+          value2: value2.length,
+          description: `Array length mismatch: ${value1.length} vs ${value2.length}`
+        });
+        return false;
+      }
+      if (ignoreArrayOrder) {
+        const sorted1 = [...value1].sort(
+          (a2, b3) => JSON.stringify(a2).localeCompare(JSON.stringify(b3))
+        );
+        const sorted2 = [...value2].sort(
+          (a2, b3) => JSON.stringify(a2).localeCompare(JSON.stringify(b3))
+        );
+        for (let i3 = 0; i3 < sorted1.length; i3++) {
+          compareValues(sorted1[i3], sorted2[i3], `${path5}[${i3}]`);
+        }
+      } else {
+        for (let i3 = 0; i3 < value1.length; i3++) {
+          compareValues(value1[i3], value2[i3], `${path5}[${i3}]`);
+        }
+      }
+      return true;
+    }
+    if (typeof value1 === "object" && typeof value2 === "object") {
+      const keys1 = Object.keys(value1);
+      const keys2 = Object.keys(value2);
+      const allKeys = /* @__PURE__ */ new Set([...keys1, ...keys2]);
+      stats.totalKeys += allKeys.size;
+      for (const key of allKeys) {
+        const currentPath = path5 ? `${path5}.${key}` : key;
+        if (!keys1.includes(key)) {
+          differences.push({
+            path: currentPath,
+            type: "missing",
+            value2: value2[key],
+            description: `Missing key in first object: ${key}`
+          });
+          stats.missingKeys++;
+          continue;
+        }
+        if (!keys2.includes(key)) {
+          differences.push({
+            path: currentPath,
+            type: "extra",
+            value1: value1[key],
+            description: `Extra key in first object: ${key}`
+          });
+          stats.extraKeys++;
+          continue;
+        }
+        if (!compareValues(value1[key], value2[key], currentPath)) {
+          stats.differentKeys++;
+        }
+      }
+      return true;
+    }
+    return true;
+  }
+  compareValues(obj1, obj2);
+  return {
+    isEqual: differences.length === 0,
+    differences,
+    stats
+  };
+}
+var init_json_comparator = __esm({
+  "src/utils/json-comparator.ts"() {
+    "use strict";
+    init_esm_shims();
+  }
+});
+
 // src/commands/pull-v3/utils/generator-utils.ts
 function toCamelCase(str) {
   const result = str.replace(/[-_](.)/g, (_3, char) => char.toUpperCase()).replace(/[^a-zA-Z0-9]/g, "").replace(/^[0-9]/, "_$&");
@@ -235464,7 +235629,11 @@ function hasDistinctModels(agentModels, projectModels) {
         if (!agentOptions || !projectOptions) {
           return true;
         }
-        if (JSON.stringify(agentOptions) !== JSON.stringify(projectOptions)) {
+        const comparison = compareJsonObjects(agentOptions, projectOptions, {
+          ignoreArrayOrder: true,
+          showDetails: false
+        });
+        if (!comparison.isEqual) {
           return true;
         }
       }
@@ -235593,6 +235762,20 @@ function generateAgentDefinition(agentId, agentData, style = DEFAULT_STYLE, regi
       lines.push(`${indentation}contextConfig: undefined,`);
     }
   }
+  if (agentData.credentials && Array.isArray(agentData.credentials) && agentData.credentials.length > 0) {
+    if (!registry2) {
+      throw new Error("Registry is required for credentials generation");
+    }
+    const credentialVars = agentData.credentials.map((cred) => {
+      const credVarName = registry2.getVariableName(cred.id, "credentials");
+      if (!credVarName) {
+        throw new Error(`Failed to resolve variable name for credential: ${cred.id}`);
+      }
+      return credVarName;
+    });
+    const credentialsArray = `[${credentialVars.join(", ")}]`;
+    lines.push(`${indentation}credentials: () => ${credentialsArray},`);
+  }
   if (agentData.stopWhen) {
     const stopWhenFormatted = formatStopWhen(agentData.stopWhen, style, 1);
     if (stopWhenFormatted) {
@@ -235616,11 +235799,11 @@ function generateAgentDefinition(agentId, agentData, style = DEFAULT_STYLE, regi
   lines.push(`})${semi}`);
   return lines.join("\n");
 }
-function generateAgentImports(agentId, agentData, style = DEFAULT_STYLE, registry2, contextConfigData) {
+function generateAgentImports(agentId, agentData, style = DEFAULT_STYLE, registry2, contextConfigData, actualFilePath) {
   const imports = [];
   imports.push(generateImport(["agent"], "@inkeep/agents-sdk", style));
   if (registry2) {
-    const currentFilePath = `agents/${agentId}.ts`;
+    const currentFilePath = actualFilePath || `agents/${agentId}.ts`;
     const referencedComponents = [];
     if (agentData.subAgents && typeof agentData.subAgents === "object") {
       const subAgentIds = Object.keys(agentData.subAgents);
@@ -235650,8 +235833,15 @@ function generateAgentImports(agentId, agentData, style = DEFAULT_STYLE, registr
   }
   return imports;
 }
-function generateAgentFile(agentId, agentData, style = DEFAULT_STYLE, registry2, contextConfigData, projectModels) {
-  const imports = generateAgentImports(agentId, agentData, style, registry2, contextConfigData);
+function generateAgentFile(agentId, agentData, style = DEFAULT_STYLE, registry2, contextConfigData, projectModels, actualFilePath) {
+  const imports = generateAgentImports(
+    agentId,
+    agentData,
+    style,
+    registry2,
+    contextConfigData,
+    actualFilePath
+  );
   const definition = generateAgentDefinition(
     agentId,
     agentData,
@@ -235666,6 +235856,7 @@ var init_agent_generator = __esm({
   "src/commands/pull-v3/components/agent-generator.ts"() {
     "use strict";
     init_esm_shims();
+    init_json_comparator();
     init_generator_utils();
   }
 });
@@ -235823,7 +236014,12 @@ function processFetchConfigTemplates(fetchConfig, headersVarName) {
         );
         return `\`${convertedStr.replace(/`/g, "\\`")}\``;
       } else {
-        return `'${value.replace(/'/g, "\\'")}'`;
+        const isMultiline = value.includes("\n") || value.length > 80;
+        if (isMultiline) {
+          return `\`${value.replace(/`/g, "\\`")}\``;
+        } else {
+          return `'${value.replace(/'/g, "\\'")}'`;
+        }
       }
     } else if (typeof value === "object" && value !== null) {
       return processObject(value);
@@ -235836,7 +236032,7 @@ function processFetchConfigTemplates(fetchConfig, headersVarName) {
       const items = obj.map((item) => processValue(item)).join(", ");
       return `[${items}]`;
     }
-    const entries = Object.entries(obj).map(([key, val]) => {
+    const entries = Object.entries(obj).filter(([key, val]) => val !== void 0 && val !== null).map(([key, val]) => {
       const processedKey = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(key) ? key : `'${key}'`;
       return `${processedKey}: ${processValue(val)}`;
     });
@@ -235861,7 +236057,7 @@ function generateHeadersDefinition(headersId, headersData, style = DEFAULT_STYLE
   lines.push(`})${semi}`);
   return lines.join("\n");
 }
-function generateFetchDefinitionDefinition(fetchId, fetchData, style = DEFAULT_STYLE, headersVarName) {
+function generateFetchDefinitionDefinition(fetchId, fetchData, style = DEFAULT_STYLE, headersVarName, registry2) {
   const { quotes, semicolons, indentation } = style;
   const q3 = quotes === "single" ? "'" : '"';
   const semi = semicolons ? ";" : "";
@@ -235888,11 +236084,18 @@ function generateFetchDefinitionDefinition(fetchId, fetchData, style = DEFAULT_S
   }
   if (fetchData.defaultValue) {
     if (typeof fetchData.defaultValue === "string") {
-      lines.push(`${indentation}defaultValue: ${formatString(fetchData.defaultValue, q3)},`);
+      const isMultiline = fetchData.defaultValue.includes("\n") || fetchData.defaultValue.length > 80;
+      lines.push(
+        `${indentation}defaultValue: ${formatString(fetchData.defaultValue, q3, isMultiline)},`
+      );
     } else {
       lines.push(`${indentation}defaultValue: ${JSON.stringify(fetchData.defaultValue)},`);
     }
   }
+  if (fetchData.credentialReferenceId && registry2) {
+    const validKey = registry2.getVariableName(fetchData.credentialReferenceId, "credentials");
+    lines.push(`${indentation}credentialReference: ${validKey},`);
+  }
   removeTrailingComma(lines);
   lines.push(`})${semi}`);
   return lines.join("\n");
@@ -235946,7 +236149,7 @@ function generateContextConfigDefinition(contextId, contextData, style = DEFAULT
   lines.push(`})${semi}`);
   return lines.join("\n");
 }
-function generateContextConfigImports(contextId, contextData, style = DEFAULT_STYLE) {
+function generateContextConfigImports(contextId, contextData, style = DEFAULT_STYLE, registry2) {
   const imports = [];
   const coreImports = [];
   if (contextData.headers || hasHeadersInData(contextData)) {
@@ -235962,6 +236165,27 @@ function generateContextConfigImports(contextId, contextData, style = DEFAULT_ST
   if (hasSchemas(contextData)) {
     imports.push(generateImport(["z"], "zod", style));
   }
+  if (registry2 && contextData.contextVariables) {
+    const credentialRefs = [];
+    for (const [varName, varData] of Object.entries(contextData.contextVariables)) {
+      if (varData && typeof varData === "object" && varData.credentialReferenceId) {
+        credentialRefs.push({
+          id: varData.credentialReferenceId,
+          type: "credentials"
+        });
+      }
+    }
+    if (credentialRefs.length > 0) {
+      const contextComponent = registry2.get(contextId, "contextConfigs");
+      if (contextComponent) {
+        const credentialImports = registry2.getImportsForFile(
+          contextComponent.filePath,
+          credentialRefs
+        );
+        imports.push(...credentialImports);
+      }
+    }
+  }
   return imports;
 }
 function hasHeadersInData(contextData) {
@@ -235977,7 +236201,7 @@ function hasSchemas(contextData) {
   return dataStr.includes("schema") || dataStr.includes("responseschema");
 }
 function generateContextConfigFile(contextId, contextData, style = DEFAULT_STYLE, registry2, agentId) {
-  const imports = generateContextConfigImports(contextId, contextData, style);
+  const imports = generateContextConfigImports(contextId, contextData, style, registry2);
   const definitions = [];
   let headersVarName;
   if (contextData.headersSchema) {
@@ -236000,7 +236224,8 @@ function generateContextConfigFile(contextId, contextData, style = DEFAULT_STYLE
           varName,
           varData,
           style,
-          headersVarName
+          headersVarName,
+          registry2
         );
         definitions.push(fetchDefinition2);
       }
@@ -236068,13 +236293,14 @@ function formatRetrievalParams(retrievalParams, style, indentLevel) {
   const indent = indentation.repeat(indentLevel + 1);
   const lines = ["{"];
   for (const [key, value] of Object.entries(retrievalParams)) {
+    const formattedKey = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(key) ? key : `${q3}${key}${q3}`;
     if (typeof value === "string") {
-      lines.push(`${indent}${q3}${key}${q3}: ${formatString3(value, q3)},`);
+      lines.push(`${indent}${formattedKey}: ${formatString3(value, q3)},`);
     } else if (typeof value === "number" || typeof value === "boolean") {
-      lines.push(`${indent}${q3}${key}${q3}: ${JSON.stringify(value)},`);
+      lines.push(`${indent}${formattedKey}: ${JSON.stringify(value)},`);
     } else if (typeof value === "object" && value !== null) {
       lines.push(
-        `${indent}${q3}${key}${q3}: ${formatRetrievalParams(value, style, indentLevel + 1)},`
+        `${indent}${formattedKey}: ${formatRetrievalParams(value, style, indentLevel + 1)},`
       );
     }
   }
@@ -236116,11 +236342,6 @@ function generateCredentialDefinition(credentialId, credentialData, style = DEFA
     } else {
       lines.push(`${indentation}retrievalParams: ${formattedParams},`);
     }
-  } else {
-    const defaultKey = credentialId.toUpperCase().replace(/-/g, "_");
-    lines.push(`${indentation}retrievalParams: {`);
-    lines.push(`${indentation}${indentation}${q3}key${q3}: ${formatString3(defaultKey, q3)}`);
-    lines.push(`${indentation}},`);
   }
   if (lines.length > 0 && lines[lines.length - 1].endsWith(",")) {
     lines[lines.length - 1] = lines[lines.length - 1].slice(0, -1);
@@ -236207,6 +236428,23 @@ function generateDataComponentDefinition(componentId, componentData, style = DEF
     const zodSchema = convertJsonSchemaToZod2(schema);
     lines.push(`${indentation}props: ${zodSchema},`);
   }
+  if (componentData.render && typeof componentData.render === "object") {
+    const render = componentData.render;
+    if (render.component && typeof render.component === "string") {
+      lines.push(`${indentation}render: {`);
+      const componentString = JSON.stringify(render.component);
+      lines.push(`${indentation}${indentation}component: ${componentString},`);
+      if (render.mockData && typeof render.mockData === "object") {
+        const mockDataStr = JSON.stringify(render.mockData, null, 2);
+        const formattedMockData = mockDataStr.split("\n").map((line, index2) => {
+          if (index2 === 0) return line;
+          return `${indentation}${indentation}${line}`;
+        }).join("\n");
+        lines.push(`${indentation}${indentation}mockData: ${formattedMockData},`);
+      }
+      lines.push(`${indentation}},`);
+    }
+  }
   if (lines.length > 0 && lines[lines.length - 1].endsWith(",")) {
     lines[lines.length - 1] = lines[lines.length - 1].slice(0, -1);
   }
@@ -236724,6 +236962,9 @@ function generateMcpToolDefinition(toolId, toolData, style = DEFAULT_STYLE7, reg
     if (mcpConfig.transport) {
       lines.push(`${indentation}transport: ${JSON.stringify(mcpConfig.transport, null, 2)},`);
     }
+    if (mcpConfig.activeTools && Array.isArray(mcpConfig.activeTools)) {
+      lines.push(`${indentation}activeTools: ${JSON.stringify(mcpConfig.activeTools)},`);
+    }
   }
   if (toolData.description) {
     lines.push(`${indentation}description: ${formatString7(toolData.description, q3, true)},`);
@@ -237096,7 +237337,11 @@ function hasDistinctModels2(subAgentModels, parentModels) {
         if (!subAgentOptions || !parentOptions) {
           return true;
         }
-        if (JSON.stringify(subAgentOptions) !== JSON.stringify(parentOptions)) {
+        const comparison = compareJsonObjects(subAgentOptions, parentOptions, {
+          ignoreArrayOrder: true,
+          showDetails: false
+        });
+        if (!comparison.isEqual) {
           return true;
         }
       }
@@ -237369,12 +237614,12 @@ function generateSubAgentDefinition(agentId, agentData, style = DEFAULT_STYLE, r
   lines.push(`})${semi}`);
   return lines.join("\n");
 }
-function generateSubAgentImports(agentId, agentData, style = DEFAULT_STYLE, registry2, parentAgentId, contextConfigData) {
+function generateSubAgentImports(agentId, agentData, style = DEFAULT_STYLE, registry2, parentAgentId, contextConfigData, actualFilePath) {
   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 currentFilePath = actualFilePath || `agents/sub-agents/${agentId}.ts`;
     const importStatement = registry2.getImportStatement(
       currentFilePath,
       contextConfigId,
@@ -237385,7 +237630,7 @@ function generateSubAgentImports(agentId, agentData, style = DEFAULT_STYLE, regi
     }
   }
   if (registry2) {
-    const currentFilePath = `agents/sub-agents/${agentId}.ts`;
+    const currentFilePath = actualFilePath || `agents/sub-agents/${agentId}.ts`;
     const referencedComponents = [];
     if (Array.isArray(agentData.canUse)) {
       for (const toolRelation of agentData.canUse) {
@@ -237450,14 +237695,15 @@ function generateSubAgentImports(agentId, agentData, style = DEFAULT_STYLE, regi
   }
   return imports;
 }
-function generateSubAgentFile(agentId, agentData, style = DEFAULT_STYLE, registry2, parentAgentId, contextConfigData, parentModels) {
+function generateSubAgentFile(agentId, agentData, style = DEFAULT_STYLE, registry2, parentAgentId, contextConfigData, parentModels, actualFilePath) {
   const imports = generateSubAgentImports(
     agentId,
     agentData,
     style,
     registry2,
     parentAgentId,
-    contextConfigData
+    contextConfigData,
+    actualFilePath
   );
   const definition = generateSubAgentDefinition(
     agentId,
@@ -237474,6 +237720,7 @@ var init_sub_agent_generator = __esm({
   "src/commands/pull-v3/components/sub-agent-generator.ts"() {
     "use strict";
     init_esm_shims();
+    init_json_comparator();
     init_generator_utils();
   }
 });
@@ -237526,14 +237773,11 @@ function registerAllComponents(project, registry2) {
   }
   if (project.agents) {
     for (const agentId of Object.keys(project.agents)) {
-      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)) {
-    console.log(`\u{1F527} Registering subAgent: ${subAgentId}`);
     registry2.register(subAgentId, "subAgents", `agents/sub-agents/${subAgentId}.ts`);
   }
   const contextConfigs2 = extractContextConfigs(project);
@@ -237643,9 +237887,6 @@ 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}"`
-          );
           name2 = uniqueName;
           actualExportName = uniqueName;
         }
@@ -237665,6 +237906,25 @@ var init_component_registry = __esm({
         }
         return info2;
       }
+      /**
+       * Override a credential component with environment settings key
+       * This allows env settings registration to take precedence over standalone credentials
+       */
+      overrideCredentialWithEnvKey(id, filePath, envKey) {
+        const typeKey = `credentials:${id}`;
+        const info2 = {
+          id,
+          type: "credentials",
+          name: envKey,
+          // Use the environment settings key
+          filePath,
+          exportName: envKey,
+          isInline: true
+        };
+        this.componentsByTypeAndId.set(typeKey, info2);
+        this.components.set(`${filePath}:${envKey}`, info2);
+        return info2;
+      }
       /**
        * Get component info by ID and type
        */
@@ -237697,6 +237957,11 @@ var init_component_registry = __esm({
       getImportStatement(fromFilePath, componentId, componentType) {
         const component = this.get(componentId, componentType);
         if (!component) return void 0;
+        const normalizedFrom = this.normalizeToProjectPath(fromFilePath);
+        const normalizedTo = this.normalizeToProjectPath(component.filePath);
+        if (normalizedFrom === normalizedTo) {
+          return void 0;
+        }
         const relativePath = this.calculateRelativeImport(fromFilePath, component.filePath);
         const importStmt = `import { ${component.exportName} } from '${relativePath}';`;
         return importStmt;
@@ -237856,18 +238121,45 @@ var init_component_registry = __esm({
             return "comp";
         }
       }
+      /**
+       * Normalize path to project-relative format using existing registry paths as templates
+       */
+      normalizeToProjectPath(filePath) {
+        if (!filePath.includes("/") || filePath.match(/^(agents|tools|environments|data-components)/)) {
+          return filePath;
+        }
+        const knownDirs = /* @__PURE__ */ new Set();
+        for (const component of this.components.values()) {
+          const firstDir = component.filePath.split("/")[0];
+          if (firstDir) knownDirs.add(firstDir);
+        }
+        const segments = filePath.split("/");
+        for (let i3 = segments.length - 1; i3 >= 0; i3--) {
+          if (knownDirs.has(segments[i3])) {
+            return segments.slice(i3).join("/");
+          }
+        }
+        return segments[segments.length - 1] || filePath;
+      }
       /**
        * Calculate relative import path between files
        */
       calculateRelativeImport(fromPath, toPath) {
         const fromParts = fromPath.replace(".ts", "").split("/");
         const toParts = toPath.replace(".ts", "").split("/");
-        fromParts.pop();
+        const fromDir = fromParts.slice(0, -1);
+        const toFile = toParts;
+        let commonLength = 0;
+        while (commonLength < fromDir.length && commonLength < toFile.length - 1 && fromDir[commonLength] === toFile[commonLength]) {
+          commonLength++;
+        }
         let relativePath = "";
-        for (let i3 = 0; i3 < fromParts.length; i3++) {
+        const upLevels = fromDir.length - commonLength;
+        for (let i3 = 0; i3 < upLevels; i3++) {
           relativePath += "../";
         }
-        relativePath += toParts.join("/");
+        const remainingPath = toFile.slice(commonLength).join("/");
+        relativePath += remainingPath;
         if (relativePath.startsWith("../")) {
           return relativePath;
         } else {
@@ -238578,16 +238870,31 @@ function compareComponentMaps(componentType, localMap, remoteMap, debug) {
   });
   const commonIds = localIds.filter((id) => remoteIds.includes(id));
   commonIds.forEach((id) => {
-    const fieldChanges = getDetailedFieldChanges("", localMap[id], remoteMap[id]);
-    if (fieldChanges.length > 0) {
-      const summary = generateComponentChangeSummary(componentType, fieldChanges);
-      changes.push({
-        componentType,
-        componentId: id,
-        changeType: "modified",
-        changedFields: fieldChanges,
-        summary
+    if (componentType === "artifactComponents") {
+      const comparison = compareJsonObjects(localMap[id], remoteMap[id], {
+        ignoreArrayOrder: true,
+        showDetails: false
       });
+      if (!comparison.isEqual) {
+        changes.push({
+          componentType,
+          componentId: id,
+          changeType: "modified",
+          summary: `Modified ${componentType}: ${id}`
+        });
+      }
+    } else {
+      const fieldChanges = getDetailedFieldChanges("", localMap[id], remoteMap[id]);
+      if (fieldChanges.length > 0) {
+        const summary = generateComponentChangeSummary(componentType, fieldChanges);
+        changes.push({
+          componentType,
+          componentId: id,
+          changeType: "modified",
+          changedFields: fieldChanges,
+          summary
+        });
+      }
     }
   });
   return changes;
@@ -238657,6 +238964,24 @@ function compareArraysAsSet(basePath, oldArray, newArray, depth) {
   }
   return changes;
 }
+function extractCredentialIds(agentObj) {
+  const credentialIds = [];
+  if (agentObj.credentials && Array.isArray(agentObj.credentials)) {
+    agentObj.credentials.forEach((cred) => {
+      if (cred.id) {
+        credentialIds.push(cred.id);
+      }
+    });
+  }
+  if (agentObj.contextConfig?.contextVariables) {
+    Object.values(agentObj.contextConfig.contextVariables).forEach((variable) => {
+      if (variable && typeof variable === "object" && variable.credentialReferenceId) {
+        credentialIds.push(variable.credentialReferenceId);
+      }
+    });
+  }
+  return [...new Set(credentialIds)];
+}
 function getDetailedFieldChanges(basePath, oldObj, newObj, depth = 0) {
   const changes = [];
   if (depth > 10) return changes;
@@ -238743,8 +239068,21 @@ function getDetailedFieldChanges(basePath, oldObj, newObj, depth = 0) {
         return false;
       });
       if (shouldIgnore) {
-        if (basePath === "" && key === "statusUpdates") {
-          console.log(`   \u26A0\uFE0F statusUpdates field is being IGNORED due to ignored fields check`);
+        continue;
+      }
+      if (key === "credentials" && basePath === "") {
+        const oldCredIds = extractCredentialIds(oldObj);
+        const newCredIds = extractCredentialIds(newObj);
+        oldCredIds.sort();
+        newCredIds.sort();
+        if (JSON.stringify(oldCredIds) !== JSON.stringify(newCredIds)) {
+          changes.push({
+            field: fieldPath,
+            changeType: "modified",
+            oldValue: oldCredIds,
+            newValue: newCredIds,
+            description: `Credential usage differs: [${oldCredIds.join(", ")}] vs [${newCredIds.join(", ")}]`
+          });
         }
         continue;
       }
@@ -238769,6 +239107,18 @@ function getDetailedFieldChanges(basePath, oldObj, newObj, depth = 0) {
           });
         }
       } else {
+        const oldIsEmpty2 = isEmpty(oldValue);
+        const newIsEmpty2 = isEmpty(newValue);
+        if (oldIsEmpty2 && newIsEmpty2) {
+          continue;
+        }
+        if (key === "models") {
+          const oldIsNull = oldValue === null || oldValue === void 0;
+          const newIsNull = newValue === null || newValue === void 0;
+          if (oldIsNull !== newIsNull) {
+            continue;
+          }
+        }
         const recursiveChanges = getDetailedFieldChanges(fieldPath, oldValue, newValue, depth + 1);
         changes.push(...recursiveChanges);
       }
@@ -239048,9 +239398,11 @@ function compareFetchDefinitions(localProject, remoteProject, debug) {
         summary: `Removed fetchDefinition: ${fetchId}`
       });
     } else if (local && remote) {
-      const localStr = JSON.stringify(local, null, 2);
-      const remoteStr = JSON.stringify(remote, null, 2);
-      if (localStr !== remoteStr) {
+      const comparison = compareJsonObjects(local, remote, {
+        ignoreArrayOrder: true,
+        showDetails: true
+      });
+      if (!comparison.isEqual) {
         changes.push({
           componentType: "fetchDefinitions",
           componentId: fetchId,
@@ -239077,6 +239429,7 @@ var init_project_comparator = __esm({
   "src/commands/pull-v3/project-comparator.ts"() {
     "use strict";
     init_esm_shims();
+    init_json_comparator();
   }
 });
 
@@ -239089,6 +239442,7 @@ __export(component_parser_exports, {
 });
 import { existsSync as existsSync8, readdirSync as readdirSync2, readFileSync as readFileSync3, statSync } from "fs";
 import { extname as extname2, join as join10, relative } from "path";
+import { Node as Node3, Project } from "ts-morph";
 function parseFileForComponents(filePath, projectRoot, debug = false) {
   if (!existsSync8(filePath)) {
     return [];
@@ -239097,271 +239451,234 @@ function parseFileForComponents(filePath, projectRoot, debug = false) {
   const relativePath = relative(projectRoot, filePath);
   try {
     const content = readFileSync3(filePath, "utf8");
-    const lines = content.split("\n");
-    const exportedIdPattern = /export\s+const\s+(\w+)\s*=\s*(\w+)\s*\(\s*\{[^}]*?id:\s*['"`]([^'"`]+)['"`]/gs;
-    const exportedTypePattern = /export\s+const\s+(\w+)\s*=\s*(\w+)\s*\(\s*\{[^}]*?type:\s*['"`]([^'"`]+)['"`]/gs;
-    const exportedNamePattern = /export\s+const\s+(\w+)\s*=\s*(\w+)\s*\(\s*\{[^}]*?name:\s*['"`]([^'"`]+)['"`]/gs;
-    const declaredIdPattern = /(?:^|\n)\s*const\s+(\w+)\s*=\s*(\w+)\s*\(\s*\{[^}]*?id:\s*['"`]([^'"`]+)['"`]/gs;
-    const declaredTypePattern = /(?:^|\n)\s*const\s+(\w+)\s*=\s*(\w+)\s*\(\s*\{[^}]*?type:\s*['"`]([^'"`]+)['"`]/gs;
-    const declaredNamePattern = /(?:^|\n)\s*const\s+(\w+)\s*=\s*(\w+)\s*\(\s*\{[^}]*?name:\s*['"`]([^'"`]+)['"`]/gs;
-    const exportedVariables = /* @__PURE__ */ new Set();
-    const exportPattern = /export\s*\{\s*([^}]+)\s*\}/g;
-    let exportMatch;
-    while ((exportMatch = exportPattern.exec(content)) !== null) {
-      const exportList = exportMatch[1];
-      const variables = exportList.split(",").map((v3) => v3.trim()).filter((v3) => v3);
-      variables.forEach((v3) => exportedVariables.add(v3));
-    }
-    let match2;
-    while ((match2 = exportedIdPattern.exec(content)) !== null) {
-      const variableName = match2[1];
-      const functionName = match2[2];
-      const componentId = match2[3];
-      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,
-          type: componentType,
-          filePath: relativePath,
-          variableName,
-          startLine: lineNumber,
-          isInline: false
-        });
-      }
-    }
-    while ((match2 = exportedTypePattern.exec(content)) !== null) {
-      const variableName = match2[1];
-      const functionName = match2[2];
-      const componentId = match2[3];
-      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,
-          type: componentType,
-          filePath: relativePath,
-          variableName,
-          startLine: lineNumber,
-          isInline: false
-        });
-      }
-    }
-    while ((match2 = exportedNamePattern.exec(content)) !== null) {
-      const variableName = match2[1];
-      const functionName = match2[2];
-      const componentId = match2[3];
-      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,
-          type: componentType,
-          filePath: relativePath,
-          variableName,
-          startLine: lineNumber,
-          isInline: false
-        });
-      }
-    }
-    while ((match2 = declaredIdPattern.exec(content)) !== null) {
-      const variableName = match2[1];
-      const functionName = match2[2];
-      const componentId = match2[3];
-      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,
-          type: componentType,
-          filePath: relativePath,
-          variableName,
-          startLine: lineNumber,
-          isInline: false
-          // It's exported via separate export statement
-        });
-      }
-    }
-    while ((match2 = declaredTypePattern.exec(content)) !== null) {
-      const variableName = match2[1];
-      const functionName = match2[2];
-      const componentId = match2[3];
-      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,
-          type: componentType,
-          filePath: relativePath,
-          variableName,
-          startLine: lineNumber,
-          isInline: false
-          // It's exported via separate export statement
-        });
+    const project = new Project({
+      useInMemoryFileSystem: true,
+      compilerOptions: {
+        allowJs: true,
+        target: 99,
+        // Latest
+        jsx: 1
+        // Preserve JSX
       }
-    }
-    while ((match2 = declaredNamePattern.exec(content)) !== null) {
-      const variableName = match2[1];
-      const functionName = match2[2];
-      const componentId = match2[3];
-      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,
-          type: componentType,
-          filePath: relativePath,
+    });
+    const sourceFile = project.createSourceFile("temp.ts", content);
+    const exportedVariableDeclarations = sourceFile.getVariableStatements().filter((statement) => statement.hasExportKeyword()).flatMap((statement) => statement.getDeclarationList().getDeclarations());
+    for (const declaration of exportedVariableDeclarations) {
+      const variableName = declaration.getName();
+      const initializer = declaration.getInitializer();
+      if (Node3.isCallExpression(initializer)) {
+        const componentMatch = parseCallExpression(initializer, variableName, false, relativePath);
+        if (componentMatch) {
+          components.push(componentMatch);
+        }
+      }
+    }
+    const exportedNames = /* @__PURE__ */ new Set();
+    sourceFile.getExportDeclarations().forEach((exportDecl) => {
+      const namedExports = exportDecl.getNamedExports();
+      namedExports.forEach((namedExport) => {
+        exportedNames.add(namedExport.getName());
+      });
+    });
+    const allVariableDeclarations = sourceFile.getVariableStatements().filter((statement) => !statement.hasExportKeyword()).flatMap((statement) => statement.getDeclarationList().getDeclarations());
+    for (const declaration of allVariableDeclarations) {
+      const variableName = declaration.getName();
+      const initializer = declaration.getInitializer();
+      if (Node3.isCallExpression(initializer)) {
+        const isExported = exportedNames.has(variableName);
+        const isInline = !isExported;
+        const componentMatch = parseCallExpression(
+          initializer,
           variableName,
-          startLine: lineNumber,
-          isInline: false
-          // It's exported via separate export statement
-        });
+          isInline,
+          relativePath
+        );
+        if (componentMatch) {
+          components.push(componentMatch);
+        }
       }
     }
-    while ((match2 = declaredIdPattern.exec(content)) !== null) {
-      const variableName = match2[1];
-      const functionName = match2[2];
-      const componentId = match2[3];
-      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,
-          type: componentType,
-          filePath: relativePath,
-          variableName,
-          startLine: lineNumber,
-          isInline: true
-          // Not exported, so treated as inline but has variable name
-        });
+    sourceFile.forEachDescendant((node) => {
+      if (Node3.isCallExpression(node)) {
+        const parent = node.getParent();
+        const isVariableInitializer = Node3.isVariableDeclaration(parent) && parent.getInitializer() === node;
+        if (!isVariableInitializer) {
+          const componentMatch = parseCallExpression(node, void 0, true, relativePath);
+          if (componentMatch) {
+            components.push(componentMatch);
+          }
+        }
       }
-    }
-    while ((match2 = declaredTypePattern.exec(content)) !== null) {
-      const variableName = match2[1];
-      const functionName = match2[2];
-      const componentId = match2[3];
-      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,
-          type: componentType,
-          filePath: relativePath,
-          variableName,
-          startLine: lineNumber,
-          isInline: true
-          // Not exported, so treated as inline but has variable name
-        });
+    });
+    sourceFile.forEachDescendant((node) => {
+      if (Node3.isCallExpression(node)) {
+        const expression = node.getExpression();
+        if (Node3.isIdentifier(expression) && expression.getText() === "registerEnvironmentSettings") {
+          const args2 = node.getArguments();
+          if (args2.length > 0 && Node3.isObjectLiteralExpression(args2[0])) {
+            const configObject = args2[0];
+            const credentialsProperty = configObject.getProperty("credentials");
+            if (credentialsProperty && Node3.isPropertyAssignment(credentialsProperty)) {
+              const credentialsValue = credentialsProperty.getInitializer();
+              if (Node3.isObjectLiteralExpression(credentialsValue)) {
+                credentialsValue.getProperties().forEach((property) => {
+                  if (Node3.isPropertyAssignment(property)) {
+                    const credentialKey = property.getName();
+                    const credentialConfig = property.getInitializer();
+                    if (Node3.isObjectLiteralExpression(credentialConfig)) {
+                      const idProperty = credentialConfig.getProperty("id");
+                      if (idProperty && Node3.isPropertyAssignment(idProperty)) {
+                        const idValue = idProperty.getInitializer();
+                        if (Node3.isStringLiteral(idValue)) {
+                          const credentialId = idValue.getLiteralValue();
+                          const startLine = node.getStartLineNumber();
+                          components.push({
+                            id: credentialId,
+                            type: "credentials",
+                            filePath: relativePath,
+                            variableName: credentialKey,
+                            // Use the key name as variable name
+                            startLine,
+                            isInline: true
+                            // It's nested within environment settings
+                          });
+                        }
+                      }
+                    } else if (Node3.isIdentifier(credentialConfig)) {
+                      const variableName = credentialConfig.getText();
+                      sourceFile.forEachDescendant((varNode) => {
+                        if (Node3.isVariableDeclaration(varNode) && varNode.getName() === variableName) {
+                          const initializer = varNode.getInitializer();
+                          if (Node3.isCallExpression(initializer)) {
+                            const callExpression = initializer.getExpression();
+                            if (Node3.isIdentifier(callExpression) && callExpression.getText() === "credential") {
+                              const args3 = initializer.getArguments();
+                              if (args3.length > 0 && Node3.isObjectLiteralExpression(args3[0])) {
+                                const configObject2 = args3[0];
+                                const idProperty = configObject2.getProperty("id");
+                                if (idProperty && Node3.isPropertyAssignment(idProperty)) {
+                                  const idValue = idProperty.getInitializer();
+                                  if (Node3.isStringLiteral(idValue)) {
+                                    const credentialId = idValue.getLiteralValue();
+                                    const startLine = node.getStartLineNumber();
+                                    components.push({
+                                      id: credentialId,
+                                      type: "credentials",
+                                      filePath: relativePath,
+                                      variableName: credentialKey,
+                                      // Use the env settings key as variable name
+                                      startLine,
+                                      isInline: true,
+                                      overrideExisting: true
+                                      // Mark this to override any existing registration
+                                    });
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      });
+                    }
+                  }
+                });
+              }
+            }
+          }
+        }
       }
+    });
+    return components;
+  } catch (error) {
+    if (debug) {
+      console.warn(`Failed to parse file ${relativePath}: ${error}`);
     }
-    while ((match2 = declaredNamePattern.exec(content)) !== null) {
-      const variableName = match2[1];
-      const functionName = match2[2];
-      const componentId = match2[3];
-      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,
-          type: componentType,
-          filePath: relativePath,
-          variableName,
-          startLine: lineNumber,
-          isInline: true
-          // Not exported, so treated as inline but has variable name
-        });
-      }
+    return [];
+  }
+}
+function parseCallExpression(callExpression, variableName, isInline, relativePath) {
+  const expression = callExpression.getExpression();
+  let functionName;
+  if (Node3.isIdentifier(expression)) {
+    functionName = expression.getText();
+  } else {
+    return null;
+  }
+  const componentType = FUNCTION_NAME_TO_TYPE[functionName];
+  if (!componentType || !VALID_COMPONENT_TYPES.has(componentType)) {
+    return null;
+  }
+  const args2 = callExpression.getArguments();
+  if (args2.length === 0 || !Node3.isObjectLiteralExpression(args2[0])) {
+    return null;
+  }
+  const configObject = args2[0];
+  let componentId = null;
+  const idProperty = configObject.getProperty("id");
+  if (idProperty && Node3.isPropertyAssignment(idProperty)) {
+    const idValue = idProperty.getInitializer();
+    if (Node3.isStringLiteral(idValue)) {
+      componentId = idValue.getLiteralValue();
     }
-    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"
-      );
-      let inlineMatch;
-      while ((inlineMatch = inlineIdPattern.exec(content)) !== null) {
-        const componentId = inlineMatch[1];
-        const componentType = FUNCTION_NAME_TO_TYPE[funcName];
-        const lineNumber = content.substring(0, inlineMatch.index).split("\n").length;
-        components.push({
-          id: componentId,
-          type: componentType,
-          filePath: relativePath,
-          variableName: void 0,
-          // No variable name for inline
-          startLine: lineNumber,
-          isInline: true
-        });
-      }
-      if (funcName === "functionTool") {
-        const inlineNamePattern = new RegExp(
-          `(?<!(?:export\\s+)?const\\s+\\w+\\s*=\\s*)\\b${funcName}\\s*\\(\\s*\\{[^}]*?name:\\s*['"\`]([^'"\`]+)['"\`]`,
-          "gs"
-        );
-        while ((inlineMatch = inlineNamePattern.exec(content)) !== null) {
-          const componentId = inlineMatch[1];
-          const componentType = FUNCTION_NAME_TO_TYPE[funcName];
-          const lineNumber = content.substring(0, inlineMatch.index).split("\n").length;
-          components.push({
-            id: componentId,
-            type: componentType,
-            filePath: relativePath,
-            variableName: void 0,
-            // No variable name for inline
-            startLine: lineNumber,
-            isInline: true
-          });
-        }
+  }
+  if (!componentId && componentType === "statusComponents") {
+    const typeProperty = configObject.getProperty("type");
+    if (typeProperty && Node3.isPropertyAssignment(typeProperty)) {
+      const typeValue = typeProperty.getInitializer();
+      if (Node3.isStringLiteral(typeValue)) {
+        componentId = typeValue.getLiteralValue();
       }
     }
-    const envCredentialsPattern = /registerEnvironmentSettings\s*\(\s*\{[^}]*?credentials:\s*\{([^}]+?)\}/gs;
-    let envMatch;
-    while ((envMatch = envCredentialsPattern.exec(content)) !== null) {
-      const credentialsBlock = envMatch[1];
-      const credentialPattern = /(\w+):\s*\{[^}]*?id:\s*['"`]([^'"`]+)['"`]/g;
-      let credMatch;
-      while ((credMatch = credentialPattern.exec(credentialsBlock)) !== null) {
-        const credentialKey = credMatch[1];
-        const credentialId = credMatch[2];
-        const lineNumber = content.substring(0, envMatch.index).split("\n").length;
-        components.push({
-          id: credentialId,
-          type: "credentials",
-          filePath: relativePath,
-          variableName: credentialKey,
-          // Use the key name as variable name
-          startLine: lineNumber,
-          isInline: true
-          // It's nested within environment settings
-        });
+  }
+  if (!componentId && componentType === "functionTools") {
+    const nameProperty = configObject.getProperty("name");
+    if (nameProperty && Node3.isPropertyAssignment(nameProperty)) {
+      const nameValue = nameProperty.getInitializer();
+      if (Node3.isStringLiteral(nameValue)) {
+        componentId = nameValue.getLiteralValue();
       }
     }
-  } catch (error) {
-    console.warn(`Failed to parse file ${filePath}: ${error}`);
   }
-  return components;
+  if (!componentId) {
+    return null;
+  }
+  const startLine = callExpression.getStartLineNumber();
+  return {
+    id: componentId,
+    type: componentType,
+    filePath: relativePath,
+    variableName,
+    startLine,
+    isInline
+  };
 }
 function scanProjectForComponents(projectRoot, debug = false) {
   const allComponents = [];
-  function scanDirectory(dirPath) {
-    if (!existsSync8(dirPath)) return;
+  if (!existsSync8(projectRoot)) {
+    return allComponents;
+  }
+  const scanDir = (dir) => {
     try {
-      const entries = readdirSync2(dirPath);
-      for (const entry of entries) {
-        const fullPath = join10(dirPath, entry);
+      const items = readdirSync2(dir);
+      for (const item of items) {
+        const fullPath = join10(dir, item);
         const stat = statSync(fullPath);
-        if (stat.isFile() && extname2(entry) === ".ts") {
+        if (stat.isDirectory()) {
+          if (!["node_modules", ".next", ".git", "dist", "build"].includes(item) && !item.startsWith(".temp-validation-")) {
+            scanDir(fullPath);
+          }
+        } else if (stat.isFile() && [".ts", ".tsx", ".js", ".jsx"].includes(extname2(item))) {
           const fileComponents = parseFileForComponents(fullPath, projectRoot, debug);
           allComponents.push(...fileComponents);
-        } else if (stat.isDirectory() && !entry.startsWith(".") && entry !== "node_modules") {
-          scanDirectory(fullPath);
         }
       }
     } catch (error) {
-      console.warn(`Failed to scan directory ${dirPath}: ${error}`);
+      if (debug) {
+        console.warn(`Failed to scan directory ${dir}: ${error}`);
+      }
     }
-  }
-  scanDirectory(projectRoot);
+  };
+  scanDir(projectRoot);
   return allComponents;
 }
 function buildComponentRegistryFromParsing(projectRoot, debug = false) {
@@ -239381,18 +239698,26 @@ function buildComponentRegistryFromParsing(projectRoot, debug = false) {
   const registeredTypeIds = /* @__PURE__ */ new Set();
   for (const component of allComponents) {
     const typeId = `${component.type}:${component.id}`;
-    if (registeredTypeIds.has(typeId)) {
+    if (registeredTypeIds.has(typeId) && !component.overrideExisting) {
       continue;
     }
     registeredTypeIds.add(typeId);
     if (component.variableName) {
-      registry2.register(
-        component.id,
-        component.type,
-        component.filePath,
-        component.variableName,
-        component.isInline
-      );
+      if (component.overrideExisting && component.type === "credentials") {
+        registry2.overrideCredentialWithEnvKey(
+          component.id,
+          component.filePath,
+          component.variableName
+        );
+      } else {
+        registry2.register(
+          component.id,
+          component.type,
+          component.filePath,
+          component.variableName,
+          component.isInline
+        );
+      }
     } else {
       registry2.register(
         component.id,
@@ -239464,84 +239789,171 @@ var init_component_parser = __esm({
 
 // src/commands/pull-v3/targeted-typescript-placeholders.ts
 import { randomBytes as randomBytes2 } from "crypto";
+import { Node as Node4, Project as Project2 } from "ts-morph";
 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
-    }
-  };
+  try {
+    const project = new Project2({ useInMemoryFileSystem: true });
+    const sourceFile = project.createSourceFile("temp.ts", content);
+    const replacementOperations = [];
+    sourceFile.forEachDescendant((node) => {
+      if (Node4.isPropertyAssignment(node)) {
+        const propertyName = node.getName();
+        const valueNode = node.getInitializer();
+        if (!valueNode) return;
+        let valueText = valueNode.getText();
+        if (valueText.trim().length < MIN_REPLACEMENT_LENGTH) return;
+        let placeholderPrefix = "";
+        switch (propertyName) {
+          case "prompt":
+            placeholderPrefix = "PROMPT";
+            break;
+          case "description":
+            placeholderPrefix = "DESC";
+            break;
+          case "inputSchema":
+            placeholderPrefix = "INPUT_SCHEMA";
+            break;
+          case "detailsSchema":
+            placeholderPrefix = "DETAILS_SCHEMA";
+            break;
+          case "props":
+            placeholderPrefix = "PROPS";
+            break;
+          case "render":
+            placeholderPrefix = "RENDER";
+            break;
+          default:
+            return;
+        }
+        const start2 = valueNode.getStart();
+        let end = valueNode.getEnd();
+        const propertyAssignment = node;
+        const propertyEnd = propertyAssignment.getEnd();
+        if (propertyName === "inputSchema" || propertyName === "render") {
+          let searchStart = start2;
+          let braceCount = 0;
+          let correctEnd = -1;
+          let inString = false;
+          let stringChar = "";
+          for (let i3 = searchStart; i3 < content.length; i3++) {
+            const char = content[i3];
+            const prevChar = i3 > 0 ? content[i3 - 1] : "";
+            if ((char === '"' || char === "'") && prevChar !== "\\") {
+              if (!inString) {
+                inString = true;
+                stringChar = char;
+              } else if (char === stringChar) {
+                inString = false;
+                stringChar = "";
+              }
+            }
+            if (!inString) {
+              if (char === "{") {
+                braceCount++;
+              } else if (char === "}") {
+                braceCount--;
+                if (braceCount === 0) {
+                  let j3 = i3 + 1;
+                  while (j3 < content.length && /\s/.test(content[j3])) {
+                    j3++;
+                  }
+                  if (j3 < content.length && content[j3] === ",") {
+                    correctEnd = j3 + 1;
+                    break;
+                  }
+                }
+              }
+            }
+          }
+          if (correctEnd > start2 && correctEnd < end + 100) {
+            end = correctEnd;
+            valueText = content.slice(start2, end);
+          }
+        } else {
+          const textAfterValue = content.slice(end, end + 20);
+          if (!textAfterValue.match(/^\s*[,}]/)) {
+            let correctEnd = end;
+            while (correctEnd > start2 && !content.slice(correctEnd, correctEnd + 10).match(/^\s*[,}]/)) {
+              correctEnd--;
+            }
+            if (correctEnd > start2) {
+              end = correctEnd;
+              valueText = content.slice(start2, end);
+            } else {
+              return;
+            }
+          }
+        }
+        if (end > propertyEnd) {
+          return;
+        }
+        const actualText = content.slice(start2, end);
+        if (valueText !== actualText) {
+          return;
+        }
+        const finalTextAfterValue = content.slice(end, end + 20);
+        if (!finalTextAfterValue.match(/^\s*[,}]/)) {
+          return;
+        }
+        const placeholder = `<${placeholderPrefix}_${generatePlaceholderId()}>`;
+        replacements[placeholder] = valueText;
+        replacedFields++;
+        replacementOperations.push({
+          start: start2,
+          end,
+          placeholder,
+          originalText: valueText
+          // This now matches what we'll actually replace
+        });
+      }
+    });
+    replacementOperations.sort((a2, b3) => b3.start - a2.start);
+    let processedContent = content;
+    for (const op of replacementOperations) {
+      processedContent = processedContent.slice(0, op.start) + op.placeholder + processedContent.slice(op.end);
+    }
+    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
+      }
+    };
+  } catch (error) {
+    return {
+      processedContent: content,
+      replacements: {},
+      stats: {
+        originalSize,
+        processedSize: originalSize,
+        savings: 0,
+        savingsPercentage: 0,
+        replacedFields: 0
+      }
+    };
+  }
 }
 function restoreTargetedTypeScriptPlaceholders(content, replacements) {
   let restoredContent = content;
   const sortedPlaceholders = Object.keys(replacements).sort((a2, b3) => b3.length - a2.length);
   for (const placeholder of sortedPlaceholders) {
     const originalValue = replacements[placeholder];
+    if (!restoredContent.includes(placeholder)) {
+      continue;
+    }
     restoredContent = restoredContent.replace(placeholder, originalValue);
   }
   return restoredContent;
@@ -239624,8 +240036,46 @@ function calculateCostEstimate(promptTokens, completionTokens) {
   return promptCost + completionCost;
 }
 async function mergeComponentsWithLLM(request) {
-  const { oldContent, newContent, modifiedComponents, filePath } = request;
+  const {
+    oldContent,
+    newContent,
+    modifiedComponents,
+    filePath,
+    newComponents,
+    componentsToExport
+  } = request;
   const componentList = modifiedComponents.map((c2) => `- ${c2.componentType}:${c2.componentId}`).join("\n");
+  const newComponentsList = newComponents && newComponents.length > 0 ? newComponents.map((c2) => {
+    const currentFilePath = filePath.replace(/^.*\/([^/]+\/[^/]+)$/, "$1");
+    const currentDir = currentFilePath.replace(/\/[^/]+$/, "");
+    let componentPath = c2.filePath;
+    if (componentPath.includes(".temp-")) {
+      componentPath = componentPath.replace(/^.*\.temp-[^/]+\//, "");
+    }
+    componentPath = componentPath.replace(/\.ts$/, "");
+    const importPath = calculateRelativeImportPath(currentDir, componentPath);
+    const variableName = c2.componentId.replace(
+      /-([a-z])/g,
+      (_3, letter) => letter.toUpperCase()
+    );
+    return `- ${c2.componentType}:${c2.componentId} (import as: import { ${variableName} } from '${importPath}')`;
+  }).join("\n") : "";
+  function calculateRelativeImportPath(fromDir, toPath) {
+    const fromParts = fromDir.split("/");
+    const toParts = toPath.split("/");
+    let commonLength = 0;
+    while (commonLength < fromParts.length && commonLength < toParts.length - 1 && fromParts[commonLength] === toParts[commonLength]) {
+      commonLength++;
+    }
+    const upLevels = fromParts.length - commonLength;
+    let relativePath = "";
+    for (let i3 = 0; i3 < upLevels; i3++) {
+      relativePath += "../";
+    }
+    relativePath += toParts.slice(commonLength).join("/");
+    return relativePath.startsWith("../") ? relativePath : "./" + relativePath;
+  }
+  const componentsToExportList = componentsToExport && componentsToExport.length > 0 ? componentsToExport.map((c2) => `- ${c2.variableName} (${c2.reason})`).join("\n") : "";
   const prompt = `You are a TypeScript code expert tasked with intelligently merging component updates.
 
 ## Task
@@ -239633,7 +240083,16 @@ Merge the OLD file content with NEW component definitions, preserving the origin
 
 ## Modified Components to Update
 ${componentList}
+${newComponentsList ? `
+## New Components Available (can be imported)
+${newComponentsList}
+` : ""}${componentsToExportList ? `
+## Components That Need To Be Exported
+The following existing components are referenced by new components and must be exported:
+${componentsToExportList}
 
+Ensure these components have export statements (convert \`const\` to \`export const\`, or add \`export\` to existing declarations).
+` : ""}
 ## 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
@@ -239642,7 +240101,13 @@ ${componentList}
 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')
+7. **Smart import handling**: 
+   - Please leave all imports at the top of the file. Don't use .js imports, use .ts imports instead. (import example from './example')
+   - Preserve all imports from the original content that are not modified.
+   - For NEW components listed above, add proper import statements
+   - For components that exist in the same file (modified components), DO NOT add import statements
+   - Remove any incorrect imports from the NEW component definitions that reference same-file components
+   - Use relative paths for imports (e.g., './example' not './example.js')
 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
@@ -239656,12 +240121,12 @@ ${componentList}
      }
      \`\`\`
 
-## OLD Content:
+## OLD File to be updated with new component definitions:
 \`\`\`typescript
 ${oldContent}
 \`\`\`
 
-## NEW Component Definitions:
+## NEW Component Definitions to replace/add to the old file:
 \`\`\`typescript
 ${newContent}
 \`\`\`
@@ -239672,11 +240137,12 @@ Provide the merged TypeScript file that:
 - Updates ONLY the modified components listed above
 - Maintains consistent code style
 - Uses improved schemas where beneficial
-- Preserves all imports, exports, and other code
+- Preserves all imports, exports, and other code that are necessary to keep the file working.
 - **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.
+- Please remember the NEW component definitions are to replace/add to the old file.
 
 Return only the merged TypeScript code without any explanation or markdown formatting.`;
   try {
@@ -239755,6 +240221,125 @@ import {
 } from "fs";
 import { basename as basename2, dirname as dirname7, join as join11 } from "path";
 import chalk11 from "chalk";
+function getObjectPreview(obj, maxLength = 200) {
+  if (obj === null) return "null";
+  if (obj === void 0) return "undefined";
+  try {
+    if (typeof obj === "object") {
+      const jsonStr = JSON.stringify(obj, null, 0);
+      if (jsonStr.length <= maxLength) {
+        return jsonStr;
+      } else {
+        if (obj.component && typeof obj.component === "string") {
+          const componentPreview = obj.component.length > 100 ? obj.component.substring(0, 100) + "..." : obj.component;
+          return `{component: "${componentPreview}", mockData: ${obj.mockData ? "present" : "null"}}`;
+        }
+        return jsonStr.substring(0, maxLength) + "...";
+      }
+    } else {
+      const str = String(obj);
+      return str.length > maxLength ? str.substring(0, maxLength) + "..." : str;
+    }
+  } catch (error) {
+    return `[Error stringifying: ${typeof obj}]`;
+  }
+}
+function extractCredentialIds2(agentObj) {
+  const credentialIds = [];
+  if (agentObj.credentials && Array.isArray(agentObj.credentials)) {
+    agentObj.credentials.forEach((cred) => {
+      if (cred.id) {
+        credentialIds.push(cred.id);
+      }
+    });
+  }
+  if (agentObj.contextConfig?.contextVariables) {
+    Object.values(agentObj.contextConfig.contextVariables).forEach((variable) => {
+      if (variable && typeof variable === "object" && variable.credentialReferenceId) {
+        credentialIds.push(variable.credentialReferenceId);
+      }
+    });
+  }
+  return [...new Set(credentialIds)];
+}
+function findKeyDifferences(obj1, obj2, componentId) {
+  const differences = [];
+  const allKeys = /* @__PURE__ */ new Set([...Object.keys(obj1 || {}), ...Object.keys(obj2 || {})]);
+  for (const key of allKeys) {
+    const val1 = obj1?.[key];
+    const val2 = obj2?.[key];
+    if (key.startsWith("_") || key === "createdAt" || key === "updatedAt") {
+      continue;
+    }
+    if (key === "credentials") {
+      const creds1 = extractCredentialIds2(obj1);
+      const creds2 = extractCredentialIds2(obj2);
+      creds1.sort();
+      creds2.sort();
+      if (JSON.stringify(creds1) !== JSON.stringify(creds2)) {
+        differences.push(
+          `~ credentials: usage differs (${creds1.join(", ")} vs ${creds2.join(", ")})`
+        );
+      }
+      continue;
+    }
+    const val1IsEmpty = val1 === null || val1 === void 0 || Array.isArray(val1) && val1.length === 0 || typeof val1 === "object" && val1 !== null && Object.keys(val1).length === 0;
+    const val2IsEmpty = val2 === null || val2 === void 0 || Array.isArray(val2) && val2.length === 0 || typeof val2 === "object" && val2 !== null && Object.keys(val2).length === 0;
+    if (val1IsEmpty && val2IsEmpty) {
+      continue;
+    }
+    if (val1IsEmpty && !val2IsEmpty) {
+      differences.push(`+ ${key}: ${typeof val2} (only in remote)`);
+    } else if (!val1IsEmpty && val2IsEmpty) {
+      differences.push(`- ${key}: ${typeof val1} (only in generated)`);
+    } else if (val1 !== val2) {
+      if (Array.isArray(val1) && Array.isArray(val2)) {
+        if (val1.length !== val2.length) {
+          differences.push(`~ ${key}: array length differs (${val1.length} vs ${val2.length})`);
+        }
+      } else if (typeof val1 === "object" && typeof val2 === "object" && val1 !== null && val2 !== null) {
+        const keys1 = Object.keys(val1).filter((k4) => {
+          if (k4.startsWith("_") || k4 === "createdAt" || k4 === "updatedAt" || k4 === "tenantId" || k4 === "projectId" || k4 === "agentId") {
+            return false;
+          }
+          const v3 = val1[k4];
+          return !(v3 === null || v3 === void 0 || Array.isArray(v3) && v3.length === 0 || typeof v3 === "object" && v3 !== null && Object.keys(v3).length === 0);
+        });
+        const keys2 = Object.keys(val2).filter((k4) => {
+          if (k4.startsWith("_") || k4 === "createdAt" || k4 === "updatedAt" || k4 === "tenantId" || k4 === "projectId" || k4 === "agentId") {
+            return false;
+          }
+          const v3 = val2[k4];
+          return !(v3 === null || v3 === void 0 || Array.isArray(v3) && v3.length === 0 || typeof v3 === "object" && v3 !== null && Object.keys(v3).length === 0);
+        });
+        const subKeys1 = keys1.length;
+        const subKeys2 = keys2.length;
+        if (subKeys1 !== subKeys2) {
+          differences.push(`~ ${key}: object size differs (${subKeys1} vs ${subKeys2} keys)`);
+        }
+      } else if (typeof val1 !== typeof val2) {
+        differences.push(`~ ${key}: type differs (${typeof val1} vs ${typeof val2})`);
+      } else {
+        if (key === "render" || key === "component") {
+          const val1Preview = getObjectPreview(val1, 200);
+          const val2Preview = getObjectPreview(val2, 200);
+          differences.push(`~ ${key}:`);
+          differences.push(`    Generated: ${val1Preview}`);
+          differences.push(`    Remote:    ${val2Preview}`);
+        } else {
+          const val1Str = String(val1);
+          const val2Str = String(val2);
+          if (val1Str.length < 100 && val2Str.length < 100) {
+            differences.push(`~ ${key}: "${val1Str}" vs "${val2Str}"`);
+          } else {
+            differences.push(`~ ${key}: values differ (both ${typeof val1})`);
+          }
+        }
+      }
+    }
+  }
+  return differences.slice(0, 10);
+}
 function getComponentFromProject(project, componentType, componentId) {
   switch (componentType) {
     case "credentials":
@@ -239763,6 +240348,39 @@ function getComponentFromProject(project, componentType, componentId) {
       return project.tools?.[componentId];
     case "agents":
       return project.agents?.[componentId];
+    case "subAgents":
+      if (project.agents) {
+        for (const [agentId, agentData] of Object.entries(project.agents)) {
+          if (agentData.subAgents && agentData.subAgents[componentId]) {
+            return agentData.subAgents[componentId];
+          }
+        }
+      }
+      return null;
+    case "contextConfigs":
+      if (project.agents) {
+        for (const [agentId, agentData] of Object.entries(project.agents)) {
+          if (agentData.contextConfig && agentData.contextConfig.id === componentId) {
+            return agentData.contextConfig;
+          }
+        }
+      }
+      return null;
+    case "fetchDefinitions":
+      if (project.agents) {
+        for (const [agentId, agentData] of Object.entries(project.agents)) {
+          if (agentData.contextConfig?.contextVariables) {
+            for (const [varId, variable] of Object.entries(
+              agentData.contextConfig.contextVariables
+            )) {
+              if (variable && typeof variable === "object" && variable.id === componentId) {
+                return variable;
+              }
+            }
+          }
+        }
+      }
+      return null;
     case "dataComponents":
       return project.dataComponents?.[componentId];
     case "artifactComponents":
@@ -239823,12 +240441,24 @@ async function validateProjectEquivalence(tempDir, remoteProject) {
                 componentType,
                 modifiedId
               );
-              console.log(
-                chalk11.gray(`Generated Component: ${JSON.stringify(generatedComponent, null, 2)}`)
-              );
-              console.log(
-                chalk11.gray(`Remote Component: ${JSON.stringify(remoteComponent, null, 2)}`)
-              );
+              if (generatedComponent && remoteComponent) {
+                const differences = findKeyDifferences(
+                  generatedComponent,
+                  remoteComponent,
+                  modifiedId
+                );
+                if (differences.length > 0) {
+                  differences.forEach((diff) => {
+                    console.log(chalk11.gray(`                ${diff}`));
+                  });
+                } else {
+                  console.log(chalk11.gray(`                No key-level differences detected`));
+                }
+              } else if (!generatedComponent) {
+                console.log(chalk11.red(`                Component missing in generated project`));
+              } else if (!remoteComponent) {
+                console.log(chalk11.red(`                Component missing in remote project`));
+              }
             }
           }
           if (changes.deleted.length > 0) {
@@ -240089,26 +240719,40 @@ async function runBiomeOnDirectory(dirPath) {
     return false;
   }
 }
-function generateUpdatedComponentContent(componentType, componentId, componentData, remoteProject, localRegistry, environment) {
+function generateUpdatedComponentContent(componentType, componentId, componentData, remoteProject, localRegistry, environment, actualFilePath) {
   const defaultStyle = {
     quotes: "single",
     indentation: "  ",
     semicolons: true
   };
   switch (componentType) {
-    case "agents":
-      return generateAgentFile(componentId, componentData, defaultStyle, localRegistry);
+    case "agents": {
+      const contextConfigData = componentData.contextConfig;
+      const projectModels = remoteProject.models;
+      return generateAgentFile(
+        componentId,
+        componentData,
+        defaultStyle,
+        localRegistry,
+        contextConfigData,
+        projectModels,
+        actualFilePath
+      );
+    }
     case "subAgents": {
       const parentInfo = findSubAgentWithParent(remoteProject, componentId);
       const parentAgentId = parentInfo?.parentAgentId;
       const contextConfigData = parentInfo?.contextConfigData;
+      const parentModels = parentInfo ? remoteProject.agents?.[parentInfo.parentAgentId]?.models : void 0;
       return generateSubAgentFile(
         componentId,
         componentData,
         defaultStyle,
         localRegistry,
         parentAgentId,
-        contextConfigData
+        contextConfigData,
+        parentModels,
+        actualFilePath
       );
     }
     case "tools":
@@ -240148,7 +240792,7 @@ function generateUpdatedComponentContent(componentType, componentId, componentDa
       throw new Error(`No generator for component type: ${componentType}`);
   }
 }
-async function updateModifiedComponents(comparison, remoteProject, localRegistry, projectRoot, environment, debug = false, providedTempDirName) {
+async function updateModifiedComponents(comparison, remoteProject, localRegistry, projectRoot, environment, debug = false, providedTempDirName, newComponents) {
   const results = [];
   const tempDirName = providedTempDirName || `.temp-${Date.now()}`;
   if (!providedTempDirName) {
@@ -240193,6 +240837,7 @@ async function updateModifiedComponents(comparison, remoteProject, localRegistry
   );
   for (const [filePath, fileComponents] of componentsByFile) {
     try {
+      const relativeFilePath = filePath.replace(projectRoot + "/", "");
       const oldContent = readFileSync5(filePath, "utf8");
       const componentContentParts = [];
       const componentResults = [];
@@ -240239,9 +240884,46 @@ async function updateModifiedComponents(comparison, remoteProject, localRegistry
           }
         } else if (componentType === "credentials") {
           componentData = remoteProject.credentialReferences?.[componentId];
+        } else if (componentType === "environments") {
+          componentData = {
+            name: `${componentId} Environment`,
+            description: `Environment configuration for ${componentId}`,
+            credentials: remoteProject.credentialReferences || {}
+          };
         } else {
           const remoteComponents = remoteProject[componentType] || {};
           componentData = remoteComponents[componentId];
+          if (componentType === "agents" && componentData && !componentData.credentials && remoteProject.credentialReferences) {
+            const agentCredentials = [];
+            const credentialSet = /* @__PURE__ */ new Set();
+            if (componentData.contextConfig?.contextVariables) {
+              for (const [varName, varData] of Object.entries(
+                componentData.contextConfig.contextVariables
+              )) {
+                if (varData && typeof varData === "object" && varData.credentialReferenceId) {
+                  const credId = varData.credentialReferenceId;
+                  if (remoteProject.credentialReferences[credId] && !credentialSet.has(credId)) {
+                    credentialSet.add(credId);
+                    agentCredentials.push({ id: credId });
+                  }
+                }
+              }
+            }
+            for (const [credId, credData] of Object.entries(remoteProject.credentialReferences)) {
+              if (credData.usedBy) {
+                for (const usage of credData.usedBy) {
+                  if (usage.type === "agent" && usage.id === componentId && !credentialSet.has(credId)) {
+                    credentialSet.add(credId);
+                    agentCredentials.push({ id: credId });
+                    break;
+                  }
+                }
+              }
+            }
+            if (agentCredentials.length > 0) {
+              componentData.credentials = agentCredentials;
+            }
+          }
         }
         if (!componentData) {
           componentResults.push({
@@ -240259,7 +240941,8 @@ async function updateModifiedComponents(comparison, remoteProject, localRegistry
             componentData,
             remoteProject,
             localRegistry,
-            environment
+            environment,
+            relativeFilePath
           );
           componentContentParts.push(`// ${componentType}:${componentId}
 ${componentContent}`);
@@ -240294,6 +240977,15 @@ ${componentContent}`);
         }
       }
       const newComponentContent = componentContentParts.join("\n\n");
+      let componentsToExport = [];
+      try {
+        componentsToExport = analyzeComponentsToExport(
+          newComponents || [],
+          relativeFilePath,
+          localRegistry
+        );
+      } catch (error) {
+      }
       const mergeResult = await mergeComponentsWithLLM({
         oldContent,
         newContent: newComponentContent,
@@ -240301,7 +240993,9 @@ ${componentContent}`);
           componentId: c2.id,
           componentType: c2.type
         })),
-        filePath
+        filePath,
+        newComponents,
+        componentsToExport
       });
       let finalContent;
       if (!mergeResult.success) {
@@ -240422,6 +241116,46 @@ ${componentContent}`);
   await validateTempDirectory(projectRoot, tempDirName, remoteProject);
   return results;
 }
+function analyzeComponentsToExport(newComponents, currentFilePath, localRegistry) {
+  const componentsToExport = [];
+  for (const newComp of newComponents) {
+    if (newComp.filePath === currentFilePath) {
+      continue;
+    }
+    const allLocalComponents = localRegistry.getAllComponents();
+    for (const localComp of allLocalComponents) {
+      const localCompRelativePath = localComp.filePath.startsWith("/") ? localComp.filePath.split("/").slice(-2).join("/") : localComp.filePath;
+      if (localCompRelativePath === currentFilePath) {
+        if (shouldComponentBeExported(localComp, newComponents)) {
+          const existingExport = componentsToExport.find((c2) => c2.componentId === localComp.id);
+          if (!existingExport) {
+            componentsToExport.push({
+              componentId: localComp.id,
+              variableName: localComp.name,
+              reason: `referenced by new component ${newComp.componentType}:${newComp.componentId}`
+            });
+          }
+        }
+      }
+    }
+  }
+  return componentsToExport;
+}
+function shouldComponentBeExported(localComponent, newComponents) {
+  if (localComponent.type === "agents" || localComponent.type === "subAgents") {
+    return true;
+  }
+  if (localComponent.type === "tools" || localComponent.type === "functionTools") {
+    return true;
+  }
+  if (localComponent.type === "contextConfigs") {
+    return true;
+  }
+  if (localComponent.type === "artifactComponents") {
+    return true;
+  }
+  return false;
+}
 var init_component_updater = __esm({
   "src/commands/pull-v3/component-updater.ts"() {
     "use strict";
@@ -240884,25 +241618,11 @@ function createProjectStructure(projectDir, projectId) {
   return paths;
 }
 function enrichCanDelegateToWithTypes(project, debug = false) {
-  if (debug) {
-    console.log(chalk14.gray("\u{1F527} Enriching canDelegateTo with type information..."));
-  }
   const agentIds = new Set(project.agents ? Object.keys(project.agents) : []);
   const subAgentIds = new Set(Object.keys(extractSubAgents(project)));
   const externalAgentIds = new Set(
     project.externalAgents ? Object.keys(project.externalAgents) : []
   );
-  if (debug) {
-    console.log(chalk14.gray(`   Available agents: ${Array.from(agentIds).join(", ") || "none"}`));
-    console.log(
-      chalk14.gray(`   Available subAgents: ${Array.from(subAgentIds).join(", ") || "none"}`)
-    );
-    console.log(
-      chalk14.gray(
-        `   Available externalAgents: ${Array.from(externalAgentIds).join(", ") || "none"}`
-      )
-    );
-  }
   const enrichCanDelegateToArray = (canDelegateTo, context) => {
     if (!Array.isArray(canDelegateTo)) return;
     for (let i3 = 0; i3 < canDelegateTo.length; i3++) {
@@ -240917,20 +241637,8 @@ function enrichCanDelegateToWithTypes(project, debug = false) {
       } else if (externalAgentIds.has(id)) {
         enrichedItem = { externalAgentId: id };
       } else {
-        if (debug) {
-          console.log(
-            chalk14.yellow(
-              `   Warning: canDelegateTo reference "${id}" in ${context} not found in any component collection`
-            )
-          );
-        }
         continue;
       }
-      if (debug && enrichedItem) {
-        console.log(
-          chalk14.gray(`   Enriched "${id}" in ${context} -> ${JSON.stringify(enrichedItem)}`)
-        );
-      }
       canDelegateTo[i3] = enrichedItem;
     }
   };
@@ -240970,22 +241678,6 @@ async function readExistingProject(projectRoot, debug = false) {
   } catch (error) {
     const errorMessage = error instanceof Error ? error.message : String(error);
     const isCredentialError = errorMessage.includes("Credential") && errorMessage.includes("not found");
-    if (debug) {
-      if (isCredentialError) {
-        console.log(
-          chalk14.yellow("   \u26A0 Cannot load existing project - credentials not configured:")
-        );
-        console.log(chalk14.gray(`   ${errorMessage}`));
-        console.log(
-          chalk14.gray(
-            "   \u{1F4A1} This is expected if you haven't added credentials to environment files yet"
-          )
-        );
-      } else {
-        console.log(chalk14.red("   \u2717 Error parsing existing project:"));
-        console.log(chalk14.red(`   ${errorMessage}`));
-      }
-    }
     return null;
   }
 }
@@ -241000,7 +241692,7 @@ async function pullV3Command(options) {
     }
   };
   performBackgroundVersionCheck();
-  console.log(chalk14.blue("\n\u{1F680} Pull v3 - Clean & Efficient"));
+  console.log(chalk14.blue("\nInkeep Pull:"));
   if (options.introspect) {
     console.log(chalk14.gray("  Introspect mode \u2022 Complete regeneration \u2022 No comparison needed"));
   } else {
@@ -241097,16 +241789,6 @@ async function pullV3Command(options) {
               };
             }
           });
-          if (options.debug) {
-            const hoistedKeys = Object.keys(agentData.functions).filter(
-              (key) => !remoteProject.functions[key]
-            );
-            if (hoistedKeys.length > 0) {
-              console.log(
-                chalk14.gray(`   Hoisted functions from agent ${agentId}: ${hoistedKeys.join(", ")}`)
-              );
-            }
-          }
         }
       }
     }
@@ -241123,14 +241805,6 @@ async function pullV3Command(options) {
           } else {
             delete agentData.tools;
           }
-          if (options.debug) {
-            const removedCount = originalToolCount - Object.keys(agentSpecificTools).length;
-            if (removedCount > 0) {
-              console.log(
-                chalk14.gray(`   Filtered ${removedCount} project-level tools from agent ${agentId}`)
-              );
-            }
-          }
         }
       }
     }
@@ -241222,10 +241896,11 @@ async function pullV3Command(options) {
       (sum, changes) => sum + changes.added.length,
       0
     );
+    let newComponentResults = [];
     if (newComponentCount > 0) {
       s4.start("Creating new component files in temp directory...");
       const { createNewComponents: createNewComponents2 } = await Promise.resolve().then(() => (init_new_component_generator(), new_component_generator_exports));
-      const newComponentResults = await createNewComponents2(
+      newComponentResults = await createNewComponents2(
         comparison,
         remoteProject,
         localRegistry,
@@ -241266,6 +241941,12 @@ async function pullV3Command(options) {
     if (modifiedCount > 0) {
       s4.start("Applying modified components to temp directory...");
       const { updateModifiedComponents: updateModifiedComponents2 } = await Promise.resolve().then(() => (init_component_updater(), component_updater_exports));
+      const newComponentsForContext = newComponentResults && newComponentResults.length > 0 ? newComponentResults.filter((result) => result.success).map((result) => ({
+        componentId: result.componentId,
+        componentType: result.componentType,
+        filePath: result.filePath.replace(paths.projectRoot + "/", "")
+        // Convert to relative path
+      })) : void 0;
       const updateResults = await updateModifiedComponents2(
         comparison,
         remoteProject,
@@ -241273,8 +241954,9 @@ async function pullV3Command(options) {
         paths.projectRoot,
         options.env || "development",
         options.debug,
-        tempDirName
+        tempDirName,
         // Use the temp directory we created
+        newComponentsForContext
       );
       s4.message("Modified components applied");
     }