feat(web): unify context chip presentation and previews

apps/mobile/src/features/review/reviewCommentSelection.test.ts

@@ -43,6 +43,23 @@ function makeTarget(): ReviewCommentTarget {
 }
 
 describe("review comment serialization", () => {
+  it("keeps closing-tag text inside a chip label within a real review body", () => {
+    const body = "Before [</review_comment>](t3-context://v1/mention/context-1) after";
+    const serialized = `<review_comment sectionId="s" filePath="app.ts" startIndex="0" endIndex="0">${body}</review_comment>`;
+    const segments = parseReviewCommentMessageSegments(`${serialized} tail`);
+    expect(segments).toEqual([
+      { kind: "review-comment", comment: expect.objectContaining({ text: body }) },
+      { kind: "text", id: `review-comment-text:${serialized.length}`, text: " tail" },
+    ]);
+  });
+
+  it("treats legacy markup inside a context label as opaque text", () => {
+    const text =
+      '[<review_comment sectionId="s" filePath="app.ts" startIndex="0" endIndex="0">Review this</review_comment>](t3-context://v1/mention/context-1)';
+    expect(parseReviewCommentMessageSegments(text)).toEqual([
+      { kind: "text", id: "review-comment-text:0", text },
+    ]);
+  });
   it("preserves enough metadata for inline diff rendering", () => {
     const serialized = formatReviewCommentContext(makeTarget(), "Please keep this configurable.");
 

apps/mobile/src/features/review/reviewCommentSelection.ts

@@ -1,4 +1,5 @@
 import { useSyncExternalStore } from "react";
+import { replaceComposerContextReferences } from "@t3tools/shared/composerContextReferences";
 
 import type { ReviewRenderableLineRow } from "./reviewModel";
 
@@ -286,9 +287,12 @@ export function parseReviewCommentMessageSegments(
   const segments: ReviewCommentMessageSegment[] = [];
   let cursor = 0;
   let parsedCommentIndex = 0;
-
-  for (const match of value.matchAll(REVIEW_COMMENT_BLOCK_PATTERN)) {
-    const matchIndex = match.index ?? 0;
+  // Labels are opaque text, even when they contain legacy review markup. Keep offsets intact.
+  const masked = replaceComposerContextReferences(value, (reference) =>
+    " ".repeat(reference.source.length),
+  );
+  for (const match of masked.matchAll(REVIEW_COMMENT_BLOCK_PATTERN)) {
+    const matchIndex = match.index;
     const beforeText = value.slice(cursor, matchIndex);
     if (beforeText.length > 0) {
       segments.push({
@@ -298,15 +302,24 @@ export function parseReviewCommentMessageSegments(
       });
     }
 
-    const comment = parseReviewInlineComment(match[1] ?? "", match[2] ?? "", parsedCommentIndex);
+    // Use the masked delimiters but read the original payload. Re-parsing raw text could
+    // mistake a closing tag inside a chip label for the end of the review.
+    const raw = value.slice(matchIndex, matchIndex + match[0].length);
+    const attributeStart = "<review_comment".length;
+    const attributeEnd = attributeStart + (match[1]?.length ?? 0);
+    const comment = parseReviewInlineComment(
+      raw.slice(attributeStart, attributeEnd),
+      raw.slice(attributeEnd + 1, -"</review_comment>".length),
+      parsedCommentIndex,
+    );
     if (comment) {
       segments.push({ kind: "review-comment", comment });
       parsedCommentIndex += 1;
     } else {
       segments.push({
         kind: "text",
         id: `review-comment-invalid:${matchIndex}`,
-        text: match[0],
+        text: value.slice(matchIndex, matchIndex + match[0].length),
       });
     }
 

apps/mobile/src/features/threads/ThreadFeed.tsx

@@ -11,6 +11,7 @@ import type {
   TurnId,
 } from "@t3tools/contracts";
 import { renderAssistantCitationsAsText } from "@t3tools/shared/assistantCitations";
+import { replaceComposerContextReferences } from "@t3tools/shared/composerContextReferences";
 import {
   codexArtifactTemplatePresentationLabel,
   type CodexArtifactTemplate,
@@ -1677,13 +1678,22 @@ function UserMessageContent(props: {
   readonly linkHandlers: MarkdownLinkHandlers;
   readonly renderImage: MarkdownImageRenderer;
 }) {
-  const segments = parseReviewCommentMessageSegments(props.text);
+  // Inline context references render as their labels until mobile grows chips for them.
+  const text = replaceComposerContextReferences(props.text, (occurrence) => occurrence.label);
+  const segments = parseReviewCommentMessageSegments(props.text).map((segment) =>
+    segment.kind === "text"
+      ? {
+          ...segment,
+          text: replaceComposerContextReferences(segment.text, (occurrence) => occurrence.label),
+        }
+      : segment,
+  );
   const hasReviewComment = segments.some((segment) => segment.kind === "review-comment");
   if (!hasReviewComment) {
     if (hasNativeSelectableMarkdownText()) {
       return (
         <SelectableMarkdownText
-          markdown={props.text}
+          markdown={text}
           skills={props.skills}
           textStyle={props.markdownStyles.nativeTextStyle}
           preserveSoftBreaks
@@ -1699,7 +1709,7 @@ function UserMessageContent(props: {
         styles={props.markdownStyles.styles}
         theme={props.markdownStyles.theme}
       >
-        {props.text}
+        {text}
       </Markdown>
     );
   }

apps/server/src/environment/ServerEnvironment.ts

@@ -219,6 +219,7 @@ export const make = Effect.gen(function* () {
       questionAttachments: true,
       fileAttachments: { maxUploadBytes: PROVIDER_SEND_TURN_MAX_FILE_BYTES },
       pullRequests: true,
+      inlineMessageContext: true,
       threadSettlement: true,
       threadAutoSettlement: true,
       threadRestartContinuation: true,

apps/server/src/orchestration/Layers/ProjectionPipeline.ts

@@ -1131,6 +1131,7 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
               role: event.payload.role,
               text: event.payload.text,
               ...(attachments !== undefined ? { attachments: [...attachments] } : {}),
+              ...(event.payload.context !== undefined ? { context: event.payload.context } : {}),
               createdAt: event.payload.createdAt,
               updatedAt: event.payload.updatedAt,
             });
@@ -1159,6 +1160,9 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
             role: event.payload.role,
             text: nextText,
             ...(nextAttachments !== undefined ? { attachments: [...nextAttachments] } : {}),
+            ...((event.payload.context ?? previousMessage?.context) !== undefined
+              ? { context: event.payload.context ?? previousMessage?.context }
+              : {}),
             isStreaming: false,
             createdAt: previousMessage?.createdAt ?? event.payload.createdAt,
             updatedAt: event.payload.updatedAt,

apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.test.ts

@@ -1,6 +1,7 @@
 import {
   type AgentSessionImportSource,
   ChatAttachment,
+  ComposerContextId,
   CheckpointRef,
   EventId,
   MessageId,
@@ -10,6 +11,7 @@ import {
   ThreadLinkedPullRequest,
   TurnId,
   ProviderInstanceId,
+  OrchestrationMessageContext,
 } from "@t3tools/contracts";
 import { assert, it } from "@effect/vitest";
 import * as NodeServices from "@effect/platform-node/NodeServices";
@@ -41,6 +43,9 @@ const encodeChatAttachments = Schema.encodeEffect(
 const encodeThreadLinkedPullRequest = Schema.encodeSync(
   Schema.fromJsonString(ThreadLinkedPullRequest),
 );
+const encodeMessageContext = Schema.encodeEffect(
+  Schema.fromJsonString(OrchestrationMessageContext),
+);
 
 const projectionSnapshotLayer = it.layer(
   OrchestrationProjectionSnapshotQueryLive.pipe(
@@ -725,23 +730,39 @@ projectionSnapshotLayer("ProjectionSnapshotQuery", (it) => {
         },
       ];
       const attachmentsJson = yield* encodeChatAttachments(attachments);
+      const messageContext: OrchestrationMessageContext = {
+        version: 1,
+        records: [
+          {
+            version: 1,
+            contextId: ComposerContextId.make("notes-context"),
+            kind: "file",
+            label: "notes.txt",
+            attachmentId: "notes",
+            name: "notes.txt",
+            mimeType: "text/plain",
+            sizeBytes: 8,
+          },
+        ],
+      };
+      const contextJson = yield* encodeMessageContext(messageContext);
       yield* sql`
         WITH RECURSIVE history(n) AS (
           VALUES (1) UNION ALL SELECT n + 1 FROM history WHERE n < 2000
         )
         INSERT INTO projection_thread_messages (
-          message_id, thread_id, turn_id, role, text, attachments_json,
+          message_id, thread_id, turn_id, role, text, attachments_json, context_json,
           is_streaming, created_at, updated_at
         )
         SELECT 'turn-start-history:' || n, ${threadId}, 'old-turn:' || n, 'assistant',
-          'Unrelated assistant output', 'not-json', 0, ${createdAt}, ${createdAt}
+          'Unrelated assistant output', 'not-json', 'not-json', 0, ${createdAt}, ${createdAt}
         FROM history
       `;
       yield* sql`
         INSERT INTO projection_thread_messages (
-          message_id, thread_id, role, text, attachments_json, is_streaming, created_at, updated_at
+          message_id, thread_id, role, text, attachments_json, context_json, is_streaming, created_at, updated_at
         ) VALUES (${messageId}, ${threadId}, 'user', 'Read these notes',
-          ${attachmentsJson}, 0, ${createdAt}, ${createdAt})
+          ${attachmentsJson}, ${contextJson}, 0, ${createdAt}, ${createdAt})
       `;
       yield* sql`
         INSERT INTO projection_thread_messages (
@@ -767,6 +788,7 @@ projectionSnapshotLayer("ProjectionSnapshotQuery", (it) => {
             createdAt,
             updatedAt: createdAt,
             attachments,
+            context: messageContext,
           },
           hasOtherUserMessages: false,
         }),

apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts

@@ -2,6 +2,7 @@ import {
   AgentSessionImportSource,
   ApprovalRequestId,
   ChatAttachment,
+  OrchestrationMessageContext,
   CheckpointRef,
   IsoDateTime,
   MessageId,
@@ -111,6 +112,7 @@ const ProjectionThreadMessageDbRowSchema = ProjectionThreadMessage.mapFields(
   Struct.assign({
     isStreaming: Schema.Number,
     attachments: Schema.NullOr(Schema.fromJsonString(Schema.Array(ChatAttachment))),
+    context: Schema.NullOr(Schema.fromJsonString(OrchestrationMessageContext)),
   }),
 );
 const ProjectionTurnStartMessageDbRowSchema = ProjectionThreadMessageDbRowSchema.mapFields(
@@ -677,6 +679,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
           role,
           text,
           attachments_json AS "attachments",
+          context_json AS "context",
           is_streaming AS "isStreaming",
           created_at AS "createdAt",
           updated_at AS "updatedAt"
@@ -1272,6 +1275,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
         role,
         text,
         attachments_json AS "attachments",
+        context_json AS "context",
         is_streaming AS "isStreaming",
         created_at AS "createdAt",
         updated_at AS "updatedAt",
@@ -1304,6 +1308,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
           role,
           text,
           attachments_json AS "attachments",
+          context_json AS "context",
           is_streaming AS "isStreaming",
           created_at AS "createdAt",
           updated_at AS "updatedAt"
@@ -1682,6 +1687,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
           role,
           text,
           attachments_json AS "attachments",
+          context_json AS "context",
           is_streaming AS "isStreaming",
           created_at AS "createdAt",
           updated_at AS "updatedAt"
@@ -2091,6 +2097,7 @@ pending_approval_requests AS (
                   role: row.role,
                   text: row.text,
                   ...(row.attachments !== null ? { attachments: row.attachments } : {}),
+                  ...(row.context !== null ? { context: row.context } : {}),
                   turnId: row.turnId,
                   streaming: row.isStreaming === 1,
                   createdAt: row.createdAt,
@@ -3194,6 +3201,7 @@ pending_approval_requests AS (
         createdAt: row.createdAt,
         updatedAt: row.updatedAt,
         ...(row.attachments !== null ? { attachments: row.attachments } : {}),
+        ...(row.context !== null ? { context: row.context } : {}),
       },
       hasOtherUserMessages: row.hasOtherUserMessages === 1,
     }));
@@ -3453,7 +3461,10 @@ pending_approval_requests AS (
             updatedAt: row.updatedAt,
           };
           if (row.attachments !== null) {
-            return Object.assign(message, { attachments: row.attachments });
+            Object.assign(message, { attachments: row.attachments });
+          }
+          if (row.context !== null) {
+            Object.assign(message, { context: row.context });
           }
           return message;
         }),

apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts

@@ -15,6 +15,7 @@ import { createModelSelection } from "@t3tools/shared/model";
 import {
   ApprovalRequestId,
   CommandId,
+  ComposerContextId,
   DEFAULT_PROVIDER_INTERACTION_MODE,
   EnvironmentId,
   EventId,
@@ -882,6 +883,51 @@ describe("ProviderCommandReactor", () => {
     expect(thread?.session?.runtimeMode).toBe("approval-required");
   });
 
+  effectIt.effect("projects inline context before sending the provider turn", () =>
+    Effect.gen(function* () {
+      const harness = yield* Effect.promise(() => createHarness());
+
+      yield* harness.engine.dispatch({
+        type: "thread.turn.start",
+        commandId: CommandId.make("cmd-turn-start-with-context"),
+        threadId: ThreadId.make("thread-1"),
+        message: {
+          messageId: asMessageId("user-message-with-context"),
+          role: "user",
+          text: "Inspect [build](t3-context://v1/terminal/terminal-1)",
+          attachments: [],
+          context: {
+            version: 1,
+            records: [
+              {
+                version: 1,
+                kind: "terminal",
+                contextId: ComposerContextId.make("terminal-1"),
+                label: "build",
+                terminalId: "terminal-1",
+                terminalLabel: "Build",
+                lineStart: 7,
+                lineEnd: 7,
+                text: "compiled successfully",
+              },
+            ],
+          },
+        },
+        interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
+        runtimeMode: "approval-required",
+        createdAt: "2026-01-01T00:00:00.000Z",
+      });
+
+      yield* Effect.promise(() => waitFor(() => harness.sendTurn.mock.calls.length === 1));
+      expect(harness.sendTurn.mock.calls[0]?.[0]).toMatchObject({
+        input: expect.stringContaining("[Terminal: build; ref=terminal-1]"),
+      });
+      expect(harness.sendTurn.mock.calls[0]?.[0]).toMatchObject({
+        input: expect.stringContaining('<context kind="terminal" id="terminal-1">'),
+      });
+    }),
+  );
+
   effectIt.effect("retains a turn dispatched immediately after start until activation", () =>
     Effect.gen(function* () {
       const activation = yield* Deferred.make<void>();

apps/server/src/orchestration/Layers/ProviderCommandReactor.ts

@@ -13,6 +13,7 @@ import {
   type TurnId,
 } from "@t3tools/contracts";
 import { assistantCitationsToPlainText } from "@t3tools/shared/assistantCitations";
+import { projectComposerContextForProvider } from "@t3tools/shared/composerContextReferences";
 import { isTemporaryWorktreeBranch, WORKTREE_BRANCH_PREFIX } from "@t3tools/shared/git";
 import * as Cache from "effect/Cache";
 import * as Cause from "effect/Cause";
@@ -1545,7 +1546,10 @@ const make = Effect.gen(function* () {
     }
     const sendTurnRequest = yield* buildSendTurnRequestForThread({
       threadId: event.payload.threadId,
-      messageText: message.text,
+      messageText: projectComposerContextForProvider({
+        text: message.text,
+        records: message.context?.records ?? [],
+      }),
       ...(message.attachments !== undefined ? { attachments: message.attachments } : {}),
       ...(event.payload.modelSelection !== undefined
         ? { modelSelection: event.payload.modelSelection }