🔀 merge: integrate steer and queue release

Author: frostime

CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.11.1] - 2026-08-15
+
+### Added
+
+- Choose Steer or Queue for each prompt submitted while Pi is streaming, with per-session delivery memory, dedicated shortcuts, and visible pending states for both queues.
+
 ## [0.11.0] - 2026-08-10
 
 ### Added
@@ -333,7 +339,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add editor context capture, file navigation, Git-base diffs, diagnostics export, CSP, and trusted-workspace constraints.
 - Add production builds, tests, VSIX verification, release scripts, and maintenance documentation.
 
-[Unreleased]: https://github.com/frostime/frostpi/compare/v0.11.0...HEAD
+[Unreleased]: https://github.com/frostime/frostpi/compare/v0.11.1...HEAD
+[0.11.1]: https://github.com/frostime/frostpi/compare/v0.11.0...v0.11.1
 [0.11.0]: https://github.com/frostime/frostpi/compare/v0.10.4...v0.11.0
 [0.10.4]: https://github.com/frostime/frostpi/compare/v0.10.3...v0.10.4
 [0.10.3]: https://github.com/frostime/frostpi/compare/v0.10.2...v0.10.3

apps/vscode/package.json

@@ -2,7 +2,7 @@
   "name": "frostpi",
   "displayName": "FrostPi — Visual UI for Pi Coding Agent",
   "description": "A polished VS Code interface for Pi's RPC mode, with streaming conversations, tool activity, image prompts, extension commands, and extension UI requests.",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "publisher": "frostime",
   "license": "AGPL-3.0-only",
   "private": false,
@@ -193,7 +193,7 @@
           ],
           "default": "followUp",
           "scope": "resource",
-          "description": "How a normal prompt is queued when Pi is already streaming. Extension commands execute immediately."
+          "description": "Default delivery for normal prompts submitted while Pi is streaming. The Composer can override it per session; extension commands execute immediately."
         },
         "frostpi.conversation.collapseTurnTrace": {
           "type": "boolean",

apps/vscode/src/extension/conversation/ConversationProjection.ts

@@ -15,7 +15,7 @@ import type {
   ImageAttachmentView,
   MessageBlockView,
   MessageStatus,
-  QueuedFollowUpView,
+  QueuedPromptView,
   ResponseActivityView,
   SessionNoticeLevel,
   SessionNoticeView,
@@ -43,7 +43,8 @@ export interface ActiveBranchEdge {
 
 export interface ConversationProjectionSnapshot {
   items: readonly ConversationItemView[];
-  queuedFollowUps: readonly QueuedFollowUpView[];
+  queuedSteers: readonly QueuedPromptView[];
+  queuedFollowUps: readonly QueuedPromptView[];
   updatedAt: number;
 }
 
@@ -57,7 +58,8 @@ interface PersistedTurnState {
 export class ConversationProjection {
   readonly #store = new ConversationItemStore();
   readonly #assistantMessageAdapter = new PiAssistantMessageAdapter();
-  #queuedFollowUps: QueuedFollowUpView[] = [];
+  #queuedSteers: QueuedPromptView[] = [];
+  #queuedFollowUps: QueuedPromptView[] = [];
   #activeTurnId: string | null = null;
   #persistedTurn: PersistedTurnState | null = null;
   #pendingLiveErrorTurnId: string | null = null;
@@ -77,6 +79,7 @@ export class ConversationProjection {
   read(): ConversationProjectionSnapshot {
     return {
       items: this.#store.read(),
+      queuedSteers: this.#queuedSteers,
       queuedFollowUps: this.#queuedFollowUps,
       updatedAt: this.#updatedAt,
     };
@@ -148,28 +151,33 @@ export class ConversationProjection {
     return turn.id;
   }
 
+  enqueueSteer(text: string, images: WebviewImageInput[], timestamp = Date.now()): string {
+    const id = `queued-steer-${timestamp}-${++this.#sequence}`;
+    this.#queuedSteers = [...this.#queuedSteers, queuedPrompt(id, text, images, timestamp)];
+    this.#touch();
+    return id;
+  }
+
   enqueueFollowUp(text: string, images: WebviewImageInput[], timestamp = Date.now()): string {
     const id = `queued-follow-up-${timestamp}-${++this.#sequence}`;
-    this.#queuedFollowUps = [...this.#queuedFollowUps, {
-      id,
-      text,
-      images: toImageViews(images),
-      timestamp,
-    }];
+    this.#queuedFollowUps = [...this.#queuedFollowUps, queuedPrompt(id, text, images, timestamp)];
     this.#touch();
     return id;
   }
 
-  clearQueuedFollowUps(): void {
-    if (this.#queuedFollowUps.length === 0) return;
+  clearQueuedPrompts(): void {
+    if (this.#queuedSteers.length === 0 && this.#queuedFollowUps.length === 0) return;
+    this.#queuedSteers = [];
     this.#queuedFollowUps = [];
     this.#touch();
   }
 
-  removeQueuedFollowUp(id: string): boolean {
-    const next = this.#queuedFollowUps.filter((item) => item.id !== id);
-    if (next.length === this.#queuedFollowUps.length) return false;
-    this.#queuedFollowUps = next;
+  removeQueuedPrompt(id: string): boolean {
+    const nextSteers = this.#queuedSteers.filter((item) => item.id !== id);
+    const nextFollowUps = this.#queuedFollowUps.filter((item) => item.id !== id);
+    if (nextSteers.length === this.#queuedSteers.length && nextFollowUps.length === this.#queuedFollowUps.length) return false;
+    this.#queuedSteers = nextSteers;
+    this.#queuedFollowUps = nextFollowUps;
     this.#touch();
     return true;
   }
@@ -400,14 +408,14 @@ export class ConversationProjection {
 
   #startAgentTurn(): void {
     let active = this.#activeTurn();
-    if (this.#queuedFollowUps.length > 0 && active?.status === "running" && active.items.length === 0) {
+    if (this.#hasQueuedPrompts() && active?.status === "running" && active.items.length === 0) {
       this.#store.removeTopLevelItem(active.id);
       this.#activeTurnId = null;
       active = undefined;
     }
     const turn = active?.status === "running"
       ? active
-      : this.#promoteQueuedFollowUp() ?? active;
+      : this.#promoteNextQueuedPrompt() ?? active;
     if (!turn) {
       this.#activeTurnId = null;
       return;
@@ -578,13 +586,12 @@ export class ConversationProjection {
   }
 
   #tryPromoteQueuedUserMessage(event: RpcEvent): boolean {
-    if (this.#queuedFollowUps.length === 0) return false;
+    if (!this.#hasQueuedPrompts()) return false;
     const message = event.message;
     if (!isRecord(message) || message.role !== "user") return false;
 
-    const [promoted, ...remaining] = this.#queuedFollowUps;
+    const promoted = this.#takeNextQueuedPrompt();
     if (!promoted) return false;
-    this.#queuedFollowUps = remaining;
     if (this.#activeTurnId) {
       const prior = this.#turn(this.#activeTurnId);
       if (prior.status === "running") this.#setTurnStatus(prior.id, "completed", Date.now());
@@ -632,15 +639,29 @@ export class ConversationProjection {
     return undefined;
   }
 
-  #promoteQueuedFollowUp(): AgentTurnView | undefined {
-    const [next, ...remaining] = this.#queuedFollowUps;
+  #promoteNextQueuedPrompt(): AgentTurnView | undefined {
+    const next = this.#takeNextQueuedPrompt();
     if (!next) return undefined;
-    this.#queuedFollowUps = remaining;
     const turn = this.#createUserTurn(next.text, next.images, next.timestamp);
     this.#store.appendItem(turn);
     return turn;
   }
 
+  #takeNextQueuedPrompt(): QueuedPromptView | undefined {
+    const steer = this.#queuedSteers[0];
+    if (steer) {
+      this.#queuedSteers = this.#queuedSteers.slice(1);
+      return steer;
+    }
+    const followUp = this.#queuedFollowUps[0];
+    if (followUp) this.#queuedFollowUps = this.#queuedFollowUps.slice(1);
+    return followUp;
+  }
+
+  #hasQueuedPrompts(): boolean {
+    return this.#queuedSteers.length > 0 || this.#queuedFollowUps.length > 0;
+  }
+
   #refreshBranchControls(branchEdges: readonly ActiveBranchEdge[]): void {
     const controls = new Map(branchEdges.map((edge) => [branchControlId(edge), branchControlView(edge)]));
     this.#store.mapItems((item) => {
@@ -909,6 +930,15 @@ function isBranchControl(
   return item.type === "branchControl";
 }
 
+function queuedPrompt(
+  id: string,
+  text: string,
+  images: WebviewImageInput[],
+  timestamp: number,
+): QueuedPromptView {
+  return { id, text, images: toImageViews(images), timestamp };
+}
+
 function toImageViews(
   images: readonly WebviewImageInput[] | readonly ImageAttachmentView[],
 ): ImageAttachmentView[] {

apps/vscode/src/extension/conversation/conversation-projection.SPEC.md

@@ -5,7 +5,7 @@ scope:
   - /apps/vscode/src/extension/conversation/**
   - /apps/vscode/src/extension/sessions/SessionEntryState.ts
   - /apps/vscode/src/shared/model/conversationModel.ts
-updated: 2026-08-09
+updated: 2026-08-15
 ---
 
 # Conversation Projection
@@ -32,7 +32,7 @@ A branch control represents an active parent-child tree edge. Its identity is de
 
 ## Live reconciliation
 
-Optimistic prompts, streaming assistant content, tools, queued follow-ups, and notices appear before persistence refresh. A live turn becomes eligible for persisted user identity only after Pi emits its user message event. Eligible live turns pair with newly appended user entries in protocol FIFO order; text and timestamp equality are never identity rules. Rejected prompts and immediate extension commands without a Pi user event remain ineligible.
+Optimistic prompts, streaming assistant content, tools, queued steering/follow-up prompts, and notices appear before persistence refresh. A live turn becomes eligible for persisted user identity only after Pi emits its user message event. Eligible live turns pair with newly appended user entries in protocol FIFO order; text and timestamp equality are never identity rules. Rejected prompts and immediate extension commands without a Pi user event remain ineligible.
 
 Live assistant projection accepts both cumulative assistant messages and indexed delta-only updates. A complete assistant `event.message` wins for its event; its accompanying delta is not appended. Otherwise text, thinking, and tool arguments assemble independently by non-negative `contentIndex`. The first valid text or thinking end replaces temporary content and closes that part; later deltas and repeated ends for the part are ignored. Unknown, malformed, conflicting, or out-of-order deltas are ignored without a notice. `message_end.message` is the live final authority and can be projected without an observed start; persisted `get_entries` remains higher authority.
 
@@ -60,7 +60,7 @@ A persisted user message closes the preceding visual turn and opens a user-ancho
 
 Live `message_end(error)` displays the error activity but leaves the turn running until `agent_end` decides whether Pi will retry. `agent_end(willRetry: true)` keeps the running turn and `auto_retry_start` adds a notice; `willRetry: false` commits the pending error. This uses the existing turn statuses and does not persist retry notices.
 
-While an agent run is active, queued follow-ups remain outside persisted conversation order. Pi may emit a follow-up user message without another `agent_start`; promotion follows protocol FIFO order and closes the prior visual turn. Abort, process stop, and process failure clear the local queue. Tool tracking at these lifecycle boundaries follows [Unresolved tool results](#unresolved-tool-results).
+While an agent run is active, queued steering and follow-up prompts remain outside persisted conversation order in separate local projections. Pi may emit queued user messages without another `agent_start`; steering is promoted FIFO before follow-ups, matching Pi's queue priority, and each promotion closes the prior visual turn. Abort, process stop, and process failure clear both local projections. Tool tracking at these lifecycle boundaries follows [Unresolved tool results](#unresolved-tool-results).
 
 Live activity updates replace existing view objects instead of mutating them. This is required for bridge deltas and Webview-owned disclosure state. Documented assistant events provide an ID or timestamp correlation clue; a malformed live assistant without either is omitted until persisted refresh rather than emitted as an uncorrelatable duplicate. Within one valid assistant stream, timestamp and any ID present at start remain stable through end. Mid-stream identity changes are unsupported malformed input and recover only through authoritative history refresh; the Store does not maintain cross-clue aliases. Notices emitted during an active turn remain inside its ordered items; idle notices are top-level conversation items.
 

apps/vscode/src/extension/sessions/SessionRegistry.ts

@@ -2,7 +2,7 @@ import { randomUUID } from "node:crypto";
 import { access } from "node:fs/promises";
 import { basename, normalize, resolve } from "node:path";
 
-import type { RpcExtensionUiResponse, ThinkingLevel } from "@frostime/pi-rpc";
+import type { RpcExtensionUiResponse, StreamingBehavior, ThinkingLevel } from "@frostime/pi-rpc";
 import * as vscode from "vscode";
 
 import type { WebviewImageInput } from "../../shared/bridge/webviewToHost.js";
@@ -292,7 +292,7 @@ export class SessionRegistry implements vscode.Disposable {
     for (const runtime of this.#runtimes.values()) runtime.refreshConfigurationState(forceRestartRequired);
   }
 
-  async sendPrompt(sessionId: string, text: string, images: WebviewImageInput[]): Promise<void> {
+  async sendPrompt(sessionId: string, text: string, images: WebviewImageInput[], streamingBehavior?: StreamingBehavior): Promise<void> {
     this.#assertSessionOutsideFork(sessionId);
     if (!text.trim() && images.length === 0) return;
     const runtime = this.#requireRuntime(sessionId);
@@ -304,7 +304,7 @@ export class SessionRegistry implements vscode.Disposable {
     const compactInstructions = compactCommandInstructions(text);
     if (compactInstructions !== null && images.length > 0) throw new Error("/compact does not support image attachments.");
     if (compactInstructions !== null) await runtime.compact(compactInstructions || undefined);
-    else await runtime.sendPrompt(text, images);
+    else await runtime.sendPrompt(text, images, streamingBehavior);
     runtime.clearComposerSeed();
     if (compactInstructions === null && this.#temporarySessionIds.delete(sessionId)) await this.#persist();
   }