@ora-ai/cli 0.12.0 → 0.13.1
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 +61 -1
- package/dist/agent-skills/cli-version.d.ts +2 -0
- package/dist/agent-skills/cli-version.d.ts.map +1 -0
- package/dist/agent-skills/cli-version.js +14 -0
- package/dist/agent-skills/cli-version.js.map +1 -0
- package/dist/agent-skills/install-targets.d.ts +14 -0
- package/dist/agent-skills/install-targets.d.ts.map +1 -0
- package/dist/agent-skills/install-targets.js +20 -0
- package/dist/agent-skills/install-targets.js.map +1 -0
- package/dist/agent-skills/installer.d.ts +9 -0
- package/dist/agent-skills/installer.d.ts.map +1 -0
- package/dist/agent-skills/installer.js +15 -0
- package/dist/agent-skills/installer.js.map +1 -0
- package/dist/agent-skills/skills-command.d.ts +5 -0
- package/dist/agent-skills/skills-command.d.ts.map +1 -0
- package/dist/agent-skills/skills-command.js +39 -0
- package/dist/agent-skills/skills-command.js.map +1 -0
- package/dist/agent-skills/studio-skill-source.d.ts +22 -0
- package/dist/agent-skills/studio-skill-source.d.ts.map +1 -0
- package/dist/agent-skills/studio-skill-source.js +15 -0
- package/dist/agent-skills/studio-skill-source.js.map +1 -0
- package/dist/auth-commands.d.ts.map +1 -1
- package/dist/auth-commands.js +3 -2
- package/dist/auth-commands.js.map +1 -1
- package/dist/coalesced-read.d.ts +12 -0
- package/dist/coalesced-read.d.ts.map +1 -0
- package/dist/coalesced-read.js +34 -0
- package/dist/coalesced-read.js.map +1 -0
- package/dist/core/error-envelope.d.ts +40 -0
- package/dist/core/error-envelope.d.ts.map +1 -0
- package/dist/core/error-envelope.js +69 -0
- package/dist/core/error-envelope.js.map +1 -0
- package/dist/core/http.d.ts +9 -2
- package/dist/core/http.d.ts.map +1 -1
- package/dist/core/http.js +19 -10
- package/dist/core/http.js.map +1 -1
- package/dist/core/output.d.ts +1 -0
- package/dist/core/output.d.ts.map +1 -1
- package/dist/core/output.js +27 -3
- package/dist/core/output.js.map +1 -1
- package/dist/core/run-operation.d.ts +4 -3
- package/dist/core/run-operation.d.ts.map +1 -1
- package/dist/core/run-operation.js +13 -10
- package/dist/core/run-operation.js.map +1 -1
- package/dist/generated/operations.d.ts +1 -1
- package/dist/generated/operations.d.ts.map +1 -1
- package/dist/generated/operations.js +633 -7
- package/dist/generated/operations.js.map +1 -1
- package/dist/generated/types.d.ts +755 -11
- package/dist/generated/types.d.ts.map +1 -1
- package/dist/generated/types.js +1 -1
- package/dist/measurement-watch.d.ts +3 -0
- package/dist/measurement-watch.d.ts.map +1 -0
- package/dist/measurement-watch.js +106 -0
- package/dist/measurement-watch.js.map +1 -0
- package/dist/program.d.ts.map +1 -1
- package/dist/program.js +6 -1
- package/dist/program.js.map +1 -1
- package/dist/render/analytics/analytics-view.d.ts +3 -0
- package/dist/render/analytics/analytics-view.d.ts.map +1 -0
- package/dist/render/analytics/analytics-view.js +69 -0
- package/dist/render/analytics/analytics-view.js.map +1 -0
- package/dist/render/analytics/history-view.d.ts +3 -0
- package/dist/render/analytics/history-view.d.ts.map +1 -0
- package/dist/render/analytics/history-view.js +25 -0
- package/dist/render/analytics/history-view.js.map +1 -0
- package/dist/render/analytics/recent-view.d.ts +3 -0
- package/dist/render/analytics/recent-view.d.ts.map +1 -0
- package/dist/render/analytics/recent-view.js +22 -0
- package/dist/render/analytics/recent-view.js.map +1 -0
- package/dist/render/analytics/renderers.d.ts +4 -0
- package/dist/render/analytics/renderers.d.ts.map +1 -0
- package/dist/render/analytics/renderers.js +23 -0
- package/dist/render/analytics/renderers.js.map +1 -0
- package/dist/render/analytics/types.d.ts +73 -0
- package/dist/render/analytics/types.d.ts.map +1 -0
- package/dist/render/analytics/types.js +2 -0
- package/dist/render/analytics/types.js.map +1 -0
- package/dist/render/ansi.d.ts +1 -0
- package/dist/render/ansi.d.ts.map +1 -1
- package/dist/render/ansi.js +38 -0
- package/dist/render/ansi.js.map +1 -1
- package/dist/render/goal-report-criteria.d.ts +39 -0
- package/dist/render/goal-report-criteria.d.ts.map +1 -0
- package/dist/render/goal-report-criteria.js +74 -0
- package/dist/render/goal-report-criteria.js.map +1 -0
- package/dist/render/goal-report-grid.d.ts +24 -0
- package/dist/render/goal-report-grid.d.ts.map +1 -0
- package/dist/render/goal-report-grid.js +52 -0
- package/dist/render/goal-report-grid.js.map +1 -0
- package/dist/render/goal-report.d.ts +3 -0
- package/dist/render/goal-report.d.ts.map +1 -0
- package/dist/render/goal-report.js +69 -0
- package/dist/render/goal-report.js.map +1 -0
- package/dist/render/index.js +10 -0
- package/dist/render/index.js.map +1 -1
- package/dist/render/insight-lines.d.ts.map +1 -1
- package/dist/render/insight-lines.js +7 -8
- package/dist/render/insight-lines.js.map +1 -1
- package/dist/render/insight.d.ts +1 -1
- package/dist/render/insight.d.ts.map +1 -1
- package/dist/render/insight.js +4 -2
- package/dist/render/insight.js.map +1 -1
- package/dist/render/insights/answers-view.d.ts +6 -0
- package/dist/render/insights/answers-view.d.ts.map +1 -0
- package/dist/render/insights/answers-view.js +29 -0
- package/dist/render/insights/answers-view.js.map +1 -0
- package/dist/render/insights/change-view.d.ts +3 -0
- package/dist/render/insights/change-view.d.ts.map +1 -0
- package/dist/render/insights/change-view.js +52 -0
- package/dist/render/insights/change-view.js.map +1 -0
- package/dist/render/insights/issues-view.d.ts +3 -0
- package/dist/render/insights/issues-view.d.ts.map +1 -0
- package/dist/render/insights/issues-view.js +31 -0
- package/dist/render/insights/issues-view.js.map +1 -0
- package/dist/render/insights/renderer.d.ts +3 -0
- package/dist/render/insights/renderer.d.ts.map +1 -0
- package/dist/render/insights/renderer.js +40 -0
- package/dist/render/insights/renderer.js.map +1 -0
- package/dist/render/insights/text.d.ts +3 -0
- package/dist/render/insights/text.d.ts.map +1 -0
- package/dist/render/insights/text.js +6 -0
- package/dist/render/insights/text.js.map +1 -0
- package/dist/render/insights/tools-view.d.ts +4 -0
- package/dist/render/insights/tools-view.d.ts.map +1 -0
- package/dist/render/insights/tools-view.js +51 -0
- package/dist/render/insights/tools-view.js.map +1 -0
- package/dist/render/insights/types.d.ts +124 -0
- package/dist/render/insights/types.d.ts.map +1 -0
- package/dist/render/insights/types.js +2 -0
- package/dist/render/insights/types.js.map +1 -0
- package/dist/render/insights/usage-view.d.ts +3 -0
- package/dist/render/insights/usage-view.d.ts.map +1 -0
- package/dist/render/insights/usage-view.js +18 -0
- package/dist/render/insights/usage-view.js.map +1 -0
- package/dist/render/insights/words.d.ts +4 -0
- package/dist/render/insights/words.d.ts.map +1 -0
- package/dist/render/insights/words.js +24 -0
- package/dist/render/insights/words.js.map +1 -0
- package/dist/render/links.d.ts +3 -0
- package/dist/render/links.d.ts.map +1 -0
- package/dist/render/links.js +5 -0
- package/dist/render/links.js.map +1 -0
- package/dist/render/live-panel.d.ts +2 -0
- package/dist/render/live-panel.d.ts.map +1 -1
- package/dist/render/live-panel.js +8 -8
- package/dist/render/live-panel.js.map +1 -1
- package/dist/render/measurement/measure-launch-view.d.ts +20 -0
- package/dist/render/measurement/measure-launch-view.d.ts.map +1 -0
- package/dist/render/measurement/measure-launch-view.js +31 -0
- package/dist/render/measurement/measure-launch-view.js.map +1 -0
- package/dist/render/measurement/measure-status-view.d.ts +35 -0
- package/dist/render/measurement/measure-status-view.d.ts.map +1 -0
- package/dist/render/measurement/measure-status-view.js +105 -0
- package/dist/render/measurement/measure-status-view.js.map +1 -0
- package/dist/render/measurement/renderers.d.ts +4 -0
- package/dist/render/measurement/renderers.d.ts.map +1 -0
- package/dist/render/measurement/renderers.js +14 -0
- package/dist/render/measurement/renderers.js.map +1 -0
- package/dist/render/meter.d.ts +2 -0
- package/dist/render/meter.d.ts.map +1 -0
- package/dist/render/meter.js +6 -0
- package/dist/render/meter.js.map +1 -0
- package/dist/render/palette.d.ts +23 -0
- package/dist/render/palette.d.ts.map +1 -0
- package/dist/render/palette.js +24 -0
- package/dist/render/palette.js.map +1 -0
- package/dist/render/payload.d.ts +3 -0
- package/dist/render/payload.d.ts.map +1 -0
- package/dist/render/payload.js +8 -0
- package/dist/render/payload.js.map +1 -0
- package/dist/watch.d.ts.map +1 -1
- package/dist/watch.js +3 -1
- package/dist/watch.js.map +1 -1
- package/dist/watchers.d.ts +15 -0
- package/dist/watchers.d.ts.map +1 -0
- package/dist/watchers.js +8 -0
- package/dist/watchers.js.map +1 -0
- package/package.json +1 -1
package/dist/core/http.js
CHANGED
|
@@ -7,17 +7,24 @@
|
|
|
7
7
|
* the CLI's promise for mutations.
|
|
8
8
|
*
|
|
9
9
|
* Non-ok responses map to ApiError carrying the platform envelope
|
|
10
|
-
* {error, code, details?} so output.ts can tell the 402/403 stories
|
|
10
|
+
* {error, code, details?} so output.ts can tell the 402/403 stories — read
|
|
11
|
+
* through core/error-envelope.ts, which also accepts the code-first and
|
|
12
|
+
* nested spellings some services answer with.
|
|
11
13
|
*/
|
|
14
|
+
import { readErrorEnvelope } from "./error-envelope.js";
|
|
12
15
|
export class ApiError extends Error {
|
|
13
16
|
status;
|
|
14
17
|
code;
|
|
15
18
|
details;
|
|
16
|
-
|
|
19
|
+
body;
|
|
20
|
+
constructor(message, status, code, details,
|
|
21
|
+
/** The response body as the API sent it (parsed JSON, or {} when it was not JSON): what --json prints. */
|
|
22
|
+
body) {
|
|
17
23
|
super(message);
|
|
18
24
|
this.status = status;
|
|
19
25
|
this.code = code;
|
|
20
26
|
this.details = details;
|
|
27
|
+
this.body = body;
|
|
21
28
|
this.name = "ApiError";
|
|
22
29
|
}
|
|
23
30
|
}
|
|
@@ -64,6 +71,7 @@ export class HttpClient {
|
|
|
64
71
|
...(opts.body !== undefined ? { "content-type": "application/json" } : {}),
|
|
65
72
|
},
|
|
66
73
|
...(opts.body !== undefined ? { body: JSON.stringify(opts.body) } : {}),
|
|
74
|
+
...(opts.signal ? { signal: opts.signal } : {}),
|
|
67
75
|
});
|
|
68
76
|
let res = await attempt(await this.auth.getToken());
|
|
69
77
|
if (res.status === 401) {
|
|
@@ -75,17 +83,18 @@ export class HttpClient {
|
|
|
75
83
|
}
|
|
76
84
|
}
|
|
77
85
|
async function toApiError(res) {
|
|
78
|
-
const raw =
|
|
86
|
+
const raw = await res.json().catch(() => ({}));
|
|
79
87
|
// Services attach their diagnostics under whatever name fits the error —
|
|
80
88
|
// `detail` (benchmark_subject_invalid), `issues` + `addon`
|
|
81
89
|
// (addon_validation_failed), `status`/`allowed` (benchmark_invalid_state),
|
|
82
|
-
// `slug` (slug_taken) — not only the envelope's `details`.
|
|
83
|
-
// extra field in, so the renderer can show the actual
|
|
84
|
-
// of a bare error code (audit F8: a 422 you can't
|
|
85
|
-
// paid probe run to bisect)
|
|
86
|
-
|
|
90
|
+
// `slug` (slug_taken) — not only the envelope's `details`. The envelope
|
|
91
|
+
// reader folds EVERY extra field in, so the renderer can show the actual
|
|
92
|
+
// field paths instead of a bare error code (audit F8: a 422 you can't
|
|
93
|
+
// self-diagnose costs a paid probe run to bisect), whichever of the three
|
|
94
|
+
// body spellings carried them (core/error-envelope.ts).
|
|
95
|
+
const { code, message, details } = readErrorEnvelope(raw);
|
|
87
96
|
const retryAfter = res.headers.get("retry-after");
|
|
88
|
-
const merged = { ...
|
|
89
|
-
return new ApiError(
|
|
97
|
+
const merged = { ...details, ...(retryAfter ? { retryAfter } : {}) };
|
|
98
|
+
return new ApiError(message ?? `HTTP ${res.status}`, res.status, code ?? "HTTP_ERROR", Object.keys(merged).length > 0 ? merged : undefined, raw);
|
|
90
99
|
}
|
|
91
100
|
//# sourceMappingURL=http.js.map
|
package/dist/core/http.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/core/http.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/core/http.ts"],"names":[],"mappings":"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"}
|
package/dist/core/output.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../src/core/output.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAOpD,wBAAgB,YAAY,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,GAAG,MAAM,CAO9E;AAwCD,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,GAAE;IAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAO,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../src/core/output.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAOpD,wBAAgB,YAAY,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,GAAG,MAAM,CAO9E;AAwCD,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,GAAE;IAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,IAAI,CAAC,EAAE,UAAU,CAAA;CAAO,GAAG,MAAM,CAKxG"}
|
package/dist/core/output.js
CHANGED
|
@@ -61,12 +61,29 @@ function renderTable(rows) {
|
|
|
61
61
|
].join("\n");
|
|
62
62
|
}
|
|
63
63
|
export function renderError(err, ctx = {}) {
|
|
64
|
+
if (ctx.mode === "json")
|
|
65
|
+
return renderErrorJson(err);
|
|
64
66
|
if (err instanceof ApiError)
|
|
65
67
|
return renderApiError(err, ctx);
|
|
66
68
|
if (err instanceof AuthError)
|
|
67
69
|
return authFailureStory(err.code, err.message);
|
|
68
70
|
return chalk.red(err instanceof Error ? err.message : String(err));
|
|
69
71
|
}
|
|
72
|
+
const isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
|
|
73
|
+
/**
|
|
74
|
+
* --json's error line (stderr, one line): the API's own error body as it was sent, so a script reads
|
|
75
|
+
* exactly the fields a client generated from the public doc reads — `code`, `details`, an Autopilot
|
|
76
|
+
* refusal's `details.issues[].refusal.wave` / `.blockedBy`. A failure the API did not answer in JSON (a
|
|
77
|
+
* refused key exchange, a missing key, an unreadable --file, a non-JSON 502) gets the same house shape,
|
|
78
|
+
* `{error, code}`. Plain and rich modes never come here.
|
|
79
|
+
*/
|
|
80
|
+
function renderErrorJson(err) {
|
|
81
|
+
if (err instanceof ApiError && isRecord(err.body) && Object.keys(err.body).length > 0)
|
|
82
|
+
return JSON.stringify(err.body);
|
|
83
|
+
if (err instanceof ApiError || err instanceof AuthError)
|
|
84
|
+
return JSON.stringify({ error: err.message, code: err.code });
|
|
85
|
+
return JSON.stringify({ error: err instanceof Error ? err.message : String(err), code: "CLI_ERROR" });
|
|
86
|
+
}
|
|
70
87
|
function authFailureStory(code, message) {
|
|
71
88
|
return [chalk.red(`Authentication failed (${code}): ${message}`), "Run `ora login` with a valid api key."].join("\n");
|
|
72
89
|
}
|
|
@@ -95,22 +112,29 @@ function renderApiError(err, ctx) {
|
|
|
95
112
|
}
|
|
96
113
|
return chalk.red(`Rate limited: ${err.message}. Retry in a moment.`);
|
|
97
114
|
}
|
|
98
|
-
return [
|
|
115
|
+
return [
|
|
116
|
+
chalk.red(`API error ${err.status} (${err.code}): ${err.message}`),
|
|
117
|
+
...renderErrorDetails(err.details, err.message),
|
|
118
|
+
].join("\n");
|
|
99
119
|
}
|
|
100
120
|
/**
|
|
101
121
|
* The diagnostics a service attached to its error, rendered as readable
|
|
102
122
|
* lines. `issues` ({path, message}[] — the addon/zod validation shape) gets
|
|
103
123
|
* one line per field; everything else prints as `key: value`. This is what
|
|
104
124
|
* turns a bare `422 addon_validation_failed` into a self-diagnosing message.
|
|
125
|
+
* An issue whose line IS the headline (a one-issue refusal whose message is
|
|
126
|
+
* its issues joined, as Autopilot's are) is not printed a second time.
|
|
105
127
|
*/
|
|
106
|
-
function renderErrorDetails(details) {
|
|
128
|
+
function renderErrorDetails(details, headline) {
|
|
107
129
|
if (!details)
|
|
108
130
|
return [];
|
|
109
131
|
const lines = [];
|
|
110
132
|
for (const [key, value] of Object.entries(details)) {
|
|
111
133
|
if (key === "issues" && Array.isArray(value)) {
|
|
112
134
|
for (const issue of value) {
|
|
113
|
-
|
|
135
|
+
const line = `${issue.path || "(body)"}: ${issue.message ?? JSON.stringify(issue)}`;
|
|
136
|
+
if (line !== headline)
|
|
137
|
+
lines.push(chalk.dim(` - ${line}`));
|
|
114
138
|
}
|
|
115
139
|
continue;
|
|
116
140
|
}
|
package/dist/core/output.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/core/output.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/core/output.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,8 +10,9 @@
|
|
|
10
10
|
*/
|
|
11
11
|
import { type OperationMeta } from "../generated/operations.js";
|
|
12
12
|
import type { ResolvedDeps } from "../program.js";
|
|
13
|
-
|
|
14
|
-
|
|
13
|
+
import { type OutputMode } from "../render/mode.js";
|
|
14
|
+
/** Resolves the api key + api url for a call, or reports the missing-key error and returns null. Shared by runOperation and the auth commands (login/whoami both need the same story). `mode` "json" reports it as a JSON line. */
|
|
15
|
+
export declare function credentials(deps: ResolvedDeps, apiUrlFlag: string | undefined, mode?: OutputMode): {
|
|
15
16
|
apiKey: string;
|
|
16
17
|
apiUrl: string;
|
|
17
18
|
} | null;
|
|
@@ -53,5 +54,5 @@ export declare const MISSING_BODY_MESSAGE = "This command requires a JSON body:
|
|
|
53
54
|
* silently dispatches the request with the bad body dropped while still
|
|
54
55
|
* exiting non-zero (the desync a future optional-body op would hit).
|
|
55
56
|
*/
|
|
56
|
-
export declare function readBody(file: string | undefined, meta: Pick<OperationMeta, "bodyRequired">, deps: Pick<ResolvedDeps, "errOut"
|
|
57
|
+
export declare function readBody(file: string | undefined, meta: Pick<OperationMeta, "bodyRequired">, deps: Pick<ResolvedDeps, "errOut">, mode?: OutputMode): ReadBodyResult;
|
|
57
58
|
//# sourceMappingURL=run-operation.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-operation.d.ts","sourceRoot":"","sources":["../../src/core/run-operation.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAOH,OAAO,EAAQ,KAAK,aAAa,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"run-operation.d.ts","sourceRoot":"","sources":["../../src/core/run-operation.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAOH,OAAO,EAAQ,KAAK,aAAa,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAqB,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAIvE,mOAAmO;AACnO,wBAAgB,WAAW,CACzB,IAAI,EAAE,YAAY,EAClB,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,IAAI,CAAC,EAAE,UAAU,GAChB;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAU3C;AAED,6GAA6G;AAC7G,wBAAgB,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,aAAa,EAAE,cAAc,GAAG,YAAY,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,MAAM,CAMjH;AAED,iIAAiI;AACjI,wBAAgB,UAAU,CACxB,IAAI,EAAE,IAAI,CAAC,aAAa,EAAE,aAAa,CAAC,EACxC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC,CAQvD;AAED,MAAM,WAAW,SAAS;IACxB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC,CAAC;IAC7D,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;;GAKG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAkC5G;AAED,MAAM,MAAM,cAAc,GAAG;IAAE,IAAI,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,OAAO,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC;AAE/E,mLAAmL;AACnL,eAAO,MAAM,oBAAoB,gFAA8E,CAAC;AAEhH;;;;;;;;;GASG;AACH,wBAAgB,QAAQ,CACtB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,IAAI,EAAE,IAAI,CAAC,aAAa,EAAE,cAAc,CAAC,EACzC,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,EAClC,IAAI,CAAC,EAAE,UAAU,GAChB,cAAc,CAqBhB"}
|
|
@@ -14,14 +14,15 @@ import { renderError, renderResult } from "./output.js";
|
|
|
14
14
|
import { readSse } from "./sse.js";
|
|
15
15
|
import { SPEC } from "../generated/operations.js";
|
|
16
16
|
import { resolveOutputMode } from "../render/mode.js";
|
|
17
|
-
import { renderEventStream
|
|
18
|
-
|
|
19
|
-
|
|
17
|
+
import { renderEventStream } from "../watch.js";
|
|
18
|
+
import { watchResult } from "../watchers.js";
|
|
19
|
+
/** Resolves the api key + api url for a call, or reports the missing-key error and returns null. Shared by runOperation and the auth commands (login/whoami both need the same story). `mode` "json" reports it as a JSON line. */
|
|
20
|
+
export function credentials(deps, apiUrlFlag, mode) {
|
|
20
21
|
const cfg = readConfig(deps.dir);
|
|
21
22
|
const apiKey = resolveApiKey(cfg, deps.env);
|
|
22
23
|
const apiUrl = resolveApiUrl(cfg, apiUrlFlag, SPEC.server, deps.env);
|
|
23
24
|
if (!apiKey) {
|
|
24
|
-
deps.errOut(renderError(new Error("No api key configured. Run `ora login` or set ORA_API_KEY.")));
|
|
25
|
+
deps.errOut(renderError(new Error("No api key configured. Run `ora login` or set ORA_API_KEY."), { mode }));
|
|
25
26
|
process.exitCode = 1;
|
|
26
27
|
return null;
|
|
27
28
|
}
|
|
@@ -56,7 +57,7 @@ export async function runOperation(meta, values, deps) {
|
|
|
56
57
|
// Resolved ONCE and threaded through — no other call in this path
|
|
57
58
|
// re-derives mode from opts/env/tty.
|
|
58
59
|
const mode = resolveOutputMode({ json: values.json, plain: values.plain }, deps.env, deps.stdoutIsTty);
|
|
59
|
-
const creds = credentials(deps, values.apiUrlFlag);
|
|
60
|
+
const creds = credentials(deps, values.apiUrlFlag, mode);
|
|
60
61
|
if (!creds)
|
|
61
62
|
return;
|
|
62
63
|
const path = buildPath(meta, values.positionals);
|
|
@@ -75,13 +76,13 @@ export async function runOperation(meta, values, deps) {
|
|
|
75
76
|
...(values.body !== undefined ? { body: values.body } : {}),
|
|
76
77
|
});
|
|
77
78
|
if (meta.watchable && values.watch) {
|
|
78
|
-
await
|
|
79
|
+
await watchResult(data, { client, deps, mode });
|
|
79
80
|
return;
|
|
80
81
|
}
|
|
81
82
|
deps.out(renderResult(data, { mode }));
|
|
82
83
|
}
|
|
83
84
|
catch (err) {
|
|
84
|
-
deps.errOut(renderError(err, { scope: meta.scope }));
|
|
85
|
+
deps.errOut(renderError(err, { scope: meta.scope, mode }));
|
|
85
86
|
process.exitCode = 1;
|
|
86
87
|
}
|
|
87
88
|
}
|
|
@@ -97,10 +98,10 @@ export const MISSING_BODY_MESSAGE = 'This command requires a JSON body: pass --f
|
|
|
97
98
|
* silently dispatches the request with the bad body dropped while still
|
|
98
99
|
* exiting non-zero (the desync a future optional-body op would hit).
|
|
99
100
|
*/
|
|
100
|
-
export function readBody(file, meta, deps) {
|
|
101
|
+
export function readBody(file, meta, deps, mode) {
|
|
101
102
|
if (!file) {
|
|
102
103
|
if (meta.bodyRequired) {
|
|
103
|
-
deps.errOut(renderError(new Error(MISSING_BODY_MESSAGE)));
|
|
104
|
+
deps.errOut(renderError(new Error(MISSING_BODY_MESSAGE), { mode }));
|
|
104
105
|
process.exitCode = 2;
|
|
105
106
|
return { kind: "error" };
|
|
106
107
|
}
|
|
@@ -111,7 +112,9 @@ export function readBody(file, meta, deps) {
|
|
|
111
112
|
return { kind: "ok", body: JSON.parse(raw) };
|
|
112
113
|
}
|
|
113
114
|
catch (err) {
|
|
114
|
-
deps.errOut(renderError(new Error(`Could not read JSON body from ${file === "-" ? "stdin" : file}: ${err.message}`)
|
|
115
|
+
deps.errOut(renderError(new Error(`Could not read JSON body from ${file === "-" ? "stdin" : file}: ${err.message}`), {
|
|
116
|
+
mode,
|
|
117
|
+
}));
|
|
115
118
|
process.exitCode = 2;
|
|
116
119
|
return { kind: "error" };
|
|
117
120
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-operation.js","sourceRoot":"","sources":["../../src/core/run-operation.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,IAAI,EAAsB,MAAM,4BAA4B,CAAC;AAEtE,OAAO,EAAE,iBAAiB,
|
|
1
|
+
{"version":3,"file":"run-operation.js","sourceRoot":"","sources":["../../src/core/run-operation.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,7 +40,7 @@ export interface OperationMeta {
|
|
|
40
40
|
}
|
|
41
41
|
export declare const SPEC: {
|
|
42
42
|
readonly version: "1.0.0";
|
|
43
|
-
readonly contentHash: "
|
|
43
|
+
readonly contentHash: "9dad38738b7813e7e3ff8a1e2a2b8d342f84e26f546f0b814e593c7ff171dad4";
|
|
44
44
|
readonly server: "https://api.agentfront.sh";
|
|
45
45
|
readonly bin: "ora";
|
|
46
46
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operations.d.ts","sourceRoot":"","sources":["../../src/generated/operations.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAC;IACtC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,QAAQ,GAAG,OAAO,CAAC;IAC3D,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,MAAM,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,CAAC;IACpD,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,UAAU,EAAE,aAAa,EAAE,CAAC;IAC5B,WAAW,EAAE,cAAc,EAAE,CAAC;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,OAAO,CAAC;IACtB,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,IAAI,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACzC,UAAU,CAAC,EAAE,aAAa,EAAE,CAAC;CAC9B;AAED,eAAO,MAAM,IAAI;;;;;CAKP,CAAC;AAEX,eAAO,MAAM,UAAU,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"operations.d.ts","sourceRoot":"","sources":["../../src/generated/operations.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAC;IACtC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,QAAQ,GAAG,OAAO,CAAC;IAC3D,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,MAAM,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,CAAC;IACpD,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,UAAU,EAAE,aAAa,EAAE,CAAC;IAC5B,WAAW,EAAE,cAAc,EAAE,CAAC;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,OAAO,CAAC;IACtB,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,IAAI,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACzC,UAAU,CAAC,EAAE,aAAa,EAAE,CAAC;CAC9B;AAED,eAAO,MAAM,IAAI;;;;;CAKP,CAAC;AAEX,eAAO,MAAM,UAAU,EAAE,aAAa,EAuyRrC,CAAC"}
|