@agentuity/cli 0.1.26 → 0.1.27

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.
@@ -5,6 +5,7 @@
5
5
  import { join } from 'node:path';
6
6
  import { discoverRoutes } from './vite/route-discovery';
7
7
  import { generateWebAnalyticsFile } from './webanalytics-generator';
8
+ import { computeApiMountPath } from './vite/api-mount-path';
8
9
  /**
9
10
  * Generate entry file with clean Vite-native architecture
10
11
  */
@@ -79,20 +80,13 @@ export async function generateEntryFile(options) {
79
80
  const routeImportsAndMounts = [];
80
81
  let routeIndex = 0;
81
82
  for (const routeFile of sortedRouteFiles) {
83
+ // Normalize path separators for cross-platform compatibility (Windows uses backslashes)
84
+ const normalizedRouteFile = routeFile.replace(/\\/g, '/');
82
85
  // Convert src/api/auth/route.ts -> auth/route
83
- const relativePath = routeFile.replace(/^src\/api\//, '').replace(/\.tsx?$/, '');
84
- // Determine the mount path
85
- // src/api/index.ts -> /api
86
- // src/api/auth/route.ts -> /api/auth
87
- // src/api/users/profile/route.ts -> /api/users/profile
88
- let mountPath = '/api';
89
- if (relativePath !== 'index') {
90
- // Remove 'route' or 'index' from the end
91
- const cleanPath = relativePath.replace(/\/(route|index)$/, '');
92
- if (cleanPath) {
93
- mountPath = `/api/${cleanPath}`;
94
- }
95
- }
86
+ const relativePath = normalizedRouteFile.replace(/^src\/api\//, '').replace(/\.tsx?$/, '');
87
+ // Determine the mount path using the shared helper
88
+ // This ensures consistency with route type generation in ast.ts
89
+ const mountPath = computeApiMountPath(relativePath);
96
90
  const importName = `router_${routeIndex++}`;
97
91
  routeImportsAndMounts.push(`const { default: ${importName} } = await import('../api/${relativePath}.js');`);
98
92
  routeImportsAndMounts.push(`app.route('${mountPath}', ${importName});`);
@@ -1 +1 @@
1
- {"version":3,"file":"entry-generator.js","sourceRoot":"","sources":["../../../src/cmd/build/entry-generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"entry-generator.js","sourceRoot":"","sources":["../../../src/cmd/build/entry-generator.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,61 @@
1
+ /**
2
+ * API Mount Path Utilities
3
+ *
4
+ * Shared helpers for computing API route mount paths from file paths.
5
+ * Used by both entry-generator.ts (runtime mounting) and ast.ts (type generation)
6
+ * to ensure consistent path calculation.
7
+ */
8
+ /**
9
+ * Compute the API mount path from a route file's relative path.
10
+ * This is the path used in app.route(mountPath, router).
11
+ *
12
+ * The mount path is based on the DIRECTORY containing the file, not the filename.
13
+ * Files directly in src/api/ (regardless of their name) mount at /api.
14
+ * Files in subdirectories mount at /api/{subdirectory}.
15
+ *
16
+ * @param relativePath - Path relative to src/api/ without extension
17
+ * e.g., 'index', 'sessions', 'auth/route', 'users/profile/route'
18
+ * @returns Mount path like '/api', '/api/auth', '/api/users/profile'
19
+ *
20
+ * @example
21
+ * computeApiMountPath('index') // '/api' (file in src/api/)
22
+ * computeApiMountPath('sessions') // '/api' (file in src/api/)
23
+ * computeApiMountPath('route') // '/api' (file in src/api/)
24
+ * computeApiMountPath('auth/route') // '/api/auth' (file in src/api/auth/)
25
+ * computeApiMountPath('auth/index') // '/api/auth' (file in src/api/auth/)
26
+ * computeApiMountPath('users/profile/route') // '/api/users/profile' (file in src/api/users/profile/)
27
+ */
28
+ export declare function computeApiMountPath(relativePath: string): string;
29
+ /**
30
+ * Join a mount base path with a route's local path.
31
+ * Handles normalization of slashes and empty/root paths.
32
+ *
33
+ * @param base - The mount base path (e.g., '/api/sessions')
34
+ * @param route - The local route path (e.g., '/', '/users', ':id')
35
+ * @returns The combined full path
36
+ *
37
+ * @example
38
+ * joinMountAndRoute('/api/sessions', '/') // '/api/sessions'
39
+ * joinMountAndRoute('/api/sessions', '/users') // '/api/sessions/users'
40
+ * joinMountAndRoute('/api', '/health') // '/api/health'
41
+ * joinMountAndRoute('/api/users', ':id') // '/api/users/:id'
42
+ */
43
+ export declare function joinMountAndRoute(base: string, route: string): string;
44
+ /**
45
+ * Extract the relative path from a full file path to src/api/.
46
+ * Normalizes path separators for cross-platform compatibility.
47
+ *
48
+ * @param filename - Full path to the route file
49
+ * @param srcDir - Path to the src directory
50
+ * @returns Path relative to src/api/ without extension
51
+ *
52
+ * @example
53
+ * // Given srcDir = '/project/src'
54
+ * extractRelativeApiPath('/project/src/api/sessions.ts', '/project/src')
55
+ * // Returns: 'sessions'
56
+ *
57
+ * extractRelativeApiPath('/project/src/api/auth/route.ts', '/project/src')
58
+ * // Returns: 'auth/route'
59
+ */
60
+ export declare function extractRelativeApiPath(filename: string, srcDir: string): string;
61
+ //# sourceMappingURL=api-mount-path.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"api-mount-path.d.ts","sourceRoot":"","sources":["../../../../src/cmd/build/vite/api-mount-path.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAWhE;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAMrE;AAID;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAK/E"}
@@ -0,0 +1,83 @@
1
+ /**
2
+ * API Mount Path Utilities
3
+ *
4
+ * Shared helpers for computing API route mount paths from file paths.
5
+ * Used by both entry-generator.ts (runtime mounting) and ast.ts (type generation)
6
+ * to ensure consistent path calculation.
7
+ */
8
+ /**
9
+ * Compute the API mount path from a route file's relative path.
10
+ * This is the path used in app.route(mountPath, router).
11
+ *
12
+ * The mount path is based on the DIRECTORY containing the file, not the filename.
13
+ * Files directly in src/api/ (regardless of their name) mount at /api.
14
+ * Files in subdirectories mount at /api/{subdirectory}.
15
+ *
16
+ * @param relativePath - Path relative to src/api/ without extension
17
+ * e.g., 'index', 'sessions', 'auth/route', 'users/profile/route'
18
+ * @returns Mount path like '/api', '/api/auth', '/api/users/profile'
19
+ *
20
+ * @example
21
+ * computeApiMountPath('index') // '/api' (file in src/api/)
22
+ * computeApiMountPath('sessions') // '/api' (file in src/api/)
23
+ * computeApiMountPath('route') // '/api' (file in src/api/)
24
+ * computeApiMountPath('auth/route') // '/api/auth' (file in src/api/auth/)
25
+ * computeApiMountPath('auth/index') // '/api/auth' (file in src/api/auth/)
26
+ * computeApiMountPath('users/profile/route') // '/api/users/profile' (file in src/api/users/profile/)
27
+ */
28
+ export function computeApiMountPath(relativePath) {
29
+ // Extract the directory path (everything before the last /)
30
+ const lastSlashIndex = relativePath.lastIndexOf('/');
31
+ if (lastSlashIndex === -1) {
32
+ // File is directly in src/api/ (e.g., 'index', 'sessions', 'route')
33
+ return '/api';
34
+ }
35
+ // File is in a subdirectory (e.g., 'auth/route' -> 'auth')
36
+ const dirPath = relativePath.substring(0, lastSlashIndex);
37
+ return `/api/${dirPath}`;
38
+ }
39
+ /**
40
+ * Join a mount base path with a route's local path.
41
+ * Handles normalization of slashes and empty/root paths.
42
+ *
43
+ * @param base - The mount base path (e.g., '/api/sessions')
44
+ * @param route - The local route path (e.g., '/', '/users', ':id')
45
+ * @returns The combined full path
46
+ *
47
+ * @example
48
+ * joinMountAndRoute('/api/sessions', '/') // '/api/sessions'
49
+ * joinMountAndRoute('/api/sessions', '/users') // '/api/sessions/users'
50
+ * joinMountAndRoute('/api', '/health') // '/api/health'
51
+ * joinMountAndRoute('/api/users', ':id') // '/api/users/:id'
52
+ */
53
+ export function joinMountAndRoute(base, route) {
54
+ if (!route || route === '/') {
55
+ return base;
56
+ }
57
+ const normalized = route.startsWith('/') ? route : `/${route}`;
58
+ return `${base}${normalized}`.replace(/\/{2,}/g, '/').replace(/\/$/, '');
59
+ }
60
+ import { join, relative } from 'node:path';
61
+ /**
62
+ * Extract the relative path from a full file path to src/api/.
63
+ * Normalizes path separators for cross-platform compatibility.
64
+ *
65
+ * @param filename - Full path to the route file
66
+ * @param srcDir - Path to the src directory
67
+ * @returns Path relative to src/api/ without extension
68
+ *
69
+ * @example
70
+ * // Given srcDir = '/project/src'
71
+ * extractRelativeApiPath('/project/src/api/sessions.ts', '/project/src')
72
+ * // Returns: 'sessions'
73
+ *
74
+ * extractRelativeApiPath('/project/src/api/auth/route.ts', '/project/src')
75
+ * // Returns: 'auth/route'
76
+ */
77
+ export function extractRelativeApiPath(filename, srcDir) {
78
+ const apiDir = join(srcDir, 'api');
79
+ return relative(apiDir, filename)
80
+ .replace(/\\/g, '/') // Normalize Windows paths
81
+ .replace(/\.tsx?$/, ''); // Remove extension
82
+ }
83
+ //# sourceMappingURL=api-mount-path.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"api-mount-path.js","sourceRoot":"","sources":["../../../../src/cmd/build/vite/api-mount-path.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,UAAU,mBAAmB,CAAC,YAAoB;IACvD,4DAA4D;IAC5D,MAAM,cAAc,GAAG,YAAY,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IACrD,IAAI,cAAc,KAAK,CAAC,CAAC,EAAE,CAAC;QAC3B,oEAAoE;QACpE,OAAO,MAAM,CAAC;IACf,CAAC;IAED,2DAA2D;IAC3D,MAAM,OAAO,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;IAC1D,OAAO,QAAQ,OAAO,EAAE,CAAC;AAC1B,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAAY,EAAE,KAAa;IAC5D,IAAI,CAAC,KAAK,IAAI,KAAK,KAAK,GAAG,EAAE,CAAC;QAC7B,OAAO,IAAI,CAAC;IACb,CAAC;IACD,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC;IAC/D,OAAO,GAAG,IAAI,GAAG,UAAU,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AAC1E,CAAC;AAED,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAE3C;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,sBAAsB,CAAC,QAAgB,EAAE,MAAc;IACtE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACnC,OAAO,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC;SAC/B,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,0BAA0B;SAC9C,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC,mBAAmB;AAC9C,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../src/cmd/cloud/deploy.ts"],"names":[],"mappings":"AAmFA,eAAO,MAAM,gBAAgB,sCA4iC3B,CAAC"}
1
+ {"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../src/cmd/cloud/deploy.ts"],"names":[],"mappings":"AAoFA,eAAO,MAAM,gBAAgB,sCA8iC3B,CAAC"}
@@ -8,7 +8,7 @@ import { isRunningFromExecutable } from '../upgrade';
8
8
  import { createSubcommand, DeployOptionsSchema } from '../../types';
9
9
  import { getUserAgent } from '../../api';
10
10
  import * as tui from '../../tui';
11
- import { saveProjectDir, getDefaultConfigDir, loadProjectSDKKey, updateProjectConfig, } from '../../config';
11
+ import { saveProjectDir, getDefaultConfigDir, loadProjectSDKKey, updateProjectConfig, getGlobalCatalystAPIClient, } from '../../config';
12
12
  import { getProjectGithubStatus } from '../git/api';
13
13
  import { runGitLink } from '../git/link';
14
14
  import { runSteps, stepSuccess, stepSkipped, stepError, pauseStepUI, } from '../../steps';
@@ -261,7 +261,9 @@ export const deploySubcommand = createSubcommand({
261
261
  return null;
262
262
  }
263
263
  logger.debug('Checking %d packages for malware', packages.length);
264
- const result = await projectDeploymentMalwareCheck(apiClient, deployment.id, packages);
264
+ // Use Catalyst client directly for malware check (security routes are on Catalyst)
265
+ const catalystClient = await getGlobalCatalystAPIClient(logger, auth, config?.name);
266
+ const result = await projectDeploymentMalwareCheck(catalystClient, deployment.id, packages);
265
267
  logger.debug('Malware check complete: action=%s, flagged=%d', result.action, result.summary.flagged);
266
268
  return result;
267
269
  }
@@ -1 +1 @@
1
- {"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../src/cmd/cloud/deploy.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../src/cmd/cloud/deploy.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import type { Config, Logger, CommandDefinition } from './types';
1
+ import type { Config, Logger, CommandDefinition, SubcommandDefinition } from './types';
2
2
  /**
3
3
  * Check for updates and optionally prompt to upgrade
4
4
  * Should be called early in the CLI initialization, before commands execute
@@ -9,5 +9,5 @@ export declare function checkForUpdates(config: Config | null, logger: Logger, o
9
9
  validate?: boolean;
10
10
  dryRun?: boolean;
11
11
  skipVersionCheck?: boolean;
12
- }, commandDef: CommandDefinition | undefined, args: string[]): Promise<void>;
12
+ }, commandDef: CommandDefinition | undefined, subcommandDef: SubcommandDefinition | undefined, args: string[]): Promise<void>;
13
13
  //# sourceMappingURL=version-check.d.ts.map
@@ -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,MAAM,SAAS,CAAC;AA8KjE;;;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,IAAI,EAAE,MAAM,EAAE,GACZ,OAAO,CAAC,IAAI,CAAC,CAoDf"}
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;AAiMvF;;;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,CAoDf"}
@@ -4,10 +4,12 @@ import * as tui from './tui';
4
4
  import { saveConfig } from './config';
5
5
  import { $ } from 'bun';
6
6
  const ONE_HOUR_MS = 60 * 60 * 1000;
7
+ // Tags that indicate a command should skip the upgrade prompt
8
+ const SKIP_UPGRADE_TAGS = ['read-only', 'fast'];
7
9
  /**
8
10
  * Check if we should skip the version check based on environment and config
9
11
  */
10
- function shouldSkipCheck(config, options, commandDef, args) {
12
+ function shouldSkipCheck(config, options, commandDef, subcommandDef, args) {
11
13
  // Skip if running via bun/bunx (not installed executable)
12
14
  if (!isRunningFromExecutable()) {
13
15
  return true;
@@ -42,6 +44,19 @@ function shouldSkipCheck(config, options, commandDef, args) {
42
44
  if (commandDef && commandDef.skipUpgradeCheck === true) {
43
45
  return true;
44
46
  }
47
+ // Skip if subcommand explicitly opts out of upgrade check
48
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
49
+ if (subcommandDef && subcommandDef.skipUpgradeCheck === true) {
50
+ return true;
51
+ }
52
+ // Skip if command or subcommand has tags indicating it's read-only or fast
53
+ // These commands shouldn't be interrupted with upgrade prompts
54
+ const commandTags = commandDef?.tags ?? [];
55
+ const subcommandTags = subcommandDef?.tags ?? [];
56
+ const allTags = [...commandTags, ...subcommandTags];
57
+ if (allTags.some((tag) => SKIP_UPGRADE_TAGS.includes(tag))) {
58
+ return true;
59
+ }
45
60
  // Skip for help commands
46
61
  const helpFlags = ['--help', '-h', 'help'];
47
62
  if (args.some((arg) => helpFlags.includes(arg))) {
@@ -140,9 +155,9 @@ async function performUpgrade(logger) {
140
155
  * Check for updates and optionally prompt to upgrade
141
156
  * Should be called early in the CLI initialization, before commands execute
142
157
  */
143
- export async function checkForUpdates(config, logger, options, commandDef, args) {
158
+ export async function checkForUpdates(config, logger, options, commandDef, subcommandDef, args) {
144
159
  // Determine if we should skip the check
145
- if (shouldSkipCheck(config, options, commandDef, args)) {
160
+ if (shouldSkipCheck(config, options, commandDef, subcommandDef, args)) {
146
161
  logger.trace('Skipping version check (disabled or not applicable)');
147
162
  return;
148
163
  }
@@ -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": "0.1.26",
3
+ "version": "0.1.27",
4
4
  "license": "Apache-2.0",
5
5
  "author": "Agentuity employees and contributors",
6
6
  "type": "module",
@@ -40,9 +40,9 @@
40
40
  "prepublishOnly": "bun run clean && bun run build"
41
41
  },
42
42
  "dependencies": {
43
- "@agentuity/auth": "0.1.26",
44
- "@agentuity/core": "0.1.26",
45
- "@agentuity/server": "0.1.26",
43
+ "@agentuity/auth": "0.1.27",
44
+ "@agentuity/core": "0.1.27",
45
+ "@agentuity/server": "0.1.27",
46
46
  "@datasert/cronjs-parser": "^1.4.0",
47
47
  "@terascope/fetch-github-release": "^2.2.1",
48
48
  "@vitejs/plugin-react": "^5.1.2",
@@ -60,10 +60,10 @@
60
60
  "typescript": "^5.9.0",
61
61
  "vite": "^7.2.7",
62
62
  "zod": "^4.3.5",
63
- "@agentuity/frontend": "0.1.26"
63
+ "@agentuity/frontend": "0.1.27"
64
64
  },
65
65
  "devDependencies": {
66
- "@agentuity/test-utils": "0.1.26",
66
+ "@agentuity/test-utils": "0.1.27",
67
67
  "@types/adm-zip": "^0.5.7",
68
68
  "@types/bun": "latest",
69
69
  "@types/tar-fs": "^2.0.4",
package/src/auth.ts CHANGED
@@ -72,12 +72,13 @@ export async function requireAuth(ctx: CommandContext<undefined>): Promise<AuthD
72
72
  // Import and run login flow
73
73
  const { loginCommand } = await import('./cmd/auth/login');
74
74
 
75
- // Ensure apiClient is available for login handler
75
+ // Ensure apiClient and opts are available for login handler
76
76
  const loginCtx = ctx as unknown as Record<string, unknown>;
77
77
  if (!loginCtx.apiClient) {
78
78
  const apiUrl = getAPIBaseURL(ctx.config ?? null);
79
79
  loginCtx.apiClient = new APIClient(apiUrl, ctx.logger, ctx.config ?? null);
80
80
  }
81
+ loginCtx.opts ??= {};
81
82
 
82
83
  if (loginCommand.handler) {
83
84
  await loginCommand.handler(loginCtx as CommandContext);
@@ -165,12 +166,13 @@ export async function optionalAuth(
165
166
  // Import and run login flow
166
167
  const { loginCommand } = await import('./cmd/auth/login');
167
168
 
168
- // Ensure apiClient is available for login handler
169
+ // Ensure apiClient and opts are available for login handler
169
170
  const loginCtx1 = ctx as unknown as Record<string, unknown>;
170
171
  if (!loginCtx1.apiClient) {
171
172
  const apiUrl = getAPIBaseURL(ctx.config ?? null);
172
173
  loginCtx1.apiClient = new APIClient(apiUrl, ctx.logger, ctx.config ?? null);
173
174
  }
175
+ loginCtx1.opts ??= {};
174
176
 
175
177
  if (loginCommand.handler) {
176
178
  await loginCommand.handler(loginCtx1 as CommandContext);
@@ -207,12 +209,13 @@ export async function optionalAuth(
207
209
  // Import and run login flow
208
210
  const { loginCommand } = await import('./cmd/auth/login');
209
211
 
210
- // Ensure apiClient is available for login handler
212
+ // Ensure apiClient and opts are available for login handler
211
213
  const loginCtx2 = ctx as unknown as Record<string, unknown>;
212
214
  if (!loginCtx2.apiClient) {
213
215
  const apiUrl = getAPIBaseURL(ctx.config ?? null);
214
216
  loginCtx2.apiClient = new APIClient(apiUrl, ctx.logger, ctx.config ?? null);
215
217
  }
218
+ loginCtx2.opts ??= {};
216
219
 
217
220
  if (loginCommand.handler) {
218
221
  await loginCommand.handler(loginCtx2 as CommandContext);
@@ -25,7 +25,8 @@ export const loginCommand = createSubcommand({
25
25
  response: z.object({ success: z.boolean() }),
26
26
  },
27
27
  async handler(ctx) {
28
- const { logger, config, apiClient, opts, options } = ctx;
28
+ const { logger, config, apiClient, options } = ctx;
29
+ const opts = ctx.opts ?? {};
29
30
 
30
31
  if (opts.setupToken) {
31
32
  const url = getAPIBaseURL(config);