@creator-notes/cnotes 0.24.3 → 0.25.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commands/auth.d.ts +1 -1
- package/dist/commands/auth.d.ts.map +1 -1
- package/dist/commands/auth.js +72 -8
- package/dist/commands/auth.js.map +1 -1
- package/dist/commands/canvas.d.ts.map +1 -1
- package/dist/commands/canvas.js +122 -20
- package/dist/commands/canvas.js.map +1 -1
- package/dist/commands/config.d.ts.map +1 -1
- package/dist/commands/config.js +10 -3
- package/dist/commands/config.js.map +1 -1
- package/dist/commands/operations.d.ts.map +1 -1
- package/dist/commands/operations.js +21 -19
- package/dist/commands/operations.js.map +1 -1
- package/dist/commands/workspace.d.ts.map +1 -1
- package/dist/commands/workspace.js +171 -1
- package/dist/commands/workspace.js.map +1 -1
- package/dist/lib/api-client.d.ts +35 -9
- package/dist/lib/api-client.d.ts.map +1 -1
- package/dist/lib/api-client.js +60 -24
- package/dist/lib/api-client.js.map +1 -1
- package/dist/lib/auth-store.d.ts +50 -11
- package/dist/lib/auth-store.d.ts.map +1 -1
- package/dist/lib/auth-store.js +47 -12
- package/dist/lib/auth-store.js.map +1 -1
- package/dist/lib/install-mcp.d.ts.map +1 -1
- package/dist/lib/install-mcp.js +19 -1
- package/dist/lib/install-mcp.js.map +1 -1
- package/dist/lib/output.d.ts +7 -0
- package/dist/lib/output.d.ts.map +1 -1
- package/dist/lib/output.js +16 -0
- package/dist/lib/output.js.map +1 -1
- package/dist/lib/server-url.d.ts +33 -0
- package/dist/lib/server-url.d.ts.map +1 -0
- package/dist/lib/server-url.js +106 -0
- package/dist/lib/server-url.js.map +1 -0
- package/package.json +3 -3
- package/skills/cnotes/SKILL.md +59 -4
|
@@ -2,8 +2,77 @@ import { select } from "@inquirer/prompts";
|
|
|
2
2
|
import { ApiClient } from "../lib/api-client.js";
|
|
3
3
|
import { resolveBaseConfig } from "../lib/config.js";
|
|
4
4
|
import { loadConfig, setWorkspaceId } from "../lib/auth-store.js";
|
|
5
|
-
import { handleError, AuthError } from "../lib/errors.js";
|
|
5
|
+
import { handleError, ApiError, AuthError, NetworkError, ValidationError } from "../lib/errors.js";
|
|
6
6
|
import { outputJson, outputTable } from "../lib/output.js";
|
|
7
|
+
const CHECKOUT_POLL_INTERVAL_MS = 5000;
|
|
8
|
+
/**
|
|
9
|
+
* One poll of the verify-creation endpoint. The two "keep waiting" states are
|
|
10
|
+
* modeled as return values (stable server `code`s), everything else — bad
|
|
11
|
+
* session id, someone else's session, network failure — throws.
|
|
12
|
+
*/
|
|
13
|
+
async function checkCheckoutState(api, sessionId) {
|
|
14
|
+
try {
|
|
15
|
+
const data = await api.get("/api/workspaces/verify-creation", { session_id: sessionId });
|
|
16
|
+
return { status: "ready", data };
|
|
17
|
+
}
|
|
18
|
+
catch (error) {
|
|
19
|
+
if (error instanceof ApiError) {
|
|
20
|
+
if (error.status === 400 && error.serverCode === "payment_pending") {
|
|
21
|
+
return { status: "pending_payment" };
|
|
22
|
+
}
|
|
23
|
+
if (error.status === 404 && error.serverCode === "workspace_pending") {
|
|
24
|
+
return { status: "workspace_pending" };
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
throw error;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
/**
|
|
31
|
+
* Interactive wait: poll until the checkout is paid and the workspace exists,
|
|
32
|
+
* then persist it as the active workspace. Returns null on timeout (with
|
|
33
|
+
* resume instructions printed and a non-zero exit code set).
|
|
34
|
+
*/
|
|
35
|
+
async function waitForCheckout(api, serverUrl, sessionId, timeoutMs) {
|
|
36
|
+
const resumeHint = `cnotes workspace create --verify ${sessionId}`;
|
|
37
|
+
console.log(`Waiting for payment to complete (Ctrl-C to stop; resume later with: ${resumeHint})`);
|
|
38
|
+
const deadline = Date.now() + timeoutMs;
|
|
39
|
+
while (Date.now() < deadline) {
|
|
40
|
+
let state;
|
|
41
|
+
try {
|
|
42
|
+
state = await checkCheckoutState(api, sessionId);
|
|
43
|
+
}
|
|
44
|
+
catch (error) {
|
|
45
|
+
// A network blip (Wi-Fi drop, lid close) that outlived ApiClient's own
|
|
46
|
+
// retries should not end a 15-minute wait — keep polling until the
|
|
47
|
+
// deadline. Any other error (session_not_found, auth) is terminal: print
|
|
48
|
+
// the resume line so it isn't lost in scrollback, then re-throw.
|
|
49
|
+
if (error instanceof NetworkError) {
|
|
50
|
+
await new Promise((resolve) => setTimeout(resolve, CHECKOUT_POLL_INTERVAL_MS));
|
|
51
|
+
continue;
|
|
52
|
+
}
|
|
53
|
+
console.log(`If you completed payment, resume with: ${resumeHint}`);
|
|
54
|
+
throw error;
|
|
55
|
+
}
|
|
56
|
+
if (state.status === "ready") {
|
|
57
|
+
const workspace = state.data.workspace;
|
|
58
|
+
const activated = setWorkspaceId(loadConfig(), serverUrl, workspace.id);
|
|
59
|
+
if (activated) {
|
|
60
|
+
console.log(`Workspace "${workspace.name}" created and set as active (${workspace.id}).`);
|
|
61
|
+
}
|
|
62
|
+
else {
|
|
63
|
+
console.log(`Workspace "${workspace.name}" created (${workspace.id}). ` +
|
|
64
|
+
`Could not set it active (this server has no saved login); ` +
|
|
65
|
+
`pass it explicitly with -w ${workspace.id}.`);
|
|
66
|
+
}
|
|
67
|
+
return workspace;
|
|
68
|
+
}
|
|
69
|
+
await new Promise((resolve) => setTimeout(resolve, CHECKOUT_POLL_INTERVAL_MS));
|
|
70
|
+
}
|
|
71
|
+
console.log(`Timed out waiting for checkout ${sessionId}.`);
|
|
72
|
+
console.log(`If you completed payment, run: ${resumeHint}`);
|
|
73
|
+
process.exitCode = 1;
|
|
74
|
+
return null;
|
|
75
|
+
}
|
|
7
76
|
/**
|
|
8
77
|
* Select a workspace from a pre-fetched list, or fetch from the API if not provided.
|
|
9
78
|
* Auto-selects if only one workspace exists.
|
|
@@ -110,6 +179,107 @@ Examples:
|
|
|
110
179
|
handleError(error, cfg.json);
|
|
111
180
|
}
|
|
112
181
|
});
|
|
182
|
+
ws
|
|
183
|
+
.command("create")
|
|
184
|
+
.description("Buy a new Pro workspace ($49/mo) via Stripe checkout")
|
|
185
|
+
.argument("[name]", "Workspace name (2-100 characters)")
|
|
186
|
+
.option("-d, --description <text>", "Workspace description")
|
|
187
|
+
.option("--permission <level>", "Default member permission: editor or view", "editor")
|
|
188
|
+
.option("--trial", "Start the subscription with a 7-day free trial (card still collected at checkout)")
|
|
189
|
+
.option("--verify <sessionId>", "Check a previous checkout instead of starting a new one")
|
|
190
|
+
.option("--timeout <seconds>", "Max seconds to wait for payment in interactive mode", "900")
|
|
191
|
+
.addHelpText("after", `
|
|
192
|
+
Examples:
|
|
193
|
+
$ cnotes workspace create "Acme Research" # open Stripe checkout, wait, switch to the new workspace
|
|
194
|
+
$ cnotes workspace create "Acme Research" --trial # same, but the subscription starts with a 7-day trial
|
|
195
|
+
$ cnotes workspace create "Acme Research" --json # print checkoutUrl + sessionId and exit (agent flow)
|
|
196
|
+
$ cnotes workspace create --verify cs_xxx --json # check a checkout; activates the workspace once paid
|
|
197
|
+
|
|
198
|
+
Notes:
|
|
199
|
+
Creating a workspace is a paid action ($49/mo). The CLI never charges a card
|
|
200
|
+
itself: it prepares a Stripe Checkout that a HUMAN completes in the browser.
|
|
201
|
+
In --json mode the command returns immediately with the checkout URL — show
|
|
202
|
+
it to the user, then poll --verify until status is "ready" (the new
|
|
203
|
+
workspace is then set as active automatically).
|
|
204
|
+
For the no-card trial of your CURRENT workspace, use \`cnotes upgrade\` instead.
|
|
205
|
+
`)
|
|
206
|
+
.action(async (name, cmdOpts) => {
|
|
207
|
+
const opts = program.opts();
|
|
208
|
+
const cfg = resolveBaseConfig(opts);
|
|
209
|
+
if (!cfg.token)
|
|
210
|
+
throw new AuthError();
|
|
211
|
+
const api = new ApiClient(cfg.serverUrl, cfg.token);
|
|
212
|
+
const timeoutMs = Math.max(1, parseInt(cmdOpts.timeout, 10) || 900) * 1000;
|
|
213
|
+
try {
|
|
214
|
+
// Resume mode: check a checkout started earlier.
|
|
215
|
+
if (cmdOpts.verify) {
|
|
216
|
+
if (cfg.json) {
|
|
217
|
+
// Single check — agents poll by re-running the command.
|
|
218
|
+
const state = await checkCheckoutState(api, cmdOpts.verify);
|
|
219
|
+
if (state.status === "ready") {
|
|
220
|
+
const workspace = state.data.workspace;
|
|
221
|
+
const activated = setWorkspaceId(loadConfig(), cfg.serverUrl, workspace.id);
|
|
222
|
+
outputJson({
|
|
223
|
+
status: "ready",
|
|
224
|
+
workspace,
|
|
225
|
+
activated,
|
|
226
|
+
...(activated
|
|
227
|
+
? {}
|
|
228
|
+
: { hint: `Workspace not persisted as active (no saved login for this server) — pass -w ${workspace.id} on subsequent commands.` }),
|
|
229
|
+
});
|
|
230
|
+
}
|
|
231
|
+
else {
|
|
232
|
+
outputJson({
|
|
233
|
+
status: state.status,
|
|
234
|
+
sessionId: cmdOpts.verify,
|
|
235
|
+
hint: state.status === "pending_payment"
|
|
236
|
+
? "Payment not completed yet — a human must open the checkout URL and pay."
|
|
237
|
+
: "Payment received — the workspace is still provisioning. Retry in a few seconds.",
|
|
238
|
+
});
|
|
239
|
+
}
|
|
240
|
+
return;
|
|
241
|
+
}
|
|
242
|
+
await waitForCheckout(api, cfg.serverUrl, cmdOpts.verify, timeoutMs);
|
|
243
|
+
return;
|
|
244
|
+
}
|
|
245
|
+
if (!name || name.trim().length < 2) {
|
|
246
|
+
throw new ValidationError('Workspace name is required (2-100 characters), e.g. cnotes workspace create "Acme Research"');
|
|
247
|
+
}
|
|
248
|
+
if (cmdOpts.permission !== "editor" && cmdOpts.permission !== "view") {
|
|
249
|
+
throw new ValidationError("--permission must be 'editor' or 'view'");
|
|
250
|
+
}
|
|
251
|
+
const res = await api.post("/api/workspaces/create-checkout", {
|
|
252
|
+
name: name.trim(),
|
|
253
|
+
...(cmdOpts.description ? { description: cmdOpts.description } : {}),
|
|
254
|
+
defaultPermission: cmdOpts.permission,
|
|
255
|
+
...(cmdOpts.trial ? { trial: true } : {}),
|
|
256
|
+
});
|
|
257
|
+
if (cfg.json) {
|
|
258
|
+
// Agent flow: hand the URL back immediately — payment is a human
|
|
259
|
+
// step. The agent relays checkoutUrl, then polls --verify.
|
|
260
|
+
outputJson({
|
|
261
|
+
status: "pending_payment",
|
|
262
|
+
checkoutUrl: res.checkoutUrl,
|
|
263
|
+
sessionId: res.sessionId,
|
|
264
|
+
next: `Have a human complete payment at checkoutUrl, then run: cnotes workspace create --verify ${res.sessionId} --json`,
|
|
265
|
+
});
|
|
266
|
+
return;
|
|
267
|
+
}
|
|
268
|
+
console.log(`Checkout created for workspace "${name.trim()}" ($49/mo${cmdOpts.trial ? ", starts with a 7-day trial" : ""}).`);
|
|
269
|
+
console.log(`Complete payment in the browser: ${res.checkoutUrl}`);
|
|
270
|
+
try {
|
|
271
|
+
const open = (await import("open")).default;
|
|
272
|
+
await open(res.checkoutUrl);
|
|
273
|
+
}
|
|
274
|
+
catch {
|
|
275
|
+
/* headless — the printed URL is the fallback */
|
|
276
|
+
}
|
|
277
|
+
await waitForCheckout(api, cfg.serverUrl, res.sessionId, timeoutMs);
|
|
278
|
+
}
|
|
279
|
+
catch (error) {
|
|
280
|
+
handleError(error, cfg.json);
|
|
281
|
+
}
|
|
282
|
+
});
|
|
113
283
|
ws
|
|
114
284
|
.command("current")
|
|
115
285
|
.description("Show the active workspace")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../src/commands/workspace.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../src/commands/workspace.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/api-client.d.ts
CHANGED
|
@@ -1,15 +1,37 @@
|
|
|
1
|
+
export interface ActiveAgentRun {
|
|
2
|
+
agentRunId: string;
|
|
3
|
+
/** The run's `auto.before_agent` snapshot. Canvas runs only. */
|
|
4
|
+
beforeSnapshotId?: string;
|
|
5
|
+
}
|
|
6
|
+
/**
|
|
7
|
+
* Resolve the agent-run to attach to writes against `serverUrl`, in precedence
|
|
8
|
+
* order:
|
|
9
|
+
*
|
|
10
|
+
* 1. `CNOTES_AGENT_RUN_ID` env var (explicit override, wins everything).
|
|
11
|
+
* `canvas agent-run wrap` sets this for its subprocess, so a wrapped run
|
|
12
|
+
* correctly beats any outer persisted run.
|
|
13
|
+
* 2. The active run persisted on this server's config, written by
|
|
14
|
+
* `cnotes operations begin` / `cnotes canvas agent-run begin` and cleared
|
|
15
|
+
* by their matching `end`.
|
|
16
|
+
*
|
|
17
|
+
* The run id and its before-snapshot resolve together, from ONE source. They
|
|
18
|
+
* are a pair — the snapshot is the state of the canvas at that run's begin — so
|
|
19
|
+
* mixing them across sources would hand a wrapped run the *outer* run's
|
|
20
|
+
* before-snapshot. The server drops a snapshot that belongs to another canvas,
|
|
21
|
+
* so the run would quietly lose its revert point rather than fail loudly.
|
|
22
|
+
*
|
|
23
|
+
* Exported so the bracketing commands resolve the run the same way the client
|
|
24
|
+
* attaches it — `canvas agent-run end` closing a run the client would not have
|
|
25
|
+
* attached to is exactly the desync that let agent edits record as human ones.
|
|
26
|
+
*/
|
|
27
|
+
export declare function resolveActiveAgentRun(serverUrl: string): ActiveAgentRun | undefined;
|
|
1
28
|
export declare class ApiClient {
|
|
2
29
|
private serverUrl;
|
|
3
30
|
private token;
|
|
4
31
|
constructor(serverUrl: string, token: string);
|
|
5
32
|
/**
|
|
6
33
|
* Build request headers, attaching the active agent-run when one is
|
|
7
|
-
* open
|
|
8
|
-
*
|
|
9
|
-
* 1. `CNOTES_AGENT_RUN_ID` env var (explicit override, wins everything).
|
|
10
|
-
* 2. The `activeAgentRunId` persisted on the current server's config
|
|
11
|
-
* (written by `cnotes operations begin`, cleared by `cnotes operations
|
|
12
|
-
* end`).
|
|
34
|
+
* open (see {@link resolveActiveAgentRun} for the resolution order).
|
|
13
35
|
*
|
|
14
36
|
* The config fallback exists because env vars don't survive across
|
|
15
37
|
* separate shell processes (or stateless tool calls — e.g. an agent
|
|
@@ -19,15 +41,19 @@ export declare class ApiClient {
|
|
|
19
41
|
*
|
|
20
42
|
* X-Agent-Before-Snapshot-Id carries the begin-checkpoint's snapshot
|
|
21
43
|
* ID so the first mutation under the run can back-link
|
|
22
|
-
* operation.checkpointBeforeId at open time
|
|
23
|
-
* snapshot belongs to the target canvas before
|
|
44
|
+
* operation.checkpointBeforeId at open time — no header, no revert point.
|
|
45
|
+
* The server validates the snapshot belongs to the target canvas before
|
|
46
|
+
* stamping it, and ignores it entirely without a run id.
|
|
24
47
|
*
|
|
25
48
|
* Prompt + rationale are deliberately NOT carried per-request — they
|
|
26
49
|
* were already persisted on the operation row at begin time, and
|
|
27
50
|
* resending them on every mutation would create a spoofing surface (a
|
|
28
51
|
* leaked runId could overwrite stored intent metadata).
|
|
52
|
+
*
|
|
53
|
+
* @internal exposed (not private) so tests can assert the run actually
|
|
54
|
+
* rides on the request — the header being silently absent is the bug.
|
|
29
55
|
*/
|
|
30
|
-
|
|
56
|
+
buildHeaders(): Record<string, string>;
|
|
31
57
|
/**
|
|
32
58
|
* Execute a fetch with retry for 5xx and 429 errors.
|
|
33
59
|
* Retries up to 3 times with exponential backoff (1s, 2s, 4s).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-client.d.ts","sourceRoot":"","sources":["../../src/lib/api-client.ts"],"names":[],"mappings":"AAcA,qBAAa,SAAS;IAElB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,KAAK;gBADL,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM;IAGvB
|
|
1
|
+
{"version":3,"file":"api-client.d.ts","sourceRoot":"","sources":["../../src/lib/api-client.ts"],"names":[],"mappings":"AAcA,MAAM,WAAW,cAAc;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,gEAAgE;IAChE,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAcnF;AAED,qBAAa,SAAS;IAElB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,KAAK;gBADL,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM;IAGvB;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,YAAY,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAgBtC;;;;OAIG;YACW,cAAc;IAkD5B;;;;;OAKG;YACW,SAAS;IAcjB,GAAG,CAAC,CAAC,GAAG,OAAO,EACnB,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GAC1C,OAAO,CAAC,CAAC,CAAC;IAqBP,IAAI,CAAC,CAAC,GAAG,OAAO,EACpB,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC7B,OAAO,CAAC,CAAC,CAAC;IAgBP,YAAY,CAAC,CAAC,GAAG,OAAO,EAC5B,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,MAAM,QAAQ,GAC5B,OAAO,CAAC,CAAC,CAAC;IAuBP,GAAG,CAAC,CAAC,GAAG,OAAO,EACnB,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC7B,OAAO,CAAC,CAAC,CAAC;IAgBP,KAAK,CAAC,CAAC,GAAG,OAAO,EACrB,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GAC1C,OAAO,CAAC,CAAC,CAAC;IAqBP,MAAM,CAAC,CAAC,GAAG,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;IAenD;;;;;;;;OAQG;IACG,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAwCvD;;;;;;OAMG;IACG,aAAa,CACjB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;IAgBzD;;;;;;OAMG;YACW,aAAa;CAc5B"}
|
package/dist/lib/api-client.js
CHANGED
|
@@ -8,6 +8,43 @@ function isRetryable(status) {
|
|
|
8
8
|
function sleep(ms) {
|
|
9
9
|
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
10
10
|
}
|
|
11
|
+
/**
|
|
12
|
+
* Resolve the agent-run to attach to writes against `serverUrl`, in precedence
|
|
13
|
+
* order:
|
|
14
|
+
*
|
|
15
|
+
* 1. `CNOTES_AGENT_RUN_ID` env var (explicit override, wins everything).
|
|
16
|
+
* `canvas agent-run wrap` sets this for its subprocess, so a wrapped run
|
|
17
|
+
* correctly beats any outer persisted run.
|
|
18
|
+
* 2. The active run persisted on this server's config, written by
|
|
19
|
+
* `cnotes operations begin` / `cnotes canvas agent-run begin` and cleared
|
|
20
|
+
* by their matching `end`.
|
|
21
|
+
*
|
|
22
|
+
* The run id and its before-snapshot resolve together, from ONE source. They
|
|
23
|
+
* are a pair — the snapshot is the state of the canvas at that run's begin — so
|
|
24
|
+
* mixing them across sources would hand a wrapped run the *outer* run's
|
|
25
|
+
* before-snapshot. The server drops a snapshot that belongs to another canvas,
|
|
26
|
+
* so the run would quietly lose its revert point rather than fail loudly.
|
|
27
|
+
*
|
|
28
|
+
* Exported so the bracketing commands resolve the run the same way the client
|
|
29
|
+
* attaches it — `canvas agent-run end` closing a run the client would not have
|
|
30
|
+
* attached to is exactly the desync that let agent edits record as human ones.
|
|
31
|
+
*/
|
|
32
|
+
export function resolveActiveAgentRun(serverUrl) {
|
|
33
|
+
const envRunId = process.env.CNOTES_AGENT_RUN_ID;
|
|
34
|
+
if (envRunId) {
|
|
35
|
+
return {
|
|
36
|
+
agentRunId: envRunId,
|
|
37
|
+
beforeSnapshotId: process.env.CNOTES_AGENT_BEFORE_SNAPSHOT_ID,
|
|
38
|
+
};
|
|
39
|
+
}
|
|
40
|
+
const active = getActiveAgentRunId(loadConfig(), serverUrl);
|
|
41
|
+
if (!active)
|
|
42
|
+
return undefined;
|
|
43
|
+
return {
|
|
44
|
+
agentRunId: active.agentRunId,
|
|
45
|
+
beforeSnapshotId: active.beforeSnapshotId,
|
|
46
|
+
};
|
|
47
|
+
}
|
|
11
48
|
export class ApiClient {
|
|
12
49
|
serverUrl;
|
|
13
50
|
token;
|
|
@@ -17,12 +54,7 @@ export class ApiClient {
|
|
|
17
54
|
}
|
|
18
55
|
/**
|
|
19
56
|
* Build request headers, attaching the active agent-run when one is
|
|
20
|
-
* open
|
|
21
|
-
*
|
|
22
|
-
* 1. `CNOTES_AGENT_RUN_ID` env var (explicit override, wins everything).
|
|
23
|
-
* 2. The `activeAgentRunId` persisted on the current server's config
|
|
24
|
-
* (written by `cnotes operations begin`, cleared by `cnotes operations
|
|
25
|
-
* end`).
|
|
57
|
+
* open (see {@link resolveActiveAgentRun} for the resolution order).
|
|
26
58
|
*
|
|
27
59
|
* The config fallback exists because env vars don't survive across
|
|
28
60
|
* separate shell processes (or stateless tool calls — e.g. an agent
|
|
@@ -32,27 +64,31 @@ export class ApiClient {
|
|
|
32
64
|
*
|
|
33
65
|
* X-Agent-Before-Snapshot-Id carries the begin-checkpoint's snapshot
|
|
34
66
|
* ID so the first mutation under the run can back-link
|
|
35
|
-
* operation.checkpointBeforeId at open time
|
|
36
|
-
* snapshot belongs to the target canvas before
|
|
67
|
+
* operation.checkpointBeforeId at open time — no header, no revert point.
|
|
68
|
+
* The server validates the snapshot belongs to the target canvas before
|
|
69
|
+
* stamping it, and ignores it entirely without a run id.
|
|
37
70
|
*
|
|
38
71
|
* Prompt + rationale are deliberately NOT carried per-request — they
|
|
39
72
|
* were already persisted on the operation row at begin time, and
|
|
40
73
|
* resending them on every mutation would create a spoofing surface (a
|
|
41
74
|
* leaked runId could overwrite stored intent metadata).
|
|
75
|
+
*
|
|
76
|
+
* @internal exposed (not private) so tests can assert the run actually
|
|
77
|
+
* rides on the request — the header being silently absent is the bug.
|
|
42
78
|
*/
|
|
43
|
-
|
|
79
|
+
buildHeaders() {
|
|
44
80
|
const base = {
|
|
45
81
|
Authorization: `Bearer ${this.token}`,
|
|
46
82
|
"Content-Type": "application/json",
|
|
47
83
|
"X-Source": "cli",
|
|
48
84
|
};
|
|
49
|
-
const
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
85
|
+
const run = resolveActiveAgentRun(this.serverUrl);
|
|
86
|
+
if (run) {
|
|
87
|
+
base["X-Agent-Run-Id"] = run.agentRunId;
|
|
88
|
+
if (run.beforeSnapshotId) {
|
|
89
|
+
base["X-Agent-Before-Snapshot-Id"] = run.beforeSnapshotId;
|
|
90
|
+
}
|
|
91
|
+
}
|
|
56
92
|
return base;
|
|
57
93
|
}
|
|
58
94
|
/**
|
|
@@ -129,7 +165,7 @@ export class ApiClient {
|
|
|
129
165
|
}
|
|
130
166
|
const res = await this.fetchWithRetry(url.toString(), {
|
|
131
167
|
method: "GET",
|
|
132
|
-
headers: this.
|
|
168
|
+
headers: this.buildHeaders(),
|
|
133
169
|
});
|
|
134
170
|
if (!res.ok) {
|
|
135
171
|
const body = await this.errorBody(res);
|
|
@@ -141,7 +177,7 @@ export class ApiClient {
|
|
|
141
177
|
const url = new URL(path, this.serverUrl);
|
|
142
178
|
const res = await this.fetchWithRetry(url.toString(), {
|
|
143
179
|
method: "POST",
|
|
144
|
-
headers: this.
|
|
180
|
+
headers: this.buildHeaders(),
|
|
145
181
|
body: body ? JSON.stringify(body) : undefined,
|
|
146
182
|
});
|
|
147
183
|
if (!res.ok) {
|
|
@@ -173,7 +209,7 @@ export class ApiClient {
|
|
|
173
209
|
const url = new URL(path, this.serverUrl);
|
|
174
210
|
const res = await this.fetchWithRetry(url.toString(), {
|
|
175
211
|
method: "PUT",
|
|
176
|
-
headers: this.
|
|
212
|
+
headers: this.buildHeaders(),
|
|
177
213
|
body: body ? JSON.stringify(body) : undefined,
|
|
178
214
|
});
|
|
179
215
|
if (!res.ok) {
|
|
@@ -192,7 +228,7 @@ export class ApiClient {
|
|
|
192
228
|
}
|
|
193
229
|
const res = await this.fetchWithRetry(url.toString(), {
|
|
194
230
|
method: "PATCH",
|
|
195
|
-
headers: this.
|
|
231
|
+
headers: this.buildHeaders(),
|
|
196
232
|
body: body ? JSON.stringify(body) : undefined,
|
|
197
233
|
});
|
|
198
234
|
if (!res.ok) {
|
|
@@ -205,7 +241,7 @@ export class ApiClient {
|
|
|
205
241
|
const url = new URL(path, this.serverUrl);
|
|
206
242
|
const res = await this.fetchWithRetry(url.toString(), {
|
|
207
243
|
method: "DELETE",
|
|
208
|
-
headers: this.
|
|
244
|
+
headers: this.buildHeaders(),
|
|
209
245
|
});
|
|
210
246
|
if (!res.ok) {
|
|
211
247
|
const body = await this.errorBody(res);
|
|
@@ -228,7 +264,7 @@ export class ApiClient {
|
|
|
228
264
|
try {
|
|
229
265
|
res = await fetch(url.toString(), {
|
|
230
266
|
method: "GET",
|
|
231
|
-
headers: this.
|
|
267
|
+
headers: this.buildHeaders(),
|
|
232
268
|
redirect: "manual",
|
|
233
269
|
});
|
|
234
270
|
}
|
|
@@ -247,7 +283,7 @@ export class ApiClient {
|
|
|
247
283
|
if (res.status === 0 || (!location && res.status < 400)) {
|
|
248
284
|
const followed = await this.fetchWithRetry(url.toString(), {
|
|
249
285
|
method: "GET",
|
|
250
|
-
headers: this.
|
|
286
|
+
headers: this.buildHeaders(),
|
|
251
287
|
});
|
|
252
288
|
if (!followed.ok) {
|
|
253
289
|
const body = await this.errorBody(followed);
|
|
@@ -270,7 +306,7 @@ export class ApiClient {
|
|
|
270
306
|
const url = new URL(path, this.serverUrl);
|
|
271
307
|
const res = await this.fetchWithRetry(url.toString(), {
|
|
272
308
|
method: "GET",
|
|
273
|
-
headers: this.
|
|
309
|
+
headers: this.buildHeaders(),
|
|
274
310
|
});
|
|
275
311
|
if (!res.ok) {
|
|
276
312
|
const body = await this.errorBody(res);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../../src/lib/api-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAElE,MAAM,WAAW,GAAG,CAAC,CAAC;AACtB,MAAM,aAAa,GAAG,IAAI,CAAC;AAE3B,SAAS,WAAW,CAAC,MAAc;IACjC,OAAO,MAAM,IAAI,GAAG,IAAI,MAAM,KAAK,GAAG,CAAC;AACzC,CAAC;AAED,SAAS,KAAK,CAAC,EAAU;IACvB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAC3D,CAAC;AAED,MAAM,OAAO,SAAS;IAEV;IACA;IAFV,YACU,SAAiB,EACjB,KAAa;QADb,cAAS,GAAT,SAAS,CAAQ;QACjB,UAAK,GAAL,KAAK,CAAQ;IACpB,CAAC;IAEJ
|
|
1
|
+
{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../../src/lib/api-client.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/auth-store.d.ts
CHANGED
|
@@ -4,15 +4,36 @@ export interface ServerConfig {
|
|
|
4
4
|
workspaceId?: string;
|
|
5
5
|
/**
|
|
6
6
|
* Currently-open agent-run on this server, written by `cnotes operations
|
|
7
|
-
* begin`
|
|
8
|
-
* to this when CNOTES_AGENT_RUN_ID env is
|
|
9
|
-
* separate shell processes (or stateless tool
|
|
10
|
-
* active run. Env wins when set, for explicit
|
|
7
|
+
* begin` / `cnotes canvas agent-run begin` and cleared by their matching
|
|
8
|
+
* `end`. The api-client falls back to this when CNOTES_AGENT_RUN_ID env is
|
|
9
|
+
* unset, so cnotes writes across separate shell processes (or stateless tool
|
|
10
|
+
* calls) auto-attach to the active run. Env wins when set, for explicit
|
|
11
|
+
* overrides.
|
|
12
|
+
*
|
|
13
|
+
* Both bracketing commands share this one slot on purpose: a request carries
|
|
14
|
+
* exactly one X-Agent-Run-Id, so two concurrent "active" runs would be
|
|
15
|
+
* ambiguous. `begin` refuses when this is already set (unless --force).
|
|
11
16
|
*/
|
|
12
17
|
activeAgentRunId?: string;
|
|
13
18
|
/** When activeAgentRunId was opened — used to surface helpful "started
|
|
14
19
|
* Xm ago" context on the "already-active" warning at begin time. */
|
|
15
20
|
activeAgentRunStartedAt?: number;
|
|
21
|
+
/**
|
|
22
|
+
* The `auto.before_agent` snapshot captured when a *canvas* agent-run was
|
|
23
|
+
* opened. Rides on every subsequent write as X-Agent-Before-Snapshot-Id so
|
|
24
|
+
* the run's first canvas mutation can back-link `checkpointBeforeId` onto its
|
|
25
|
+
* operation row.
|
|
26
|
+
*
|
|
27
|
+
* Load-bearing, not decorative: the server only back-links this at the first
|
|
28
|
+
* mutation (at begin time the operation row doesn't exist yet), and
|
|
29
|
+
* getRevertContext returns null without it — so a run that never carries this
|
|
30
|
+
* header cannot be reverted. Persisting it beside the run id is what makes
|
|
31
|
+
* "Revert this run" work for callers that don't inherit an env var.
|
|
32
|
+
*
|
|
33
|
+
* Unset for `operations begin` runs: those are workspace-scoped and have no
|
|
34
|
+
* canvas snapshot to carry.
|
|
35
|
+
*/
|
|
36
|
+
activeAgentBeforeSnapshotId?: string;
|
|
16
37
|
}
|
|
17
38
|
export interface CliConfig {
|
|
18
39
|
version: 1;
|
|
@@ -25,23 +46,41 @@ export declare function getServerConfig(config: CliConfig, server?: string): Ser
|
|
|
25
46
|
export declare function setServerConfig(config: CliConfig, serverUrl: string, serverConfig: ServerConfig): void;
|
|
26
47
|
export declare function removeServerConfig(config: CliConfig, serverUrl: string): void;
|
|
27
48
|
export declare function setCurrentServer(config: CliConfig, serverUrl: string): void;
|
|
28
|
-
|
|
49
|
+
/**
|
|
50
|
+
* Persist the active workspace for a server. Returns false (a no-op) when there
|
|
51
|
+
* is no stored config entry for `serverUrl` — i.e. the token came from a flag or
|
|
52
|
+
* env var against a server never logged into with `cnotes auth login`, so there
|
|
53
|
+
* is nowhere on disk to record the selection. Callers that report activation
|
|
54
|
+
* back to a caller should surface this instead of claiming success.
|
|
55
|
+
*/
|
|
56
|
+
export declare function setWorkspaceId(config: CliConfig, serverUrl: string, workspaceId: string): boolean;
|
|
29
57
|
/**
|
|
30
58
|
* Mark a given agent-run as the active one for a server. Subsequent cnotes
|
|
31
|
-
* writes against this server will carry X-Agent-Run-Id automatically
|
|
59
|
+
* writes against this server will carry X-Agent-Run-Id automatically —
|
|
60
|
+
* plus X-Agent-Before-Snapshot-Id when `beforeSnapshotId` is given (canvas
|
|
61
|
+
* runs), which is what makes the run revertable.
|
|
62
|
+
*
|
|
63
|
+
* Returns false (a no-op) when there is no stored config entry for `serverUrl`
|
|
64
|
+
* — i.e. the token came from a flag or env var against a server never logged
|
|
65
|
+
* into with `cnotes auth login`, so there is nowhere on disk to record the run.
|
|
66
|
+
* Callers MUST surface this instead of claiming the run is active: silently
|
|
67
|
+
* persisting nothing is exactly how bracketed agent writes end up recorded as
|
|
68
|
+
* unattributed human edits. Same contract as setWorkspaceId above.
|
|
32
69
|
*/
|
|
33
|
-
export declare function setActiveAgentRunId(config: CliConfig, serverUrl: string, agentRunId: string, startedAt: number):
|
|
70
|
+
export declare function setActiveAgentRunId(config: CliConfig, serverUrl: string, agentRunId: string, startedAt: number, beforeSnapshotId?: string): boolean;
|
|
34
71
|
/**
|
|
35
|
-
* Clear the active agent-run for a server. Called by `cnotes operations end`
|
|
36
|
-
* after a successful close, so the next cnotes
|
|
37
|
-
* unless the user opens a new run.
|
|
72
|
+
* Clear the active agent-run for a server. Called by `cnotes operations end` /
|
|
73
|
+
* `cnotes canvas agent-run end` after a successful close, so the next cnotes
|
|
74
|
+
* write reverts to "unattached" unless the user opens a new run.
|
|
38
75
|
*/
|
|
39
76
|
export declare function clearActiveAgentRunId(config: CliConfig, serverUrl: string): void;
|
|
40
77
|
/**
|
|
41
|
-
* Read the active agent-run for a server (if any).
|
|
78
|
+
* Read the active agent-run for a server (if any). `beforeSnapshotId` is
|
|
79
|
+
* present only for canvas runs (see the field docs on ServerConfig).
|
|
42
80
|
*/
|
|
43
81
|
export declare function getActiveAgentRunId(config: CliConfig, serverUrl: string): {
|
|
44
82
|
agentRunId: string;
|
|
45
83
|
startedAt: number;
|
|
84
|
+
beforeSnapshotId?: string;
|
|
46
85
|
} | null;
|
|
47
86
|
//# sourceMappingURL=auth-store.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-store.d.ts","sourceRoot":"","sources":["../../src/lib/auth-store.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB
|
|
1
|
+
{"version":3,"file":"auth-store.d.ts","sourceRoot":"","sources":["../../src/lib/auth-store.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;;;;;;;OAWG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B;yEACqE;IACrE,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC;;;;;;;;;;;;;;OAcG;IACH,2BAA2B,CAAC,EAAE,MAAM,CAAC;CACtC;AAED,MAAM,WAAW,SAAS;IACxB,OAAO,EAAE,CAAC,CAAC;IACX,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACtC,aAAa,EAAE,MAAM,CAAC;CACvB;AA8CD,wBAAgB,UAAU,IAAI,SAAS,CAmBtC;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAQlD;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CAGvF;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,SAAS,EACjB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,YAAY,GACzB,IAAI,CAGN;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAG7E;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAG3E;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,SAAS,EACjB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAClB,OAAO,CAQT;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,SAAS,EACjB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,gBAAgB,CAAC,EAAE,MAAM,GACxB,OAAO,CAeT;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,SAAS,EACjB,SAAS,EAAE,MAAM,GAChB,IAAI,CAWN;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,SAAS,EACjB,SAAS,EAAE,MAAM,GAChB;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAU7E"}
|