@samva/cli 0.6.1 → 0.7.1

package/AGENTS.md

@@ -16,7 +16,8 @@ The developer loop for a template project is `samva templates dev` (the local vi
 and `snapshot <template> --fixture <name>` (desktop and mobile PNGs, light and dark, in
 `.samva/snapshots`, needing `playwright` in the project or a system Chrome). With `--json`, every
 finding carries `code`, `severity`, `message`, `file`, `line`/`column`, `range`, and, where the
-compiler has them, `fix` and a machine-applicable `edit`. Templates live in `templates/` and
+compiler has them, `fix`, a machine-applicable `edit`, and `upgrade`, the instructions for migrating
+a template written in a format the compiler rejects. Templates live in `templates/` and
 `emails/`; a template is a `.tsx` file that default-exports `defineTemplate`, and the compiler reads
 it without running it.
 

package/dist/bin.mjs

@@ -4028,6 +4028,10 @@ 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
@@ -5597,6 +5601,7 @@ var flatMap3 = flatMap2;
 var andThen2 = andThen;
 var tap2 = tap;
 var result2 = result;
+var option2 = option;
 var exit2 = exit;
 var map6 = map4;
 var as2 = as;
@@ -13674,7 +13679,7 @@ var layer12 = /* @__PURE__ */ layer.pipe(/* @__PURE__ */ provideMerge(/* @__PURE
 // package.json
 var package_default = {
   name: "@samva/cli",
-  version: "0.6.1",
+  version: "0.7.1",
   description: "Samva CLI \u2014 email and platform operations from your terminal",
   keywords: [
     "cli",
@@ -13722,8 +13727,8 @@ var package_default = {
   devDependencies: {
     "@effect/platform-bun": "catalog:effect",
     "@effect/vitest": "catalog:effect",
-    "@samva/markup": "workspace:0.11.0",
-    "@samva/vite": "workspace:0.11.0",
+    "@samva/markup": "^0.11.4",
+    "@samva/vite": "^0.11.4",
     "@types/node": "catalog:",
     "better-auth": "catalog:",
     effect: "catalog:effect",
@@ -13733,10 +13738,10 @@ var package_default = {
     vitest: "catalog:"
   },
   optionalDependencies: {
-    "@samva/cli-darwin-arm64": "workspace:0.6.1",
-    "@samva/cli-darwin-x64": "workspace:0.6.1",
-    "@samva/cli-linux-arm64": "workspace:0.6.1",
-    "@samva/cli-linux-x64": "workspace:0.6.1"
+    "@samva/cli-darwin-arm64": "workspace:0.7.1",
+    "@samva/cli-darwin-x64": "workspace:0.7.1",
+    "@samva/cli-linux-arm64": "workspace:0.7.1",
+    "@samva/cli-linux-x64": "workspace:0.7.1"
   },
   engines: {
     node: ">=18"
@@ -42413,7 +42418,7 @@ var $ = (e) => {
 };
 var ae = { ok: l, isOk: u, err: d, isError: f, try: T, tryPromise: E, map: D, mapError: O, tryRecover: k, andThen: A, tryRecoverAsync: ee, andThenAsync: te, match: ne, tap: j, tapAsync: M, tapError: N6, tapErrorAsync: P, tapBoth: F4, tapBothAsync: I, unwrap: L, unwrapOr: z, gen: B, await: V, codec: re, all: Q, allAsync: ie, partition: $, partitionAsync: async (e) => $(await Z(e, `Result.partitionAsync input promise rejected`)), flatten: (e) => e.status === `ok` ? e.value : e };
 
-// ../markup/dist/theme-css-CEUrDpqq.js
+// ../../node_modules/.bun/@samva+markup@0.11.4+a19bcd7db259aaf7/node_modules/@samva/markup/dist/theme-css-CEUrDpqq.js
 var BRAND_NAMESPACES = [
   "--color-",
   "--font-",
@@ -42606,7 +42611,7 @@ var parseBrandCss = (css) => {
     fontFaces
   });
 };
-// ../markup/dist/diagnostic-model-DJtqbETd.js
+// ../../node_modules/.bun/@samva+markup@0.11.4+a19bcd7db259aaf7/node_modules/@samva/markup/dist/diagnostic-codes-BduqCv_h.js
 var buildLineMap = (source) => {
   const lineStarts = [0];
   for (let index = 0;index < source.length; index++) {
@@ -42631,8 +42636,6 @@ var lineColumn = (lineMap, offset) => {
     column: offset - lineMap[low] + 1
   };
 };
-
-// ../markup/dist/diagnostics.js
 var codes2 = (table) => table;
 var DIAGNOSTIC_CODES = codes2({
   "no-template": {
@@ -43029,7 +43032,6 @@ var DIAGNOSTIC_CODES = codes2({
     channelOnly: true
   }
 });
-
 // ../sdk/dist/normalize-B79uJIeb.js
 function toRecipientArray(recipient) {
   return Array.isArray(recipient) ? recipient : [recipient];
@@ -56684,9 +56686,13 @@ var missingOrgMessage = "No active organization. Run `samva org use <slug>` afte
 var provider = (config) => ({
   provide: (effect) => provide4(effect, layerFetch(config))
 });
-var getClientProviderForContext = (context, baseUrl) => gen2(function* () {
+var getClientConfigForContext = (context, baseUrl) => gen2(function* () {
   if (context.apiKey) {
-    return provider({ apiKey: context.apiKey, baseUrl, headers: CLI_CLIENT_HEADERS });
+    return {
+      apiKey: context.apiKey,
+      baseUrl,
+      headers: CLI_CLIENT_HEADERS
+    };
   }
   if (context.credentials) {
     if (isCredentialExpired(context.credentials, yield* currentTimeMillis2)) {
@@ -56703,18 +56709,38 @@ var getClientProviderForContext = (context, baseUrl) => gen2(function* () {
         message: missingOrgMessage
       });
     }
-    return provider({
+    return {
       authToken,
       baseUrl,
       headers: { ...CLI_CLIENT_HEADERS, "x-org-slug": activeOrgSlug }
-    });
+    };
   }
   return yield* new CliAuthError({
     code: "missing_credentials",
     message: "No credentials found. Run `samva login`, or set SAMVA_API_KEY for automation."
   });
 });
-var getClientProvider = flatMap3(resolveExecutionContext, (context) => getClientProviderForContext(context, context.apiUrl));
+var getClientConfig = flatMap3(resolveExecutionContext, (context) => getClientConfigForContext(context, context.apiUrl));
+var getClientProvider = map6(getClientConfig, provider);
+var getAuthenticatedJsonForContext = fn2("CliClient.getAuthenticatedJson")(function* (context, path) {
+  const config = yield* getClientConfigForContext(context, context.apiUrl);
+  const headers = {
+    ...config.headers,
+    ...config.apiKey !== undefined ? { "x-api-key": config.apiKey } : { Authorization: `Bearer ${config.authToken}` }
+  };
+  const url = `${config.baseUrl.replace(/\/$/, "")}${path}`;
+  return yield* tryPromise2({
+    try: async (signal) => {
+      const response = await fetch(url, { headers, signal });
+      if (!response.ok) {
+        throw new Error(`HTTP ${response.status}`);
+      }
+      return response.json();
+    },
+    catch: (cause) => new SamvaCliError({ message: `Request to ${url} failed: ${String(cause)}` })
+  });
+});
+var getAuthenticatedJson = (path) => flatMap3(resolveExecutionContext, (context) => getAuthenticatedJsonForContext(context, path));
 
 // src/lib/output.ts
 var CLI_SCHEMA_VERSION = 1;
@@ -61024,7 +61050,7 @@ var resolvePublicAuthUrl = (basePath) => {
       } catch {}
   }
 };
-var getClientConfig = (options, loadEnv) => {
+var getClientConfig2 = (options, loadEnv) => {
   const isCredentialsSupported = "credentials" in Request.prototype;
   const baseURL = getBaseURL(options?.baseURL, options?.basePath, undefined, loadEnv) ?? resolvePublicAuthUrl(options?.basePath) ?? "/api/auth";
   const pluginsFetchPlugins = options?.plugins?.flatMap((plugin) => plugin.fetchPlugins).filter((pl) => pl !== undefined) || [];
@@ -61226,7 +61252,7 @@ function createDynamicPathProxy(routes, client, knownPathMethods, atoms, atomLis
 
 // ../../node_modules/.bun/better-auth@1.7.5+e459c178ac81a797/node_modules/better-auth/dist/client/vanilla.mjs
 function createAuthClient(options) {
-  const { pluginPathMethods, pluginsActions, pluginsAtoms, hydrateSession, $fetch, atomListeners, $store } = getClientConfig(options);
+  const { pluginPathMethods, pluginsActions, pluginsAtoms, hydrateSession, $fetch, atomListeners, $store } = getClientConfig2(options);
   const resolvedHooks = {};
   for (const [key, value] of Object.entries(pluginsAtoms))
     resolvedHooks[`use${capitalizeFirstLetter(key)}`] = value;
@@ -62955,6 +62981,7 @@ var reportDiagnostic = (diagnostic, context) => {
     ...origin === undefined ? {} : { line: origin.lineNumber, column: origin.columnNumber },
     ...range === undefined ? {} : { range },
     ...diagnostic.fix === undefined ? {} : { fix: diagnostic.fix },
+    ...diagnostic.upgrade === undefined ? {} : { upgrade: diagnostic.upgrade },
     ...diagnostic.edit === undefined ? {} : { edit: diagnostic.edit },
     ...context.fixture === undefined ? {} : { fixture: context.fixture }
   };
@@ -62962,8 +62989,10 @@ var reportDiagnostic = (diagnostic, context) => {
 var formatReportedDiagnostic = (diagnostic) => {
   const at = diagnostic.line === undefined ? diagnostic.file : `${diagnostic.file}:${diagnostic.line}${diagnostic.column === undefined ? "" : `:${diagnostic.column}`}`;
   const head = `${at} ${diagnostic.severity} ${diagnostic.code}: ${diagnostic.message}`;
-  return diagnostic.fix === undefined ? head : `${head}
+  const fixed = diagnostic.fix === undefined ? head : `${head}
   Fix: ${diagnostic.fix}`;
+  return diagnostic.upgrade === undefined ? fixed : `${fixed}
+  Upgrade: ${diagnostic.upgrade}`;
 };
 
 // src/commands/templates/local-build.ts
@@ -63141,7 +63170,11 @@ var digest2 = async (value) => {
   const bytes = await crypto.subtle.digest("SHA-256", new TextEncoder().encode(value));
   return Array.from(new Uint8Array(bytes), (byte) => byte.toString(16).padStart(2, "0")).join("");
 };
+var StarterCatalog = Struct({
+  items: ArraySchema(Struct({ id: String4, channel: String4 }))
+});
 var init = make27("init", {
+  starter: String8("starter").pipe(withDescription2("Gallery starter id (see the template gallery)"), optional4),
   name: String8("name").pipe(withDescription2("Template name")),
   projectName: String8("project-name").pipe(withDescription2("Template project name"), optional4),
   slug: String8("slug").pipe(withDescription2("Template handle"), optional4),
@@ -63149,24 +63182,30 @@ var init = make27("init", {
   idempotencyKey: String8("idempotency-key").pipe(withDescription2("Stable retry key for project creation"), optional4),
   dryRun: Boolean6("dry-run").pipe(withDescription2("Show the project creation request without writing"), withDefault4(false)),
   json: jsonFlag
-}).pipe(withDescription3("Create and clone the canonical Samva email starter"), withExamples([
+}).pipe(withDescription3("Create and clone a Samva email starter"), withExamples([
   {
     command: 'samva templates init --name "Welcome email"',
     description: "Create a remote project and clone its canonical starter"
   },
+  {
+    command: 'samva templates init --name "Product newsletter" --starter product-newsletter',
+    description: "Create a project from a gallery starter"
+  },
   {
     command: 'samva templates init --name "Welcome email" --slug welcome --dir welcome-email --json',
     description: "Create deterministically for CI or a coding agent"
   }
-]), withHandler(({ name, projectName, slug, dir, idempotencyKey, dryRun, json }) => gen2(function* () {
+]), withHandler(({ name, projectName, slug, dir, starter, idempotencyKey, dryRun, json }) => gen2(function* () {
   const root = resolve8(getOrElse(dir, () => projectDirectory(name)));
   const key = getOrUndefined(idempotencyKey);
   const request = {
     name,
     projectName: getOrUndefined(projectName),
+    galleryTemplateId: getOrUndefined(starter),
     slug: getOrUndefined(slug),
     idempotencyKey: key ?? `cli:init:${(yield* promise2(() => digest2(`${name}
-${root}`))).slice(0, 48)}`
+${root}${isSome2(starter) ? `
+${starter.value}` : ""}`))).slice(0, 48)}`
   };
   if (dryRun) {
     const result = { action: "templates.init", dryRun: true, dir: root, request };
@@ -63178,9 +63217,23 @@ ${root}`))).slice(0, 48)}`
       ["Name", request.name],
       ["Project", request.projectName ?? request.name],
       ["Slug", request.slug ?? "Generated by Samva"],
+      ["Starter", request.galleryTemplateId ?? "Canonical email starter"],
       ["Idempotency key", request.idempotencyKey]
     ]);
   }
+  if (request.galleryTemplateId !== undefined) {
+    const response = yield* getAuthenticatedJson("/v1/starters/");
+    const catalog = yield* decodeUnknownEffect2(StarterCatalog)(response).pipe(mapError2((error) => new SamvaCliError({
+      message: formatApiError("Could not read starter catalog", error)
+    })));
+    const validIds = catalog.items.filter((item) => item.channel === "email").map((item) => item.id);
+    if (!validIds.includes(request.galleryTemplateId)) {
+      return yield* new CliUsageError({
+        code: "unknown_starter",
+        message: `Unknown email starter '${request.galleryTemplateId}'. Valid starter ids: ${validIds.join(", ") || "(none)"}.`
+      });
+    }
+  }
   const client = yield* getClientProvider;
   const created = yield* create11(request).pipe(client.provide, mapError2((error) => new SamvaCliError({
     message: formatApiError("Could not create template project", error)
@@ -63192,6 +63245,7 @@ ${root}`))).slice(0, 48)}`
   yield* printFields([
     ["Template", payload.templateId],
     ["Project", payload.projectId],
+    ["Starter", request.galleryTemplateId ?? "Canonical email starter"],
     ["Directory", payload.dir],
     ["Commit", payload.commit]
   ]);
@@ -64831,28 +64885,32 @@ var observeTemplateCheck = (dir, tsconfig, build) => gen2(function* () {
     line: diagnostic.line,
     column: diagnostic.column
   }));
-  if (typeProblems.length > 0) {
-    const message = `TypeScript check failed (${typeProblems.length} problem(s)).`;
-    return {
+  const typeFailure = () => ({
+    ok: false,
+    message: `TypeScript check failed (${typeProblems.length} problem(s)).`,
+    problems: typeProblems,
+    payload: {
+      action: "templates.check",
       ok: false,
-      message,
-      problems: typeProblems,
-      payload: {
-        action: "templates.check",
-        ok: false,
-        phase: "typescript",
-        tsconfig,
-        typescriptVersion: typecheck.version,
-        problems: typeProblems
-      }
-    };
-  }
-  const built = yield* build();
-  const problems = collectBuildProblems(built);
-  const ok = isSuccessfulBuild(built);
+      phase: "typescript",
+      tsconfig,
+      typescriptVersion: typecheck.version,
+      problems: typeProblems
+    }
+  });
+  const attempted = typeProblems.length > 0 ? yield* option2(build()) : some2(yield* build());
+  if (isNone2(attempted))
+    return typeFailure();
+  const built = attempted.value;
+  const buildProblems = collectBuildProblems(built);
+  if (typeProblems.length > 0 && built.files.length === 0 && buildProblems.length === 0) {
+    return typeFailure();
+  }
+  const problems = [...typeProblems, ...buildProblems];
+  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)` : built.files.length === 0 ? NO_TEMPLATES(dir) : `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)` : 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)).`;
   return {
     ok,
     message,
@@ -64860,7 +64918,7 @@ var observeTemplateCheck = (dir, tsconfig, build) => gen2(function* () {
     payload: {
       action: "templates.check",
       ok,
-      phase: ok ? "complete" : "templates",
+      phase: ok ? "complete" : typeProblems.length > 0 ? "typescript" : "templates",
       tsconfig,
       typescriptVersion: typecheck.version,
       compilerVersion,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@samva/cli",
-  "version": "0.6.1",
+  "version": "0.7.1",
   "description": "Samva CLI — email and platform operations from your terminal",
   "keywords": [
     "cli",
@@ -48,8 +48,8 @@
   "devDependencies": {
     "@effect/platform-bun": "4.0.0",
     "@effect/vitest": "4.0.0",
-    "@samva/markup": "0.11.0",
-    "@samva/vite": "0.11.0",
+    "@samva/markup": "^0.11.4",
+    "@samva/vite": "^0.11.4",
     "@types/node": "^26.6.2",
     "better-auth": "1.7.5",
     "effect": "4.0.0",
@@ -59,10 +59,10 @@
     "vitest": "^5.0.3"
   },
   "optionalDependencies": {
-    "@samva/cli-darwin-arm64": "0.6.1",
-    "@samva/cli-darwin-x64": "0.6.1",
-    "@samva/cli-linux-arm64": "0.6.1",
-    "@samva/cli-linux-x64": "0.6.1"
+    "@samva/cli-darwin-arm64": "0.7.1",
+    "@samva/cli-darwin-x64": "0.7.1",
+    "@samva/cli-linux-arm64": "0.7.1",
+    "@samva/cli-linux-x64": "0.7.1"
   },
   "engines": {
     "node": ">=18"