@farthershore/cli 0.3.3 → 0.3.5

package/dist/client.d.ts

@@ -1,4 +1,4 @@
-import type { Product, Plan, ApplyResponse, MakerToken, OrgMember, InitProductResponse } from "./types.js";
+import type { Product, InitProductResponse } from "./types.js";
 export declare function createClient(opts: {
     apiUrl: string;
     token: string;
@@ -22,23 +22,7 @@ export declare function createClient(opts: {
             role: string;
         }>;
     }>;
-    validateToken: () => Promise<{
-        valid: boolean;
-        type: string;
-        orgId: string;
-        productId: string | null;
-        permissions: string[];
-    }>;
     listProducts: () => Promise<Product[]>;
-    getProduct: (id: string) => Promise<Product>;
-    createProduct: (data: {
-        name: string;
-        baseUrl: string;
-        description?: string;
-    }) => Promise<Product>;
-    updateProduct: (id: string, data: Record<string, unknown>) => Promise<Product>;
-    deleteProduct: (id: string) => Promise<void>;
-    publishProduct: (id: string) => Promise<Product>;
     initProduct: (data: {
         name: string;
         baseUrl?: string;
@@ -46,30 +30,6 @@ export declare function createClient(opts: {
         displayName?: string;
         billingStrategy?: string;
     }) => Promise<InitProductResponse>;
-    listPlans: (productId: string) => Promise<Plan[]>;
-    createPlan: (productId: string, data: Record<string, unknown>) => Promise<Plan>;
-    updatePlan: (productId: string, planId: string, data: Record<string, unknown>) => Promise<Plan>;
-    deletePlan: (productId: string, planId: string) => Promise<void>;
-    exportPlanConfig: (productId: string) => Promise<string>;
-    applyPlanConfig: (productId: string, config: string, opts?: {
-        configHash?: string;
-        force?: boolean;
-        validateOnly?: boolean;
-    }) => Promise<ApplyResponse>;
-    listTokens: () => Promise<MakerToken[]>;
-    revokeToken: (id: string) => Promise<void>;
-    listMembers: (orgId: string) => Promise<OrgMember[]>;
-    inviteMember: (orgId: string, email: string, role: string) => Promise<unknown>;
-    removeMember: (orgId: string, userId: string) => Promise<void>;
-    getStripeStatus: () => Promise<{
-        connected: boolean;
-        chargesEnabled?: boolean;
-        accountId?: string;
-    }>;
-    startStripeOnboard: () => Promise<{
-        url: string;
-    }>;
-    getUsage: (productId: string) => Promise<Record<string, unknown>>;
     compileProduct: (productId: string) => Promise<{
         success: boolean;
         errors?: Array<{
@@ -81,6 +41,18 @@ export declare function createClient(opts: {
             message: string;
         }>;
     }>;
+    managementCompileSelf: () => Promise<{
+        success: boolean;
+        productId: string;
+        errors?: Array<{
+            code?: string;
+            message: string;
+        }>;
+        warnings?: Array<{
+            code?: string;
+            message: string;
+        }>;
+    }>;
     managementCompile: (productId: string) => Promise<{
         success: boolean;
         errors?: Array<{
@@ -93,12 +65,6 @@ export declare function createClient(opts: {
         }>;
     }>;
     managementListProducts: () => Promise<Product[]>;
-    whoami: () => Promise<{
-        tokenId: string;
-        organizationId: string;
-        productId: string | null;
-        scopes: string[];
-    }>;
     isMakerToken: () => boolean;
 };
 export type ApiClient = ReturnType<typeof createClient>;

package/dist/client.js

@@ -18,60 +18,19 @@ export function createClient(opts) {
             return undefined;
         return res.json();
     }
-    async function rawText(method, path) {
-        const res = await fetch(`${opts.apiUrl}${path}`, {
-            method,
-            headers: { Authorization: `Bearer ${opts.token}` },
-        });
-        if (!res.ok) {
-            throw new CliError(`API error: ${res.status}`, res.status);
-        }
-        return res.text();
-    }
     return {
         // --- Auth ---
         bootstrap: () => request("POST", "/builder/context/bootstrap"),
-        validateToken: () => request("POST", "/auth/validate-token"),
         // --- Products ---
         listProducts: () => request("GET", "/products"),
-        getProduct: (id) => request("GET", `/products/${id}`),
-        createProduct: (data) => request("POST", "/products", data),
-        updateProduct: (id, data) => request("PATCH", `/products/${id}`, data),
-        deleteProduct: (id) => request("DELETE", `/products/${id}`),
-        publishProduct: (id) => request("POST", `/products/${id}/publish`),
         initProduct: (data) => request("POST", "/products/init", data),
-        // --- Plans ---
-        listPlans: (productId) => request("GET", `/products/${productId}/plans`),
-        createPlan: (productId, data) => request("POST", `/products/${productId}/plans`, data),
-        updatePlan: (productId, planId, data) => request("PATCH", `/products/${productId}/plans/${planId}`, data),
-        deletePlan: (productId, planId) => request("DELETE", `/products/${productId}/plans/${planId}`),
-        // --- Plan config (declarative) ---
-        exportPlanConfig: (productId) => rawText("GET", `/products/${productId}/plans/export`),
-        applyPlanConfig: (productId, config, opts) => {
-            const params = opts?.validateOnly ? "?validate_only=true" : "";
-            return request("POST", `/products/${productId}/plans/apply${params}`, { config, configHash: opts?.configHash, force: opts?.force });
-        },
-        // --- Tokens ---
-        listTokens: () => request("GET", "/maker-tokens"),
-        revokeToken: (id) => request("DELETE", `/maker-tokens/${id}`),
-        // --- Team ---
-        listMembers: (orgId) => request("GET", `/builder/organizations/${orgId}/members`),
-        inviteMember: (orgId, email, role) => request("POST", `/builder/organizations/${orgId}/invitations`, {
-            email,
-            role,
-        }),
-        removeMember: (orgId, userId) => request("DELETE", `/builder/organizations/${orgId}/members/${userId}`),
-        // --- Billing ---
-        getStripeStatus: () => request("GET", "/builder/stripe/status"),
-        startStripeOnboard: () => request("POST", "/builder/stripe/onboard"),
-        // --- Usage ---
-        getUsage: (productId) => request("GET", `/products/${productId}/usage`),
         // --- Compile ---
         compileProduct: (productId) => request("POST", `/products/${productId}/compile`),
         // --- Management (maker token) ---
+        // Compile the product associated with the token — no product ID needed.
+        managementCompileSelf: () => request("POST", "/management/compile"),
         managementCompile: (productId) => request("POST", `/management/products/${productId}/compile`),
         managementListProducts: () => request("GET", "/management/products"),
-        whoami: () => request("GET", "/management/whoami"),
         isMakerToken: () => opts.token.startsWith("mk_"),
     };
 }

package/dist/commands/apply.js

@@ -48,6 +48,33 @@ async function resolveProductId(client, arg) {
         return null;
     }
 }
+function handleResult(result) {
+    // GitHub Actions annotations
+    if (CI) {
+        for (const err of result.errors ?? []) {
+            console.log(`::error file=product.yaml::${err.code ? `[${err.code}] ` : ""}${err.message}`);
+        }
+        for (const w of result.warnings ?? []) {
+            console.log(`::warning file=product.yaml::${w.code ? `[${w.code}] ` : ""}${w.message}`);
+        }
+    }
+    if (result.success) {
+        output.success("Compilation passed");
+        if (result.warnings?.length) {
+            console.log();
+            for (const w of result.warnings) {
+                output.warn(`${w.code ? `[${w.code}] ` : ""}${w.message}`);
+            }
+        }
+    }
+    else {
+        output.error("Compilation failed\n");
+        for (const err of result.errors ?? []) {
+            console.log(`  • ${err.code ? `[${err.code}] ` : ""}${err.message}`);
+        }
+        process.exitCode = 1;
+    }
+}
 export function registerApplyCommand(program, getClient) {
     program
         .command("apply [product]")
@@ -55,21 +82,25 @@ export function registerApplyCommand(program, getClient) {
         "Pass a product slug, or run inside a product repo to auto-detect from product.yaml.")
         .action(async (productArg) => {
         const client = getClient();
-        // For product-scoped maker tokens, get the productId directly from
-        // the token — no need to read product.yaml or resolve slugs.
-        let productId = null;
+        // Fast path for CI: product-scoped maker token with no argument.
+        // Server auto-resolves product from the token — no product.yaml,
+        // no slug lookup, single API call.
         if (client.isMakerToken() && !productArg) {
             try {
-                const info = await client.whoami();
-                productId = info.productId;
+                const result = await client.managementCompileSelf();
+                handleResult(result);
+                return;
             }
-            catch {
-                // Fall through to slug resolution
+            catch (err) {
+                const msg = err instanceof Error ? err.message : "Compilation check failed";
+                if (CI)
+                    console.log(`::error::${msg}`);
+                output.error(msg);
+                process.exitCode = 1;
+                return;
             }
         }
-        if (!productId) {
-            productId = await resolveProductId(client, productArg);
-        }
+        const productId = await resolveProductId(client, productArg);
         if (!productId) {
             const hint = productArg
                 ? `Product "${productArg}" not found. Check the name and try again.`
@@ -83,31 +114,7 @@ export function registerApplyCommand(program, getClient) {
             const result = client.isMakerToken()
                 ? await client.managementCompile(productId)
                 : await client.compileProduct(productId);
-            // GitHub Actions annotations
-            if (CI) {
-                for (const err of result.errors ?? []) {
-                    console.log(`::error file=product.yaml::${err.code ? `[${err.code}] ` : ""}${err.message}`);
-                }
-                for (const w of result.warnings ?? []) {
-                    console.log(`::warning file=product.yaml::${w.code ? `[${w.code}] ` : ""}${w.message}`);
-                }
-            }
-            if (result.success) {
-                output.success("Compilation passed");
-                if (result.warnings?.length) {
-                    console.log();
-                    for (const w of result.warnings) {
-                        output.warn(`${w.code ? `[${w.code}] ` : ""}${w.message}`);
-                    }
-                }
-            }
-            else {
-                output.error("Compilation failed\n");
-                for (const err of result.errors ?? []) {
-                    console.log(`  • ${err.code ? `[${err.code}] ` : ""}${err.message}`);
-                }
-                process.exitCode = 1;
-            }
+            handleResult(result);
         }
         catch (err) {
             const msg = err instanceof Error ? err.message : "Compilation check failed";

package/dist/types.d.ts

@@ -20,44 +20,6 @@ export type Plan = {
     isActive: boolean;
     selfServeEnabled: boolean;
 };
-export type ApplyResponse = {
-    valid: boolean;
-    errors: Array<{
-        line?: number;
-        message: string;
-    }>;
-    warnings: Array<{
-        message: string;
-    }>;
-    changes: Array<{
-        action: "create" | "update" | "deactivate";
-        key: string;
-        name: string;
-        details: string;
-    }>;
-    applied: boolean;
-    results?: Array<{
-        action: string;
-        key: string;
-        id: string;
-    }>;
-};
-export type MakerToken = {
-    id: string;
-    label: string;
-    lastFour: string;
-    productId: string | null;
-    permissions: string[];
-    createdAt: string;
-};
-export type OrgMember = {
-    userId: string;
-    role: string;
-    user?: {
-        email?: string;
-        name?: string;
-    };
-};
 export type CliConfig = {
     apiUrl: string;
     activeOrg?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farthershore/cli",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "description": "FartherShore CLI — create and configure API products",
   "type": "module",
   "bin": {