@eide/foir-cli 0.3.2 → 0.4.0

package/dist/cli.js

@@ -2,7 +2,7 @@
 
 // src/cli.ts
 import { config } from "dotenv";
-import { resolve as resolve6, dirname as dirname4 } from "path";
+import { resolve as resolve7, dirname as dirname4 } from "path";
 import { fileURLToPath } from "url";
 import { createRequire } from "module";
 import { Command } from "commander";
@@ -300,13 +300,13 @@ function withErrorHandler(optsFn, fn) {
 // src/commands/login.ts
 async function findAvailablePort(start, end) {
   for (let port = start; port <= end; port++) {
-    const available = await new Promise((resolve7) => {
+    const available = await new Promise((resolve8) => {
       const server = http.createServer();
       server.listen(port, () => {
         server.close();
-        resolve7(true);
+        resolve8(true);
       });
-      server.on("error", () => resolve7(false));
+      server.on("error", () => resolve8(false));
     });
     if (available) return port;
   }
@@ -344,7 +344,7 @@ async function loginAction(globalOpts) {
   const state = crypto.randomBytes(16).toString("hex");
   const port = await findAvailablePort(9876, 9900);
   const redirectUri = `http://localhost:${port}/callback`;
-  const authCode = await new Promise((resolve7, reject) => {
+  const authCode = await new Promise((resolve8, reject) => {
     let timeoutId;
     const server = http.createServer((req, res) => {
       const url = new URL(req.url, `http://localhost:${port}`);
@@ -383,7 +383,7 @@ async function loginAction(globalOpts) {
         );
         server.closeAllConnections();
         server.close();
-        resolve7(code);
+        resolve8(code);
       }
     });
     server.listen(port);
@@ -1860,7 +1860,14 @@ function createConfigsMethods(client) {
           configData
         })
       );
-      return resp.config ?? null;
+      const config2 = resp.config ?? null;
+      if (!config2) return null;
+      return {
+        ...config2,
+        summary: resp.summary ?? null,
+        provisionedApiKeys: resp.provisionedApiKeys ?? [],
+        webhookSecret: resp.webhookSecret ?? null
+      };
     },
     async deleteConfig(id) {
       const resp = await client.deleteConfig(
@@ -2905,12 +2912,9 @@ function registerSelectProjectCommand(program2, globalOpts) {
           selectedProject = projects.find((p) => p.id === projectId);
         }
         console.log("\nProvisioning API key for CLI access...");
-        const projectClient = createPlatformClientWithHeaders(apiUrl, {
-          Authorization: `Bearer ${credentials.accessToken}`,
-          "x-tenant-id": selectedProject.tenantId,
-          "x-project-id": selectedProject.id
-        });
-        const { apiKey, apiKeyId } = await provisionApiKey(projectClient);
+        await client.identity.switchTenant(selectedProject.tenantId);
+        await client.identity.switchProject(selectedProject.id);
+        const { apiKey, apiKeyId } = await provisionApiKey(client);
         await writeProjectContext(
           {
             id: selectedProject.id,
@@ -4229,7 +4233,7 @@ Edit the files, then run:
 
 // src/commands/push.ts
 import chalk6 from "chalk";
-import { existsSync as existsSync4 } from "fs";
+import { existsSync as existsSync4, readFileSync, writeFileSync as writeFileSync2 } from "fs";
 import { resolve as resolve4 } from "path";
 var CONFIG_FILE_NAMES = [
   "foir.config.ts",
@@ -4244,8 +4248,25 @@ function discoverConfigFile() {
   }
   return null;
 }
+function writeEnvVar(envPath, key, value) {
+  let content = "";
+  if (existsSync4(envPath)) {
+    content = readFileSync(envPath, "utf-8");
+    const regex = new RegExp(`^${key}=`, "m");
+    if (regex.test(content)) {
+      return false;
+    }
+  }
+  if (content && !content.endsWith("\n")) {
+    content += "\n";
+  }
+  content += `${key}=${value}
+`;
+  writeFileSync2(envPath, content, "utf-8");
+  return true;
+}
 function registerPushCommand(program2, globalOpts) {
-  program2.command("push").description("Push foir.config.ts to the platform").option("--config <path>", "Path to config file (default: auto-discover)").option("--force", "Force reinstall (delete and recreate)", false).action(
+  program2.command("push").description("Push foir.config.ts to the platform").option("--config <path>", "Path to config file (default: auto-discover)").option("--force", "Force reinstall (delete and recreate)", false).option("--env <path>", "Path to .env file (default: .env)").action(
     withErrorHandler(
       globalOpts,
       async (opts) => {
@@ -4282,18 +4303,203 @@ function registerPushCommand(program2, globalOpts) {
           );
         }
         console.log();
-        console.log(chalk6.green("Config applied successfully."));
-        console.log();
+        console.log(chalk6.green("\u2713 Config applied successfully"));
         console.log(`  Config ID:  ${chalk6.cyan(result.id)}`);
         console.log(`  Config Key: ${chalk6.cyan(result.key)}`);
+        const summary = result.summary;
+        if (summary) {
+          console.log();
+          const lines = [];
+          if (summary.modelsCreated || summary.modelsUpdated) {
+            lines.push(
+              `  Models:      ${summary.modelsCreated ?? 0} created, ${summary.modelsUpdated ?? 0} updated`
+            );
+          }
+          if (summary.operationsCreated || summary.operationsUpdated) {
+            lines.push(
+              `  Operations:  ${summary.operationsCreated ?? 0} created, ${summary.operationsUpdated ?? 0} updated`
+            );
+          }
+          if (summary.hooksCreated || summary.hooksUpdated) {
+            lines.push(
+              `  Hooks:       ${summary.hooksCreated ?? 0} created, ${summary.hooksUpdated ?? 0} updated`
+            );
+          }
+          if (summary.segmentsCreated || summary.segmentsUpdated) {
+            lines.push(
+              `  Segments:    ${summary.segmentsCreated ?? 0} created, ${summary.segmentsUpdated ?? 0} updated`
+            );
+          }
+          if (summary.schedulesCreated || summary.schedulesUpdated) {
+            lines.push(
+              `  Schedules:   ${summary.schedulesCreated ?? 0} created, ${summary.schedulesUpdated ?? 0} updated`
+            );
+          }
+          if (summary.authProvidersCreated || summary.authProvidersUpdated) {
+            lines.push(
+              `  Auth:        ${summary.authProvidersCreated ?? 0} created, ${summary.authProvidersUpdated ?? 0} updated`
+            );
+          }
+          if (summary.resourcesDeleted) {
+            lines.push(
+              `  Cleaned up:  ${summary.resourcesDeleted} orphaned resource(s)`
+            );
+          }
+          if (lines.length > 0) {
+            for (const line of lines) {
+              console.log(line);
+            }
+          }
+        }
+        const envPath = resolve4(opts.env ?? ".env");
+        const r = result;
+        const provisionedKeys = r.provisionedApiKeys;
+        const webhookSecret = r.webhookSecret;
+        const envWrites = [];
+        if (provisionedKeys && provisionedKeys.length > 0) {
+          for (const pk of provisionedKeys) {
+            envWrites.push({
+              key: pk.envVar,
+              value: pk.rawKey,
+              label: `${pk.name} (${pk.keyType})`
+            });
+          }
+        }
+        if (webhookSecret) {
+          envWrites.push({
+            key: "FOIR_WEBHOOK_SECRET",
+            value: webhookSecret,
+            label: "Webhook signing secret"
+          });
+        }
+        if (envWrites.length > 0) {
+          console.log();
+          for (const { key, value, label } of envWrites) {
+            const written = writeEnvVar(envPath, key, value);
+            if (written) {
+              console.log(
+                chalk6.green(`\u2713 ${label}`) + chalk6.dim(` \u2192 ${key} written to ${envPath}`)
+              );
+            } else {
+              console.log(
+                chalk6.dim(`  ${label}: ${key} already exists in ${envPath}, skipped`)
+              );
+            }
+          }
+        }
         console.log();
       }
     )
   );
 }
 
-// src/commands/remove.ts
+// src/commands/pull.ts
 import chalk7 from "chalk";
+import { existsSync as existsSync5, writeFileSync as writeFileSync3 } from "fs";
+import { resolve as resolve5 } from "path";
+import prettier from "prettier";
+var DEFAULT_OUTPUT = "foir.config.ts";
+function registerPullCommand(program2, globalOpts) {
+  program2.command("pull").description("Export platform config to foir.config.ts").option("--key <configKey>", "Config key to export").option("--out <path>", `Output file (default: ${DEFAULT_OUTPUT})`).option("--force", "Overwrite existing file without prompting", false).action(
+    withErrorHandler(
+      globalOpts,
+      async (opts) => {
+        const client = await createPlatformClient(globalOpts());
+        let configKey = opts.key;
+        if (!configKey) {
+          const { configs } = await client.configs.listConfigs({ limit: 50 });
+          if (!configs || configs.length === 0) {
+            throw new Error(
+              "No configs found in this project. Push one first with `foir push`."
+            );
+          }
+          if (configs.length === 1) {
+            configKey = configs[0].key;
+          } else {
+            console.log("Available configs:");
+            for (const c of configs) {
+              console.log(`  ${chalk7.cyan(c.key)} \u2014 ${c.name}`);
+            }
+            throw new Error(
+              "Multiple configs found. Use --key <configKey> to specify which one to export."
+            );
+          }
+        }
+        console.log(chalk7.dim(`Fetching config "${configKey}"...`));
+        const config2 = await client.configs.getConfigByKey(configKey);
+        if (!config2) {
+          throw new Error(`Config "${configKey}" not found.`);
+        }
+        const configData = config2.config;
+        if (!configData) {
+          throw new Error(
+            `Config "${configKey}" has no config data. It may have been created via the admin UI without a manifest.`
+          );
+        }
+        const manifest = {
+          key: config2.key,
+          name: config2.name,
+          ...config2.configType && config2.configType !== "custom" ? { configType: config2.configType } : {},
+          ...config2.direction ? { direction: config2.direction } : {},
+          ...config2.description ? { description: config2.description } : {},
+          ...config2.connectionDomain ? { operationBaseUrl: config2.connectionDomain } : {},
+          ...configData
+        };
+        delete manifest.force;
+        const jsonContent = JSON.stringify(manifest, null, 2);
+        const tsContent = `/**
+ * ${manifest.name} \u2014 Foir Config
+ *
+ * Exported from platform via \`foir pull\`.
+ * Push changes back with \`foir push\`.
+ */
+
+import { defineConfig } from '@eide/foir-cli/configs';
+
+export default defineConfig(${jsonContent});
+`;
+        let formatted;
+        try {
+          formatted = await prettier.format(tsContent, {
+            parser: "typescript",
+            singleQuote: true,
+            trailingComma: "all"
+          });
+        } catch {
+          formatted = tsContent;
+        }
+        const outPath = resolve5(opts.out ?? DEFAULT_OUTPUT);
+        if (existsSync5(outPath) && !opts.force) {
+          throw new Error(
+            `${outPath} already exists. Use --force to overwrite.`
+          );
+        }
+        writeFileSync3(outPath, formatted, "utf-8");
+        console.log(chalk7.green(`\u2713 Exported to ${outPath}`));
+        const models = configData.models ?? [];
+        const operations = configData.operations ?? [];
+        const hooks = configData.hooks ?? [];
+        const segments = configData.segments ?? [];
+        const schedules = configData.schedules ?? [];
+        const authProviders = configData.authProviders ?? [];
+        const parts = [];
+        if (models.length > 0) parts.push(`${models.length} model(s)`);
+        if (operations.length > 0) parts.push(`${operations.length} operation(s)`);
+        if (hooks.length > 0) parts.push(`${hooks.length} hook(s)`);
+        if (segments.length > 0) parts.push(`${segments.length} segment(s)`);
+        if (schedules.length > 0) parts.push(`${schedules.length} schedule(s)`);
+        if (authProviders.length > 0) parts.push(`${authProviders.length} auth provider(s)`);
+        if (configData.customerProfileSchema) parts.push("customer profile schema");
+        if (parts.length > 0) {
+          console.log(chalk7.dim(`  Contains: ${parts.join(", ")}`));
+        }
+      }
+    )
+  );
+}
+
+// src/commands/remove.ts
+import chalk8 from "chalk";
 import inquirer5 from "inquirer";
 function registerRemoveCommand(program2, globalOpts) {
   program2.command("remove <key>").description("Remove a config and all its provisioned resources").option("--force", "Skip confirmation prompt", false).action(
@@ -4315,13 +4521,13 @@ function registerRemoveCommand(program2, globalOpts) {
             }
           ]);
           if (!confirmed) {
-            console.log(chalk7.dim("Cancelled."));
+            console.log(chalk8.dim("Cancelled."));
             return;
           }
         }
         await client.configs.deleteConfig(config2.id);
         console.log(
-          chalk7.green(`Removed config "${config2.name}" (${config2.key}).`)
+          chalk8.green(`Removed config "${config2.name}" (${config2.key}).`)
         );
       }
     )
@@ -4329,7 +4535,7 @@ function registerRemoveCommand(program2, globalOpts) {
 }
 
 // src/commands/profiles.ts
-import chalk8 from "chalk";
+import chalk9 from "chalk";
 function registerProfilesCommand(program2, globalOpts) {
   const profiles = program2.command("profiles").description("Manage named project profiles");
   profiles.command("list").description("List all saved project profiles").action(
@@ -4489,7 +4695,7 @@ function registerProfilesCommand(program2, globalOpts) {
         if (opts.json || opts.jsonl) {
           formatOutput({ deleted: name }, opts);
         } else {
-          console.log(chalk8.green(`Deleted profile "${name}".`));
+          console.log(chalk9.green(`Deleted profile "${name}".`));
         }
       }
     )
@@ -4498,8 +4704,8 @@ function registerProfilesCommand(program2, globalOpts) {
 
 // src/commands/register-commands.ts
 import { readdirSync } from "fs";
-import { resolve as resolve5 } from "path";
-import chalk9 from "chalk";
+import { resolve as resolve6 } from "path";
+import chalk10 from "chalk";
 
 // src/command-registry/command-map.ts
 var COMMANDS = [
@@ -6297,7 +6503,7 @@ function buildDispatchTable() {
       unregisterConfig: async (v, c) => await c.configs.deleteConfig(str(v.id)),
       triggerConfigSync: async (v, _c) => {
         console.log(
-          chalk9.yellow(
+          chalk10.yellow(
             `Config sync trigger for ${str(v.configId)} is not yet available via ConnectRPC.`
           )
         );
@@ -6467,11 +6673,11 @@ function registerDynamicCommands(program2, globalOpts) {
             variables.limit = flags.limit;
           }
           if (flags.dir && entry.acceptsInput) {
-            const dirPath = resolve5(String(flags.dir));
+            const dirPath = resolve6(String(flags.dir));
             const files = readdirSync(dirPath).filter((f) => /\.(json|ts|js|mjs)$/.test(f)).sort();
             if (files.length === 0) {
               console.error(
-                chalk9.yellow(`No .json/.ts/.js files found in ${dirPath}`)
+                chalk10.yellow(`No .json/.ts/.js files found in ${dirPath}`)
               );
               return;
             }
@@ -6479,7 +6685,7 @@ function registerDynamicCommands(program2, globalOpts) {
             let updated = 0;
             let failed = 0;
             for (const file of files) {
-              const filePath = resolve5(dirPath, file);
+              const filePath = resolve6(dirPath, file);
               const fileData = await parseInputData({ file: filePath });
               const argName = entry.inputArgName ?? "input";
               const fileVars = { ...variables, [argName]: fileData };
@@ -6514,19 +6720,19 @@ function registerDynamicCommands(program2, globalOpts) {
                   } catch (updateErr) {
                     failed++;
                     const msg2 = updateErr instanceof Error ? updateErr.message : String(updateErr);
-                    console.error(chalk9.red(`\u2717 ${label}:`), msg2);
+                    console.error(chalk10.red(`\u2717 ${label}:`), msg2);
                     continue;
                   }
                 }
                 failed++;
                 const msg = err instanceof Error ? err.message : String(err);
-                console.error(chalk9.red(`\u2717 ${label}:`), msg);
+                console.error(chalk10.red(`\u2717 ${label}:`), msg);
               }
             }
             if (!(opts.json || opts.jsonl || opts.quiet)) {
               console.log("");
               console.log(
-                chalk9.bold(
+                chalk10.bold(
                   `Done: ${created} created${updated ? `, ${updated} updated` : ""}${failed ? `, ${failed} failed` : ""}`
                 )
               );
@@ -6687,7 +6893,7 @@ function registerDynamicCommands(program2, globalOpts) {
               }
             } else if (!(opts.json || opts.jsonl || opts.quiet)) {
               console.error(
-                chalk9.yellow(
+                chalk10.yellow(
                   "Could not auto-publish: no version found in response"
                 )
               );
@@ -6702,7 +6908,7 @@ function registerDynamicCommands(program2, globalOpts) {
 // src/cli.ts
 var __filename = fileURLToPath(import.meta.url);
 var __dirname = dirname4(__filename);
-config({ path: resolve6(__dirname, "../.env.local") });
+config({ path: resolve7(__dirname, "../.env.local") });
 var require2 = createRequire(import.meta.url);
 var { version } = require2("../package.json");
 var program = new Command();
@@ -6725,6 +6931,7 @@ registerProfilesCommand(program, getGlobalOpts);
 registerMediaCommands(program, getGlobalOpts);
 registerSearchCommands(program, getGlobalOpts);
 registerPushCommand(program, getGlobalOpts);
+registerPullCommand(program, getGlobalOpts);
 registerRemoveCommand(program, getGlobalOpts);
 registerCreateConfigCommand(program, getGlobalOpts);
 registerInitCommands(program, getGlobalOpts);

package/dist/lib/config-helpers.d.ts

@@ -98,6 +98,16 @@ interface ApplyConfigHookInput {
     expression?: Record<string, unknown>;
     hooks?: ApplyConfigHookInput[];
 }
+interface ApplyConfigApiKeyInput {
+    /** Name for this API key (e.g. "Tilly iOS", "Tilly BFF"). */
+    name: string;
+    /** Key type: 'public' for client apps, 'secret' for BFF/server. */
+    keyType: 'public' | 'secret';
+    /** Environment variable name to write the key to in .env (e.g. "FOIR_PUBLIC_KEY"). */
+    envVar: string;
+    /** Optional scopes to restrict the key. */
+    scopes?: Record<string, unknown>;
+}
 interface ApplyConfigInput {
     key: string;
     name: string;
@@ -110,6 +120,7 @@ interface ApplyConfigInput {
     hooks?: ApplyConfigHookInput[];
     authProviders?: ApplyConfigAuthProviderInput[];
     placements?: ApplyConfigPlacementInput[];
+    apiKeys?: ApplyConfigApiKeyInput[];
     [key: string]: unknown;
 }
 /** Define a complete config manifest. */
@@ -133,4 +144,4 @@ declare function defineHook(hook: ApplyConfigHookInput): ApplyConfigHookInput;
 /** Define an editor placement (sidebar or main-editor tab). */
 declare function definePlacement(placement: ApplyConfigPlacementInput): ApplyConfigPlacementInput;
 
-export { type ApplyConfigAuthProviderInput, type ApplyConfigHookInput, type ApplyConfigInput, type ApplyConfigModelInput, type ApplyConfigOperationInput, type ApplyConfigPlacementInput, type ApplyConfigScheduleInput, type ApplyConfigSegmentInput, type FieldDefinitionInput, defineAuthProvider, defineConfig, defineExtension, defineField, defineHook, defineModel, defineOperation, definePlacement, defineSchedule, defineSegment };
+export { type ApplyConfigApiKeyInput, type ApplyConfigAuthProviderInput, type ApplyConfigHookInput, type ApplyConfigInput, type ApplyConfigModelInput, type ApplyConfigOperationInput, type ApplyConfigPlacementInput, type ApplyConfigScheduleInput, type ApplyConfigSegmentInput, type FieldDefinitionInput, defineAuthProvider, defineConfig, defineExtension, defineField, defineHook, defineModel, defineOperation, definePlacement, defineSchedule, defineSegment };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eide/foir-cli",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "Universal platform CLI for Foir platform",
   "type": "module",
   "publishConfig": {
@@ -49,7 +49,7 @@
     "@bufbuild/protobuf": "^2.0.0",
     "@connectrpc/connect": "^2.0.0",
     "@connectrpc/connect-node": "^2.0.0",
-    "@eide/foir-proto-ts": "^0.1.0",
+    "@eide/foir-proto-ts": "^0.3.1",
     "chalk": "^5.3.0",
     "commander": "^12.1.0",
     "dotenv": "^16.4.5",