@opennous/cli 0.13.0 → 0.14.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opennous/cli",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "description": "Nous CLI — set up Nous, connect it to your coding agent, and read the Context API from your terminal",
   "type": "module",
   "bin": {

package/src/backfill.js

@@ -97,6 +97,9 @@ function runCommand({ cmd, args, input }, cwd) {
   });
 }
 
+/** Nothing to read in this window. Pure. */
+export const emptyEstimate = (counts) => !Object.values(counts ?? {}).some((n) => n > 0);
+
 /** One line on how far the job is, or null when there is nothing to say yet. Pure. */
 export function progressLine(reading, answered) {
   if (reading?.finished) return "Wrapping up: last summaries for your accounts.";

package/src/index.js

@@ -110,9 +110,9 @@ function writeConfig(cfg) {
 /** A key is there to use: from the environment, or saved by a sign-in. */
 const hasKey = () => !!(process.env.NOUS_API_KEY || readConfig().apiKey);
 
-function apiClient() {
+function apiClient(key) {
   const cfg = readConfig();
-  const apiKey = process.env.NOUS_API_KEY || cfg.apiKey;
+  const apiKey = key || process.env.NOUS_API_KEY || cfg.apiKey;
   const apiUrl = process.env.NOUS_API_URL || cfg.apiUrl || "https://api.opennous.cloud";
 
   if (!apiKey) {
@@ -288,14 +288,18 @@ async function browserLogin(url, opts = {}) {
     } catch { continue; }
 
     if (j.status === "approved" && j.api_key) {
-      const cfg = readConfig();
-      cfg.apiKey = j.api_key;
-      cfg.apiUrl = apiUrl;
-      writeConfig(cfg);
+      // `save: false` is one command's key: the sign-in on this machine stays what it was.
+      if (opts.save !== false) {
+        const cfg = readConfig();
+        cfg.apiKey = j.api_key;
+        cfg.apiUrl = apiUrl;
+        writeConfig(cfg);
+      }
       const who = await fetchWhoami(apiUrl, j.api_key);
       console.log(`\n\n  ${green("✓")} ${bold("Signed in")}${who ? ` as ${identityLine(who)}` : ""}`);
-      console.log(`  ${dim("Key saved to ~/.nous/config.json")}\n`);
-      return true;
+      if (opts.save !== false) console.log(`  ${dim("Key saved to ~/.nous/config.json")}`);
+      console.log("");
+      return j.api_key;
     }
     if (j.status === "denied")  { console.log("\nAuthorization was denied."); process.exit(1); }
     if (j.status === "expired") { console.log("\nThis sign-in expired. Run it again."); process.exit(1); }
@@ -546,10 +550,11 @@ program
   .description("Read your email and meeting history on your own Claude or ChatGPT plan")
   .option("--agent <agent>", "claude or codex (default: whichever you're signed in to)")
   .option("--days <days>", "how many days back to read, 1 to 730", "180")
+  .option("--workspace <id>", "the workspace to read; the app's command fills this in")
   .option("--yes", "start without asking")
   .option("--url <url>", "API base URL (default: https://api.opennous.cloud)")
   .action(async (opts) => {
-    const { detectAgents, runBackfill, liveRun, RERUN, NO_AGENT } = await import("./backfill.js");
+    const { detectAgents, runBackfill, liveRun, emptyEstimate, RERUN, NO_AGENT } = await import("./backfill.js");
     const days = Number(opts.days);
     if (!Number.isInteger(days) || days < 1 || days > 730) {
       console.error("--days must be a whole number from 1 to 730.");
@@ -563,9 +568,30 @@ program
     }
     // Asked after the check above, so nobody signs in to be told they can't run this.
     if (!hasKey()) await browserLogin(opts.url);
-    const api = apiClient();
+    // A key saved here may be for another workspace, so say which one this is, and never read the
+    // wrong one: the app's command names its workspace, and a key for any other is not used.
+    const cfg = readConfig();
+    const whoamiUrl = opts.url || process.env.NOUS_API_URL || cfg.apiUrl || "https://api.opennous.cloud";
+    let key = process.env.NOUS_API_KEY || cfg.apiKey;
+    let who = await fetchWhoami(whoamiUrl, key);
+    if (opts.workspace && who?.workspace?.id !== opts.workspace) {
+      console.log(`This machine is signed in to ${who?.workspace?.name ?? "another workspace"}. Sign in to the workspace this backfill is for.`);
+      key = await browserLogin(opts.url, { save: false });
+      who = await fetchWhoami(whoamiUrl, key);
+      if (who?.workspace?.id !== opts.workspace) {
+        console.error(`That sign-in is for ${who?.workspace?.name ?? "another workspace"}. Open the right workspace in the app, then run this again.`);
+        process.exit(1);
+      }
+    }
+    const workspace = who?.workspace?.name ?? "your workspace";
+    const api = apiClient(key);
     const est = await api.post("/v2/backfill/own/estimate", { days });
-    console.log(`\nLast ${days} days: about ${est.counts.email_thread} email threads, ${est.counts.meeting} meetings, ${est.counts.call} calls.`);
+    if (emptyEstimate(est.counts)) {
+      console.log(`\nNothing to read in ${workspace} for the last ${days} days. If your sync is still running, try again when it's done.`);
+      return;
+    }
+    console.log(`\nWorkspace: ${workspace}`);
+    console.log(`Last ${days} days: about ${est.counts.email_thread} email threads, ${est.counts.meeting} meetings, ${est.counts.call} calls.`);
     console.log(`They're filtered first, then read on your ${agent} plan. None of it uses your OpenNous credits.`);
     console.log("You can stop at any time and run this again: it carries on where it stopped.\n");
     if (!opts.yes) {