instant-cli 1.0.23-branch-codex-cli-args-combinators.25394030897.1 → 1.0.23-branch-codex-cli-args-combinators.25395572961.1

package/src/commands/auth/client/add.ts

@@ -39,9 +39,6 @@ import {
   clientSecretPrompt,
   firebaseDiscoveryEndpoint,
   firebaseProjectIdPrompt,
-  getFlag,
-  hasAnyFlag,
-  isTrueFlag,
   readPrivateKeyFile,
   redirectSetupMessages,
   redirectUriPrompt,
@@ -151,8 +148,9 @@ const resolveGoogleCredentialMode = Effect.fn(function* ({
   opts: Record<string, unknown>;
 }): Effect.fn.Return<'custom' | 'dev', BadArgsError, GlobalOpts> {
   const { yes } = yield* GlobalOpts;
-  const devCredentialsFlag = isTrueFlag(getFlag(opts, 'dev-credentials'));
-  const hasProvidedSomeCustomCredentials = hasAnyFlag(opts, [
+  const args = Args.from(opts);
+  const devCredentialsFlag = args.isTrue('dev-credentials');
+  const hasProvidedSomeCustomCredentials = args.hasAny([
     'client-id',
     'client-secret',
     'custom-redirect-uri',
@@ -256,6 +254,7 @@ const printGoogleCustomCredentialsClient = Effect.fn(function* ({
 });
 
 const handleGoogleClient = Effect.fn(function* (opts: Record<string, unknown>) {
+  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']);
@@ -271,8 +270,8 @@ const handleGoogleClient = Effect.fn(function* (opts: Record<string, unknown>) {
   );
   const suggestedClientName = findName(`google-${appType}`, usedClientNames);
 
-  const clientName = yield* Args.text(opts, 'name').pipe(
-    Args.orPrompt({
+  const clientName = yield* args.text('name').pipe(
+    Args.prompt({
       prompt: 'Client Name:',
       defaultValue: suggestedClientName,
       placeholder: suggestedClientName,
@@ -291,39 +290,34 @@ const handleGoogleClient = Effect.fn(function* (opts: Record<string, unknown>) {
     });
   }
 
-  const clientId = yield* Args.text(opts, 'client-id').pipe(
-    Args.forbidIf(useSharedCredentials, {
+  const clientId = yield* args.text('client-id').pipe(
+    Args.availableWhen(!useSharedCredentials, {
       message:
         '--client-id is not compatible with --dev-credentials. Drop one or the other.',
     }),
-    Args.orPromptIf(
-      !useSharedCredentials,
-      clientIdPrompt({ providerUrl: googleConsoleUrl }),
-    ),
-    Args.requiredIf(!useSharedCredentials),
+    Args.prompt(clientIdPrompt({ providerUrl: googleConsoleUrl })),
+    Args.required(),
   );
 
   const usesCustomWebCredentials = !useSharedCredentials && appType === 'web';
-  const clientSecret = yield* Args.text(opts, 'client-secret').pipe(
-    Args.forbidIf(!usesCustomWebCredentials, {
+  const clientSecret = yield* args.text('client-secret').pipe(
+    Args.availableWhen(usesCustomWebCredentials, {
       message: useSharedCredentials
         ? '--client-secret is not compatible with --dev-credentials. Drop one or the other.'
         : undefined,
     }),
-    Args.orPromptIf(
-      usesCustomWebCredentials,
-      clientSecretPrompt({ providerUrl: googleConsoleUrl }),
-    ),
-    Args.requiredIf(usesCustomWebCredentials),
+    Args.prompt(clientSecretPrompt({ providerUrl: googleConsoleUrl })),
+    Args.required(),
   );
 
-  const customRedirectUri = yield* Args.text(opts, 'custom-redirect-uri').pipe(
-    Args.forbidIf(!usesCustomWebCredentials, {
+  const customRedirectUri = yield* args.text('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.',
     }),
-    Args.orPromptIf(usesCustomWebCredentials, optionalRedirectPrompt),
+    Args.prompt(optionalRedirectPrompt),
+    Args.optional(),
   );
 
   if (!clientName) {
@@ -367,24 +361,29 @@ const handleGoogleClient = Effect.fn(function* (opts: Record<string, unknown>) {
 });
 
 const handleGithubClient = Effect.fn(function* (opts: Record<string, unknown>) {
+  const args = Args.from(opts);
   const { clientName, provider } = yield* getClientNameAndProvider(
     'github',
     opts,
   );
 
-  const clientId = yield* Args.text(opts, 'client-id').pipe(
-    Args.orPrompt(clientIdPrompt({ providerUrl: githubDeveloperUrl })),
-    Args.required(),
-  );
+  const clientId = yield* args
+    .text('client-id')
+    .pipe(
+      Args.prompt(clientIdPrompt({ providerUrl: githubDeveloperUrl })),
+      Args.required(),
+    );
 
-  const clientSecret = yield* Args.text(opts, 'client-secret').pipe(
-    Args.orPrompt(clientSecretPrompt({ providerUrl: githubDeveloperUrl })),
-    Args.required(),
-  );
+  const clientSecret = yield* args
+    .text('client-secret')
+    .pipe(
+      Args.prompt(clientSecretPrompt({ providerUrl: githubDeveloperUrl })),
+      Args.required(),
+    );
 
-  const customRedirectUri = yield* Args.text(opts, 'custom-redirect-uri').pipe(
-    Args.orPrompt(optionalRedirectPrompt),
-  );
+  const customRedirectUri = yield* args
+    .text('custom-redirect-uri')
+    .pipe(Args.prompt(optionalRedirectPrompt), Args.optional());
 
   if (!clientName) {
     return yield* BadArgsError.make({ message: 'Client name is required.' });
@@ -425,24 +424,29 @@ const handleGithubClient = Effect.fn(function* (opts: Record<string, unknown>) {
 const handleLinkedInClient = Effect.fn(function* (
   opts: Record<string, unknown>,
 ) {
+  const args = Args.from(opts);
   const { clientName, provider } = yield* getClientNameAndProvider(
     'linkedin',
     opts,
   );
 
-  const clientId = yield* Args.text(opts, 'client-id').pipe(
-    Args.orPrompt(clientIdPrompt({ providerUrl: linkedinDeveloperUrl })),
-    Args.required(),
-  );
+  const clientId = yield* args
+    .text('client-id')
+    .pipe(
+      Args.prompt(clientIdPrompt({ providerUrl: linkedinDeveloperUrl })),
+      Args.required(),
+    );
 
-  const clientSecret = yield* Args.text(opts, 'client-secret').pipe(
-    Args.orPrompt(clientSecretPrompt({ providerUrl: linkedinDeveloperUrl })),
-    Args.required(),
-  );
+  const clientSecret = yield* args
+    .text('client-secret')
+    .pipe(
+      Args.prompt(clientSecretPrompt({ providerUrl: linkedinDeveloperUrl })),
+      Args.required(),
+    );
 
-  const customRedirectUri = yield* Args.text(opts, 'custom-redirect-uri').pipe(
-    Args.orPrompt(optionalRedirectPrompt),
-  );
+  const customRedirectUri = yield* args
+    .text('custom-redirect-uri')
+    .pipe(Args.prompt(optionalRedirectPrompt), Args.optional());
 
   if (!clientName) {
     return yield* BadArgsError.make({ message: 'Client name is required.' });
@@ -482,20 +486,20 @@ const handleLinkedInClient = Effect.fn(function* (
 
 const handleAppleClient = Effect.fn(function* (opts: Record<string, unknown>) {
   const { yes } = yield* GlobalOpts;
+  const args = Args.from(opts);
   const { clientName, provider } = yield* getClientNameAndProvider(
     'apple',
     opts,
   );
 
-  const servicesId = yield* Args.text(opts, 'services-id').pipe(
-    Args.orPrompt(appleServicesIdPrompt({})),
-    Args.required(),
-  );
+  const servicesId = yield* args
+    .text('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 = Boolean(
-    opts['team-id'] || opts['key-id'] || opts['private-key-file'],
+    args.hasAny(['team-id', 'key-id', 'private-key-file']),
   );
 
   const configureWeb = anyWebFlagProvided
@@ -503,8 +507,8 @@ const handleAppleClient = Effect.fn(function* (opts: Record<string, unknown>) {
     : yes
       ? false
       : Boolean(
-          yield* Args.bool(opts, 'configure-web').pipe(
-            Args.orConfirm({
+          yield* args.bool('configure-web').pipe(
+            Args.confirm({
               promptText:
                 'Configure web redirect flow? ' +
                 chalk.dim(
@@ -512,6 +516,7 @@ const handleAppleClient = Effect.fn(function* (opts: Record<string, unknown>) {
                 ),
               defaultValue: false,
             }),
+            Args.optional(),
           ),
         );
 
@@ -519,35 +524,40 @@ const handleAppleClient = Effect.fn(function* (opts: Record<string, unknown>) {
   const webSkipMessage =
     'requires configuring the web redirect flow (also provide --team-id, --key-id, and --private-key-file).';
 
-  const teamId = yield* Args.text(opts, 'team-id').pipe(
-    Args.forbidIf(skipWeb, { message: `--team-id ${webSkipMessage}` }),
-    Args.orPromptIf(!skipWeb, appleTeamIdPrompt({})),
-    Args.requiredIf(!skipWeb),
-  );
+  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(opts, 'key-id').pipe(
-    Args.forbidIf(skipWeb, { message: `--key-id ${webSkipMessage}` }),
-    Args.orPromptIf(!skipWeb, appleKeyIdPrompt({})),
-    Args.requiredIf(!skipWeb),
-  );
+  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(opts, 'private-key-file').pipe(
-    Args.forbidIf(skipWeb, {
+  const privateKeyPath = yield* args.text('private-key-file').pipe(
+    Args.availableWhen(!skipWeb, {
       message: `--private-key-file ${webSkipMessage}`,
     }),
-    Args.orPromptIf(!skipWeb, applePrivateKeyFilePrompt({})),
-    Args.requiredIf(!skipWeb),
+    Args.prompt(applePrivateKeyFilePrompt({})),
+    Args.required(),
   );
 
   const privateKey = privateKeyPath
     ? yield* readPrivateKeyFile(privateKeyPath)
     : undefined;
 
-  const customRedirectUri = yield* Args.text(opts, 'custom-redirect-uri').pipe(
-    Args.forbidIf(skipWeb, {
+  const customRedirectUri = yield* args.text('custom-redirect-uri').pipe(
+    Args.availableWhen(!skipWeb, {
       message: `--custom-redirect-uri ${webSkipMessage}`,
     }),
-    Args.orPromptIf(!skipWeb, optionalRedirectPrompt),
+    Args.prompt(optionalRedirectPrompt),
+    Args.optional(),
   );
 
   if (!clientName) {
@@ -600,15 +610,15 @@ const handleAppleClient = Effect.fn(function* (opts: Record<string, unknown>) {
 });
 
 const handleClerkClient = Effect.fn(function* (opts: Record<string, unknown>) {
+  const args = Args.from(opts);
   const { clientName, provider } = yield* getClientNameAndProvider(
     'clerk',
     opts,
   );
 
-  const publishableKey = yield* Args.text(opts, 'publishable-key').pipe(
-    Args.orPrompt(clerkPublishableKeyPrompt({})),
-    Args.required(),
-  );
+  const publishableKey = yield* args
+    .text('publishable-key')
+    .pipe(Args.prompt(clerkPublishableKeyPrompt({})), Args.required());
 
   if (!clientName) {
     return yield* BadArgsError.make({ message: 'Client name is required.' });
@@ -665,15 +675,15 @@ const handleClerkClient = Effect.fn(function* (opts: Record<string, unknown>) {
 const handleFirebaseClient = Effect.fn(function* (
   opts: OptsFromCommand<typeof authClientAddDef> & Record<string, unknown>,
 ) {
+  const args = Args.from(opts);
   const { clientName, provider } = yield* getClientNameAndProvider(
     'firebase',
     opts,
   );
 
-  const projectId = yield* Args.text(opts, 'project-id').pipe(
-    Args.orPrompt(firebaseProjectIdPrompt({})),
-    Args.required(),
-  );
+  const projectId = yield* args
+    .text('project-id')
+    .pipe(Args.prompt(firebaseProjectIdPrompt({})), Args.required());
   // typeguard
   if (!clientName || !projectId) {
     return yield* BadArgsError.make({

package/src/commands/auth/client/shared.ts

@@ -9,18 +9,6 @@ import { UI } from '../../../ui/index.ts';
 
 type EmptyPromptArgs = Record<string, never>;
 
-export const getFlag = (opts: Record<string, unknown>, flag: string) =>
-  opts[flag];
-
-export const hasFlag = (opts: Record<string, unknown>, flag: string) =>
-  flag in opts;
-
-export const hasAnyFlag = (opts: Record<string, unknown>, flags: string[]) =>
-  flags.some((flag) => hasFlag(opts, flag));
-
-export const isTrueFlag = (value: unknown) =>
-  value === true || value === 'true';
-
 export const getMetaString = (meta: unknown, key: string) => {
   if (!meta || typeof meta !== 'object') return undefined;
   const value = (meta as Record<string, unknown>)[key];

package/src/commands/auth/client/update.ts

@@ -27,11 +27,7 @@ import {
   clientSecretPrompt,
   firebaseDiscoveryEndpoint,
   firebaseProjectIdPrompt,
-  getFlag,
   getMetaString,
-  hasAnyFlag,
-  hasFlag,
-  isTrueFlag,
   readPrivateKeyFile,
   redirectSetupMessages,
   redirectUriPrompt,
@@ -149,10 +145,10 @@ const updateGoogleToDevCredentials = Effect.fn(function* (
 type GoogleUpdateMode = 'dev' | 'custom' | 'redirect' | 'none';
 
 const hasGoogleCustomCredentialFlags = (opts: Record<string, unknown>) =>
-  hasAnyFlag(opts, ['client-id', 'client-secret', 'custom-redirect-uri']);
+  Args.from(opts).hasAny(['client-id', 'client-secret', 'custom-redirect-uri']);
 
 const hasGoogleUpdateFlags = (opts: Record<string, unknown>) =>
-  isTrueFlag(getFlag(opts, 'dev-credentials')) ||
+  Args.from(opts).isTrue('dev-credentials') ||
   hasGoogleCustomCredentialFlags(opts);
 
 const selectGoogleUpdateMode = Effect.fn(function* ({
@@ -211,7 +207,8 @@ const resolveGoogleUpdateMode = Effect.fn(function* ({
   switchingFromShared: boolean;
 }) {
   const { yes } = yield* GlobalOpts;
-  const devCredentialsFlag = isTrueFlag(getFlag(opts, 'dev-credentials'));
+  const args = Args.from(opts);
+  const devCredentialsFlag = args.isTrue('dev-credentials');
   const hasProvidedSomeCustomCredentials = hasGoogleCustomCredentialFlags(opts);
 
   if (devCredentialsFlag && !isWeb) {
@@ -222,7 +219,7 @@ const resolveGoogleUpdateMode = Effect.fn(function* ({
 
   if (
     !isWeb &&
-    (hasFlag(opts, 'client-secret') || hasFlag(opts, 'custom-redirect-uri'))
+    (args.has('client-secret') || args.has('custom-redirect-uri'))
   ) {
     return yield* BadArgsError.make({
       message:
@@ -254,7 +251,7 @@ const resolveGoogleUpdateMode = Effect.fn(function* ({
     yes &&
     isWeb &&
     switchingFromShared &&
-    (!hasFlag(opts, 'client-id') || !hasFlag(opts, 'client-secret'))
+    (!args.has('client-id') || !args.has('client-secret'))
   ) {
     return yield* BadArgsError.make({
       message:
@@ -276,10 +273,10 @@ const updateGoogleRedirect = Effect.fn(function* ({
   opts: Record<string, unknown>;
   client: OAuthClientRow;
 }) {
-  const redirectTo = yield* Args.text(opts, 'custom-redirect-uri').pipe(
-    Args.orPrompt(newRedirectPrompt),
-    Args.required(),
-  );
+  const args = Args.from(opts);
+  const redirectTo = yield* args
+    .text('custom-redirect-uri')
+    .pipe(Args.prompt(newRedirectPrompt), Args.required());
 
   const response = yield* updateOAuthClient({
     oauthClientId: client.id,
@@ -314,34 +311,37 @@ const updateGoogleCustomCredentials = Effect.fn(function* ({
   switchingFromShared: boolean;
   promptCredentials: boolean;
 }) {
+  const args = Args.from(opts);
   const mustCollectCredentials = promptCredentials || switchingFromShared;
-  const shouldPromptClientId =
-    promptCredentials || (switchingFromShared && !hasFlag(opts, 'client-id'));
-  const shouldPromptClientSecret =
-    isWeb &&
-    (promptCredentials ||
-      (switchingFromShared && !hasFlag(opts, 'client-secret')));
   const shouldPromptRedirectUri =
     isWeb && switchingFromShared && promptCredentials;
 
-  const clientId = yield* Args.text(opts, 'client-id').pipe(
-    Args.orPromptIf(
-      shouldPromptClientId,
-      clientIdPrompt({ providerUrl: googleConsoleUrl }),
-    ),
-    Args.requiredIf(mustCollectCredentials),
-  );
-  const clientSecret = yield* Args.text(opts, 'client-secret').pipe(
-    Args.orPromptIf(
-      shouldPromptClientSecret,
-      clientSecretPrompt({ providerUrl: googleConsoleUrl }),
-    ),
-    Args.requiredIf(isWeb && mustCollectCredentials),
-  );
+  const clientId = yield* args
+    .text('client-id')
+    .pipe(
+      Args.availableWhen(mustCollectCredentials || args.has('client-id')),
+      Args.prompt(clientIdPrompt({ providerUrl: googleConsoleUrl })),
+      Args.required(),
+    );
+  const clientSecret = yield* args
+    .text('client-secret')
+    .pipe(
+      Args.availableWhen(
+        isWeb && (mustCollectCredentials || args.has('client-secret')),
+      ),
+      Args.prompt(clientSecretPrompt({ providerUrl: googleConsoleUrl })),
+      Args.required(),
+    );
   const customRedirectUri = isWeb
-    ? yield* Args.text(opts, 'custom-redirect-uri').pipe(
-        Args.orPromptIf(shouldPromptRedirectUri, redirectPrompt),
-      )
+    ? yield* args
+        .text('custom-redirect-uri')
+        .pipe(
+          Args.availableWhen(
+            shouldPromptRedirectUri || args.has('custom-redirect-uri'),
+          ),
+          Args.prompt(redirectPrompt),
+          Args.optional(),
+        )
     : undefined;
 
   const redirectTo = switchingFromShared
@@ -439,7 +439,8 @@ const handleClientIdSecretUpdate = Effect.fn(function* (params: {
   redirectSetupPrompt: string;
 }) {
   const { yes } = yield* GlobalOpts;
-  const hasAnyUpdateFlag = hasAnyFlag(params.opts, [
+  const args = Args.from(params.opts);
+  const hasAnyUpdateFlag = args.hasAny([
     'client-id',
     'client-secret',
     'custom-redirect-uri',
@@ -463,30 +464,27 @@ const handleClientIdSecretUpdate = Effect.fn(function* (params: {
     promptRedirect = action === 'redirect';
   }
 
-  const clientId = yield* Args.text(params.opts, 'client-id').pipe(
-    Args.orPromptIf(
-      promptCredentials,
-      clientIdPrompt({ providerUrl: params.providerUrl }),
-    ),
-    Args.requiredIf(promptCredentials),
-  );
-  const clientSecret = yield* Args.text(params.opts, 'client-secret').pipe(
-    Args.orPromptIf(
-      promptCredentials,
-      clientSecretPrompt({ providerUrl: params.providerUrl }),
-    ),
-    Args.requiredIf(promptCredentials),
-  );
-  const customRedirectUri = yield* Args.text(
-    params.opts,
-    'custom-redirect-uri',
-  ).pipe(
-    Args.orPromptIf(
-      promptRedirect,
-      promptRedirect ? newRedirectPrompt : redirectPrompt,
-    ),
-    Args.requiredIf(promptRedirect),
-  );
+  const clientId = yield* args
+    .text('client-id')
+    .pipe(
+      Args.availableWhen(promptCredentials || args.has('client-id')),
+      Args.prompt(clientIdPrompt({ providerUrl: params.providerUrl })),
+      Args.required(),
+    );
+  const clientSecret = yield* args
+    .text('client-secret')
+    .pipe(
+      Args.availableWhen(promptCredentials || args.has('client-secret')),
+      Args.prompt(clientSecretPrompt({ providerUrl: params.providerUrl })),
+      Args.required(),
+    );
+  const customRedirectUri = yield* args
+    .text('custom-redirect-uri')
+    .pipe(
+      Args.availableWhen(promptRedirect || args.has('custom-redirect-uri')),
+      Args.prompt(promptRedirect ? newRedirectPrompt : redirectPrompt),
+      Args.required(),
+    );
 
   const response = yield* updateOAuthClient({
     oauthClientId: params.client.id,
@@ -527,10 +525,10 @@ const appleWebFlags = [
 const appleUpdateFlags = ['services-id', ...appleWebFlags];
 
 const hasAppleWebFlags = (opts: Record<string, unknown>) =>
-  hasAnyFlag(opts, appleWebFlags);
+  Args.from(opts).hasAny(appleWebFlags);
 
 const hasAppleUpdateFlags = (opts: Record<string, unknown>) =>
-  hasAnyFlag(opts, appleUpdateFlags);
+  Args.from(opts).hasAny(appleUpdateFlags);
 
 const appleClientHasWebConfig = (client: OAuthClientRow) =>
   Boolean(
@@ -596,24 +594,38 @@ const readAppleWebUpdate = Effect.fn(function* ({
   client: OAuthClientRow;
   promptAll: boolean;
 }) {
-  const teamId = yield* Args.text(opts, 'team-id').pipe(
-    Args.orPromptIf(promptAll, appleTeamIdPrompt({})),
-    Args.requiredIf(promptAll),
-  );
-  const keyId = yield* Args.text(opts, 'key-id').pipe(
-    Args.orPromptIf(promptAll, appleKeyIdPrompt({})),
-    Args.requiredIf(promptAll),
-  );
-  const privateKeyPath = yield* Args.text(opts, 'private-key-file').pipe(
-    Args.orPromptIf(promptAll, applePrivateKeyFilePrompt({})),
-    Args.requiredIf(promptAll),
-  );
+  const args = Args.from(opts);
+  const teamId = yield* args
+    .text('team-id')
+    .pipe(
+      Args.availableWhen(promptAll || args.has('team-id')),
+      Args.prompt(appleTeamIdPrompt({})),
+      Args.required(),
+    );
+  const keyId = yield* args
+    .text('key-id')
+    .pipe(
+      Args.availableWhen(promptAll || args.has('key-id')),
+      Args.prompt(appleKeyIdPrompt({})),
+      Args.required(),
+    );
+  const privateKeyPath = yield* args
+    .text('private-key-file')
+    .pipe(
+      Args.availableWhen(promptAll || args.has('private-key-file')),
+      Args.prompt(applePrivateKeyFilePrompt({})),
+      Args.required(),
+    );
   const privateKey = privateKeyPath
     ? yield* readPrivateKeyFile(privateKeyPath)
     : undefined;
-  const customRedirectUri = yield* Args.text(opts, 'custom-redirect-uri').pipe(
-    Args.orPromptIf(promptAll, redirectPrompt),
-  );
+  const customRedirectUri = yield* args
+    .text('custom-redirect-uri')
+    .pipe(
+      Args.availableWhen(promptAll || args.has('custom-redirect-uri')),
+      Args.prompt(redirectPrompt),
+      Args.optional(),
+    );
 
   const meta: Record<string, string> = {};
   if (teamId) meta.teamId = teamId;
@@ -634,16 +646,20 @@ const handleAppleUpdate = Effect.fn(function* (
   client: OAuthClientRow,
 ) {
   const { yes } = yield* GlobalOpts;
+  const args = Args.from(opts);
   const { promptAll, configureWeb } = yield* resolveAppleUpdateConfig({
     opts,
     client,
     yes,
   });
 
-  const servicesId = yield* Args.text(opts, 'services-id').pipe(
-    Args.orPromptIf(promptAll, appleServicesIdPrompt({})),
-    Args.requiredIf(promptAll),
-  );
+  const servicesId = yield* args
+    .text('services-id')
+    .pipe(
+      Args.availableWhen(promptAll || args.has('services-id')),
+      Args.prompt(appleServicesIdPrompt({})),
+      Args.required(),
+    );
   const webUpdate: AppleWebUpdate = configureWeb
     ? yield* readAppleWebUpdate({ opts, client, promptAll })
     : {};
@@ -683,14 +699,10 @@ const handleClerkUpdate = Effect.fn(function* (
   opts: Record<string, unknown>,
   client: OAuthClientRow,
 ) {
-  const { yes } = yield* GlobalOpts;
-  const publishableKey = yield* Args.text(opts, 'publishable-key').pipe(
-    Args.orPromptIf(
-      !yes && !hasFlag(opts, 'publishable-key'),
-      clerkPublishableKeyPrompt({}),
-    ),
-    Args.required(),
-  );
+  const args = Args.from(opts);
+  const publishableKey = yield* args
+    .text('publishable-key')
+    .pipe(Args.prompt(clerkPublishableKeyPrompt({})), Args.required());
 
   const domain = clerkDomainFromPublishableKey(publishableKey);
   if (!domain) {
@@ -721,14 +733,10 @@ const handleFirebaseUpdate = Effect.fn(function* (
   opts: Record<string, unknown>,
   client: OAuthClientRow,
 ) {
-  const { yes } = yield* GlobalOpts;
-  const projectId = yield* Args.text(opts, 'project-id').pipe(
-    Args.orPromptIf(
-      !yes && !hasFlag(opts, 'project-id'),
-      firebaseProjectIdPrompt({}),
-    ),
-    Args.required(),
-  );
+  const args = Args.from(opts);
+  const projectId = yield* args
+    .text('project-id')
+    .pipe(Args.prompt(firebaseProjectIdPrompt({})), Args.required());
 
   const validationError = validateFirebaseProjectId(projectId);
   if (validationError) {