@mindstudio-ai/remy 0.1.199 → 0.1.201

package/README.md

@@ -1,8 +1,8 @@
 # Remy
 
-A spec-building and coding agent for MindStudio apps.
+A spec-building and coding agent for building apps.
 
-Remy helps users design, spec, build, and iterate on MindStudio projects. It runs locally in a terminal or as a headless subprocess in the MindStudio sandbox. It has tools for reading/writing specs and code, running shell commands, searching code, prompting users with structured forms, and (in the sandbox) TypeScript language server integration. LLM calls are routed through the MindStudio platform for billing and model routing.
+Remy helps users design, spec, build, and iterate on app projects. It runs locally in a terminal or as a headless subprocess in the sandbox. It has tools for reading/writing specs and code, running shell commands, searching code, prompting users with structured forms, and (in the sandbox) TypeScript language server integration. LLM calls are routed through the Remy platform for billing and model routing.
 
 ## Quick Start
 
@@ -11,7 +11,7 @@ Remy helps users design, spec, build, and iterate on MindStudio projects. It run
 mindstudio login
 
 # Navigate to your project
-cd my-mindstudio-app
+cd my-app
 
 # Run remy
 npx remy
@@ -59,6 +59,7 @@ Tool availability depends on the project's onboarding state, sent by the sandbox
 | `visualDesignExpert` | Visual design expert for fonts, colors, palettes, gradients, layouts, imagery, and icons (sub-agent) |
 | `productVision` | Owns the product roadmap — creates/updates/deletes roadmap items in `src/roadmap/` (sub-agent) |
 | `codeSanityCheck` | Quick readonly sanity check on architecture and package choices before building (sub-agent) |
+| `writeBuildOverview` | Generate/refresh the Build Overview (`src/overview.html`) — a single-page plain-language reference of everything the app contains; you author the copy, the design expert lays it out |
 
 ### Spec Tools
 
@@ -307,14 +308,24 @@ Return the full conversation history.
 
 Messages with `hidden: true` were generated by `runCommand` actions and should not be displayed in the UI.
 
+The response also includes `queuedMessages` — the current pending-queue snapshot (possibly empty) — so a client can render the queue immediately on connect/reconnect. Live changes after that arrive via `queue_changed`.
+
 #### `cancel`
 
-Cancel the current turn. The cancel command gets `completed(success:true)`. The in-flight message command (if any) gets its own `completed(success:false, error:"cancelled")`.
+Cancel the current turn. The cancel command gets `completed(success:true)`; any queued messages are flushed and returned on it as `cancelledMessages`. The in-flight message command (if any) gets its own `completed(success:false, error:"cancelled")`.
 
 ```json
 {"action": "cancel", "requestId": "r3"}
 ```
 
+#### `cancelQueued`
+
+Cancel pending **queued** messages without touching the in-flight turn. Omit `id` to cancel all queued user messages, or pass `id` (the `requestId` of a queued message) to cancel just that one. Only user messages are cancellable — chained and background messages are part of a system chain and are never removed. Responds with `completed(success:true, cancelledQueued:[...])` listing what was removed; a `queue_changed` event also fires with the updated queue.
+
+```json
+{"action": "cancelQueued", "requestId": "r6", "id": "r2"}
+```
+
 #### `clear`
 
 Clear conversation history and delete the session file.
@@ -341,6 +352,7 @@ Events are emitted as newline-delimited JSON. Command responses include `request
 |-------|--------|-------------|
 | `ready` | | Headless mode initialized, ready for input |
 | `session_restored` | `messageCount` | Previous session loaded |
+| `queue_changed` | `queuedMessages` | Queue contents changed (any push/shift/drain/cancel). Carries the full current snapshot — an empty array when the queue drains. The live queue-state signal; for the initial snapshot on connect/reconnect, read `queuedMessages` from `get_history`. |
 | `stopping` | | Shutdown initiated |
 | `stopped` | | Shutdown complete |
 

package/dist/automatedActions/debugRequest.md

@@ -2,7 +2,7 @@
 trigger: debugRequest
 ---
 
-This is an automated message triggered by the user having clicked "Debug" in the "Request" log detail in MindStudio UI. Find the request in .logs/requests.ndjson by its ID. If there is an error, fix it immediately - otherwise, explain the request at a high-level in non-technical/natural language and see what the user wishes to do with it. Remember, the user can't see this message, so keep that in mind when responding.
+This is an automated message triggered by the user having clicked "Debug" in the "Request" log detail in the Remy UI. Find the request in .logs/requests.ndjson by its ID. If there is an error, fix it immediately - otherwise, explain the request at a high-level in non-technical/natural language and see what the user wishes to do with it. Remember, the user can't see this message, so keep that in mind when responding.
 
 <request_id>
 {{requestId}}

package/dist/automatedActions/feelingLucky.md

@@ -2,7 +2,7 @@
 trigger: feelingLucky
 ---
 
-This is an automated message triggered by the user having clicked "I'm feeling lucky" in the MindStudio UI and selecting a category from a list of app archetypes. They can't see this message. They're likely new to MindStudio and Remy - this might even be their first time using it. They haven't described a specific idea yet and more than likely don't actually have anything specific in mind — they're exploring what they can build and clicked on something that looked interesting. Your job is to ask questions to help them conjure the seed of an idea that is unique, specific, and interesting, and will be compelling to build as an MVP. Don't build something generic - help the user make something unique that allows you to truly show off the power of what you can build. Stay focused on web interfaces for now, unless the user specifically wants a different interface type. When you've aligned on something to build, focus on making it visually beautiful and highly usable from a UX perspective - at this point in the user's experience they're going to be much more "wowed" by something that looks pretty than by something with a ton of backend complexity.
+This is an automated message triggered by the user having clicked "I'm feeling lucky" in the Remy UI and selecting a category from a list of app archetypes. They can't see this message. They're likely new to Remy - this might even be their first time using it. They haven't described a specific idea yet and more than likely don't actually have anything specific in mind — they're exploring what they can build and clicked on something that looked interesting. Your job is to ask questions to help them conjure the seed of an idea that is unique, specific, and interesting, and will be compelling to build as an MVP. Don't build something generic - help the user make something unique that allows you to truly show off the power of what you can build. Stay focused on web interfaces for now, unless the user specifically wants a different interface type. When you've aligned on something to build, focus on making it visually beautiful and highly usable from a UX perspective - at this point in the user's experience they're going to be much more "wowed" by something that looks pretty than by something with a ton of backend complexity.
 
 <selected_category>
 {{title}}

package/dist/automatedActions/postBuildPolish.md

@@ -13,6 +13,7 @@ The visual assets — photography, generated images, brand colors, typography
 
 ## Finalizing
 When everything is working and polished:
-1. Use `productVision` to mark the MVP roadmap item as done.
-2. Call `compactConversation` to summarize the build session and free up context for the next phase of work.
-3. Call `setProjectOnboardingState({ state: "buildComplete" })`. This triggers the reveal experience on the frontend, where the user sees the pitch deck and their finished app for the first time.
+1. Write the Build Overview. Author the full copy of everything this build actually produced — the data stores and what each holds, the backend operations, the interfaces, any access and role boundaries, background jobs, and seeded scenarios, including the parts the user can't see — in plain, calm, present-tense language, with real names and exact counts. Then call `writeBuildOverview` to render it. Do this now, before compacting, while the build is still fresh in context.
+2. Use `productVision` to mark the MVP roadmap item as done.
+3. Call `compactConversation` to summarize the build session and free up context for the next phase of work.
+4. Call `setProjectOnboardingState({ state: "buildComplete" })`. This triggers the reveal experience on the frontend, where the user sees their finished app and its Build Overview for the first time.

package/dist/brandExtraction/extract.md

@@ -1,4 +1,4 @@
-You extract a structured `AppBrand` JSON object from the spec files of a MindStudio app project.
+You extract a structured `AppBrand` JSON object from the spec files of an app project.
 
 Your output is read by a frontend renderer that uses the brand to style internal documents (implementation plans, sync plans, publish plans) with a "letterhead" treatment — a wordmark, accent color, paper-tone background, and branded fonts. Every field is optional. The renderer falls back to generic styling when a field is missing or invalid.
 

package/dist/compaction/conversation.md

@@ -1,4 +1,4 @@
-You are summarizing a conversation between a user and an AI coding agent called Remy that builds MindStudio apps. Your summary will replace the conversation history — the agent will only see your summary plus any new messages, so it must capture everything needed to continue working.
+You are summarizing a conversation between a user and an AI coding agent called Remy that builds apps. Your summary will replace the conversation history — the agent will only see your summary plus any new messages, so it must capture everything needed to continue working.
 
 Write a tight, factual summary in bullet points. Cover what matters for picking the work back up:
 - What the user is trying to do, and any key decisions, constraints, or preferences they've stated.

package/dist/headless.d.ts

@@ -68,14 +68,9 @@ declare class HeadlessSession {
     start(): Promise<void>;
     private shutdown;
     private emit;
-    /**
-     * Emit a `completed` event and mark completedEmitted. Includes
-     * `queuedMessages` if the queue has items (sandbox uses this to know the
-     * agent is still busy with pipeline work).
-     */
+    /** Emit a `completed` event and mark completedEmitted. Queue state is
+     * surfaced separately via the `queue_changed` event, not on `completed`. */
     private emitCompleted;
-    /** Returns `{ queuedMessages }` when the queue is non-empty, else empty object. */
-    private queueFields;
     /** Dispatch a simple (non-streaming) command: call handler, emit response + completed. */
     private dispatchSimple;
     /** Persist sessionStats + queue snapshot to .remy-stats.json. */
@@ -138,6 +133,13 @@ declare class HeadlessSession {
     private handleChangeModels;
     /** Cancel the running turn and drain the queue. Returns the drained items. */
     private handleCancel;
+    /**
+     * Remove pending queued messages — all user messages, or one by id.
+     * Only `source: 'user'` items are removable; chained and background
+     * messages are part of a system chain and are never cancellable. Does
+     * not affect the in-flight turn (use `cancel` for that).
+     */
+    private handleCancelQueued;
     private handleStdinLine;
 }
 

package/dist/headless.js

@@ -4680,9 +4680,9 @@ ${parts.join("\n\n")}
 }
 function loadPlatformBrief() {
   return `<platform_brief>
-## What is a MindStudio app?
+## What is a Remy app?
 
-A MindStudio app is a managed full-stack TypeScript project with three layers: a spec (natural language in src/), a backend contract (methods, tables, roles in dist/), and one or more interfaces (web, API, bots, cron, etc.). The spec is the source of truth; code is derived from it.
+A Remy app is a managed full-stack TypeScript project with three layers: a spec (natural language in src/), a backend contract (methods, tables, roles in dist/), and one or more interfaces (web, API, bots, cron, etc.). The spec is the source of truth; code is derived from it.
 
 This is a capable, stable platform used in production by 100k+ users. Build with confidence \u2014 you're building production-grade apps, not fragile prototypes.
 
@@ -4727,7 +4727,7 @@ TypeScript running in a sandboxed environment. Any npm package can be installed.
 
 The first-party SDK (@mindstudio-ai/agent) provides access to 200+ AI models (OpenAI, Anthropic, Google, Meta, Mistral, and more) and 1000+ integrations (email, SMS, Slack, HubSpot, Google Workspace, web scraping, image/video generation, media processing, and much more) with zero configuration \u2014 credentials are handled automatically in the execution environment. No API keys needed. This SDK is robust and battle-tested in production.
 
-## What MindStudio apps are NOT good for
+## What Remy apps are NOT good for
 
 - Native mobile apps (iOS/Android). Mobile-responsive web apps are fine.
 - Real-time multiplayer with persistent connections (no WebSocket support). Turn-based or async patterns work.
@@ -5391,6 +5391,94 @@ var scrapeWebUrlTool = {
   }
 };
 
+// src/tools/spec/writeBuildOverview.ts
+import fs20 from "fs";
+var OVERVIEW_FILE = "src/overview.html";
+var DESIGN_BRIEF = `We are building the Build Overview for this app \u2014 the home page of its Spec tab. It is a calm, dense, one-page reference of everything the app actually contains, including the parts the user can't see. It renders flush inside the Spec tab's content panel (the IDE supplies the surrounding nav).
+
+Take the plain-language copy in <overview_copy> and lay it out and skin it into a single, beautiful, self-contained HTML document in the app's own brand. If <current_overview> is non-empty, use it as your starting point and preserve its established skin, updating only what the copy changed.
+
+### The single hard rule
+Preserve every fact in <overview_copy> exactly \u2014 every number, name, label, and claim. Do not add, drop, soften, reword, or invent any fact. You own layout, typography, and visual design only; the substance and the words are fixed. A single wrong number breaks this document's entire purpose.
+
+### What it is (and is not)
+- A typeset reference dossier: composed, dense, a little cool \u2014 substantial at a glance, then readable. Density communicates substance; sparse and airy reads as "not much here."
+- Brand-skinned: pull the palette, type system, and a single accent from the app's spec. The accent leads labels and figures; it is a mark, not a fill.
+- NOT a slide deck \u2014 no theatrics, no building to a climax, no persuasion.
+- NOT a docs site \u2014 no raised or shadowed cards, no hover-lift, no clickable-feeling surfaces, no sticky table of contents.
+- NOT a sparse memo \u2014 a restrained single-column page under-sells the work.
+- No header chrome and no footer: open straight on the app's logo and name so it sits flush with the IDE.
+
+### Constraints
+- A single self-contained HTML file. Fonts may load from a CDN; everything else (CSS, the logo SVG) is inline.
+- Responsive: fills the embedded panel width and collapses gracefully at narrow widths.
+
+Respond only with the complete HTML file and absolutely no other text. Your response will be written directly to src/overview.html.`;
+var OVERVIEW_SHELL = `<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<!-- This renders inside an iframe in the IDE. Keep it a simple, self-contained
+     static document \u2014 no scroll/zoom/accessibility scaffolding beyond this head.
+     The user-scalable=no viewport is intentional; leave it. -->
+<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+<title>Build Overview</title>
+<!-- SKIN: link the app's fonts here (CDN \u2014 e.g. Fontshare / Google Fonts). -->
+<style>
+*, *::before, *::after { margin: 0; padding: 0; box-sizing: border-box; }
+</style>
+</head>
+<body>
+<!-- Compose the Build Overview here. Layout, sections, type, and styling are
+     yours \u2014 keep everything inline and self-contained, brand-skinned from the
+     app's spec. -->
+</body>
+</html>`;
+var buildOverviewTool = {
+  clearable: false,
+  definition: {
+    name: "writeBuildOverview",
+    description: "Generate or refresh the Build Overview \u2014 the project's home page in the Spec tab: a single-page, plain-language reference of everything the app actually contains, including the parts the user can't see (data stores, backend operations, access and roles, background jobs, seeded scenarios, the design system). You author the full copy: read the manifest and spec and state, plainly and exactly, what genuinely exists \u2014 real names and accurate counts \u2014 in calm, declarative, present-tense outcome language, with no persuasion or hype. Describe only what exists. Pass the complete copy as `content`; the design expert lays it out and skins it to the app's brand without altering any of your facts. Generate it at the end of a build and refresh it after meaningful work.",
+    inputSchema: {
+      type: "object",
+      properties: {
+        content: {
+          type: "string",
+          description: "The full Build Overview copy you authored: everything the app contains, in plain present-tense outcome language, with real names and exact counts. The design expert lays this out and skins it to the brand without changing any fact."
+        }
+      },
+      required: ["content"]
+    }
+  },
+  async execute(input, context) {
+    if (!context) {
+      return "Error: writeBuildOverview requires execution context for design expert delegation";
+    }
+    const content = (input.content ?? "").trim();
+    if (!content) {
+      return "Error: writeBuildOverview requires non-empty `content` (the overview copy).";
+    }
+    try {
+      const existing = fs20.existsSync(OVERVIEW_FILE) ? fs20.readFileSync(OVERVIEW_FILE, "utf-8").trim() : "";
+      const currentOverview = existing || OVERVIEW_SHELL;
+      const task = `<overview_copy>${content}</overview_copy>
+
+<current_overview>${currentOverview}</current_overview>
+
+${DESIGN_BRIEF}`;
+      const result = await designExpertTool.execute({ task }, context);
+      const htmlMatch = result.match(
+        /```(?:html|wireframe)\n([\s\S]*?)```/
+      );
+      const html = htmlMatch ? htmlMatch[1].trim() : result;
+      fs20.writeFileSync(OVERVIEW_FILE, html, "utf-8");
+      return "Build overview written successfully to src/overview.html.";
+    } catch (err) {
+      return `Error generating build overview: ${err.message}`;
+    }
+  }
+};
+
 // src/tools/index.ts
 function deriveContext(parent, toolCallId) {
   return { ...parent, toolCallId };
@@ -5407,6 +5495,7 @@ var ALL_TOOLS = [
   designExpertTool,
   productVisionTool,
   codeSanityCheckTool,
+  buildOverviewTool,
   compactConversationTool,
   // Post-onboarding
   presentPublishPlanTool,
@@ -5789,7 +5878,7 @@ function triggerCompaction(state, apiConfig, opts = {}) {
 }
 
 // src/brandExtraction/index.ts
-import fs20 from "fs";
+import fs21 from "fs";
 import path10 from "path";
 import { createHash } from "crypto";
 var log9 = createLogger("brandExtraction");
@@ -5838,7 +5927,7 @@ function sha256(input) {
 }
 function readSafe(filePath) {
   try {
-    return fs20.readFileSync(filePath, "utf-8");
+    return fs21.readFileSync(filePath, "utf-8");
   } catch {
     return "";
   }
@@ -5846,7 +5935,7 @@ function readSafe(filePath) {
 function walkMdFiles3(dir) {
   const results = [];
   try {
-    const entries = fs20.readdirSync(dir, { withFileTypes: true });
+    const entries = fs21.readdirSync(dir, { withFileTypes: true });
     for (const entry of entries) {
       const full = path10.join(dir, entry.name);
       if (entry.isDirectory()) {
@@ -5861,7 +5950,7 @@ function walkMdFiles3(dir) {
 }
 function parseFrontmatter3(filePath) {
   try {
-    const content = fs20.readFileSync(filePath, "utf-8");
+    const content = fs21.readFileSync(filePath, "utf-8");
     const match = content.match(/^---\n([\s\S]*?)\n---/);
     if (!match) {
       return { type: "" };
@@ -6040,14 +6129,14 @@ function pickFont(raw) {
 }
 function persistBrand(brand, inputHash) {
   const tmp = `${BRAND_FILE}.tmp`;
-  fs20.writeFileSync(tmp, JSON.stringify(brand, null, 2), "utf-8");
-  fs20.renameSync(tmp, BRAND_FILE);
+  fs21.writeFileSync(tmp, JSON.stringify(brand, null, 2), "utf-8");
+  fs21.renameSync(tmp, BRAND_FILE);
   const cache = { inputHash, generatedAt: Date.now() };
-  fs20.writeFileSync(CACHE_FILE, JSON.stringify(cache, null, 2), "utf-8");
+  fs21.writeFileSync(CACHE_FILE, JSON.stringify(cache, null, 2), "utf-8");
 }
 function readCache() {
   try {
-    const raw = fs20.readFileSync(CACHE_FILE, "utf-8");
+    const raw = fs21.readFileSync(CACHE_FILE, "utf-8");
     const parsed = JSON.parse(raw);
     if (parsed && typeof parsed.inputHash === "string" && typeof parsed.generatedAt === "number") {
       return parsed;
@@ -6080,14 +6169,14 @@ function triggerBrandExtraction(apiConfig, model) {
 }
 
 // src/session.ts
-import fs21 from "fs";
+import fs22 from "fs";
 import path11 from "path";
 var log11 = createLogger("session");
 var SESSION_FILE = ".remy-session.json";
 var ARCHIVE_DIR = ".logs/sessions";
 function loadSession(state) {
   try {
-    const raw = fs21.readFileSync(SESSION_FILE, "utf-8");
+    const raw = fs22.readFileSync(SESSION_FILE, "utf-8");
     const data = JSON.parse(raw);
     if (data.models && typeof data.models === "object") {
       state.models = data.models;
@@ -6146,7 +6235,7 @@ function saveSession(state) {
     if (state.models && Object.keys(state.models).length > 0) {
       payload.models = state.models;
     }
-    fs21.writeFileSync(SESSION_FILE, JSON.stringify(payload, null, 2), "utf-8");
+    fs22.writeFileSync(SESSION_FILE, JSON.stringify(payload, null, 2), "utf-8");
     log11.info("Session saved", { messageCount: state.messages.length });
   } catch (err) {
     log11.warn("Session save failed", { error: err.message });
@@ -6155,11 +6244,11 @@ function saveSession(state) {
 function clearSession(state) {
   state.messages = [];
   try {
-    if (fs21.existsSync(SESSION_FILE)) {
-      fs21.mkdirSync(ARCHIVE_DIR, { recursive: true });
+    if (fs22.existsSync(SESSION_FILE)) {
+      fs22.mkdirSync(ARCHIVE_DIR, { recursive: true });
       const ts = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
       const dest = path11.join(ARCHIVE_DIR, `cleared-${ts}.json`);
-      fs21.renameSync(SESSION_FILE, dest);
+      fs22.renameSync(SESSION_FILE, dest);
       log11.info("Session archived on clear", { dest });
     }
   } catch (err) {
@@ -6167,7 +6256,7 @@ function clearSession(state) {
       error: err.message
     });
     try {
-      fs21.unlinkSync(SESSION_FILE);
+      fs22.unlinkSync(SESSION_FILE);
     } catch {
     }
   }
@@ -7159,6 +7248,24 @@ var MessageQueue = class {
     this.onChange?.();
     return all;
   }
+  /**
+   * Remove all items matching `predicate`. Fires onChange only if something
+   * was removed. Returns the removed items.
+   */
+  removeWhere(predicate) {
+    const removed = [];
+    this.items = this.items.filter((item) => {
+      if (predicate(item)) {
+        removed.push(item);
+        return false;
+      }
+      return true;
+    });
+    if (removed.length > 0) {
+      this.onChange?.();
+    }
+    return removed;
+  }
   /** Copy of current queue contents (for surfacing on events). */
   snapshot() {
     return [...this.items];
@@ -7209,6 +7316,24 @@ function resolveAction(text) {
     next
   };
 }
+function getActionChain(startName) {
+  const chain = [];
+  const seen = /* @__PURE__ */ new Set();
+  let name = startName;
+  while (name && !seen.has(name)) {
+    seen.add(name);
+    chain.push(name);
+    let body;
+    try {
+      body = readAsset("automatedActions", `${name}.md`);
+    } catch {
+      break;
+    }
+    const fm = body.match(/^---\s*\n([\s\S]*?)\n---/);
+    name = fm?.[1].match(/^\s*next:\s*(\w+)\s*$/m)?.[1];
+  }
+  return chain;
+}
 
 // src/headless/index.ts
 var log14 = createLogger("headless");
@@ -7279,14 +7404,16 @@ var HeadlessSession = class {
       baseUrl: this.opts.baseUrl
     });
     const resumed = loadSession(this.state);
-    this.queue = new MessageQueue(loadQueue(), () => this.persistStats());
+    this.queue = new MessageQueue(loadQueue(), () => {
+      this.persistStats();
+      this.emit("queue_changed", { queuedMessages: this.queue.snapshot() });
+    });
     if (resumed) {
       this.emit("session_restored", {
         messageCount: this.state.messages.length,
         ...this.state.models && { models: this.state.models },
         modelSurfaces: MODEL_SURFACES,
-        allowedModelsByType: ALLOWED_MODELS_BY_TYPE,
-        ...this.queueFields()
+        allowedModelsByType: ALLOWED_MODELS_BY_TYPE
       });
     }
     triggerBrandExtraction(
@@ -7336,7 +7463,7 @@ var HeadlessSession = class {
     });
     process.on("SIGTERM", this.shutdown);
     process.on("SIGINT", this.shutdown);
-    this.emit("ready", this.queueFields());
+    this.emit("ready");
   }
   shutdown = () => {
     this.emit("stopping");
@@ -7360,19 +7487,12 @@ var HeadlessSession = class {
     }
     process.stdout.write(line);
   }
-  /**
-   * Emit a `completed` event and mark completedEmitted. Includes
-   * `queuedMessages` if the queue has items (sandbox uses this to know the
-   * agent is still busy with pipeline work).
-   */
+  /** Emit a `completed` event and mark completedEmitted. Queue state is
+   * surfaced separately via the `queue_changed` event, not on `completed`. */
   emitCompleted(rid, data) {
-    this.emit("completed", { ...data, ...this.queueFields() }, rid);
+    this.emit("completed", { ...data }, rid);
     this.completedEmitted = true;
   }
-  /** Returns `{ queuedMessages }` when the queue is non-empty, else empty object. */
-  queueFields() {
-    return this.queue.length > 0 ? { queuedMessages: this.queue.snapshot() } : {};
-  }
   /** Dispatch a simple (non-streaming) command: call handler, emit response + completed. */
   dispatchSimple(requestId, eventName, handler) {
     try {
@@ -7550,11 +7670,7 @@ var HeadlessSession = class {
         });
         return;
       case "turn_cancelled": {
-        this.emit(
-          "completed",
-          { success: false, error: "cancelled", ...this.queueFields() },
-          rid
-        );
+        this.emit("completed", { success: false, error: "cancelled" }, rid);
         this.completedEmitted = true;
         return;
       }
@@ -7678,7 +7794,7 @@ var HeadlessSession = class {
    * message — `running` stays held across the queue drain so no user
    * message can slip in mid-pipeline.
    */
-  async runSingleTurn(parsed, requestId) {
+  async runSingleTurn(parsed, requestId, fromChain = false) {
     this.currentRequestId = requestId;
     this.currentAbort = new AbortController();
     this.completedEmitted = false;
@@ -7726,16 +7842,18 @@ var HeadlessSession = class {
       onboardingState,
       parsed.viewContext
     );
-    if (resolved?.next) {
-      this.queue.push({
-        command: {
-          action: "message",
-          text: sentinel(resolved.next),
-          onboardingState
-        },
-        source: "chain",
-        enqueuedAt: Date.now()
-      });
+    if (resolved?.next && !fromChain) {
+      for (const step of getActionChain(resolved.next)) {
+        this.queue.push({
+          command: {
+            action: "message",
+            text: sentinel(step),
+            onboardingState
+          },
+          source: "chain",
+          enqueuedAt: Date.now()
+        });
+      }
     }
     try {
       await runTurn({
@@ -7793,11 +7911,6 @@ var HeadlessSession = class {
         source: "user",
         enqueuedAt: Date.now()
       });
-      this.emit(
-        "queued",
-        { position: this.queue.length, ...this.queueFields() },
-        requestId
-      );
       return;
     }
     this.running = true;
@@ -7845,7 +7958,7 @@ var HeadlessSession = class {
         continue;
       }
       const nextRid = next.command.requestId ?? `${next.source}-${Date.now()}`;
-      await this.runSingleTurn(next.command, nextRid);
+      await this.runSingleTurn(next.command, nextRid, next.source === "chain");
     }
   }
   /**
@@ -7909,6 +8022,17 @@ var HeadlessSession = class {
     }
     return this.queue.drain();
   }
+  /**
+   * Remove pending queued messages — all user messages, or one by id.
+   * Only `source: 'user'` items are removable; chained and background
+   * messages are part of a system chain and are never cancellable. Does
+   * not affect the in-flight turn (use `cancel` for that).
+   */
+  handleCancelQueued(id) {
+    return this.queue.removeWhere(
+      (item) => item.source === "user" && (id === void 0 || item.command.requestId === id)
+    );
+  }
   //////////////////////////////////////////////////////////////////////////////
   // Stdin router
   //////////////////////////////////////////////////////////////////////////////
@@ -7973,7 +8097,11 @@ var HeadlessSession = class {
         ...this.state.models && { models: this.state.models },
         modelSurfaces: MODEL_SURFACES,
         allowedModelsByType: ALLOWED_MODELS_BY_TYPE,
-        ...this.queueFields()
+        // Current queue snapshot for connect/reconnect — get_history is the
+        // on-demand "current state" query. Always an array (possibly empty),
+        // matching the queue_changed convention so the client reconciles the
+        // same way from both; live mutations are pushed via queue_changed.
+        queuedMessages: this.queue.snapshot()
       }));
       return;
     }
@@ -8017,6 +8145,16 @@ var HeadlessSession = class {
       );
       return;
     }
+    if (action === "cancelQueued") {
+      const id = parsed.id;
+      const removed = this.handleCancelQueued(id);
+      this.emit(
+        "completed",
+        { success: true, cancelledQueued: removed },
+        requestId
+      );
+      return;
+    }
     if (action === "stop_tool") {
       const id = parsed.id;
       const mode = parsed.mode ?? "hard";