@nextclaw/ui 0.15.21 → 0.15.23

package/src/features/chat/features/conversation/utils/session-conversation-input-toolbar.utils.ts

@@ -28,9 +28,13 @@ type ToolbarSelectBuildParams = {
   readonly hasModelOptions: boolean;
   readonly isModelOptionsLoading: boolean;
   readonly modelRecords: ChatModelRecord[];
+  readonly discoveredModelRecords: ChatModelRecord[];
   readonly modelSearchEmptyLabel: string;
   readonly modelSearchPlaceholder: string;
   readonly onFavoriteModelToggle: (value: string, favorite: boolean) => void;
+  readonly onDiscoveredModelSelect: (value: string) => Promise<void> | void;
+  readonly onDiscoveredModelsDismiss: () => void;
+  readonly onModelSelectOpen: () => void;
   readonly onModelChange: (value: string) => void;
   readonly onThinkingChange: (value: ChatThinkingLevel | null) => void;
   readonly recentModelValues: string[];
@@ -51,9 +55,13 @@ export function buildSessionConversationToolbarSelects(params: ToolbarSelectBuil
     hasModelOptions,
     isModelOptionsLoading,
     modelRecords,
+    discoveredModelRecords,
     modelSearchEmptyLabel,
     modelSearchPlaceholder,
     onFavoriteModelToggle,
+    onDiscoveredModelSelect,
+    onDiscoveredModelsDismiss,
+    onModelSelectOpen,
     onModelChange,
     onThinkingChange,
     recentModelValues,
@@ -67,12 +75,16 @@ export function buildSessionConversationToolbarSelects(params: ToolbarSelectBuil
   return [
     buildModelToolbarSelect({
       modelOptions: modelRecords,
+      discoveredModelOptions: discoveredModelRecords,
       favoriteModelValues,
       recentModelValues,
       selectedModel,
       isModelOptionsLoading,
       hasModelOptions,
       onFavoriteToggle: onFavoriteModelToggle,
+      onDiscoveredModelSelect,
+      onDiscoveredModelsDismiss,
+      onOpen: onModelSelectOpen,
       onValueChange: onModelChange,
       texts: {
         modelSelectPlaceholder: t('chatSelectModel'),
@@ -82,6 +94,12 @@ export function buildSessionConversationToolbarSelects(params: ToolbarSelectBuil
         favoriteModelsLabel,
         favoriteModelLabel,
         unfavoriteModelLabel,
+        manageModelsLabel: t('chatManageModels'),
+        discoveredModelsSummaryLabel: t('chatDiscoveredModelsSummary'),
+        discoveredModelsViewLabel: t('chatDiscoveredModelsView'),
+        discoveredModelsGroupLabel: t('chatDiscoveredModelsGroup'),
+        discoveredModelAddLabel: t('chatDiscoveredModelAdd'),
+        discoveredModelsDismissLabel: t('chatDiscoveredModelsDismiss'),
         recentModelsLabel,
         allModelsLabel,
       },

package/src/features/chat/features/conversation/utils/session-message-composer.utils.ts

@@ -0,0 +1,117 @@
+import {
+  createChatComposerTextNode,
+  createChatComposerTokenNode,
+  normalizeChatComposerNodes,
+  type ChatComposerNode,
+} from '@nextclaw/agent-chat-ui';
+import type { NcpMessage } from '@nextclaw/ncp';
+import type { NcpDraftAttachment } from '@nextclaw/ncp-react';
+
+import { deriveChatComposerDraft } from '@/features/chat/features/input/utils/chat-composer-state.utils';
+import {
+  readInlineTokensFromMetadata,
+  resolveInlineTokensForText,
+  type ChatInlineTokenSource,
+} from '@/features/chat/features/input/utils/chat-inline-token.utils';
+import { normalizeRequestedSkills } from '@/features/chat/features/runtime/utils/chat-runtime.utils';
+import type { SessionConversationComposerState } from '@/features/chat/features/conversation/hooks/use-session-conversation-input-state';
+
+export type SessionMessageComposerSnapshot = SessionConversationComposerState & {
+  readonly attachments: readonly NcpDraftAttachment[];
+};
+
+function buildTextNodes(
+  text: string,
+  inlineTokens: readonly ChatInlineTokenSource[],
+): ChatComposerNode[] {
+  const nodes: ChatComposerNode[] = [];
+  let offset = 0;
+  while (offset < text.length) {
+    const nextToken = inlineTokens
+      .flatMap((token) => {
+        const index = text.indexOf(token.rawText, offset);
+        return index < 0 ? [] : [{ index, token }];
+      })
+      .sort((left, right) => left.index - right.index || right.token.rawText.length - left.token.rawText.length)[0];
+    if (!nextToken) {
+      nodes.push(createChatComposerTextNode(text.slice(offset)));
+      return nodes;
+    }
+    if (nextToken.index > offset) {
+      nodes.push(createChatComposerTextNode(text.slice(offset, nextToken.index)));
+    }
+    nodes.push(createChatComposerTokenNode({
+      tokenKind: nextToken.token.kind,
+      tokenKey: 'ref' in nextToken.token ? nextToken.token.ref : nextToken.token.key,
+      label: nextToken.token.label,
+    }));
+    offset = nextToken.index + nextToken.token.rawText.length;
+  }
+  return nodes;
+}
+
+function readRequestedSkills(metadata: Record<string, unknown>): string[] {
+  const raw = metadata.requested_skill_refs;
+  return normalizeRequestedSkills(
+    Array.isArray(raw)
+      ? raw.filter((value): value is string => typeof value === 'string')
+      : undefined,
+  );
+}
+
+export function buildSessionMessageComposerSnapshot(params: {
+  readonly attachmentIdPrefix: string;
+  readonly availableSkills: readonly { ref: string; name: string }[];
+  readonly message: NcpMessage;
+  readonly metadata?: Record<string, unknown>;
+}): SessionMessageComposerSnapshot {
+  const { attachmentIdPrefix, availableSkills, message } = params;
+  const metadata = params.metadata ?? message.metadata ?? {};
+  const metadataTokens = readInlineTokensFromMetadata(metadata);
+  const nodes: ChatComposerNode[] = [];
+  const attachments: NcpDraftAttachment[] = [];
+
+  message.parts.forEach((part, index) => {
+    if (part.type === 'text' || part.type === 'rich-text' || part.type === 'reasoning') {
+      nodes.push(...buildTextNodes(
+        part.text,
+        resolveInlineTokensForText(part.text, metadataTokens),
+      ));
+      return;
+    }
+    if (part.type !== 'file') {
+      return;
+    }
+    const id = `${attachmentIdPrefix}-${index}`;
+    const attachment: NcpDraftAttachment = {
+      id,
+      name: part.name ?? 'attachment',
+      mimeType: part.mimeType ?? 'application/octet-stream',
+      sizeBytes: part.sizeBytes ?? 0,
+      assetUri: part.assetUri,
+      url: part.url,
+      contentBase64: part.contentBase64,
+    };
+    attachments.push(attachment);
+    nodes.push(createChatComposerTokenNode({
+      tokenKind: 'file',
+      tokenKey: id,
+      label: attachment.name,
+      previewUrl: attachment.mimeType.startsWith('image/') ? attachment.url : undefined,
+    }));
+  });
+
+  const normalizedNodes = normalizeChatComposerNodes(nodes);
+  const selectedSkills = readRequestedSkills(metadata);
+  const skillNameByRef = new Map(availableSkills.map(({ ref, name }) => [ref, name]));
+  return {
+    text: deriveChatComposerDraft(normalizedNodes),
+    nodes: normalizedNodes,
+    selectedSkills,
+    skillRecords: selectedSkills.map((ref) => ({
+      ref,
+      name: skillNameByRef.get(ref) ?? ref,
+    })),
+    attachments,
+  };
+}

package/src/features/chat/features/conversation/utils/session-queued-input.utils.ts

@@ -1,54 +1,14 @@
-import {
-  createChatComposerTextNode,
-  createChatComposerTokenNode,
-  normalizeChatComposerNodes,
-  type ChatComposerNode,
-} from '@nextclaw/agent-chat-ui';
 import type { UiNcpSessionQueuedInputView } from '@nextclaw/client-sdk';
-import type { NcpDraftAttachment } from '@nextclaw/ncp-react';
 
 import {
   readInlineTokensFromMetadata,
-  resolveInlineTokensForText,
-  type ChatInlineTokenSource,
 } from '@/features/chat/features/input/utils/chat-inline-token.utils';
-import { deriveChatComposerDraft } from '@/features/chat/features/input/utils/chat-composer-state.utils';
-import { normalizeRequestedSkills } from '@/features/chat/features/runtime/utils/chat-runtime.utils';
-import type { SessionConversationComposerState } from '@/features/chat/features/conversation/hooks/use-session-conversation-input-state';
-
-export type SessionQueuedInputComposerSnapshot = SessionConversationComposerState & {
-  readonly attachments: readonly NcpDraftAttachment[];
-};
+import {
+  buildSessionMessageComposerSnapshot,
+  type SessionMessageComposerSnapshot,
+} from '@/features/chat/features/conversation/utils/session-message-composer.utils';
 
-function buildTextNodes(
-  text: string,
-  inlineTokens: readonly ChatInlineTokenSource[],
-): ChatComposerNode[] {
-  const nodes: ChatComposerNode[] = [];
-  let offset = 0;
-  while (offset < text.length) {
-    const nextToken = inlineTokens
-      .flatMap((token) => {
-        const index = text.indexOf(token.rawText, offset);
-        return index < 0 ? [] : [{ index, token }];
-      })
-      .sort((left, right) => left.index - right.index || right.token.rawText.length - left.token.rawText.length)[0];
-    if (!nextToken) {
-      nodes.push(createChatComposerTextNode(text.slice(offset)));
-      return nodes;
-    }
-    if (nextToken.index > offset) {
-      nodes.push(createChatComposerTextNode(text.slice(offset, nextToken.index)));
-    }
-    nodes.push(createChatComposerTokenNode({
-      tokenKind: nextToken.token.kind,
-      tokenKey: "ref" in nextToken.token ? nextToken.token.ref : nextToken.token.key,
-      label: nextToken.token.label,
-    }));
-    offset = nextToken.index + nextToken.token.rawText.length;
-  }
-  return nodes;
-}
+export type SessionQueuedInputComposerSnapshot = SessionMessageComposerSnapshot;
 
 function readInputMetadata(input: UiNcpSessionQueuedInputView): Record<string, unknown> {
   return {
@@ -57,13 +17,6 @@ function readInputMetadata(input: UiNcpSessionQueuedInputView): Record<string, u
   };
 }
 
-function readRequestedSkills(input: UiNcpSessionQueuedInputView): string[] {
-  const raw = readInputMetadata(input).requested_skill_refs;
-  return normalizeRequestedSkills(
-    Array.isArray(raw) ? raw.filter((value): value is string => typeof value === 'string') : undefined,
-  );
-}
-
 export function buildSessionQueuedInputPreview(input: UiNcpSessionQueuedInputView): string {
   const inlineTokens = readInlineTokensFromMetadata(readInputMetadata(input));
   const text = input.message.parts.flatMap((part) =>
@@ -85,50 +38,10 @@ export function buildSessionQueuedInputComposerSnapshot(
   input: UiNcpSessionQueuedInputView,
   availableSkills: readonly { ref: string; name: string }[],
 ): SessionQueuedInputComposerSnapshot {
-  const nodes: ChatComposerNode[] = [];
-  const attachments: NcpDraftAttachment[] = [];
-  const metadataTokens = readInlineTokensFromMetadata(readInputMetadata(input));
-
-  input.message.parts.forEach((part, index) => {
-    if (part.type === 'text' || part.type === 'rich-text' || part.type === 'reasoning') {
-      nodes.push(...buildTextNodes(
-        part.text,
-        resolveInlineTokensForText(part.text, metadataTokens),
-      ));
-      return;
-    }
-    if (part.type !== 'file') {
-      return;
-    }
-    const id = `queued-attachment-${input.id}-${index}`;
-    const attachment: NcpDraftAttachment = {
-      id,
-      name: part.name ?? 'attachment',
-      mimeType: part.mimeType ?? 'application/octet-stream',
-      sizeBytes: part.sizeBytes ?? 0,
-      assetUri: part.assetUri,
-      url: part.url,
-      contentBase64: part.contentBase64,
-    };
-    attachments.push(attachment);
-    nodes.push(createChatComposerTokenNode({
-      tokenKind: 'file',
-      tokenKey: id,
-      label: attachment.name,
-    }));
+  return buildSessionMessageComposerSnapshot({
+    attachmentIdPrefix: `queued-attachment-${input.id}`,
+    availableSkills,
+    message: input.message,
+    metadata: readInputMetadata(input),
   });
-
-  const normalizedNodes = normalizeChatComposerNodes(nodes);
-  const selectedSkills = readRequestedSkills(input);
-  const skillNameByRef = new Map(availableSkills.map(({ ref, name }) => [ref, name]));
-  return {
-    text: deriveChatComposerDraft(normalizedNodes),
-    nodes: normalizedNodes,
-    selectedSkills,
-    skillRecords: selectedSkills.map((ref) => ({
-      ref,
-      name: skillNameByRef.get(ref) ?? ref,
-    })),
-    attachments,
-  };
 }

package/src/features/chat/features/input/input-surface-plugins/__tests__/slash-command-plugin.test.ts

@@ -35,6 +35,7 @@ function createPlugin(
     commands: [
       {
         key: 'side-chat',
+        icon: 'message-square-plus',
         title: 'Side chat',
         description: 'Open side chat',
         detailLines: ['Creates a child session on first send'],
@@ -133,7 +134,7 @@ describe('createSlashCommandInputSurfacePlugin', () => {
       { key: 'panel-apps', label: 'Panel Apps', sectionKeys: ['panel-apps'] },
     ]);
     expect(state.panel?.items[0]).toMatchObject({
-      icon: 'command',
+      icon: 'message-square-plus',
       sectionKey: 'commands',
       sectionLabel: 'Commands',
       hintLabel: 'Run command',

package/src/features/chat/features/input/input-surface-plugins/slash-command-plugin.utils.ts

@@ -2,6 +2,7 @@ import {
   CHAT_INPUT_SURFACE_SLASH_TRIGGER_SPEC,
   createInputSurfaceTriggeredPanelPlugin,
   type ChatInputSurfaceItem,
+  type ChatInputSurfaceItemIcon,
   type ChatInputSurfaceMenuTexts,
   type ChatInputSurfacePlugin,
 } from '@nextclaw/agent-chat-ui';
@@ -24,6 +25,7 @@ const SLASH_SKILL_SECTION_KEY = 'skills';
 
 export type ChatSlashCommandDescriptor = {
   key: string;
+  icon: ChatInputSurfaceItemIcon;
   title: string;
   description: string;
   detailLines?: readonly string[];
@@ -69,7 +71,7 @@ function buildSlashCommandItems(params: {
     })
     .map(({ command }) => ({
       key: `command:${command.key}`,
-      icon: 'command',
+      icon: command.icon,
       title: command.title,
       subtitle: params.texts.commandSubtitle,
       description: command.description,

package/src/features/chat/features/input/utils/__tests__/chat-composer-state.utils.test.ts

@@ -56,7 +56,7 @@ describe('deriveNcpMessagePartsFromComposer', () => {
       },
       {
         type: 'text',
-        text: ' between $Web Searchafter'
+        text: ' between $Web Search after'
       },
       {
         type: 'file',
@@ -115,6 +115,27 @@ describe('deriveNcpMessagePartsFromComposer', () => {
     ]);
   });
 
+  it('separates workspace references from adjacent message text', () => {
+    expect(
+      deriveNcpMessagePartsFromComposer(
+        [
+          createChatComposerTokenNode({
+            tokenKind: 'workspace_file',
+            tokenKey: 'AGENTS.md',
+            label: 'AGENTS.md',
+          }),
+          createChatComposerTextNode('这里面有啥'),
+        ],
+        [],
+      ),
+    ).toEqual([
+      {
+        type: 'text',
+        text: '@file:AGENTS.md 这里面有啥',
+      },
+    ]);
+  });
+
   it('preserves uploaded attachment references when the attachment has a server uri', () => {
     const parts = deriveNcpMessagePartsFromComposer(
       [

package/src/features/chat/features/input/utils/__tests__/chat-inline-token.utils.test.ts

@@ -226,6 +226,29 @@ describe('chat inline token workspace references', () => {
     ]);
   });
 
+  it('prefers persisted token metadata over a greedy protocol fallback', () => {
+    expect(
+      resolveInlineTokensForText(
+        '@file:AGENTS.md这里面有啥',
+        [
+          {
+            kind: 'workspace_file',
+            key: 'AGENTS.md',
+            label: 'AGENTS.md',
+            rawText: '@file:AGENTS.md',
+          },
+        ],
+      ),
+    ).toEqual([
+      {
+        kind: 'workspace_file',
+        key: 'AGENTS.md',
+        label: 'AGENTS.md',
+        rawText: '@file:AGENTS.md',
+      },
+    ]);
+  });
+
   it('serializes project references with their registered path and display name', () => {
     expect(
       buildInlineTokensFromComposer([

package/src/features/chat/features/input/utils/__tests__/chat-input-bar.utils.test.ts

@@ -1,5 +1,6 @@
 import {
   buildChatSlashItems,
+  buildModelStateHint,
   buildModelToolbarSelect,
   buildSkillPickerModel
 } from '@/features/chat/features/input/utils/chat-input-bar.utils';
@@ -22,11 +23,48 @@ function createModelTexts() {
     favoriteModelsLabel: 'Favorites',
     favoriteModelLabel: 'Favorite model',
     unfavoriteModelLabel: 'Remove favorite',
+    manageModelsLabel: 'Manage models and providers',
+    discoveredModelsSummaryLabel: '{count} new models available',
+    discoveredModelsViewLabel: 'View',
+    discoveredModelsGroupLabel: 'New models',
+    discoveredModelAddLabel: 'Add',
+    discoveredModelsDismissLabel: "Don't remind me about these",
     recentModelsLabel: 'Recent',
     allModelsLabel: 'All models'
   };
 }
 
+describe('buildModelStateHint', () => {
+  it('keeps the input surface clear while model options are unresolved', () => {
+    expect(buildModelStateHint({
+      isModelOptionsEmpty: false,
+      onGoToProviders: vi.fn(),
+      texts: {
+        noModelOptionsLabel: 'No models',
+        configureProviderLabel: 'Configure provider'
+      }
+    })).toBeNull();
+  });
+
+  it('keeps the actionable warning when model loading resolves empty', () => {
+    const onGoToProviders = vi.fn();
+
+    expect(buildModelStateHint({
+      isModelOptionsEmpty: true,
+      onGoToProviders,
+      texts: {
+        noModelOptionsLabel: 'No models',
+        configureProviderLabel: 'Configure provider'
+      }
+    })).toEqual({
+      tone: 'warning',
+      text: 'No models',
+      actionLabel: 'Configure provider',
+      onAction: onGoToProviders
+    });
+  });
+});
+
 describe('buildChatSlashItems', () => {
   const texts = {
     slashSkillSubtitle: 'Skill',
@@ -238,6 +276,71 @@ describe('buildSkillPickerModel', () => {
 });
 
 describe('buildModelToolbarSelect', () => {
+  it('exposes discovered models through an expanded-panel contract without changing the selected label', () => {
+    const onDiscoveredModelsDismiss = vi.fn();
+    const onDiscoveredModelSelect = vi.fn();
+    const onOpen = vi.fn();
+    const select = buildModelToolbarSelect({
+      modelOptions: [{
+        value: 'opencode/big-pickle',
+        modelLabel: 'big-pickle',
+        providerLabel: 'OpenCode',
+      }],
+      discoveredModelOptions: [
+        {
+          value: 'opencode/deepseek-v4-flash-free',
+          modelLabel: 'deepseek-v4-flash-free',
+          providerLabel: 'OpenCode',
+        },
+        {
+          value: 'openrouter/inclusionai/ling-3.0-tiny:free',
+          modelLabel: 'inclusionai/ling-3.0-tiny:free',
+          providerLabel: 'OpenRouter',
+        },
+      ],
+      recentModelValues: [],
+      selectedModel: 'opencode/big-pickle',
+      isModelOptionsLoading: false,
+      hasModelOptions: true,
+      onDiscoveredModelSelect,
+      onDiscoveredModelsDismiss,
+      onOpen,
+      onValueChange: vi.fn(),
+      texts: createModelTexts(),
+    });
+
+    expect(select.selectedLabel).toBe('OpenCode/big-pickle');
+    expect(select.discovery).toEqual({
+      summaryLabel: '2 new models available',
+      viewLabel: 'View',
+      groupLabel: 'New models',
+      allGroupLabel: 'All models',
+      actionLabel: 'Add',
+      dismissLabel: "Don't remind me about these",
+      groups: [
+        {
+          key: 'opencode',
+          label: 'OpenCode',
+          options: [{
+            value: 'opencode/deepseek-v4-flash-free',
+            label: 'deepseek-v4-flash-free',
+          }],
+        },
+        {
+          key: 'openrouter',
+          label: 'OpenRouter',
+          options: [{
+            value: 'openrouter/inclusionai/ling-3.0-tiny:free',
+            label: 'inclusionai/ling-3.0-tiny:free',
+          }],
+        },
+      ],
+      onDismiss: onDiscoveredModelsDismiss,
+      onSelect: onDiscoveredModelSelect,
+    });
+    expect(select.onOpen).toBe(onOpen);
+  });
+
   it('falls back to the first available option when the selected model is missing', () => {
     const onValueChange = vi.fn();
     const select = buildModelToolbarSelect({
@@ -262,6 +365,8 @@ describe('buildModelToolbarSelect', () => {
       value: 'minimax/MiniMax-M2.7',
       label: 'MiniMax/MiniMax-M2.7'
     });
+    expect(select.manageLabel).toBe('Manage models and providers');
+    expect(select.manageHref).toBe('/providers');
   });
 
   it('keeps the full provider/model label in shared state while exposing a compact mobile label', () => {

package/src/features/chat/features/input/utils/chat-composer-state.utils.ts

@@ -29,6 +29,27 @@ function appendTextPart(parts: NcpMessagePart[], text: string): NcpMessagePart[]
   ];
 }
 
+function hasSerializedTokenText(node: ChatComposerNode | undefined): boolean {
+  return node?.type === 'token' && Boolean(serializeChatComposerTokenText(node));
+}
+
+function serializeTokenWithTextBoundaries(params: {
+  index: number;
+  nodes: readonly ChatComposerNode[];
+  tokenText: string;
+}): string {
+  const { index, nodes, tokenText } = params;
+  const previousNode = nodes[index - 1];
+  const nextNode = nodes[index + 1];
+  const needsLeadingSpace = (
+    previousNode?.type === 'text' && /\S$/.test(previousNode.text)
+  ) || hasSerializedTokenText(previousNode);
+  const needsTrailingSpace = (
+    nextNode?.type === 'text' && /^\S/.test(nextNode.text)
+  ) || hasSerializedTokenText(nextNode);
+  return `${needsLeadingSpace ? ' ' : ''}${tokenText}${needsTrailingSpace ? ' ' : ''}`;
+}
+
 export function createInitialChatComposerNodes(): ChatComposerNode[] {
   return createEmptyChatComposerNodes();
 }
@@ -102,7 +123,7 @@ export function deriveNcpMessagePartsFromComposer(
   const attachmentById = new Map(attachments.map((attachment) => [attachment.id, attachment]));
   let parts: NcpMessagePart[] = [];
 
-  for (const node of nodes) {
+  for (const [index, node] of nodes.entries()) {
     if (node.type === 'text') {
       parts = appendTextPart(parts, node.text);
       continue;
@@ -110,7 +131,11 @@ export function deriveNcpMessagePartsFromComposer(
 
     const tokenText = serializeChatComposerTokenText(node);
     if (tokenText) {
-      parts = appendTextPart(parts, tokenText);
+      parts = appendTextPart(parts, serializeTokenWithTextBoundaries({
+        index,
+        nodes,
+        tokenText,
+      }));
       continue;
     }
 

package/src/features/chat/features/input/utils/chat-composer-token-protocol.utils.ts

@@ -1,6 +1,7 @@
 import {
   CHAT_PROJECT_TOKEN_KIND,
   CHAT_WORKSPACE_DIRECTORY_TOKEN_KIND,
+  CHAT_WORKSPACE_EXCERPT_TOKEN_KIND,
   CHAT_WORKSPACE_FILE_TOKEN_KIND,
 } from '@nextclaw/shared';
 
@@ -9,6 +10,7 @@ const CHAT_PANEL_APP_TOKEN_PREFIX = '@panel-app:';
 const CHAT_PROJECT_TOKEN_PREFIX = '@project:';
 const CHAT_WORKSPACE_FILE_TOKEN_PREFIX = '@file:';
 const CHAT_WORKSPACE_DIRECTORY_TOKEN_PREFIX = '@folder:';
+const CHAT_WORKSPACE_EXCERPT_TOKEN_PREFIX = '@excerpt:';
 
 export function serializeChatComposerTokenText(params: {
   label?: string;
@@ -31,5 +33,8 @@ export function serializeChatComposerTokenText(params: {
   if (tokenKind === CHAT_WORKSPACE_DIRECTORY_TOKEN_KIND) {
     return `${CHAT_WORKSPACE_DIRECTORY_TOKEN_PREFIX}${encodeURIComponent(tokenKey)}`;
   }
+  if (tokenKind === CHAT_WORKSPACE_EXCERPT_TOKEN_KIND) {
+    return `${CHAT_WORKSPACE_EXCERPT_TOKEN_PREFIX}${encodeURIComponent(tokenKey)}`;
+  }
   return null;
 }