naro-cli 0.4.1 → 0.5.0

package/dist/{chunk-YLFLDW2H.js → chunk-ZHVBIQBE.js}

@@ -207,6 +207,11 @@ function pathnameOf(url2) {
   }
 }
 
+// ../../packages/core/src/paths.ts
+function projectPath(teamSlug, projectSlug) {
+  return `/${teamSlug}/projects/${projectSlug}`;
+}
+
 // ../../node_modules/.pnpm/zod@4.4.3/node_modules/zod/v4/classic/external.js
 var external_exports = {};
 __export(external_exports, {
@@ -17224,6 +17229,7 @@ async function deployDirectory(sourceDir, options, log2) {
   log2("\u25B8 starting deployment");
   const ctx = await client.deployments.createCli({
     ...options.projectId ? { projectId: options.projectId } : { name },
+    ...options.teamSlug ? { teamSlug: options.teamSlug } : {},
     production,
     ...git.repositoryUrl != null && { repositoryUrl: git.repositoryUrl },
     ...branch != null && { branch },
@@ -17284,7 +17290,10 @@ async function deployDirectory(sourceDir, options, log2) {
     status: detail.deployment.status,
     url: url2,
     production,
-    missingEnvKeys
+    missingEnvKeys,
+    teamSlug: ctx.teamSlug,
+    projectSlug: ctx.projectSlug,
+    gitConnection: ctx.gitConnection
   };
 }
 async function waitForFinish(client, ctx, log2) {
@@ -17305,6 +17314,7 @@ function deploymentUrl(detail, ctx, production) {
 
 export {
   parseGitHubRemote,
+  projectPath,
   NaroError,
   isNaroError,
   toNaroError,

package/dist/deploy.d.ts

@@ -1,3 +1,4 @@
+import { type CliGitConnection } from "@next-deploy/sdk";
 import type { BuildObserver, DeploymentArtifact, DeploymentStatus } from "./artifact-types";
 /** The slice of LocalBuildExecutor the deploy flow needs — injectable in tests. */
 export interface DeployBuildExecutor {
@@ -22,6 +23,8 @@ export interface DeployOptions {
     name?: string | undefined;
     /** Linked project id (.naro/project.json or --project). */
     projectId?: string | undefined;
+    /** Owning team slug, resolved by the caller (see commands/link.ts). */
+    teamSlug?: string | undefined;
     rootDirectory?: string | null;
     production?: boolean;
     env?: Record<string, string> | undefined;
@@ -49,6 +52,10 @@ export interface DeployResult {
     production: boolean;
     /** 끝까지 채워지지 않은 키. */
     missingEnvKeys: string[];
+    /** 서버가 확정한 목적지 — 출력과 링크 파일이 이 값을 쓴다. */
+    teamSlug: string;
+    projectSlug: string;
+    gitConnection: CliGitConnection;
 }
 /**
  * The full CLI deploy: authenticate, register the deployment with the

package/dist/deploy.js

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

package/dist/index.js

@@ -15,6 +15,7 @@ import {
   login,
   openBrowser,
   parseGitHubRemote,
+  projectPath,
   promptForMissingEnv,
   readProjectLink,
   refreshStoredSession,
@@ -25,7 +26,7 @@ import {
   slugify,
   toNaroError,
   writeProjectLink
-} from "./chunk-YLFLDW2H.js";
+} from "./chunk-ZHVBIQBE.js";
 
 // src/args.ts
 var BOOLEAN_FLAGS = {
@@ -522,20 +523,34 @@ async function runGitDisconnect(context) {
     "   Deploy from here with: naro deploy"
   ]);
 }
-async function offerAutoDeploy(context, projectId, overrides = {}) {
+async function offerAutoDeploy(context, projectId, overrides) {
   const deps = { ...defaults, ...overrides };
   if (overrides.canPrompt === false) return;
   try {
     if (readProjectLink(context.cwd)?.autoDeployDeclined === true) return;
-    const remote = await deps.detectRemote(context.cwd);
-    const parsed = remote ? parseGitHubRemote(remote) : null;
-    if (!parsed) return;
-    const client = await context.client();
-    const project = await client.projects.get(projectId);
-    if (project.repositoryFullName) return;
-    const wanted = await context.prompter.confirm(
-      "Should your changes deploy automatically from now on?"
-    );
+    const connection = overrides.gitConnection;
+    if (connection.state === "connected" || connection.state === "none") return;
+    const fullName = connection.fullName;
+    if (!fullName) return;
+    let wanted;
+    if (connection.state === "unreachable") {
+      const installed = connection.installedAccounts ?? [];
+      context.output.log(
+        `
+\u25B8 Automatic deploys need the Naro GitHub App on \`${connection.repoOwner ?? fullName}\`.`
+      );
+      if (overrides.teamSlug && installed.length > 0)
+        context.output.log(
+          `  Team ${overrides.teamSlug} has it on: ${installed.join(", ")}.`
+        );
+      wanted = await context.prompter.confirm(
+        "Install it for this team now? (opens your browser)"
+      );
+    } else {
+      wanted = await context.prompter.confirm(
+        "Should your changes deploy automatically from now on?"
+      );
+    }
     if (!wanted) {
       const link = readProjectLink(context.cwd);
       writeProjectLink(context.cwd, {
@@ -547,18 +562,19 @@ async function offerAutoDeploy(context, projectId, overrides = {}) {
       );
       return;
     }
-    const result = await client.projects.connectGit(projectId, parsed.fullName);
+    const client = await context.client();
+    const result = await client.projects.connectGit(projectId, fullName);
     if (result.ok) {
       connected(context, result.project);
       return;
     }
     if (!result.installUrl) return;
     context.output.log(`
-\u25B8 Naro needs access to ${parsed.fullName}.`);
+\u25B8 Naro needs access to ${fullName}.`);
     context.output.log(`  Opening ${result.installUrl}`);
     deps.openBrowser(result.installUrl);
     context.output.log("  Waiting for the installation to finish...\n");
-    await waitForInstall(context, projectId, parsed.fullName, deps);
+    await waitForInstall(context, projectId, fullName, deps);
   } catch (error) {
     context.output.log(
       `\u25B8 Could not set up automatic deploys (${error instanceof Error ? error.message : String(error)}).`
@@ -567,10 +583,150 @@ async function offerAutoDeploy(context, projectId, overrides = {}) {
   }
 }
 
+// src/commands/link.ts
+var SWITCH_ACCOUNT = "Sign in as a different account\u2026";
+async function resolveTeam(context, teams, deps = {}) {
+  const explicit = context.flags.team ?? process.env.NARO_TEAM;
+  if (explicit) {
+    const match = teams.find((team) => team.slug === explicit);
+    if (!match)
+      throw new NaroError(
+        "NOT_FOUND",
+        `You are not a member of team "${explicit}".`
+      );
+    return match;
+  }
+  const linked = context.projectLink();
+  if (linked?.teamSlug) {
+    const match = teams.find((team) => team.slug === linked.teamSlug);
+    if (match) return match;
+  }
+  if (teams.length === 0)
+    throw new NaroError("NOT_FOUND", "Your account has no teams yet.");
+  const canPrompt = deps.canPrompt?.() ?? (!context.flags.json && !context.flags.yes && isInteractive());
+  if (!canPrompt)
+    throw new NaroError(
+      "TEAM_REQUIRED",
+      `Cannot pick a team without a prompt. Pass --team <slug>, set NARO_TEAM, or run \`naro link\` first.
+  Your teams: ${teams.map((team) => team.slug).join(", ")}`
+    );
+  const account = deps.accountLabel ? await deps.accountLabel() : "this account";
+  if (teams.length === 1) {
+    const only = teams[0];
+    const label = only.isPersonal ? `${only.name} (personal)` : only.name;
+    context.output.log(`
+   ${account} \u2192 ${label}`);
+    const ok = await context.prompter.confirm(
+      "Deploy to this account and team?"
+    );
+    if (ok) return only;
+    return switchAndRetry(context, deps);
+  }
+  const options = [
+    ...teams.map(
+      (team) => `${team.name}${team.isPersonal ? "  (personal)" : ""}`
+    ),
+    SWITCH_ACCOUNT
+  ];
+  const index = await context.prompter.select(
+    `Deploying as ${account} \u2014 which team owns this project?`,
+    options
+  );
+  const picked = teams[index];
+  if (picked) return picked;
+  return switchAndRetry(context, deps);
+}
+async function switchAndRetry(context, deps) {
+  if (!deps.switchAccount || !deps.listTeams)
+    throw new NaroError(
+      "CANCELED",
+      "Canceled. Switch accounts with `naro logout && naro login`."
+    );
+  await deps.switchAccount();
+  const teams = await deps.listTeams();
+  return resolveTeam(context, teams, deps);
+}
+function saveLink(context, project, teamSlug) {
+  writeProjectLink(context.cwd, {
+    projectId: project.id,
+    teamSlug,
+    projectName: project.name
+  });
+  if (ensureGitignoreHasNaro(context.cwd))
+    context.output.log("\u25B8 added .naro to .gitignore");
+}
+async function runLink(context) {
+  const client = await context.client();
+  const teams = await client.teams.list();
+  const team = await resolveTeam(context, teams);
+  const projects = await client.projects.list(team.slug);
+  let project;
+  if (context.flags.project) {
+    project = projects.find(
+      (candidate) => candidate.id === context.flags.project
+    );
+    if (!project) {
+      project = await client.projects.get(context.flags.project);
+    }
+  } else if (context.flags.name) {
+    project = projects.find(
+      (candidate) => candidate.name === context.flags.name || candidate.slug === context.flags.name
+    );
+    if (!project)
+      throw new NaroError(
+        "PROJECT_NOT_FOUND",
+        `No project named "${context.flags.name}" in team ${team.slug}. Run \`naro deploy\` to create it.`
+      );
+  } else {
+    const guess = slugify(context.cwd.split("/").at(-1) ?? "app");
+    const exact = projects.find(
+      (candidate) => candidate.name === guess || candidate.slug === guess
+    );
+    if (exact && (context.flags.yes || context.flags.json)) {
+      project = exact;
+    } else if (projects.length === 0) {
+      throw new NaroError(
+        "PROJECT_NOT_FOUND",
+        `Team ${team.slug} has no projects yet. Run \`naro deploy\` to create one.`
+      );
+    } else {
+      const options = projects.map(
+        (candidate) => `${candidate.name} (${candidate.subdomain})`
+      );
+      const index = await context.prompter.select(
+        `Link ${context.cwd} to which project?`,
+        options
+      );
+      project = projects[index];
+    }
+  }
+  if (!project)
+    throw new NaroError("PROJECT_NOT_FOUND", "No project selected.");
+  const owningTeam = teams.find((candidate) => candidate.id === project.teamId) ?? team;
+  saveLink(context, project, owningTeam.slug);
+  context.output.result(
+    {
+      projectId: project.id,
+      projectName: project.name,
+      teamSlug: owningTeam.slug,
+      subdomain: project.subdomain
+    },
+    [`\u2705 Linked to ${owningTeam.slug}/${project.name} (.naro/project.json)`]
+  );
+}
+async function runUnlink(context) {
+  const existing = readProjectLink(context.cwd);
+  const removed = removeProjectLink(context.cwd);
+  context.output.result(
+    { removed, ...existing ? { projectId: existing.projectId } : {} },
+    [removed ? "\u2705 Unlinked (.naro removed)" : "Nothing to unlink here."]
+  );
+}
+
 // src/commands/deploy.ts
 async function runDeploy(context, deps = { deploy: deployDirectory, offerAutoDeploy }) {
   const { flags, output } = context;
-  const link = flags.project ? { projectId: flags.project } : readProjectLink(context.cwd);
+  const link = flags.project ? { projectId: flags.project, teamSlug: void 0 } : readProjectLink(context.cwd);
   if (flags.prod && !flags.yes && !flags.json && isInteractive()) {
     const confirmed = await context.prompter.confirm("Deploy to production?");
     if (!confirmed) throw new NaroError("CANCELED", "Canceled.");
@@ -578,12 +734,17 @@ async function runDeploy(context, deps = { deploy: deployDirectory, offerAutoDep
   output.log(`
 \u{1F680} Deploying ${context.cwd}
 `);
-  const canPrompt = !flags.json && !flags.yes && isInteractive();
+  const canPrompt = deps.canPrompt?.() ?? (!flags.json && !flags.yes && isInteractive());
+  const team = await resolveDestination(context, link, canPrompt);
+  const account = await accountLabel(context);
+  output.log(`   ${account} \u2192 ${team.slug}
+`);
   const result = await deps.deploy(
     context.cwd,
     {
       name: flags.name,
       projectId: link?.projectId,
+      teamSlug: team.slug,
       rootDirectory: flags.root ?? null,
       branch: flags.branch,
       production: flags.prod,
@@ -598,13 +759,24 @@ async function runDeploy(context, deps = { deploy: deployDirectory, offerAutoDep
     },
     (message) => output.log(message)
   );
+  const existing = readProjectLink(context.cwd);
+  writeProjectLink(context.cwd, {
+    projectId: result.projectId,
+    teamSlug: result.teamSlug,
+    projectName: result.projectSlug,
+    ...existing?.autoDeployDeclined === true ? { autoDeployDeclined: true } : {}
+  });
   if (!link) {
-    writeProjectLink(context.cwd, { projectId: result.projectId });
     if (ensureGitignoreHasNaro(context.cwd))
       output.log("\u25B8 added .naro to .gitignore");
     output.log("\u25B8 linked (.naro/project.json)");
   }
-  await deps.offerAutoDeploy?.(context, result.projectId, { canPrompt });
+  await deps.offerAutoDeploy?.(context, result.projectId, {
+    canPrompt,
+    gitConnection: result.gitConnection,
+    teamSlug: result.teamSlug
+  });
+  const inspect = `${controlPlaneUrl()}${projectPath(result.teamSlug, result.projectSlug)}`;
   context.output.result(
     {
       deploymentId: result.deploymentId,
@@ -612,16 +784,54 @@ async function runDeploy(context, deps = { deploy: deployDirectory, offerAutoDep
       status: result.status,
       url: result.url,
       target: result.production ? "production" : "preview",
+      teamSlug: result.teamSlug,
+      inspectUrl: inspect,
       missingEnvKeys: result.missingEnvKeys
     },
     [
       "",
       `\u2705 Deployment ready (${result.production ? "production" : "preview"})`,
       "",
-      result.url
+      `   ${result.url}`,
+      `   Inspect  ${inspect}`
     ]
   );
 }
+async function resolveDestination(context, link, canPrompt) {
+  const client = await context.client();
+  const teams = await client.teams.list();
+  const deps = scopeDeps(context, canPrompt);
+  if (link?.teamSlug) {
+    const match = teams.find((team) => team.slug === link.teamSlug);
+    if (match) return match;
+  } else if (link) {
+    const project = await client.projects.get(link.projectId);
+    const match = teams.find((team) => team.id === project.teamId);
+    if (match) return match;
+  }
+  return resolveTeam(context, teams, deps);
+}
+function scopeDeps(context, canPrompt) {
+  return {
+    canPrompt: () => canPrompt,
+    accountLabel: () => accountLabel(context),
+    switchAccount: async () => {
+      clearSession();
+      await runLogin(context);
+    },
+    listTeams: async () => (await context.client()).teams.list()
+  };
+}
+async function accountLabel(context) {
+  try {
+    const { user } = await context.auth();
+    if (!user) return "this account";
+    const name = user.email ?? user.id;
+    return user.github ? `${name} (${user.github})` : name;
+  } catch {
+    return "this account";
+  }
+}
 
 // src/commands/deployments.ts
 function shortSha(sha) {
@@ -875,112 +1085,6 @@ ${serializeDotenv(vars)}`,
   );
 }
 
-// src/commands/link.ts
-async function resolveTeam(context, teams) {
-  if (context.flags.team) {
-    const match = teams.find((team) => team.slug === context.flags.team);
-    if (!match)
-      throw new NaroError(
-        "NOT_FOUND",
-        `You are not a member of team "${context.flags.team}".`
-      );
-    return match;
-  }
-  const linked = context.projectLink();
-  if (linked?.teamSlug) {
-    const match = teams.find((team) => team.slug === linked.teamSlug);
-    if (match) return match;
-  }
-  const personal = teams.find((team) => team.isPersonal);
-  const fallback = personal ?? teams[0];
-  if (!fallback)
-    throw new NaroError("NOT_FOUND", "Your account has no teams yet.");
-  if (teams.length > 1 && !personal) {
-    const index = await context.prompter.select(
-      "Which team?",
-      teams.map((team) => `${team.name} (${team.slug})`)
-    );
-    return teams[index] ?? fallback;
-  }
-  return fallback;
-}
-function saveLink(context, project, teamSlug) {
-  writeProjectLink(context.cwd, {
-    projectId: project.id,
-    teamSlug,
-    projectName: project.name
-  });
-  if (ensureGitignoreHasNaro(context.cwd))
-    context.output.log("\u25B8 added .naro to .gitignore");
-}
-async function runLink(context) {
-  const client = await context.client();
-  const teams = await client.teams.list();
-  const team = await resolveTeam(context, teams);
-  const projects = await client.projects.list(team.slug);
-  let project;
-  if (context.flags.project) {
-    project = projects.find(
-      (candidate) => candidate.id === context.flags.project
-    );
-    if (!project) {
-      project = await client.projects.get(context.flags.project);
-    }
-  } else if (context.flags.name) {
-    project = projects.find(
-      (candidate) => candidate.name === context.flags.name || candidate.slug === context.flags.name
-    );
-    if (!project)
-      throw new NaroError(
-        "PROJECT_NOT_FOUND",
-        `No project named "${context.flags.name}" in team ${team.slug}. Run \`naro deploy\` to create it.`
-      );
-  } else {
-    const guess = slugify(context.cwd.split("/").at(-1) ?? "app");
-    const exact = projects.find(
-      (candidate) => candidate.name === guess || candidate.slug === guess
-    );
-    if (exact && (context.flags.yes || context.flags.json)) {
-      project = exact;
-    } else if (projects.length === 0) {
-      throw new NaroError(
-        "PROJECT_NOT_FOUND",
-        `Team ${team.slug} has no projects yet. Run \`naro deploy\` to create one.`
-      );
-    } else {
-      const options = projects.map(
-        (candidate) => `${candidate.name} (${candidate.subdomain})`
-      );
-      const index = await context.prompter.select(
-        `Link ${context.cwd} to which project?`,
-        options
-      );
-      project = projects[index];
-    }
-  }
-  if (!project)
-    throw new NaroError("PROJECT_NOT_FOUND", "No project selected.");
-  const owningTeam = teams.find((candidate) => candidate.id === project.teamId) ?? team;
-  saveLink(context, project, owningTeam.slug);
-  context.output.result(
-    {
-      projectId: project.id,
-      projectName: project.name,
-      teamSlug: owningTeam.slug,
-      subdomain: project.subdomain
-    },
-    [`\u2705 Linked to ${owningTeam.slug}/${project.name} (.naro/project.json)`]
-  );
-}
-async function runUnlink(context) {
-  const existing = readProjectLink(context.cwd);
-  const removed = removeProjectLink(context.cwd);
-  context.output.result(
-    { removed, ...existing ? { projectId: existing.projectId } : {} },
-    [removed ? "\u2705 Unlinked (.naro removed)" : "Nothing to unlink here."]
-  );
-}
-
 // src/commands/logs.ts
 var FOLLOW_INTERVAL_MS = 3e3;
 function sleep(ms) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "naro-cli",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "type": "module",
   "bin": {
     "naro": "./dist/index.js"
@@ -28,8 +28,8 @@
     "tsx": "4.23.12",
     "typescript": "7.0.2",
     "vitest": "3.2.7",
-    "@next-deploy/build": "0.1.0",
     "@next-deploy/core": "0.1.0",
+    "@next-deploy/build": "0.1.0",
     "@next-deploy/config": "0.1.0",
     "@next-deploy/sdk": "0.1.0"
   },