Merge trunk into fix/refactor-auth-provider-in-redux-slice

Port removal of noisy Sentry.captureException calls from auth-provider.tsx
to auth-slice.ts (handleInvalidToken, authLogout token revoke, authLogout
clearAuthenticationToken), keeping the intentional deletion of auth-provider.tsx.

Made-with: Cursor

Author: Kateryna Kodonenko

.github/dependabot.yml

@@ -112,6 +112,7 @@ updates:
       - dependency-name: "ora"
       - dependency-name: "cross-port-killer"
       - dependency-name: "fast-deep-equal"
+      - dependency-name: "simple-git"
 
       # Markdown & content processing
       - dependency-name: "react-markdown"

.gitignore

@@ -125,6 +125,7 @@ artifacts
 .cursor/
 .claude/
 CLAUDE.md
+!skills/CLAUDE.md
 
 # Bundled Node binary (downloaded during build)
 apps/studio/bin/node

.xcode-version

@@ -1 +1 @@
-26.2
+26.3

Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     CFPropertyList (3.0.8)
     abbrev (0.1.2)
-    activesupport (7.2.3)
+    activesupport (7.2.3.1)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -12,7 +12,7 @@ GEM
       drb
       i18n (>= 1.6, < 2)
       logger (>= 1.4.2)
-      minitest (>= 5.1)
+      minitest (>= 5.1, < 6)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
     addressable (2.8.9)
@@ -225,7 +225,7 @@ GEM
       concurrent-ruby (~> 1.0)
     java-properties (0.3.0)
     jmespath (1.6.2)
-    json (2.19.1)
+    json (2.19.2)
     jwt (2.10.2)
       base64
     language_server-protocol (3.17.0.5)
@@ -235,9 +235,7 @@ GEM
     logger (1.7.0)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
-    minitest (6.0.2)
-      drb (~> 2.0)
-      prism (~> 1.5)
+    minitest (5.27.0)
     multi_json (1.19.1)
     multipart-post (2.4.1)
     mutex_m (0.3.0)

RELEASE-NOTES.txt

@@ -1,6 +1,18 @@
 Unreleased
 ==========
 
+1.7.7
+=====
+* Added dark mode support #2652 #2865 #2857 #2866
+* Added phpMyAdmin support #2834
+* Ship AI instructions with every newly created site #2886 #2889
+* Fixed issue where site status wouldn't show up correctly in app #2847
+* Rename 'Open site' to 'Open local site' in header #2856
+* Improve Playground CLI child process error handling #2844
+* Move login into Account tab and rename settings tabs #2854
+* Migrated config files, HTTPS certificates, and WordPress dependencies `~/.studio` #2793 #2871 #2873
+* Updated multiple dependencies, including WordPress packages, and PHP-WASM
+
 1.7.6
 =====
 * Added enableMultisite Blueprint step support #2470

apps/cli/README.md

@@ -1,64 +1,84 @@
 # WordPress Studio CLI
 
-> [!WARNING]  
-> Please note that this is still alpha software. It requires the Studio desktop app to be installed.
+`wp-studio` is the standalone, CLI-only version of [WordPress Studio](https://developer.wordpress.com/studio/) – a fast, free, open source tool for local WordPress development all powered by WordPress Playground and WordPress.com.
 
-The standalone, CLI-only version of [WordPress Studio](https://developer.wordpress.com/studio/).
+If you already have Studio installed, then the easiest way to use the CLI is to open Studio, go to the settings modal and ensure that the "Studio CLI" toggle is enabled.
+
+The Studio CLI lets you:
 
 - Create, run, and manage local WordPress sites from the terminal.
 - Run WP-CLI commands.
 - Publish ephemeral preview sites to share (requires WordPress.com login).
+- Integrate with AI coding agents. Every site comes with an `AGENTS.md` file.
+
+# Table of contents
+
+- [Requirements](#requirements)
+- [Installation](#installation)
+- [Quick start](#quick-start)
+- [Usage](#usage)
+- [Preview sites](#preview-sites)
+
+## Requirements
 
-## Install
+`wp-studio` runs best on Node.js 24 or higher, which supports more recent V8 WASM APIs. Node.js 22 or higher is required. You can download the appropriate version from the [Node.js website](https://nodejs.org/en/download).
+
+## Installation
 
 Run without installing:
 
 ```bash
-npx @automattic/wp-studio@latest --help
+npx wp-studio@latest --help
 ```
 
 Install globally:
 
 ```bash
-npm install -g @automattic/wp-studio
+npm install -g wp-studio
 studio --help
 ```
 
 ## Quick start
 
-Create a site (with a step-by-step guide):
+From anywhere on your system, run the following command to create a new WordPress site (with a step-by-step guide):
 
 ```bash
 studio site create
 ```
 
-List sites:
+## Usage
+
+The Studio CLI integrates with Studio and uses the same list of sites. Similarly to Studio, the Studio CLI also runs sites in the background. To see the list of sites under management by Studio and their current status, run the command:
 
 ```bash
 studio site list
 ```
 
-Start / stop a site:
+To start and stop sites, run these commands:
 
 ```bash
 studio site start --path ~/Studio/my-site
 studio site stop --path ~/Studio/my-site
 ```
 
-Run WP-CLI in a site:
+Run WP-CLI commands in a site:
 
 ```bash
 studio wp plugin list --path ~/Studio/my-site
 studio wp option get home --path ~/Studio/my-site
 ```
 
+## Preview sites
+
+The Studio CLI lets you share your work through preview sites. These are powered by WordPress.com on a temporary domain (wp.build), and they allow you to share snapshots of your local sites with clients or team members.
+
 To publish preview sites, you need to first authenticate with WordPress.com:
 
 ```bash
 studio auth login
 ```
 
-Publish a preview site: 
+Publish a preview with this command:
 
 ```bash
 studio preview create --path ~/Studio/my-site

apps/cli/__mocks__/lib/daemon-client.ts

@@ -2,7 +2,7 @@ import { vi } from 'vitest';
 
 export const connectToDaemon = vi.fn().mockResolvedValue( undefined );
 export const disconnectFromDaemon = vi.fn().mockResolvedValue( undefined );
-export const emitSiteEvent = vi.fn().mockResolvedValue( undefined );
+export const emitCliEvent = vi.fn().mockResolvedValue( undefined );
 export const killDaemonAndChildren = vi.fn().mockResolvedValue( undefined );
 export const listProcesses = vi.fn().mockResolvedValue( [] );
 export const getDaemonBus = vi.fn().mockResolvedValue( {} );

apps/cli/ai/auth.ts

@@ -4,7 +4,7 @@ import {
 	getAiProviderDefinition,
 	type AiProviderId,
 } from 'cli/ai/providers';
-import { getAiProvider, saveAiProvider } from 'cli/lib/appdata';
+import { readCliConfig, updateCliConfigWithPartial } from 'cli/lib/cli-config/core';
 
 async function getPreferredReadyProvider(
 	exclude?: AiProviderId
@@ -49,7 +49,7 @@ export async function resolveUnavailableAiProvider(
 }
 
 export async function resolveInitialAiProvider(): Promise< AiProviderId > {
-	const savedProvider = await getAiProvider();
+	const { aiProvider: savedProvider } = await readCliConfig();
 	if ( savedProvider ) {
 		const definition = getAiProviderDefinition( savedProvider );
 		if (
@@ -73,7 +73,7 @@ export async function resolveInitialAiProvider(): Promise< AiProviderId > {
 }
 
 export async function saveSelectedAiProvider( provider: AiProviderId ): Promise< void > {
-	await saveAiProvider( provider );
+	await updateCliConfigWithPartial( { aiProvider: provider } );
 }
 
 export async function prepareAiProvider(

apps/cli/ai/plugin/skills/site-spec/SKILL.md

@@ -1,71 +1,35 @@
 ---
 name: site-spec
-description: Gather user preferences before building a WordPress site. Asks about purpose, audience, brand personality, aesthetic direction, colors, and content structure. Run this before creating any new site.
+description: Gather the site name and layout preference before building a WordPress site. Run this before creating any new site.
 user-invokable: true
 ---
 
 # Site Spec Discovery
 
-Before creating a new WordPress site, gather the user's preferences through a short interactive discovery phase. This produces a **Site Spec** that guides all subsequent design and development decisions.
+Before creating a new WordPress site, gather the user's basic preferences through a short interactive discovery phase. This produces a **Site Spec** that guides all subsequent design and development decisions.
 
 ## How to Run
 
-Gather preferences through 3-4 rounds, building on previous answers. Keep it concise — no more than 6-7 questions total.
+Gather preferences through 2 rounds. Keep it concise.
 
 **AskUserQuestion constraints**: Each call supports 1-4 questions, each with 2-4 options. An "Other" free-form option is automatically provided by the system — do NOT add one yourself. Keep option labels short (1-5 words). Only use AskUserQuestion for questions that have meaningful predefined options. For open-ended questions (like asking for a name), just ask in your text output — the user will type their answer in the prompt.
 
 ### Round 1 — Name
 
 Ask the user for their business/site name in your text output. **Stop here and wait for their reply** — do NOT call any tools or continue to the next round. The user needs a chance to type their answer in the prompt.
 
-### Round 2 — Purpose & Audience
+### Round 2 — Layout
 
 After the user provides the name, use AskUserQuestion for:
-- What is this site for? (e.g., business type, portfolio, blog, community, e-commerce, agency, restaurant, etc.)
-- Who is the target audience? (e.g., professionals, consumers, creatives, developers, local community, etc.)
-
-### Round 3 — Brand & Aesthetic Direction
-
-Adapt based on previous answers. Ask about:
-- What tone or personality should the site convey? (e.g., professional, playful, minimalist, bold, luxurious, raw, editorial, retro, organic, etc.)
-- Any reference sites or brands you admire? Or styles you want to avoid?
-
-### Round 4 — Visual & Structural Preferences
-
-Adapt based on previous answers. Ask about:
-- Color preferences or existing brand colors? (or let the user say "surprise me")
 - One-page site or multi-page site? (e.g., single scrollable page with sections vs. separate pages for each area)
-- What pages/sections do you need? (e.g., homepage, about, services, blog, contact, shop, gallery, etc.) — adapt the phrasing based on the one-page vs. multi-page answer
-
-## Synthesize the Site Spec
 
-After gathering answers, produce a concise **Site Spec** document:
+## After Gathering Answers
 
-```
-Site Spec: [Site Name]
-- Purpose: [what the site is for]
-- Audience: [who it's for]
-- Tone: [personality/voice]
-- Aesthetic direction: [visual style, references]
-- Color palette: [colors or direction]
-- Layout: [one-page or multi-page]
-- Pages/Structure: [list of pages or sections and key features]
-- Key differentiator: [the one thing that makes this site memorable]
-```
-
-Show the spec to the user, then use AskUserQuestion to ask for confirmation (e.g., "Ready to build this site?" with options like "Yes, let's go" / "I'd like to adjust something"). Do NOT just print a text question and wait — always use the AskUserQuestion tool for confirmation so the user gets interactive options.
-
-## After Confirmation
-
-1. Call `site_create` with an appropriate name derived from the spec.
-2. Save the site spec to `{site_path}/.agents/site-spec.md` using the Write tool, so it persists for future sessions.
-3. Use the spec to guide ALL subsequent design decisions — theme, typography, colors, layout, content tone, and page structure.
+Call `site_create` with the provided name and use the layout preference to guide all subsequent design decisions.
 
 ## When to Skip Discovery
 
 Do NOT ask questions if:
-- The user already provided an answer for that specific question in the initial prompt. (e.g., "build me a dark minimalist portfolio for a photographer with these 5 pages using navy and gold colors"). Instead, synthesize the spec directly from their request and confirm.
+- The user already provided the name and layout preference in the initial prompt. Proceed directly with site creation.
 - The user says "just build something" or "surprise me". Pick a bold creative direction yourself and proceed.
 - The user explicitly asks to skip the setup or says they don't want questions.
-
-In all skip cases, still synthesize and show a Site Spec before creating the site.

apps/cli/ai/providers.ts

@@ -1,8 +1,8 @@
 import childProcess from 'child_process';
 import { password } from '@inquirer/prompts';
+import { readAuthToken } from '@studio/common/lib/shared-config';
 import { __ } from '@wordpress/i18n';
-import { z } from 'zod';
-import { getAnthropicApiKey, getAuthToken, saveAnthropicApiKey } from 'cli/lib/appdata';
+import { readCliConfig, updateCliConfigWithPartial } from 'cli/lib/cli-config/core';
 import { LoggerError } from 'cli/logger';
 
 export const AI_PROVIDERS = {
@@ -13,7 +13,6 @@ export const AI_PROVIDERS = {
 
 export type AiProviderId = keyof typeof AI_PROVIDERS;
 
-export const aiProviderSchema = z.enum( [ 'wpcom', 'anthropic-claude', 'anthropic-api-key' ] );
 export const DEFAULT_AI_PROVIDER: AiProviderId = 'anthropic-api-key';
 export const AI_PROVIDER_PRIORITY: AiProviderId[] = [
 	'wpcom',
@@ -51,7 +50,7 @@ export function hasClaudeCodeAuth(): boolean {
 async function resolveAnthropicApiKey( options?: {
 	force?: boolean;
 } ): Promise< string | undefined > {
-	const savedKey = await getAnthropicApiKey();
+	const { anthropicApiKey: savedKey } = await readCliConfig();
 	if ( savedKey && ! options?.force ) {
 		return savedKey;
 	}
@@ -67,7 +66,7 @@ async function resolveAnthropicApiKey( options?: {
 		},
 	} );
 
-	await saveAnthropicApiKey( apiKey );
+	await updateCliConfigWithPartial( { anthropicApiKey: apiKey } );
 	return apiKey;
 }
 
@@ -83,12 +82,8 @@ function getWpcomAiGatewayBaseUrl(): string {
 }
 
 async function hasValidWpcomAuth(): Promise< boolean > {
-	try {
-		await getAuthToken();
-		return true;
-	} catch {
-		return false;
-	}
+	const token = await readAuthToken();
+	return token !== null;
 }
 
 function createBaseEnvironment(): Record< string, string > {
@@ -117,7 +112,10 @@ const AI_PROVIDER_DEFINITIONS: Record< AiProviderId, AiProviderDefinition > = {
 			throw new LoggerError( __( 'WordPress.com login required. Use /login to authenticate.' ) );
 		},
 		resolveEnv: async () => {
-			const token = await getAuthToken();
+			const token = await readAuthToken();
+			if ( ! token ) {
+				throw new LoggerError( __( 'WordPress.com login required. Use /login to authenticate.' ) );
+			}
 			const env = createBaseEnvironment();
 			env.ANTHROPIC_BASE_URL = getWpcomAiGatewayBaseUrl();
 			env.ANTHROPIC_AUTH_TOKEN = token.accessToken;
@@ -156,12 +154,15 @@ const AI_PROVIDER_DEFINITIONS: Record< AiProviderId, AiProviderDefinition > = {
 		id: 'anthropic-api-key',
 		autoFallbackWhenUnavailable: false,
 		isVisible: async () => true,
-		isReady: async () => Boolean( await getAnthropicApiKey() ),
+		isReady: async () => {
+			const { anthropicApiKey } = await readCliConfig();
+			return Boolean( anthropicApiKey );
+		},
 		prepare: async ( options ) => {
 			await resolveAnthropicApiKey( options );
 		},
 		resolveEnv: async () => {
-			const apiKey = await getAnthropicApiKey();
+			const { anthropicApiKey: apiKey } = await readCliConfig();
 			if ( ! apiKey ) {
 				throw new LoggerError(
 					__(