naro-cli 0.26.0 → 0.28.0

package/dist/deploy.d.ts

@@ -2,6 +2,7 @@ import { type CacheTransport, type LocalBuildDependencies } from "@next-deploy/b
 import { type CliGitConnection } from "@next-deploy/sdk";
 import type { BuildObserver, DeploymentArtifact, DeploymentStatus, DeploymentStrategyRecord } from "./artifact-types";
 import { type GitInfo } from "./git-info";
+import { type UserAdapterChoice } from "./user-adapter";
 import { type WorkingTreeCopy } from "./working-tree";
 /** The slice of LocalBuildExecutor the deploy flow needs — injectable in tests. */
 export interface DeployBuildExecutor {
@@ -14,6 +15,7 @@ export interface DeployBuildExecutor {
         env: Record<string, string>;
         strategy?: DeploymentStrategyRecord | null;
         vinextEnabled?: boolean;
+        userAdapter?: "replace" | "keep" | null;
     }, observer: BuildObserver, cache?: CacheTransport): Promise<{
         artifact: DeploymentArtifact;
     }>;
@@ -75,7 +77,7 @@ export interface DeployOptions {
      * enough to time some out when the whole suite ran at once.
      */
     pollIntervalMs?: number;
-    /** Test seam: replaces the local OpenNext build. */
+    /** Test seam: replaces the local build. */
     executor?: DeployBuildExecutor;
     /** Test seam: replaces the `git` calls that read the repository. */
     gitInfo?: (dir: string) => Promise<GitInfo>;
@@ -84,6 +86,12 @@ export interface DeployOptions {
      * 대화형 CLI만 전달한다 — MCP·CI는 생략하고 안내만 받는다.
      */
     onMissingEnv?: (keys: string[]) => Promise<Record<string, string>>;
+    /**
+     * The answer to the adapter question (`--user-adapter`, the prompt, MCP's
+     * userAdapter), saved to the project once the deployment exists when it
+     * differs from the stored choice (spec 2026-11-07 S3).
+     */
+    userAdapter?: UserAdapterChoice | undefined;
 }
 export interface DeployResult {
     deploymentId: string;
@@ -105,7 +113,7 @@ export interface DeployResult {
 }
 /**
  * The full CLI deploy: authenticate, register the deployment with the
- * control plane, build locally (OpenNext for Next.js, the static pipeline
+ * control plane, build locally (vinext for Next.js, the static pipeline
  * for Vite/CRA/static sites), upload the artifact and poll until the
  * platform finishes publishing the worker.
  *
@@ -115,3 +123,4 @@ export declare function deployDirectory(sourceDir: string, options: DeployOption
 export { lintDatabase, type DatabaseLint } from "./commands/db-lint";
 export { readCapped } from "./functions/read-capped";
 export { assertFunctionsNode, deployFunctions, type DeployedFunction, type DeployFunctionsOptions, type DeployFunctionsResult, } from "./functions/deploy";
+export { detectUserAdapter, parseUserAdapter, userAdapterUnreadable, type DetectedUserAdapter, type UserAdapterChoice, } from "./user-adapter";

package/dist/deploy.js

@@ -3,26 +3,32 @@ import {
   assertFunctionsNode,
   deployDirectory,
   deployFunctions,
+  detectUserAdapter,
   eventsObserver,
   lintDatabase,
   localDependencies,
   parseDotenv,
+  parseUserAdapter,
   readCapped,
   readProjectEnv,
   slugify,
+  userAdapterUnreadable,
   workingTreeNotices
-} from "./chunk-RQJTCRKY.js";
+} from "./chunk-UJGDKNDM.js";
 import "./chunk-K3NQKI34.js";
 export {
   assertFunctionsNode,
   deployDirectory,
   deployFunctions,
+  detectUserAdapter,
   eventsObserver,
   lintDatabase,
   localDependencies,
   parseDotenv,
+  parseUserAdapter,
   readCapped,
   readProjectEnv,
   slugify,
+  userAdapterUnreadable,
   workingTreeNotices
 };

package/dist/index.js

@@ -24,6 +24,7 @@ import {
   STORAGE_OBJECTS_TABLE,
   STORAGE_SUBQUERIES_SQL,
   UNSHOWN_WARNING_LINE,
+  USER_ADAPTER_OPTIONS,
   appliedMigrations,
   applyMigrationFiles,
   assertFunctionsNode,
@@ -48,6 +49,7 @@ import {
   deployDirectory,
   deployFunctions,
   detectGitInfo,
+  detectUserAdapter,
   enableBackendCommand,
   ensureGitignoreHasNaro,
   envFlag,
@@ -81,6 +83,7 @@ import {
   parsePolicyNode,
   parsePolicyStatement,
   parseRedirectEntry,
+  parseUserAdapter,
   pendingMigrationNames,
   policiesForTypes,
   policiesLostByReset,
@@ -124,12 +127,16 @@ import {
   toNaroError,
   unreadablePolicyComment,
   usageMonthOf,
+  userAdapterQuestion,
+  userAdapterStored,
+  userAdapterUnasked,
+  userAdapterUnreadable,
   userForAccessToken,
   version,
   warningLines,
   withFunctionRetries,
   writeProjectLink
-} from "./chunk-RQJTCRKY.js";
+} from "./chunk-UJGDKNDM.js";
 import "./chunk-K3NQKI34.js";
 
 // src/args.ts
@@ -257,6 +264,7 @@ var STRING_FLAGS = {
   "--build-command": "buildCommand",
   "--output-dir": "outputDir",
   "--vinext": "vinext",
+  "--user-adapter": "userAdapter",
   "--expires": "expires",
   "--verify-jwt": "verifyJwt",
   "--method": "method",
@@ -4207,6 +4215,7 @@ function deployTarget(flags) {
 async function runDeploy(context, deps = { deploy: deployDirectory, offerAutoDeploy }) {
   const { flags, output } = context;
   const target = deployTarget(flags);
+  const flaggedAdapter = flaggedUserAdapter(flags);
   const link = flags.project ? { projectId: flags.project, teamSlug: void 0 } : readProjectLink(context.cwd);
   if (target.production && !flags.yes && !flags.json && isInteractive()) {
     const confirmed = await context.prompter.confirm("Deploy to production?");
@@ -4220,6 +4229,12 @@ async function runDeploy(context, deps = { deploy: deployDirectory, offerAutoDep
   const account = await accountLabel(context);
   output.log(`   ${account} \u2192 ${team.slug}
 `);
+  const userAdapter = await askUserAdapter(
+    context,
+    flaggedAdapter,
+    link,
+    canPrompt
+  );
   const result = await deps.deploy(
     context.cwd,
     {
@@ -4246,7 +4261,8 @@ async function runDeploy(context, deps = { deploy: deployDirectory, offerAutoDep
         )
       },
       token: flags.token,
-      allowLogin: !flags.json && !flags.yes
+      allowLogin: !flags.json && !flags.yes,
+      ...userAdapter ? { userAdapter } : {}
     },
     (message) => output.log(message)
   );
@@ -4290,6 +4306,44 @@ async function runDeploy(context, deps = { deploy: deployDirectory, offerAutoDep
     ]
   );
 }
+function flaggedUserAdapter(flags) {
+  if (flags.userAdapter === void 0) return void 0;
+  const choice = parseUserAdapter(flags.userAdapter);
+  if (!choice)
+    throw new NaroError(
+      "VALIDATION_FAILED",
+      "--user-adapter takes replace or keep."
+    );
+  return choice;
+}
+async function askUserAdapter(context, flagged, link, canPrompt) {
+  const { flags, output } = context;
+  if (flagged) return flagged;
+  const adapter = await detectUserAdapter(context.cwd, flags.root ?? null);
+  if (!adapter) return void 0;
+  let stored = null;
+  if (link?.projectId) {
+    try {
+      stored = (await (await context.client()).projects.get(link.projectId)).userAdapter;
+    } catch {
+      output.log(userAdapterUnreadable(adapter));
+      return void 0;
+    }
+  }
+  if (stored) {
+    output.log(userAdapterStored(adapter, stored));
+    return void 0;
+  }
+  if (!canPrompt) {
+    output.log(userAdapterUnasked(adapter));
+    return void 0;
+  }
+  const index = await context.prompter.select(
+    userAdapterQuestion(adapter),
+    USER_ADAPTER_OPTIONS.map((option) => option.label)
+  );
+  return USER_ADAPTER_OPTIONS[index]?.value ?? "replace";
+}
 async function resolveDestination(context, link, canPrompt) {
   const client = await context.client();
   const teams = await client.teams.list();
@@ -11934,53 +11988,8 @@ async function runObservability(context) {
   context.output.result({ projectId, report }, observabilityLines(report));
 }
 
-// src/commands/supabase.ts
-async function runSupabase(context) {
-  const projectId = await context.resolveProjectId();
-  const client = await context.client();
-  const links = await client.supabase.links(projectId);
-  context.output.result({ projectId, links }, [
-    `Supabase links (${String(links.length)}):`,
-    ...links.length === 0 ? [
-      "  None. Connect a Supabase project in the dashboard, under the project's Settings."
-    ] : links.map(
-      (link) => `  ${link.target.padEnd(12)} ${link.supabaseName} (${link.supabaseRef}), ${link.keyKind} keys${link.includeSecret ? " + secret" : ""}`
-    )
-  ]);
-}
-async function runSupabaseDisconnect(context) {
-  const [given] = context.positionals;
-  const target = given === "all" ? void 0 : given;
-  const projectId = await context.resolveProjectId();
-  const client = await context.client();
-  await confirmOrAbort(
-    context,
-    target === void 0 ? "Disconnect Supabase from every target your role may change? The env vars it set are deleted, and the next deploy goes without them." : `Disconnect Supabase from ${target}? The env vars it set there are deleted, and the next deploy goes without them.`
-  );
-  const { removed } = await client.supabase.disconnect(
-    projectId,
-    target === void 0 ? {} : { target }
-  );
-  let remaining = [];
-  if (target === void 0) {
-    try {
-      remaining = (await client.supabase.links(projectId)).map(
-        (link) => link.target
-      );
-    } catch {
-      remaining = null;
-    }
-  }
-  context.output.result({ projectId, removed, remaining }, [
-    `\u2705 Removed ${String(removed)} Supabase link(s)`,
-    ...remaining === null ? ["\u26A0 Could not read which links are left; run `naro supabase` to check."] : remaining.length > 0 ? [
-      `\u26A0 Still connected: ${remaining.join(", ")} \u2014 your role cannot change those.`
-    ] : []
-  ]);
-}
-
 // src/commands/project-settings.ts
-var SET_USAGE2 = "Usage: naro project set [--subdomain <name>] [--framework <preset>] [--root <dir>] [--branch <branch>] [--build-command <script>] [--output-dir <dir>] [--vinext on|off]";
+var SET_USAGE2 = "Usage: naro project set [--subdomain <name>] [--framework <preset>] [--root <dir>] [--branch <branch>] [--build-command <script>] [--output-dir <dir>] [--vinext on|off] [--user-adapter replace|keep]";
 var GRANT_USAGE = "Usage: naro project access grant <user-id> --role <project_admin|project_developer|project_viewer>";
 function clearable(value) {
   return value === "" ? null : value;
@@ -12002,6 +12011,15 @@ function settingsFrom(context) {
       throw new NaroError("VALIDATION_FAILED", "--vinext takes on or off.");
     patch.vinextEnabled = flags.vinext === "on";
   }
+  if (flags.userAdapter !== void 0) {
+    const choice = parseUserAdapter(flags.userAdapter);
+    if (!choice)
+      throw new NaroError(
+        "VALIDATION_FAILED",
+        "--user-adapter takes replace or keep."
+      );
+    patch.userAdapter = choice;
+  }
   if (Object.keys(patch).length === 0)
     throw new NaroError("VALIDATION_FAILED", SET_USAGE2);
   return patch;
@@ -14098,6 +14116,53 @@ function usageLines3(report, summary) {
   );
   return lines;
 }
+function tenths(value) {
+  return Math.round(value * 10) / 10;
+}
+function cpuText(ms) {
+  const whole = Math.round(ms);
+  if (whole < 1e3) return `${String(whole)} ms`;
+  const seconds = tenths(ms / 1e3);
+  if (seconds < 60) return `${seconds.toFixed(1)} s`;
+  const minutes = tenths(ms / 6e4);
+  if (minutes < 60) return `${minutes.toFixed(1)} min`;
+  return `${tenths(ms / 36e5).toFixed(1)} h`;
+}
+function environmentName(environment) {
+  switch (environment.kind) {
+    case "production":
+      return "production";
+    case "preview":
+      return "preview";
+    case "environment":
+      return printable(environment.label);
+    case "former":
+      return `earlier name ${printable(environment.workerName)}`;
+  }
+}
+function hostingLines(hosting) {
+  if (!hosting || hosting.projects.length === 0) return [];
+  const rows = [["CPU", "Invocations", "Project / environment"]];
+  for (const project of hosting.projects) {
+    rows.push([
+      cpuText(project.cpuMs),
+      formatCount(project.invocations),
+      project.name === null ? `Not in this team ${printable(project.projectId)}` : printable(project.name)
+    ]);
+    for (const environment of project.environments)
+      rows.push([
+        cpuText(environment.cpuMs),
+        formatCount(environment.invocations),
+        `  ${environmentName(environment)}`
+      ]);
+  }
+  return [
+    "",
+    "Compute (CPU) \xB7 observed, not billed \xB7 sampled estimate",
+    ...table(rows),
+    `Total: ${cpuText(hosting.totals.cpuMs)} of CPU over ${formatCount(hosting.totals.invocations)} invocations`
+  ];
+}
 
 // src/commands/usage.ts
 async function runUsage(context) {
@@ -14105,12 +14170,26 @@ async function runUsage(context) {
   const teams = await client.teams.list();
   const team = await resolveTeam(context, teams, { intent: "read" });
   const month = context.flags.month;
-  const report = await client.teams.usage(
-    team.slug,
-    month !== void 0 ? { month } : {}
-  );
+  const query = month !== void 0 ? { month } : {};
+  const report = await client.teams.usage(team.slug, query);
   const summary = summarizeTeamUsage(report, usageMonthOf(/* @__PURE__ */ new Date()));
-  context.output.result({ ...report, summary }, usageLines3(report, summary));
+  let hosting = null;
+  let hostingError;
+  try {
+    hosting = await client.teams.usageHosting(team.slug, query);
+  } catch (error) {
+    hostingError = {
+      code: error instanceof NaroError ? error.code : "UNKNOWN",
+      message: error instanceof Error ? error.message : String(error)
+    };
+    context.output.warn(
+      `Could not read compute usage: ${hostingError.message}`
+    );
+  }
+  context.output.result(
+    hostingError ? { ...report, summary, hosting, hostingError } : { ...report, summary, hosting },
+    [...usageLines3(report, summary), ...hostingLines(hosting)]
+  );
 }
 
 // src/router.ts
@@ -14143,6 +14222,7 @@ Usage:
   naro project delete                Delete the project and everything under it: type its name to confirm
   naro project set [--subdomain <name>] [--framework <preset>] [--root <dir>] [--branch <branch>]
        [--build-command <script>] [--output-dir <dir>] [--vinext on|off]
+       [--user-adapter replace|keep]
                                      Change the General settings; an empty value clears one. A new subdomain
                                      moves the project's address at once (asks first; --yes in CI)
   naro project check <subdomain>     Whether a subdomain is free
@@ -14152,7 +14232,7 @@ Usage:
                                      Take a contributor's project role away (asks first)
        [--project <id> --yes]          (in CI both; --yes alone is refused so the folder cannot choose the project)
   naro usage [--month YYYY-MM] [--team <slug>]
-                                     Team usage: requests, builds and custom domains against the plan, then by project
+                                     Team usage: requests, builds and custom domains against the plan, then by project, then CPU by project and environment
   naro billing [--team <slug>]      The team's plan, subscription and this month's overage; the plan changes in the dashboard
   naro dashboard [<capability>]      The dashboard URL for what the CLI leaves there (payments, GitHub App, \u2026); no argument lists them
 
@@ -14195,8 +14275,6 @@ Usage:
   naro env import <file> [target]    Upload a dotenv file's variables (asks first; --yes in CI)
   naro env pull [file]               Write env vars to .env.local
        target is production, preview, all or an environment name; add and import use all when none is given
-  naro supabase [list]               The project's Supabase links: target, Supabase project and keys (connect in the dashboard)
-  naro supabase disconnect [target]  Remove a target's link, or (no target or all) every link your role may change, with its env vars (asks first)
 
   naro environments                  List the project's environments: address, branch, protection, data, and how many the plan allows
   naro environments create <slug> [--branch <b>] [--copy-env preview|production|none] [--database schema|empty]
@@ -14828,10 +14906,6 @@ function routeCommand(parsed) {
     // Spec 2026-10-18-usage-cli-mcp §2.
     case "usage":
       return positionals.length === 0 ? { handler: runUsage, positionals: [] } : null;
-    case "supabase":
-      if (sub === void 0 || sub === "list")
-        return positionals.length <= 1 ? { handler: runSupabase, positionals: [] } : null;
-      return sub === "disconnect" && positionals.length <= 2 ? { handler: runSupabaseDisconnect, positionals: positionals.slice(1) } : null;
     case "dashboard":
       return positionals.length <= 1 ? { handler: runDashboard, positionals } : null;
     case "billing":

package/dist/user-adapter.d.ts

@@ -0,0 +1,32 @@
+export type UserAdapterChoice = "replace" | "keep";
+export interface DetectedUserAdapter {
+    /** The active next.config, relative to the app directory. */
+    file: string;
+    key: "adapterPath" | "experimental.adapterPath";
+}
+/** The next.config Next would load sets adapterPath, read the way Naro's builders read it. */
+export declare function detectUserAdapter(directory: string, rootDirectory: string | null): Promise<DetectedUserAdapter | null>;
+export declare function parseUserAdapter(value: unknown): UserAdapterChoice | null;
+export declare const USER_ADAPTER_OPTIONS: ReadonlyArray<{
+    value: UserAdapterChoice;
+    label: string;
+}>;
+export declare function userAdapterQuestion(adapter: DetectedUserAdapter): string;
+/** One line on what a choice means for this deploy (the local build has no Naro adapter, spec S2 D8). */
+export declare function userAdapterOutcome(choice: UserAdapterChoice): string;
+/** The line for a project that already chose. */
+export declare function userAdapterStored(adapter: DetectedUserAdapter, choice: UserAdapterChoice): string;
+/** The warning when nobody chose and nobody can be asked. */
+export declare function userAdapterUnasked(adapter: DetectedUserAdapter): string;
+/** Where each surface changes the stored choice. */
+declare const CHOOSE_USER_ADAPTER: {
+    readonly cli: "naro project set --user-adapter replace|keep";
+    readonly mcp: "update_project with userAdapter replace|keep";
+};
+/**
+ * The warning when the project's stored choice could not be read. It may
+ * already say keep, so this line must not claim replace the way
+ * userAdapterUnasked does.
+ */
+export declare function userAdapterUnreadable(adapter: DetectedUserAdapter, surface?: keyof typeof CHOOSE_USER_ADAPTER): string;
+export {};

package/dist/working-tree.d.ts

@@ -49,7 +49,7 @@ export interface WorkingTreeCopy {
  * edit to a committed `.env`, one hidden behind `skip-worktree`, one only
  * staged, and an untracked `.env.local` all stay on the machine. `next build`
  * reads those files on its own and inlines NEXT_PUBLIC_* into the bundle, and
- * OpenNext bundles every value they hold into the Worker, so a file copied
+ * the bundler inlines every value they hold into the Worker, so a file copied
  * here would ship values the developer declined to send. The env consent
  * prompt is the only way local values reach a build (known-issues #7,
  * CLI-DEPLOY-011).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "naro-cli",
-  "version": "0.26.0",
+  "version": "0.28.0",
   "type": "module",
   "bin": {
     "naro": "./dist/index.js"
@@ -23,7 +23,6 @@
   },
   "dependencies": {
     "@cloudflare/unenv-preset": "2.16.2",
-    "@opennextjs/cloudflare": "1.20.12",
     "@supabase/supabase-js": "2.112.3",
     "@vercel/frameworks": "3.34.0",
     "esbuild": "0.28.1",
@@ -37,14 +36,14 @@
     "tsx": "4.23.12",
     "typescript": "7.0.2",
     "vitest": "3.2.7",
+    "naro-js": "0.9.0",
     "@next-deploy/build": "0.1.0",
-    "@next-deploy/data-core": "0.1.0",
     "@next-deploy/config": "0.1.0",
+    "@next-deploy/data-core": "0.1.0",
     "@next-deploy/functions-runtime": "0.1.0",
-    "naro-js": "0.9.0",
+    "@next-deploy/functions-bundler": "0.1.0",
     "@next-deploy/sdk": "0.1.0",
-    "@next-deploy/core": "0.1.0",
-    "@next-deploy/functions-bundler": "0.1.0"
+    "@next-deploy/core": "0.1.0"
   },
   "scripts": {
     "build": "tsup && pnpm build:types",