Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 79 additions & 43 deletions apps/web/src/components/ChatView.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -201,6 +201,7 @@ import {
} from "../state/entities";
import { environmentShell } from "../state/shell";
import { ChatComposer, type ChatComposerHandle } from "./chat/ChatComposer";
import { DraftHeroHeadline } from "./chat/DraftHeroHeadline";
import { ExpandedImageDialog } from "./chat/ExpandedImageDialog";
import { PullRequestThreadDialog } from "./PullRequestThreadDialog";
import { MessagesTimeline } from "./chat/MessagesTimeline";
Expand DownExpand Up@@ -2063,6 +2064,7 @@ function ChatViewContent(props: ChatViewProps) {
deriveTimelineEntries(timelineMessages, activeThread?.proposedPlans ?? [], workLogEntries),
[activeThread?.proposedPlans, timelineMessages, workLogEntries],
);
const isDraftHeroState = isLocalDraftThread && timelineEntries.length === 0 && !isWorking;
const { turnDiffSummaries, inferredCheckpointTurnCountByTurnId } =
useTurnDiffSummaries(activeThread);
const turnDiffSummaryByAssistantMessageId = useMemo(() => {
Expand DownExpand Up@@ -5101,6 +5103,7 @@ function ChatViewContent(props: ChatViewProps) {
contentInsetEndAdjustment={composerOverlayHeight}
onIsAtEndChange={onIsAtEndChange}
onManualNavigation={cancelTimelineLiveFollowForUserNavigation}
hideEmptyPlaceholder={isDraftHeroState}
/>

{/* scroll to end pill — shown when user has scrolled away from the live edge */}
Expand All@@ -5123,23 +5126,45 @@ function ChatViewContent(props: ChatViewProps) {
)}
</div>

{/* Input bar */}
{/* Input bar — centered hero while a draft has no messages, docked at the bottom otherwise */}
<div
ref={setComposerOverlayElement}
data-chat-composer-overlay="true"
className="pointer-events-none absolute inset-x-0 bottom-0 z-20 pt-1.5 sm:pt-2"
className={
isDraftHeroState
? "pointer-events-none absolute inset-0 z-20 flex flex-col pt-1.5 sm:pt-2"
: "pointer-events-none absolute inset-x-0 bottom-0 z-20 pt-1.5 sm:pt-2"
}
>
<div
aria-hidden="true"
className="chat-composer-horizontal-inset pointer-events-none absolute inset-x-0 top-1.5 bottom-0 z-0 sm:top-2"
>
<div className="relative mx-auto h-full w-full max-w-3xl overflow-clip rounded-t-[20px]">
<div className="chat-composer-shared-blur absolute -inset-8" />
{/* Equal flexible spacers keep the hero group vertically stable:
whatever mounts below (branch toolbar, banners) grows into the
bottom spacer instead of re-centering the headline. */}
{isDraftHeroState ? <div className="min-h-0 flex-1 basis-0" /> : null}
{isDraftHeroState ? (
<div className="chat-composer-horizontal-inset pb-8">
<DraftHeroHeadline
activeProjectRef={activeProjectRef}
activeProjectTitle={activeProject?.title ?? null}
/>
</div>
</div>
) : (
<div
aria-hidden="true"
className="chat-composer-horizontal-inset pointer-events-none absolute inset-x-0 top-1.5 bottom-0 z-0 sm:top-2"
>
<div className="relative mx-auto h-full w-full max-w-3xl overflow-clip rounded-t-[20px]">
<div className="chat-composer-shared-blur absolute -inset-8" />
</div>
</div>
)}
<div className="chat-composer-horizontal-inset">
<div className="pointer-events-auto relative z-10 isolate">
<ComposerBannerStack className="relative z-0" items={composerBannerItems} />
{/* In the hero layout the banner hangs below the composer without
contributing height, so connect/reconnect churn cannot
re-center the headline and composer. */}
{isDraftHeroState ? null : (
<ComposerBannerStack className="relative z-0" items={composerBannerItems} />
)}
<div className="relative z-10">
<ChatComposer
composerRef={composerRef}
Expand DownExpand Up@@ -5216,41 +5241,52 @@ function ChatViewContent(props: ChatViewProps) {
</div>
</div>
<div
className={cn(
"chat-composer-horizontal-inset chat-composer-lower-chrome relative z-10",
isGitRepo
? "pb-[calc(env(safe-area-inset-bottom)+0.25rem)]"
: "pb-[calc(env(safe-area-inset-bottom)+0.75rem)] sm:pb-[calc(env(safe-area-inset-bottom)+1rem)]",
)}
className={isDraftHeroState ? "flex min-h-0 flex-1 basis-0 flex-col" : "contents"}
>
{isGitRepo && (
<div className="pointer-events-auto">
<BranchToolbar
environmentId={activeThread.environmentId}
threadId={activeThread.id}
{...(routeKind === "draft" && draftId ? { draftId } : {})}
onEnvModeChange={onEnvModeChange}
startFromOrigin={startFromOrigin}
onStartFromOriginChange={onStartFromOriginChange}
{...(canOverrideServerThreadEnvMode
? { effectiveEnvModeOverride: envMode }
: {})}
{...(canOverrideServerThreadEnvMode
? {
activeThreadBranchOverride: activeThreadBranch,
onActiveThreadBranchOverrideChange: setPendingServerThreadBranch,
}
: {})}
envLocked={envLocked}
onComposerFocusRequest={scheduleComposerFocus}
{...(canCheckoutPullRequestIntoThread
? { onCheckoutPullRequestRequest: openPullRequestDialog }
: {})}
{...(hasMultipleEnvironments ? { onEnvironmentChange } : {})}
availableEnvironments={logicalProjectEnvironments}
/>
<div
className={cn(
"chat-composer-horizontal-inset chat-composer-lower-chrome relative z-10",
isGitRepo
? "pb-[calc(env(safe-area-inset-bottom)+0.25rem)]"
: "pb-[calc(env(safe-area-inset-bottom)+0.75rem)] sm:pb-[calc(env(safe-area-inset-bottom)+1rem)]",
)}
>
{isGitRepo && (
<div className="pointer-events-auto">
<BranchToolbar
environmentId={activeThread.environmentId}
threadId={activeThread.id}
{...(routeKind === "draft" && draftId ? { draftId } : {})}
onEnvModeChange={onEnvModeChange}
startFromOrigin={startFromOrigin}
onStartFromOriginChange={onStartFromOriginChange}
{...(canOverrideServerThreadEnvMode
? { effectiveEnvModeOverride: envMode }
: {})}
{...(canOverrideServerThreadEnvMode
? {
activeThreadBranchOverride: activeThreadBranch,
onActiveThreadBranchOverrideChange: setPendingServerThreadBranch,
}
: {})}
envLocked={envLocked}
onComposerFocusRequest={scheduleComposerFocus}
{...(canCheckoutPullRequestIntoThread
? { onCheckoutPullRequestRequest: openPullRequestDialog }
: {})}
{...(hasMultipleEnvironments ? { onEnvironmentChange } : {})}
availableEnvironments={logicalProjectEnvironments}
/>
</div>
)}
</div>
{isDraftHeroState ? (
<div className="chat-composer-horizontal-inset pt-1">
<div className="pointer-events-auto">
<ComposerBannerStack className="relative z-0" items={composerBannerItems} />
</div>
</div>
)}
) : null}
</div>
</div>

Expand Down
88 changes: 88 additions & 0 deletions apps/web/src/components/chat/DraftHeroHeadline.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
import type { ScopedProjectRef } from "@t3tools/contracts";
import { scopedProjectKey, scopeProjectRef } from "@t3tools/client-runtime/environment";
import { ChevronDownIcon } from "lucide-react";
import { useMemo } from "react";

import { useNewThreadHandler } from "~/hooks/useHandleNewThread";
import { useProjects, useThreadShells } from "~/state/entities";
import { sortProjectsForSidebar } from "../Sidebar.logic";
import { Menu, MenuPopup, MenuRadioGroup, MenuRadioItem, MenuTrigger } from "../ui/menu";

interface DraftHeroHeadlineProps {
readonly activeProjectRef: ScopedProjectRef | null;
readonly activeProjectTitle: string | null;
}

export function DraftHeroHeadline({
activeProjectRef,
activeProjectTitle,
}: DraftHeroHeadlineProps) {
const projects = useProjects();
const threads = useThreadShells();
const handleNewThread = useNewThreadHandler();

const orderedProjects = useMemo(
() => sortProjectsForSidebar(projects, threads, "updated_at"),
[projects, threads],
);
const projectByKey = useMemo(
() =>
new Map(
orderedProjects.map(
(project) =>
[
scopedProjectKey(scopeProjectRef(project.environmentId, project.id)),
project,
] as const,
),
),
[orderedProjects],
);
const activeProjectKey = activeProjectRef === null ? "" : scopedProjectKey(activeProjectRef);

const projectLabel = activeProjectTitle ?? "this project";
return (
<h1 className="mx-auto w-full max-w-3xl text-center font-semibold text-2xl text-foreground sm:text-3xl">
What should we do in{" "}
{orderedProjects.length > 1 ? (
<Menu>
<MenuTrigger className="pointer-events-auto inline-flex cursor-pointer items-baseline gap-1.5 rounded-md text-muted-foreground/60 transition-colors hover:text-foreground/80 focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring">
{projectLabel}
<span
aria-hidden="true"
className="mr-1.5 flex size-4 shrink-0 items-center justify-center self-center rounded-full bg-muted-foreground/12 sm:size-5"
>
<ChevronDownIcon className="size-2.5 sm:size-3" />
</span>
</MenuTrigger>
<MenuPopup align="center" className="max-h-80 w-64 overflow-y-auto">
<MenuRadioGroup
value={activeProjectKey}
onValueChange={(value) => {
const project = projectByKey.get(value as string);
if (!project || value === activeProjectKey) {
return;
}
void handleNewThread(scopeProjectRef(project.environmentId, project.id), {
replace: true,
});
}}
>
{orderedProjects.map((project) => {
const key = scopedProjectKey(scopeProjectRef(project.environmentId, project.id));
return (
<MenuRadioItem key={key} value={key} closeOnClick>
<span className="min-w-0 truncate">{project.title}</span>
</MenuRadioItem>
);
})}
</MenuRadioGroup>
</MenuPopup>
</Menu>
) : (
<span className="text-muted-foreground/60">{projectLabel}</span>
)}
?
</h1>
);
}
5 changes: 5 additions & 0 deletions apps/web/src/components/chat/MessagesTimeline.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -179,6 +179,7 @@ interface MessagesTimelineProps {
contentInsetEndAdjustment: number;
onIsAtEndChange: (isAtEnd: boolean) => void;
onManualNavigation: () => void;
hideEmptyPlaceholder?: boolean;
}

// ---------------------------------------------------------------------------
Expand DownExpand Up@@ -212,6 +213,7 @@ export const MessagesTimeline = memo(function MessagesTimeline({
contentInsetEndAdjustment,
onIsAtEndChange,
onManualNavigation,
hideEmptyPlaceholder = false,
}: MessagesTimelineProps) {
const [expandedTurnIds, setExpandedTurnIds] = useState<ReadonlySet<TurnId>>(new Set());
const [expandedWorkGroupIds, setExpandedWorkGroupIds] = useState<ReadonlySet<string>>(new Set());
Expand DownExpand Up@@ -458,6 +460,9 @@ export const MessagesTimeline = memo(function MessagesTimeline({
);

if (rows.length === 0 && !isWorking) {
if (hideEmptyPlaceholder) {
return null;
}
return (
<div className="flex h-full items-center justify-center">
<p className="text-sm text-muted-foreground/30">
Expand Down
3 changes: 3 additions & 0 deletions apps/web/src/hooks/useHandleNewThread.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ export function useNewThreadHandler() {
worktreePath?: string | null;
envMode?: DraftThreadEnvMode;
startFromOrigin?: boolean;
replace?: boolean;
},
): Promise<void> => {
const {
Expand DownExpand Up@@ -120,6 +121,7 @@ export function useNewThreadHandler() {
await router.navigate({
to: "/draft/$draftId",
params: { draftId: reusableStoredDraftThread.draftId },
replace: options?.replace ?? false,
});
})();
}
Expand DownExpand Up@@ -180,6 +182,7 @@ export function useNewThreadHandler() {
await router.navigate({
to: "/draft/$draftId",
params: { draftId },
replace: options?.replace ?? false,
});
})();
},
Expand Down
67 changes: 67 additions & 0 deletions apps/web/src/routes/_chat.index.tsx
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
import { scopeProjectRef } from "@t3tools/client-runtime/environment";
import { createFileRoute, Link } from "@tanstack/react-router";
import { LinkIcon, PlusIcon } from "lucide-react";
import { useEffect, useMemo, useRef } from "react";

import { useOpenAddProjectCommandPalette } from "../commandPaletteContext";
import { NoActiveThreadState } from "../components/NoActiveThreadState";
import { sortProjectsForSidebar } from "../components/Sidebar.logic";
import { Button } from "../components/ui/button";
import { Empty, EmptyDescription, EmptyHeader, EmptyTitle } from "../components/ui/empty";
import { SidebarInset } from "../components/ui/sidebar";
import { useNewThreadHandler } from "../hooks/useHandleNewThread";
import { useProjects, useThreadShells } from "../state/entities";
import { useEnvironments } from "../state/environments";
import { APP_DISPLAY_NAME } from "~/branding";
import { hasCloudPublicConfig } from "~/cloud/publicConfig";
Expand All@@ -19,9 +25,70 @@ function ChatIndexRouteView() {
return <HostedStaticOnboardingState />;
}

return <IndexDraftLanding />;
}

/**
* Landing on the index route drops straight into a draft thread for the most
* recently active project, so the first screen is a prompt instead of a dead
* end. Falls back to an add-project hero when no project exists yet.
*/
function IndexDraftLanding() {
const projects = useProjects();
const threads = useThreadShells();
const handleNewThread = useNewThreadHandler();
const startedRef = useRef(false);

const mostRecentProject = useMemo(
() => sortProjectsForSidebar(projects, threads, "updated_at")[0] ?? null,
[projects, threads],
);

useEffect(() => {
if (mostRecentProject === null || startedRef.current) {
return;
}
startedRef.current = true;
void handleNewThread(scopeProjectRef(mostRecentProject.environmentId, mostRecentProject.id), {
replace: true,
});
}, [handleNewThread, mostRecentProject]);

if (mostRecentProject === null) {
return <NoProjectsHero />;
}
return <NoActiveThreadState />;
}

function NoProjectsHero() {
const openAddProject = useOpenAddProjectCommandPalette();

return (
<SidebarInset className="h-dvh min-h-0 overflow-hidden overscroll-y-none bg-background text-foreground">
<div className="flex min-h-0 min-w-0 flex-1 flex-col overflow-x-hidden bg-background">
<Empty className="flex-1">
<div className="w-full max-w-lg px-8 py-12">
<EmptyHeader className="max-w-none">
<EmptyTitle className="text-foreground text-2xl sm:text-3xl">
What should we work on?
</EmptyTitle>
<EmptyDescription className="mt-2 text-sm text-muted-foreground/78">
Add a project to start your first thread.
</EmptyDescription>
<div className="mt-6 flex justify-center">
<Button size="sm" onClick={openAddProject}>
<PlusIcon className="size-4" />
Add project
</Button>
</div>
</EmptyHeader>
</div>
</Empty>
</div>
</SidebarInset>
);
}

export const Route = createFileRoute("/_chat/")({
component: ChatIndexRouteView,
});
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 79 additions & 43 deletions apps/web/src/components/ChatView.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -201,6 +201,7 @@ import {
} from "../state/entities";
import { environmentShell } from "../state/shell";
import { ChatComposer, type ChatComposerHandle } from "./chat/ChatComposer";
import { DraftHeroHeadline } from "./chat/DraftHeroHeadline";
import { ExpandedImageDialog } from "./chat/ExpandedImageDialog";
import { PullRequestThreadDialog } from "./PullRequestThreadDialog";
import { MessagesTimeline } from "./chat/MessagesTimeline";
Expand DownExpand Up@@ -2063,6 +2064,7 @@ function ChatViewContent(props: ChatViewProps) {
deriveTimelineEntries(timelineMessages, activeThread?.proposedPlans ?? [], workLogEntries),
[activeThread?.proposedPlans, timelineMessages, workLogEntries],
);
const isDraftHeroState = isLocalDraftThread && timelineEntries.length === 0 && !isWorking;
const { turnDiffSummaries, inferredCheckpointTurnCountByTurnId } =
useTurnDiffSummaries(activeThread);
const turnDiffSummaryByAssistantMessageId = useMemo(() => {
Expand DownExpand Up@@ -5101,6 +5103,7 @@ function ChatViewContent(props: ChatViewProps) {
contentInsetEndAdjustment={composerOverlayHeight}
onIsAtEndChange={onIsAtEndChange}
onManualNavigation={cancelTimelineLiveFollowForUserNavigation}
hideEmptyPlaceholder={isDraftHeroState}
/>

{/* scroll to end pill — shown when user has scrolled away from the live edge */}
Expand All@@ -5123,23 +5126,45 @@ function ChatViewContent(props: ChatViewProps) {
)}
</div>

{/* Input bar */}
{/* Input bar — centered hero while a draft has no messages, docked at the bottom otherwise */}
<div
ref={setComposerOverlayElement}
data-chat-composer-overlay="true"
className="pointer-events-none absolute inset-x-0 bottom-0 z-20 pt-1.5 sm:pt-2"
className={
isDraftHeroState
? "pointer-events-none absolute inset-0 z-20 flex flex-col pt-1.5 sm:pt-2"
: "pointer-events-none absolute inset-x-0 bottom-0 z-20 pt-1.5 sm:pt-2"
}
>
<div
aria-hidden="true"
className="chat-composer-horizontal-inset pointer-events-none absolute inset-x-0 top-1.5 bottom-0 z-0 sm:top-2"
>
<div className="relative mx-auto h-full w-full max-w-3xl overflow-clip rounded-t-[20px]">
<div className="chat-composer-shared-blur absolute -inset-8" />
{/* Equal flexible spacers keep the hero group vertically stable:
whatever mounts below (branch toolbar, banners) grows into the
bottom spacer instead of re-centering the headline. */}
{isDraftHeroState ? <div className="min-h-0 flex-1 basis-0" /> : null}
{isDraftHeroState ? (
<div className="chat-composer-horizontal-inset pb-8">
<DraftHeroHeadline
activeProjectRef={activeProjectRef}
activeProjectTitle={activeProject?.title ?? null}
/>
</div>
</div>
) : (
<div
aria-hidden="true"
className="chat-composer-horizontal-inset pointer-events-none absolute inset-x-0 top-1.5 bottom-0 z-0 sm:top-2"
>
<div className="relative mx-auto h-full w-full max-w-3xl overflow-clip rounded-t-[20px]">
<div className="chat-composer-shared-blur absolute -inset-8" />
</div>
</div>
)}
<div className="chat-composer-horizontal-inset">
<div className="pointer-events-auto relative z-10 isolate">
<ComposerBannerStack className="relative z-0" items={composerBannerItems} />
{/* In the hero layout the banner hangs below the composer without
contributing height, so connect/reconnect churn cannot
re-center the headline and composer. */}
{isDraftHeroState ? null : (
<ComposerBannerStack className="relative z-0" items={composerBannerItems} />
)}
<div className="relative z-10">
<ChatComposer
composerRef={composerRef}
Expand DownExpand Up@@ -5216,41 +5241,52 @@ function ChatViewContent(props: ChatViewProps) {
</div>
</div>
<div
className={cn(
"chat-composer-horizontal-inset chat-composer-lower-chrome relative z-10",
isGitRepo
? "pb-[calc(env(safe-area-inset-bottom)+0.25rem)]"
: "pb-[calc(env(safe-area-inset-bottom)+0.75rem)] sm:pb-[calc(env(safe-area-inset-bottom)+1rem)]",
)}
className={isDraftHeroState ? "flex min-h-0 flex-1 basis-0 flex-col" : "contents"}
>
{isGitRepo && (
<div className="pointer-events-auto">
<BranchToolbar
environmentId={activeThread.environmentId}
threadId={activeThread.id}
{...(routeKind === "draft" && draftId ? { draftId } : {})}
onEnvModeChange={onEnvModeChange}
startFromOrigin={startFromOrigin}
onStartFromOriginChange={onStartFromOriginChange}
{...(canOverrideServerThreadEnvMode
? { effectiveEnvModeOverride: envMode }
: {})}
{...(canOverrideServerThreadEnvMode
? {
activeThreadBranchOverride: activeThreadBranch,
onActiveThreadBranchOverrideChange: setPendingServerThreadBranch,
}
: {})}
envLocked={envLocked}
onComposerFocusRequest={scheduleComposerFocus}
{...(canCheckoutPullRequestIntoThread
? { onCheckoutPullRequestRequest: openPullRequestDialog }
: {})}
{...(hasMultipleEnvironments ? { onEnvironmentChange } : {})}
availableEnvironments={logicalProjectEnvironments}
/>
<div
className={cn(
"chat-composer-horizontal-inset chat-composer-lower-chrome relative z-10",
isGitRepo
? "pb-[calc(env(safe-area-inset-bottom)+0.25rem)]"
: "pb-[calc(env(safe-area-inset-bottom)+0.75rem)] sm:pb-[calc(env(safe-area-inset-bottom)+1rem)]",
)}
>
{isGitRepo && (
<div className="pointer-events-auto">
<BranchToolbar
environmentId={activeThread.environmentId}
threadId={activeThread.id}
{...(routeKind === "draft" && draftId ? { draftId } : {})}
onEnvModeChange={onEnvModeChange}
startFromOrigin={startFromOrigin}
onStartFromOriginChange={onStartFromOriginChange}
{...(canOverrideServerThreadEnvMode
? { effectiveEnvModeOverride: envMode }
: {})}
{...(canOverrideServerThreadEnvMode
? {
activeThreadBranchOverride: activeThreadBranch,
onActiveThreadBranchOverrideChange: setPendingServerThreadBranch,
}
: {})}
envLocked={envLocked}
onComposerFocusRequest={scheduleComposerFocus}
{...(canCheckoutPullRequestIntoThread
? { onCheckoutPullRequestRequest: openPullRequestDialog }
: {})}
{...(hasMultipleEnvironments ? { onEnvironmentChange } : {})}
availableEnvironments={logicalProjectEnvironments}
/>
</div>
)}
</div>
{isDraftHeroState ? (
<div className="chat-composer-horizontal-inset pt-1">
<div className="pointer-events-auto">
<ComposerBannerStack className="relative z-0" items={composerBannerItems} />
</div>
</div>
)}
) : null}
</div>
</div>

Expand Down
88 changes: 88 additions & 0 deletions apps/web/src/components/chat/DraftHeroHeadline.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
import type { ScopedProjectRef } from "@t3tools/contracts";
import { scopedProjectKey, scopeProjectRef } from "@t3tools/client-runtime/environment";
import { ChevronDownIcon } from "lucide-react";
import { useMemo } from "react";

import { useNewThreadHandler } from "~/hooks/useHandleNewThread";
import { useProjects, useThreadShells } from "~/state/entities";
import { sortProjectsForSidebar } from "../Sidebar.logic";
import { Menu, MenuPopup, MenuRadioGroup, MenuRadioItem, MenuTrigger } from "../ui/menu";

interface DraftHeroHeadlineProps {
readonly activeProjectRef: ScopedProjectRef | null;
readonly activeProjectTitle: string | null;
}

export function DraftHeroHeadline({
activeProjectRef,
activeProjectTitle,
}: DraftHeroHeadlineProps) {
const projects = useProjects();
const threads = useThreadShells();
const handleNewThread = useNewThreadHandler();

const orderedProjects = useMemo(
() => sortProjectsForSidebar(projects, threads, "updated_at"),
[projects, threads],
);
const projectByKey = useMemo(
() =>
new Map(
orderedProjects.map(
(project) =>
[
scopedProjectKey(scopeProjectRef(project.environmentId, project.id)),
project,
] as const,
),
),
[orderedProjects],
);
const activeProjectKey = activeProjectRef === null ? "" : scopedProjectKey(activeProjectRef);

const projectLabel = activeProjectTitle ?? "this project";
return (
<h1 className="mx-auto w-full max-w-3xl text-center font-semibold text-2xl text-foreground sm:text-3xl">
What should we do in{" "}
{orderedProjects.length > 1 ? (
<Menu>
<MenuTrigger className="pointer-events-auto inline-flex cursor-pointer items-baseline gap-1.5 rounded-md text-muted-foreground/60 transition-colors hover:text-foreground/80 focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring">
{projectLabel}
<span
aria-hidden="true"
className="mr-1.5 flex size-4 shrink-0 items-center justify-center self-center rounded-full bg-muted-foreground/12 sm:size-5"
>
<ChevronDownIcon className="size-2.5 sm:size-3" />
</span>
</MenuTrigger>
<MenuPopup align="center" className="max-h-80 w-64 overflow-y-auto">
<MenuRadioGroup
value={activeProjectKey}
onValueChange={(value) => {
const project = projectByKey.get(value as string);
if (!project || value === activeProjectKey) {
return;
}
void handleNewThread(scopeProjectRef(project.environmentId, project.id), {
replace: true,
});
}}
>
{orderedProjects.map((project) => {
const key = scopedProjectKey(scopeProjectRef(project.environmentId, project.id));
return (
<MenuRadioItem key={key} value={key} closeOnClick>
<span className="min-w-0 truncate">{project.title}</span>
</MenuRadioItem>
);
})}
</MenuRadioGroup>
</MenuPopup>
</Menu>
) : (
<span className="text-muted-foreground/60">{projectLabel}</span>
)}
?
</h1>
);
}
5 changes: 5 additions & 0 deletions apps/web/src/components/chat/MessagesTimeline.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -179,6 +179,7 @@ interface MessagesTimelineProps {
contentInsetEndAdjustment: number;
onIsAtEndChange: (isAtEnd: boolean) => void;
onManualNavigation: () => void;
hideEmptyPlaceholder?: boolean;
}

// ---------------------------------------------------------------------------
Expand DownExpand Up@@ -212,6 +213,7 @@ export const MessagesTimeline = memo(function MessagesTimeline({
contentInsetEndAdjustment,
onIsAtEndChange,
onManualNavigation,
hideEmptyPlaceholder = false,
}: MessagesTimelineProps) {
const [expandedTurnIds, setExpandedTurnIds] = useState<ReadonlySet<TurnId>>(new Set());
const [expandedWorkGroupIds, setExpandedWorkGroupIds] = useState<ReadonlySet<string>>(new Set());
Expand DownExpand Up@@ -458,6 +460,9 @@ export const MessagesTimeline = memo(function MessagesTimeline({
);

if (rows.length === 0 && !isWorking) {
if (hideEmptyPlaceholder) {
return null;
}
return (
<div className="flex h-full items-center justify-center">
<p className="text-sm text-muted-foreground/30">
Expand Down
3 changes: 3 additions & 0 deletions apps/web/src/hooks/useHandleNewThread.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ export function useNewThreadHandler() {
worktreePath?: string | null;
envMode?: DraftThreadEnvMode;
startFromOrigin?: boolean;
replace?: boolean;
},
): Promise<void> => {
const {
Expand DownExpand Up@@ -120,6 +121,7 @@ export function useNewThreadHandler() {
await router.navigate({
to: "/draft/$draftId",
params: { draftId: reusableStoredDraftThread.draftId },
replace: options?.replace ?? false,
});
})();
}
Expand DownExpand Up@@ -180,6 +182,7 @@ export function useNewThreadHandler() {
await router.navigate({
to: "/draft/$draftId",
params: { draftId },
replace: options?.replace ?? false,
});
})();
},
Expand Down
67 changes: 67 additions & 0 deletions apps/web/src/routes/_chat.index.tsx
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
import { scopeProjectRef } from "@t3tools/client-runtime/environment";
import { createFileRoute, Link } from "@tanstack/react-router";
import { LinkIcon, PlusIcon } from "lucide-react";
import { useEffect, useMemo, useRef } from "react";

import { useOpenAddProjectCommandPalette } from "../commandPaletteContext";
import { NoActiveThreadState } from "../components/NoActiveThreadState";
import { sortProjectsForSidebar } from "../components/Sidebar.logic";
import { Button } from "../components/ui/button";
import { Empty, EmptyDescription, EmptyHeader, EmptyTitle } from "../components/ui/empty";
import { SidebarInset } from "../components/ui/sidebar";
import { useNewThreadHandler } from "../hooks/useHandleNewThread";
import { useProjects, useThreadShells } from "../state/entities";
import { useEnvironments } from "../state/environments";
import { APP_DISPLAY_NAME } from "~/branding";
import { hasCloudPublicConfig } from "~/cloud/publicConfig";
Expand All@@ -19,9 +25,70 @@ function ChatIndexRouteView() {
return <HostedStaticOnboardingState />;
}

return <IndexDraftLanding />;
}

/**
* Landing on the index route drops straight into a draft thread for the most
* recently active project, so the first screen is a prompt instead of a dead
* end. Falls back to an add-project hero when no project exists yet.
*/
function IndexDraftLanding() {
const projects = useProjects();
const threads = useThreadShells();
const handleNewThread = useNewThreadHandler();
const startedRef = useRef(false);

const mostRecentProject = useMemo(
() => sortProjectsForSidebar(projects, threads, "updated_at")[0] ?? null,
[projects, threads],
);

useEffect(() => {
if (mostRecentProject === null || startedRef.current) {
return;
}
startedRef.current = true;
void handleNewThread(scopeProjectRef(mostRecentProject.environmentId, mostRecentProject.id), {
replace: true,
});
}, [handleNewThread, mostRecentProject]);

if (mostRecentProject === null) {
return <NoProjectsHero />;
}
return <NoActiveThreadState />;
}

function NoProjectsHero() {
const openAddProject = useOpenAddProjectCommandPalette();

return (
<SidebarInset className="h-dvh min-h-0 overflow-hidden overscroll-y-none bg-background text-foreground">
<div className="flex min-h-0 min-w-0 flex-1 flex-col overflow-x-hidden bg-background">
<Empty className="flex-1">
<div className="w-full max-w-lg px-8 py-12">
<EmptyHeader className="max-w-none">
<EmptyTitle className="text-foreground text-2xl sm:text-3xl">
What should we work on?
</EmptyTitle>
<EmptyDescription className="mt-2 text-sm text-muted-foreground/78">
Add a project to start your first thread.
</EmptyDescription>
<div className="mt-6 flex justify-center">
<Button size="sm" onClick={openAddProject}>
<PlusIcon className="size-4" />
Add project
</Button>
</div>
</EmptyHeader>
</div>
</Empty>
</div>
</SidebarInset>
);
}

export const Route = createFileRoute("/_chat/")({
component: ChatIndexRouteView,
});
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 79 additions & 43 deletions apps/web/src/components/ChatView.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -201,6 +201,7 @@ import {
} from "../state/entities";
import { environmentShell } from "../state/shell";
import { ChatComposer, type ChatComposerHandle } from "./chat/ChatComposer";
import { DraftHeroHeadline } from "./chat/DraftHeroHeadline";
import { ExpandedImageDialog } from "./chat/ExpandedImageDialog";
import { PullRequestThreadDialog } from "./PullRequestThreadDialog";
import { MessagesTimeline } from "./chat/MessagesTimeline";
Expand DownExpand Up@@ -2063,6 +2064,7 @@ function ChatViewContent(props: ChatViewProps) {
deriveTimelineEntries(timelineMessages, activeThread?.proposedPlans ?? [], workLogEntries),
[activeThread?.proposedPlans, timelineMessages, workLogEntries],
);
const isDraftHeroState = isLocalDraftThread && timelineEntries.length === 0 && !isWorking;
const { turnDiffSummaries, inferredCheckpointTurnCountByTurnId } =
useTurnDiffSummaries(activeThread);
const turnDiffSummaryByAssistantMessageId = useMemo(() => {
Expand DownExpand Up@@ -5101,6 +5103,7 @@ function ChatViewContent(props: ChatViewProps) {
contentInsetEndAdjustment={composerOverlayHeight}
onIsAtEndChange={onIsAtEndChange}
onManualNavigation={cancelTimelineLiveFollowForUserNavigation}
hideEmptyPlaceholder={isDraftHeroState}
/>

{/* scroll to end pill — shown when user has scrolled away from the live edge */}
Expand All@@ -5123,23 +5126,45 @@ function ChatViewContent(props: ChatViewProps) {
)}
</div>

{/* Input bar */}
{/* Input bar — centered hero while a draft has no messages, docked at the bottom otherwise */}
<div
ref={setComposerOverlayElement}
data-chat-composer-overlay="true"
className="pointer-events-none absolute inset-x-0 bottom-0 z-20 pt-1.5 sm:pt-2"
className={
isDraftHeroState
? "pointer-events-none absolute inset-0 z-20 flex flex-col pt-1.5 sm:pt-2"
: "pointer-events-none absolute inset-x-0 bottom-0 z-20 pt-1.5 sm:pt-2"
}
>
<div
aria-hidden="true"
className="chat-composer-horizontal-inset pointer-events-none absolute inset-x-0 top-1.5 bottom-0 z-0 sm:top-2"
>
<div className="relative mx-auto h-full w-full max-w-3xl overflow-clip rounded-t-[20px]">
<div className="chat-composer-shared-blur absolute -inset-8" />
{/* Equal flexible spacers keep the hero group vertically stable:
whatever mounts below (branch toolbar, banners) grows into the
bottom spacer instead of re-centering the headline. */}
{isDraftHeroState ? <div className="min-h-0 flex-1 basis-0" /> : null}
{isDraftHeroState ? (
<div className="chat-composer-horizontal-inset pb-8">
<DraftHeroHeadline
activeProjectRef={activeProjectRef}
activeProjectTitle={activeProject?.title ?? null}
/>
</div>
</div>
) : (
<div
aria-hidden="true"
className="chat-composer-horizontal-inset pointer-events-none absolute inset-x-0 top-1.5 bottom-0 z-0 sm:top-2"
>
<div className="relative mx-auto h-full w-full max-w-3xl overflow-clip rounded-t-[20px]">
<div className="chat-composer-shared-blur absolute -inset-8" />
</div>
</div>
)}
<div className="chat-composer-horizontal-inset">
<div className="pointer-events-auto relative z-10 isolate">
<ComposerBannerStack className="relative z-0" items={composerBannerItems} />
{/* In the hero layout the banner hangs below the composer without
contributing height, so connect/reconnect churn cannot
re-center the headline and composer. */}
{isDraftHeroState ? null : (
<ComposerBannerStack className="relative z-0" items={composerBannerItems} />
)}
<div className="relative z-10">
<ChatComposer
composerRef={composerRef}
Expand DownExpand Up@@ -5216,41 +5241,52 @@ function ChatViewContent(props: ChatViewProps) {
</div>
</div>
<div
className={cn(
"chat-composer-horizontal-inset chat-composer-lower-chrome relative z-10",
isGitRepo
? "pb-[calc(env(safe-area-inset-bottom)+0.25rem)]"
: "pb-[calc(env(safe-area-inset-bottom)+0.75rem)] sm:pb-[calc(env(safe-area-inset-bottom)+1rem)]",
)}
className={isDraftHeroState ? "flex min-h-0 flex-1 basis-0 flex-col" : "contents"}
>
{isGitRepo && (
<div className="pointer-events-auto">
<BranchToolbar
environmentId={activeThread.environmentId}
threadId={activeThread.id}
{...(routeKind === "draft" && draftId ? { draftId } : {})}
onEnvModeChange={onEnvModeChange}
startFromOrigin={startFromOrigin}
onStartFromOriginChange={onStartFromOriginChange}
{...(canOverrideServerThreadEnvMode
? { effectiveEnvModeOverride: envMode }
: {})}
{...(canOverrideServerThreadEnvMode
? {
activeThreadBranchOverride: activeThreadBranch,
onActiveThreadBranchOverrideChange: setPendingServerThreadBranch,
}
: {})}
envLocked={envLocked}
onComposerFocusRequest={scheduleComposerFocus}
{...(canCheckoutPullRequestIntoThread
? { onCheckoutPullRequestRequest: openPullRequestDialog }
: {})}
{...(hasMultipleEnvironments ? { onEnvironmentChange } : {})}
availableEnvironments={logicalProjectEnvironments}
/>
<div
className={cn(
"chat-composer-horizontal-inset chat-composer-lower-chrome relative z-10",
isGitRepo
? "pb-[calc(env(safe-area-inset-bottom)+0.25rem)]"
: "pb-[calc(env(safe-area-inset-bottom)+0.75rem)] sm:pb-[calc(env(safe-area-inset-bottom)+1rem)]",
)}
>
{isGitRepo && (
<div className="pointer-events-auto">
<BranchToolbar
environmentId={activeThread.environmentId}
threadId={activeThread.id}
{...(routeKind === "draft" && draftId ? { draftId } : {})}
onEnvModeChange={onEnvModeChange}
startFromOrigin={startFromOrigin}
onStartFromOriginChange={onStartFromOriginChange}
{...(canOverrideServerThreadEnvMode
? { effectiveEnvModeOverride: envMode }
: {})}
{...(canOverrideServerThreadEnvMode
? {
activeThreadBranchOverride: activeThreadBranch,
onActiveThreadBranchOverrideChange: setPendingServerThreadBranch,
}
: {})}
envLocked={envLocked}
onComposerFocusRequest={scheduleComposerFocus}
{...(canCheckoutPullRequestIntoThread
? { onCheckoutPullRequestRequest: openPullRequestDialog }
: {})}
{...(hasMultipleEnvironments ? { onEnvironmentChange } : {})}
availableEnvironments={logicalProjectEnvironments}
/>
</div>
)}
</div>
{isDraftHeroState ? (
<div className="chat-composer-horizontal-inset pt-1">
<div className="pointer-events-auto">
<ComposerBannerStack className="relative z-0" items={composerBannerItems} />
</div>
</div>
)}
) : null}
</div>
</div>

Expand Down
88 changes: 88 additions & 0 deletions apps/web/src/components/chat/DraftHeroHeadline.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
import type { ScopedProjectRef } from "@t3tools/contracts";
import { scopedProjectKey, scopeProjectRef } from "@t3tools/client-runtime/environment";
import { ChevronDownIcon } from "lucide-react";
import { useMemo } from "react";

import { useNewThreadHandler } from "~/hooks/useHandleNewThread";
import { useProjects, useThreadShells } from "~/state/entities";
import { sortProjectsForSidebar } from "../Sidebar.logic";
import { Menu, MenuPopup, MenuRadioGroup, MenuRadioItem, MenuTrigger } from "../ui/menu";

interface DraftHeroHeadlineProps {
readonly activeProjectRef: ScopedProjectRef | null;
readonly activeProjectTitle: string | null;
}

export function DraftHeroHeadline({
activeProjectRef,
activeProjectTitle,
}: DraftHeroHeadlineProps) {
const projects = useProjects();
const threads = useThreadShells();
const handleNewThread = useNewThreadHandler();

const orderedProjects = useMemo(
() => sortProjectsForSidebar(projects, threads, "updated_at"),
[projects, threads],
);
const projectByKey = useMemo(
() =>
new Map(
orderedProjects.map(
(project) =>
[
scopedProjectKey(scopeProjectRef(project.environmentId, project.id)),
project,
] as const,
),
),
[orderedProjects],
);
const activeProjectKey = activeProjectRef === null ? "" : scopedProjectKey(activeProjectRef);

const projectLabel = activeProjectTitle ?? "this project";
return (
<h1 className="mx-auto w-full max-w-3xl text-center font-semibold text-2xl text-foreground sm:text-3xl">
What should we do in{" "}
{orderedProjects.length > 1 ? (
<Menu>
<MenuTrigger className="pointer-events-auto inline-flex cursor-pointer items-baseline gap-1.5 rounded-md text-muted-foreground/60 transition-colors hover:text-foreground/80 focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring">
{projectLabel}
<span
aria-hidden="true"
className="mr-1.5 flex size-4 shrink-0 items-center justify-center self-center rounded-full bg-muted-foreground/12 sm:size-5"
>
<ChevronDownIcon className="size-2.5 sm:size-3" />
</span>
</MenuTrigger>
<MenuPopup align="center" className="max-h-80 w-64 overflow-y-auto">
<MenuRadioGroup
value={activeProjectKey}
onValueChange={(value) => {
const project = projectByKey.get(value as string);
if (!project || value === activeProjectKey) {
return;
}
void handleNewThread(scopeProjectRef(project.environmentId, project.id), {
replace: true,
});
}}
>
{orderedProjects.map((project) => {
const key = scopedProjectKey(scopeProjectRef(project.environmentId, project.id));
return (
<MenuRadioItem key={key} value={key} closeOnClick>
<span className="min-w-0 truncate">{project.title}</span>
</MenuRadioItem>
);
})}
</MenuRadioGroup>
</MenuPopup>
</Menu>
) : (
<span className="text-muted-foreground/60">{projectLabel}</span>
)}
?
</h1>
);
}
5 changes: 5 additions & 0 deletions apps/web/src/components/chat/MessagesTimeline.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -179,6 +179,7 @@ interface MessagesTimelineProps {
contentInsetEndAdjustment: number;
onIsAtEndChange: (isAtEnd: boolean) => void;
onManualNavigation: () => void;
hideEmptyPlaceholder?: boolean;
}

// ---------------------------------------------------------------------------
Expand DownExpand Up@@ -212,6 +213,7 @@ export const MessagesTimeline = memo(function MessagesTimeline({
contentInsetEndAdjustment,
onIsAtEndChange,
onManualNavigation,
hideEmptyPlaceholder = false,
}: MessagesTimelineProps) {
const [expandedTurnIds, setExpandedTurnIds] = useState<ReadonlySet<TurnId>>(new Set());
const [expandedWorkGroupIds, setExpandedWorkGroupIds] = useState<ReadonlySet<string>>(new Set());
Expand DownExpand Up@@ -458,6 +460,9 @@ export const MessagesTimeline = memo(function MessagesTimeline({
);

if (rows.length === 0 && !isWorking) {
if (hideEmptyPlaceholder) {
return null;
}
return (
<div className="flex h-full items-center justify-center">
<p className="text-sm text-muted-foreground/30">
Expand Down
3 changes: 3 additions & 0 deletions apps/web/src/hooks/useHandleNewThread.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ export function useNewThreadHandler() {
worktreePath?: string | null;
envMode?: DraftThreadEnvMode;
startFromOrigin?: boolean;
replace?: boolean;
},
): Promise<void> => {
const {
Expand DownExpand Up@@ -120,6 +121,7 @@ export function useNewThreadHandler() {
await router.navigate({
to: "/draft/$draftId",
params: { draftId: reusableStoredDraftThread.draftId },
replace: options?.replace ?? false,
});
})();
}
Expand DownExpand Up@@ -180,6 +182,7 @@ export function useNewThreadHandler() {
await router.navigate({
to: "/draft/$draftId",
params: { draftId },
replace: options?.replace ?? false,
});
})();
},
Expand Down
67 changes: 67 additions & 0 deletions apps/web/src/routes/_chat.index.tsx
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
import { scopeProjectRef } from "@t3tools/client-runtime/environment";
import { createFileRoute, Link } from "@tanstack/react-router";
import { LinkIcon, PlusIcon } from "lucide-react";
import { useEffect, useMemo, useRef } from "react";

import { useOpenAddProjectCommandPalette } from "../commandPaletteContext";
import { NoActiveThreadState } from "../components/NoActiveThreadState";
import { sortProjectsForSidebar } from "../components/Sidebar.logic";
import { Button } from "../components/ui/button";
import { Empty, EmptyDescription, EmptyHeader, EmptyTitle } from "../components/ui/empty";
import { SidebarInset } from "../components/ui/sidebar";
import { useNewThreadHandler } from "../hooks/useHandleNewThread";
import { useProjects, useThreadShells } from "../state/entities";
import { useEnvironments } from "../state/environments";
import { APP_DISPLAY_NAME } from "~/branding";
import { hasCloudPublicConfig } from "~/cloud/publicConfig";
Expand All@@ -19,9 +25,70 @@ function ChatIndexRouteView() {
return <HostedStaticOnboardingState />;
}

return <IndexDraftLanding />;
}

/**
* Landing on the index route drops straight into a draft thread for the most
* recently active project, so the first screen is a prompt instead of a dead
* end. Falls back to an add-project hero when no project exists yet.
*/
function IndexDraftLanding() {
const projects = useProjects();
const threads = useThreadShells();
const handleNewThread = useNewThreadHandler();
const startedRef = useRef(false);

const mostRecentProject = useMemo(
() => sortProjectsForSidebar(projects, threads, "updated_at")[0] ?? null,
[projects, threads],
);

useEffect(() => {
if (mostRecentProject === null || startedRef.current) {
return;
}
startedRef.current = true;
void handleNewThread(scopeProjectRef(mostRecentProject.environmentId, mostRecentProject.id), {
replace: true,
});
}, [handleNewThread, mostRecentProject]);

if (mostRecentProject === null) {
return <NoProjectsHero />;
}
return <NoActiveThreadState />;
}

function NoProjectsHero() {
const openAddProject = useOpenAddProjectCommandPalette();

return (
<SidebarInset className="h-dvh min-h-0 overflow-hidden overscroll-y-none bg-background text-foreground">
<div className="flex min-h-0 min-w-0 flex-1 flex-col overflow-x-hidden bg-background">
<Empty className="flex-1">
<div className="w-full max-w-lg px-8 py-12">
<EmptyHeader className="max-w-none">
<EmptyTitle className="text-foreground text-2xl sm:text-3xl">
What should we work on?
</EmptyTitle>
<EmptyDescription className="mt-2 text-sm text-muted-foreground/78">
Add a project to start your first thread.
</EmptyDescription>
<div className="mt-6 flex justify-center">
<Button size="sm" onClick={openAddProject}>
<PlusIcon className="size-4" />
Add project
</Button>
</div>
</EmptyHeader>
</div>
</Empty>
</div>
</SidebarInset>
);
}

export const Route = createFileRoute("/_chat/")({
component: ChatIndexRouteView,
});
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 79 additions & 43 deletions apps/web/src/components/ChatView.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -201,6 +201,7 @@ import {
} from "../state/entities";
import { environmentShell } from "../state/shell";
import { ChatComposer, type ChatComposerHandle } from "./chat/ChatComposer";
import { DraftHeroHeadline } from "./chat/DraftHeroHeadline";
import { ExpandedImageDialog } from "./chat/ExpandedImageDialog";
import { PullRequestThreadDialog } from "./PullRequestThreadDialog";
import { MessagesTimeline } from "./chat/MessagesTimeline";
Expand DownExpand Up@@ -2063,6 +2064,7 @@ function ChatViewContent(props: ChatViewProps) {
deriveTimelineEntries(timelineMessages, activeThread?.proposedPlans ?? [], workLogEntries),
[activeThread?.proposedPlans, timelineMessages, workLogEntries],
);
const isDraftHeroState = isLocalDraftThread && timelineEntries.length === 0 && !isWorking;
const { turnDiffSummaries, inferredCheckpointTurnCountByTurnId } =
useTurnDiffSummaries(activeThread);
const turnDiffSummaryByAssistantMessageId = useMemo(() => {
Expand DownExpand Up@@ -5101,6 +5103,7 @@ function ChatViewContent(props: ChatViewProps) {
contentInsetEndAdjustment={composerOverlayHeight}
onIsAtEndChange={onIsAtEndChange}
onManualNavigation={cancelTimelineLiveFollowForUserNavigation}
hideEmptyPlaceholder={isDraftHeroState}
/>

{/* scroll to end pill — shown when user has scrolled away from the live edge */}
Expand All@@ -5123,23 +5126,45 @@ function ChatViewContent(props: ChatViewProps) {
)}
</div>

{/* Input bar */}
{/* Input bar — centered hero while a draft has no messages, docked at the bottom otherwise */}
<div
ref={setComposerOverlayElement}
data-chat-composer-overlay="true"
className="pointer-events-none absolute inset-x-0 bottom-0 z-20 pt-1.5 sm:pt-2"
className={
isDraftHeroState
? "pointer-events-none absolute inset-0 z-20 flex flex-col pt-1.5 sm:pt-2"
: "pointer-events-none absolute inset-x-0 bottom-0 z-20 pt-1.5 sm:pt-2"
}
>
<div
aria-hidden="true"
className="chat-composer-horizontal-inset pointer-events-none absolute inset-x-0 top-1.5 bottom-0 z-0 sm:top-2"
>
<div className="relative mx-auto h-full w-full max-w-3xl overflow-clip rounded-t-[20px]">
<div className="chat-composer-shared-blur absolute -inset-8" />
{/* Equal flexible spacers keep the hero group vertically stable:
whatever mounts below (branch toolbar, banners) grows into the
bottom spacer instead of re-centering the headline. */}
{isDraftHeroState ? <div className="min-h-0 flex-1 basis-0" /> : null}
{isDraftHeroState ? (
<div className="chat-composer-horizontal-inset pb-8">
<DraftHeroHeadline
activeProjectRef={activeProjectRef}
activeProjectTitle={activeProject?.title ?? null}
/>
</div>
</div>
) : (
<div
aria-hidden="true"
className="chat-composer-horizontal-inset pointer-events-none absolute inset-x-0 top-1.5 bottom-0 z-0 sm:top-2"
>
<div className="relative mx-auto h-full w-full max-w-3xl overflow-clip rounded-t-[20px]">
<div className="chat-composer-shared-blur absolute -inset-8" />
</div>
</div>
)}
<div className="chat-composer-horizontal-inset">
<div className="pointer-events-auto relative z-10 isolate">
<ComposerBannerStack className="relative z-0" items={composerBannerItems} />
{/* In the hero layout the banner hangs below the composer without
contributing height, so connect/reconnect churn cannot
re-center the headline and composer. */}
{isDraftHeroState ? null : (
<ComposerBannerStack className="relative z-0" items={composerBannerItems} />
)}
<div className="relative z-10">
<ChatComposer
composerRef={composerRef}
Expand DownExpand Up@@ -5216,41 +5241,52 @@ function ChatViewContent(props: ChatViewProps) {
</div>
</div>
<div
className={cn(
"chat-composer-horizontal-inset chat-composer-lower-chrome relative z-10",
isGitRepo
? "pb-[calc(env(safe-area-inset-bottom)+0.25rem)]"
: "pb-[calc(env(safe-area-inset-bottom)+0.75rem)] sm:pb-[calc(env(safe-area-inset-bottom)+1rem)]",
)}
className={isDraftHeroState ? "flex min-h-0 flex-1 basis-0 flex-col" : "contents"}
>
{isGitRepo && (
<div className="pointer-events-auto">
<BranchToolbar
environmentId={activeThread.environmentId}
threadId={activeThread.id}
{...(routeKind === "draft" && draftId ? { draftId } : {})}
onEnvModeChange={onEnvModeChange}
startFromOrigin={startFromOrigin}
onStartFromOriginChange={onStartFromOriginChange}
{...(canOverrideServerThreadEnvMode
? { effectiveEnvModeOverride: envMode }
: {})}
{...(canOverrideServerThreadEnvMode
? {
activeThreadBranchOverride: activeThreadBranch,
onActiveThreadBranchOverrideChange: setPendingServerThreadBranch,
}
: {})}
envLocked={envLocked}
onComposerFocusRequest={scheduleComposerFocus}
{...(canCheckoutPullRequestIntoThread
? { onCheckoutPullRequestRequest: openPullRequestDialog }
: {})}
{...(hasMultipleEnvironments ? { onEnvironmentChange } : {})}
availableEnvironments={logicalProjectEnvironments}
/>
<div
className={cn(
"chat-composer-horizontal-inset chat-composer-lower-chrome relative z-10",
isGitRepo
? "pb-[calc(env(safe-area-inset-bottom)+0.25rem)]"
: "pb-[calc(env(safe-area-inset-bottom)+0.75rem)] sm:pb-[calc(env(safe-area-inset-bottom)+1rem)]",
)}
>
{isGitRepo && (
<div className="pointer-events-auto">
<BranchToolbar
environmentId={activeThread.environmentId}
threadId={activeThread.id}
{...(routeKind === "draft" && draftId ? { draftId } : {})}
onEnvModeChange={onEnvModeChange}
startFromOrigin={startFromOrigin}
onStartFromOriginChange={onStartFromOriginChange}
{...(canOverrideServerThreadEnvMode
? { effectiveEnvModeOverride: envMode }
: {})}
{...(canOverrideServerThreadEnvMode
? {
activeThreadBranchOverride: activeThreadBranch,
onActiveThreadBranchOverrideChange: setPendingServerThreadBranch,
}
: {})}
envLocked={envLocked}
onComposerFocusRequest={scheduleComposerFocus}
{...(canCheckoutPullRequestIntoThread
? { onCheckoutPullRequestRequest: openPullRequestDialog }
: {})}
{...(hasMultipleEnvironments ? { onEnvironmentChange } : {})}
availableEnvironments={logicalProjectEnvironments}
/>
</div>
)}
</div>
{isDraftHeroState ? (
<div className="chat-composer-horizontal-inset pt-1">
<div className="pointer-events-auto">
<ComposerBannerStack className="relative z-0" items={composerBannerItems} />
</div>
</div>
)}
) : null}
</div>
</div>

Expand Down
88 changes: 88 additions & 0 deletions apps/web/src/components/chat/DraftHeroHeadline.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
import type { ScopedProjectRef } from "@t3tools/contracts";
import { scopedProjectKey, scopeProjectRef } from "@t3tools/client-runtime/environment";
import { ChevronDownIcon } from "lucide-react";
import { useMemo } from "react";

import { useNewThreadHandler } from "~/hooks/useHandleNewThread";
import { useProjects, useThreadShells } from "~/state/entities";
import { sortProjectsForSidebar } from "../Sidebar.logic";
import { Menu, MenuPopup, MenuRadioGroup, MenuRadioItem, MenuTrigger } from "../ui/menu";

interface DraftHeroHeadlineProps {
readonly activeProjectRef: ScopedProjectRef | null;
readonly activeProjectTitle: string | null;
}

export function DraftHeroHeadline({
activeProjectRef,
activeProjectTitle,
}: DraftHeroHeadlineProps) {
const projects = useProjects();
const threads = useThreadShells();
const handleNewThread = useNewThreadHandler();

const orderedProjects = useMemo(
() => sortProjectsForSidebar(projects, threads, "updated_at"),
[projects, threads],
);
const projectByKey = useMemo(
() =>
new Map(
orderedProjects.map(
(project) =>
[
scopedProjectKey(scopeProjectRef(project.environmentId, project.id)),
project,
] as const,
),
),
[orderedProjects],
);
const activeProjectKey = activeProjectRef === null ? "" : scopedProjectKey(activeProjectRef);

const projectLabel = activeProjectTitle ?? "this project";
return (
<h1 className="mx-auto w-full max-w-3xl text-center font-semibold text-2xl text-foreground sm:text-3xl">
What should we do in{" "}
{orderedProjects.length > 1 ? (
<Menu>
<MenuTrigger className="pointer-events-auto inline-flex cursor-pointer items-baseline gap-1.5 rounded-md text-muted-foreground/60 transition-colors hover:text-foreground/80 focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring">
{projectLabel}
<span
aria-hidden="true"
className="mr-1.5 flex size-4 shrink-0 items-center justify-center self-center rounded-full bg-muted-foreground/12 sm:size-5"
>
<ChevronDownIcon className="size-2.5 sm:size-3" />
</span>
</MenuTrigger>
<MenuPopup align="center" className="max-h-80 w-64 overflow-y-auto">
<MenuRadioGroup
value={activeProjectKey}
onValueChange={(value) => {
const project = projectByKey.get(value as string);
if (!project || value === activeProjectKey) {
return;
}
void handleNewThread(scopeProjectRef(project.environmentId, project.id), {
replace: true,
});
}}
>
{orderedProjects.map((project) => {
const key = scopedProjectKey(scopeProjectRef(project.environmentId, project.id));
return (
<MenuRadioItem key={key} value={key} closeOnClick>
<span className="min-w-0 truncate">{project.title}</span>
</MenuRadioItem>
);
})}
</MenuRadioGroup>
</MenuPopup>
</Menu>
) : (
<span className="text-muted-foreground/60">{projectLabel}</span>
)}
?
</h1>
);
}
5 changes: 5 additions & 0 deletions apps/web/src/components/chat/MessagesTimeline.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -179,6 +179,7 @@ interface MessagesTimelineProps {
contentInsetEndAdjustment: number;
onIsAtEndChange: (isAtEnd: boolean) => void;
onManualNavigation: () => void;
hideEmptyPlaceholder?: boolean;
}

// ---------------------------------------------------------------------------
Expand DownExpand Up@@ -212,6 +213,7 @@ export const MessagesTimeline = memo(function MessagesTimeline({
contentInsetEndAdjustment,
onIsAtEndChange,
onManualNavigation,
hideEmptyPlaceholder = false,
}: MessagesTimelineProps) {
const [expandedTurnIds, setExpandedTurnIds] = useState<ReadonlySet<TurnId>>(new Set());
const [expandedWorkGroupIds, setExpandedWorkGroupIds] = useState<ReadonlySet<string>>(new Set());
Expand DownExpand Up@@ -458,6 +460,9 @@ export const MessagesTimeline = memo(function MessagesTimeline({
);

if (rows.length === 0 && !isWorking) {
if (hideEmptyPlaceholder) {
return null;
}
return (
<div className="flex h-full items-center justify-center">
<p className="text-sm text-muted-foreground/30">
Expand Down
3 changes: 3 additions & 0 deletions apps/web/src/hooks/useHandleNewThread.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ export function useNewThreadHandler() {
worktreePath?: string | null;
envMode?: DraftThreadEnvMode;
startFromOrigin?: boolean;
replace?: boolean;
},
): Promise<void> => {
const {
Expand DownExpand Up@@ -120,6 +121,7 @@ export function useNewThreadHandler() {
await router.navigate({
to: "/draft/$draftId",
params: { draftId: reusableStoredDraftThread.draftId },
replace: options?.replace ?? false,
});
})();
}
Expand DownExpand Up@@ -180,6 +182,7 @@ export function useNewThreadHandler() {
await router.navigate({
to: "/draft/$draftId",
params: { draftId },
replace: options?.replace ?? false,
});
})();
},
Expand Down
67 changes: 67 additions & 0 deletions apps/web/src/routes/_chat.index.tsx
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
import { scopeProjectRef } from "@t3tools/client-runtime/environment";
import { createFileRoute, Link } from "@tanstack/react-router";
import { LinkIcon, PlusIcon } from "lucide-react";
import { useEffect, useMemo, useRef } from "react";

import { useOpenAddProjectCommandPalette } from "../commandPaletteContext";
import { NoActiveThreadState } from "../components/NoActiveThreadState";
import { sortProjectsForSidebar } from "../components/Sidebar.logic";
import { Button } from "../components/ui/button";
import { Empty, EmptyDescription, EmptyHeader, EmptyTitle } from "../components/ui/empty";
import { SidebarInset } from "../components/ui/sidebar";
import { useNewThreadHandler } from "../hooks/useHandleNewThread";
import { useProjects, useThreadShells } from "../state/entities";
import { useEnvironments } from "../state/environments";
import { APP_DISPLAY_NAME } from "~/branding";
import { hasCloudPublicConfig } from "~/cloud/publicConfig";
Expand All@@ -19,9 +25,70 @@ function ChatIndexRouteView() {
return <HostedStaticOnboardingState />;
}

return <IndexDraftLanding />;
}

/**
* Landing on the index route drops straight into a draft thread for the most
* recently active project, so the first screen is a prompt instead of a dead
* end. Falls back to an add-project hero when no project exists yet.
*/
function IndexDraftLanding() {
const projects = useProjects();
const threads = useThreadShells();
const handleNewThread = useNewThreadHandler();
const startedRef = useRef(false);

const mostRecentProject = useMemo(
() => sortProjectsForSidebar(projects, threads, "updated_at")[0] ?? null,
[projects, threads],
);

useEffect(() => {
if (mostRecentProject === null || startedRef.current) {
return;
}
startedRef.current = true;
void handleNewThread(scopeProjectRef(mostRecentProject.environmentId, mostRecentProject.id), {
replace: true,
});
}, [handleNewThread, mostRecentProject]);

if (mostRecentProject === null) {
return <NoProjectsHero />;
}
return <NoActiveThreadState />;
}

function NoProjectsHero() {
const openAddProject = useOpenAddProjectCommandPalette();

return (
<SidebarInset className="h-dvh min-h-0 overflow-hidden overscroll-y-none bg-background text-foreground">
<div className="flex min-h-0 min-w-0 flex-1 flex-col overflow-x-hidden bg-background">
<Empty className="flex-1">
<div className="w-full max-w-lg px-8 py-12">
<EmptyHeader className="max-w-none">
<EmptyTitle className="text-foreground text-2xl sm:text-3xl">
What should we work on?
</EmptyTitle>
<EmptyDescription className="mt-2 text-sm text-muted-foreground/78">
Add a project to start your first thread.
</EmptyDescription>
<div className="mt-6 flex justify-center">
<Button size="sm" onClick={openAddProject}>
<PlusIcon className="size-4" />
Add project
</Button>
</div>
</EmptyHeader>
</div>
</Empty>
</div>
</SidebarInset>
);
}

export const Route = createFileRoute("/_chat/")({
component: ChatIndexRouteView,
});
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 79 additions & 43 deletions apps/web/src/components/ChatView.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -201,6 +201,7 @@ import {
} from "../state/entities";
import { environmentShell } from "../state/shell";
import { ChatComposer, type ChatComposerHandle } from "./chat/ChatComposer";
import { DraftHeroHeadline } from "./chat/DraftHeroHeadline";
import { ExpandedImageDialog } from "./chat/ExpandedImageDialog";
import { PullRequestThreadDialog } from "./PullRequestThreadDialog";
import { MessagesTimeline } from "./chat/MessagesTimeline";
Expand DownExpand Up@@ -2063,6 +2064,7 @@ function ChatViewContent(props: ChatViewProps) {
deriveTimelineEntries(timelineMessages, activeThread?.proposedPlans ?? [], workLogEntries),
[activeThread?.proposedPlans, timelineMessages, workLogEntries],
);
const isDraftHeroState = isLocalDraftThread && timelineEntries.length === 0 && !isWorking;
const { turnDiffSummaries, inferredCheckpointTurnCountByTurnId } =
useTurnDiffSummaries(activeThread);
const turnDiffSummaryByAssistantMessageId = useMemo(() => {
Expand DownExpand Up@@ -5101,6 +5103,7 @@ function ChatViewContent(props: ChatViewProps) {
contentInsetEndAdjustment={composerOverlayHeight}
onIsAtEndChange={onIsAtEndChange}
onManualNavigation={cancelTimelineLiveFollowForUserNavigation}
hideEmptyPlaceholder={isDraftHeroState}
/>

{/* scroll to end pill — shown when user has scrolled away from the live edge */}
Expand All@@ -5123,23 +5126,45 @@ function ChatViewContent(props: ChatViewProps) {
)}
</div>

{/* Input bar */}
{/* Input bar — centered hero while a draft has no messages, docked at the bottom otherwise */}
<div
ref={setComposerOverlayElement}
data-chat-composer-overlay="true"
className="pointer-events-none absolute inset-x-0 bottom-0 z-20 pt-1.5 sm:pt-2"
className={
isDraftHeroState
? "pointer-events-none absolute inset-0 z-20 flex flex-col pt-1.5 sm:pt-2"
: "pointer-events-none absolute inset-x-0 bottom-0 z-20 pt-1.5 sm:pt-2"
}
>
<div
aria-hidden="true"
className="chat-composer-horizontal-inset pointer-events-none absolute inset-x-0 top-1.5 bottom-0 z-0 sm:top-2"
>
<div className="relative mx-auto h-full w-full max-w-3xl overflow-clip rounded-t-[20px]">
<div className="chat-composer-shared-blur absolute -inset-8" />
{/* Equal flexible spacers keep the hero group vertically stable:
whatever mounts below (branch toolbar, banners) grows into the
bottom spacer instead of re-centering the headline. */}
{isDraftHeroState ? <div className="min-h-0 flex-1 basis-0" /> : null}
{isDraftHeroState ? (
<div className="chat-composer-horizontal-inset pb-8">
<DraftHeroHeadline
activeProjectRef={activeProjectRef}
activeProjectTitle={activeProject?.title ?? null}
/>
</div>
</div>
) : (
<div
aria-hidden="true"
className="chat-composer-horizontal-inset pointer-events-none absolute inset-x-0 top-1.5 bottom-0 z-0 sm:top-2"
>
<div className="relative mx-auto h-full w-full max-w-3xl overflow-clip rounded-t-[20px]">
<div className="chat-composer-shared-blur absolute -inset-8" />
</div>
</div>
)}
<div className="chat-composer-horizontal-inset">
<div className="pointer-events-auto relative z-10 isolate">
<ComposerBannerStack className="relative z-0" items={composerBannerItems} />
{/* In the hero layout the banner hangs below the composer without
contributing height, so connect/reconnect churn cannot
re-center the headline and composer. */}
{isDraftHeroState ? null : (
<ComposerBannerStack className="relative z-0" items={composerBannerItems} />
)}
<div className="relative z-10">
<ChatComposer
composerRef={composerRef}
Expand DownExpand Up@@ -5216,41 +5241,52 @@ function ChatViewContent(props: ChatViewProps) {
</div>
</div>
<div
className={cn(
"chat-composer-horizontal-inset chat-composer-lower-chrome relative z-10",
isGitRepo
? "pb-[calc(env(safe-area-inset-bottom)+0.25rem)]"
: "pb-[calc(env(safe-area-inset-bottom)+0.75rem)] sm:pb-[calc(env(safe-area-inset-bottom)+1rem)]",
)}
className={isDraftHeroState ? "flex min-h-0 flex-1 basis-0 flex-col" : "contents"}
>
{isGitRepo && (
<div className="pointer-events-auto">
<BranchToolbar
environmentId={activeThread.environmentId}
threadId={activeThread.id}
{...(routeKind === "draft" && draftId ? { draftId } : {})}
onEnvModeChange={onEnvModeChange}
startFromOrigin={startFromOrigin}
onStartFromOriginChange={onStartFromOriginChange}
{...(canOverrideServerThreadEnvMode
? { effectiveEnvModeOverride: envMode }
: {})}
{...(canOverrideServerThreadEnvMode
? {
activeThreadBranchOverride: activeThreadBranch,
onActiveThreadBranchOverrideChange: setPendingServerThreadBranch,
}
: {})}
envLocked={envLocked}
onComposerFocusRequest={scheduleComposerFocus}
{...(canCheckoutPullRequestIntoThread
? { onCheckoutPullRequestRequest: openPullRequestDialog }
: {})}
{...(hasMultipleEnvironments ? { onEnvironmentChange } : {})}
availableEnvironments={logicalProjectEnvironments}
/>
<div
className={cn(
"chat-composer-horizontal-inset chat-composer-lower-chrome relative z-10",
isGitRepo
? "pb-[calc(env(safe-area-inset-bottom)+0.25rem)]"
: "pb-[calc(env(safe-area-inset-bottom)+0.75rem)] sm:pb-[calc(env(safe-area-inset-bottom)+1rem)]",
)}
>
{isGitRepo && (
<div className="pointer-events-auto">
<BranchToolbar
environmentId={activeThread.environmentId}
threadId={activeThread.id}
{...(routeKind === "draft" && draftId ? { draftId } : {})}
onEnvModeChange={onEnvModeChange}
startFromOrigin={startFromOrigin}
onStartFromOriginChange={onStartFromOriginChange}
{...(canOverrideServerThreadEnvMode
? { effectiveEnvModeOverride: envMode }
: {})}
{...(canOverrideServerThreadEnvMode
? {
activeThreadBranchOverride: activeThreadBranch,
onActiveThreadBranchOverrideChange: setPendingServerThreadBranch,
}
: {})}
envLocked={envLocked}
onComposerFocusRequest={scheduleComposerFocus}
{...(canCheckoutPullRequestIntoThread
? { onCheckoutPullRequestRequest: openPullRequestDialog }
: {})}
{...(hasMultipleEnvironments ? { onEnvironmentChange } : {})}
availableEnvironments={logicalProjectEnvironments}
/>
</div>
)}
</div>
{isDraftHeroState ? (
<div className="chat-composer-horizontal-inset pt-1">
<div className="pointer-events-auto">
<ComposerBannerStack className="relative z-0" items={composerBannerItems} />
</div>
</div>
)}
) : null}
</div>
</div>

Expand Down
88 changes: 88 additions & 0 deletions apps/web/src/components/chat/DraftHeroHeadline.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
import type { ScopedProjectRef } from "@t3tools/contracts";
import { scopedProjectKey, scopeProjectRef } from "@t3tools/client-runtime/environment";
import { ChevronDownIcon } from "lucide-react";
import { useMemo } from "react";

import { useNewThreadHandler } from "~/hooks/useHandleNewThread";
import { useProjects, useThreadShells } from "~/state/entities";
import { sortProjectsForSidebar } from "../Sidebar.logic";
import { Menu, MenuPopup, MenuRadioGroup, MenuRadioItem, MenuTrigger } from "../ui/menu";

interface DraftHeroHeadlineProps {
readonly activeProjectRef: ScopedProjectRef | null;
readonly activeProjectTitle: string | null;
}

export function DraftHeroHeadline({
activeProjectRef,
activeProjectTitle,
}: DraftHeroHeadlineProps) {
const projects = useProjects();
const threads = useThreadShells();
const handleNewThread = useNewThreadHandler();

const orderedProjects = useMemo(
() => sortProjectsForSidebar(projects, threads, "updated_at"),
[projects, threads],
);
const projectByKey = useMemo(
() =>
new Map(
orderedProjects.map(
(project) =>
[
scopedProjectKey(scopeProjectRef(project.environmentId, project.id)),
project,
] as const,
),
),
[orderedProjects],
);
const activeProjectKey = activeProjectRef === null ? "" : scopedProjectKey(activeProjectRef);

const projectLabel = activeProjectTitle ?? "this project";
return (
<h1 className="mx-auto w-full max-w-3xl text-center font-semibold text-2xl text-foreground sm:text-3xl">
What should we do in{" "}
{orderedProjects.length > 1 ? (
<Menu>
<MenuTrigger className="pointer-events-auto inline-flex cursor-pointer items-baseline gap-1.5 rounded-md text-muted-foreground/60 transition-colors hover:text-foreground/80 focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring">
{projectLabel}
<span
aria-hidden="true"
className="mr-1.5 flex size-4 shrink-0 items-center justify-center self-center rounded-full bg-muted-foreground/12 sm:size-5"
>
<ChevronDownIcon className="size-2.5 sm:size-3" />
</span>
</MenuTrigger>
<MenuPopup align="center" className="max-h-80 w-64 overflow-y-auto">
<MenuRadioGroup
value={activeProjectKey}
onValueChange={(value) => {
const project = projectByKey.get(value as string);
if (!project || value === activeProjectKey) {
return;
}
void handleNewThread(scopeProjectRef(project.environmentId, project.id), {
replace: true,
});
}}
>
{orderedProjects.map((project) => {
const key = scopedProjectKey(scopeProjectRef(project.environmentId, project.id));
return (
<MenuRadioItem key={key} value={key} closeOnClick>
<span className="min-w-0 truncate">{project.title}</span>
</MenuRadioItem>
);
})}
</MenuRadioGroup>
</MenuPopup>
</Menu>
) : (
<span className="text-muted-foreground/60">{projectLabel}</span>
)}
?
</h1>
);
}
5 changes: 5 additions & 0 deletions apps/web/src/components/chat/MessagesTimeline.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -179,6 +179,7 @@ interface MessagesTimelineProps {
contentInsetEndAdjustment: number;
onIsAtEndChange: (isAtEnd: boolean) => void;
onManualNavigation: () => void;
hideEmptyPlaceholder?: boolean;
}

// ---------------------------------------------------------------------------
Expand DownExpand Up@@ -212,6 +213,7 @@ export const MessagesTimeline = memo(function MessagesTimeline({
contentInsetEndAdjustment,
onIsAtEndChange,
onManualNavigation,
hideEmptyPlaceholder = false,
}: MessagesTimelineProps) {
const [expandedTurnIds, setExpandedTurnIds] = useState<ReadonlySet<TurnId>>(new Set());
const [expandedWorkGroupIds, setExpandedWorkGroupIds] = useState<ReadonlySet<string>>(new Set());
Expand DownExpand Up@@ -458,6 +460,9 @@ export const MessagesTimeline = memo(function MessagesTimeline({
);

if (rows.length === 0 && !isWorking) {
if (hideEmptyPlaceholder) {
return null;
}
return (
<div className="flex h-full items-center justify-center">
<p className="text-sm text-muted-foreground/30">
Expand Down
3 changes: 3 additions & 0 deletions apps/web/src/hooks/useHandleNewThread.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ export function useNewThreadHandler() {
worktreePath?: string | null;
envMode?: DraftThreadEnvMode;
startFromOrigin?: boolean;
replace?: boolean;
},
): Promise<void> => {
const {
Expand DownExpand Up@@ -120,6 +121,7 @@ export function useNewThreadHandler() {
await router.navigate({
to: "/draft/$draftId",
params: { draftId: reusableStoredDraftThread.draftId },
replace: options?.replace ?? false,
});
})();
}
Expand DownExpand Up@@ -180,6 +182,7 @@ export function useNewThreadHandler() {
await router.navigate({
to: "/draft/$draftId",
params: { draftId },
replace: options?.replace ?? false,
});
})();
},
Expand Down
67 changes: 67 additions & 0 deletions apps/web/src/routes/_chat.index.tsx
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
import { scopeProjectRef } from "@t3tools/client-runtime/environment";
import { createFileRoute, Link } from "@tanstack/react-router";
import { LinkIcon, PlusIcon } from "lucide-react";
import { useEffect, useMemo, useRef } from "react";

import { useOpenAddProjectCommandPalette } from "../commandPaletteContext";
import { NoActiveThreadState } from "../components/NoActiveThreadState";
import { sortProjectsForSidebar } from "../components/Sidebar.logic";
import { Button } from "../components/ui/button";
import { Empty, EmptyDescription, EmptyHeader, EmptyTitle } from "../components/ui/empty";
import { SidebarInset } from "../components/ui/sidebar";
import { useNewThreadHandler } from "../hooks/useHandleNewThread";
import { useProjects, useThreadShells } from "../state/entities";
import { useEnvironments } from "../state/environments";
import { APP_DISPLAY_NAME } from "~/branding";
import { hasCloudPublicConfig } from "~/cloud/publicConfig";
Expand All@@ -19,9 +25,70 @@ function ChatIndexRouteView() {
return <HostedStaticOnboardingState />;
}

return <IndexDraftLanding />;
}

/**
* Landing on the index route drops straight into a draft thread for the most
* recently active project, so the first screen is a prompt instead of a dead
* end. Falls back to an add-project hero when no project exists yet.
*/
function IndexDraftLanding() {
const projects = useProjects();
const threads = useThreadShells();
const handleNewThread = useNewThreadHandler();
const startedRef = useRef(false);

const mostRecentProject = useMemo(
() => sortProjectsForSidebar(projects, threads, "updated_at")[0] ?? null,
[projects, threads],
);

useEffect(() => {
if (mostRecentProject === null || startedRef.current) {
return;
}
startedRef.current = true;
void handleNewThread(scopeProjectRef(mostRecentProject.environmentId, mostRecentProject.id), {
replace: true,
});
}, [handleNewThread, mostRecentProject]);

if (mostRecentProject === null) {
return <NoProjectsHero />;
}
return <NoActiveThreadState />;
}

function NoProjectsHero() {
const openAddProject = useOpenAddProjectCommandPalette();

return (
<SidebarInset className="h-dvh min-h-0 overflow-hidden overscroll-y-none bg-background text-foreground">
<div className="flex min-h-0 min-w-0 flex-1 flex-col overflow-x-hidden bg-background">
<Empty className="flex-1">
<div className="w-full max-w-lg px-8 py-12">
<EmptyHeader className="max-w-none">
<EmptyTitle className="text-foreground text-2xl sm:text-3xl">
What should we work on?
</EmptyTitle>
<EmptyDescription className="mt-2 text-sm text-muted-foreground/78">
Add a project to start your first thread.
</EmptyDescription>
<div className="mt-6 flex justify-center">
<Button size="sm" onClick={openAddProject}>
<PlusIcon className="size-4" />
Add project
</Button>
</div>
</EmptyHeader>
</div>
</Empty>
</div>
</SidebarInset>
);
}

export const Route = createFileRoute("/_chat/")({
component: ChatIndexRouteView,
});
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 79 additions & 43 deletions apps/web/src/components/ChatView.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -201,6 +201,7 @@ import {
} from "../state/entities";
import { environmentShell } from "../state/shell";
import { ChatComposer, type ChatComposerHandle } from "./chat/ChatComposer";
import { DraftHeroHeadline } from "./chat/DraftHeroHeadline";
import { ExpandedImageDialog } from "./chat/ExpandedImageDialog";
import { PullRequestThreadDialog } from "./PullRequestThreadDialog";
import { MessagesTimeline } from "./chat/MessagesTimeline";
Expand DownExpand Up@@ -2063,6 +2064,7 @@ function ChatViewContent(props: ChatViewProps) {
deriveTimelineEntries(timelineMessages, activeThread?.proposedPlans ?? [], workLogEntries),
[activeThread?.proposedPlans, timelineMessages, workLogEntries],
);
const isDraftHeroState = isLocalDraftThread && timelineEntries.length === 0 && !isWorking;
const { turnDiffSummaries, inferredCheckpointTurnCountByTurnId } =
useTurnDiffSummaries(activeThread);
const turnDiffSummaryByAssistantMessageId = useMemo(() => {
Expand DownExpand Up@@ -5101,6 +5103,7 @@ function ChatViewContent(props: ChatViewProps) {
contentInsetEndAdjustment={composerOverlayHeight}
onIsAtEndChange={onIsAtEndChange}
onManualNavigation={cancelTimelineLiveFollowForUserNavigation}
hideEmptyPlaceholder={isDraftHeroState}
/>

{/* scroll to end pill — shown when user has scrolled away from the live edge */}
Expand All@@ -5123,23 +5126,45 @@ function ChatViewContent(props: ChatViewProps) {
)}
</div>

{/* Input bar */}
{/* Input bar — centered hero while a draft has no messages, docked at the bottom otherwise */}
<div
ref={setComposerOverlayElement}
data-chat-composer-overlay="true"
className="pointer-events-none absolute inset-x-0 bottom-0 z-20 pt-1.5 sm:pt-2"
className={
isDraftHeroState
? "pointer-events-none absolute inset-0 z-20 flex flex-col pt-1.5 sm:pt-2"
: "pointer-events-none absolute inset-x-0 bottom-0 z-20 pt-1.5 sm:pt-2"
}
>
<div
aria-hidden="true"
className="chat-composer-horizontal-inset pointer-events-none absolute inset-x-0 top-1.5 bottom-0 z-0 sm:top-2"
>
<div className="relative mx-auto h-full w-full max-w-3xl overflow-clip rounded-t-[20px]">
<div className="chat-composer-shared-blur absolute -inset-8" />
{/* Equal flexible spacers keep the hero group vertically stable:
whatever mounts below (branch toolbar, banners) grows into the
bottom spacer instead of re-centering the headline. */}
{isDraftHeroState ? <div className="min-h-0 flex-1 basis-0" /> : null}
{isDraftHeroState ? (
<div className="chat-composer-horizontal-inset pb-8">
<DraftHeroHeadline
activeProjectRef={activeProjectRef}
activeProjectTitle={activeProject?.title ?? null}
/>
</div>
</div>
) : (
<div
aria-hidden="true"
className="chat-composer-horizontal-inset pointer-events-none absolute inset-x-0 top-1.5 bottom-0 z-0 sm:top-2"
>
<div className="relative mx-auto h-full w-full max-w-3xl overflow-clip rounded-t-[20px]">
<div className="chat-composer-shared-blur absolute -inset-8" />
</div>
</div>
)}
<div className="chat-composer-horizontal-inset">
<div className="pointer-events-auto relative z-10 isolate">
<ComposerBannerStack className="relative z-0" items={composerBannerItems} />
{/* In the hero layout the banner hangs below the composer without
contributing height, so connect/reconnect churn cannot
re-center the headline and composer. */}
{isDraftHeroState ? null : (
<ComposerBannerStack className="relative z-0" items={composerBannerItems} />
)}
<div className="relative z-10">
<ChatComposer
composerRef={composerRef}
Expand DownExpand Up@@ -5216,41 +5241,52 @@ function ChatViewContent(props: ChatViewProps) {
</div>
</div>
<div
className={cn(
"chat-composer-horizontal-inset chat-composer-lower-chrome relative z-10",
isGitRepo
? "pb-[calc(env(safe-area-inset-bottom)+0.25rem)]"
: "pb-[calc(env(safe-area-inset-bottom)+0.75rem)] sm:pb-[calc(env(safe-area-inset-bottom)+1rem)]",
)}
className={isDraftHeroState ? "flex min-h-0 flex-1 basis-0 flex-col" : "contents"}
>
{isGitRepo && (
<div className="pointer-events-auto">
<BranchToolbar
environmentId={activeThread.environmentId}
threadId={activeThread.id}
{...(routeKind === "draft" && draftId ? { draftId } : {})}
onEnvModeChange={onEnvModeChange}
startFromOrigin={startFromOrigin}
onStartFromOriginChange={onStartFromOriginChange}
{...(canOverrideServerThreadEnvMode
? { effectiveEnvModeOverride: envMode }
: {})}
{...(canOverrideServerThreadEnvMode
? {
activeThreadBranchOverride: activeThreadBranch,
onActiveThreadBranchOverrideChange: setPendingServerThreadBranch,
}
: {})}
envLocked={envLocked}
onComposerFocusRequest={scheduleComposerFocus}
{...(canCheckoutPullRequestIntoThread
? { onCheckoutPullRequestRequest: openPullRequestDialog }
: {})}
{...(hasMultipleEnvironments ? { onEnvironmentChange } : {})}
availableEnvironments={logicalProjectEnvironments}
/>
<div
className={cn(
"chat-composer-horizontal-inset chat-composer-lower-chrome relative z-10",
isGitRepo
? "pb-[calc(env(safe-area-inset-bottom)+0.25rem)]"
: "pb-[calc(env(safe-area-inset-bottom)+0.75rem)] sm:pb-[calc(env(safe-area-inset-bottom)+1rem)]",
)}
>
{isGitRepo && (
<div className="pointer-events-auto">
<BranchToolbar
environmentId={activeThread.environmentId}
threadId={activeThread.id}
{...(routeKind === "draft" && draftId ? { draftId } : {})}
onEnvModeChange={onEnvModeChange}
startFromOrigin={startFromOrigin}
onStartFromOriginChange={onStartFromOriginChange}
{...(canOverrideServerThreadEnvMode
? { effectiveEnvModeOverride: envMode }
: {})}
{...(canOverrideServerThreadEnvMode
? {
activeThreadBranchOverride: activeThreadBranch,
onActiveThreadBranchOverrideChange: setPendingServerThreadBranch,
}
: {})}
envLocked={envLocked}
onComposerFocusRequest={scheduleComposerFocus}
{...(canCheckoutPullRequestIntoThread
? { onCheckoutPullRequestRequest: openPullRequestDialog }
: {})}
{...(hasMultipleEnvironments ? { onEnvironmentChange } : {})}
availableEnvironments={logicalProjectEnvironments}
/>
</div>
)}
</div>
{isDraftHeroState ? (
<div className="chat-composer-horizontal-inset pt-1">
<div className="pointer-events-auto">
<ComposerBannerStack className="relative z-0" items={composerBannerItems} />
</div>
</div>
)}
) : null}
</div>
</div>

Expand Down
88 changes: 88 additions & 0 deletions apps/web/src/components/chat/DraftHeroHeadline.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
import type { ScopedProjectRef } from "@t3tools/contracts";
import { scopedProjectKey, scopeProjectRef } from "@t3tools/client-runtime/environment";
import { ChevronDownIcon } from "lucide-react";
import { useMemo } from "react";

import { useNewThreadHandler } from "~/hooks/useHandleNewThread";
import { useProjects, useThreadShells } from "~/state/entities";
import { sortProjectsForSidebar } from "../Sidebar.logic";
import { Menu, MenuPopup, MenuRadioGroup, MenuRadioItem, MenuTrigger } from "../ui/menu";

interface DraftHeroHeadlineProps {
readonly activeProjectRef: ScopedProjectRef | null;
readonly activeProjectTitle: string | null;
}

export function DraftHeroHeadline({
activeProjectRef,
activeProjectTitle,
}: DraftHeroHeadlineProps) {
const projects = useProjects();
const threads = useThreadShells();
const handleNewThread = useNewThreadHandler();

const orderedProjects = useMemo(
() => sortProjectsForSidebar(projects, threads, "updated_at"),
[projects, threads],
);
const projectByKey = useMemo(
() =>
new Map(
orderedProjects.map(
(project) =>
[
scopedProjectKey(scopeProjectRef(project.environmentId, project.id)),
project,
] as const,
),
),
[orderedProjects],
);
const activeProjectKey = activeProjectRef === null ? "" : scopedProjectKey(activeProjectRef);

const projectLabel = activeProjectTitle ?? "this project";
return (
<h1 className="mx-auto w-full max-w-3xl text-center font-semibold text-2xl text-foreground sm:text-3xl">
What should we do in{" "}
{orderedProjects.length > 1 ? (
<Menu>
<MenuTrigger className="pointer-events-auto inline-flex cursor-pointer items-baseline gap-1.5 rounded-md text-muted-foreground/60 transition-colors hover:text-foreground/80 focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring">
{projectLabel}
<span
aria-hidden="true"
className="mr-1.5 flex size-4 shrink-0 items-center justify-center self-center rounded-full bg-muted-foreground/12 sm:size-5"
>
<ChevronDownIcon className="size-2.5 sm:size-3" />
</span>
</MenuTrigger>
<MenuPopup align="center" className="max-h-80 w-64 overflow-y-auto">
<MenuRadioGroup
value={activeProjectKey}
onValueChange={(value) => {
const project = projectByKey.get(value as string);
if (!project || value === activeProjectKey) {
return;
}
void handleNewThread(scopeProjectRef(project.environmentId, project.id), {
replace: true,
});
}}
>
{orderedProjects.map((project) => {
const key = scopedProjectKey(scopeProjectRef(project.environmentId, project.id));
return (
<MenuRadioItem key={key} value={key} closeOnClick>
<span className="min-w-0 truncate">{project.title}</span>
</MenuRadioItem>
);
})}
</MenuRadioGroup>
</MenuPopup>
</Menu>
) : (
<span className="text-muted-foreground/60">{projectLabel}</span>
)}
?
</h1>
);
}
5 changes: 5 additions & 0 deletions apps/web/src/components/chat/MessagesTimeline.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -179,6 +179,7 @@ interface MessagesTimelineProps {
contentInsetEndAdjustment: number;
onIsAtEndChange: (isAtEnd: boolean) => void;
onManualNavigation: () => void;
hideEmptyPlaceholder?: boolean;
}

// ---------------------------------------------------------------------------
Expand DownExpand Up@@ -212,6 +213,7 @@ export const MessagesTimeline = memo(function MessagesTimeline({
contentInsetEndAdjustment,
onIsAtEndChange,
onManualNavigation,
hideEmptyPlaceholder = false,
}: MessagesTimelineProps) {
const [expandedTurnIds, setExpandedTurnIds] = useState<ReadonlySet<TurnId>>(new Set());
const [expandedWorkGroupIds, setExpandedWorkGroupIds] = useState<ReadonlySet<string>>(new Set());
Expand DownExpand Up@@ -458,6 +460,9 @@ export const MessagesTimeline = memo(function MessagesTimeline({
);

if (rows.length === 0 && !isWorking) {
if (hideEmptyPlaceholder) {
return null;
}
return (
<div className="flex h-full items-center justify-center">
<p className="text-sm text-muted-foreground/30">
Expand Down
3 changes: 3 additions & 0 deletions apps/web/src/hooks/useHandleNewThread.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ export function useNewThreadHandler() {
worktreePath?: string | null;
envMode?: DraftThreadEnvMode;
startFromOrigin?: boolean;
replace?: boolean;
},
): Promise<void> => {
const {
Expand DownExpand Up@@ -120,6 +121,7 @@ export function useNewThreadHandler() {
await router.navigate({
to: "/draft/$draftId",
params: { draftId: reusableStoredDraftThread.draftId },
replace: options?.replace ?? false,
});
})();
}
Expand DownExpand Up@@ -180,6 +182,7 @@ export function useNewThreadHandler() {
await router.navigate({
to: "/draft/$draftId",
params: { draftId },
replace: options?.replace ?? false,
});
})();
},
Expand Down
67 changes: 67 additions & 0 deletions apps/web/src/routes/_chat.index.tsx
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
import { scopeProjectRef } from "@t3tools/client-runtime/environment";
import { createFileRoute, Link } from "@tanstack/react-router";
import { LinkIcon, PlusIcon } from "lucide-react";
import { useEffect, useMemo, useRef } from "react";

import { useOpenAddProjectCommandPalette } from "../commandPaletteContext";
import { NoActiveThreadState } from "../components/NoActiveThreadState";
import { sortProjectsForSidebar } from "../components/Sidebar.logic";
import { Button } from "../components/ui/button";
import { Empty, EmptyDescription, EmptyHeader, EmptyTitle } from "../components/ui/empty";
import { SidebarInset } from "../components/ui/sidebar";
import { useNewThreadHandler } from "../hooks/useHandleNewThread";
import { useProjects, useThreadShells } from "../state/entities";
import { useEnvironments } from "../state/environments";
import { APP_DISPLAY_NAME } from "~/branding";
import { hasCloudPublicConfig } from "~/cloud/publicConfig";
Expand All@@ -19,9 +25,70 @@ function ChatIndexRouteView() {
return <HostedStaticOnboardingState />;
}

return <IndexDraftLanding />;
}

/**
* Landing on the index route drops straight into a draft thread for the most
* recently active project, so the first screen is a prompt instead of a dead
* end. Falls back to an add-project hero when no project exists yet.
*/
function IndexDraftLanding() {
const projects = useProjects();
const threads = useThreadShells();
const handleNewThread = useNewThreadHandler();
const startedRef = useRef(false);

const mostRecentProject = useMemo(
() => sortProjectsForSidebar(projects, threads, "updated_at")[0] ?? null,
[projects, threads],
);

useEffect(() => {
if (mostRecentProject === null || startedRef.current) {
return;
}
startedRef.current = true;
void handleNewThread(scopeProjectRef(mostRecentProject.environmentId, mostRecentProject.id), {
replace: true,
});
}, [handleNewThread, mostRecentProject]);

if (mostRecentProject === null) {
return <NoProjectsHero />;
}
return <NoActiveThreadState />;
}

function NoProjectsHero() {
const openAddProject = useOpenAddProjectCommandPalette();

return (
<SidebarInset className="h-dvh min-h-0 overflow-hidden overscroll-y-none bg-background text-foreground">
<div className="flex min-h-0 min-w-0 flex-1 flex-col overflow-x-hidden bg-background">
<Empty className="flex-1">
<div className="w-full max-w-lg px-8 py-12">
<EmptyHeader className="max-w-none">
<EmptyTitle className="text-foreground text-2xl sm:text-3xl">
What should we work on?
</EmptyTitle>
<EmptyDescription className="mt-2 text-sm text-muted-foreground/78">
Add a project to start your first thread.
</EmptyDescription>
<div className="mt-6 flex justify-center">
<Button size="sm" onClick={openAddProject}>
<PlusIcon className="size-4" />
Add project
</Button>
</div>
</EmptyHeader>
</div>
</Empty>
</div>
</SidebarInset>
);
}

export const Route = createFileRoute("/_chat/")({
component: ChatIndexRouteView,
});
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 79 additions & 43 deletions apps/web/src/components/ChatView.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -201,6 +201,7 @@ import {
} from "../state/entities";
import { environmentShell } from "../state/shell";
import { ChatComposer, type ChatComposerHandle } from "./chat/ChatComposer";
import { DraftHeroHeadline } from "./chat/DraftHeroHeadline";
import { ExpandedImageDialog } from "./chat/ExpandedImageDialog";
import { PullRequestThreadDialog } from "./PullRequestThreadDialog";
import { MessagesTimeline } from "./chat/MessagesTimeline";
Expand DownExpand Up@@ -2063,6 +2064,7 @@ function ChatViewContent(props: ChatViewProps) {
deriveTimelineEntries(timelineMessages, activeThread?.proposedPlans ?? [], workLogEntries),
[activeThread?.proposedPlans, timelineMessages, workLogEntries],
);
const isDraftHeroState = isLocalDraftThread && timelineEntries.length === 0 && !isWorking;
const { turnDiffSummaries, inferredCheckpointTurnCountByTurnId } =
useTurnDiffSummaries(activeThread);
const turnDiffSummaryByAssistantMessageId = useMemo(() => {
Expand DownExpand Up@@ -5101,6 +5103,7 @@ function ChatViewContent(props: ChatViewProps) {
contentInsetEndAdjustment={composerOverlayHeight}
onIsAtEndChange={onIsAtEndChange}
onManualNavigation={cancelTimelineLiveFollowForUserNavigation}
hideEmptyPlaceholder={isDraftHeroState}
/>

{/* scroll to end pill — shown when user has scrolled away from the live edge */}
Expand All@@ -5123,23 +5126,45 @@ function ChatViewContent(props: ChatViewProps) {
)}
</div>

{/* Input bar */}
{/* Input bar — centered hero while a draft has no messages, docked at the bottom otherwise */}
<div
ref={setComposerOverlayElement}
data-chat-composer-overlay="true"
className="pointer-events-none absolute inset-x-0 bottom-0 z-20 pt-1.5 sm:pt-2"
className={
isDraftHeroState
? "pointer-events-none absolute inset-0 z-20 flex flex-col pt-1.5 sm:pt-2"
: "pointer-events-none absolute inset-x-0 bottom-0 z-20 pt-1.5 sm:pt-2"
}
>
<div
aria-hidden="true"
className="chat-composer-horizontal-inset pointer-events-none absolute inset-x-0 top-1.5 bottom-0 z-0 sm:top-2"
>
<div className="relative mx-auto h-full w-full max-w-3xl overflow-clip rounded-t-[20px]">
<div className="chat-composer-shared-blur absolute -inset-8" />
{/* Equal flexible spacers keep the hero group vertically stable:
whatever mounts below (branch toolbar, banners) grows into the
bottom spacer instead of re-centering the headline. */}
{isDraftHeroState ? <div className="min-h-0 flex-1 basis-0" /> : null}
{isDraftHeroState ? (
<div className="chat-composer-horizontal-inset pb-8">
<DraftHeroHeadline
activeProjectRef={activeProjectRef}
activeProjectTitle={activeProject?.title ?? null}
/>
</div>
</div>
) : (
<div
aria-hidden="true"
className="chat-composer-horizontal-inset pointer-events-none absolute inset-x-0 top-1.5 bottom-0 z-0 sm:top-2"
>
<div className="relative mx-auto h-full w-full max-w-3xl overflow-clip rounded-t-[20px]">
<div className="chat-composer-shared-blur absolute -inset-8" />
</div>
</div>
)}
<div className="chat-composer-horizontal-inset">
<div className="pointer-events-auto relative z-10 isolate">
<ComposerBannerStack className="relative z-0" items={composerBannerItems} />
{/* In the hero layout the banner hangs below the composer without
contributing height, so connect/reconnect churn cannot
re-center the headline and composer. */}
{isDraftHeroState ? null : (
<ComposerBannerStack className="relative z-0" items={composerBannerItems} />
)}
<div className="relative z-10">
<ChatComposer
composerRef={composerRef}
Expand DownExpand Up@@ -5216,41 +5241,52 @@ function ChatViewContent(props: ChatViewProps) {
</div>
</div>
<div
className={cn(
"chat-composer-horizontal-inset chat-composer-lower-chrome relative z-10",
isGitRepo
? "pb-[calc(env(safe-area-inset-bottom)+0.25rem)]"
: "pb-[calc(env(safe-area-inset-bottom)+0.75rem)] sm:pb-[calc(env(safe-area-inset-bottom)+1rem)]",
)}
className={isDraftHeroState ? "flex min-h-0 flex-1 basis-0 flex-col" : "contents"}
>
{isGitRepo && (
<div className="pointer-events-auto">
<BranchToolbar
environmentId={activeThread.environmentId}
threadId={activeThread.id}
{...(routeKind === "draft" && draftId ? { draftId } : {})}
onEnvModeChange={onEnvModeChange}
startFromOrigin={startFromOrigin}
onStartFromOriginChange={onStartFromOriginChange}
{...(canOverrideServerThreadEnvMode
? { effectiveEnvModeOverride: envMode }
: {})}
{...(canOverrideServerThreadEnvMode
? {
activeThreadBranchOverride: activeThreadBranch,
onActiveThreadBranchOverrideChange: setPendingServerThreadBranch,
}
: {})}
envLocked={envLocked}
onComposerFocusRequest={scheduleComposerFocus}
{...(canCheckoutPullRequestIntoThread
? { onCheckoutPullRequestRequest: openPullRequestDialog }
: {})}
{...(hasMultipleEnvironments ? { onEnvironmentChange } : {})}
availableEnvironments={logicalProjectEnvironments}
/>
<div
className={cn(
"chat-composer-horizontal-inset chat-composer-lower-chrome relative z-10",
isGitRepo
? "pb-[calc(env(safe-area-inset-bottom)+0.25rem)]"
: "pb-[calc(env(safe-area-inset-bottom)+0.75rem)] sm:pb-[calc(env(safe-area-inset-bottom)+1rem)]",
)}
>
{isGitRepo && (
<div className="pointer-events-auto">
<BranchToolbar
environmentId={activeThread.environmentId}
threadId={activeThread.id}
{...(routeKind === "draft" && draftId ? { draftId } : {})}
onEnvModeChange={onEnvModeChange}
startFromOrigin={startFromOrigin}
onStartFromOriginChange={onStartFromOriginChange}
{...(canOverrideServerThreadEnvMode
? { effectiveEnvModeOverride: envMode }
: {})}
{...(canOverrideServerThreadEnvMode
? {
activeThreadBranchOverride: activeThreadBranch,
onActiveThreadBranchOverrideChange: setPendingServerThreadBranch,
}
: {})}
envLocked={envLocked}
onComposerFocusRequest={scheduleComposerFocus}
{...(canCheckoutPullRequestIntoThread
? { onCheckoutPullRequestRequest: openPullRequestDialog }
: {})}
{...(hasMultipleEnvironments ? { onEnvironmentChange } : {})}
availableEnvironments={logicalProjectEnvironments}
/>
</div>
)}
</div>
{isDraftHeroState ? (
<div className="chat-composer-horizontal-inset pt-1">
<div className="pointer-events-auto">
<ComposerBannerStack className="relative z-0" items={composerBannerItems} />
</div>
</div>
)}
) : null}
</div>
</div>

Expand Down
88 changes: 88 additions & 0 deletions apps/web/src/components/chat/DraftHeroHeadline.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
import type { ScopedProjectRef } from "@t3tools/contracts";
import { scopedProjectKey, scopeProjectRef } from "@t3tools/client-runtime/environment";
import { ChevronDownIcon } from "lucide-react";
import { useMemo } from "react";

import { useNewThreadHandler } from "~/hooks/useHandleNewThread";
import { useProjects, useThreadShells } from "~/state/entities";
import { sortProjectsForSidebar } from "../Sidebar.logic";
import { Menu, MenuPopup, MenuRadioGroup, MenuRadioItem, MenuTrigger } from "../ui/menu";

interface DraftHeroHeadlineProps {
readonly activeProjectRef: ScopedProjectRef | null;
readonly activeProjectTitle: string | null;
}

export function DraftHeroHeadline({
activeProjectRef,
activeProjectTitle,
}: DraftHeroHeadlineProps) {
const projects = useProjects();
const threads = useThreadShells();
const handleNewThread = useNewThreadHandler();

const orderedProjects = useMemo(
() => sortProjectsForSidebar(projects, threads, "updated_at"),
[projects, threads],
);
const projectByKey = useMemo(
() =>
new Map(
orderedProjects.map(
(project) =>
[
scopedProjectKey(scopeProjectRef(project.environmentId, project.id)),
project,
] as const,
),
),
[orderedProjects],
);
const activeProjectKey = activeProjectRef === null ? "" : scopedProjectKey(activeProjectRef);

const projectLabel = activeProjectTitle ?? "this project";
return (
<h1 className="mx-auto w-full max-w-3xl text-center font-semibold text-2xl text-foreground sm:text-3xl">
What should we do in{" "}
{orderedProjects.length > 1 ? (
<Menu>
<MenuTrigger className="pointer-events-auto inline-flex cursor-pointer items-baseline gap-1.5 rounded-md text-muted-foreground/60 transition-colors hover:text-foreground/80 focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring">
{projectLabel}
<span
aria-hidden="true"
className="mr-1.5 flex size-4 shrink-0 items-center justify-center self-center rounded-full bg-muted-foreground/12 sm:size-5"
>
<ChevronDownIcon className="size-2.5 sm:size-3" />
</span>
</MenuTrigger>
<MenuPopup align="center" className="max-h-80 w-64 overflow-y-auto">
<MenuRadioGroup
value={activeProjectKey}
onValueChange={(value) => {
const project = projectByKey.get(value as string);
if (!project || value === activeProjectKey) {
return;
}
void handleNewThread(scopeProjectRef(project.environmentId, project.id), {
replace: true,
});
}}
>
{orderedProjects.map((project) => {
const key = scopedProjectKey(scopeProjectRef(project.environmentId, project.id));
return (
<MenuRadioItem key={key} value={key} closeOnClick>
<span className="min-w-0 truncate">{project.title}</span>
</MenuRadioItem>
);
})}
</MenuRadioGroup>
</MenuPopup>
</Menu>
) : (
<span className="text-muted-foreground/60">{projectLabel}</span>
)}
?
</h1>
);
}
5 changes: 5 additions & 0 deletions apps/web/src/components/chat/MessagesTimeline.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -179,6 +179,7 @@ interface MessagesTimelineProps {
contentInsetEndAdjustment: number;
onIsAtEndChange: (isAtEnd: boolean) => void;
onManualNavigation: () => void;
hideEmptyPlaceholder?: boolean;
}

// ---------------------------------------------------------------------------
Expand DownExpand Up@@ -212,6 +213,7 @@ export const MessagesTimeline = memo(function MessagesTimeline({
contentInsetEndAdjustment,
onIsAtEndChange,
onManualNavigation,
hideEmptyPlaceholder = false,
}: MessagesTimelineProps) {
const [expandedTurnIds, setExpandedTurnIds] = useState<ReadonlySet<TurnId>>(new Set());
const [expandedWorkGroupIds, setExpandedWorkGroupIds] = useState<ReadonlySet<string>>(new Set());
Expand DownExpand Up@@ -458,6 +460,9 @@ export const MessagesTimeline = memo(function MessagesTimeline({
);

if (rows.length === 0 && !isWorking) {
if (hideEmptyPlaceholder) {
return null;
}
return (
<div className="flex h-full items-center justify-center">
<p className="text-sm text-muted-foreground/30">
Expand Down
3 changes: 3 additions & 0 deletions apps/web/src/hooks/useHandleNewThread.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ export function useNewThreadHandler() {
worktreePath?: string | null;
envMode?: DraftThreadEnvMode;
startFromOrigin?: boolean;
replace?: boolean;
},
): Promise<void> => {
const {
Expand DownExpand Up@@ -120,6 +121,7 @@ export function useNewThreadHandler() {
await router.navigate({
to: "/draft/$draftId",
params: { draftId: reusableStoredDraftThread.draftId },
replace: options?.replace ?? false,
});
})();
}
Expand DownExpand Up@@ -180,6 +182,7 @@ export function useNewThreadHandler() {
await router.navigate({
to: "/draft/$draftId",
params: { draftId },
replace: options?.replace ?? false,
});
})();
},
Expand Down
67 changes: 67 additions & 0 deletions apps/web/src/routes/_chat.index.tsx
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
import { scopeProjectRef } from "@t3tools/client-runtime/environment";
import { createFileRoute, Link } from "@tanstack/react-router";
import { LinkIcon, PlusIcon } from "lucide-react";
import { useEffect, useMemo, useRef } from "react";

import { useOpenAddProjectCommandPalette } from "../commandPaletteContext";
import { NoActiveThreadState } from "../components/NoActiveThreadState";
import { sortProjectsForSidebar } from "../components/Sidebar.logic";
import { Button } from "../components/ui/button";
import { Empty, EmptyDescription, EmptyHeader, EmptyTitle } from "../components/ui/empty";
import { SidebarInset } from "../components/ui/sidebar";
import { useNewThreadHandler } from "../hooks/useHandleNewThread";
import { useProjects, useThreadShells } from "../state/entities";
import { useEnvironments } from "../state/environments";
import { APP_DISPLAY_NAME } from "~/branding";
import { hasCloudPublicConfig } from "~/cloud/publicConfig";
Expand All@@ -19,9 +25,70 @@ function ChatIndexRouteView() {
return <HostedStaticOnboardingState />;
}

return <IndexDraftLanding />;
}

/**
* Landing on the index route drops straight into a draft thread for the most
* recently active project, so the first screen is a prompt instead of a dead
* end. Falls back to an add-project hero when no project exists yet.
*/
function IndexDraftLanding() {
const projects = useProjects();
const threads = useThreadShells();
const handleNewThread = useNewThreadHandler();
const startedRef = useRef(false);

const mostRecentProject = useMemo(
() => sortProjectsForSidebar(projects, threads, "updated_at")[0] ?? null,
[projects, threads],
);

useEffect(() => {
if (mostRecentProject === null || startedRef.current) {
return;
}
startedRef.current = true;
void handleNewThread(scopeProjectRef(mostRecentProject.environmentId, mostRecentProject.id), {
replace: true,
});
}, [handleNewThread, mostRecentProject]);

if (mostRecentProject === null) {
return <NoProjectsHero />;
}
return <NoActiveThreadState />;
}

function NoProjectsHero() {
const openAddProject = useOpenAddProjectCommandPalette();

return (
<SidebarInset className="h-dvh min-h-0 overflow-hidden overscroll-y-none bg-background text-foreground">
<div className="flex min-h-0 min-w-0 flex-1 flex-col overflow-x-hidden bg-background">
<Empty className="flex-1">
<div className="w-full max-w-lg px-8 py-12">
<EmptyHeader className="max-w-none">
<EmptyTitle className="text-foreground text-2xl sm:text-3xl">
What should we work on?
</EmptyTitle>
<EmptyDescription className="mt-2 text-sm text-muted-foreground/78">
Add a project to start your first thread.
</EmptyDescription>
<div className="mt-6 flex justify-center">
<Button size="sm" onClick={openAddProject}>
<PlusIcon className="size-4" />
Add project
</Button>
</div>
</EmptyHeader>
</div>
</Empty>
</div>
</SidebarInset>
);
}

export const Route = createFileRoute("/_chat/")({
component: ChatIndexRouteView,
});
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 79 additions & 43 deletions apps/web/src/components/ChatView.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -201,6 +201,7 @@ import {
} from "../state/entities";
import { environmentShell } from "../state/shell";
import { ChatComposer, type ChatComposerHandle } from "./chat/ChatComposer";
import { DraftHeroHeadline } from "./chat/DraftHeroHeadline";
import { ExpandedImageDialog } from "./chat/ExpandedImageDialog";
import { PullRequestThreadDialog } from "./PullRequestThreadDialog";
import { MessagesTimeline } from "./chat/MessagesTimeline";
Expand DownExpand Up@@ -2063,6 +2064,7 @@ function ChatViewContent(props: ChatViewProps) {
deriveTimelineEntries(timelineMessages, activeThread?.proposedPlans ?? [], workLogEntries),
[activeThread?.proposedPlans, timelineMessages, workLogEntries],
);
const isDraftHeroState = isLocalDraftThread && timelineEntries.length === 0 && !isWorking;
const { turnDiffSummaries, inferredCheckpointTurnCountByTurnId } =
useTurnDiffSummaries(activeThread);
const turnDiffSummaryByAssistantMessageId = useMemo(() => {
Expand DownExpand Up@@ -5101,6 +5103,7 @@ function ChatViewContent(props: ChatViewProps) {
contentInsetEndAdjustment={composerOverlayHeight}
onIsAtEndChange={onIsAtEndChange}
onManualNavigation={cancelTimelineLiveFollowForUserNavigation}
hideEmptyPlaceholder={isDraftHeroState}
/>

{/* scroll to end pill — shown when user has scrolled away from the live edge */}
Expand All@@ -5123,23 +5126,45 @@ function ChatViewContent(props: ChatViewProps) {
)}
</div>

{/* Input bar */}
{/* Input bar — centered hero while a draft has no messages, docked at the bottom otherwise */}
<div
ref={setComposerOverlayElement}
data-chat-composer-overlay="true"
className="pointer-events-none absolute inset-x-0 bottom-0 z-20 pt-1.5 sm:pt-2"
className={
isDraftHeroState
? "pointer-events-none absolute inset-0 z-20 flex flex-col pt-1.5 sm:pt-2"
: "pointer-events-none absolute inset-x-0 bottom-0 z-20 pt-1.5 sm:pt-2"
}
>
<div
aria-hidden="true"
className="chat-composer-horizontal-inset pointer-events-none absolute inset-x-0 top-1.5 bottom-0 z-0 sm:top-2"
>
<div className="relative mx-auto h-full w-full max-w-3xl overflow-clip rounded-t-[20px]">
<div className="chat-composer-shared-blur absolute -inset-8" />
{/* Equal flexible spacers keep the hero group vertically stable:
whatever mounts below (branch toolbar, banners) grows into the
bottom spacer instead of re-centering the headline. */}
{isDraftHeroState ? <div className="min-h-0 flex-1 basis-0" /> : null}
{isDraftHeroState ? (
<div className="chat-composer-horizontal-inset pb-8">
<DraftHeroHeadline
activeProjectRef={activeProjectRef}
activeProjectTitle={activeProject?.title ?? null}
/>
</div>
</div>
) : (
<div
aria-hidden="true"
className="chat-composer-horizontal-inset pointer-events-none absolute inset-x-0 top-1.5 bottom-0 z-0 sm:top-2"
>
<div className="relative mx-auto h-full w-full max-w-3xl overflow-clip rounded-t-[20px]">
<div className="chat-composer-shared-blur absolute -inset-8" />
</div>
</div>
)}
<div className="chat-composer-horizontal-inset">
<div className="pointer-events-auto relative z-10 isolate">
<ComposerBannerStack className="relative z-0" items={composerBannerItems} />
{/* In the hero layout the banner hangs below the composer without
contributing height, so connect/reconnect churn cannot
re-center the headline and composer. */}
{isDraftHeroState ? null : (
<ComposerBannerStack className="relative z-0" items={composerBannerItems} />
)}
<div className="relative z-10">
<ChatComposer
composerRef={composerRef}
Expand DownExpand Up@@ -5216,41 +5241,52 @@ function ChatViewContent(props: ChatViewProps) {
</div>
</div>
<div
className={cn(
"chat-composer-horizontal-inset chat-composer-lower-chrome relative z-10",
isGitRepo
? "pb-[calc(env(safe-area-inset-bottom)+0.25rem)]"
: "pb-[calc(env(safe-area-inset-bottom)+0.75rem)] sm:pb-[calc(env(safe-area-inset-bottom)+1rem)]",
)}
className={isDraftHeroState ? "flex min-h-0 flex-1 basis-0 flex-col" : "contents"}
>
{isGitRepo && (
<div className="pointer-events-auto">
<BranchToolbar
environmentId={activeThread.environmentId}
threadId={activeThread.id}
{...(routeKind === "draft" && draftId ? { draftId } : {})}
onEnvModeChange={onEnvModeChange}
startFromOrigin={startFromOrigin}
onStartFromOriginChange={onStartFromOriginChange}
{...(canOverrideServerThreadEnvMode
? { effectiveEnvModeOverride: envMode }
: {})}
{...(canOverrideServerThreadEnvMode
? {
activeThreadBranchOverride: activeThreadBranch,
onActiveThreadBranchOverrideChange: setPendingServerThreadBranch,
}
: {})}
envLocked={envLocked}
onComposerFocusRequest={scheduleComposerFocus}
{...(canCheckoutPullRequestIntoThread
? { onCheckoutPullRequestRequest: openPullRequestDialog }
: {})}
{...(hasMultipleEnvironments ? { onEnvironmentChange } : {})}
availableEnvironments={logicalProjectEnvironments}
/>
<div
className={cn(
"chat-composer-horizontal-inset chat-composer-lower-chrome relative z-10",
isGitRepo
? "pb-[calc(env(safe-area-inset-bottom)+0.25rem)]"
: "pb-[calc(env(safe-area-inset-bottom)+0.75rem)] sm:pb-[calc(env(safe-area-inset-bottom)+1rem)]",
)}
>
{isGitRepo && (
<div className="pointer-events-auto">
<BranchToolbar
environmentId={activeThread.environmentId}
threadId={activeThread.id}
{...(routeKind === "draft" && draftId ? { draftId } : {})}
onEnvModeChange={onEnvModeChange}
startFromOrigin={startFromOrigin}
onStartFromOriginChange={onStartFromOriginChange}
{...(canOverrideServerThreadEnvMode
? { effectiveEnvModeOverride: envMode }
: {})}
{...(canOverrideServerThreadEnvMode
? {
activeThreadBranchOverride: activeThreadBranch,
onActiveThreadBranchOverrideChange: setPendingServerThreadBranch,
}
: {})}
envLocked={envLocked}
onComposerFocusRequest={scheduleComposerFocus}
{...(canCheckoutPullRequestIntoThread
? { onCheckoutPullRequestRequest: openPullRequestDialog }
: {})}
{...(hasMultipleEnvironments ? { onEnvironmentChange } : {})}
availableEnvironments={logicalProjectEnvironments}
/>
</div>
)}
</div>
{isDraftHeroState ? (
<div className="chat-composer-horizontal-inset pt-1">
<div className="pointer-events-auto">
<ComposerBannerStack className="relative z-0" items={composerBannerItems} />
</div>
</div>
)}
) : null}
</div>
</div>

Expand Down
88 changes: 88 additions & 0 deletions apps/web/src/components/chat/DraftHeroHeadline.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
import type { ScopedProjectRef } from "@t3tools/contracts";
import { scopedProjectKey, scopeProjectRef } from "@t3tools/client-runtime/environment";
import { ChevronDownIcon } from "lucide-react";
import { useMemo } from "react";

import { useNewThreadHandler } from "~/hooks/useHandleNewThread";
import { useProjects, useThreadShells } from "~/state/entities";
import { sortProjectsForSidebar } from "../Sidebar.logic";
import { Menu, MenuPopup, MenuRadioGroup, MenuRadioItem, MenuTrigger } from "../ui/menu";

interface DraftHeroHeadlineProps {
readonly activeProjectRef: ScopedProjectRef | null;
readonly activeProjectTitle: string | null;
}

export function DraftHeroHeadline({
activeProjectRef,
activeProjectTitle,
}: DraftHeroHeadlineProps) {
const projects = useProjects();
const threads = useThreadShells();
const handleNewThread = useNewThreadHandler();

const orderedProjects = useMemo(
() => sortProjectsForSidebar(projects, threads, "updated_at"),
[projects, threads],
);
const projectByKey = useMemo(
() =>
new Map(
orderedProjects.map(
(project) =>
[
scopedProjectKey(scopeProjectRef(project.environmentId, project.id)),
project,
] as const,
),
),
[orderedProjects],
);
const activeProjectKey = activeProjectRef === null ? "" : scopedProjectKey(activeProjectRef);

const projectLabel = activeProjectTitle ?? "this project";
return (
<h1 className="mx-auto w-full max-w-3xl text-center font-semibold text-2xl text-foreground sm:text-3xl">
What should we do in{" "}
{orderedProjects.length > 1 ? (
<Menu>
<MenuTrigger className="pointer-events-auto inline-flex cursor-pointer items-baseline gap-1.5 rounded-md text-muted-foreground/60 transition-colors hover:text-foreground/80 focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring">
{projectLabel}
<span
aria-hidden="true"
className="mr-1.5 flex size-4 shrink-0 items-center justify-center self-center rounded-full bg-muted-foreground/12 sm:size-5"
>
<ChevronDownIcon className="size-2.5 sm:size-3" />
</span>
</MenuTrigger>
<MenuPopup align="center" className="max-h-80 w-64 overflow-y-auto">
<MenuRadioGroup
value={activeProjectKey}
onValueChange={(value) => {
const project = projectByKey.get(value as string);
if (!project || value === activeProjectKey) {
return;
}
void handleNewThread(scopeProjectRef(project.environmentId, project.id), {
replace: true,
});
}}
>
{orderedProjects.map((project) => {
const key = scopedProjectKey(scopeProjectRef(project.environmentId, project.id));
return (
<MenuRadioItem key={key} value={key} closeOnClick>
<span className="min-w-0 truncate">{project.title}</span>
</MenuRadioItem>
);
})}
</MenuRadioGroup>
</MenuPopup>
</Menu>
) : (
<span className="text-muted-foreground/60">{projectLabel}</span>
)}
?
</h1>
);
}
5 changes: 5 additions & 0 deletions apps/web/src/components/chat/MessagesTimeline.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -179,6 +179,7 @@ interface MessagesTimelineProps {
contentInsetEndAdjustment: number;
onIsAtEndChange: (isAtEnd: boolean) => void;
onManualNavigation: () => void;
hideEmptyPlaceholder?: boolean;
}

// ---------------------------------------------------------------------------
Expand DownExpand Up@@ -212,6 +213,7 @@ export const MessagesTimeline = memo(function MessagesTimeline({
contentInsetEndAdjustment,
onIsAtEndChange,
onManualNavigation,
hideEmptyPlaceholder = false,
}: MessagesTimelineProps) {
const [expandedTurnIds, setExpandedTurnIds] = useState<ReadonlySet<TurnId>>(new Set());
const [expandedWorkGroupIds, setExpandedWorkGroupIds] = useState<ReadonlySet<string>>(new Set());
Expand DownExpand Up@@ -458,6 +460,9 @@ export const MessagesTimeline = memo(function MessagesTimeline({
);

if (rows.length === 0 && !isWorking) {
if (hideEmptyPlaceholder) {
return null;
}
return (
<div className="flex h-full items-center justify-center">
<p className="text-sm text-muted-foreground/30">
Expand Down
3 changes: 3 additions & 0 deletions apps/web/src/hooks/useHandleNewThread.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ export function useNewThreadHandler() {
worktreePath?: string | null;
envMode?: DraftThreadEnvMode;
startFromOrigin?: boolean;
replace?: boolean;
},
): Promise<void> => {
const {
Expand DownExpand Up@@ -120,6 +121,7 @@ export function useNewThreadHandler() {
await router.navigate({
to: "/draft/$draftId",
params: { draftId: reusableStoredDraftThread.draftId },
replace: options?.replace ?? false,
});
})();
}
Expand DownExpand Up@@ -180,6 +182,7 @@ export function useNewThreadHandler() {
await router.navigate({
to: "/draft/$draftId",
params: { draftId },
replace: options?.replace ?? false,
});
})();
},
Expand Down
67 changes: 67 additions & 0 deletions apps/web/src/routes/_chat.index.tsx
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
import { scopeProjectRef } from "@t3tools/client-runtime/environment";
import { createFileRoute, Link } from "@tanstack/react-router";
import { LinkIcon, PlusIcon } from "lucide-react";
import { useEffect, useMemo, useRef } from "react";

import { useOpenAddProjectCommandPalette } from "../commandPaletteContext";
import { NoActiveThreadState } from "../components/NoActiveThreadState";
import { sortProjectsForSidebar } from "../components/Sidebar.logic";
import { Button } from "../components/ui/button";
import { Empty, EmptyDescription, EmptyHeader, EmptyTitle } from "../components/ui/empty";
import { SidebarInset } from "../components/ui/sidebar";
import { useNewThreadHandler } from "../hooks/useHandleNewThread";
import { useProjects, useThreadShells } from "../state/entities";
import { useEnvironments } from "../state/environments";
import { APP_DISPLAY_NAME } from "~/branding";
import { hasCloudPublicConfig } from "~/cloud/publicConfig";
Expand All@@ -19,9 +25,70 @@ function ChatIndexRouteView() {
return <HostedStaticOnboardingState />;
}

return <IndexDraftLanding />;
}

/**
* Landing on the index route drops straight into a draft thread for the most
* recently active project, so the first screen is a prompt instead of a dead
* end. Falls back to an add-project hero when no project exists yet.
*/
function IndexDraftLanding() {
const projects = useProjects();
const threads = useThreadShells();
const handleNewThread = useNewThreadHandler();
const startedRef = useRef(false);

const mostRecentProject = useMemo(
() => sortProjectsForSidebar(projects, threads, "updated_at")[0] ?? null,
[projects, threads],
);

useEffect(() => {
if (mostRecentProject === null || startedRef.current) {
return;
}
startedRef.current = true;
void handleNewThread(scopeProjectRef(mostRecentProject.environmentId, mostRecentProject.id), {
replace: true,
});
}, [handleNewThread, mostRecentProject]);

if (mostRecentProject === null) {
return <NoProjectsHero />;
}
return <NoActiveThreadState />;
}

function NoProjectsHero() {
const openAddProject = useOpenAddProjectCommandPalette();

return (
<SidebarInset className="h-dvh min-h-0 overflow-hidden overscroll-y-none bg-background text-foreground">
<div className="flex min-h-0 min-w-0 flex-1 flex-col overflow-x-hidden bg-background">
<Empty className="flex-1">
<div className="w-full max-w-lg px-8 py-12">
<EmptyHeader className="max-w-none">
<EmptyTitle className="text-foreground text-2xl sm:text-3xl">
What should we work on?
</EmptyTitle>
<EmptyDescription className="mt-2 text-sm text-muted-foreground/78">
Add a project to start your first thread.
</EmptyDescription>
<div className="mt-6 flex justify-center">
<Button size="sm" onClick={openAddProject}>
<PlusIcon className="size-4" />
Add project
</Button>
</div>
</EmptyHeader>
</div>
</Empty>
</div>
</SidebarInset>
);
}

export const Route = createFileRoute("/_chat/")({
component: ChatIndexRouteView,
});
Expand Down
Loading