@neopress/cli 4.1.0 → 4.2.0

package/dist/bin.cjs

@@ -3387,6 +3387,7 @@ function fail(message, code = 1) {
 // src/utils/config.ts
 var import_node_fs2 = require("fs");
 var import_node_path2 = require("path");
+var import_node_os2 = require("os");
 
 // src/utils/token-store.ts
 var import_node_fs = require("fs");
@@ -3421,31 +3422,55 @@ function clearSession() {
 // src/utils/config.ts
 var PROJECT_CONFIG = ".neopressrc.json";
 var WORKSPACE_CONFIG = ".neopress/config.json";
-function readProjectConfig() {
-  let config2 = {};
-  for (const file2 of [PROJECT_CONFIG, WORKSPACE_CONFIG]) {
-    try {
-      const parsed = JSON.parse((0, import_node_fs2.readFileSync)(file2, "utf-8"));
-      config2 = {
-        ...config2,
-        ...typeof parsed.siteId === "number" ? { siteId: parsed.siteId } : {},
-        ...typeof parsed.baseUrl === "string" ? { baseUrl: parsed.baseUrl } : {}
-      };
-    } catch {
+function readConfigFileAt(path) {
+  try {
+    const parsed = JSON.parse((0, import_node_fs2.readFileSync)(path, "utf-8"));
+    return {
+      ...typeof parsed.siteId === "number" ? { siteId: parsed.siteId } : {},
+      ...typeof parsed.baseUrl === "string" ? { baseUrl: parsed.baseUrl } : {}
+    };
+  } catch {
+    return {};
+  }
+}
+function locateProjectConfig(startDir = process.cwd()) {
+  const home = (0, import_node_path2.resolve)((0, import_node_os2.homedir)());
+  let dir = (0, import_node_path2.resolve)(startDir);
+  while (true) {
+    let merged = {};
+    let foundPath;
+    for (const rel of [PROJECT_CONFIG, WORKSPACE_CONFIG]) {
+      const p = (0, import_node_path2.join)(dir, rel);
+      const cfg = readConfigFileAt(p);
+      if (Object.keys(cfg).length > 0) {
+        merged = { ...merged, ...cfg };
+        if (!foundPath) foundPath = p;
+      }
     }
+    if (Object.keys(merged).length > 0) return { config: merged, path: foundPath };
+    const parent = (0, import_node_path2.dirname)(dir);
+    if (dir === home || parent === dir) break;
+    dir = parent;
   }
-  return config2;
+  return { config: {} };
+}
+function readProjectConfig() {
+  return locateProjectConfig().config;
 }
 function writeWorkspaceConfig(next) {
   (0, import_node_fs2.mkdirSync)((0, import_node_path2.dirname)(WORKSPACE_CONFIG), { recursive: true });
   (0, import_node_fs2.writeFileSync)(WORKSPACE_CONFIG, JSON.stringify(next, null, 2) + "\n", "utf-8");
 }
-function getSiteId() {
-  const envSiteId = process.env.NEOPRESS_SITE_ID;
-  if (envSiteId) return parseInt(envSiteId, 10);
-  const projectConfig = readProjectConfig();
-  if (projectConfig.siteId) return projectConfig.siteId;
-  return loadSession().activeSiteId;
+function writeProjectSiteId(siteId) {
+  let raw = {};
+  try {
+    const parsed = JSON.parse((0, import_node_fs2.readFileSync)(PROJECT_CONFIG, "utf-8"));
+    if (parsed && typeof parsed === "object") raw = parsed;
+  } catch {
+  }
+  const next = { ...raw, siteId };
+  (0, import_node_fs2.writeFileSync)(PROJECT_CONFIG, JSON.stringify(next, null, 2) + "\n", "utf-8");
+  return (0, import_node_path2.resolve)(PROJECT_CONFIG);
 }
 function getBaseUrl() {
   return process.env.NEOPRESS_BASE_URL || readProjectConfig().baseUrl || "https://app.neopress.ai";
@@ -3461,12 +3486,24 @@ var siteOverride;
 function setSiteOverride(value) {
   siteOverride = value;
 }
-function getSiteTarget() {
+function resolveSiteTarget() {
   if (siteOverride) {
     const n = parseInt(siteOverride, 10);
-    return String(n) === siteOverride ? n : siteOverride;
+    const value = String(n) === siteOverride ? n : siteOverride;
+    return { value, source: "flag", detail: "--site" };
+  }
+  const envSiteId = process.env.NEOPRESS_SITE_ID;
+  if (envSiteId) return { value: parseInt(envSiteId, 10), source: "env", detail: "NEOPRESS_SITE_ID" };
+  const located = locateProjectConfig();
+  if (typeof located.config.siteId === "number") {
+    return { value: located.config.siteId, source: "project-config", detail: located.path };
   }
-  return getSiteId();
+  const active = loadSession().activeSiteId;
+  if (active) return { value: active, source: "global-active", detail: "sites use" };
+  return { value: void 0, source: "none" };
+}
+function getSiteTarget() {
+  return resolveSiteTarget().value;
 }
 
 // src/utils/pkce.ts
@@ -3759,11 +3796,11 @@ function __rest(s, e) {
 }
 function __awaiter(thisArg, _arguments, P, generator) {
   function adopt(value) {
-    return value instanceof P ? value : new P(function(resolve) {
-      resolve(value);
+    return value instanceof P ? value : new P(function(resolve2) {
+      resolve2(value);
     });
   }
-  return new (P || (P = Promise))(function(resolve, reject) {
+  return new (P || (P = Promise))(function(resolve2, reject) {
     function fulfilled(value) {
       try {
         step(generator.next(value));
@@ -3779,7 +3816,7 @@ function __awaiter(thisArg, _arguments, P, generator) {
       }
     }
     function step(result) {
-      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+      result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
     }
     step((generator = generator.apply(thisArg, _arguments || [])).next());
   });
@@ -4150,18 +4187,18 @@ var PostgrestError = class extends Error {
   }
 };
 function sleep(ms, signal) {
-  return new Promise((resolve) => {
+  return new Promise((resolve2) => {
     if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
-      resolve();
+      resolve2();
       return;
     }
     const id = setTimeout(() => {
       signal === null || signal === void 0 || signal.removeEventListener("abort", onAbort);
-      resolve();
+      resolve2();
     }, ms);
     function onAbort() {
       clearTimeout(id);
-      resolve();
+      resolve2();
     }
     signal === null || signal === void 0 || signal.addEventListener("abort", onAbort);
   });
@@ -12110,15 +12147,15 @@ var RealtimeChannel = class _RealtimeChannel {
         }
       }
     } else {
-      return new Promise((resolve) => {
+      return new Promise((resolve2) => {
         var _a3, _b2, _c;
         const push = this.channelAdapter.push(args.type, args, opts.timeout || this.timeout);
         if (args.type === "broadcast" && !((_c = (_b2 = (_a3 = this.params) === null || _a3 === void 0 ? void 0 : _a3.config) === null || _b2 === void 0 ? void 0 : _b2.broadcast) === null || _c === void 0 ? void 0 : _c.ack)) {
-          resolve("ok");
+          resolve2("ok");
         }
-        push.receive("ok", () => resolve("ok"));
-        push.receive("error", () => resolve("error"));
-        push.receive("timeout", () => resolve("timed out"));
+        push.receive("ok", () => resolve2("ok"));
+        push.receive("error", () => resolve2("error"));
+        push.receive("timeout", () => resolve2("timed out"));
       });
     }
   }
@@ -12143,8 +12180,8 @@ var RealtimeChannel = class _RealtimeChannel {
    * @category Realtime
    */
   async unsubscribe(timeout = this.timeout) {
-    return new Promise((resolve) => {
-      this.channelAdapter.unsubscribe(timeout).receive("ok", () => resolve("ok")).receive("timeout", () => resolve("timed out")).receive("error", () => resolve("error"));
+    return new Promise((resolve2) => {
+      this.channelAdapter.unsubscribe(timeout).receive("ok", () => resolve2("ok")).receive("timeout", () => resolve2("timed out")).receive("error", () => resolve2("error"));
     });
   }
   /**
@@ -12225,8 +12262,8 @@ var RealtimeChannel = class _RealtimeChannel {
   }
   /** @internal */
   _notThisChannelEvent(event, ref) {
-    const { close, error: error48, leave, join: join2 } = CHANNEL_EVENTS;
-    const events = [close, error48, leave, join2];
+    const { close, error: error48, leave, join: join3 } = CHANNEL_EVENTS;
+    const events = [close, error48, leave, join3];
     return ref && events.includes(event) && ref !== this.joinPush.ref;
   }
   /** @internal */
@@ -12339,11 +12376,11 @@ var SocketAdapter = class {
     this.socket.connect();
   }
   disconnect(callback, code, reason, timeout = 1e4) {
-    return new Promise((resolve) => {
-      setTimeout(() => resolve("timeout"), timeout);
+    return new Promise((resolve2) => {
+      setTimeout(() => resolve2("timeout"), timeout);
       this.socket.disconnect(() => {
         callback();
-        resolve("ok");
+        resolve2("ok");
       }, code, reason);
     });
   }
@@ -13757,7 +13794,7 @@ var _getRequestParams = (method, options, parameters, body) => {
   return _objectSpread22(_objectSpread22({}, params), parameters);
 };
 async function _handleRequest(fetcher, method, url2, options, parameters, body, namespace) {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve2, reject) => {
     fetcher(url2, _getRequestParams(method, options, parameters, body)).then((result) => {
       if (!result.ok) throw result;
       if (options === null || options === void 0 ? void 0 : options.noResolveJson) return result;
@@ -13767,7 +13804,7 @@ async function _handleRequest(fetcher, method, url2, options, parameters, body,
         if (!contentType || !contentType.includes("application/json")) return {};
       }
       return result.json();
-    }).then((data) => resolve(data)).catch((error48) => handleError(error48, reject, options, namespace));
+    }).then((data) => resolve2(data)).catch((error48) => handleError(error48, reject, options, namespace));
   });
 }
 function createFetchApi(namespace = "storage") {
@@ -24012,11 +24049,11 @@ var DEFAULT_TRACE_PROPAGATION_OPTIONS = {
 };
 function __awaiter2(thisArg, _arguments, P, generator) {
   function adopt(value) {
-    return value instanceof P ? value : new P(function(resolve) {
-      resolve(value);
+    return value instanceof P ? value : new P(function(resolve2) {
+      resolve2(value);
     });
   }
-  return new (P || (P = Promise))(function(resolve, reject) {
+  return new (P || (P = Promise))(function(resolve2, reject) {
     function fulfilled(value) {
       try {
         step(generator.next(value));
@@ -24032,7 +24069,7 @@ function __awaiter2(thisArg, _arguments, P, generator) {
       }
     }
     function step(result) {
-      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+      result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
     }
     step((generator = generator.apply(thisArg, _arguments || [])).next());
   });
@@ -39254,8 +39291,8 @@ var SiteHistoryService = class _SiteHistoryService {
     const previousLock = _SiteHistoryService.sessionLocks.get(key) ?? Promise.resolve();
     let releaseCurrentLock = () => {
     };
-    const currentLock = new Promise((resolve) => {
-      releaseCurrentLock = resolve;
+    const currentLock = new Promise((resolve2) => {
+      releaseCurrentLock = resolve2;
     });
     const queuedLock = previousLock.catch(() => {
     }).then(() => currentLock);
@@ -40881,8 +40918,10 @@ function registerSiteCommands(program3) {
 Examples:
   $ neopress sites list
   $ neopress sites create --name "My Site" --handle my-site --use
+  $ neopress sites create --name "My Site" --handle my-site --pin
   $ neopress sites use my-site
-Run \`sites use <id|handle>\` to set the active site for all other commands.`);
+  $ neopress sites current
+Run \`sites use <id|handle>\` to set the global active site, or \`sites create --pin\` to scope a site to the current directory. \`sites current\` shows which site commands will target and why.`);
   sites.command("list").description("List accessible sites").action(async () => {
     const client = await getGlobalClientAsync();
     const sitesList = await client.site.list();
@@ -40913,10 +40952,14 @@ Examples:
   $ neopress sites create --name "My Site" --handle my-site
   $ neopress sites create --prompt "a portfolio for a freelance photographer" --use
   $ neopress sites create --name Acme --handle acme --language en
-Pass --prompt to auto-generate name/handle, or supply both --name and --handle. --language sets the default content locale (default en). --use sets the new site as active.`).option("--name <name>", "Site name").option("--handle <handle>", "Site handle").option("--prompt <prompt>", "Prompt to generate site name/handle").option("--language <locale>", "Default content locale", "en").option("--use", "Set the created site as active").action(async (options) => {
+Pass --prompt to auto-generate name/handle, or supply both --name and --handle. --language sets the default content locale (default en).
+--use sets the new site as the GLOBAL active site (shared across all directories). --pin instead writes ./.neopressrc.json for THIS directory only, leaving the global active site untouched \u2014 prefer it for parallel/automated runs so concurrent builds don't stomp each other's active site.`).option("--name <name>", "Site name").option("--handle <handle>", "Site handle").option("--prompt <prompt>", "Prompt to generate site name/handle").option("--language <locale>", "Default content locale", "en").option("--use", "Set the created site as the global active site").option("--pin", "Pin the created site to this directory via ./.neopressrc.json (no global state)").action(async (options) => {
     if (!options.prompt && !(options.name && options.handle)) {
       fail("Provide --prompt or both --name and --handle.");
     }
+    if (options.use && options.pin) {
+      fail("Pass only one of --use (global active site) or --pin (this directory only).");
+    }
     const client = await getGlobalClientAsync();
     const site = await client.site.create({
       siteName: options.name,
@@ -40924,17 +40967,26 @@ Pass --prompt to auto-generate name/handle, or supply both --name and --handle.
       prompt: options.prompt,
       language: options.language
     });
-    if (options.use) {
-      setActiveSiteId(site.id);
-    }
+    if (options.use) setActiveSiteId(site.id);
+    let pinnedPath;
+    if (options.pin) pinnedPath = writeProjectSiteId(site.id);
     output(site);
-    if (options.use && !isJsonMode()) ok(`Active site set to ${site.id}`);
+    if (!isJsonMode()) {
+      if (options.use) ok(`Active site set to ${site.id}`);
+      if (options.pin) ok(`Pinned site ${site.id} for this directory (${pinnedPath})`);
+    }
   });
   sites.command("get").description("Get current site info").action(async () => {
     const client = await getClientAsync();
     const site = await client.site.get();
     output(site);
   });
+  sites.command("current").description("Show which site commands will target, and where it resolved from").addHelpText("after", `
+Resolution order: --site flag > NEOPRESS_SITE_ID > .neopressrc.json/.neopress/config.json (cwd and up) > global active site (set by \`sites use\`).
+Local check only \u2014 it does not contact the server. Unlike \`whoami\` (which always reports the global active site), this reports the site your next command will actually hit.`).action(() => {
+    const { value, source, detail } = resolveSiteTarget();
+    output({ siteId: value ?? null, source, resolvedFrom: detail ?? null });
+  });
   sites.command("update").description("Update site settings").addHelpText("after", `
 Examples:
   $ neopress sites update --name "New Name"
@@ -40969,9 +41021,9 @@ Permanently deletes the site and all its content (workspace admin only) \u2014 t
       const { createInterface } = await import("readline");
       const rl = createInterface({ input: process.stdin, output: process.stdout });
       const answer = await new Promise(
-        (resolve) => rl.question(`Delete site "${siteIdOrHandle}" and ALL its content? Type the id/handle to confirm: `, (a) => {
+        (resolve2) => rl.question(`Delete site "${siteIdOrHandle}" and ALL its content? Type the id/handle to confirm: `, (a) => {
           rl.close();
-          resolve(a.trim());
+          resolve2(a.trim());
         })
       );
       if (answer !== siteIdOrHandle) {
@@ -41945,7 +41997,7 @@ function registerGuideCommands(program3) {
 
 // src/bin.ts
 var program2 = new Command();
-program2.name("neopress").description("Neopress CLI \u2014 manage your site from the terminal").version("4.1.0").option("--json", "Output in JSON format (for AI tools and pipes)").option("--site <idOrHandle>", "Target a specific site (overrides active site; not persisted)").option("--no-input", "Non-interactive mode").hook("preAction", (thisCommand) => {
+program2.name("neopress").description("Neopress CLI \u2014 manage your site from the terminal").version("4.2.0").option("--json", "Output in JSON format (for AI tools and pipes)").option("--site <idOrHandle>", "Target a specific site (overrides active site; not persisted)").option("--no-input", "Non-interactive mode").hook("preAction", (thisCommand) => {
   const opts = thisCommand.optsWithGlobals();
   if (opts.site) setSiteOverride(String(opts.site));
   if (opts.json || !process.stdout.isTTY) setJsonMode(true);

package/dist/index.js

@@ -18,11 +18,11 @@ function __rest(s, e) {
 }
 function __awaiter(thisArg, _arguments, P, generator) {
   function adopt(value) {
-    return value instanceof P ? value : new P(function(resolve) {
-      resolve(value);
+    return value instanceof P ? value : new P(function(resolve2) {
+      resolve2(value);
     });
   }
-  return new (P || (P = Promise))(function(resolve, reject) {
+  return new (P || (P = Promise))(function(resolve2, reject) {
     function fulfilled(value) {
       try {
         step(generator.next(value));
@@ -38,7 +38,7 @@ function __awaiter(thisArg, _arguments, P, generator) {
       }
     }
     function step(result) {
-      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+      result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
     }
     step((generator = generator.apply(thisArg, _arguments || [])).next());
   });
@@ -409,18 +409,18 @@ var PostgrestError = class extends Error {
   }
 };
 function sleep(ms, signal) {
-  return new Promise((resolve) => {
+  return new Promise((resolve2) => {
     if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
-      resolve();
+      resolve2();
       return;
     }
     const id = setTimeout(() => {
       signal === null || signal === void 0 || signal.removeEventListener("abort", onAbort);
-      resolve();
+      resolve2();
     }, ms);
     function onAbort() {
       clearTimeout(id);
-      resolve();
+      resolve2();
     }
     signal === null || signal === void 0 || signal.addEventListener("abort", onAbort);
   });
@@ -8369,15 +8369,15 @@ var RealtimeChannel = class _RealtimeChannel {
         }
       }
     } else {
-      return new Promise((resolve) => {
+      return new Promise((resolve2) => {
         var _a3, _b2, _c;
         const push = this.channelAdapter.push(args.type, args, opts.timeout || this.timeout);
         if (args.type === "broadcast" && !((_c = (_b2 = (_a3 = this.params) === null || _a3 === void 0 ? void 0 : _a3.config) === null || _b2 === void 0 ? void 0 : _b2.broadcast) === null || _c === void 0 ? void 0 : _c.ack)) {
-          resolve("ok");
+          resolve2("ok");
         }
-        push.receive("ok", () => resolve("ok"));
-        push.receive("error", () => resolve("error"));
-        push.receive("timeout", () => resolve("timed out"));
+        push.receive("ok", () => resolve2("ok"));
+        push.receive("error", () => resolve2("error"));
+        push.receive("timeout", () => resolve2("timed out"));
       });
     }
   }
@@ -8402,8 +8402,8 @@ var RealtimeChannel = class _RealtimeChannel {
    * @category Realtime
    */
   async unsubscribe(timeout = this.timeout) {
-    return new Promise((resolve) => {
-      this.channelAdapter.unsubscribe(timeout).receive("ok", () => resolve("ok")).receive("timeout", () => resolve("timed out")).receive("error", () => resolve("error"));
+    return new Promise((resolve2) => {
+      this.channelAdapter.unsubscribe(timeout).receive("ok", () => resolve2("ok")).receive("timeout", () => resolve2("timed out")).receive("error", () => resolve2("error"));
     });
   }
   /**
@@ -8484,8 +8484,8 @@ var RealtimeChannel = class _RealtimeChannel {
   }
   /** @internal */
   _notThisChannelEvent(event, ref) {
-    const { close, error: error48, leave, join: join2 } = CHANNEL_EVENTS;
-    const events = [close, error48, leave, join2];
+    const { close, error: error48, leave, join: join3 } = CHANNEL_EVENTS;
+    const events = [close, error48, leave, join3];
     return ref && events.includes(event) && ref !== this.joinPush.ref;
   }
   /** @internal */
@@ -8598,11 +8598,11 @@ var SocketAdapter = class {
     this.socket.connect();
   }
   disconnect(callback, code, reason, timeout = 1e4) {
-    return new Promise((resolve) => {
-      setTimeout(() => resolve("timeout"), timeout);
+    return new Promise((resolve2) => {
+      setTimeout(() => resolve2("timeout"), timeout);
       this.socket.disconnect(() => {
         callback();
-        resolve("ok");
+        resolve2("ok");
       }, code, reason);
     });
   }
@@ -10016,7 +10016,7 @@ var _getRequestParams = (method, options, parameters, body) => {
   return _objectSpread22(_objectSpread22({}, params), parameters);
 };
 async function _handleRequest(fetcher, method, url2, options, parameters, body, namespace) {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve2, reject) => {
     fetcher(url2, _getRequestParams(method, options, parameters, body)).then((result) => {
       if (!result.ok) throw result;
       if (options === null || options === void 0 ? void 0 : options.noResolveJson) return result;
@@ -10026,7 +10026,7 @@ async function _handleRequest(fetcher, method, url2, options, parameters, body,
         if (!contentType || !contentType.includes("application/json")) return {};
       }
       return result.json();
-    }).then((data) => resolve(data)).catch((error48) => handleError(error48, reject, options, namespace));
+    }).then((data) => resolve2(data)).catch((error48) => handleError(error48, reject, options, namespace));
   });
 }
 function createFetchApi(namespace = "storage") {
@@ -20271,11 +20271,11 @@ var DEFAULT_TRACE_PROPAGATION_OPTIONS = {
 };
 function __awaiter2(thisArg, _arguments, P, generator) {
   function adopt(value) {
-    return value instanceof P ? value : new P(function(resolve) {
-      resolve(value);
+    return value instanceof P ? value : new P(function(resolve2) {
+      resolve2(value);
     });
   }
-  return new (P || (P = Promise))(function(resolve, reject) {
+  return new (P || (P = Promise))(function(resolve2, reject) {
     function fulfilled(value) {
       try {
         step(generator.next(value));
@@ -20291,7 +20291,7 @@ function __awaiter2(thisArg, _arguments, P, generator) {
       }
     }
     function step(result) {
-      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+      result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
     }
     step((generator = generator.apply(thisArg, _arguments || [])).next());
   });
@@ -35513,8 +35513,8 @@ var SiteHistoryService = class _SiteHistoryService {
     const previousLock = _SiteHistoryService.sessionLocks.get(key) ?? Promise.resolve();
     let releaseCurrentLock = () => {
     };
-    const currentLock = new Promise((resolve) => {
-      releaseCurrentLock = resolve;
+    const currentLock = new Promise((resolve2) => {
+      releaseCurrentLock = resolve2;
     });
     const queuedLock = previousLock.catch(() => {
     }).then(() => currentLock);
@@ -37201,23 +37201,44 @@ function fail(message, code = 1) {
 
 // src/utils/config.ts
 import { existsSync as existsSync2, mkdirSync as mkdirSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "fs";
-import { dirname } from "path";
+import { dirname, join as join2, resolve } from "path";
+import { homedir as homedir2 } from "os";
 var PROJECT_CONFIG = ".neopressrc.json";
 var WORKSPACE_CONFIG = ".neopress/config.json";
-function readProjectConfig() {
-  let config2 = {};
-  for (const file2 of [PROJECT_CONFIG, WORKSPACE_CONFIG]) {
-    try {
-      const parsed = JSON.parse(readFileSync2(file2, "utf-8"));
-      config2 = {
-        ...config2,
-        ...typeof parsed.siteId === "number" ? { siteId: parsed.siteId } : {},
-        ...typeof parsed.baseUrl === "string" ? { baseUrl: parsed.baseUrl } : {}
-      };
-    } catch {
+function readConfigFileAt(path) {
+  try {
+    const parsed = JSON.parse(readFileSync2(path, "utf-8"));
+    return {
+      ...typeof parsed.siteId === "number" ? { siteId: parsed.siteId } : {},
+      ...typeof parsed.baseUrl === "string" ? { baseUrl: parsed.baseUrl } : {}
+    };
+  } catch {
+    return {};
+  }
+}
+function locateProjectConfig(startDir = process.cwd()) {
+  const home = resolve(homedir2());
+  let dir = resolve(startDir);
+  while (true) {
+    let merged = {};
+    let foundPath;
+    for (const rel of [PROJECT_CONFIG, WORKSPACE_CONFIG]) {
+      const p = join2(dir, rel);
+      const cfg = readConfigFileAt(p);
+      if (Object.keys(cfg).length > 0) {
+        merged = { ...merged, ...cfg };
+        if (!foundPath) foundPath = p;
+      }
     }
+    if (Object.keys(merged).length > 0) return { config: merged, path: foundPath };
+    const parent = dirname(dir);
+    if (dir === home || parent === dir) break;
+    dir = parent;
   }
-  return config2;
+  return { config: {} };
+}
+function readProjectConfig() {
+  return locateProjectConfig().config;
 }
 function writeWorkspaceConfig(next) {
   mkdirSync2(dirname(WORKSPACE_CONFIG), { recursive: true });
@@ -37244,12 +37265,24 @@ function setActiveSiteId(siteId) {
   }
 }
 var siteOverride;
-function getSiteTarget() {
+function resolveSiteTarget() {
   if (siteOverride) {
     const n = parseInt(siteOverride, 10);
-    return String(n) === siteOverride ? n : siteOverride;
+    const value = String(n) === siteOverride ? n : siteOverride;
+    return { value, source: "flag", detail: "--site" };
   }
-  return getSiteId();
+  const envSiteId = process.env.NEOPRESS_SITE_ID;
+  if (envSiteId) return { value: parseInt(envSiteId, 10), source: "env", detail: "NEOPRESS_SITE_ID" };
+  const located = locateProjectConfig();
+  if (typeof located.config.siteId === "number") {
+    return { value: located.config.siteId, source: "project-config", detail: located.path };
+  }
+  const active = loadSession().activeSiteId;
+  if (active) return { value: active, source: "global-active", detail: "sites use" };
+  return { value: void 0, source: "none" };
+}
+function getSiteTarget() {
+  return resolveSiteTarget().value;
 }
 
 // src/utils/client.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neopress/cli",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "description": "Neopress CLI — manage your Neopress site from the terminal",
   "type": "module",
   "keywords": [