@zoahhq/cli 0.1.8 → 0.1.9

package/README.md

@@ -46,7 +46,7 @@ zoah login --organization acme                  # skip the organization list
 
 After you sign in, the CLI asks which organization to work in. Your active organization in the web app is first and selected. Use the arrow keys to choose another, then press Enter. An account with one organization skips the question.
 
-The CLI keeps this choice. Changing organizations in the web app does not change it. New projects from `zoah import` go into this organization. A repo that already has `.zoah/config.json` keeps updating its own project.
+The CLI keeps this choice. Changing organizations in the web app does not change it. New projects from `zoah import` go into this organization, and so do directories that are imported but not swapped yet. A swapped directory stays on its project (see [Where a directory stands](#where-a-directory-stands)).
 
 The CLI uses `ZOAH_BASE_URL` when it is set. Otherwise, it uses `https://zoah.com`. `OPACITY_BASE_URL` remains a compatibility fallback.
 
@@ -59,6 +59,14 @@ By default, this removes the **active** credentials. It removes project-local cr
 
 To clear both, run logout twice.
 
+### `zoah status`
+
+Prints who is signed in, the CLI's organization, and this directory's project, package and state, plus what the next `zoah import` will do. It reads local files only.
+
+```bash
+zoah status
+```
+
 ### `zoah whoami`
 
 Prints the active user, the source credentials file, the base URL, and the organization the CLI works in. Use this when project credentials hide the global token.
@@ -215,18 +223,32 @@ zoah import                       # scans ./src
 zoah import src/components        # scope to a subdirectory
 zoah import --swap                # also rewrite local imports after publish
 zoah import --project-name my-ui  # override the first project name
+zoah import --new-project         # start over in a new project (before a swap)
 zoah import --branch main         # target a specific branch
 zoah import --debug               # also write .zoah/debug/payload.json
 zoah import --print-issues warn   # print issue details at or above this level
 zoah import --dry-run             # preview locally without an API call
 ```
 
-The first import creates a project and saves its IDs to `.zoah/config.json`. Later imports use the same project.
+The first import creates a project and saves its IDs to `.zoah/config.json`. Before it scans, `zoah import` says where the directory stands and where this import goes.
+
+#### Where a directory stands
+
+`zoah status` prints this without scanning or calling the API.
+
+| State    | What it means                                                 | What `zoah import` does                                                                                                                                                                                                       |
+| -------- | ------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| New      | No `.zoah/config.json`.                                       | Creates a project in the CLI's organization.                                                                                                                                                                                  |
+| Imported | Linked to a project, but no source file uses its package yet. | Updates the linked project. If the CLI's organization is different, it creates a project there and relinks the directory. `--new-project` also starts a new project.                                                          |
+| Swapped  | `zoah swap` rewrote component files to use the package.       | Adds and updates components in the linked project, whichever organization the CLI is in. Swapped components are already in Zoah, so the scan skips them. `--new-project` is refused, because the code depends on the package. |
+
+A swapped directory stays on its project because its code imports that project's package. It still takes new components: add one and run `zoah import --swap`.
 
 Notable flags:
 
 - `--swap`: runs `zoah swap` after a successful import.
-- `--project-name <name>`: sets the first project name. Later imports use the project ID in `.zoah/config.json`.
+- `--project-name <name>`: sets the name of a new project. Later imports use the project ID in `.zoah/config.json`.
+- `--new-project`: creates a new project in the CLI's organization and relinks the directory. Not possible once the directory is swapped.
 - `--branch <name>`: defaults to the project's saved branch (usually `main`).
 - `--base-url <url>`: overrides the URL saved at login.
 - `--print-issues <level>`: also prints full details for every issue at or above `info | warn | error`.

package/dist/cli.mjs

@@ -422,6 +422,7 @@ var init_client = __esm({
 // src/config/local.ts
 var local_exports = {};
 __export(local_exports, {
+  manifestSourceFile: () => manifestSourceFile,
   readComponentsManifest: () => readComponentsManifest,
   readPackageManifest: () => readPackageManifest,
   readProjectConfig: () => readProjectConfig,
@@ -430,6 +431,11 @@ __export(local_exports, {
   writePackageManifest: () => writePackageManifest,
   writeProjectConfig: () => writeProjectConfig
 });
+function manifestSourceFile(key, entry) {
+  if (entry.sourceFile !== void 0) return entry.sourceFile;
+  const hash = key.indexOf("#");
+  return hash === -1 ? key : key.slice(0, hash);
+}
 function readProjectConfig(cwd) {
   return readCurrentOrLegacy(
     zoahPaths.config(cwd),
@@ -471,6 +477,120 @@ var init_local = __esm({
   }
 });
 
+// src/config/directory-state.ts
+import { existsSync } from "fs";
+import { readFile as readFile2 } from "fs/promises";
+import { isAbsolute, join as join2 } from "path";
+function importsPackage(source, packageName) {
+  const escaped = packageName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  return new RegExp(`from\\s+["']${escaped}(?:/[^"']*)?["']`).test(source);
+}
+async function readDirectoryState(cwd) {
+  const config = await readProjectConfig(cwd);
+  if (!config) return { kind: "new" };
+  const manifest = await readPackageManifest(cwd);
+  const components2 = await readComponentsManifest(cwd);
+  if (!manifest || !components2) {
+    return { kind: "imported", config, manifest, components: components2 };
+  }
+  const files = new Set(
+    Object.entries(components2).map(
+      ([key, entry]) => manifestSourceFile(key, entry)
+    )
+  );
+  const swappedFiles = [];
+  for (const file of files) {
+    const path4 = isAbsolute(file) ? file : join2(cwd, file);
+    if (!existsSync(path4)) continue;
+    if (importsPackage(await readFile2(path4, "utf8"), manifest.name)) {
+      swappedFiles.push(file);
+    }
+  }
+  if (swappedFiles.length === 0) {
+    return { kind: "imported", config, manifest, components: components2 };
+  }
+  return { kind: "swapped", config, manifest, components: components2, swappedFiles };
+}
+function resolveImportTarget(state, organization, opts = {}) {
+  if (state.kind === "new") return { kind: "new", reason: "first" };
+  if (state.kind === "swapped") {
+    if (opts.newProject) {
+      throw new DirectoryLockedError(state, "Starting a new project");
+    }
+    return {
+      kind: "existing",
+      config: state.config,
+      components: state.components,
+      locked: true
+    };
+  }
+  if (opts.newProject) {
+    return { kind: "new", reason: "requested", replaces: state.config };
+  }
+  if (organization && organization.id !== state.config.orgId) {
+    return { kind: "new", reason: "organization", replaces: state.config };
+  }
+  return {
+    kind: "existing",
+    config: state.config,
+    components: state.components,
+    locked: false
+  };
+}
+function projectLabel(config) {
+  return `${config.projectSlug ?? config.projectId} in ${config.orgSlug ?? config.orgId}`;
+}
+function organizationLabel(organization) {
+  if (!organization) return "your active organization";
+  return organization.slug ? `${organization.name} (${organization.slug})` : organization.name;
+}
+function describeState(state) {
+  switch (state.kind) {
+    case "new":
+      return "Not linked to a Zoah project yet.";
+    case "imported":
+      return `Linked to ${projectLabel(state.config)}. Nothing is swapped yet, so the link can still change.`;
+    case "swapped":
+      return `Swapped to ${state.manifest.name} (${state.swappedFiles.length === 1 ? "1 file" : `${state.swappedFiles.length} files`}), so it stays on ${projectLabel(state.config)}.`;
+  }
+}
+function describeTarget(target, organization) {
+  if (target.kind === "existing") {
+    return `Adds and updates components in ${projectLabel(target.config)}.`;
+  }
+  const where = organizationLabel(organization);
+  switch (target.reason) {
+    case "first":
+      return `Creates a project in ${where}.`;
+    case "organization":
+      return `Creates a project in ${where}, the CLI's organization, and links this directory to it instead of ${projectLabel(target.replaces)}.`;
+    case "requested":
+      return `Creates a new project in ${where} and links this directory to it instead of ${projectLabel(target.replaces)}.`;
+  }
+}
+function organizationNote(target, organization) {
+  if (target.kind === "existing" && target.locked && organization && organization.id !== target.config.orgId) {
+    return `The CLI works in ${organizationLabel(organization)}, but a swapped directory stays on its project.`;
+  }
+  return null;
+}
+var DirectoryLockedError;
+var init_directory_state = __esm({
+  "src/config/directory-state.ts"() {
+    "use strict";
+    init_local();
+    DirectoryLockedError = class extends Error {
+      constructor(state, action) {
+        super(
+          `${action} is not possible here: this directory is swapped to ${state.manifest.name} (${state.swappedFiles.length === 1 ? "1 file" : `${state.swappedFiles.length} files`}), so it stays on ${projectLabel(state.config)}. \`zoah import\` still adds and updates components in that project.`
+        );
+        this.state = state;
+        this.name = "DirectoryLockedError";
+      }
+    };
+  }
+});
+
 // src/mcp/refs.ts
 function matchRef(options) {
   const trimmed = options.reference.trim();
@@ -1074,7 +1194,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/config/version.ts"() {
     "use strict";
-    CLI_VERSION = true ? "0.1.8" : "0.0.0-dev";
+    CLI_VERSION = true ? "0.1.9" : "0.0.0-dev";
   }
 });
 
@@ -1179,7 +1299,9 @@ function StatusLine({ children }) {
 }
 function introCopy({
   userEmail,
-  zoahUrl
+  zoahUrl,
+  directory,
+  next
 }) {
   if (!userEmail) {
     return {
@@ -1197,7 +1319,7 @@ function introCopy({
   }
   return {
     heading: "Want to rescan?",
-    body: "We will scan your library again and upload it as a new Zoah project. The previous project stays available.",
+    body: directory && next ? `${directory} The next import: ${next}` : "We will scan your library again and update the linked Zoah project.",
     goLabel: "Rescan"
   };
 }
@@ -1221,12 +1343,14 @@ var init_screens = __esm({
       userEmail,
       zoahUrl,
       lastScanAge,
-      sync: sync2
+      sync: sync2,
+      directory,
+      next
     }) => function Intro({ value, onFinish }) {
       const settled = value !== void 0;
       const screenReaderEnabled = useIsScreenReaderEnabled();
       const [logoDone, setLogoDone] = useState2(settled || screenReaderEnabled);
-      const copy = introCopy({ userEmail, zoahUrl });
+      const copy = introCopy({ userEmail, zoahUrl, directory, next });
       const showStatus = useReveal(150, logoDone);
       const showPitch = useReveal(500, logoDone);
       const showPicker = useReveal(850, logoDone);
@@ -1363,6 +1487,9 @@ var init_screens = __esm({
     };
     COMPONENT_LIST_CAP = 20;
     DesignSummary = (report) => {
+      if (report.upToDate) {
+        return /* @__PURE__ */ jsx3(Panel, { title: "Nothing new to import", children: /* @__PURE__ */ jsx3(Text3, { children: `The components here are already swapped to ${report.upToDate}. Add a component, then run \`zoah\` again.` }) });
+      }
       const checkRow = (key, label, suffix) => /* @__PURE__ */ jsxs3(Box3, { gap: 1, children: [
         /* @__PURE__ */ jsx3(Text3, { color: "green", children: "\u2713" }),
         /* @__PURE__ */ jsx3(Text3, { children: label }),
@@ -1554,17 +1681,12 @@ async function runOrganizationSwitch(opts) {
   const organization = toCliOrganization(chosen);
   await writeCredentialOrganization(found, organization);
   console.log(`The CLI now works in ${describe(organization)}.`);
-  const config = await readProjectConfig(opts.cwd);
-  if (config && config.orgId !== organization.id) {
+  const state = await readDirectoryState(opts.cwd);
+  if (state.kind !== "new") {
+    const target = resolveImportTarget(state, organization);
+    console.log(dim(`  This directory: ${describeState(state)}`));
     console.log(
-      dim(
-        `  This repo's project is in ${config.orgSlug ?? config.orgId}, and \`zoah import\` keeps updating it.`
-      )
-    );
-    console.log(
-      dim(
-        "  To import into this organization instead, remove .zoah/config.json, .zoah/components.json and .zoah/manifest.json."
-      )
+      dim(`  Next import here: ${describeTarget(target, organization)}`)
     );
   }
 }
@@ -1586,7 +1708,7 @@ var init_organization = __esm({
     "use strict";
     init_client();
     init_session();
-    init_local();
+    init_directory_state();
     init_refs();
     init_colors();
   }
@@ -1673,11 +1795,11 @@ var init_errors = __esm({
 });
 
 // src/util/ensure-gitignore.ts
-import { readFile as readFile2 } from "fs/promises";
+import { readFile as readFile3 } from "fs/promises";
 async function ensureZoahGitignore(cwd) {
   const path4 = zoahPaths.gitignore(cwd);
   try {
-    const current2 = await readFile2(path4, "utf8");
+    const current2 = await readFile3(path4, "utf8");
     if (current2 === GITIGNORE_CONTENT) return;
   } catch (err) {
     if (err.code !== "ENOENT") throw err;
@@ -25557,14 +25679,14 @@ var init_issues_snapshot = __esm({
 });
 
 // src/parse/scan.ts
-import { existsSync, statSync } from "fs";
-import { isAbsolute, join as join2, relative, resolve } from "path";
+import { existsSync as existsSync2, statSync } from "fs";
+import { isAbsolute as isAbsolute2, join as join3, relative, resolve } from "path";
 import { Project } from "ts-morph";
 function findTsConfig(cwd) {
   const candidates = ["tsconfig.json", "jsconfig.json"];
   for (const name of candidates) {
-    const full = join2(cwd, name);
-    if (existsSync(full)) return full;
+    const full = join3(cwd, name);
+    if (existsSync2(full)) return full;
   }
   return null;
 }
@@ -25580,17 +25702,17 @@ function loadProject(opts) {
       /* Preserve */
     }
   });
-  const scopeAbsolute = isAbsolute(opts.scopePath) ? opts.scopePath : resolve(opts.cwd, opts.scopePath);
-  if (existsSync(scopeAbsolute)) {
+  const scopeAbsolute = isAbsolute2(opts.scopePath) ? opts.scopePath : resolve(opts.cwd, opts.scopePath);
+  if (existsSync2(scopeAbsolute)) {
     const stat = statSync(scopeAbsolute);
     if (stat.isDirectory()) {
       const patterns = SOURCE_EXTENSIONS.map(
-        (ext) => join2(scopeAbsolute, `**/*.${ext}`)
+        (ext) => join3(scopeAbsolute, `**/*.${ext}`)
       );
       for (const dir of IGNORED_DIRS) {
-        patterns.push(`!${join2(scopeAbsolute, `**/${dir}/**`)}`);
+        patterns.push(`!${join3(scopeAbsolute, `**/${dir}/**`)}`);
       }
-      patterns.push(`!${join2(scopeAbsolute, "**/*.d.ts")}`);
+      patterns.push(`!${join3(scopeAbsolute, "**/*.d.ts")}`);
       project.addSourceFilesAtPaths(patterns);
     } else {
       project.addSourceFileAtPathIfExists(scopeAbsolute);
@@ -25740,7 +25862,7 @@ var init_classify = __esm({
 });
 
 // src/parse/entry-points.ts
-import { existsSync as existsSync2 } from "fs";
+import { existsSync as existsSync3 } from "fs";
 import { resolve as resolve2 } from "path";
 function isFrameworkReservedFile(filePath) {
   const base = filePath.split("/").pop() ?? "";
@@ -25752,7 +25874,7 @@ function findEntrySkips(project, cwd) {
   const entryFiles = [];
   for (const candidate of ENTRY_CANDIDATES) {
     const fullPath = resolve2(cwd, candidate);
-    if (!existsSync2(fullPath)) continue;
+    if (!existsSync3(fullPath)) continue;
     let sf = project.getSourceFile(fullPath);
     if (!sf) {
       sf = project.addSourceFileAtPathIfExists(fullPath) ?? void 0;
@@ -25885,10 +26007,10 @@ var init_styled_components = __esm({
 });
 
 // src/parse/module-resolution.ts
-import { existsSync as existsSync3, readFileSync, readdirSync, statSync as statSync2 } from "fs";
-import { dirname as dirname2, isAbsolute as isAbsolute2, join as join3, relative as relative2, resolve as resolve3, sep } from "path";
+import { existsSync as existsSync4, readFileSync, readdirSync, statSync as statSync2 } from "fs";
+import { dirname as dirname2, isAbsolute as isAbsolute3, join as join4, relative as relative2, resolve as resolve3, sep } from "path";
 function readTsconfig(absPath) {
-  if (!existsSync3(absPath)) return null;
+  if (!existsSync4(absPath)) return null;
   let raw;
   try {
     raw = readFileSync(absPath, "utf8");
@@ -25906,7 +26028,7 @@ function readTsconfig(absPath) {
 function loadTsconfigPaths(cwd) {
   const candidates = ["tsconfig.json", "jsconfig.json"];
   for (const name of candidates) {
-    const path4 = join3(cwd, name);
+    const path4 = join4(cwd, name);
     const tsconfig = readTsconfig(path4);
     if (!tsconfig) continue;
     const opts = tsconfig.compilerOptions;
@@ -25956,13 +26078,13 @@ function expandWorkspaceGlob(rootCwd, pattern) {
   const starIdx = cleaned.indexOf("*");
   if (starIdx < 0) {
     const abs = resolve3(rootCwd, cleaned);
-    return existsSync3(join3(abs, "package.json")) ? [abs] : [];
+    return existsSync4(join4(abs, "package.json")) ? [abs] : [];
   }
   const prefix = cleaned.slice(0, starIdx).replace(/\/$/, "");
   const suffix = cleaned.slice(starIdx).replace(/^\*+\/?/, "");
   if (suffix.length > 0) return [];
   const dir = resolve3(rootCwd, prefix);
-  if (!existsSync3(dir)) return [];
+  if (!existsSync4(dir)) return [];
   let entries;
   try {
     entries = readdirSync(dir);
@@ -25972,19 +26094,19 @@ function expandWorkspaceGlob(rootCwd, pattern) {
   const out = [];
   for (const entry of entries) {
     if (entry.startsWith(".")) continue;
-    const child = join3(dir, entry);
+    const child = join4(dir, entry);
     try {
       if (!statSync2(child).isDirectory()) continue;
     } catch {
       continue;
     }
-    if (existsSync3(join3(child, "package.json"))) out.push(child);
+    if (existsSync4(join4(child, "package.json"))) out.push(child);
   }
   return out;
 }
 function readPackageJson(packageRoot) {
-  const path4 = join3(packageRoot, "package.json");
-  if (!existsSync3(path4)) return null;
+  const path4 = join4(packageRoot, "package.json");
+  if (!existsSync4(path4)) return null;
   try {
     const parsed = JSON.parse(readFileSync(path4, "utf8"));
     if (parsed && typeof parsed === "object") {
@@ -25996,8 +26118,8 @@ function readPackageJson(packageRoot) {
   }
 }
 function readPnpmWorkspaceGlobs(cwd) {
-  const path4 = join3(cwd, "pnpm-workspace.yaml");
-  if (!existsSync3(path4)) return [];
+  const path4 = join4(cwd, "pnpm-workspace.yaml");
+  if (!existsSync4(path4)) return [];
   let raw;
   try {
     raw = readFileSync(path4, "utf8");
@@ -26050,8 +26172,8 @@ function loadWorkspacePackages(cwd) {
       });
     }
   }
-  const lernaPath = join3(cwd, "lerna.json");
-  if (existsSync3(lernaPath)) {
+  const lernaPath = join4(cwd, "lerna.json");
+  if (existsSync4(lernaPath)) {
     try {
       const lerna = JSON.parse(readFileSync(lernaPath, "utf8"));
       if (Array.isArray(lerna.packages)) {
@@ -26072,7 +26194,7 @@ function findOwningWorkspace(workspaces, absPath) {
   let best = null;
   for (const ws of workspaces) {
     const rel = relative2(ws.root, absPath);
-    if (rel.startsWith("..") || isAbsolute2(rel)) continue;
+    if (rel.startsWith("..") || isAbsolute3(rel)) continue;
     if (!best || ws.root.length > best.root.length) best = ws;
   }
   return best;
@@ -26177,8 +26299,8 @@ function detectBuildTimeTransforms(cwd) {
   const detected = [];
   const seen = /* @__PURE__ */ new Set();
   for (const candidate of TRANSFORM_CONFIG_CANDIDATES) {
-    const path4 = join3(cwd, candidate);
-    if (!existsSync3(path4)) continue;
+    const path4 = join4(cwd, candidate);
+    if (!existsSync4(path4)) continue;
     let raw;
     try {
       raw = readFileSync(path4, "utf8");
@@ -26206,7 +26328,7 @@ function buildModuleResolutionContext(cwd) {
 function findOwningPackageRoot(absPath) {
   let dir = dirname2(absPath);
   for (let i3 = 0; i3 < MAX_PACKAGE_WALK_DEPTH; i3++) {
-    if (existsSync3(join3(dir, "package.json"))) return dir;
+    if (existsSync4(join4(dir, "package.json"))) return dir;
     const parent = dirname2(dir);
     if (parent === dir) return null;
     dir = parent;
@@ -26221,7 +26343,7 @@ function resolveImport(ctx, sourceFile, decl, issueCtx) {
   const line = decl.getStartLineNumber();
   const resolvedSf = decl.getModuleSpecifierSourceFile();
   const resolvedAbs = resolvedSf?.getFilePath() ?? null;
-  const isBareSpecifier = !specifier.startsWith(".") && !isAbsolute2(specifier);
+  const isBareSpecifier = !specifier.startsWith(".") && !isAbsolute3(specifier);
   const tsconfigMatch = isBareSpecifier && ctx.tsconfigPaths ? matchTsconfigPath(ctx.tsconfigPaths, specifier) : null;
   if (tsconfigMatch) {
     const resolvedTo = resolvedAbs ? relative2(ctx.cwd, resolvedAbs) || resolvedAbs : tsconfigMatch.resolvedTargets[0] ? relative2(ctx.cwd, tsconfigMatch.resolvedTargets[0]) || tsconfigMatch.resolvedTargets[0] : tsconfigMatch.pattern;
@@ -26757,16 +26879,16 @@ var init_discover = __esm({
 });
 
 // src/parse/tailwind-tokens.ts
-import { existsSync as existsSync4, readFileSync as readFileSync2 } from "fs";
-import { join as join4 } from "path";
+import { existsSync as existsSync5, readFileSync as readFileSync2 } from "fs";
+import { join as join5 } from "path";
 function cssImportsTailwind(cssText) {
   return /@import\s+["']tailwindcss["']/.test(cssText);
 }
 function findThemeCssFiles(cwd) {
   const found = [];
   for (const rel of CSS_ENTRY_CANDIDATES) {
-    const p4 = join4(cwd, rel);
-    if (!existsSync4(p4)) continue;
+    const p4 = join5(cwd, rel);
+    if (!existsSync5(p4)) continue;
     const text = safeRead(p4);
     if (text && (cssImportsTailwind(text) || /:root\s*\{|@theme\b/.test(text))) {
       found.push(p4);
@@ -27161,8 +27283,8 @@ var init_tailwind_engine = __esm({
 });
 
 // src/parse/tailwind.ts
-import { existsSync as existsSync5 } from "fs";
-import { join as join5 } from "path";
+import { existsSync as existsSync6 } from "fs";
+import { join as join6 } from "path";
 import { createJiti } from "jiti";
 function findConfig(cwd) {
   const candidates = [
@@ -27172,8 +27294,8 @@ function findConfig(cwd) {
     "tailwind.config.mjs"
   ];
   for (const name of candidates) {
-    const p4 = join5(cwd, name);
-    if (existsSync5(p4)) return p4;
+    const p4 = join6(cwd, name);
+    if (existsSync6(p4)) return p4;
   }
   return null;
 }
@@ -29198,15 +29320,15 @@ var init_plain_css = __esm({
 });
 
 // src/parse/css-resolution.ts
-import { dirname as dirname4, isAbsolute as isAbsolute3, resolve as resolve4 } from "path";
-import { existsSync as existsSync6 } from "fs";
+import { dirname as dirname4, isAbsolute as isAbsolute4, resolve as resolve4 } from "path";
+import { existsSync as existsSync7 } from "fs";
 import {
   Node as Node8
 } from "ts-morph";
 function resolveImportPath(fromFile, specifier) {
-  if (!specifier.startsWith(".") && !isAbsolute3(specifier)) return null;
-  const base = isAbsolute3(specifier) ? specifier : resolve4(dirname4(fromFile), specifier);
-  if (existsSync6(base)) return base;
+  if (!specifier.startsWith(".") && !isAbsolute4(specifier)) return null;
+  const base = isAbsolute4(specifier) ? specifier : resolve4(dirname4(fromFile), specifier);
+  if (existsSync7(base)) return base;
   return null;
 }
 function buildSourceFileResolverContext(sourceFile, emit, viewportWidth = 0) {
@@ -89897,8 +90019,8 @@ var init_dist4 = __esm({
 });
 
 // src/codemod/wrap-with-zoah.ts
-import { existsSync as existsSync7 } from "fs";
-import { join as join6, resolve as resolve5 } from "path";
+import { existsSync as existsSync8 } from "fs";
+import { join as join7, resolve as resolve5 } from "path";
 import {
   Node as Node10,
   Project as Project3,
@@ -89906,8 +90028,8 @@ import {
 } from "ts-morph";
 function findTsConfig2(cwd) {
   for (const name of ["tsconfig.json", "jsconfig.json"]) {
-    const full = join6(cwd, name);
-    if (existsSync7(full)) return full;
+    const full = join7(cwd, name);
+    if (existsSync8(full)) return full;
   }
   return null;
 }
@@ -90817,12 +90939,9 @@ function wrapSingleFile(file, filePath, entry, packageName, rootForwardingSurfac
   ensureAliasedImport(file, exportName, aliasName, moduleSpecifier);
   return { kind: "wrapped", infoFindings };
 }
-function sourceFileForManifestEntry(key, entry) {
-  return entry.sourceFile ?? key.split("#")[0] ?? key;
-}
 function groupManifestEntries(components2) {
   return Object.entries(components2).map(([key, entry]) => ({
-    filePath: sourceFileForManifestEntry(key, entry),
+    filePath: manifestSourceFile(key, entry),
     entry
   }));
 }
@@ -90847,7 +90966,7 @@ async function wrapWithZoah(opts) {
   }
   for (const [relPath, entries] of fileEntries) {
     const absPath = resolve5(opts.cwd, relPath);
-    if (!existsSync7(absPath)) {
+    if (!existsSync8(absPath)) {
       result.issues.push(
         makeIssue({
           code: "CODEMOD_SOURCE_FILE_NOT_FOUND",
@@ -90980,6 +91099,7 @@ var init_wrap_with_zoah = __esm({
   "src/codemod/wrap-with-zoah.ts"() {
     "use strict";
     init_cli_import();
+    init_local();
     init_discover();
     init_jsx_peel();
     init_props();
@@ -90988,17 +91108,17 @@ var init_wrap_with_zoah = __esm({
 });
 
 // src/codemod/install-package.ts
-import { existsSync as existsSync8 } from "fs";
-import { chmod as chmod2, readFile as readFile3, writeFile as writeFile2 } from "fs/promises";
-import { dirname as dirname5, join as join7 } from "path";
+import { existsSync as existsSync9 } from "fs";
+import { chmod as chmod2, readFile as readFile4, writeFile as writeFile2 } from "fs/promises";
+import { dirname as dirname5, join as join8 } from "path";
 import { homedir as homedir2 } from "os";
 import { spawn } from "child_process";
 import { request as request3 } from "undici";
 function detectPackageManager(cwd) {
   let dir = cwd;
   while (true) {
-    if (existsSync8(join7(dir, "pnpm-lock.yaml"))) return "pnpm";
-    if (existsSync8(join7(dir, "yarn.lock"))) return "yarn";
+    if (existsSync9(join8(dir, "pnpm-lock.yaml"))) return "pnpm";
+    if (existsSync9(join8(dir, "yarn.lock"))) return "yarn";
     const parent = dirname5(dir);
     if (parent === dir) break;
     dir = parent;
@@ -91006,11 +91126,11 @@ function detectPackageManager(cwd) {
   return "npm";
 }
 async function ensureNpmrcRegistry(cwd, registryUrl) {
-  const npmrcPath = join7(cwd, ".npmrc");
+  const npmrcPath = join8(cwd, ".npmrc");
   const desired = `@zoah:registry=${registryUrl}`;
   let existing = "";
-  if (existsSync8(npmrcPath)) {
-    existing = await readFile3(npmrcPath, "utf8");
+  if (existsSync9(npmrcPath)) {
+    existing = await readFile4(npmrcPath, "utf8");
   }
   const lines = existing.split(/\r?\n/);
   const idx = lines.findIndex((l) => l.trim().startsWith("@zoah:registry="));
@@ -91029,9 +91149,9 @@ function registryHostOf(registryUrl) {
 }
 async function readNpmrcAuthToken(cwd, registryUrl) {
   const prefix = `//${registryHostOf(registryUrl)}/:_authToken=`;
-  for (const npmrcPath of [join7(cwd, ".npmrc"), join7(homedir2(), ".npmrc")]) {
-    if (!existsSync8(npmrcPath)) continue;
-    const content = await readFile3(npmrcPath, "utf8");
+  for (const npmrcPath of [join8(cwd, ".npmrc"), join8(homedir2(), ".npmrc")]) {
+    if (!existsSync9(npmrcPath)) continue;
+    const content = await readFile4(npmrcPath, "utf8");
     const line = content.split(/\r?\n/).map((l) => l.trim()).find((l) => l.startsWith(prefix));
     if (line) return line.slice(prefix.length);
   }
@@ -91066,12 +91186,12 @@ function isNpmrcTracked(cwd) {
   });
 }
 async function ensureNpmrcAuthToken(cwd, registryUrl, token) {
-  const npmrcPath = join7(cwd, ".npmrc");
+  const npmrcPath = join8(cwd, ".npmrc");
   const host = registryHostOf(registryUrl);
   const desired = `//${host}/:_authToken=${token}`;
   let existing = "";
-  if (existsSync8(npmrcPath)) {
-    existing = await readFile3(npmrcPath, "utf8");
+  if (existsSync9(npmrcPath)) {
+    existing = await readFile4(npmrcPath, "utf8");
   }
   const lines = existing.split(/\r?\n/);
   const idx = lines.findIndex(
@@ -91092,10 +91212,10 @@ async function ensureNpmrcAuthToken(cwd, registryUrl, token) {
   await chmod2(npmrcPath, 384);
 }
 async function ensureGitignoreHasNpmrc(cwd) {
-  const gitignorePath = join7(cwd, ".gitignore");
+  const gitignorePath = join8(cwd, ".gitignore");
   let existing = "";
-  if (existsSync8(gitignorePath)) {
-    existing = await readFile3(gitignorePath, "utf8");
+  if (existsSync9(gitignorePath)) {
+    existing = await readFile4(gitignorePath, "utf8");
     const has = existing.split(/\r?\n/).some((l) => l.trim() === ".npmrc" || l.trim() === "/.npmrc");
     if (has) return false;
   }
@@ -91105,11 +91225,11 @@ async function ensureGitignoreHasNpmrc(cwd) {
   return true;
 }
 async function addDependencyToPackageJson(cwd, packageName, version) {
-  const pkgPath = join7(cwd, "package.json");
-  if (!existsSync8(pkgPath)) {
+  const pkgPath = join8(cwd, "package.json");
+  if (!existsSync9(pkgPath)) {
     throw new Error("No package.json found at " + cwd);
   }
-  const raw = await readFile3(pkgPath, "utf8");
+  const raw = await readFile4(pkgPath, "utf8");
   const pkg = JSON.parse(raw);
   const deps = pkg.dependencies ?? {};
   const desired = `^${version}`;
@@ -91239,7 +91359,7 @@ async function runSwapCore(opts) {
   const swapped = [];
   const skipped = [];
   for (const [manifestKey, comp] of Object.entries(components2)) {
-    const filePath = comp.sourceFile ?? manifestKey.split("#")[0];
+    const filePath = manifestSourceFile(manifestKey, comp);
     if (changedFiles.has(filePath)) {
       swapped.push(comp.packageExport);
     } else {
@@ -91394,18 +91514,19 @@ var init_swap = __esm({
 // src/commands/import.ts
 var import_exports = {};
 __export(import_exports, {
+  buildDesignUrl: () => buildDesignUrl,
   runImport: () => runImport,
   runImportLocalPipeline: () => runImportLocalPipeline,
   runImportSubmit: () => runImportSubmit
 });
-import { readFile as readFile4 } from "fs/promises";
-import { existsSync as existsSync9 } from "fs";
-import { isAbsolute as isAbsolute4, join as join8, relative as relative5 } from "path";
+import { readFile as readFile5 } from "fs/promises";
+import { existsSync as existsSync10 } from "fs";
+import { isAbsolute as isAbsolute5, join as join9, relative as relative5 } from "path";
 async function readPackageJsonName(cwd) {
-  const path4 = join8(cwd, "package.json");
-  if (!existsSync9(path4)) return null;
+  const path4 = join9(cwd, "package.json");
+  if (!existsSync10(path4)) return null;
   try {
-    const raw = await readFile4(path4, "utf8");
+    const raw = await readFile5(path4, "utf8");
     const parsed = JSON.parse(raw);
     return parsed.name ?? null;
   } catch {
@@ -91504,14 +91625,11 @@ function componentIdsForReimport(components2, manifest, cwd) {
   return [...ids];
 }
 function manifestKeyForPath(cwd, filePath) {
-  return isAbsolute4(filePath) ? relative5(cwd, filePath) : filePath;
+  return isAbsolute5(filePath) ? relative5(cwd, filePath) : filePath;
 }
 function manifestKeyForComponent(cwd, filePath, packageExport) {
   return `${manifestKeyForPath(cwd, filePath)}#${packageExport}`;
 }
-function manifestSourceFile(key, entry) {
-  return entry.sourceFile ?? key.split("#")[0] ?? key;
-}
 function findManifestEntryForComponent(manifest, cwd, filePath, packageExport) {
   const sourceFile = manifestKeyForPath(cwd, filePath);
   const keyed = manifest[`${sourceFile}#${packageExport}`];
@@ -91528,8 +91646,12 @@ async function runImportLocalPipeline(opts) {
   await ensureZoahGitignore(opts.cwd);
   const baseUrl = opts.baseUrl ?? creds.baseUrl;
   const branchName = opts.branch ?? process.env.ZOAH_BRANCH ?? process.env.OPACITY_BRANCH ?? null;
-  const existingConfig = await readProjectConfig(opts.cwd);
-  const existingComponentsManifest = existingConfig ? await readComponentsManifest(opts.cwd) : null;
+  const state = await readDirectoryState(opts.cwd);
+  const target = resolveImportTarget(state, creds.organization, {
+    newProject: opts.newProject
+  });
+  const existingConfig = target.kind === "existing" ? target.config : null;
+  const existingComponentsManifest = target.kind === "existing" ? target.components : null;
   const api = ApiClient.fromCredentials(creds, baseUrl);
   const commitSha = getCommitSha(opts.cwd);
   const issueCtx = createIssueContext({ commitSha });
@@ -91547,7 +91669,22 @@ async function runImportLocalPipeline(opts) {
   const entrySkip = findEntrySkips(scan2.project, opts.cwd);
   const preBuildIssues = [];
   const relPath = (abs) => relative5(opts.cwd, abs);
+  const swappedExports = /* @__PURE__ */ new Set();
+  if (state.kind === "swapped") {
+    const swappedFiles = new Set(state.swappedFiles);
+    for (const [key, entry] of Object.entries(state.components)) {
+      const file = manifestSourceFile(key, entry);
+      if (swappedFiles.has(file)) {
+        swappedExports.add(`${file}#${entry.packageExport}`);
+      }
+    }
+  }
+  const alreadySwapped = [];
   const filteredComponents = fullDiscovery.components.filter((c3) => {
+    if (swappedExports.has(`${relPath(c3.filePath)}#${c3.name}`)) {
+      alreadySwapped.push(c3);
+      return false;
+    }
     if (entrySkip.skippedFilePaths.has(c3.filePath)) {
       preBuildIssues.push(
         makeIssue({
@@ -91599,6 +91736,10 @@ async function runImportLocalPipeline(opts) {
   return {
     payload,
     filteredComponents,
+    alreadySwapped,
+    state,
+    target,
+    organization: creds.organization,
     preBuildIssues,
     importPhaseIssues,
     scanSourceFileCount: scan2.sourceFiles.length,
@@ -91636,6 +91777,7 @@ async function runImportSubmit(local, opts, onProgress) {
   const {
     payload,
     filteredComponents,
+    alreadySwapped,
     buildResult,
     baseUrl,
     branchName,
@@ -91678,7 +91820,7 @@ async function runImportSubmit(local, opts, onProgress) {
     });
   }
   const discoveredManifestKeys = new Set(
-    filteredComponents.map(
+    [...filteredComponents, ...alreadySwapped].map(
       (component) => manifestKeyForPath(opts.cwd, component.filePath)
     )
   );
@@ -91758,12 +91900,21 @@ async function runImport(opts) {
   try {
     local = await runImportLocalPipeline(opts);
   } catch (err) {
-    scanSpinner.fail("Scan failed.");
+    scanSpinner.fail(
+      err instanceof DirectoryLockedError ? "This directory is swapped." : "Scan failed."
+    );
     throw err;
   }
+  const swappedCount = local.alreadySwapped.length;
   scanSpinner.succeed(
-    `Found ${bold(pluralize(local.filteredComponents.length, "first-party component"))}.`
+    `Found ${bold(pluralize(local.filteredComponents.length, "first-party component"))}` + (swappedCount > 0 ? ` to import, plus ${pluralize(swappedCount, "swapped component")} already in Zoah` : "") + "."
+  );
+  console.log(`  ${dim("This directory:")} ${describeState(local.state)}`);
+  console.log(
+    `  ${dim("This import:")}    ${describeTarget(local.target, local.organization)}`
   );
+  const note = organizationNote(local.target, local.organization);
+  if (note) console.log(dim(`  ${note}`));
   const tailwind = local.tailwind;
   if (tailwind.available && tailwind.configPath) {
     console.log(`  Tailwind config: ${bold(tailwind.configPath)}.`);
@@ -91838,6 +91989,16 @@ async function runImport(opts) {
       console.log(`  ${dim("View in Zoah:")} ${bold(url)}`);
     }
   };
+  if (payload.components.length === 0 && swappedCount > 0) {
+    await flushIssueOutput();
+    console.log("");
+    console.log(
+      `  Nothing new to import. The components here are already swapped to ${bold(
+        local.state.kind === "swapped" ? local.state.manifest.name : "its package"
+      )}. Add a component, then run \`zoah import\` again.`
+    );
+    return;
+  }
   if (opts.dryRun) {
     if (opts.swap) {
       console.log(
@@ -91966,6 +92127,7 @@ var init_import = __esm({
     init_cli_import();
     init_dist4();
     init_swap();
+    init_directory_state();
   }
 });
 
@@ -112586,7 +112748,7 @@ import {
 } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { z as z59 } from "zod";
-import { existsSync as existsSync10 } from "fs";
+import { existsSync as existsSync11 } from "fs";
 import { statSync as statSync3 } from "fs";
 function parseJsonObject(text) {
   const value = JSON.parse(text);
@@ -112678,7 +112840,7 @@ async function runMcpServer(options) {
     return `The credential now points at ${credentialInstance}, but this session is open against ${session.baseUrl}. Refusing to send this call to a different instance than the one you are working on: the token would be presented to the wrong server, and on a development machine the two are commonly local dev and production. Nothing was sent. Either restore the credential for ${session.baseUrl} (\`zoah login\` in that directory), or call \`disconnect\` and then \`connect\` to move this session to ${credentialInstance} deliberately.`;
   }
   function loginScope() {
-    return existsSync10(zoahPaths.localCredentials(process.cwd())) || existsSync10(legacyOpacityPaths.localCredentials(process.cwd())) ? "local" : "global";
+    return existsSync11(zoahPaths.localCredentials(process.cwd())) || existsSync11(legacyOpacityPaths.localCredentials(process.cwd())) ? "local" : "global";
   }
   let pendingSignIn = null;
   let selectedOrganization = null;
@@ -112758,7 +112920,7 @@ async function runMcpServer(options) {
       pinnedBy: "the human's selection"
     } : null;
   }
-  function organizationLabel(fallbackId) {
+  function organizationLabel2(fallbackId) {
     const working = describeWorkingIn(fallbackId);
     return working?.slug ?? working?.id ?? fallbackId;
   }
@@ -112781,7 +112943,7 @@ async function runMcpServer(options) {
     const dropped = session ? {
       project: session.projectId,
       branch: session.branchSlug,
-      fromOrganization: organizationLabel(session.orgId),
+      fromOrganization: organizationLabel2(session.orgId),
       toOrganization: to.slug ?? to.organizationId
     } : void 0;
     if (session) await teardownSession();
@@ -114274,7 +114436,7 @@ __export(init_exports, {
   runMcpInit: () => runMcpInit
 });
 import { execFile } from "child_process";
-import { readFile as readFile6, writeFile as writeFile3, mkdir as mkdir2 } from "fs/promises";
+import { readFile as readFile7, writeFile as writeFile3, mkdir as mkdir2 } from "fs/promises";
 import { createInterface } from "readline/promises";
 import path3 from "path";
 function buildServerEntry(opts) {
@@ -114379,7 +114541,7 @@ async function writeHarnessConfig(cwd, target, entry) {
   const filePath = path3.join(cwd, target.file);
   let root = {};
   try {
-    const existing = await readFile6(filePath, "utf8");
+    const existing = await readFile7(filePath, "utf8");
     const parsed = JSON.parse(existing);
     if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
       return null;
@@ -114646,6 +114808,61 @@ async function runPreflight(opts) {
 init_swap();
 init_whoami();
 
+// src/commands/status.ts
+init_session();
+init_directory_state();
+init_colors();
+init_import();
+async function runStatus(opts) {
+  const found = await findCredentials(opts.cwd);
+  const organization = found?.creds.organization;
+  if (found) {
+    console.log(
+      `Signed in as ${bold(found.creds.userEmail)} (${found.scope}) on ${found.creds.baseUrl}.`
+    );
+    console.log(
+      `  ${dim("Organization:")}   ${organization ? `${organization.name}${organization.slug ? ` (${organization.slug})` : ""}` : "none chosen, following the web app (run `zoah organization switch`)"}`
+    );
+  } else {
+    console.log("Not signed in. Run `zoah login` first.");
+  }
+  const state = await readDirectoryState(opts.cwd);
+  console.log("");
+  console.log(`${dim("This directory:")} ${describeState(state)}`);
+  if (state.kind !== "new") {
+    const url = buildDesignUrl(
+      (found?.creds.baseUrl ?? opts.baseUrl).replace(/\/$/, ""),
+      state.config
+    );
+    if (url) console.log(`  ${dim("Project:")}        ${url}`);
+    if (state.manifest) {
+      console.log(
+        `  ${dim("Package:")}        ${state.manifest.name}@${state.manifest.version}`
+      );
+    }
+  }
+  const target = resolveImportTarget(state, organization);
+  console.log(
+    `${dim("Next import:")}    ${describeTarget(target, organization)}`
+  );
+  const note = organizationNote(target, organization);
+  if (note) console.log(dim(`  ${note}`));
+  console.log("");
+  if (state.kind === "imported") {
+    console.log(
+      dim(
+        "Nothing is swapped yet, so you can still move this directory: `zoah organization switch` to import into another organization, or `zoah import --new-project` for a new project here."
+      )
+    );
+  } else if (state.kind === "swapped") {
+    console.log(
+      dim(
+        "Swapped code renders this project's package, so the directory stays on it. `zoah import` adds new components; `zoah import --swap` also swaps them in."
+      )
+    );
+  }
+}
+
 // src/app.tsx
 init_flow();
 init_errors();
@@ -114653,14 +114870,15 @@ init_components();
 init_session();
 init_client();
 init_organization();
+init_directory_state();
 init_local();
 init_base_url();
 init_issues_detail();
 init_dist4();
 init_screens();
 init_components();
-import { Box as Box4, Text as Text5 } from "ink";
-import { readFile as readFile5 } from "fs/promises";
+import { Text as Text5 } from "ink";
+import { readFile as readFile6 } from "fs/promises";
 import path2 from "path";
 
 // src/ui/steps.tsx
@@ -114712,7 +114930,8 @@ var scan = async (carry) => {
     branch: carry.branch,
     debug: carry.debug
   });
-  if (pipeline.payload.components.length === 0) {
+  const upToDate = pipeline.payload.components.length === 0 && pipeline.alreadySwapped.length > 0 && pipeline.state.kind === "swapped" ? pipeline.state.manifest.name : void 0;
+  if (pipeline.payload.components.length === 0 && !upToDate) {
     throw new Error(
       `No components were extractable from this project. Make sure your component files exist under \`${carry.scopePath}\` and use a supported styling approach.`
     );
@@ -114722,7 +114941,7 @@ var scan = async (carry) => {
     const { writeLastPayload: writeLastPayload2 } = await Promise.resolve().then(() => (init_local(), local_exports));
     await writeLastPayload2(process.cwd(), pipeline.payload);
   }
-  return payloadToScanReport(pipeline);
+  return { ...payloadToScanReport(pipeline), upToDate };
 };
 var scanLoader = (carry) => loader(
   () => scan(carry),
@@ -114802,7 +115021,7 @@ async function flushIssueSnapshot() {
 }
 
 // src/app.tsx
-import { jsx as jsx4, jsxs as jsxs4 } from "react/jsx-runtime";
+import { jsx as jsx4 } from "react/jsx-runtime";
 var titleCase = (s5) => s5.replace(/[-_]+/g, " ").replace(/\b\w/g, (c3) => c3.toUpperCase()).trim();
 function formatRelativeAge(isoTimestamp) {
   const diffMs = Date.now() - new Date(isoTimestamp).getTime();
@@ -114823,7 +115042,7 @@ function formatRelativeAge(isoTimestamp) {
 }
 async function detectProjectName(cwd) {
   try {
-    const raw = await readFile5(path2.join(cwd, "package.json"), "utf8");
+    const raw = await readFile6(path2.join(cwd, "package.json"), "utf8");
     const pkg = JSON.parse(raw);
     if (typeof pkg.name === "string" && pkg.name) {
       const bare = pkg.name.startsWith("@") ? pkg.name.split("/")[1] ?? pkg.name : pkg.name;
@@ -114833,15 +115052,6 @@ async function detectProjectName(cwd) {
   }
   return titleCase(path2.basename(cwd));
 }
-async function packageInDeps(cwd, name) {
-  try {
-    const raw = await readFile5(path2.join(cwd, "package.json"), "utf8");
-    const pkg = JSON.parse(raw);
-    return Boolean(pkg.dependencies?.[name] ?? pkg.devDependencies?.[name]);
-  } catch {
-    return false;
-  }
-}
 var projectUrl = (baseUrl, config) => {
   if (!config) return void 0;
   if (!config.orgSlug || !config.projectSlug) return void 0;
@@ -114889,27 +115099,9 @@ async function runApp(opts = {}) {
     version: manifest.version,
     npmUrl: `https://npmjs.com/package/${manifest.name}`
   } : void 0;
-  const alreadySetUp = manifest !== null && existingSync !== void 0 && await packageInDeps(process.cwd(), manifest.name);
+  const state = await readDirectoryState(process.cwd());
+  const plannedTarget = resolveImportTarget(state, creds?.organization);
   const ui = createFlow();
-  if (alreadySetUp && existingSync) {
-    ui.log(
-      /* @__PURE__ */ jsxs4(Box4, { flexDirection: "column", gap: 1, marginY: 1, children: [
-        /* @__PURE__ */ jsx4(Text5, { children: "Your project is already connected to Zoah." }),
-        /* @__PURE__ */ jsxs4(Box4, { flexDirection: "column", marginLeft: 2, children: [
-          /* @__PURE__ */ jsxs4(Text5, { children: [
-            /* @__PURE__ */ jsx4(Dim, { children: "Zoah      " }),
-            /* @__PURE__ */ jsx4(Text5, { color: "cyan", underline: true, children: existingSync.zoahUrl })
-          ] }),
-          /* @__PURE__ */ jsxs4(Text5, { children: [
-            /* @__PURE__ */ jsx4(Dim, { children: "Package   " }),
-            `${existingSync.packageName}@${existingSync.version}`
-          ] })
-        ] })
-      ] })
-    );
-    await ui.done();
-    return;
-  }
   const carry = {
     baseUrl,
     scopePath,
@@ -114922,16 +115114,22 @@ async function runApp(opts = {}) {
         userEmail: creds?.userEmail,
         zoahUrl,
         lastScanAge,
-        sync: existingSync
+        sync: existingSync,
+        directory: describeState(state),
+        next: describeTarget(plannedTarget, creds?.organization)
       })
     )) {
       ui.log(/* @__PURE__ */ jsx4(Dim, { children: "Run `zoah` when you are ready." }));
       return;
     }
-    const projectName = opts.projectName ?? await ui.run(askProjectName(detectedName));
+    const projectName = opts.projectName ?? (plannedTarget.kind === "new" ? await ui.run(askProjectName(detectedName)) : void 0);
     if (!creds) await ui.run(signIn(baseUrl));
-    if (!config) await ensureOrganization(ui, baseUrl);
-    await ui.run(scanLoader(carry));
+    if (state.kind !== "swapped") await ensureOrganization(ui, baseUrl);
+    const scanReport = await ui.run(scanLoader(carry));
+    if (scanReport.upToDate) {
+      await flushIssueSnapshot();
+      return;
+    }
     let syncResult;
     try {
       syncResult = await ui.run(syncLoader(projectName, carry));
@@ -115128,6 +115326,18 @@ async function main() {
       fail(err);
     }
   });
+  program.command("status").description(
+    "Show this directory's Zoah project, whether it is swapped, and what `zoah import` will do."
+  ).action(async () => {
+    try {
+      await runStatus({
+        cwd: process.cwd(),
+        baseUrl: program.opts().baseUrl ?? DEFAULT_BASE_URL
+      });
+    } catch (err) {
+      fail(err);
+    }
+  });
   const mcp = program.command("mcp").description(
     "Run the Zoah MCP server over stdio for coding agents. Run `zoah mcp init` to set up your harness; reuses `zoah login` credentials."
   ).option(
@@ -115194,6 +115404,10 @@ async function main() {
     "--dry-run",
     `Run the full local pipeline without calling the API or writing project state. Issues snapshot is still written to ${zoahPathDisplay.issues}. Equivalent to \`zoah preflight\`.`,
     false
+  ).option(
+    "--new-project",
+    "Create a new project in the CLI's organization instead of updating the linked one. Not possible once the directory is swapped.",
+    false
   ).action(
     async (path4, options) => {
       try {
@@ -115203,6 +115417,7 @@ async function main() {
           scopePath: path4 ?? ".",
           cwd: process.cwd(),
           swap: options.swap,
+          newProject: options.newProject,
           projectName: g2.projectName,
           branch: g2.branch,
           debug: g2.debug ?? false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zoahhq/cli",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "Zoah CLI: import React components, publish via Zoah, swap local imports",
   "license": "Apache-2.0",
   "author": "Zoah Inc.",