@nextclaw/ui 0.26.5 → 0.27.1

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

@@ -23,7 +23,7 @@ function createSnapshot(overrides: Partial<AvailabilitySnapshot> = {}): Availabi
 }
 
 describe('ncp-chat-input-availability.utils', () => {
-  it('keeps the composer editable during cold start while runtime blocking still prevents send', () => {
+  it('keeps editing and sending available when runtime readiness is misreported', () => {
     const snapshot = createSnapshot({
       isProviderStateResolved: false,
       modelOptions: [],
@@ -35,25 +35,7 @@ describe('ncp-chat-input-availability.utils', () => {
     expect(isNcpChatComposerDisabled(snapshot)).toBe(false);
     expect(
       isNcpChatSendDisabled({
-        snapshot,
         hasSendableDraft: true,
-        isRuntimeBlocked: true,
-      })
-    ).toBe(true);
-  });
-
-  it('does not block send only because model options have not loaded yet', () => {
-    const snapshot = createSnapshot({
-      isProviderStateResolved: false,
-      modelOptions: [],
-      sessionTypeUnavailable: false,
-    });
-
-    expect(
-      isNcpChatSendDisabled({
-        snapshot,
-        hasSendableDraft: true,
-        isRuntimeBlocked: false,
       })
     ).toBe(false);
   });
@@ -81,25 +63,15 @@ describe('ncp-chat-input-availability.utils', () => {
     expect(isNcpChatComposerDisabled(snapshot)).toBe(false);
     expect(
       isNcpChatSendDisabled({
-        snapshot,
         hasSendableDraft: true,
-        isRuntimeBlocked: false,
       })
     ).toBe(false);
   });
 
   it('blocks send when there is no sendable draft', () => {
-    const snapshot = createSnapshot({
-      isProviderStateResolved: true,
-      modelOptions: [],
-      sessionTypeUnavailable: true,
-    });
-
     expect(
       isNcpChatSendDisabled({
-        snapshot,
         hasSendableDraft: false,
-        isRuntimeBlocked: false,
       })
     ).toBe(true);
   });

package/src/features/chat/features/input/utils/ncp-chat-input-availability.utils.ts

@@ -30,13 +30,6 @@ export function isNcpChatComposerDisabled(
 
 export function isNcpChatSendDisabled(params: {
   hasSendableDraft: boolean;
-  snapshot: ChatInputAvailabilitySnapshot;
-  isRuntimeBlocked: boolean;
 }): boolean {
-  const { hasSendableDraft, isRuntimeBlocked } = params;
-
-  return (
-    isRuntimeBlocked ||
-    !hasSendableDraft
-  );
+  return !params.hasSendableDraft;
 }

package/src/features/chat/features/message/components/__tests__/chat-message-list-skill-preview.container.test.tsx

@@ -23,6 +23,8 @@ function ChatMessageListContainer({
 }
 
 const captures = vi.hoisted(() => ({
+  resolveResource: vi.fn(),
+  openResource: vi.fn(),
   renders: [] as Array<{
     onInlineTokenClick?: (token: unknown) => void;
   }>,
@@ -98,6 +100,8 @@ vi.mock("@/shared/lib/i18n", () => ({
 }));
 
 beforeEach(() => {
+  captures.resolveResource.mockReset();
+  captures.openResource.mockReset();
   captures.renders = [];
   captures.openFilePreview.mockReset();
   captures.fetchSessionSkills.mockReset();
@@ -116,6 +120,15 @@ function clickSkill(token: Record<string, unknown>, sessionKey?: string): void {
   captures.renders[captures.renders.length - 1]?.onInlineTokenClick?.(token);
 }
 
+it("opens a quoted object through the resource opener instead of treating its URI as a local path", () => {
+  const page = { uri: "nextclaw://objects/agent/philosopher" };
+  captures.resolveResource.mockReturnValue(page);
+  clickSkill({ kind: "workspace_excerpt", path: page.uri, excerpt: "Description", label: "Philosopher", startLine: null, endLine: null });
+  expect(captures.resolveResource).toHaveBeenCalledWith(page.uri);
+  expect(captures.openResource).toHaveBeenCalledWith(page, "default", expect.any(Function));
+  expect(captures.openFilePreview).not.toHaveBeenCalled();
+});
+
 it("opens a persisted skill path without consulting the session catalog", () => {
   clickSkill({
     kind: "skill", ref: "global:/skills/review", name: "review", source: "global",
@@ -170,4 +183,4 @@ it("shows an error when a persisted v1 skill is no longer resolvable", async ()
 });
 
 vi.mock("react-router-dom", async (importOriginal) => ({ ...(await importOriginal<object>()), useNavigate: () => vi.fn() }));
-vi.mock("@/app/components/app-presenter-provider", () => ({ useAppPresenter: () => ({ pageResourceManager: { resolve: vi.fn(), open: vi.fn() } }) }));
+vi.mock("@/app/components/app-presenter-provider", () => ({ useAppPresenter: () => ({ pageResourceManager: { resolve: captures.resolveResource, open: captures.openResource } }) }));

package/src/features/chat/features/message/hooks/use-chat-inline-token-actions.ts

@@ -30,8 +30,13 @@ export function useChatInlineTokenActions(params: {
   const projectRoot = selectedSession?.projectRoot ?? selectedSession?.workingDir;
 
   const handleInlineTokenClick = useCallback((token: ChatInlineTokenViewModel) => {
-    if ((token.kind === CHAT_UI_RESOURCE_TOKEN_KIND || token.kind === CHAT_SYSTEM_OBJECT_TOKEN_KIND) && "key" in token) {
-      const page = appPresenter.pageResourceManager.resolve(token.key);
+    const resourceUri = (token.kind === CHAT_UI_RESOURCE_TOKEN_KIND || token.kind === CHAT_SYSTEM_OBJECT_TOKEN_KIND) && "key" in token
+      ? token.key
+      : token.kind === CHAT_WORKSPACE_EXCERPT_TOKEN_KIND && "excerpt" in token && token.path.startsWith("nextclaw://")
+        ? token.path
+        : null;
+    if (resourceUri) {
+      const page = appPresenter.pageResourceManager.resolve(resourceUri);
       if (page) appPresenter.pageResourceManager.open(page, 'default', navigate);
       return;
     }

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

@@ -1,4 +1,6 @@
 import type { ChatMessageMoreActionsViewModel } from "@nextclaw/agent-chat-ui";
+import { createElement } from "react";
+import { Braces } from "lucide-react";
 import {
   readNcpAiExecutionMetadata,
   type NcpAiExecutionMetadata,
@@ -159,6 +161,7 @@ export function buildChatMessageExecutionPresentation(params: {
       items: [
         {
           key: "ai-execution-metadata",
+          icon: createElement(Braces, { className: "h-4 w-4" }),
           label: labels.viewMetadata,
           dialog: {
             title: labels.metadataTitle,

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

@@ -190,6 +190,7 @@ export function buildChatMessageTexts(
     excerptCharacterCountTemplate: t("chatWorkspaceExcerptCharacterCount"),
     mermaidDiagramLabel: t("chatMermaidDiagram"),
     frontmatterLabel: t("chatMarkdownFrontmatter"),
+    detailsLabel: t("chatMarkdownDetails"),
     mermaidExpandLabel: t("chatMermaidExpand"),
     mermaidLoadingLabel: t("chatMermaidLoading"),
     mermaidRenderErrorLabel: t("chatMermaidRenderError"),

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

@@ -1,4 +1,6 @@
 import type { ChatMessageMoreActionsViewModel } from "@nextclaw/agent-chat-ui";
+import { createElement } from "react";
+import { Zap } from "lucide-react";
 import {
   readNcpAiExecutionMetadata,
   readNcpRunTriggerMetadata,
@@ -106,6 +108,7 @@ export function buildChatMessageTriggerDetails(params: {
     triggerLabel: labels.moreActions,
     items: [{
       key: "run-trigger-metadata",
+      icon: createElement(Zap, { className: "h-4 w-4" }),
       label: labels.viewTrigger,
       dialog: {
         title: labels.title,

package/src/features/chat/features/session/components/chat-sidebar-project-groups.tsx

@@ -262,7 +262,7 @@ export function ChatSidebarProjectGroups(props: ChatSidebarProjectGroupsProps) {
                         onClick={(event) => event.stopPropagation()}
                       />
                     </PopoverTrigger>
-                    <ChatPopoverContent align="end" className="w-56 p-2">
+                    <ChatPopoverContent align="end" variant="menu">
                       <ChatSessionHeaderMenuItem
                         icon={FolderMinus}
                         label={t("projectsRemoveFromList")}

package/src/features/chat/features/session/components/session-header/chat-session-metadata-dialog.tsx

@@ -29,7 +29,7 @@ export function ChatSessionMetadataDialog({
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
       <DialogContent className="max-w-2xl gap-0 overflow-hidden p-0">
-        <DialogHeader className="border-b border-border px-5 py-4 pr-12">
+        <DialogHeader className="border-b border-border px-5 py-4">
           <DialogTitle className="text-base">{t('chatSessionMetadataDialogTitle')}</DialogTitle>
           <DialogDescription className="sr-only">
             {t('chatSessionMetadataDialogDescription')}

package/src/features/chat/features/session/components/session-header/chat-session-project-badge.tsx

@@ -56,8 +56,8 @@ export function ChatSessionProjectBadge({
         <PopoverTrigger asChild>
           <button
             type="button"
-            title={projectRoot ?? undefined}
-            className="min-w-0 max-w-[320px] shrink rounded-full border border-border bg-muted px-2 py-0.5 text-[11px] font-medium text-muted-foreground transition-colors hover:border-primary/35 hover:bg-[var(--interaction-hover)] hover:text-accent-foreground disabled:cursor-not-allowed disabled:opacity-60"
+            title={projectRoot ? `${projectName}\n${projectRoot}` : projectName}
+            className="min-w-0 max-w-[40%] shrink-0 rounded-full border border-border bg-muted px-2 py-0.5 text-[11px] font-medium text-muted-foreground transition-colors hover:bg-[var(--interaction-hover)] hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-border disabled:cursor-not-allowed disabled:opacity-60"
             aria-label={t('chatSessionSetProject')}
             disabled={isProjectPending}
           >

package/src/features/chat/features/session/utils/__tests__/chat-session-route.utils.test.ts

@@ -1,11 +1,37 @@
 import { describe, expect, it } from 'vitest';
 import {
   CHAT_DRAFT_SESSION_PATH,
+  buildSessionPanelUrl,
+  parseSessionKeyFromPanelUrl,
+  encodeSessionRouteId,
   buildSessionPath,
   parseSessionKeyFromRoute,
 } from '@/features/chat/features/session/utils/chat-session-route.utils';
 
 describe('chat session route utils', () => {
+  it.each(['ncp-mu2x4zdy-9wzl0otb', 'agent:main:会话/一 %2F', 'sid_literal', 'draft'])(
+    'round-trips resource and browser links for %s', (id) => {
+      expect(buildSessionPanelUrl(id)).toBe(`nextclaw://sessions/${encodeURIComponent(id)}`);
+      expect(parseSessionKeyFromPanelUrl(buildSessionPanelUrl(id))).toBe(id);
+      expect(parseSessionKeyFromRoute(buildSessionPath(id).slice('/chat/'.length))).toBe(id);
+      expect(parseSessionKeyFromPanelUrl(`nextclaw://chat-session/${encodeSessionRouteId(id)}`)).toBe(id);
+    },
+  );
+  it('keeps ordinary IDs readable in the address bar', () => {
+    expect(buildSessionPath('ncp-mu2x4zdy-9wzl0otb')).toBe('/chat/ncp-mu2x4zdy-9wzl0otb');
+  });
+  it.each(['sessions', 'chat-session', 'objects/chat-session', 'objects/chat-sessions'])(
+    'recovers already delivered %s links', (namespace) => {
+      expect(parseSessionKeyFromPanelUrl(`nextclaw://${namespace}/ncp-mu2x4zdy-9wzl0otb`)).toBe('ncp-mu2x4zdy-9wzl0otb');
+    },
+  );
+  it.each(['nextclaw://sessions/', 'nextclaw://sessions/a/b', 'nextclaw://sessions/%ZZ',
+    'nextclaw://sessions/%20', 'nextclaw://chat-session/sid_%%%','nextclaw://sessions/a?other=b',
+    'https://sessions/a', 'nextclaw://user@sessions/a', 'nextclaw://objects/project/a'])(
+    'rejects malformed or unrelated session links: %s', (uri) => {
+      expect(parseSessionKeyFromPanelUrl(uri)).toBeNull();
+    },
+  );
   it('keeps the draft route separate from real session keys', () => {
     expect(CHAT_DRAFT_SESSION_PATH).toBe('/chat/draft');
     expect(parseSessionKeyFromRoute('draft')).toBeNull();

package/src/features/chat/features/session/utils/chat-session-preference-governance.utils.ts

@@ -129,15 +129,17 @@ export function resolveSelectedThinkingLevelValue(params: {
   });
 }
 
-export function resolveRecentSessionPreferredValue<T>(params: {
+export function resolveRecentSessionPreferenceSnapshot(params: {
   sessions: readonly SessionEntryView[];
   selectedSessionKey?: string | null;
   sessionType?: string | null;
-  readPreference: (session: SessionEntryView) => T | null | undefined;
-}): T | undefined {
-  const { sessions, selectedSessionKey, sessionType, readPreference } = params;
+}): {
+  model: string;
+  thinking?: ThinkingLevel;
+} | undefined {
+  const { sessions, selectedSessionKey, sessionType } = params;
   const targetSessionType = normalizeSessionType(sessionType);
-  let bestValue: T | undefined;
+  let bestValue: { model: string; thinking?: ThinkingLevel } | undefined;
   let bestTimestamp = Number.NEGATIVE_INFINITY;
   for (const session of sessions) {
     if (session.key === selectedSessionKey) {
@@ -146,14 +148,18 @@ export function resolveRecentSessionPreferredValue<T>(params: {
     if (normalizeSessionType(session.sessionType) !== targetSessionType) {
       continue;
     }
-    const value = readPreference(session);
-    if (value === null || value === undefined) {
+    const model = session.preferredModel?.trim() || undefined;
+    const thinking = session.preferredThinking ?? undefined;
+    if (model === undefined) {
       continue;
     }
     const updatedAtTimestamp = Date.parse(session.updatedAt);
     const comparableTimestamp = Number.isFinite(updatedAtTimestamp) ? updatedAtTimestamp : Number.NEGATIVE_INFINITY;
     if (bestValue === undefined || comparableTimestamp > bestTimestamp) {
-      bestValue = value;
+      bestValue = {
+        model,
+        ...(thinking ? { thinking } : {}),
+      };
       bestTimestamp = comparableTimestamp;
     }
   }

package/src/features/chat/features/session/utils/chat-session-route.utils.ts

@@ -1,16 +1,9 @@
+import { createSessionResourceUri, parseSessionResourceUri } from '@nextclaw/shared';
+
 const SESSION_ROUTE_PREFIX = 'sid_';
 export const CHAT_SESSION_PANEL_KIND = 'chat-session';
-const SESSION_PANEL_PREFIX = 'nextclaw://chat-session/';
-
-export function buildSessionPanelUrl(sessionKey: string): string {
-  return SESSION_PANEL_PREFIX + encodeSessionRouteId(sessionKey);
-}
-
-export function parseSessionKeyFromPanelUrl(url: string): string | null {
-  return url.startsWith(SESSION_PANEL_PREFIX)
-    ? decodeSessionRouteId(url.slice(SESSION_PANEL_PREFIX.length))
-    : null;
-}
+export const buildSessionPanelUrl = createSessionResourceUri;
+export const parseSessionKeyFromPanelUrl = parseSessionResourceUri;
 export const CHAT_DRAFT_SESSION_PATH = '/chat/draft';
 const DRAFT_SESSION_ROUTE_ID = CHAT_DRAFT_SESSION_PATH.slice('/chat/'.length);
 
@@ -55,5 +48,9 @@ export function parseSessionKeyFromRoute(routeValue?: string): string | null {
 }
 
 export function buildSessionPath(sessionKey: string): string {
-  return `/chat/${encodeSessionRouteId(sessionKey)}`;
+  // Keep reserved historical route tokens unambiguous; ordinary IDs stay readable.
+  const routeId = sessionKey === DRAFT_SESSION_ROUTE_ID || sessionKey.startsWith(SESSION_ROUTE_PREFIX)
+    ? encodeSessionRouteId(sessionKey)
+    : encodeURIComponent(sessionKey);
+  return `/chat/${routeId}`;
 }

package/src/features/chat/features/welcome/components/__tests__/chat-welcome.test.tsx

@@ -1,6 +1,8 @@
 import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import { describe, expect, it, vi } from 'vitest';
 import { ChatWelcome } from '@/features/chat/features/welcome/components/chat-welcome';
+import { MemoryRouter } from 'react-router-dom';
+import { buildSessionPath } from '@/features/chat/features/session/utils/chat-session-route.utils';
 
 vi.mock(
   '@/features/chat/features/session/components/session-header/chat-session-project-dialog',
@@ -18,12 +20,14 @@ function renderWelcome(
   overrides: Partial<Parameters<typeof ChatWelcome>[0]> = {},
 ) {
   return render(
+    <MemoryRouter>
     <ChatWelcome
       agents={[
         { id: 'main', displayName: 'Main' },
         { id: 'engineer', displayName: 'Engineer' },
       ]}
       projectOptions={[]}
+      selectedProjectRoot="/tmp/project"
       selectedAgentId="main"
       selectedSessionType="native"
       sessionTypeOptions={sessionTypeOptions}
@@ -31,11 +35,34 @@ function renderWelcome(
       onSelectPrompt={vi.fn()}
       onSelectSessionType={vi.fn()}
       {...overrides}
-    />,
+    />
+    </MemoryRouter>,
   );
 }
 
 describe('ChatWelcome', () => {
+  it('offers an open-ended starting point outside an explicit project', () => {
+    renderWelcome({ selectedProjectRoot: null });
+    expect(screen.getByRole('button', { name: 'Talk about how I’ve been' })).toBeTruthy();
+    expect(screen.queryByRole('button', { name: 'Move this project forward' })).toBeNull();
+  });
+
+  it('links to the original session and can dismiss it without removing history', () => {
+    renderWelcome({ continuation: { sessionKey: 'session/one', title: 'A real conversation' } });
+    const link = screen.getByRole('link', { name: /A real conversation/ });
+    expect(link.getAttribute('href')).toBe(buildSessionPath('session/one'));
+    expect(screen.getByRole('button', { name: 'Talk about how I’ve been' })).toBeTruthy();
+    fireEvent.click(screen.getByRole('button', { name: 'Hide this conversation suggestion for now' }));
+    expect(screen.queryByRole('link')).toBeNull();
+    expect(screen.getByRole('button', { name: 'Move this project forward' })).toBeTruthy();
+  });
+
+  it('hides starting suggestions while composing but keeps context controls available', () => {
+    renderWelcome({ hasDraftContent: true });
+    expect(screen.queryByRole('button', { name: 'Move this project forward' })).toBeNull();
+    expect(screen.getByRole('combobox', { name: 'Draft agent' })).toBeTruthy();
+    expect(screen.getByRole('button', { name: 'Choose session type' })).toBeTruthy();
+  });
   it('renders a lightweight draft agent select and allows switching', () => {
     const onSelectAgent = vi.fn();
 
@@ -53,12 +80,10 @@ describe('ChatWelcome', () => {
   it('renders a single-purpose welcome surface with compact prompt suggestions', () => {
     renderWelcome({ agents: [{ id: 'main', displayName: 'Main' }] });
 
-    expect(screen.getByRole('heading', { name: 'What would you like to get done?' })).toBeTruthy();
+    expect(screen.getByRole('heading', { name: 'Where shall we start today?' })).toBeTruthy();
     expect(screen.queryByText(/Describe the goal/)).toBeNull();
     expect(screen.getByRole('group', { name: 'Task context' })).toBeTruthy();
-    const suggestion = screen.getByRole('button', { name: 'Review this project' });
-    expect(suggestion.className).toContain('rounded-full');
-    expect(suggestion.className).not.toContain('border');
+    const suggestion = screen.getByRole('button', { name: 'Move this project forward' });
     expect(suggestion.parentElement?.className).toContain('flex-wrap');
   });
 
@@ -67,7 +92,7 @@ describe('ChatWelcome', () => {
 
     renderWelcome({ onSelectPrompt });
 
-    fireEvent.click(screen.getByRole('button', { name: 'Review this project' }));
+    fireEvent.click(screen.getByRole('button', { name: 'Move this project forward' }));
 
     expect(onSelectPrompt).toHaveBeenCalledWith(
       expect.stringContaining('next three concrete things'),

package/src/features/chat/features/welcome/components/chat-conversation-welcome.tsx

@@ -19,11 +19,13 @@ import { useAgents } from "@/shared/hooks/use-agents";
 import { useProjects } from "@/shared/hooks/use-projects";
 import type { NcpSessionSummaryView } from "@/shared/lib/api";
 import { normalizeSessionProjectRootValue } from "@/shared/lib/session-project";
+import { resolveChatWelcomeContinuation } from "@/features/chat/features/welcome/utils/chat-welcome-continuation.utils";
 
 const EMPTY_NCP_SESSION_SUMMARIES: NcpSessionSummaryView[] = [];
 
 type ChatConversationWelcomeProps = {
   inputSlot: ReactNode;
+  hasDraftContent?: boolean;
   pendingProjectRoot: string | null;
   pendingSessionType: string;
   selectedSessionTypeValue: string | null;
@@ -34,6 +36,7 @@ type ChatConversationWelcomeProps = {
 
 export function ChatConversationWelcome({
   inputSlot,
+  hasDraftContent = false,
   pendingProjectRoot,
   pendingSessionType,
   selectedSessionTypeValue,
@@ -50,7 +53,9 @@ export function ChatConversationWelcome({
     (state) => state.snapshot.configQuery?.data ?? null,
   );
   const sessionSummaries = useChatQueryStore(
-    (state) => state.snapshot.sessionsQuery?.data?.sessions ?? EMPTY_NCP_SESSION_SUMMARIES,
+    (state) => state.snapshot.sessionsQuery?.isSuccess
+      ? state.snapshot.sessionsQuery.data?.sessions ?? EMPTY_NCP_SESSION_SUMMARIES
+      : EMPTY_NCP_SESSION_SUMMARIES,
   );
   const sessionTypesData = useChatQueryStore(
     (state) => state.snapshot.sessionTypesQuery?.data ?? null,
@@ -104,6 +109,13 @@ export function ChatConversationWelcome({
       agents={availableAgents}
       defaultProjectRoot={defaultProjectRoot}
       inputSlot={inputSlot}
+      hasDraftContent={hasDraftContent}
+      continuation={resolveChatWelcomeContinuation({
+        sessions: sessionSummaries,
+        projectRoot: selectedProjectRoot ?? defaultProjectRoot,
+        defaultProjectRoot,
+        agentId: draftAgentId,
+      })}
       projectOptions={projectOptions}
       selectedAgentId={draftAgentId}
       selectedProjectRoot={selectedProjectRoot}

package/src/features/chat/features/welcome/components/chat-welcome-agent-picker.tsx

@@ -28,7 +28,7 @@ export function ChatWelcomeAgentPicker({
     <Select value={selectedAgentId} onValueChange={onSelectAgent}>
       <SelectTrigger
         aria-label={t('chatDraftAgentTitle')}
-        className="h-auto w-auto min-w-0 gap-1 rounded-lg border-0 bg-transparent px-2 py-1.5 text-muted-foreground shadow-none hover:bg-[var(--interaction-hover)] hover:text-accent-foreground focus:ring-0"
+        className="h-9 w-auto min-w-0 gap-1.5 rounded-lg border-0 bg-transparent px-2 py-1.5 text-sm font-medium text-foreground/80 shadow-none hover:bg-[var(--interaction-hover)] hover:text-foreground focus:ring-1 focus:ring-border"
       >
         <span className="sr-only">{t('chatDraftAgentTitle')}</span>
         <div className="flex min-w-0 items-center gap-1.5">

package/src/features/chat/features/welcome/components/chat-welcome-project-picker.tsx

@@ -43,7 +43,7 @@ export function ChatWelcomeProjectPicker({
       <PopoverTrigger asChild>
         <button
           type="button"
-          className="inline-flex min-w-0 max-w-full items-center gap-1.5 rounded-lg px-2 py-1.5 text-left font-medium text-muted-foreground transition-colors hover:bg-[var(--interaction-hover)] hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-border"
+          className="inline-flex h-9 min-w-0 max-w-full items-center gap-1.5 rounded-lg px-2 py-1.5 text-left text-sm font-medium text-foreground/80 transition-colors hover:bg-[var(--interaction-hover)] hover:text-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-border"
           title={projectRoot ?? undefined}
           aria-label={t('chatWelcomeProjectPickerLabel')}
           disabled={!selectable || isSaving}

package/src/features/chat/features/welcome/components/chat-welcome-prompt-suggestions.tsx

@@ -1,9 +1,14 @@
+import { useState } from 'react';
+import { Link } from 'react-router-dom';
+import { ArrowUpRight, History, X } from 'lucide-react';
+import { buildSessionPath } from '@/features/chat/features/session/utils/chat-session-route.utils';
+import type { ChatWelcomeContinuation } from '@/features/chat/features/welcome/utils/chat-welcome-continuation.utils';
 import { t } from '@/shared/lib/i18n';
 
 const WELCOME_PROMPT_SUGGESTIONS = [
   {
-    labelKey: 'chatWelcomeSuggestion1Label' as const,
-    promptKey: 'chatWelcomeSuggestion1Prompt' as const,
+    labelKey: 'chatWelcomeOpenStartLabel' as const,
+    promptKey: 'chatWelcomeOpenStartPrompt' as const,
   },
   {
     labelKey: 'chatWelcomeSuggestion2Label' as const,
@@ -17,21 +22,59 @@ const WELCOME_PROMPT_SUGGESTIONS = [
 
 export function ChatWelcomePromptSuggestions({
   onSelectPrompt,
+  hasDraftContent = false,
+  hasProject = false,
+  continuation,
 }: {
   onSelectPrompt: (prompt: string) => void;
+  hasDraftContent?: boolean;
+  hasProject?: boolean;
+  continuation?: ChatWelcomeContinuation | null;
 }) {
+  const [dismissedSessionKey, setDismissedSessionKey] = useState<string | null>(null);
+  const showContinuation = continuation && continuation.sessionKey !== dismissedSessionKey;
   return (
-    <div className="mt-5 flex flex-wrap justify-center gap-2">
-      {WELCOME_PROMPT_SUGGESTIONS.map((suggestion) => (
-        <button
-          key={suggestion.labelKey}
-          type="button"
-          onClick={() => onSelectPrompt(t(suggestion.promptKey))}
-          className="rounded-full bg-muted/55 px-3.5 py-2 text-xs font-medium text-muted-foreground transition-colors hover:bg-[var(--interaction-hover)] hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
-        >
-          {t(suggestion.labelKey)}
-        </button>
-      ))}
+    <div className={`mt-3 min-h-32 ${hasDraftContent ? 'invisible' : ''}`} aria-hidden={hasDraftContent || undefined}>
+      <div className="flex flex-wrap justify-center gap-x-2 gap-y-1">
+        {WELCOME_PROMPT_SUGGESTIONS.map((suggestion, index) => {
+          const projectStart = index === 2 && hasProject;
+          return (
+            <button
+              key={suggestion.labelKey}
+              type="button"
+              onClick={() => onSelectPrompt(t(projectStart ? 'chatWelcomeSuggestion1Prompt' : suggestion.promptKey))}
+              className="rounded-lg bg-muted/70 px-3 py-1.5 text-[13px] font-normal leading-5 text-foreground/80 transition-colors hover:bg-[var(--interaction-hover)] hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
+            >
+              {t(projectStart ? 'chatWelcomeSuggestion1Label' : suggestion.labelKey)}
+            </button>
+          );
+        })}
+      </div>
+      {continuation ? (
+        <div className={`mx-auto mt-5 flex min-w-0 max-w-lg items-center gap-1 border-t border-border/50 pt-3 ${showContinuation ? '' : 'invisible'}`} aria-hidden={!showContinuation || undefined}>
+          <Link
+            to={buildSessionPath(continuation.sessionKey)}
+            title={t('chatWelcomeContinueHint')}
+            className="flex min-w-0 flex-1 items-center gap-3 rounded-lg px-2 py-2 transition-colors hover:bg-[var(--interaction-hover)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
+          >
+            <History aria-hidden="true" className="h-4 w-4 shrink-0 text-muted-foreground" />
+            <span className="min-w-0 flex-1">
+              <span className="block text-xs text-muted-foreground">{t('chatWelcomeContinueLabel')}</span>
+              <span className="mt-1 block truncate text-sm text-foreground">{continuation.title}</span>
+            </span>
+            <ArrowUpRight aria-hidden="true" className="h-4 w-4 shrink-0 text-muted-foreground" />
+          </Link>
+          <button
+            type="button"
+            aria-label={t('chatWelcomeDismissContinue')}
+            title={t('chatWelcomeDismissContinue')}
+            onClick={() => setDismissedSessionKey(continuation.sessionKey)}
+            className="mr-1 flex h-9 w-9 shrink-0 items-center justify-center rounded-lg text-muted-foreground hover:bg-[var(--interaction-hover)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
+          >
+            <X aria-hidden="true" className="h-3.5 w-3.5" />
+          </button>
+        </div>
+      ) : null}
     </div>
   );
 }

package/src/features/chat/features/welcome/components/chat-welcome-session-type-picker.tsx

@@ -1,5 +1,5 @@
 import { useState } from 'react';
-import { Bot, ChevronDown } from 'lucide-react';
+import { Cpu, ChevronDown } from 'lucide-react';
 import { SessionContextIconNode } from '@/features/chat/features/session/components/session-context-icon';
 import { ChatSessionTypeOptionItem } from '@/features/chat/features/session-type/components/chat-session-type-option-item';
 import type { ChatSessionTypeOption } from '@/features/chat/features/session-type/utils/chat-session-type.utils';
@@ -39,7 +39,7 @@ export function ChatWelcomeSessionTypePicker({
       <PopoverTrigger asChild>
         <button
           type="button"
-          className="inline-flex min-w-0 max-w-full items-center gap-1.5 rounded-lg px-2 py-1.5 text-left font-medium text-muted-foreground transition-colors hover:bg-[var(--interaction-hover)] hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-border"
+          className="inline-flex h-9 min-w-0 max-w-full items-center gap-1.5 rounded-lg px-2 py-1.5 text-left text-sm font-medium text-foreground/80 transition-colors hover:bg-[var(--interaction-hover)] hover:text-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-border"
           aria-label={t('chatWelcomeSessionTypePickerLabel')}
         >
           {selectedOption.icon?.src ? (
@@ -53,7 +53,7 @@ export function ChatWelcomeSessionTypePicker({
               className="h-4 w-4"
             />
           ) : (
-            <Bot className="h-4 w-4 shrink-0" />
+            <Cpu className="h-3.5 w-3.5 shrink-0" />
           )}
           <span className="truncate">{selectedOption.label}</span>
           <ChevronDown className="h-3.5 w-3.5 shrink-0 text-muted-foreground/70" />