@skrr-ai/cli 0.1.48 → 0.1.50
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/README.md +5 -4
- package/dist/base-command.js +16 -4
- package/dist/commands/agent-worker.d.ts +12 -0
- package/dist/commands/agent-worker.js +140 -0
- package/dist/commands/agents/create.js +14 -7
- package/dist/commands/agents/update.js +11 -5
- package/dist/commands/code/index.d.ts +1 -0
- package/dist/commands/code/index.js +49 -5
- package/dist/commands/code/run.js +5 -1
- package/dist/commands/commitments/cycles.d.ts +19 -0
- package/dist/commands/commitments/cycles.js +46 -0
- package/dist/commands/commitments/effective-policy.js +26 -1
- package/dist/commands/commitments/explain.d.ts +17 -0
- package/dist/commands/commitments/explain.js +40 -0
- package/dist/commands/goals/create.d.ts +1 -0
- package/dist/commands/goals/create.js +22 -0
- package/dist/commands/logout.js +12 -1
- package/dist/commands/machines/dedicated/index.js +1 -1
- package/dist/commands/machines/dedicated/sign-in.js +4 -1
- package/dist/commands/machines/dedicated/terminal/kill.d.ts +21 -0
- package/dist/commands/machines/dedicated/terminal/kill.js +55 -0
- package/dist/commands/machines/dedicated/terminal/ls.d.ts +22 -0
- package/dist/commands/machines/dedicated/terminal/ls.js +70 -0
- package/dist/commands/machines/dedicated/terminal/rename.d.ts +23 -0
- package/dist/commands/machines/dedicated/terminal/rename.js +64 -0
- package/dist/commands/machines/dedicated/terminal.d.ts +9 -0
- package/dist/commands/machines/dedicated/terminal.js +27 -2
- package/dist/commands/machines/hosted/connect.js +2 -2
- package/dist/commands/machines/hosted/destroy.js +1 -1
- package/dist/commands/machines/hosted/exec.js +1 -1
- package/dist/commands/machines/hosted/list.js +1 -1
- package/dist/commands/machines/hosted/pause.js +1 -1
- package/dist/commands/machines/hosted/pull.js +1 -1
- package/dist/commands/machines/hosted/resume.js +1 -1
- package/dist/commands/machines/hosted/start.js +2 -2
- package/dist/commands/machines/hosted/status.js +2 -1
- package/dist/commands/tasks/create.js +1 -0
- package/dist/commands/tasks/list.js +1 -0
- package/dist/commands/tasks/update.js +1 -0
- package/dist/lib/agent-config.d.ts +2 -0
- package/dist/lib/agent-config.js +3 -1
- package/dist/lib/api-fetch.js +19 -0
- package/dist/lib/auth-storage.d.ts +14 -0
- package/dist/lib/auth-storage.js +14 -0
- package/dist/lib/commitments.d.ts +17 -2
- package/dist/lib/commitments.js +114 -0
- package/dist/lib/daemon-installer.d.ts +6 -5
- package/dist/lib/daemon-installer.js +4 -17
- package/dist/lib/daemonBroker.d.ts +120 -31
- package/dist/lib/daemonBroker.js +313 -20
- package/dist/lib/dedicated-lease-command.d.ts +14 -0
- package/dist/lib/dedicated-lease-command.js +30 -1
- package/dist/lib/dedicated-machines.js +8 -25
- package/dist/lib/dedicated-service-command.d.ts +11 -3
- package/dist/lib/dedicated-service-command.js +20 -3
- package/dist/lib/dedicated-service.d.ts +46 -0
- package/dist/lib/dedicated-service.js +85 -7
- package/dist/lib/dedicated-terminal.d.ts +21 -0
- package/dist/lib/dedicated-terminal.js +104 -9
- package/dist/lib/first-party-harness-broker.d.ts +10 -0
- package/dist/lib/first-party-harness-broker.js +9 -0
- package/dist/lib/first-party-harness-doctor.js +41 -1
- package/dist/lib/first-party-harness-managed.d.ts +4 -3
- package/dist/lib/first-party-harness-project-trust.d.ts +125 -0
- package/dist/lib/first-party-harness-project-trust.js +364 -0
- package/dist/lib/first-party-harness.d.ts +9 -2
- package/dist/lib/first-party-harness.js +6 -5
- package/dist/lib/hosted-machines.d.ts +10 -1
- package/dist/lib/hosted-machines.js +36 -2
- package/dist/lib/login.js +16 -0
- package/dist/lib/machine-spend-cap.d.ts +23 -0
- package/dist/lib/machine-spend-cap.js +68 -0
- package/dist/lib/node-adapter.js +15 -3
- package/dist/node_modules/@skrr-ai/auth-core/dist/cjs/cliHandoffWire.d.ts +90 -0
- package/dist/node_modules/@skrr-ai/auth-core/dist/cjs/cliHandoffWire.js +113 -0
- package/dist/node_modules/@skrr-ai/auth-core/dist/cjs/credentialSession.d.ts +47 -0
- package/dist/node_modules/@skrr-ai/auth-core/dist/cjs/credentialSession.js +69 -0
- package/dist/node_modules/@skrr-ai/auth-core/dist/cjs/daemonToolApproval.d.ts +109 -0
- package/dist/node_modules/@skrr-ai/auth-core/dist/cjs/daemonToolApproval.js +171 -0
- package/dist/node_modules/@skrr-ai/auth-core/dist/cjs/firstPartyHarness.d.ts +1 -1
- package/dist/node_modules/@skrr-ai/auth-core/dist/cjs/firstPartyHarness.js +1 -1
- package/dist/node_modules/@skrr-ai/auth-core/dist/cjs/index.d.ts +1 -1
- package/dist/node_modules/@skrr-ai/auth-core/dist/cjs/index.js +4 -2
- package/dist/node_modules/@skrr-ai/auth-core/dist/cjs/messages.d.ts +8 -3
- package/dist/node_modules/@skrr-ai/auth-core/dist/cjs/messages.js +9 -4
- package/dist/node_modules/@skrr-ai/auth-core/dist/cjs/refresh.js +8 -9
- package/dist/node_modules/@skrr-ai/auth-core/dist/cjs/refreshClassification.d.ts +6 -0
- package/dist/node_modules/@skrr-ai/auth-core/dist/cjs/refreshClassification.js +32 -9
- package/dist/node_modules/@skrr-ai/auth-core/dist/cjs/releaseManifest.d.ts +38 -0
- package/dist/node_modules/@skrr-ai/auth-core/dist/cjs/releaseManifest.js +66 -1
- package/dist/node_modules/@skrr-ai/auth-core/dist/cjs/sessionPermissionAuthority.d.ts +81 -0
- package/dist/node_modules/@skrr-ai/auth-core/dist/cjs/sessionPermissionAuthority.js +87 -0
- package/dist/node_modules/@skrr-ai/auth-core/dist/cjs/types.d.ts +6 -1
- package/dist/node_modules/@skrr-ai/auth-core/dist/esm/cliHandoffWire.d.ts +90 -0
- package/dist/node_modules/@skrr-ai/auth-core/dist/esm/cliHandoffWire.js +105 -0
- package/dist/node_modules/@skrr-ai/auth-core/dist/esm/credentialSession.d.ts +47 -0
- package/dist/node_modules/@skrr-ai/auth-core/dist/esm/credentialSession.js +66 -0
- package/dist/node_modules/@skrr-ai/auth-core/dist/esm/daemonToolApproval.d.ts +109 -0
- package/dist/node_modules/@skrr-ai/auth-core/dist/esm/daemonToolApproval.js +164 -0
- package/dist/node_modules/@skrr-ai/auth-core/dist/esm/firstPartyHarness.d.ts +1 -1
- package/dist/node_modules/@skrr-ai/auth-core/dist/esm/firstPartyHarness.js +1 -1
- package/dist/node_modules/@skrr-ai/auth-core/dist/esm/index.d.ts +1 -1
- package/dist/node_modules/@skrr-ai/auth-core/dist/esm/index.js +1 -1
- package/dist/node_modules/@skrr-ai/auth-core/dist/esm/messages.d.ts +8 -3
- package/dist/node_modules/@skrr-ai/auth-core/dist/esm/messages.js +9 -4
- package/dist/node_modules/@skrr-ai/auth-core/dist/esm/refresh.js +8 -9
- package/dist/node_modules/@skrr-ai/auth-core/dist/esm/refreshClassification.d.ts +6 -0
- package/dist/node_modules/@skrr-ai/auth-core/dist/esm/refreshClassification.js +31 -9
- package/dist/node_modules/@skrr-ai/auth-core/dist/esm/releaseManifest.d.ts +38 -0
- package/dist/node_modules/@skrr-ai/auth-core/dist/esm/releaseManifest.js +64 -0
- package/dist/node_modules/@skrr-ai/auth-core/dist/esm/sessionPermissionAuthority.d.ts +81 -0
- package/dist/node_modules/@skrr-ai/auth-core/dist/esm/sessionPermissionAuthority.js +80 -0
- package/dist/node_modules/@skrr-ai/auth-core/dist/esm/types.d.ts +6 -1
- package/dist/node_modules/@skrr-ai/auth-core/package.json +41 -1
- package/dist/node_modules/@skrr-ai/data-provider/index.js +3413 -3343
- package/oclif.manifest.json +8930 -8466
- package/package.json +4 -1
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Session permission authority — the ONE rule that decides whether a session's
|
|
4
|
+
* execution contract governs the run's permissions, shared by the server and
|
|
5
|
+
* the daemon (OSK-11975 introduced it; it was implemented twice — the server
|
|
6
|
+
* read `kind !== 'commitment'`, the daemon read the `permissionSource` marker —
|
|
7
|
+
* which is exactly how a new contract kind or a new source value would drift
|
|
8
|
+
* them apart).
|
|
9
|
+
*
|
|
10
|
+
* The wire model:
|
|
11
|
+
*
|
|
12
|
+
* - The contract is closed (`hasOnlyKeys` on the daemon), so "whose
|
|
13
|
+
* permissions govern" can never ride INSIDE it. It is a top-level session
|
|
14
|
+
* field: `permissionSource`.
|
|
15
|
+
* - `'agent'` means the Agent's own configured permission mode, tool policy,
|
|
16
|
+
* Grants, session env, MCP servers and machine consent govern the run,
|
|
17
|
+
* exactly as for an unattended Task of the same Agent. Today only a
|
|
18
|
+
* `commitment` contract may carry it.
|
|
19
|
+
* - A `commitment` contract WITHOUT the marker (an older server mid-deploy)
|
|
20
|
+
* still governs permissions — the marker is the version signal, so its
|
|
21
|
+
* absence must keep the legacy fence, not silently lift it.
|
|
22
|
+
* - `task_delivery` contracts always govern, marker or not.
|
|
23
|
+
*
|
|
24
|
+
* Server vs daemon asymmetry, on purpose: the server STAMPS the marker
|
|
25
|
+
* (`permissionSourceForContract`), so on its own side the predicate reduces to
|
|
26
|
+
* "a commitment never governs" — `contractGovernsPermissions(c,
|
|
27
|
+
* permissionSourceForContract(c))` is exactly `kind !== 'commitment'`. The
|
|
28
|
+
* daemon reads the marker it received, because it cannot distinguish "new
|
|
29
|
+
* server, agent permissions" from "old server, contract fence" any other way.
|
|
30
|
+
* Both call the same function; only the input differs.
|
|
31
|
+
*/
|
|
32
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
33
|
+
exports.COMMITMENT_AGENT_PERMISSIONS_CAPABILITY = exports.SESSION_PERMISSION_SOURCES = void 0;
|
|
34
|
+
exports.normalizeSessionPermissionSource = normalizeSessionPermissionSource;
|
|
35
|
+
exports.permissionSourceForContract = permissionSourceForContract;
|
|
36
|
+
exports.contractGovernsPermissions = contractGovernsPermissions;
|
|
37
|
+
exports.permissionGoverningContract = permissionGoverningContract;
|
|
38
|
+
/** The wire vocabulary for `permissionSource`. Top-level session field. */
|
|
39
|
+
exports.SESSION_PERMISSION_SOURCES = ['agent'];
|
|
40
|
+
/**
|
|
41
|
+
* The daemon capability that proves a build honours `permissionSource`. The
|
|
42
|
+
* server announces it in preflight and refuses to dispatch a Commitment Run to
|
|
43
|
+
* a daemon without it (`COMMITMENT_AGENT_PERMISSIONS_RUNTIME_UNSUPPORTED`), so
|
|
44
|
+
* the marker never reaches a daemon that would ignore it.
|
|
45
|
+
*/
|
|
46
|
+
exports.COMMITMENT_AGENT_PERMISSIONS_CAPABILITY = 'commitment_execution_contract_v2_agent_permissions';
|
|
47
|
+
/**
|
|
48
|
+
* Untrusted wire input: anything but an exact vocabulary literal reads as
|
|
49
|
+
* absent. Never widen by coercion — an unrecognized future value must degrade
|
|
50
|
+
* to "contract governs", the conservative answer.
|
|
51
|
+
*/
|
|
52
|
+
function normalizeSessionPermissionSource(value) {
|
|
53
|
+
return exports.SESSION_PERMISSION_SOURCES.includes(value)
|
|
54
|
+
? value
|
|
55
|
+
: undefined;
|
|
56
|
+
}
|
|
57
|
+
/**
|
|
58
|
+
* What the server stamps on the wire for this contract. A `commitment`
|
|
59
|
+
* contract no longer carries permissions (OSK-11975); every other contract
|
|
60
|
+
* kind keeps its own authority and stamps nothing.
|
|
61
|
+
*/
|
|
62
|
+
function permissionSourceForContract(contract) {
|
|
63
|
+
return contract?.kind === 'commitment' ? 'agent' : undefined;
|
|
64
|
+
}
|
|
65
|
+
/**
|
|
66
|
+
* Whether the contract is the run's PERMISSION authority — the single place
|
|
67
|
+
* this rule lives.
|
|
68
|
+
*
|
|
69
|
+
* True for a non-commitment contract regardless of marker, and for a
|
|
70
|
+
* commitment whose server did not declare agent permissions. False for no
|
|
71
|
+
* contract at all, and for a commitment carrying `permissionSource: 'agent'`,
|
|
72
|
+
* which then follows the Agent's own permissions exactly as a Task does while
|
|
73
|
+
* the contract keeps its non-permission roles (normalized shape, ephemeral
|
|
74
|
+
* worktree, result validation, `GIT_OPTIONAL_LOCKS`, provider restriction).
|
|
75
|
+
*/
|
|
76
|
+
function contractGovernsPermissions(contract, permissionSource) {
|
|
77
|
+
if (!contract)
|
|
78
|
+
return false;
|
|
79
|
+
return !(contract.kind === 'commitment' && normalizeSessionPermissionSource(permissionSource) === 'agent');
|
|
80
|
+
}
|
|
81
|
+
/**
|
|
82
|
+
* The contract when it governs permissions, else `undefined` — for the sites
|
|
83
|
+
* that used `executionContract` as "is this run permission-fenced".
|
|
84
|
+
*/
|
|
85
|
+
function permissionGoverningContract(contract, permissionSource) {
|
|
86
|
+
return contract && contractGovernsPermissions(contract, permissionSource) ? contract : undefined;
|
|
87
|
+
}
|
|
@@ -62,6 +62,11 @@ export interface TokenPair {
|
|
|
62
62
|
* - TOKEN_* — access-token specific (server pushes 4402 close;
|
|
63
63
|
* daemon classifies as TOKEN_INVALID/TOKEN_EXPIRED).
|
|
64
64
|
* - SESSION_REVOKED — admin/forensic revoke; whole family burned.
|
|
65
|
+
* - DEVICE_KEY_MISMATCH — the refresh carried a device proof signed by a key
|
|
66
|
+
* other than the one enrolled on this daemon's row
|
|
67
|
+
* (server code `DEVICE_PROOF_THUMBPRINT_MISMATCH`).
|
|
68
|
+
* The daemon signs every retry with the same key, so
|
|
69
|
+
* retrying can never succeed.
|
|
65
70
|
* - UNKNOWN_401 — server returned 401 with a code we don't
|
|
66
71
|
* recognize. Treated as permanent (better to prompt
|
|
67
72
|
* re-auth than to loop forever) but tagged
|
|
@@ -74,7 +79,7 @@ export interface TokenPair {
|
|
|
74
79
|
* Without this, the client `describeAuthFailure` exhaustiveness check
|
|
75
80
|
* was silently broken for the non-REFRESH branches.
|
|
76
81
|
*/
|
|
77
|
-
export type PermanentAuthReason = 'REFRESH_INVALID' | 'REFRESH_REUSED' | 'REFRESH_EXPIRED' | 'SESSION_REVOKED' | 'TOKEN_INVALID' | 'TOKEN_EXPIRED' | 'UNKNOWN_401';
|
|
82
|
+
export type PermanentAuthReason = 'REFRESH_INVALID' | 'REFRESH_REUSED' | 'REFRESH_EXPIRED' | 'SESSION_REVOKED' | 'DEVICE_KEY_MISMATCH' | 'TOKEN_INVALID' | 'TOKEN_EXPIRED' | 'UNKNOWN_401';
|
|
78
83
|
export declare class PermanentAuthFailure extends Error {
|
|
79
84
|
readonly code: PermanentAuthReason;
|
|
80
85
|
constructor(code: PermanentAuthReason, message: string);
|
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* cliHandoffWire.ts — the ONE declaration of the CLI↔daemon hand-off wire
|
|
3
|
+
* contracts, shared by the daemon (writer/server) and the CLI (reader).
|
|
4
|
+
*
|
|
5
|
+
* Two contracts live here:
|
|
6
|
+
*
|
|
7
|
+
* 1. The hand-off descriptor file (`descriptor.json` on Dedicated guests,
|
|
8
|
+
* `daemon-island.<profile>.json` on laptops). Until now the shape was
|
|
9
|
+
* declared twice — `DedicatedCliHandoffDescriptor` daemon-side and
|
|
10
|
+
* `LocalBootstrap` CLI-side — two type declarations for one file format,
|
|
11
|
+
* the same drift disease `sessionPermissionAuthority` fixed.
|
|
12
|
+
* 2. The broker-mode redeem exchange: `POST /v1/auth/cli-handoff-token`
|
|
13
|
+
* request/response plus its error codes.
|
|
14
|
+
*
|
|
15
|
+
* Readers stay loose (unknown fields ignored, absent `handoffModes` reads as
|
|
16
|
+
* refresh-family-only) so a new field never breaks an older peer; writers
|
|
17
|
+
* must produce the full shape.
|
|
18
|
+
*/
|
|
19
|
+
/**
|
|
20
|
+
* What a caller may redeem the descriptor secret for.
|
|
21
|
+
* - `refresh_family`: the legacy durable mint (90-day cli-scope family).
|
|
22
|
+
* - `access_token`: broker mode — a short-lived access token from a
|
|
23
|
+
* daemon-owned family; nothing durable leaves the daemon.
|
|
24
|
+
*/
|
|
25
|
+
export declare const CLI_HANDOFF_MODES: readonly ["refresh_family", "access_token"];
|
|
26
|
+
export type CliHandoffMode = (typeof CLI_HANDOFF_MODES)[number];
|
|
27
|
+
/** Broker-mode redeem route on the daemon's loopback server. */
|
|
28
|
+
export declare const CLI_HANDOFF_TOKEN_PATH = "/v1/auth/cli-handoff-token";
|
|
29
|
+
/** Error codes this contract emits. String literals so both ends compare
|
|
30
|
+
* without importing a symbol they may not have. */
|
|
31
|
+
export declare const CLI_HANDOFF_TOKEN_ERROR_UNAVAILABLE = "HANDOFF_TOKEN_UNAVAILABLE";
|
|
32
|
+
/** Emitted by the LEGACY /v1/auth/cli-handoff route when a hand-off-secret
|
|
33
|
+
* caller asks for a refresh family the daemon no longer mints for it. */
|
|
34
|
+
export declare const CLI_HANDOFF_ERROR_BROKER_ONLY = "HANDOFF_BROKER_ONLY";
|
|
35
|
+
/**
|
|
36
|
+
* The descriptor file format. `version` is absent on the oldest island files
|
|
37
|
+
* and `1` on the first dedicated-guest descriptors; `handoffModes` first
|
|
38
|
+
* appears at version 2. Every field the CLI needs to dial is validated; the
|
|
39
|
+
* rest ride along untyped.
|
|
40
|
+
*/
|
|
41
|
+
export interface CliHandoffDescriptor {
|
|
42
|
+
version?: number;
|
|
43
|
+
pid?: number;
|
|
44
|
+
daemonId?: string;
|
|
45
|
+
host?: string;
|
|
46
|
+
port?: number;
|
|
47
|
+
/** Base64 handshake secret — hand-off-only on guests, island on laptops. */
|
|
48
|
+
secret?: string;
|
|
49
|
+
/** Server URL the daemon is authenticated against. Older daemons omit it;
|
|
50
|
+
* readers refuse to broker without it (never mint against an unknown
|
|
51
|
+
* server). */
|
|
52
|
+
serverUrl?: string;
|
|
53
|
+
/** Daemon-authored epoch counter; bumped when the descriptor is republished. */
|
|
54
|
+
epoch?: number;
|
|
55
|
+
handoffModes?: CliHandoffMode[];
|
|
56
|
+
}
|
|
57
|
+
/**
|
|
58
|
+
* Parse an untrusted descriptor JSON value. Returns null when the fields the
|
|
59
|
+
* caller cannot proceed without — host, port, secret — are absent or
|
|
60
|
+
* mistyped. Unknown fields and future `version` values are tolerated: the
|
|
61
|
+
* reader ignores them, which is what makes additive evolution safe.
|
|
62
|
+
*/
|
|
63
|
+
export declare function parseCliHandoffDescriptor(value: unknown): CliHandoffDescriptor | null;
|
|
64
|
+
/**
|
|
65
|
+
* Untrusted `handoffModes` input → known literals only, deduped. An
|
|
66
|
+
* unrecognized future mode is dropped rather than widening by coercion.
|
|
67
|
+
*/
|
|
68
|
+
export declare function normalizeHandoffModes(value: unknown): CliHandoffMode[];
|
|
69
|
+
/**
|
|
70
|
+
* The versioned-default rule: a descriptor that never declares modes offers
|
|
71
|
+
* only the durable mint it has always offered. Mode negotiation is purely
|
|
72
|
+
* additive — a daemon advertises the new mode, it never un-advertises the
|
|
73
|
+
* old one by accident.
|
|
74
|
+
*/
|
|
75
|
+
export declare function advertisedHandoffModes(d: CliHandoffDescriptor): CliHandoffMode[];
|
|
76
|
+
export declare function descriptorOffersAccessToken(d: CliHandoffDescriptor): boolean;
|
|
77
|
+
export interface CliHandoffTokenRequest {
|
|
78
|
+
/** Bypass the daemon broker's cached token (the 401-recovery path). */
|
|
79
|
+
forceRefresh?: boolean;
|
|
80
|
+
}
|
|
81
|
+
export interface CliHandoffTokenResponse {
|
|
82
|
+
accessToken: string;
|
|
83
|
+
/** Absolute expiry in ms since epoch, when the daemon knows it. */
|
|
84
|
+
accessExpiresAt?: number;
|
|
85
|
+
/** Server the minted credential belongs to — lets the caller verify it is
|
|
86
|
+
* about to use a token for the API it thinks it is talking to. */
|
|
87
|
+
serverUrl?: string;
|
|
88
|
+
}
|
|
89
|
+
/** Parse the redeem response; null when the token itself is absent. */
|
|
90
|
+
export declare function parseCliHandoffTokenResponse(value: unknown): CliHandoffTokenResponse | null;
|
|
@@ -0,0 +1,105 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* cliHandoffWire.ts — the ONE declaration of the CLI↔daemon hand-off wire
|
|
3
|
+
* contracts, shared by the daemon (writer/server) and the CLI (reader).
|
|
4
|
+
*
|
|
5
|
+
* Two contracts live here:
|
|
6
|
+
*
|
|
7
|
+
* 1. The hand-off descriptor file (`descriptor.json` on Dedicated guests,
|
|
8
|
+
* `daemon-island.<profile>.json` on laptops). Until now the shape was
|
|
9
|
+
* declared twice — `DedicatedCliHandoffDescriptor` daemon-side and
|
|
10
|
+
* `LocalBootstrap` CLI-side — two type declarations for one file format,
|
|
11
|
+
* the same drift disease `sessionPermissionAuthority` fixed.
|
|
12
|
+
* 2. The broker-mode redeem exchange: `POST /v1/auth/cli-handoff-token`
|
|
13
|
+
* request/response plus its error codes.
|
|
14
|
+
*
|
|
15
|
+
* Readers stay loose (unknown fields ignored, absent `handoffModes` reads as
|
|
16
|
+
* refresh-family-only) so a new field never breaks an older peer; writers
|
|
17
|
+
* must produce the full shape.
|
|
18
|
+
*/
|
|
19
|
+
/**
|
|
20
|
+
* What a caller may redeem the descriptor secret for.
|
|
21
|
+
* - `refresh_family`: the legacy durable mint (90-day cli-scope family).
|
|
22
|
+
* - `access_token`: broker mode — a short-lived access token from a
|
|
23
|
+
* daemon-owned family; nothing durable leaves the daemon.
|
|
24
|
+
*/
|
|
25
|
+
export const CLI_HANDOFF_MODES = ['refresh_family', 'access_token'];
|
|
26
|
+
/** Broker-mode redeem route on the daemon's loopback server. */
|
|
27
|
+
export const CLI_HANDOFF_TOKEN_PATH = '/v1/auth/cli-handoff-token';
|
|
28
|
+
/** Error codes this contract emits. String literals so both ends compare
|
|
29
|
+
* without importing a symbol they may not have. */
|
|
30
|
+
export const CLI_HANDOFF_TOKEN_ERROR_UNAVAILABLE = 'HANDOFF_TOKEN_UNAVAILABLE';
|
|
31
|
+
/** Emitted by the LEGACY /v1/auth/cli-handoff route when a hand-off-secret
|
|
32
|
+
* caller asks for a refresh family the daemon no longer mints for it. */
|
|
33
|
+
export const CLI_HANDOFF_ERROR_BROKER_ONLY = 'HANDOFF_BROKER_ONLY';
|
|
34
|
+
/**
|
|
35
|
+
* Parse an untrusted descriptor JSON value. Returns null when the fields the
|
|
36
|
+
* caller cannot proceed without — host, port, secret — are absent or
|
|
37
|
+
* mistyped. Unknown fields and future `version` values are tolerated: the
|
|
38
|
+
* reader ignores them, which is what makes additive evolution safe.
|
|
39
|
+
*/
|
|
40
|
+
export function parseCliHandoffDescriptor(value) {
|
|
41
|
+
if (value == null || typeof value !== 'object')
|
|
42
|
+
return null;
|
|
43
|
+
const v = value;
|
|
44
|
+
if (typeof v.host !== 'string' || v.host.length === 0)
|
|
45
|
+
return null;
|
|
46
|
+
if (typeof v.port !== 'number' || !Number.isInteger(v.port) || v.port <= 0)
|
|
47
|
+
return null;
|
|
48
|
+
if (typeof v.secret !== 'string' || v.secret.length === 0)
|
|
49
|
+
return null;
|
|
50
|
+
return {
|
|
51
|
+
...(typeof v.version === 'number' ? { version: v.version } : {}),
|
|
52
|
+
...(typeof v.pid === 'number' ? { pid: v.pid } : {}),
|
|
53
|
+
...(typeof v.daemonId === 'string' ? { daemonId: v.daemonId } : {}),
|
|
54
|
+
host: v.host,
|
|
55
|
+
port: v.port,
|
|
56
|
+
secret: v.secret,
|
|
57
|
+
...(typeof v.serverUrl === 'string' ? { serverUrl: v.serverUrl } : {}),
|
|
58
|
+
...(typeof v.epoch === 'number' ? { epoch: v.epoch } : {}),
|
|
59
|
+
...(Array.isArray(v.handoffModes)
|
|
60
|
+
? { handoffModes: normalizeHandoffModes(v.handoffModes) }
|
|
61
|
+
: {}),
|
|
62
|
+
};
|
|
63
|
+
}
|
|
64
|
+
/**
|
|
65
|
+
* Untrusted `handoffModes` input → known literals only, deduped. An
|
|
66
|
+
* unrecognized future mode is dropped rather than widening by coercion.
|
|
67
|
+
*/
|
|
68
|
+
export function normalizeHandoffModes(value) {
|
|
69
|
+
if (!Array.isArray(value))
|
|
70
|
+
return [];
|
|
71
|
+
const out = [];
|
|
72
|
+
for (const m of value) {
|
|
73
|
+
if (CLI_HANDOFF_MODES.includes(m) &&
|
|
74
|
+
!out.includes(m)) {
|
|
75
|
+
out.push(m);
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
return out;
|
|
79
|
+
}
|
|
80
|
+
/**
|
|
81
|
+
* The versioned-default rule: a descriptor that never declares modes offers
|
|
82
|
+
* only the durable mint it has always offered. Mode negotiation is purely
|
|
83
|
+
* additive — a daemon advertises the new mode, it never un-advertises the
|
|
84
|
+
* old one by accident.
|
|
85
|
+
*/
|
|
86
|
+
export function advertisedHandoffModes(d) {
|
|
87
|
+
const declared = normalizeHandoffModes(d.handoffModes);
|
|
88
|
+
return declared.length > 0 ? declared : ['refresh_family'];
|
|
89
|
+
}
|
|
90
|
+
export function descriptorOffersAccessToken(d) {
|
|
91
|
+
return advertisedHandoffModes(d).includes('access_token');
|
|
92
|
+
}
|
|
93
|
+
/** Parse the redeem response; null when the token itself is absent. */
|
|
94
|
+
export function parseCliHandoffTokenResponse(value) {
|
|
95
|
+
if (value == null || typeof value !== 'object')
|
|
96
|
+
return null;
|
|
97
|
+
const v = value;
|
|
98
|
+
if (typeof v.accessToken !== 'string' || v.accessToken.length === 0)
|
|
99
|
+
return null;
|
|
100
|
+
return {
|
|
101
|
+
accessToken: v.accessToken,
|
|
102
|
+
...(typeof v.accessExpiresAt === 'number' ? { accessExpiresAt: v.accessExpiresAt } : {}),
|
|
103
|
+
...(typeof v.serverUrl === 'string' ? { serverUrl: v.serverUrl } : {}),
|
|
104
|
+
};
|
|
105
|
+
}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* credentialSession.ts — the shared credential-lifecycle kernel (policy half).
|
|
3
|
+
*
|
|
4
|
+
* A credential lifecycle is policy × mechanism. The policy — serve a cached
|
|
5
|
+
* token until its expiry-skew window, collapse concurrent acquires onto one
|
|
6
|
+
* in-flight operation, invalidate on a resource-side 401 — is identical for
|
|
7
|
+
* every surface and was being re-implemented per consumer (task token-broker,
|
|
8
|
+
* delegated-cli redemption, the human CLI refresh path). The mechanism —
|
|
9
|
+
* WHERE the durable secret lives and HOW a token is acquired — legitimately
|
|
10
|
+
* differs (in-memory daemon family vs file+envelope+lock vs loopback redeem)
|
|
11
|
+
* and stays behind the `acquire` seam.
|
|
12
|
+
*
|
|
13
|
+
* Deliberately thin: no persistence, no retry policy, no logging. Callers
|
|
14
|
+
* own their store and their error surfaces; this owns the cache/single-
|
|
15
|
+
* flight/invalidate invariants so they cannot drift between surfaces.
|
|
16
|
+
*/
|
|
17
|
+
/** What an acquire returns. `expiresAtMs` absent means "no known expiry" —
|
|
18
|
+
* the token is served until `invalidate()` or an acquire replaces it. */
|
|
19
|
+
export interface AcquiredCredential {
|
|
20
|
+
accessToken: string;
|
|
21
|
+
/** Absolute expiry in ms since epoch, when the issuer tells us. */
|
|
22
|
+
expiresAtMs?: number;
|
|
23
|
+
}
|
|
24
|
+
export interface CredentialSessionOptions {
|
|
25
|
+
/**
|
|
26
|
+
* The mechanism. Called with `forceRefresh: true` when the caller asked to
|
|
27
|
+
* bypass the cache (the 401-recovery path) — implementations should renew
|
|
28
|
+
* rather than serve their own cache. A rejected promise propagates to every
|
|
29
|
+
* waiter and is never cached.
|
|
30
|
+
*/
|
|
31
|
+
acquire: (forceRefresh: boolean) => Promise<AcquiredCredential>;
|
|
32
|
+
/** Serve the cached token until this many ms before expiry. Default 30s. */
|
|
33
|
+
skewMs?: number;
|
|
34
|
+
/** Injectable clock for tests. */
|
|
35
|
+
now?: () => number;
|
|
36
|
+
}
|
|
37
|
+
export interface CredentialSession {
|
|
38
|
+
/**
|
|
39
|
+
* Resolves a usable access token: the cached one while it is inside its
|
|
40
|
+
* freshness window, otherwise a single shared acquire. `forceRefresh`
|
|
41
|
+
* discards the cache first (use after a resource 401).
|
|
42
|
+
*/
|
|
43
|
+
getToken(forceRefresh?: boolean): Promise<string>;
|
|
44
|
+
/** Drop the cached token; the next getToken() acquires. */
|
|
45
|
+
invalidate(): void;
|
|
46
|
+
}
|
|
47
|
+
export declare function createCredentialSession(opts: CredentialSessionOptions): CredentialSession;
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* credentialSession.ts — the shared credential-lifecycle kernel (policy half).
|
|
3
|
+
*
|
|
4
|
+
* A credential lifecycle is policy × mechanism. The policy — serve a cached
|
|
5
|
+
* token until its expiry-skew window, collapse concurrent acquires onto one
|
|
6
|
+
* in-flight operation, invalidate on a resource-side 401 — is identical for
|
|
7
|
+
* every surface and was being re-implemented per consumer (task token-broker,
|
|
8
|
+
* delegated-cli redemption, the human CLI refresh path). The mechanism —
|
|
9
|
+
* WHERE the durable secret lives and HOW a token is acquired — legitimately
|
|
10
|
+
* differs (in-memory daemon family vs file+envelope+lock vs loopback redeem)
|
|
11
|
+
* and stays behind the `acquire` seam.
|
|
12
|
+
*
|
|
13
|
+
* Deliberately thin: no persistence, no retry policy, no logging. Callers
|
|
14
|
+
* own their store and their error surfaces; this owns the cache/single-
|
|
15
|
+
* flight/invalidate invariants so they cannot drift between surfaces.
|
|
16
|
+
*/
|
|
17
|
+
const DEFAULT_SKEW_MS = 30_000;
|
|
18
|
+
export function createCredentialSession(opts) {
|
|
19
|
+
const skewMs = opts.skewMs ?? DEFAULT_SKEW_MS;
|
|
20
|
+
const now = opts.now ?? Date.now;
|
|
21
|
+
let cached = null;
|
|
22
|
+
let inFlight = null;
|
|
23
|
+
let inFlightForced = false;
|
|
24
|
+
// Monotonic generation so a superseded in-flight acquire (a forceRefresh
|
|
25
|
+
// launched while a plain acquire was still running) cannot write its stale
|
|
26
|
+
// result back over the newer one.
|
|
27
|
+
let generation = 0;
|
|
28
|
+
const fresh = (t) => t.expiresAtMs == null || now() < t.expiresAtMs - skewMs;
|
|
29
|
+
const acquireShared = (force) => {
|
|
30
|
+
// A forced acquire must not join a non-forced in-flight one — that would
|
|
31
|
+
// serve the very credential a 401 just invalidated. A forced in-flight
|
|
32
|
+
// DOES satisfy non-forced waiters: it is already renewing.
|
|
33
|
+
if (inFlight && (inFlightForced || !force))
|
|
34
|
+
return inFlight;
|
|
35
|
+
const gen = ++generation;
|
|
36
|
+
const p = opts.acquire(force).then((t) => {
|
|
37
|
+
if (gen === generation)
|
|
38
|
+
cached = t;
|
|
39
|
+
return t;
|
|
40
|
+
});
|
|
41
|
+
inFlight = p;
|
|
42
|
+
inFlightForced = force;
|
|
43
|
+
// `then(cleanup, cleanup)` not `.finally(cleanup)`: finally propagates the
|
|
44
|
+
// rejection into a derived promise nobody awaits — an unhandledRejection.
|
|
45
|
+
const cleanup = () => {
|
|
46
|
+
if (inFlight === p) {
|
|
47
|
+
inFlight = null;
|
|
48
|
+
inFlightForced = false;
|
|
49
|
+
}
|
|
50
|
+
};
|
|
51
|
+
p.then(cleanup, cleanup);
|
|
52
|
+
return p;
|
|
53
|
+
};
|
|
54
|
+
return {
|
|
55
|
+
async getToken(forceRefresh = false) {
|
|
56
|
+
if (forceRefresh)
|
|
57
|
+
cached = null;
|
|
58
|
+
if (cached && fresh(cached))
|
|
59
|
+
return cached.accessToken;
|
|
60
|
+
return (await acquireShared(forceRefresh)).accessToken;
|
|
61
|
+
},
|
|
62
|
+
invalidate() {
|
|
63
|
+
cached = null;
|
|
64
|
+
},
|
|
65
|
+
};
|
|
66
|
+
}
|
|
@@ -0,0 +1,109 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Server-attested tool approval (OSK-11975 follow-up to the `manual` mode
|
|
3
|
+
* refusal on `daemon:tool:request`).
|
|
4
|
+
*
|
|
5
|
+
* A daemon category in `manual` mode means "a PERSON approves each call". On
|
|
6
|
+
* the harness-session path the daemon asks through the permission bridge; on
|
|
7
|
+
* the daemon-tool path a cloud agent's call used to be refused outright,
|
|
8
|
+
* because the request carried no approval and there was no channel back to a
|
|
9
|
+
* person. The attested-approval protocol closes that gap without weakening
|
|
10
|
+
* the guarantee:
|
|
11
|
+
*
|
|
12
|
+
* 1. The daemon announces `daemon_tool_attested_approval_v1` and its
|
|
13
|
+
* resolved per-category posture (`toolPermissionModes`) at register time.
|
|
14
|
+
* 2. Before proxying a call, the server reads the announced posture for the
|
|
15
|
+
* tool's category. `manual` means it must ask first — through the same
|
|
16
|
+
* permission surface (`canUseTool` → `permission:request`) an in-process
|
|
17
|
+
* SDK turn would have used — and only then dispatch, carrying an
|
|
18
|
+
* `attestedApproval` object on the request.
|
|
19
|
+
* 3. The daemon verifies the attestation's SHAPE and BINDING — it is bound
|
|
20
|
+
* to this exact (toolUseId, toolName, toolInput digest) and expires
|
|
21
|
+
* quickly — and allows the call. A missing or malformed attestation gets
|
|
22
|
+
* the same named refusal as before.
|
|
23
|
+
*
|
|
24
|
+
* What the daemon verifies is the binding, not the server's honesty: the
|
|
25
|
+
* request already arrives over the daemon's authenticated server channel, so
|
|
26
|
+
* the field IS the attestation. What the binding buys is that the model —
|
|
27
|
+
* which authors `toolInput` — cannot mint an approval, and an approval for
|
|
28
|
+
* one call cannot be replayed onto another.
|
|
29
|
+
*/
|
|
30
|
+
/** Announced by a daemon that honours `attestedApproval` on daemon:tool:request. */
|
|
31
|
+
export declare const DAEMON_TOOL_ATTESTED_APPROVAL_CAPABILITY = "daemon_tool_attested_approval_v1";
|
|
32
|
+
/**
|
|
33
|
+
* Announced by a daemon that honours `toolPosture: 'read_only'` on
|
|
34
|
+
* daemon:tool:request — the daemon-tool-path expression of the wire `plan`
|
|
35
|
+
* session mode: reads run, every mutating category is refused with a named
|
|
36
|
+
* reason. Carries INTENT like `browserPolicy: 'read_only'` — the daemon owns
|
|
37
|
+
* what read-only means, so the server cannot widen the fence by shipping a
|
|
38
|
+
* wider value.
|
|
39
|
+
*/
|
|
40
|
+
export declare const DAEMON_TOOL_READ_ONLY_CAPABILITY = "daemon_tool_read_only_v1";
|
|
41
|
+
/**
|
|
42
|
+
* Tool categories the daemon recognizes for permission purposes. This is the
|
|
43
|
+
* wire vocabulary the daemon's announced `toolPermissionModes` is keyed on —
|
|
44
|
+
* shared so the server's pre-dispatch check and the daemon's own enforcement
|
|
45
|
+
* classify a tool name identically (a third map was exactly the drift this
|
|
46
|
+
* package exists to prevent).
|
|
47
|
+
*/
|
|
48
|
+
export type DaemonToolCategory = 'read' | 'write' | 'bash' | 'browser' | 'claude_session' | 'native_ui';
|
|
49
|
+
export declare const DAEMON_TOOL_CATEGORIES: readonly DaemonToolCategory[];
|
|
50
|
+
/** Map a tool name to its category. Unknown tools take the restrictive answer. */
|
|
51
|
+
export declare function categoryForDaemonTool(toolName: string): DaemonToolCategory;
|
|
52
|
+
/**
|
|
53
|
+
* The posture a daemon announces per category for the daemon-tool path:
|
|
54
|
+
* - `auto` — the call runs once guardrails pass; no attestation needed
|
|
55
|
+
* - `manual` — the call needs a person; the server must attach a fresh
|
|
56
|
+
* `attestedApproval` or the daemon refuses it
|
|
57
|
+
* - `delegated` — the category's own policy decides per action (browser,
|
|
58
|
+
* native UI); asking up front would ask the wrong question
|
|
59
|
+
*/
|
|
60
|
+
export type DaemonToolPathPosture = 'auto' | 'manual' | 'delegated';
|
|
61
|
+
export type DaemonToolPermissionModes = Readonly<Partial<Record<DaemonToolCategory, DaemonToolPathPosture>>>;
|
|
62
|
+
/** The wire field values `toolPosture` accepts. Unknown values must be ignored. */
|
|
63
|
+
export type DaemonToolPosture = 'read_only';
|
|
64
|
+
/**
|
|
65
|
+
* How long an attestation stays valid. Short: it answers ONE person, about
|
|
66
|
+
* THIS call, moments ago — it is not a standing grant. The server asks and
|
|
67
|
+
* dispatches back-to-back, so the window only has to outlive publish latency.
|
|
68
|
+
*/
|
|
69
|
+
export declare const ATTESTED_TOOL_APPROVAL_TTL_MS: number;
|
|
70
|
+
export interface AttestedToolApproval {
|
|
71
|
+
v: 1;
|
|
72
|
+
/** Binds the approval to this exact call — a different call gets nothing. */
|
|
73
|
+
toolUseId: string;
|
|
74
|
+
toolName: string;
|
|
75
|
+
/** SHA-256 of the canonical tool input (see `canonicalToolInputDigest`). */
|
|
76
|
+
inputSha256: string;
|
|
77
|
+
/** Who answered on the server's permission surface. */
|
|
78
|
+
decidedBy: 'user';
|
|
79
|
+
issuedAt: number;
|
|
80
|
+
expiresAt: number;
|
|
81
|
+
}
|
|
82
|
+
/** The digest both sides compute over `toolInput`. */
|
|
83
|
+
export declare function canonicalToolInputDigest(toolInput: unknown): string;
|
|
84
|
+
/** Server side: mint the attestation after a person approved THIS call. */
|
|
85
|
+
export declare function mintAttestedToolApproval(args: {
|
|
86
|
+
toolUseId: string;
|
|
87
|
+
toolName: string;
|
|
88
|
+
toolInput: unknown;
|
|
89
|
+
now?: number;
|
|
90
|
+
ttlMs?: number;
|
|
91
|
+
}): AttestedToolApproval;
|
|
92
|
+
export type AttestedToolApprovalVerdict = {
|
|
93
|
+
ok: true;
|
|
94
|
+
} | {
|
|
95
|
+
ok: false;
|
|
96
|
+
reason: 'absent' | 'malformed' | 'binding' | 'expired';
|
|
97
|
+
};
|
|
98
|
+
/**
|
|
99
|
+
* Daemon side: verify an attestation against the call it claims to approve.
|
|
100
|
+
* Untrusted wire input — every field is checked, and any mismatch is a plain
|
|
101
|
+
* "no approval", never a partial credit. `reason` is for daemon logs; the
|
|
102
|
+
* refusal text stays generic so a probing caller learns nothing new.
|
|
103
|
+
*/
|
|
104
|
+
export declare function verifyAttestedToolApproval(approval: unknown, call: {
|
|
105
|
+
toolUseId: string;
|
|
106
|
+
toolName: string;
|
|
107
|
+
toolInput: unknown;
|
|
108
|
+
now?: number;
|
|
109
|
+
}): AttestedToolApprovalVerdict;
|