feat(chat): quote transcript selections into the composer

src/features/automations/ui/AutomationBuilderView.tsx

@@ -116,6 +116,9 @@ export function AutomationBuilderView({
             controls={{
               agentModelPicker: false,
               projectPicker: false,
+              // The builder converses about an automation; its transcript
+              // is not a quotable source.
+              quotes: false,
             }}
             composerActions={{
               onSend: (text) => builder.sendMessage(text),

src/features/chat/hooks/useChat.ts

@@ -23,6 +23,7 @@ import {
 } from "../lib/sendCore";
 import { perfLog } from "@/shared/lib/perfLog";
 import { sanitizeReplayMessages } from "../lib/replaySanitizer";
+import { withRestoredStagedItems } from "../lib/submittedQuoteProvenance";
 import { i18n } from "@/shared/i18n";
 import type { ChatSendOptions } from "../types";
 import { formatAcpErrorMessage } from "@/shared/api/acpErrors";
@@ -164,6 +165,10 @@ export function useChat(
       const sid = sessionId.slice(0, 8);
       const hasAttachments = (attachments?.length ?? 0) > 0;
       const hasAssistantPrompt = Boolean(sendOptions?.assistantPrompt?.trim());
+      // Staged quotes deliberately do NOT make an empty send valid: a
+      // quote-only dispatch would carry an empty ACP prompt, which breaks
+      // replay provenance matching (withRestoredStagedItems skips
+      // empty-text turns). The composer enforces the same policy.
       const currentChatState = useChatStore
         .getState()
         .getSessionRuntime(sessionId).chatState;
@@ -456,7 +461,10 @@ export function useChat(
         const buffer = getAndDeleteReplayBuffer(sessionId);
         if (buffer) {
           setMessages(sessionId, [
-            ...sanitizeReplayMessages(buffer),
+            ...withRestoredStagedItems(
+              sessionId,
+              sanitizeReplayMessages(buffer),
+            ),
             createCompactionConfirmationMessage(),
           ]);
         } else {

src/features/chat/hooks/useChatInputSubmit.ts

@@ -1,13 +1,18 @@
 import { useCallback, type RefObject } from "react";
 import type { SkillCommandMatch } from "@/features/skills/lib/skillChatPrompt";
-import type { ChatAttachmentDraft, MessageChip } from "@/shared/types/messages";
+import type {
+  ChatAttachmentDraft,
+  MessageChip,
+  StagedItem,
+} from "@/shared/types/messages";
 import { skillDraftSnapshotsMatch } from "../lib/chatInputSnapshots";
 import { submitComposerMessage } from "../lib/submitComposerMessage";
 import type { ChatInputSendHandler, ChatSkillDraft } from "../types";
 
 interface UseChatInputSubmitOptions {
   attachmentsRef: RefObject<ChatAttachmentDraft[]>;
   selectedSkillsRef: RefObject<ChatSkillDraft[]>;
+  stagedItemsRef: RefObject<StagedItem[]>;
   selectedChipsRef: RefObject<MessageChip[]>;
   skillProviderId?: string | null;
   selectedPersonaId?: string | null;
@@ -21,6 +26,7 @@ interface UseChatInputSubmitOptions {
 export function useChatInputSubmit({
   attachmentsRef,
   selectedSkillsRef,
+  stagedItemsRef,
   selectedChipsRef,
   skillProviderId,
   selectedPersonaId,
@@ -33,12 +39,14 @@ export function useChatInputSubmit({
       submittedText: string,
       submittedAttachments: ChatAttachmentDraft[],
       submittedSkills: ChatSkillDraft[],
+      submittedStagedItems: StagedItem[],
       submitHandler: ChatInputSendHandler = onSend,
     ) =>
       submitComposerMessage({
         text: submittedText,
         attachments: submittedAttachments,
         skills: submittedSkills,
+        stagedItems: submittedStagedItems,
         chips: selectedChipsRef.current,
         skillProviderId,
         selectedPersonaId,
@@ -62,6 +70,7 @@ export function useChatInputSubmit({
         submittedText,
         submittedAttachments,
         submittedSkills,
+        stagedItemsRef.current,
       );
       if (
         accepted &&
@@ -74,6 +83,7 @@ export function useChatInputSubmit({
     [
       attachmentsRef,
       selectedSkillsRef,
+      stagedItemsRef,
       setSelectedSkills,
       submitChatInputMessage,
     ],

src/features/chat/hooks/useChatSessionController.ts

@@ -7,7 +7,7 @@ import {
   useState,
 } from "react";
 import { QueryClientContext } from "@tanstack/react-query";
-import type { ChatAttachmentDraft } from "@/shared/types/messages";
+import type { ChatAttachmentDraft, StagedItem } from "@/shared/types/messages";
 import type { ChatSendOptions, ChatSkillDraft, ModelOption } from "../types";
 import { INITIAL_TOKEN_STATE } from "@/shared/types/chat";
 import { useChat } from "./useChat";
@@ -130,6 +130,7 @@ const DRAFT_STORE_UPDATE_DEBOUNCE_MS = 300;
 const PENDING_HOME_SESSION_ID = "__home_pending__";
 const EMPTY_SKILL_DRAFTS: ChatSkillDraft[] = [];
 const EMPTY_ATTACHMENT_DRAFTS: ChatAttachmentDraft[] = [];
+const EMPTY_STAGED_ITEMS: StagedItem[] = [];
 const AGENT_BUILDER_MENTION_INVOCATION = /^@agent-builder\s*$/i;
 const STEERING_SUPPORTED_AGENT_ID = "goose";
 const EMPTY_PROMPT_STATE: { key: string; prompt: string | undefined } = {
@@ -2562,6 +2563,11 @@ export function useChatSessionController({
   const draftAttachments = sessionId
     ? sessionDraftAttachments
     : pendingDraftAttachments;
+  const stagedItems = useChatStore((s) =>
+    sessionId
+      ? (s.stagedItemsBySession[sessionId] ?? EMPTY_STAGED_ITEMS)
+      : EMPTY_STAGED_ITEMS,
+  );
   const draftValue = sessionId ? sessionDraftValue : pendingDraftValue;
   const storedSelectedSkills = sessionId
     ? sessionSkillDrafts
@@ -2634,6 +2640,12 @@ export function useChatSessionController({
     },
     [stateSessionId],
   );
+  const handleRemoveStagedItem = useCallback(
+    (itemId: string) => {
+      useChatStore.getState().removeStagedItem(stateSessionId, itemId);
+    },
+    [stateSessionId],
+  );
 
   useEffect(() => {
     const previousSelection = agentBuilderSkillSelectionRef.current;
@@ -3087,6 +3099,8 @@ export function useChatSessionController({
     handleDraftChange,
     draftAttachments,
     handleDraftAttachmentsChange,
+    stagedItems,
+    handleRemoveStagedItem,
     selectedSkills,
     handleSkillsChange,
     skillProjectDirs,

src/features/chat/lib/sendCore.ts

@@ -30,6 +30,7 @@ import {
   ownsSessionPrompt,
   releaseSessionPrompt,
 } from "@/features/chat/lib/sessionPromptOwnership";
+import { prepareStagedQuoteDispatch } from "@/features/chat/lib/stagedQuoteSend";
 import { perfLog } from "@/shared/lib/perfLog";
 import { completeAssistantMessage } from "@/features/chat/lib/messageCompletion";
 import {
@@ -306,6 +307,17 @@ export async function dispatchPrompt(
     );
     const acpPrompt =
       promptWithPaths || (images?.length ? " " : promptWithPaths);
+    // Quote serialization happens here, at the authoritative send attempt:
+    // any compaction for this attempt already ran, so the current transcript
+    // decides per quote source whether an anchor suffices or the excerpt
+    // must be re-sent in full (see stagedQuoteSend.ts).
+    const dispatchAssistantPrompt = prepareStagedQuoteDispatch({
+      sessionId,
+      assistantPrompt,
+      acpPrompt,
+      stagedItems: userMessageMetadata?.stagedItems,
+      liveMessages: useChatStore.getState().messagesBySession[sessionId] ?? [],
+    });
     const tAcp = performance.now();
     if (!background) {
       perfLog(
@@ -314,7 +326,9 @@ export async function dispatchPrompt(
     }
     const promptPromise = acpSendMessage(sessionId, acpPrompt, {
       systemPrompt,
-      ...(assistantPrompt ? { assistantPrompt } : {}),
+      ...(dispatchAssistantPrompt
+        ? { assistantPrompt: dispatchAssistantPrompt }
+        : {}),
       personaId: persona?.id,
       personaName: persona?.name,
       goose: acpGooseMetadata,

src/features/chat/lib/sessionActivation.ts

@@ -3,6 +3,7 @@ import {
   getAndDeleteReplayBuffer,
 } from "@/features/chat/hooks/replayBuffer";
 import { sanitizeReplayMessages } from "@/features/chat/lib/replaySanitizer";
+import { withRestoredStagedItems } from "@/features/chat/lib/submittedQuoteProvenance";
 import { completeReplayAssistantMessage } from "@/features/chat/acp/acpReplayAssistant";
 import { useChatStore } from "@/features/chat/stores/chatStore";
 import {
@@ -401,7 +402,9 @@ async function performSessionMessagesLoad(
     }
     const tFlush = performance.now();
     const buffer = getAndDeleteReplayBuffer(sessionId);
-    const replayMessages = buffer ? sanitizeReplayMessages(buffer) : undefined;
+    const replayMessages = buffer
+      ? withRestoredStagedItems(sessionId, sanitizeReplayMessages(buffer))
+      : undefined;
     const replayStats = getReplayPerf(sessionId);
     clearReplayPerf(sessionId);
     if (replayMessages) {

src/features/chat/lib/stagedItemPresentation.test.ts

@@ -0,0 +1,67 @@
+import { describe, expect, it } from "vitest";
+import type { StagedQuoteItem } from "@/shared/types/messages";
+import {
+  stagedQuoteLabel,
+  stagedQuoteSourceKind,
+  stagedQuoteWordCount,
+} from "./stagedItemPresentation";
+
+function quote(overrides: Partial<StagedQuoteItem> = {}): StagedQuoteItem {
+  return {
+    id: "quote-1",
+    kind: "quote",
+    excerpt: "Saturn",
+    sources: [
+      {
+        messageId: "message-1",
+        role: "assistant",
+        contentBlockIndex: 0,
+        start: 0,
+        end: 6,
+      },
+    ],
+    ...overrides,
+  };
+}
+
+describe("staged quote presentation", () => {
+  it("keeps short selections verbatim", () => {
+    expect(stagedQuoteLabel(quote())).toBe("Saturn");
+  });
+
+  it("creates a stable verbatim anchor for long selections", () => {
+    const label = stagedQuoteLabel(
+      quote({ excerpt: "A deliberately long selection ".repeat(5) }),
+    );
+    expect(label.endsWith("…")).toBe(true);
+    expect(label.length).toBeLessThanOrEqual(73);
+  });
+
+  it("describes source and extent without replacing the excerpt", () => {
+    expect(stagedQuoteSourceKind(quote())).toBe("agentResponse");
+    expect(stagedQuoteWordCount(quote())).toBe(1);
+    expect(
+      stagedQuoteSourceKind(
+        quote({
+          sources: [
+            quote().sources[0],
+            { ...quote().sources[0], messageId: "message-2" },
+          ],
+        }),
+      ),
+    ).toBe("multipleMessages");
+  });
+
+  it("treats multiple blocks of one message as a single-message quote", () => {
+    expect(
+      stagedQuoteSourceKind(
+        quote({
+          sources: [
+            quote().sources[0],
+            { ...quote().sources[0], contentBlockIndex: 1 },
+          ],
+        }),
+      ),
+    ).toBe("agentResponse");
+  });
+});

src/features/chat/lib/stagedItemPresentation.ts

@@ -0,0 +1,47 @@
+import type { StagedQuoteItem } from "@/shared/types/messages";
+
+const SHORT_QUOTE_CHARACTER_LIMIT = 72;
+
+function compactWhitespace(value: string): string {
+  return value.replace(/\s+/g, " ").trim();
+}
+
+function wordCount(value: string): number {
+  return compactWhitespace(value).split(" ").filter(Boolean).length;
+}
+
+export function stagedQuoteLabel(quote: StagedQuoteItem): string {
+  const excerpt = compactWhitespace(quote.excerpt);
+  if (excerpt.length <= SHORT_QUOTE_CHARACTER_LIMIT) return excerpt;
+  return `${excerpt.slice(0, SHORT_QUOTE_CHARACTER_LIMIT).trimEnd()}…`;
+}
+
+export type StagedQuoteSourceKind =
+  | "agentResponse"
+  | "yourMessage"
+  | "systemMessage"
+  | "multipleMessages";
+
+/** Distinct messages the quote draws from; multiple blocks of one message
+ * still count as one message. */
+export function stagedQuoteMessageCount(quote: StagedQuoteItem): number {
+  return new Set(quote.sources.map((source) => source.messageId)).size;
+}
+
+export function stagedQuoteSourceKind(
+  quote: StagedQuoteItem,
+): StagedQuoteSourceKind {
+  if (stagedQuoteMessageCount(quote) > 1) return "multipleMessages";
+  switch (quote.sources[0]?.role) {
+    case "user":
+      return "yourMessage";
+    case "system":
+      return "systemMessage";
+    default:
+      return "agentResponse";
+  }
+}
+
+export function stagedQuoteWordCount(quote: StagedQuoteItem): number {
+  return wordCount(quote.excerpt);
+}