@mediamonks/canopy-cli 0.4.5 → 0.5.0

package/dist/templates/worker/worker/index.ts

@@ -4,9 +4,10 @@
  * platform (db/blob/ai) through the CANOPY service binding, so budgets and
  * data isolation still apply.
  *
- * NOTE: per-project Workers are a Canopy Phase 2 capability. `canopy deploy`
- * does not upload this Worker yet — the frontend deploys like any SPA, and
- * this directory is picked up automatically once the platform supports it.
+ * On GCP, `canopy deploy` bundles this file and rolls a per-project Cloud Run
+ * service (docs/05-gcp-plan.md G6). Routes under `/api/*` reach this Worker;
+ * everything else serves the SPA. Dashboard schedules call `scheduled()`
+ * (docs/07-schedules.md).
  */
 
 import { createCanopy } from "@mediamonks/canopy";
@@ -15,6 +16,15 @@ import { Hono } from "hono";
 interface Env {
   // Service binding to the platform API (canopy-api), scoped to this project.
   CANOPY: { fetch: typeof fetch };
+  // Dashboard secrets (Settings → Secrets) land as Workers-shaped bindings:
+  // MY_API_KEY?: string;
+}
+
+interface ScheduledEvent {
+  name: string;
+  cron: string;
+  scheduledTime: number;
+  type: "scheduled";
 }
 
 const app = new Hono<{ Bindings: Env }>();
@@ -26,4 +36,17 @@ app.get("/api/hello", async (c) => {
   return c.json({ message: `Hello from the backend, ${user.name}!` });
 });
 
-export default app;
+export default {
+  fetch: app.fetch.bind(app),
+
+  // Settings → Schedules: switch on event.name (not the cron string).
+  async scheduled(event: ScheduledEvent, _env: Env) {
+    switch (event.name) {
+      // case "daily-digest":
+      //   await doWork(_env);
+      //   break;
+      default:
+        console.warn("unhandled schedule", event.name);
+    }
+  },
+};

package/dist/{token-yuwQTQB8.mjs → token-BeF9zczg.mjs}

@@ -1,5 +1,5 @@
-import { n as reportErrors, s as apiRequest } from "./ui-D1DXoDN1.mjs";
-import { i as resolveProject, n as projectFlagArgs, t as projectDirArgs } from "./project-DKbgJACM.mjs";
+import { a as projectFlagArgs, i as projectDirArgs, s as resolveProject } from "./site-BJjoePQS.mjs";
+import { c as apiRequest, n as reportErrors } from "./ui-DThlyHgo.mjs";
 import { defineCommand } from "citty";
 const tokenCommand = defineCommand({
 	meta: {

package/dist/{ui-D1DXoDN1.mjs → ui-DThlyHgo.mjs}

@@ -1,37 +1,6 @@
+import { n as siteConfig } from "./site-BJjoePQS.mjs";
 import { spawn } from "node:child_process";
-import { chmodSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { join } from "node:path";
 import { cancel, isCancel } from "@clack/prompts";
-//#region src/config.ts
-/**
-* CLI config at ~/.canopy/config.json — platform endpoints and the current
-* CLI token. Env overrides: CANOPY_API_URL, CANOPY_OIDC_ISSUER,
-* CANOPY_OIDC_CLIENT_ID.
-*/
-const DEFAULT_API_URL = "https://canopy-api.arjan-van-wijk.workers.dev";
-const DEFAULT_ISSUER = "https://s4capital.onelogin.com/oidc/2";
-const DEFAULT_CLI_CLIENT_ID = "b69755d0-6678-013f-b5ce-09fe44a57aa0180501";
-const configDir = join(homedir(), ".canopy");
-const configPath = join(configDir, "config.json");
-function readConfig() {
-	let stored = {};
-	try {
-		stored = JSON.parse(readFileSync(configPath, "utf8"));
-	} catch {}
-	return {
-		...stored,
-		apiUrl: process.env["CANOPY_API_URL"] ?? stored.apiUrl ?? DEFAULT_API_URL,
-		issuer: process.env["CANOPY_OIDC_ISSUER"] ?? stored.issuer ?? DEFAULT_ISSUER,
-		cliClientId: process.env["CANOPY_OIDC_CLIENT_ID"] ?? stored.cliClientId ?? DEFAULT_CLI_CLIENT_ID
-	};
-}
-function writeConfig(config) {
-	mkdirSync(configDir, { recursive: true });
-	writeFileSync(configPath, `${JSON.stringify(config, null, 2)}\n`);
-	chmodSync(configPath, 384);
-}
-//#endregion
 //#region src/api.ts
 /**
 * Authenticated requests to the Canopy control plane. Credentials, in order:
@@ -81,6 +50,10 @@ const ERROR_COPY = {
 		why: "the AI service is temporarily unavailable",
 		fix: "This is usually transient — wait a moment and try again."
 	},
+	not_supported_on_target: {
+		why: "this Canopy deployment's cloud target doesn't support that feature",
+		fix: "Per-project workers, schedules and secrets are capability-gated per target — remove the unsupported part (e.g. the worker bundle) or run against a target that supports it."
+	},
 	deploy_too_large: {
 		why: "the deploy bundle exceeds the 25 MB limit",
 		fix: "Trim large assets from the build output (or move them to blob storage), then redeploy."
@@ -190,7 +163,7 @@ async function withContext(request, context) {
 }
 /** Resolve the bearer token: CI deploy token first (D11), then the login token. */
 function credentials() {
-	const config = readConfig();
+	const config = siteConfig();
 	const deployToken = process.env["CANOPY_DEPLOY_TOKEN"];
 	const token = deployToken || config.token;
 	if (!token) throw new Error("Not logged in — run `canopy login` first.");
@@ -214,7 +187,7 @@ async function fail(response, isDeployToken, method, path) {
 async function apiRequest(method, path, body, rawContentType, headers) {
 	const { apiUrl, token, isDeployToken } = credentials();
 	const isForm = body instanceof FormData;
-	const response = await fetch(`${apiUrl}/v1${path}`, {
+	const response = await fetch(`${apiUrl}/control/v1${path}`, {
 		method,
 		headers: {
 			authorization: `Bearer ${token}`,
@@ -229,10 +202,29 @@ async function apiRequest(method, path, body, rawContentType, headers) {
 /** Authenticated GET returning raw bytes (e.g. a deploy zip). */
 async function apiDownload(path) {
 	const { apiUrl, token, isDeployToken } = credentials();
-	const response = await fetch(`${apiUrl}/v1${path}`, { headers: { authorization: `Bearer ${token}` } });
+	const response = await fetch(`${apiUrl}/control/v1${path}`, { headers: { authorization: `Bearer ${token}` } });
 	if (!response.ok) return fail(response, isDeployToken, "GET", path);
 	return Buffer.from(await response.arrayBuffer());
 }
+/**
+* Data-plane call (db safety: export/snapshots/restore). The CLI token is
+* unscoped; the target project rides as X-Canopy-Project and the api. gateway
+* re-vouches it (docs/10-cli-sites.md D17).
+*/
+async function apiDataRequest(method, path, projectSlug, body, rawContentType) {
+	const { apiUrl, token, isDeployToken } = credentials();
+	const response = await fetch(`${apiUrl}/data/v1${path}`, {
+		method,
+		headers: {
+			authorization: `Bearer ${token}`,
+			"x-canopy-project": projectSlug,
+			...body === void 0 ? {} : { "content-type": rawContentType ?? "application/json" }
+		},
+		body: body === void 0 ? void 0 : rawContentType !== void 0 ? body : JSON.stringify(body)
+	});
+	if (!response.ok) return fail(response, isDeployToken, method, path);
+	return await response.json();
+}
 //#endregion
 //#region src/ui.ts
 /**
@@ -305,4 +297,4 @@ function openBrowser(url) {
 	}).on("error", () => {}).unref();
 }
 //#endregion
-export { ApiError as a, withContext as c, unwrap as i, readConfig as l, reportErrors as n, apiDownload as o, requireTty as r, apiRequest as s, openBrowser as t, writeConfig as u };
+export { ApiError as a, apiRequest as c, unwrap as i, withContext as l, reportErrors as n, apiDataRequest as o, requireTty as r, apiDownload as s, openBrowser as t };

package/dist/{upgrade-sXoqYLRu.mjs → upgrade-DNxR-zh7.mjs}

@@ -1,5 +1,5 @@
-import { t as PACKAGE_NAME } from "./version-check-CoWgQs2h.mjs";
-import { n as reportErrors } from "./ui-D1DXoDN1.mjs";
+import { t as PACKAGE_NAME } from "./version-check-Cuh6HaLX.mjs";
+import { n as reportErrors } from "./ui-DThlyHgo.mjs";
 import { defineCommand } from "citty";
 import { spawn } from "node:child_process";
 import { fileURLToPath } from "node:url";
@@ -112,7 +112,7 @@ const upgradeCommand = defineCommand({
 		const spec = `${PACKAGE_NAME}@${args.version ?? "latest"}`;
 		const command = pmCommand(pm);
 		const cmd = installArgs(pm, spec);
-		const { skillInstalled } = await import("./skill-h7QlCMhc.mjs");
+		const { skillInstalled } = await import("./skill-IAAa2EkK.mjs");
 		const refreshSkill = skillInstalled(process.cwd());
 		console.log(`Upgrading via ${command}: ${command} ${cmd.join(" ")}`);
 		await run(command, cmd);

package/dist/usage-DQpH7A3X.mjs

@@ -0,0 +1,79 @@
+import { a as projectFlagArgs, s as resolveProject } from "./site-BJjoePQS.mjs";
+import { c as apiRequest, l as withContext, n as reportErrors } from "./ui-DThlyHgo.mjs";
+import { defineCommand } from "citty";
+//#region src/usage.ts
+/**
+* canopy usage — print a project's AI spend + storage footprint
+* (same data as the dashboard Usage tab / GET /v1/projects/:slug/usage).
+*/
+function formatBytes(bytes) {
+	if (bytes < 1024) return `${bytes} B`;
+	if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} kB`;
+	if (bytes < 1024 * 1024 * 1024) return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
+	return `${(bytes / (1024 * 1024 * 1024)).toFixed(2)} GB`;
+}
+function formatUsd(n) {
+	if (n === 0) return "$0";
+	if (n < 1e-4) return `$${n.toExponential(1)}`;
+	if (n < .01) return `$${n.toFixed(4)}`;
+	return `$${n.toFixed(2)}`;
+}
+function formatTokens(n) {
+	if (n < 1e3) return String(n);
+	if (n < 1e6) return `${(n / 1e3).toFixed(1)}k`;
+	return `${(n / 1e6).toFixed(2)}M`;
+}
+function pad(label, width = 12) {
+	return label.padEnd(width);
+}
+function renderUsage(slug, usage) {
+	const lines = [`${slug} — last ${usage.ai.windowDays ?? 30} days`, ""];
+	lines.push("AI");
+	if (!usage.ai.available) lines.push(`  ${pad("status")}unavailable${usage.ai.reason ? ` (${usage.ai.reason})` : ""}`);
+	else {
+		lines.push(`  ${pad("spend")}${formatUsd(usage.ai.costUsd ?? 0)}`);
+		lines.push(`  ${pad("requests")}${usage.ai.requests ?? 0}`);
+		lines.push(`  ${pad("tokens")}${formatTokens(usage.ai.tokensIn ?? 0)} in / ${formatTokens(usage.ai.tokensOut ?? 0)} out`);
+		if (usage.ai.byModel?.length) {
+			lines.push("  by model");
+			for (const row of usage.ai.byModel.slice(0, 8)) lines.push(`    ${row.model.padEnd(36)} ${String(row.requests).padStart(4)}  ${formatUsd(row.costUsd)}`);
+		}
+		if (usage.ai.truncated) lines.push("  (truncated — more requests in the window than we summarized)");
+	}
+	lines.push("");
+	lines.push("Storage");
+	lines.push(usage.db ? `  ${pad("database")}${formatBytes(usage.db.sizeBytes)} · ${usage.db.tables} tables` : `  ${pad("database")}—`);
+	lines.push(usage.blob ? `  ${pad("blobs")}${formatBytes(usage.blob.totalBytes)} · ${usage.blob.objects} objects` : `  ${pad("blobs")}—`);
+	const deploys = usage.deploys.count;
+	const live = usage.deploys.latestVersion != null ? ` · v${usage.deploys.latestVersion} live` : "";
+	lines.push(`  ${pad("deploys")}${deploys}${live}`);
+	return lines.join("\n");
+}
+const usageCommand = defineCommand({
+	meta: {
+		name: "usage",
+		description: "Show AI spend and storage usage for a project"
+	},
+	args: {
+		...projectFlagArgs,
+		json: {
+			type: "boolean",
+			description: "Print raw JSON (same shape as the dashboard Usage API)",
+			default: false
+		}
+	},
+	run: reportErrors("usage", async ({ args }) => {
+		const { slug } = resolveProject(args);
+		const { usage } = await withContext(apiRequest("GET", `/projects/${slug}/usage`), { action: `look up usage for "${slug}"` });
+		if (args.json) {
+			console.log(JSON.stringify({
+				slug,
+				usage
+			}, null, 2));
+			return;
+		}
+		console.log(renderUsage(slug, usage));
+	})
+});
+//#endregion
+export { usageCommand };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mediamonks/canopy-cli",
-  "version": "0.4.5",
+  "version": "0.5.0",
   "description": "Canopy CLI — create, develop and deploy Canopy projects.",
   "bin": {
     "canopy": "./dist/index.mjs"
@@ -15,11 +15,12 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.7.0",
+    "@electric-sql/pglite": "^0.3.14",
     "citty": "^0.2.2",
+    "esbuild": "^0.28.1",
     "hono": "^4.8.0",
-    "miniflare": "^4.20260714.0",
     "vite-server": "npm:vite@^7",
-    "@mediamonks/canopy": "0.0.2",
+    "@mediamonks/canopy": "0.0.3",
     "@mediamonks/canopy-data-plane": "0.0.1"
   },
   "devDependencies": {

package/dist/dev-BYv6BmcI.mjs

@@ -1,2 +0,0 @@
-import { t as devCommand } from "./dev-CuvlJpcO.mjs";
-export { devCommand };