In progress

Author: nightnei

apps/cli/ai/output-adapter.ts

@@ -158,8 +158,7 @@ export class JsonAdapter implements AiOutputAdapter {
 	}
 
 	async collectPassword( question: string ): Promise< string | null > {
-		const answers = await this.askUser( [ { question, options: [], inputType: 'password' } ] );
-		return Object.values( answers )[ 0 ] ?? null;
+		throw new Error( `collectPassword is not available in JSON mode: ${ question }` );
 	}
 
 	async askUser( questions: AskUserQuestion[] ): Promise< Record< string, string > > {
@@ -177,7 +176,6 @@ export class JsonAdapter implements AiOutputAdapter {
 			questions: questions.map( ( q ) => ( {
 				question: q.question,
 				options: q.options,
-				inputType: q.inputType,
 			} ) ),
 		} );
 

apps/cli/ai/types.ts

@@ -2,7 +2,6 @@ export interface AskUserQuestion {
 	question: string;
 	options: { label: string; description: string }[];
 	allowFreeForm?: boolean;
-	inputType?: 'password';
 }
 
 export type AskUserHandler = (

apps/cli/commands/ai/index.ts

@@ -4,8 +4,6 @@ import { buildSkillInvocationPrompt } from '@studio/common/ai/slash-commands';
 import { readAuthToken } from '@studio/common/lib/shared-config';
 import { __, sprintf } from '@wordpress/i18n';
 import {
-	getAvailableAiProviders,
-	isAiProviderReady,
 	prepareAiProvider,
 	resolveAiEnvironment,
 	resolveInitialAiProvider,
@@ -29,7 +27,6 @@ import { replaySessionHistory } from 'cli/ai/sessions/replay';
 import { setLocalSiteSelectedCallback } from 'cli/ai/site-selection';
 import { getActiveSlashCommands, type SlashCommandContext } from 'cli/ai/slash-commands';
 import { AiChatUI } from 'cli/ai/ui';
-import { runCommand as runLoginCommand } from 'cli/commands/auth/login';
 import { readCliConfig } from 'cli/lib/cli-config/core';
 import { findSiteByFolder } from 'cli/lib/cli-config/sites';
 import { Logger, LoggerError, setProgressCallback } from 'cli/logger';
@@ -55,13 +52,6 @@ function appendStudioEntry< T extends StudioCustomEntryType >(
 	return sm.appendCustomEntry( customType, data );
 }
 
-function isPromptAbortError( error: unknown ): boolean {
-	return (
-		error instanceof Error &&
-		[ 'AbortPromptError', 'CancelPromptError', 'ExitPromptError' ].includes( error.name )
-	);
-}
-
 function getErrorMessage( error: unknown ): string {
 	if ( error instanceof Error ) {
 		return error.message;
@@ -96,12 +86,9 @@ export async function runCommand( options: {
 } ): Promise< void > {
 	const ui = options.adapter;
 	const isJsonMode = ui instanceof JsonAdapter;
-	const isStudioAppMode = isJsonMode && typeof process.send === 'function';
-	const config = await readCliConfig();
 	const resumeContext = resolveResumeSessionContext( options.resumeSession );
-	let currentProvider: AiProviderId = isStudioAppMode
-		? 'wpcom'
-		: resumeContext.provider ?? ( await resolveInitialAiProvider() );
+	let currentProvider: AiProviderId =
+		resumeContext.provider ?? ( await resolveInitialAiProvider() );
 	let currentModel: AiModelId = resumeContext.model ?? DEFAULT_MODEL;
 	ui.currentProvider = currentProvider;
 	ui.currentModel = currentModel;
@@ -272,10 +259,6 @@ export async function runCommand( options: {
 	}
 
 	async function maybeAutoSwitchProvider(): Promise< void > {
-		if ( isStudioAppMode ) {
-			return;
-		}
-
 		const fallbackProvider = await resolveUnavailableAiProvider( currentProvider );
 		if ( ! fallbackProvider || fallbackProvider === currentProvider ) {
 			return;
@@ -314,79 +297,16 @@ export async function runCommand( options: {
 		}
 	}
 
-	if ( isStudioAppMode && ! config.aiProvider ) {
-		await saveSelectedAiProvider( 'wpcom' );
-	}
-
-	let showCapabilitiesOnConnect = ! config.aiProvider && ! isStudioAppMode;
+	const config = await readCliConfig();
+	let showCapabilitiesOnConnect = ! config.aiProvider;
 
 	if ( showCapabilitiesOnConnect ) {
+		currentProvider = 'wpcom';
+		ui.currentProvider = currentProvider;
+		await saveSelectedAiProvider( currentProvider );
 		ui.showOnboarding();
-
-		// Auto-trigger provider selection on first run
-		const availableProviders = await getAvailableAiProviders();
-		const labelToProvider = new Map< string, AiProviderId >();
-		const providerOptions = availableProviders.map( ( id ) => {
-			const label = id === 'wpcom' ? __( 'WordPress.com (recommended)' ) : AI_PROVIDERS[ id ];
-			labelToProvider.set( label, id );
-			return { label, description: id };
-		} );
-		const answer = await ui.askUser( [
-			{
-				question: __( 'Choose how to connect' ),
-				options: providerOptions,
-			},
-		] );
-		const selectedLabel = Object.values( answer )[ 0 ] as string;
-		const selectedProvider = labelToProvider.get( selectedLabel );
-		if ( selectedProvider ) {
-			try {
-				if ( selectedProvider === 'wpcom' ) {
-					// Run login flow directly instead of prepare(), which would
-					// just throw "login required" since there's no token yet.
-					ui.stop();
-					await runLoginCommand();
-					ui.start();
-
-					if ( await isAiProviderReady( 'wpcom' ) ) {
-						await switchProvider( 'wpcom', false );
-						const token = await readAuthToken();
-						if ( token ) {
-							ui.showSuccess(
-								sprintf(
-									/* translators: 1: display name, 2: email */
-									__( 'Logged in as %1$s (%2$s)' ),
-									token.displayName,
-									token.email
-								)
-							);
-							ui.setStatusMessage(
-								sprintf(
-									/* translators: %s: display name */
-									__( 'Logged in as %s' ),
-									token.displayName
-								)
-							);
-							showCapabilitiesOnConnect = false;
-							ui.showCapabilities();
-						}
-					}
-				} else {
-					await prepareProviderSelection( selectedProvider );
-					await switchProvider( selectedProvider, false );
-					showCapabilitiesOnConnect = false;
-					ui.showCapabilities();
-				}
-			} catch ( error ) {
-				if ( ! isPromptAbortError( error ) ) {
-					if ( error instanceof LoggerError ) {
-						ui.showError( error.message );
-					} else {
-						throw error;
-					}
-				}
-			}
-		}
+		showCapabilitiesOnConnect = false;
+		ui.showCapabilities();
 	} else if ( currentProvider === 'wpcom' ) {
 		const token = await readAuthToken();
 		if ( token ) {

apps/studio/src/components/studio-code-session/conversation/index.tsx

@@ -9,8 +9,6 @@ import {
 } from '@studio/common/ai/tools';
 import { __ } from '@wordpress/i18n';
 import { useMemo, useState } from 'react';
-import Button from 'src/components/button';
-import TextControl from 'src/components/text-control';
 import { cx } from 'src/lib/cx';
 import { Markdown } from '../markdown';
 import { ThinkingIndicator } from '../thinking-indicator';
@@ -33,7 +31,6 @@ type RenderItem =
 			key: string;
 			question: string;
 			options: Array< { label: string; description: string } >;
-			inputType?: 'password';
 	  }
 	| { kind: 'interrupted-marker'; key: string };
 
@@ -133,7 +130,6 @@ function entriesToRenderItems( entries: SessionEntry[] ): RenderItem[] {
 				key: `${ entryIndex }:question`,
 				question: data.question,
 				options: data.options,
-				inputType: data.inputType,
 			} );
 			return;
 		}
@@ -237,54 +233,16 @@ function ToolUseRow( {
 function AgentQuestion( {
 	question,
 	options,
-	inputType,
 	isInteractive,
 	pickedLabel,
 	onAnswer,
 }: {
 	question: string;
 	options: Array< { label: string; description: string } >;
-	inputType?: 'password';
 	isInteractive: boolean;
 	pickedLabel: string | undefined;
 	onAnswer: ( label: string ) => void;
 } ) {
-	const [ inputValue, setInputValue ] = useState( '' );
-
-	if ( inputType === 'password' ) {
-		return (
-			<div className={ styles.question }>
-				<p className={ styles.questionText }>{ question }</p>
-				{ ! pickedLabel && isInteractive ? (
-					<form
-						className={ styles.passwordForm }
-						onSubmit={ ( e ) => {
-							e.preventDefault();
-							if ( inputValue.trim() ) {
-								onAnswer( inputValue.trim() );
-							}
-						} }
-					>
-						<TextControl
-							type="password"
-							value={ inputValue }
-							onChange={ setInputValue }
-							className={ styles.passwordInput }
-						/>
-						<Button
-							type="submit"
-							variant="primary"
-							disabled={ ! inputValue.trim() }
-							style={ { height: '40px' } }
-						>
-							{ __( 'Submit' ) }
-						</Button>
-					</form>
-				) : null }
-			</div>
-		);
-	}
-
 	return (
 		<div className={ styles.question }>
 			<p className={ styles.questionText }>{ question }</p>
@@ -357,7 +315,6 @@ export function Conversation( {
 								key={ item.key }
 								question={ item.question }
 								options={ item.options }
-								inputType={ item.inputType }
 								isInteractive={ pendingQuestions.has( item.question ) }
 								pickedLabel={ pendingAnswers[ item.question ] }
 								onAnswer={ ( label ) => onAnswerQuestion( item.question, label ) }

apps/studio/src/components/studio-code-session/conversation/style.module.css

@@ -158,17 +158,6 @@
 	opacity: 1;
 }
 
-.passwordForm {
-	display: flex;
-	gap: var(--wpds-dimension-padding-sm);
-	align-items: stretch;
-}
-
-.passwordInput {
-	flex: 1;
-	min-width: 0;
-}
-
 .interruptedMarker {
 	align-self: center;
 	margin: var(--wpds-dimension-padding-sm) 0;

apps/studio/src/components/studio-code-session/use-agent-run.tsx

@@ -32,7 +32,6 @@ function shortEntryId(): string {
 export interface PendingQuestion {
 	question: string;
 	options: Array< { label: string; description: string } >;
-	inputType?: 'password';
 }
 
 export interface QueuedPrompt {
@@ -424,11 +423,7 @@ export function AgentRunProvider( { children }: PropsWithChildren ) {
 									parentId: null,
 									timestamp: event.timestamp,
 									customType: 'studio.agent_question',
-									data: {
-										question: q.question,
-										options: q.options,
-										inputType: q.inputType,
-									},
+									data: { question: q.question, options: q.options },
 								} ) as SessionEntry
 						),
 					] );

tools/common/ai/json-events.ts

@@ -33,7 +33,6 @@ export type JsonEvent =
 			questions: Array< {
 				question: string;
 				options: Array< { label: string; description: string } >;
-				inputType?: 'password';
 			} >;
 	  }
 	| { type: 'turn.started'; timestamp: string }

tools/common/ai/sessions/entry-types.ts

@@ -29,7 +29,6 @@ export interface StudioToolProgressData {
 export interface StudioAgentQuestionData {
 	question: string;
 	options: Array< { label: string; description: string } >;
-	inputType?: 'password';
 }
 
 export type StudioTurnStatus = 'success' | 'error' | 'max_turns' | 'interrupted';