@creator-notes/cnotes 0.24.3 → 0.25.2

package/dist/commands/auth.d.ts

@@ -4,7 +4,7 @@ export interface LoginResult {
     email: string;
     serverUrl: string;
 }
-export declare function browserLogin(serverUrl: string, json: boolean, options?: {
+export declare function browserLogin(rawServerUrl: string, json: boolean, options?: {
     quiet?: boolean;
 }): Promise<LoginResult>;
 //# sourceMappingURL=auth.d.ts.map

package/dist/commands/auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/commands/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAYpC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAyG3D;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,wBAAsB,YAAY,CAChC,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,OAAO,EACb,OAAO,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,GAC5B,OAAO,CAAC,WAAW,CAAC,CAuGtB"}
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/commands/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAmBpC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAyI3D;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,wBAAsB,YAAY,CAChC,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,OAAO,EACb,OAAO,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,GAC5B,OAAO,CAAC,WAAW,CAAC,CA6ItB"}

package/dist/commands/auth.js

@@ -1,5 +1,8 @@
 import { createServer } from "node:http";
+import { randomBytes } from "node:crypto";
 import { loadConfig, saveConfig, setServerConfig, removeServerConfig, getServerConfig, } from "../lib/auth-store.js";
+import { validateServerUrl, unofficialServerWarning, allowedCallbackOrigins, } from "../lib/server-url.js";
+import { readStdin } from "../lib/stdin.js";
 import { handleError } from "../lib/errors.js";
 import { outputJson } from "../lib/output.js";
 export function registerAuthCommands(program) {
@@ -10,15 +13,42 @@ export function registerAuthCommands(program) {
         .command("login")
         .description("Authenticate with CreatorNotes via browser OAuth")
         .option("--token <token>", "Paste an existing API key instead of browser flow")
+        .option("--token-stdin", "Read the API key from stdin (safer than --token, which is visible in `ps` and shell history)")
         .option("--server <url>", "Server URL to authenticate with")
         .action(async (opts) => {
         const json = program.opts().json ?? false;
         try {
             const config = loadConfig();
-            const serverUrl = opts.server || process.env.CNOTES_SERVER || config.currentServer;
-            if (opts.token) {
-                // Direct token input (for agents or manual paste)
-                const token = opts.token;
+            // Reject malformed/insecure server URLs before we ever send a key there.
+            const serverUrl = validateServerUrl(opts.server || process.env.CNOTES_SERVER || config.currentServer);
+            // Resolve a directly-supplied token from the safe source first.
+            let token;
+            if (opts.tokenStdin) {
+                // On a TTY there is nothing piped in, so readStdin() blocks on EOF with
+                // no output — indistinguishable from a hang. Say what we're waiting for.
+                if (process.stdin.isTTY && !json) {
+                    console.error("Reading the API key from stdin — paste it and press Ctrl-D, " +
+                        "or pipe it in (e.g. `pbpaste | cnotes auth login --token-stdin`).");
+                }
+                token = (await readStdin()).trim();
+                if (!token)
+                    throw new Error("No token received on stdin.");
+            }
+            else if (opts.token) {
+                token = opts.token;
+                // argv is world-visible via `ps` and lands in shell history — the key
+                // is a bearer credential, so nudge toward the stdin path (HIGH-2).
+                if (!json) {
+                    console.error("Warning: --token is visible in `ps` output and your shell history. " +
+                        "Prefer `--token-stdin` (pipe the key in) for a credential.");
+                }
+            }
+            if (token) {
+                // The key is about to be sent to serverUrl to validate — warn if that
+                // host isn't official/localhost, the phishing moment (MEDIUM-2).
+                const warning = unofficialServerWarning(serverUrl);
+                if (warning && !json)
+                    console.error(warning);
                 // Verify the token works by calling a simple endpoint
                 const res = await fetch(new URL("/api/workspaces", serverUrl).toString(), {
                     headers: { Authorization: `Bearer ${token}` },
@@ -104,13 +134,38 @@ export function registerAuthCommands(program) {
         }
     });
 }
-export async function browserLogin(serverUrl, json, options) {
+export async function browserLogin(rawServerUrl, json, options) {
     const quiet = options?.quiet ?? false;
+    // Validate HERE, not only at the call sites: `cnotes init` (and any future
+    // caller) feeds `config.currentServer` straight in, so a URL stored before
+    // set-server validated anything — a trailing slash, or a cleartext http remote
+    // — would otherwise skip every check and, if malformed, die on `new URL(...)`
+    // below with a far less legible error. Validating at the entry point makes
+    // every caller inherit it, and normalizes what we then persist.
+    const serverUrl = validateServerUrl(rawServerUrl);
+    // Single-use nonce tying the callback to THIS login attempt. Without it, any
+    // web page open in the browser during the ~2-minute login window could scan
+    // localhost ports and POST its own token to our /callback — a login-CSRF that
+    // would silently authenticate the CLI as the ATTACKER's account (so the
+    // user's next `cnotes notes create` writes into the attacker's workspace).
+    // The auth page echoes this value back; a mismatch is rejected (HIGH-1).
+    const expectedState = randomBytes(16).toString("hex");
+    const allowedOrigins = allowedCallbackOrigins(serverUrl);
     return new Promise((resolve, reject) => {
         const server = createServer((req, res) => {
             const url = new URL(req.url || "/", `http://localhost`);
-            // CORS headers so the browser auth page can call us via fetch
-            res.setHeader("Access-Control-Allow-Origin", "*");
+            // Scope CORS to the server origin (not "*") so no other site can read this
+            // callback's response or drive it cross-origin (HIGH-1). Echo back the
+            // request's own Origin when it's one we allow — for a local dev server the
+            // page may arrive from the loopback SIBLING (the /auth/cli page rewrites
+            // 127.0.0.1 -> localhost so OAuth cookies resolve), and a single hard-coded
+            // origin would mismatch it. Login would still complete (CORS gates reading
+            // the response, not sending the GET), but the page would show the manual
+            // screen for no reason.
+            const reqOrigin = req.headers.origin;
+            const originToAllow = reqOrigin && allowedOrigins.has(reqOrigin) ? reqOrigin : allowedOrigins.values().next().value;
+            res.setHeader("Access-Control-Allow-Origin", originToAllow);
+            res.setHeader("Vary", "Origin");
             res.setHeader("Access-Control-Allow-Methods", "GET, OPTIONS");
             if (req.method === "OPTIONS") {
                 res.writeHead(204);
@@ -124,6 +179,15 @@ export async function browserLogin(serverUrl, json, options) {
             }
             const token = url.searchParams.get("token");
             const email = url.searchParams.get("email");
+            const state = url.searchParams.get("state");
+            // Reject a callback that doesn't carry our nonce. An older auth page that
+            // doesn't echo `state` fails here too, but the page's own fallback then
+            // shows the manual `--token` command, so the user is never hard-blocked.
+            if (!state || state !== expectedState) {
+                res.writeHead(400);
+                res.end("Invalid or missing state");
+                return;
+            }
             if (!token) {
                 res.writeHead(400);
                 res.end("Missing token");
@@ -161,7 +225,7 @@ export async function browserLogin(serverUrl, json, options) {
                 return;
             }
             const port = addr.port;
-            const authUrl = `${serverUrl}/auth/cli?callbackPort=${port}`;
+            const authUrl = `${serverUrl}/auth/cli?callbackPort=${port}&state=${expectedState}`;
             if (!quiet && !json) {
                 console.log("Opening browser for authentication...");
             }

package/dist/commands/auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/commands/auth.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/commands/auth.ts"],"names":[],"mappings":"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"}

package/dist/commands/canvas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"canvas.d.ts","sourceRoot":"","sources":["../../src/commands/canvas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAkF5C,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAoxD7D"}
+{"version":3,"file":"canvas.d.ts","sourceRoot":"","sources":["../../src/commands/canvas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAwF5C,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA44D7D"}

package/dist/commands/canvas.js

@@ -1,9 +1,10 @@
 import { Option } from "commander";
-import { ApiClient } from "../lib/api-client.js";
+import { ApiClient, resolveActiveAgentRun } from "../lib/api-client.js";
 import { resolveConfig } from "../lib/config.js";
-import { EXIT_CODES, handleError, ValidationError } from "../lib/errors.js";
+import { CliError, EXIT_CODES, handleError, ValidationError } from "../lib/errors.js";
 import { parseJsonOption, readFileSafe } from "../lib/fs-utils.js";
-import { outputJson, outputTable, outputQuiet, truncate, timeAgo } from "../lib/output.js";
+import { loadConfig, setActiveAgentRunId, clearActiveAgentRunId, getActiveAgentRunId, } from "../lib/auth-store.js";
+import { outputJson, outputTable, outputQuiet, truncate, timeAgo, formatAgo } from "../lib/output.js";
 import { readCanvasMarkdown, renderCanvasMarkdown } from "../lib/canvas-read.js";
 import { resolveAgentSession } from "../lib/claude-session.js";
 import { WARN, dim } from "../lib/style.js";
@@ -1520,33 +1521,88 @@ Examples:
     // Bracket a sequence of canvas commands with auto-checkpoints so the
     // server treats them as a single agent operation. The pattern:
     //
-    //   eval "$(npx cnotes canvas agent-run begin --canvas <id> --prompt "Reorganize")"
+    //   npx cnotes canvas agent-run begin --canvas <id> --prompt "Reorganize"
     //   npx cnotes canvas add-node ...
     //   npx cnotes canvas add-edge ...
     //   npx cnotes canvas agent-run end --canvas <id>
     //
-    // `begin` prints `export CNOTES_AGENT_RUN_ID=...` for shell eval. Subsequent
-    // commands pick up the env var and the api-client adds it as a header,
-    // so all mutations between begin and end share one operation row + a
-    // before/after snapshot pair, recoverable later via "Revert this run".
+    // `begin` PERSISTS the run as the active run for this server (same store
+    // `cnotes operations begin` uses), so every subsequent cnotes write attaches
+    // automatically — across separate shells and stateless tool calls, with no
+    // env var to thread through. It also still prints `export CNOTES_AGENT_RUN_ID=...`
+    // so the older `eval "$(...)"` form keeps working; the env var wins over the
+    // persisted pointer in ApiClient's precedence order.
+    //
+    // Persisting is load-bearing, not a convenience. Before it, an agent that ran
+    // begin and then issued each write as its own process (the normal shape of
+    // agent work) got NO run attached: the writes silently landed as
+    // `manual.edit` / actorSource "human", and `end` failed with "No agent run ID
+    // found". The bracket looked fine and recorded a lie.
+    //
+    // Two things persist, and BOTH are required for "Revert this run" to work:
+    // the runId (which clusters the writes into one operation) and the
+    // before-snapshot id (which the run's first mutation back-links as
+    // operation.checkpointBeforeId — the state revert rewinds to). Persist only
+    // the first and you get a run that looks healthy in the timeline and throws
+    // "Operation cannot be reverted" when the user tries to undo it.
     const agentRun = canvas
         .command("agent-run")
         .description("Bracket canvas commands with before/after auto-checkpoints");
     agentRun
         .command("begin")
-        .description("Open an agent-run session — captures a before-snapshot and prints CNOTES_AGENT_RUN_ID")
+        .description("Open an agent-run session — captures a before-snapshot and makes the run active for this server")
         .requiredOption("--canvas <id>", "Canvas ID to bracket")
         .requiredOption("--prompt <text>", "User prompt or summary describing the run")
         .option("--rationale <text>", "Optional rationale (e.g. agent's plan)")
+        .option("--force", "If an active run already exists on this server, end it server-side and start a fresh one")
+        .addHelpText("after", `
+Examples:
+  $ cnotes canvas agent-run begin --canvas <id> --prompt "Reorganize into sections"
+  $ cnotes canvas place <id> --spec ./layout.json      # attaches automatically
+  $ cnotes canvas agent-run end --canvas <id>
+
+After 'begin', every subsequent cnotes write on this server attaches to the
+run automatically — no env var to export, and it survives across separate
+shells. End with 'cnotes canvas agent-run end --canvas <id>'.
+
+If a run is already open (from 'agent-run begin' or 'operations begin'),
+begin refuses rather than silently clobbering it. Pass --force to end the
+prior run server-side and start fresh.
+`)
         .action(async (opts) => {
         const cfg = resolveConfig(program.opts());
         const api = new ApiClient(cfg.serverUrl, cfg.token);
-        // This command is designed to be used via `eval "$(...)"`, which makes
+        // This command is designed to be usable via `eval "$(...)"`, which makes
         // stdout a non-TTY. resolveConfig's default would then flip cfg.json on
         // and we'd emit JSON instead of shell exports — breaking the eval form.
         // Honour JSON only when the user asked for it explicitly.
         const wantsJson = program.opts().json === true || process.env.CNOTES_JSON === "1";
         try {
+            // Refuse to open a second run while one is still active on this server.
+            // Both `operations begin` and `canvas agent-run begin` write the same
+            // pointer, and a request carries exactly one X-Agent-Run-Id — so a
+            // second begin would either clobber the first or silently attach writes
+            // to the wrong run. Mirrors `cnotes operations begin`.
+            const existing = getActiveAgentRunId(loadConfig(), cfg.serverUrl);
+            if (existing) {
+                if (opts.force) {
+                    try {
+                        await api.post("/api/operations", {
+                            action: "end",
+                            agentRunId: existing.agentRunId,
+                        });
+                    }
+                    catch {
+                        // Best-effort: ending an already-completed/abandoned run is
+                        // idempotent server-side. Either way clear the local pointer so
+                        // the caller isn't wedged.
+                    }
+                    clearActiveAgentRunId(loadConfig(), cfg.serverUrl);
+                }
+                else {
+                    throw new CliError(`An active agent-run already exists on this server (agentRunId ${existing.agentRunId}, started ${formatAgo(existing.startedAt)}).`, EXIT_CODES.CONFLICT, "End it first (`cnotes canvas agent-run end --canvas <id>` or `cnotes operations end`), or pass --force to end it server-side and start fresh.");
+                }
+            }
             const body = {
                 action: "agentRunBegin",
                 prompt: opts.prompt,
@@ -1557,6 +1613,29 @@ Examples:
             if (agentSession)
                 body.agentSession = agentSession;
             const data = await api.post(`/api/canvas/${encodeURIComponent(opts.canvas)}`, body);
+            // Persist the active run so subsequent cnotes writes attach to it even
+            // when each one is a separate process. The server response carries no
+            // startedAt for canvas runs, so stamp it locally — it only feeds the
+            // "started Xs ago" text on a conflicting begin.
+            //
+            // beforeCheckpointId rides along on every write as
+            // X-Agent-Before-Snapshot-Id: the server can only back-link
+            // operation.checkpointBeforeId at the run's FIRST mutation (at begin
+            // time the operation row doesn't exist yet), and without that link
+            // getRevertContext bails — "Revert this run" is dead for the whole
+            // batch. Persisting the run id without it produces a run that looks
+            // perfectly healthy and cannot be undone.
+            const persisted = setActiveAgentRunId(loadConfig(), cfg.serverUrl, data.agentRunId, Date.now(), data.beforeCheckpointId);
+            // No stored config entry for this server (token came from --token /
+            // CNOTES_TOKEN against a server never logged into), so there is nowhere
+            // to record the run. Say so rather than printing "every write now
+            // attaches" — silently attaching nothing is the bug this flow exists to
+            // kill. stderr, so it can't corrupt --json or the eval form.
+            if (!persisted) {
+                console.error(`# WARNING: could not persist the active run for ${cfg.serverUrl} — no stored login for that server.`);
+                console.error(`# Subsequent cnotes writes will NOT attach to it. Either run \`cnotes auth login\`,`);
+                console.error(`# or use the env form: eval "$(cnotes canvas agent-run begin --canvas ${opts.canvas} --prompt "...")"`);
+            }
             if (cfg.quiet) {
                 outputQuiet(data.agentRunId);
                 return;
@@ -1565,14 +1644,16 @@ Examples:
                 outputJson(data);
                 return;
             }
-            // Print eval-friendly export so users can:
+            // Still print the eval-friendly exports so the older
             //   eval "$(npx cnotes canvas agent-run begin ...)"
-            // Only the runId + before-snapshot id need to ride along on
-            // each request — prompt + rationale were already persisted on
-            // the operation row at agentRunBegin time.
+            // form keeps working. The env var takes precedence over the persisted
+            // pointer, so both paths agree on the same run.
             console.log(`export CNOTES_AGENT_RUN_ID=${data.agentRunId}`);
             console.log(`export CNOTES_AGENT_BEFORE_SNAPSHOT_ID=${data.beforeCheckpointId}`);
             console.error(`# agent run started: v${data.beforeSnapshotNumber} (${data.agentRunId})`);
+            if (persisted) {
+                console.error(`# every cnotes write on this server now attaches to this run`);
+            }
             console.error(`# end with: npx cnotes canvas agent-run end --canvas ${opts.canvas}`);
         }
         catch (error) {
@@ -1612,6 +1693,14 @@ Examples:
         // need to propagate — prompt + rationale are persisted on the
         // operation row at agentRunBegin time, so resending them per-request
         // would be redundant (and would add a spoofing surface).
+        //
+        // Unlike `begin`, wrap deliberately does NOT persist the run to the
+        // server config: the env var scopes it to this subprocess tree, and wrap
+        // always closes the run in its own finally-path. Persisting would risk
+        // leaving a stale pointer if wrap were killed, and would make wrap
+        // unusable inside an open `operations` run (a common nesting: open an
+        // operation for `notes create`, then wrap a canvas layout inside it).
+        // Env var beats the persisted pointer in ApiClient, so the nesting works.
         const { spawn } = await import("node:child_process");
         const child = spawn(command[0], command.slice(1), {
             stdio: "inherit",
@@ -1663,24 +1752,37 @@ Examples:
     });
     agentRun
         .command("end")
-        .description("Close an agent-run session — captures an after-snapshot and prints unset commands")
+        .description("Close an agent-run session — captures an after-snapshot and clears the active run")
         .requiredOption("--canvas <id>", "Canvas ID to close")
-        .option("--run-id <id>", "Agent run ID (defaults to CNOTES_AGENT_RUN_ID env var)")
+        .option("--run-id <id>", "Agent run ID (defaults to the active run on this server, then CNOTES_AGENT_RUN_ID)")
         .action(async (opts) => {
         const cfg = resolveConfig(program.opts());
         const api = new ApiClient(cfg.serverUrl, cfg.token);
-        const runId = opts.runId ?? process.env.CNOTES_AGENT_RUN_ID;
-        if (!runId) {
-            throw new ValidationError("No agent run ID found. Pass --run-id or set CNOTES_AGENT_RUN_ID.");
-        }
         // Same reasoning as `begin`: eval form makes stdout non-TTY, so don't
         // let the auto-detect flip us into JSON mode.
         const wantsJson = program.opts().json === true || process.env.CNOTES_JSON === "1";
         try {
+            // Resolve the run to close through the SAME resolver ApiClient uses to
+            // attach it (explicit flag first, then env, then the persisted run).
+            // Sharing the function, rather than re-deriving the precedence here, is
+            // the point: `end` closing a run the client would not have attached to
+            // is exactly the desync that let agent edits record as human ones.
+            const runId = opts.runId ?? resolveActiveAgentRun(cfg.serverUrl)?.agentRunId;
+            if (!runId) {
+                throw new ValidationError("No active run on this server, and no --run-id passed", "Open one with `cnotes canvas agent-run begin --canvas <id> --prompt \"...\"`, or pass --run-id <id> to close a specific run.");
+            }
             const data = await api.post(`/api/canvas/${encodeURIComponent(opts.canvas)}`, {
                 action: "agentRunEnd",
                 agentRunId: runId,
             });
+            // Clear the local pointer so the next write detaches. Only clear when
+            // it matches the run we just closed, so a concurrent begin from another
+            // shell isn't stomped. Done after a successful response so a transient
+            // server error can't desync local state from the server.
+            const active = getActiveAgentRunId(loadConfig(), cfg.serverUrl);
+            if (active?.agentRunId === data.agentRunId) {
+                clearActiveAgentRunId(loadConfig(), cfg.serverUrl);
+            }
             if (cfg.quiet) {
                 outputQuiet(String(data.afterSnapshotNumber));
                 return;