@rness/cli 0.5.2 → 0.6.0

package/dist/{chunk-P4YG6P7I.js → chunk-NY3WV7X5.js}

@@ -725,7 +725,7 @@ function classifyProbe(url, exitCode, stderr) {
 var STDERR_FLUSH_MS = 200;
 async function probeRemote(url, timeoutMs = 6e4, credentials) {
   positional(url, "repository url");
-  return new Promise((resolve4) => {
+  return new Promise((resolve5) => {
     const auth = withCredentials(credentials);
     const child = spawn(
       "git",
@@ -744,7 +744,7 @@ async function probeRemote(url, timeoutMs = 6e4, credentials) {
       settled = true;
       clearTimeout(timer);
       child.stderr?.destroy();
-      resolve4(probe);
+      resolve5(probe);
     };
     const timer = setTimeout(() => {
       child.kill("SIGKILL");
@@ -814,13 +814,8 @@ function readOrg(value) {
   }
   return value;
 }
-function resolveOrg(manifest, root) {
-  if (manifest.org !== null) return { org: manifest.org, warning: null };
-  const name = basename2(root);
-  return {
-    org: name,
-    warning: `rness.json: no "org"; using the directory name "${name}"`
-  };
+function workspaceName(manifest, root) {
+  return manifest.org ?? basename2(root);
 }
 function readRepos(value) {
   const raw = value ?? {};
@@ -915,8 +910,13 @@ function parseRepoSpec(spec, org, host) {
     url = spec;
   } else {
     const parts = spec.split("/");
-    if (parts.length === 1) url = repoUrl(host, org, spec);
-    else if (parts.length === 2 && parts[0] !== void 0 && parts[1] !== void 0)
+    if (parts.length === 1) {
+      if (org === null)
+        throw new Error(
+          "this workspace has no GitHub organization: give <owner>/<repo> or a git URL"
+        );
+      url = repoUrl(host, org, spec);
+    } else if (parts.length === 2 && parts[0] !== void 0 && parts[1] !== void 0)
       url = repoUrl(host, parts[0], parts[1]);
     else
       throw new Error(
@@ -1162,7 +1162,7 @@ async function detectGithubSsh(opts) {
     ...opts.interactive ? [] : ["-o", "BatchMode=yes"],
     "git@github.com"
   ];
-  return new Promise((resolve4) => {
+  return new Promise((resolve5) => {
     const child = spawn2(opts.command ?? "ssh", args, {
       stdio: [opts.interactive ? "inherit" : "ignore", "ignore", "pipe"]
     });
@@ -1175,7 +1175,7 @@ async function detectGithubSsh(opts) {
       settled = true;
       clearTimeout(timer);
       child.stderr?.destroy();
-      resolve4(access2);
+      resolve5(access2);
     };
     const timer = setTimeout(() => {
       child.kill("SIGKILL");
@@ -1828,9 +1828,8 @@ async function syncCommand(opts, deps = {}) {
   try {
     const ws = await findWorkspace(cwd);
     const manifest = await loadManifest(ws.rnessDir);
-    const { org, warning } = resolveOrg(manifest, ws.root);
+    const org = workspaceName(manifest, ws.root);
     if (ownUi) ui.intro(`Sync workspace ${org}`);
-    if (warning !== null) ui.warn(warning);
     if (opts.scope !== void 0 && !Object.hasOwn(manifest.scopes, opts.scope)) {
       process.stderr.write(`unknown scope: ${opts.scope}
 `);
@@ -2035,9 +2034,7 @@ async function addCommand(spec, opts, deps = {}) {
   try {
     const ws = await findWorkspace(cwd);
     const manifest = await loadManifest(ws.rnessDir);
-    const { org, warning } = resolveOrg(manifest, ws.root);
-    if (warning !== null) process.stderr.write(`${warn(warning)}
-`);
+    const org = manifest.org;
     let parsed;
     try {
       parsed = parseRepoSpec(spec, org, transport.hosts.https);
@@ -2062,7 +2059,10 @@ async function addCommand(spec, opts, deps = {}) {
       return 2;
     }
     const ui = deps.ui ?? (interactive ? await makeUi(terminal) : { ...plainUi });
-    if (ownUi) ui.intro(`Add ${parsed.name} to workspace ${org}`);
+    if (ownUi)
+      ui.intro(
+        `Add ${parsed.name} to workspace ${workspaceName(manifest, ws.root)}`
+      );
     if (opts.host !== void 0 || opts.https === true) ui.gitIsSilent = true;
     let host = opts.host;
     if (host === void 0 && opts.ssh === true) host = transport.hosts.ssh;
@@ -2229,6 +2229,9 @@ async function contextCommand(opts) {
   }
 }
 
+// src/version.ts
+var VERSION = "0.6.0";
+
 // src/core/delegate.ts
 import { readFile as readFile6 } from "fs/promises";
 import { join as join11 } from "path";
@@ -2304,6 +2307,17 @@ async function packageManagerVersion(pm) {
     throw new Error(`${pm} is not available on PATH`, { cause: e });
   }
 }
+function rnessRunner(pm, version) {
+  if (pm === "pnpm") return "pnpm dlx @rness/cli";
+  if (pm === "bun") return "bunx @rness/cli";
+  if (pm === "yarn" && Number(version?.split(".")[0]) >= 2)
+    return "yarn dlx @rness/cli";
+  return "npx @rness/cli";
+}
+async function rnessRunnerFor(pm) {
+  const version = pm === "yarn" ? await packageManagerVersion(pm).catch(() => null) : null;
+  return rnessRunner(pm, version);
+}
 var BARE_NPM_CODE = /^npm (error|ERR!) code \S+$/;
 function installErrorLine(stderr) {
   const lines = stderr.split("\n").map((l) => l.trim()).filter((l) => l !== "");
@@ -2331,12 +2345,228 @@ async function installDependencies(pm, dir, opts = {}) {
   }
 }
 
-// src/core/pinned.ts
+// src/core/scaffold.ts
+import { statSync } from "fs";
+import { dirname as dirname4, join as join12 } from "path";
+import { fileURLToPath } from "url";
+var SCAFFOLD_FILES = [
+  "AGENTS.md",
+  "CONVENTIONS.md",
+  "README.md",
+  "WORKSPACE.md",
+  "rness.json",
+  "package.json",
+  "_gitignore",
+  ".githooks/pre-commit",
+  ".github/workflows/validate.yml",
+  ".github/dependabot.yml",
+  "pnpm-workspace.yaml",
+  "adr/0000-template.md",
+  "standards/.gitkeep",
+  "specs/.gitkeep",
+  "plans/.gitkeep",
+  "skills/.gitkeep",
+  "docs/.gitkeep"
+];
+function scaffoldDir() {
+  let dir = dirname4(fileURLToPath(import.meta.url));
+  for (let i = 0; i < 4; i += 1) {
+    const candidate = join12(dir, "scaffold");
+    try {
+      if (statSync(join12(candidate, "rness.json")).isFile()) return candidate;
+    } catch {
+    }
+    dir = dirname4(dir);
+  }
+  throw new Error("scaffold directory not found next to the @rness/cli package");
+}
+
+// src/core/scaffold-copy.ts
+import { chmod as chmod2, mkdir as mkdir2, readFile as readFile7, stat as stat2, writeFile as writeFile2 } from "fs/promises";
+import { dirname as dirname5, join as join13 } from "path";
+var TOKENISED = /* @__PURE__ */ new Set(["package.json"]);
+async function copyScaffold(dest, tokens) {
+  const source = scaffoldDir();
+  for (const rel of SCAFFOLD_FILES) {
+    if (rel === "rness.json") continue;
+    const from = join13(source, ...rel.split("/"));
+    const targetRel = rel === "_gitignore" ? ".gitignore" : rel;
+    const to = join13(dest, ...targetRel.split("/"));
+    await mkdir2(dirname5(to), { recursive: true });
+    let content = await readFile7(from, "utf8");
+    if (TOKENISED.has(rel)) {
+      content = content.replaceAll("__RNESS_VERSION__", tokens.version).replaceAll("__RNESS_PM__", tokens.packageManager);
+    }
+    await writeFile2(to, content, "utf8");
+    const mode = (await stat2(from)).mode & 511;
+    if (mode & 73) await chmod2(to, mode);
+  }
+}
+
+// src/commands/login.ts
+import { spawn as spawn3 } from "child_process";
+import { realpath } from "fs/promises";
+
+// src/core/setup-git.ts
 import { execFile as execFile3 } from "child_process";
-import { readFile as readFile7 } from "fs/promises";
-import { basename as basename4, join as join12 } from "path";
 import { promisify as promisify3 } from "util";
 var execFileP3 = promisify3(execFile3);
+var KEY = "credential.https://github.com.helper";
+function helperValue(node, bin) {
+  return `!'${node}' '${bin}' git-credential`;
+}
+var isOurs = (value) => /^!'[^']+' '[^']*rness[^']*' git-credential$/.test(value);
+async function config(args) {
+  const { stdout } = await execFileP3("git", ["config", "--global", ...args]);
+  return stdout;
+}
+async function values() {
+  try {
+    const out = await config(["--get-all", KEY]);
+    return out.replace(/\n$/, "").split("\n");
+  } catch {
+    return [];
+  }
+}
+function isStableInstall(bin) {
+  return !/[\\/]_npx[\\/]/.test(bin);
+}
+async function setupGit(node, bin) {
+  const ours = helperValue(node, bin);
+  if ((await values()).includes(ours)) return false;
+  await removeGitSetup();
+  await config(["--add", KEY, ""]);
+  await config(["--add", KEY, ours]);
+  return true;
+}
+async function removeGitSetup() {
+  const current = await values();
+  if (!current.some(isOurs)) return false;
+  const kept = current.filter(
+    (value, i) => !isOurs(value) && !(value === "" && isOurs(current[i + 1] ?? ""))
+  );
+  await config(["--unset-all", KEY]);
+  for (const value of kept) await config(["--add", KEY, value]);
+  return true;
+}
+
+// src/commands/login.ts
+function openInBrowser(url) {
+  const [command, args] = process.platform === "darwin" ? ["open", [url]] : process.platform === "win32" ? ["cmd", ["/c", "start", "", url]] : ["xdg-open", [url]];
+  try {
+    const child = spawn3(command, args, { stdio: "ignore", detached: true });
+    child.on("error", () => void 0);
+    child.unref();
+  } catch {
+  }
+}
+async function offerSetupGit(opts, terminal, bin, ui) {
+  if (opts.setupGit === false) return;
+  if (!isStableInstall(bin)) {
+    ui.hint(
+      "install rness globally to let git use your login: npm i -g @rness/cli"
+    );
+    return;
+  }
+  if (opts.setupGit !== true) {
+    if (!terminal.isTty()) return;
+    const p = await terminal.prompts();
+    const ok = await p.confirm({
+      message: "Use rness to authenticate git over HTTPS for github.com?",
+      initialValue: true
+    });
+    if (p.isCancel(ok) || ok !== true) return;
+  }
+  const changed = await setupGit(process.execPath, bin);
+  ui.line(
+    changed ? "updated" : "unchanged",
+    "git: rness answers for https://github.com (rness logout undoes it)",
+    "git now asks rness for your github.com login over HTTPS (rness logout undoes it)"
+  );
+}
+async function loginCommand(opts, deps = {}) {
+  const terminal = deps.terminal ?? defaultTerminal;
+  const own = deps.ui === void 0;
+  const ui = deps.ui ?? await makeUi(terminal);
+  if (own) ui.intro("Log in to GitHub");
+  try {
+    const bin = deps.bin ?? await realpath(process.argv[1] ?? "").catch(() => "");
+    const env = envToken();
+    if (env !== null)
+      ui.hint(`${env.source} is set and wins over a stored login`);
+    const stored = await readAuth();
+    if (stored !== null && await resolveToken() !== null) {
+      ui.line(
+        "logged in",
+        `as ${stored.login} (github.com); rness logout to switch`
+      );
+      await offerSetupGit(opts, terminal, bin, ui);
+      if (own) ui.outro("Nothing to do", "idle");
+      return 0;
+    }
+    const code = await requestDeviceCode();
+    if (ui.session)
+      ui.line(
+        "open",
+        code.verificationUri,
+        `Open ${code.verificationUri} and enter the code ${code.userCode}`
+      );
+    else {
+      ui.line("open", code.verificationUri);
+      ui.line("code", code.userCode);
+    }
+    if (terminal.isTty() && process.env["SSH_CONNECTION"] === void 0)
+      (deps.open ?? openInBrowser)(code.verificationUri);
+    if (!ui.session)
+      ui.line("waiting", "for you to approve rness on github.com\u2026");
+    const login = await ui.step(
+      {
+        doing: "waiting  for you to approve rness on github.com",
+        sentence: "Waiting for your approval on github.com",
+        quiet: true
+      },
+      async () => {
+        const tokens = await pollForToken(code, deps);
+        const user = await getUser({
+          token: tokens.accessToken,
+          apiBase: opts.githubApi ?? DEFAULT_GITHUB_API
+        });
+        await writeAuth({ login: user.login, tokens });
+        return user.login;
+      },
+      (name) => ["logged in", `as ${name} (github.com)`]
+    );
+    if (!ui.session) ui.line("logged in", `as ${login} (github.com)`);
+    await offerSetupGit(opts, terminal, bin, ui);
+    if (own) ui.outro(`You are logged in as ${login}`);
+    return 0;
+  } catch (e) {
+    if (e instanceof LoginError) {
+      ui.error(e.message);
+      return 1;
+    }
+    return reportError(e);
+  }
+}
+function revokeUrl() {
+  return `https://github.com/settings/connections/applications/${clientId()}`;
+}
+
+// src/commands/create.ts
+import { mkdir as mkdir5, mkdtemp, rename as rename2, rm as rm5 } from "fs/promises";
+import { tmpdir } from "os";
+import { join as join17, relative as relative4, resolve as resolve4 } from "path";
+
+// src/core/new-workspace.ts
+import { mkdir as mkdir3, readdir as readdir2, rm as rm4, stat as stat3 } from "fs/promises";
+import { dirname as dirname6, join as join15, relative as relative2 } from "path";
+
+// src/core/pinned.ts
+import { execFile as execFile4 } from "child_process";
+import { readFile as readFile8 } from "fs/promises";
+import { basename as basename4, join as join14 } from "path";
+import { promisify as promisify4 } from "util";
+var execFileP4 = promisify4(execFile4);
 var PACKAGE = "@rness/cli";
 var EXACT_VERSION = /^\d+\.\d+\.\d+(-[0-9A-Za-z.-]+)?$/;
 function compareVersions(a, b) {
@@ -2359,7 +2589,7 @@ function compareVersions(a, b) {
 async function readPackageJson(rnessDir) {
   try {
     const parsed = JSON.parse(
-      await readFile7(join12(rnessDir, "package.json"), "utf8")
+      await readFile8(join14(rnessDir, "package.json"), "utf8")
     );
     return parsed !== null && typeof parsed === "object" ? parsed : null;
   } catch {
@@ -2378,8 +2608,8 @@ async function readPin(rnessDir) {
   return null;
 }
 async function writePin(rnessDir, from, to) {
-  const file = join12(rnessDir, "package.json");
-  const text = await readFile7(file, "utf8");
+  const file = join14(rnessDir, "package.json");
+  const text = await readFile8(file, "utf8");
   const entry = new RegExp(
     `("${PACKAGE}"\\s*:\\s*")${from.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}(")`
   );
@@ -2401,12 +2631,12 @@ async function workspacePackageManager(rnessDir) {
     if (isPackageManager(name)) return name;
   }
   for (const [lockfile, pm] of LOCKFILES)
-    if (await exists(join12(rnessDir, lockfile))) return pm;
+    if (await exists(join14(rnessDir, lockfile))) return pm;
   return "npm";
 }
 async function hasLockfile(rnessDir, pm) {
   for (const [lockfile, owner] of LOCKFILES)
-    if (owner === pm && await exists(join12(rnessDir, lockfile))) return true;
+    if (owner === pm && await exists(join14(rnessDir, lockfile))) return true;
   return false;
 }
 async function pinDrift(rnessDir) {
@@ -2462,9 +2692,9 @@ async function ensureInstalled(rnessDir, opts = {}) {
   }
 }
 async function runPinnedSync(root) {
-  const installed = await readPinnedCli(join12(root, ".rness"));
+  const installed = await readPinnedCli(join14(root, ".rness"));
   if (installed === null) return null;
-  const pinned = join12(installed.dir, ...installed.bin.split("/"));
+  const pinned = join14(installed.dir, ...installed.bin.split("/"));
   if (!await exists(pinned))
     return {
       code: 1,
@@ -2473,7 +2703,7 @@ async function runPinnedSync(root) {
 `
     };
   try {
-    const { stdout, stderr } = await execFileP3(
+    const { stdout, stderr } = await execFileP4(
       process.execPath,
       [pinned, "sync", "--yes"],
       {
@@ -2526,7 +2756,7 @@ function syncOutcome(result, opts = {}) {
   };
 }
 async function syncPinned(root, shown, fallback) {
-  const rnessDir = join12(root, ".rness");
+  const rnessDir = join14(root, ".rness");
   const installed = await readPinnedCli(rnessDir);
   if (installed === null) {
     if (fallback !== void 0) return fallback();
@@ -2536,7 +2766,7 @@ async function syncPinned(root, shown, fallback) {
     );
     return 1;
   }
-  const pinned = join12(installed.dir, ...installed.bin.split("/"));
+  const pinned = join14(installed.dir, ...installed.bin.split("/"));
   if (!await exists(pinned)) {
     process.stderr.write(
       `@rness/cli in ${shown}/.rness is not installed correctly (missing ${installed.bin}); reinstall in .rness/
@@ -2545,7 +2775,7 @@ async function syncPinned(root, shown, fallback) {
     return 1;
   }
   try {
-    const { stdout, stderr } = await execFileP3(
+    const { stdout, stderr } = await execFileP4(
       process.execPath,
       [pinned, "sync", "--yes"],
       {
@@ -2569,220 +2799,83 @@ async function syncPinned(root, shown, fallback) {
   }
 }
 
-// src/core/scaffold.ts
-import { statSync } from "fs";
-import { dirname as dirname4, join as join13 } from "path";
-import { fileURLToPath } from "url";
-var SCAFFOLD_FILES = [
-  "AGENTS.md",
-  "CONVENTIONS.md",
-  "README.md",
-  "WORKSPACE.md",
-  "rness.json",
-  "package.json",
-  "_gitignore",
-  ".githooks/pre-commit",
-  ".github/workflows/validate.yml",
-  ".github/dependabot.yml",
-  "pnpm-workspace.yaml",
-  "adr/0000-template.md",
-  "standards/.gitkeep",
-  "specs/.gitkeep",
-  "plans/.gitkeep",
-  "skills/.gitkeep",
-  "docs/.gitkeep"
-];
-function scaffoldDir() {
-  let dir = dirname4(fileURLToPath(import.meta.url));
-  for (let i = 0; i < 4; i += 1) {
-    const candidate = join13(dir, "scaffold");
-    try {
-      if (statSync(join13(candidate, "rness.json")).isFile()) return candidate;
-    } catch {
-    }
-    dir = dirname4(dir);
+// src/core/new-workspace.ts
+async function isEmptyDir(dir) {
+  return (await readdir2(dir)).length === 0;
+}
+async function insideWorkspace(dir) {
+  try {
+    await findWorkspace(dir);
+    return true;
+  } catch {
+    return false;
   }
-  throw new Error("scaffold directory not found next to the @rness/cli package");
 }
-
-// src/core/scaffold-copy.ts
-import { chmod as chmod2, mkdir as mkdir2, readFile as readFile8, stat as stat2, writeFile as writeFile2 } from "fs/promises";
-import { dirname as dirname5, join as join14 } from "path";
-var TOKENISED = /* @__PURE__ */ new Set(["package.json"]);
-async function copyScaffold(dest, tokens) {
-  const source = scaffoldDir();
-  for (const rel of SCAFFOLD_FILES) {
-    if (rel === "rness.json") continue;
-    const from = join14(source, ...rel.split("/"));
-    const targetRel = rel === "_gitignore" ? ".gitignore" : rel;
-    const to = join14(dest, ...targetRel.split("/"));
-    await mkdir2(dirname5(to), { recursive: true });
-    let content = await readFile8(from, "utf8");
-    if (TOKENISED.has(rel)) {
-      content = content.replaceAll("__RNESS_VERSION__", tokens.version).replaceAll("__RNESS_PM__", tokens.packageManager);
-    }
-    await writeFile2(to, content, "utf8");
-    const mode = (await stat2(from)).mode & 511;
-    if (mode & 73) await chmod2(to, mode);
+async function targetProblem(cwd, root, pm) {
+  const shown = relative2(cwd, root) || ".";
+  if (await insideWorkspace(cwd) || await insideWorkspace(dirname6(root)))
+    return "already inside an rness workspace; create runs from outside one";
+  if (!await exists(root)) return null;
+  if (await exists(join15(root, ".rness", "rness.json"))) {
+    if (!await exists(join15(root, ".rness", "node_modules")))
+      return `${shown} holds an rness workspace whose dependencies are not installed; cd ${shown}/.rness && ${pm} install, then rness sync`;
+    return `${shown} already holds an rness workspace (.rness/); run rness add inside it to add repositories`;
   }
+  if (!(await stat3(root)).isDirectory()) return `${shown} is not a directory`;
+  if (!await isEmptyDir(root)) return `${shown} is not empty`;
+  return null;
 }
-
-// src/version.ts
-var VERSION = "0.5.2";
-
-// src/commands/login.ts
-import { spawn as spawn3 } from "child_process";
-import { realpath } from "fs/promises";
-
-// src/core/setup-git.ts
-import { execFile as execFile4 } from "child_process";
-import { promisify as promisify4 } from "util";
-var execFileP4 = promisify4(execFile4);
-var KEY = "credential.https://github.com.helper";
-function helperValue(node, bin) {
-  return `!'${node}' '${bin}' git-credential`;
-}
-var isOurs = (value) => /^!'[^']+' '[^']*rness[^']*' git-credential$/.test(value);
-async function config(args) {
-  const { stdout } = await execFileP4("git", ["config", "--global", ...args]);
-  return stdout;
-}
-async function values() {
-  try {
-    const out = await config(["--get-all", KEY]);
-    return out.replace(/\n$/, "").split("\n");
-  } catch {
-    return [];
+async function installContext(input) {
+  const { ui, pm, rnessDir } = input;
+  if (input.skip) {
+    ui.line("skipped", `install with ${pm} (--skip-install)`);
+    return;
   }
-}
-function isStableInstall(bin) {
-  return !/[\\/]_npx[\\/]/.test(bin);
-}
-async function setupGit(node, bin) {
-  const ours = helperValue(node, bin);
-  if ((await values()).includes(ours)) return false;
-  await removeGitSetup();
-  await config(["--add", KEY, ""]);
-  await config(["--add", KEY, ours]);
-  return true;
-}
-async function removeGitSetup() {
-  const current = await values();
-  if (!current.some(isOurs)) return false;
-  const kept = current.filter(
-    (value, i) => !isOurs(value) && !(value === "" && isOurs(current[i + 1] ?? ""))
+  const frozen = await hasLockfile(rnessDir, pm);
+  await ui.step(
+    { doing: `installing dependencies with ${pm}` },
+    () => installDependencies(pm, rnessDir, { frozen }),
+    () => ["installed", `dependencies with ${pm}`]
   );
-  await config(["--unset-all", KEY]);
-  for (const value of kept) await config(["--add", KEY, value]);
-  return true;
 }
-
-// src/commands/login.ts
-function openInBrowser(url) {
-  const [command, args] = process.platform === "darwin" ? ["open", [url]] : process.platform === "win32" ? ["cmd", ["/c", "start", "", url]] : ["xdg-open", [url]];
+async function buildContext(input) {
+  const { ui, root, shown, pm } = input;
+  const rnessDir = join15(root, ".rness");
+  const pmVersion = await packageManagerVersion(pm);
+  await mkdir3(root, { recursive: true });
   try {
-    const child = spawn3(command, args, { stdio: "ignore", detached: true });
-    child.on("error", () => void 0);
-    child.unref();
-  } catch {
-  }
-}
-async function offerSetupGit(opts, terminal, bin, ui) {
-  if (opts.setupGit === false) return;
-  if (!isStableInstall(bin)) {
-    ui.hint(
-      "install rness globally to let git use your login: npm i -g @rness/cli"
-    );
-    return;
-  }
-  if (opts.setupGit !== true) {
-    if (!terminal.isTty()) return;
-    const p = await terminal.prompts();
-    const ok = await p.confirm({
-      message: "Use rness to authenticate git over HTTPS for github.com?",
-      initialValue: true
+    await copyScaffold(rnessDir, {
+      version: VERSION,
+      packageManager: `${pm}@${pmVersion}`
     });
-    if (p.isCancel(ok) || ok !== true) return;
+    await writeManifest(rnessDir, input.manifest);
+    ui.line("created", `${shown}/.rness (${input.kind})`);
+    await installContext({ ui, pm, rnessDir, skip: input.skipInstall });
+    return true;
+  } catch (e) {
+    reportError(e);
+    await rm4(rnessDir, { recursive: true, force: true }).catch(() => void 0);
+    if (await isEmptyDir(root).catch(() => false))
+      await rm4(root, { recursive: true, force: true }).catch(() => void 0);
+    process.stderr.write(
+      `removed ${shown}/.rness after the failure; fix it and retry
+`
+    );
+    return false;
   }
-  const changed = await setupGit(process.execPath, bin);
-  ui.line(
-    changed ? "updated" : "unchanged",
-    "git: rness answers for https://github.com (rness logout undoes it)",
-    "git now asks rness for your github.com login over HTTPS (rness logout undoes it)"
-  );
 }
-async function loginCommand(opts, deps = {}) {
-  const terminal = deps.terminal ?? defaultTerminal;
-  const own = deps.ui === void 0;
-  const ui = deps.ui ?? await makeUi(terminal);
-  if (own) ui.intro("Log in to GitHub");
+async function commitContext(input) {
+  const { ui, rnessDir, shown } = input;
+  await init(rnessDir);
   try {
-    const bin = deps.bin ?? await realpath(process.argv[1] ?? "").catch(() => "");
-    const env = envToken();
-    if (env !== null)
-      ui.hint(`${env.source} is set and wins over a stored login`);
-    const stored = await readAuth();
-    if (stored !== null && await resolveToken() !== null) {
-      ui.line(
-        "logged in",
-        `as ${stored.login} (github.com); rness logout to switch`
-      );
-      await offerSetupGit(opts, terminal, bin, ui);
-      if (own) ui.outro("Nothing to do", "idle");
-      return 0;
-    }
-    const code = await requestDeviceCode();
-    if (ui.session)
-      ui.line(
-        "open",
-        code.verificationUri,
-        `Open ${code.verificationUri} and enter the code ${code.userCode}`
-      );
-    else {
-      ui.line("open", code.verificationUri);
-      ui.line("code", code.userCode);
-    }
-    if (terminal.isTty() && process.env["SSH_CONNECTION"] === void 0)
-      (deps.open ?? openInBrowser)(code.verificationUri);
-    if (!ui.session)
-      ui.line("waiting", "for you to approve rness on github.com\u2026");
-    const login = await ui.step(
-      {
-        doing: "waiting  for you to approve rness on github.com",
-        sentence: "Waiting for your approval on github.com",
-        quiet: true
-      },
-      async () => {
-        const tokens = await pollForToken(code, deps);
-        const user = await getUser({
-          token: tokens.accessToken,
-          apiBase: opts.githubApi ?? DEFAULT_GITHUB_API
-        });
-        await writeAuth({ login: user.login, tokens });
-        return user.login;
-      },
-      (name) => ["logged in", `as ${name} (github.com)`]
-    );
-    if (!ui.session) ui.line("logged in", `as ${login} (github.com)`);
-    await offerSetupGit(opts, terminal, bin, ui);
-    if (own) ui.outro(`You are logged in as ${login}`);
-    return 0;
+    await commitAll(rnessDir, "chore: rness workspace context");
+    ui.line("committed", `${shown}/.rness`);
   } catch (e) {
-    if (e instanceof LoginError) {
-      ui.error(e.message);
-      return 1;
-    }
-    return reportError(e);
+    ui.warn(
+      `${e instanceof Error ? e.message : String(e)} \u2014 commit ${shown}/.rness yourself`
+    );
   }
 }
-function revokeUrl() {
-  return `https://github.com/settings/connections/applications/${clientId()}`;
-}
-
-// src/commands/create.ts
-import { mkdir as mkdir3, mkdtemp, readdir as readdir2, rename as rename2, rm as rm4, stat as stat3 } from "fs/promises";
-import { tmpdir } from "os";
-import { dirname as dirname6, join as join15, relative as relative2, resolve as resolve3 } from "path";
 
 // src/core/sync-blocks.ts
 async function syncBlocks(ui, root, shown, inPlace, sshWorks) {
@@ -2812,38 +2905,113 @@ async function syncBlocks(ui, root, shown, inPlace, sshWorks) {
   return outcome.code;
 }
 
-// src/commands/create.ts
-async function isEmptyDir(dir) {
-  return (await readdir2(dir)).length === 0;
-}
-async function insideWorkspace(dir) {
-  try {
-    await findWorkspace(dir);
-    return true;
-  } catch {
-    return false;
+// src/commands/create-blank.ts
+import { mkdir as mkdir4 } from "fs/promises";
+import { join as join16, relative as relative3, resolve as resolve3 } from "path";
+var WORKSPACE_NAME = /^(?!\.{1,2}$)[A-Za-z0-9._][A-Za-z0-9._-]*$/;
+function workspaceNameError(name) {
+  return `workspace name "${name}" may only contain letters, digits, '.', '_' and '-', not starting with '-'`;
+}
+async function createBlank(input) {
+  const { cwd, pm, ui } = input;
+  let name = input.name;
+  let prompted = false;
+  if (name === void 0) {
+    if (!input.interactive) {
+      process.stderr.write(
+        "rness create --blank needs a <name> without a prompt\n"
+      );
+      return 2;
+    }
+    const p = await input.prompts();
+    const answer = await p.text({
+      message: "What should the workspace be called?",
+      placeholder: "my-workspace",
+      validate: (value) => {
+        const v = value?.trim() ?? "";
+        return WORKSPACE_NAME.test(v) ? void 0 : workspaceNameError(v);
+      }
+    });
+    if (p.isCancel(answer) || typeof answer !== "string") {
+      ui.cancelled();
+      return 0;
+    }
+    name = answer.trim();
+    prompted = true;
+  }
+  const root = resolve3(cwd, name);
+  const shown = relative3(cwd, root) || ".";
+  const problem = await targetProblem(cwd, root, pm);
+  if (problem !== null) {
+    process.stderr.write(`${problem}
+`);
+    return 1;
+  }
+  if (!input.mayWrite) {
+    process.stderr.write(
+      "rness create writes files; pass --yes to run without a prompt\n"
+    );
+    return 2;
   }
+  if (input.interactive && !prompted) {
+    const p = await input.prompts();
+    const ok = await p.confirm({
+      message: `Create blank workspace ${name} in ./${shown}?`
+    });
+    if (p.isCancel(ok) || ok !== true) {
+      ui.cancelled();
+      return 0;
+    }
+  }
+  const built = await buildContext({
+    ui,
+    root,
+    shown,
+    manifest: { contract: 1, org: null, repos: {}, scopes: {} },
+    pm,
+    skipInstall: input.skipInstall,
+    kind: "blank workspace"
+  });
+  if (!built) return 1;
+  await mkdir4(join16(root, "org"), { recursive: true });
+  await commitContext({ ui, rnessDir: join16(root, ".rness"), shown });
+  const code = await syncBlocks(
+    ui,
+    root,
+    shown,
+    () => syncCommand({ yes: true, cwd: root })
+  );
+  if (code !== 0) return code;
+  const next = [
+    `cd ${shown}`,
+    "# bring a repository in: <owner>/<repo> on GitHub, or any git URL",
+    `${await rnessRunnerFor(pm)} add <owner>/<repo>`,
+    '# to share it: set "org" in .rness/rness.json, then push .rness to github.com/<org>/.rness'
+  ];
+  if (ui.session) {
+    ui.note("Next steps", next);
+    ui.outro(`Workspace ${name} is ready in ${shown}/`);
+  } else
+    process.stdout.write(
+      [
+        "",
+        `Workspace \`${name}\` is ready in ${shown}/.`,
+        "",
+        "Next:",
+        ...next.map((line) => `  ${line}`),
+        ""
+      ].join("\n")
+    );
+  return 0;
 }
+
+// src/commands/create.ts
 function firstLine4(text) {
   return text.split("\n").find((l) => l.trim() !== "")?.trim() ?? "unknown error";
 }
 function splitSpecs(list) {
   return list.split(",").map((s) => s.trim()).filter((s) => s !== "");
 }
-async function targetProblem(cwd, root, pm) {
-  const shown = relative2(cwd, root) || ".";
-  if (await insideWorkspace(cwd) || await insideWorkspace(dirname6(root)))
-    return "already inside an rness workspace; create runs from outside one";
-  if (!await exists(root)) return null;
-  if (await exists(join15(root, ".rness", "rness.json"))) {
-    if (!await exists(join15(root, ".rness", "node_modules")))
-      return `${shown} holds an rness workspace whose dependencies are not installed; cd ${shown}/.rness && ${pm} install, then rness sync`;
-    return `${shown} already holds an rness workspace (.rness/); run rness add inside it to add repositories`;
-  }
-  if (!(await stat3(root)).isDirectory()) return `${shown} is not a directory`;
-  if (!await isEmptyDir(root)) return `${shown} is not empty`;
-  return null;
-}
 function cancelled(ui) {
   ui.cancelled();
   return 0;
@@ -2966,7 +3134,7 @@ async function cloneSelection(input) {
           { doing: `cloning  org/${repo}`, git: true },
           () => clone(
             entry.url,
-            join15(input.root, "org", repo),
+            join17(input.root, "org", repo),
             input.provider.credentialsFor(entry.url)
           ),
           () => ["cloned", `org/${repo}`]
@@ -3006,6 +3174,25 @@ async function placeContext(staged, rnessDir, url, credentials) {
     await clone(url, rnessDir, credentials);
   }
 }
+function blankConflict(opts) {
+  if (opts.org !== void 0) return "--org";
+  if (opts.repos !== void 0) return "--repos";
+  if (opts.ssh === true) return "--ssh";
+  if (opts.https === true) return "--https";
+  if (opts.host !== void 0) return "--host";
+  return null;
+}
+async function chooseStart(prompts) {
+  const answer = await prompts.select({
+    message: "How do you want to start?",
+    options: [
+      { value: "github", label: "From a GitHub organization" },
+      { value: "blank", label: "Blank local workspace" }
+    ]
+  });
+  if (prompts.isCancel(answer)) return null;
+  return answer === "blank" ? "blank" : "github";
+}
 var OTHER = /* @__PURE__ */ Symbol("another organization");
 async function chooseOrganization(provider, prompts) {
   if (!provider.authenticated) return OTHER;
@@ -3082,6 +3269,19 @@ async function createCommand(opts, deps = {}) {
     process.stderr.write("--ssh and --https cannot be combined\n");
     return 2;
   }
+  if (opts.blank === true) {
+    const clash = blankConflict(opts);
+    if (clash !== null) {
+      process.stderr.write(`--blank cannot be combined with ${clash}
+`);
+      return 2;
+    }
+    if (opts.name !== void 0 && !WORKSPACE_NAME.test(opts.name)) {
+      process.stderr.write(`${workspaceNameError(opts.name)}
+`);
+      return 2;
+    }
+  }
   if (opts.org !== void 0 && !ORG_NAME.test(opts.org)) {
     process.stderr.write(
       `organization name "${opts.org}" is not a valid GitHub organization name
@@ -3090,6 +3290,7 @@ async function createCommand(opts, deps = {}) {
     return 2;
   }
   let pm = opts.pm !== void 0 && isPackageManager(opts.pm) ? opts.pm : detectPackageManager();
+  const launchedWith = pm;
   const interactive = opts.yes !== true && terminal.isTty();
   const ui = interactive ? await makeUi(terminal) : { ...plainUi };
   let sshTest;
@@ -3129,6 +3330,23 @@ async function createCommand(opts, deps = {}) {
       );
       return 1;
     }
+    let blank = opts.blank === true;
+    if (!blank && interactive && opts.org === void 0 && opts.repos === void 0) {
+      const start = await chooseStart(await prompts());
+      if (start === null) return cancelled(ui);
+      blank = start === "blank";
+    }
+    if (blank)
+      return await createBlank({
+        name: opts.name,
+        cwd,
+        pm,
+        interactive,
+        mayWrite: opts.yes === true || terminal.isTty(),
+        skipInstall: opts.skipInstall === true,
+        ui,
+        prompts
+      });
     let prompted = false;
     let org = opts.org;
     if (org === void 0 && !interactive) {
@@ -3176,8 +3394,8 @@ async function createCommand(opts, deps = {}) {
       org = answer.trim();
       prompted = true;
     }
-    const root = resolve3(cwd, org);
-    const shown = relative2(cwd, root) || ".";
+    const root = resolve4(cwd, org);
+    const shown = relative4(cwd, root) || ".";
     const problem = await targetProblem(cwd, root, pm);
     if (problem !== null) {
       process.stderr.write(`${problem}
@@ -3218,8 +3436,8 @@ async function createCommand(opts, deps = {}) {
       );
     let catalogue = { contract: 1, org, repos: {}, scopes: {} };
     const staged = async () => {
-      staging ??= await mkdtemp(join15(tmpdir(), "rness-join-"));
-      return join15(staging, ".rness");
+      staging ??= await mkdtemp(join17(tmpdir(), "rness-join-"));
+      return join17(staging, ".rness");
     };
     if (joining) {
       const stagedDir = await staged();
@@ -3269,21 +3487,10 @@ async function createCommand(opts, deps = {}) {
       });
       if (p.isCancel(ok) || ok !== true) return cancelled(ui);
     }
-    const rnessDir = join15(root, ".rness");
-    const install = async () => {
-      if (opts.skipInstall === true) {
-        ui.line("skipped", `install with ${pm} (--skip-install)`);
-        return;
-      }
-      const frozen = await hasLockfile(rnessDir, pm);
-      await ui.step(
-        { doing: `installing dependencies with ${pm}` },
-        () => installDependencies(pm, rnessDir, { frozen }),
-        () => ["installed", `dependencies with ${pm}`]
-      );
-    };
+    const rnessDir = join17(root, ".rness");
+    const install = () => installContext({ ui, pm, rnessDir, skip: opts.skipInstall === true });
     if (joining) {
-      await mkdir3(root, { recursive: true });
+      await mkdir5(root, { recursive: true });
       await placeContext(
         await staged(),
         rnessDir,
@@ -3293,7 +3500,7 @@ async function createCommand(opts, deps = {}) {
       ui.line("cloned", `${shown}/.rness (joined ${org})`);
       if (opts.pm === void 0) pm = await workspacePackageManager(rnessDir);
       await install();
-      await mkdir3(join15(root, "org"), { recursive: true });
+      await mkdir5(join17(root, "org"), { recursive: true });
       const failures2 = await cloneSelection({
         root,
         rnessDir,
@@ -3316,15 +3523,18 @@ async function createCommand(opts, deps = {}) {
       const remaining = Object.keys(catalogue.repos).filter(
         (name2) => !cloned.has(name2)
       );
+      const rness2 = await rnessRunnerFor(launchedWith);
       const next2 = [
         `cd ${shown}`,
         // The comment above its command, as the new-workspace note does: a
         // line that wraps in a narrow terminal is a line nobody reads.
         ...remaining.length > 0 ? [
           `# clone the catalogue repositories you did not pick: ${remaining.join(", ")}`,
-          "rness sync --all"
+          `${rness2} sync --all`
         ] : [],
-        ...failures2.map((f) => `rness add ${f.spec}   # failed: ${f.message}`)
+        ...failures2.map(
+          (f) => `${rness2} add ${f.spec}   # failed: ${f.message}`
+        )
       ];
       if (ui.session) ui.note("Next steps", next2);
       else process.stdout.write(`
@@ -3333,30 +3543,17 @@ ${next2.map((l) => `  ${l}`).join("\n")}
       ui.outro(`You joined ${org} \u2014 your workspace is in ${shown}/`);
       return failures2.length > 0 ? 1 : 0;
     }
-    const pmVersion = await packageManagerVersion(pm);
-    await mkdir3(root, { recursive: true });
-    try {
-      await copyScaffold(rnessDir, {
-        version: VERSION,
-        packageManager: `${pm}@${pmVersion}`
-      });
-      await writeManifest(rnessDir, catalogue);
-      ui.line("created", `${shown}/.rness (new workspace)`);
-      await install();
-    } catch (e) {
-      reportError(e);
-      await rm4(rnessDir, { recursive: true, force: true }).catch(
-        () => void 0
-      );
-      if (await isEmptyDir(root).catch(() => false))
-        await rm4(root, { recursive: true, force: true }).catch(() => void 0);
-      process.stderr.write(
-        `removed ${shown}/.rness after the failure; fix it and retry
-`
-      );
-      return 1;
-    }
-    await mkdir3(join15(root, "org"), { recursive: true });
+    const built = await buildContext({
+      ui,
+      root,
+      shown,
+      manifest: catalogue,
+      pm,
+      skipInstall: opts.skipInstall === true,
+      kind: "new workspace"
+    });
+    if (!built) return 1;
+    await mkdir5(join17(root, "org"), { recursive: true });
     const failures = await cloneSelection({
       root,
       rnessDir,
@@ -3367,15 +3564,7 @@ ${next2.map((l) => `  ${l}`).join("\n")}
       provider: gitProvider,
       ui
     });
-    await init(rnessDir);
-    try {
-      await commitAll(rnessDir, "chore: rness workspace context");
-      ui.line("committed", `${shown}/.rness`);
-    } catch (e) {
-      ui.warn(
-        `${e instanceof Error ? e.message : String(e)} \u2014 commit ${shown}/.rness yourself`
-      );
-    }
+    await commitContext({ ui, rnessDir, shown });
     const code = await syncBlocks(
       ui,
       root,
@@ -3394,11 +3583,12 @@ ${next2.map((l) => `  ${l}`).join("\n")}
       url: contextUrl
     }) : false;
     if (published === null) return cancelled(ui);
+    const rness = await rnessRunnerFor(launchedWith);
     const next = [
       `cd ${shown}/.rness`,
       // What was asked for and did not happen, as the command that retries
       // it — the workspace is complete otherwise.
-      ...failures.map((f) => `rness add ${f.spec}   # failed: ${f.message}`),
+      ...failures.map((f) => `${rness} add ${f.spec}   # failed: ${f.message}`),
       ...published ? [] : [
         `# create the empty private repository ${org}/.rness on github.com, then:`,
         `git remote add origin ${contextUrl} && git push -u origin main`,
@@ -3407,7 +3597,7 @@ ${next2.map((l) => `  ${l}`).join("\n")}
         "# or, with the GitHub CLI (gh) installed, in one step:",
         `gh repo create ${org}/.rness --private --source . --push`
       ],
-      `# then, for every teammate: npm create rness ${org}`
+      `# then, for every teammate: ${launchedWith} create rness ${org}`
     ];
     if (ui.session) {
       ui.note("Next steps", next);
@@ -3428,7 +3618,7 @@ ${next2.map((l) => `  ${l}`).join("\n")}
     return reportError(e);
   } finally {
     if (staging !== void 0)
-      await rm4(staging, { recursive: true, force: true }).catch(() => void 0);
+      await rm5(staging, { recursive: true, force: true }).catch(() => void 0);
   }
 }
 
@@ -3462,8 +3652,8 @@ async function logoutCommand() {
 
 // src/commands/upgrade.ts
 import { execFile as execFile5 } from "child_process";
-import { mkdir as mkdir4, readFile as readFile9, readdir as readdir3 } from "fs/promises";
-import { basename as basename5, dirname as dirname7, join as join16, relative as relative3 } from "path";
+import { mkdir as mkdir6, readFile as readFile9, readdir as readdir3 } from "fs/promises";
+import { basename as basename5, dirname as dirname7, join as join18, relative as relative5 } from "path";
 import { promisify as promisify5 } from "util";
 var execFileP5 = promisify5(execFile5);
 var NOTES = "https://github.com/rness-dev/rness/tree/main/packages/cli#readme";
@@ -3560,15 +3750,15 @@ async function upgradeCommand(version, opts, terminal = defaultTerminal) {
         return 1;
       }
     }
-    const packageFile = join16(ws.rnessDir, "package.json");
+    const packageFile = join18(ws.rnessDir, "package.json");
     const restore = /* @__PURE__ */ new Map([
       [packageFile, await readFile9(packageFile, "utf8")]
     ]);
     if (pin.spec !== target) await writePin(ws.rnessDir, pin.spec, target);
-    const workflows = join16(ws.rnessDir, ".github", "workflows");
+    const workflows = join18(ws.rnessDir, ".github", "workflows");
     for (const name of await readdir3(workflows).catch(() => [])) {
       if (!/\.ya?ml$/.test(name)) continue;
-      const file = join16(workflows, name);
+      const file = join18(workflows, name);
       const text = await readOrNull(file);
       if (text === null) continue;
       const shown = `.github/workflows/${name}`;
@@ -3586,14 +3776,14 @@ async function upgradeCommand(version, opts, terminal = defaultTerminal) {
         ui.warn(`${shown} names @rness/cli@${pin.spec}; update it by hand`);
       }
     }
-    const dependabot = join16(ws.rnessDir, ".github", "dependabot.yml");
+    const dependabot = join18(ws.rnessDir, ".github", "dependabot.yml");
     if (await exists(dependabot)) {
       ui.hint(".github/dependabot.yml is already there \u2014 left as it is");
     } else {
-      await mkdir4(dirname7(dependabot), { recursive: true });
+      await mkdir6(dirname7(dependabot), { recursive: true });
       await writeFileAtomic(
         dependabot,
-        await readFile9(join16(scaffoldDir(), ".github", "dependabot.yml"), "utf8")
+        await readFile9(join18(scaffoldDir(), ".github", "dependabot.yml"), "utf8")
       );
       ui.line(
         "wrote",
@@ -3610,7 +3800,7 @@ async function upgradeCommand(version, opts, terminal = defaultTerminal) {
       for (const [file, text] of restore) await writeFileAtomic(file, text);
       const message = e instanceof Error ? e.message : String(e);
       ui.error(message);
-      ui.hint(`restored ${relative3(cwd, packageFile) || packageFile}`, "stderr");
+      ui.hint(`restored ${relative5(cwd, packageFile) || packageFile}`, "stderr");
       if (/minimum.?release.?age|NO_MATURE/i.test(message))
         ui.hint(
           "pnpm refuses versions published less than 24 h ago: add '@rness/cli' under minimumReleaseAgeExclude in .rness/pnpm-workspace.yaml",
@@ -3629,7 +3819,7 @@ async function upgradeCommand(version, opts, terminal = defaultTerminal) {
     ui.gitIsSilent = true;
     const code = await syncBlocks(ui, ws.root, basename5(ws.root));
     if (code !== 0) return code;
-    const rel = relative3(cwd, ws.rnessDir) || ".";
+    const rel = relative5(cwd, ws.rnessDir) || ".";
     const next = [
       `git -C ${rel} add -A && git -C ${rel} commit -m "chore: rness ${target}"`,
       "# teammates: git pull \u2014 the next rness command installs it"
@@ -3655,7 +3845,7 @@ async function upgradeCommand(version, opts, terminal = defaultTerminal) {
 }
 
 // src/core/blocks.ts
-import { join as join17 } from "path";
+import { join as join19 } from "path";
 var PROBLEM = /* @__PURE__ */ new Set(["stale", "malformed"]);
 async function checkBlocks({
   root,
@@ -3672,13 +3862,13 @@ async function checkBlocks({
     warnings: checks.filter((c) => !PROBLEM.has(c.status) && c.message !== null).map((c) => c.message),
     checks
   });
-  if (!await exists(join17(root, "org"))) return derive();
+  if (!await exists(join19(root, "org"))) return derive();
   const targets = [{ scope: null, dir: root, depth: 0, label: "AGENTS.md" }];
   for (const [name, entry] of Object.entries(manifest.scopes)) {
     const segments = entry.path.split("/");
     targets.push({
       scope: name,
-      dir: join17(root, ...segments),
+      dir: join19(root, ...segments),
       depth: segments.length,
       label: `${entry.path}/AGENTS.md`
     });
@@ -3692,7 +3882,7 @@ async function checkBlocks({
       );
       continue;
     }
-    const text = await readOrNull(join17(t.dir, "AGENTS.md"));
+    const text = await readOrNull(join19(t.dir, "AGENTS.md"));
     const lines = text === null ? [] : text.split(/\r?\n/);
     const found = findBlock(lines);
     if (found.kind === "none") {
@@ -3727,7 +3917,7 @@ async function checkBlocks({
 }
 
 // src/core/contract.ts
-import { join as join18 } from "path";
+import { join as join20 } from "path";
 var STATUSES = {
   adr: ["Proposed", "Accepted", "Rejected", "Superseded"],
   specs: [
@@ -3746,7 +3936,7 @@ async function checkContract(rnessDir) {
   const problems = [];
   for (const name of COLLECTIONS) {
     const allowed = STATUSES[name];
-    const items = await collectMarkdown(join18(rnessDir, name));
+    const items = await collectMarkdown(join20(rnessDir, name));
     for (const item of items) {
       const where = `${name}/${item.rel}`;
       if (SKIP.has(where)) continue;
@@ -3789,8 +3979,7 @@ async function validateCommand(opts, deps = {}) {
     const ws = await findWorkspace(cwd);
     const manifest = await loadManifest(ws.rnessDir);
     for (const s of Object.keys(manifest.scopes)) scopeChain(manifest, s);
-    const { org, warning } = resolveOrg(manifest, ws.root);
-    const warnings = warning === null ? [] : [warning];
+    const org = workspaceName(manifest, ws.root);
     const problems = await checkContract(ws.rnessDir);
     const blocks = await checkBlocks({
       root: ws.root,
@@ -3799,12 +3988,11 @@ async function validateCommand(opts, deps = {}) {
       org
     });
     problems.push(...blocks.problems);
-    warnings.push(...blocks.warnings);
     const ui = await makeUi(deps.terminal ?? defaultTerminal);
     if (!ui.session) {
       for (const p of problems) process.stderr.write(`${p}
 `);
-      for (const w of warnings) process.stderr.write(`${warn(w)}
+      for (const w of blocks.warnings) process.stderr.write(`${warn(w)}
 `);
       if (problems.length > 0) return 1;
       process.stdout.write("context ok\n");
@@ -3817,7 +4005,6 @@ async function validateCommand(opts, deps = {}) {
         ui.error(c.message);
       else ui.warn(c.message);
     for (const p of problems) if (!blocks.problems.includes(p)) ui.error(p);
-    for (const w of warnings) if (!blocks.warnings.includes(w)) ui.warn(w);
     ui.outro(
       problems.length > 0 ? "Context mismatch" : "Context OK",
       problems.length > 0 ? "error" : "done"
@@ -3920,8 +4107,11 @@ function buildProgram(state) {
     state.code = await upgradeCommand(version, opts);
   });
   program.command("create").description(
-    "Create a workspace for a GitHub organization, or join its existing .rness"
-  ).argument("[org]", "the GitHub organization, same as --org").option(
+    "Create or join a GitHub organization's workspace, or a blank one with --blank"
+  ).argument(
+    "[name]",
+    "the GitHub organization, same as --org; with --blank, the workspace directory"
+  ).option(
     "--org <name>",
     "the GitHub organization, exact name (github.com/<name>)"
   ).option(
@@ -3933,7 +4123,16 @@ function buildProgram(state) {
   ).option(
     "--ssh",
     "force git@github.com: (default: SSH when it works, else HTTPS)"
-  ).option("--https", "force https://github.com/").option("--skip-install", "do not install .rness/ dependencies").option("-y, --yes", "do not ask for confirmation").option("--template <name>", "reserved").addOption(new Option("--host <base>").hideHelp()).addOption(new Option("--github-api <base>").hideHelp()).addOption(new Option("--cwd <dir>").hideHelp()).action(async (orgArg, opts) => {
+  ).option("--https", "force https://github.com/").option(
+    "--blank",
+    "a local workspace with no GitHub organization: .rness/, an empty org/, the root files"
+  ).option("--skip-install", "do not install .rness/ dependencies").option("-y, --yes", "do not ask for confirmation").option("--template <name>", "reserved").addOption(new Option("--host <base>").hideHelp()).addOption(new Option("--github-api <base>").hideHelp()).addOption(new Option("--cwd <dir>").hideHelp()).action(async (orgArg, opts) => {
+    if (opts.blank === true) {
+      state.code = await createCommand(
+        orgArg === void 0 ? opts : { ...opts, name: orgArg }
+      );
+      return;
+    }
     if (orgArg !== void 0 && opts.org !== void 0 && orgArg !== opts.org) {
       process.stderr.write(
         `organization given twice: "${orgArg}" and --org "${opts.org}"
@@ -3967,6 +4166,51 @@ async function run(argv) {
   return state.code;
 }
 
+// src/core/catch-up.ts
+import { spawnSync } from "child_process";
+var OWN_COMMANDS = [
+  "create",
+  "upgrade",
+  "update",
+  "login",
+  "logout",
+  "git-credential"
+];
+var CATCH_UP_DONE = "RNESS_CATCH_UP_DONE";
+async function catchUp(argv, deps = {}) {
+  const env = deps.env ?? process.env;
+  const cwd = deps.cwd ?? process.cwd();
+  const command = argv[0];
+  if (command === void 0 || command.startsWith("-") || OWN_COMMANDS.includes(command) || env["RNESS_NO_DELEGATE"] === "1" || env[CATCH_UP_DONE] === "1")
+    return null;
+  const ws = await findWorkspace(cwd).catch(() => null);
+  if (ws === null) return null;
+  env[CATCH_UP_DONE] = "1";
+  const stderr = deps.stderr ?? ((text) => void process.stderr.write(text));
+  const outcome = await ensureInstalled(ws.rnessDir, {
+    env,
+    announce: (pin) => stderr(`installing @rness/cli ${pin} in .rness\u2026
+`),
+    ...deps.install === void 0 ? {} : { install: deps.install }
+  });
+  if (outcome === null) return null;
+  if (!outcome.installed) {
+    const warning = await driftWarning(cwd);
+    if (warning !== null) stderr(`${warning}
+`);
+    return null;
+  }
+  if (await pinDrift(ws.rnessDir) !== null) return null;
+  const bin = await pinnedBinPath(ws.rnessDir);
+  if (bin === null) return null;
+  const spawn4 = deps.spawn ?? ((file, args, dir) => spawnSync(process.execPath, [file, ...args], {
+    cwd: dir,
+    env,
+    stdio: "inherit"
+  }).status ?? 1);
+  return spawn4(bin, argv, cwd);
+}
+
 export {
   exists,
   readOrNull,
@@ -4013,20 +4257,16 @@ export {
   addCommand,
   renderMarkdown,
   contextCommand,
-  pinnedBinPath,
+  VERSION,
   findDelegate,
   PACKAGE_MANAGERS,
   isPackageManager,
   detectPackageManager,
   packageManagerVersion,
   installDependencies,
-  pinDrift,
-  driftWarning,
-  ensureInstalled,
   SCAFFOLD_FILES,
   scaffoldDir,
   copyScaffold,
-  VERSION,
   loginCommand,
   createCommand,
   logoutCommand,
@@ -4035,6 +4275,8 @@ export {
   STATUSES,
   checkContract,
   validateCommand,
-  run
+  run,
+  OWN_COMMANDS,
+  catchUp
 };
-//# sourceMappingURL=chunk-P4YG6P7I.js.map
+//# sourceMappingURL=chunk-NY3WV7X5.js.map