@oodarun/cli 0.1.18 → 0.1.20

package/dist/cli.js

@@ -1304,9 +1304,9 @@ function failLogin(json, message) {
   }
   process.exitCode = 1;
 }
-function whoamiCmd(opts) {
+async function whoamiCmd(opts) {
   const orgId = getOrgId();
-  const token = getAccessToken();
+  const token = await ensureFreshAccessToken();
   if (!orgId || !token) {
     if (opts.json) {
       console.log(JSON.stringify({ ok: false, authenticated: false }));
@@ -5669,15 +5669,15 @@ function buildPublishBody(opts) {
 // src/cli/publish.ts
 var MAX_SLUG_ATTEMPTS = 5;
 async function publishLocalDir(opts) {
-  const { projectDir, slugOverride, json } = opts;
+  const { projectDir, slugOverride, force, json } = opts;
   if (!isOrgMode()) {
     fail(json, "Publishing requires an organisation login. Run `ooda` and log in first.");
     return;
   }
   const orgId = getOrgId();
-  const jwt = getAccessToken();
+  const jwt = await ensureFreshAccessToken();
   if (!orgId || !jwt) {
-    fail(json, "No active org session. Run `ooda` and log in first.");
+    fail(json, "Not signed in (or your session expired). Run `ooda login` first.");
     return;
   }
   const apiBase = process.env.OODA_API_BASE || "https://api.ooda.run";
@@ -5705,11 +5705,21 @@ async function publishLocalDir(opts) {
     return;
   }
   let candidate = base;
-  if (allowSuffix) {
-    try {
-      const taken = new Set((await listSites(auth)).map((s) => s.slug));
-      if (taken.has(candidate)) candidate = appendSuffix(base, randomSlugSuffix());
-    } catch {
+  let takenInOrg = /* @__PURE__ */ new Set();
+  try {
+    takenInOrg = new Set((await listSites(auth)).map((s) => s.slug));
+  } catch {
+  }
+  const isOurs = (slug) => config.slug === slug;
+  if (takenInOrg.has(candidate) && !isOurs(candidate) && !force) {
+    if (allowSuffix) {
+      candidate = appendSuffix(base, randomSlugSuffix());
+    } else {
+      fail(
+        json,
+        `A site "${candidate}" already exists in your org and isn't this project's. Publishing would overwrite it \u2014 choose a different --slug, or pass --force to overwrite on purpose.`
+      );
+      return;
     }
   }
   if (!json) {
@@ -5804,8 +5814,8 @@ var ACCESS_MODES = ["public", "password", "login"];
 async function runSitesCommand(args) {
   if (!isOrgMode()) return fail2(args.json, "Managing sites requires an organisation login. Run `ooda` and log in first.");
   const orgId = getOrgId();
-  const jwt = getAccessToken();
-  if (!orgId || !jwt) return fail2(args.json, "No active org session. Run `ooda` and log in first.");
+  const jwt = await ensureFreshAccessToken();
+  if (!orgId || !jwt) return fail2(args.json, "Not signed in (or your session expired). Run `ooda login` first.");
   const apiBase = process.env.OODA_API_BASE || "https://api.ooda.run";
   const auth = { apiBase, orgId, jwt };
   const sub = args.subcommand || "list";
@@ -5950,6 +5960,7 @@ publish [path]
   build folder. The CLI finds the build output inside it (dist, build, out,
   .output/public, .next/static). Requires an org login.
     --slug <slug>              Override the slug (default: ooda.json name, else folder name)
+    --force                    Overwrite an existing same-org site at this slug (otherwise refused)
     --json                     Machine-readable JSON output
 
 sites access <slug>
@@ -6052,7 +6063,7 @@ async function notifyIfOutdated(current, now = Date.now()) {
 }
 
 // src/cli/index.ts
-var CLI_VERSION = "0.1.18";
+var CLI_VERSION = "0.1.20";
 function formatMutationError(result) {
   const parts = [];
   if (result.status !== void 0) parts.push(String(result.status));
@@ -6132,6 +6143,7 @@ function parseArgs(argv) {
       i++;
     } else if (arg === "--clear-password") flags.clearPassword = true;
     else if (arg === "--clear-mode") flags.clearMode = true;
+    else if (arg === "--force") flags.force = true;
     else if (arg === "--json") flags.json = true;
     else if (!arg.startsWith("--")) positionals.push(arg);
   }
@@ -6143,6 +6155,7 @@ function parseArgs(argv) {
   } else if (command === "publish") {
     args.publishTarget = positionals[0];
     args.publishSlug = flags.slug;
+    args.publishForce = Boolean(flags.force);
   } else if (command === "sites") {
     args.sites = {
       subcommand: positionals[0],
@@ -6605,7 +6618,7 @@ async function main() {
   if (args.command === "publish") {
     await ensureAuth({ requireClaudeToken: false });
     const dir = args.publishTarget ? path12.resolve(args.publishTarget) : cwd;
-    await publishLocalDir({ projectDir: dir, slugOverride: args.publishSlug, json: args.json });
+    await publishLocalDir({ projectDir: dir, slugOverride: args.publishSlug, force: args.publishForce, json: args.json });
     process.exit(process.exitCode ?? 0);
   }
   if (args.command === "sites") {
@@ -6618,7 +6631,7 @@ async function main() {
     process.exit(process.exitCode ?? 0);
   }
   if (args.command === "whoami") {
-    whoamiCmd({ json: args.json });
+    await whoamiCmd({ json: args.json });
     process.exit(process.exitCode ?? 0);
   }
   if (args.command === "logout") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oodarun/cli",
-  "version": "0.1.18",
+  "version": "0.1.20",
   "description": "Launch Claude Code on cloud dev environments",
   "type": "module",
   "license": "UNLICENSED",