naro-cli 0.6.0 → 0.6.1

package/README.md

@@ -27,6 +27,20 @@ Values you register are encrypted at rest, and `naro env pull` /
 `naro env list --reveal` can read them back — your account credentials are
 effectively your env credentials.
 
+## Build cache
+
+Deploys reuse the dependency and framework caches from your previous build,
+which are stored per project and restored before the install step. The
+archives are zstd-compressed, so caching needs `zstd` on your PATH:
+
+```bash
+brew install zstd     # macOS
+apt install zstd      # Debian/Ubuntu
+```
+
+Without it deploys still work — they just build from scratch every time and
+say so in the build log.
+
 ## Commands
 
 ```text

package/dist/{chunk-TYBC3YSK.js → chunk-WKJELBOU.js}

@@ -92,19 +92,43 @@ async function computeDepsCacheKey(checkoutDir, packageManager) {
 async function log(observer, scope, level, message) {
   await observer.onLog({ level, stage: STAGE[scope], message });
 }
+async function reportUnavailable(scope, ports, observer) {
+  if (ports.report?.unavailable === true) return;
+  if (ports.report) ports.report.unavailable = true;
+  await log(
+    observer,
+    scope,
+    "WARN",
+    "Build cache is unavailable - this build runs uncached and saves nothing for the next one."
+  );
+}
 async function restoreCache(args) {
   const { scope, key, targetDir, ports, observer } = args;
   const urls = await ports.transport.resolveUrls(scope, key);
-  if (!urls) return false;
+  if (!urls) {
+    await reportUnavailable(scope, ports, observer);
+    return false;
+  }
   const response = await ports.fetch(urls.getUrl);
-  if (response.status !== 200) return false;
+  if (response.status !== 200) {
+    await log(
+      observer,
+      scope,
+      "INFO",
+      `No ${scope} cache stored for ${key} yet.`
+    );
+    return false;
+  }
   const archive = ports.tmpFile(".tar.zst");
   await writeFile(archive, Buffer.from(await response.arrayBuffer()));
   await mkdir(targetDir, { recursive: true });
   await ports.runCommand(
     {
       command: "tar",
-      args: ["--use-compress-program=zstd", "-xf", archive, "-C", targetDir],
+      // --zstd, not --use-compress-program: BSD tar (macOS, where the CLI
+      // builds) feeds the external program wrong on extract and dies with
+      // "Broken pipe". Both GNU tar 1.31+ and bsdtar 3.x accept --zstd.
+      args: ["--zstd", "-xf", archive, "-C", targetDir],
       cwd: targetDir,
       timeoutMs: 12e4,
       stage: STAGE[scope],
@@ -119,22 +143,26 @@ async function saveCache(args) {
   const { scope, key, sourceDir, ports, observer } = args;
   try {
     const info2 = await stat(sourceDir);
-    if (!info2.isDirectory()) return;
+    if (!info2.isDirectory()) throw new Error("not a directory");
   } catch {
+    await log(
+      observer,
+      scope,
+      "WARN",
+      `Nothing to save for the ${scope} cache - the build wrote nothing to that directory.`
+    );
+    return;
+  }
+  const urls = await ports.transport.resolveUrls(scope, key);
+  if (!urls) {
+    await reportUnavailable(scope, ports, observer);
     return;
   }
   const archive = ports.tmpFile(".tar.zst");
   await ports.runCommand(
     {
       command: "tar",
-      args: [
-        "--use-compress-program=zstd",
-        "-cf",
-        archive,
-        "-C",
-        sourceDir,
-        "."
-      ],
+      args: ["--zstd", "-cf", archive, "-C", sourceDir, "."],
       cwd: sourceDir,
       timeoutMs: 12e4,
       stage: STAGE[scope],
@@ -142,8 +170,6 @@ async function saveCache(args) {
     },
     observer
   );
-  const urls = await ports.transport.resolveUrls(scope, key);
-  if (!urls) return;
   const body = await readFile(archive);
   const response = await ports.fetch(urls.putUrl, { method: "PUT", body });
   if (!response.ok) {
@@ -158,10 +184,45 @@ async function saveCache(args) {
   await log(observer, scope, "INFO", `Saved ${scope} cache (${key}).`);
 }
 
+// ../../packages/build/src/cache-transport.ts
+function createCacheTransport(options) {
+  return {
+    async resolveUrls(scope, key) {
+      try {
+        const url2 = new URL(
+          `/api/internal/deployments/${options.deploymentId}/cache/url`,
+          options.controlPlaneUrl
+        );
+        const response = await options.fetch(url2, {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: `Bearer ${options.callbackToken}`
+          },
+          body: JSON.stringify({ scope, key })
+        });
+        if (!response.ok) return null;
+        const data = await response.json();
+        if (data.disabled === true) return null;
+        if (typeof data.getUrl !== "string" || typeof data.putUrl !== "string") {
+          return null;
+        }
+        return { getUrl: data.getUrl, putUrl: data.putUrl };
+      } catch {
+        return null;
+      }
+    }
+  };
+}
+
 // ../../packages/build/src/hash.ts
 import { createHash as createHash2 } from "crypto";
-function hashAsset(data) {
-  return createHash2("sha256").update(data).digest("hex").slice(0, 32);
+var FALLBACK_CONTENT_TYPE = "application/octet-stream";
+function assetContentType(value) {
+  return value || FALLBACK_CONTENT_TYPE;
+}
+function hashAsset(data, contentType2) {
+  return createHash2("sha256").update(assetContentType(contentType2)).update("\0").update(data).digest("hex").slice(0, 32);
 }
 
 // ../../packages/build/src/local-build-executor.ts
@@ -14853,20 +14914,28 @@ async function detectPackageManager(root) {
   if (await exists(join2(root, "pnpm-lock.yaml"))) {
     return {
       name: "pnpm",
-      install: ["pnpm", "install", "--frozen-lockfile"]
+      install: ["pnpm", "install", "--frozen-lockfile"],
+      cacheArgs: (dir) => ["--store-dir", dir]
     };
   }
   if (await exists(join2(root, "package-lock.json"))) {
-    return { name: "npm", install: ["npm", "ci"] };
+    return {
+      name: "npm",
+      install: ["npm", "ci"],
+      cacheArgs: (dir) => ["--cache", dir]
+    };
   }
   if (await exists(join2(root, "yarn.lock"))) {
+    const modern = await usesModernYarn(root);
     return {
       name: "yarn",
       install: [
         "yarn",
         "install",
-        await usesModernYarn(root) ? "--immutable" : "--frozen-lockfile"
-      ]
+        modern ? "--immutable" : "--frozen-lockfile"
+      ],
+      // Berry takes no install-time cache flag; YARN_CACHE_FOLDER covers it.
+      cacheArgs: (dir) => modern ? [] : ["--cache-folder", dir]
     };
   }
   throw new DeploymentError(
@@ -15595,8 +15664,27 @@ var defaultDependencies = {
   openNextCommand: "opennextjs-cloudflare",
   wranglerCommand: "wrangler",
   cacheFetch: (input, init) => fetch(input, init),
-  convertProxyToMiddleware
+  convertProxyToMiddleware,
+  commandAvailable: hasCommand
 };
+async function hasCommand(command) {
+  try {
+    await runCommand(
+      {
+        command,
+        args: ["--version"],
+        cwd: tmpdir(),
+        timeoutMs: 1e4,
+        stage: "CLONING",
+        errorCode: "CLONE_FAILED"
+      },
+      { onLog: () => void 0 }
+    );
+    return true;
+  } catch {
+    return false;
+  }
+}
 function sanitizeCacheKey(value) {
   return value.replace(/[^A-Za-z0-9._-]/g, "-").slice(0, 128);
 }
@@ -15638,14 +15726,25 @@ var LocalBuildExecutor = class {
     const checkout = join8(workspace, "checkout");
     const pmCacheDir = join8(workspace, ".pm-store");
     let cacheSeq = 0;
-    const cachePorts = cache ? {
+    const compressor = "zstd";
+    const canCompress = cache ? await (this.dependencies.commandAvailable ?? hasCommand)(compressor) : false;
+    const cachePorts = cache && canCompress ? {
       transport: cache,
       fetch: this.dependencies.cacheFetch ?? ((url2, init) => fetch(url2, init)),
       runCommand: this.dependencies.runCommand,
-      tmpFile: (suffix) => join8(workspace, `cache-${String(cacheSeq++)}${suffix}`)
+      tmpFile: (suffix) => join8(workspace, `cache-${String(cacheSeq++)}${suffix}`),
+      // One latch for the whole build so a disabled cache warns once.
+      report: { unavailable: false }
     } : null;
     try {
       await notifyStatus(observer, "CLONING");
+      if (cache && !canCompress) {
+        await observer.onLog({
+          level: "WARN",
+          stage: "CLONING",
+          message: `Build cache disabled: ${compressor} is not installed. Install it to reuse dependencies between deploys.`
+        });
+      }
       await this.dependencies.runCommand(
         {
           command: "git",
@@ -15757,7 +15856,7 @@ var LocalBuildExecutor = class {
         await this.dependencies.runCommand(
           {
             command: installCommand,
-            args: installArgs,
+            args: cachePorts ? [...installArgs, ...packageManager.cacheArgs(pmCacheDir)] : installArgs,
             cwd: checkout,
             env: {
               NODE_ENV: "development",
@@ -15984,8 +16083,149 @@ function controlPlaneUrl(env = process.env) {
 
 // ../../packages/sdk/src/callback-server.ts
 import { createServer } from "http";
-var DONE_HTML = "<html><body><p>\u2705 Logged in. You can close this tab and return to the terminal.</p></body></html>";
-var FAIL_HTML = "<html><body><p>Login failed. You can close this tab and return to the terminal.</p></body></html>";
+
+// ../../packages/sdk/src/callback-page.ts
+function escapeHtml(value) {
+  return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#39;");
+}
+var FAVICON = `data:image/svg+xml,${encodeURIComponent(
+  '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><rect width="32" height="32" rx="8" fill="#ededed"/><text x="16" y="23" text-anchor="middle" fill="#000" font-family="system-ui,sans-serif" font-size="20" font-weight="700">n</text></svg>'
+)}`;
+var CHECK_ICON = '<svg viewBox="0 0 24 24" fill="none" aria-hidden="true"><path d="M5 12.5 10 17.5 19 7.5" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"/></svg>';
+var CROSS_ICON = '<svg viewBox="0 0 24 24" fill="none" aria-hidden="true"><path d="M7 7 17 17M17 7 7 17" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"/></svg>';
+var STYLES = `
+  *{box-sizing:border-box}
+  :root{
+    --bg:#000;--surface:#0a0a0a;--surface-2:#111;--border:#232323;
+    --text:#ededed;--muted:#a1a1a1;--faint:#6f6f6f;
+    --sans:ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif;
+    --mono:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;
+  }
+  html{color-scheme:dark;-webkit-font-smoothing:antialiased}
+  body{
+    margin:0;min-height:100vh;display:grid;place-items:center;padding:24px;
+    background:var(--bg);color:var(--text);font-family:var(--sans);
+    font-size:14px;line-height:1.5;letter-spacing:-.006em;
+  }
+  body::before{
+    content:"";position:fixed;inset:0;pointer-events:none;
+    background:radial-gradient(62% 46% at 50% 0%,var(--glow),transparent 72%);
+  }
+  .card{
+    position:relative;width:100%;max-width:400px;padding:34px 32px 28px;
+    background:var(--surface);border:1px solid var(--border);border-radius:14px;
+    text-align:center;animation:rise .4s cubic-bezier(.2,.7,.3,1) both;
+  }
+  .brand{
+    display:inline-flex;align-items:center;gap:8px;
+    font-size:14px;font-weight:600;letter-spacing:-.02em;color:var(--muted);
+  }
+  .brand-mark{
+    display:inline-grid;width:22px;height:22px;place-items:center;
+    background:var(--text);color:#000;border-radius:6px;
+    font-size:12px;font-weight:700;line-height:1;
+  }
+  .glyph{
+    width:52px;height:52px;margin:26px auto 20px;display:grid;place-items:center;
+    border-radius:50%;color:var(--tone);
+    background:var(--tone-soft);border:1px solid var(--tone-edge);
+  }
+  .glyph svg{width:26px;height:26px}
+  .glyph path{stroke-dasharray:32;stroke-dashoffset:32;animation:draw .5s .15s cubic-bezier(.2,.7,.3,1) forwards}
+  h1{margin:0 0 8px;font-size:19px;font-weight:600;letter-spacing:-.02em}
+  p{margin:0 auto;max-width:32ch;color:var(--muted)}
+  .detail{
+    margin-top:18px;padding:10px 12px;text-align:left;word-break:break-word;
+    background:var(--surface-2);border:1px solid var(--border);border-radius:8px;
+    font-family:var(--mono);font-size:12.5px;color:var(--muted);
+  }
+  .hint{
+    display:flex;align-items:center;gap:10px;margin-top:22px;padding:10px 12px;
+    background:var(--surface-2);border:1px solid var(--border);border-radius:8px;text-align:left;
+  }
+  .hint-label{
+    flex:none;font-size:10px;font-weight:600;letter-spacing:.09em;color:var(--faint);
+  }
+  .hint code{font-family:var(--mono);font-size:13px;color:var(--text)}
+  .hint code::before{content:"$ ";color:var(--faint)}
+  footer{margin-top:20px;font-size:12.5px;color:var(--faint)}
+  @keyframes rise{from{opacity:0;transform:translateY(8px)}to{opacity:1;transform:none}}
+  @keyframes draw{to{stroke-dashoffset:0}}
+  @media (prefers-reduced-motion:reduce){
+    .card{animation:none}
+    .glyph path{animation:none;stroke-dashoffset:0}
+  }
+`;
+var TONES = {
+  success: {
+    color: "#4ade80",
+    soft: "rgba(74,222,128,.12)",
+    edge: "rgba(74,222,128,.3)",
+    glow: "rgba(74,222,128,.09)",
+    icon: CHECK_ICON
+  },
+  failure: {
+    color: "#ff5c5c",
+    soft: "rgba(255,92,92,.12)",
+    edge: "rgba(255,92,92,.3)",
+    glow: "rgba(255,92,92,.09)",
+    icon: CROSS_ICON
+  }
+};
+function page(options) {
+  const tone = TONES[options.tone];
+  const title = escapeHtml(options.title);
+  const detail = options.detail ? `<div class="detail">${escapeHtml(options.detail)}</div>` : "";
+  return `<!doctype html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<title>${title} \xB7 naro</title>
+<link rel="icon" href="${FAVICON}">
+<style>:root{--tone:${tone.color};--tone-soft:${tone.soft};--tone-edge:${tone.edge};--glow:${tone.glow}}${STYLES}</style>
+</head>
+<body>
+<main class="card">
+  <span class="brand"><span class="brand-mark">n</span>naro</span>
+  <div class="glyph">${tone.icon}</div>
+  <h1>${title}</h1>
+  <p>${escapeHtml(options.message)}</p>
+  ${detail}
+  <div class="hint">
+    <span class="hint-label">${escapeHtml(options.hint.label)}</span>
+    <code>${escapeHtml(options.hint.command)}</code>
+  </div>
+  <footer>You can close this tab.</footer>
+</main>
+</body>
+</html>`;
+}
+function successPage() {
+  return page({
+    tone: "success",
+    title: "You're signed in",
+    message: "The CLI saved your session. Head back to the terminal to keep going.",
+    hint: { label: "NEXT", command: "naro deploy" }
+  });
+}
+function failurePage(reason) {
+  return page({
+    tone: "failure",
+    title: "Sign-in failed",
+    message: "Nothing was saved. Return to the terminal and try again.",
+    detail: reason,
+    hint: { label: "RETRY", command: "naro login" }
+  });
+}
+
+// ../../packages/sdk/src/callback-server.ts
+function sendPage(res, status, html) {
+  res.statusCode = status;
+  res.setHeader("content-type", "text/html; charset=utf-8");
+  res.setHeader("cache-control", "no-store");
+  res.end(html);
+}
 async function startCallbackServer() {
   let resolveCode;
   let rejectCode;
@@ -16003,18 +16243,20 @@ async function startCallbackServer() {
     const error51 = url2.searchParams.get("error");
     const code = url2.searchParams.get("code");
     if (error51) {
-      res.setHeader("content-type", "text/html");
-      res.end(FAIL_HTML);
+      const description = url2.searchParams.get("error_description");
+      sendPage(res, 200, failurePage(description ?? error51));
       rejectCode(new Error(`GitHub authorization failed: ${error51}`));
       return;
     }
     if (!code) {
-      res.statusCode = 400;
-      res.end("Missing code");
+      sendPage(
+        res,
+        400,
+        failurePage("The callback carried no authorization code.")
+      );
       return;
     }
-    res.setHeader("content-type", "text/html");
-    res.end(DONE_HTML);
+    sendPage(res, 200, successPage());
     resolveCode(code);
   });
   await new Promise((resolve5) => server.listen(0, "127.0.0.1", resolve5));
@@ -17062,7 +17304,7 @@ function manifest(artifact) {
     modules: [artifact.entrypoint, ...artifact.modules].map(meta3),
     assets: artifact.assets.map((file2) => ({
       ...meta3(file2),
-      hash: hashAsset(file2.data)
+      hash: hashAsset(file2.data, file2.contentType)
     })),
     compatibilityDate: artifact.compatibilityDate,
     compatibilityFlags: artifact.compatibilityFlags,
@@ -17162,7 +17404,8 @@ async function detectPackageManagerLenient(root) {
         "--no-audit",
         "--no-fund",
         "--legacy-peer-deps"
-      ]
+      ],
+      cacheArgs: (dir) => ["--cache", dir]
     };
   }
 }
@@ -17288,7 +17531,13 @@ async function deployDirectory(sourceDir, options, log2) {
         rootDirectory: options.rootDirectory ?? null,
         env: { ...ctx.env, ...envToSend }
       },
-      observer
+      observer,
+      createCacheTransport({
+        deploymentId: ctx.deploymentId,
+        controlPlaneUrl: cpUrl,
+        callbackToken: ctx.callbackToken,
+        ...options.fetch ? { fetch: options.fetch } : { fetch }
+      })
     );
     artifact = result.artifact;
   } catch (error51) {

package/dist/deploy.d.ts

@@ -1,3 +1,4 @@
+import { type CacheTransport } from "@next-deploy/build";
 import { type CliGitConnection } from "@next-deploy/sdk";
 import type { BuildObserver, DeploymentArtifact, DeploymentStatus } from "./artifact-types";
 import { type GitInfo } from "./git-info";
@@ -10,7 +11,7 @@ export interface DeployBuildExecutor {
         branch: string;
         rootDirectory: string | null;
         env: Record<string, string>;
-    }, observer: BuildObserver): Promise<{
+    }, observer: BuildObserver, cache?: CacheTransport): Promise<{
         artifact: DeploymentArtifact;
     }>;
 }

package/dist/deploy.js

@@ -5,7 +5,7 @@ import {
   parseDotenv,
   readProjectEnv,
   slugify
-} from "./chunk-TYBC3YSK.js";
+} from "./chunk-WKJELBOU.js";
 export {
   deployDirectory,
   eventsObserver,

package/dist/index.js

@@ -26,7 +26,7 @@ import {
   slugify,
   toNaroError,
   writeProjectLink
-} from "./chunk-TYBC3YSK.js";
+} from "./chunk-WKJELBOU.js";
 
 // src/args.ts
 var BOOLEAN_FLAGS = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "naro-cli",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "type": "module",
   "bin": {
     "naro": "./dist/index.js"
@@ -29,9 +29,9 @@
     "typescript": "7.0.2",
     "vitest": "3.2.7",
     "@next-deploy/build": "0.1.0",
-    "@next-deploy/config": "0.1.0",
+    "@next-deploy/core": "0.1.0",
     "@next-deploy/sdk": "0.1.0",
-    "@next-deploy/core": "0.1.0"
+    "@next-deploy/config": "0.1.0"
   },
   "scripts": {
     "build": "tsup && pnpm build:types",