Studio Code Assistant

apps/cli/ai/output-adapter.ts

@@ -46,6 +46,7 @@ export class JsonAdapter implements AiOutputAdapter {
 	onSiteSelected: ( ( site: SiteInfo ) => void ) | null = null;
 	onInterrupt: ( () => void ) | null = null;
 	onBeforeExit: ( () => Promise< void > ) | null = null;
+	permissionResponse: Record< string, string > | null = null;
 
 	private sessionId: string | undefined;
 
@@ -94,7 +95,7 @@ export class JsonAdapter implements AiOutputAdapter {
 	}
 
 	setLoaderMessage( message: string, _update?: boolean ): void {
-		emitEvent( { type: 'progress', timestamp: new Date().toISOString(), message } );
+		this.showProgress( message );
 	}
 
 	beginAgentTurn(): void {
@@ -150,6 +151,14 @@ export class JsonAdapter implements AiOutputAdapter {
 	}
 
 	async askUser( questions: AskUserQuestion[] ): Promise< Record< string, string > > {
+		// If a permission response was pre-supplied (e.g. from desktop app),
+		// return it immediately instead of pausing.
+		if ( this.permissionResponse ) {
+			const response = this.permissionResponse;
+			this.permissionResponse = null;
+			return response;
+		}
+
 		emitEvent( {
 			type: 'question.asked',
 			timestamp: new Date().toISOString(),

apps/cli/ai/tools.ts

@@ -118,6 +118,17 @@ async function resolveSite( nameOrPath: string ): Promise< SiteData > {
 	if ( siteByName ) {
 		return siteByName;
 	}
+
+	// Also try matching by the last folder segment of the site path,
+	// since the agent may pass just the folder name instead of the full path.
+	if ( ! path.isAbsolute( nameOrPath ) ) {
+		const config = await readCliConfig();
+		const siteByFolder = config.sites.find( ( site ) => path.basename( site.path ) === nameOrPath );
+		if ( siteByFolder ) {
+			return siteByFolder;
+		}
+	}
+
 	return getSiteByFolder( nameOrPath );
 }
 

apps/cli/commands/ai/index.ts

@@ -1,3 +1,4 @@
+import { listAiSessions } from '@studio/common/ai/sessions/store';
 import { type LoadedAiSession, type TurnStatus } from '@studio/common/ai/sessions/types';
 import { readAuthToken } from '@studio/common/lib/shared-config';
 import { __, _n, sprintf } from '@wordpress/i18n';
@@ -15,6 +16,7 @@ import { closeSharedBrowser } from 'cli/ai/browser-utils';
 import { type AiOutputAdapter, JsonAdapter } from 'cli/ai/output-adapter';
 import { AI_PROVIDERS, type AiProviderId } from 'cli/ai/providers';
 import { resolveResumeSessionContext } from 'cli/ai/sessions/context';
+import { getAiSessionsRootDirectory } from 'cli/ai/sessions/paths';
 import { AiSessionRecorder } from 'cli/ai/sessions/recorder';
 import { replaySessionHistory } from 'cli/ai/sessions/replay';
 import { AI_CHAT_SLASH_COMMANDS, type SlashCommandContext } from 'cli/ai/slash-commands';
@@ -45,9 +47,11 @@ export async function runCommand( options: {
 	adapter: AiOutputAdapter;
 	initialMessage?: string;
 	resumeSession?: LoadedAiSession;
+	resumeSessionId?: string;
 	noSessionPersistence?: boolean;
 	autoApprove?: boolean;
 	showLegacyCommandNotice?: boolean;
+	activeSite?: { name: string; path: string; running?: boolean };
 } ): Promise< void > {
 	const ui = options.adapter;
 	const isJsonMode = ui instanceof JsonAdapter;
@@ -57,6 +61,13 @@ export async function runCommand( options: {
 	let currentModel: AiModelId = resumeContext.model ?? DEFAULT_MODEL;
 	ui.currentProvider = currentProvider;
 	ui.currentModel = currentModel;
+	if ( options.activeSite ) {
+		ui.activeSite = {
+			name: options.activeSite.name,
+			path: options.activeSite.path,
+			running: options.activeSite.running ?? false,
+		};
+	}
 	ui.start();
 	ui.showWelcome();
 
@@ -66,7 +77,7 @@ export async function runCommand( options: {
 
 	let sessionRecorder: AiSessionRecorder | undefined;
 	let didDisableSessionPersistence = options.noSessionPersistence === true;
-	let sessionId: string | undefined = resumeContext.sessionId;
+	let sessionId: string | undefined = options.resumeSessionId ?? resumeContext.sessionId;
 	let persistQueue: Promise< void > = Promise.resolve();
 
 	if ( options.noSessionPersistence ) {
@@ -88,6 +99,27 @@ export async function runCommand( options: {
 					filePath: options.resumeSession.summary.filePath,
 					linkedAgentSessionIds: options.resumeSession.summary.linkedAgentSessionIds,
 				} );
+			} else if ( options.resumeSessionId ) {
+				// Find existing session file by SDK agent session ID so
+				// follow-up turns append to the same file instead of creating new ones.
+				const sessions = await listAiSessions( getAiSessionsRootDirectory() );
+				const existing = sessions.find( ( s ) =>
+					s.linkedAgentSessionIds.includes( options.resumeSessionId! )
+				);
+				if ( ! existing ) {
+					throw new Error(
+						sprintf(
+							/* translators: %s: agent session ID */
+							__( 'No AI session found for resume ID: %s' ),
+							options.resumeSessionId
+						)
+					);
+				}
+				sessionRecorder = await AiSessionRecorder.open( {
+					sessionId: existing.id,
+					filePath: existing.filePath,
+					linkedAgentSessionIds: existing.linkedAgentSessionIds,
+				} );
 			} else {
 				sessionRecorder = await AiSessionRecorder.create();
 			}
@@ -148,9 +180,9 @@ export async function runCommand( options: {
 		);
 	}
 
-	setProgressCallback( ( message, update ) => {
+	setProgressCallback( ( message ) => {
 		const timestamp = new Date().toISOString();
-		ui.setLoaderMessage( message, update );
+		ui.setLoaderMessage( message );
 		void persist( ( recorder ) => recorder.recordToolProgress( message, timestamp ) );
 	} );
 
@@ -361,6 +393,7 @@ export async function runCommand( options: {
 	async function runAgentTurn(
 		prompt: string
 	): Promise< { status: TurnStatus; usage?: { numTurns: number; costUsd?: number } } > {
+		await maybeAutoSwitchProvider();
 		const env = await resolveAiEnvironment( currentProvider );
 		ui.beginAgentTurn();
 
@@ -551,7 +584,6 @@ export async function runCommand( options: {
 					}
 				} else {
 					// Skill command — no handler, route to agent
-					await maybeAutoSwitchProvider();
 					ui.addUserMessage( prompt );
 					try {
 						await runAgentTurn( `Run the /${ cmd.name } skill using the Skill tool.` );
@@ -562,7 +594,6 @@ export async function runCommand( options: {
 				continue;
 			}
 
-			await maybeAutoSwitchProvider();
 			ui.addUserMessage( prompt );
 			try {
 				await runAgentTurn( prompt );
@@ -590,6 +621,11 @@ export const registerCommand = ( yargs: StudioArgv ) => {
 				.option( 'path', {
 					hidden: true,
 				} )
+				.option( 'site-name', {
+					type: 'string',
+					hidden: true,
+					description: __( 'Name of the active WordPress site' ),
+				} )
 				.option( 'json', {
 					type: 'boolean',
 					default: false,
@@ -599,6 +635,16 @@ export const registerCommand = ( yargs: StudioArgv ) => {
 					type: 'boolean',
 					description: __( 'Auto-approve all tool calls (defaults to true in --json mode)' ),
 				} )
+				.option( 'resume-session', {
+					type: 'string',
+					hidden: true,
+					description: __( 'SDK session ID to resume (for JSON mode multi-turn)' ),
+				} )
+				.option( 'permission-response', {
+					type: 'string',
+					hidden: true,
+					description: __( 'JSON-encoded permission response for a paused session' ),
+				} )
 				.option( 'session-persistence', {
 					type: 'boolean',
 					default: true,
@@ -618,16 +664,32 @@ export const registerCommand = ( yargs: StudioArgv ) => {
 					json?: boolean;
 					sessionPersistence?: boolean;
 					autoApprove?: boolean;
+					resumeSession?: string;
+					permissionResponse?: string;
+					siteName?: string;
 				};
 				const noSessionPersistence = typedArgv.sessionPersistence === false;
 				const adapter: AiOutputAdapter = typedArgv.json ? new JsonAdapter() : new AiChatUI();
 
+				if ( adapter instanceof JsonAdapter && typedArgv.permissionResponse ) {
+					adapter.permissionResponse = JSON.parse( typedArgv.permissionResponse ) as Record<
+						string,
+						string
+					>;
+				}
+
+				const sitePath = typeof argv.path === 'string' ? argv.path : undefined;
 				await runCommand( {
 					adapter,
 					initialMessage: typedArgv.message,
+					resumeSessionId: typedArgv.resumeSession,
 					noSessionPersistence,
 					autoApprove: typedArgv.autoApprove,
 					showLegacyCommandNotice: argv._[ 0 ] === 'ai',
+					activeSite:
+						sitePath && typedArgv.siteName
+							? { name: typedArgv.siteName, path: sitePath }
+							: undefined,
 				} );
 			} catch ( error ) {
 				if ( error instanceof LoggerError ) {

apps/studio/src/components/ai-input.tsx

@@ -17,6 +17,7 @@ interface AIInputProps {
 	handleKeyDown: ( e: React.KeyboardEvent< HTMLTextAreaElement > ) => void;
 	clearConversation: () => void;
 	isAssistantThinking: boolean;
+	showTelexLink?: boolean;
 }
 
 const MAX_ROWS = 10;
@@ -54,6 +55,7 @@ const UnforwardedAIInput = (
 		handleKeyDown,
 		clearConversation,
 		isAssistantThinking,
+		showTelexLink = true,
 	}: AIInputProps,
 	inputRef: React.RefObject< HTMLTextAreaElement > | React.RefCallback< HTMLTextAreaElement > | null
 ) => {
@@ -255,19 +257,24 @@ const UnforwardedAIInput = (
 				{ ( { onClose }: { onClose: () => void } ) => (
 					<>
 						<MenuGroup>
-							<MenuItem
-								data-testid="telex-link-button"
-								onClick={ () => {
-									const telexUrl = addUrlParams( `https://${ TELEX_HOSTNAME }/`, TELEX_UTM_PARAMS );
-									getIpcApi().openURL( telexUrl );
-									onClose();
-								} }
-								className="flex flex-row"
-							>
-								<SparklesIcon />
-								<span className="ltr:pl-2 rtl:pl-2">{ __( 'Build with Telex' ) }</span>
-								<ArrowIcon />
-							</MenuItem>
+							{ showTelexLink && (
+								<MenuItem
+									data-testid="telex-link-button"
+									onClick={ () => {
+										const telexUrl = addUrlParams(
+											`https://${ TELEX_HOSTNAME }/`,
+											TELEX_UTM_PARAMS
+										);
+										getIpcApi().openURL( telexUrl );
+										onClose();
+									} }
+									className="flex flex-row"
+								>
+									<SparklesIcon />
+									<span className="ltr:pl-2 rtl:pl-2">{ __( 'Build with Telex' ) }</span>
+									<ArrowIcon />
+								</MenuItem>
+							) }
 							<MenuItem
 								isDestructive
 								data-testid="clear-conversation-button"

apps/studio/src/components/content-tab-assistant.tsx

@@ -16,9 +16,11 @@ import { ChatMessage, MarkDownWithCode } from 'src/components/chat-message';
 import { ChatRating } from 'src/components/chat-rating';
 import { LearnMoreLink } from 'src/components/learn-more';
 import offlineIcon from 'src/components/offline-icon';
+import { StudioCodeChat } from 'src/components/studio-code-chat';
 import WelcomeComponent from 'src/components/welcome-message-prompt';
 import { LIMIT_OF_PROMPTS_PER_USER, TELEX_HOSTNAME, TELEX_UTM_PARAMS } from 'src/constants';
 import { useAuth } from 'src/hooks/use-auth';
+import { useFeatureFlags } from 'src/hooks/use-feature-flags';
 import { useOffline } from 'src/hooks/use-offline';
 import { useThemeDetails } from 'src/hooks/use-theme-details';
 import { cx } from 'src/lib/cx';
@@ -357,6 +359,16 @@ const UnauthenticatedView = ( { onAuthenticate }: { onAuthenticate: () => void }
 );
 
 export function ContentTabAssistant( { selectedSite }: ContentTabAssistantProps ) {
+	const { enableStudioCodeUi } = useFeatureFlags();
+
+	if ( enableStudioCodeUi ) {
+		return <StudioCodeChat selectedSite={ selectedSite } />;
+	}
+
+	return <WpcomAssistant selectedSite={ selectedSite } />;
+}
+
+function WpcomAssistant( { selectedSite }: ContentTabAssistantProps ) {
 	const inputRef = useRef< HTMLTextAreaElement >( null );
 	const wrapperRef = useRef< HTMLDivElement >( null );
 	const dispatch = useAppDispatch();