@opennous/cli 0.13.0 → 0.14.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @opennous/cli changelog
 
+## 0.14.1
+
+### Fixed: carrying on with `backfill --workspace`
+
+The carry-on line now repeats `--workspace`, so a rerun stays in the same workspace. A workspace you
+signed in to for a backfill keeps its key, so carrying on doesn't ask you to sign in again. `logout`
+removes these keys too (GET-1087).
+
 ## 0.13.0
 
 ### Added: `backfill`, in one command

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opennous/cli",
-  "version": "0.13.0",
+  "version": "0.14.1",
   "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

@@ -13,6 +13,8 @@ import { join } from "node:path";
 
 /** What to type to carry on. `npx` because most people never installed `nous` (GET-1087). */
 export const RERUN = "npx @opennous/cli@latest backfill";
+/** The same, for the workspace this run read: without it a rerun goes to the saved key's. Pure. */
+export const rerunCommand = (workspaceId) => (workspaceId ? `${RERUN} --workspace ${workspaceId}` : RERUN);
 export const NO_AGENT = "Sign in to Claude Code (`claude`) or Codex (`codex login`) first: this runs on your own plan, so it needs one of them. Then run this again.";
 
 export const POLL_MS = 2000;
@@ -97,10 +99,13 @@ 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) {
+export function progressLine(reading, answered, rerun = RERUN) {
   if (reading?.finished) return "Wrapping up: last summaries for your accounts.";
-  const stop = `Stop any time with Ctrl-C; run \`${RERUN}\` again to carry on.`;
+  const stop = `Stop any time with Ctrl-C; run \`${rerun}\` again to carry on.`;
   if (reading?.total) return `Read ${reading.done} of ${reading.total} ${reading.kind === "meetings" ? "meetings" : "email threads"}. ${stop}`;
   if (answered) return `${answered} reads done on your plan. ${stop}`;
   return `Getting ready to read. This can take a few minutes. ${stop}`;
@@ -111,7 +116,7 @@ export function progressLine(reading, answered) {
  * `run` (one command → stdout), `sleep`, `log`. Stopping loses nothing: every read that finished
  * is saved, and unanswered calls come back to the next run.
  */
-export async function runBackfill({ api, agent, jobId, run, sleep, log, now = Date.now, workers = WORKERS, limitWaitMs = LIMIT_WAIT_MS, pollMs = POLL_MS, progressMs = PROGRESS_MS }) {
+export async function runBackfill({ api, agent, jobId, run, sleep, log, now = Date.now, workers = WORKERS, limitWaitMs = LIMIT_WAIT_MS, pollMs = POLL_MS, progressMs = PROGRESS_MS, rerun = RERUN }) {
   let waitUntil = 0, answered = 0, lastLine = null, lastAt = -Infinity;
   const say = (line) => {
     if (!line || (line === lastLine && now() - lastAt < progressMs) || now() - lastAt < Math.min(progressMs, 1000)) return;
@@ -141,7 +146,7 @@ export async function runBackfill({ api, agent, jobId, run, sleep, log, now = Da
     if (page.status === "failed") throw new Error(page.error || "The backfill failed on our side.");
     // The server gave up waiting for us (a long sleep, say). We're back, so pick it up.
     if (page.status === "paused_own_model") { await api.resume?.(); await sleep(pollMs); continue; }
-    say(progressLine(page.reading, answered));
+    say(progressLine(page.reading, answered, rerun));
     if (!page.calls.length) { await sleep(pollMs); continue; }
     await Promise.all(page.calls.map((c) => answerOne(c, page.models)));
   }

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) {
@@ -192,8 +192,9 @@ program
       .description("Sign out — remove the saved API key")
       .action(() => {
         const cfg = readConfig();
-        if (!cfg.apiKey) { console.log("Not signed in."); return; }
+        if (!cfg.apiKey && !cfg.workspaceKeys) { console.log("Not signed in."); return; }
         delete cfg.apiKey;
+        delete cfg.workspaceKeys;
         writeConfig(cfg);
         console.log("✓ Signed out — removed the saved API key from ~/.nous/config.json");
       })
@@ -288,14 +289,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 +551,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, rerunCommand, 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 +569,39 @@ 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);
+    // A workspace signed in to here before keeps its key, so carrying on doesn't mean signing in again.
+    const kept = opts.workspace && who?.workspace?.id !== opts.workspace ? cfg.workspaceKeys?.[opts.workspace] : null;
+    if (kept) {
+      const keptWho = await fetchWhoami(whoamiUrl, kept);
+      if (keptWho?.workspace?.id === opts.workspace) { key = kept; who = keptWho; }
+    }
+    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 saved = readConfig();
+      writeConfig({ ...saved, workspaceKeys: { ...saved.workspaceKeys, [opts.workspace]: key } });
+    }
+    const workspace = who?.workspace?.name ?? "your workspace";
+    const rerun = rerunCommand(opts.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) {
@@ -576,13 +612,13 @@ program
       if (!ok) return;
     }
     const job = await api.post("/v2/backfill/own", { days });
-    console.log(job.resumed ? "Picking up where you left off. Stop any time with Ctrl-C." : `Started. Stop any time with Ctrl-C; run \`${RERUN}\` again to carry on.`);
+    console.log(job.resumed ? "Picking up where you left off. Stop any time with Ctrl-C." : `Started. Stop any time with Ctrl-C; run \`${rerun}\` again to carry on.`);
     process.once("SIGINT", () => {
-      console.log(`\nStopped. Everything read so far is saved. Run \`${RERUN}\` to carry on.`);
+      console.log(`\nStopped. Everything read so far is saved. Run \`${rerun}\` to carry on.`);
       process.exit(130);
     });
     const result = await runBackfill({
-      agent, jobId: job.job_id, run: liveRun(), log: console.log,
+      agent, jobId: job.job_id, run: liveRun(), log: console.log, rerun,
       sleep: (ms) => new Promise((r) => setTimeout(r, ms)),
       api: {
         calls: (id, limit) => api.get(`/v2/backfill/own/${id}/calls`, { limit }),
@@ -591,7 +627,7 @@ program
       },
     });
     console.log(`Done. This run: ${result.read} conversations read, ${result.answered} model calls on your ${agent} plan.`);
-    if (result.failed) console.log(`${result.failed} conversations couldn't be read. Run \`${RERUN}\` again to retry them.`);
+    if (result.failed) console.log(`${result.failed} conversations couldn't be read. Run \`${rerun}\` again to retry them.`);
   });
 
 program
@@ -599,8 +635,9 @@ program
   .description("Sign out — remove the saved API key")
   .action(() => {
     const cfg = readConfig();
-    if (!cfg.apiKey) { console.log("Not signed in."); return; }
+    if (!cfg.apiKey && !cfg.workspaceKeys) { console.log("Not signed in."); return; }
     delete cfg.apiKey;
+    delete cfg.workspaceKeys;
     writeConfig(cfg);
     console.log("✓ Signed out — removed the saved API key from ~/.nous/config.json");
   });