@inkeep/agents-cli 0.12.1 → 0.13.0

package/dist/config.d.ts

@@ -1,10 +1,28 @@
-interface InkeepConfig {
+interface ApiConfig {
+    url: string;
+    apiKey?: string;
+}
+interface FlatInkeepConfig {
     tenantId: string;
+    /**
+     * @deprecated Use the nested `agentsManageApi.url` format instead
+     */
     agentsManageApiUrl: string;
+    /**
+     * @deprecated Use the nested `agentsRunApi.url` format instead
+     */
     agentsRunApiUrl: string;
     manageUiUrl?: string;
     outputDirectory?: string;
 }
+interface NestedInkeepConfig {
+    tenantId: string;
+    agentsManageApi: ApiConfig;
+    agentsRunApi: ApiConfig;
+    manageUiUrl?: string;
+    outputDirectory?: string;
+}
+type InkeepConfig = FlatInkeepConfig | NestedInkeepConfig;
 declare function defineConfig(config: InkeepConfig): InkeepConfig;
 
-export { type InkeepConfig, defineConfig };
+export { type ApiConfig, type FlatInkeepConfig, type InkeepConfig, type NestedInkeepConfig, defineConfig };

package/dist/index.js

@@ -2714,7 +2714,7 @@ var init_schemas = __esm({
     });
     ProjectSelectSchema = createSelectSchema(projects);
     ProjectInsertSchema = createInsertSchema(projects).extend({
-      models: ProjectModelSchema.optional(),
+      models: ProjectModelSchema,
       stopWhen: StopWhenSchema.optional()
     }).omit({
       createdAt: true,
@@ -20529,41 +20529,6 @@ var init_src = __esm({
   }
 });
 
-// src/env.ts
-import { z as z10 } from "zod";
-var envSchema2, parseEnv2, env2;
-var init_env2 = __esm({
-  "src/env.ts"() {
-    "use strict";
-    init_esm_shims();
-    init_src();
-    loadEnvironmentFiles();
-    envSchema2 = z10.object({
-      DEBUG: z10.string().optional(),
-      // Secrets loaded from .env files (relative to where CLI is executed)
-      INKEEP_AGENTS_MANAGE_API_BYPASS_SECRET: z10.string().optional(),
-      INKEEP_AGENTS_RUN_API_BYPASS_SECRET: z10.string().optional(),
-      ANTHROPIC_API_KEY: z10.string().optional()
-    });
-    parseEnv2 = () => {
-      try {
-        const parsedEnv = envSchema2.parse(process.env);
-        return parsedEnv;
-      } catch (error) {
-        if (error instanceof z10.ZodError) {
-          const missingVars = error.issues.map((issue) => issue.path.join("."));
-          throw new Error(
-            `\u274C Invalid environment variables: ${missingVars.join(", ")}
-${error.message}`
-          );
-        }
-        throw error;
-      }
-    };
-    env2 = parseEnv2();
-  }
-});
-
 // src/utils/tsx-loader.ts
 import { extname } from "path";
 import { pathToFileURL } from "url";
@@ -20601,8 +20566,41 @@ var init_tsx_loader = __esm({
 });
 
 // src/utils/config.ts
+var config_exports = {};
+__export(config_exports, {
+  getAgentsManageApiUrl: () => getAgentsManageApiUrl,
+  getAgentsRunApiUrl: () => getAgentsRunApiUrl,
+  getProjectId: () => getProjectId,
+  getTenantId: () => getTenantId,
+  loadConfig: () => loadConfig,
+  validateConfiguration: () => validateConfiguration
+});
 import { existsSync as existsSync4 } from "fs";
 import { dirname as dirname3, join as join4, resolve as resolve2 } from "path";
+function isNestedConfig(config) {
+  return config && (config.agentsManageApi !== void 0 || config.agentsRunApi !== void 0);
+}
+function normalizeConfig(config) {
+  if (isNestedConfig(config)) {
+    return {
+      tenantId: config.tenantId,
+      agentsManageApiUrl: config.agentsManageApi?.url,
+      agentsRunApiUrl: config.agentsRunApi?.url,
+      agentsManageApiKey: config.agentsManageApi?.apiKey,
+      agentsRunApiKey: config.agentsRunApi?.apiKey,
+      manageUiUrl: config.manageUiUrl,
+      outputDirectory: config.outputDirectory
+    };
+  } else {
+    return {
+      tenantId: config.tenantId,
+      agentsManageApiUrl: config.agentsManageApiUrl,
+      agentsRunApiUrl: config.agentsRunApiUrl,
+      manageUiUrl: config.manageUiUrl,
+      outputDirectory: config.outputDirectory
+    };
+  }
+}
 function findConfigFile(startPath = process.cwd()) {
   let currentPath = resolve2(startPath);
   const root = "/";
@@ -20638,11 +20636,12 @@ async function loadConfigFromFile(configPath) {
   }
   try {
     const module = await importWithTypeScriptSupport(resolvedPath);
-    const config = module.default || module.config;
-    logger12.info({ config }, `Loaded config values`);
-    if (!config) {
+    const rawConfig = module.default || module.config;
+    if (!rawConfig) {
       throw new Error(`No config exported from ${resolvedPath}`);
     }
+    const config = normalizeConfig(rawConfig);
+    logger12.info({ config }, `Loaded config values`);
     return config;
   } catch (error) {
     console.warn(`Warning: Failed to load config file ${resolvedPath}:`, error);
@@ -20704,6 +20703,8 @@ async function validateConfiguration(tenantIdFlag, agentsManageApiUrlFlag, agent
       tenantId: tenantIdFlag,
       agentsManageApiUrl: agentsManageApiUrlFlag,
       agentsRunApiUrl: agentsRunApiUrlFlag,
+      agentsManageApiKey: config.agentsManageApiKey,
+      agentsRunApiKey: config.agentsRunApiKey,
       manageUiUrl: config.manageUiUrl,
       sources: sources2
     };
@@ -20742,6 +20743,8 @@ Please ensure your config file exports a valid configuration with tenantId.`
     tenantId,
     agentsManageApiUrl,
     agentsRunApiUrl,
+    agentsManageApiKey: config.agentsManageApiKey,
+    agentsRunApiKey: config.agentsRunApiKey,
     manageUiUrl: config.manageUiUrl,
     sources
   };
@@ -20763,16 +20766,17 @@ var init_api = __esm({
   "src/api.ts"() {
     "use strict";
     init_esm_shims();
-    init_env2();
     init_config();
     BaseApiClient = class {
       apiUrl;
       tenantId;
       projectId;
-      constructor(apiUrl, tenantId, projectId) {
+      apiKey;
+      constructor(apiUrl, tenantId, projectId, apiKey) {
         this.apiUrl = apiUrl;
         this.tenantId = tenantId;
         this.projectId = projectId;
+        this.apiKey = apiKey;
       }
       checkTenantId() {
         if (!this.tenantId) {
@@ -20791,14 +20795,16 @@ var init_api = __esm({
       }
     };
     ManagementApiClient = class _ManagementApiClient extends BaseApiClient {
-      constructor(apiUrl, tenantId, projectId) {
-        super(apiUrl, tenantId, projectId);
+      constructor(apiUrl, tenantId, projectId, apiKey) {
+        super(apiUrl, tenantId, projectId, apiKey);
       }
       static async create(apiUrl, configPath, tenantIdOverride, projectIdOverride) {
         const resolvedApiUrl = await getAgentsManageApiUrl(apiUrl, configPath);
         const tenantId = tenantIdOverride || await getTenantId(configPath);
         const projectId = projectIdOverride || await getProjectId(configPath);
-        return new _ManagementApiClient(resolvedApiUrl, tenantId, projectId);
+        const { validateConfiguration: validateConfiguration2 } = await Promise.resolve().then(() => (init_config(), config_exports));
+        const config = await validateConfiguration2(tenantIdOverride, apiUrl, void 0, configPath);
+        return new _ManagementApiClient(resolvedApiUrl, tenantId, projectId, config.agentsManageApiKey);
       }
       async listGraphs() {
         const tenantId = this.checkTenantId();
@@ -20809,8 +20815,8 @@ var init_api = __esm({
             method: "GET",
             headers: {
               "Content-Type": "application/json",
-              ...env2.INKEEP_AGENTS_MANAGE_API_BYPASS_SECRET && {
-                Authorization: `Bearer ${env2.INKEEP_AGENTS_MANAGE_API_BYPASS_SECRET}`
+              ...this.apiKey && {
+                Authorization: `Bearer ${this.apiKey}`
               }
             }
           }
@@ -20840,8 +20846,8 @@ var init_api = __esm({
             method: "PUT",
             headers: {
               "Content-Type": "application/json",
-              ...env2.INKEEP_AGENTS_MANAGE_API_BYPASS_SECRET && {
-                Authorization: `Bearer ${env2.INKEEP_AGENTS_MANAGE_API_BYPASS_SECRET}`
+              ...this.apiKey && {
+                Authorization: `Bearer ${this.apiKey}`
               }
             },
             body: JSON.stringify(graphDefinition)
@@ -20857,14 +20863,16 @@ ${errorText}`);
       }
     };
     ExecutionApiClient = class _ExecutionApiClient extends BaseApiClient {
-      constructor(apiUrl, tenantId, projectId) {
-        super(apiUrl, tenantId, projectId);
+      constructor(apiUrl, tenantId, projectId, apiKey) {
+        super(apiUrl, tenantId, projectId, apiKey);
       }
       static async create(apiUrl, configPath, tenantIdOverride, projectIdOverride) {
         const resolvedApiUrl = await getAgentsRunApiUrl(apiUrl, configPath);
         const tenantId = tenantIdOverride || await getTenantId(configPath);
         const projectId = projectIdOverride || await getProjectId(configPath);
-        return new _ExecutionApiClient(resolvedApiUrl, tenantId, projectId);
+        const { validateConfiguration: validateConfiguration2 } = await Promise.resolve().then(() => (init_config(), config_exports));
+        const config = await validateConfiguration2(tenantIdOverride, void 0, apiUrl, configPath);
+        return new _ExecutionApiClient(resolvedApiUrl, tenantId, projectId, config.agentsRunApiKey);
       }
       async chatCompletion(graphId, messages2, conversationId) {
         const response = await fetch(`${this.apiUrl}/v1/chat/completions`, {
@@ -20872,8 +20880,8 @@ ${errorText}`);
           headers: {
             "Content-Type": "application/json",
             Accept: "text/event-stream",
-            ...env2.INKEEP_AGENTS_RUN_API_BYPASS_SECRET && {
-              Authorization: `Bearer ${env2.INKEEP_AGENTS_RUN_API_BYPASS_SECRET}`
+            ...this.apiKey && {
+              Authorization: `Bearer ${this.apiKey}`
             },
             "x-inkeep-tenant-id": this.tenantId || "test-tenant-id",
             "x-inkeep-project-id": this.projectId,
@@ -21218,7 +21226,35 @@ var init_chat_enhanced = __esm({
 
 // src/index.ts
 init_esm_shims();
-init_env2();
+
+// src/env.ts
+init_esm_shims();
+init_src();
+import { z as z10 } from "zod";
+loadEnvironmentFiles();
+var envSchema2 = z10.object({
+  DEBUG: z10.string().optional(),
+  // Secrets loaded from .env files (relative to where CLI is executed)
+  ANTHROPIC_API_KEY: z10.string().optional()
+});
+var parseEnv2 = () => {
+  try {
+    const parsedEnv = envSchema2.parse(process.env);
+    return parsedEnv;
+  } catch (error) {
+    if (error instanceof z10.ZodError) {
+      const missingVars = error.issues.map((issue) => issue.path.join("."));
+      throw new Error(
+        `\u274C Invalid environment variables: ${missingVars.join(", ")}
+${error.message}`
+      );
+    }
+    throw error;
+  }
+};
+var env2 = parseEnv2();
+
+// src/index.ts
 import { readFileSync as readFileSync3 } from "fs";
 import { dirname as dirname5, join as join10 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
@@ -21748,8 +21784,12 @@ async function initCommand(options) {
 
 export default defineConfig({
   tenantId: '${answers.tenantId}',
-  agentsManageApiUrl: '${answers.apiUrl}',
-  agentsRunApiUrl: '${answers.apiUrl}',
+  agentsManageApi: {
+    url: '${answers.apiUrl}',
+  },
+  agentsRunApi: {
+    url: '${answers.apiUrl}',
+  },
 });
 `;
   try {
@@ -21847,13 +21887,12 @@ ${table.toString()}`);
 
 // src/commands/pull.ts
 init_esm_shims();
-init_env2();
-init_tsx_loader();
 import { existsSync as existsSync6, mkdirSync, readFileSync as readFileSync2, writeFileSync as writeFileSync4 } from "fs";
 import { dirname as dirname4, join as join7, resolve as resolve4 } from "path";
 import chalk6 from "chalk";
 import ora4 from "ora";
 import prompts from "prompts";
+init_tsx_loader();
 
 // src/utils/project-directory.ts
 init_esm_shims();
@@ -23199,12 +23238,11 @@ async function pullProjectCommand(options) {
 
 // src/commands/push.ts
 init_esm_shims();
-init_env2();
-init_config();
 import { existsSync as existsSync8 } from "fs";
 import { join as join9, resolve as resolve5 } from "path";
 import chalk7 from "chalk";
 import ora5 from "ora";
+init_config();
 
 // src/utils/environment-loader.ts
 init_esm_shims();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inkeep/agents-cli",
-  "version": "0.12.1",
+  "version": "0.13.0",
   "description": "Inkeep CLI tool",
   "type": "module",
   "main": "./dist/index.js",
@@ -45,8 +45,8 @@
     "recast": "^0.23.0",
     "ts-morph": "^26.0.0",
     "tsx": "^4.20.5",
-    "@inkeep/agents-manage-ui": "^0.12.1",
-    "@inkeep/agents-core": "^0.12.1"
+    "@inkeep/agents-core": "^0.13.0",
+    "@inkeep/agents-manage-ui": "^0.13.0"
   },
   "devDependencies": {
     "@types/degit": "^2.8.6",