@samva/cli 0.21.0 → 0.22.1

package/dist/bin.mjs

@@ -677,6 +677,7 @@ var identity = (a) => a;
 var constant = (value) => () => value;
 var constTrue = /* @__PURE__ */ constant(true);
 var constFalse = /* @__PURE__ */ constant(false);
+var constNull = /* @__PURE__ */ constant(null);
 var constUndefined = /* @__PURE__ */ constant(undefined);
 var constVoid = constUndefined;
 function pipe(a, ...args) {
@@ -2012,6 +2013,7 @@ var getOrElse = /* @__PURE__ */ dual(2, (self, onNone) => isNone2(self) ? onNone
 var orElse = /* @__PURE__ */ dual(2, (self, that) => isNone2(self) ? that() : self);
 var fromNullishOr = (a) => a == null ? none2() : some2(a);
 var fromUndefinedOr = (a) => a === undefined ? none2() : some2(a);
+var getOrNull = /* @__PURE__ */ getOrElse(constNull);
 var getOrUndefined = /* @__PURE__ */ getOrElse(constUndefined);
 var liftThrowable = (f) => (...a) => {
   try {
@@ -4139,10 +4141,6 @@ var ignore = /* @__PURE__ */ dual((args) => isEffect(args[0]), (self, options) =
     onSuccess: (_) => void_
   });
 });
-var option = (self) => match5(self, {
-  onFailure: none2,
-  onSuccess: some2
-});
 var result = (self) => matchEager(self, {
   onFailure: fail2,
   onSuccess: succeed2
@@ -5744,10 +5742,10 @@ var flatMap3 = flatMap2;
 var andThen2 = andThen;
 var tap2 = tap;
 var result2 = result;
-var option2 = option;
 var exit2 = exit;
 var map7 = map5;
 var as2 = as;
+var asSome2 = asSome;
 var asVoid2 = asVoid;
 var catch_2 = catch_;
 var catchTag2 = catchTag;
@@ -14278,7 +14276,7 @@ var layer12 = /* @__PURE__ */ layer.pipe(/* @__PURE__ */ provideMerge(/* @__PURE
 // package.json
 var package_default = {
   name: "@samva/cli",
-  version: "0.21.0",
+  version: "0.22.1",
   description: "Samva CLI \u2014 email and platform operations from your terminal",
   keywords: [
     "cli",
@@ -14321,7 +14319,7 @@ var package_default = {
     "build:release-artifacts": "bun run scripts/build-release-artifacts.ts",
     test: "vitest run --root ../.. --project cli",
     "test:package": "vitest run --root ../.. --project cli packages/cli/tests/package-install.e2e.test.ts",
-    typecheck: "tsc --noEmit && tsc --noEmit -p tests/consumer/tsconfig.json"
+    typecheck: "tsc-rs --noEmit && tsc-rs --noEmit -p tests/consumer/tsconfig.json && tsc-rs --noEmit -p tests/consumer/tsconfig.default.json"
   },
   devDependencies: {
     "@effect/platform-bun": "catalog:effect",
@@ -14334,16 +14332,16 @@ var package_default = {
     "@types/node": "catalog:",
     "better-auth": "catalog:",
     effect: "catalog:effect",
-    samva: "workspace:0.23.0",
-    typescript: "catalog:",
+    samva: "workspace:0.23.1",
+    "tsc-rs": "catalog:",
     vite: "~8.3.0",
     vitest: "catalog:"
   },
   optionalDependencies: {
-    "@samva/cli-darwin-arm64": "workspace:0.21.0",
-    "@samva/cli-darwin-x64": "workspace:0.21.0",
-    "@samva/cli-linux-arm64": "workspace:0.21.0",
-    "@samva/cli-linux-x64": "workspace:0.21.0"
+    "@samva/cli-darwin-arm64": "workspace:0.22.1",
+    "@samva/cli-darwin-x64": "workspace:0.22.1",
+    "@samva/cli-linux-arm64": "workspace:0.22.1",
+    "@samva/cli-linux-x64": "workspace:0.22.1"
   },
   engines: {
     node: ">=18"
@@ -15841,7 +15839,7 @@ var map10 = /* @__PURE__ */ dual(2, (self, f) => {
 var withDefault3 = /* @__PURE__ */ dual(2, (self, defaultValue) => {
   return make28((provider, pathPrefix) => mapEager2(evaluateAt(self, provider, pathPrefix), (resolution) => isFailure2(resolution) ? succeed2(defaultValue) : resolution));
 });
-var option3 = (self) => self.pipe(map10(some2), withDefault3(none2()));
+var option2 = (self) => self.pipe(map10(some2), withDefault3(none2()));
 var isSourceError = (u) => isTagged(u, "SourceError");
 var cursorToString = () => "<configuration>";
 var mapReasons = (f) => (self) => catchCause2(self, (cause) => failCause3(fromReasons(cause.reasons.map(f))));
@@ -25566,7 +25564,7 @@ var __exportAll = (all, no_symbols) => {
 };
 
 // ../sdk/dist/package.js
-var version = "0.23.0";
+var version = "0.23.1";
 
 // ../sdk/dist/client-attribution.js
 var SDK_VERSION = version;
@@ -25909,7 +25907,7 @@ var commandTree = {
     update: {},
     remove: {}
   },
-  brands: { list: {}, get: {}, pull: {}, push: {} },
+  brands: { list: {}, get: {}, pull: {}, push: {}, default: {}, remove: {} },
   mailboxes: {
     events: {},
     list: {},
@@ -54599,6 +54597,8 @@ var make41 = /* @__PURE__ */ forGroup(BrandsGroup);
 var list3 = /* @__PURE__ */ make41("brandsList");
 var get9 = /* @__PURE__ */ make41("brandsGet");
 var update4 = /* @__PURE__ */ make41("brandsUpdate");
+var remove4 = /* @__PURE__ */ make41("brandsRemove");
+var setDefault = /* @__PURE__ */ make41("brandsSetDefault");
 
 // src/commands/brands.ts
 var SNAPSHOT_DIR = [".samva", "brands"];
@@ -54755,11 +54755,62 @@ var push = make29("push", {
   yield* log(`Updated brand ${updated.slug} from ${file}.`);
   yield* logInfo("Published templates keep the brand they were built against until they are republished.");
 }).pipe(json ? provideService2(MinimumLogLevel2, "None") : identity)));
-var brandsCommand = make29("brands").pipe(withDescription3("List, snapshot, and update the organization's brands (what samva:brand resolves to)"), withExamples([
+var requiredSlugArgument = String10("slug").pipe(withDescription4("Brand slug"));
+var dryRunFlag2 = Boolean6("dry-run").pipe(withDescription2("Print the request without sending it"), withDefault5(false));
+var yesFlag2 = Boolean6("yes").pipe(withDescription2("Confirm without prompting (required outside a terminal)"), withDefault5(false));
+var makeDefault = make29("default", {
+  slug: requiredSlugArgument,
+  dryRun: dryRunFlag2,
+  json: jsonFlag
+}).pipe(withDescription3("Make a brand the organization's default: bare samva:brand and domains without a brand resolve to it"), withExamples([
+  { command: "samva brands default acme" },
+  { command: "samva brands default acme --dry-run --json" }
+]), withHandler(({ slug, dryRun, json }) => gen2(function* () {
+  if (dryRun)
+    return yield* json ? printJson({ dryRun: true, action: "brands.default", slug }) : log(`[dry-run] Would make brand ${slug} the default.`);
+  const client = yield* getClientProvider;
+  const brand = yield* setDefault({ slug }).pipe(client.provide, mapError2(apiFailure(`Could not make brand ${slug} the default`)));
+  const result = {
+    action: "brands.default",
+    slug: brand.slug,
+    name: brand.name,
+    isDefault: brand.isDefault
+  };
+  if (json)
+    return yield* printJson(result);
+  yield* log(`Brand ${brand.slug} (${brand.name}) is now the default.`);
+}).pipe(json ? provideService2(MinimumLogLevel2, "None") : identity)));
+var remove5 = make29("remove", {
+  slug: requiredSlugArgument,
+  dryRun: dryRunFlag2,
+  yes: yesFlag2,
+  json: jsonFlag
+}).pipe(withDescription3("Permanently delete a brand. The default brand cannot be deleted; make another brand the default first. Domains that used it fall back to the default."), withExamples([
+  { command: "samva brands remove promo --dry-run" },
+  { command: "samva brands remove promo --yes" }
+]), withHandler(({ slug, dryRun, yes, json }) => gen2(function* () {
+  if (dryRun)
+    return yield* json ? printJson({ dryRun: true, action: "brands.remove", slug }) : log(`[dry-run] Would permanently remove brand ${slug}.`);
+  yield* confirmDestructive({
+    yes,
+    json,
+    message: `Permanently remove brand ${slug}?`,
+    nonInteractiveMessage: "Permanent brand deletion requires --yes in non-interactive mode. Preview with --dry-run."
+  });
+  const client = yield* getClientProvider;
+  yield* remove4({ slug }).pipe(client.provide, mapError2(apiFailure(`Could not remove brand ${slug}`)));
+  const result = { action: "brands.remove", slug, removed: true };
+  if (json)
+    return yield* printJson(result);
+  yield* log(`Removed brand ${slug}.`);
+}).pipe(json ? provideService2(MinimumLogLevel2, "None") : identity)));
+var brandsCommand = make29("brands").pipe(withDescription3("List, snapshot, update, and delete the organization's brands (what samva:brand resolves to)"), withExamples([
   { command: "samva brands list" },
   { command: "samva brands pull", description: "Snapshot the default brand for offline builds" },
-  { command: "samva brands push brand.css --brand acme" }
-]), withSubcommands([list4, get10, pull, push]));
+  { command: "samva brands push brand.css --brand acme" },
+  { command: "samva brands default acme", description: "Make acme the default brand" },
+  { command: "samva brands remove promo --yes" }
+]), withSubcommands([list4, get10, pull, push, makeDefault, remove5]));
 
 // ../sdk/dist/effect/generated/campaigns.js
 var CampaignId2 = /* @__PURE__ */ String4.check(isPattern2(/* @__PURE__ */ new RegExp("^camp_[0-9a-hjkmnp-tv-z]{16,24}$", "u")).annotate({
@@ -55387,7 +55438,7 @@ var excludeTagsFlag = String9("exclude-tags").pipe(withDescription2("Contact tag
 var contactIdsFlag = String9("contact-ids").pipe(withDescription2("Explicit contact ids to target (comma-separated or repeated)"), atLeast2(0));
 var unsubscribeGroupIdFlag = String9("unsubscribe-group-id").pipe(withDescription2("Unsubscribe group id applied to every send; overrides the organization's default group"), optional4);
 var pageSizeFlag = Int5("page-size").pipe(withDescription2("Recipients dispatched per batch"), optional4);
-var dryRunFlag2 = Boolean6("dry-run").pipe(withDescription2("Validate inputs and print the request payload without calling the API"), withDefault5(false));
+var dryRunFlag3 = Boolean6("dry-run").pipe(withDescription2("Validate inputs and print the request payload without calling the API"), withDefault5(false));
 var trackOpensFlag = Literals3("track-opens", ["on", "off"]).pipe(withDescription2("Override open tracking for campaign sends; recipient opt-out wins"), optional4);
 var trackClicksFlag = Literals3("track-clicks", ["on", "off"]).pipe(withDescription2("Override click tracking for campaign sends; recipient opt-out wins"), optional4);
 var atFlag = String9("at").pipe(withDescription2("Absolute run start instant as ISO 8601 (defaults to now)"), optional4);
@@ -55415,7 +55466,7 @@ var create4 = make29("create", {
   pageSize: pageSizeFlag,
   trackOpens: trackOpensFlag,
   trackClicks: trackClicksFlag,
-  dryRun: dryRunFlag2,
+  dryRun: dryRunFlag3,
   json: jsonFlag
 }).pipe(withDescription3("Create an email campaign targeting tags or explicit contacts"), withExamples([
   {
@@ -55794,7 +55845,7 @@ var runCreate = make29("create", {
   campaignId: String10("campaignId"),
   at: atFlag,
   idempotencyKey: idempotencyKeyFlag,
-  dryRun: dryRunFlag2,
+  dryRun: dryRunFlag3,
   json: jsonFlag
 }).pipe(withDescription3("Create a run for a campaign (starts immediately without --at)"), withExamples([
   { command: "samva campaigns runs create camp_abc123", description: "Start now" },
@@ -55907,7 +55958,7 @@ var runGet = make29("get", {
 var runPause = make29("pause", {
   campaignId: String10("campaignId"),
   runId: String10("runId"),
-  dryRun: dryRunFlag2,
+  dryRun: dryRunFlag3,
   json: jsonFlag
 }).pipe(withDescription3("Pause a running campaign run"), withExamples([{ command: "samva campaigns runs pause camp_abc123 crun_def456" }]), withHandler(({ campaignId, runId, dryRun, json }) => gen2(function* () {
   if (dryRun)
@@ -55923,7 +55974,7 @@ var runPause = make29("pause", {
 var runResume = make29("resume", {
   campaignId: String10("campaignId"),
   runId: String10("runId"),
-  dryRun: dryRunFlag2,
+  dryRun: dryRunFlag3,
   json: jsonFlag
 }).pipe(withDescription3("Resume a paused campaign run"), withExamples([{ command: "samva campaigns runs resume camp_abc123 crun_def456" }]), withHandler(({ campaignId, runId, dryRun, json }) => gen2(function* () {
   if (dryRun)
@@ -61003,7 +61054,7 @@ var rotateDkim = make29("rotate-dkim", {
   yield* log("The minimum retention date does not authorize deletion. Retirement requires separate approval and verification that at least two actual former-record TTLs have elapsed.");
   yield* log(`After DNS publication, advance verification: samva email domains check ${id}`);
 })));
-var remove4 = make29("remove", {
+var remove6 = make29("remove", {
   id: String10("id").pipe(withDescription4("Domain id to permanently remove")),
   dryRun: Boolean6("dry-run").pipe(withDescription2("Print the deletion plan without calling the API"), withDefault5(false)),
   yes: Boolean6("yes").pipe(withDescription2("Confirm permanent deletion (required for non-interactive use)"), withDefault5(false)),
@@ -61026,7 +61077,7 @@ var remove4 = make29("remove", {
     return yield* printJson(data);
   yield* log(`Removed domain ${id}.`);
 }).pipe(json ? provideService2(MinimumLogLevel2, "None") : identity)));
-var setDefault = make29("set-default", {
+var setDefault2 = make29("set-default", {
   id: String10("id").pipe(withDescription4("Domain id to make the default")),
   dryRun: Boolean6("dry-run").pipe(withDescription2("Print the planned change without calling the API"), withDefault5(false)),
   json: jsonFlag
@@ -61144,7 +61195,7 @@ var customDisable = make29("disable", {
 var customTracking = make29("custom-tracking").pipe(withDescription3("Manage a domain's custom tracking (custom open/click subdomain)"), withExamples([{ command: "samva email domains custom-tracking enable dom_abc123" }]), withSubcommands([customEnable, customStatus, customRecheck, customDisable]));
 var domainsCommand = make29("domains").pipe(withDescription3("Manage email sending domains"), withExamples([
   { command: "samva email domains list", description: "List configured domains" }
-]), withSubcommands([list9, add2, check2, rotateDkim, setDefault, remove4, customTracking]));
+]), withSubcommands([list9, add2, check2, rotateDkim, setDefault2, remove6, customTracking]));
 
 // src/commands/email/receiving.ts
 var destinationLabel = (destination) => {
@@ -61683,7 +61734,7 @@ var idempotencyKeyFlag2 = String9("idempotency-key").pipe(withDescription2("Key
 var trackOpensFlag2 = Literals3("track-opens", ["on", "off"]).pipe(withDescription2("Override open tracking for this send; recipient opt-out still wins"), optional4);
 var trackClicksFlag2 = Literals3("track-clicks", ["on", "off"]).pipe(withDescription2("Override click tracking for this send; recipient opt-out still wins"), optional4);
 var attachFlag = String9("attach").pipe(withDescription2("File to attach (repeatable); small files travel inline, larger ones upload through media first"), atLeast2(0));
-var dryRunFlag3 = Boolean6("dry-run").pipe(withDescription2("Validate inputs and print the request payload without calling the API"), withDefault5(false));
+var dryRunFlag4 = Boolean6("dry-run").pipe(withDescription2("Validate inputs and print the request payload without calling the API"), withDefault5(false));
 var bodySourceName = (input) => {
   if (input.templateRefValue)
     return "template";
@@ -61720,7 +61771,7 @@ var send3 = make29("send", {
   trackOpens: trackOpensFlag2,
   trackClicks: trackClicksFlag2,
   attach: attachFlag,
-  dryRun: dryRunFlag3,
+  dryRun: dryRunFlag4,
   wait: Boolean6("wait").pipe(withDescription2("Wait for delivered/read or a terminal delivery failure"), withDefault5(false)),
   timeout: timeoutFlag,
   json: jsonFlag
@@ -62130,7 +62181,7 @@ var check3 = make29("check", {
     ["Verified at", data.verifiedAt ?? null]
   ]);
 }).pipe(json ? provideService2(MinimumLogLevel2, "None") : identity)));
-var setDefault2 = make29("set-default", {
+var setDefault3 = make29("set-default", {
   id: String10("id").pipe(withDescription4("Sender id to make the default")),
   dryRun: Boolean6("dry-run").pipe(withDescription2("Print the planned change without calling the API"), withDefault5(false)),
   json: jsonFlag
@@ -62146,7 +62197,7 @@ var setDefault2 = make29("set-default", {
     return yield* printJson(data);
   yield* log(`Sender ${id} is now the default sender.`);
 }).pipe(json ? provideService2(MinimumLogLevel2, "None") : identity)));
-var remove5 = make29("remove", {
+var remove7 = make29("remove", {
   id: String10("id").pipe(withDescription4("Sender id to permanently remove")),
   dryRun: Boolean6("dry-run").pipe(withDescription2("Print the deletion plan without calling the API"), withDefault5(false)),
   yes: Boolean6("yes").pipe(withDescription2("Confirm permanent deletion (required for non-interactive use)"), withDefault5(false)),
@@ -62171,7 +62222,7 @@ var remove5 = make29("remove", {
 }).pipe(json ? provideService2(MinimumLogLevel2, "None") : identity)));
 var sendersCommand = make29("senders").pipe(withDescription3("Manage sender addresses"), withExamples([
   { command: "samva email senders list", description: "List sender addresses" }
-]), withSubcommands([list12, add3, check3, setDefault2, remove5]));
+]), withSubcommands([list12, add3, check3, setDefault3, remove7]));
 
 // src/commands/email/tracking.ts
 var toggle = (name, description) => Literals3(name, ["on", "off"]).pipe(withDescription2(description), optional4);
@@ -64012,7 +64063,7 @@ __export(exports_mailboxes, {
   mailboxes_exports: () => mailboxes_exports2,
   pause: () => pause,
   releaseMessage: () => releaseMessage,
-  remove: () => remove6,
+  remove: () => remove8,
   removeEndpoint: () => removeEndpoint,
   removeThreadLabels: () => removeThreadLabels,
   reply: () => reply,
@@ -67061,7 +67112,7 @@ var mailboxes_exports2 = /* @__PURE__ */ __exportAll({
   listThreads: () => listThreads,
   pause: () => pause,
   releaseMessage: () => releaseMessage,
-  remove: () => remove6,
+  remove: () => remove8,
   removeEndpoint: () => removeEndpoint,
   removeThreadLabels: () => removeThreadLabels,
   reply: () => reply,
@@ -67085,7 +67136,7 @@ var list16 = /* @__PURE__ */ make50("mailboxesList");
 var create6 = /* @__PURE__ */ make50("mailboxesCreate");
 var get19 = /* @__PURE__ */ make50("mailboxesGet");
 var update8 = /* @__PURE__ */ make50("mailboxesUpdate");
-var remove6 = /* @__PURE__ */ make50("mailboxesRemove");
+var remove8 = /* @__PURE__ */ make50("mailboxesRemove");
 var createEndpoint = /* @__PURE__ */ make50("mailboxesCreateEndpoint");
 var updateEndpoint = /* @__PURE__ */ make50("mailboxesUpdateEndpoint");
 var removeEndpoint = /* @__PURE__ */ make50("mailboxesRemoveEndpoint");
@@ -67253,7 +67304,7 @@ var reconnectNotice = (output, reconnect) => {
 };
 var tailEvents = (options) => gen2(function* () {
   const provider = yield* getClientProvider;
-  const override = yield* option3(String5("SAMVA_EVENTS_URL"));
+  const override = yield* option2(String5("SAMVA_EVENTS_URL"));
   const eventsUrl = getOrUndefined(override);
   yield* untilInterrupted((interrupted) => provider.provide(events3({
     cursor: options.cursor,
@@ -68747,7 +68798,7 @@ var list17 = /* @__PURE__ */ make51("journeysList");
 var create7 = /* @__PURE__ */ make51("journeysCreate");
 var get20 = /* @__PURE__ */ make51("journeysGet");
 var update9 = /* @__PURE__ */ make51("journeysUpdate");
-var remove7 = /* @__PURE__ */ make51("journeysRemove");
+var remove9 = /* @__PURE__ */ make51("journeysRemove");
 var replaceDraft = /* @__PURE__ */ make51("journeysReplaceDraft");
 var publish3 = /* @__PURE__ */ make51("journeysPublish");
 var pause2 = /* @__PURE__ */ make51("journeysPause");
@@ -68974,7 +69025,7 @@ var destructive = (name, description, warning, run, failure) => make29(name, {
   ]);
 }).pipe(quietWhenJson(json))));
 var archive4 = destructive("archive", "Archive a journey and exit its active runs", "Archive and exit every active run of", (id) => archive3({ id }), "Could not archive journey");
-var remove8 = destructive("delete", "Delete a never-published or archived journey with its versions and runs", "Permanently delete", (id) => remove7({ id }), "Could not delete journey");
+var remove10 = destructive("delete", "Delete a never-published or archived journey with its versions and runs", "Permanently delete", (id) => remove9({ id }), "Could not delete journey");
 var getVersion3 = make29("version", {
   id: idArgument2,
   version: Int6("version").pipe(withDescription4("Published version number")),
@@ -69101,7 +69152,7 @@ var journeysCommand = make29("journeys").pipe(withDescription3("Create, publish,
   pause3,
   resume3,
   archive4,
-  remove8,
+  remove10,
   getVersion3,
   stats2,
   runs2
@@ -72743,7 +72794,7 @@ var actionDecision = (verb) => make29(verb, {
   })).pipe(client.provide, mapError2((e) => mailboxApiError(`Could not ${verb} action`, e, { personOnly: verb })));
   yield* json ? printJson(result) : printAction(result);
 })));
-var remove9 = make29("remove", {
+var remove11 = make29("remove", {
   id: String10("mailbox-id").pipe(withSchema3(MailboxId)),
   dryRun: Boolean6("dry-run").pipe(withDefault5(false)),
   yes: Boolean6("yes").pipe(withDefault5(false)),
@@ -72761,7 +72812,7 @@ var remove9 = make29("remove", {
     nonInteractiveMessage: "Permanent mailbox deletion requires --yes in non-interactive mode. Preview with --dry-run."
   });
   const client = yield* getClientProvider;
-  const result = yield* remove6({ id }).pipe(client.provide, mapError2((e) => mailboxApiError("Could not remove mailbox", e)));
+  const result = yield* remove8({ id }).pipe(client.provide, mapError2((e) => mailboxApiError("Could not remove mailbox", e)));
   if (json)
     return yield* printJson(result);
   yield* log(`Removed mailbox ${id}. The messages it received stay with the organization.`);
@@ -73052,7 +73103,7 @@ var mailboxesCommand = make29("mailboxes").pipe(withDescription3("Mailbox readin
     actionCancel,
     actionRetry
   ])),
-  remove9,
+  remove11,
   threads,
   read2,
   send7,
@@ -73283,7 +73334,7 @@ var list20 = /* @__PURE__ */ make52("namespacesList");
 var create10 = /* @__PURE__ */ make52("namespacesCreate");
 var get23 = /* @__PURE__ */ make52("namespacesGet");
 var update11 = /* @__PURE__ */ make52("namespacesUpdate");
-var remove10 = /* @__PURE__ */ make52("namespacesRemove");
+var remove12 = /* @__PURE__ */ make52("namespacesRemove");
 var assignResource = /* @__PURE__ */ make52("namespacesAssignResource");
 var removeResource = /* @__PURE__ */ make52("namespacesRemoveResource");
 var getUsage2 = /* @__PURE__ */ make52("namespacesGetUsage");
@@ -73291,7 +73342,7 @@ var getUsage2 = /* @__PURE__ */ make52("namespacesGetUsage");
 // src/commands/namespaces.ts
 var idArgument3 = String10("id").pipe(withDescription4("Namespace id (ns_...)"));
 var optionalString2 = (name, description) => String9(name).pipe(withDescription2(description), optional4);
-var dryRunFlag4 = Boolean6("dry-run").pipe(withDescription2("Print the planned change without calling the API"), withDefault5(false));
+var dryRunFlag5 = Boolean6("dry-run").pipe(withDescription2("Print the planned change without calling the API"), withDefault5(false));
 var RESOURCE_FLAGS = ["domain", "sender", "contact", "template"];
 var resourceFlags = {
   domain: optionalString2("domain", "Domain id (dom_...)"),
@@ -73381,7 +73432,7 @@ var list21 = make29("list", {
 var create11 = make29("create", {
   name: String10("name").pipe(withDescription4("Namespace name")),
   metadata: String9("metadata").pipe(withDescription2("Your own label, key=value (repeatable); Samva stores and never reads it"), atLeast2(0)),
-  dryRun: dryRunFlag4,
+  dryRun: dryRunFlag5,
   json: jsonFlag
 }).pipe(withDescription3("Create a namespace, a sub-tenant for one of your customers"), withExamples([
   { command: "samva namespaces create Acme --metadata customerId=cus_123" },
@@ -73420,7 +73471,7 @@ var update12 = make29("update", {
   name: optionalString2("name", "New name"),
   metadata: String9("metadata").pipe(withDescription2("Set a metadata label, key=value (repeatable); other keys are kept"), atLeast2(0)),
   unsetMetadata: String9("unset-metadata").pipe(withDescription2("Delete a metadata key (repeatable)"), atLeast2(0)),
-  dryRun: dryRunFlag4,
+  dryRun: dryRunFlag5,
   json: jsonFlag
 }).pipe(withDescription3("Rename a namespace or change its metadata"), withExamples([
   { command: "samva namespaces update ns_7q2xk9mvt4znw8rh --name Acme --metadata plan=pro" },
@@ -73467,9 +73518,9 @@ var update12 = make29("update", {
     ["Updated", updated.updatedAt]
   ]);
 }).pipe(json ? provideService2(MinimumLogLevel2, "None") : identity)));
-var remove11 = make29("delete", {
+var remove13 = make29("delete", {
   id: idArgument3,
-  dryRun: dryRunFlag4,
+  dryRun: dryRunFlag5,
   yes: Boolean6("yes").pipe(withDefault5(false)),
   json: jsonFlag
 }).pipe(withDescription3("Delete an empty namespace; one that still holds anything is refused with a count of what remains"), withExamples([
@@ -73485,7 +73536,7 @@ var remove11 = make29("delete", {
     nonInteractiveMessage: "Namespace deletion requires --yes in non-interactive mode. Preview with --dry-run."
   });
   const client = yield* getClientProvider;
-  const result = yield* remove10({ id }).pipe(client.provide, mapError2((error) => toCliApiError("Could not delete namespace", error)));
+  const result = yield* remove12({ id }).pipe(client.provide, mapError2((error) => toCliApiError("Could not delete namespace", error)));
   if (json)
     return yield* printJson(result);
   yield* log(`Deleted namespace ${id}.`);
@@ -73493,7 +73544,7 @@ var remove11 = make29("delete", {
 var assign2 = make29("assign", {
   id: idArgument3,
   ...resourceFlags,
-  dryRun: dryRunFlag4,
+  dryRun: dryRunFlag5,
   json: jsonFlag
 }).pipe(withDescription3("Move a domain, sender, contact, or template into a namespace; pass exactly one resource flag"), withExamples([
   { command: "samva namespaces assign ns_7q2xk9mvt4znw8rh --domain dom_xyz789" },
@@ -73523,7 +73574,7 @@ var assign2 = make29("assign", {
 var unassign = make29("unassign", {
   id: idArgument3,
   ...resourceFlags,
-  dryRun: dryRunFlag4,
+  dryRun: dryRunFlag5,
   json: jsonFlag
 }).pipe(withDescription3("Return a domain, sender, contact, or template to organization level; pass exactly one resource flag"), withExamples([
   { command: "samva namespaces unassign ns_7q2xk9mvt4znw8rh --domain dom_xyz789" }
@@ -73571,7 +73622,7 @@ var usage3 = make29("usage", {
     ["Total", data.totalMessages]
   ]);
 }).pipe(json ? provideService2(MinimumLogLevel2, "None") : identity)));
-var namespacesCommand = make29("namespaces").pipe(withDescription3("Manage namespaces, the sub-tenants of your organization"), withExamples([{ command: "samva namespaces list --json" }]), withSubcommands([list21, create11, get24, update12, remove11, assign2, unassign, usage3]));
+var namespacesCommand = make29("namespaces").pipe(withDescription3("Manage namespaces, the sub-tenants of your organization"), withExamples([{ command: "samva namespaces list --json" }]), withSubcommands([list21, create11, get24, update12, remove13, assign2, unassign, usage3]));
 
 // ../sdk/dist/effect/generated/whoami.js
 var WhoamiUser = /* @__PURE__ */ Struct({
@@ -73912,7 +73963,7 @@ var use2 = make29("use", { name: String10("name") }).pipe(withDescription3("Sele
   yield* writeConfig({ ...config, activeProfile: name });
   yield* printResult({ action: "profile.use", name }, `Active profile set to ${name}.`);
 })));
-var remove12 = make29("delete", {
+var remove14 = make29("delete", {
   name: String10("name"),
   yes: Boolean6("yes").pipe(withDefault5(false))
 }).pipe(withDescription3("Delete a profile and its OS-keyring credential"), withHandler(fnUntraced2(function* ({ name, yes }) {
@@ -73937,7 +73988,7 @@ var remove12 = make29("delete", {
     yield* (yield* Service4).clear(name);
   yield* printResult({ action: "profile.delete", name }, `Deleted profile ${name}.`);
 })));
-var profileCommand = make29("profile").pipe(withDescription3("Manage user-level credential identity and organization contexts"), withSubcommands([list23, show, create12, use2, remove12]));
+var profileCommand = make29("profile").pipe(withDescription3("Manage user-level credential identity and organization contexts"), withSubcommands([list23, show, create12, use2, remove14]));
 
 // ../sdk/dist/effect/generated/scheduled-messages.js
 var ScheduledMessageId2 = /* @__PURE__ */ String4.check(isPattern2(/* @__PURE__ */ new RegExp("^sched_[0-9a-hjkmnp-tv-z]{16,24}$", "u")).annotate({
@@ -74194,7 +74245,7 @@ var atFlag2 = String9("at").pipe(withDescription2("Absolute send instant as an I
 var timezoneFlag = String9("timezone").pipe(withDescription2("IANA timezone for the schedule, e.g. America/New_York"), optional4);
 var idempotencyKeyFlag3 = String9("idempotency-key").pipe(withDescription2("Idempotency key so retries do not schedule duplicates"), optional4);
 var referenceIdFlag = String9("reference-id").pipe(withDescription2("Your own reference id to correlate this schedule"), optional4);
-var dryRunFlag5 = Boolean6("dry-run").pipe(withDescription2("Validate inputs and print the request payload without calling the API"), withDefault5(false));
+var dryRunFlag6 = Boolean6("dry-run").pipe(withDescription2("Validate inputs and print the request payload without calling the API"), withDefault5(false));
 var trackOpensFlag3 = Literals3("track-opens", ["on", "off"]).pipe(withDescription2("Override open tracking for this scheduled send; recipient opt-out wins"), optional4);
 var trackClicksFlag3 = Literals3("track-clicks", ["on", "off"]).pipe(withDescription2("Override click tracking for this scheduled send; recipient opt-out wins"), optional4);
 var statusFlag2 = Literals3("status", SCHEDULED_STATUSES).pipe(withDescription2("Filter by status"), optional4);
@@ -74219,7 +74270,7 @@ var create14 = make29("create", {
   referenceId: referenceIdFlag,
   trackOpens: trackOpensFlag3,
   trackClicks: trackClicksFlag3,
-  dryRun: dryRunFlag5,
+  dryRun: dryRunFlag6,
   json: jsonFlag
 }).pipe(withDescription3("Schedule an email to send at a future time"), withExamples([
   {
@@ -74598,7 +74649,7 @@ var subscriptionsCommand = make29("subscriptions").pipe(withDescription3("Reques
 // src/commands/templates.ts
 import { constants as constants2 } from "fs";
 import { access as access3, stat as stat5 } from "fs/promises";
-import { dirname as dirname5, resolve as resolve16 } from "path";
+import { basename as basename3, dirname as dirname5, resolve as resolve17 } from "path";
 import { pathToFileURL as pathToFileURL5 } from "url";
 
 // ../sdk/dist/effect/generated/templates.js
@@ -76862,7 +76913,7 @@ var create15 = /* @__PURE__ */ make54("templatesCreate");
 var createFromWebsite = /* @__PURE__ */ make54("templatesCreateFromWebsite");
 var addEntry = /* @__PURE__ */ make54("templatesAddEntry");
 var getById = /* @__PURE__ */ make54("templatesGetById");
-var remove13 = /* @__PURE__ */ make54("templatesRemove");
+var remove15 = /* @__PURE__ */ make54("templatesRemove");
 var update13 = /* @__PURE__ */ make54("templatesUpdate");
 var openWorkspace = /* @__PURE__ */ make54("templatesOpenWorkspace");
 var getGitRepository = /* @__PURE__ */ make54("templatesGetGitRepository");
@@ -76886,6 +76937,146 @@ var offlineFlag = Boolean6("offline").pipe(withDescription2("Use the cached bran
 
 // src/commands/templates/toolchain.ts
 import { pathToFileURL as pathToFileURL3 } from "url";
+// ../../node_modules/.bun/@samva+markup@0.17.3+a19bcd7db259aaf7/node_modules/@samva/markup/package.json
+var package_default2 = {
+  name: "@samva/markup",
+  version: "0.17.3",
+  description: "Type-safe authoring and compilation primitives for Samva templates",
+  keywords: [
+    "email",
+    "jsx",
+    "samva",
+    "sml",
+    "sms",
+    "templates",
+    "tsx",
+    "whatsapp"
+  ],
+  homepage: "https://samva.dev",
+  bugs: {
+    url: "https://github.com/SamvaHQ/SML/issues"
+  },
+  license: "MIT",
+  author: "Arya Labs, Inc.",
+  repository: {
+    type: "git",
+    url: "https://github.com/SamvaHQ/SML.git",
+    directory: "packages/markup"
+  },
+  files: [
+    "dist",
+    "samva-brand.d.ts",
+    "generated",
+    "skills",
+    "package.json",
+    "README.md",
+    "CHANGELOG.md",
+    "AGENTS.md",
+    "LICENSE"
+  ],
+  type: "module",
+  sideEffects: false,
+  exports: {
+    ".": {
+      types: "./dist/index.d.ts",
+      import: "./dist/index.js"
+    },
+    "./email": {
+      types: "./dist/email.d.ts",
+      import: "./dist/email.js"
+    },
+    "./email/jsx-runtime": {
+      types: "./dist/email/jsx-runtime.d.ts",
+      import: "./dist/email/jsx-runtime.js"
+    },
+    "./email/jsx-dev-runtime": {
+      types: "./dist/email/jsx-dev-runtime.d.ts",
+      import: "./dist/email/jsx-dev-runtime.js"
+    },
+    "./fmt": {
+      types: "./dist/fmt.d.ts",
+      import: "./dist/fmt.js"
+    },
+    "./sms": {
+      types: "./dist/sms.d.ts",
+      import: "./dist/sms.js"
+    },
+    "./whatsapp": {
+      types: "./dist/whatsapp.d.ts",
+      import: "./dist/whatsapp.js"
+    },
+    "./input-schema": {
+      types: "./dist/input-schema.d.ts",
+      import: "./dist/input-schema.js"
+    },
+    "./compiler": {
+      types: "./dist/compiler.d.ts",
+      import: "./dist/compiler.js"
+    },
+    "./compatibility": {
+      types: "./dist/compatibility.d.ts",
+      import: "./dist/compatibility.js"
+    },
+    "./diagnostics": {
+      types: "./dist/diagnostics.d.ts",
+      import: "./dist/diagnostics.js"
+    },
+    "./render": {
+      types: "./dist/render.d.ts",
+      import: "./dist/render.js"
+    },
+    "./edit": {
+      types: "./dist/edit.d.ts",
+      import: "./dist/edit.js"
+    },
+    "./brand": {
+      types: "./dist/brand.d.ts",
+      import: "./dist/brand.js"
+    },
+    "./samva-brand": {
+      types: "./samva-brand.d.ts"
+    },
+    "./contract.json": "./generated/contract.json",
+    "./reference.md": "./generated/reference.md",
+    "./package.json": "./package.json"
+  },
+  publishConfig: {
+    access: "public"
+  },
+  scripts: {
+    build: "tsdown",
+    prepack: "bun run build",
+    "corpus:render": "bun run scripts/render-compatibility-corpus.ts",
+    "codegen:tailwind": "bun run scripts/codegen-tailwind.ts && oxfmt src/email/tailwind-stylesheets.gen.ts",
+    "codegen:contract": "bun run scripts/generate-contract.ts",
+    test: "vitest run",
+    typecheck: "tsc --noEmit && tsc --noEmit -p tests/consumer/tsconfig.json"
+  },
+  dependencies: {
+    "@babel/parser": "^8.0.4",
+    "@cfworker/json-schema": "4.1.1",
+    "@standard-schema/spec": "1.1.0",
+    "better-result": "3.0.1",
+    caniemail: "2.0.2",
+    "css-tree": "3.2.1",
+    tailwindcss: "^4.3.3"
+  },
+  devDependencies: {
+    "@css-inline/css-inline-wasm": "0.15.0",
+    "@effect/vitest": "4.0.0",
+    "@types/css-tree": "3.2.0",
+    "@types/node": "^26.6.2",
+    effect: "4.0.0",
+    tsdown: "^0.22.13",
+    typescript: "^7.0.2",
+    vitest: "^5.0.3",
+    zod: "4.6.5"
+  }
+};
+
+// src/lib/authoring-release.ts
+var minorOf = (version) => version.split(".").slice(0, 2).join(".");
+var AUTHORING_MINOR = minorOf(package_default2.version);
 
 // src/commands/templates/brand-resolver.ts
 var brand_resolver_default = `import { execFile } from "node:child_process";
@@ -77316,6 +77507,30 @@ export const createBrandResolver = (options: {
 
 // src/commands/templates/toolchain.ts
 var TOOLCHAIN_INSTALL = "npm install --save-dev @samva/markup @samva/vite vite";
+var AUTHORING_PACKAGES = ["@samva/markup", "@samva/vite"];
+var toolchainSkew = (installed, action) => {
+  for (const name of AUTHORING_PACKAGES) {
+    const version = installed[name];
+    if (version === undefined || minorOf(version) === AUTHORING_MINOR)
+      continue;
+    const behind = Number(minorOf(version).split(".")[1]) < Number(AUTHORING_MINOR.split(".")[1]);
+    return behind ? `${action}: this project has ${name} ${version}, but this CLI drives ${AUTHORING_MINOR}.x. Update the project with \`npm install --save-dev @samva/markup@~${AUTHORING_MINOR}.0 @samva/vite@~${AUTHORING_MINOR}.0\`.` : `${action}: this project has ${name} ${version}, which is newer than the ${AUTHORING_MINOR}.x this CLI drives. Update the CLI with \`npm install -g @samva/cli@latest\`.`;
+  }
+  return;
+};
+var installedAuthoring = async (root) => Object.fromEntries(await Promise.all(AUTHORING_PACKAGES.map(async (name) => {
+  const manifest = await Promise.resolve().then(async () => await Bun.file(Bun.resolveSync(`${name}/package.json`, root)).json()).catch(() => {
+    return;
+  });
+  return [name, manifest?.version];
+})));
+var requireCompatibleToolchain = (action) => tryPromise2({
+  try: () => installedAuthoring(process.cwd()),
+  catch: () => new SamvaCliError({ message: `${action}: could not read the project's installed packages.` })
+}).pipe(flatMap3((installed) => {
+  const skew = toolchainSkew(installed, action);
+  return skew === undefined ? void_3 : fail6(new SamvaCliError({ message: skew }));
+}));
 var MISSING_MODULE = /Cannot find (?:package|module) '([^']+)'/;
 var toolchainFailure = (stderr, action) => {
   const missing = MISSING_MODULE.exec(stderr)?.[1];
@@ -77327,28 +77542,42 @@ var toolchainFailure = (stderr, action) => {
   }
   return `${action}: ${stderr.trim() || "the toolchain process failed."}`;
 };
+var invocationEnv = gen2(function* () {
+  const profile = getOrUndefined(yield* Profile);
+  const org = getOrUndefined(yield* Org);
+  const apiUrl = getOrUndefined(yield* ApiUrl);
+  return {
+    ...profile === undefined ? {} : { SAMVA_PROFILE: profile },
+    ...org === undefined ? {} : { SAMVA_ORG: org },
+    ...apiUrl === undefined ? {} : { SAMVA_API_URL: apiUrl }
+  };
+});
 var NODE_MISSING = "Install Node.js 22+ to run template authoring commands.";
-var runToolchain = (input) => tryPromise2({
-  try: async () => {
-    const child = Bun.spawn(["node", "--input-type=module", "--eval", input.script], {
-      cwd: process.cwd(),
-      env: { ...Bun.env, SAMVA_TOOLCHAIN_INPUT: JSON.stringify(input.options) },
-      stdout: "pipe",
-      stderr: "pipe"
-    });
-    const [stdout, stderr, exitCode] = await Promise.all([
-      new Response(child.stdout).text(),
-      new Response(child.stderr).text(),
-      child.exited
-    ]);
-    if (exitCode !== 0) {
-      return Promise.reject(new SamvaCliError({ message: toolchainFailure(stderr, input.action) }));
-    }
-    return JSON.parse(stdout);
-  },
-  catch: (cause) => cause instanceof SamvaCliError ? cause : new SamvaCliError({
-    message: `${input.action}: ${NODE_MISSING} ${String(cause)}`
-  })
+var runToolchain = (input) => gen2(function* () {
+  yield* requireCompatibleToolchain(input.action);
+  const selection = yield* invocationEnv;
+  return yield* tryPromise2({
+    try: async () => {
+      const child = Bun.spawn(["node", "--input-type=module", "--eval", input.script], {
+        cwd: process.cwd(),
+        env: { ...Bun.env, ...selection, SAMVA_TOOLCHAIN_INPUT: JSON.stringify(input.options) },
+        stdout: "pipe",
+        stderr: "pipe"
+      });
+      const [stdout, stderr, exitCode] = await Promise.all([
+        new Response(child.stdout).text(),
+        new Response(child.stderr).text(),
+        child.exited
+      ]);
+      if (exitCode !== 0) {
+        return Promise.reject(new SamvaCliError({ message: toolchainFailure(stderr, input.action) }));
+      }
+      return JSON.parse(stdout);
+    },
+    catch: (cause) => cause instanceof SamvaCliError ? cause : new SamvaCliError({
+      message: `${input.action}: ${NODE_MISSING} ${String(cause)}`
+    })
+  });
 });
 var OPTIONS_PRELUDE = "const options = JSON.parse(process.env.SAMVA_TOOLCHAIN_INPUT);";
 var brandResolverPrelude = () => `${new Bun.Transpiler({ loader: "ts" }).transformSync(brand_resolver_default)}
@@ -77539,8 +77768,24 @@ var buildDir = (dir, assetBase) => runToolchain({
 ${brandResolverPrelude()} process.stdout.write(JSON.stringify(await buildTemplates(options)));`
 });
 
-// src/commands/templates/project.ts
+// src/commands/templates/local-export.ts
 import { resolve as resolve10 } from "path";
+var exportProject = (input) => runToolchain({
+  action: `Could not export templates${input.dir === undefined ? "" : ` in ${input.dir}`}`,
+  options: {
+    root: process.cwd(),
+    out: resolve10(input.out),
+    ...input.dir === undefined ? {} : { dir: resolve10(input.dir) },
+    ...input.assetBase === undefined ? {} : { assetBase: input.assetBase },
+    ...input.offline === true ? { offline: true } : {}
+  },
+  script: `import { exportProject } from "@samva/vite/project"; ${OPTIONS_PRELUDE}
+${brandResolverPrelude()}
+process.stdout.write(JSON.stringify(await exportProject(options)));`
+});
+
+// src/commands/templates/project.ts
+import { resolve as resolve11 } from "path";
 var templateId = String10("id").pipe(withDescription4("Template id"));
 var projectOrTemplateId = String10("id").pipe(withDescription4("Template project id (tproj_...) or the id of any template in it"));
 var runGit = (args, options = {}) => tryPromise2({
@@ -77627,7 +77872,7 @@ var cloneProject = fn2("Templates.cloneProject")(function* (input) {
     getById({ id: cloneTemplateId }).pipe(client.provide),
     getGitRepository({ id: cloneTemplateId }).pipe(client.provide)
   ], { concurrency: 2 }).pipe(mapError2((error) => toCliApiError("Could not resolve template project", error)));
-  const root = resolve10(input.dir);
+  const root = resolve11(input.dir);
   const helper = yield* helperCommand(template.id, "read");
   yield* runGit([
     "-c",
@@ -77725,7 +77970,7 @@ var init2 = make29("init", {
     description: "Create deterministically for CI or a coding agent"
   }
 ]), withHandler(({ name, projectName, slug, dir, starter, idempotencyKey, dryRun, json }) => gen2(function* () {
-  const root = resolve10(getOrElse(dir, () => projectDirectory(name)));
+  const root = resolve11(getOrElse(dir, () => projectDirectory(name)));
   const key = getOrUndefined(idempotencyKey);
   const request = {
     name,
@@ -78080,10 +78325,12 @@ ${lines.join(`
 
 // src/commands/templates/render-command.ts
 import { mkdir as mkdir3, writeFile as writeFile4 } from "fs/promises";
-import { dirname as dirname3, resolve as resolve12 } from "path";
+import { dirname as dirname3, resolve as resolve13 } from "path";
 
 // src/commands/templates/local-render.ts
-import { resolve as resolve11 } from "path";
+import { mkdtemp as mkdtemp2, readFile as readFile5, rm as rm2 } from "fs/promises";
+import { tmpdir as tmpdir2 } from "os";
+import { join as join4, resolve as resolve12 } from "path";
 var renderLocal = (input) => runToolchain({
   action: `Could not render ${input.template}`,
   options: {
@@ -78091,7 +78338,7 @@ var renderLocal = (input) => runToolchain({
     template: input.template,
     fixture: input.fixture,
     channel: input.channel,
-    ...input.dir === undefined ? {} : { dir: resolve11(input.dir) },
+    ...input.dir === undefined ? {} : { dir: resolve12(input.dir) },
     ...input.locale === undefined ? {} : { locale: input.locale },
     ...input.timeZone === undefined ? {} : { timeZone: input.timeZone },
     ...input.assetBase === undefined ? {} : { assetBase: input.assetBase },
@@ -78100,6 +78347,55 @@ var renderLocal = (input) => runToolchain({
   script: `import { renderChannel, renderTemplate } from "@samva/vite/render"; ${OPTIONS_PRELUDE}
 ${brandResolverPrelude()} const { channel, ...rest } = options; const result = channel === "email" ? await renderTemplate(rest) : await renderChannel({ ...rest, channel }); process.stdout.write(JSON.stringify(result));`
 });
+var finding = (code, message) => ({
+  code,
+  severity: "error",
+  message,
+  origins: []
+});
+var renderWithProjectAssets = (input) => gen2(function* () {
+  const scratch = yield* acquireRelease2(tryPromise2({
+    try: () => mkdtemp2(join4(tmpdir2(), "samva-snapshot-export-")),
+    catch: (cause) => new SamvaCliError({ message: `Could not create a scratch directory: ${String(cause)}` })
+  }), (path) => promise2(() => rm2(path, { recursive: true, force: true })));
+  const receipt = yield* exportProject({
+    dir: input.dir,
+    out: scratch,
+    assetBase: join4(scratch, "assets"),
+    offline: input.offline
+  });
+  const entry = input.template.replace(/^\.\//, "");
+  const template = receipt.templates.find((candidate) => candidate.id === entry || candidate.entryPath === entry);
+  const others = receipt.templates.filter((candidate) => candidate !== template).map((candidate) => candidate.entryPath);
+  const diagnostics = receipt.diagnostics.filter((diagnostic) => {
+    const file = diagnostic.origins[0]?.fileName ?? "";
+    return !others.some((path) => file === path || file.endsWith(`/${path}`));
+  });
+  if (template === undefined)
+    return {
+      ok: false,
+      diagnostics: [
+        ...diagnostics,
+        finding("template-not-found", `No template ${JSON.stringify(input.template)} in the project. Known templates: ${receipt.templates.map((candidate) => candidate.id).join(", ") || "none"}.`)
+      ]
+    };
+  if (diagnostics.some((diagnostic) => diagnostic.severity === "error"))
+    return { ok: false, diagnostics };
+  const page = template.fixtures.find((candidate) => candidate.fixture === input.fixture)?.html;
+  if (page === undefined)
+    return {
+      ok: false,
+      diagnostics: [
+        ...diagnostics,
+        finding("unknown-fixture", `Template ${template.id} has no email fixture ${JSON.stringify(input.fixture)}. Known fixtures: ${template.fixtures.map((candidate) => candidate.fixture).join(", ") || "none"}.`)
+      ]
+    };
+  const html = yield* tryPromise2({
+    try: () => readFile5(join4(scratch, page), "utf8"),
+    catch: (cause) => new SamvaCliError({ message: `Could not read the exported page: ${String(cause)}` })
+  });
+  return { ok: true, template: template.id, html, diagnostics };
+});
 
 // src/commands/templates/render-command.ts
 var renderPayload = (result, out) => ({
@@ -78175,7 +78471,7 @@ var renderCommand = make29("render", {
   json
 }) => gen2(function* () {
   const machine = json || format === "json";
-  const outPath = map(out, (value) => resolve12(value)).pipe(getOrUndefined);
+  const outPath = map(out, (value) => resolve13(value)).pipe(getOrUndefined);
   const result = yield* renderLocal({
     template,
     fixture,
@@ -78225,13 +78521,13 @@ var renderCommand = make29("render", {
 }).pipe(json || format === "json" ? provideService2(MinimumLogLevel2, "None") : identity)));
 
 // src/commands/templates/snapshot-command.ts
-import { resolve as resolve13 } from "path";
+import { resolve as resolve14 } from "path";
 
 // src/commands/templates/snapshot-browser.ts
 import { existsSync } from "fs";
-import { copyFile as copyFile3, mkdir as mkdir4, mkdtemp as mkdtemp2, readFile as readFile5, rm as rm2, stat as stat4, writeFile as writeFile5 } from "fs/promises";
-import { tmpdir as tmpdir2 } from "os";
-import { join as join4 } from "path";
+import { copyFile as copyFile3, mkdir as mkdir4, mkdtemp as mkdtemp3, readFile as readFile6, rm as rm3, stat as stat4, writeFile as writeFile5 } from "fs/promises";
+import { tmpdir as tmpdir3 } from "os";
+import { join as join5 } from "path";
 import { pathToFileURL as pathToFileURL4 } from "url";
 var VIEWPORTS = {
   desktop: { width: 1280, height: 800 },
@@ -78242,8 +78538,8 @@ var BROWSER_REMEDY = "Install a browser to screenshot with: add `playwright` to
 var snapshotFileName = (template, fixture, viewport, scheme) => `${template}-${fixture}-${viewport}-${scheme}.png`;
 var takeSnapshots = async (input) => {
   await mkdir4(input.outDir, { recursive: true });
-  const scratch = await mkdtemp2(join4(tmpdir2(), "samva-snapshot-"));
-  const htmlPath = join4(scratch, "page.html");
+  const scratch = await mkdtemp3(join5(tmpdir3(), "samva-snapshot-"));
+  const htmlPath = join5(scratch, "page.html");
   await writeFile5(htmlPath, input.html);
   const requests = input.viewports.flatMap((viewport) => input.schemes.map((scheme) => ({
     htmlPath,
@@ -78251,7 +78547,7 @@ var takeSnapshots = async (input) => {
     width: VIEWPORTS[viewport].width,
     height: VIEWPORTS[viewport].height,
     scheme,
-    outFile: join4(input.outDir, snapshotFileName(input.template, input.fixture, viewport, scheme))
+    outFile: join5(input.outDir, snapshotFileName(input.template, input.fixture, viewport, scheme))
   })));
   const reasons = [];
   try {
@@ -78272,7 +78568,7 @@ var takeSnapshots = async (input) => {
     }
     return { ok: false, reasons };
   } finally {
-    await rm2(scratch, { recursive: true, force: true });
+    await rm3(scratch, { recursive: true, force: true });
   }
 };
 var CHROME_PATHS = [
@@ -78366,10 +78662,10 @@ var chromeLauncher = (binary, run = runProcess) => ({
         status: "unavailable",
         reason: "no Chrome or Chromium found in the usual locations and SAMVA_CHROME is not set"
       };
-    const profile = await mkdtemp2(join4(tmpdir2(), "samva-chrome-"));
+    const profile = await mkdtemp3(join5(tmpdir3(), "samva-chrome-"));
     try {
       for (const request of requests) {
-        const source = await readFile5(request.htmlPath, "utf8");
+        const source = await readFile6(request.htmlPath, "utf8");
         const measured = request.htmlPath.replace(/\.html$/, `.${request.viewport}.${request.scheme}.html`);
         await writeFile5(measured, withMeasurement(source));
         const measure = await run(binary, chromeMeasureArgs({
@@ -78380,7 +78676,7 @@ var chromeLauncher = (binary, run = runProcess) => ({
           url: pathToFileURL4(measured).href
         }), { stdoutIncludes: "</html>" });
         const height = Math.max(request.height, parseMeasuredHeight(measure.stdout) ?? request.height);
-        const staged = join4(profile, `shot-${request.viewport}-${request.scheme}.png`);
+        const staged = join5(profile, `shot-${request.viewport}-${request.scheme}.png`);
         const shot = await run(binary, chromeScreenshotArgs({
           profile,
           width: request.width,
@@ -78399,7 +78695,7 @@ var chromeLauncher = (binary, run = runProcess) => ({
       }
       return { status: "done" };
     } finally {
-      await rm2(profile, { recursive: true, force: true });
+      await rm3(profile, { recursive: true, force: true });
     }
   }
 });
@@ -78491,7 +78787,7 @@ var snapshotCommand = make29("snapshot", {
   out: Directory2("out").pipe(withDescription2("Directory to write the PNGs into"), withDefault5(".samva/snapshots")),
   viewport: String9("viewport").pipe(withDescription2(`Comma-separated viewports: ${Object.entries(VIEWPORTS).map(([name, size]) => `${name} (${size.width}px)`).join(", ")}`), withDefault5("desktop,mobile")),
   scheme: String9("scheme").pipe(withDescription2("Comma-separated color schemes: light, dark"), withDefault5("light,dark")),
-  assetBase: assetBaseFlag,
+  assetBase: String9("asset-base").pipe(withDescription2("HTTPS origin the template's imported assets are served from; omit to use the project's own asset files"), optional4),
   offline: offlineFlag,
   json: jsonFlag
 }).pipe(withDescription3("Screenshot one fixture in a headless browser at desktop and mobile widths, light and dark"), withExamples([
@@ -78503,17 +78799,18 @@ var snapshotCommand = make29("snapshot", {
     command: "samva templates snapshot welcome --fixture default --viewport mobile --scheme dark --out shots",
     description: "One screenshot: mobile, dark"
   }
-]), withHandler(({ template, fixture, dir, out, viewport, scheme, assetBase, offline, json }) => gen2(function* () {
+]), withHandler(({ template, fixture, dir, out, viewport, scheme, assetBase, offline, json }) => scoped2(gen2(function* () {
   const viewports = yield* parseChoices("viewport", viewport, Object.keys(VIEWPORTS));
   const schemes = yield* parseChoices("scheme", scheme, SCHEMES);
-  const rendered = yield* renderLocal({
-    template,
-    fixture,
-    channel: "email",
-    dir: getOrUndefined(dir),
-    assetBase: getOrUndefined(assetBase),
-    offline
-  });
+  const base = getOrUndefined(assetBase);
+  if (base !== undefined && !/^https:\/\//i.test(base)) {
+    return yield* new CliUsageError({
+      code: "invalid_asset_base",
+      message: `--asset-base must be an HTTPS origin; got ${base}. Omit it to screenshot with the project's own asset files.`
+    });
+  }
+  const input = { template, fixture, dir: getOrUndefined(dir) };
+  const rendered = base === undefined ? yield* renderWithProjectAssets({ ...input, channel: "email", offline }) : yield* renderLocal({ ...input, channel: "email", assetBase: base, offline });
   if (!rendered.ok || !("html" in rendered)) {
     const message = `Could not render ${template} (${fixture}) to screenshot it.`;
     const diagnostics = rendered.diagnostics.map((diagnostic) => reportDiagnostic(diagnostic, { file: "." }));
@@ -78530,7 +78827,7 @@ var snapshotCommand = make29("snapshot", {
     }
     return yield* new SamvaCliError({ message });
   }
-  const outDir = resolve13(out);
+  const outDir = resolve14(out);
   const shots = yield* promise2(() => takeSnapshots({
     html: rendered.html,
     template: rendered.template,
@@ -78558,10 +78855,10 @@ var snapshotCommand = make29("snapshot", {
     return yield* printJson(result);
   for (const file of shots.files)
     yield* log(file.path);
-}).pipe(json ? provideService2(MinimumLogLevel2, "None") : identity)));
+})).pipe(json ? provideService2(MinimumLogLevel2, "None") : identity)));
 
 // src/commands/templates/types-command.ts
-import { dirname as dirname4, resolve as resolve14 } from "path";
+import { dirname as dirname4, resolve as resolve15 } from "path";
 
 // src/commands/templates/schema-types.ts
 var RESERVED = new Set([
@@ -78609,6 +78906,93 @@ var pascalCase = (value, fallback) => {
   const joined = parts.map((part) => `${part.charAt(0).toUpperCase()}${part.slice(1)}`).join("").replace(/^[0-9]+/, "");
   return joined.length === 0 || RESERVED.has(joined.toLowerCase()) ? fallback : joined;
 };
+var text2 = (value) => ({ kind: "text", text: value });
+var NEVER = text2("never");
+var union2 = (members) => members.length === 1 ? members[0] ?? NEVER : { kind: "union", members: members.flatMap((m) => m.kind === "union" ? m.members : [m]) };
+var PRINT_WIDTH = 100;
+var pad2 = (indent) => " ".repeat(indent);
+var isFlat = (doc) => {
+  switch (doc.kind) {
+    case "text":
+      return true;
+    case "object":
+      return false;
+    case "union":
+    case "intersection":
+      return doc.members.every(isFlat);
+    case "array":
+      return isFlat(doc.element);
+    case "tuple":
+      return doc.members.every(isFlat) && (doc.rest === undefined || isFlat(doc.rest));
+    case "record":
+      return isFlat(doc.value);
+  }
+};
+var flat = (doc) => {
+  switch (doc.kind) {
+    case "text":
+      return doc.text;
+    case "object":
+      return `{ ${doc.members.map(({ name, optional, type }) => `readonly ${name}${optional ? "?" : ""}: ${flat(type)}`).join("; ")} }`;
+    case "union":
+      return doc.members.map(flat).join(" | ");
+    case "intersection":
+      return doc.members.map(operand).join(" & ");
+    case "array":
+      return `readonly ${wrapped(doc.element)}[]`;
+    case "tuple":
+      return `readonly [${[...doc.members.map(flat), ...doc.rest === undefined ? [] : [`...${flat(doc.rest)}[]`]].join(", ")}]`;
+    case "record":
+      return `Record<string, ${flat(doc.value)}>`;
+  }
+};
+var needsParentheses = (doc) => doc.kind === "union" || doc.kind === "intersection" || doc.kind === "array" || doc.kind === "tuple";
+var operand = (doc) => doc.kind === "union" ? `(${flat(doc)})` : flat(doc);
+var wrapped = (doc) => needsParentheses(doc) ? `(${flat(doc)})` : flat(doc);
+var printType = (doc, indent, column, suffix = 1) => {
+  switch (doc.kind) {
+    case "object":
+      return `{
+${doc.members.map(({ name, optional, type }) => {
+        const head = `${pad2(indent + 2)}readonly ${name}${optional ? "?" : ""}:`;
+        const body = printType(type, indent + 2, head.length + 1);
+        return `${head}${body.startsWith(`
+`) ? "" : " "}${body};`;
+      }).join(`
+`)}
+${pad2(indent)}}`;
+    case "union": {
+      if (isFlat(doc) && column + flat(doc).length + suffix <= PRINT_WIDTH)
+        return flat(doc);
+      return doc.members.map((member) => `
+${pad2(indent + 2)}| ${printType(member, indent + 4, indent + 4, 0)}`).join("");
+    }
+    case "intersection":
+      return doc.members.map((member) => {
+        const body = printType(member, indent, column, suffix);
+        if (member.kind !== "union")
+          return body;
+        return body.startsWith(`
+`) ? `(${body}
+${pad2(indent)})` : `(${body})`;
+      }).join(" & ");
+    case "array": {
+      const element = doc.element;
+      if (isFlat(doc) && column + flat(doc).length + suffix <= PRINT_WIDTH)
+        return flat(doc);
+      if (element.kind === "object")
+        return `readonly ${printType(element, indent, column + 9, 0)}[]`;
+      if (!needsParentheses(element))
+        return flat(doc);
+      const body = printType(element, indent, column + 10, 0);
+      return body.startsWith(`
+`) ? `readonly (${body}
+${pad2(indent)})[]` : `readonly (${body})[]`;
+    }
+    default:
+      return flat(doc);
+  }
+};
 var UNSUPPORTED_KEYWORDS = [
   "not",
   "if",
@@ -78625,31 +79009,31 @@ var UNSUPPORTED_KEYWORDS = [
 ];
 var literal = (value, pointer, state) => {
   if (value === null)
-    return "null";
+    return text2("null");
   if (typeof value === "string")
-    return JSON.stringify(value);
+    return text2(JSON.stringify(value));
   if (typeof value === "number" || typeof value === "boolean")
-    return String(value);
+    return text2(String(value));
   state.problems.push({
     pointer,
     message: "Only string, number, boolean and null literals become generated types."
   });
-  return "never";
+  return NEVER;
 };
 var scalar = (type, pointer, state) => {
   switch (type) {
     case "string":
-      return "string";
+      return text2("string");
     case "number":
     case "integer":
-      return "number";
+      return text2("number");
     case "boolean":
-      return "boolean";
+      return text2("boolean");
     case "null":
-      return "null";
+      return text2("null");
     default:
       state.problems.push({ pointer, message: `Unsupported JSON Schema type ${type}.` });
-      return "never";
+      return NEVER;
   }
 };
 var definitionName = (state, key, index, pointer) => {
@@ -78671,13 +79055,13 @@ var emit = (schema, pointer, root, state) => {
       pointer,
       message: "An unconstrained schema cannot produce a type that checks anything."
     });
-    return "never";
+    return NEVER;
   }
   if (schema === false)
-    return "never";
+    return NEVER;
   if (!isObject2(schema)) {
     state.problems.push({ pointer, message: "Expected a JSON Schema object." });
-    return "never";
+    return NEVER;
   }
   for (const keyword of UNSUPPORTED_KEYWORDS) {
     if (schema[keyword] !== undefined) {
@@ -78685,7 +79069,7 @@ var emit = (schema, pointer, root, state) => {
         pointer,
         message: `Generated types do not support the ${keyword} keyword.`
       });
-      return "never";
+      return NEVER;
     }
   }
   const reference = schema.$ref;
@@ -78697,48 +79081,51 @@ var emit = (schema, pointer, root, state) => {
         pointer,
         message: `Only local #/$defs references are generated; found ${reference}.`
       });
-      return "never";
+      return NEVER;
     }
     const name = definitionName(state, key, Object.keys(defs).indexOf(key), pointer);
     if (name === undefined)
-      return "never";
+      return NEVER;
     if (!state.defs.has(name) && !state.emitting.has(name)) {
       state.emitting.add(name);
       state.defs.set(name, emit(defs[key], `#/$defs/${key}`, root, state));
     }
-    return name;
+    return text2(name);
   }
   if (schema.const !== undefined)
     return literal(schema.const, pointer, state);
   if (Array.isArray(schema.enum)) {
-    return schema.enum.length === 0 ? "never" : schema.enum.map((value) => literal(value, pointer, state)).join(" | ");
+    return schema.enum.length === 0 ? NEVER : union2(schema.enum.map((value) => literal(value, pointer, state)));
   }
   if (Array.isArray(schema.allOf)) {
-    return schema.allOf.map((member, index) => emit(member, `${pointer}/allOf/${index}`, root, state)).join(" & ");
+    return {
+      kind: "intersection",
+      members: schema.allOf.map((member, index) => emit(member, `${pointer}/allOf/${index}`, root, state))
+    };
   }
   for (const key of ["anyOf", "oneOf"]) {
     const members = schema[key];
     if (!Array.isArray(members))
       continue;
-    return members.length === 0 ? "never" : members.map((member, index) => emit(member, `${pointer}/${key}/${index}`, root, state)).join(" | ");
+    return members.length === 0 ? NEVER : union2(members.map((member, index) => emit(member, `${pointer}/${key}/${index}`, root, state)));
   }
   const type = schema.type;
   if (Array.isArray(type)) {
-    return type.map((member) => scalarOrStructured(schema, member, pointer, root, state)).join(" | ");
+    return union2(type.map((member) => scalarOrStructured(schema, member, pointer, root, state)));
   }
   if (typeof type !== "string") {
     state.problems.push({
       pointer,
       message: "A generated type needs an explicit type, enum, const, $ref or composition."
     });
-    return "never";
+    return NEVER;
   }
   return scalarOrStructured(schema, type, pointer, root, state);
 };
 var scalarOrStructured = (schema, type, pointer, root, state) => {
   if (typeof type !== "string") {
     state.problems.push({ pointer, message: "Expected a JSON Schema type name." });
-    return "never";
+    return NEVER;
   }
   if (type === "object") {
     const properties = isObject2(schema.properties) ? schema.properties : {};
@@ -78751,40 +79138,52 @@ var scalarOrStructured = (schema, type, pointer, root, state) => {
           pointer,
           message: "An object with no declared properties cannot produce a type that checks input."
         });
-        return "never";
+        return NEVER;
       }
-      return additional === false ? "Record<string, never>" : `Record<string, ${emit(additional, `${pointer}/additionalProperties`, root, state)}>`;
+      return additional === false ? { kind: "record", value: NEVER } : {
+        kind: "record",
+        value: emit(additional, `${pointer}/additionalProperties`, root, state)
+      };
     }
     const declared = keys.map((key) => ({
       name: SAFE_PROPERTY.test(key) ? key : JSON.stringify(key),
-      optional: required.has(key) ? "" : "?",
+      optional: !required.has(key),
       type: emit(properties[key], `${pointer}/properties/${key}`, root, state)
     }));
-    const shape = `{
-${declared.map(({ name, optional, type: member }) => `  readonly ${name}${optional}: ${member};`).join(`
-`)}
-}`;
+    const shape = { kind: "object", members: declared };
     if (additional === undefined || additional === false || additional === true)
       return shape;
     const extra = emit(additional, `${pointer}/additionalProperties`, root, state);
-    const open = [...new Set([...declared.map(({ type: member }) => member), extra])].filter((member) => member !== "never").join(" | ");
-    return `${shape} & Record<string, ${open.length === 0 ? "never" : open}>`;
+    const seen = new Set;
+    const open = [...declared.map((member) => member.type), extra].filter((member) => {
+      const key = flat(member);
+      if (key === "never" || seen.has(key))
+        return false;
+      seen.add(key);
+      return true;
+    });
+    return {
+      kind: "intersection",
+      members: [shape, { kind: "record", value: open.length === 0 ? NEVER : union2(open) }]
+    };
   }
   if (type === "array") {
     if (Array.isArray(schema.prefixItems)) {
       const tuple = schema.prefixItems.map((member, index) => emit(member, `${pointer}/prefixItems/${index}`, root, state));
-      const rest = schema.items === undefined || schema.items === false ? "" : `, ...${emit(schema.items, `${pointer}/items`, root, state)}[]`;
-      return `readonly [${tuple.join(", ")}${rest}]`;
+      return {
+        kind: "tuple",
+        members: tuple,
+        ...schema.items === undefined || schema.items === false ? {} : { rest: emit(schema.items, `${pointer}/items`, root, state) }
+      };
     }
     if (schema.items === undefined) {
       state.problems.push({
         pointer,
         message: "An array without declared items cannot produce a type that checks input."
       });
-      return "never";
+      return NEVER;
     }
-    const member = emit(schema.items, `${pointer}/items`, root, state);
-    return SAFE_PROPERTY.test(member) ? `readonly ${member}[]` : `readonly (${member})[]`;
+    return { kind: "array", element: emit(schema.items, `${pointer}/items`, root, state) };
   }
   return scalar(type, pointer, state);
 };
@@ -78808,31 +79207,54 @@ var schemaToTypeScript = (schema, prefix) => {
 var TEMPLATE_TYPES_MANIFEST_PREFIX = "// samva:catalog ";
 var ManifestSchema = Struct({
   version: Literal2(1),
-  reference: Literals(["exact", "contract-latest"]),
+  by: optionalKey2(Literals(["id", "slug"])),
+  reference: optionalKey2(Literals(["exact", "contract-latest"])),
   templates: ArraySchema(Struct({
     key: String4,
     templateId: String4,
-    reference: String4
+    reference: optionalKey2(String4),
+    inputContractId: optionalKey2(String4)
   }))
 });
 var decodeManifest = decodeUnknownOption2(fromJsonString2(ManifestSchema));
+var withKeying = (manifest) => ({ ...manifest, by: manifest.by ?? "id" });
 var readTemplateTypesManifest = (source) => {
   const line = source.split(`
 `).find((candidate) => candidate.startsWith(TEMPLATE_TYPES_MANIFEST_PREFIX));
-  return line === undefined ? undefined : getOrUndefined(decodeManifest(line.slice(TEMPLATE_TYPES_MANIFEST_PREFIX.length)));
+  return line === undefined ? undefined : getOrUndefined(map(decodeManifest(line.slice(TEMPLATE_TYPES_MANIFEST_PREFIX.length)), withKeying));
+};
+var MODULE_TYPE_NAMES = [
+  "SamvaTemplateInputs",
+  "TemplateContent",
+  "TemplateSlug",
+  "TemplateValue",
+  "TemplateValues"
+];
+var memberKey = (value) => /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(value) ? value : JSON.stringify(value);
+var declaration = (head, type) => {
+  const body = printType(type, 0, head.length + 1);
+  return `${head}${body.startsWith(`
+`) ? "" : " "}${body};`;
+};
+var mapEntry = (key, fields) => {
+  const flat = `  ${key}: { ${fields.map(([name, value]) => `${name}: ${value}`).join(", ")} },`;
+  return flat.length <= PRINT_WIDTH ? flat : [`  ${key}: {`, ...fields.map(([name, value]) => `    ${name}: ${value},`), "  },"].join(`
+`);
 };
 var renderTemplateTypes = (input) => {
+  const bySlug = input.by === "slug";
+  const referenceKind = bySlug ? "contract-latest" : input.reference;
   const skipped = [];
   const problems = [];
   const entries = [...input.entries].sort((left, right) => left.key < right.key ? -1 : left.key > right.key ? 1 : 0);
   const generated = [];
-  const used = new Set;
+  const declared = new Set(MODULE_TYPE_NAMES);
   for (const [index, entry] of entries.entries()) {
-    const reference = input.reference === "exact" ? entry.publicationId : entry.inputContractId;
+    const reference = referenceKind === "exact" ? entry.publicationId : entry.inputContractId;
     if (reference === undefined) {
       skipped.push({
         key: entry.key,
-        reason: input.reference === "exact" ? "no publication yet; publish the template before generating an exact reference" : "no input contract yet; publish the template before adopting its contract"
+        reason: referenceKind === "exact" ? "no publication yet; publish the template before generating an exact reference" : bySlug ? "no input contract yet; publish the template before generating types by slug" : "no input contract yet; publish the template before adopting its contract"
       });
       continue;
     }
@@ -78841,10 +79263,17 @@ var renderTemplateTypes = (input) => {
       continue;
     }
     let name = pascalCase(entry.key, `Template${index + 1}`);
-    while (used.has(name))
+    let rendered = schemaToTypeScript(entry.inputSchema, name);
+    const typeNames = () => [
+      `${name}Input`,
+      ...rendered.definitions.map((definition) => definition.name)
+    ];
+    while (typeNames().some((typeName) => declared.has(typeName))) {
       name = `${name}_`;
-    used.add(name);
-    const rendered = schemaToTypeScript(entry.inputSchema, name);
+      rendered = schemaToTypeScript(entry.inputSchema, name);
+    }
+    for (const typeName of typeNames())
+      declared.add(typeName);
     for (const problem of rendered.problems)
       problems.push({ ...problem, key: entry.key });
     generated.push({
@@ -78857,19 +79286,60 @@ var renderTemplateTypes = (input) => {
   }
   const manifest = {
     version: 1,
-    reference: input.reference,
+    by: input.by,
+    ...bySlug ? {} : { reference: referenceKind },
     templates: generated.map(({ entry, reference }) => ({
       key: entry.key,
       templateId: entry.templateId,
-      reference
+      ...bySlug ? { inputContractId: reference } : { reference }
     }))
   };
-  const referenceField = input.reference === "exact" ? "publicationId" : "inputContractId";
-  const referenceNote = input.reference === "exact" ? "Each reference pins one exact publication, so a send from this file renders the same message until you regenerate." : "Each reference names an input contract, so a send from this file follows the newest publication that still validates input identically.";
-  const definitions = generated.flatMap(({ definitions: members }) => members.map(({ name, type }) => `type ${name} = ${type};`));
-  const inputs = generated.map(({ entry, name, type }) => [`/** Input for the \`${entry.key}\` template. */`, `export type ${name}Input = ${type};`].join(`
+  const referenceField = referenceKind === "exact" ? "publicationId" : "inputContractId";
+  const referenceNote = bySlug ? "Each helper names a template by slug, so a send from this file renders the template's current publication; its input is typed from the input contract current when you generated." : referenceKind === "exact" ? "Each reference pins one exact publication, so a send from this file renders the same message until you regenerate." : "Each reference names an input contract, so a send from this file follows the newest publication that still validates input identically.";
+  const definitions = generated.flatMap(({ definitions: members }) => members.map(({ name, type }) => declaration(`type ${name} =`, type)));
+  const inputs = generated.map(({ entry, name, type }) => [
+    `/** Input for the \`${entry.key}\` template. */`,
+    declaration(`export type ${name}Input =`, type)
+  ].join(`
 `));
-  const key = (value) => /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(value) ? value : JSON.stringify(value);
+  const keying = bySlug ? [
+    "/**",
+    " * Email content for one template, named by slug. TypeScript rejects input the template's",
+    " * input contract would reject; spread the result into `email.send`.",
+    " */",
+    "export const templateContent = <Slug extends TemplateSlug>(",
+    "  slug: Slug,",
+    "  templateData: SamvaTemplateInputs[Slug],",
+    ") => ({ templateSlug: slug, templateData: asTemplateData(templateData) });"
+  ] : [
+    `/** ${referenceNote} */`,
+    generated.length === 0 ? "export const samvaTemplates = {} as const;" : `export const samvaTemplates = {
+${generated.map(({ entry, reference }) => mapEntry(memberKey(entry.key), [
+      ["templateId", JSON.stringify(entry.templateId)],
+      [referenceField, JSON.stringify(reference)]
+    ])).join(`
+`)}
+} as const;`,
+    "",
+    "/** What a send spreads in: the template's reference and its input as JSON. */",
+    "export type TemplateContent = {",
+    "  readonly templateId: string;",
+    `  readonly ${referenceField}: string;`,
+    "  readonly templateData: TemplateValues;",
+    "};",
+    "",
+    "/**",
+    " * Email content for one template. TypeScript rejects input the published",
+    " * schema would reject, and the reference travels with it. Spread it into `email.send`.",
+    " */",
+    "export const templateContent = <Slug extends TemplateSlug>(",
+    "  slug: Slug,",
+    "  templateData: SamvaTemplateInputs[Slug],",
+    "): TemplateContent => ({",
+    "  ...samvaTemplates[slug],",
+    "  templateData: asTemplateData(templateData),",
+    "});"
+  ];
   const source = `${[
     "// Generated by `samva templates types`. Do not edit.",
     `//`,
@@ -78886,24 +79356,43 @@ var renderTemplateTypes = (input) => {
 `), ""],
     "/** What each published template accepts, keyed by slug. */",
     generated.length === 0 ? "export interface SamvaTemplateInputs {}" : `export interface SamvaTemplateInputs {
-${generated.map(({ entry, name }) => `  readonly ${key(entry.key)}: ${name}Input;`).join(`
+${generated.map(({ entry, name }) => `  readonly ${memberKey(entry.key)}: ${name}Input;`).join(`
 `)}
 }`,
     "",
-    `/** ${referenceNote} */`,
-    generated.length === 0 ? "export const samvaTemplates = {} as const;" : `export const samvaTemplates = {
-${generated.map(({ entry, reference }) => `  ${key(entry.key)}: { templateId: ${JSON.stringify(entry.templateId)}, ${referenceField}: ${JSON.stringify(reference)} },`).join(`
-`)}
-} as const;`,
+    "/** The slug of every template in this file. */",
+    "export type TemplateSlug = keyof SamvaTemplateInputs;",
     "",
-    "/**",
-    " * Email content for one template. TypeScript rejects input the published",
-    " * schema would reject, and the reference travels with it.",
-    " */",
-    "export const templateContent = <Name extends keyof SamvaTemplateInputs>(",
-    "  name: Name,",
-    "  templateData: SamvaTemplateInputs[Name],",
-    ") => ({ ...samvaTemplates[name], templateData });"
+    "// What the API accepts as template data. A generated input is made of these values, but its",
+    "// readonly lists and optional properties are not always assignable to them, so the helper",
+    "// rebuilds the input as JSON values, leaving out a property that is undefined.",
+    "type TemplateValue =",
+    "  | string",
+    "  | number",
+    "  | boolean",
+    "  | null",
+    "  | TemplateValue[]",
+    "  | { [key: string]: TemplateValue };",
+    "type TemplateValues = { [key: string]: TemplateValue };",
+    "const toTemplateValue = (value: unknown): TemplateValue => {",
+    '  if (value === null || typeof value === "string") return value;',
+    '  if (typeof value === "number" || typeof value === "boolean") return value;',
+    "  if (Array.isArray(value)) return value.map(toTemplateValue);",
+    '  if (typeof value !== "object") return null;',
+    "  return Object.fromEntries(",
+    "    Object.entries(value)",
+    "      .filter(([, member]) => member !== undefined)",
+    "      .map(([key, member]) => [key, toTemplateValue(member)]),",
+    "  );",
+    "};",
+    "const asTemplateData = (input: SamvaTemplateInputs[TemplateSlug]): TemplateValues =>",
+    "  Object.fromEntries(",
+    "    Object.entries(input)",
+    "      .filter(([, member]) => member !== undefined)",
+    "      .map(([key, member]) => [key, toTemplateValue(member)]),",
+    "  );",
+    "",
+    ...keying
   ].join(`
 `)}
 `;
@@ -78920,6 +79409,13 @@ var templateTypesDrift = (existing, generated) => {
         detail: "The file carries no samva:catalog manifest; it was not written by this command."
       }
     ];
+  if (manifest.by !== generated.manifest.by)
+    return [
+      {
+        kind: "keying",
+        detail: `Generated by ${manifest.by}; asked for ${generated.manifest.by}.`
+      }
+    ];
   if (manifest.reference !== generated.manifest.reference)
     return [
       {
@@ -78936,7 +79432,14 @@ var templateTypesDrift = (existing, generated) => {
       drift.push({ kind: "added", key, detail: `${key} is published and not in the file.` });
       continue;
     }
-    if (previous.reference !== entry.reference)
+    if (generated.manifest.by === "slug") {
+      if (previous.inputContractId !== entry.inputContractId)
+        drift.push({
+          kind: "contract",
+          key,
+          detail: `${key} was typed from input contract ${previous.inputContractId}; the catalog now has ${entry.inputContractId}.`
+        });
+    } else if (previous.reference !== entry.reference)
       drift.push({
         kind: "reference",
         key,
@@ -78982,13 +79485,22 @@ var readCatalog = fn2("templates.types.readCatalog")(function* () {
     ...item.inputSchema === null ? {} : { inputSchema: item.inputSchema }
   }))), { concurrency: CATALOG_READ_CONCURRENCY });
 });
+var keyingRows = (by, reference) => by === "slug" ? [
+  ["By", "slug"],
+  ["Publication", "current"],
+  ["Drift", "input contract"]
+] : [
+  ["By", "id"],
+  ["Reference", reference ?? "exact"]
+];
 var readExisting = (path) => gen2(function* () {
   const fs = yield* FileSystem;
   return (yield* fs.exists(path)) ? yield* fs.readFileString(path) : undefined;
 }).pipe(catch_2(() => succeed6(undefined)));
 var typesCommand = make29("types", {
   out: String9("out").pipe(withDescription2("TypeScript file to write the generated template inputs into"), withDefault5("samva-templates.ts")),
-  reference: String9("reference").pipe(withDescription2("exact pins one publication per template; contract-latest follows the newest publication that validates input identically"), withDefault5("exact")),
+  by: Literals3("by", ["id", "slug"]).pipe(withDescription2("id keys each send by template id with a reference; slug keys it by template slug and follows the template's current publication"), withDefault5("id")),
+  reference: String9("reference").pipe(withDescription2("With --by id (default exact): exact pins one publication per template; contract-latest follows the newest publication that validates input identically"), optional4),
   check: Boolean6("check").pipe(withDescription2("Report drift without writing; exits 1 when the file is out of date"), withDefault5(false)),
   json: jsonFlag
 }).pipe(withDescription3("Generate typed template inputs from the authenticated catalog"), withExamples([
@@ -78996,21 +79508,32 @@ var typesCommand = make29("types", {
     command: "samva templates types --out src/samva-templates.ts",
     description: "Pin each template's current publication and type its input"
   },
+  {
+    command: "samva templates types --by slug --out src/samva-templates.ts",
+    description: "Type a send that names the template by slug: { templateSlug, templateData }"
+  },
   {
     command: "samva templates types --check",
     description: "Fail CI when the generated file no longer matches the catalog"
   }
-]), withHandler(fnUntraced2(function* ({ out, reference, check, json }) {
+]), withHandler(fnUntraced2(function* ({ out, by, reference: requested, check, json }) {
+  const reference = getOrElse(requested, () => "exact");
   if (reference !== "exact" && reference !== "contract-latest") {
     return yield* new SamvaCliError({
       message: `Unknown --reference ${reference}. Use exact or contract-latest.`
     });
   }
+  if (by === "slug" && isSome2(requested)) {
+    return yield* new SamvaCliError({
+      message: "--reference does not apply with --by slug: a send by slug renders the template's current publication, and the types follow its input contract."
+    });
+  }
   const context = yield* resolveExecutionContext;
-  const path = resolve14(out);
+  const path = resolve15(out);
   const entries = yield* readCatalog();
   const generated = renderTemplateTypes({
     entries,
+    by,
     reference,
     origin: context.apiUrl
   });
@@ -79023,7 +79546,8 @@ var typesCommand = make29("types", {
         action: "templates.types",
         ok: false,
         out: path,
-        reference,
+        by,
+        ...generated.manifest.reference === undefined ? {} : { reference: generated.manifest.reference },
         problems: generated.problems
       },
       human: [
@@ -79039,7 +79563,8 @@ var typesCommand = make29("types", {
     action: "templates.types",
     ok: check ? drift.length === 0 : true,
     out: path,
-    reference,
+    by,
+    ...generated.manifest.reference === undefined ? {} : { reference: generated.manifest.reference },
     templates: generated.manifest.templates,
     skipped: generated.skipped,
     drift,
@@ -79051,7 +79576,7 @@ var typesCommand = make29("types", {
         return yield* printJson(result);
       return yield* printFields([
         ["File", path],
-        ["Reference", reference],
+        ...keyingRows(by, generated.manifest.reference),
         ["Templates", generated.manifest.templates.length],
         ["Status", "up to date"]
       ]);
@@ -79078,7 +79603,7 @@ var typesCommand = make29("types", {
     return yield* printJson(written);
   yield* printFields([
     ["File", path],
-    ["Reference", reference],
+    ...keyingRows(by, generated.manifest.reference),
     ["Templates", generated.manifest.templates.length],
     ["Skipped", generated.skipped.length]
   ]);
@@ -79087,9 +79612,22 @@ var typesCommand = make29("types", {
 })));
 
 // src/commands/templates/workspace.ts
-import { basename as basename2, resolve as resolve15 } from "path";
+import { basename as basename2, resolve as resolve16 } from "path";
 var templateIdArgument = String10("template-id").pipe(withDescription4("Template whose project workspace to act on"));
 var revisionFlag2 = String9("revision").pipe(withDescription2("Workspace revision this call is fenced to; a workspace that moved refuses the call"));
+var readRevisionFlag = String9("revision").pipe(withDescription2("Workspace revision this call is fenced to; a workspace that moved refuses the call (default: the workspace's current revision)"), optional4);
+var currentRevision = (id, revision) => isSome2(revision) ? succeed6(revision.value) : gen2(function* () {
+  const client = yield* getClientProvider;
+  const view = yield* openWorkspace({ id }).pipe(client.provide, mapError2((error) => {
+    const failure = toCliApiError("Could not read the template workspace revision", error);
+    return new SamvaCliError({
+      message: `${failure.message} The current revision is read by opening the workspace, which needs templates:create; pass --revision to skip that.`,
+      api: failure.api,
+      details: failure.details
+    });
+  }));
+  return view.workspace.revision;
+});
 var idempotencyKeyFlag4 = String9("idempotency-key").pipe(withDescription2("Key so an identical retry returns the original result rather than repeating it"));
 var apiFailure2 = (what) => (error) => toCliApiError(`Could not ${what}`, error);
 var emit2 = (value) => printJsonDocument(value);
@@ -79105,11 +79643,12 @@ var open3 = make29("open", { id: templateIdArgument, json: jsonFlag }).pipe(with
 })));
 var diff = make29("diff", {
   id: templateIdArgument,
-  revision: revisionFlag2,
+  revision: readRevisionFlag,
   json: jsonFlag
 }).pipe(withDescription3("Show every unsaved change against the workspace Git base"), withHandler(fnUntraced2(function* ({ id, revision, json }) {
+  const expectedRevision = yield* currentRevision(id, revision);
   const client = yield* getClientProvider;
-  const result = yield* diffWorkspace({ id, expectedRevision: revision }).pipe(client.provide, mapError2(apiFailure2("diff the template workspace")));
+  const result = yield* diffWorkspace({ id, expectedRevision }).pipe(client.provide, mapError2(apiFailure2("diff the template workspace")));
   yield* emit2(result);
 })));
 var patch2 = make29("patch", {
@@ -79140,7 +79679,7 @@ var patch2 = make29("patch", {
         message: `--set must be <project-path>=<local-file>; got ${entry}.`
       });
     const path = entry.slice(0, separator);
-    const source = resolve15(entry.slice(separator + 1));
+    const source = resolve16(entry.slice(separator + 1));
     const content = yield* fs.readFileString(source).pipe(mapError2((cause) => new SamvaCliError({ message: `Could not read ${source}: ${String(cause)}` })));
     written.push({ path, content });
   }
@@ -79174,7 +79713,7 @@ var addAsset = make29("add-asset", {
   }
 ]), withHandler(fnUntraced2(function* ({ id, file, revision, path, replace, idempotencyKey, json }) {
   const fs = yield* FileSystem;
-  const source = resolve15(file);
+  const source = resolve16(file);
   const bytes = yield* fs.readFile(source).pipe(mapError2((cause) => new SamvaCliError({ message: `Could not read ${source}: ${String(cause)}` })));
   const client = yield* getClientProvider;
   const view = yield* putWorkspaceAsset({
@@ -79189,28 +79728,30 @@ var addAsset = make29("add-asset", {
 })));
 var check4 = make29("check", {
   id: templateIdArgument,
-  revision: revisionFlag2,
+  revision: readRevisionFlag,
   json: jsonFlag
 }).pipe(withDescription3("Build the effective workspace tree and report what it declares plus every finding"), withExamples([
   {
-    command: "samva templates workspace check tmpl_abc123 --revision 5",
-    description: "Read the template id, input schema, fixture names, and located diagnostics without rendering or writing"
+    command: "samva templates workspace check tmpl_abc123",
+    description: "Read the template id, input schema, fixture names, and located diagnostics without rendering or writing; --revision 5 fences the call to a revision you inspected"
   }
 ]), withHandler(fnUntraced2(function* ({ id, revision, json }) {
+  const expectedRevision = yield* currentRevision(id, revision);
   const client = yield* getClientProvider;
-  const result = yield* checkWorkspace({ id, expectedRevision: revision }).pipe(client.provide, mapError2(apiFailure2("check the template workspace")));
+  const result = yield* checkWorkspace({ id, expectedRevision }).pipe(client.provide, mapError2(apiFailure2("check the template workspace")));
   yield* emit2(result);
 })));
 var fixture = make29("fixture", {
   id: templateIdArgument,
-  revision: revisionFlag2,
+  revision: readRevisionFlag,
   name: String9("name").pipe(withDescription2("One of the fixture names `workspace check` reported")),
   json: jsonFlag
 }).pipe(withDescription3("Render one input the template declares, as the recipient receives it"), withHandler(fnUntraced2(function* ({ id, revision, name, json }) {
+  const expectedRevision = yield* currentRevision(id, revision);
   const client = yield* getClientProvider;
   const result = yield* renderWorkspaceFixture({
     id,
-    expectedRevision: revision,
+    expectedRevision,
     fixture: name
   }).pipe(client.provide, mapError2(apiFailure2("render the template fixture")));
   yield* emit2(result);
@@ -79287,42 +79828,52 @@ var workspaceCommand = make29("workspace").pipe(withDescription3("Author a templ
 
 // src/commands/templates.ts
 var tsconfigFlag = String9("tsconfig").pipe(withDescription2("TypeScript project used to check authored templates"), withDefault5("tsconfig.json"));
-var dryRunFlag6 = Boolean6("dry-run").pipe(withDescription2("Show the request without calling the API"), withDefault5(false));
+var dryRunFlag7 = Boolean6("dry-run").pipe(withDescription2("Show the request without calling the API"), withDefault5(false));
 var templateIdArgument2 = String10("id").pipe(withDescription4("Remote template id"));
 var parseObject = (raw, flag) => try_3({
   try: () => JSON.parse(raw),
   catch: () => new SamvaCliError({ message: `${flag} must be a valid JSON object.` })
 }).pipe(filterOrFail2((value) => isObject(value) && !Array.isArray(value), () => new SamvaCliError({ message: `${flag} must be a non-null JSON object.` })));
 var decodePayload = (raw, flag, schema) => parseObject(raw, flag).pipe(flatMap3(decodeUnknownEffect2(schema)), mapError2((error) => error instanceof SamvaCliError ? error : new SamvaCliError({ message: `${flag} does not match the API schema: ${String(error)}` })));
-var createProjectBuildSession = (dir, assetBase) => tryPromise2({
-  try: async () => {
-    const entry = Bun.resolveSync("@samva/vite/build", process.cwd());
-    const projectBuild = await import(pathToFileURL5(entry).href);
-    const { createBrandResolver, loadBrandEnv } = await loadSamvaBrandResolver(process.cwd());
-    const projectBrand = await import(pathToFileURL5(Bun.resolveSync("@samva/markup/brand", process.cwd())).href);
-    return projectBuild.createTemplateBuildSession({
-      brandResolver: createBrandResolver({
+var createProjectBuildSession = (dir, assetBase) => gen2(function* () {
+  yield* requireCompatibleToolchain(`Could not start template watch${dir === undefined ? "" : ` in ${dir}`}`);
+  const selection = yield* invocationEnv;
+  return yield* tryPromise2({
+    try: async () => {
+      const entry = Bun.resolveSync("@samva/vite/build", process.cwd());
+      const projectBuild = await import(pathToFileURL5(entry).href);
+      const { createBrandResolver, loadBrandEnv } = await loadSamvaBrandResolver(process.cwd());
+      const projectBrand = await import(pathToFileURL5(Bun.resolveSync("@samva/markup/brand", process.cwd())).href);
+      return projectBuild.createTemplateBuildSession({
+        brandResolver: createBrandResolver({
+          root: process.cwd(),
+          env: { ...await loadBrandEnv(process.cwd()), ...selection }
+        }),
+        brandPlugin: projectBrand.samvaBrandPlugin,
         root: process.cwd(),
-        env: await loadBrandEnv(process.cwd())
-      }),
-      brandPlugin: projectBrand.samvaBrandPlugin,
-      root: process.cwd(),
-      ...dir === undefined ? {} : { dir: resolve16(dir) },
-      ...assetBase === undefined ? {} : { assetBase }
-    });
-  },
-  catch: (cause) => new SamvaCliError({
-    message: toolchainFailure(String(cause), `Could not start template watch${dir === undefined ? "" : ` in ${dir}`}`)
-  })
+        ...dir === undefined ? {} : { dir: resolve17(dir) },
+        ...assetBase === undefined ? {} : { assetBase }
+      });
+    },
+    catch: (cause) => new SamvaCliError({
+      message: toolchainFailure(String(cause), `Could not start template watch${dir === undefined ? "" : ` in ${dir}`}`)
+    })
+  });
 });
 var TSC_DIAGNOSTIC_LINE = /^(?:(.*?)(?:\((\d+),(\d+)\))?: )?(?:error )?(TS\d+): (.*)$/;
+var BRAND_MODULE_NOT_FOUND = /^Cannot find module 'samva:brand(?:\/[^']*)?'/;
+var ASSET_MODULE_NOT_FOUND = /^Cannot find module '[^']+\.(?:png|jpe?g|gif|webp|woff2)'/;
+var withTypesHint = (message, tsconfig) => {
+  const types = BRAND_MODULE_NOT_FOUND.test(message) ? "@samva/markup/samva-brand" : ASSET_MODULE_NOT_FOUND.test(message) ? "vite/client" : undefined;
+  return types === undefined ? message : `${message} Add "${types}" to compilerOptions.types in ${basename3(tsconfig)}.`;
+};
 var parseTypeScriptDiagnostics = (output, tsconfig) => output.split(`
 `).filter((line) => line.length > 0).map((line) => {
   const match = TSC_DIAGNOSTIC_LINE.exec(line);
   return match === null ? { file: tsconfig, code: "TSC", message: line } : {
     file: match[1] ?? tsconfig,
     code: match[4] ?? "TSC",
-    message: match[5] ?? line,
+    message: withTypesHint(match[5] ?? line, tsconfig),
     ...match[2] === undefined ? {} : { line: Number(match[2]) },
     ...match[3] === undefined ? {} : { column: Number(match[3]) }
   };
@@ -79330,16 +79881,16 @@ var parseTypeScriptDiagnostics = (output, tsconfig) => output.split(`
 var typecheckProject = (tsconfig) => tryPromise2({
   try: async () => {
     const typescriptPackage = Bun.resolveSync("typescript/package.json", process.cwd());
-    const tsc = resolve16(dirname5(typescriptPackage), "bin/tsc");
+    const tsc = resolve17(dirname5(typescriptPackage), "bin/tsc");
     const typescriptManifest = await Bun.file(typescriptPackage).json();
-    const child = Bun.spawn(["node", tsc, "--noEmit", "--pretty", "false", "--project", resolve16(tsconfig)], { cwd: process.cwd(), stdout: "pipe", stderr: "pipe" });
+    const child = Bun.spawn(["node", tsc, "--noEmit", "--pretty", "false", "--project", resolve17(tsconfig)], { cwd: process.cwd(), stdout: "pipe", stderr: "pipe" });
     const [stdout, stderr, exitCode] = await Promise.all([
       new Response(child.stdout).text(),
       new Response(child.stderr).text(),
       child.exited
     ]);
     const output = `${stdout}${stderr}`.trim();
-    const diagnostics = parseTypeScriptDiagnostics(output, resolve16(tsconfig));
+    const diagnostics = parseTypeScriptDiagnostics(output, resolve17(tsconfig));
     if (exitCode !== 0 && diagnostics.length === 0) {
       return Promise.reject(new SamvaCliError({
         message: output || `Could not run TypeScript from this project. Install typescript and check ${tsconfig}.`
@@ -79421,7 +79972,7 @@ var observeTemplateCheck = (dir, tsconfig, build) => gen2(function* () {
       problems: typeProblems
     }
   });
-  const attempted = typeProblems.length > 0 ? yield* option2(build()) : some2(yield* build());
+  const attempted = typeProblems.length > 0 ? yield* build().pipe(asSome2, catchTag2("SamvaCliError", () => succeed6(none2()))) : some2(yield* build());
   if (isNone2(attempted))
     return typeFailure();
   const built = attempted.value;
@@ -79433,7 +79984,15 @@ var observeTemplateCheck = (dir, tsconfig, build) => gen2(function* () {
   const ok = typeProblems.length === 0 && isSuccessfulBuild(built);
   const compilerVersion = built.compilerVersion;
   const warnings = compatibilityFindings(built, "warning");
-  const message = ok ? `TypeScript v${typecheck.version} \xB7 compiler ${compilerVersion} \xB7 ${built.files.length} template(s) compiled \xB7 ${warnings.length} compatibility warning(s)` : typeProblems.length > 0 ? `TypeScript check failed (${typeProblems.length} problem(s)); template check found ${problems.length - typeProblems.length} more.` : built.files.length === 0 ? NO_TEMPLATES(dir) : `Template check failed (${problems.length} problem(s)).`;
+  const failureMessage = () => {
+    if (typeProblems.length > 0) {
+      return `TypeScript check failed (${typeProblems.length} problem(s)); template check found ${problems.length - typeProblems.length} more.`;
+    }
+    if (built.files.length === 0)
+      return NO_TEMPLATES(dir);
+    return `Template check failed (${problems.length} problem(s)).`;
+  };
+  const message = ok ? `TypeScript v${typecheck.version} \xB7 compiler ${compilerVersion} \xB7 ${built.files.length} template(s) compiled \xB7 ${warnings.length} compatibility warning(s)` : failureMessage();
   return {
     ok,
     message,
@@ -79634,7 +80193,7 @@ var build3 = make29("build", {
     }
     return yield* new SamvaCliError({ message });
   }
-  const target = resolve16(out);
+  const target = resolve17(out);
   const artifact = toTemplateBuildArtifact(built);
   yield* writeJsonFile(target, artifact);
   const result = {
@@ -79718,7 +80277,7 @@ var createRemote = make29("create", {
   data: String9("data").pipe(withDescription2("Complete template JSON payload")),
   namespace: namespaceFlag("create"),
   shared: Boolean6("shared").pipe(withDescription2("Share the new organization-level project with every namespace; namespace-scoped keys read and send it but cannot change it"), withDefault5(false)),
-  dryRun: dryRunFlag6,
+  dryRun: dryRunFlag7,
   json: jsonFlag
 }).pipe(withDescription3("Create a remote template from JSON"), withExamples([
   {
@@ -79761,7 +80320,7 @@ var updateRemote = make29("update", {
   id: templateIdArgument2,
   data: String9("data").pipe(withDescription2("JSON object of template fields to update")),
   shared: Literals3("shared", ["true", "false"]).pipe(withDescription2("Share the template's organization-level project with every namespace (true) or stop sharing it (false); applies to every entry in the project"), optional4),
-  dryRun: dryRunFlag6,
+  dryRun: dryRunFlag7,
   json: jsonFlag
 }).pipe(withDescription3("Update a remote template from JSON"), withExamples([
   {
@@ -79791,7 +80350,7 @@ var updateRemote = make29("update", {
 }).pipe(json ? provideService2(MinimumLogLevel2, "None") : identity)));
 var removeRemote = make29("remove", {
   id: templateIdArgument2,
-  dryRun: dryRunFlag6,
+  dryRun: dryRunFlag7,
   yes: Boolean6("yes").pipe(withDescription2("Confirm destructive state change"), withDefault5(false)),
   json: jsonFlag
 }).pipe(withDescription3("Deactivate a remote template; its project file and publications remain"), withExamples([{ command: "samva templates remove tmpl_abc123 --dry-run" }]), withHandler(({ id, dryRun, yes, json }) => gen2(function* () {
@@ -79804,7 +80363,7 @@ var removeRemote = make29("remove", {
     nonInteractiveMessage: "remove requires --yes in non-interactive mode. Preview with --dry-run."
   });
   const client = yield* getClientProvider;
-  const result = yield* remove13({ id }).pipe(client.provide, mapError2((error) => toCliApiError("Could not remove template", error)));
+  const result = yield* remove15({ id }).pipe(client.provide, mapError2((error) => toCliApiError("Could not remove template", error)));
   if (json)
     return yield* printJson(result);
   yield* printFields([
@@ -79812,18 +80371,6 @@ var removeRemote = make29("remove", {
     ["Removed", result.success]
   ]);
 }).pipe(json ? provideService2(MinimumLogLevel2, "None") : identity)));
-var exportProject = (input) => runToolchain({
-  action: `Could not export templates${input.dir === undefined ? "" : ` in ${input.dir}`}`,
-  options: {
-    root: process.cwd(),
-    out: resolve16(input.out),
-    ...input.dir === undefined ? {} : { dir: resolve16(input.dir) },
-    ...input.assetBase === undefined ? {} : { assetBase: input.assetBase }
-  },
-  script: `import { exportProject } from "@samva/vite/project"; ${OPTIONS_PRELUDE}
-${brandResolverPrelude()}
-process.stdout.write(JSON.stringify(await exportProject(options)));`
-});
 var exportCommand = make29("export", {
   dir: dirFlag,
   out: Directory2("out").pipe(withDescription2("Directory to write rendered fixtures, assets, and the catalog into")),
@@ -79844,7 +80391,7 @@ var exportCommand = make29("export", {
   const result = {
     action: "templates.export",
     ok: errors.length === 0,
-    out: resolve16(out),
+    out: resolve17(out),
     assetBase: receipt.assets.base,
     templates: receipt.templates.map((template) => ({
       id: template.id,
@@ -80486,7 +81033,7 @@ var list27 = /* @__PURE__ */ make55("webhooksList");
 var create16 = /* @__PURE__ */ make55("webhooksCreate");
 var getSecret = /* @__PURE__ */ make55("webhooksGetSecret");
 var get28 = /* @__PURE__ */ make55("webhooksGet");
-var remove14 = /* @__PURE__ */ make55("webhooksRemove");
+var remove16 = /* @__PURE__ */ make55("webhooksRemove");
 var update14 = /* @__PURE__ */ make55("webhooksUpdate");
 var test = /* @__PURE__ */ make55("webhooksTest");
 var getLogs = /* @__PURE__ */ make55("webhooksGetLogs");
@@ -80749,11 +81296,11 @@ var rotate3 = make29("rotate-secret", {
   const client = yield* getClientProvider;
   const data = yield* regenerateSecret({ id }).pipe(client.provide, mapError2((error) => toCliApiError("Could not rotate webhook secret", error)));
   const warning = `Read this signing secret again with samva webhooks secret ${id}. The previous secret remains valid for 24 hours.`;
-  const secret = value2(data.secret);
+  const signingSecret = value2(data.secret);
   if (json)
-    return yield* printJson({ secret, warning });
+    return yield* printJson({ secret: signingSecret, warning });
   yield* error(`WARNING: ${warning}`);
-  yield* log(secret);
+  yield* log(signingSecret);
 }).pipe(json ? provideService2(MinimumLogLevel2, "None") : identity)));
 var create17 = make29("create", {
   data: String9("data").pipe(withDescription2("Webhook JSON: name, url, eventTypes, and optional retry settings")),
@@ -80773,16 +81320,17 @@ var create17 = make29("create", {
   const client = yield* getClientProvider;
   const result = yield* create16(payload).pipe(client.provide, mapError2((error) => toCliApiError("Could not create webhook", error)));
   const warning = `Read this signing secret again with samva webhooks secret ${result.endpoint.id}.`;
-  const secret = value2(result.secret);
-  if (json)
-    return yield* printJson({ endpoint: result.endpoint, secret, warning });
+  const signingSecret = value2(result.secret);
+  if (json) {
+    return yield* printJson({ endpoint: result.endpoint, secret: signingSecret, warning });
+  }
   yield* error(`WARNING: ${warning}`);
   yield* printFields([
     ["ID", result.endpoint.id],
     ["Name", result.endpoint.name],
     ["Status", result.endpoint.status],
     ["URL", result.endpoint.url],
-    ["Signing secret", secret]
+    ["Signing secret", signingSecret]
   ]);
 }).pipe(json ? provideService2(MinimumLogLevel2, "None") : identity)));
 var update15 = make29("update", {
@@ -80808,7 +81356,7 @@ var update15 = make29("update", {
     return yield* printJson(result);
   yield* printFields(objectRows(result));
 }).pipe(json ? provideService2(MinimumLogLevel2, "None") : identity)));
-var remove15 = make29("remove", {
+var remove17 = make29("remove", {
   id: idArgument4,
   dryRun: Boolean6("dry-run").pipe(withDefault5(false)),
   yes: Boolean6("yes").pipe(withDefault5(false)),
@@ -80826,7 +81374,7 @@ var remove15 = make29("remove", {
     nonInteractiveMessage: "Permanent webhook deletion requires --yes in non-interactive mode. Preview with --dry-run."
   });
   const client = yield* getClientProvider;
-  const result = yield* remove14({ id }).pipe(client.provide, mapError2((error) => toCliApiError("Could not remove webhook", error)));
+  const result = yield* remove16({ id }).pipe(client.provide, mapError2((error) => toCliApiError("Could not remove webhook", error)));
   if (json)
     return yield* printJson(result);
   yield* log(`Removed webhook ${id}.`);
@@ -80842,7 +81390,7 @@ var webhooksCommand = make29("webhooks").pipe(withDescription3("Inspect, test, a
   stats3,
   retry4,
   rotate3,
-  remove15
+  remove17
 ]));
 
 // src/lib/root-commands.ts
@@ -80913,6 +81461,40 @@ var cli = make29("samva").pipe(withDescription3(`Samva \u2014 email and platform
   }
 ]), withSubcommands([...rootCommands, helpCommand]), withGlobalFlags(globalFlags));
 
+// src/lib/help-json.ts
+var description = (value) => getOrNull(value);
+var flag = (doc) => ({
+  name: doc.name,
+  aliases: doc.aliases,
+  type: doc.type,
+  description: description(doc.description),
+  required: doc.required
+});
+var helpDocJson = (doc) => ({
+  schemaVersion: 1,
+  description: doc.description,
+  usage: doc.usage,
+  flags: doc.flags.map(flag),
+  globalFlags: (doc.globalFlags ?? []).map(flag),
+  args: (doc.args ?? []).map((arg) => ({
+    name: arg.name,
+    type: arg.type,
+    description: description(arg.description),
+    required: arg.required,
+    variadic: arg.variadic
+  })),
+  subcommands: (doc.subcommands ?? []).flatMap((group) => group.commands.map((command) => ({
+    name: command.name,
+    alias: command.alias ?? null,
+    description: command.shortDescription ?? command.description,
+    group: group.group ?? null
+  }))),
+  examples: (doc.examples ?? []).map((example) => ({
+    command: example.command,
+    description: example.description ?? null
+  }))
+});
+
 // src/bin.ts
 var argv = process.argv.slice(2);
 var outputMode = outputModeFromArgv(argv);
@@ -80938,7 +81520,7 @@ var rootMachineHelp = (() => {
   }
   return { requested, command: undefined };
 })();
-var isRootMachineHelp = machineMode && rootMachineHelp.requested && rootMachineHelp.command === undefined;
+var helpRequested = processArgs.some((token) => token === "--help" || token === "-h");
 var isUnknownRootMachineHelp = machineMode && rootMachineHelp.requested && rootMachineHelp.command !== undefined && !isKnownRootCommand(rootMachineHelp.command);
 var cliLogger = make30(({ logLevel, message }) => {
   const text = (Array.isArray(message) ? message : [message]).map(String).join(" ");
@@ -80964,11 +81546,21 @@ var isBareHelp = (error) => error instanceof ShowHelp && error.errors.length ===
 var formatter = {
   ...defaultFormatter2(),
   formatError: () => "",
-  formatErrors: () => ""
+  formatErrors: () => "",
+  ...machineMode && helpRequested ? {
+    formatHelpDoc: (doc) => JSON.stringify(helpDocJson(doc))
+  } : {}
 };
 var flushSuccessfulResults = (state, partial = false) => gen2(function* () {
-  if (outputMode === "quiet" || outputMode === "jsonl")
+  if (outputMode === "quiet")
     return;
+  if (outputMode === "jsonl") {
+    if (helpRequested && state.lines.length === 1) {
+      yield* writeOutput(process.stdout, `${JSON.stringify(resultEnvelope(commandNameFromArgv(argv), JSON.parse(state.lines[0])))}
+`);
+    }
+    return;
+  }
   if (outputMode === "human") {
     if (state.lines.length > 0) {
       yield* writeOutput(process.stdout, `${state.lines.join(`
@@ -81070,12 +81662,7 @@ Try: ${next}`}`);
   }
   yield* printJsonError(error2, message);
 });
-var runMachineHelp = gen2(function* () {
-  const payload = resultEnvelope(commandNameFromArgv(argv), helpManifest);
-  yield* writeOutput(process.stdout, `${JSON.stringify(payload, null, outputMode === "jsonl" ? undefined : 2)}
-`);
-});
-var program = (isRootMachineHelp ? validateProcessArgs(argv).pipe(flatMap3(() => runMachineHelp)) : isUnknownRootMachineHelp ? validateProcessArgs(argv).pipe(flatMap3(() => new CliUsageError({
+var program = (isUnknownRootMachineHelp ? validateProcessArgs(argv).pipe(flatMap3(() => new CliUsageError({
   code: "unknown_subcommand",
   message: `Unknown subcommand ${JSON.stringify(rootMachineHelp.command)} for samva.`
 }))) : withStdoutBuffer(validateProcessArgs(argv).pipe(flatMap3(() => run5(cli, { version: package_default.version }))))).pipe(provide4(mergeAll2(layer14([cliLogger]), layer12, layer13(formatter), layer17)), matchEffect3({