@nextclaw/ui 0.12.4 → 0.12.6

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

@@ -9,6 +9,7 @@ import type { ChatToolPartViewModel } from "@nextclaw/agent-chat-ui";
 type ToolCardViewSource = ToolCard & {
   statusTone: ChatToolPartViewModel["statusTone"];
   statusLabel: string;
+  input?: string;
   action?: ChatToolPartViewModel["action"];
 };
 
@@ -31,15 +32,30 @@ type SessionRequestResult = {
   sessionId?: string;
   agentId?: string;
   isChildSession?: boolean;
+  lifecycle?: string;
   title?: string;
   task?: string;
   status?: string;
+  notify?: string;
+  spawnedByRequestId?: string;
   message?: unknown;
   finalResponseText?: unknown;
   error?: unknown;
   parentSessionId?: string;
 };
 
+type SessionSpawnResult = {
+  kind: string;
+  sessionId?: string;
+  agentId?: string;
+  isChildSession?: boolean;
+  title?: string;
+  sessionType?: string;
+  lifecycle?: string;
+  createdAt?: string;
+  parentSessionId?: string;
+};
+
 function isRecord(value: unknown): value is Record<string, unknown> {
   return typeof value === "object" && value !== null;
 }
@@ -59,6 +75,33 @@ function readSessionRequestResult(value: unknown): SessionRequestResult | null {
   return value as SessionRequestResult;
 }
 
+function readSessionSpawnResult(value: unknown): SessionSpawnResult | null {
+  if (!isRecord(value) || value.kind !== "nextclaw.session") {
+    return null;
+  }
+  return value as SessionSpawnResult;
+}
+
+function parseStructuredValue(value: unknown): unknown {
+  if (typeof value !== "string") {
+    return value;
+  }
+  const trimmed = value.trim();
+  if (!trimmed.startsWith("{") && !trimmed.startsWith("[")) {
+    return value;
+  }
+  try {
+    return JSON.parse(trimmed) as unknown;
+  } catch {
+    return value;
+  }
+}
+
+function buildStructuredInput(value: unknown): string | undefined {
+  const text = stringifyUnknown(parseStructuredValue(value)).trim();
+  return text || undefined;
+}
+
 function buildSessionRequestDetail(
   result: SessionRequestResult,
   fallbackArgs: unknown,
@@ -78,11 +121,32 @@ function buildSessionRequestDetail(
   return detailParts.join(" · ") || summarizeToolArgs(fallbackArgs);
 }
 
+function buildSessionSpawnDetail(
+  result: SessionSpawnResult,
+  fallbackArgs: unknown,
+): string | undefined {
+  const detailParts = [
+    readOptionalString(result.title)
+      ? `title: ${result.title?.trim()}`
+      : null,
+    readOptionalString(result.sessionId)
+      ? `session: ${result.sessionId?.trim()}`
+      : null,
+  ].filter((value): value is string => Boolean(value));
+
+  return detailParts.join(" · ") || summarizeToolArgs(fallbackArgs);
+}
+
 function buildSessionRequestOutput(result: SessionRequestResult): string | undefined {
   const requestId = readOptionalString(result.requestId);
   const sessionId = readOptionalString(result.sessionId);
   const title = readOptionalString(result.title);
   const task = readOptionalString(result.task);
+  const status = readOptionalString(result.status);
+  const notify = readOptionalString(result.notify);
+  const lifecycle = readOptionalString(result.lifecycle);
+  const parentSessionId = readOptionalString(result.parentSessionId);
+  const spawnedByRequestId = readOptionalString(result.spawnedByRequestId);
   const messageText =
     typeof result.message !== "undefined"
       ? stringifyUnknown(result.message).trim()
@@ -102,6 +166,11 @@ function buildSessionRequestOutput(result: SessionRequestResult): string | undef
     typeof result.isChildSession === "boolean"
       ? `Target: ${result.isChildSession ? "child" : "session"}`
       : null,
+    status ? `Status: ${status}` : null,
+    notify ? `Notify: ${notify}` : null,
+    lifecycle ? `Lifecycle: ${lifecycle}` : null,
+    parentSessionId ? `Parent Session ID: ${parentSessionId}` : null,
+    spawnedByRequestId ? `Spawned By Request ID: ${spawnedByRequestId}` : null,
     title ? `Title: ${title}` : null,
     task ? `Task:\n${task}` : null,
     finalResponseText
@@ -116,6 +185,29 @@ function buildSessionRequestOutput(result: SessionRequestResult): string | undef
   return sections.length > 0 ? sections.join("\n\n") : undefined;
 }
 
+function buildSessionSpawnOutput(result: SessionSpawnResult): string | undefined {
+  const sessionId = readOptionalString(result.sessionId);
+  const title = readOptionalString(result.title);
+  const sessionType = readOptionalString(result.sessionType);
+  const lifecycle = readOptionalString(result.lifecycle);
+  const parentSessionId = readOptionalString(result.parentSessionId);
+  const createdAt = readOptionalString(result.createdAt);
+
+  const sections = [
+    sessionId ? `Session ID: ${sessionId}` : null,
+    typeof result.isChildSession === "boolean"
+      ? `Target: ${result.isChildSession ? "child" : "session"}`
+      : null,
+    title ? `Title: ${title}` : null,
+    sessionType ? `Session Type: ${sessionType}` : null,
+    lifecycle ? `Lifecycle: ${lifecycle}` : null,
+    parentSessionId ? `Parent Session ID: ${parentSessionId}` : null,
+    createdAt ? `Created At: ${createdAt}` : null,
+  ].filter((value): value is string => Boolean(value));
+
+  return sections.length > 0 ? sections.join("\n\n") : undefined;
+}
+
 export function buildSessionRequestToolCard(params: {
   invocation: SessionRequestInvocation;
   texts: SessionRequestToolCardTexts;
@@ -123,77 +215,123 @@ export function buildSessionRequestToolCard(params: {
   const { invocation, texts } = params;
   const { toolName, toolCallId, args, result } = invocation;
 
-  if (toolName !== "spawn" && toolName !== "sessions_request") {
+  if (
+    toolName !== "spawn" &&
+    toolName !== "sessions_request" &&
+    toolName !== "sessions_spawn"
+  ) {
     return null;
   }
 
   const sessionRequest = readSessionRequestResult(result);
-  if (!sessionRequest) {
-    return null;
-  }
+  if (sessionRequest) {
+    const normalizedStatus = readOptionalString(sessionRequest.status)?.toLowerCase();
+    const detail = buildSessionRequestDetail(sessionRequest, args);
+    const output = buildSessionRequestOutput(sessionRequest);
+    const targetSessionId = readOptionalString(sessionRequest.sessionId);
+    const agentId = resolveToolInvocationAgentId({ args, result: sessionRequest });
+    const action =
+      targetSessionId
+        ? {
+            kind: "open-session" as const,
+            sessionId: targetSessionId,
+            sessionKind: sessionRequest.isChildSession === true ? ("child" as const) : ("session" as const),
+            ...(agentId
+              ? { agentId }
+              : {}),
+            ...(readOptionalString(sessionRequest.title)
+              ? { label: sessionRequest.title!.trim() }
+              : {}),
+            ...(readOptionalString(sessionRequest.parentSessionId)
+              ? { parentSessionId: sessionRequest.parentSessionId!.trim() }
+              : {}),
+          }
+        : undefined;
 
-  const normalizedStatus = readOptionalString(sessionRequest.status)?.toLowerCase();
-  const detail = buildSessionRequestDetail(sessionRequest, args);
-  const output = buildSessionRequestOutput(sessionRequest);
-  const targetSessionId = readOptionalString(sessionRequest.sessionId);
-  const agentId = resolveToolInvocationAgentId({ args, result: sessionRequest });
-  const action =
-    targetSessionId
-      ? {
-          kind: "open-session" as const,
-          sessionId: targetSessionId,
-          sessionKind: sessionRequest.isChildSession === true ? ("child" as const) : ("session" as const),
-          ...(agentId
-            ? { agentId }
-            : {}),
-          ...(readOptionalString(sessionRequest.title)
-            ? { label: sessionRequest.title!.trim() }
-            : {}),
-          ...(readOptionalString(sessionRequest.parentSessionId)
-            ? { parentSessionId: sessionRequest.parentSessionId!.trim() }
-            : {}),
-        }
-      : undefined;
+    if (normalizedStatus === "failed") {
+      return {
+        kind: "result",
+        name: toolName,
+        detail,
+        input: buildStructuredInput(args),
+        text: output,
+        callId: toolCallId || undefined,
+        hasResult: Boolean(output),
+        statusTone: "error",
+        statusLabel: texts.toolStatusFailedLabel,
+        ...(agentId ? { agentId } : {}),
+        ...(action ? { action } : {}),
+      };
+    }
+
+    if (normalizedStatus === "completed") {
+      return {
+        kind: "result",
+        name: toolName,
+        detail,
+        input: buildStructuredInput(args),
+        text: output,
+        callId: toolCallId || undefined,
+        hasResult: Boolean(output),
+        statusTone: "success",
+        statusLabel: texts.toolStatusCompletedLabel,
+        ...(agentId ? { agentId } : {}),
+        ...(action ? { action } : {}),
+      };
+    }
 
-  if (normalizedStatus === "failed") {
     return {
       kind: "result",
       name: toolName,
       detail,
+      input: buildStructuredInput(args),
       text: output,
       callId: toolCallId || undefined,
       hasResult: Boolean(output),
-      statusTone: "error",
-      statusLabel: texts.toolStatusFailedLabel,
+      statusTone: "running",
+      statusLabel: texts.toolStatusRunningLabel,
       ...(agentId ? { agentId } : {}),
       ...(action ? { action } : {}),
     };
   }
 
-  if (normalizedStatus === "completed") {
-    return {
-      kind: "result",
-      name: toolName,
-      detail,
-      text: output,
-      callId: toolCallId || undefined,
-      hasResult: Boolean(output),
-      statusTone: "success",
-      statusLabel: texts.toolStatusCompletedLabel,
-      ...(agentId ? { agentId } : {}),
-      ...(action ? { action } : {}),
-    };
+  const sessionSpawn = readSessionSpawnResult(result);
+  if (!sessionSpawn) {
+    return null;
   }
 
+  const detail = buildSessionSpawnDetail(sessionSpawn, args);
+  const output = buildSessionSpawnOutput(sessionSpawn);
+  const targetSessionId = readOptionalString(sessionSpawn.sessionId);
+  const agentId = resolveToolInvocationAgentId({ args, result: sessionSpawn });
+  const action =
+    targetSessionId
+      ? {
+          kind: "open-session" as const,
+          sessionId: targetSessionId,
+          sessionKind: sessionSpawn.isChildSession === true ? ("child" as const) : ("session" as const),
+          ...(agentId
+            ? { agentId }
+            : {}),
+          ...(readOptionalString(sessionSpawn.title)
+            ? { label: sessionSpawn.title!.trim() }
+            : {}),
+          ...(readOptionalString(sessionSpawn.parentSessionId)
+            ? { parentSessionId: sessionSpawn.parentSessionId!.trim() }
+            : {}),
+        }
+      : undefined;
+
   return {
     kind: "result",
     name: toolName,
     detail,
+    input: buildStructuredInput(args),
     text: output,
     callId: toolCallId || undefined,
     hasResult: Boolean(output),
-    statusTone: "running",
-    statusLabel: texts.toolStatusRunningLabel,
+    statusTone: "success",
+    statusLabel: texts.toolStatusCompletedLabel,
     ...(agentId ? { agentId } : {}),
     ...(action ? { action } : {}),
   };

package/src/components/chat/adapters/chat-message.session-spawn-tool-card.test.ts

@@ -0,0 +1,104 @@
+import { ToolInvocationStatus, type UiMessage } from "@nextclaw/agent-chat";
+import { adaptChatMessages } from "@/components/chat/adapters/chat-message.adapter";
+import type { ChatMessageSource } from "@/components/chat/adapters/chat-message.adapter";
+
+const defaultTexts = {
+  roleLabels: {
+    user: "You",
+    assistant: "Assistant",
+    tool: "Tool",
+    system: "System",
+    fallback: "Message",
+  },
+  reasoningLabel: "Reasoning",
+  toolCallLabel: "Tool Call",
+  toolResultLabel: "Tool Result",
+  toolInputLabel: "Input",
+  toolNoOutputLabel: "No output",
+  toolOutputLabel: "Output",
+  toolStatusPreparingLabel: "Preparing",
+  toolStatusRunningLabel: "Running",
+  toolStatusCompletedLabel: "Completed",
+  toolStatusFailedLabel: "Failed",
+  toolStatusCancelledLabel: "Cancelled",
+  imageAttachmentLabel: "Image attachment",
+  fileAttachmentLabel: "File attachment",
+  unknownPartLabel: "Unknown Part",
+};
+
+function adapt(uiMessages: UiMessage[]) {
+  return adaptChatMessages({
+    uiMessages: uiMessages as unknown as ChatMessageSource[],
+    formatTimestamp: (value) => `formatted:${value}`,
+    texts: defaultTexts,
+  });
+}
+
+it("renders child-session creation cards for sessions_spawn and keeps child-panel navigation", () => {
+  const adapted = adapt([
+    {
+      id: "assistant-child-session-create",
+      role: "assistant",
+      parts: [
+        {
+          type: "tool-invocation",
+          toolInvocation: {
+            status: ToolInvocationStatus.RESULT,
+            toolCallId: "sessions-spawn-child-only-1",
+            toolName: "sessions_spawn",
+            args: '{"scope":"child","title":"Verifier","task":"Prepare a child workspace"}',
+            result: {
+              kind: "nextclaw.session",
+              sessionId: "child-session-2",
+              agentId: "verifier-agent",
+              isChildSession: true,
+              title: "Verifier",
+              sessionType: "native",
+              lifecycle: "persistent",
+              parentSessionId: "parent-session-2",
+              createdAt: "2026-04-09T09:00:00.000Z",
+            },
+          },
+        },
+      ],
+    },
+  ]);
+
+  expect(adapted[0]?.parts[0]).toMatchObject({
+    type: "tool-card",
+    card: {
+      toolName: "sessions_spawn",
+      agentId: "verifier-agent",
+      summary: "title: Verifier · session: child-session-2",
+      input: `{
+  "scope": "child",
+  "title": "Verifier",
+  "task": "Prepare a child workspace"
+}`,
+      output: [
+        "Session ID: child-session-2",
+        "",
+        "Target: child",
+        "",
+        "Title: Verifier",
+        "",
+        "Session Type: native",
+        "",
+        "Lifecycle: persistent",
+        "",
+        "Parent Session ID: parent-session-2",
+        "",
+        "Created At: 2026-04-09T09:00:00.000Z",
+      ].join("\n"),
+      statusTone: "success",
+      action: {
+        kind: "open-session",
+        sessionId: "child-session-2",
+        sessionKind: "child",
+        agentId: "verifier-agent",
+        label: "Verifier",
+        parentSessionId: "parent-session-2",
+      },
+    },
+  });
+});