@kodycodes/cli 1.16.5 → 1.18.0
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 +18 -4
- package/dist/auth.d.ts +41 -1
- package/dist/auth.js +179 -25
- package/dist/auth.js.map +1 -1
- package/dist/capability-proxy.d.ts +7 -0
- package/dist/capability-proxy.js +8 -2
- package/dist/capability-proxy.js.map +1 -1
- package/dist/cli.d.ts +3 -1
- package/dist/cli.js +127 -32
- package/dist/cli.js.map +1 -1
- package/dist/discover-login-identity.d.ts +18 -0
- package/dist/discover-login-identity.js +77 -0
- package/dist/discover-login-identity.js.map +1 -0
- package/dist/discover-org.d.ts +10 -0
- package/dist/discover-org.js +62 -0
- package/dist/discover-org.js.map +1 -0
- package/dist/help.d.ts +13 -1
- package/dist/help.js +75 -12
- package/dist/help.js.map +1 -1
- package/dist/local-execute-auth.d.ts +1 -0
- package/dist/local-execute-auth.js +7 -1
- package/dist/local-execute-auth.js.map +1 -1
- package/dist/local-execute.d.ts +2 -0
- package/dist/local-execute.js +6 -1
- package/dist/local-execute.js.map +1 -1
- package/dist/local-package-graph.js +2 -0
- package/dist/local-package-graph.js.map +1 -1
- package/dist/login-callback-assets.d.ts +9 -0
- package/dist/login-callback-assets.js +10 -0
- package/dist/login-callback-assets.js.map +1 -0
- package/dist/login-callback-page.d.ts +21 -0
- package/dist/login-callback-page.js +362 -0
- package/dist/login-callback-page.js.map +1 -0
- package/dist/mcp.d.ts +4 -0
- package/dist/mcp.js +3 -0
- package/dist/mcp.js.map +1 -1
- package/dist/oauth-provider.d.ts +1 -2
- package/dist/oauth-provider.js +2 -8
- package/dist/oauth-provider.js.map +1 -1
- package/dist/open-api-client.d.ts +5 -0
- package/dist/open-api-client.js +4 -0
- package/dist/open-api-client.js.map +1 -1
- package/dist/org-resolve.d.ts +9 -0
- package/dist/org-resolve.js +16 -0
- package/dist/org-resolve.js.map +1 -0
- package/dist/org-slug.d.ts +4 -0
- package/dist/org-slug.js +11 -0
- package/dist/org-slug.js.map +1 -0
- package/dist/org.d.ts +22 -0
- package/dist/org.js +100 -0
- package/dist/org.js.map +1 -0
- package/dist/remote-execute.d.ts +2 -0
- package/dist/remote-execute.js +6 -1
- package/dist/remote-execute.js.map +1 -1
- package/dist/store.d.ts +93 -3
- package/dist/store.js +454 -23
- package/dist/store.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -48,20 +48,34 @@ MCP connection.
|
|
|
48
48
|
|
|
49
49
|
```bash
|
|
50
50
|
npm install -g @kodycodes/cli
|
|
51
|
-
kody login
|
|
52
|
-
kody login --org acme
|
|
51
|
+
kody login # browser picks the org; adds that org login
|
|
52
|
+
kody login --org acme # bind / replace the acme login; other orgs stay
|
|
53
|
+
kody org list # show logged-in orgs (* = active)
|
|
54
|
+
kody org use beta # switch active org (agents); bare `org use` opens a TTY chooser
|
|
55
|
+
kody execute --org acme … # one-shot org override (also: KODY_ORG=acme)
|
|
53
56
|
```
|
|
54
57
|
|
|
55
58
|
Or run via `npx @kodycodes/cli` without a global install.
|
|
56
59
|
|
|
60
|
+
Each `kody login` adds an org (chosen in the browser, or via `--org`). Re-logging
|
|
61
|
+
into an org that is already stored replaces only that org's credential. Org-scoped
|
|
62
|
+
commands (`execute`, `search`, `whoami`, `api`, …) take `--org <slug>` or
|
|
63
|
+
`KODY_ORG` (flag wins, then env, then the active org). `kody logout` removes the
|
|
64
|
+
active org; `kody logout --org <slug>` removes one org. Git auth stays user-wide
|
|
65
|
+
(`kody auth setup-git` once covers every repo across orgs). Existing single-org
|
|
66
|
+
keychain credentials migrate silently into the multi-org store as the active org
|
|
67
|
+
(no re-login).
|
|
68
|
+
|
|
57
69
|
## Commands
|
|
58
70
|
|
|
59
71
|
| Command | Purpose |
|
|
60
72
|
| --- | --- |
|
|
61
73
|
| `kody install` | Detect running local MCP clients, write their config, and start host OAuth. **Recommended long-term path.** |
|
|
62
74
|
| `kody skill install` | Copies the getting-started skill into Claude Code / Cursor / Agents. |
|
|
63
|
-
| `kody login` | Browser OAuth (CIMD + PKCE) for the CLI itself.
|
|
64
|
-
| `kody
|
|
75
|
+
| `kody login` | Browser OAuth (CIMD + PKCE) for the CLI itself. Adds/replaces one org login (browser picker, or `kody login --org acme`) and keeps other org logins. |
|
|
76
|
+
| `kody org list` | Lists logged-in orgs and marks the active one. `--json` for agents. |
|
|
77
|
+
| `kody org use [<slug>]` | Switches the active org. With a slug (agents) switches directly; with no slug on a TTY opens a chooser; without a TTY pass a slug. |
|
|
78
|
+
| `kody logout` | Removes the active org login (or `--org <slug>` for one org) and clears a stored bootstrap/API token when appropriate. |
|
|
65
79
|
| `kody status` | Shows CLI login / stored API token state without printing secrets. |
|
|
66
80
|
| `kody auth bootstrap --code` | Redeems a one-shot `kody_bc_…` from MCP `cliCredentialBootstrap` and stores the resulting `kody_at_…` for `execute --local` (never prints the token). |
|
|
67
81
|
| `kody auth bootstrap --scopes` | Opt-in extra scopes: mints the code itself by passing `scopes` to `cliCredentialBootstrap` (with `--token`, else the `kody login` session, else a stored token), then redeems and stores it. See [Opt-in scopes](#opt-in-scopes). |
|
package/dist/auth.d.ts
CHANGED
|
@@ -1,15 +1,28 @@
|
|
|
1
1
|
import { type OAuthClientInformationMixed, type OAuthTokens } from '@modelcontextprotocol/client';
|
|
2
|
-
import { type
|
|
2
|
+
import { type LoginIdentity } from './discover-login-identity.js';
|
|
3
|
+
import { type LoginCallbackAccount } from './login-callback-page.js';
|
|
4
|
+
import { type SecretBackend, type StoreResolution, type StoredCredentials } from './store.js';
|
|
3
5
|
export type LoginOptions = {
|
|
4
6
|
mcpUrl?: string;
|
|
5
7
|
/** Organization slug. Omit to let the server bind the sole or signup org. */
|
|
6
8
|
org?: string;
|
|
7
9
|
openBrowser?: boolean;
|
|
8
10
|
backend?: SecretBackend;
|
|
11
|
+
resolution?: StoreResolution;
|
|
9
12
|
timeoutMs?: number;
|
|
10
13
|
now?: () => number;
|
|
11
14
|
fetchFn?: typeof fetch;
|
|
12
15
|
onAuthorizationUrl?: (url: URL) => void;
|
|
16
|
+
/**
|
|
17
|
+
* Test seam: resolve org + account after the code exchange so the localhost
|
|
18
|
+
* callback page can show them (and multi-org storage can name the login).
|
|
19
|
+
* Defaults to `metaGetCurrentUser` via {@link discoverLoginIdentity}.
|
|
20
|
+
*/
|
|
21
|
+
discoverIdentity?: (input: {
|
|
22
|
+
mcpUrl: string;
|
|
23
|
+
accessToken: string;
|
|
24
|
+
fetchFn?: typeof fetch;
|
|
25
|
+
}) => Promise<LoginIdentity>;
|
|
13
26
|
};
|
|
14
27
|
export declare function isAccessTokenExpired(credentials: StoredCredentials, now?: number): boolean;
|
|
15
28
|
export declare function credentialsFromTokens(input: {
|
|
@@ -19,23 +32,50 @@ export declare function credentialsFromTokens(input: {
|
|
|
19
32
|
client: OAuthClientInformationMixed;
|
|
20
33
|
tokens: OAuthTokens;
|
|
21
34
|
previous?: StoredCredentials;
|
|
35
|
+
org?: string;
|
|
22
36
|
now?: number;
|
|
23
37
|
}): StoredCredentials;
|
|
24
38
|
export declare function refreshStoredCredentials(input: {
|
|
25
39
|
credentials: StoredCredentials;
|
|
26
40
|
backend?: SecretBackend;
|
|
41
|
+
resolution?: StoreResolution;
|
|
27
42
|
now?: number;
|
|
28
43
|
fetchFn?: typeof fetch;
|
|
29
44
|
}): Promise<StoredCredentials>;
|
|
45
|
+
/**
|
|
46
|
+
* Finish silent v1→multi-org migration when a pending session has no slug yet.
|
|
47
|
+
* Best-effort: failures leave pending in place so commands still work.
|
|
48
|
+
*/
|
|
49
|
+
export declare function resolvePendingOrgSlug(input: {
|
|
50
|
+
mcpUrl?: string;
|
|
51
|
+
backend?: SecretBackend;
|
|
52
|
+
resolution?: StoreResolution;
|
|
53
|
+
now?: number;
|
|
54
|
+
fetchFn?: typeof fetch;
|
|
55
|
+
discoverOrg?: (input: {
|
|
56
|
+
mcpUrl: string;
|
|
57
|
+
accessToken: string;
|
|
58
|
+
fetchFn?: typeof fetch;
|
|
59
|
+
}) => Promise<string>;
|
|
60
|
+
}): Promise<string | null>;
|
|
30
61
|
export declare function ensureFreshCredentials(input: {
|
|
31
62
|
mcpUrl?: string;
|
|
63
|
+
org?: string;
|
|
32
64
|
backend?: SecretBackend;
|
|
65
|
+
resolution?: StoreResolution;
|
|
33
66
|
now?: number;
|
|
34
67
|
fetchFn?: typeof fetch;
|
|
68
|
+
discoverOrg?: (input: {
|
|
69
|
+
mcpUrl: string;
|
|
70
|
+
accessToken: string;
|
|
71
|
+
fetchFn?: typeof fetch;
|
|
72
|
+
}) => Promise<string>;
|
|
35
73
|
}): Promise<StoredCredentials>;
|
|
36
74
|
export declare function login(options?: LoginOptions): Promise<{
|
|
37
75
|
credentials: StoredCredentials;
|
|
38
76
|
authorizationUrl: URL;
|
|
39
77
|
backendKind: 'keyring' | 'file';
|
|
40
78
|
backendPath?: string;
|
|
79
|
+
org?: string;
|
|
80
|
+
account?: LoginCallbackAccount;
|
|
41
81
|
}>;
|
package/dist/auth.js
CHANGED
|
@@ -2,9 +2,12 @@ import { createServer, } from 'node:http';
|
|
|
2
2
|
import { auth, } from '@modelcontextprotocol/client';
|
|
3
3
|
import { missingCliAuthMessage } from './api-token.js';
|
|
4
4
|
import { accessTokenSkewMs, cliRedirectUrl, defaultMcpUrl, defaultScopes, loginTimeoutMs, } from './defaults.js';
|
|
5
|
+
import { discoverLoginIdentity, } from './discover-login-identity.js';
|
|
6
|
+
import { discoverOrgSlugFromAccessToken } from './discover-org.js';
|
|
7
|
+
import { loginCallbackErrorFromOAuthError, renderLoginCallbackPage, } from './login-callback-page.js';
|
|
5
8
|
import { createCliOAuthProvider, orgSlugFromFlag } from './oauth-provider.js';
|
|
6
9
|
import { redactError } from './redact.js';
|
|
7
|
-
import { loadCredentials, saveCredentials, } from './store.js';
|
|
10
|
+
import { loadCredentialStore, loadCredentials, loadPendingCredentials, promotePendingOrg, saveCredentials, } from './store.js';
|
|
8
11
|
export function isAccessTokenExpired(credentials, now = Date.now()) {
|
|
9
12
|
if (!credentials.expiresAt)
|
|
10
13
|
return false;
|
|
@@ -15,9 +18,11 @@ export function credentialsFromTokens(input) {
|
|
|
15
18
|
const expiresAt = typeof input.tokens.expires_in === 'number'
|
|
16
19
|
? now + input.tokens.expires_in * 1000
|
|
17
20
|
: input.previous?.expiresAt;
|
|
21
|
+
const org = input.org ?? input.previous?.org;
|
|
18
22
|
return {
|
|
19
23
|
version: 1,
|
|
20
24
|
mcpUrl: input.mcpUrl,
|
|
25
|
+
...(org ? { org } : {}),
|
|
21
26
|
resource: input.resource,
|
|
22
27
|
authorizationServerUrl: input.authorizationServerUrl,
|
|
23
28
|
clientId: input.client.client_id,
|
|
@@ -50,9 +55,12 @@ async function persistAuthorizedSession(input) {
|
|
|
50
55
|
client,
|
|
51
56
|
tokens,
|
|
52
57
|
previous: input.previous,
|
|
58
|
+
org: input.org ?? input.previous?.org,
|
|
53
59
|
now: input.now,
|
|
54
60
|
});
|
|
55
|
-
const saved = saveCredentials(credentials, input.backend
|
|
61
|
+
const saved = saveCredentials(credentials, input.backend, input.resolution, {
|
|
62
|
+
activate: input.activate !== false,
|
|
63
|
+
});
|
|
56
64
|
return { credentials, saved };
|
|
57
65
|
}
|
|
58
66
|
export async function refreshStoredCredentials(input) {
|
|
@@ -80,15 +88,74 @@ export async function refreshStoredCredentials(input) {
|
|
|
80
88
|
mcpUrl: credentials.mcpUrl,
|
|
81
89
|
provider,
|
|
82
90
|
backend: input.backend,
|
|
91
|
+
resolution: input.resolution,
|
|
83
92
|
previous: credentials,
|
|
93
|
+
org: credentials.org,
|
|
84
94
|
now: input.now,
|
|
95
|
+
// Do not steal activeOrg during a one-shot `--org` / KODY_ORG refresh.
|
|
96
|
+
activate: false,
|
|
85
97
|
});
|
|
86
98
|
return next;
|
|
87
99
|
}
|
|
100
|
+
/**
|
|
101
|
+
* Finish silent v1→multi-org migration when a pending session has no slug yet.
|
|
102
|
+
* Best-effort: failures leave pending in place so commands still work.
|
|
103
|
+
*/
|
|
104
|
+
export async function resolvePendingOrgSlug(input) {
|
|
105
|
+
const mcpUrl = input.mcpUrl ?? defaultMcpUrl;
|
|
106
|
+
const snapshot = loadCredentialStore(mcpUrl, input.backend, input.resolution);
|
|
107
|
+
if (!snapshot?.pending)
|
|
108
|
+
return snapshot?.activeOrg ?? null;
|
|
109
|
+
let pending = loadPendingCredentials(mcpUrl, input.backend, input.resolution);
|
|
110
|
+
if (!pending)
|
|
111
|
+
return snapshot.activeOrg ?? null;
|
|
112
|
+
if (isAccessTokenExpired(pending, input.now)) {
|
|
113
|
+
if (!pending.refreshToken)
|
|
114
|
+
return null;
|
|
115
|
+
try {
|
|
116
|
+
pending = await refreshStoredCredentials({
|
|
117
|
+
credentials: pending,
|
|
118
|
+
backend: input.backend,
|
|
119
|
+
resolution: input.resolution,
|
|
120
|
+
now: input.now,
|
|
121
|
+
fetchFn: input.fetchFn,
|
|
122
|
+
});
|
|
123
|
+
}
|
|
124
|
+
catch {
|
|
125
|
+
return null;
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
const discover = input.discoverOrg ?? discoverOrgSlugFromAccessToken;
|
|
129
|
+
try {
|
|
130
|
+
const slug = await discover({
|
|
131
|
+
mcpUrl,
|
|
132
|
+
accessToken: pending.accessToken,
|
|
133
|
+
fetchFn: input.fetchFn,
|
|
134
|
+
});
|
|
135
|
+
promotePendingOrg(mcpUrl, slug, input.backend, input.resolution);
|
|
136
|
+
return slug;
|
|
137
|
+
}
|
|
138
|
+
catch {
|
|
139
|
+
return null;
|
|
140
|
+
}
|
|
141
|
+
}
|
|
88
142
|
export async function ensureFreshCredentials(input) {
|
|
89
143
|
const mcpUrl = input.mcpUrl ?? defaultMcpUrl;
|
|
90
|
-
|
|
144
|
+
await resolvePendingOrgSlug({
|
|
145
|
+
mcpUrl,
|
|
146
|
+
backend: input.backend,
|
|
147
|
+
resolution: input.resolution,
|
|
148
|
+
now: input.now,
|
|
149
|
+
fetchFn: input.fetchFn,
|
|
150
|
+
discoverOrg: input.discoverOrg,
|
|
151
|
+
});
|
|
152
|
+
const credentials = loadCredentials(mcpUrl, input.backend, input.resolution, {
|
|
153
|
+
org: input.org,
|
|
154
|
+
});
|
|
91
155
|
if (!credentials) {
|
|
156
|
+
if (input.org) {
|
|
157
|
+
throw new Error(`No login stored for org "${input.org}". Run \`kody login --org ${input.org}\` (or \`kody org use ${input.org}\` after logging in).`);
|
|
158
|
+
}
|
|
92
159
|
throw new Error(missingCliAuthMessage());
|
|
93
160
|
}
|
|
94
161
|
if (!isAccessTokenExpired(credentials, input.now)) {
|
|
@@ -97,6 +164,7 @@ export async function ensureFreshCredentials(input) {
|
|
|
97
164
|
return await refreshStoredCredentials({
|
|
98
165
|
credentials,
|
|
99
166
|
backend: input.backend,
|
|
167
|
+
resolution: input.resolution,
|
|
100
168
|
now: input.now,
|
|
101
169
|
fetchFn: input.fetchFn,
|
|
102
170
|
});
|
|
@@ -115,18 +183,45 @@ function startCallbackServer(redirectUri) {
|
|
|
115
183
|
});
|
|
116
184
|
});
|
|
117
185
|
}
|
|
186
|
+
function sendCallbackHtml(response, status, page) {
|
|
187
|
+
if (response.headersSent)
|
|
188
|
+
return;
|
|
189
|
+
response.writeHead(status, {
|
|
190
|
+
'Content-Type': 'text/html; charset=utf-8',
|
|
191
|
+
'Cache-Control': 'no-store',
|
|
192
|
+
});
|
|
193
|
+
response.end(renderLoginCallbackPage(page));
|
|
194
|
+
}
|
|
118
195
|
function waitForCallback(input) {
|
|
119
196
|
return new Promise((resolve, reject) => {
|
|
120
|
-
|
|
121
|
-
|
|
197
|
+
let settled = false;
|
|
198
|
+
let pendingResponse;
|
|
199
|
+
const closeServer = () => {
|
|
122
200
|
input.server.close();
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
201
|
+
};
|
|
202
|
+
const rejectOnce = (error) => {
|
|
203
|
+
if (settled)
|
|
204
|
+
return;
|
|
205
|
+
settled = true;
|
|
206
|
+
clearTimeout(timer);
|
|
207
|
+
closeServer();
|
|
208
|
+
reject(error);
|
|
209
|
+
};
|
|
210
|
+
const resolveOnce = (result) => {
|
|
211
|
+
if (settled)
|
|
212
|
+
return;
|
|
213
|
+
settled = true;
|
|
214
|
+
clearTimeout(timer);
|
|
215
|
+
resolve(result);
|
|
127
216
|
};
|
|
128
217
|
const timer = setTimeout(() => {
|
|
129
|
-
|
|
218
|
+
if (pendingResponse && !pendingResponse.headersSent) {
|
|
219
|
+
sendCallbackHtml(pendingResponse, 408, {
|
|
220
|
+
kind: 'error',
|
|
221
|
+
error: 'expired',
|
|
222
|
+
});
|
|
223
|
+
}
|
|
224
|
+
rejectOnce(new Error('Timed out waiting for the browser login.'));
|
|
130
225
|
}, input.timeoutMs);
|
|
131
226
|
input.server.on('request', (request, response) => {
|
|
132
227
|
try {
|
|
@@ -138,36 +233,41 @@ function waitForCallback(input) {
|
|
|
138
233
|
const error = url.searchParams.get('error');
|
|
139
234
|
if (error) {
|
|
140
235
|
const description = url.searchParams.get('error_description') ?? '';
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
finish(new Error(description || error));
|
|
236
|
+
const kind = loginCallbackErrorFromOAuthError(error);
|
|
237
|
+
sendCallbackHtml(response, 400, { kind: 'error', error: kind });
|
|
238
|
+
rejectOnce(new Error(description || error));
|
|
145
239
|
return;
|
|
146
240
|
}
|
|
147
241
|
const state = url.searchParams.get('state');
|
|
148
242
|
const code = url.searchParams.get('code');
|
|
149
243
|
const iss = url.searchParams.get('iss') ?? undefined;
|
|
150
244
|
if (state !== input.expectedState || !code) {
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
245
|
+
const kind = state && state !== input.expectedState
|
|
246
|
+
? 'state_mismatch'
|
|
247
|
+
: 'failed';
|
|
248
|
+
sendCallbackHtml(response, 400, { kind: 'error', error: kind });
|
|
249
|
+
rejectOnce(new Error('OAuth callback missing code or state.'));
|
|
155
250
|
return;
|
|
156
251
|
}
|
|
157
|
-
response
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
252
|
+
pendingResponse = response;
|
|
253
|
+
resolveOnce({
|
|
254
|
+
code,
|
|
255
|
+
...(iss ? { iss } : {}),
|
|
256
|
+
complete(page) {
|
|
257
|
+
sendCallbackHtml(response, page.kind === 'success' ? 200 : 400, page);
|
|
258
|
+
closeServer();
|
|
259
|
+
},
|
|
260
|
+
});
|
|
161
261
|
}
|
|
162
262
|
catch (error) {
|
|
163
|
-
|
|
263
|
+
rejectOnce(redactError(error));
|
|
164
264
|
}
|
|
165
265
|
});
|
|
166
266
|
});
|
|
167
267
|
}
|
|
168
268
|
export async function login(options = {}) {
|
|
169
269
|
const mcpUrl = options.mcpUrl ?? defaultMcpUrl;
|
|
170
|
-
const
|
|
270
|
+
const orgHint = options.org === undefined ? undefined : orgSlugFromFlag(options.org);
|
|
171
271
|
const redirectUri = cliRedirectUrl();
|
|
172
272
|
const expectedState = crypto.randomUUID();
|
|
173
273
|
const server = await startCallbackServer(redirectUri);
|
|
@@ -178,12 +278,13 @@ export async function login(options = {}) {
|
|
|
178
278
|
loadStoredTokens: false,
|
|
179
279
|
openBrowser: options.openBrowser !== false,
|
|
180
280
|
expectedState,
|
|
181
|
-
...(
|
|
281
|
+
...(orgHint ? { org: orgHint } : {}),
|
|
182
282
|
onAuthorizationUrl: (url) => {
|
|
183
283
|
authorizationUrl = url;
|
|
184
284
|
options.onAuthorizationUrl?.(url);
|
|
185
285
|
},
|
|
186
286
|
});
|
|
287
|
+
let completeCallback;
|
|
187
288
|
try {
|
|
188
289
|
const first = await auth(provider, {
|
|
189
290
|
serverUrl: mcpUrl,
|
|
@@ -197,6 +298,7 @@ export async function login(options = {}) {
|
|
|
197
298
|
expectedState,
|
|
198
299
|
timeoutMs: options.timeoutMs ?? loginTimeoutMs,
|
|
199
300
|
});
|
|
301
|
+
completeCallback = callback.complete;
|
|
200
302
|
const exchanged = await auth(provider, {
|
|
201
303
|
serverUrl: mcpUrl,
|
|
202
304
|
authorizationCode: callback.code,
|
|
@@ -205,26 +307,78 @@ export async function login(options = {}) {
|
|
|
205
307
|
fetchFn: options.fetchFn,
|
|
206
308
|
});
|
|
207
309
|
if (exchanged !== 'AUTHORIZED') {
|
|
310
|
+
completeCallback({ kind: 'error', error: 'failed' });
|
|
311
|
+
completeCallback = undefined;
|
|
208
312
|
throw new Error('OAuth redirect completed without tokens.');
|
|
209
313
|
}
|
|
210
314
|
}
|
|
211
315
|
else {
|
|
212
316
|
server.close();
|
|
213
317
|
}
|
|
318
|
+
const tokens = await provider.tokens();
|
|
319
|
+
if (!tokens?.access_token) {
|
|
320
|
+
throw new Error('OAuth completed without tokens. Run `kody login`.');
|
|
321
|
+
}
|
|
322
|
+
let org = orgHint;
|
|
323
|
+
let account;
|
|
324
|
+
const discover = options.discoverIdentity ?? discoverLoginIdentity;
|
|
325
|
+
try {
|
|
326
|
+
const identity = await discover({
|
|
327
|
+
mcpUrl,
|
|
328
|
+
accessToken: tokens.access_token,
|
|
329
|
+
fetchFn: options.fetchFn,
|
|
330
|
+
});
|
|
331
|
+
if (orgHint && identity.org !== orgHint) {
|
|
332
|
+
completeCallback?.({ kind: 'error', error: 'failed' });
|
|
333
|
+
completeCallback = undefined;
|
|
334
|
+
throw new Error(`Login was bound to org "${identity.org}" but \`--org ${orgHint}\` was requested.`);
|
|
335
|
+
}
|
|
336
|
+
org = identity.org;
|
|
337
|
+
account = identity.account;
|
|
338
|
+
}
|
|
339
|
+
catch (error) {
|
|
340
|
+
// Org mismatch always fails. Soft-fail other discovery errors only
|
|
341
|
+
// when we can still name the login (--org) or park a sole pending
|
|
342
|
+
// migration (no named orgs yet). Otherwise a nameless pending
|
|
343
|
+
// beside existing orgs would never become active.
|
|
344
|
+
if (error instanceof Error &&
|
|
345
|
+
error.message.startsWith('Login was bound to org ')) {
|
|
346
|
+
throw error;
|
|
347
|
+
}
|
|
348
|
+
if (!orgHint) {
|
|
349
|
+
const existing = loadCredentialStore(mcpUrl, options.backend, options.resolution);
|
|
350
|
+
if (existing && Object.keys(existing.orgs).length > 0) {
|
|
351
|
+
completeCallback?.({ kind: 'error', error: 'failed' });
|
|
352
|
+
completeCallback = undefined;
|
|
353
|
+
throw new Error('Could not determine the organization for this login. Re-run with `kody login --org <slug>`.');
|
|
354
|
+
}
|
|
355
|
+
}
|
|
356
|
+
}
|
|
214
357
|
const { credentials, saved } = await persistAuthorizedSession({
|
|
215
358
|
mcpUrl,
|
|
216
359
|
provider,
|
|
217
360
|
backend: options.backend,
|
|
361
|
+
resolution: options.resolution,
|
|
362
|
+
org,
|
|
218
363
|
now: options.now?.(),
|
|
219
364
|
});
|
|
365
|
+
completeCallback?.({
|
|
366
|
+
kind: 'success',
|
|
367
|
+
...(org ? { org } : {}),
|
|
368
|
+
...(account ? { account } : {}),
|
|
369
|
+
});
|
|
370
|
+
completeCallback = undefined;
|
|
220
371
|
return {
|
|
221
372
|
credentials,
|
|
222
373
|
authorizationUrl,
|
|
223
374
|
backendKind: saved.backend.kind,
|
|
224
375
|
backendPath: saved.backend.path,
|
|
376
|
+
...(org ? { org } : {}),
|
|
377
|
+
...(account ? { account } : {}),
|
|
225
378
|
};
|
|
226
379
|
}
|
|
227
380
|
catch (error) {
|
|
381
|
+
completeCallback?.({ kind: 'error', error: 'failed' });
|
|
228
382
|
server.close();
|
|
229
383
|
throw redactError(error);
|
|
230
384
|
}
|
package/dist/auth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -78,6 +78,11 @@ export type CapabilityProxyClientInput = {
|
|
|
78
78
|
/** Defaults to the shared `createCapabilityProxyFetch()` sender. */
|
|
79
79
|
fetchFn?: typeof fetch;
|
|
80
80
|
signal?: AbortSignal;
|
|
81
|
+
/**
|
|
82
|
+
* User-owned API token org selection (ADR 0070). Appended as `?org=<slug>`
|
|
83
|
+
* on CapabilityProxy / package-graph requests.
|
|
84
|
+
*/
|
|
85
|
+
org?: string;
|
|
81
86
|
};
|
|
82
87
|
export declare class CapabilityProxyError extends Error {
|
|
83
88
|
readonly status: number | null;
|
|
@@ -90,6 +95,8 @@ export declare class CapabilityProxyError extends Error {
|
|
|
90
95
|
/** The bearer token must not cross the network in cleartext. */
|
|
91
96
|
export declare function assertTokenSafeApiUrl(apiUrl: string): void;
|
|
92
97
|
export declare function capabilityProxyUrl(apiUrl: string, path: string): URL;
|
|
98
|
+
/** Attach `?org=` for user-owned tokens without clobbering other query params. */
|
|
99
|
+
export declare function withOrgQuery(url: URL, org?: string): URL;
|
|
93
100
|
export declare function openCapabilityProxySession(input: CapabilityProxyClientInput): Promise<CapabilityProxySession>;
|
|
94
101
|
export declare function callCapabilityProxy(input: CapabilityProxyClientInput & CapabilityProxyCall): Promise<unknown>;
|
|
95
102
|
/**
|
package/dist/capability-proxy.js
CHANGED
|
@@ -226,8 +226,14 @@ export function capabilityProxyUrl(apiUrl, path) {
|
|
|
226
226
|
const base = apiUrl.endsWith('/') ? apiUrl : `${apiUrl}/`;
|
|
227
227
|
return new URL(path, base);
|
|
228
228
|
}
|
|
229
|
+
/** Attach `?org=` for user-owned tokens without clobbering other query params. */
|
|
230
|
+
export function withOrgQuery(url, org) {
|
|
231
|
+
if (org)
|
|
232
|
+
url.searchParams.set('org', org);
|
|
233
|
+
return url;
|
|
234
|
+
}
|
|
229
235
|
export async function openCapabilityProxySession(input) {
|
|
230
|
-
const url = capabilityProxyUrl(input.apiUrl, capabilityProxySessionPath);
|
|
236
|
+
const url = withOrgQuery(capabilityProxyUrl(input.apiUrl, capabilityProxySessionPath), input.org);
|
|
231
237
|
const response = await send(input, url, { method: 'GET' });
|
|
232
238
|
const body = await readJson(response);
|
|
233
239
|
if (!response.ok) {
|
|
@@ -245,7 +251,7 @@ export async function openCapabilityProxySession(input) {
|
|
|
245
251
|
};
|
|
246
252
|
}
|
|
247
253
|
export async function callCapabilityProxy(input) {
|
|
248
|
-
const url = capabilityProxyUrl(input.apiUrl, capabilityProxyCallPath);
|
|
254
|
+
const url = withOrgQuery(capabilityProxyUrl(input.apiUrl, capabilityProxyCallPath), input.org);
|
|
249
255
|
const payload = { path: input.path, args: input.args };
|
|
250
256
|
if (input.conversationId !== undefined)
|
|
251
257
|
payload.conversationId = input.conversationId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capability-proxy.js","sourceRoot":"","sources":["../src/capability-proxy.ts"],"names":[],"mappings":"AAEA,OAAO,EACN,wBAAwB,EACxB,wBAAwB,EACxB,sBAAsB,EACtB,wBAAwB,EACxB,4BAA4B,EAC5B,gBAAgB,EAChB,0BAA0B,GAC1B,MAAM,gBAAgB,CAAA;AACvB,OAAO,EACN,2BAA2B,GAE3B,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAA;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAEtD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG,6BAA6B,CAAA;AACvE,MAAM,CAAC,MAAM,uBAAuB,GAAG,0BAA0B,CAAA;AAEjE;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,gCAAgC,GAAG,CAAC,GAAG,MAAM,CAAA;AAC1D,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,GAAG,MAAM,CAAA;AACtD,kFAAkF;AAClF,MAAM,CAAC,MAAM,+BAA+B,GAAG,MAAM,CAAA;AAErD;;;;;GAKG;AACH,MAAM,UAAU,gBAAgB,CAC/B,MAAyB,OAAO,CAAC,GAAG,EACpC,WAAkC,OAAO,CAAC,QAAQ;IAElD,IAAI,GAAG,CAAC,kBAAkB,KAAK,GAAG;QAAE,OAAO,IAAI,CAAA;IAC/C,MAAM,KAAK,GAAG,CAAC,GAAG,QAAQ,EAAE,GAAG,CAAC,GAAG,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAA;IACrE,OAAO,KAAK,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAA;AACzC,CAAC;AAED,4FAA4F;AAC5F,MAAM,wBAAwB,GAA2B,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAA;AAE1E,MAAM,UAAU,uBAAuB,CAAC,UAAkB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAC9E,MAAM,CAAC,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IAC7D,MAAM,YAAY,GAAG,wBAAwB,CAAC,KAAK,CAAC,CAAA;IACpD,IAAI,YAAY,KAAK,SAAS;QAAE,OAAO,KAAK,GAAG,EAAE,CAAA;IACjD,OAAO,KAAK,IAAI,YAAY,CAAA;AAC7B,CAAC;AAUD;;;;;GAKG;AACH,MAAM,UAAU,0BAA0B,CACzC,UAAuC,EAAE;IAEzC,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,4BAA4B,CAAA;IACnE,MAAM,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,IAAI,+BAA+B,CAAA;IACpF,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,gBAAgB,EAAE,CAAA;IAC7D,IAAI,WAAW,IAAI,CAAC,uBAAuB,EAAE,EAAE,CAAC;QAC/C,MAAM,IAAI,KAAK,CACd,QAAQ,OAAO,CAAC,OAAO,4LAA4L,CACnN,CAAA;IACF,CAAC;IACD,IAAI,UAAU,GAA+B,IAAI,CAAA;IACjD,OAAO,KAAK,EAAE,KAAK,EAAE,IAAI,GAAG,EAAE,EAAE,EAAE;QACjC,MAAM,GAAG,GAAG,KAAK,YAAY,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,KAAK,YAAY,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;QAChG,+FAA+F;QAC/F,UAAU,KAAK,cAAc,CAAC,WAAW,CAAC,CAAA;QAC1C,MAAM,SAAS,GAAG,CAAC,MAAM,UAAU,CAAC,CAAC,GAAG,CAAC,QAA4B,CAAC,CAAA;QACtE,IAAI,CAAC,SAAS,EAAE,CAAC;YAChB,MAAM,IAAI,SAAS,CAAC,0CAA0C,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC9E,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;QACtB,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YACrE,MAAM,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAA;QACpE,CAAC;QACD,OAAO,IAAI,OAAO,CAAW,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAChD,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAChC,GAAG,EACH;gBACC,KAAK,EAAE,SAAS,CAAC,KAAK;gBACtB,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,KAAK;gBAC5B,OAAO,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aACtD,EACD,CAAC,QAAQ,EAAE,EAAE;gBACZ,YAAY,CAAC,YAAY,CAAC,CAAA;gBAC1B,MAAM,MAAM,GAAkB,EAAE,CAAA;gBAChC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;gBAC1D,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;gBAC5B,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;YAC/E,CAAC,CACD,CAAA;YACD,4FAA4F;YAC5F,MAAM,YAAY,GAAG,UAAU,CAAC,GAAG,EAAE;gBACpC,OAAO,CAAC,OAAO,CACd,IAAI,KAAK,CACR,mCAAmC,gBAAgB,OAAO,GAAG,CAAC,QAAQ,IAAI,CAC1E,CACD,CAAA;YACF,CAAC,EAAE,gBAAgB,CAAC,CAAA;YACpB,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE;gBAC/B,MAAM,iBAAiB,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,CAAC,CAAA;gBAC1D,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;oBAC/B,mEAAmE;oBACnE,qEAAqE;oBACrE,iBAAiB;oBACjB,IAAI,mBAAmB,CAAC,MAAM,CAAC,KAAK,KAAK,EAAE,CAAC;wBAC3C,iBAAiB,EAAE,CAAA;wBACnB,OAAM;oBACP,CAAC;oBACD,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAA;oBAC/C,OAAM;gBACP,CAAC;gBACD,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;oBACxB,iBAAiB,EAAE,CAAA;oBACnB,OAAM;gBACP,CAAC;gBACD,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAA;YAC1C,CAAC,CAAC,CAAA;YACF,OAAO,CAAC,UAAU,CAAC,SAAS,EAAE,GAAG,EAAE,CAClC,OAAO,CAAC,OAAO,CACd,IAAI,KAAK,CAAC,6BAA6B,SAAS,OAAO,GAAG,CAAC,QAAQ,IAAI,CAAC,CACxE,CACD,CAAA;YACD,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;gBAC7B,YAAY,CAAC,YAAY,CAAC,CAAA;gBAC1B,MAAM,CAAC,KAAK,CAAC,CAAA;YACd,CAAC,CAAC,CAAA;YACF,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;YACvB,IAAI,MAAM,EAAE,CAAC;gBACZ,MAAM,KAAK,GAAG,GAAG,EAAE;oBAClB,YAAY,CAAC,YAAY,CAAC,CAAA;oBAC1B,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;gBAC3C,CAAC,CAAA;gBACD,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;oBACpB,KAAK,EAAE,CAAA;gBACR,CAAC;qBAAM,CAAC;oBACP,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;oBACvD,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAA;gBACxE,CAAC;YACF,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,SAAS,CAAC,CAAA;QAC/B,CAAC,CAAC,CAAA;IACH,CAAC,CAAA;AACF,CAAC;AAKD,KAAK,UAAU,cAAc,CAAC,WAAoB;IACjD,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;IACpF,MAAM,YAAY,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAA;IAC3F,OAAO;QACN,OAAO,EAAE,EAAE,KAAK,EAAE,gBAAgB,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE;QACzF,QAAQ,EAAE,EAAE,KAAK,EAAE,gBAAgB,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE;KAC5F,CAAA;AACF,CAAC;AAED,kFAAkF;AAClF,SAAS,gBAAgB,CAAC,KAAgB;IACzC,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE;QAC3B,MAAM,CAAC,KAAK,EAAE,CAAA;IACf,CAAC,CAAC,CAAA;IACF,OAAO,KAAK,CAAA;AACb,CAAC;AAED,yFAAyF;AACzF,SAAS,mBAAmB,CAAC,MAAc;IAC1C,IAAI,CAAC,CAAC,kBAAkB,IAAI,MAAM,CAAC;QAAE,OAAO,IAAI,CAAA;IAChD,OAAQ,MAAiD,CAAC,gBAAgB,CAAA;AAC3E,CAAC;AAED,SAAS,UAAU,CAAC,MAAe;IAClC,IAAI,MAAM,YAAY,KAAK;QAAE,OAAO,MAAM,CAAA;IAC1C,OAAO,IAAI,YAAY,CACtB,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,4BAA4B,EAClE,YAAY,CACZ,CAAA;AACF,CAAC;AAED,SAAS,UAAU,CAAC,QAAyB,EAAE,IAAY;IAC1D,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAA;IAC7B,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QAC9D,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1B,KAAK,MAAM,KAAK,IAAI,KAAK;gBAAE,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;QACvD,CAAC;aAAM,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YAChC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;QACzB,CAAC;IACF,CAAC;IACD,MAAM,MAAM,GAAG,QAAQ,CAAC,UAAU,IAAI,CAAC,CAAA;IACvC,MAAM,QAAQ,GAAG,MAAM,KAAK,GAAG,IAAI,MAAM,KAAK,GAAG,IAAI,MAAM,KAAK,GAAG,CAAA;IACnE,OAAO,IAAI,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE;QAC3C,MAAM;QACN,UAAU,EAAE,QAAQ,CAAC,aAAa,IAAI,EAAE;QACxC,OAAO;KACP,CAAC,CAAA;AACH,CAAC;AAED,IAAI,2BAA2B,GAAwB,IAAI,CAAA;AAE3D,SAAS,oBAAoB;IAC5B,2BAA2B,KAAK,0BAA0B,EAAE,CAAA;IAC5D,OAAO,2BAA2B,CAAA;AACnC,CAAC;AAyBD,MAAM,OAAO,oBAAqB,SAAQ,KAAK;IACrC,MAAM,CAAe;IACrB,IAAI,CAAe;IAE5B,YACC,OAAe,EACf,UAA4D,EAAE;QAE9D,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,sBAAsB,CAAA;QAClC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,IAAI,CAAA;QACpC,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,IAAI,CAAA;IACjC,CAAC;CACD;AAED,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC,CAAA;AAElE,gEAAgE;AAChE,MAAM,UAAU,qBAAqB,CAAC,MAAc;IACnD,IAAI,GAAQ,CAAA;IACZ,IAAI,CAAC;QACJ,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAA;IACtB,CAAC;IAAC,MAAM,CAAC;QACR,MAAM,IAAI,KAAK,CAAC,yBAAyB,MAAM,EAAE,CAAC,CAAA;IACnD,CAAC;IACD,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ;QAAE,OAAM;IACrC,IAAI,GAAG,CAAC,QAAQ,KAAK,OAAO,IAAI,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC;QAAE,OAAM;IACvE,MAAM,IAAI,KAAK,CACd,qCAAqC,GAAG,CAAC,MAAM,yDAAyD,CACxG,CAAA;AACF,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,MAAc,EAAE,IAAY;IAC9D,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,CAAA;IACzD,OAAO,IAAI,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;AAC3B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC/C,KAAiC;IAEjC,MAAM,GAAG,GAAG,kBAAkB,CAAC,KAAK,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAA;IACxE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAA;IAC1D,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,CAAA;IACrC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QAClB,MAAM,eAAe,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,CAAA;IAC1E,CAAC;IACD,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAA;IACzC,OAAO;QACN,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;YACnC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAmB,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC;YAC7E,CAAC,CAAC,EAAE;QACL,SAAS,EAAE,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI;QACzE,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC;YACvC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAqB,EAAE,CAAC,OAAO,OAAO,KAAK,QAAQ,CAAC;YACrF,CAAC,CAAC,EAAE;KACL,CAAA;AACF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACxC,KAAuD;IAEvD,MAAM,GAAG,GAAG,kBAAkB,CAAC,KAAK,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAA;IACrE,MAAM,OAAO,GAAwB,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAA;IAC3E,IAAI,KAAK,CAAC,cAAc,KAAK,SAAS;QAAE,OAAO,CAAC,cAAc,GAAG,KAAK,CAAC,cAAc,CAAA;IACrF,IAAI,KAAK,CAAC,WAAW,KAAK,SAAS;QAAE,OAAO,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,CAAA;IAC5E,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE;QACvC,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;QAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;KAC7B,CAAC,CAAA;IACF,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,CAAA;IACrC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QAClB,MAAM,eAAe,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAA;IACvE,CAAC;IACD,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,CAAA;IACnC,IAAI,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,oBAAoB,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAA;IACjG,CAAC;IACD,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAA;AAChD,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC3C,KAMC;IAED,MAAM,IAAI,GAA4B,EAAE,CAAA;IACxC,IAAI,KAAK,CAAC,MAAM,KAAK,IAAI;QAAE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAA;IAC7C,IAAI,KAAK,CAAC,SAAS,KAAK,SAAS;QAAE,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAA;IACnE,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC;QACxC,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,IAAI,EAAE,CAAC,MAAM,EAAE,uBAAuB,CAAC;QACvC,IAAI,EAAE,CAAC,IAAI,CAAC;QACZ,cAAc,EAAE,KAAK,CAAC,cAAc;QACpC,WAAW,EAAE,KAAK,CAAC,WAAW;KAC9B,CAAC,CAAA;IACF,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QACvB,MAAM,IAAI,oBAAoB,CAAC,sDAAsD,CAAC,CAAA;IACvF,CAAC;IACD,IAAI,MAAM,CAAC,EAAE,KAAK,KAAK,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAA;QACxD,MAAM,IAAI,GAAG,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAAA;QAC7E,MAAM,IAAI,oBAAoB,CAAC,2BAA2B,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;IAC7E,CAAC;IACD,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAA;IAC1D,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC;QAC9C,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAqB,EAAE,CAAC,OAAO,OAAO,KAAK,QAAQ,CAAC;QACpF,CAAC,CAAC,EAAE,CAAA;IACL,OAAO,EAAE,QAAQ,EAAE,CAAA;AACpB,CAAC;AAED,KAAK,UAAU,IAAI,CAClB,KAAiC,EACjC,GAAQ,EACR,IAAiB;IAEjB,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,IAAI,oBAAoB,EAAE,CAAA;IACvD,IAAI,CAAC;QACJ,OAAO,MAAM,OAAO,CAAC,GAAG,EAAE;YACzB,GAAG,IAAI;YACP,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,OAAO,EAAE;gBACR,GAAI,IAAI,CAAC,OAA8C;gBACvD,MAAM,EAAE,kBAAkB;gBAC1B,aAAa,EAAE,UAAU,KAAK,CAAC,KAAK,EAAE;gBACtC,YAAY,EAAE,GAAG,OAAO,IAAI,kBAAkB,EAAE,EAAE;aAClD;SACD,CAAC,CAAA;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,MAAM,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAA;QAC1C,MAAM,IAAI,oBAAoB,CAC7B,mCAAmC,GAAG,CAAC,MAAM,KAAK,MAAM,qDAAqD,CAC7G,CAAA;IACF,CAAC;AACF,CAAC;AAED,KAAK,UAAU,QAAQ,CAAC,QAAkB;IACzC,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;IAClC,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAA;IACtB,IAAI,CAAC;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACxB,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,IAAI,CAAA;IACZ,CAAC;AACF,CAAC;AAED,SAAS,aAAa,CAAC,IAAa;IACnC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI;QAAE,OAAO,IAAI,CAAA;IACtD,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAA;IACtB,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAA;IACpE,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACrB,MAAM,IAAI,GAAG,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAA;QAC/D,MAAM,OAAO,GACZ,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;QAClF,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAA;IACzB,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAA;AAC9C,CAAC;AAED,SAAS,eAAe,CACvB,MAAc,EACd,IAAa,EACb,GAAQ,EACR,KAAyB,EACzB,KAAa;IAEb,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,CAAA;IACnC,MAAM,IAAI,GAAG,OAAO,EAAE,IAAI,IAAI,IAAI,CAAA;IAClC,MAAM,MAAM,GAAG,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,iBAAiB,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IACzE,IAAI,MAAM,KAAK,GAAG,EAAE,CAAC;QACpB,MAAM,OAAO,GAAG,gBAAgB,CAAC,KAAK,CAAC;YACtC,CAAC,CAAC,uHAAuH,cAAc,IAAI,MAAM,EAAE;YACnJ,CAAC,CAAC,GAAG,0BAA0B,EAAE,GAAG,MAAM,EAAE,CAAA;QAC7C,OAAO,IAAI,oBAAoB,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;IAC3D,CAAC;IACD,IAAI,IAAI,KAAK,kBAAkB,EAAE,CAAC;QACjC,OAAO,IAAI,oBAAoB,CAAC,GAAG,sBAAsB,EAAE,GAAG,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;IAC1F,CAAC;IACD,IAAI,IAAI,KAAK,oBAAoB,EAAE,CAAC;QACnC,OAAO,IAAI,oBAAoB,CAC9B,GAAG,wBAAwB,CAAC,4BAA4B,CAAC,IAAI,CAAC,CAAC,GAAG,MAAM,EAAE,EAC1E,EAAE,MAAM,EAAE,IAAI,EAAE,CAChB,CAAA;IACF,CAAC;IACD,IAAI,MAAM,KAAK,GAAG,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAC3C,OAAO,IAAI,oBAAoB,CAC9B,sDAAsD,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,wBAAwB,EAAE,2BAA2B,wBAAwB,EAAE,GAAG,MAAM,EAAE,EAC7K,EAAE,MAAM,EAAE,IAAI,EAAE,CAChB,CAAA;IACF,CAAC;IACD,IAAI,MAAM,KAAK,GAAG,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAC3C,OAAO,IAAI,oBAAoB,CAC9B,oCAAoC,GAAG,CAAC,IAAI,2FAA2F,EACvI,EAAE,MAAM,EAAE,IAAI,EAAE,CAChB,CAAA;IACF,CAAC;IACD,OAAO,IAAI,oBAAoB,CAC9B,OAAO,EAAE,OAAO,IAAI,qCAAqC,MAAM,KAAK,GAAG,CAAC,QAAQ,IAAI,EACpF,EAAE,MAAM,EAAE,IAAI,EAAE,CAChB,CAAA;AACF,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC/B,OAAO,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;AAC5E,CAAC"}
|
|
1
|
+
{"version":3,"file":"capability-proxy.js","sourceRoot":"","sources":["../src/capability-proxy.ts"],"names":[],"mappings":"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"}
|
package/dist/cli.d.ts
CHANGED
|
@@ -3,7 +3,7 @@ import { type CredentialCallMapInput } from './credential-call-map.js';
|
|
|
3
3
|
export { readApiToken, requireApiToken as resolveApiToken, resolveScopedApiToken, } from './api-token.js';
|
|
4
4
|
export { resolveLocalExecuteBearer } from './local-execute-auth.js';
|
|
5
5
|
export { authBootstrap, authBootstrapWithScopes, bootstrapRedeemRequestBody, cliTokenLifetimeAliases, cliTokenLifetimeMissingError, cliTokenLifetimePolicy, parseCliLifetimeSecondsFlag, parseCliScopesFlag, redeemBootstrapCode, resolveCliTokenLifetime, } from './auth-bootstrap.js';
|
|
6
|
-
export type CommandName = 'login' | 'logout' | 'status' | 'auth' | 'git-credential' | 'whoami' | 'search' | 'api' | 'execute' | 'install' | 'skill' | 'help' | 'version';
|
|
6
|
+
export type CommandName = 'login' | 'logout' | 'org' | 'status' | 'auth' | 'git-credential' | 'whoami' | 'search' | 'api' | 'execute' | 'install' | 'skill' | 'help' | 'version';
|
|
7
7
|
export declare function apiUrlFrom(values: {
|
|
8
8
|
apiUrl?: string;
|
|
9
9
|
}, env?: NodeJS.ProcessEnv): string;
|
|
@@ -84,6 +84,8 @@ export declare function shouldUseApiToken(input: {
|
|
|
84
84
|
allowEnvWithoutLogin: boolean;
|
|
85
85
|
env?: NodeJS.ProcessEnv;
|
|
86
86
|
apiUrl?: string;
|
|
87
|
+
/** When set, only a login for this org counts as a session. */
|
|
88
|
+
org?: string;
|
|
87
89
|
/** Override session detection (tests). */
|
|
88
90
|
hasSession?: boolean;
|
|
89
91
|
/** Test seam for stored bootstrap/API token lookup. */
|