@paradigma-inc/flywheel 0.1.60 → 0.1.73
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 +35 -14
- package/package.json +4 -2
- package/skills/flywheel/SKILL.md +4 -3
- package/skills/flywheel/getting-started/flywheel-quickstart.md +4 -4
- package/skills/flywheel/references/flywheel-cli-tool-map.md +40 -36
- package/skills/flywheel/references/flywheel-mcp-tool-map.md +8 -5
- package/skills/flywheel/setting-up-flywheel/claude-code-cli-installation.md +3 -3
- package/skills/flywheel/setting-up-flywheel/codex-cli-installation.md +3 -3
- package/skills/flywheel/setting-up-flywheel/installation-overview.md +9 -8
- package/skills/flywheel/setting-up-flywheel/other-hosts-installation.md +1 -1
- package/skills/flywheel/setting-up-flywheel/updating-flywheel-mcp.md +4 -4
- package/skills/flywheel-auto/SKILL.md +4 -3
- package/skills/flywheel-auto/references/flywheel-cli-tool-map.md +37 -35
- package/skills/flywheel-auto/references/flywheel-mcp-tool-map.md +4 -4
- package/skills/flywheel-lookahead/SKILL.md +1 -1
- package/skills/flywheel-lookahead/references/flywheel-cli-tool-map.md +37 -35
- package/skills/flywheel-lookahead/references/flywheel-mcp-tool-map.md +4 -4
- package/skills/flywheel-prove/SKILL.md +1 -1
- package/skills/flywheel-reproduce/SKILL.md +4 -3
- package/skills/flywheel-reproduce/references/flywheel-cli-tool-map.md +37 -35
- package/skills/flywheel-reproduce/references/flywheel-mcp-tool-map.md +4 -4
- package/skills/flywheel-to-graph/SKILL.md +1 -1
- package/skills/flywheel-to-graph/references/flywheel-cli-tool-map.md +37 -35
- package/skills/flywheel-to-graph/references/flywheel-mcp-tool-map.md +4 -4
- package/skills/flywheel-tree/SKILL.md +1 -1
- package/src/cli.mjs +111 -26
- package/src/runtime/required-runtime-commands.json +2 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/_admin-auth.d.ts +3 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/_admin-auth.js +23 -4
- package/src/runtime/vendor/flywheel-cli-dist/commands/_admin-auth.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/_artifacts-upload-helpers.d.ts +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/_artifacts-upload-helpers.js +6 -5
- package/src/runtime/vendor/flywheel-cli-dist/commands/_artifacts-upload-helpers.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/_browser-handoff.d.ts +21 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/_browser-handoff.js +51 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/_browser-handoff.js.map +1 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/_open-url.d.ts +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/_open-url.js +6 -3
- package/src/runtime/vendor/flywheel-cli-dist/commands/_open-url.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/_secret-param.d.ts +7 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/_secret-param.js +18 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/_secret-param.js.map +1 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/account-detach.js +2 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/account-detach.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/account-emails-add.js +2 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/account-emails-add.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/account-emails-remove.js +2 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/account-emails-remove.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/account-emails-set-primary.js +2 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/account-emails-set-primary.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/account-get.d.ts +2 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/account-get.js +6 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/account-get.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/account-merge-preview.js +2 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/account-merge-preview.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/account-merge-proof.js +2 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/account-merge-proof.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/account-merge.js +2 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/account-merge.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/admin-compute-policy-get.js +2 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/admin-compute-policy-get.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/admin-compute-policy-set.js +49 -13
- package/src/runtime/vendor/flywheel-cli-dist/commands/admin-compute-policy-set.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/admin-graphs-export-stream.js +2 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/admin-graphs-export-stream.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/admin-graphs-export.js +2 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/admin-graphs-export.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/admin-graphs-list.js +2 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/admin-graphs-list.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/admin-nodes-audit-list.js +2 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/admin-nodes-audit-list.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/api-keys-list.d.ts +18 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/api-keys-list.js +38 -5
- package/src/runtime/vendor/flywheel-cli-dist/commands/api-keys-list.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/artifacts-delete.js +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/artifacts-delete.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/auth-mode.d.ts +4 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/auth-mode.js +42 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/auth-mode.js.map +1 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/auth-status.js +15 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/auth-status.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/compute-grants-list.js +8 -2
- package/src/runtime/vendor/flywheel-cli-dist/commands/compute-grants-list.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/compute-grants-request-approval.js +6 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/compute-grants-request-approval.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/compute-release-all.js +18 -7
- package/src/runtime/vendor/flywheel-cli-dist/commands/compute-release-all.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/credits-billing-portal.js +8 -4
- package/src/runtime/vendor/flywheel-cli-dist/commands/credits-billing-portal.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/credits-purchase.js +8 -4
- package/src/runtime/vendor/flywheel-cli-dist/commands/credits-purchase.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/credits-subscribe.js +8 -4
- package/src/runtime/vendor/flywheel-cli-dist/commands/credits-subscribe.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/destructive-confirmation.d.ts +2 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/destructive-confirmation.js +7 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/destructive-confirmation.js.map +1 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/enums.d.ts +2 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/enums.js +1 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/enums.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/export-history.js +2 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/export-history.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/export-subgraph.js +12 -4
- package/src/runtime/vendor/flywheel-cli-dist/commands/export-subgraph.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/github-link.js +9 -14
- package/src/runtime/vendor/flywheel-cli-dist/commands/github-link.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/help-format.d.ts +31 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/help-format.js +69 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/help-format.js.map +1 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/help.d.ts +4 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/help.js +181 -129
- package/src/runtime/vendor/flywheel-cli-dist/commands/help.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/index.js +4 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/index.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/integrations-huggingface-set.js +7 -3
- package/src/runtime/vendor/flywheel-cli-dist/commands/integrations-huggingface-set.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/integrations-wandb-set.js +6 -2
- package/src/runtime/vendor/flywheel-cli-dist/commands/integrations-wandb-set.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/nodes-add-parent.js +6 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/nodes-add-parent.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/nodes-delete-bulk.js +2 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/nodes-delete-bulk.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/nodes-delete.js +2 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/nodes-delete.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/nodes-remove-parent.js +8 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/nodes-remove-parent.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/nodes-resolve-slug.js +55 -2
- package/src/runtime/vendor/flywheel-cli-dist/commands/nodes-resolve-slug.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/profile-list.js +13 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/profile-list.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/profile-show.js +16 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/profile-show.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry/account.js +8 -7
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry/account.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry/admin.js +14 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry/admin.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry/api-keys.js +8 -2
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry/api-keys.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry/approval.js +29 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry/approval.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry/artifacts.js +13 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry/artifacts.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry/budgets.js +11 -2
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry/budgets.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry/compute.js +2 -2
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry/compute.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry/credits.js +8 -6
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry/credits.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry/github.js +6 -14
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry/github.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry/hooks.d.ts +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry/hooks.js +193 -125
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry/hooks.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry/integrations.js +22 -8
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry/integrations.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry/lifecycle.js +123 -11
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry/lifecycle.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry/sharing.js +12 -4
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry/sharing.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry.d.ts +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry.js +42 -9
- package/src/runtime/vendor/flywheel-cli-dist/commands/registry.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/commands/remote-artifacts-refresh.d.ts +2 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/remote-artifacts-refresh.js +20 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/remote-artifacts-refresh.js.map +1 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/remote-artifacts-resolve.d.ts +2 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/remote-artifacts-resolve.js +23 -0
- package/src/runtime/vendor/flywheel-cli-dist/commands/remote-artifacts-resolve.js.map +1 -0
- package/src/runtime/vendor/flywheel-cli-dist/errors.d.ts +15 -0
- package/src/runtime/vendor/flywheel-cli-dist/errors.js +16 -1
- package/src/runtime/vendor/flywheel-cli-dist/errors.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/http/client.d.ts +1 -0
- package/src/runtime/vendor/flywheel-cli-dist/http/client.js +75 -19
- package/src/runtime/vendor/flywheel-cli-dist/http/client.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/http/debug.d.ts +3 -0
- package/src/runtime/vendor/flywheel-cli-dist/http/debug.js +21 -2
- package/src/runtime/vendor/flywheel-cli-dist/http/debug.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/main.js +118 -9
- package/src/runtime/vendor/flywheel-cli-dist/main.js.map +1 -1
- package/src/runtime/vendor/flywheel-cli-dist/output/format.js +44 -6
- package/src/runtime/vendor/flywheel-cli-dist/output/format.js.map +1 -1
- package/src/runtime/vendor/manifest.json +22 -1
- package/src/setup/base-url.mjs +43 -0
- package/src/setup/command.mjs +2 -0
- package/src/setup/modes/cli.mjs +33 -10
- package/src/setup/modes/mcp-command.mjs +48 -19
- package/src/setup/resolved-selection-record.mjs +25 -0
- package/src/setup-auth.mjs +3 -2
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { randomUUID } from 'node:crypto';
|
|
2
2
|
import { CliApprovalPendingError, } from '../errors.js';
|
|
3
3
|
import { EXIT_AUTH, EXIT_TRANSPORT, } from '../exit-codes.js';
|
|
4
|
-
import { maskForDebug, maskQueryString } from './debug.js';
|
|
4
|
+
import { maskForDebug, maskQueryString, redactExternalUrlForOutput, } from './debug.js';
|
|
5
5
|
import { isRetryableNetworkError, isRetryableStatus, parseRetryAfterMs, withRetry, } from './retry.js';
|
|
6
6
|
export class CliHttpError extends Error {
|
|
7
7
|
exitCode;
|
|
@@ -25,6 +25,15 @@ class RetryableHttpError extends CliHttpError {
|
|
|
25
25
|
this.retryAfterMs = retryAfterMs;
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
|
+
const API_VERSION_PREFIX = '/v1';
|
|
29
|
+
const ROOT_ONLY_PREFIXES = [
|
|
30
|
+
'/admin',
|
|
31
|
+
'/auth/accounts',
|
|
32
|
+
'/auth/github',
|
|
33
|
+
'/auth/integrations',
|
|
34
|
+
'/health',
|
|
35
|
+
'/repos',
|
|
36
|
+
];
|
|
28
37
|
function mapStatusToExitCode(status) {
|
|
29
38
|
if (status === 401 || status === 403) {
|
|
30
39
|
return EXIT_AUTH;
|
|
@@ -54,6 +63,51 @@ function toQueryString(query) {
|
|
|
54
63
|
const encoded = params.toString();
|
|
55
64
|
return encoded ? `?${encoded}` : '';
|
|
56
65
|
}
|
|
66
|
+
function normalizeInternalPath(path) {
|
|
67
|
+
return path.startsWith('/') ? path : `/${path}`;
|
|
68
|
+
}
|
|
69
|
+
function normalizeApiVersionPrefix(prefix) {
|
|
70
|
+
const raw = prefix ?? API_VERSION_PREFIX;
|
|
71
|
+
const normalized = raw.trim();
|
|
72
|
+
if (normalized === '' || normalized === '/') {
|
|
73
|
+
return '';
|
|
74
|
+
}
|
|
75
|
+
return `/${normalized.replace(/^\/+|\/+$/g, '')}`;
|
|
76
|
+
}
|
|
77
|
+
function stripTrailingApiVersionPrefixFromBaseUrl(baseUrl, apiVersionPrefix) {
|
|
78
|
+
const normalizedBase = baseUrl.replace(/\/+$/, '');
|
|
79
|
+
if (apiVersionPrefix === '') {
|
|
80
|
+
return normalizedBase;
|
|
81
|
+
}
|
|
82
|
+
try {
|
|
83
|
+
const parsed = new URL(normalizedBase);
|
|
84
|
+
const cleanPath = parsed.pathname.replace(/\/+$/u, '');
|
|
85
|
+
if (cleanPath === apiVersionPrefix || cleanPath.endsWith(apiVersionPrefix)) {
|
|
86
|
+
parsed.pathname = cleanPath.slice(0, -apiVersionPrefix.length) || '/';
|
|
87
|
+
parsed.search = '';
|
|
88
|
+
parsed.hash = '';
|
|
89
|
+
return parsed.toString().replace(/\/+$/, '');
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
catch {
|
|
93
|
+
return normalizedBase;
|
|
94
|
+
}
|
|
95
|
+
return normalizedBase;
|
|
96
|
+
}
|
|
97
|
+
function isRootOnlyPath(path) {
|
|
98
|
+
return ROOT_ONLY_PREFIXES.some((prefix) => path === prefix || path.startsWith(`${prefix}/`));
|
|
99
|
+
}
|
|
100
|
+
function versionedRequestPath(path, apiVersionPrefix) {
|
|
101
|
+
const normalized = normalizeInternalPath(path);
|
|
102
|
+
if (apiVersionPrefix === '' || isRootOnlyPath(normalized)) {
|
|
103
|
+
return normalized;
|
|
104
|
+
}
|
|
105
|
+
if (normalized === apiVersionPrefix ||
|
|
106
|
+
normalized.startsWith(`${apiVersionPrefix}/`)) {
|
|
107
|
+
return normalized;
|
|
108
|
+
}
|
|
109
|
+
return `${apiVersionPrefix}${normalized}`;
|
|
110
|
+
}
|
|
57
111
|
function baseUrlLooksLikeOriginRoot(baseUrl) {
|
|
58
112
|
try {
|
|
59
113
|
const parsed = new URL(baseUrl);
|
|
@@ -107,7 +161,8 @@ function isApprovalRequiredBody(body) {
|
|
|
107
161
|
}
|
|
108
162
|
export function createHttpClient(options) {
|
|
109
163
|
const transport = options.transport ?? fetch;
|
|
110
|
-
const
|
|
164
|
+
const apiVersionPrefix = normalizeApiVersionPrefix(options.apiVersionPrefix);
|
|
165
|
+
const normalizedBase = stripTrailingApiVersionPrefixFromBaseUrl(options.baseUrl, apiVersionPrefix);
|
|
111
166
|
const invocationId = options.invocationId ?? randomUUID();
|
|
112
167
|
const retryMax = options.retryMax ?? 3;
|
|
113
168
|
const warnedPaths = new Set();
|
|
@@ -130,8 +185,8 @@ export function createHttpClient(options) {
|
|
|
130
185
|
const debug = options.debug ?? false;
|
|
131
186
|
const debugLog = options.debugLog ?? ((line) => process.stderr.write(`${line}\n`));
|
|
132
187
|
const timeoutMs = options.timeoutMs ?? 300_000;
|
|
133
|
-
async function doRequest(method,
|
|
134
|
-
const url = new URL(`${normalizedBase}${
|
|
188
|
+
async function doRequest(method, requestPath, requestOptions, idempotencyKey, requestId) {
|
|
189
|
+
const url = new URL(`${normalizedBase}${requestPath}${toQueryString(requestOptions?.query)}`);
|
|
135
190
|
const headers = {
|
|
136
191
|
Accept: 'application/json',
|
|
137
192
|
};
|
|
@@ -199,12 +254,13 @@ export function createHttpClient(options) {
|
|
|
199
254
|
return response;
|
|
200
255
|
}
|
|
201
256
|
async function requestWithRetry(method, path, requestOptions) {
|
|
257
|
+
const requestPath = versionedRequestPath(path, apiVersionPrefix);
|
|
202
258
|
const idempotencyKey = options.idempotencyKey ?? randomUUID();
|
|
203
259
|
const requestId = randomUUID();
|
|
204
260
|
const fn = async () => {
|
|
205
261
|
let response;
|
|
206
262
|
try {
|
|
207
|
-
response = await doRequest(method,
|
|
263
|
+
response = await doRequest(method, requestPath, requestOptions, idempotencyKey, requestId);
|
|
208
264
|
}
|
|
209
265
|
catch (error) {
|
|
210
266
|
// Network/transport layer errors propagate (retry layer decides).
|
|
@@ -213,7 +269,7 @@ export function createHttpClient(options) {
|
|
|
213
269
|
}
|
|
214
270
|
throw new CliHttpError('transport error', EXIT_TRANSPORT, undefined, undefined, {
|
|
215
271
|
method,
|
|
216
|
-
path,
|
|
272
|
+
path: requestPath,
|
|
217
273
|
requestId,
|
|
218
274
|
});
|
|
219
275
|
}
|
|
@@ -239,27 +295,27 @@ export function createHttpClient(options) {
|
|
|
239
295
|
serverResponse: snapshotResponse(response.status, body),
|
|
240
296
|
request: {
|
|
241
297
|
method,
|
|
242
|
-
path,
|
|
298
|
+
path: requestPath,
|
|
243
299
|
requestId,
|
|
244
300
|
},
|
|
245
301
|
});
|
|
246
302
|
}
|
|
247
303
|
if (isRetryableStatus(response.status)) {
|
|
248
304
|
const retryAfterMs = parseRetryAfterMs(response.headers.get('retry-after'));
|
|
249
|
-
throw new RetryableHttpError(buildHttpErrorMessage(response.status, options.baseUrl), response.status, retryAfterMs, body, { method, path, requestId });
|
|
305
|
+
throw new RetryableHttpError(buildHttpErrorMessage(response.status, options.baseUrl), response.status, retryAfterMs, body, { method, path: requestPath, requestId });
|
|
250
306
|
}
|
|
251
307
|
if (response.status === 426) {
|
|
252
|
-
throw new CliHttpError('upgrade required: install the latest @paradigma-inc/flywheel package', EXIT_TRANSPORT, 426, body, { method, path, requestId });
|
|
308
|
+
throw new CliHttpError('upgrade required: install the latest @paradigma-inc/flywheel package', EXIT_TRANSPORT, 426, body, { method, path: requestPath, requestId });
|
|
253
309
|
}
|
|
254
310
|
if (response.status === 410) {
|
|
255
311
|
const hint = body && typeof body === 'object' && typeof body.replacement === 'string'
|
|
256
312
|
? body.replacement
|
|
257
313
|
: null;
|
|
258
|
-
throw new CliHttpError(`resource gone${hint ? ` — use ${hint}` : ''}`, EXIT_TRANSPORT, 410, body, { method, path, requestId });
|
|
314
|
+
throw new CliHttpError(`resource gone${hint ? ` — use ${hint}` : ''}`, EXIT_TRANSPORT, 410, body, { method, path: requestPath, requestId });
|
|
259
315
|
}
|
|
260
|
-
throw new CliHttpError(buildHttpErrorMessage(response.status, options.baseUrl), mapStatusToExitCode(response.status), response.status, body, { method, path, requestId });
|
|
316
|
+
throw new CliHttpError(buildHttpErrorMessage(response.status, options.baseUrl), mapStatusToExitCode(response.status), response.status, body, { method, path: requestPath, requestId });
|
|
261
317
|
}
|
|
262
|
-
emitDeprecationWarning(
|
|
318
|
+
emitDeprecationWarning(requestPath, response, debugLog);
|
|
263
319
|
return response;
|
|
264
320
|
};
|
|
265
321
|
try {
|
|
@@ -294,7 +350,7 @@ export function createHttpClient(options) {
|
|
|
294
350
|
throw error;
|
|
295
351
|
}
|
|
296
352
|
const detail = error instanceof Error ? error.message : String(error);
|
|
297
|
-
throw new CliHttpError(`transport error: ${detail}`, EXIT_TRANSPORT, undefined, undefined, { method, path, requestId });
|
|
353
|
+
throw new CliHttpError(`transport error: ${detail}`, EXIT_TRANSPORT, undefined, undefined, { method, path: requestPath, requestId });
|
|
298
354
|
}
|
|
299
355
|
}
|
|
300
356
|
return {
|
|
@@ -323,7 +379,7 @@ export function createHttpClient(options) {
|
|
|
323
379
|
Object.assign(headers, rawOptions.extraHeaders);
|
|
324
380
|
}
|
|
325
381
|
if (debug) {
|
|
326
|
-
debugLog(`DEBUG: ${method} ${
|
|
382
|
+
debugLog(`DEBUG: ${method} ${redactExternalUrlForOutput(absoluteUrl)} (external) ${JSON.stringify({
|
|
327
383
|
headers: maskForDebug(headers),
|
|
328
384
|
})}`);
|
|
329
385
|
}
|
|
@@ -348,10 +404,10 @@ export function createHttpClient(options) {
|
|
|
348
404
|
catch (error) {
|
|
349
405
|
// Mirror internal-request semantics so callers always receive a
|
|
350
406
|
// structured CliHttpError envelope (with EXIT_TRANSPORT + the
|
|
351
|
-
//
|
|
352
|
-
// bubbling out through the generic Error path in runCli.
|
|
353
|
-
|
|
354
|
-
throw new CliHttpError(`transport error
|
|
407
|
+
// redacted external URL as `request.path`) instead of a raw network
|
|
408
|
+
// error bubbling out through the generic Error path in runCli.
|
|
409
|
+
void error;
|
|
410
|
+
throw new CliHttpError(`transport error while contacting ${redactExternalUrlForOutput(absoluteUrl)}`, EXIT_TRANSPORT, undefined, undefined, { method, path: redactExternalUrlForOutput(absoluteUrl) });
|
|
355
411
|
}
|
|
356
412
|
}
|
|
357
413
|
finally {
|
|
@@ -360,7 +416,7 @@ export function createHttpClient(options) {
|
|
|
360
416
|
clearInterval(progressInterval);
|
|
361
417
|
}
|
|
362
418
|
if (debug) {
|
|
363
|
-
debugLog(`DEBUG: ${method} ${
|
|
419
|
+
debugLog(`DEBUG: ${method} ${redactExternalUrlForOutput(absoluteUrl)} (external) -> ${response.status}`);
|
|
364
420
|
}
|
|
365
421
|
return response;
|
|
366
422
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/http/client.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/http/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,5 @@
|
|
|
1
|
+
export declare const REDACTED_EXTERNAL_URL = "[external URL redacted]";
|
|
1
2
|
export declare function maskForDebug(value: unknown): unknown;
|
|
3
|
+
export declare function maskSensitiveForOutput(value: unknown): unknown;
|
|
2
4
|
export declare function maskQueryString(query: string): string;
|
|
5
|
+
export declare function redactExternalUrlForOutput(target: string): string;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
const SENSITIVE_KEY_PATTERN = /api[_-]?key|token|password|secret|bearer|credential/i;
|
|
1
|
+
const SENSITIVE_KEY_PATTERN = /api[_-]?key|token|password|secret|bearer|credential|ticket|sig|signature/i;
|
|
2
2
|
const MASK = '***';
|
|
3
|
+
export const REDACTED_EXTERNAL_URL = '[external URL redacted]';
|
|
3
4
|
function isPlainObject(value) {
|
|
4
5
|
return (value !== null &&
|
|
5
6
|
typeof value === 'object' &&
|
|
@@ -28,8 +29,11 @@ function maskJson(value) {
|
|
|
28
29
|
}
|
|
29
30
|
if (isPlainObject(value)) {
|
|
30
31
|
const out = {};
|
|
32
|
+
const sensitiveValidationInput = Array.isArray(value.loc) &&
|
|
33
|
+
value.loc.some((part) => typeof part === 'string' && SENSITIVE_KEY_PATTERN.test(part));
|
|
31
34
|
for (const [key, nested] of Object.entries(value)) {
|
|
32
|
-
if (SENSITIVE_KEY_PATTERN.test(key)
|
|
35
|
+
if (SENSITIVE_KEY_PATTERN.test(key) ||
|
|
36
|
+
(sensitiveValidationInput && key === 'input')) {
|
|
33
37
|
out[key] = MASK;
|
|
34
38
|
}
|
|
35
39
|
else {
|
|
@@ -47,6 +51,9 @@ export function maskForDebug(value) {
|
|
|
47
51
|
}
|
|
48
52
|
return maskJson(value);
|
|
49
53
|
}
|
|
54
|
+
export function maskSensitiveForOutput(value) {
|
|
55
|
+
return maskJson(value);
|
|
56
|
+
}
|
|
50
57
|
export function maskQueryString(query) {
|
|
51
58
|
if (!query) {
|
|
52
59
|
return query;
|
|
@@ -65,4 +72,16 @@ export function maskQueryString(query) {
|
|
|
65
72
|
const result = masked.toString();
|
|
66
73
|
return query.startsWith('?') ? (result ? `?${result}` : '') : result;
|
|
67
74
|
}
|
|
75
|
+
export function redactExternalUrlForOutput(target) {
|
|
76
|
+
try {
|
|
77
|
+
const url = new URL(target);
|
|
78
|
+
if (url.protocol === 'http:' || url.protocol === 'https:') {
|
|
79
|
+
return REDACTED_EXTERNAL_URL;
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
catch {
|
|
83
|
+
return REDACTED_EXTERNAL_URL;
|
|
84
|
+
}
|
|
85
|
+
return REDACTED_EXTERNAL_URL;
|
|
86
|
+
}
|
|
68
87
|
//# sourceMappingURL=debug.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug.js","sourceRoot":"","sources":["../../src/http/debug.ts"],"names":[],"mappings":"AAAA,MAAM,qBAAqB,
|
|
1
|
+
{"version":3,"file":"debug.js","sourceRoot":"","sources":["../../src/http/debug.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,11 +13,12 @@ import { BUILTIN_PROFILE_NAMES, isBuiltinProfileName, resolveBuiltinBaseUrl, } f
|
|
|
13
13
|
import { renderCommandHelp, renderCommandHelpAsJson, renderHelp, renderHelpAsJson, } from './commands/help.js';
|
|
14
14
|
import { getCommandByName } from './commands/registry.js';
|
|
15
15
|
import { MVP_COMMAND_HANDLERS } from './commands/index.js';
|
|
16
|
-
import { CliApprovalPendingError, CliFinalizeFailedError, CliUsageError, CliWaitTimeoutError, } from './errors.js';
|
|
16
|
+
import { CliApprovalPendingError, CliAuthRequirementError, CliFinalizeFailedError, CliUsageError, CliWaitTimeoutError, } from './errors.js';
|
|
17
17
|
import { EXIT_TRANSPORT, EXIT_USAGE } from './exit-codes.js';
|
|
18
|
-
import { extractGlobals } from './grammar/globals.js';
|
|
18
|
+
import { extractGlobals, GLOBAL_FLAG_NAMES } from './grammar/globals.js';
|
|
19
19
|
import { parseCliArgs } from './grammar/parse.js';
|
|
20
20
|
import { CliHttpError, createHttpClient } from './http/client.js';
|
|
21
|
+
import { maskSensitiveForOutput } from './http/debug.js';
|
|
21
22
|
import { renderOutput } from './output/format.js';
|
|
22
23
|
import { CLI_VERSION } from './version.js';
|
|
23
24
|
function defaultStdout(chunk) {
|
|
@@ -149,6 +150,7 @@ const VALID_TOPIC_IDS = new Set([
|
|
|
149
150
|
'profile',
|
|
150
151
|
'nodes-graph',
|
|
151
152
|
'artifacts-files',
|
|
153
|
+
'hooks',
|
|
152
154
|
'compute-executions',
|
|
153
155
|
'approvals-budgets',
|
|
154
156
|
'export-import',
|
|
@@ -216,6 +218,20 @@ const RUNTIME_CONFIG_OPTIONAL_COMMANDS = new Set([
|
|
|
216
218
|
'env:list',
|
|
217
219
|
'env:switch',
|
|
218
220
|
]);
|
|
221
|
+
const API_KEY_BOUND_BROWSER_AND_INTEGRATION_COMMANDS = new Set([
|
|
222
|
+
'credits:purchase',
|
|
223
|
+
'credits:subscribe',
|
|
224
|
+
'credits:billing-portal',
|
|
225
|
+
'github:link',
|
|
226
|
+
'github:refresh-repos',
|
|
227
|
+
'github:disconnect',
|
|
228
|
+
'integrations:wandb:set',
|
|
229
|
+
'integrations:wandb:remove',
|
|
230
|
+
'integrations:huggingface:set',
|
|
231
|
+
'integrations:huggingface:remove',
|
|
232
|
+
]);
|
|
233
|
+
const RAW_API_KEY_ALLOWLIST_DETAIL = 'API key authentication is not allowed on this endpoint';
|
|
234
|
+
const CLI_API_KEY_BOUND_ALLOWLIST_DETAIL = 'API-key access is unavailable for this command. Update the server API-key route allowlist for this endpoint.';
|
|
219
235
|
function isHelpToken(token) {
|
|
220
236
|
return HELP_TOKENS.has(token);
|
|
221
237
|
}
|
|
@@ -322,6 +338,24 @@ function buildMissingParamHint(commandName, message) {
|
|
|
322
338
|
}
|
|
323
339
|
return lines.join('\n');
|
|
324
340
|
}
|
|
341
|
+
function validateCommandSpecificFlags(commandName, params) {
|
|
342
|
+
const command = getCommandByName(commandName);
|
|
343
|
+
if (!command) {
|
|
344
|
+
return;
|
|
345
|
+
}
|
|
346
|
+
const allowed = new Set([
|
|
347
|
+
...command.required.map((param) => param.name),
|
|
348
|
+
...command.optional.map((param) => param.name),
|
|
349
|
+
]);
|
|
350
|
+
for (const flagName of Object.keys(params)) {
|
|
351
|
+
if (GLOBAL_FLAG_NAMES.has(flagName)) {
|
|
352
|
+
continue;
|
|
353
|
+
}
|
|
354
|
+
if (!allowed.has(flagName)) {
|
|
355
|
+
throw new CliUsageError(`unknown flag for ${commandName}: --${flagName}`);
|
|
356
|
+
}
|
|
357
|
+
}
|
|
358
|
+
}
|
|
325
359
|
function buildCommitSchemaHint(commandName, message) {
|
|
326
360
|
const command = getCommandByName(commandName);
|
|
327
361
|
if (!command?.schema) {
|
|
@@ -355,6 +389,23 @@ function buildLocalhostTransportHint(message, baseUrl) {
|
|
|
355
389
|
lines.push(' Run `npx --yes @paradigma-inc/flywheel setup --mode cli` to configure Flywheel.');
|
|
356
390
|
return lines.join('\n');
|
|
357
391
|
}
|
|
392
|
+
function looksLikeNodeSlug(value) {
|
|
393
|
+
return /^[a-z][a-z0-9]*-[a-z][a-z0-9]*-\d{4}$/.test(value);
|
|
394
|
+
}
|
|
395
|
+
function buildNodeSlugMissHint(args) {
|
|
396
|
+
const { commandName, status, params, message } = args;
|
|
397
|
+
if (commandName !== 'nodes:get' || status !== 404) {
|
|
398
|
+
return message;
|
|
399
|
+
}
|
|
400
|
+
const nodeId = params.node_id;
|
|
401
|
+
if (typeof nodeId !== 'string' || !looksLikeNodeSlug(nodeId.trim())) {
|
|
402
|
+
return message;
|
|
403
|
+
}
|
|
404
|
+
return [
|
|
405
|
+
message,
|
|
406
|
+
`hint: node_id looks like a slug. Use \`flywheel nodes:resolve-slug --slug_name ${nodeId.trim()}\` to resolve it.`,
|
|
407
|
+
].join('\n');
|
|
408
|
+
}
|
|
358
409
|
function formatConfigPathForMessage(configPath) {
|
|
359
410
|
const homeDir = os.homedir();
|
|
360
411
|
const withSlash = `${homeDir}/`;
|
|
@@ -373,6 +424,30 @@ function buildMissingRuntimeConfigMessage(configPath) {
|
|
|
373
424
|
// setup only touches host MCP entries, not the runtime CLI config.
|
|
374
425
|
return `Flywheel CLI runtime config not found at ${displayPath}. Run \`npx --yes @paradigma-inc/flywheel setup --mode cli\` to configure Flywheel.`;
|
|
375
426
|
}
|
|
427
|
+
function isPolicyBlockedResponseBody(body) {
|
|
428
|
+
if (!body || typeof body !== 'object') {
|
|
429
|
+
return false;
|
|
430
|
+
}
|
|
431
|
+
const detail = body.detail;
|
|
432
|
+
if (!detail || typeof detail !== 'object') {
|
|
433
|
+
return false;
|
|
434
|
+
}
|
|
435
|
+
return detail.type === 'policy_blocked';
|
|
436
|
+
}
|
|
437
|
+
function isRawApiKeyAllowlistResponseBody(body) {
|
|
438
|
+
if (!body || typeof body !== 'object') {
|
|
439
|
+
return false;
|
|
440
|
+
}
|
|
441
|
+
return body.detail === RAW_API_KEY_ALLOWLIST_DETAIL;
|
|
442
|
+
}
|
|
443
|
+
function responseBodyForCliError(commandName, body) {
|
|
444
|
+
const maskedBody = maskSensitiveForOutput(body);
|
|
445
|
+
if (API_KEY_BOUND_BROWSER_AND_INTEGRATION_COMMANDS.has(commandName) &&
|
|
446
|
+
isRawApiKeyAllowlistResponseBody(maskedBody)) {
|
|
447
|
+
return { detail: CLI_API_KEY_BOUND_ALLOWLIST_DETAIL };
|
|
448
|
+
}
|
|
449
|
+
return maskedBody;
|
|
450
|
+
}
|
|
376
451
|
async function defaultConfigExists(filePath) {
|
|
377
452
|
try {
|
|
378
453
|
await access(filePath);
|
|
@@ -507,6 +582,7 @@ export async function runCli(argv, dependencies = {}) {
|
|
|
507
582
|
let effectiveBaseUrl = DEFAULT_BASE_URL;
|
|
508
583
|
let globals = {};
|
|
509
584
|
try {
|
|
585
|
+
validateCommandSpecificFlags(commandName, parsed.params);
|
|
510
586
|
const extracted = extractGlobals(parsed.params);
|
|
511
587
|
globals = { ...extracted.globals, format: parsed.format, formatExplicit: parsed.formatExplicit };
|
|
512
588
|
const { handlerParams, flagNames } = extracted;
|
|
@@ -570,9 +646,12 @@ export async function runCli(argv, dependencies = {}) {
|
|
|
570
646
|
const config = await loadConfig(configPath);
|
|
571
647
|
const runtimeConfig = await resolveRuntimeAuthConfig(config, profile, resolveEnvApiKey);
|
|
572
648
|
effectiveBaseUrl = runtimeConfig.baseUrl;
|
|
649
|
+
const commandDefaultFormat = commandName === 'api-keys:list' ? 'table' : parsed.format;
|
|
573
650
|
const effectiveFormat = parsed.formatExplicit
|
|
574
651
|
? parsed.format
|
|
575
|
-
:
|
|
652
|
+
: commandName === 'api-keys:list'
|
|
653
|
+
? commandDefaultFormat
|
|
654
|
+
: (runtimeConfig.defaultFormat ?? commandDefaultFormat);
|
|
576
655
|
const profileTimeoutS = typeof profile?.defaultTimeoutS === 'number' ? profile.defaultTimeoutS : undefined;
|
|
577
656
|
const effectiveTimeoutMs = typeof globals.timeoutS === 'number'
|
|
578
657
|
? globals.timeoutS * 1000
|
|
@@ -641,6 +720,25 @@ export async function runCli(argv, dependencies = {}) {
|
|
|
641
720
|
return 0;
|
|
642
721
|
}
|
|
643
722
|
catch (error) {
|
|
723
|
+
if (error instanceof CliAuthRequirementError) {
|
|
724
|
+
const envelope = {
|
|
725
|
+
error: {
|
|
726
|
+
code: error.code,
|
|
727
|
+
message: error.message,
|
|
728
|
+
exit_code: error.exitCode,
|
|
729
|
+
command: error.commandName,
|
|
730
|
+
},
|
|
731
|
+
};
|
|
732
|
+
const errBody = envelope.error;
|
|
733
|
+
if (error.url) {
|
|
734
|
+
errBody.url = error.url;
|
|
735
|
+
}
|
|
736
|
+
if (error.nextAction) {
|
|
737
|
+
errBody.next_action = error.nextAction;
|
|
738
|
+
}
|
|
739
|
+
writeLine(stderr, JSON.stringify(envelope));
|
|
740
|
+
return error.exitCode;
|
|
741
|
+
}
|
|
644
742
|
if (error instanceof CliUsageError) {
|
|
645
743
|
const augmented = error.message.startsWith('missing required parameter')
|
|
646
744
|
? buildMissingParamHint(commandName, error.message)
|
|
@@ -709,11 +807,19 @@ export async function runCli(argv, dependencies = {}) {
|
|
|
709
807
|
message = buildCommitSchemaHint(commandName, message);
|
|
710
808
|
}
|
|
711
809
|
message = buildLocalhostTransportHint(message, effectiveBaseUrl);
|
|
712
|
-
|
|
713
|
-
|
|
714
|
-
: error.status
|
|
715
|
-
|
|
716
|
-
|
|
810
|
+
message = buildNodeSlugMissHint({
|
|
811
|
+
commandName,
|
|
812
|
+
status: error.status,
|
|
813
|
+
params: parsed.params,
|
|
814
|
+
message,
|
|
815
|
+
});
|
|
816
|
+
const code = error.status === 403 && isPolicyBlockedResponseBody(error.body)
|
|
817
|
+
? 'policy_blocked'
|
|
818
|
+
: error.status === 401 || error.status === 403
|
|
819
|
+
? 'auth_error'
|
|
820
|
+
: error.status === undefined
|
|
821
|
+
? 'transport_error'
|
|
822
|
+
: 'http_error';
|
|
717
823
|
const envelope = {
|
|
718
824
|
error: {
|
|
719
825
|
code,
|
|
@@ -723,7 +829,10 @@ export async function runCli(argv, dependencies = {}) {
|
|
|
723
829
|
};
|
|
724
830
|
const inner = envelope.error;
|
|
725
831
|
if (typeof error.status === 'number') {
|
|
726
|
-
inner.server_response = {
|
|
832
|
+
inner.server_response = {
|
|
833
|
+
status: error.status,
|
|
834
|
+
body: responseBodyForCliError(commandName, error.body),
|
|
835
|
+
};
|
|
727
836
|
}
|
|
728
837
|
if (error.request) {
|
|
729
838
|
inner.request = {
|