instant-cli 1.0.23-branch-codex-cli-args-combinators.25401805358.1 → 1.0.23-branch-codex-cli-args-combinators.25402394638.1

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
 
-> instant-cli@1.0.23-branch-codex-cli-args-combinators.25401805358.1 build /home/runner/work/instant/instant/client/packages/cli
+> instant-cli@1.0.23-branch-codex-cli-args-combinators.25402394638.1 build /home/runner/work/instant/instant/client/packages/cli
 > rm -rf dist; tsc -p tsconfig.build.json
 

package/__tests__/args.test.ts

@@ -30,17 +30,19 @@ const basePrompt = { prompt: 'Client ID:' } as any;
 
 describe('types', () => {
   test('required return type accounts for inactive args', () => {
-    const requiredValue = Args.from({ 'client-id': 'abc123' })
-      .text('client-id')
-      .pipe(Args.required());
+    const requiredValue = Args.text(
+      { 'client-id': 'abc123' },
+      'client-id',
+    ).pipe(Args.required());
 
     expectTypeOf(requiredValue).toEqualTypeOf<
       Effect.Effect<string, BadArgsError>
     >();
 
-    const conditionallyRequiredValue = Args.from({})
-      .text('client-id')
-      .pipe(Args.availableWhen(false), Args.required());
+    const conditionallyRequiredValue = Args.text({}, 'client-id').pipe(
+      Args.availableWhen(false),
+      Args.required(),
+    );
 
     expectTypeOf(conditionallyRequiredValue).toEqualTypeOf<
       Effect.Effect<string | undefined, BadArgsError>
@@ -51,17 +53,17 @@ describe('types', () => {
 describe('availableWhen', () => {
   test('unavailable + value provided -> error', async () => {
     const err = await runFail(
-      Args.from({
-        'custom-redirect-uri': 'https://mysite.com/callback',
-      })
-        .text('custom-redirect-uri')
-        .pipe(
-          Args.availableWhen(false, {
-            message:
-              'Provided custom redirect URI when not using web app type.',
-          }),
-          Args.optional(),
-        ),
+      Args.text(
+        {
+          'custom-redirect-uri': 'https://mysite.com/callback',
+        },
+        'custom-redirect-uri',
+      ).pipe(
+        Args.availableWhen(false, {
+          message: 'Provided custom redirect URI when not using web app type.',
+        }),
+        Args.optional(),
+      ),
       false,
     );
 
@@ -72,15 +74,12 @@ describe('availableWhen', () => {
 
   test('unavailable + empty value provided -> error', async () => {
     const err = await runFail(
-      Args.from({ 'custom-redirect-uri': '' })
-        .text('custom-redirect-uri')
-        .pipe(
-          Args.availableWhen(false, {
-            message:
-              'Provided custom redirect URI when not using web app type.',
-          }),
-          Args.optional(),
-        ),
+      Args.text({ 'custom-redirect-uri': '' }, 'custom-redirect-uri').pipe(
+        Args.availableWhen(false, {
+          message: 'Provided custom redirect URI when not using web app type.',
+        }),
+        Args.optional(),
+      ),
       false,
     );
 
@@ -91,9 +90,10 @@ describe('availableWhen', () => {
 
   test('unavailable + no value -> undefined', async () => {
     const result = await run(
-      Args.from({})
-        .text('custom-redirect-uri')
-        .pipe(Args.availableWhen(false), Args.optional()),
+      Args.text({}, 'custom-redirect-uri').pipe(
+        Args.availableWhen(false),
+        Args.optional(),
+      ),
       false,
     );
 
@@ -104,16 +104,14 @@ describe('availableWhen', () => {
 describe('validate', () => {
   test('valid value -> passes through', async () => {
     const result = await run(
-      Args.from({ 'project-id': 'my-project' })
-        .text('project-id')
-        .pipe(
-          Args.validate((value) =>
-            value.includes('_')
-              ? 'Project ID cannot include underscores.'
-              : undefined,
-          ),
-          Args.required(),
+      Args.text({ 'project-id': 'my-project' }, 'project-id').pipe(
+        Args.validate((value) =>
+          value.includes('_')
+            ? 'Project ID cannot include underscores.'
+            : undefined,
         ),
+        Args.required(),
+      ),
       true,
     );
 
@@ -122,16 +120,14 @@ describe('validate', () => {
 
   test('invalid value -> error', async () => {
     const err = await runFail(
-      Args.from({ 'project-id': 'my_project' })
-        .text('project-id')
-        .pipe(
-          Args.validate((value) =>
-            value.includes('_')
-              ? 'Project ID cannot include underscores.'
-              : undefined,
-          ),
-          Args.required(),
+      Args.text({ 'project-id': 'my_project' }, 'project-id').pipe(
+        Args.validate((value) =>
+          value.includes('_')
+            ? 'Project ID cannot include underscores.'
+            : undefined,
         ),
+        Args.required(),
+      ),
       true,
     );
 
@@ -142,9 +138,7 @@ describe('validate', () => {
 describe('non-interactive', () => {
   test('required missing value -> error', async () => {
     const err = await runFail(
-      Args.from({})
-        .text('client-id')
-        .pipe(Args.prompt(basePrompt), Args.required()),
+      Args.text({}, 'client-id').pipe(Args.prompt(basePrompt), Args.required()),
       true,
     );
 
@@ -153,7 +147,7 @@ describe('non-interactive', () => {
 
   test('number value -> stringified', async () => {
     const result = await run(
-      Args.from({ 'client-id': 42 }).text('client-id').pipe(Args.required()),
+      Args.text({ 'client-id': 42 }, 'client-id').pipe(Args.required()),
       true,
     );
 
@@ -162,7 +156,7 @@ describe('non-interactive', () => {
 
   test('non-string/number value -> error', async () => {
     const err = await runFail(
-      Args.from({ 'client-id': true }).text('client-id').pipe(Args.required()),
+      Args.text({ 'client-id': true }, 'client-id').pipe(Args.required()),
       true,
     );
 
@@ -171,9 +165,10 @@ describe('non-interactive', () => {
 
   test('valid string -> trimmed value', async () => {
     const result = await run(
-      Args.from({ 'client-id': ' abc123.apps.googleusercontent.com ' })
-        .text('client-id')
-        .pipe(Args.required()),
+      Args.text(
+        { 'client-id': ' abc123.apps.googleusercontent.com ' },
+        'client-id',
+      ).pipe(Args.required()),
       true,
     );
 
@@ -182,36 +177,29 @@ describe('non-interactive', () => {
 
   test('optional missing value -> undefined', async () => {
     const result = await run(
-      Args.from({}).text('custom-redirect-uri').pipe(Args.optional()),
+      Args.text({}, 'custom-redirect-uri').pipe(Args.optional()),
       true,
     );
 
     expect(result).toBeUndefined();
   });
 
-  test('flag name can include leading dashes', async () => {
-    const result = await run(
-      Args.from({ 'client-id': 'abc123' })
-        .text('--client-id')
-        .pipe(Args.required()),
-      true,
-    );
-
-    expect(result).toBe('abc123');
-  });
-
-  test('camelCase key reads camelCase opts and derives kebab-case flag name', async () => {
+  test('simpleName overrides display flag without changing lookup key', async () => {
     const result = await run(
-      Args.from({ customRedirectUri: 'https://example.com/callback' })
-        .text('customRedirectUri')
-        .pipe(Args.required()),
+      Args.text(
+        { customRedirectUri: 'https://example.com/callback' },
+        'customRedirectUri',
+        { simpleName: '--custom-redirect-uri' },
+      ).pipe(Args.required()),
       true,
     );
 
     expect(result).toBe('https://example.com/callback');
 
     const err = await runFail(
-      Args.from({}).text('customRedirectUri').pipe(Args.required()),
+      Args.text({}, 'customRedirectUri', {
+        simpleName: '--custom-redirect-uri',
+      }).pipe(Args.required()),
       true,
     );
 
@@ -220,31 +208,26 @@ describe('non-interactive', () => {
     );
   });
 
-  test('simpleName overrides display flag without changing lookup key', async () => {
-    const result = await run(
-      Args.from({ firebaseProject: 'valid-app-123' })
-        .text('firebaseProject', { simpleName: '--project-id' })
-        .pipe(Args.required()),
-      true,
-    );
-
-    expect(result).toBe('valid-app-123');
-
+  test('does not fall back to other key shapes', async () => {
     const err = await runFail(
-      Args.from({ firebaseProject: true })
-        .text('firebaseProject', { simpleName: '--project-id' })
-        .pipe(Args.required()),
+      Args.text(
+        { 'custom-redirect-uri': 'https://example.com/callback' },
+        'customRedirectUri',
+        { simpleName: '--custom-redirect-uri' },
+      ).pipe(Args.required()),
       true,
     );
 
-    expect(err.message).toBe('Invalid value for --project-id');
+    expect(err.message).toBe(
+      'Missing required value for --custom-redirect-uri',
+    );
   });
 
   test('boolean value -> parsed', async () => {
     const result = await run(
-      Args.from({ 'configure-web': true })
-        .bool('configure-web')
-        .pipe(Args.optional()),
+      Args.bool({ 'configure-web': true }, 'configure-web').pipe(
+        Args.optional(),
+      ),
       true,
     );
 
@@ -253,9 +236,9 @@ describe('non-interactive', () => {
 
   test('boolean string value -> parsed', async () => {
     const result = await run(
-      Args.from({ 'configure-web': 'false' })
-        .bool('configure-web')
-        .pipe(Args.optional()),
+      Args.bool({ 'configure-web': 'false' }, 'configure-web').pipe(
+        Args.optional(),
+      ),
       true,
     );
 
@@ -264,9 +247,9 @@ describe('non-interactive', () => {
 
   test('invalid boolean value -> error', async () => {
     const err = await runFail(
-      Args.from({ 'configure-web': 'sometimes' })
-        .bool('configure-web')
-        .pipe(Args.optional()),
+      Args.bool({ 'configure-web': 'sometimes' }, 'configure-web').pipe(
+        Args.optional(),
+      ),
       true,
     );
 
@@ -275,15 +258,13 @@ describe('non-interactive', () => {
 
   test('missing confirmation returns default value', async () => {
     const result = await run(
-      Args.from({})
-        .bool('configure-web')
-        .pipe(
-          Args.confirm({
-            promptText: 'Configure web redirect flow?',
-            defaultValue: false,
-          }),
-          Args.required(),
-        ),
+      Args.bool({}, 'configure-web').pipe(
+        Args.confirm({
+          promptText: 'Configure web redirect flow?',
+          defaultValue: false,
+        }),
+        Args.required(),
+      ),
       true,
     );
 
@@ -294,9 +275,10 @@ describe('non-interactive', () => {
 describe('interactive', () => {
   test('value already provided -> use it directly', async () => {
     const result = await run(
-      Args.from({ 'client-id': ' abc123.apps.googleusercontent.com ' })
-        .text('client-id')
-        .pipe(Args.prompt(basePrompt), Args.required()),
+      Args.text(
+        { 'client-id': ' abc123.apps.googleusercontent.com ' },
+        'client-id',
+      ).pipe(Args.prompt(basePrompt), Args.required()),
       false,
     );
 
@@ -307,9 +289,10 @@ describe('interactive', () => {
     mockPromptReturn = ' GOCSPX-secret123 ';
 
     const result = await run(
-      Args.from({})
-        .text('client-secret')
-        .pipe(Args.prompt(basePrompt), Args.required()),
+      Args.text({}, 'client-secret').pipe(
+        Args.prompt(basePrompt),
+        Args.required(),
+      ),
       false,
     );
 
@@ -320,9 +303,10 @@ describe('interactive', () => {
     mockPromptReturn = '';
 
     const err = await runFail(
-      Args.from({})
-        .text('client-secret')
-        .pipe(Args.prompt(basePrompt), Args.required()),
+      Args.text({}, 'client-secret').pipe(
+        Args.prompt(basePrompt),
+        Args.required(),
+      ),
       false,
     );
 
@@ -333,9 +317,10 @@ describe('interactive', () => {
     mockPromptReturn = '';
 
     const result = await run(
-      Args.from({})
-        .text('custom-redirect-uri')
-        .pipe(Args.prompt(basePrompt), Args.optional()),
+      Args.text({}, 'custom-redirect-uri').pipe(
+        Args.prompt(basePrompt),
+        Args.optional(),
+      ),
       false,
     );
 
@@ -346,15 +331,13 @@ describe('interactive', () => {
     mockPromptReturn = true;
 
     const result = await run(
-      Args.from({})
-        .bool('configure-web')
-        .pipe(
-          Args.confirm({
-            promptText: 'Configure web redirect flow?',
-            defaultValue: false,
-          }),
-          Args.optional(),
-        ),
+      Args.bool({}, 'configure-web').pipe(
+        Args.confirm({
+          promptText: 'Configure web redirect flow?',
+          defaultValue: false,
+        }),
+        Args.optional(),
+      ),
       false,
     );
 

package/__tests__/oauthMock.ts

@@ -40,13 +40,12 @@ export const makeOAuthMock = (mocks: {
     providerType: string,
     opts: Record<string, unknown>,
   ) {
-    const args = Args.from(opts);
     const { auth, provider } = yield* getOrCreateProvider(providerType);
     const used: Set<string> = new Set(
       (auth.oauth_clients ?? []).map((c: any) => c.client_name),
     );
     const suggested = findName(providerType, used);
-    const clientName = yield* args.text('name').pipe(
+    const clientName = yield* Args.text(opts, 'name').pipe(
       Args.prompt({
         prompt: 'Client Name:',
         defaultValue: suggested,

package/dist/commands/auth/client/add.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../../../../src/commands/auth/client/add.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAiB,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGvD,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AA4C5D,eAAO,MAAM,gBAAgB,gFAO5B,CAAC;AAmnBF,eAAO,MAAM,gBAAgB;;;;wgBAwD5B,CAAC"}
+{"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../../../../src/commands/auth/client/add.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAiB,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGvD,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AA4C5D,eAAO,MAAM,gBAAgB,gFAO5B,CAAC;AAkmBF,eAAO,MAAM,gBAAgB;;;;wgBAwD5B,CAAC"}

package/dist/commands/auth/client/add.js

@@ -70,9 +70,8 @@ const selectGoogleCredentialMode = Effect.fn(function* () {
 });
 const resolveGoogleCredentialMode = Effect.fn(function* ({ appType, opts, }) {
     const { yes } = yield* GlobalOpts;
-    const args = Args.from(opts);
-    const devCredentialsFlag = args.isTrue('dev-credentials');
-    const hasProvidedSomeCustomCredentials = args.hasAny([
+    const devCredentialsFlag = Args.isTrue(opts, 'dev-credentials');
+    const hasProvidedSomeCustomCredentials = Args.hasAny(opts, [
         'client-id',
         'client-secret',
         'custom-redirect-uri',
@@ -133,7 +132,6 @@ const printGoogleCustomCredentialsClient = Effect.fn(function* ({ appType, clien
     ].join('\n'), { dimBorder: true, padding: { right: 1, left: 1 } }));
 });
 const handleGoogleClient = Effect.fn(function* (opts) {
-    const args = Args.from(opts);
     // This one requires special logic for getting client name
     // because the suggested name includes the app type
     const appType = yield* selectGoogleAppType(opts['app-type']);
@@ -145,7 +143,7 @@ const handleGoogleClient = Effect.fn(function* (opts) {
     const { auth, provider } = yield* getOrCreateProvider('google');
     const usedClientNames = new Set((auth.oauth_clients ?? []).map((client) => client.client_name));
     const suggestedClientName = findName(`google-${appType}`, usedClientNames);
-    const clientName = yield* args.text('name').pipe(Args.prompt({
+    const clientName = yield* Args.text(opts, 'name').pipe(Args.prompt({
         prompt: 'Client Name:',
         defaultValue: suggestedClientName,
         placeholder: suggestedClientName,
@@ -160,16 +158,16 @@ const handleGoogleClient = Effect.fn(function* (opts) {
             message: `The unique name '${clientName}' is already in use.`,
         });
     }
-    const clientId = yield* args.text('client-id').pipe(Args.availableWhen(!useSharedCredentials, {
+    const clientId = yield* Args.text(opts, 'client-id').pipe(Args.availableWhen(!useSharedCredentials, {
         message: '--client-id is not compatible with --dev-credentials. Drop one or the other.',
     }), Args.prompt(clientIdPrompt({ providerUrl: googleConsoleUrl })), Args.required());
     const usesCustomWebCredentials = !useSharedCredentials && appType === 'web';
-    const clientSecret = yield* args.text('client-secret').pipe(Args.availableWhen(usesCustomWebCredentials, {
+    const clientSecret = yield* Args.text(opts, 'client-secret').pipe(Args.availableWhen(usesCustomWebCredentials, {
         message: useSharedCredentials
             ? '--client-secret is not compatible with --dev-credentials. Drop one or the other.'
             : undefined,
     }), Args.prompt(clientSecretPrompt({ providerUrl: googleConsoleUrl })), Args.required());
-    const customRedirectUri = yield* args.text('custom-redirect-uri').pipe(Args.availableWhen(usesCustomWebCredentials, {
+    const customRedirectUri = yield* Args.text(opts, 'custom-redirect-uri').pipe(Args.availableWhen(usesCustomWebCredentials, {
         message: useSharedCredentials
             ? '--custom-redirect-uri is not compatible with --dev-credentials.'
             : 'Provided custom redirect URI when not using web app type.',
@@ -208,17 +206,10 @@ const handleGoogleClient = Effect.fn(function* (opts) {
     });
 });
 const handleGithubClient = Effect.fn(function* (opts) {
-    const args = Args.from(opts);
     const { clientName, provider } = yield* getClientNameAndProvider('github', opts);
-    const clientId = yield* args
-        .text('client-id')
-        .pipe(Args.prompt(clientIdPrompt({ providerUrl: githubDeveloperUrl })), Args.required());
-    const clientSecret = yield* args
-        .text('client-secret')
-        .pipe(Args.prompt(clientSecretPrompt({ providerUrl: githubDeveloperUrl })), Args.required());
-    const customRedirectUri = yield* args
-        .text('custom-redirect-uri')
-        .pipe(Args.prompt(optionalRedirectPrompt), Args.optional());
+    const clientId = yield* Args.text(opts, 'client-id').pipe(Args.prompt(clientIdPrompt({ providerUrl: githubDeveloperUrl })), Args.required());
+    const clientSecret = yield* Args.text(opts, 'client-secret').pipe(Args.prompt(clientSecretPrompt({ providerUrl: githubDeveloperUrl })), Args.required());
+    const customRedirectUri = yield* Args.text(opts, 'custom-redirect-uri').pipe(Args.prompt(optionalRedirectPrompt), Args.optional());
     const redirectUri = customRedirectUri || DEFAULT_OAUTH_CALLBACK_URL;
     // The backend infers GitHub's authorization/token endpoints from
     // meta.providerName === 'github', so we don't pass them here.
@@ -243,17 +234,10 @@ const handleGithubClient = Effect.fn(function* (opts) {
     ].join('\n'), { dimBorder: true, padding: { right: 1, left: 1 } }));
 });
 const handleLinkedInClient = Effect.fn(function* (opts) {
-    const args = Args.from(opts);
     const { clientName, provider } = yield* getClientNameAndProvider('linkedin', opts);
-    const clientId = yield* args
-        .text('client-id')
-        .pipe(Args.prompt(clientIdPrompt({ providerUrl: linkedinDeveloperUrl })), Args.required());
-    const clientSecret = yield* args
-        .text('client-secret')
-        .pipe(Args.prompt(clientSecretPrompt({ providerUrl: linkedinDeveloperUrl })), Args.required());
-    const customRedirectUri = yield* args
-        .text('custom-redirect-uri')
-        .pipe(Args.prompt(optionalRedirectPrompt), Args.optional());
+    const clientId = yield* Args.text(opts, 'client-id').pipe(Args.prompt(clientIdPrompt({ providerUrl: linkedinDeveloperUrl })), Args.required());
+    const clientSecret = yield* Args.text(opts, 'client-secret').pipe(Args.prompt(clientSecretPrompt({ providerUrl: linkedinDeveloperUrl })), Args.required());
+    const customRedirectUri = yield* Args.text(opts, 'custom-redirect-uri').pipe(Args.prompt(optionalRedirectPrompt), Args.optional());
     const redirectUri = customRedirectUri || DEFAULT_OAUTH_CALLBACK_URL;
     const response = yield* addOAuthClient({
         providerId: provider.id,
@@ -278,40 +262,33 @@ const handleLinkedInClient = Effect.fn(function* (opts) {
     ].join('\n'), { dimBorder: true, padding: { right: 1, left: 1 } }));
 });
 const handleAppleClient = Effect.fn(function* (opts) {
-    const args = Args.from(opts);
     const { clientName, provider } = yield* getClientNameAndProvider('apple', opts);
-    const servicesId = yield* args
-        .text('services-id')
-        .pipe(Args.prompt(appleServicesIdPrompt({})), Args.required());
+    const servicesId = yield* Args.text(opts, 'services-id').pipe(Args.prompt(appleServicesIdPrompt({})), Args.required());
     // If any web-flow flag is provided, enable web flow; otherwise ask
     // (non-interactively with --yes we default to native-only).
-    const anyWebFlagProvided = args.hasAny([
+    const anyWebFlagProvided = Args.hasAny(opts, [
         'team-id',
         'key-id',
         'private-key-file',
     ]);
     const configureWeb = anyWebFlagProvided
         ? true
-        : yield* args.bool('configure-web').pipe(Args.confirm({
+        : yield* Args.bool(opts, 'configure-web').pipe(Args.confirm({
             promptText: 'Configure web redirect flow? ' +
                 chalk.dim('(requires Team ID, Key ID, and a .p8 private key from Apple)'),
             defaultValue: false,
         }), Args.required());
     const skipWeb = !configureWeb;
     const webSkipMessage = 'requires configuring the web redirect flow (also provide --team-id, --key-id, and --private-key-file).';
-    const teamId = yield* args
-        .text('team-id')
-        .pipe(Args.availableWhen(!skipWeb, { message: `--team-id ${webSkipMessage}` }), Args.prompt(appleTeamIdPrompt({})), Args.required());
-    const keyId = yield* args
-        .text('key-id')
-        .pipe(Args.availableWhen(!skipWeb, { message: `--key-id ${webSkipMessage}` }), Args.prompt(appleKeyIdPrompt({})), Args.required());
-    const privateKeyPath = yield* args.text('private-key-file').pipe(Args.availableWhen(!skipWeb, {
+    const teamId = yield* Args.text(opts, 'team-id').pipe(Args.availableWhen(!skipWeb, { message: `--team-id ${webSkipMessage}` }), Args.prompt(appleTeamIdPrompt({})), Args.required());
+    const keyId = yield* Args.text(opts, 'key-id').pipe(Args.availableWhen(!skipWeb, { message: `--key-id ${webSkipMessage}` }), Args.prompt(appleKeyIdPrompt({})), Args.required());
+    const privateKeyPath = yield* Args.text(opts, 'private-key-file').pipe(Args.availableWhen(!skipWeb, {
         message: `--private-key-file ${webSkipMessage}`,
     }), Args.prompt(applePrivateKeyFilePrompt({})), Args.required());
     const privateKey = privateKeyPath
         ? yield* readPrivateKeyFile(privateKeyPath)
         : undefined;
-    const customRedirectUri = yield* args.text('custom-redirect-uri').pipe(Args.availableWhen(!skipWeb, {
+    const customRedirectUri = yield* Args.text(opts, 'custom-redirect-uri').pipe(Args.availableWhen(!skipWeb, {
         message: `--custom-redirect-uri ${webSkipMessage}`,
     }), Args.prompt(optionalRedirectPrompt), Args.optional());
     const redirectUri = privateKey
@@ -353,11 +330,8 @@ const handleAppleClient = Effect.fn(function* (opts) {
     }));
 });
 const handleClerkClient = Effect.fn(function* (opts) {
-    const args = Args.from(opts);
     const { clientName, provider } = yield* getClientNameAndProvider('clerk', opts);
-    const publishableKey = yield* args
-        .text('publishable-key')
-        .pipe(Args.prompt(clerkPublishableKeyPrompt({})), Args.required());
+    const publishableKey = yield* Args.text(opts, 'publishable-key').pipe(Args.prompt(clerkPublishableKeyPrompt({})), Args.required());
     const domain = clerkDomainFromPublishableKey(publishableKey);
     if (!domain) {
         return yield* BadArgsError.make({
@@ -384,11 +358,8 @@ const handleClerkClient = Effect.fn(function* (opts) {
 }`, { borderStyle: 'none' }));
 });
 const handleFirebaseClient = Effect.fn(function* (opts) {
-    const args = Args.from(opts);
     const { clientName, provider } = yield* getClientNameAndProvider('firebase', opts);
-    const projectId = yield* args
-        .text('project-id')
-        .pipe(Args.prompt(firebaseProjectIdPrompt({})), Args.validate(validateFirebaseProjectId), Args.required());
+    const projectId = yield* Args.text(opts, 'project-id').pipe(Args.prompt(firebaseProjectIdPrompt({})), Args.validate(validateFirebaseProjectId), Args.required());
     const response = yield* addOAuthClient({
         providerId: provider.id,
         clientName,