@guuey/chat 0.10.0 → 0.12.0

package/src/corpus/__snapshots__/corpus.test.ts.snap

@@ -833,6 +833,7 @@ exports[`corpus > 1. forty-tools — grouping caps the rows; plan stays O(groups
   ],
   "recovery": null,
   "status": null,
+  "views": [],
 }
 `;
 
@@ -969,6 +970,7 @@ exports[`corpus > 2. midstream-tool-failure — failed inline; badge without unr
   ],
   "recovery": null,
   "status": null,
+  "views": [],
 }
 `;
 
@@ -992,6 +994,7 @@ exports[`corpus > 3. cold-start — R12 escalation at 0 / 2.5 s / 15 s 1`] = `
     "kind": "status",
     "state": "starting",
   },
+  "views": [],
 }
 `;
 
@@ -1065,6 +1068,7 @@ exports[`corpus > 4. consent-gate — pending grant-mode card → answered one-l
   ],
   "recovery": null,
   "status": null,
+  "views": [],
 }
 `;
 
@@ -1091,6 +1095,7 @@ exports[`corpus > 5. bypass-text-only — plan identical to a silver text-only s
   ],
   "recovery": null,
   "status": null,
+  "views": [],
 }
 `;
 
@@ -1168,6 +1173,36 @@ exports[`corpus > 7. view-never-handshakes — channel-aware labels on both chan
   ],
   "recovery": null,
   "status": null,
+  "views": [
+    {
+      "actionScope": null,
+      "channel": "inline",
+      "key": "view.tInline",
+      "mount": {
+        "channel": "inline",
+        "resource": {
+          "mimeType": "text/html",
+          "text": "<p>form</p>",
+          "uri": "ui://forms/1",
+        },
+      },
+      "origin": "live",
+      "phase": "no-handshake",
+      "title": "render form",
+    },
+    {
+      "actionScope": "ui://ggui/render/render_00000000-0000-4000-8000-300000000001/c0ffee",
+      "channel": "locator",
+      "key": "view.tGgui",
+      "mount": {
+        "channel": "locator",
+        "resourceUri": "ui://ggui/render/render_00000000-0000-4000-8000-300000000001/c0ffee",
+      },
+      "origin": "live",
+      "phase": "no-handshake",
+      "title": "ggui render",
+    },
+  ],
 }
 `;
 
@@ -1212,6 +1247,7 @@ exports[`corpus > 8. aborted-mid-stream — partial kept + Stopped.; no orphaned
     "kind": "status",
     "state": "aborted",
   },
+  "views": [],
 }
 `;
 
@@ -1267,6 +1303,29 @@ exports[`corpus > 9. history-dead-locators — the expired path beside a healthy
   ],
   "recovery": null,
   "status": null,
+  "views": [
+    {
+      "actionScope": "ui://ggui/render/old/1",
+      "channel": "locator",
+      "key": "card.1",
+      "mount": {
+        "channel": "locator",
+        "resourceUri": "ui://ggui/render/old/1",
+      },
+      "origin": "history",
+      "phase": "negotiating",
+      "title": "Card",
+    },
+    {
+      "actionScope": null,
+      "channel": null,
+      "key": "card.2",
+      "mount": null,
+      "origin": "history",
+      "phase": "expired",
+      "title": "Card",
+    },
+  ],
 }
 `;
 
@@ -1284,6 +1343,7 @@ exports[`corpus > 10. empty-turn — status resolves, no empty bubble 1`] = `
   ],
   "recovery": null,
   "status": null,
+  "views": [],
 }
 `;
 
@@ -1328,6 +1388,7 @@ exports[`corpus > 11. unknown-block-storm — labeled rows; nothing blank, nothi
   ],
   "recovery": null,
   "status": null,
+  "views": [],
 }
 `;
 
@@ -1392,6 +1453,7 @@ exports[`corpus > 12. interleaved-media-code-citations — ordering and aggregat
   ],
   "recovery": null,
   "status": null,
+  "views": [],
 }
 `;
 
@@ -1418,6 +1480,7 @@ exports[`corpus > 13. saturated-then-served — only R12 waiting, then a normal
   ],
   "recovery": null,
   "status": null,
+  "views": [],
 }
 `;
 
@@ -1452,6 +1515,7 @@ exports[`corpus > 14. reasoning-heavy — calm collapses to one line; debug expa
   ],
   "recovery": null,
   "status": null,
+  "views": [],
 }
 `;
 
@@ -1601,6 +1665,24 @@ exports[`corpus > 15. tools-around-a-view — the group SPLITS at the view's pos
   ],
   "recovery": null,
   "status": null,
+  "views": [
+    {
+      "actionScope": null,
+      "channel": "inline",
+      "key": "view.t3",
+      "mount": {
+        "channel": "inline",
+        "resource": {
+          "mimeType": "text/html",
+          "text": "<div>picker</div>",
+          "uri": "ui://cards/slot-picker",
+        },
+      },
+      "origin": "live",
+      "phase": "negotiating",
+      "title": "ggui render",
+    },
+  ],
 }
 `;
 
@@ -1618,6 +1700,7 @@ exports[`corpus > 16. user-send-failure — R0 failed with retry; the message ne
   ],
   "recovery": null,
   "status": null,
+  "views": [],
 }
 `;
 
@@ -1739,6 +1822,32 @@ exports[`corpus > 19. persisted-plus-live — the fold owns its trailing turns;
     "kind": "status",
     "state": "using-tool",
   },
+  "views": [
+    {
+      "actionScope": "ui://ggui/render/render_00000000-0000-4000-8000-300000000001/c0ffee",
+      "channel": "locator",
+      "key": "view.tA",
+      "mount": {
+        "channel": "locator",
+        "resourceUri": "ui://ggui/render/render_00000000-0000-4000-8000-300000000001/c0ffee",
+      },
+      "origin": "live",
+      "phase": "negotiating",
+      "title": "ggui render",
+    },
+    {
+      "actionScope": "ui://ggui/render/old/1",
+      "channel": "locator",
+      "key": "card.1",
+      "mount": {
+        "channel": "locator",
+        "resourceUri": "ui://ggui/render/old/1",
+      },
+      "origin": "history",
+      "phase": "negotiating",
+      "title": "Card",
+    },
+  ],
 }
 `;
 
@@ -1807,6 +1916,7 @@ exports[`corpus > 20. hitl-grant-modes — the persisted declaration renders; an
   ],
   "recovery": null,
   "status": null,
+  "views": [],
 }
 `;
 
@@ -1849,6 +1959,7 @@ exports[`corpus > 21. notice-rows — both arrival paths render labeled, never a
   ],
   "recovery": null,
   "status": null,
+  "views": [],
 }
 `;
 
@@ -1912,11 +2023,47 @@ exports[`corpus > 22. promoted-view — the stage's mount chips (guuey#204); oth
       "key": "view.t2",
       "kind": "viewRef",
       "label": "ggui render — on canvas",
+      "phase": "negotiating",
+      "selected": true,
       "title": "ggui render",
     },
   ],
   "recovery": null,
   "status": null,
+  "views": [
+    {
+      "actionScope": null,
+      "channel": "inline",
+      "key": "view.t1",
+      "mount": {
+        "channel": "inline",
+        "resource": {
+          "mimeType": "text/html",
+          "text": "<div>t1</div>",
+          "uri": "ui://cards/t1",
+        },
+      },
+      "origin": "live",
+      "phase": "negotiating",
+      "title": "ggui render",
+    },
+    {
+      "actionScope": null,
+      "channel": "inline",
+      "key": "view.t2",
+      "mount": {
+        "channel": "inline",
+        "resource": {
+          "mimeType": "text/html",
+          "text": "<div>t2</div>",
+          "uri": "ui://cards/t2",
+        },
+      },
+      "origin": "live",
+      "phase": "negotiating",
+      "title": "ggui render",
+    },
+  ],
 }
 `;
 
@@ -1962,6 +2109,20 @@ exports[`corpus > 23. meta-less-locator — a \`_meta\`-withholding producer's r
   ],
   "recovery": null,
   "status": null,
+  "views": [
+    {
+      "actionScope": "ui://ggui/render/render_dark/h1",
+      "channel": "locator",
+      "key": "view.t1",
+      "mount": {
+        "channel": "locator",
+        "resourceUri": "ui://ggui/render/render_dark/h1",
+      },
+      "origin": "live",
+      "phase": "negotiating",
+      "title": "ggui render",
+    },
+  ],
 }
 `;
 
@@ -2016,6 +2177,113 @@ exports[`corpus > 24. prod-wire-ggui-render — ggui's production posture: no _m
   ],
   "recovery": null,
   "status": null,
+  "views": [
+    {
+      "actionScope": "ui://ggui/render/render_5d11b1b4-75ba-44e5-81bb-0b420b86bb8e/7328555b44e72bd7",
+      "channel": "locator",
+      "key": "view.t1",
+      "mount": {
+        "channel": "locator",
+        "resourceUri": "ui://ggui/render/render_5d11b1b4-75ba-44e5-81bb-0b420b86bb8e/7328555b44e72bd7",
+      },
+      "origin": "live",
+      "phase": "negotiating",
+      "title": "ggui render",
+    },
+  ],
+}
+`;
+
+exports[`corpus > 25. chips-presentation — EVERY view chips; the promoted key marks the selection; views roster carries the mounts (guuey#301) 1`] = `
+{
+  "items": [
+    {
+      "expanded": true,
+      "key": "u0",
+      "kind": "user",
+      "retry": false,
+      "state": "sent",
+      "text": "show me two cards",
+    },
+    {
+      "argsPreview": null,
+      "attribution": true,
+      "expanded": false,
+      "key": "tool.t1",
+      "kind": "tool",
+      "name": "ggui_render",
+      "result": null,
+      "state": "done",
+      "title": "ggui render",
+      "toolCallId": "t1",
+    },
+    {
+      "expanded": false,
+      "key": "view.t1",
+      "kind": "viewRef",
+      "label": "ggui render",
+      "phase": "negotiating",
+      "selected": false,
+      "title": "ggui render",
+    },
+    {
+      "argsPreview": null,
+      "attribution": true,
+      "expanded": false,
+      "key": "tool.t2",
+      "kind": "tool",
+      "name": "ggui_render",
+      "result": null,
+      "state": "done",
+      "title": "ggui render",
+      "toolCallId": "t2",
+    },
+    {
+      "expanded": false,
+      "key": "view.t2",
+      "kind": "viewRef",
+      "label": "ggui render — on canvas",
+      "phase": "negotiating",
+      "selected": true,
+      "title": "ggui render",
+    },
+  ],
+  "recovery": null,
+  "status": null,
+  "views": [
+    {
+      "actionScope": null,
+      "channel": "inline",
+      "key": "view.t1",
+      "mount": {
+        "channel": "inline",
+        "resource": {
+          "mimeType": "text/html",
+          "text": "<div>t1</div>",
+          "uri": "ui://cards/t1",
+        },
+      },
+      "origin": "live",
+      "phase": "negotiating",
+      "title": "ggui render",
+    },
+    {
+      "actionScope": null,
+      "channel": "inline",
+      "key": "view.t2",
+      "mount": {
+        "channel": "inline",
+        "resource": {
+          "mimeType": "text/html",
+          "text": "<div>t2</div>",
+          "uri": "ui://cards/t2",
+        },
+      },
+      "origin": "live",
+      "phase": "negotiating",
+      "title": "ggui render",
+    },
+  ],
 }
 `;
 
@@ -2098,5 +2366,6 @@ exports[`corpus > 25. oauth-auth-ask — kind:auth + authConfig oauth2 plans as
   ],
   "recovery": null,
   "status": null,
+  "views": [],
 }
 `;

package/src/index.ts

@@ -77,6 +77,7 @@ export type {
   TranscriptMessage,
   TranscriptOverrides,
   TranscriptPlan,
+  PlanViewSummary,
   UnknownItem,
   UserMessageItem,
   ViewMountItem,

package/src/plan.ts

@@ -48,6 +48,7 @@ import type {
   DisplayItem,
   ItemKey,
   NoticeItem,
+  PlanViewSummary,
   StatusLineItem,
   ToolGroupItem,
   ToolItem,
@@ -148,17 +149,43 @@ function foldAssistantSources(
   const hasTurnIdentity = result.messages.some(
     (m) => m.role === "assistant" && m.turnId !== undefined,
   );
+  // ONE source per conversational TURN, not per assistant message segment
+  // (guuey#306 — the mis-slotting bug): a pod fold emits SEVERAL assistant
+  // messages per turn (thought/text/tool interleave — a generative-card
+  // turn is ~6-8 segments), and the conversation loop pairs users to
+  // sources BY SLOT — per-segment sources stretched the index space, so
+  // from turn 2 on every user bubble rendered clustered inside turn 1's
+  // segment run. Grouping: a `user` row closes the current group (the
+  // fold's messages are the whole conversation, users included), and a
+  // turnId CHANGE between assistant segments splits too (identity beats
+  // adjacency — two turns without an intervening user row still separate).
   const sources: AssistantSource[] = [];
   const notices: FoldNotice[] = [];
+  let current: AssistantSource | null = null;
+  let currentTurnId: string | undefined;
   for (const m of result.messages) {
-    if (m.role === "assistant") {
-      sources.push({
-        blocks: [...m.content],
-        live: inFlight && hasTurnIdentity && m.turnId !== undefined && openTurns.has(m.turnId),
-        stopped: false,
-      });
+    if (m.role === "user") {
+      current = null;
+      currentTurnId = undefined;
+    } else if (m.role === "assistant") {
+      const startsNewTurn =
+        current === null ||
+        (m.turnId !== undefined && currentTurnId !== undefined && m.turnId !== currentTurnId);
+      if (startsNewTurn) {
+        current = { blocks: [], live: false, stopped: false };
+        sources.push(current);
+        currentTurnId = undefined;
+      }
+      if (m.turnId !== undefined) currentTurnId = m.turnId;
+      current!.blocks.push(...m.content);
+      if (inFlight && hasTurnIdentity && m.turnId !== undefined && openTurns.has(m.turnId)) {
+        current!.live = true;
+      }
     } else if (m.role === "tool" && sources.length > 0) {
-      sources[sources.length - 1]!.blocks.push(...m.content);
+      // Tool results belong to the turn in progress — or, when they trail a
+      // user boundary before the next assistant segment, to the PRECEDING
+      // turn (the pre-#306 last-source semantics, kept).
+      (current ?? sources[sources.length - 1]!).blocks.push(...m.content);
     } else if (m.role === "notice") {
       // R16 (spec draft.2): a session annotation — a PEER row, never folded
       // into assistant content; it anchors after the source it followed.
@@ -177,10 +204,33 @@ function foldAssistantSources(
   return { sources, notices };
 }
 
+/**
+ * Flat assistant rows grouped by conversational ORDER (guuey#306): a user
+ * row closes the current slot, consecutive assistant rows merge into one —
+ * the assembler's interleave IS the turn structure, and the old
+ * filter/zip threw it away (double/empty assistant rows drifted every
+ * later user bubble by one). Shared by the flat path and the fold-vs-flat
+ * seam, so both count the same slots.
+ */
+function flatSettledGroups(messages: TranscriptInputs["messages"]): AssistantSource[] {
+  const groups: AssistantSource[] = [];
+  let current: AssistantSource | null = null;
+  for (const m of messages) {
+    if (m.role === "user") {
+      current = null;
+    } else if (m.role === "assistant") {
+      if (current === null) {
+        current = { blocks: [], live: false, stopped: false };
+        groups.push(current);
+      }
+      current.blocks.push({ type: "text", text: m.text });
+    }
+  }
+  return groups;
+}
+
 function flatAssistantSources(inputs: TranscriptInputs, inFlight: boolean): AssistantSource[] {
-  const settled: AssistantSource[] = inputs.messages
-    .filter((m) => m.role === "assistant")
-    .map((m) => ({ blocks: [{ type: "text", text: m.text }], live: false, stopped: false }));
+  const settled: AssistantSource[] = flatSettledGroups(inputs.messages);
   // The in-flight (or abort-kept) partial is its own trailing slot — settled
   // turns live in `messages`; `assistantText` is ignored once `ready` again
   // UNLESS the turn ended by abort (R1 aborted-partial keeps it).
@@ -726,29 +776,23 @@ export function planTranscript(
   // keep rendering as flat text slots in front. When the fold spans the
   // whole conversation (a pure-live session — the corpus's world), the kept
   // prefix is empty and the plan is byte-identical to the old wholesale
-  // replace. Alignment is by COUNT (trailing flat entries ↔ settled fold
-  // sources): flat rows carry no turn identity, so a persisted CARD-ONLY
-  // turn inside the fold's span (an empty-text assistant row the assembler
-  // dropped) can offset the seam by one — a documented approximation, same
-  // class as the header's read-plane-seq note, resolved for the visible
-  // cards by the actionScope dedupe below.
+  // replace. Alignment counts TURNS on
+  // both sides (guuey#306): fold sources group per turn (user boundary +
+  // turnId change), flat entries group by conversational order — the old
+  // per-message COUNT approximation (and its one-off seam drift on
+  // card-only turns) is gone.
   let assistants: AssistantSource[];
   if (inputs.result) {
     const fold = foldAssistantSources(inputs.result, inFlight, inputs.aborted === true);
     const foldSources = fold.sources;
     const settledFoldCount = foldSources.filter((s) => !s.live).length;
-    const flatSettled = inputs.messages.filter((m) => m.role === "assistant");
-    const keep = Math.max(0, flatSettled.length - settledFoldCount);
-    assistants = [
-      ...flatSettled.slice(0, keep).map(
-        (m): AssistantSource => ({
-          blocks: [{ type: "text", text: m.text }],
-          live: false,
-          stopped: false,
-        }),
-      ),
-      ...foldSources,
-    ];
+    // Both sides of the seam now count TURNS (guuey#306): fold sources are
+    // per-turn groups, and the flat prefix uses the SAME order-derived
+    // grouping — the old per-message counts were the documented
+    // approximation this replaces.
+    const flatGroups = flatSettledGroups(inputs.messages);
+    const keep = Math.max(0, flatGroups.length - settledFoldCount);
+    assistants = [...flatGroups.slice(0, keep), ...foldSources];
     if (policy.notice.show) {
       // Fold-borne notices anchor to the fold source they followed, which
       // sits at global slot `keep + afterSourceIndex` after the seam.
@@ -919,26 +963,77 @@ export function planTranscript(
     });
   }
 
-  // guuey#204 "promote and reference": the ONE mount a host-owned stage
-  // shows (`inputs.promotedViewKey`) renders as a compact reference chip
-  // instead of a second live app instance. A key matching nothing (stale
-  // host state) or an expired mount promotes nothing — the honest no-op;
-  // the next render's key corrects it. The chip keeps the mount's key, so
-  // overrides and phase reports survive a swap back to the full mount.
+  // The host-canvas contract (guuey#301): every view the plan saw, with
+  // its mount material — collected BEFORE any chips/promotion pass, so a
+  // stage can render the selected mount even when the transcript shows
+  // only chips.
+  const views: PlanViewSummary[] = [];
+  for (const item of items) {
+    if (item.kind !== "view") continue;
+    views.push({
+      key: item.key,
+      title: item.toolTitle ?? policy.strings.viewRefFallbackTitle,
+      phase: item.phase,
+      channel: item.channel,
+      mount: item.mount,
+      actionScope: item.actionScope,
+      // The kit's own key scheme is authoritative here: `card.{seq}` is
+      // exactly the history-card emission (this file builds both).
+      origin: item.key.startsWith("card.") ? "history" : "live",
+    });
+  }
+
+  // Two composable behaviors over the assembled items:
+  //
+  // guuey#204 "promote and reference" (inline presentation): the ONE mount
+  // a host-owned stage shows (`inputs.promotedViewKey`) renders as a
+  // compact reference chip instead of a second live app instance. A key
+  // matching nothing (stale host state) or an expired mount promotes
+  // nothing — the honest no-op; the next render's key corrects it.
+  //
+  // guuey#301 chips presentation (`policy.view.presentation === "chips"`):
+  // EVERY view plans as a chip — the full render belongs to the host's
+  // stage; the promoted key marks the SELECTED chip (browser-history
+  // mechanic), and expired/dead views chip with their honest state.
+  //
+  // Either way a chip keeps the mount's key, so overrides and phase
+  // reports survive a swap back to the full mount.
   const promoted = inputs.promotedViewKey;
+  const chips = policy.view.presentation === "chips";
   const finalItems =
-    promoted === undefined
+    !chips && promoted === undefined
       ? items
       : items.map((item): DisplayItem => {
-          if (item.kind !== "view" || item.key !== promoted) return item;
-          if (item.phase === "expired" || item.mount === null) return item;
+          if (item.kind !== "view") return item;
           const title = item.toolTitle ?? policy.strings.viewRefFallbackTitle;
+          if (chips) {
+            const mountable = item.phase !== "expired" && item.mount !== null;
+            const selected = mountable && item.key === promoted;
+            const ref: ViewRefItem = {
+              kind: "viewRef",
+              key: item.key,
+              expanded: false,
+              title,
+              label: selected
+                ? policy.strings.viewPromoted(title)
+                : mountable
+                  ? policy.strings.viewChip(title)
+                  : policy.strings.viewChipExpired(title),
+              selected,
+              phase: item.phase,
+            };
+            return ref;
+          }
+          if (item.key !== promoted) return item;
+          if (item.phase === "expired" || item.mount === null) return item;
           const ref: ViewRefItem = {
             kind: "viewRef",
             key: item.key,
             expanded: false,
             title,
             label: policy.strings.viewPromoted(title),
+            selected: true,
+            phase: item.phase,
           };
           return ref;
         });
@@ -948,6 +1043,7 @@ export function planTranscript(
     status: deriveStatus(inputs, policy),
     recovery:
       inputs.adopted === true && policy.debugDetail ? policy.strings.recoveredFromHistory : null,
+    views,
   };
 }
 

package/src/policy.ts

@@ -40,8 +40,15 @@ export interface TranscriptPolicy {
     /** Preview bound — the plan never carries a full giant payload (fixture 6). */
     previewChars: number;
   };
-  /** R6 (sandbox overrides pass through to `<GuueyView>` in 3b). */
-  view: { timeoutMs: number };
+  /**
+   * R6 (sandbox overrides pass through to `<GuueyView>` in 3b).
+   * `presentation` (guuey#301): `"inline"` = every mount renders as a live
+   * view in the transcript (the default, unchanged); `"chips"` = EVERY
+   * view plans as a compact {@link ViewRefItem} — the full render belongs
+   * to a host-owned stage fed by `TranscriptPlan.views` + the selection
+   * input `promotedViewKey`.
+   */
+  view: { timeoutMs: number; presentation: "inline" | "chips" };
   /** R7. */
   media: { inlineImageCapRem: number; chipOnly: boolean };
   /** R8. */
@@ -114,7 +121,7 @@ function calmBase(): TranscriptPolicy {
     tool: { expandByDefault: false, argsVisible: false, humanizeTitle: humanizeToolName },
     toolGroup: { threshold: 2 },
     dataResult: { capRem: 16, prettyPrint: true, alwaysShowBytes: false, previewChars: 2048 },
-    view: { timeoutMs: 8000 },
+    view: { timeoutMs: 8000, presentation: "inline" },
     media: { inlineImageCapRem: 20, chipOnly: false },
     code: { capRem: 16, wrap: false },
     citations: { style: "chips" },