@agentuity/cli 1.0.7 → 1.0.9
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/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +32 -4
- package/dist/cli.js.map +1 -1
- package/dist/cmd/ai/claude-code/constants.d.ts +13 -0
- package/dist/cmd/ai/claude-code/constants.d.ts.map +1 -0
- package/dist/cmd/ai/claude-code/constants.js +16 -0
- package/dist/cmd/ai/claude-code/constants.js.map +1 -0
- package/dist/cmd/ai/claude-code/index.d.ts +3 -0
- package/dist/cmd/ai/claude-code/index.d.ts.map +1 -0
- package/dist/cmd/ai/claude-code/index.js +22 -0
- package/dist/cmd/ai/claude-code/index.js.map +1 -0
- package/dist/cmd/ai/claude-code/install.d.ts +3 -0
- package/dist/cmd/ai/claude-code/install.d.ts.map +1 -0
- package/dist/cmd/ai/claude-code/install.js +133 -0
- package/dist/cmd/ai/claude-code/install.js.map +1 -0
- package/dist/cmd/ai/claude-code/uninstall.d.ts +3 -0
- package/dist/cmd/ai/claude-code/uninstall.d.ts.map +1 -0
- package/dist/cmd/ai/claude-code/uninstall.js +105 -0
- package/dist/cmd/ai/claude-code/uninstall.js.map +1 -0
- package/dist/cmd/ai/index.d.ts.map +1 -1
- package/dist/cmd/ai/index.js +6 -0
- package/dist/cmd/ai/index.js.map +1 -1
- package/dist/cmd/build/vite/db-rewrite.d.ts +50 -0
- package/dist/cmd/build/vite/db-rewrite.d.ts.map +1 -0
- package/dist/cmd/build/vite/db-rewrite.js +169 -0
- package/dist/cmd/build/vite/db-rewrite.js.map +1 -0
- package/dist/cmd/build/vite/registry-generator.d.ts.map +1 -1
- package/dist/cmd/build/vite/registry-generator.js +7 -0
- package/dist/cmd/build/vite/registry-generator.js.map +1 -1
- package/dist/cmd/build/vite/server-bundler.d.ts.map +1 -1
- package/dist/cmd/build/vite/server-bundler.js +71 -1
- package/dist/cmd/build/vite/server-bundler.js.map +1 -1
- package/dist/cmd/canary/index.d.ts.map +1 -1
- package/dist/cmd/canary/index.js +3 -1
- package/dist/cmd/canary/index.js.map +1 -1
- package/dist/cmd/cloud/agent/list.d.ts.map +1 -1
- package/dist/cmd/cloud/agent/list.js +17 -4
- package/dist/cmd/cloud/agent/list.js.map +1 -1
- package/dist/cmd/cloud/apikey/list.d.ts.map +1 -1
- package/dist/cmd/cloud/apikey/list.js +3 -0
- package/dist/cmd/cloud/apikey/list.js.map +1 -1
- package/dist/cmd/cloud/db/list.d.ts.map +1 -1
- package/dist/cmd/cloud/db/list.js +2 -1
- package/dist/cmd/cloud/db/list.js.map +1 -1
- package/dist/cmd/cloud/deployment/list.d.ts.map +1 -1
- package/dist/cmd/cloud/deployment/list.js +14 -6
- package/dist/cmd/cloud/deployment/list.js.map +1 -1
- package/dist/cmd/cloud/deployment/remove.js +2 -2
- package/dist/cmd/cloud/deployment/remove.js.map +1 -1
- package/dist/cmd/cloud/deployment/rollback.js +2 -2
- package/dist/cmd/cloud/deployment/rollback.js.map +1 -1
- package/dist/cmd/cloud/deployment/show.js +2 -2
- package/dist/cmd/cloud/deployment/show.js.map +1 -1
- package/dist/cmd/cloud/deployment/undeploy.js +2 -2
- package/dist/cmd/cloud/deployment/undeploy.js.map +1 -1
- package/dist/cmd/cloud/env/list.d.ts.map +1 -1
- package/dist/cmd/cloud/env/list.js +14 -4
- package/dist/cmd/cloud/env/list.js.map +1 -1
- package/dist/cmd/cloud/eval/list.d.ts.map +1 -1
- package/dist/cmd/cloud/eval/list.js +6 -1
- package/dist/cmd/cloud/eval/list.js.map +1 -1
- package/dist/cmd/cloud/eval-run/list.d.ts.map +1 -1
- package/dist/cmd/cloud/eval-run/list.js +6 -1
- package/dist/cmd/cloud/eval-run/list.js.map +1 -1
- package/dist/cmd/cloud/keyvalue/list-namespaces.d.ts.map +1 -1
- package/dist/cmd/cloud/keyvalue/list-namespaces.js +5 -2
- package/dist/cmd/cloud/keyvalue/list-namespaces.js.map +1 -1
- package/dist/cmd/cloud/keyvalue/util.d.ts +1 -1
- package/dist/cmd/cloud/keyvalue/util.d.ts.map +1 -1
- package/dist/cmd/cloud/keyvalue/util.js +3 -2
- package/dist/cmd/cloud/keyvalue/util.js.map +1 -1
- package/dist/cmd/cloud/machine/list.d.ts.map +1 -1
- package/dist/cmd/cloud/machine/list.js +5 -2
- package/dist/cmd/cloud/machine/list.js.map +1 -1
- package/dist/cmd/cloud/queue/list.d.ts.map +1 -1
- package/dist/cmd/cloud/queue/list.js +3 -1
- package/dist/cmd/cloud/queue/list.js.map +1 -1
- package/dist/cmd/cloud/sandbox/execution/list.d.ts.map +1 -1
- package/dist/cmd/cloud/sandbox/execution/list.js +5 -3
- package/dist/cmd/cloud/sandbox/execution/list.js.map +1 -1
- package/dist/cmd/cloud/sandbox/list.d.ts.map +1 -1
- package/dist/cmd/cloud/sandbox/list.js +4 -1
- package/dist/cmd/cloud/sandbox/list.js.map +1 -1
- package/dist/cmd/cloud/sandbox/runtime/list.d.ts.map +1 -1
- package/dist/cmd/cloud/sandbox/runtime/list.js +4 -2
- package/dist/cmd/cloud/sandbox/runtime/list.js.map +1 -1
- package/dist/cmd/cloud/sandbox/snapshot/list.d.ts.map +1 -1
- package/dist/cmd/cloud/sandbox/snapshot/list.js +4 -2
- package/dist/cmd/cloud/sandbox/snapshot/list.js.map +1 -1
- package/dist/cmd/cloud/session/list.d.ts.map +1 -1
- package/dist/cmd/cloud/session/list.js +6 -1
- package/dist/cmd/cloud/session/list.js.map +1 -1
- package/dist/cmd/cloud/storage/list.d.ts.map +1 -1
- package/dist/cmd/cloud/storage/list.js +2 -1
- package/dist/cmd/cloud/storage/list.js.map +1 -1
- package/dist/cmd/cloud/stream/list.d.ts.map +1 -1
- package/dist/cmd/cloud/stream/list.js +5 -2
- package/dist/cmd/cloud/stream/list.js.map +1 -1
- package/dist/cmd/cloud/thread/list.d.ts.map +1 -1
- package/dist/cmd/cloud/thread/list.js +4 -1
- package/dist/cmd/cloud/thread/list.js.map +1 -1
- package/dist/cmd/cloud/vector/list-namespaces.d.ts.map +1 -1
- package/dist/cmd/cloud/vector/list-namespaces.js +5 -2
- package/dist/cmd/cloud/vector/list-namespaces.js.map +1 -1
- package/dist/cmd/cloud/vector/util.d.ts +1 -1
- package/dist/cmd/cloud/vector/util.d.ts.map +1 -1
- package/dist/cmd/cloud/vector/util.js +3 -2
- package/dist/cmd/cloud/vector/util.js.map +1 -1
- package/dist/cmd/dev/index.d.ts.map +1 -1
- package/dist/cmd/dev/index.js +2 -0
- package/dist/cmd/dev/index.js.map +1 -1
- package/dist/cmd/project/add/database.d.ts.map +1 -1
- package/dist/cmd/project/add/database.js +43 -3
- package/dist/cmd/project/add/database.js.map +1 -1
- package/dist/cmd/project/add/storage.d.ts.map +1 -1
- package/dist/cmd/project/add/storage.js +43 -3
- package/dist/cmd/project/add/storage.js.map +1 -1
- package/dist/cmd/upgrade/index.d.ts.map +1 -1
- package/dist/cmd/upgrade/index.js +25 -10
- package/dist/cmd/upgrade/index.js.map +1 -1
- package/dist/cmd/upgrade/npm-availability.d.ts +45 -12
- package/dist/cmd/upgrade/npm-availability.d.ts.map +1 -1
- package/dist/cmd/upgrade/npm-availability.js +73 -26
- package/dist/cmd/upgrade/npm-availability.js.map +1 -1
- package/dist/version-check.d.ts.map +1 -1
- package/dist/version-check.js +15 -2
- package/dist/version-check.js.map +1 -1
- package/package.json +6 -6
- package/src/cli.ts +41 -4
- package/src/cmd/ai/claude-code/constants.ts +26 -0
- package/src/cmd/ai/claude-code/index.ts +23 -0
- package/src/cmd/ai/claude-code/install.ts +181 -0
- package/src/cmd/ai/claude-code/uninstall.ts +122 -0
- package/src/cmd/ai/index.ts +6 -0
- package/src/cmd/build/vite/db-rewrite.ts +189 -0
- package/src/cmd/build/vite/registry-generator.ts +7 -0
- package/src/cmd/build/vite/server-bundler.ts +89 -3
- package/src/cmd/canary/index.ts +3 -1
- package/src/cmd/cloud/agent/list.ts +19 -4
- package/src/cmd/cloud/apikey/list.ts +4 -0
- package/src/cmd/cloud/db/list.ts +2 -1
- package/src/cmd/cloud/deployment/list.ts +16 -6
- package/src/cmd/cloud/deployment/remove.ts +2 -2
- package/src/cmd/cloud/deployment/rollback.ts +2 -2
- package/src/cmd/cloud/deployment/show.ts +2 -2
- package/src/cmd/cloud/deployment/undeploy.ts +2 -2
- package/src/cmd/cloud/env/list.ts +17 -4
- package/src/cmd/cloud/eval/list.ts +7 -1
- package/src/cmd/cloud/eval-run/list.ts +7 -1
- package/src/cmd/cloud/keyvalue/list-namespaces.ts +5 -2
- package/src/cmd/cloud/keyvalue/util.ts +12 -8
- package/src/cmd/cloud/machine/list.ts +5 -2
- package/src/cmd/cloud/queue/list.ts +3 -1
- package/src/cmd/cloud/sandbox/execution/list.ts +11 -3
- package/src/cmd/cloud/sandbox/list.ts +5 -1
- package/src/cmd/cloud/sandbox/runtime/list.ts +4 -2
- package/src/cmd/cloud/sandbox/snapshot/list.ts +4 -2
- package/src/cmd/cloud/session/list.ts +7 -1
- package/src/cmd/cloud/storage/list.ts +2 -1
- package/src/cmd/cloud/stream/list.ts +7 -2
- package/src/cmd/cloud/thread/list.ts +5 -1
- package/src/cmd/cloud/vector/list-namespaces.ts +5 -2
- package/src/cmd/cloud/vector/util.ts +12 -8
- package/src/cmd/dev/index.ts +2 -0
- package/src/cmd/project/add/database.ts +54 -3
- package/src/cmd/project/add/storage.ts +54 -3
- package/src/cmd/upgrade/index.ts +36 -11
- package/src/cmd/upgrade/npm-availability.ts +106 -36
- package/src/version-check.ts +22 -2
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
|
-
import { listResources } from '@agentuity/server';
|
|
2
|
+
import { listResources, projectEnvUpdate } from '@agentuity/server';
|
|
3
3
|
import { createSubcommand } from '../../../types';
|
|
4
4
|
import * as tui from '../../../tui';
|
|
5
5
|
import { createPrompt } from '../../../tui';
|
|
@@ -7,7 +7,7 @@ import { getCatalystAPIClient } from '../../../config';
|
|
|
7
7
|
import { getCommand } from '../../../command-prefix';
|
|
8
8
|
import { isDryRunMode, outputDryRun } from '../../../explain';
|
|
9
9
|
import { ErrorCode } from '../../../errors';
|
|
10
|
-
import { addResourceEnvVars } from '../../../env-util';
|
|
10
|
+
import { addResourceEnvVars, findExistingEnvFile, readEnvFile, filterAgentuitySdkKeys, splitEnvAndSecrets, } from '../../../env-util';
|
|
11
11
|
export const storageSubcommand = createSubcommand({
|
|
12
12
|
name: 'storage',
|
|
13
13
|
aliases: ['bucket', 's3'],
|
|
@@ -40,7 +40,7 @@ export const storageSubcommand = createSubcommand({
|
|
|
40
40
|
}),
|
|
41
41
|
},
|
|
42
42
|
async handler(ctx) {
|
|
43
|
-
const { logger, args, orgId, region, auth, options, projectDir } = ctx;
|
|
43
|
+
const { logger, args, orgId, region, auth, options, projectDir, project } = ctx;
|
|
44
44
|
if (isDryRunMode(options)) {
|
|
45
45
|
const message = args.name
|
|
46
46
|
? `Would link storage bucket "${args.name}" to project in ${projectDir}`
|
|
@@ -108,6 +108,46 @@ export const storageSubcommand = createSubcommand({
|
|
|
108
108
|
tui.success(`Linked storage bucket: ${tui.bold(selectedBucket.bucket_name)}`);
|
|
109
109
|
tui.info('Environment variables written to .env');
|
|
110
110
|
}
|
|
111
|
+
// Sync to cloud
|
|
112
|
+
const isHeadless = !process.stdin.isTTY || !process.stdout.isTTY;
|
|
113
|
+
let shouldSync = true;
|
|
114
|
+
if (!isHeadless && !options.json) {
|
|
115
|
+
shouldSync = await tui.confirm('Sync environment variables to cloud project?', true);
|
|
116
|
+
if (process.stdin.isTTY) {
|
|
117
|
+
process.stdin.pause();
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
if (shouldSync) {
|
|
121
|
+
try {
|
|
122
|
+
const envFilePath = await findExistingEnvFile(projectDir);
|
|
123
|
+
const localEnv = await readEnvFile(envFilePath);
|
|
124
|
+
const filteredEnv = filterAgentuitySdkKeys(localEnv);
|
|
125
|
+
if (Object.keys(filteredEnv).length > 0) {
|
|
126
|
+
const { env, secrets } = splitEnvAndSecrets(filteredEnv);
|
|
127
|
+
await tui.spinner({
|
|
128
|
+
message: 'Syncing environment variables to cloud',
|
|
129
|
+
clearOnSuccess: true,
|
|
130
|
+
callback: async () => {
|
|
131
|
+
await projectEnvUpdate(catalystClient, {
|
|
132
|
+
id: project.projectId,
|
|
133
|
+
env,
|
|
134
|
+
secrets,
|
|
135
|
+
});
|
|
136
|
+
},
|
|
137
|
+
});
|
|
138
|
+
if (!options.json) {
|
|
139
|
+
tui.success('Environment variables synced to cloud');
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
catch (error) {
|
|
144
|
+
if (!options.json) {
|
|
145
|
+
tui.warning('Failed to sync environment variables to cloud. You can sync later with: ' +
|
|
146
|
+
tui.bold(getCommand('cloud env push')));
|
|
147
|
+
}
|
|
148
|
+
logger.debug('Failed to sync env to cloud:', error);
|
|
149
|
+
}
|
|
150
|
+
}
|
|
111
151
|
}
|
|
112
152
|
else {
|
|
113
153
|
if (!options.json) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../../../src/cmd/project/add/storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../../../src/cmd/project/add/storage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmd/upgrade/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmd/upgrade/index.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,mBAAmB,EAAE,KAAK,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAa3F;;;GAGG;AACH,OAAO,EAAE,mBAAmB,EAAE,KAAK,gBAAgB,EAAE,CAAC;AAEtD;;;GAGG;AACH,wBAAgB,eAAe,IAAI,OAAO,CAEzC;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC,CA+B1D;AAyDD,eAAO,MAAM,OAAO,mCAuLlB,CAAC"}
|
|
@@ -5,6 +5,7 @@ import { z } from 'zod';
|
|
|
5
5
|
import { ErrorCode, createError, exitWithError } from '../../errors';
|
|
6
6
|
import * as tui from '../../tui';
|
|
7
7
|
import { $ } from 'bun';
|
|
8
|
+
import { tmpdir } from 'node:os';
|
|
8
9
|
import { getInstallationType } from '../../utils/installation-type';
|
|
9
10
|
const UpgradeOptionsSchema = z.object({
|
|
10
11
|
force: z.boolean().optional().describe('Force upgrade even if version is the same'),
|
|
@@ -59,16 +60,26 @@ export async function fetchLatestVersion() {
|
|
|
59
60
|
return trimmedVersion.startsWith('v') ? trimmedVersion : `v${trimmedVersion}`;
|
|
60
61
|
}
|
|
61
62
|
/**
|
|
62
|
-
* Upgrade the CLI using bun global install
|
|
63
|
+
* Upgrade the CLI using bun global install.
|
|
64
|
+
* Retries on transient resolution errors caused by npm CDN propagation delays.
|
|
63
65
|
*/
|
|
64
|
-
async function performBunUpgrade(version) {
|
|
66
|
+
async function performBunUpgrade(version, onRetry) {
|
|
65
67
|
// Remove 'v' prefix for npm version
|
|
66
68
|
const npmVersion = version.replace(/^v/, '');
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
69
|
+
const { installWithRetry } = await import('./npm-availability');
|
|
70
|
+
try {
|
|
71
|
+
await installWithRetry(async () => {
|
|
72
|
+
// Use bun to install the specific version globally
|
|
73
|
+
// Run from tmpdir to avoid interference from any local package.json/node_modules
|
|
74
|
+
const result = await $ `bun add -g @agentuity/cli@${npmVersion}`
|
|
75
|
+
.cwd(tmpdir())
|
|
76
|
+
.quiet()
|
|
77
|
+
.nothrow();
|
|
78
|
+
return { exitCode: result.exitCode, stderr: result.stderr };
|
|
79
|
+
}, { onRetry });
|
|
80
|
+
}
|
|
81
|
+
catch (error) {
|
|
82
|
+
throw new Error(`Failed to install @agentuity/cli@${npmVersion}: ${error instanceof Error ? error.message : String(error)}`);
|
|
72
83
|
}
|
|
73
84
|
}
|
|
74
85
|
/**
|
|
@@ -164,8 +175,9 @@ export const command = createCommand({
|
|
|
164
175
|
callback: async () => {
|
|
165
176
|
const { waitForNpmAvailability } = await import('./npm-availability');
|
|
166
177
|
return await waitForNpmAvailability(latestVersion, {
|
|
167
|
-
maxAttempts:
|
|
168
|
-
initialDelayMs:
|
|
178
|
+
maxAttempts: 10,
|
|
179
|
+
initialDelayMs: 5000,
|
|
180
|
+
maxDelayMs: 15000,
|
|
169
181
|
});
|
|
170
182
|
},
|
|
171
183
|
});
|
|
@@ -207,8 +219,11 @@ export const command = createCommand({
|
|
|
207
219
|
}
|
|
208
220
|
// Perform the upgrade using bun
|
|
209
221
|
await tui.spinner({
|
|
222
|
+
type: 'logger',
|
|
210
223
|
message: `Installing @agentuity/cli@${normalizedLatest}...`,
|
|
211
|
-
callback: async () => await performBunUpgrade(latestVersion)
|
|
224
|
+
callback: async (log) => await performBunUpgrade(latestVersion, (attempt, delayMs) => {
|
|
225
|
+
log(`Package not yet available on CDN, retrying in ${Math.round(delayMs / 1000)}s (attempt ${attempt})...`);
|
|
226
|
+
}),
|
|
212
227
|
});
|
|
213
228
|
// Verify the upgrade
|
|
214
229
|
await tui.spinner({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cmd/upgrade/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAChF,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACrE,OAAO,KAAK,GAAG,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,mBAAmB,EAAyB,MAAM,+BAA+B,CAAC;AAE3F,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC;IACrC,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,2CAA2C,CAAC;CACnF,CAAC,CAAC;AAEH,MAAM,qBAAqB,GAAG,CAAC,CAAC,MAAM,CAAC;IACtC,QAAQ,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,kCAAkC,CAAC;IAClE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,wBAAwB,CAAC;IACnD,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,uBAAuB,CAAC;IAChD,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,gBAAgB,CAAC;CAC9C,CAAC,CAAC;AAEH;;;GAGG;AACH,OAAO,EAAE,mBAAmB,EAAyB,CAAC;AAEtD;;;GAGG;AACH,MAAM,UAAU,eAAe;IAC9B,OAAO,mBAAmB,EAAE,KAAK,QAAQ,CAAC;AAC3C,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB;IACvC,MAAM,cAAc,GAAG,UAAU,EAAE,CAAC;IACpC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,0CAA0C,EAAE;QACxE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,oBAAoB;QACzD,OAAO,EAAE;YACR,YAAY,EAAE,iBAAiB,cAAc,EAAE;SAC/C;KACD,CAAC,CAAC;IACH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QAClB,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACnC,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAC7B,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,gBAAgB,CAAC,CAAC;QAC7C,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,4BAA4B,IAAI,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IACtC,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAEtC,0BAA0B;IAC1B,IACC,CAAC,2BAA2B,CAAC,IAAI,CAAC,cAAc,CAAC;QACjD,cAAc,CAAC,QAAQ,CAAC,SAAS,CAAC;QAClC,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC;QAChC,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAChC,CAAC;QACF,MAAM,IAAI,KAAK,CAAC,oCAAoC,cAAc,EAAE,CAAC,CAAC;IACvE,CAAC;IAED,gCAAgC;IAChC,OAAO,cAAc,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,cAAc,EAAE,CAAC;AAC/E,CAAC;AAED
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cmd/upgrade/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,26 +1,23 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* npm registry availability checking utilities.
|
|
3
|
-
* Used to verify a version is available
|
|
3
|
+
* Used to verify a version is available via bun's resolver before attempting upgrade.
|
|
4
4
|
*/
|
|
5
|
-
export interface CheckNpmOptions {
|
|
6
|
-
/** Timeout in milliseconds (default: 5000 for explicit, 1000 for quick) */
|
|
7
|
-
timeoutMs?: number;
|
|
8
|
-
}
|
|
9
5
|
/**
|
|
10
|
-
* Check if a specific version of @agentuity/cli is
|
|
11
|
-
* Uses
|
|
6
|
+
* Check if a specific version of @agentuity/cli is resolvable by bun.
|
|
7
|
+
* Uses `bun info` to verify bun's own resolver/CDN can see the version,
|
|
8
|
+
* which avoids the race where npm registry returns 200 but bun's CDN
|
|
9
|
+
* has not yet propagated the version.
|
|
12
10
|
*
|
|
13
11
|
* @param version - Version to check (with or without 'v' prefix)
|
|
14
|
-
* @param options - Optional configuration
|
|
15
12
|
* @returns true if version is available, false otherwise
|
|
16
13
|
*/
|
|
17
|
-
export declare function isVersionAvailableOnNpm(version: string
|
|
14
|
+
export declare function isVersionAvailableOnNpm(version: string): Promise<boolean>;
|
|
18
15
|
/**
|
|
19
|
-
* Quick check if a version is available
|
|
20
|
-
* Used for implicit version checks (auto-upgrade flow)
|
|
16
|
+
* Quick check if a version is available via bun's resolver.
|
|
17
|
+
* Used for implicit version checks (auto-upgrade flow).
|
|
21
18
|
*
|
|
22
19
|
* @param version - Version to check (with or without 'v' prefix)
|
|
23
|
-
* @returns true if version is available, false if unavailable or
|
|
20
|
+
* @returns true if version is available, false if unavailable or error
|
|
24
21
|
*/
|
|
25
22
|
export declare function isVersionAvailableOnNpmQuick(version: string): Promise<boolean>;
|
|
26
23
|
export interface WaitForNpmOptions {
|
|
@@ -41,4 +38,40 @@ export interface WaitForNpmOptions {
|
|
|
41
38
|
* @returns true if version became available, false if timed out
|
|
42
39
|
*/
|
|
43
40
|
export declare function waitForNpmAvailability(version: string, options?: WaitForNpmOptions): Promise<boolean>;
|
|
41
|
+
/**
|
|
42
|
+
* Check whether a bun install failure is a transient resolution error
|
|
43
|
+
* caused by npm CDN propagation delays.
|
|
44
|
+
*/
|
|
45
|
+
export declare function isResolutionError(stderr: string): boolean;
|
|
46
|
+
export interface InstallWithRetryOptions {
|
|
47
|
+
/** Maximum number of attempts including the first (default: 7 → 1 initial + 6 retries) */
|
|
48
|
+
maxAttempts?: number;
|
|
49
|
+
/** Initial delay in ms before the first retry (default: 5000) */
|
|
50
|
+
initialDelayMs?: number;
|
|
51
|
+
/** Maximum delay cap in ms (default: 30000) */
|
|
52
|
+
maxDelayMs?: number;
|
|
53
|
+
/** Multiplier applied to the delay after each retry (default: 2) */
|
|
54
|
+
multiplier?: number;
|
|
55
|
+
/** Callback invoked before each retry with the attempt number and upcoming delay */
|
|
56
|
+
onRetry?: (attempt: number, delayMs: number) => void;
|
|
57
|
+
}
|
|
58
|
+
/**
|
|
59
|
+
* Run an install function and retry on transient resolution errors with
|
|
60
|
+
* exponential backoff. This covers the window (~2 min) where npm CDN nodes
|
|
61
|
+
* have not yet propagated a newly-published version.
|
|
62
|
+
*
|
|
63
|
+
* Total wait with defaults: 5 + 10 + 20 + 30 + 30 + 30 = 125 s ≈ 2 min
|
|
64
|
+
*
|
|
65
|
+
* @param installFn - Async function that performs the install and returns exitCode + stderr
|
|
66
|
+
* @param options - Retry configuration
|
|
67
|
+
* @returns The successful result (exitCode 0)
|
|
68
|
+
* @throws Error if all retries are exhausted or a non-resolution error occurs
|
|
69
|
+
*/
|
|
70
|
+
export declare function installWithRetry(installFn: () => Promise<{
|
|
71
|
+
exitCode: number;
|
|
72
|
+
stderr: Buffer;
|
|
73
|
+
}>, options?: InstallWithRetryOptions): Promise<{
|
|
74
|
+
exitCode: number;
|
|
75
|
+
stderr: Buffer;
|
|
76
|
+
}>;
|
|
44
77
|
//# sourceMappingURL=npm-availability.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm-availability.d.ts","sourceRoot":"","sources":["../../../src/cmd/upgrade/npm-availability.ts"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"npm-availability.d.ts","sourceRoot":"","sources":["../../../src/cmd/upgrade/npm-availability.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH;;;;;;;;GAQG;AACH,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAkB/E;AAED;;;;;;GAMG;AACH,wBAAsB,4BAA4B,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAEpF;AAED,MAAM,WAAW,iBAAiB;IACjC,8CAA8C;IAC9C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,2DAA2D;IAC3D,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,4DAA4D;IAC5D,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,wCAAwC;IACxC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACrD;AAED;;;;;;GAMG;AACH,wBAAsB,sBAAsB,CAC3C,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,iBAAsB,GAC7B,OAAO,CAAC,OAAO,CAAC,CAsBlB;AAQD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEzD;AAED,MAAM,WAAW,uBAAuB;IACvC,0FAA0F;IAC1F,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iEAAiE;IACjE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,+CAA+C;IAC/C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oEAAoE;IACpE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oFAAoF;IACpF,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACrD;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACrC,SAAS,EAAE,MAAM,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,EAC9D,OAAO,GAAE,uBAA4B,GACnC,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAqC/C"}
|
|
@@ -1,49 +1,48 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* npm registry availability checking utilities.
|
|
3
|
-
* Used to verify a version is available
|
|
3
|
+
* Used to verify a version is available via bun's resolver before attempting upgrade.
|
|
4
4
|
*/
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
const QUICK_CHECK_TIMEOUT_MS = 1000;
|
|
9
|
-
/** Default timeout for explicit upgrade command */
|
|
10
|
-
const EXPLICIT_CHECK_TIMEOUT_MS = 5000;
|
|
5
|
+
import { $ } from 'bun';
|
|
6
|
+
import { tmpdir } from 'node:os';
|
|
7
|
+
const PACKAGE_SPEC = '@agentuity/cli';
|
|
11
8
|
/**
|
|
12
|
-
* Check if a specific version of @agentuity/cli is
|
|
13
|
-
* Uses
|
|
9
|
+
* Check if a specific version of @agentuity/cli is resolvable by bun.
|
|
10
|
+
* Uses `bun info` to verify bun's own resolver/CDN can see the version,
|
|
11
|
+
* which avoids the race where npm registry returns 200 but bun's CDN
|
|
12
|
+
* has not yet propagated the version.
|
|
14
13
|
*
|
|
15
14
|
* @param version - Version to check (with or without 'v' prefix)
|
|
16
|
-
* @param options - Optional configuration
|
|
17
15
|
* @returns true if version is available, false otherwise
|
|
18
16
|
*/
|
|
19
|
-
export async function isVersionAvailableOnNpm(version
|
|
20
|
-
const { timeoutMs = EXPLICIT_CHECK_TIMEOUT_MS } = options;
|
|
17
|
+
export async function isVersionAvailableOnNpm(version) {
|
|
21
18
|
const normalizedVersion = version.replace(/^v/, '');
|
|
22
|
-
const url = `${NPM_REGISTRY_URL}/${encodeURIComponent(PACKAGE_NAME)}/${normalizedVersion}`;
|
|
23
19
|
try {
|
|
24
|
-
const
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
}
|
|
31
|
-
|
|
20
|
+
const result = await $ `bun info ${PACKAGE_SPEC}@${normalizedVersion} --json`
|
|
21
|
+
.cwd(tmpdir())
|
|
22
|
+
.quiet()
|
|
23
|
+
.nothrow();
|
|
24
|
+
if (result.exitCode !== 0) {
|
|
25
|
+
return false;
|
|
26
|
+
}
|
|
27
|
+
const info = JSON.parse(result.stdout.toString());
|
|
28
|
+
if (info.error) {
|
|
29
|
+
return false;
|
|
30
|
+
}
|
|
31
|
+
return info.version === normalizedVersion;
|
|
32
32
|
}
|
|
33
33
|
catch {
|
|
34
|
-
// Network error or timeout - assume not available
|
|
35
34
|
return false;
|
|
36
35
|
}
|
|
37
36
|
}
|
|
38
37
|
/**
|
|
39
|
-
* Quick check if a version is available
|
|
40
|
-
* Used for implicit version checks (auto-upgrade flow)
|
|
38
|
+
* Quick check if a version is available via bun's resolver.
|
|
39
|
+
* Used for implicit version checks (auto-upgrade flow).
|
|
41
40
|
*
|
|
42
41
|
* @param version - Version to check (with or without 'v' prefix)
|
|
43
|
-
* @returns true if version is available, false if unavailable or
|
|
42
|
+
* @returns true if version is available, false if unavailable or error
|
|
44
43
|
*/
|
|
45
44
|
export async function isVersionAvailableOnNpmQuick(version) {
|
|
46
|
-
return isVersionAvailableOnNpm(version
|
|
45
|
+
return isVersionAvailableOnNpm(version);
|
|
47
46
|
}
|
|
48
47
|
/**
|
|
49
48
|
* Wait for a version to become available on npm with exponential backoff.
|
|
@@ -70,4 +69,52 @@ export async function waitForNpmAvailability(version, options = {}) {
|
|
|
70
69
|
}
|
|
71
70
|
return false;
|
|
72
71
|
}
|
|
72
|
+
/**
|
|
73
|
+
* Patterns in bun's stderr that indicate a resolution/CDN propagation failure
|
|
74
|
+
* (as opposed to a permanent install error like permissions or disk space).
|
|
75
|
+
*/
|
|
76
|
+
const RESOLUTION_ERROR_PATTERNS = [/failed to resolve/i, /no version matching/i];
|
|
77
|
+
/**
|
|
78
|
+
* Check whether a bun install failure is a transient resolution error
|
|
79
|
+
* caused by npm CDN propagation delays.
|
|
80
|
+
*/
|
|
81
|
+
export function isResolutionError(stderr) {
|
|
82
|
+
return RESOLUTION_ERROR_PATTERNS.some((pattern) => pattern.test(stderr));
|
|
83
|
+
}
|
|
84
|
+
/**
|
|
85
|
+
* Run an install function and retry on transient resolution errors with
|
|
86
|
+
* exponential backoff. This covers the window (~2 min) where npm CDN nodes
|
|
87
|
+
* have not yet propagated a newly-published version.
|
|
88
|
+
*
|
|
89
|
+
* Total wait with defaults: 5 + 10 + 20 + 30 + 30 + 30 = 125 s ≈ 2 min
|
|
90
|
+
*
|
|
91
|
+
* @param installFn - Async function that performs the install and returns exitCode + stderr
|
|
92
|
+
* @param options - Retry configuration
|
|
93
|
+
* @returns The successful result (exitCode 0)
|
|
94
|
+
* @throws Error if all retries are exhausted or a non-resolution error occurs
|
|
95
|
+
*/
|
|
96
|
+
export async function installWithRetry(installFn, options = {}) {
|
|
97
|
+
const { maxAttempts = 7, initialDelayMs = 5000, maxDelayMs = 30000, multiplier = 2, onRetry, } = options;
|
|
98
|
+
let delay = initialDelayMs;
|
|
99
|
+
for (let attempt = 1; attempt <= maxAttempts; attempt++) {
|
|
100
|
+
const result = await installFn();
|
|
101
|
+
if (result.exitCode === 0) {
|
|
102
|
+
return result;
|
|
103
|
+
}
|
|
104
|
+
const stderr = result.stderr.toString();
|
|
105
|
+
// Only retry on resolution/propagation errors — bail immediately for anything else
|
|
106
|
+
if (!isResolutionError(stderr)) {
|
|
107
|
+
throw new Error(stderr);
|
|
108
|
+
}
|
|
109
|
+
// Last attempt exhausted — throw
|
|
110
|
+
if (attempt === maxAttempts) {
|
|
111
|
+
throw new Error(stderr);
|
|
112
|
+
}
|
|
113
|
+
onRetry?.(attempt, delay);
|
|
114
|
+
await new Promise((resolve) => setTimeout(resolve, delay));
|
|
115
|
+
delay = Math.min(Math.round(delay * multiplier), maxDelayMs);
|
|
116
|
+
}
|
|
117
|
+
// Unreachable, but satisfies TypeScript
|
|
118
|
+
throw new Error('Install failed after retries');
|
|
119
|
+
}
|
|
73
120
|
//# sourceMappingURL=npm-availability.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm-availability.js","sourceRoot":"","sources":["../../../src/cmd/upgrade/npm-availability.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,
|
|
1
|
+
{"version":3,"file":"npm-availability.js","sourceRoot":"","sources":["../../../src/cmd/upgrade/npm-availability.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version-check.d.ts","sourceRoot":"","sources":["../src/version-check.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"version-check.d.ts","sourceRoot":"","sources":["../src/version-check.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAgOvF;;;GAGG;AACH,wBAAsB,eAAe,CACpC,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IACR,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC3B,EACD,UAAU,EAAE,iBAAiB,GAAG,SAAS,EACzC,aAAa,EAAE,oBAAoB,GAAG,SAAS,EAC/C,IAAI,EAAE,MAAM,EAAE,GACZ,OAAO,CAAC,IAAI,CAAC,CAoEf"}
|
package/dist/version-check.js
CHANGED
|
@@ -4,6 +4,7 @@ import { getVersion, getCompareUrl, getReleaseUrl, toTag } from './version';
|
|
|
4
4
|
import * as tui from './tui';
|
|
5
5
|
import { saveConfig } from './config';
|
|
6
6
|
import { $ } from 'bun';
|
|
7
|
+
import { tmpdir } from 'node:os';
|
|
7
8
|
import { getExecutingAgent } from './agent-detection';
|
|
8
9
|
const ONE_HOUR_MS = 60 * 60 * 1000;
|
|
9
10
|
// Tags that indicate a command should skip the upgrade prompt
|
|
@@ -133,8 +134,20 @@ async function performUpgrade(logger, targetVersion) {
|
|
|
133
134
|
// Remove 'v' prefix for npm version
|
|
134
135
|
const npmVersion = targetVersion.replace(/^v/, '');
|
|
135
136
|
logger.info('Upgrading to version %s...', npmVersion);
|
|
136
|
-
// Use bun to install the specific version globally
|
|
137
|
-
|
|
137
|
+
// Use bun to install the specific version globally with retry for CDN propagation delays
|
|
138
|
+
// Run from tmpdir to avoid interference from any local package.json/node_modules
|
|
139
|
+
const { installWithRetry } = await import('./cmd/upgrade/npm-availability');
|
|
140
|
+
await installWithRetry(async () => {
|
|
141
|
+
const result = await $ `bun add -g @agentuity/cli@${npmVersion}`
|
|
142
|
+
.cwd(tmpdir())
|
|
143
|
+
.quiet()
|
|
144
|
+
.nothrow();
|
|
145
|
+
return { exitCode: result.exitCode, stderr: result.stderr };
|
|
146
|
+
}, {
|
|
147
|
+
onRetry: (attempt, delayMs) => {
|
|
148
|
+
logger.info('Package not yet available on CDN, retrying in %ds (attempt %d)...', Math.round(delayMs / 1000), attempt);
|
|
149
|
+
},
|
|
150
|
+
});
|
|
138
151
|
// If we got here, the upgrade succeeded
|
|
139
152
|
// Re-run the original command with the new binary
|
|
140
153
|
const args = process.argv.slice(2);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version-check.js","sourceRoot":"","sources":["../src/version-check.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"version-check.js","sourceRoot":"","sources":["../src/version-check.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@agentuity/cli",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.9",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"author": "Agentuity employees and contributors",
|
|
6
6
|
"type": "module",
|
|
@@ -41,9 +41,9 @@
|
|
|
41
41
|
"prepublishOnly": "bun run clean && bun run build"
|
|
42
42
|
},
|
|
43
43
|
"dependencies": {
|
|
44
|
-
"@agentuity/auth": "1.0.
|
|
45
|
-
"@agentuity/core": "1.0.
|
|
46
|
-
"@agentuity/server": "1.0.
|
|
44
|
+
"@agentuity/auth": "1.0.9",
|
|
45
|
+
"@agentuity/core": "1.0.9",
|
|
46
|
+
"@agentuity/server": "1.0.9",
|
|
47
47
|
"@datasert/cronjs-parser": "^1.4.0",
|
|
48
48
|
"@terascope/fetch-github-release": "^2.2.1",
|
|
49
49
|
"@vitejs/plugin-react": "^5.1.2",
|
|
@@ -61,10 +61,10 @@
|
|
|
61
61
|
"typescript": "^5.9.0",
|
|
62
62
|
"vite": "^7.2.7",
|
|
63
63
|
"zod": "^4.3.5",
|
|
64
|
-
"@agentuity/frontend": "1.0.
|
|
64
|
+
"@agentuity/frontend": "1.0.9"
|
|
65
65
|
},
|
|
66
66
|
"devDependencies": {
|
|
67
|
-
"@agentuity/test-utils": "1.0.
|
|
67
|
+
"@agentuity/test-utils": "1.0.9",
|
|
68
68
|
"@types/adm-zip": "^0.5.7",
|
|
69
69
|
"@types/bun": "latest",
|
|
70
70
|
"@types/tar-fs": "^2.0.4",
|
package/src/cli.ts
CHANGED
|
@@ -1051,9 +1051,9 @@ async function registerSubcommand(
|
|
|
1051
1051
|
cmd.option('--dir <path>', 'project directory (default: current directory)');
|
|
1052
1052
|
}
|
|
1053
1053
|
|
|
1054
|
-
if
|
|
1055
|
-
|
|
1056
|
-
|
|
1054
|
+
// Note: --org-id may also be added below if the schema defines orgId;
|
|
1055
|
+
// in that case we skip adding it here to avoid conflicts.
|
|
1056
|
+
const _deferOrgIdFlag = requiresOrg || optionalOrg;
|
|
1057
1057
|
|
|
1058
1058
|
if (requiresRegion || optionalRegion) {
|
|
1059
1059
|
cmd.option('--region <region>', 'cloud region');
|
|
@@ -1072,8 +1072,9 @@ async function registerSubcommand(
|
|
|
1072
1072
|
}
|
|
1073
1073
|
}
|
|
1074
1074
|
|
|
1075
|
-
// Track if projectId is defined in schema options
|
|
1075
|
+
// Track if projectId/orgId is defined in schema options
|
|
1076
1076
|
let hasProjectIdInSchema = false;
|
|
1077
|
+
let hasOrgIdInSchema = false;
|
|
1077
1078
|
|
|
1078
1079
|
if (subcommand.schema?.options) {
|
|
1079
1080
|
const parsed = parseOptionsSchema(subcommand.schema.options);
|
|
@@ -1089,6 +1090,11 @@ async function registerSubcommand(
|
|
|
1089
1090
|
hasProjectIdInSchema = true;
|
|
1090
1091
|
}
|
|
1091
1092
|
|
|
1093
|
+
// Track if this schema defines orgId (as 'orgId' or 'org-id')
|
|
1094
|
+
if (opt.name === 'orgId' || opt.name === 'org-id' || flag === 'org-id') {
|
|
1095
|
+
hasOrgIdInSchema = true;
|
|
1096
|
+
}
|
|
1097
|
+
|
|
1092
1098
|
const desc = opt.description || '';
|
|
1093
1099
|
// Build flag spec with aliases (check both camelCase and kebab-case names)
|
|
1094
1100
|
// Auto-add -y alias for confirm flag
|
|
@@ -1194,6 +1200,11 @@ async function registerSubcommand(
|
|
|
1194
1200
|
}
|
|
1195
1201
|
}
|
|
1196
1202
|
|
|
1203
|
+
// Add --org-id if command requires/optional org and doesn't define it in schema
|
|
1204
|
+
if (_deferOrgIdFlag && !hasOrgIdInSchema) {
|
|
1205
|
+
cmd.option('--org-id <id>', 'organization ID');
|
|
1206
|
+
}
|
|
1207
|
+
|
|
1197
1208
|
// Add --project-id if command requires/optional project and doesn't define it in schema
|
|
1198
1209
|
if ((requiresProject || optionalProject) && !hasProjectIdInSchema) {
|
|
1199
1210
|
cmd.option('--project-id <id>', 'project ID (alternative to --dir)');
|
|
@@ -1204,6 +1215,32 @@ async function registerSubcommand(
|
|
|
1204
1215
|
const options = cmdObj.opts();
|
|
1205
1216
|
const args = rawArgs.slice(0, -1);
|
|
1206
1217
|
|
|
1218
|
+
// Merge global --org-id and --project-id into subcommand options when the schema
|
|
1219
|
+
// defines these fields. Global options (program-level) capture the values first,
|
|
1220
|
+
// so subcommand-level options may not have them. Only merge when the user
|
|
1221
|
+
// explicitly passed the flag on the CLI (not from env var defaults).
|
|
1222
|
+
const argv = process.argv;
|
|
1223
|
+
const hasExplicitOrgId = argv.some((a) => a === '--org-id' || a.startsWith('--org-id='));
|
|
1224
|
+
const hasExplicitProjectId = argv.some(
|
|
1225
|
+
(a) => a === '--project-id' || a.startsWith('--project-id=')
|
|
1226
|
+
);
|
|
1227
|
+
if (
|
|
1228
|
+
hasOrgIdInSchema &&
|
|
1229
|
+
options.orgId === undefined &&
|
|
1230
|
+
hasExplicitOrgId &&
|
|
1231
|
+
baseCtx.options.orgId
|
|
1232
|
+
) {
|
|
1233
|
+
options.orgId = baseCtx.options.orgId;
|
|
1234
|
+
}
|
|
1235
|
+
if (
|
|
1236
|
+
hasProjectIdInSchema &&
|
|
1237
|
+
options.projectId === undefined &&
|
|
1238
|
+
hasExplicitProjectId &&
|
|
1239
|
+
(baseCtx.options as unknown as Record<string, unknown>).projectId
|
|
1240
|
+
) {
|
|
1241
|
+
options.projectId = (baseCtx.options as unknown as Record<string, unknown>).projectId;
|
|
1242
|
+
}
|
|
1243
|
+
|
|
1207
1244
|
if (subcommand.banner) {
|
|
1208
1245
|
showBanner();
|
|
1209
1246
|
}
|