@eide/foir-cli 0.11.2 → 0.12.0

package/dist/cli.js

@@ -848,7 +848,16 @@ function createIdentityMethods(client) {
         create(UpdateProjectRequestSchema, {
           id: params.id,
           name: params.name,
-          description: params.description
+          description: params.description,
+          displayName: params.displayName,
+          logoUrl: params.logoUrl,
+          primaryColor: params.primaryColor,
+          fromName: params.fromName,
+          replyTo: params.replyTo,
+          supportEmail: params.supportEmail,
+          customerPortalBaseUrl: params.customerPortalBaseUrl,
+          customerWelcomeEmailEnabled: params.customerWelcomeEmailEnabled,
+          customerSignupEnabled: params.customerSignupEnabled
         })
       );
       return { project: resp.project ?? null };
@@ -3478,9 +3487,12 @@ function registerSelectProjectCommand(program2, globalOpts) {
           selectedProject = projects.find((p) => p.id === projectId);
         }
         console.log("\nProvisioning API key for CLI access...");
-        await client.identity.switchTenant(selectedProject.tenantId);
-        await client.identity.switchProject(selectedProject.id);
-        const { apiKey, apiKeyId } = await provisionApiKey(client);
+        const scopedClient = createPlatformClientWithHeaders(apiUrl, {
+          Authorization: `Bearer ${credentials.accessToken}`,
+          "x-tenant-id": selectedProject.tenantId,
+          "x-project-id": selectedProject.id
+        });
+        const { apiKey, apiKeyId } = await provisionApiKey(scopedClient);
         await writeProjectContext(
           {
             id: selectedProject.id,
@@ -5693,8 +5705,24 @@ function registerPushCommand(program2, globalOpts) {
           );
         }
         const gOpts = globalOpts();
-        const client = await createPlatformClient(gOpts);
         const resolved = await resolveProjectContext(gOpts);
+        const projectBlock = config2.project;
+        if (projectBlock) {
+          if (!resolved) {
+            throw new Error(
+              `foir.config.ts is pinned to project "${projectBlock.name ?? projectBlock.id}" (${projectBlock.id}), but no project context is selected. Run \`foir select-project\` first.`
+            );
+          }
+          if (resolved.project.id !== projectBlock.id || resolved.project.tenantId !== projectBlock.tenantId) {
+            throw new Error(
+              `Project mismatch \u2014 refusing to push.
+  foir.config.ts pin: ${projectBlock.name ?? projectBlock.id} (${projectBlock.id})
+  resolved (${resolved.source}): ${resolved.project.name} (${resolved.project.id})
+  Hand-edit foir.config.ts or run \`foir select-project\` to align them.`
+            );
+          }
+        }
+        const client = await createPlatformClient(gOpts);
         console.log(
           chalk6.dim(`Pushing config "${config2.key}" to platform...`)
         );
@@ -5747,6 +5775,34 @@ function registerPushCommand(program2, globalOpts) {
         console.log(`  Config Key: ${chalk6.cyan(config2.key)}`);
         console.log();
         printSummary(summary);
+        if (projectBlock?.settings && resolved) {
+          const s = projectBlock.settings;
+          await client.identity.updateProject({
+            id: resolved.project.id,
+            displayName: s.displayName,
+            logoUrl: s.logoUrl,
+            primaryColor: s.primaryColor,
+            fromName: s.fromName,
+            replyTo: s.replyTo,
+            supportEmail: s.supportEmail,
+            customerPortalBaseUrl: s.customerPortalBaseUrl,
+            customerWelcomeEmailEnabled: s.customerWelcomeEmailEnabled,
+            customerSignupEnabled: s.customerSignupEnabled
+          });
+          console.log(chalk6.dim("  Project settings:  applied"));
+        }
+        if (!projectBlock && resolved) {
+          console.log();
+          console.log(chalk6.dim("Tip: pin this folder to its project by adding the following to foir.config.ts:"));
+          console.log(chalk6.dim("  project: {"));
+          console.log(chalk6.dim(`    id: '${resolved.project.id}',`));
+          console.log(chalk6.dim(`    tenantId: '${resolved.project.tenantId}',`));
+          if (resolved.project.name) {
+            console.log(chalk6.dim(`    name: '${resolved.project.name}',`));
+          }
+          console.log(chalk6.dim("  },"));
+          console.log(chalk6.dim("Future pushes will refuse to run if the resolved project drifts from this id."));
+        }
         const envPath = resolve4(opts.env ?? ".env");
         const envWrites = [];
         for (const pk of summary.apiKeys) {
@@ -5846,6 +5902,7 @@ function registerPullCommand(program2, globalOpts) {
         }
         const resolved = await resolveProjectContext(globalOpts());
         let apps;
+        let projectBlock;
         if (resolved) {
           const projectId = resolved.project.id;
           const tenantId = resolved.project.tenantId;
@@ -5856,9 +5913,18 @@ function registerPullCommand(program2, globalOpts) {
               apps[a.name] = appToInput(a);
             }
           }
+          const { project } = await client.identity.getProject(projectId);
+          projectBlock = {
+            id: projectId,
+            tenantId,
+            ...project?.name ? { name: project.name } : {},
+            settings: projectSettingsFromGetProject(project)
+          };
         }
         const configDataNoInteg = { ...configData };
         delete configDataNoInteg.apps;
+        const configDataNoProject = { ...configDataNoInteg };
+        delete configDataNoProject.project;
         const manifest = {
           key: config2.key,
           name: config2.name,
@@ -5866,7 +5932,8 @@ function registerPullCommand(program2, globalOpts) {
           ...config2.direction ? { direction: config2.direction } : {},
           ...config2.description ? { description: config2.description } : {},
           ...config2.connectionDomain ? { operationBaseUrl: config2.connectionDomain } : {},
-          ...configDataNoInteg,
+          ...projectBlock ? { project: projectBlock } : {},
+          ...configDataNoProject,
           ...apps ? { apps } : {}
         };
         delete manifest.force;
@@ -5957,6 +6024,24 @@ export default defineConfig(${jsonContent});
     )
   );
 }
+function projectSettingsFromGetProject(p) {
+  if (!p) return void 0;
+  const out = {};
+  if (p.displayName) out.displayName = p.displayName;
+  if (p.logoUrl) out.logoUrl = p.logoUrl;
+  if (p.primaryColor) out.primaryColor = p.primaryColor;
+  if (p.fromName) out.fromName = p.fromName;
+  if (p.replyTo) out.replyTo = p.replyTo;
+  if (p.supportEmail) out.supportEmail = p.supportEmail;
+  if (p.customerPortalBaseUrl) out.customerPortalBaseUrl = p.customerPortalBaseUrl;
+  if (typeof p.customerWelcomeEmailEnabled === "boolean") {
+    out.customerWelcomeEmailEnabled = p.customerWelcomeEmailEnabled;
+  }
+  if (typeof p.customerSignupEnabled === "boolean") {
+    out.customerSignupEnabled = p.customerSignupEnabled;
+  }
+  return Object.keys(out).length > 0 ? out : void 0;
+}
 function appToInput(a) {
   const mappingsBlob = a.mappings ?? {};
   const out = { source: a.manifestUrl };

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

@@ -252,6 +252,62 @@ interface AppInput {
         placementFields?: Record<string, AppPlacementFieldChoiceInput>;
     };
 }
+/**
+ * Project-level settings applied via UpdateProject at push time and
+ * read via GetProject at pull time. Branding fields are empty-string-as-
+ * clear on the platform side: `''` clears the column, `undefined` leaves
+ * it untouched.
+ */
+interface ApplyConfigProjectSettingsInput {
+    /** Display name in customer-facing emails / portal headers. */
+    displayName?: string;
+    /** Public URL of the project logo (rendered in customer emails). */
+    logoUrl?: string;
+    /** Hex color used as accent in customer-facing emails. */
+    primaryColor?: string;
+    /** "From" name on outbound customer emails. */
+    fromName?: string;
+    /** "Reply-To" address on outbound customer emails. */
+    replyTo?: string;
+    /** Support email surfaced in email footers. */
+    supportEmail?: string;
+    /**
+     * Base URL of the customer-facing portal. Reset / verify / invitation
+     * links in customer emails are built from this — required before the
+     * platform will mint customer-portal links.
+     */
+    customerPortalBaseUrl?: string;
+    /**
+     * Whether the platform sends a welcome email on customer registration.
+     * Default true. Disable for invite-style flows.
+     */
+    customerWelcomeEmailEnabled?: boolean;
+    /**
+     * Whether the public CustomerRegister mutation is allowed. Default true.
+     * When false, customers can only be created via secret-key admin paths
+     * (CreateCustomer, CreateCustomerInvitation).
+     */
+    customerSignupEnabled?: boolean;
+}
+/**
+ * Project pin + declarative settings. The pin (id / tenantId) is a guard
+ * against pushing one folder's config into another folder's project; the
+ * settings are applied to the platform via UpdateProject.
+ */
+interface ApplyConfigProjectInput {
+    /** Project id this folder is bound to. */
+    id: string;
+    /** Tenant id of the bound project. */
+    tenantId: string;
+    /** Optional human-friendly name for diff readability. */
+    name?: string;
+    /**
+     * Project-level settings reconciled by `foir push`. Omit to leave the
+     * platform settings untouched. `foir pull` populates this block from
+     * the live project state so the local config can be version-controlled.
+     */
+    settings?: ApplyConfigProjectSettingsInput;
+}
 interface ApplyConfigInput {
     key: string;
     name: string;
@@ -259,6 +315,12 @@ interface ApplyConfigInput {
     force?: boolean;
     /** Base URL prepended to relative operation endpoints. */
     operationBaseUrl?: string;
+    /**
+     * Project pin + declarative project-level settings. The pin guards
+     * against cross-folder mis-pushes; the settings (when present) are
+     * applied to the platform alongside the model / operation reconcile.
+     */
+    project?: ApplyConfigProjectInput;
     models?: ApplyConfigModelInput[];
     operations?: ApplyConfigOperationInput[];
     segments?: ApplyConfigSegmentInput[];
@@ -292,4 +354,4 @@ declare function defineHook(hook: ApplyConfigHookInput): ApplyConfigHookInput;
 /** Define an editor placement (sidebar or main-editor tab). */
 declare function definePlacement(placement: ApplyConfigPlacementInput): ApplyConfigPlacementInput;
 
-export { type AppInput, type AppPlacementFieldChoiceInput, type AppSinkMappingInput, type AppSourceMappingInput, type ApplyConfigApiKeyInput, type ApplyConfigAuthProviderInput, type ApplyConfigHookInput, type ApplyConfigInput, type ApplyConfigModelInput, type ApplyConfigOperationInput, type ApplyConfigPlacementInput, type ApplyConfigScheduleInput, type ApplyConfigSegmentInput, type ExpressionPrecondition, type FieldDefinitionInput, type Precondition, type QuotaRule, type SegmentPrecondition, type SelectFieldConfig, type SelectFieldDefinitionInput, defineAuthProvider, defineConfig, defineField, defineHook, defineModel, defineOperation, definePlacement, defineSchedule, defineSegment, defineSelectField };
+export { type AppInput, type AppPlacementFieldChoiceInput, type AppSinkMappingInput, type AppSourceMappingInput, type ApplyConfigApiKeyInput, type ApplyConfigAuthProviderInput, type ApplyConfigHookInput, type ApplyConfigInput, type ApplyConfigModelInput, type ApplyConfigOperationInput, type ApplyConfigPlacementInput, type ApplyConfigProjectInput, type ApplyConfigProjectSettingsInput, type ApplyConfigScheduleInput, type ApplyConfigSegmentInput, type ExpressionPrecondition, type FieldDefinitionInput, type Precondition, type QuotaRule, type SegmentPrecondition, type SelectFieldConfig, type SelectFieldDefinitionInput, defineAuthProvider, defineConfig, defineField, defineHook, defineModel, defineOperation, definePlacement, defineSchedule, defineSegment, defineSelectField };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eide/foir-cli",
-  "version": "0.11.2",
+  "version": "0.12.0",
   "description": "Universal platform CLI for Foir platform",
   "type": "module",
   "publishConfig": {
@@ -50,7 +50,7 @@
     "@bufbuild/protovalidate": "^1.1.1",
     "@connectrpc/connect": "^2.0.0",
     "@connectrpc/connect-node": "^2.0.0",
-    "@eide/foir-proto-ts": "^0.29.1",
+    "@eide/foir-proto-ts": "^0.30.0",
     "chalk": "^5.3.0",
     "commander": "^12.1.0",
     "dotenv": "^16.4.5",