@nextclaw/ui 0.27.4 → 0.27.5-beta.0

package/src/features/chat/features/message/utils/__tests__/chat-message-timeline.utils.test.ts

@@ -20,6 +20,22 @@ const visibleMessage = {
 } satisfies NcpMessage;
 
 describe("chat message timeline visibility", () => {
+  it("places an async question at its tool call between assistant text parts", () => {
+    const source = { ...visibleMessage, parts: [
+      { type: "text" as const, text: "先说明。" },
+      { type: "tool-invocation" as const, toolCallId: "call-1", toolName: "request_user_input_async", state: "result" as const,
+        args: "{}", result: { accepted: true, questionIds: ["q-1"] } },
+      { type: "text" as const, text: "稍后继续。" },
+    ] } satisfies NcpMessage;
+    const question = { ...visibleMessage, id: "assistant-question-1", parts: [
+      { type: "text" as const, text: "城市？ (北京 / 上海)" },
+      { type: "extension" as const, extensionType: "nextclaw.user-question", data: { questions: [{ id: "q-1", title: "城市？", options: ["北京", "上海"] }] } },
+    ] } satisfies NcpMessage;
+    const projected = projectVisibleChatMessages([source, question]);
+    expect(projected).toHaveLength(1);
+    expect(projected[0]?.parts.map((part) => part.type)).toEqual(["text", "extension", "text"]);
+    expect(projected[0]?.parts[1]).toMatchObject({ data: { questions: [{ id: "q-1" }] } });
+  });
   it("places context compaction between surrounding visible messages", () => {
     const afterMessage = {
       ...visibleMessage,

package/src/features/chat/features/message/utils/__tests__/chat-message.utils.test.ts

@@ -118,6 +118,23 @@ it("maps context compaction extensions into stable process parts", () => {
   }]);
 });
 
+it("keeps assistant prose on both sides of an unanchored question fallback", () => {
+  const data = { questions: [{ id: "question-1", title: "Which format?", options: ["PDF", "DOCX"] }] };
+  const adapted = adapt([{
+    id: "assistant-question-older",
+    role: "assistant",
+    parts: [
+      { type: "text", text: "Before." },
+      { type: "text", text: "Which format? (PDF / DOCX)" },
+      { type: "extension", extensionType: "nextclaw.user-question", data },
+      { type: "text", text: "After." },
+    ],
+  }]);
+  expect(adapted[0]?.parts.map((part) => part.type)).toEqual(["markdown", "custom", "markdown"]);
+  expect(adapted[0]?.parts[0]).toMatchObject({ text: "Before." });
+  expect(adapted[0]?.parts[2]).toMatchObject({ text: "After." });
+});
+
 it("renders a structured user question at its message position without repeating fallback text", () => {
   const data = { questions: [{ id: "question-1", title: "Which format?", options: ["PDF", "DOCX"] }] };
   const adapted = adapt([{

package/src/features/chat/features/message/utils/chat-message-timeline.utils.ts

@@ -13,10 +13,10 @@ import {
   readObservationEventPartData,
   type ObservationEventPartData,
 } from "@/features/chat/features/message/utils/chat-message-observation-event.utils";
+import { placeUserQuestionsInAssistantBody } from "@/features/chat/features/message/utils/chat-user-question-timeline.utils";
 
 const INHERITED_FROM_SESSION_METADATA_KEY = "inherited_from_session_id";
-export const CONTEXT_COMPACTION_PART_EXTENSION_TYPE =
-  "nextclaw.context-compaction";
+export const CONTEXT_COMPACTION_PART_EXTENSION_TYPE = "nextclaw.context-compaction";
 
 export type ContextCompactionPartData = {
   id: string;
@@ -280,7 +280,7 @@ function projectVisibleChatMessageState(
       status: "pending",
     };
   }
-  return { messages, inlineCompactionMessageIds, observationEvents };
+  return { ...placeUserQuestionsInAssistantBody(messages, observationEvents), inlineCompactionMessageIds };
 }
 
 export function projectVisibleChatMessages(

package/src/features/chat/features/message/utils/chat-message.utils.ts

@@ -122,16 +122,23 @@ export function adaptChatMessage(
       texts: params.texts,
     }))
     .filter((part) => part !== null);
-  const hasQuestionPart = parts.some(
-    (part) => part.type === "custom" && part.customType === "nextclaw.user-question",
-  );
   const reply = message.meta?.userQuestionReply;
   const displayParts: ChatMessageViewModel["parts"] = reply
     ? [
         { type: "custom", id: reply.questionId, customType: "nextclaw.user-question-reply", data: reply },
         ...(reply.answer ? [{ type: "markdown" as const, text: reply.answer }] : []),
       ]
-    : hasQuestionPart ? parts.filter((part) => part.type !== "markdown") : parts;
+    : parts.filter((part, index) => {
+        const next = parts[index + 1];
+        if (part.type !== "markdown" || next?.type !== "custom" || next.customType !== "nextclaw.user-question") return true;
+        const entries = next.data && typeof next.data === "object" && "questions" in next.data ? next.data.questions : null;
+        if (!Array.isArray(entries)) return true;
+        const fallback = entries.map((entry) => {
+          if (!entry || typeof entry.title !== "string") return "";
+          return `${entry.title}${Array.isArray(entry.options) && entry.options.length ? ` (${entry.options.join(" / ")})` : ""}`;
+        }).join("\n");
+        return part.text !== fallback;
+      });
   return {
     id: message.id,
     role: resolveUiRole(message.role),

package/src/features/chat/features/message/utils/chat-user-question-timeline.utils.ts

@@ -0,0 +1,42 @@
+import type { NcpMessage } from "@nextclaw/ncp";
+
+function questionIdsFromToolPart(part: NcpMessage["parts"][number]): string[] {
+  if (part.type !== "tool-invocation" || part.toolName !== "request_user_input_async" ||
+    !part.result || typeof part.result !== "object" || Array.isArray(part.result)) return [];
+  const { accepted, questionIds } = part.result as { accepted?: unknown; questionIds?: unknown };
+  return accepted === true && Array.isArray(questionIds) && questionIds.every((id) => typeof id === "string")
+    ? questionIds : [];
+}
+
+function questionEntries(part: NcpMessage["parts"][number]): Array<{ id: string }> {
+  if (part.type !== "extension" || part.extensionType !== "nextclaw.user-question") return [];
+  const entries = part.data && typeof part.data === "object" && "questions" in part.data ? part.data.questions : null;
+  return Array.isArray(entries) ? entries.filter((entry): entry is { id: string } => Boolean(entry && typeof entry.id === "string")) : [];
+}
+
+export function placeUserQuestionsInAssistantBody<T extends { boundaryIndex: number }>(
+  messages: NcpMessage[], observationEvents: T[],
+): { messages: NcpMessage[]; observationEvents: T[] } {
+  const entriesById = new Map(messages.flatMap((message) => message.parts.flatMap((part) => questionEntries(part).map((entry) => [entry.id, entry] as const))));
+  const anchoredIds = new Set(messages.flatMap((message) => message.parts.flatMap((part) =>
+    questionIdsFromToolPart(part).filter((id) => entriesById.has(id)))));
+  if (!anchoredIds.size) return { messages, observationEvents };
+  const removedIndices: number[] = [];
+  const projected = messages.flatMap((message, index) => {
+    const questionPart = message.parts.find((part) => questionEntries(part).length);
+    if (questionPart && message.id.startsWith("assistant-question-")) {
+      const remaining = questionEntries(questionPart).filter((entry) => !anchoredIds.has(entry.id));
+      if (!remaining.length) { removedIndices.push(index); return []; }
+      return [{ ...message, parts: [{ type: "extension" as const, extensionType: "nextclaw.user-question", data: { questions: remaining } }] }];
+    }
+    const parts = message.parts.flatMap((part): NcpMessage["parts"] => {
+      const questions = questionIdsFromToolPart(part).flatMap((id) => entriesById.get(id) ?? []);
+      return questions.length
+        ? [{ type: "extension", extensionType: "nextclaw.user-question", data: { questions } }]
+        : [part];
+    });
+    return [{ ...message, parts }];
+  });
+  return { messages: projected, observationEvents: observationEvents.map((entry) => ({ ...entry,
+    boundaryIndex: entry.boundaryIndex - removedIndices.filter((index) => index < entry.boundaryIndex).length })) };
+}

package/dist/assets/agents-p_wcGhC3.js

@@ -1 +0,0 @@
-import{t as e}from"./agents-BdeFtIOV.js";export{e as AgentsPage};

package/dist/assets/apps-CKFrWb00.js

@@ -1 +0,0 @@
-import{ot as e}from"./app-presenter-provider-BB3Xl8b0.js";export{e as AppsPanel};

package/dist/assets/cron-UqsFT41c.js

@@ -1 +0,0 @@
-import{K as e}from"./app-presenter-provider-BB3Xl8b0.js";export{e as CronJobResource};

package/dist/assets/doc-browser-2VjSkax1.js

@@ -1 +0,0 @@
-import{St as e}from"./app-presenter-provider-BB3Xl8b0.js";export{e as DocBrowser};

package/dist/assets/inbox-D62apR2j.js

@@ -1 +0,0 @@
-import{z as e}from"./app-presenter-provider-BB3Xl8b0.js";export{e as InboxPage};

package/dist/assets/mcp-marketplace-page-oHCbBkS-.js

@@ -1 +0,0 @@
-import{st as e}from"./app-presenter-provider-BB3Xl8b0.js";export{e as McpMarketplacePage};

package/dist/assets/panel-apps-CniMi7QW.js

@@ -1 +0,0 @@
-import{s as e,v as t}from"./theme-provider-BsJ6HxeX.js";import"./app-presenter-provider-BB3Xl8b0.js";export{t as PanelAppHostProvider,e as PanelAppRuntimeSurface};

package/dist/assets/remote-CsJMF8OR.js

@@ -1 +0,0 @@
-import{F as e}from"./app-presenter-provider-BB3Xl8b0.js";export{e as RemoteAccessPage};