@farthershore/cli 0.3.6 → 0.3.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farthershore/cli",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "description": "FartherShore CLI — create and configure API products",
   "type": "module",
   "bin": {
@@ -21,7 +21,9 @@
   },
   "scripts": {
     "dev": "tsx src/index.ts",
-    "build": "tsc",
+    "build": "rm -rf dist && npm run build:types && npm run build:bundle",
+    "build:types": "tsc --emitDeclarationOnly",
+    "build:bundle": "esbuild src/index.ts --bundle --platform=node --format=esm --target=node22 --outfile=dist/index.js --external:chalk --external:commander --external:yaml --external:zod && chmod +x dist/index.js",
     "prepublishOnly": "npm run build",
     "test": "vitest run",
     "lint": "prettier --check \"src/**/*.ts\" && eslint .",
@@ -39,14 +41,15 @@
   "author": "Farther Shore",
   "license": "MIT",
   "dependencies": {
-    "@farther-shore/shared-types": "^0.28.2",
     "chalk": "^5.4.1",
     "commander": "^13.1.0",
     "yaml": "^2.8.3",
     "zod": "^4.3.6"
   },
   "devDependencies": {
+    "@farther-shore/shared-types": "^0.28.2",
     "@types/node": "^22.19.17",
+    "esbuild": "^0.28.0",
     "eslint": "^9.39.4",
     "eslint-plugin-sonarjs": "^4.0.3",
     "prettier": "^3.8.1",

package/dist/auth.js

@@ -1,17 +0,0 @@
-// Token resolution: env var → credentials file → error
-import { loadCredentials } from "./config.js";
-import { CliError } from "./types.js";
-export function resolveToken(overrideToken) {
-    // 1. Explicit override (--token flag)
-    if (overrideToken)
-        return overrideToken;
-    // 2. Environment variable
-    const envToken = process.env.FARTHERSHORE_TOKEN;
-    if (envToken)
-        return envToken;
-    // 3. Stored credentials (from `farthershore login`)
-    const creds = loadCredentials();
-    if (creds?.token)
-        return creds.token;
-    throw new CliError("Not authenticated. Run `farthershore set-key` or set FARTHERSHORE_TOKEN environment variable.");
-}

package/dist/build-info.js

@@ -1,10 +0,0 @@
-// Build-time constants baked into the CLI binary at publish time.
-//
-// To publish a staging variant:
-//   1. Change BUILD_API_URL below to the staging URL
-//   2. Change the npm package name/tag in package.json
-//   3. Run `npm publish`
-//
-// The CLI uses this as the default API URL — users don't need to set
-// FARTHERSHORE_API_URL or pass --api-url for their target environment.
-export const BUILD_API_URL = "https://core.farthershore.com";

package/dist/client.js

@@ -1,53 +0,0 @@
-// Typed API client for the FartherShore platform
-import { CliError } from "./types.js";
-export function createClient(opts) {
-    async function request(method, path, body) {
-        const res = await fetch(`${opts.apiUrl}${path}`, {
-            method,
-            headers: {
-                Authorization: `Bearer ${opts.token}`,
-                "Content-Type": "application/json",
-            },
-            body: body ? JSON.stringify(body) : undefined,
-        });
-        if (!res.ok) {
-            // Try the canonical Wave-4 envelope first; fall back to a string
-            // body or the bare statusText so the error path is robust to old
-            // server builds and HTML/text responses (e.g. Cloudflare 502s).
-            const parsed = (await res.json().catch(() => null));
-            const errEnvelope = parsed && typeof parsed === "object" && parsed.error;
-            let message = res.statusText;
-            let code;
-            let details;
-            if (typeof errEnvelope === "string") {
-                // Legacy { error: "..." } shape.
-                message = errEnvelope;
-            }
-            else if (errEnvelope && typeof errEnvelope === "object") {
-                message = errEnvelope.message ?? message;
-                code = errEnvelope.code;
-                details = errEnvelope.details;
-            }
-            throw new CliError(message, res.status, { code, details });
-        }
-        if (res.status === 204)
-            return undefined;
-        return res.json();
-    }
-    return {
-        // --- Auth ---
-        bootstrap: () => request("POST", "/builder/context/bootstrap"),
-        // --- Products ---
-        listProducts: () => request("GET", "/products"),
-        initProduct: (data) => request("POST", "/products/init", data),
-        // --- Compile ---
-        compileProduct: (productId, opts) => request("POST", `/products/${productId}/compile`, opts?.branch ? { branch: opts.branch } : undefined),
-        // --- Management (maker token) ---
-        // Compile the product associated with the token — no product ID needed.
-        // Pass `branch` to scope compilation to an env branch's plans.
-        managementCompileSelf: (opts) => request("POST", "/management/compile", opts?.branch ? { branch: opts.branch } : undefined),
-        managementCompile: (productId, opts) => request("POST", `/management/products/${productId}/compile`, opts?.branch ? { branch: opts.branch } : undefined),
-        managementListProducts: () => request("GET", "/management/products"),
-        isMakerToken: () => opts.token.startsWith("mk_"),
-    };
-}

package/dist/commands/apply.js

@@ -1,231 +0,0 @@
-import { execSync } from "node:child_process";
-import { readFileSync, existsSync } from "node:fs";
-import { resolve } from "node:path";
-import YAML from "yaml";
-import * as output from "../output.js";
-import { loadProductYaml, validateProductYaml } from "./validate.js";
-const CI = !!process.env.CI || !!process.env.GITHUB_ACTIONS;
-/**
- * Detect the git branch the compiler should scope to. Order of preference:
- *   1. --branch CLI flag (explicit override)
- *   2. GITHUB_HEAD_REF — pull_request source branch (the branch being proposed)
- *   3. GITHUB_REF_NAME — push event branch
- *   4. `git rev-parse --abbrev-ref HEAD` — local dev
- * Returns undefined when nothing is detectable.
- */
-function detectBranch(explicit) {
-    if (explicit)
-        return explicit;
-    const ghHead = process.env.GITHUB_HEAD_REF;
-    if (ghHead)
-        return ghHead;
-    const ghRef = process.env.GITHUB_REF_NAME;
-    if (ghRef)
-        return ghRef;
-    try {
-        const local = execSync("git rev-parse --abbrev-ref HEAD", {
-            encoding: "utf-8",
-            stdio: ["pipe", "pipe", "pipe"],
-        }).trim();
-        return local && local !== "HEAD" ? local : undefined;
-    }
-    catch {
-        return undefined;
-    }
-}
-/**
- * Read the product name/slug from product.yaml in the current directory.
- */
-function readSlugFromProductYaml() {
-    const yamlPath = resolve("product.yaml");
-    if (!existsSync(yamlPath))
-        return null;
-    try {
-        const spec = YAML.parse(readFileSync(yamlPath, "utf-8"));
-        const product = spec.product;
-        return product?.name ?? null;
-    }
-    catch {
-        return null;
-    }
-}
-function validateLocalProductYamlBeforeRemoteCompile() {
-    const filePath = resolve("product.yaml");
-    if (!existsSync(filePath))
-        return true;
-    const loaded = loadProductYaml(filePath);
-    if (!loaded.ok) {
-        const message = loaded.reason === "parse"
-            ? `Local product.yaml failed to parse; remote compile was not started.\n${loaded.message}`
-            : `Local product.yaml could not be read; remote compile was not started.\n${loaded.message}`;
-        if (CI) {
-            console.log(`::error file=product.yaml::${message}`);
-        }
-        output.error(message);
-        process.exitCode = 1;
-        return false;
-    }
-    const result = validateProductYaml(loaded.spec);
-    if (!result.valid) {
-        if (CI) {
-            for (const err of result.errors) {
-                console.log(`::error file=product.yaml::${err}`);
-            }
-            for (const warning of result.warnings) {
-                console.log(`::warning file=product.yaml::${warning}`);
-            }
-        }
-        output.error("Local product.yaml failed validation; remote compile was not started.\n");
-        for (const err of result.errors) {
-            console.log(`  • ${err}`);
-        }
-        if (result.warnings.length > 0) {
-            console.log();
-            for (const warning of result.warnings) {
-                output.warn(warning);
-            }
-        }
-        process.exitCode = 1;
-        return false;
-    }
-    output.success("Local product.yaml passed validation");
-    for (const warning of result.warnings) {
-        output.warn(warning);
-    }
-    output.info("Remote compile checks the pushed branch state; unpushed local edits are not included.");
-    return true;
-}
-function shouldValidateLocalProductYaml(productArg) {
-    const filePath = resolve("product.yaml");
-    if (!existsSync(filePath))
-        return false;
-    if (!productArg)
-        return true;
-    const localSlug = readSlugFromProductYaml();
-    return (typeof localSlug === "string" &&
-        localSlug.toLowerCase() === productArg.toLowerCase());
-}
-/**
- * Resolve a product identifier to an API product ID.
- * If no arg, reads product.name from product.yaml in the current directory.
- * If arg looks like a UUID, uses it directly. Otherwise treats it as a slug.
- */
-async function resolveProductId(client, arg) {
-    const slug = arg ?? readSlugFromProductYaml();
-    if (!slug)
-        return null;
-    // UUID — use directly
-    if (slug.length === 36 &&
-        /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/.test(slug)) {
-        return slug;
-    }
-    // Slug — resolve via product list (use management API for maker tokens)
-    try {
-        const products = client.isMakerToken()
-            ? await client.managementListProducts()
-            : await client.listProducts();
-        const match = products.find((p) => p.name === slug || p.name.toLowerCase() === slug.toLowerCase());
-        return match?.id ?? null;
-    }
-    catch (err) {
-        // Don't swallow network errors silently
-        const msg = err instanceof Error ? err.message : String(err);
-        process.stderr.write(`Warning: Failed to resolve product slug: ${msg}\n`);
-        return null;
-    }
-}
-// Render a diagnostic with an optional plan-key prefix so users can see which
-// plan an error belongs to when the compiler scopes it. `compiledPlanId`
-// itself is an internal pointer — `planKey` is the human-readable label.
-function formatDiag(d) {
-    const prefix = d.code ? `[${d.code}] ` : "";
-    const planLabel = d.planKey ? `(plan: ${d.planKey}) ` : "";
-    return `${prefix}${planLabel}${d.message}`;
-}
-function handleResult(result) {
-    // GitHub Actions annotations
-    if (CI) {
-        for (const err of result.errors ?? []) {
-            console.log(`::error file=product.yaml::${formatDiag(err)}`);
-        }
-        for (const w of result.warnings ?? []) {
-            console.log(`::warning file=product.yaml::${formatDiag(w)}`);
-        }
-    }
-    if (result.success) {
-        output.success("Remote compile passed");
-        if (result.warnings?.length) {
-            console.log();
-            for (const w of result.warnings) {
-                output.warn(formatDiag(w));
-            }
-        }
-    }
-    else {
-        output.error("Remote compile failed\n");
-        for (const err of result.errors ?? []) {
-            console.log(`  • ${formatDiag(err)}`);
-        }
-        process.exitCode = 1;
-    }
-}
-export function registerApplyCommand(program, getClient) {
-    program
-        .command("apply [product]")
-        .description("Validate the current repo's product.yaml before remote compile when applying that repo's product, then run the server-side compiler against the pushed branch state for this product. " +
-        "Unpushed local edits are not included. Pass a product slug, or run inside a product repo to auto-detect from product.yaml. " +
-        "Automatically scopes to the current git branch so env branches compile against their own plans.")
-        .option("--branch <branch>", "Override the branch used for env-scoped compilation (default: auto-detected)")
-        .action(async (productArg, opts) => {
-        const client = getClient();
-        const branch = detectBranch(opts.branch);
-        if (shouldValidateLocalProductYaml(productArg) &&
-            !validateLocalProductYamlBeforeRemoteCompile()) {
-            return;
-        }
-        if (branch && CI) {
-            console.log(`::notice::Compiling against branch '${branch}'`);
-        }
-        // 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 result = await client.managementCompileSelf({ branch });
-                handleResult(result);
-                return;
-            }
-            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;
-            }
-        }
-        const productId = await resolveProductId(client, productArg);
-        if (!productId) {
-            const hint = productArg
-                ? `Product "${productArg}" not found. Check the name and try again.`
-                : "No product specified and no product.yaml found.\n" +
-                    "  Run from inside a product repo, or pass the slug: farthershore apply my-api";
-            output.error(hint);
-            process.exitCode = 1;
-            return;
-        }
-        try {
-            const result = client.isMakerToken()
-                ? await client.managementCompile(productId, { branch })
-                : await client.compileProduct(productId, { branch });
-            handleResult(result);
-        }
-        catch (err) {
-            const msg = err instanceof Error ? err.message : "Compilation check failed";
-            if (CI)
-                console.log(`::error::${msg}`);
-            output.error(msg);
-            process.exitCode = 1;
-        }
-    });
-}

package/dist/commands/init.js

@@ -1,43 +0,0 @@
-import * as output from "../output.js";
-export function registerInitCommand(program, getClient) {
-    program
-        .command("init <name>")
-        .description("Create a new product with a GitHub repo for agent-first configuration")
-        .option("--base-url <url>", "Backend API base URL")
-        .option("--description <desc>", "Product description")
-        .option("--display-name <name>", "Display name")
-        .action(async (name, opts) => {
-        const client = getClient();
-        const result = await client.initProduct({
-            name,
-            baseUrl: opts.baseUrl,
-            description: opts.description,
-            displayName: opts.displayName,
-        });
-        // `program.opts()` is typed `OptionValues` (string-indexed any).
-        // Narrow at the boundary so `outputFormat`'s `string | undefined`
-        // parameter type is satisfied without an unsafe-arg lint.
-        const formatOpt = program.opts().format;
-        const format = output.outputFormat(formatOpt);
-        if (format === "json") {
-            console.log(output.json(result));
-            return;
-        }
-        output.success(`Created product "${result.product.name}" (DRAFT)`);
-        console.log();
-        if (result.repo) {
-            console.log(`  Repository:  ${result.repo.htmlUrl}`);
-            console.log(`  Clone:       git clone ${result.repo.cloneUrl}`);
-            console.log();
-        }
-        console.log("  Next steps:");
-        console.log("    1. Clone the repository");
-        console.log("    2. Read AGENTS.md for the full configuration reference");
-        console.log("    3. Edit product.yaml — add your base URL, plans, and meters");
-        console.log("    4. Push to main — a valid config goes live automatically");
-        console.log();
-        if (result.agent.agentsMdUrl) {
-            console.log(`  Docs: ${result.agent.agentsMdUrl}`);
-        }
-    });
-}

package/dist/commands/login.js

@@ -1,120 +0,0 @@
-import * as readline from "node:readline/promises";
-import { createClient } from "../client.js";
-import { loadConfig, saveConfig, saveCredentials, clearCredentials, } from "../config.js";
-import { resolveToken } from "../auth.js";
-import * as output from "../output.js";
-export function registerAuthCommands(program) {
-    program
-        .command("set-key [token]")
-        .description("Set your API token (interactive or pass as argument)")
-        .action(async (tokenArg) => {
-        let token = tokenArg?.trim();
-        if (!token) {
-            // Interactive mode
-            if (!process.stdin.isTTY) {
-                output.error("No token provided. Pass it as an argument: farthershore set-key <token>");
-                process.exitCode = 1;
-                return;
-            }
-            console.log("Set your FartherShore API token\n");
-            console.log("  Create a token at https://farthershore.com/settings/tokens\n");
-            const rl = readline.createInterface({
-                input: process.stdin,
-                output: process.stdout,
-            });
-            token = (await rl.question("Token: ")).trim();
-            rl.close();
-        }
-        if (!token) {
-            output.error("No token provided.");
-            process.exitCode = 1;
-            return;
-        }
-        const config = loadConfig();
-        try {
-            const client = createClient({ apiUrl: config.apiUrl, token });
-            const ctx = await client.bootstrap();
-            saveCredentials({
-                token,
-                orgId: ctx.activeOrganization.id,
-                userId: ctx.user.id,
-            });
-            output.success("Authenticated");
-            console.log(`  Organization: ${ctx.activeOrganization.name ?? ctx.activeOrganization.id}`);
-        }
-        catch {
-            output.error("Invalid token. Check it and try again.");
-            process.exitCode = 1;
-        }
-    });
-    program
-        .command("logout")
-        .description("Clear stored credentials")
-        .action(() => {
-        clearCredentials();
-        output.success("Credentials cleared.");
-    });
-    program
-        .command("whoami")
-        .description("Show current authentication context")
-        .action(async () => {
-        const config = loadConfig();
-        const formatOpt = program.opts().format;
-        const format = output.outputFormat(formatOpt);
-        try {
-            const token = resolveToken();
-            const client = createClient({ apiUrl: config.apiUrl, token });
-            const ctx = await client.bootstrap();
-            const authSource = process.env.FARTHERSHORE_TOKEN
-                ? "env:FARTHERSHORE_TOKEN"
-                : "credentials-file";
-            if (format === "json") {
-                // Machine-readable shape — stable contract for CI scripts
-                // ("am I logged in?"). Don't include the token itself.
-                console.log(output.json({
-                    organization: {
-                        id: ctx.activeOrganization.id,
-                        name: ctx.activeOrganization.name ?? null,
-                        slug: ctx.activeOrganization.slug ?? null,
-                    },
-                    user: { id: ctx.user.id },
-                    apiUrl: config.apiUrl,
-                    authSource,
-                }));
-                return;
-            }
-            output.heading("Current Context");
-            console.log(`  Organization: ${ctx.activeOrganization.name ?? ctx.activeOrganization.id}`);
-            console.log(`  API URL:      ${config.apiUrl}`);
-            if (authSource === "env:FARTHERSHORE_TOKEN") {
-                output.info("  Auth: FARTHERSHORE_TOKEN env var");
-            }
-            else {
-                output.info("  Auth: ~/.farthershore/credentials.json");
-            }
-        }
-        catch {
-            if (format === "json") {
-                console.log(output.json({ authenticated: false }));
-            }
-            else {
-                output.error("Not authenticated. Run `farthershore set-key` or set FARTHERSHORE_TOKEN.");
-            }
-            process.exitCode = 1;
-        }
-    });
-    program
-        .command("set-url <url>")
-        .description("Override the API base URL (for staging/testing)")
-        .action((url) => {
-        saveConfig({ apiUrl: url });
-        output.success(`API URL set to ${url}`);
-    });
-    program
-        .command("reset-url")
-        .description("Reset the API URL to production default")
-        .action(() => {
-        saveConfig({ apiUrl: "https://core.farthershore.com" });
-        output.success("API URL reset to https://core.farthershore.com");
-    });
-}