@nextclaw/ui 0.12.3 → 0.12.5

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",
+      },
+    },
+  });
+});

package/src/components/chat/chat-child-session-panel.tsx

@@ -1,13 +1,18 @@
-import { ArrowLeft, Loader2, X } from 'lucide-react';
-import { ChatMessageListContainer } from '@/components/chat/containers/chat-message-list.container';
-import { useNcpChildSessionTabsView } from '@/components/chat/ncp/session-conversation/use-ncp-child-session-tabs-view';
-import { useNcpSessionConversation } from '@/components/chat/ncp/session-conversation/use-ncp-session-conversation';
-import type { ChatChildSessionTab } from '@/components/chat/stores/chat-thread.store';
-import { AgentIdentityAvatar } from '@/components/common/agent-identity';
-import { Tabs, TabsList, TabsTrigger } from '@/components/ui/tabs';
-import { t } from '@/lib/i18n';
-import { cn } from '@/lib/utils';
-import type { ChatToolActionViewModel } from '@nextclaw/agent-chat-ui';
+import { useRef } from "react";
+import { ArrowLeft, Loader2, X } from "lucide-react";
+import { useStickyBottomScroll } from "@nextclaw/agent-chat-ui";
+import { ChatMessageListContainer } from "@/components/chat/containers/chat-message-list.container";
+import {
+  useNcpChildSessionTabsView,
+  type ResolvedChildSessionTab,
+} from "@/components/chat/ncp/session-conversation/use-ncp-child-session-tabs-view";
+import { useNcpSessionConversation } from "@/components/chat/ncp/session-conversation/use-ncp-session-conversation";
+import type { ChatChildSessionTab } from "@/components/chat/stores/chat-thread.store";
+import { AgentIdentityAvatar } from "@/components/common/agent-identity";
+import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
+import { t } from "@/lib/i18n";
+import { cn } from "@/lib/utils";
+import type { ChatToolActionViewModel } from "@nextclaw/agent-chat-ui";
 
 type ChatChildSessionPanelProps = {
   tabs: readonly ChatChildSessionTab[];
@@ -27,39 +32,84 @@ function ChildSessionPanelConversation({
 }) {
   const agent = useNcpSessionConversation(sessionKey);
   const messages = agent.visibleMessages;
+  const scrollRef = useRef<HTMLDivElement>(null);
+  const { onScroll } = useStickyBottomScroll({
+    scrollRef,
+    resetKey: sessionKey,
+    isLoading: agent.isHydrating,
+    hasContent: messages.length > 0,
+    contentVersion: messages[messages.length - 1] ?? null,
+    stickyThresholdPx: 20,
+  });
 
-  if (agent.isHydrating) {
-    return (
-      <div className="flex h-full items-center justify-center text-sm text-gray-500">
-        <Loader2 className="mr-2 h-4 w-4 animate-spin" />
-        {t('chatChildSessionLoading')}
-      </div>
-    );
-  }
+  return (
+    <div
+      ref={scrollRef}
+      onScroll={onScroll}
+      className="h-full overflow-y-auto custom-scrollbar"
+    >
+      {agent.isHydrating ? (
+        <div className="flex h-full items-center justify-center text-sm text-gray-500">
+          <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+          {t("chatChildSessionLoading")}
+        </div>
+      ) : agent.hydrateError ? (
+        <div className="px-4 py-5 text-sm text-rose-600">
+          {agent.hydrateError.message}
+        </div>
+      ) : messages.length === 0 && !agent.isRunning ? (
+        <div className="px-4 py-5 text-sm text-gray-500">
+          {t("chatChildSessionEmpty")}
+        </div>
+      ) : (
+        <div className="px-4 py-5">
+          <ChatMessageListContainer
+            messages={messages}
+            isSending={agent.isRunning}
+            onToolAction={onToolAction}
+          />
+        </div>
+      )}
+    </div>
+  );
+}
 
-  if (agent.hydrateError) {
-    return (
-      <div className="px-4 py-5 text-sm text-rose-600">
-        {agent.hydrateError.message}
-      </div>
-    );
-  }
+function ChildSessionPanelMetaChip({ value }: { value: string }) {
+  return (
+    <span className="inline-flex max-w-full items-center rounded-full border border-gray-200/80 bg-gray-50/90 px-2.5 py-1 text-[11px] font-medium text-gray-600">
+      <span className="truncate">{value}</span>
+    </span>
+  );
+}
 
-  if (messages.length === 0 && !agent.isRunning) {
-    return (
-      <div className="px-4 py-5 text-sm text-gray-500">
-        {t('chatChildSessionEmpty')}
-      </div>
-    );
+function ChildSessionPanelMetaStrip({ tab }: { tab: ResolvedChildSessionTab }) {
+  const metaItems = [
+    tab.sessionTypeLabel,
+    tab.preferredModel,
+    tab.projectName,
+  ].filter((value): value is string => Boolean(value?.trim()));
+
+  if (metaItems.length === 0 && !tab.projectRoot) {
+    return null;
   }
 
   return (
-    <div className="px-4 py-5">
-      <ChatMessageListContainer
-        messages={messages}
-        isSending={agent.isRunning}
-        onToolAction={onToolAction}
-      />
+    <div className="mt-3 space-y-2">
+      {metaItems.length > 0 ? (
+        <div className="flex flex-wrap gap-1.5">
+          {metaItems.map((item) => (
+            <ChildSessionPanelMetaChip key={item} value={item} />
+          ))}
+        </div>
+      ) : null}
+      {tab.projectRoot ? (
+        <div
+          title={tab.projectRoot}
+          className="truncate rounded-xl border border-gray-200/70 bg-gray-50/80 px-2.5 py-2 font-mono text-[11px] text-gray-500"
+        >
+          {tab.projectRoot}
+        </div>
+      ) : null}
     </div>
   );
 }
@@ -77,7 +127,9 @@ export function ChatChildSessionPanel({
     resolvedTabs.find((tab) => tab.sessionKey === activeSessionKey) ??
     resolvedTabs[0] ??
     null;
-  const hasParentSession = resolvedTabs.some((tab) => Boolean(tab.parentSessionKey));
+  const hasParentSession = resolvedTabs.some((tab) =>
+    Boolean(tab.parentSessionKey),
+  );
   const shouldShowTabs = resolvedTabs.length > 1;
 
   if (!activeTab) {
@@ -93,18 +145,18 @@ export function ChatChildSessionPanel({
               type="button"
               onClick={onBackToParent}
               className={cn(
-                'inline-flex items-center gap-1 text-xs font-medium text-gray-600 transition-colors hover:text-gray-900',
-                !hasParentSession && 'pointer-events-none opacity-0',
+                "inline-flex items-center gap-1 text-xs font-medium text-gray-600 transition-colors hover:text-gray-900",
+                !hasParentSession && "pointer-events-none opacity-0",
               )}
             >
               <ArrowLeft className="h-3.5 w-3.5" />
-              <span>{t('chatBackToParent')}</span>
+              <span>{t("chatBackToParent")}</span>
             </button>
             <button
               type="button"
               onClick={onClose}
               className="rounded-full border border-gray-200/80 p-1.5 text-gray-500 transition-colors hover:bg-gray-100 hover:text-gray-900"
-              aria-label={t('chatChildSessionClosePanel')}
+              aria-label={t("chatChildSessionClosePanel")}
             >
               <X className="h-4 w-4" />
             </button>
@@ -138,20 +190,26 @@ export function ChatChildSessionPanel({
                           className="h-4 w-4 shrink-0"
                         />
                       ) : null}
-                      <span className="max-w-[132px] truncate">{tab.title}</span>
+                      <span className="max-w-[132px] truncate">
+                        {tab.title}
+                      </span>
                     </TabsTrigger>
                   ))}
                 </TabsList>
               </Tabs>
             </div>
           ) : null}
+          <ChildSessionPanelMetaStrip tab={activeTab} />
         </div>
 
-        <div className="flex-1 min-h-0 overflow-y-auto custom-scrollbar">
+        <div className="flex-1 min-h-0">
           {resolvedTabs.map((tab) => (
             <div
               key={tab.sessionKey}
-              className={cn(tab.sessionKey === activeSessionKey ? 'block' : 'hidden')}
+              className={cn(
+                "h-full",
+                tab.sessionKey === activeSessionKey ? "block" : "hidden",
+              )}
             >
               <ChildSessionPanelConversation
                 sessionKey={tab.sessionKey}

package/src/components/chat/chat-page-runtime.test.ts

@@ -6,7 +6,9 @@ import {
   resolveSelectedModelValue,
   resolveSelectedThinkingLevelValue
 } from '@/components/chat/chat-session-preference-governance';
-import { shouldRefreshDraftSessionId } from '@/components/chat/ncp/NcpChatPage';
+import {
+  shouldClearPendingProjectRootOverride
+} from '@/components/chat/ncp/NcpChatPage';
 
 const modelOptions = [
   {
@@ -155,33 +157,28 @@ describe('resolveSelectedModelValue', () => {
   });
 });
 
-describe('shouldRefreshDraftSessionId', () => {
-  it('does not replace the initial draft session id on first mount', () => {
+describe('shouldClearPendingProjectRootOverride', () => {
+  it('does not clear an unrelated session project override', () => {
     expect(
-      shouldRefreshDraftSessionId({
-        previousSelectedSessionKey: undefined,
-        nextSelectedSessionKey: null
+      shouldClearPendingProjectRootOverride({
+        pendingProjectRoot: '/tmp/project-alpha',
+        pendingProjectRootSessionKey: 'draft-project-alpha',
+        sessionKey: 'session-existing',
+        selectedSessionProjectRoot: '/tmp/project-alpha'
       })
     ).toBe(false);
   });
 
-  it('replaces the draft session id after leaving an existing session', () => {
+  it('clears the override only after the bound session reflects the same project root', () => {
     expect(
-      shouldRefreshDraftSessionId({
-        previousSelectedSessionKey: 'session-1',
-        nextSelectedSessionKey: null
+      shouldClearPendingProjectRootOverride({
+        pendingProjectRoot: '/tmp/project-alpha',
+        pendingProjectRootSessionKey: 'draft-after-refresh',
+        sessionKey: 'draft-after-refresh',
+        selectedSessionProjectRoot: '/tmp/project-alpha'
       })
     ).toBe(true);
   });
-
-  it('does not replace the draft session id while staying on the same session', () => {
-    expect(
-      shouldRefreshDraftSessionId({
-        previousSelectedSessionKey: 'session-1',
-        nextSelectedSessionKey: 'session-1'
-      })
-    ).toBe(false);
-  });
 });
 
 describe('resolveRecentSessionPreferredModel', () => {