@inkeep/agents-cli 0.31.1 → 0.31.2

package/dist/index.js

@@ -234538,6 +234538,62 @@ ${errorText}` : ""}`
   }
 });
 
+// src/utils/cli-pipeline.ts
+import * as p4 from "@clack/prompts";
+import chalk5 from "chalk";
+async function initializeCommand(options = {}) {
+  const {
+    configPath,
+    showSpinner = false,
+    spinnerText = "Loading configuration...",
+    logConfig = true
+  } = options;
+  const s = showSpinner ? p4.spinner() : void 0;
+  if (s) {
+    s.start(spinnerText);
+  }
+  try {
+    const config = await validateConfiguration(configPath);
+    if (s) {
+      s.stop("Configuration loaded");
+    }
+    if (logConfig) {
+      console.log(chalk5.gray("Configuration:"));
+      console.log(chalk5.gray(`  \u2022 Tenant ID: ${config.tenantId}`));
+      console.log(chalk5.gray(`  \u2022 Manage API URL: ${config.agentsManageApiUrl}`));
+      console.log(chalk5.gray(`  \u2022 Run API URL: ${config.agentsRunApiUrl}`));
+      if (config.sources.configFile) {
+        console.log(chalk5.gray(`  \u2022 Config file: ${config.sources.configFile}`));
+      }
+    }
+    return { config };
+  } catch (error) {
+    if (s) {
+      s.stop("Configuration failed");
+    }
+    console.error(chalk5.red("Error:"), error.message);
+    if (error.message.includes("No configuration found")) {
+      console.log(chalk5.yellow("\nHint: Create a configuration file by running:"));
+      console.log(chalk5.gray("  inkeep init"));
+    } else if (error.message.includes("Config file not found")) {
+      console.log(chalk5.yellow("\nHint: Check that your config file path is correct"));
+    } else if (error.message.includes("tenantId") || error.message.includes("API URL")) {
+      console.log(chalk5.yellow("\nHint: Ensure your inkeep.config.ts has all required fields:"));
+      console.log(chalk5.gray("  - tenantId"));
+      console.log(chalk5.gray("  - agentsManageApiUrl (or agentsManageApi.url)"));
+      console.log(chalk5.gray("  - agentsRunApiUrl (or agentsRunApi.url)"));
+    }
+    process.exit(1);
+  }
+}
+var init_cli_pipeline = __esm({
+  "src/utils/cli-pipeline.ts"() {
+    "use strict";
+    init_esm_shims();
+    init_config();
+  }
+});
+
 // src/utils/version-check.ts
 import { existsSync as existsSync5, readFileSync as readFileSync2 } from "fs";
 import { dirname as dirname4, join as join5 } from "path";
@@ -234634,6 +234690,38 @@ var init_background_version_check = __esm({
   }
 });
 
+// src/utils/project-loader.ts
+var project_loader_exports = {};
+__export(project_loader_exports, {
+  loadProject: () => loadProject
+});
+import { existsSync as existsSync6 } from "fs";
+import { join as join6 } from "path";
+async function loadProject(projectDir) {
+  const indexPath = join6(projectDir, "index.ts");
+  if (!existsSync6(indexPath)) {
+    throw new Error(`index.ts not found in project directory: ${projectDir}`);
+  }
+  const module = await importWithTypeScriptSupport(indexPath);
+  const exports = Object.keys(module);
+  for (const exportKey of exports) {
+    const value = module[exportKey];
+    if (value && typeof value === "object" && value.__type === "project") {
+      return value;
+    }
+  }
+  throw new Error(
+    'No project export found in index.ts. Expected an export with __type = "project"'
+  );
+}
+var init_project_loader = __esm({
+  "src/utils/project-loader.ts"() {
+    "use strict";
+    init_esm_shims();
+    init_tsx_loader();
+  }
+});
+
 // src/commands/pull-v3/utils/generator-utils.ts
 function toCamelCase(str) {
   const result = str.replace(/[-_](.)/g, (_, char) => char.toUpperCase()).replace(/[^a-zA-Z0-9]/g, "").replace(/^[0-9]/, "_$&");
@@ -237265,7 +237353,7 @@ var init_component_registry = __esm({
 
 // src/commands/pull-v3/introspect-generator.ts
 import { mkdirSync, writeFileSync as writeFileSync3 } from "fs";
-import { dirname as dirname5, join as join6 } from "path";
+import { dirname as dirname5, join as join7 } from "path";
 import chalk8 from "chalk";
 function ensureDir(filePath) {
   const dir = dirname5(filePath);
@@ -237282,14 +237370,14 @@ async function introspectGenerate(project, paths, environment, debug, options =
     registerAllComponents(project, registry2);
     if (project.credentialReferences) {
       for (const [credId, credData] of Object.entries(project.credentialReferences)) {
-        const credentialFile = join6(paths.credentialsDir, `${credId}.ts`);
+        const credentialFile = join7(paths.credentialsDir, `${credId}.ts`);
         const credentialContent = generateCredentialFile(credId, credData, style);
         ensureDir(credentialFile);
         writeFileSync3(credentialFile, credentialContent, "utf-8");
         generatedFiles.push(credentialFile);
       }
     }
-    const envFile = join6(paths.environmentsDir, `${environment}.env.ts`);
+    const envFile = join7(paths.environmentsDir, `${environment}.env.ts`);
     const envData = {
       name: `${environment} Environment`,
       description: `Environment configuration for ${environment}`,
@@ -237300,7 +237388,7 @@ async function introspectGenerate(project, paths, environment, debug, options =
     ensureDir(envFile);
     writeFileSync3(envFile, envContent, "utf-8");
     generatedFiles.push(envFile);
-    const envIndexFile = join6(paths.environmentsDir, "index.ts");
+    const envIndexFile = join7(paths.environmentsDir, "index.ts");
     const environments = [environment];
     const envIndexContent = generateEnvironmentIndexFile(environments, style);
     ensureDir(envIndexFile);
@@ -237308,7 +237396,7 @@ async function introspectGenerate(project, paths, environment, debug, options =
     generatedFiles.push(envIndexFile);
     if (project.functions) {
       for (const [funcId, funcData] of Object.entries(project.functions)) {
-        const functionFile = join6(paths.toolsDir, "functions", `${funcId}.ts`);
+        const functionFile = join7(paths.toolsDir, "functions", `${funcId}.ts`);
         const functionContent = generateFunctionToolFile(funcId, funcData, style);
         ensureDir(functionFile);
         writeFileSync3(functionFile, functionContent, "utf-8");
@@ -237317,7 +237405,7 @@ async function introspectGenerate(project, paths, environment, debug, options =
     }
     if (project.tools) {
       for (const [toolId, toolData] of Object.entries(project.tools)) {
-        const toolFile = join6(paths.toolsDir, `${toolId}.ts`);
+        const toolFile = join7(paths.toolsDir, `${toolId}.ts`);
         const toolContent = generateMcpToolFile(toolId, toolData, style, registry2);
         ensureDir(toolFile);
         writeFileSync3(toolFile, toolContent, "utf-8");
@@ -237326,7 +237414,7 @@ async function introspectGenerate(project, paths, environment, debug, options =
     }
     if (project.dataComponents) {
       for (const [dataId, dataData] of Object.entries(project.dataComponents)) {
-        const dataFile = join6(paths.dataComponentsDir, `${dataId}.ts`);
+        const dataFile = join7(paths.dataComponentsDir, `${dataId}.ts`);
         const dataContent = generateDataComponentFile(dataId, dataData, style);
         ensureDir(dataFile);
         writeFileSync3(dataFile, dataContent, "utf-8");
@@ -237335,7 +237423,7 @@ async function introspectGenerate(project, paths, environment, debug, options =
     }
     if (project.artifactComponents) {
       for (const [artifactId, artifactData] of Object.entries(project.artifactComponents)) {
-        const artifactFile = join6(paths.artifactComponentsDir, `${artifactId}.ts`);
+        const artifactFile = join7(paths.artifactComponentsDir, `${artifactId}.ts`);
         const artifactContent = generateArtifactComponentFile(artifactId, artifactData, style);
         ensureDir(artifactFile);
         writeFileSync3(artifactFile, artifactContent, "utf-8");
@@ -237347,7 +237435,7 @@ async function introspectGenerate(project, paths, environment, debug, options =
       for (const statusComp of registeredStatusComponents) {
         const statusData = findStatusComponentData(project, statusComp.id);
         if (statusData) {
-          const statusFile = join6(paths.statusComponentsDir, `${statusComp.id}.ts`);
+          const statusFile = join7(paths.statusComponentsDir, `${statusComp.id}.ts`);
           const statusContent = generateStatusComponentFile(statusComp.id, statusData, style);
           ensureDir(statusFile);
           writeFileSync3(statusFile, statusContent, "utf-8");
@@ -237357,7 +237445,7 @@ async function introspectGenerate(project, paths, environment, debug, options =
     }
     if (project.externalAgents) {
       for (const [extAgentId, extAgentData] of Object.entries(project.externalAgents)) {
-        const extAgentFile = join6(paths.externalAgentsDir, `${extAgentId}.ts`);
+        const extAgentFile = join7(paths.externalAgentsDir, `${extAgentId}.ts`);
         const extAgentContent = generateExternalAgentFile(
           extAgentId,
           extAgentData,
@@ -237374,7 +237462,7 @@ async function introspectGenerate(project, paths, environment, debug, options =
       for (const contextComp of registeredContextConfigs) {
         const contextData = findContextConfigData(project, contextComp.id);
         if (contextData) {
-          const contextFile = join6(paths.contextConfigsDir, `${contextComp.id}.ts`);
+          const contextFile = join7(paths.contextConfigsDir, `${contextComp.id}.ts`);
           const contextContent = generateContextConfigFile(
             contextComp.id,
             contextData,
@@ -237401,7 +237489,7 @@ async function introspectGenerate(project, paths, environment, debug, options =
           if (agentData.subAgents) {
             const contextConfigData = agentData.contextConfig?.id ? findContextConfigData(project, agentData.contextConfig.id) : void 0;
             for (const [subAgentId, subAgentData] of Object.entries(agentData.subAgents)) {
-              const subAgentFile = join6(paths.agentsDir, "sub-agents", `${subAgentId}.ts`);
+              const subAgentFile = join7(paths.agentsDir, "sub-agents", `${subAgentId}.ts`);
               const parentModels = agentData.models || project.models;
               const subAgentContent = generateSubAgentFile(
                 subAgentId,
@@ -237422,7 +237510,7 @@ async function introspectGenerate(project, paths, environment, debug, options =
     }
     if (project.agents) {
       for (const [agentId, agentData] of Object.entries(project.agents)) {
-        const agentFile = join6(paths.agentsDir, `${agentId}.ts`);
+        const agentFile = join7(paths.agentsDir, `${agentId}.ts`);
         const contextConfigData = agentData.contextConfig?.id ? findContextConfigData(project, agentData.contextConfig.id) : void 0;
         const agentContent = generateAgentFile(
           agentId,
@@ -237447,7 +237535,7 @@ async function introspectGenerate(project, paths, environment, debug, options =
       artifactComponents: project.artifactComponents ? Object.keys(project.artifactComponents) : [],
       credentialReferences: project.credentialReferences ? Object.keys(project.credentialReferences) : []
     };
-    const projectFile = join6(paths.projectRoot, "index.ts");
+    const projectFile = join7(paths.projectRoot, "index.ts");
     const projectContent = generateProjectFile(
       project.id,
       projectDataForGenerator,
@@ -238451,38 +238539,6 @@ var init_project_comparator = __esm({
   }
 });
 
-// src/utils/project-loader.ts
-var project_loader_exports = {};
-__export(project_loader_exports, {
-  loadProject: () => loadProject
-});
-import { existsSync as existsSync6 } from "fs";
-import { join as join7 } from "path";
-async function loadProject(projectDir) {
-  const indexPath = join7(projectDir, "index.ts");
-  if (!existsSync6(indexPath)) {
-    throw new Error(`index.ts not found in project directory: ${projectDir}`);
-  }
-  const module = await importWithTypeScriptSupport(indexPath);
-  const exports = Object.keys(module);
-  for (const exportKey of exports) {
-    const value = module[exportKey];
-    if (value && typeof value === "object" && value.__type === "project") {
-      return value;
-    }
-  }
-  throw new Error(
-    'No project export found in index.ts. Expected an export with __type = "project"'
-  );
-}
-var init_project_loader = __esm({
-  "src/utils/project-loader.ts"() {
-    "use strict";
-    init_esm_shims();
-    init_tsx_loader();
-  }
-});
-
 // src/commands/pull-v3/component-parser.ts
 var component_parser_exports = {};
 __export(component_parser_exports, {
@@ -240262,35 +240318,9 @@ var init_project_index_generator = __esm({
 
 // src/commands/pull-v3/index.ts
 import { existsSync as existsSync11, mkdirSync as mkdirSync5 } from "fs";
-import { dirname as dirname9, join as join13, resolve as resolve3 } from "path";
+import { join as join13, resolve as resolve3 } from "path";
 import * as p6 from "@clack/prompts";
 import chalk14 from "chalk";
-async function loadProjectConfig(projectDir, configPathOverride) {
-  const configPath = configPathOverride ? resolve3(process.cwd(), configPathOverride) : join13(projectDir, "inkeep.config.ts");
-  if (!existsSync11(configPath)) {
-    throw new Error(`Configuration file not found: ${configPath}`);
-  }
-  try {
-    const config = await loadConfig(configPath);
-    if (!config.tenantId) {
-      throw new Error("tenantId is required in inkeep.config.ts");
-    }
-    return {
-      tenantId: config.tenantId,
-      agentsManageApi: {
-        url: config.agentsManageApiUrl || "http://localhost:3002",
-        ...config.agentsManageApiKey && { apiKey: config.agentsManageApiKey }
-      },
-      agentsRunApi: {
-        url: config.agentsRunApiUrl || "http://localhost:3003",
-        ...config.agentsRunApiKey && { apiKey: config.agentsRunApiKey }
-      },
-      outputDirectory: config.outputDirectory
-    };
-  } catch (error) {
-    throw new Error(`Failed to load configuration: ${error.message}`);
-  }
-}
 function createProjectStructure(projectDir, projectId) {
   const projectRoot = projectDir;
   const paths = {
@@ -240437,31 +240467,54 @@ async function pullV3Command(options) {
   }
   const s = p6.spinner();
   try {
-    s.start("Loading configuration...");
-    let config = null;
-    const searchDir = process.cwd();
-    if (options.config) {
-      const configPath = resolve3(process.cwd(), options.config);
-      if (existsSync11(configPath)) {
-        config = await loadProjectConfig(dirname9(configPath), options.config);
-      } else {
-        throw new Error(`Configuration file not found: ${configPath}`);
+    const { config } = await initializeCommand({
+      configPath: options.config,
+      showSpinner: true,
+      spinnerText: "Loading configuration...",
+      logConfig: true
+    });
+    s.start("Detecting project...");
+    let projectDir;
+    if (options.project) {
+      projectDir = resolve3(process.cwd(), options.project);
+      if (!existsSync11(join13(projectDir, "index.ts"))) {
+        s.stop(`No index.ts found in specified project directory: ${projectDir}`);
+        console.error(
+          chalk14.yellow("The specified project directory must contain an index.ts file")
+        );
+        process.exit(1);
       }
     } else {
-      const currentConfigPath = join13(searchDir, "inkeep.config.ts");
-      if (existsSync11(currentConfigPath)) {
-        config = await loadProjectConfig(searchDir);
+      const currentDir = process.cwd();
+      if (existsSync11(join13(currentDir, "index.ts"))) {
+        projectDir = currentDir;
       } else {
-        throw new Error("Could not find inkeep.config.ts");
+        s.stop("No index.ts found in current directory");
+        console.error(
+          chalk14.yellow(
+            "Please run this command from a directory containing index.ts or use --project <path>"
+          )
+        );
+        process.exit(1);
       }
     }
-    const projectId = options.project;
-    if (!projectId) {
-      throw new Error("Project ID is required");
+    s.stop(`Project found: ${projectDir}`);
+    s.start("Loading local project to get project ID...");
+    let localProjectForId;
+    let projectId;
+    try {
+      localProjectForId = await loadProject(projectDir);
+      projectId = localProjectForId.getId();
+      s.stop(`Project ID: ${projectId}`);
+    } catch (error) {
+      s.stop("Failed to load local project");
+      throw new Error(
+        `Could not determine project ID. Local project failed to load: ${error instanceof Error ? error.message : String(error)}`
+      );
     }
-    s.message("Configuration loaded");
+    s.start(`Fetching project: ${projectId}`);
     const apiClient = await ManagementApiClient.create(
-      config.agentsManageApi.url,
+      config.agentsManageApiUrl,
       options.config,
       config.tenantId,
       projectId
@@ -240547,8 +240600,6 @@ async function pullV3Command(options) {
       restoreLogLevel();
       return;
     }
-    const outputDir = config.outputDirectory && config.outputDirectory !== "default" ? config.outputDirectory : process.cwd();
-    const projectDir = resolve3(outputDir, projectId);
     const paths = createProjectStructure(projectDir, projectId);
     if (options.introspect) {
       console.log(chalk14.yellow("\n\u{1F50D} Introspect mode: Regenerating all files from scratch"));
@@ -240722,7 +240773,8 @@ var init_pull_v3 = __esm({
     init_esm_shims();
     init_api();
     init_background_version_check();
-    init_config();
+    init_cli_pipeline();
+    init_project_loader();
     init_introspect_generator();
     init_project_comparator();
     init_component_registry();
@@ -241752,62 +241804,10 @@ Note: Config file created in ${configDir}`));
 // src/commands/list-agents.ts
 init_esm_shims();
 init_api();
+init_cli_pipeline();
 import * as p5 from "@clack/prompts";
 import chalk6 from "chalk";
 import Table from "cli-table3";
-
-// src/utils/cli-pipeline.ts
-init_esm_shims();
-init_config();
-import * as p4 from "@clack/prompts";
-import chalk5 from "chalk";
-async function initializeCommand(options = {}) {
-  const {
-    configPath,
-    showSpinner = false,
-    spinnerText = "Loading configuration...",
-    logConfig = true
-  } = options;
-  const s = showSpinner ? p4.spinner() : void 0;
-  if (s) {
-    s.start(spinnerText);
-  }
-  try {
-    const config = await validateConfiguration(configPath);
-    if (s) {
-      s.stop("Configuration loaded");
-    }
-    if (logConfig) {
-      console.log(chalk5.gray("Configuration:"));
-      console.log(chalk5.gray(`  \u2022 Tenant ID: ${config.tenantId}`));
-      console.log(chalk5.gray(`  \u2022 Manage API URL: ${config.agentsManageApiUrl}`));
-      console.log(chalk5.gray(`  \u2022 Run API URL: ${config.agentsRunApiUrl}`));
-      if (config.sources.configFile) {
-        console.log(chalk5.gray(`  \u2022 Config file: ${config.sources.configFile}`));
-      }
-    }
-    return { config };
-  } catch (error) {
-    if (s) {
-      s.stop("Configuration failed");
-    }
-    console.error(chalk5.red("Error:"), error.message);
-    if (error.message.includes("No configuration found")) {
-      console.log(chalk5.yellow("\nHint: Create a configuration file by running:"));
-      console.log(chalk5.gray("  inkeep init"));
-    } else if (error.message.includes("Config file not found")) {
-      console.log(chalk5.yellow("\nHint: Check that your config file path is correct"));
-    } else if (error.message.includes("tenantId") || error.message.includes("API URL")) {
-      console.log(chalk5.yellow("\nHint: Ensure your inkeep.config.ts has all required fields:"));
-      console.log(chalk5.gray("  - tenantId"));
-      console.log(chalk5.gray("  - agentsManageApiUrl (or agentsManageApi.url)"));
-      console.log(chalk5.gray("  - agentsRunApiUrl (or agentsRunApi.url)"));
-    }
-    process.exit(1);
-  }
-}
-
-// src/commands/list-agents.ts
 async function listAgentsCommand(options) {
   const configPath = options.config || options.configFilePath;
   const { config } = await initializeCommand({
@@ -241876,6 +241876,7 @@ import { join as join15, resolve as resolve4 } from "path";
 import * as p7 from "@clack/prompts";
 import chalk15 from "chalk";
 init_background_version_check();
+init_cli_pipeline();
 
 // src/utils/environment-loader.ts
 init_esm_shims();
@@ -242262,7 +242263,10 @@ program.command("push").description("Push a project configuration to the backend
 ).option("--json", "Generate project data JSON file instead of pushing to backend").action(async (options) => {
   await pushCommand(options);
 });
-program.command("pull").description("Pull project configuration with clean, efficient code generation").option("--project <project-id>", "Project ID to pull from backend").option("--config <path>", "Path to configuration file").option(
+program.command("pull").description("Pull project configuration with clean, efficient code generation").option(
+  "--project <project-id>",
+  "Override project ID (defaults to local project ID from index.ts)"
+).option("--config <path>", "Path to configuration file").option(
   "--env <environment>",
   "Environment file to generate (development, staging, production). Defaults to development"
 ).option("--json", "Output project data as JSON instead of generating files").option("--debug", "Enable debug logging").option("--verbose", "Enable verbose logging").option("--force", "Force regeneration even if no changes detected").option("--introspect", "Completely regenerate all files from scratch (no comparison needed)").action(async (options) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inkeep/agents-cli",
-  "version": "0.31.1",
+  "version": "0.31.2",
   "description": "Inkeep CLI tool",
   "type": "module",
   "main": "./dist/index.js",
@@ -49,8 +49,8 @@
     "ts-morph": "^26.0.0",
     "tsx": "^4.20.5",
     "open": "^10.2.0",
-    "@inkeep/agents-core": "^0.31.1",
-    "@inkeep/agents-sdk": "^0.31.1"
+    "@inkeep/agents-core": "^0.31.2",
+    "@inkeep/agents-sdk": "^0.31.2"
   },
   "devDependencies": {
     "@types/degit": "^2.8.6",