@mediamonks/canopy-cli 0.7.3 → 0.7.4

package/dist/docs/troubleshooting.md

@@ -77,6 +77,19 @@ or use dashboard Settings → Outbound hosts. Details and entry rules:
 target outbound requests are currently unrestricted, so this error only
 appears on GCP.
 
+## The worker returns errors and you can't see why
+
+Read its console output instead of adding diagnostic endpoints:
+
+```bash
+canopy logs --since 15m
+```
+
+`console.log` / `console.error` from your deployed worker, straight in the
+terminal; `--follow` tails it live while you reproduce the problem. See
+[canopy logs](https://docs.canopy.website/cli/logs). (On sites without worker log capture the command
+answers `not_supported_on_target`.)
+
 ## Docs are stale
 
 `canopy docs` caches the platform's docs. Force a refresh:

package/dist/{docs-BwtpnE8W.mjs → docs-IxKmYx_G.mjs}

@@ -1,4 +1,4 @@
-import { t as version } from "./package-BjMP21nL.mjs";
+import { t as version } from "./package-DBEmT6Uh.mjs";
 import { n as siteConfig } from "./site-BUlQR117.mjs";
 import { i as latestKnownVersion, r as compareSemver } from "./version-check-CcsA1QjI.mjs";
 import { n as reportErrors } from "./ui-CpdtK7mt.mjs";

package/dist/index.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as version } from "./package-BjMP21nL.mjs";
+import { t as version } from "./package-DBEmT6Uh.mjs";
 import { r as siteHeaderLine, t as setInvocationProfile } from "./site-BUlQR117.mjs";
 import { a as notifyOfUpdate, o as runRefresh } from "./version-check-CcsA1QjI.mjs";
 import { defineCommand, runMain } from "citty";
@@ -15,7 +15,7 @@ import { defineCommand, runMain } from "citty";
 *   deploy                build & deploy assets (+ worker)        [phase 1/2]
 *   token create|list|revoke   deploy tokens for CI               [phase 2]
 *   db pull|snapshot|restore                                      [phase 2]
-*   logs                  tail the project's worker logs          [phase 2]
+*   logs [--follow]       read the project's worker logs          [phase 2]
 *   usage                 AI spend + storage for a project        [phase 1]
 *   open                  open the deployed project / dashboard   [phase 1]
 */
@@ -53,19 +53,6 @@ function takeGlobalProfile(argv) {
 const profileFlag = takeGlobalProfile(process.argv);
 if (profileFlag) setInvocationProfile(profileFlag);
 else if (process.env["CANOPY_PROFILE"]) setInvocationProfile(process.env["CANOPY_PROFILE"]);
-/** A roadmap command that has not landed yet (docs/04-roadmap.md). */
-function planned(name, description, phase) {
-	return defineCommand({
-		meta: {
-			name,
-			description: `${description} (not implemented yet — Phase ${phase})`
-		},
-		run() {
-			console.error(`canopy ${name}: not implemented yet — lands in Phase ${phase} (docs/04-roadmap.md).`);
-			process.exit(1);
-		}
-	});
-}
 const main = defineCommand({
 	meta: {
 		name: "canopy",
@@ -91,10 +78,10 @@ const main = defineCommand({
 		db: () => import("./db-D3RKaLVU.mjs").then((m) => m.dbCommand),
 		usage: () => import("./usage-wpew0a2M.mjs").then((m) => m.usageCommand),
 		open: () => import("./open-CLSh6oez.mjs").then((m) => m.openCommand),
-		docs: () => import("./docs-BwtpnE8W.mjs").then((m) => m.docsCommand),
-		skill: () => import("./skill-aTr-RQil.mjs").then((m) => m.skillCommand),
-		upgrade: () => import("./upgrade-Dl6DiMhL.mjs").then((m) => m.upgradeCommand),
-		logs: planned("logs", "Tail worker logs", "2")
+		docs: () => import("./docs-IxKmYx_G.mjs").then((m) => m.docsCommand),
+		skill: () => import("./skill-D3MHtg4s.mjs").then((m) => m.skillCommand),
+		upgrade: () => import("./upgrade-PcE6l9uj.mjs").then((m) => m.upgradeCommand),
+		logs: () => import("./logs-DBLDS3aQ.mjs").then((m) => m.logsCommand)
 	}
 });
 if (process.argv[2] !== "upgrade") notifyOfUpdate(version);

package/dist/logs-DBLDS3aQ.mjs

@@ -0,0 +1,109 @@
+import { c as resolveProject, o as projectFlagArgs } from "./site-BUlQR117.mjs";
+import { c as apiRequest, l as withContext, n as reportErrors } from "./ui-CpdtK7mt.mjs";
+import { defineCommand } from "citty";
+//#region src/logs.ts
+/**
+* canopy logs — read the project worker's stdout/stderr
+* (GET /v1/projects/:slug/logs, docs/17-worker-logs.md). `--follow` is a
+* polling loop on since=<last ts>; output is stdout-clean for piping.
+*/
+const FOLLOW_INTERVAL_MS = 4e3;
+/** `--since` accepts a duration (30s, 15m, 2h, 1d) or an RFC 3339 timestamp. */
+function parseSince(value, now = Date.now()) {
+	const duration = /^(\d+)([smhd])$/.exec(value.trim());
+	if (duration) {
+		const unitMs = {
+			s: 1e3,
+			m: 6e4,
+			h: 36e5,
+			d: 864e5
+		}[duration[2]];
+		return new Date(now - Number(duration[1]) * unitMs).toISOString();
+	}
+	const ms = Date.parse(value);
+	if (Number.isNaN(ms)) throw new Error(`--since must be a duration (30s, 15m, 2h, 1d) or a timestamp, not ${JSON.stringify(value)}.`);
+	return new Date(ms).toISOString();
+}
+/** `SEVERITY  ts  text` — severity padded so lines column-align. */
+function formatEntry(entry) {
+	return `${entry.severity.padEnd(8)} ${entry.ts}  ${entry.text}`;
+}
+async function fetchLogs(slug, params) {
+	const query = new URLSearchParams({ channel: params.channel });
+	if (params.since) query.set("since", params.since);
+	if (params.limit) query.set("limit", String(params.limit));
+	return withContext(apiRequest("GET", `/projects/${slug}/logs?${query}`), {
+		action: `read worker logs for "${slug}"`,
+		fixes: { not_supported_on_target: "Worker logs aren't available on this site yet — GCP sites only." }
+	});
+}
+const logsCommand = defineCommand({
+	meta: {
+		name: "logs",
+		description: "Show the project worker's logs (stdout/stderr)"
+	},
+	args: {
+		...projectFlagArgs,
+		staging: {
+			type: "boolean",
+			default: false,
+			description: "Read the staging channel's worker instead of live"
+		},
+		since: {
+			type: "string",
+			description: "How far back to read: a duration (30s, 15m, 2h, 1d) or a timestamp",
+			default: "1h"
+		},
+		limit: {
+			type: "string",
+			description: "Max entries to print (1–1000)",
+			default: "100"
+		},
+		follow: {
+			type: "boolean",
+			alias: "f",
+			default: false,
+			description: "Keep polling for new entries (Ctrl-C to stop)"
+		},
+		json: {
+			type: "boolean",
+			default: false,
+			description: "Print entries as JSON lines instead of formatted text"
+		}
+	},
+	run: reportErrors("logs", async ({ args }) => {
+		const { slug } = resolveProject(args);
+		const channel = args.staging ? "staging" : "live";
+		const limit = Number(args.limit);
+		if (!Number.isInteger(limit) || limit < 1 || limit > 1e3) throw new Error("--limit must be an integer between 1 and 1000.");
+		let since = parseSince(args.since);
+		const print = (entries) => {
+			for (const entry of entries) console.log(args.json ? JSON.stringify(entry) : formatEntry(entry));
+		};
+		const initial = [...(await fetchLogs(slug, {
+			channel,
+			since,
+			limit
+		})).entries].reverse();
+		print(initial);
+		if (!args.follow) {
+			if (initial.length === 0) console.error(`No log entries since ${since} — is the worker getting traffic?`);
+			return;
+		}
+		console.error(`Following ${slug}${channel === "staging" ? " [staging]" : ""}… (Ctrl-C to stop)`);
+		let lastTs = initial.at(-1)?.ts ?? since;
+		for (;;) {
+			await new Promise((resolve) => setTimeout(resolve, FOLLOW_INTERVAL_MS));
+			const fresh = [...(await fetchLogs(slug, {
+				channel,
+				since: lastTs,
+				limit: 1e3
+			})).entries].reverse().filter((e) => e.ts > lastTs);
+			if (fresh.length === 0) continue;
+			print(fresh);
+			lastTs = fresh.at(-1).ts;
+		}
+	})
+});
+//#endregion
+export { logsCommand };

package/dist/{package-BjMP21nL.mjs → package-DBEmT6Uh.mjs}

@@ -1,4 +1,4 @@
 //#region package.json
-var version = "0.7.3";
+var version = "0.7.4";
 //#endregion
 export { version as t };

package/dist/{skill-aTr-RQil.mjs → skill-D3MHtg4s.mjs}

@@ -1,4 +1,4 @@
-import { t as version } from "./package-BjMP21nL.mjs";
+import { t as version } from "./package-DBEmT6Uh.mjs";
 import { n as reportErrors } from "./ui-CpdtK7mt.mjs";
 import { defineCommand } from "citty";
 import { cpSync, existsSync, mkdirSync, rmSync, symlinkSync, writeFileSync } from "node:fs";

package/dist/{upgrade-Dl6DiMhL.mjs → upgrade-PcE6l9uj.mjs}

@@ -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-aTr-RQil.mjs");
+		const { skillInstalled } = await import("./skill-D3MHtg4s.mjs");
 		const refreshSkill = skillInstalled(process.cwd());
 		console.log(`Upgrading via ${command}: ${command} ${cmd.join(" ")}`);
 		await run(command, cmd);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mediamonks/canopy-cli",
-  "version": "0.7.3",
+  "version": "0.7.4",
   "description": "Canopy CLI — create, develop and deploy Canopy projects.",
   "bin": {
     "canopy": "./dist/index.mjs"