Skip to content

upstream merge 2026-04-27 PR-D4: chat / header / v1→v2 keypad loading (3 commits) #451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MocA-Love merged 3 commits into from
Apr 28, 2026
Merged

upstream merge 2026-04-27 PR-D4: chat / header / v1→v2 keypad loading (3 commits) #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
30de54f
feat(desktop): consolidate comment pane headers (#3803)
saddlepaddle Apr 27, 2026
a7ec181
Migrate v1 keypad loading screen to v2 as a separate page (#3788)
AviPeltz Apr 27, 2026
3606b3a
fix(desktop): collapse v2 chat double header into pane header (#3805)
saddlepaddle Apr 27, 2026
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
218 changes: 103 additions & 115 deletions apps/desktop/src/renderer/routes/_authenticated/_dashboard/pending/$pendingId/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { useQuery } from "@tanstack/react-query";
import { createFileRoute, useNavigate } from "@tanstack/react-router";
import { useCallback, useEffect, useRef, useState } from "react";
import { GoGitBranch } from "react-icons/go";
import { HiCheck, HiExclamationTriangle } from "react-icons/hi2";
import { HiExclamationTriangle } from "react-icons/hi2";
import { useHostTargetUrl } from "renderer/hooks/host-service/useHostTargetUrl";
import { authClient } from "renderer/lib/auth-client";
import { electronTrpc } from "renderer/lib/electron-trpc";
Expand All @@ -15,13 +15,15 @@ import {
clearAttachments,
loadAttachments,
} from "renderer/lib/pending-attachment-store";
import { V2WorkspaceLoadingView } from "renderer/routes/_authenticated/_dashboard/v2-workspace-loading/$workspaceId/components/V2WorkspaceLoadingView";
import { useAdoptWorktree } from "renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/hooks/useAdoptWorktree";
import { useCheckoutDashboardWorkspace } from "renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/hooks/useCheckoutDashboardWorkspace";
import { useCreateDashboardWorkspace } from "renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/hooks/useCreateDashboardWorkspace";
import { useDashboardSidebarState } from "renderer/routes/_authenticated/hooks/useDashboardSidebarState";
import { useCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider";
import type { PendingWorkspaceRow } from "renderer/routes/_authenticated/providers/CollectionsProvider/dashboardSidebarLocal/schema";
import { useLocalHostService } from "renderer/routes/_authenticated/providers/LocalHostServiceProvider";
import type { WorkspaceInitStep } from "shared/types/workspace-init";
import type { ResolvedPrContent } from "./buildForkAgentLaunch";
import {
buildAdoptPayload,
Expand Down Expand Up @@ -277,7 +279,8 @@ function PendingWorkspacePage() {
}, [pending, fireIntent]);

// Poll host-service for step-by-step progress (fork + checkout only;
// adopt is fast and doesn't instrument progress).
// adopt is fast and doesn't instrument progress). Drives the keypad-loader
// off real backend state so keys press as steps advance.
const intentHasProgress =
pending?.intent === "fork" || pending?.intent === "checkout";
const hostUrl = useHostTargetUrl(pending?.hostTarget ?? null);
Expand All @@ -295,7 +298,7 @@ function PendingWorkspacePage() {
enabled: pending?.status === "creating" && !!hostUrl && intentHasProgress,
});

const steps = progress?.steps ?? [];
const loaderStep = mapHostProgressToInitStep(progress?.steps);

const STALE_THRESHOLD_MS = 2 * 60 * 1000;
const [now, setNow] = useState(Date.now());
Expand Down Expand Up @@ -371,12 +374,62 @@ function PendingWorkspacePage() {
);
}

const creatingLabel =
const creatingTitle =
pending.intent === "adopt"
? "Adopting worktree..."
? "Adopting worktree"
: pending.intent === "checkout"
? "Checking out branch..."
: "Creating workspace...";
? "Checking out branch"
: "Setting up workspace";

// Render the keypad through the "succeeded" hold (and during the brief
// pre-sync window before that) so the last key animates to pressed —
// the host clears progress without ever flagging "registering: done",
// so the success transition is the only signal we have for that frame.
const showKeypad =
pending.status === "creating" ||
(pending.status === "succeeded" && !(syncTimedOut && !workspaceSynced));

if (showKeypad) {
const isFinalizing = pending.status === "succeeded";
return (
<V2WorkspaceLoadingView
workspaceName={pending.name}
title={creatingTitle}
currentStep={isFinalizing ? "ready" : loaderStep}
description={
isFinalizing
? "Workspace ready — opening..."
: isStale
? "This is taking longer than expected..."
: `Takes 10s to a few minutes (started ${elapsedLabel})`
}
>
{!isFinalizing && (
<button
type="button"
className="mt-2 rounded-md border px-3 py-1.5 text-sm text-muted-foreground hover:text-foreground hover:bg-accent"
onClick={() => {
collections.pendingWorkspaces.delete(pendingId);
void clearAttachments(pendingId);
void navigate({ to: "/" });
}}
>
Dismiss
</button>
)}
{isFinalizing && pending.warnings.length > 0 && (
<ul className="mt-2 space-y-1 text-xs text-amber-500 text-left">
{pending.warnings.map((w) => (
<li key={w} className="flex items-start gap-1.5">
<HiExclamationTriangle className="size-3.5 mt-0.5 shrink-0" />
<span>{w}</span>
</li>
))}
</ul>
)}
</V2WorkspaceLoadingView>
);
}

return (
<div className="flex h-full w-full flex-1 justify-center pt-24">
Expand All @@ -389,59 +442,30 @@ function PendingWorkspacePage() {
</div>
</div>

{pending.status === "creating" && (
<div className="space-y-3">
<div className="flex items-center justify-between">
<p
className={`text-sm ${isStale ? "text-amber-500" : "text-muted-foreground"}`}
>
{isStale
? "This is taking longer than expected..."
: creatingLabel}
</p>
<span className="text-xs tabular-nums text-muted-foreground/50">
{elapsedLabel}
{pending.status === "succeeded" && syncTimedOut && !workspaceSynced && (
<div className="space-y-4">
<div className="flex items-start gap-2 text-sm text-amber-500">
<HiExclamationTriangle className="size-4 mt-0.5 shrink-0" />
<span>
Workspace was created but hasn't synced to this device yet.
Check your connection.
</span>
</div>
{intentHasProgress && steps.length > 0 ? (
<div className="space-y-2">
{steps.map((step) => (
<div
key={step.id}
className="flex items-center gap-2.5 text-sm"
>
{step.status === "done" ? (
<HiCheck className="size-4 text-emerald-500" />
) : step.status === "active" ? (
<div className="size-4 flex items-center justify-center">
<div className="size-2.5 rounded-full bg-foreground animate-pulse" />
</div>
) : (
<div className="size-4 flex items-center justify-center">
<div className="size-2 rounded-full bg-muted-foreground/30" />
</div>
)}
<span
className={
step.status === "done" || step.status === "active"
? "text-foreground"
: "text-muted-foreground/50"
}
>
{step.label}
</span>
</div>
))}
</div>
) : (
// Adopt has no host-side progress steps — show a generic spinner.
<div className="flex items-center gap-2.5 text-sm text-muted-foreground">
<div className="size-4 flex items-center justify-center">
<div className="size-2.5 rounded-full bg-foreground animate-pulse" />
</div>
</div>
)}
<div className="flex gap-2 pt-1">
<div className="flex gap-2">
<button
type="button"
className="rounded-md bg-primary px-3 py-1.5 text-sm text-primary-foreground hover:bg-primary/90"
onClick={() => setSyncTimedOut(false)}
>
Keep waiting
</button>
<button
type="button"
className="rounded-md border px-3 py-1.5 text-sm hover:bg-accent"
onClick={doNavigate}
>
Open anyway
</button>
<button
type="button"
className="rounded-md border px-3 py-1.5 text-sm text-muted-foreground hover:text-foreground hover:bg-accent"
Expand All @@ -457,63 +481,6 @@ function PendingWorkspacePage() {
</div>
)}

{pending.status === "succeeded" &&
(syncTimedOut && !workspaceSynced ? (
<div className="space-y-4">
<div className="flex items-start gap-2 text-sm text-amber-500">
<HiExclamationTriangle className="size-4 mt-0.5 shrink-0" />
<span>
Workspace was created but hasn't synced to this device yet.
Check your connection.
</span>
</div>
<div className="flex gap-2">
<button
type="button"
className="rounded-md bg-primary px-3 py-1.5 text-sm text-primary-foreground hover:bg-primary/90"
onClick={() => setSyncTimedOut(false)}
>
Keep waiting
</button>
<button
type="button"
className="rounded-md border px-3 py-1.5 text-sm hover:bg-accent"
onClick={doNavigate}
>
Open anyway
</button>
<button
type="button"
className="rounded-md border px-3 py-1.5 text-sm text-muted-foreground hover:text-foreground hover:bg-accent"
onClick={() => {
collections.pendingWorkspaces.delete(pendingId);
void clearAttachments(pendingId);
void navigate({ to: "/" });
}}
>
Dismiss
</button>
</div>
</div>
) : (
<div className="space-y-2">
<div className="flex items-center gap-2 text-sm text-emerald-500">
<HiCheck className="size-4" />
<span>Workspace ready — opening...</span>
</div>
{pending.warnings.length > 0 && (
<ul className="space-y-1 text-xs text-amber-500">
{pending.warnings.map((w) => (
<li key={w} className="flex items-start gap-1.5">
<HiExclamationTriangle className="size-3.5 mt-0.5 shrink-0" />
<span>{w}</span>
</li>
))}
</ul>
)}
</div>
))}

{pending.status === "failed" && (
<div className="space-y-4">
<div className="flex items-start gap-2 text-sm text-destructive">
Expand Down Expand Up @@ -551,3 +518,24 @@ function PendingWorkspacePage() {
</div>
);
}

type HostProgressStep = {
id: string;
label: string;
status: "pending" | "active" | "done";
};

// Maps the host-service's 3-step progress (ensuring_repo → creating_worktree
// → registering) onto the v1 keypad's step vocabulary. Skipped keys (fetching,
// copying_config) press through quickly when the keypad jumps past them.
function mapHostProgressToInitStep(
steps: HostProgressStep[] | null | undefined,
): WorkspaceInitStep | undefined {
if (!steps || steps.length === 0) return undefined;
const byId = new Map(steps.map((s) => [s.id, s.status]));
if (byId.get("registering") === "done") return "ready";
if (byId.get("registering") === "active") return "finalizing";
if (byId.get("creating_worktree") === "active") return "creating_worktree";
if (byId.get("ensuring_repo") === "active") return "syncing";
return "pending";
}
Loading
Loading