CLI agent: align pi-tui with other pi-* deps and restore annotation tools (#3336)

Author: youknowriad

apps/cli/ai/tools/index.ts

@@ -10,6 +10,7 @@ import { installTaxonomyScriptsTool } from './install-taxonomy-scripts';
 import { listPreviewsTool } from './list-previews';
 import { listSitesTool } from './list-sites';
 import { auditPerformanceTool } from './need-for-speed';
+import { openAnnotationBrowserTool } from './open-annotation-browser';
 import { previewNavigateTool } from './preview-navigate';
 import { previewReloadTool } from './preview-reload';
 import { pullSiteTool } from './pull-site';
@@ -22,6 +23,7 @@ import { stopSiteTool } from './stop-site';
 import { takeScreenshotTool } from './take-screenshot';
 import { updatePreviewTool } from './update-preview';
 import { validateBlocksTool } from './validate-blocks';
+import { waitForAnnotationsTool } from './wait-for-annotations';
 import { runWpCliTool } from './wp-cli';
 import { createWpcomRequestTool } from './wpcom-request';
 
@@ -54,6 +56,8 @@ export const studioToolDefinitions = [
 	pullSiteTool,
 	importSiteTool,
 	exportSiteTool,
+	openAnnotationBrowserTool,
+	waitForAnnotationsTool,
 	...previewSteeringToolDefinitions,
 ];
 

apps/cli/ai/tools/open-annotation-browser.ts

@@ -0,0 +1,29 @@
+import { tool } from '@anthropic-ai/claude-agent-sdk';
+import { z } from 'zod/v4';
+import { openAnnotationBrowser } from 'cli/ai/inspector/inspector-inject';
+import { emitProgress } from 'cli/logger';
+import { errorResult, textResult } from './utils';
+
+export const openAnnotationBrowserTool = tool(
+	'open_annotation_browser',
+	'Opens a headed browser on a site with the Studio annotation inspector. ' +
+		'The user clicks "Annotate", picks an element, types feedback, then clicks "Done". ' +
+		'After calling this tool, call `wait_for_annotations` to block until the user submits.',
+	{
+		url: z.string().describe( 'The site URL to open (e.g., "http://localhost:8881")' ),
+	},
+	async ( args ) => {
+		try {
+			emitProgress( `Opening annotation browser at ${ args.url }…` );
+			const message = await openAnnotationBrowser( args.url );
+			emitProgress( 'Annotation browser ready' );
+			return textResult( message );
+		} catch ( error ) {
+			return errorResult(
+				`Failed to open annotation browser: ${
+					error instanceof Error ? error.message : String( error )
+				}`
+			);
+		}
+	}
+);

apps/cli/ai/tools/wait-for-annotations.ts

@@ -0,0 +1,39 @@
+import { tool } from '@anthropic-ai/claude-agent-sdk';
+import { z } from 'zod/v4';
+import { waitForAnnotationsDone } from 'cli/ai/inspector/inspector-inject';
+import { emitProgress } from 'cli/logger';
+import { errorResult, textResult } from './utils';
+
+export const waitForAnnotationsTool = tool(
+	'wait_for_annotations',
+	'Blocks until the user clicks "Done" in the annotation inspector toolbar. ' +
+		'Returns the annotations the user wrote, captured straight from the page. ' +
+		'Call this AFTER `open_annotation_browser`.',
+	{
+		// Bound the wait — `0` would resolve to `timeout: 0` in Playwright,
+		// which means "no timeout" and would block the agent forever. The
+		// upper bound of 120 minutes is generous enough for any realistic
+		// annotation session.
+		timeoutMinutes: z
+			.number()
+			.int()
+			.min( 1 )
+			.max( 120 )
+			.optional()
+			.describe( 'How long to wait for the user to click "Done", in minutes. Defaults to 30.' ),
+	},
+	async ( args ) => {
+		try {
+			emitProgress( 'Waiting for the user to click "Done"…' );
+			const result = await waitForAnnotationsDone( {
+				timeoutMs: ( args.timeoutMinutes ?? 30 ) * 60 * 1000,
+			} );
+			emitProgress( `Received ${ result.annotations.length } annotation(s)` );
+			return textResult( JSON.stringify( result, null, 2 ) );
+		} catch ( error ) {
+			return errorResult(
+				`Failed to read annotations: ${ error instanceof Error ? error.message : String( error ) }`
+			);
+		}
+	}
+);

apps/cli/ai/ui.ts

@@ -131,6 +131,10 @@ class PromptEditor implements Component, Focusable {
 		this.editor.setAutocompleteProvider( provider );
 	}
 
+	addToHistory( text: string ): void {
+		this.editor.addToHistory( text );
+	}
+
 	getText(): string {
 		return this.editor.getText();
 	}
@@ -563,14 +567,15 @@ export class AiChatUI implements AiOutputAdapter {
 		this.editor = new PromptEditor( this.tui, editorTheme );
 
 		this.editor.setAutocompleteProvider(
-			new CombinedAutocompleteProvider( AI_CHAT_SLASH_COMMANDS )
+			new CombinedAutocompleteProvider( AI_CHAT_SLASH_COMMANDS, process.cwd() )
 		);
 
 		this.editor.onSubmit = ( text ) => {
 			const trimmed = text.trim();
 			if ( ! trimmed ) {
 				return;
 			}
+			this.editor.addToHistory( trimmed );
 			if ( this.submitResolve ) {
 				const resolve = this.submitResolve;
 				this.submitResolve = null;

apps/cli/package.json

@@ -29,7 +29,7 @@
 		"@mariozechner/pi-agent-core": "0.70.2",
 		"@mariozechner/pi-ai": "0.70.2",
 		"@mariozechner/pi-coding-agent": "0.70.2",
-		"@mariozechner/pi-tui": "0.54.0",
+		"@mariozechner/pi-tui": "0.70.2",
 		"@modelcontextprotocol/sdk": "^1.27.1",
 		"@php-wasm/node": "3.1.22",
 		"@php-wasm/universal": "3.1.22",