@eide/foir-cli 0.4.2 → 0.4.4

package/dist/cli.js

@@ -1144,7 +1144,8 @@ function createIdentityMethods(client) {
 }
 
 // src/lib/rpc/models.ts
-import { create as create2 } from "@bufbuild/protobuf";
+import { create as create2, fromJson } from "@bufbuild/protobuf";
+import { ValueSchema } from "@bufbuild/protobuf/wkt";
 import {
   FieldSchema as ProtoFieldSchema,
   SharingConfigSchema as ProtoSharingConfigSchema,
@@ -1168,6 +1169,7 @@ function jsFieldToProto(f) {
     required: f.required,
     helpText: f.helpText,
     placeholder: f.placeholder,
+    defaultValue: f.defaultValue !== void 0 ? fromJson(ValueSchema, f.defaultValue) : void 0,
     config: f.config && Object.keys(f.config).length > 0 ? f.config : void 0,
     itemType: f.itemType,
     storage: f.storage,
@@ -1887,7 +1889,12 @@ function createConfigsMethods(client) {
 }
 
 // src/lib/rpc/segments.ts
-import { create as create5 } from "@bufbuild/protobuf";
+import { create as create5, fromJson as fromJson2 } from "@bufbuild/protobuf";
+import { ValueSchema as ValueSchema2 } from "@bufbuild/protobuf/wkt";
+import {
+  RuleExpressionSchema,
+  RuleOperandSchema
+} from "@eide/foir-proto-ts/expressions/v1/expressions_pb";
 import {
   CreateSegmentRequestSchema,
   GetSegmentRequestSchema,
@@ -1902,6 +1909,27 @@ import {
   OptOutOfSegmentRequestSchema,
   OptBackIntoSegmentRequestSchema
 } from "@eide/foir-proto-ts/segments/v1/segments_pb";
+function rawOperandToProto(raw) {
+  return create5(RuleOperandSchema, {
+    type: raw.type,
+    path: raw.path,
+    value: raw.value !== void 0 ? fromJson2(ValueSchema2, raw.value) : void 0,
+    valueType: raw.valueType,
+    label: raw.label
+  });
+}
+function rawRulesToProto(raw) {
+  return create5(RuleExpressionSchema, {
+    type: raw.type,
+    id: raw.id,
+    left: raw.left ? rawOperandToProto(raw.left) : void 0,
+    operator: raw.operator,
+    right: raw.right ? rawOperandToProto(raw.right) : void 0,
+    conditions: Array.isArray(raw.conditions) ? raw.conditions.map((c) => rawRulesToProto(c)) : [],
+    logicalOperator: raw.logicalOperator,
+    value: raw.value !== void 0 ? fromJson2(ValueSchema2, raw.value) : void 0
+  });
+}
 function createSegmentsMethods(client) {
   return {
     // ── Queries ──────────────────────────────────────────────
@@ -1928,12 +1956,13 @@ function createSegmentsMethods(client) {
     },
     // ── Mutations ────────────────────────────────────────────
     async createSegment(params) {
+      const rules = params.rules && !("$typeName" in params.rules) ? rawRulesToProto(params.rules) : params.rules;
       const resp = await client.createSegment(
         create5(CreateSegmentRequestSchema, {
           key: params.key,
           name: params.name,
           description: params.description,
-          rules: params.rules,
+          rules,
           evaluationMode: params.evaluationMode,
           isActive: params.isActive
         })
@@ -1941,12 +1970,13 @@ function createSegmentsMethods(client) {
       return resp.segment ?? null;
     },
     async updateSegment(params) {
+      const rules = params.rules && !("$typeName" in params.rules) ? rawRulesToProto(params.rules) : params.rules;
       const resp = await client.updateSegment(
         create5(UpdateSegmentRequestSchema, {
           id: params.id,
           name: params.name,
           description: params.description,
-          rules: params.rules,
+          rules,
           evaluationMode: params.evaluationMode,
           isActive: params.isActive
         })
@@ -2708,7 +2738,8 @@ import {
   GetOperationRequestSchema,
   CreateOperationRequestSchema,
   UpdateOperationRequestSchema,
-  DeleteOperationRequestSchema
+  DeleteOperationRequestSchema,
+  GetSigningSecretRequestSchema
 } from "@eide/foir-proto-ts/operations/v1/operations_pb";
 function createOperationsMethods(client) {
   return {
@@ -2743,10 +2774,14 @@ function createOperationsMethods(client) {
           description: params.description,
           icon: params.icon,
           category: params.category,
-          endpointAuth: params.endpointAuth,
           timeoutMs: params.timeoutMs,
           inputSchema: params.inputSchema,
           outputSchema: params.outputSchema,
+          streamConfig: params.streamConfig,
+          quotas: params.quotas,
+          retryPolicy: params.retryPolicy,
+          allowedRoles: params.allowedRoles ?? [],
+          precondition: params.precondition,
           configId: params.configId
         })
       );
@@ -2759,10 +2794,13 @@ function createOperationsMethods(client) {
           name: params.name,
           description: params.description,
           endpoint: params.endpoint,
-          endpointAuth: params.endpointAuth,
           timeoutMs: params.timeoutMs,
           inputSchema: params.inputSchema,
           outputSchema: params.outputSchema,
+          streamConfig: params.streamConfig,
+          quotas: params.quotas,
+          retryPolicy: params.retryPolicy,
+          precondition: params.precondition,
           isActive: params.isActive
         })
       );
@@ -2773,6 +2811,12 @@ function createOperationsMethods(client) {
         create9(DeleteOperationRequestSchema, { id })
       );
       return resp.success;
+    },
+    async getSigningSecret() {
+      const resp = await client.getSigningSecret(
+        create9(GetSigningSecretRequestSchema, {})
+      );
+      return { secret: resp.secret, prefix: resp.prefix };
     }
   };
 }
@@ -2926,6 +2970,7 @@ function createCronSchedulesMethods(client) {
         create11(CreateCronScheduleRequestSchema, {
           key: params.key,
           name: params.name,
+          description: params.description,
           cron: params.cron,
           timezone: params.timezone,
           operationKey: params.operationKey,
@@ -4306,7 +4351,7 @@ import chalk5 from "chalk";
 import inquirer4 from "inquirer";
 var FIELD_DEFAULTS = {
   text: "",
-  richtext: "",
+  content: "",
   number: 0,
   boolean: false,
   date: (/* @__PURE__ */ new Date()).toISOString().split("T")[0],
@@ -4341,7 +4386,7 @@ function generateModelTemplate(key) {
       },
       {
         key: "description",
-        type: "richtext",
+        type: "content",
         label: "Description"
       },
       {
@@ -4531,8 +4576,9 @@ async function reconcileConfig(client, configId, manifest) {
     profileSchemaUpdated: false,
     apiKeys: []
   };
+  const operationBaseUrl = manifest.operationBaseUrl ?? "";
   await reconcileModels(client, configId, manifest.models ?? [], summary);
-  await reconcileOperations(client, configId, manifest.operations ?? [], summary);
+  await reconcileOperations(client, configId, manifest.operations ?? [], operationBaseUrl, summary);
   await reconcileHooks(client, configId, manifest.hooks ?? [], summary);
   await reconcileSegments(client, manifest.segments ?? [], summary);
   await reconcileCronSchedules(client, configId, manifest.schedules ?? [], summary);
@@ -4553,13 +4599,16 @@ async function reconcileModels(client, configId, models, summary) {
   for (const m of models) {
     if (!m.key || !m.name) continue;
     manifestKeys.add(m.key);
+    const config2 = { ...m.config };
+    if (m.pluralName) config2.pluralName = m.pluralName;
+    if (m.description) config2.description = m.description;
     const ex = existingByKey.get(m.key);
     if (ex) {
       await client.models.updateModel({
         id: ex.id,
         name: m.name,
         fields: m.fields,
-        config: m.config
+        config: config2
       });
       summary.models.updated++;
     } else {
@@ -4567,7 +4616,7 @@ async function reconcileModels(client, configId, models, summary) {
         key: m.key,
         name: m.name,
         fields: m.fields,
-        config: m.config,
+        config: config2,
         configId
       });
       summary.models.created++;
@@ -4582,7 +4631,12 @@ async function reconcileModels(client, configId, models, summary) {
     }
   }
 }
-async function reconcileOperations(client, configId, operations, summary) {
+function resolveEndpoint(endpoint, baseUrl) {
+  if (!endpoint) return "";
+  if (endpoint.startsWith("http://") || endpoint.startsWith("https://")) return endpoint;
+  return baseUrl ? `${baseUrl.replace(/\/+$/, "")}${endpoint.startsWith("/") ? "" : "/"}${endpoint}` : endpoint;
+}
+async function reconcileOperations(client, configId, operations, operationBaseUrl, summary) {
   const existing = await client.operations.listOperations({ configId, limit: 200 });
   const existingByKey = new Map(
     (existing.operations ?? []).map((o) => [o.key, o])
@@ -4592,21 +4646,39 @@ async function reconcileOperations(client, configId, operations, summary) {
     if (!op.key || !op.name) continue;
     manifestKeys.add(op.key);
     const ex = existingByKey.get(op.key);
+    const endpoint = resolveEndpoint(op.endpoint, operationBaseUrl);
     if (ex) {
       await client.operations.updateOperation({
         id: ex.id,
         name: op.name,
         description: op.description,
-        endpoint: op.endpoint
+        endpoint,
+        timeoutMs: op.timeoutMs,
+        inputSchema: op.inputSchema,
+        outputSchema: op.outputSchema,
+        streamConfig: op.streamConfig,
+        quotas: op.quotas,
+        retryPolicy: op.retryPolicy,
+        precondition: op.precondition,
+        isActive: op.isActive
       });
       summary.operations.updated++;
     } else {
       await client.operations.createOperation({
         key: op.key,
         name: op.name,
-        endpoint: op.endpoint ?? "",
+        endpoint,
         description: op.description,
+        icon: op.icon,
         category: op.category,
+        timeoutMs: op.timeoutMs,
+        inputSchema: op.inputSchema,
+        outputSchema: op.outputSchema,
+        streamConfig: op.streamConfig,
+        quotas: op.quotas,
+        retryPolicy: op.retryPolicy,
+        allowedRoles: op.allowedRoles,
+        precondition: op.precondition,
         configId
       });
       summary.operations.created++;
@@ -4637,18 +4709,23 @@ async function reconcileHooks(client, configId, hooks, summary) {
       await client.hooks.updateHook({
         id: ex.id,
         name,
+        description: hook.description,
         operationKey: hook.operationKey,
-        filter: hook.filter
+        filter: hook.filter,
+        notificationConfig: hook.notificationConfig,
+        isActive: hook.isActive
       });
       summary.hooks.updated++;
     } else {
       await client.hooks.createHook({
         key,
         name,
+        description: hook.description,
         event: hook.event,
         targetType: hook.type ?? "operation",
         operationKey: hook.operationKey,
         filter: hook.filter,
+        notificationConfig: hook.notificationConfig,
         configId
       });
       summary.hooks.created++;
@@ -4702,23 +4779,27 @@ async function reconcileCronSchedules(client, configId, schedules, summary) {
   );
   const manifestKeys = /* @__PURE__ */ new Set();
   for (const sched of schedules) {
-    const key = sched.operationKey;
+    const key = sched.key ?? sched.operationKey;
     if (!key || !sched.cron) continue;
     manifestKeys.add(key);
+    const name = sched.name ?? key;
     const ex = existingByKey.get(key);
     if (ex) {
       await client.cronSchedules.updateCronSchedule({
         id: ex.id,
-        name: key,
+        name,
+        description: sched.description,
         cron: sched.cron,
         timezone: sched.timezone,
-        operationKey: sched.operationKey
+        operationKey: sched.operationKey,
+        isActive: sched.enabled
       });
       summary.cronSchedules.updated++;
     } else {
       await client.cronSchedules.createCronSchedule({
         key,
-        name: key,
+        name,
+        description: sched.description,
         cron: sched.cron,
         timezone: sched.timezone,
         operationKey: sched.operationKey,
@@ -4911,11 +4992,11 @@ function registerPushCommand(program2, globalOpts) {
             label: `${pk.name} (${pk.keyType})`
           });
         }
-        const webhookSecret = applyResult.webhookSecret;
-        if (webhookSecret) {
+        const { secret: signingSecret } = await client.operations.getSigningSecret();
+        if (signingSecret) {
           envWrites.push({
             key: "FOIR_WEBHOOK_SECRET",
-            value: webhookSecret,
+            value: signingSecret,
             label: "Webhook signing secret"
           });
         }

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

@@ -33,6 +33,8 @@ interface FieldDefinitionInput {
 interface ApplyConfigModelInput {
     key: string;
     name: string;
+    pluralName?: string;
+    description?: string;
     fields?: FieldDefinitionInput[];
     config?: Record<string, unknown>;
 }
@@ -40,11 +42,24 @@ interface ApplyConfigOperationInput {
     key: string;
     name: string;
     description?: string;
+    icon?: string;
     category?: string;
     /** HTTP endpoint URL that the platform calls when this operation is triggered. */
     endpoint?: string;
-    config?: Record<string, unknown>;
     isActive?: boolean;
+    timeoutMs?: number;
+    inputSchema?: Record<string, unknown>;
+    outputSchema?: Record<string, unknown>;
+    /** Streaming configuration for SSE/chunked responses. */
+    streamConfig?: Record<string, unknown>;
+    /** Usage quota rules (e.g., rate limits per customer). */
+    quotas?: Record<string, unknown>;
+    /** Retry policy for failed executions. */
+    retryPolicy?: Record<string, unknown>;
+    /** Roles allowed to execute this operation. */
+    allowedRoles?: string[];
+    /** Precondition that must be met before execution (e.g., segment membership). */
+    precondition?: Record<string, unknown>;
 }
 interface ApplyConfigSegmentInput {
     key: string;
@@ -55,11 +70,15 @@ interface ApplyConfigSegmentInput {
     isActive?: boolean;
 }
 interface ApplyConfigScheduleInput {
+    /** Unique key for this schedule. Defaults to operationKey if not provided. */
+    key?: string;
+    /** Display name. Defaults to key if not provided. */
+    name?: string;
+    description?: string;
     operationKey: string;
     cron: string;
     timezone?: string;
     enabled?: boolean;
-    payload?: Record<string, unknown>;
 }
 interface ApplyConfigAuthProviderInput {
     key: string;
@@ -84,20 +103,20 @@ interface ApplyConfigHookInput {
     key?: string;
     /** Display name. */
     name?: string;
+    /** Description of what this hook does. */
+    description?: string;
     /** Lifecycle event that triggers this hook. */
     event: string;
+    /** Target type — defaults to 'operation'. */
+    type?: string;
     /** Key of the operation to execute. */
     operationKey?: string;
     /** Filter to scope the hook (e.g., `{ modelKey: 'redirect' }`). */
     filter?: Record<string, unknown>;
-    type?: string;
-    url?: string;
-    method?: string;
-    async?: boolean;
-    headers?: Record<string, string>;
-    additionalData?: Record<string, unknown>;
-    expression?: Record<string, unknown>;
-    hooks?: ApplyConfigHookInput[];
+    /** Notification config for notification-type hooks. */
+    notificationConfig?: Record<string, unknown>;
+    /** Whether the hook is active. Defaults to true. */
+    isActive?: boolean;
 }
 interface ApplyConfigApiKeyInput {
     /** Name for this API key (e.g. "Tilly iOS", "Tilly BFF"). */
@@ -118,6 +137,8 @@ interface ApplyConfigInput {
     name: string;
     configType?: string;
     force?: boolean;
+    /** Base URL prepended to relative operation endpoints. */
+    operationBaseUrl?: string;
     models?: ApplyConfigModelInput[];
     operations?: ApplyConfigOperationInput[];
     segments?: ApplyConfigSegmentInput[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eide/foir-cli",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "Universal platform CLI for Foir platform",
   "type": "module",
   "publishConfig": {