@ora-ai/cli 0.23.0 → 0.24.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/CHANGELOG.md +64 -0
- package/README.md +44 -13
- package/dist/agent-skills/skills-command.d.ts.map +1 -1
- package/dist/agent-skills/skills-command.js +2 -2
- package/dist/agent-skills/skills-command.js.map +1 -1
- package/dist/auth-commands.d.ts +25 -9
- package/dist/auth-commands.d.ts.map +1 -1
- package/dist/auth-commands.js +59 -49
- package/dist/auth-commands.js.map +1 -1
- package/dist/core/auth.d.ts +2 -2
- package/dist/core/auth.d.ts.map +1 -1
- package/dist/core/auth.js +5 -4
- package/dist/core/auth.js.map +1 -1
- package/dist/core/config.d.ts +10 -5
- package/dist/core/config.d.ts.map +1 -1
- package/dist/core/config.js +10 -7
- package/dist/core/config.js.map +1 -1
- package/dist/core/credentials/api-key-credential.d.ts +29 -0
- package/dist/core/credentials/api-key-credential.d.ts.map +1 -0
- package/dist/core/credentials/api-key-credential.js +58 -0
- package/dist/core/credentials/api-key-credential.js.map +1 -0
- package/dist/core/credentials/ci-oidc-credential.d.ts +44 -0
- package/dist/core/credentials/ci-oidc-credential.d.ts.map +1 -0
- package/dist/core/credentials/ci-oidc-credential.js +82 -0
- package/dist/core/credentials/ci-oidc-credential.js.map +1 -0
- package/dist/core/credentials/credential-chain.d.ts +25 -0
- package/dist/core/credentials/credential-chain.d.ts.map +1 -0
- package/dist/core/credentials/credential-chain.js +39 -0
- package/dist/core/credentials/credential-chain.js.map +1 -0
- package/dist/core/credentials/credential.d.ts +73 -0
- package/dist/core/credentials/credential.d.ts.map +1 -0
- package/dist/core/credentials/credential.js +9 -0
- package/dist/core/credentials/credential.js.map +1 -0
- package/dist/core/credentials/device-session-credential.d.ts +27 -0
- package/dist/core/credentials/device-session-credential.d.ts.map +1 -0
- package/dist/core/credentials/device-session-credential.js +78 -0
- package/dist/core/credentials/device-session-credential.js.map +1 -0
- package/dist/core/credentials/identity-lines.d.ts +14 -0
- package/dist/core/credentials/identity-lines.d.ts.map +1 -0
- package/dist/core/credentials/identity-lines.js +45 -0
- package/dist/core/credentials/identity-lines.js.map +1 -0
- package/dist/core/credentials/refusal-words.d.ts +15 -0
- package/dist/core/credentials/refusal-words.d.ts.map +1 -0
- package/dist/core/credentials/refusal-words.js +56 -0
- package/dist/core/credentials/refusal-words.js.map +1 -0
- package/dist/core/credentials/sign-in-areas.d.ts +18 -0
- package/dist/core/credentials/sign-in-areas.d.ts.map +1 -0
- package/dist/core/credentials/sign-in-areas.js +22 -0
- package/dist/core/credentials/sign-in-areas.js.map +1 -0
- package/dist/core/http.d.ts +10 -4
- package/dist/core/http.d.ts.map +1 -1
- package/dist/core/http.js +7 -5
- package/dist/core/http.js.map +1 -1
- package/dist/core/identity.d.ts +11 -0
- package/dist/core/identity.d.ts.map +1 -0
- package/dist/core/identity.js +21 -0
- package/dist/core/identity.js.map +1 -0
- package/dist/core/login.d.ts +5 -3
- package/dist/core/login.d.ts.map +1 -1
- package/dist/core/login.js +5 -3
- package/dist/core/login.js.map +1 -1
- package/dist/core/oauth/metadata.d.ts +24 -0
- package/dist/core/oauth/metadata.d.ts.map +1 -0
- package/dist/core/oauth/metadata.js +99 -0
- package/dist/core/oauth/metadata.js.map +1 -0
- package/dist/core/oauth/oauth-client.d.ts +70 -0
- package/dist/core/oauth/oauth-client.d.ts.map +1 -0
- package/dist/core/oauth/oauth-client.js +136 -0
- package/dist/core/oauth/oauth-client.js.map +1 -0
- package/dist/core/oauth/oauth-error.d.ts +18 -0
- package/dist/core/oauth/oauth-error.d.ts.map +1 -0
- package/dist/core/oauth/oauth-error.js +31 -0
- package/dist/core/oauth/oauth-error.js.map +1 -0
- package/dist/core/oauth/sign-in-error.d.ts +15 -0
- package/dist/core/oauth/sign-in-error.d.ts.map +1 -0
- package/dist/core/oauth/sign-in-error.js +21 -0
- package/dist/core/oauth/sign-in-error.js.map +1 -0
- package/dist/core/oauth/sign-in-target.d.ts +31 -0
- package/dist/core/oauth/sign-in-target.d.ts.map +1 -0
- package/dist/core/oauth/sign-in-target.js +44 -0
- package/dist/core/oauth/sign-in-target.js.map +1 -0
- package/dist/core/output.d.ts +14 -3
- package/dist/core/output.d.ts.map +1 -1
- package/dist/core/output.js +35 -31
- package/dist/core/output.js.map +1 -1
- package/dist/core/retry-after.d.ts +8 -0
- package/dist/core/retry-after.d.ts.map +1 -0
- package/dist/core/retry-after.js +18 -0
- package/dist/core/retry-after.js.map +1 -0
- package/dist/core/run-operation.d.ts +23 -9
- package/dist/core/run-operation.d.ts.map +1 -1
- package/dist/core/run-operation.js +25 -14
- package/dist/core/run-operation.js.map +1 -1
- package/dist/core/session/device-session-auth.d.ts +29 -0
- package/dist/core/session/device-session-auth.d.ts.map +1 -0
- package/dist/core/session/device-session-auth.js +92 -0
- package/dist/core/session/device-session-auth.js.map +1 -0
- package/dist/core/session/file-lock.d.ts +33 -0
- package/dist/core/session/file-lock.d.ts.map +1 -0
- package/dist/core/session/file-lock.js +145 -0
- package/dist/core/session/file-lock.js.map +1 -0
- package/dist/core/session/session-refusals.d.ts +22 -0
- package/dist/core/session/session-refusals.d.ts.map +1 -0
- package/dist/core/session/session-refusals.js +23 -0
- package/dist/core/session/session-refusals.js.map +1 -0
- package/dist/core/session/session-store.d.ts +53 -0
- package/dist/core/session/session-store.d.ts.map +1 -0
- package/dist/core/session/session-store.js +71 -0
- package/dist/core/session/session-store.js.map +1 -0
- package/dist/core/sign-in.d.ts +2 -2
- package/dist/core/sign-in.js +2 -2
- package/dist/core/token-expiry.d.ts +9 -0
- package/dist/core/token-expiry.d.ts.map +1 -0
- package/dist/core/token-expiry.js +11 -0
- package/dist/core/token-expiry.js.map +1 -0
- package/dist/core/url.d.ts +5 -0
- package/dist/core/url.d.ts.map +1 -0
- package/dist/core/url.js +17 -0
- package/dist/core/url.js.map +1 -0
- package/dist/generated/operations.d.ts +1 -1
- package/dist/generated/operations.js +2 -2
- package/dist/generated/types.d.ts +289 -0
- package/dist/generated/types.d.ts.map +1 -1
- package/dist/generated/types.js +1 -1
- package/dist/interactive/menu.d.ts.map +1 -1
- package/dist/interactive/menu.js +4 -2
- package/dist/interactive/menu.js.map +1 -1
- package/dist/interactive/session.d.ts.map +1 -1
- package/dist/interactive/session.js +13 -6
- package/dist/interactive/session.js.map +1 -1
- package/dist/login/browser-opener.d.ts +20 -0
- package/dist/login/browser-opener.d.ts.map +1 -0
- package/dist/login/browser-opener.js +43 -0
- package/dist/login/browser-opener.js.map +1 -0
- package/dist/login/device-flow.d.ts +60 -0
- package/dist/login/device-flow.d.ts.map +1 -0
- package/dist/login/device-flow.js +98 -0
- package/dist/login/device-flow.js.map +1 -0
- package/dist/login/device-login.d.ts +27 -0
- package/dist/login/device-login.d.ts.map +1 -0
- package/dist/login/device-login.js +148 -0
- package/dist/login/device-login.js.map +1 -0
- package/dist/login/device-presenter.d.ts +24 -0
- package/dist/login/device-presenter.d.ts.map +1 -0
- package/dist/login/device-presenter.js +69 -0
- package/dist/login/device-presenter.js.map +1 -0
- package/dist/login/login-command.d.ts +14 -0
- package/dist/login/login-command.d.ts.map +1 -0
- package/dist/login/login-command.js +73 -0
- package/dist/login/login-command.js.map +1 -0
- package/dist/login/login-deps.d.ts +17 -0
- package/dist/login/login-deps.d.ts.map +1 -0
- package/dist/login/login-deps.js +18 -0
- package/dist/login/login-deps.js.map +1 -0
- package/dist/login/piped-input.d.ts +23 -0
- package/dist/login/piped-input.d.ts.map +1 -0
- package/dist/login/piped-input.js +36 -0
- package/dist/login/piped-input.js.map +1 -0
- package/dist/login/requested-scopes.d.ts +22 -0
- package/dist/login/requested-scopes.d.ts.map +1 -0
- package/dist/login/requested-scopes.js +43 -0
- package/dist/login/requested-scopes.js.map +1 -0
- package/dist/program.d.ts +16 -5
- package/dist/program.d.ts.map +1 -1
- package/dist/program.js +15 -7
- package/dist/program.js.map +1 -1
- package/dist/study-ci/ci-command.d.ts.map +1 -1
- package/dist/study-ci/ci-command.js +2 -2
- package/dist/study-ci/ci-command.js.map +1 -1
- package/dist/study-ci/ci-rehearse-command.d.ts.map +1 -1
- package/dist/study-ci/ci-rehearse-command.js +2 -2
- package/dist/study-ci/ci-rehearse-command.js.map +1 -1
- package/dist/tunnel/connection-end.d.ts +30 -0
- package/dist/tunnel/connection-end.d.ts.map +1 -0
- package/dist/tunnel/connection-end.js +29 -0
- package/dist/tunnel/connection-end.js.map +1 -0
- package/dist/tunnel-command.d.ts.map +1 -1
- package/dist/tunnel-command.js +24 -8
- package/dist/tunnel-command.js.map +1 -1
- package/package.json +3 -2
- package/dist/core/credential-sources.d.ts +0 -45
- package/dist/core/credential-sources.d.ts.map +0 -1
- package/dist/core/credential-sources.js +0 -65
- package/dist/core/credential-sources.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ci-rehearse-command.js","sourceRoot":"","sources":["../../src/study-ci/ci-rehearse-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,OAAO,EAAE,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"ci-rehearse-command.js","sourceRoot":"","sources":["../../src/study-ci/ci-rehearse-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import type { RefusalWords } from "../core/credentials/credential.js";
|
|
2
|
+
/**
|
|
3
|
+
* How a held tunnel connection ended, and what to tell the person.
|
|
4
|
+
*
|
|
5
|
+
* Most ends are plain: Ctrl-C, a dropped network, a tunnel someone revoked. One is about the credential itself: the
|
|
6
|
+
* server keeps asking whether a browser sign-in still stands for as long as its tunnel is connected, and closes the
|
|
7
|
+
* connection when it does not (disconnected in Connected apps, `ora logout` elsewhere, log out everywhere, removal
|
|
8
|
+
* from the organization). It says so with this close code, the same one a refused connection gets for a credential
|
|
9
|
+
* that does not work, and the reason says what ended.
|
|
10
|
+
*
|
|
11
|
+
* The code is `TUNNEL_CLOSE_CODES.unauthorized` of @ora-ai/tunnel-protocol, written out here rather than imported:
|
|
12
|
+
* the published CLI depends on the published protocol (^0.4), which predates that export, so importing it would fail
|
|
13
|
+
* when the CLI loads. connection-end.test.ts holds the two equal. Once a protocol release carries the export and the
|
|
14
|
+
* CLI depends on that release, import it instead.
|
|
15
|
+
*/
|
|
16
|
+
export declare const CREDENTIAL_ENDED_CLOSE_CODE = 4401;
|
|
17
|
+
export interface TunnelEnd {
|
|
18
|
+
/** The WebSocket close code. */
|
|
19
|
+
readonly code: number;
|
|
20
|
+
/** The reason the closing side gave (may be empty). */
|
|
21
|
+
readonly reason: string;
|
|
22
|
+
}
|
|
23
|
+
/** Did the server end the connection because the credential that opened it no longer works there? */
|
|
24
|
+
export declare function credentialEnded(end: TunnelEnd): boolean;
|
|
25
|
+
/**
|
|
26
|
+
* What to print after the disconnect line when the credential ended: the credential's own words (a sign-in is told
|
|
27
|
+
* to sign in again, never to mint a key). Nothing for any other end.
|
|
28
|
+
*/
|
|
29
|
+
export declare function credentialEndedLines(end: TunnelEnd, words: RefusalWords): string[];
|
|
30
|
+
//# sourceMappingURL=connection-end.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"connection-end.d.ts","sourceRoot":"","sources":["../../src/tunnel/connection-end.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAEtE;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,2BAA2B,OAAO,CAAC;AAEhD,MAAM,WAAW,SAAS;IACxB,gCAAgC;IAChC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,uDAAuD;IACvD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAED,qGAAqG;AACrG,wBAAgB,eAAe,CAAC,GAAG,EAAE,SAAS,GAAG,OAAO,CAEvD;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,GAAG,MAAM,EAAE,CAGlF"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* How a held tunnel connection ended, and what to tell the person.
|
|
3
|
+
*
|
|
4
|
+
* Most ends are plain: Ctrl-C, a dropped network, a tunnel someone revoked. One is about the credential itself: the
|
|
5
|
+
* server keeps asking whether a browser sign-in still stands for as long as its tunnel is connected, and closes the
|
|
6
|
+
* connection when it does not (disconnected in Connected apps, `ora logout` elsewhere, log out everywhere, removal
|
|
7
|
+
* from the organization). It says so with this close code, the same one a refused connection gets for a credential
|
|
8
|
+
* that does not work, and the reason says what ended.
|
|
9
|
+
*
|
|
10
|
+
* The code is `TUNNEL_CLOSE_CODES.unauthorized` of @ora-ai/tunnel-protocol, written out here rather than imported:
|
|
11
|
+
* the published CLI depends on the published protocol (^0.4), which predates that export, so importing it would fail
|
|
12
|
+
* when the CLI loads. connection-end.test.ts holds the two equal. Once a protocol release carries the export and the
|
|
13
|
+
* CLI depends on that release, import it instead.
|
|
14
|
+
*/
|
|
15
|
+
export const CREDENTIAL_ENDED_CLOSE_CODE = 4401;
|
|
16
|
+
/** Did the server end the connection because the credential that opened it no longer works there? */
|
|
17
|
+
export function credentialEnded(end) {
|
|
18
|
+
return end.code === CREDENTIAL_ENDED_CLOSE_CODE;
|
|
19
|
+
}
|
|
20
|
+
/**
|
|
21
|
+
* What to print after the disconnect line when the credential ended: the credential's own words (a sign-in is told
|
|
22
|
+
* to sign in again, never to mint a key). Nothing for any other end.
|
|
23
|
+
*/
|
|
24
|
+
export function credentialEndedLines(end, words) {
|
|
25
|
+
if (!credentialEnded(end))
|
|
26
|
+
return [];
|
|
27
|
+
return words.signedOut(String(end.code), end.reason || "the server ended the connection");
|
|
28
|
+
}
|
|
29
|
+
//# sourceMappingURL=connection-end.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"connection-end.js","sourceRoot":"","sources":["../../src/tunnel/connection-end.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAG,IAAI,CAAC;AAShD,qGAAqG;AACrG,MAAM,UAAU,eAAe,CAAC,GAAc;IAC5C,OAAO,GAAG,CAAC,IAAI,KAAK,2BAA2B,CAAC;AAClD,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAAC,GAAc,EAAE,KAAmB;IACtE,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC;QAAE,OAAO,EAAE,CAAC;IACrC,OAAO,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,MAAM,IAAI,iCAAiC,CAAC,CAAC;AAC5F,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel-command.d.ts","sourceRoot":"","sources":["../src/tunnel-command.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"tunnel-command.d.ts","sourceRoot":"","sources":["../src/tunnel-command.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAQzC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AA6BjD;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,GAAG,IAAI,CAiC9E"}
|
package/dist/tunnel-command.js
CHANGED
|
@@ -5,6 +5,7 @@ import { readFileSync, writeFileSync, mkdirSync } from "node:fs";
|
|
|
5
5
|
import { join } from "node:path";
|
|
6
6
|
import { credentials } from "./core/run-operation.js";
|
|
7
7
|
import { renderError } from "./core/output.js";
|
|
8
|
+
import { credentialEnded, credentialEndedLines } from "./tunnel/connection-end.js";
|
|
8
9
|
import { HttpLocalForwarder } from "./tunnel/local-forwarder.js";
|
|
9
10
|
/**
|
|
10
11
|
* Protected-mode secrets are shown ONCE by the API (only sha256 stored), so
|
|
@@ -84,21 +85,30 @@ async function runTunnel(portArg, opts, deps) {
|
|
|
84
85
|
const creds = credentials(deps, opts.apiUrl);
|
|
85
86
|
if (!creds)
|
|
86
87
|
return; // credentials() already reported the login hint
|
|
88
|
+
try {
|
|
89
|
+
await openTunnel(creds, { id: opts.id, name: opts.name ?? `dev-${port}`, access, host: opts.host ?? "127.0.0.1", port }, deps);
|
|
90
|
+
}
|
|
91
|
+
catch (error) {
|
|
92
|
+
// A refusal is told in the credential's own words: a browser sign-in is told to sign in again (and allow the
|
|
93
|
+
// permission), never to mint an api key.
|
|
94
|
+
deps.errOut(creds.renderError(error));
|
|
95
|
+
process.exitCode = 1;
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
/** Resolve the tunnel, print its header, and hold its connection — as the resolved caller. */
|
|
99
|
+
async function openTunnel(creds, want, deps) {
|
|
87
100
|
const client = deps.makeClient(creds);
|
|
88
|
-
const tunnel = await resolveTunnel(client, deps, {
|
|
89
|
-
id: opts.id,
|
|
90
|
-
name: opts.name ?? `dev-${port}`,
|
|
91
|
-
access,
|
|
92
|
-
});
|
|
101
|
+
const tunnel = await resolveTunnel(client, deps, { id: want.id, name: want.name, access: want.access });
|
|
93
102
|
if (tunnel.accessToken)
|
|
94
103
|
rememberSecret(deps.dir, tunnel.id, tunnel.accessToken);
|
|
95
104
|
const secret = tunnel.accessToken ?? readSecrets(deps.dir)[tunnel.id] ?? null;
|
|
96
|
-
printHeader(deps, tunnel, port, secret);
|
|
105
|
+
printHeader(deps, tunnel, want.port, secret);
|
|
97
106
|
if (tunnel.connection.kind !== "ora-ws") {
|
|
98
107
|
throw new Error(`provider connection kind "${tunnel.connection.kind}" is not supported by this CLI yet`);
|
|
99
108
|
}
|
|
109
|
+
// The same bearer every request carries: an api key's traded token, a browser sign-in's access token.
|
|
100
110
|
const token = await deps.makeAuth(creds).getToken();
|
|
101
|
-
await holdConnection(tunnel, token, { host:
|
|
111
|
+
await holdConnection(tunnel, token, { host: want.host, port: want.port }, deps, creds.credential.words);
|
|
102
112
|
}
|
|
103
113
|
/**
|
|
104
114
|
* create-or-reuse: --id wins; else create by name, falling back to the
|
|
@@ -162,7 +172,7 @@ function printHeader(deps, tunnel, port, secret) {
|
|
|
162
172
|
deps.out("");
|
|
163
173
|
}
|
|
164
174
|
/** Dial the WS, run the protocol connector, and log traffic until Ctrl-C. */
|
|
165
|
-
async function holdConnection(tunnel, bearer, target, deps) {
|
|
175
|
+
async function holdConnection(tunnel, bearer, target, deps, words) {
|
|
166
176
|
const url = `${tunnel.connection.url}?tunnelId=${tunnel.id}`;
|
|
167
177
|
const ws = new WebSocket(url, [tunnel.connection.subprotocol], {
|
|
168
178
|
headers: { Authorization: `Bearer ${bearer}` },
|
|
@@ -203,6 +213,12 @@ async function holdConnection(tunnel, bearer, target, deps) {
|
|
|
203
213
|
process.once("SIGTERM", stop);
|
|
204
214
|
ws.once("close", (code, reason) => {
|
|
205
215
|
deps.out(`\n ${chalk.red("●")} disconnected (${code}${reason.length ? ` ${reason.toString()}` : ""})`);
|
|
216
|
+
// The server ends a tunnel whose sign-in no longer stands: say so in the credential's own words.
|
|
217
|
+
const end = { code, reason: reason.toString() };
|
|
218
|
+
for (const line of credentialEndedLines(end, words))
|
|
219
|
+
deps.errOut(` ${line}`);
|
|
220
|
+
if (credentialEnded(end))
|
|
221
|
+
process.exitCode = 1;
|
|
206
222
|
resolve();
|
|
207
223
|
});
|
|
208
224
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel-command.js","sourceRoot":"","sources":["../src/tunnel-command.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tunnel-command.js","sourceRoot":"","sources":["../src/tunnel-command.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ora-ai/cli",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.24.0",
|
|
4
4
|
"description": "ora customer CLI — generated from the ora public API",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -28,7 +28,8 @@
|
|
|
28
28
|
},
|
|
29
29
|
"files": [
|
|
30
30
|
"dist",
|
|
31
|
-
"LICENSE"
|
|
31
|
+
"LICENSE",
|
|
32
|
+
"CHANGELOG.md"
|
|
32
33
|
],
|
|
33
34
|
"publishConfig": {
|
|
34
35
|
"access": "public"
|
|
@@ -1,45 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* WHERE THE CLI'S CREDENTIAL COMES FROM — an ordered registry of sources
|
|
3
|
-
* (Strategy + Registry). The first source that has something to say decides.
|
|
4
|
-
*
|
|
5
|
-
* THE ORDER, and why:
|
|
6
|
-
* 1. `ORA_API_KEY` in the environment: the most explicit thing a person or a
|
|
7
|
-
* job can say;
|
|
8
|
-
* 2. keyless CI sign-in (`ORA_API_KEY_ID` in a job that can request its
|
|
9
|
-
* identity token): chosen by naming a key id, with no secret anywhere;
|
|
10
|
-
* 3. the key `ora login` stored on this machine.
|
|
11
|
-
*
|
|
12
|
-
* A SOURCE THAT WAS ASKED FOR AND CANNOT WORK SAYS SO. A job that sets
|
|
13
|
-
* `ORA_API_KEY_ID` but has no identity token gets that told to it, by name.
|
|
14
|
-
* It never falls through to a stored key: signing in as something other than
|
|
15
|
-
* what was asked for is the failure to avoid.
|
|
16
|
-
*
|
|
17
|
-
* Adding a source (another CI system, a keychain) is one entry here.
|
|
18
|
-
*/
|
|
19
|
-
import type { OraConfig } from "./config.js";
|
|
20
|
-
import { type SignIn } from "./sign-in.js";
|
|
21
|
-
export interface CredentialContext {
|
|
22
|
-
cfg: OraConfig;
|
|
23
|
-
env: NodeJS.ProcessEnv;
|
|
24
|
-
/** The API origin the CLI is pointed at. */
|
|
25
|
-
apiUrl: string;
|
|
26
|
-
fetchFn?: typeof fetch;
|
|
27
|
-
}
|
|
28
|
-
/** What a source says: a way to sign in, a reason it was asked for and cannot work, or nothing (null). */
|
|
29
|
-
export type CredentialResolution = {
|
|
30
|
-
signIn: SignIn;
|
|
31
|
-
} | {
|
|
32
|
-
problem: string;
|
|
33
|
-
} | null;
|
|
34
|
-
export interface CredentialSource {
|
|
35
|
-
readonly id: string;
|
|
36
|
-
resolve(ctx: CredentialContext): CredentialResolution;
|
|
37
|
-
}
|
|
38
|
-
/** The variable that names the api key a CI job signs in as. Its value is an id, not a secret. */
|
|
39
|
-
export declare const API_KEY_ID_ENV = "ORA_API_KEY_ID";
|
|
40
|
-
/** Overrides the audience a CI identity token is requested for (default: the API origin). */
|
|
41
|
-
export declare const CI_AUDIENCE_ENV = "ORA_CI_AUDIENCE";
|
|
42
|
-
export declare const CREDENTIAL_SOURCES: readonly CredentialSource[];
|
|
43
|
-
/** The first source with something to say decides; null when none has. */
|
|
44
|
-
export declare function resolveSignIn(ctx: CredentialContext, sources?: readonly CredentialSource[]): CredentialResolution;
|
|
45
|
-
//# sourceMappingURL=credential-sources.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"credential-sources.d.ts","sourceRoot":"","sources":["../../src/core/credential-sources.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAgB,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAEzD,MAAM,WAAW,iBAAiB;IAChC,GAAG,EAAE,SAAS,CAAC;IACf,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,4CAA4C;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,KAAK,CAAC;CACxB;AAED,0GAA0G;AAC1G,MAAM,MAAM,oBAAoB,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC;AAEnF,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,GAAG,EAAE,iBAAiB,GAAG,oBAAoB,CAAC;CACvD;AAED,kGAAkG;AAClG,eAAO,MAAM,cAAc,mBAAmB,CAAC;AAC/C,6FAA6F;AAC7F,eAAO,MAAM,eAAe,oBAAoB,CAAC;AAoCjD,eAAO,MAAM,kBAAkB,EAAE,SAAS,gBAAgB,EAAoD,CAAC;AAE/G,0EAA0E;AAC1E,wBAAgB,aAAa,CAAC,GAAG,EAAE,iBAAiB,EAAE,OAAO,GAAE,SAAS,gBAAgB,EAAuB,GAAG,oBAAoB,CAMrI"}
|
|
@@ -1,65 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* WHERE THE CLI'S CREDENTIAL COMES FROM — an ordered registry of sources
|
|
3
|
-
* (Strategy + Registry). The first source that has something to say decides.
|
|
4
|
-
*
|
|
5
|
-
* THE ORDER, and why:
|
|
6
|
-
* 1. `ORA_API_KEY` in the environment: the most explicit thing a person or a
|
|
7
|
-
* job can say;
|
|
8
|
-
* 2. keyless CI sign-in (`ORA_API_KEY_ID` in a job that can request its
|
|
9
|
-
* identity token): chosen by naming a key id, with no secret anywhere;
|
|
10
|
-
* 3. the key `ora login` stored on this machine.
|
|
11
|
-
*
|
|
12
|
-
* A SOURCE THAT WAS ASKED FOR AND CANNOT WORK SAYS SO. A job that sets
|
|
13
|
-
* `ORA_API_KEY_ID` but has no identity token gets that told to it, by name.
|
|
14
|
-
* It never falls through to a stored key: signing in as something other than
|
|
15
|
-
* what was asked for is the failure to avoid.
|
|
16
|
-
*
|
|
17
|
-
* Adding a source (another CI system, a keychain) is one entry here.
|
|
18
|
-
*/
|
|
19
|
-
import { GITHUB_ID_TOKEN_REQUEST_TOKEN, GITHUB_ID_TOKEN_REQUEST_URL, githubActionsSignIn } from "./github-actions-sign-in.js";
|
|
20
|
-
import { apiKeySignIn } from "./sign-in.js";
|
|
21
|
-
/** The variable that names the api key a CI job signs in as. Its value is an id, not a secret. */
|
|
22
|
-
export const API_KEY_ID_ENV = "ORA_API_KEY_ID";
|
|
23
|
-
/** Overrides the audience a CI identity token is requested for (default: the API origin). */
|
|
24
|
-
export const CI_AUDIENCE_ENV = "ORA_CI_AUDIENCE";
|
|
25
|
-
const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
|
|
26
|
-
const envApiKey = {
|
|
27
|
-
id: "env_api_key",
|
|
28
|
-
resolve: ({ env }) => (env.ORA_API_KEY ? { signIn: apiKeySignIn(env.ORA_API_KEY) } : null),
|
|
29
|
-
};
|
|
30
|
-
const githubActionsKeyless = {
|
|
31
|
-
id: "github_actions_keyless",
|
|
32
|
-
resolve({ env, apiUrl, fetchFn }) {
|
|
33
|
-
const apiKeyId = env[API_KEY_ID_ENV]?.trim();
|
|
34
|
-
if (!apiKeyId)
|
|
35
|
-
return null;
|
|
36
|
-
if (!UUID.test(apiKeyId)) {
|
|
37
|
-
return { problem: `${API_KEY_ID_ENV} is not an api key id. It is the key's ID (a UUID, shown beside the key in Settings, API keys), not the ora_sk_ secret.` };
|
|
38
|
-
}
|
|
39
|
-
const requestUrl = env[GITHUB_ID_TOKEN_REQUEST_URL];
|
|
40
|
-
const requestToken = env[GITHUB_ID_TOKEN_REQUEST_TOKEN];
|
|
41
|
-
if (!requestUrl || !requestToken) {
|
|
42
|
-
return {
|
|
43
|
-
problem: `${API_KEY_ID_ENV} is set, but this job has no identity token to sign in with. ` +
|
|
44
|
-
"In GitHub Actions, give the job `permissions: id-token: write` and run the CLI through the ora study-gate action " +
|
|
45
|
-
`(or pass ${GITHUB_ID_TOKEN_REQUEST_URL} and ${GITHUB_ID_TOKEN_REQUEST_TOKEN} to the step). Anywhere else, set ORA_API_KEY.`,
|
|
46
|
-
};
|
|
47
|
-
}
|
|
48
|
-
return { signIn: githubActionsSignIn({ apiKeyId, audience: env[CI_AUDIENCE_ENV]?.trim() || apiUrl, requestUrl, requestToken, fetchFn }) };
|
|
49
|
-
},
|
|
50
|
-
};
|
|
51
|
-
const storedApiKey = {
|
|
52
|
-
id: "stored_api_key",
|
|
53
|
-
resolve: ({ cfg }) => (cfg.apiKey ? { signIn: apiKeySignIn(cfg.apiKey) } : null),
|
|
54
|
-
};
|
|
55
|
-
export const CREDENTIAL_SOURCES = [envApiKey, githubActionsKeyless, storedApiKey];
|
|
56
|
-
/** The first source with something to say decides; null when none has. */
|
|
57
|
-
export function resolveSignIn(ctx, sources = CREDENTIAL_SOURCES) {
|
|
58
|
-
for (const source of sources) {
|
|
59
|
-
const resolution = source.resolve(ctx);
|
|
60
|
-
if (resolution)
|
|
61
|
-
return resolution;
|
|
62
|
-
}
|
|
63
|
-
return null;
|
|
64
|
-
}
|
|
65
|
-
//# sourceMappingURL=credential-sources.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"credential-sources.js","sourceRoot":"","sources":["../../src/core/credential-sources.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAGH,OAAO,EAAE,6BAA6B,EAAE,2BAA2B,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAC9H,OAAO,EAAE,YAAY,EAAe,MAAM,cAAc,CAAC;AAkBzD,kGAAkG;AAClG,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAgB,CAAC;AAC/C,6FAA6F;AAC7F,MAAM,CAAC,MAAM,eAAe,GAAG,iBAAiB,CAAC;AAEjD,MAAM,IAAI,GAAG,iEAAiE,CAAC;AAE/E,MAAM,SAAS,GAAqB;IAClC,EAAE,EAAE,aAAa;IACjB,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;CAC3F,CAAC;AAEF,MAAM,oBAAoB,GAAqB;IAC7C,EAAE,EAAE,wBAAwB;IAC5B,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE;QAC9B,MAAM,QAAQ,GAAG,GAAG,CAAC,cAAc,CAAC,EAAE,IAAI,EAAE,CAAC;QAC7C,IAAI,CAAC,QAAQ;YAAE,OAAO,IAAI,CAAC;QAC3B,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YACzB,OAAO,EAAE,OAAO,EAAE,GAAG,cAAc,yHAAyH,EAAE,CAAC;QACjK,CAAC;QACD,MAAM,UAAU,GAAG,GAAG,CAAC,2BAA2B,CAAC,CAAC;QACpD,MAAM,YAAY,GAAG,GAAG,CAAC,6BAA6B,CAAC,CAAC;QACxD,IAAI,CAAC,UAAU,IAAI,CAAC,YAAY,EAAE,CAAC;YACjC,OAAO;gBACL,OAAO,EACL,GAAG,cAAc,+DAA+D;oBAChF,mHAAmH;oBACnH,YAAY,2BAA2B,QAAQ,6BAA6B,gDAAgD;aAC/H,CAAC;QACJ,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,mBAAmB,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,IAAI,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;IAC5I,CAAC;CACF,CAAC;AAEF,MAAM,YAAY,GAAqB;IACrC,EAAE,EAAE,gBAAgB;IACpB,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;CACjF,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAgC,CAAC,SAAS,EAAE,oBAAoB,EAAE,YAAY,CAAC,CAAC;AAE/G,0EAA0E;AAC1E,MAAM,UAAU,aAAa,CAAC,GAAsB,EAAE,UAAuC,kBAAkB;IAC7G,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACvC,IAAI,UAAU;YAAE,OAAO,UAAU,CAAC;IACpC,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
|