@nextclaw/ui 0.11.17 → 0.11.19

package/src/components/chat/adapters/chat-message.adapter.ts

@@ -1,49 +1,18 @@
-import {
-  stringifyUnknown,
-  summarizeToolArgs,
-  type ToolCard,
-} from "@/lib/chat-message";
-import { buildSubagentToolCard } from "@/components/chat/adapters/chat-message.subagent-tool-card";
+import { adaptChatMessagePart } from "@/components/chat/adapters/chat-message-part.adapter";
+import type { ChatInlineTokenSource } from "@/components/chat/chat-inline-token.utils";
 import type {
   ChatMessageRole,
   ChatMessageViewModel,
-  ChatToolPartViewModel,
 } from "@nextclaw/agent-chat-ui";
+import type {
+  ChatMessageAdapterTexts,
+  ChatMessagePartSource,
+} from "@/components/chat/adapters/chat-message-part.adapter";
 
-export type ChatMessagePartSource =
-  | {
-      type: "text";
-      text: string;
-    }
-  | {
-      type: "file";
-      mimeType: string;
-      data: string;
-      url?: string;
-      name?: string;
-      sizeBytes?: number;
-    }
-  | {
-      type: "reasoning";
-      reasoning: string;
-    }
-  | {
-      type: "tool-invocation";
-      toolInvocation: {
-        status?: string;
-        toolName: string;
-        args?: unknown;
-        parsedArgs?: unknown;
-        result?: unknown;
-        error?: string;
-        cancelled?: boolean;
-        toolCallId?: string;
-      };
-    }
-  | {
-      type: string;
-      [key: string]: unknown;
-    };
+export type {
+  ChatMessageAdapterTexts,
+  ChatMessagePartSource,
+} from "@/components/chat/adapters/chat-message-part.adapter";
 
 export type ChatMessageSource = {
   id: string;
@@ -51,146 +20,11 @@ export type ChatMessageSource = {
   meta?: {
     timestamp?: string;
     status?: string;
+    inlineTokens?: ChatInlineTokenSource[];
   };
   parts: ChatMessagePartSource[];
 };
 
-export type ChatMessageAdapterTexts = {
-  roleLabels: {
-    user: string;
-    assistant: string;
-    tool: string;
-    system: string;
-    fallback: string;
-  };
-  reasoningLabel: string;
-  toolCallLabel: string;
-  toolResultLabel: string;
-  toolNoOutputLabel: string;
-  toolOutputLabel: string;
-  toolStatusPreparingLabel: string;
-  toolStatusRunningLabel: string;
-  toolStatusCompletedLabel: string;
-  toolStatusFailedLabel: string;
-  toolStatusCancelledLabel: string;
-  imageAttachmentLabel: string;
-  fileAttachmentLabel: string;
-  unknownPartLabel: string;
-};
-
-const INVISIBLE_ONLY_TEXT_PATTERN = /\u200B|\u200C|\u200D|\u2060|\uFEFF/g;
-
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null;
-}
-
-function readOptionalString(value: unknown): string | null {
-  if (typeof value !== "string") {
-    return null;
-  }
-  const trimmed = value.trim();
-  return trimmed.length > 0 ? trimmed : null;
-}
-
-function readOptionalNumber(value: unknown): number | null {
-  if (typeof value === "number" && Number.isFinite(value) && value >= 0) {
-    return value;
-  }
-  if (typeof value !== "string") {
-    return null;
-  }
-  const trimmed = value.trim();
-  if (!trimmed) {
-    return null;
-  }
-  const parsed = Number(trimmed);
-  return Number.isFinite(parsed) && parsed >= 0 ? parsed : null;
-}
-
-function extractAssetFileView(
-  value: unknown,
-  texts: ChatMessageAdapterTexts,
-): {
-  type: "file";
-  file: {
-    label: string;
-    mimeType: string;
-    dataUrl: string;
-    sizeBytes?: number;
-    isImage: boolean;
-  };
-} | null {
-  if (!isRecord(value)) {
-    return null;
-  }
-  const assetCandidate = isRecord(value.asset)
-    ? value.asset
-    : Array.isArray(value.assets) &&
-        value.assets.length > 0 &&
-        isRecord(value.assets[0])
-      ? value.assets[0]
-      : null;
-  if (!assetCandidate) {
-    return null;
-  }
-  const url = readOptionalString(assetCandidate.url);
-  const mimeType =
-    readOptionalString(assetCandidate.mimeType) ?? "application/octet-stream";
-  const sizeBytes = readOptionalNumber(assetCandidate.sizeBytes);
-  if (!url) {
-    return null;
-  }
-  const label =
-    readOptionalString(assetCandidate.name) ??
-    (mimeType.startsWith("image/")
-      ? texts.imageAttachmentLabel
-      : texts.fileAttachmentLabel);
-  return {
-    type: "file",
-    file: {
-      label,
-      mimeType,
-      dataUrl: url,
-      ...(sizeBytes != null ? { sizeBytes } : {}),
-      isImage: mimeType.startsWith("image/"),
-    },
-  };
-}
-
-function isTextPart(
-  part: ChatMessagePartSource,
-): part is Extract<ChatMessagePartSource, { type: "text" }> {
-  return part.type === "text" && typeof part.text === "string";
-}
-
-function isReasoningPart(
-  part: ChatMessagePartSource,
-): part is Extract<ChatMessagePartSource, { type: "reasoning" }> {
-  return part.type === "reasoning" && typeof part.reasoning === "string";
-}
-
-function isFilePart(
-  part: ChatMessagePartSource,
-): part is Extract<ChatMessagePartSource, { type: "file" }> {
-  return (
-    part.type === "file" &&
-    typeof part.mimeType === "string" &&
-    typeof part.data === "string"
-  );
-}
-
-function isToolInvocationPart(
-  part: ChatMessagePartSource,
-): part is Extract<ChatMessagePartSource, { type: "tool-invocation" }> {
-  if (part.type !== "tool-invocation") {
-    return false;
-  }
-  if (!isRecord(part.toolInvocation)) {
-    return false;
-  }
-  return typeof part.toolInvocation.toolName === "string";
-}
-
 function resolveMessageTimestamp(message: ChatMessageSource): string {
   const candidate = message.meta?.timestamp;
   if (candidate && Number.isFinite(Date.parse(candidate))) {
@@ -230,94 +64,6 @@ function resolveUiRole(role: string): ChatMessageRole {
   return "message";
 }
 
-function buildToolCard(
-  toolCard: ToolCardViewSource,
-  texts: ChatMessageAdapterTexts,
-): ChatToolPartViewModel {
-  return {
-    kind: toolCard.kind,
-    toolName: toolCard.name,
-    summary: toolCard.detail,
-    output: toolCard.text,
-    hasResult: Boolean(toolCard.hasResult),
-    statusTone: toolCard.statusTone,
-    statusLabel: toolCard.statusLabel,
-    titleLabel:
-      toolCard.kind === "call" ? texts.toolCallLabel : texts.toolResultLabel,
-    outputLabel: texts.toolOutputLabel,
-    emptyLabel: texts.toolNoOutputLabel,
-  };
-}
-
-type ToolCardViewSource = ToolCard & {
-  statusTone: ChatToolPartViewModel["statusTone"];
-  statusLabel: string;
-};
-
-function resolveToolCardStatus(params: {
-  status?: string;
-  error?: string;
-  cancelled?: boolean;
-  result?: unknown;
-  texts: ChatMessageAdapterTexts;
-}): Pick<
-  ChatToolPartViewModel,
-  "kind" | "hasResult" | "statusTone" | "statusLabel"
-> {
-  const rawStatus =
-    typeof params.status === "string" ? params.status.trim().toLowerCase() : "";
-  const hasError =
-    typeof params.error === "string" && params.error.trim().length > 0;
-  const isCancelled = params.cancelled === true || rawStatus === "cancelled";
-  if (isCancelled) {
-    return {
-      kind: "result",
-      hasResult: true,
-      statusTone: "cancelled",
-      statusLabel: params.texts.toolStatusCancelledLabel,
-    };
-  }
-  if (hasError || rawStatus === "error") {
-    return {
-      kind: "result",
-      hasResult: true,
-      statusTone: "error",
-      statusLabel: params.texts.toolStatusFailedLabel,
-    };
-  }
-  if (rawStatus === "result" || params.result != null) {
-    return {
-      kind: "result",
-      hasResult: true,
-      statusTone: "success",
-      statusLabel: params.texts.toolStatusCompletedLabel,
-    };
-  }
-  if (rawStatus === "partial-call") {
-    return {
-      kind: "call",
-      hasResult: false,
-      statusTone: "running",
-      statusLabel: params.texts.toolStatusPreparingLabel,
-    };
-  }
-  return {
-    kind: "call",
-    hasResult: false,
-    statusTone: "running",
-    statusLabel: params.texts.toolStatusRunningLabel,
-  };
-}
-
-function toRenderableText(value: string): string | null {
-  const trimmed = value.trim();
-  if (!trimmed) {
-    return null;
-  }
-  const visible = trimmed.replace(INVISIBLE_ONLY_TEXT_PATTERN, "").trim();
-  return visible ? trimmed : null;
-}
-
 type ChatMessageAdapterParams = {
   texts: ChatMessageAdapterTexts;
   formatTimestamp: (value: string) => string;
@@ -334,107 +80,13 @@ export function adaptChatMessage(
     timestampLabel: params.formatTimestamp(resolveMessageTimestamp(message)),
     status: message.meta?.status,
     parts: message.parts
-      .map((part) => {
-        if (isTextPart(part)) {
-          const text = toRenderableText(part.text);
-          if (!text) {
-            return null;
-          }
-          return {
-            type: "markdown" as const,
-            text,
-          };
-        }
-        if (isReasoningPart(part)) {
-          const text = toRenderableText(part.reasoning);
-          if (!text) {
-            return null;
-          }
-          return {
-            type: "reasoning" as const,
-            text,
-            label: params.texts.reasoningLabel,
-          };
-        }
-        if (isFilePart(part)) {
-          const isImage = part.mimeType.startsWith("image/");
-          const sizeBytes = readOptionalNumber(part.sizeBytes);
-          return {
-            type: "file" as const,
-            file: {
-              label:
-                typeof part.name === "string" && part.name.trim()
-                  ? part.name.trim()
-                  : isImage
-                    ? params.texts.imageAttachmentLabel
-                    : params.texts.fileAttachmentLabel,
-              mimeType: part.mimeType,
-              dataUrl:
-                typeof part.url === "string" && part.url.trim().length > 0
-                  ? part.url.trim()
-                  : `data:${part.mimeType};base64,${part.data}`,
-              ...(sizeBytes != null ? { sizeBytes } : {}),
-              isImage,
-            },
-          };
-        }
-        if (isToolInvocationPart(part)) {
-          const invocation = part.toolInvocation;
-          const assetFileView = extractAssetFileView(
-            invocation.result,
-            params.texts,
-          );
-          if (assetFileView) {
-            return assetFileView;
-          }
-          const subagentToolCard = buildSubagentToolCard({
-            invocation,
-            texts: params.texts,
-          });
-          if (subagentToolCard) {
-            return {
-              type: "tool-card" as const,
-              card: buildToolCard(subagentToolCard, params.texts),
-            };
-          }
-          const statusView = resolveToolCardStatus({
-            status: invocation.status,
-            error: invocation.error,
-            cancelled: invocation.cancelled,
-            result: invocation.result,
-            texts: params.texts,
-          });
-          const detail = summarizeToolArgs(
-            invocation.parsedArgs ?? invocation.args,
-          );
-          const rawResult =
-            typeof invocation.error === "string" && invocation.error.trim()
-              ? invocation.error.trim()
-              : invocation.result != null
-                ? stringifyUnknown(invocation.result).trim()
-                : "";
-          const card: ToolCardViewSource = {
-            kind: statusView.kind,
-            name: invocation.toolName,
-            detail,
-            text: rawResult || undefined,
-            callId: invocation.toolCallId || undefined,
-            hasResult: statusView.hasResult,
-            statusTone: statusView.statusTone,
-            statusLabel: statusView.statusLabel,
-          };
-          return {
-            type: "tool-card" as const,
-            card: buildToolCard(card, params.texts),
-          };
-        }
-        return {
-          type: "unknown" as const,
-          label: params.texts.unknownPartLabel,
-          rawType: typeof part.type === "string" ? part.type : "unknown",
-          text: stringifyUnknown(part),
-        };
-      })
+      .map((part) =>
+        adaptChatMessagePart({
+          part,
+          inlineTokens: message.meta?.inlineTokens ?? [],
+          texts: params.texts,
+        }),
+      )
       .filter((part) => part !== null),
   };
 }

package/src/components/chat/adapters/chat-message.subagent-tool-card.ts

@@ -57,6 +57,47 @@ function readSubagentRunResult(value: unknown): SubagentRunResult | null {
   return null;
 }
 
+function buildSubagentDetail(subagentRun: SubagentRunResult, fallbackArgs: unknown): string | undefined {
+  const detailParts = [
+    readOptionalString(subagentRun.label)
+      ? `label: ${subagentRun.label?.trim()}`
+      : null,
+    readOptionalString(subagentRun.runId)
+      ? `run: ${subagentRun.runId?.trim()}`
+      : null,
+    readOptionalString(subagentRun.task)
+      ? `task: ${subagentRun.task?.trim()}`
+      : null,
+  ].filter((value): value is string => Boolean(value));
+
+  return detailParts.join(" · ") || summarizeToolArgs(fallbackArgs);
+}
+
+function buildSubagentOutput(subagentRun: SubagentRunResult): string | undefined {
+  const runId = readOptionalString(subagentRun.runId);
+  const label = readOptionalString(subagentRun.label);
+  const task = readOptionalString(subagentRun.task);
+  const status = readOptionalString(subagentRun.status)?.toLowerCase();
+  const resultText =
+    typeof subagentRun.result !== "undefined"
+      ? stringifyUnknown(subagentRun.result).trim()
+      : "";
+  const messageText = readOptionalString(subagentRun.message);
+
+  const sections = [
+    runId ? `Run ID: ${runId}` : null,
+    label ? `Label: ${label}` : null,
+    task ? `Task:\n${task}` : null,
+    resultText
+      ? `${status === "failed" ? "Error" : "Result"}:\n${resultText}`
+      : messageText
+        ? `Status:\n${messageText}`
+        : null,
+  ].filter((value): value is string => Boolean(value));
+
+  return sections.length > 0 ? sections.join("\n\n") : undefined;
+}
+
 export function buildSubagentToolCard(params: {
   invocation: SpawnToolInvocation;
   texts: SubagentToolCardTexts;
@@ -70,27 +111,15 @@ export function buildSubagentToolCard(params: {
     return null;
   }
 
-  const detailParts = [
-    readOptionalString(subagentRun.label)
-      ? `label: ${subagentRun.label?.trim()}`
-      : null,
-    readOptionalString(subagentRun.task)
-      ? `task: ${subagentRun.task?.trim()}`
-      : null,
-  ].filter((value): value is string => Boolean(value));
   const normalizedStatus = readOptionalString(subagentRun.status)?.toLowerCase();
-  const output =
-    (typeof subagentRun.result !== "undefined"
-      ? stringifyUnknown(subagentRun.result).trim()
-      : "") ||
-    readOptionalString(subagentRun.message) ||
-    undefined;
+  const detail = buildSubagentDetail(subagentRun, params.invocation.args);
+  const output = buildSubagentOutput(subagentRun);
 
   if (normalizedStatus === "failed") {
     return {
       kind: "result",
       name: params.invocation.toolName,
-      detail: detailParts.join(" · ") || summarizeToolArgs(params.invocation.args),
+      detail,
       text: output,
       callId: params.invocation.toolCallId || undefined,
       hasResult: Boolean(output),
@@ -103,7 +132,7 @@ export function buildSubagentToolCard(params: {
     return {
       kind: "result",
       name: params.invocation.toolName,
-      detail: detailParts.join(" · ") || summarizeToolArgs(params.invocation.args),
+      detail,
       text: output,
       callId: params.invocation.toolCallId || undefined,
       hasResult: Boolean(output),
@@ -115,7 +144,7 @@ export function buildSubagentToolCard(params: {
   return {
     kind: "result",
     name: params.invocation.toolName,
-    detail: detailParts.join(" · ") || summarizeToolArgs(params.invocation.args),
+    detail,
     text: output,
     callId: params.invocation.toolCallId || undefined,
     hasResult: Boolean(output),

package/src/components/chat/chat-composer-state.test.ts

@@ -2,7 +2,7 @@ import { createChatComposerTextNode, createChatComposerTokenNode } from '@nextcl
 import { deriveNcpMessagePartsFromComposer } from '@/components/chat/chat-composer-state';
 
 describe('deriveNcpMessagePartsFromComposer', () => {
-  it('preserves interleaved text and image token order while skipping skill tokens', () => {
+  it('preserves interleaved text and image token order while serializing skill tokens inline', () => {
     const parts = deriveNcpMessagePartsFromComposer(
       [
         createChatComposerTextNode('before '),
@@ -56,11 +56,7 @@ describe('deriveNcpMessagePartsFromComposer', () => {
       },
       {
         type: 'text',
-        text: ' between '
-      },
-      {
-        type: 'text',
-        text: 'after'
+        text: ' between $web-searchafter'
       },
       {
         type: 'file',

package/src/components/chat/chat-composer-state.ts

@@ -11,6 +11,27 @@ import {
   serializeChatComposerPlainText
 } from '@nextclaw/agent-chat-ui';
 
+const CHAT_SKILL_TOKEN_PREFIX = '$';
+
+function serializeSkillTokenText(skillSpec: string): string {
+  return `${CHAT_SKILL_TOKEN_PREFIX}${skillSpec}`;
+}
+
+function appendTextPart(parts: NcpMessagePart[], text: string): void {
+  if (text.length === 0) {
+    return;
+  }
+  const previous = parts[parts.length - 1];
+  if (previous?.type === 'text') {
+    previous.text += text;
+    return;
+  }
+  parts.push({
+    type: 'text',
+    text
+  });
+}
+
 export function createInitialChatComposerNodes(): ChatComposerNode[] {
   return createEmptyChatComposerNodes();
 }
@@ -86,12 +107,12 @@ export function deriveNcpMessagePartsFromComposer(
 
   for (const node of nodes) {
     if (node.type === 'text') {
-      if (node.text.length > 0) {
-        parts.push({
-          type: 'text',
-          text: node.text
-        });
-      }
+      appendTextPart(parts, node.text);
+      continue;
+    }
+
+    if (node.tokenKind === 'skill') {
+      appendTextPart(parts, serializeSkillTokenText(node.tokenKey));
       continue;
     }
 

package/src/components/chat/chat-inline-token.utils.test.ts

@@ -0,0 +1,87 @@
+import { createChatComposerTextNode, createChatComposerTokenNode } from "@nextclaw/agent-chat-ui";
+import {
+  buildInlineSkillTokensFromComposer,
+  CHAT_UI_INLINE_TOKENS_METADATA_KEY,
+  readInlineTokensFromMetadata,
+  splitTextByInlineTokens,
+} from "@/components/chat/chat-inline-token.utils";
+
+describe("chat-inline-token utils", () => {
+  it("builds ordered inline skill tokens from composer nodes", () => {
+    expect(
+      buildInlineSkillTokensFromComposer([
+        createChatComposerTextNode("before "),
+        createChatComposerTokenNode({
+          tokenKind: "skill",
+          tokenKey: "weather",
+          label: "Weather",
+        }),
+        createChatComposerTokenNode({
+          tokenKind: "skill",
+          tokenKey: "docs",
+          label: "Docs",
+        }),
+      ]),
+    ).toEqual([
+      {
+        kind: "skill",
+        key: "weather",
+        label: "Weather",
+        rawText: "$weather",
+      },
+      {
+        kind: "skill",
+        key: "docs",
+        label: "Docs",
+        rawText: "$docs",
+      },
+    ]);
+  });
+
+  it("reads generic inline token metadata safely", () => {
+    expect(
+      readInlineTokensFromMetadata({
+        [CHAT_UI_INLINE_TOKENS_METADATA_KEY]: [
+          {
+            kind: "skill",
+            key: "weather",
+            label: "Weather",
+            rawText: "$weather",
+          },
+        ],
+      }),
+    ).toEqual([
+      {
+        kind: "skill",
+        key: "weather",
+        label: "Weather",
+        rawText: "$weather",
+      },
+    ]);
+  });
+
+  it("splits text into inline text and token fragments", () => {
+    expect(
+      splitTextByInlineTokens("please use $weather now", [
+        {
+          kind: "skill",
+          key: "weather",
+          label: "Weather",
+          rawText: "$weather",
+        },
+      ]),
+    ).toEqual([
+      { type: "text", text: "please use " },
+      {
+        type: "token",
+        token: {
+          kind: "skill",
+          key: "weather",
+          label: "Weather",
+          rawText: "$weather",
+        },
+      },
+      { type: "text", text: " now" },
+    ]);
+  });
+});