@dk/jolly 0.2.0 → 0.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dk/jolly",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Ahoy, agent. Go build a Saleor storefront.",
   "type": "module",
   "bin": {
@@ -8,7 +8,7 @@
   },
   "files": [
     "bin/",
-    "src/",
+    "dist/",
     "assets/skills/",
     "README.md"
   ],
@@ -19,19 +19,23 @@
     "node": ">=23.0.0"
   },
   "scripts": {
-    "dev": "bun run --watch src/index.ts",
-    "start": "bun run src/index.ts",
-    "test": "bun test tests/",
-    "test:bdd": "bun x --bun cucumber-js",
-    "test:logic": "bun x --bun cucumber-js -p logic",
-    "test:sandbox": "bun x --bun cucumber-js -p sandbox",
-    "typecheck": "bun x tsc --noEmit"
+    "build": "esbuild src/index.ts --bundle --platform=node --format=esm --outfile=dist/index.js",
+    "prepack": "esbuild src/index.ts --bundle --platform=node --format=esm --outfile=dist/index.js",
+    "prepublishOnly": "esbuild src/index.ts --bundle --platform=node --format=esm --outfile=dist/index.js",
+    "dev": "node --watch src/index.ts",
+    "start": "node src/index.ts",
+    "test": "node --test \"tests/**/*.test.ts\"",
+    "test:bdd": "cucumber-js",
+    "test:logic": "cucumber-js -p logic",
+    "test:sandbox": "cucumber-js -p sandbox",
+    "test:eval": "cucumber-js -p eval",
+    "typecheck": "tsc --noEmit"
   },
   "devDependencies": {
     "@cucumber/cucumber": "^11.3.0",
     "@earendil-works/pi-coding-agent": "^0.79.1",
-    "@types/bun": "^1.3.14",
     "@types/node": "^22.10.0",
+    "esbuild": "^0.24.0",
     "happy-dom": "^15.11.0",
     "typescript": "^5.7.0"
   }

package/src/lib/cloud-api.ts

@@ -1,555 +0,0 @@
-// Saleor Cloud API client (feature 012 — existing Saleor store connection).
-//
-// Pinned by the feature 012 Rule "Existing-store automation principles":
-// - The Cloud API is at https://cloud.saleor.io/platform/api, optionally
-//   overridden by JOLLY_SALEOR_CLOUD_API_URL (feature 018 Rule); every Cloud
-//   API request honors the override.
-//   Authenticate with `Authorization: Token <token>`.
-// - Organizations: GET /platform/api/organizations/ returns a list with slug
-//   and environments URL.
-// - Projects: POST /platform/api/organizations/{slug}/projects/ with body
-//   { name, plan: "dev", region }.
-// - Environments: POST /platform/api/organizations/{slug}/environments/ with
-//   body { name, project, domain_label, database_population: "sample",
-//   service, region: "us-east-1" }. Returns a task_id.
-// - Task status: GET /platform/api/service/task-status/{task_id} until
-//   status is "SUCCEEDED".
-// - The environment task result contains the domain URL
-//   (https://{domain_label}.saleor.cloud/graphql/).
-//
-// Pinned by the Rule "Environment creation against in-use organizations":
-// - When the Cloud API rejects environment creation because the
-//   organization's sandbox environment limit is reached, surface the stable
-//   error code ENVIRONMENT_LIMIT_REACHED.
-//
-// App token acquisition follows the deprecated CLI's example flow (reference
-// material only, feature 012): authenticate to the instance's GraphQL API
-// with the Cloud token (Bearer), select an existing local app or create one,
-// and create an app token via the Saleor GraphQL API.
-
-const DEFAULT_CLOUD_API_BASE = "https://cloud.saleor.io/platform/api";
-
-/**
- * The Cloud API base URL for this request: the JOLLY_SALEOR_CLOUD_API_URL
- * override when set (feature 018 Rule — pointing it elsewhere is the
- * customer's explicit choice), otherwise the first-party default.
- */
-export function cloudApiBase(): string {
-  const override = process.env["JOLLY_SALEOR_CLOUD_API_URL"];
-  if (override && override.trim().length > 0) {
-    return override.trim().replace(/\/+$/, "");
-  }
-  return DEFAULT_CLOUD_API_BASE;
-}
-
-const POLL_INTERVAL_MS = 5_000;
-const POLL_TIMEOUT_MS = 480_000; // stay under the harness's CLI timeout
-
-/** Error from the Cloud API with a stable, branchable code. */
-export class CloudApiError extends Error {
-  readonly code: string;
-  readonly httpStatus?: number;
-
-  constructor(message: string, code: string, httpStatus?: number) {
-    super(message);
-    this.name = "CloudApiError";
-    this.code = code;
-    this.httpStatus = httpStatus;
-  }
-}
-
-async function cloudFetch(
-  url: string,
-  token: string,
-  options: RequestInit = {},
-): Promise<Response> {
-  return await fetch(url, {
-    ...options,
-    headers: {
-      Authorization: `Token ${token}`,
-      "Content-Type": "application/json",
-      ...((options.headers as Record<string, string>) ?? {}),
-    },
-  });
-}
-
-// ── Organizations ────────────────────────────────────────────────────────
-
-export interface CloudOrganization {
-  slug: string;
-  name?: string;
-  [key: string]: unknown;
-}
-
-/** GET /platform/api/organizations/ */
-export async function listOrganizations(
-  token: string,
-): Promise<CloudOrganization[]> {
-  const response = await cloudFetch(`${cloudApiBase()}/organizations/`, token);
-  if (!response.ok) {
-    throw new CloudApiError(
-      `Failed to list organizations: HTTP ${response.status} ${await response.text()}`,
-      "CLOUD_API_ERROR",
-      response.status,
-    );
-  }
-  return (await response.json()) as CloudOrganization[];
-}
-
-// ── Projects (create-or-reuse) ───────────────────────────────────────────
-
-export interface CloudProject {
-  name: string;
-  slug?: string;
-  plan?: string;
-  region?: string;
-  [key: string]: unknown;
-}
-
-/** GET /platform/api/organizations/{slug}/projects/ */
-export async function listProjects(
-  token: string,
-  organizationSlug: string,
-): Promise<CloudProject[]> {
-  const response = await cloudFetch(
-    `${cloudApiBase()}/organizations/${organizationSlug}/projects/`,
-    token,
-  );
-  if (!response.ok) {
-    throw new CloudApiError(
-      `Failed to list projects: HTTP ${response.status} ${await response.text()}`,
-      "CLOUD_API_ERROR",
-      response.status,
-    );
-  }
-  return (await response.json()) as CloudProject[];
-}
-
-/** POST /platform/api/organizations/{slug}/projects/ with { name, plan, region }. */
-export async function createProject(
-  token: string,
-  organizationSlug: string,
-  body: { name: string; plan: string; region: string },
-): Promise<CloudProject> {
-  const response = await cloudFetch(
-    `${cloudApiBase()}/organizations/${organizationSlug}/projects/`,
-    token,
-    { method: "POST", body: JSON.stringify(body) },
-  );
-  if (!response.ok) {
-    throw new CloudApiError(
-      `Failed to create project: HTTP ${response.status} ${await response.text()}`,
-      "PROJECT_CREATE_FAILED",
-      response.status,
-    );
-  }
-  return (await response.json()) as CloudProject;
-}
-
-// ── Services (concrete service identifier for environment creation) ──────
-
-export interface CloudService {
-  name: string;
-  region?: string;
-  service_type?: string;
-  [key: string]: unknown;
-}
-
-/** GET /platform/api/organizations/{org}/projects/{project}/services/ */
-export async function listProjectServices(
-  token: string,
-  organizationSlug: string,
-  projectSlug: string,
-): Promise<CloudService[]> {
-  const response = await cloudFetch(
-    `${cloudApiBase()}/organizations/${organizationSlug}/projects/${projectSlug}/services/`,
-    token,
-  );
-  if (!response.ok) return [];
-  return (await response.json()) as CloudService[];
-}
-
-/**
- * Pick the service identifier for environment creation: prefer a sandbox
- * service in the default region, then any sandbox service, then the first
- * listed; fall back to the spec's "saleor" default when discovery yields
- * nothing.
- */
-export function pickService(
-  services: CloudService[],
-  region: string = "us-east-1",
-): string {
-  const sandbox = services.filter(
-    (s) => String(s.service_type ?? "").toUpperCase() === "SANDBOX",
-  );
-  const inRegion = sandbox.find((s) => s.region === region);
-  const chosen = inRegion ?? sandbox[0] ?? services[0];
-  return chosen?.name ?? "saleor";
-}
-
-// ── Environments ─────────────────────────────────────────────────────────
-
-export interface CloudEnvironment {
-  key?: string;
-  name?: string;
-  domain?: string;
-  domain_label?: string;
-  task_id?: string;
-  [key: string]: unknown;
-}
-
-/**
- * POST /platform/api/organizations/{slug}/environments/ — returns the
- * environment (with task_id for async provisioning). A rejection caused by
- * the organization's sandbox environment limit surfaces as a CloudApiError
- * with the stable code ENVIRONMENT_LIMIT_REACHED (feature 012 Rule).
- */
-export async function createEnvironment(
-  token: string,
-  organizationSlug: string,
-  body: {
-    name: string;
-    project: string;
-    domain_label: string;
-    database_population: string;
-    service: string;
-    region: string;
-  },
-): Promise<CloudEnvironment> {
-  const response = await cloudFetch(
-    `${cloudApiBase()}/organizations/${organizationSlug}/environments/`,
-    token,
-    { method: "POST", body: JSON.stringify(body) },
-  );
-  if (!response.ok) {
-    const text = await response.text();
-    if (
-      response.status >= 400 &&
-      response.status < 500 &&
-      /domain/i.test(text) &&
-      /taken|exists|already|unique|in use|duplicate/i.test(text)
-    ) {
-      throw new CloudApiError(
-        `The Cloud API rejected the environment creation: the domain label ` +
-          `"${body.domain_label}" is already taken (HTTP ${response.status}).`,
-        "DOMAIN_LABEL_TAKEN",
-        response.status,
-      );
-    }
-    if (
-      response.status >= 400 &&
-      response.status < 500 &&
-      /limit|quota|exceed/i.test(text)
-    ) {
-      throw new CloudApiError(
-        "The organization's sandbox environment limit is reached. " +
-          "Delete an unused environment or upgrade the plan, then re-run " +
-          "`jolly create store --create-environment`.",
-        "ENVIRONMENT_LIMIT_REACHED",
-        response.status,
-      );
-    }
-    throw new CloudApiError(
-      `Failed to create environment: HTTP ${response.status} ${text}`,
-      "ENVIRONMENT_CREATE_FAILED",
-      response.status,
-    );
-  }
-  return (await response.json()) as CloudEnvironment;
-}
-
-/** GET /platform/api/organizations/{slug}/environments/ */
-export async function listEnvironments(
-  token: string,
-  organizationSlug: string,
-): Promise<CloudEnvironment[]> {
-  const response = await cloudFetch(
-    `${cloudApiBase()}/organizations/${organizationSlug}/environments/`,
-    token,
-  );
-  if (!response.ok) return [];
-  return (await response.json()) as CloudEnvironment[];
-}
-
-/** GET /platform/api/organizations/{slug}/environments/{key}/ */
-export async function getEnvironment(
-  token: string,
-  organizationSlug: string,
-  environmentKey: string,
-): Promise<CloudEnvironment | undefined> {
-  const response = await cloudFetch(
-    `${cloudApiBase()}/organizations/${organizationSlug}/environments/${environmentKey}/`,
-    token,
-  );
-  if (!response.ok) return undefined;
-  return (await response.json()) as CloudEnvironment;
-}
-
-// ── Task polling ─────────────────────────────────────────────────────────
-
-export interface TaskStatus {
-  status?: string;
-  [key: string]: unknown;
-}
-
-/** The poll URL for a task: GET /platform/api/service/task-status/{task_id}. */
-export function taskStatusUrl(taskId: string): string {
-  return `${cloudApiBase()}/service/task-status/${taskId}/`;
-}
-
-/**
- * Poll GET /platform/api/service/task-status/{task_id} until status is
- * "SUCCEEDED". Throws on FAILED or on timeout. Returns the final task body
- * so the caller can extract the resulting domain from the task result.
- *
- * Verified against the live Cloud API: the task id is the full job name
- * from the creation response, and the endpoint is anonymous — sending the
- * Cloud `Authorization: Token` header makes the service try (and fail) to
- * decode it as a JWT, returning 401 "Error decoding signature".
- */
-export async function pollTaskStatus(
-  taskId: string,
-  timeoutMs: number = POLL_TIMEOUT_MS,
-): Promise<TaskStatus> {
-  const deadline = Date.now() + timeoutMs;
-  const url = taskStatusUrl(taskId);
-  for (;;) {
-    const response = await fetch(url, {
-      headers: { "Content-Type": "application/json" },
-    });
-    if (!response.ok) {
-      throw new CloudApiError(
-        `Task status check failed: HTTP ${response.status} ${await response.text()}`,
-        "TASK_STATUS_FAILED",
-        response.status,
-      );
-    }
-    const task = (await response.json()) as TaskStatus;
-    const status = String(task.status ?? "").toUpperCase();
-    if (status === "SUCCEEDED") return task;
-    if (status === "FAILED" || status === "ERROR") {
-      throw new CloudApiError(
-        `Environment provisioning task ${taskId} failed: ${JSON.stringify(task)}`,
-        "TASK_FAILED",
-      );
-    }
-    if (Date.now() + POLL_INTERVAL_MS > deadline) {
-      throw new CloudApiError(
-        `Environment provisioning task ${taskId} did not reach SUCCEEDED within ${Math.round(timeoutMs / 1000)}s (last status: ${status || "unknown"})`,
-        "TASK_TIMEOUT",
-      );
-    }
-    await sleep(POLL_INTERVAL_MS);
-  }
-}
-
-/**
- * Extract the resulting GraphQL domain URL
- * (https://{domain_label}.saleor.cloud/graphql/) from the task result,
- * falling back to the environment object when the task body does not carry
- * it (the exact task-status shape is verified against the live API).
- */
-export function extractDomainUrl(
-  task: TaskStatus | undefined,
-  environment: CloudEnvironment | undefined,
-  domainLabel: string,
-): string {
-  const candidates: unknown[] = [];
-  if (task) {
-    const result = task.result as Record<string, unknown> | undefined;
-    candidates.push(result?.domain, task.domain, environment?.domain);
-  } else {
-    candidates.push(environment?.domain);
-  }
-  for (const candidate of candidates) {
-    if (typeof candidate === "string" && candidate.length > 0) {
-      const domain = candidate.replace(/^https?:\/\//, "").replace(/\/.*$/, "");
-      return `https://${domain}/graphql/`;
-    }
-  }
-  return `https://${domainLabel}.saleor.cloud/graphql/`;
-}
-
-// ── Instance GraphQL: app token acquisition ──────────────────────────────
-
-async function graphqlFetch(
-  graphqlUrl: string,
-  token: string,
-  query: string,
-  variables?: Record<string, unknown>,
-): Promise<Record<string, unknown>> {
-  const response = await fetch(graphqlUrl, {
-    method: "POST",
-    headers: {
-      Authorization: `Bearer ${token}`,
-      "Content-Type": "application/json",
-    },
-    body: JSON.stringify(variables ? { query, variables } : { query }),
-  });
-  if (!response.ok) {
-    throw new CloudApiError(
-      `GraphQL request to the Saleor instance failed: HTTP ${response.status}`,
-      "GRAPHQL_HTTP_ERROR",
-      response.status,
-    );
-  }
-  const body = (await response.json()) as Record<string, unknown>;
-  if (body.errors) {
-    throw new CloudApiError(
-      `GraphQL errors: ${JSON.stringify(body.errors)}`,
-      "GRAPHQL_ERROR",
-    );
-  }
-  return (body.data ?? {}) as Record<string, unknown>;
-}
-
-/** query GetApps { apps(first: 100) { edges { node { id name } } } } */
-export async function queryGetApps(
-  graphqlUrl: string,
-  token: string,
-): Promise<Array<{ id: string; name: string }>> {
-  const data = await graphqlFetch(
-    graphqlUrl,
-    token,
-    `query GetApps { apps(first: 100) { edges { node { id name } } } }`,
-  );
-  const apps = data.apps as Record<string, unknown> | undefined;
-  const edges = (apps?.edges ?? []) as Array<Record<string, unknown>>;
-  return edges.map((edge) => edge.node as { id: string; name: string });
-}
-
-/** All PermissionEnum values supported by the instance. */
-async function queryPermissionEnum(
-  graphqlUrl: string,
-  token: string,
-): Promise<string[]> {
-  const data = await graphqlFetch(
-    graphqlUrl,
-    token,
-    `query { __type(name: "PermissionEnum") { enumValues { name } } }`,
-  );
-  const type = data.__type as Record<string, unknown> | undefined;
-  const values = (type?.enumValues ?? []) as Array<Record<string, unknown>>;
-  return values.map((value) => String(value.name));
-}
-
-/** mutation appTokenCreate — create a token for an existing local app. */
-export async function createAppToken(
-  graphqlUrl: string,
-  token: string,
-  appId: string,
-): Promise<{ authToken: string }> {
-  const data = await graphqlFetch(
-    graphqlUrl,
-    token,
-    `mutation AppTokenCreate($app: ID!) {
-      appTokenCreate(input: { app: $app }) {
-        authToken
-        errors { field message }
-      }
-    }`,
-    { app: appId },
-  );
-  const result = data.appTokenCreate as Record<string, unknown> | undefined;
-  const errors = (result?.errors ?? []) as Array<Record<string, unknown>>;
-  if (errors.length > 0) {
-    throw new CloudApiError(
-      `appTokenCreate failed: ${errors.map((e) => e.message).join("; ")}`,
-      "APP_TOKEN_CREATE_FAILED",
-    );
-  }
-  const authToken = result?.authToken;
-  if (typeof authToken !== "string" || authToken.length === 0) {
-    throw new CloudApiError(
-      "appTokenCreate did not return an authToken",
-      "APP_TOKEN_CREATE_FAILED",
-    );
-  }
-  return { authToken };
-}
-
-/** mutation appCreate — create a local app; returns its auth token directly. */
-export async function createLocalApp(
-  graphqlUrl: string,
-  token: string,
-  name: string,
-  permissions: string[],
-): Promise<{ appId: string; authToken: string }> {
-  const data = await graphqlFetch(
-    graphqlUrl,
-    token,
-    `mutation AppCreate($input: AppInput!) {
-      appCreate(input: $input) {
-        authToken
-        app { id name }
-        errors { field message }
-      }
-    }`,
-    { input: { name, permissions } },
-  );
-  const result = data.appCreate as Record<string, unknown> | undefined;
-  const errors = (result?.errors ?? []) as Array<Record<string, unknown>>;
-  if (errors.length > 0) {
-    throw new CloudApiError(
-      `appCreate failed: ${errors.map((e) => e.message).join("; ")}`,
-      "APP_CREATE_FAILED",
-    );
-  }
-  const app = result?.app as Record<string, unknown> | undefined;
-  const authToken = result?.authToken;
-  if (typeof authToken !== "string" || authToken.length === 0) {
-    throw new CloudApiError(
-      "appCreate did not return an authToken",
-      "APP_CREATE_FAILED",
-    );
-  }
-  return { appId: String(app?.id ?? ""), authToken };
-}
-
-/**
- * Acquire an app token on the instance: select an existing local app and
- * create a token for it, otherwise create a local app (which yields its
- * token directly) — the deprecated CLI's example flow. Retries transient
- * failures: a freshly provisioned environment can take a moment to serve
- * GraphQL.
- */
-export async function acquireAppToken(
-  graphqlUrl: string,
-  token: string,
-  appName: string,
-): Promise<string> {
-  const apps = await withRetries(() => queryGetApps(graphqlUrl, token));
-  if (apps.length > 0) {
-    const { authToken } = await createAppToken(graphqlUrl, token, apps[0].id);
-    return authToken;
-  }
-  const permissions = await queryPermissionEnum(graphqlUrl, token);
-  const { authToken } = await createLocalApp(
-    graphqlUrl,
-    token,
-    appName,
-    permissions,
-  );
-  return authToken;
-}
-
-async function withRetries<T>(
-  fn: () => Promise<T>,
-  attempts: number = 5,
-  delayMs: number = 5_000,
-): Promise<T> {
-  let lastError: unknown;
-  for (let attempt = 0; attempt < attempts; attempt++) {
-    try {
-      return await fn();
-    } catch (error) {
-      lastError = error;
-      if (attempt < attempts - 1) await sleep(delayMs);
-    }
-  }
-  throw lastError;
-}
-
-function sleep(ms: number): Promise<void> {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}

package/src/lib/env-file.ts

@@ -1,68 +0,0 @@
-// Local .env secret handling (AGENTS.md "Secret and Environment Handling").
-//
-// Pinned harness seam (see features/step_definitions/005-stripe-checkout-setup.steps.ts):
-//   writeEnvValues(projectDir, values) — ensures .env is ignored by Git BEFORE
-//     writing, merges the given values into .env, and returns the full loaded
-//     post-update value map so the current command flow can use them.
-//   loadEnvValues(projectDir) — parses .env into a name → value record.
-//
-// The values handled here are secrets: they must never be logged or printed;
-// Jolly output references them by name only.
-import { existsSync, readFileSync, writeFileSync } from "node:fs";
-import { join } from "node:path";
-
-const ENV_LINE = /^\s*(?:export\s+)?([A-Za-z_][A-Za-z0-9_]*)\s*=\s*(.*?)\s*$/;
-
-/** Parse the project's .env into a name → value record (empty when absent). */
-export function loadEnvValues(projectDir: string): Record<string, string> {
-  const path = join(projectDir, ".env");
-  if (!existsSync(path)) return {};
-  const values: Record<string, string> = {};
-  for (const line of readFileSync(path, "utf8").split("\n")) {
-    const match = ENV_LINE.exec(line);
-    if (match) values[match[1]] = match[2];
-  }
-  return values;
-}
-
-/** Make sure .gitignore exists and lists `.env` so secrets are never committed. */
-function ensureEnvIgnored(projectDir: string): void {
-  const path = join(projectDir, ".gitignore");
-  const existing = existsSync(path) ? readFileSync(path, "utf8") : "";
-  const alreadyIgnored = existing.split("\n").some((line) => line.trim() === ".env");
-  if (alreadyIgnored) return;
-  const prefix = existing.length > 0 && !existing.endsWith("\n") ? `${existing}\n` : existing;
-  writeFileSync(path, `${prefix}.env\n`);
-}
-
-/**
- * Merge values into the project's .env, ensuring .env is Git-ignored before
- * any secret touches disk. Existing variables are updated in place, new ones
- * appended, and unrelated lines (comments, other variables) are preserved.
- * Returns the full post-update value map for the current command flow.
- */
-export function writeEnvValues(
-  projectDir: string,
-  values: Record<string, string>,
-): Record<string, string> {
-  ensureEnvIgnored(projectDir);
-  const path = join(projectDir, ".env");
-  const lines = existsSync(path) ? readFileSync(path, "utf8").split("\n") : [];
-  while (lines.length > 0 && lines[lines.length - 1] === "") lines.pop();
-
-  const pending = { ...values };
-  const updated = lines.map((line) => {
-    const match = ENV_LINE.exec(line);
-    if (match && match[1] in pending) {
-      const replacement = `${match[1]}=${pending[match[1]]}`;
-      delete pending[match[1]];
-      return replacement;
-    }
-    return line;
-  });
-  for (const [name, value] of Object.entries(pending)) {
-    updated.push(`${name}=${value}`);
-  }
-  writeFileSync(path, `${updated.join("\n")}\n`);
-  return loadEnvValues(projectDir);
-}