@mediamonks/canopy-cli 0.7.36 → 0.7.38

package/dist/project-template-BEr_tgIY.mjs

@@ -0,0 +1,125 @@
+import { a as projectDirArgs, c as resolveProject } from "./site-DM2J10CB.mjs";
+import { i as apiRequest, o as withContext } from "./api-BPEYm9ts.mjs";
+import { a as unwrap, i as requireTty, r as reportErrors } from "./ui-CHfKV6lG.mjs";
+import { defineCommand } from "citty";
+import * as p from "@clack/prompts";
+/** Plain words for the API's template errors. */
+const TEMPLATE_FIXES = {
+	template_not_found: "No template by that name on this site. `canopy projects --templates` lists the templates you can start from.",
+	template_empty: "The template's repository has no code yet. Ask its owner to push it first.",
+	template_too_large: `The template's files are larger than the 32 MiB a copy can hold. Ask its owner to remove large files from the repository.`,
+	repo_required: "A template needs a Canopy git repository. Create one with `canopy repo create`, push the code, then try again.",
+	repo_empty: "Push the project's code to its repository first, then try again.",
+	owner_only: "Only the project owner can make it a template, or stop it being one.",
+	repos_not_configured: "Templates need Canopy git repositories, which are not available on this site yet."
+};
+/** What the new project gets, one line each — shown before creating. */
+function describeCopy(copy) {
+	const lines = ["The code in its repository, as one fresh commit (no history)."];
+	if (copy.egress_mode === "open") lines.push("Outbound access: open (the backend may call any host).");
+	else if (copy.egress_allowlist.length) lines.push(`Outbound hosts allowed: ${copy.egress_allowlist.join(", ")}.`);
+	const loosened = [
+		!copy.csp_enabled && "Content-Security-Policy off",
+		copy.allow_framing && "other sites may frame the app",
+		copy.browser_db_access !== "full" && `browser database access: ${copy.browser_db_access}`,
+		!copy.feedback_widget && "feedback widget hidden"
+	].filter(Boolean);
+	if (loosened.length) lines.push(`Page settings: ${loosened.join("; ")}.`);
+	if (copy.google_bundles.length) lines.push(`Google access it asks visitors for: ${copy.google_bundles.join(", ")}.`);
+	if (copy.schedules.length) lines.push(`Schedules, turned off: ${copy.schedules.map((s) => `${s.name} (${s.cron})`).join(", ")}.`);
+	if (copy.secrets.length) lines.push(`Secret names to fill in (no values): ${copy.secrets.join(", ")}.`);
+	lines.push("Not copied: its data, files, members, password, budgets or history.");
+	return lines;
+}
+/** What is left to do once the project exists. */
+function nextSteps(slug, copy) {
+	const steps = [`cd ${slug}`];
+	for (const name of copy.secrets) steps.push(`canopy secrets set ${name}`);
+	steps.push("canopy deploy");
+	for (const s of copy.schedules) steps.push(`canopy schedule add ${s.name} "${s.cron}"   (to turn it on)`);
+	if (copy.google_restricted.length) steps.push(`Ask a Canopy admin to unlock restricted Google access (${copy.google_restricted.join(", ")}), then turn it on in the dashboard.`);
+	return steps;
+}
+function fetchTemplate(slug) {
+	return withContext(apiRequest("GET", `/projects/${slug}/template`), {
+		action: `read template ${slug}`,
+		fixes: TEMPLATE_FIXES
+	});
+}
+const templateCommand = defineCommand({
+	meta: {
+		name: "template",
+		description: "Offer a project as a template (mark, unmark, show)"
+	},
+	subCommands: {
+		mark: defineCommand({
+			meta: {
+				name: "mark",
+				description: "Let anyone on this site start a project from this one"
+			},
+			args: {
+				...projectDirArgs,
+				yes: {
+					type: "boolean",
+					description: "Skip the confirmation",
+					default: false
+				}
+			},
+			run: reportErrors("template mark", async ({ args }) => {
+				const { slug } = resolveProject(args);
+				if (!args.yes) {
+					requireTty("pass --yes to confirm.");
+					p.log.info(`Everyone on this site will be able to start a project of their own with a copy of ${slug}'s current code in its repository, plus its setup (outbound hosts, page settings, schedule and secret names). Its data, secret values and members are never copied.`);
+					if (!unwrap(await p.confirm({
+						message: `Make ${slug} a template?`,
+						initialValue: false
+					}))) {
+						p.cancel("Not marked.");
+						return;
+					}
+				}
+				if ((await withContext(apiRequest("PUT", `/projects/${slug}/template`, { enabled: true }), {
+					action: `make ${slug} a template`,
+					fixes: TEMPLATE_FIXES
+				})).warnings.includes("no_migrations")) p.log.warn("canopy.json sets no \"migrations\", so new projects start with an empty database: none of its tables come along. Add migrations to the repository to fix that.");
+				p.log.success(`${slug} is a template. Others start from it with \`canopy create <name> --from ${slug}\`.`);
+			})
+		}),
+		unmark: defineCommand({
+			meta: {
+				name: "unmark",
+				description: "Stop new projects starting from this one"
+			},
+			args: { ...projectDirArgs },
+			run: reportErrors("template unmark", async ({ args }) => {
+				const { slug } = resolveProject(args);
+				await withContext(apiRequest("PUT", `/projects/${slug}/template`, { enabled: false }), {
+					action: `stop ${slug} being a template`,
+					fixes: TEMPLATE_FIXES
+				});
+				p.log.success(`${slug} is no longer a template. Projects already started from it are not affected.`);
+			})
+		}),
+		show: defineCommand({
+			meta: {
+				name: "show",
+				description: "Show what a new project gets from a template"
+			},
+			args: { slug: {
+				type: "positional",
+				description: "Template slug",
+				required: true
+			} },
+			run: reportErrors("template show", async ({ args }) => {
+				const preview = await fetchTemplate(args.slug);
+				const t = preview.template;
+				console.log(`${t.name} (${t.slug}) — by ${t.owner.name} <${t.owner.email}>`);
+				if (t.description) console.log(t.description);
+				console.log("");
+				for (const line of describeCopy(preview.copies)) console.log(`- ${line}`);
+			})
+		})
+	}
+});
+//#endregion
+export { templateCommand as a, nextSteps as i, describeCopy as n, fetchTemplate as r, TEMPLATE_FIXES as t };

package/dist/project-template-DdT0dqpn.mjs

@@ -0,0 +1,2 @@
+import { a as templateCommand } from "./project-template-BEr_tgIY.mjs";
+export { templateCommand };

package/dist/{projects-DQAhCZm8.mjs → projects-Bm4oTodB.mjs}

@@ -1,7 +1,8 @@
 import { n as siteConfig, s as projectUrl, u as tryReadCanopyJson } from "./site-DM2J10CB.mjs";
-import { i as apiRequest } from "./api-C4rMhE7i.mjs";
-import { a as unwrap, i as requireTty, r as reportErrors } from "./ui-C_jSc1Kz.mjs";
-import { r as offerRepoOnCreate } from "./repo-Bb9ntNa4.mjs";
+import { i as apiRequest, o as withContext } from "./api-BPEYm9ts.mjs";
+import { a as unwrap, i as requireTty, r as reportErrors } from "./ui-CHfKV6lG.mjs";
+import { i as nextSteps, n as describeCopy, r as fetchTemplate, t as TEMPLATE_FIXES } from "./project-template-BEr_tgIY.mjs";
+import { i as offerRepoOnCreate, n as cloneProjectRepo } from "./repo-CE22HpqZ.mjs";
 import { defineCommand } from "citty";
 import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "node:fs";
 import { join, relative, resolve, sep } from "node:path";
@@ -111,6 +112,10 @@ const createCommand = defineCommand({
 			type: "boolean",
 			description: "Also create a git repository for the project on Canopy",
 			negativeDescription: "Don't create a git repository (no question asked)"
+		},
+		from: {
+			type: "string",
+			description: "Start from a template project: a copy of its code and setup (`canopy projects --templates`)"
 		}
 	},
 	run: reportErrors("create", async ({ args }) => {
@@ -134,6 +139,10 @@ const createCommand = defineCommand({
 			}
 		})).trim();
 		slug ||= slugify(name);
+		if (args.from) {
+			await createFromTemplate(name, slug, args.from);
+			return;
+		}
 		const scaffold = shouldScaffoldCreate(args.scaffold);
 		let template = TEMPLATES.find((t) => t.id === (args.template ?? "static"));
 		if (!template) throw new Error(`Unknown template "${args.template}" — available: ${TEMPLATES.map((t) => t.id).join(", ")}.`);
@@ -188,6 +197,45 @@ const createCommand = defineCommand({
 		}
 	})
 });
+/**
+* `canopy create --from` (project-templates): show what the new project
+* gets, create it with a copy of the template, clone it, list what's left.
+*/
+async function createFromTemplate(name, slug, from) {
+	const targetDir = resolve(slug);
+	if (existsSync(targetDir)) throw new Error(`Directory ./${slug} already exists — remove it, or pick another slug.`);
+	const preview = await fetchTemplate(from);
+	p.note(describeCopy(preview.copies).join("\n"), `From ${preview.template.name} (by ${preview.template.owner.name}), ${slug} gets`);
+	if (process.stdin.isTTY) {
+		if (!unwrap(await p.confirm({
+			message: `Create ${slug} from ${from}?`,
+			initialValue: true
+		}))) {
+			p.cancel("Nothing created.");
+			return;
+		}
+	}
+	const spin = p.spinner();
+	spin.start(`Creating ${slug} from ${from}…`);
+	let project;
+	try {
+		({project} = await withContext(apiRequest("POST", "/projects", {
+			slug,
+			name,
+			from
+		}), {
+			action: `create ${slug} from ${from}`,
+			fixes: TEMPLATE_FIXES
+		}));
+	} catch (err) {
+		spin.error("Create failed.");
+		throw err;
+	}
+	spin.stop(`Created ${project.name} — ${projectUrl(project.slug)}`);
+	await cloneProjectRepo(slug, targetDir);
+	p.note(nextSteps(slug, preview.copies).join("\n"), `Cloned into ./${slug}/ — next`);
+	p.outro(`Live URL (after first deploy): ${projectUrl(project.slug)}`);
+}
 /** Empty enough to scaffold into: missing, or holding only dotfiles (.git, .agents…). */
 function isEmptyish(dir) {
 	if (!existsSync(dir)) return true;
@@ -294,13 +342,31 @@ const projectsCommand = defineCommand({
 		name: "projects",
 		description: "List your projects"
 	},
-	args: { all: {
-		type: "boolean",
-		default: false,
-		description: "Include projects you can't edit"
-	} },
+	args: {
+		all: {
+			type: "boolean",
+			default: false,
+			description: "Include projects you can't edit"
+		},
+		templates: {
+			type: "boolean",
+			default: false,
+			description: "List the templates anyone can start a project from"
+		}
+	},
 	run: reportErrors("projects", async ({ args }) => {
 		const { projects, is_admin: isAdmin } = await apiRequest("GET", "/projects");
+		if (args.templates) {
+			const templates = projects.filter((project) => project.is_template);
+			if (templates.length === 0) {
+				console.log("No templates on this site yet.");
+				return;
+			}
+			const width = Math.max(...templates.map((project) => project.slug.length));
+			for (const project of templates) console.log(`${project.slug.padEnd(width)}  ${project.name}  (${project.owner_email})`);
+			console.log(`\nStart from one with \`canopy create <name> --from <template>\`.`);
+			return;
+		}
 		const mine = args.all || isAdmin ? projects : projects.filter((project) => project.role);
 		if (mine.length === 0) {
 			console.log(projects.length === 0 ? "No projects yet — run `canopy create`." : `No projects of your own yet — run \`canopy create\`, or --all to list all ${projects.length}.`);

package/dist/{repo-Bb9ntNa4.mjs → repo-CE22HpqZ.mjs}

@@ -1,6 +1,6 @@
 import { a as projectDirArgs, c as resolveProject, n as siteConfig, u as tryReadCanopyJson } from "./site-DM2J10CB.mjs";
-import { i as apiRequest, o as withContext } from "./api-C4rMhE7i.mjs";
-import { a as unwrap, i as requireTty, r as reportErrors, t as formatDateTime } from "./ui-C_jSc1Kz.mjs";
+import { i as apiRequest, o as withContext } from "./api-BPEYm9ts.mjs";
+import { a as unwrap, i as requireTty, r as reportErrors, t as formatDateTime } from "./ui-CHfKV6lG.mjs";
 import { a as parseCredentialInput, i as helperCommand, o as runCredentialHelper, r as fileTokenCache, t as RepoCredentialError } from "./repo-credential-CNDRM-tG.mjs";
 import { defineCommand } from "citty";
 import { existsSync, realpathSync } from "node:fs";
@@ -268,20 +268,23 @@ const cloneCommand = defineCommand({
 		}
 	},
 	run: reportErrors("repo clone", async ({ args }) => {
-		const slug = args.slug;
-		const repo = requireCanopyRepo(slug, await fetchRepo(slug));
-		await requireGit();
-		const target = resolve(args.target ?? slug);
-		const code = await gitInteractive([
-			"clone",
-			...credentialConfig(repo.remote, currentProfile(), slug).flatMap(([key, values]) => values.flatMap((value) => ["-c", `${key}=${value}`])),
-			repo.remote,
-			target
-		]);
-		if (code !== 0) throw new Error(`git clone failed (exit ${code}).`);
-		p.log.success(`Cloned ${slug} into ${target}.`);
+		const target = await cloneProjectRepo(args.slug, resolve(args.target ?? args.slug));
+		p.log.success(`Cloned ${args.slug} into ${target}.`);
 	})
 });
+/** Clone a project's Canopy repository into `target`, credential helper included. */
+async function cloneProjectRepo(slug, target) {
+	const repo = requireCanopyRepo(slug, await fetchRepo(slug));
+	await requireGit();
+	const code = await gitInteractive([
+		"clone",
+		...credentialConfig(repo.remote, currentProfile(), slug).flatMap(([key, values]) => values.flatMap((value) => ["-c", `${key}=${value}`])),
+		repo.remote,
+		target
+	]);
+	if (code !== 0) throw new Error(`git clone failed (exit ${code}).`);
+	return target;
+}
 const deleteCommand = defineCommand({
 	meta: {
 		name: "delete",
@@ -420,4 +423,4 @@ async function offerRepoOnCreate(slug, dir, flag) {
 	}
 }
 //#endregion
-export { repoCommand as i, connectFolder as n, offerRepoOnCreate as r, cliInvocation as t };
+export { repoCommand as a, offerRepoOnCreate as i, cloneProjectRepo as n, connectFolder as r, cliInvocation as t };

package/dist/repo-DlYX_1tN.mjs

@@ -0,0 +1,2 @@
+import { a as repoCommand } from "./repo-CE22HpqZ.mjs";
+export { repoCommand };

package/dist/{schedule-C5lMf3ny.mjs → schedule-DdMq5eXC.mjs}

@@ -1,6 +1,6 @@
 import { c as resolveProject, o as projectFlagArgs } from "./site-DM2J10CB.mjs";
-import { i as apiRequest, o as withContext } from "./api-C4rMhE7i.mjs";
-import { r as reportErrors, t as formatDateTime } from "./ui-C_jSc1Kz.mjs";
+import { i as apiRequest, o as withContext } from "./api-BPEYm9ts.mjs";
+import { r as reportErrors, t as formatDateTime } from "./ui-CHfKV6lG.mjs";
 import { defineCommand } from "citty";
 //#region src/schedule.ts
 /**

package/dist/{secrets-BSEjZnxg.mjs → secrets-BOKuWBYV.mjs}

@@ -1,6 +1,6 @@
 import { a as projectDirArgs, c as resolveProject } from "./site-DM2J10CB.mjs";
-import { i as apiRequest, o as withContext } from "./api-C4rMhE7i.mjs";
-import { a as unwrap, r as reportErrors, t as formatDateTime } from "./ui-C_jSc1Kz.mjs";
+import { i as apiRequest, o as withContext } from "./api-BPEYm9ts.mjs";
+import { a as unwrap, r as reportErrors, t as formatDateTime } from "./ui-CHfKV6lG.mjs";
 import { defineCommand } from "citty";
 import * as p from "@clack/prompts";
 //#region src/secrets.ts
@@ -52,13 +52,14 @@ const secretsCommand = defineCommand({
 			args: { ...projectDirArgs },
 			run: reportErrors("secrets list", async ({ args }) => {
 				const { slug } = resolveProject(args);
-				const { secrets } = await apiRequest("GET", `/projects/${slug}/secrets`);
-				if (secrets.length === 0) {
+				const { secrets, missing = [] } = await apiRequest("GET", `/projects/${slug}/secrets`);
+				if (secrets.length === 0 && missing.length === 0) {
 					console.log(`No secrets set for ${slug} — add one with \`canopy secrets set NAME\`.`);
 					return;
 				}
-				const width = Math.max(...secrets.map((s) => s.key.length));
+				const width = Math.max(...secrets.map((s) => s.key.length), ...missing.map((m) => m.length));
 				for (const s of secrets) console.log(`${s.key.padEnd(width)}  updated ${formatDateTime(s.updated_at)}`);
+				for (const name of missing) console.log(`${name.padEnd(width)}  missing — set it with \`canopy secrets set ${name}\``);
 			})
 		}),
 		set: defineCommand({

package/dist/{skill-BUA2uRR2.mjs → skill-3wOwhzDx.mjs}

@@ -1,5 +1,5 @@
-import { t as version } from "./package-lYhex2Gp.mjs";
-import { r as reportErrors } from "./ui-C_jSc1Kz.mjs";
+import { t as version } from "./package-CdDH35SE.mjs";
+import { r as reportErrors } from "./ui-CHfKV6lG.mjs";
 import { defineCommand } from "citty";
 import { cpSync, existsSync, mkdirSync, rmSync, symlinkSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";

package/dist/{staging-BZVty57b.mjs → staging-CU4QrzFX.mjs}

@@ -1,6 +1,6 @@
 import { c as resolveProject, l as stagingUrl, o as projectFlagArgs, s as projectUrl } from "./site-DM2J10CB.mjs";
-import { i as apiRequest, o as withContext } from "./api-C4rMhE7i.mjs";
-import { a as unwrap, i as requireTty, r as reportErrors, t as formatDateTime } from "./ui-C_jSc1Kz.mjs";
+import { i as apiRequest, o as withContext } from "./api-BPEYm9ts.mjs";
+import { a as unwrap, i as requireTty, r as reportErrors, t as formatDateTime } from "./ui-CHfKV6lG.mjs";
 import { defineCommand } from "citty";
 import * as p from "@clack/prompts";
 //#region src/staging.ts

package/dist/{token-HHlUR0CF.mjs → token-BWnLsWLg.mjs}

@@ -1,6 +1,6 @@
 import { a as projectDirArgs, c as resolveProject, o as projectFlagArgs } from "./site-DM2J10CB.mjs";
-import { i as apiRequest } from "./api-C4rMhE7i.mjs";
-import { r as reportErrors, t as formatDateTime } from "./ui-C_jSc1Kz.mjs";
+import { i as apiRequest } from "./api-BPEYm9ts.mjs";
+import { r as reportErrors, t as formatDateTime } from "./ui-CHfKV6lG.mjs";
 import { defineCommand } from "citty";
 const tokenCommand = defineCommand({
 	meta: {

package/dist/{ui-C_jSc1Kz.mjs → ui-CHfKV6lG.mjs}

@@ -1,4 +1,4 @@
-import { t as ApiError } from "./api-C4rMhE7i.mjs";
+import { t as ApiError } from "./api-BPEYm9ts.mjs";
 import { spawn } from "node:child_process";
 import { cancel, isCancel } from "@clack/prompts";
 //#region src/ui.ts

package/dist/{upgrade-ZSb56qBJ.mjs → upgrade-BJ2dWjCG.mjs}

@@ -1,5 +1,5 @@
 import { t as PACKAGE_NAME } from "./version-check-CcsA1QjI.mjs";
-import { r as reportErrors } from "./ui-C_jSc1Kz.mjs";
+import { r as reportErrors } from "./ui-CHfKV6lG.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-BUA2uRR2.mjs");
+		const { skillInstalled } = await import("./skill-3wOwhzDx.mjs");
 		const { homedir } = await import("node:os");
 		const refreshGlobal = skillInstalled(homedir());
 		const refreshRepo = process.cwd() !== homedir() && skillInstalled(process.cwd());

package/dist/{usage-CUYrWxv0.mjs → usage-Cqqvnzrf.mjs}

@@ -1,6 +1,6 @@
 import { c as resolveProject, o as projectFlagArgs } from "./site-DM2J10CB.mjs";
-import { i as apiRequest, o as withContext } from "./api-C4rMhE7i.mjs";
-import { r as reportErrors } from "./ui-C_jSc1Kz.mjs";
+import { i as apiRequest, o as withContext } from "./api-BPEYm9ts.mjs";
+import { r as reportErrors } from "./ui-CHfKV6lG.mjs";
 import { defineCommand } from "citty";
 //#region src/usage.ts
 /**

package/package.json

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

package/dist/dev-BeFX_wc5.mjs

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

package/dist/repo-1RQ1vBMv.mjs

@@ -1,2 +0,0 @@
-import { i as repoCommand } from "./repo-Bb9ntNa4.mjs";
-export { repoCommand };