wp-studio 1.7.9 → 1.7.10

package/dist/cli/{index-DBCpWm8k.mjs → index-BjzOJKPi.mjs}

@@ -1,19 +1,48 @@
-import { S as STUDIO_SITES_ROOT, c as createRemoteSiteTools, a as createStudioTools, r as readAuthToken, b as getSnapshotsFromConfig, i as isSnapshotExpired, d as captureCommandOutput, e as runCommand$3, f as runCommand$4, h as getSitesRunningStatus, j as getWpComSites, k as isSiteRunning, o as openBrowser, l as getSiteUrl, m as closeSharedBrowser } from "./index-BiCiEz-r.mjs";
+import { b as getAiSessionsDirectoryForDate, c as buildAiSessionFileName, l as listAiSessions, g as getAiSessionsRootDirectory } from "./paths-CqXGLB7R.mjs";
+import { S as STUDIO_SITES_ROOT, c as createRemoteSiteTools, a as createStudioTools, r as readAuthToken, b as getSnapshotsFromConfig, i as isSnapshotExpired, d as captureCommandOutput, e as runCommand$3, f as runCommand$4, h as chalk, j as getSitesRunningStatus, k as getWpComSites, l as isSiteRunning, o as openBrowser, m as getSiteUrl, n as closeSharedBrowser } from "./index-DRQnCQvM.mjs";
 import { __, sprintf, _n } from "@wordpress/i18n";
 import fs__default from "fs";
 import path__default from "path";
 import { query } from "@anthropic-ai/claude-agent-sdk";
 import os from "os";
+import { l as lockCliConfig, r as readCliConfig, s as saveCliConfig, u as unlockCliConfig, g as updateCliConfigWithPartial } from "./certificate-manager-SVYcCL_i.mjs";
 import { password } from "@inquirer/prompts";
-import { r as readCliConfig, g as updateCliConfigWithPartial } from "./certificate-manager-Bp1E0km4.mjs";
-import { L as LoggerError, d as Logger, s as setProgressCallback } from "./well-known-paths-CG_o9mSO.mjs";
+import { L as LoggerError, d as Logger, s as setProgressCallback } from "./well-known-paths-BYA1Bw5o.mjs";
 import crypto from "crypto";
 import fs from "fs/promises";
-import { g as getAiSessionsDirectoryForDate, b as buildAiSessionFileName } from "./paths-BPK_RySX.mjs";
-import { runCommand as runCommand$1 } from "./login-OvZJPTV5.mjs";
-import { runCommand as runCommand$2 } from "./logout-BaG-QFSN.mjs";
+import { runCommand as runCommand$1 } from "./login-BtPZeZ4G.mjs";
+import { runCommand as runCommand$2 } from "./logout-Cr631QzG.mjs";
 import { ProcessTerminal, TUI, Container, Loader, CombinedAutocompleteProvider, isKeyRelease, matchesKey, Text, SelectList, Input, Markdown, Editor, visibleWidth, CURSOR_MARKER, truncateToWidth } from "@mariozechner/pi-tui";
-import chalk from "chalk";
+const AI_MODELS = {
+  "claude-sonnet-4-6": "Sonnet 4.6",
+  "claude-opus-4-6": "Opus 4.6",
+  "claude-opus-4-7": "Opus 4.7"
+};
+const DEFAULT_MODEL = "claude-sonnet-4-6";
+function isAiModelId(value) {
+  return Object.prototype.hasOwnProperty.call(AI_MODELS, value);
+}
+async function readApprovedPermissions() {
+  const config = await readCliConfig();
+  return config.approvedPermissions ?? [];
+}
+async function addApprovedPermission(entry) {
+  try {
+    await lockCliConfig();
+    const config = await readCliConfig();
+    const existing = config.approvedPermissions ?? [];
+    const alreadyPresent = existing.some(
+      (item) => item.toolName === entry.toolName && item.approvalPath === entry.approvalPath
+    );
+    if (alreadyPresent) {
+      return;
+    }
+    config.approvedPermissions = [...existing, entry];
+    await saveCliConfig(config);
+  } finally {
+    await unlockCliConfig();
+  }
+}
 const ALLOWED_TOOLS = [
   "mcp__studio__*",
   "Read",
@@ -25,21 +54,10 @@ const ALLOWED_TOOLS = [
   "NotebookRead",
   "AskUserQuestion"
 ];
-const ALLOWED_TOOLS_REMOTE = [
-  "mcp__studio__*",
-  "Read",
-  "Glob",
-  "Grep",
-  "WebFetch",
-  "WebSearch",
-  "TodoRead",
-  "NotebookRead",
-  "AskUserQuestion"
-];
 const PATH_GATED_TOOLS = ["Write", "Edit", "Bash", "NotebookEdit"];
 const PATH_INPUT_KEYS = ["path", "file_path", "filePath"];
 const APPROVE_ONCE_LABEL = "Allow once";
-const APPROVE_SESSION_LABEL = "Allow for this session";
+const APPROVE_ALWAYS_LABEL = "Allow always";
 const DENY_LABEL = "Deny";
 const STUDIO_ROOT = path__default.resolve(STUDIO_SITES_ROOT);
 const TMP_ROOT = path__default.resolve(os.tmpdir());
@@ -111,6 +129,19 @@ function createPathApprovalSession() {
     }
   };
 }
+const defaultApprovalSession = createPathApprovalSession();
+let primePromise = null;
+function primeDefaultApprovalSession() {
+  if (!primePromise) {
+    primePromise = (async () => {
+      const entries = await readApprovedPermissions();
+      for (const { toolName, approvalPath } of entries) {
+        defaultApprovalSession.rememberApprovedPath(toolName, approvalPath);
+      }
+    })();
+  }
+  return primePromise;
+}
 function getPathGatedPermissionRequest({
   toolName,
   input,
@@ -147,8 +178,8 @@ async function askForPathGatedToolApproval({
           description: `Run ${toolName} outside trusted directories for this step.`
         },
         {
-          label: APPROVE_SESSION_LABEL,
-          description: `Allow this kind of ${toolName} action for the rest of this session.`
+          label: APPROVE_ALWAYS_LABEL,
+          description: `Remember this choice and stop asking for ${toolName} on this path.`
         },
         {
           label: DENY_LABEL,
@@ -160,8 +191,8 @@ async function askForPathGatedToolApproval({
   if (answers[question] === APPROVE_ONCE_LABEL) {
     return "allow_once";
   }
-  if (answers[question] === APPROVE_SESSION_LABEL) {
-    return "allow_session";
+  if (answers[question] === APPROVE_ALWAYS_LABEL) {
+    return "allow_always";
   }
   return "deny";
 }
@@ -170,8 +201,11 @@ async function promptForApproval({
   input,
   metadata,
   onAskUser,
-  pathApprovalSession: pathApprovalSession2
+  pathApprovalSession = defaultApprovalSession
 }) {
+  if (pathApprovalSession === defaultApprovalSession) {
+    await primeDefaultApprovalSession();
+  }
   const permissionRequest = getPathGatedPermissionRequest({
     toolName,
     input,
@@ -179,7 +213,7 @@ async function promptForApproval({
     suggestions: metadata?.suggestions
   });
   if (permissionRequest) {
-    if (!pathApprovalSession2.hasApprovedPath(toolName, permissionRequest.approvalPath)) {
+    if (!pathApprovalSession.hasApprovedPath(toolName, permissionRequest.approvalPath)) {
       const approvalDecision = await askForPathGatedToolApproval({
         toolName,
         outsidePath: permissionRequest.approvalPath,
@@ -191,8 +225,12 @@ async function promptForApproval({
           message: ACCESS_DENIED_MESSAGE
         };
       }
-      if (approvalDecision === "allow_session") {
-        pathApprovalSession2.rememberApprovedPath(toolName, permissionRequest.approvalPath);
+      if (approvalDecision === "allow_always") {
+        pathApprovalSession.rememberApprovedPath(toolName, permissionRequest.approvalPath);
+        await addApprovedPermission({
+          toolName,
+          approvalPath: permissionRequest.approvalPath
+        });
       }
     }
     return {
@@ -411,14 +449,12 @@ Interpret creatively and make unexpected choices that feel genuinely designed fo
 **IMPORTANT**: Match implementation complexity to the aesthetic vision. Maximalist designs need elaborate code with extensive animations and effects. Minimalist or refined designs need restraint, precision, and careful attention to spacing, typography, and subtle details. Elegance comes from executing the vision well.
 
 Remember: You are capable of extraordinary creative work. Don't hold back, show what can truly be created when thinking outside the box and committing fully to a distinctive vision.`;
-const AI_MODELS = {
-  "claude-sonnet-4-6": "Sonnet 4.6",
-  "claude-opus-4-6": "Opus 4.6"
-};
-const DEFAULT_MODEL = "claude-sonnet-4-6";
-const pathApprovalSession = createPathApprovalSession();
+const SDK_INTERRUPT_CLEANUP_ERRORS = [
+  "Query closed",
+  "ProcessTransport is not ready for writing"
+];
 process.on("unhandledRejection", (reason) => {
-  if (reason instanceof Error && reason.message.includes("Query closed")) {
+  if (reason instanceof Error && SDK_INTERRUPT_CLEANUP_ERRORS.some((msg) => reason.message.includes(msg))) {
     return;
   }
   throw reason;
@@ -440,7 +476,7 @@ function startAiAgent(config) {
   const mcpServers = {
     studio: isRemoteSite ? createRemoteSiteTools(wpcomAccessToken, activeSite.wpcomSiteId) : createStudioTools()
   };
-  const allowedTools = isRemoteSite ? [...ALLOWED_TOOLS_REMOTE] : [...ALLOWED_TOOLS];
+  const allowedTools = [...ALLOWED_TOOLS];
   const systemPromptOptions = isRemoteSite ? {
     remoteSite: {
       name: activeSite.name,
@@ -485,13 +521,7 @@ function startAiAgent(config) {
             updatedInput: { ...input, answers }
           };
         }
-        return promptForApproval({
-          toolName,
-          input,
-          metadata,
-          onAskUser,
-          pathApprovalSession
-        });
+        return promptForApproval({ toolName, input, metadata, onAskUser });
       },
       plugins: [{ type: "local", path: path__default.resolve(import.meta.dirname, "plugin") }],
       model,
@@ -536,6 +566,12 @@ async function hasValidWpcomAuth() {
   const token = await readAuthToken();
   return token !== null;
 }
+function readInlineWpcomToken() {
+  return process.env.STUDIO_WPCOM_TOKEN?.trim() || null;
+}
+function hasInlineWpcomAuth() {
+  return readInlineWpcomToken() !== null;
+}
 function createBaseEnvironment() {
   const env = { ...process.env };
   delete env.ANTHROPIC_API_KEY;
@@ -543,6 +579,9 @@ function createBaseEnvironment() {
   delete env.ANTHROPIC_BASE_URL;
   delete env.ANTHROPIC_CUSTOM_HEADERS;
   delete env.CLAUDE_CODE_DISABLE_EXPERIMENTAL_BETAS;
+  if (!env.CLAUDE_CODE_MAX_RETRIES) {
+    env.CLAUDE_CODE_MAX_RETRIES = "1";
+  }
   return env;
 }
 const AI_PROVIDER_DEFINITIONS = {
@@ -550,21 +589,22 @@ const AI_PROVIDER_DEFINITIONS = {
     id: "wpcom",
     autoFallbackWhenUnavailable: true,
     isVisible: async () => true,
-    isReady: hasValidWpcomAuth,
+    isReady: async () => hasInlineWpcomAuth() || await hasValidWpcomAuth(),
     prepare: async () => {
-      if (await hasValidWpcomAuth()) {
+      if (hasInlineWpcomAuth() || await hasValidWpcomAuth()) {
         return;
       }
       throw new LoggerError(__("WordPress.com login required. Use /login to authenticate."));
     },
     resolveEnv: async () => {
-      const token = await readAuthToken();
-      if (!token) {
+      const inlineToken = readInlineWpcomToken();
+      const accessToken = inlineToken ?? (await readAuthToken())?.accessToken;
+      if (!accessToken) {
         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;
+      env.ANTHROPIC_AUTH_TOKEN = accessToken;
       env.ANTHROPIC_CUSTOM_HEADERS = buildAnthropicCustomHeaders({
         "X-WPCOM-AI-Feature": WPCOM_AI_FEATURE_HEADER
       });
@@ -633,6 +673,9 @@ async function resolveUnavailableAiProvider(provider) {
   return getPreferredReadyProvider(provider);
 }
 async function resolveInitialAiProvider() {
+  if (hasInlineWpcomAuth()) {
+    return "wpcom";
+  }
   const { aiProvider: savedProvider } = await readCliConfig();
   if (savedProvider) {
     const definition = getAiProviderDefinition(savedProvider);
@@ -659,6 +702,10 @@ async function resolveAiEnvironment(provider) {
   return getAiProviderDefinition(provider).resolveEnv();
 }
 function emitEvent(event) {
+  if (typeof process.send === "function") {
+    process.send(event);
+    return;
+  }
   process.stdout.write(JSON.stringify(event) + "\n");
 }
 class JsonAdapter {
@@ -669,10 +716,25 @@ class JsonAdapter {
     this.onSiteSelected = null;
     this.onInterrupt = null;
     this.onBeforeExit = null;
+    this.permissionResponse = null;
+    this.ipcMessageListener = null;
   }
   start() {
+    if (typeof process.send !== "function") {
+      return;
+    }
+    this.ipcMessageListener = (message) => {
+      if (message && typeof message === "object" && message.type === "interrupt") {
+        this.onInterrupt?.();
+      }
+    };
+    process.on("message", this.ipcMessageListener);
   }
   stop() {
+    if (this.ipcMessageListener) {
+      process.off("message", this.ipcMessageListener);
+      this.ipcMessageListener = null;
+    }
   }
   showWelcome() {
   }
@@ -696,7 +758,7 @@ class JsonAdapter {
   setStatusMessage() {
   }
   setLoaderMessage(message, _update) {
-    emitEvent({ type: "progress", timestamp: (/* @__PURE__ */ new Date()).toISOString(), message });
+    this.showProgress(message);
   }
   beginAgentTurn() {
     emitEvent({ type: "turn.started", timestamp: (/* @__PURE__ */ new Date()).toISOString() });
@@ -720,7 +782,7 @@ class JsonAdapter {
       return {
         type: "result",
         sessionId: message.session_id,
-        success: message.subtype === "success"
+        success: !message.is_error
       };
     }
     return void 0;
@@ -738,6 +800,11 @@ class JsonAdapter {
     throw new Error("waitForInput is not available in JSON mode");
   }
   async askUser(questions) {
+    if (this.permissionResponse) {
+      const response = this.permissionResponse;
+      this.permissionResponse = null;
+      return response;
+    }
     emitEvent({
       type: "question.asked",
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
@@ -746,6 +813,18 @@ class JsonAdapter {
         options: q.options
       }))
     });
+    if (typeof process.send === "function") {
+      return new Promise((resolve) => {
+        const onMessage = (message) => {
+          if (message && typeof message === "object" && message.type === "answer") {
+            const answers = message.answers;
+            process.off("message", onMessage);
+            resolve(answers ?? {});
+          }
+        };
+        process.on("message", onMessage);
+      });
+    }
     this.emitTurnCompleted("paused");
     await this.onBeforeExit?.();
     process.exitCode = 0;
@@ -759,9 +838,6 @@ class JsonAdapter {
 function isAiProviderId(value) {
   return Object.prototype.hasOwnProperty.call(AI_PROVIDERS, value);
 }
-function isAiModelId(value) {
-  return Object.prototype.hasOwnProperty.call(AI_MODELS, value);
-}
 function resolveResumeSessionContext(resumeSession) {
   if (!resumeSession) {
     return {};
@@ -779,6 +855,11 @@ function resolveResumeSessionContext(resumeSession) {
         context.sessionId = sessionId;
       }
     }
+    if (!context.model && event.type === "session.model_selected") {
+      if (isAiModelId(event.model)) {
+        context.model = event.model;
+      }
+    }
     if (event.type === "session.context") {
       if (!context.provider && isAiProviderId(event.provider)) {
         context.provider = event.provider;
@@ -857,6 +938,15 @@ class AiSessionRecorder {
       wpcomSiteId: site.wpcomSiteId
     });
   }
+  async recordEnvironmentSelected(payload) {
+    await this.appendEvent({
+      type: "environment.selected",
+      timestamp: toIsoTimestamp(),
+      environment: payload.environment,
+      url: payload.url,
+      wpcomSiteId: payload.wpcomSiteId
+    });
+  }
   async recordUserMessage(options) {
     await this.appendEvent({
       type: "user.message",
@@ -911,17 +1001,21 @@ class AiSessionRecorder {
     });
   }
 }
-function replaySessionHistory(ui, events) {
-  ui.prepareForReplay();
-  let isTurnOpen = false;
-  let lastClearedIndex = -1;
+function filterEventsAfterLastClear(events) {
   for (let i = events.length - 1; i >= 0; i--) {
     if (events[i].type === "session.cleared") {
-      lastClearedIndex = i;
-      break;
+      return events.slice(i + 1);
     }
   }
-  const eventsToReplay = lastClearedIndex >= 0 ? events.slice(lastClearedIndex + 1) : events;
+  return events;
+}
+function isVisibleUserMessage(event) {
+  return event.source === "prompt";
+}
+function replaySessionHistory(ui, events) {
+  ui.prepareForReplay();
+  let isTurnOpen = false;
+  const eventsToReplay = filterEventsAfterLastClear(events);
   try {
     for (const event of eventsToReplay) {
       ui.setReplayTimestamp(event.timestamp);
@@ -932,14 +1026,34 @@ function replaySessionHistory(ui, events) {
             path: event.sitePath,
             running: false,
             remote: event.remote === true,
-            url: typeof event.url === "string" ? event.url : void 0
+            url: typeof event.url === "string" ? event.url : void 0,
+            wpcomSiteId: typeof event.wpcomSiteId === "number" ? event.wpcomSiteId : void 0
+          },
+          { announce: true, emitEvent: false }
+        );
+        continue;
+      }
+      if (event.type === "environment.selected") {
+        const current = ui.activeSite;
+        if (!current) {
+          continue;
+        }
+        const isLive = event.environment === "live";
+        ui.setActiveSite(
+          {
+            name: current.name,
+            path: current.path,
+            running: current.running,
+            remote: isLive,
+            url: isLive ? event.url : void 0,
+            wpcomSiteId: isLive ? event.wpcomSiteId : void 0
           },
           { announce: true, emitEvent: false }
         );
         continue;
       }
       if (event.type === "user.message") {
-        if (event.source === "ask_user") {
+        if (!isVisibleUserMessage(event)) {
           continue;
         }
         if (isTurnOpen) {
@@ -1216,6 +1330,137 @@ const AI_CHAT_SLASH_COMMANDS = [
   { name: "taxonomist", description: __("Optimize category taxonomy with AI") },
   { name: "need-for-speed", description: __("Run a performance audit on a site") }
 ];
+const THINKING_MESSAGES = [
+  "Thinking…",
+  "Iterating…",
+  "Interpolating…",
+  "Philosophising…",
+  "Cogitating…",
+  "Poetizing…",
+  "Sketching…",
+  "Scribbling…",
+  "Drafting…",
+  "Harmonizing…",
+  "Rehearsing…",
+  "Combabulating…",
+  "Conjectureing…",
+  "Tinkering…",
+  "Polishing…",
+  "Concocting…",
+  "Wizarding…",
+  "Enchanting…",
+  "Transmuting…",
+  "Summoning…",
+  "Gutenberging…",
+  "Hooking…",
+  "Filtering…",
+  "Looping…",
+  "Codexing…",
+  "Annotating…",
+  "Ruminating…",
+  "Paragraphing…",
+  "Typesetting…",
+  "Soloing…",
+  "Compiling…",
+  "Abstracting…",
+  "Meandering…",
+  "Daydreaming…",
+  "Riffing…",
+  "Wandering…",
+  "Introspecting…",
+  "Experiencing…",
+  "Reflecting…",
+  "Adventuring…",
+  "Levitating…",
+  "Glueing…",
+  "Soaring…",
+  "Gliding…",
+  "Paragliding…",
+  "Excavating…",
+  "Planting…",
+  "Stargazing…",
+  "Scribing…"
+];
+function randomThinkingMessage() {
+  return THINKING_MESSAGES[Math.floor(Math.random() * THINKING_MESSAGES.length)];
+}
+function getToolDisplayName(name) {
+  const displayNames = {
+    mcp__studio__site_create: __("Create site"),
+    mcp__studio__site_list: __("List sites"),
+    mcp__studio__site_info: __("Get site info"),
+    mcp__studio__site_start: __("Start site"),
+    mcp__studio__site_stop: __("Stop site"),
+    mcp__studio__site_delete: __("Delete site"),
+    mcp__studio__preview_create: __("Create preview"),
+    mcp__studio__preview_list: __("List previews"),
+    mcp__studio__preview_update: __("Update preview"),
+    mcp__studio__preview_delete: __("Delete preview"),
+    mcp__studio__wp_cli: __("Run WP-CLI"),
+    mcp__studio__validate_blocks: __("Validate blocks"),
+    mcp__studio__take_screenshot: __("Take screenshot"),
+    Read: __("Read"),
+    Write: __("Write"),
+    Edit: __("Edit"),
+    Bash: __("Run"),
+    Glob: __("Search"),
+    Grep: __("Search"),
+    Skill: __("Load skill"),
+    Task: __("Run task"),
+    TodoWrite: __("Update todo list")
+  };
+  return displayNames[name] ?? name;
+}
+const BASH_DETAIL_MAX_LENGTH = 60;
+function getToolDetail(name, input) {
+  if (!input) {
+    return "";
+  }
+  switch (name) {
+    case "mcp__studio__site_create":
+      return typeof input.name === "string" ? input.name : "";
+    case "mcp__studio__site_info":
+    case "mcp__studio__site_start":
+    case "mcp__studio__site_stop":
+    case "mcp__studio__site_delete":
+    case "mcp__studio__preview_create":
+    case "mcp__studio__preview_list":
+      return typeof input.nameOrPath === "string" ? input.nameOrPath : "";
+    case "mcp__studio__preview_update":
+    case "mcp__studio__preview_delete":
+      return typeof input.host === "string" ? input.host : "";
+    case "mcp__studio__wp_cli":
+      return typeof input.command === "string" ? `wp ${input.command}` : "";
+    case "mcp__studio__validate_blocks":
+      if (typeof input.filePath === "string") {
+        return input.filePath.split("/").slice(-2).join("/");
+      }
+      return __("inline content");
+    case "mcp__studio__take_screenshot":
+      return typeof input.url === "string" ? input.url : "";
+    case "Read":
+    case "Write":
+    case "Edit": {
+      const filePath = input.file_path ?? input.path;
+      if (typeof filePath === "string") {
+        return filePath.split("/").slice(-2).join("/");
+      }
+      return "";
+    }
+    case "Bash":
+      if (typeof input.command !== "string") {
+        return "";
+      }
+      return input.command.length > BASH_DETAIL_MAX_LENGTH ? input.command.slice(0, BASH_DETAIL_MAX_LENGTH - 3) + "…" : input.command;
+    case "Skill":
+      return typeof input.skill === "string" ? input.skill : "";
+    case "Grep":
+    case "Glob":
+      return typeof input.pattern === "string" ? input.pattern : "";
+    default:
+      return "";
+  }
+}
 function formatTodoSnapshotLine(todo) {
   switch (todo.status) {
     case "completed":
@@ -1341,6 +1586,13 @@ const DEFAULT_COLLAPSE_THRESHOLD_LINES = 5;
 function formatToolOutputLines(lines) {
   return lines.map((line, index2) => `${index2 === 0 ? "   " + chalk.dim("⎿ ") : "     "}${line}`).join("\n");
 }
+function formatQueuedPrompt(text) {
+  const lines = text.split("\n");
+  return lines.map((line, i) => {
+    const body = i === 0 ? "↳ " + line + " " : "  " + line + " ";
+    return " " + chalk.bgHex("#e8eef5").hex("#5a6b7d")(body);
+  }).join("\n");
+}
 class PromptEditor {
   constructor(tui, theme, options) {
     this._focused = false;
@@ -1466,83 +1718,13 @@ const editorTheme = {
     noMatch: (text) => chalk.dim(text)
   }
 };
-const toolDisplayNames = {
-  mcp__studio__site_create: __("Create site"),
-  mcp__studio__site_list: __("List sites"),
-  mcp__studio__site_info: __("Get site info"),
-  mcp__studio__site_start: __("Start site"),
-  mcp__studio__site_stop: __("Stop site"),
-  mcp__studio__site_delete: __("Delete site"),
-  mcp__studio__preview_create: __("Create preview"),
-  mcp__studio__preview_list: __("List previews"),
-  mcp__studio__preview_update: __("Update preview"),
-  mcp__studio__preview_delete: __("Delete preview"),
-  mcp__studio__wp_cli: __("Run WP-CLI"),
-  mcp__studio__validate_blocks: __("Validate blocks"),
-  mcp__studio__take_screenshot: __("Take screenshot"),
-  Read: __("Read"),
-  Write: __("Write"),
-  Edit: __("Edit"),
-  Bash: __("Run"),
-  Glob: __("Search"),
-  Grep: __("Search"),
-  Skill: __("Load skill"),
-  Task: __("Run task"),
-  TodoWrite: __("Update todo list")
-};
-function getToolDetail(name, input) {
-  switch (name) {
-    case "mcp__studio__site_create":
-      return typeof input.name === "string" ? input.name : "";
-    case "mcp__studio__site_info":
-    case "mcp__studio__site_start":
-    case "mcp__studio__site_stop":
-    case "mcp__studio__site_delete":
-    case "mcp__studio__preview_create":
-    case "mcp__studio__preview_list":
-      return typeof input.nameOrPath === "string" ? input.nameOrPath : "";
-    case "mcp__studio__preview_update":
-    case "mcp__studio__preview_delete":
-      return typeof input.host === "string" ? input.host : "";
-    case "mcp__studio__wp_cli":
-      return typeof input.command === "string" ? `wp ${input.command}` : "";
-    case "mcp__studio__validate_blocks":
-      if (typeof input.filePath === "string") {
-        return input.filePath.split("/").slice(-2).join("/");
-      }
-      return __("inline content");
-    case "mcp__studio__take_screenshot":
-      return typeof input.url === "string" ? input.url : "";
-    case "Read":
-    case "Write":
-    case "Edit": {
-      const filePath = input.file_path ?? input.path;
-      if (typeof filePath === "string") {
-        const parts = filePath.split("/");
-        return parts.slice(-2).join("/");
-      }
-      return "";
-    }
-    case "Bash":
-      return typeof input.command === "string" ? input.command.length > 60 ? input.command.slice(0, 57) + "…" : input.command : "";
-    case "Skill":
-      return typeof input.skill === "string" ? input.skill : "";
-    case "Grep":
-    case "Glob":
-      return typeof input.pattern === "string" ? input.pattern : "";
-    default:
-      return "";
-  }
-}
 function formatToolName(name, input) {
-  const displayName = toolDisplayNames[name] ?? name;
-  if (input) {
-    const detail = getToolDetail(name, input);
-    if (detail) {
-      return chalk.bold(displayName) + " " + chalk.dim("(" + detail + ")");
-    }
+  const displayName = chalk.bold(getToolDisplayName(name));
+  const detail = getToolDetail(name, input);
+  if (detail) {
+    return displayName + " " + chalk.dim("(" + detail + ")");
   }
-  return chalk.bold(displayName);
+  return displayName;
 }
 function isTodoWriteInput(input) {
   if (!input || typeof input !== "object" || !Array.isArray(input.todos)) {
@@ -1602,6 +1784,7 @@ function normalizeToolUseResult(result) {
 }
 class AiChatUI {
   constructor() {
+    this.queuedPrompts = [];
     this.currentResponseText = "";
     this.currentMarkdown = null;
     this.submitResolve = null;
@@ -1631,58 +1814,6 @@ class AiChatUI {
     this.pendingToolCalls = /* @__PURE__ */ new Map();
     this.currentModel = DEFAULT_MODEL;
     this.currentProvider = DEFAULT_AI_PROVIDER;
-    this.thinkingMessages = [
-      "Thinking…",
-      "Iterating…",
-      "Interpolating…",
-      "Philosophising…",
-      "Cogitating…",
-      "Poetizing…",
-      "Sketching…",
-      "Scribbling…",
-      "Drafting…",
-      "Harmonizing…",
-      "Rehearsing…",
-      "Combabulating…",
-      "Conjectureing…",
-      "Tinkering…",
-      "Polishing…",
-      "Concocting…",
-      "Wizarding…",
-      "Enchanting…",
-      "Transmuting…",
-      "Summoning…",
-      "Gutenberging…",
-      "Hooking…",
-      "Filtering…",
-      "Looping…",
-      "Codexing…",
-      "Annotating…",
-      "Ruminating…",
-      "Paragraphing…",
-      "Typesetting…",
-      "Soloing…",
-      "Compiling…",
-      "Abstracting…",
-      "Meandering…",
-      "Daydreaming…",
-      "Riffing…",
-      "Wandering…",
-      "Introspecting…",
-      "Experiencing…",
-      "Reflecting…",
-      "Adventuring…",
-      "Levitating…",
-      "Glueing…",
-      "Soaring…",
-      "Gliding…",
-      "Paragliding…",
-      "Excavating…",
-      "Planting…",
-      "Stargazing…",
-      "Scribing…",
-      "Levitating…"
-    ];
     this.optionPickerContainer = null;
     this.optionPickerSelectList = null;
     this.optionPickerVisible = false;
@@ -1708,6 +1839,8 @@ class AiChatUI {
     this.tui = new TUI(terminal, true);
     this.messages = new Container();
     this.tui.addChild(this.messages);
+    this.queuedContainer = new Container();
+    this.tui.addChild(this.queuedContainer);
     this.loader = new Loader(
       this.tui,
       (str) => chalk.yellow(str),
@@ -1744,10 +1877,19 @@ class AiChatUI {
     );
     this.editor.onSubmit = (text) => {
       const trimmed = text.trim();
-      if (trimmed && this.submitResolve) {
+      if (!trimmed) {
+        return;
+      }
+      if (this.submitResolve) {
         const resolve = this.submitResolve;
         this.submitResolve = null;
         resolve(trimmed);
+        return;
+      }
+      if (this._inAgentTurn) {
+        this.queuedPrompts.push(trimmed);
+        this.editor.setText("");
+        this.renderQueuedContainer();
       }
     };
     this.tui.addInputListener((data) => {
@@ -1829,6 +1971,11 @@ class AiChatUI {
         this.renderSitePicker();
         return { consume: true };
       }
+      if (matchesKey(data, "backspace") && this.editorVisible && this.queuedPrompts.length > 0 && this.editor.getText() === "") {
+        this.queuedPrompts.pop();
+        this.renderQueuedContainer();
+        return { consume: true };
+      }
       if (matchesKey(data, "escape") && this.interruptCallback) {
         this.wasInterrupted = true;
         this.interruptCallback();
@@ -1840,9 +1987,6 @@ class AiChatUI {
       return void 0;
     });
   }
-  randomThinkingMessage() {
-    return this.thinkingMessages[Math.floor(Math.random() * this.thinkingMessages.length)];
-  }
   static {
     this.OTHER_VALUE = "__other__";
   }
@@ -1897,6 +2041,10 @@ class AiChatUI {
     this.currentMarkdown = null;
     this.currentResponseText = "";
     this.messages.clear();
+    if (this.queuedPrompts.length > 0) {
+      this.queuedPrompts = [];
+      this.renderQueuedContainer();
+    }
     this.tui.requestRender();
   }
   showAgentQuestion(question, _options) {
@@ -2300,12 +2448,12 @@ ${chalk.dim(message)}
     this.tui.start();
   }
   showWelcome() {
-    const version = "1.7.9";
+    const version = "1.7.10";
     const cwd = process.cwd();
     const home = process.env.HOME ?? process.env.USERPROFILE ?? "";
     const displayCwd = home && cwd.startsWith(home) ? "~" + cwd.slice(home.length) : cwd;
     const b = chalk.blue;
-    const logo = [
+    const logoLines = [
       "    ▄█▛▀▀▀▀█▙▖",
       " ▗▟█        ▗██▄",
       "▄███▛ ▝▜██  ▝███▙",
@@ -2314,21 +2462,37 @@ ${chalk.dim(message)}
       "▀▙▖ ▜█▄▟ ▝█▙▄▌ ▄▛",
       " ▝▜▄▝██▌  ▀██▗▟▀",
       "    ▀██▙▄▄▄█▛▘"
-    ].map((s) => b(s));
+    ];
+    const logo = logoLines.map((s) => b(s));
+    const logoWidth = Math.max(...logoLines.map((s) => s.length));
+    const gap = 4;
+    const leading = 1;
+    const termWidth = process.stdout.columns ?? 80;
+    const availableInfoWidth = Math.max(0, termWidth - leading - logoWidth - gap);
+    const baseInfo = `${AI_MODELS[this.currentModel]} · ${AI_PROVIDERS[this.currentProvider]}`;
+    const sep = " · ";
+    let secondLine;
+    if (baseInfo.length + sep.length + displayCwd.length <= availableInfoWidth) {
+      secondLine = `${baseInfo}${sep}${displayCwd}`;
+    } else {
+      const pathBudget = availableInfoWidth - baseInfo.length - sep.length;
+      if (pathBudget >= 4) {
+        secondLine = `${baseInfo}${sep}…${displayCwd.slice(-(pathBudget - 1))}`;
+      } else {
+        secondLine = baseInfo;
+      }
+    }
     const info = [
       chalk.bold("WordPress Studio") + chalk.dim(` v${version}`),
-      chalk.dim(
-        `${AI_MODELS[this.currentModel]} · ${AI_PROVIDERS[this.currentProvider]} · ${displayCwd}`
-      ),
+      chalk.dim(secondLine),
       "",
       chalk.dim.italic(__("Code is Poetry"))
     ];
-    const gap = 4;
     const infoStartRow = Math.max(0, Math.floor((logo.length - info.length) / 2));
     const lines = logo.map((logoLine, i) => {
       const infoIndex = i - infoStartRow;
       const infoText = infoIndex >= 0 && infoIndex < info.length ? info[infoIndex] : "";
-      return " " + logoLine + " ".repeat(gap) + infoText;
+      return " ".repeat(leading) + logoLine + " ".repeat(gap) + infoText;
     });
     this.messages.addChild(new Text("\n" + lines.join("\n") + "\n", 0, 0));
     this.tui.requestRender();
@@ -2344,6 +2508,11 @@ ${chalk.dim(message)}
     this.editor.setText("");
     this.hideLoader();
     this.showEditor();
+    if (this.queuedPrompts.length > 0) {
+      const next = this.queuedPrompts.shift();
+      this.renderQueuedContainer();
+      return Promise.resolve(next);
+    }
     return new Promise((resolve) => {
       this.submitResolve = resolve;
     });
@@ -2359,6 +2528,14 @@ ${chalk.dim(message)}
     this.messages.addChild(new Text("\n" + formatted, 0, 0));
     this.tui.requestRender();
   }
+  renderQueuedContainer() {
+    this.queuedContainer.clear();
+    for (const prompt of this.queuedPrompts) {
+      this.queuedContainer.addChild(new Text("\n" + formatQueuedPrompt(prompt), 0, 0));
+    }
+    this.updateHints();
+    this.tui.requestRender();
+  }
   setLoaderMessage(message, update) {
     if (!message) {
       return;
@@ -2378,7 +2555,9 @@ ${chalk.dim(message)}
       if (wasEditorVisible) {
         this.tui.removeChild(this.editor);
       }
+      this.tui.removeChild(this.queuedContainer);
       this.tui.addChild(this.loader);
+      this.tui.addChild(this.queuedContainer);
       if (wasEditorVisible) {
         this.tui.addChild(this.editor);
       }
@@ -2409,6 +2588,9 @@ ${chalk.dim(message)}
         this.activeExpandablePreview.isExpanded ? __("ctrl+o collapse") : __("ctrl+o expand")
       );
     }
+    if (this.queuedPrompts.length > 0) {
+      hints.push(__("backspace to unqueue"));
+    }
     hints.push(__("esc to interrupt"));
     this.editor.hints = hints;
   }
@@ -2436,7 +2618,7 @@ ${chalk.dim(message)}
     this.editor.setText("");
     this._inAgentTurn = true;
     this.updateHints();
-    this.showLoader(this.randomThinkingMessage());
+    this.showLoader(randomThinkingMessage());
     this.currentResponseText = "";
     this.hasShownResponseMarker = false;
     this.wasInterrupted = false;
@@ -2710,7 +2892,7 @@ ${chalk.dim(message)}
     }
   }
   showToolUse(toolLabel) {
-    this.showLoader(this.randomThinkingMessage());
+    this.showLoader(randomThinkingMessage());
     this.stopToolDotBlink();
     this.lastProgressText = null;
     this.toolDotLabel = toolLabel;
@@ -2921,7 +3103,7 @@ ${chalk.dim(message)}
         answers[q.question] = answer;
       }
     }
-    this.showLoader(this.randomThinkingMessage());
+    this.showLoader(randomThinkingMessage());
     return answers;
   }
   /**
@@ -2982,7 +3164,7 @@ ${chalk.dim(message)}
           }
         }
         if (!this.replayMode && !this.loaderVisible) {
-          this.showLoader(this.randomThinkingMessage());
+          this.showLoader(randomThinkingMessage());
         }
         return void 0;
       }
@@ -3006,29 +3188,15 @@ ${chalk.dim(message)}
       }
       case "result": {
         this.hideLoader();
-        if (message.subtype === "success") {
-          const thinkingSec = Math.round((this.nowMs() - this.turnStartTime) / 1e3);
-          if (!this.hasShownResponseMarker) {
-            this.messages.addChild(
-              new Text("\n " + chalk.blue("⏺") + " " + __("Done"), 0, 0)
-            );
-          }
-          this.showInfo(
-            sprintf(
-              /* translators: 1: seconds spent thinking, 2: number of turns */
-              _n(
-                "Thought for %1$ds · %2$d turn",
-                "Thought for %1$ds · %2$d turns",
-                message.num_turns
-              ),
-              thinkingSec,
-              message.num_turns
-            )
-          );
-          return { type: "result", sessionId: message.session_id, success: true };
+        if (message.subtype === "error_max_turns") {
+          return {
+            type: "max_turns",
+            sessionId: message.session_id,
+            numTurns: message.num_turns
+          };
         }
         if (this.wasInterrupted) {
-          const thinkingSec = Math.round((this.nowMs() - this.turnStartTime) / 1e3);
+          const thinkingSec2 = Math.round((this.nowMs() - this.turnStartTime) / 1e3);
           this.messages.addChild(
             new Text(
               "\n " + chalk.yellow("⏺") + " " + chalk.yellow(__("Interrupted")),
@@ -3040,37 +3208,59 @@ ${chalk.dim(message)}
             sprintf(
               /* translators: %d: number of seconds */
               __("Ran for %ds before interruption"),
-              thinkingSec
+              thinkingSec2
             )
           );
-          return { type: "result", sessionId: message.session_id, success: false };
-        }
-        const parts = [];
-        if ("errors" in message && message.errors?.length) {
-          parts.push(...message.errors);
-        }
-        if (message.subtype === "error_max_turns") {
           return {
-            type: "max_turns",
+            type: "result",
             sessionId: message.session_id,
-            numTurns: message.num_turns
+            success: false,
+            interrupted: true
           };
-        } else if (message.subtype) {
-          parts.push(`(${message.subtype})`);
         }
-        if ("permission_denials" in message && message.permission_denials?.length) {
-          for (const denial of message.permission_denials) {
-            parts.push(
-              sprintf(
-                /* translators: %s: tool name */
-                __("Permission denied: %s"),
-                denial.tool_name
-              )
-            );
+        if (message.is_error) {
+          const parts = [];
+          if ("errors" in message && message.errors?.length) {
+            parts.push(...message.errors);
+          }
+          if ("result" in message && typeof message.result === "string" && message.result) {
+            parts.push(message.result);
+          } else if (message.subtype && message.subtype !== "success") {
+            parts.push(`(${message.subtype})`);
+          }
+          if ("permission_denials" in message && message.permission_denials?.length) {
+            for (const denial of message.permission_denials) {
+              parts.push(
+                sprintf(
+                  /* translators: %s: tool name */
+                  __("Permission denied: %s"),
+                  denial.tool_name
+                )
+              );
+            }
           }
+          this.showError(parts.length > 0 ? parts.join("\n") : __("Unknown error"));
+          return { type: "result", sessionId: message.session_id, success: false };
+        }
+        const thinkingSec = Math.round((this.nowMs() - this.turnStartTime) / 1e3);
+        if (!this.hasShownResponseMarker) {
+          this.messages.addChild(
+            new Text("\n " + chalk.blue("⏺") + " " + __("Done"), 0, 0)
+          );
         }
-        this.showError(parts.length > 0 ? parts.join("\n") : __("Unknown error"));
-        return { type: "result", sessionId: message.session_id, success: false };
+        this.showInfo(
+          sprintf(
+            /* translators: 1: seconds spent thinking, 2: number of turns */
+            _n(
+              "Thought for %1$ds · %2$d turn",
+              "Thought for %1$ds · %2$d turns",
+              message.num_turns
+            ),
+            thinkingSec,
+            message.num_turns
+          )
+        );
+        return { type: "result", sessionId: message.session_id, success: true };
       }
       case "system": {
         if (message.subtype === "status" && message.status === "compacting") {
@@ -3103,6 +3293,16 @@ async function runCommand(options) {
   let currentModel = 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,
+      remote: options.activeSite.remote,
+      url: options.activeSite.url,
+      wpcomSiteId: options.activeSite.wpcomSiteId
+    };
+  }
   ui.start();
   ui.showWelcome();
   if (options.showLegacyCommandNotice && !isJsonMode) {
@@ -3110,7 +3310,7 @@ async function runCommand(options) {
   }
   let sessionRecorder;
   let didDisableSessionPersistence = options.noSessionPersistence === true;
-  let sessionId = resumeContext.sessionId;
+  let sessionId = options.resumeSessionId ?? resumeContext.sessionId;
   let persistQueue = Promise.resolve();
   if (options.noSessionPersistence) {
     ui.showInfo(__("Session persistence disabled (--no-session-persistence)."));
@@ -3129,6 +3329,25 @@ async function runCommand(options) {
           filePath: options.resumeSession.summary.filePath,
           linkedAgentSessionIds: options.resumeSession.summary.linkedAgentSessionIds
         });
+      } else if (options.resumeSessionId) {
+        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();
       }
@@ -3182,9 +3401,9 @@ async function runCommand(options) {
       })
     );
   }
-  setProgressCallback((message, update) => {
+  setProgressCallback((message) => {
     const timestamp = (/* @__PURE__ */ new Date()).toISOString();
-    ui.setLoaderMessage(message, update);
+    ui.setLoaderMessage(message);
     void persist((recorder) => recorder.recordToolProgress(message, timestamp));
   });
   ui.onSiteSelected = (site) => {
@@ -3366,7 +3585,9 @@ async function runCommand(options) {
     }
     return answers;
   }
-  async function runAgentTurn(prompt) {
+  const MAX_RETRY_ATTEMPTS = 4;
+  async function runAgentTurn(prompt, retryAttempt = 0) {
+    await maybeAutoSwitchProvider();
     const env = await resolveAiEnvironment(currentProvider);
     ui.beginAgentTurn();
     let enrichedPrompt = prompt;
@@ -3421,6 +3642,8 @@ ${prompt}`;
               numTurns: result.numTurns
             };
             turnStatus = "max_turns";
+          } else if (result.interrupted) {
+            turnStatus = "interrupted";
           } else {
             turnStatus = result.success ? "success" : "error";
           }
@@ -3428,7 +3651,10 @@ ${prompt}`;
       }
     } catch (error) {
       turnStatus = "error";
-      throw error;
+      if (isJsonMode) {
+        throw error;
+      }
+      ui.showError(getErrorMessage(error));
     } finally {
       await persist((recorder) => recorder.recordTurnClosed(turnStatus));
       ui.endAgentTurn();
@@ -3456,6 +3682,32 @@ ${prompt}`;
         return runAgentTurn("Continue from where you left off.");
       }
     }
+    if (turnStatus === "error" && !isJsonMode) {
+      if (retryAttempt >= MAX_RETRY_ATTEMPTS) {
+        ui.showInfo(
+          __("The server has not recovered after multiple attempts. Please try again later.")
+        );
+      } else {
+        const answer = await ui.askUser([
+          {
+            question: __("There was a hiccup on the server. Do you want to continue?"),
+            options: [
+              { label: "Yes", description: __("Continue from where you left off") },
+              {
+                label: "No",
+                description: __("Stop so I can give different instructions")
+              }
+            ]
+          }
+        ]);
+        const choice = Object.values(answer)[0]?.toLowerCase();
+        if (choice === "yes") {
+          ui.showInfo(__("Retrying…"));
+          const retryPrompt = sessionId ? "Continue from where you left off." : prompt;
+          return runAgentTurn(retryPrompt, retryAttempt + 1);
+        }
+      }
+    }
     return {
       status: turnStatus,
       usage: maxTurnsResult
@@ -3535,7 +3787,6 @@ ${prompt}`;
             break;
           }
         } else {
-          await maybeAutoSwitchProvider();
           ui.addUserMessage(prompt);
           try {
             await runAgentTurn(`Run the /${cmd.name} skill using the Skill tool.`);
@@ -3545,7 +3796,6 @@ ${prompt}`;
         }
         continue;
       }
-      await maybeAutoSwitchProvider();
       ui.addUserMessage(prompt);
       try {
         await runAgentTurn(prompt);
@@ -3569,6 +3819,10 @@ const registerCommand = (yargs) => {
         description: __("Initial message to send to the AI agent")
       }).option("path", {
         hidden: true
+      }).option("site-name", {
+        type: "string",
+        hidden: true,
+        description: __("Name of the active WordPress site")
       }).option("json", {
         type: "boolean",
         default: false,
@@ -3576,6 +3830,14 @@ const registerCommand = (yargs) => {
       }).option("auto-approve", {
         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,
@@ -3592,12 +3854,18 @@ const registerCommand = (yargs) => {
         const typedArgv = argv;
         const noSessionPersistence = typedArgv.sessionPersistence === false;
         const adapter = typedArgv.json ? new JsonAdapter() : new AiChatUI();
+        if (adapter instanceof JsonAdapter && typedArgv.permissionResponse) {
+          adapter.permissionResponse = JSON.parse(typedArgv.permissionResponse);
+        }
+        const sitePath = typeof argv.path === "string" ? argv.path : void 0;
         await runCommand({
           adapter,
           initialMessage: typedArgv.message,
+          resumeSessionId: typedArgv.resumeSession,
           noSessionPersistence,
           autoApprove: typedArgv.autoApprove,
-          showLegacyCommandNotice: argv._[0] === "ai"
+          showLegacyCommandNotice: argv._[0] === "ai",
+          activeSite: sitePath && typedArgv.siteName ? { name: typedArgv.siteName, path: sitePath } : void 0
         });
       } catch (error) {
         if (error instanceof LoggerError) {
@@ -3617,6 +3885,7 @@ const index = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePropert
 }, Symbol.toStringTag, { value: "Module" }));
 export {
   AiChatUI as A,
+  JsonAdapter as J,
   index as i,
   runCommand as r
 };