Skip to content

feat(desktop): add state-aware Git next action #217

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
IchenDEV merged 4 commits into from
Sep 1, 2026
Merged

feat(desktop): add state-aware Git next action #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
edbcee6
feat(desktop): add state-aware git next action
IchenDEV Sep 1, 2026
c027386
docs(sdlc): record git action acceptance
IchenDEV Sep 1, 2026
7b116cf
docs(sdlc): link git action review
IchenDEV Sep 1, 2026
19d408b
test(desktop): restore taskboard mutation gate
IchenDEV Sep 1, 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
194 changes: 141 additions & 53 deletions apps/desktop/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@ import {
gitDiffStat,
gitPush,
gitRevert,
gitSourceControlInfo,
gitStatus,
githubCurrentPullRequest,
githubImportPlugin,
installMarketplacePlugin,
importPromptImage,
Expand Down Expand Up @@ -158,6 +160,7 @@ import {
type Annotation,
type AppshotCapture,
type GitStatus,
type GitHubPullRequest,
type GoalSnapshot,
type GitHubPullRequestDetail,
type Issue,
Expand All @@ -179,6 +182,7 @@ import {
type Sandbox,
type SessionActivity,
type SessionInfo,
type SourceControlInfo,
type SessionInteractionCapabilities,
type SkillInfo,
type WorktreeBaselineKind,
Expand Down Expand Up @@ -400,6 +404,7 @@ import {
} from "./dock/Dock";
import { BrowserPanel } from "./browser/Browser";
import { GitDockContent, PullRequestDockContent } from "./git/GitDockContent";
import { resolveGitNextAction } from "./git/nextAction";
import { TerminalDockContent } from "./terminal/TerminalDockContent";
import { TrajectoryView } from "./session/TrajectoryView";
import { SessionRail } from "./sidebar/SessionRail";
Expand Down Expand Up @@ -653,12 +658,18 @@ function localCanvasScene(
interface GitWorkspaceData {
status: GitStatus | null;
diffStat: { added: number; deleted: number; truncated: boolean };
sourceControl: SourceControlInfo | null;
pullRequest: GitHubPullRequest | null;
forgeError: string | null;
}

const EMPTY_DIFF_STAT = { added: 0, deleted: 0, truncated: false } as const;
const EMPTY_GIT_WORKSPACE: GitWorkspaceData = {
status: null,
diffStat: EMPTY_DIFF_STAT,
sourceControl: null,
pullRequest: null,
forgeError: null,
};
const EMPTY_CHECKPOINTS: Checkpoint[] = [];

Expand Down Expand Up @@ -1364,6 +1375,26 @@ export default function App() {
);
const git = currentGitWorkspace.value.status;
const diffStat = currentGitWorkspace.value.diffStat;
const activeSessionRecord = useMemo(
() =>
sessions.find((session) => session.id === activeSession)
?? archivedSessions.find((session) => session.id === activeSession)
?? null,
[activeSession, archivedSessions, sessions],
);
const gitNextAction = resolveGitNextAction({
status: git,
loading: currentGitWorkspace.loading,
sourceControl: currentGitWorkspace.value.sourceControl,
pullRequest: currentGitWorkspace.value.pullRequest,
forgeError: currentGitWorkspace.value.forgeError,
taskWorktree: Boolean(
activeSessionRecord?.worktree_path && !activeSessionRecord.worktree_discarded,
),
canCleanup: Boolean(
activeSessionRecord?.worktree_path && !activeSessionRecord.worktree_discarded,
),
});
const currentCheckpointWorkspace = workspaceStateForCwd(
checkpointWorkspace,
workspaceCwd,
Expand Down Expand Up @@ -2598,14 +2629,7 @@ export default function App() {
}
}, [refreshProjects, selectProject, toast]);

const activeSessionTitle = useMemo(
() =>
(
sessions.find((s) => s.id === activeSession) ??
archivedSessions.find((s) => s.id === activeSession)
)?.title ?? null,
[sessions, archivedSessions, activeSession],
);
const activeSessionTitle = activeSessionRecord?.title ?? null;
const activeTitle = activeBoardTask?.title
?? activeSessionTitle
?? t(temporarySession ? "rail.newTemporarySession" : "rail.newTask");
Expand Down Expand Up @@ -2645,15 +2669,12 @@ export default function App() {
const focusedConfigOptions = configOptions;
const focusedSessionUsage = sessionUsage;
const activeWorktreeState = useMemo(() => {
const stored =
sessions.find((session) => session.id === activeSession) ??
archivedSessions.find((session) => session.id === activeSession);
return activeSessionWorktreeState(
activeSession,
stored,
activeSessionRecord ?? undefined,
activeSessionReceipt,
);
}, [sessions, archivedSessions, activeSession, activeSessionReceipt]);
);
}, [activeSession, activeSessionReceipt, activeSessionRecord]);
const activeWorktreeBaseline = activeWorktreeState.baseline;
const activeWorktreeUnknown = activeWorktreeState.legacyUnknown;

Expand All @@ -2671,6 +2692,7 @@ export default function App() {
const focusedActiveProjectRecord = activeProjectRecord;
const focusedActiveProjectName = activeProjectName;
const focusedGit = git;
const focusedGitNextAction = gitNextAction;

const taskBoardSessions = useMemo(
() =>
Expand Down Expand Up @@ -5529,46 +5551,84 @@ export default function App() {
const fresh = () =>
gitRefreshSeq.current === request && (cwdRef.current || ".") === target;
setGitWorkspace({ cwd: target, loading: true, value: EMPTY_GIT_WORKSPACE });
gitStatus(target)
.then((s) => {
if (!fresh()) return;
void (async () => {
const [statusResult, sourceControlResult] = await Promise.allSettled([
gitStatus(target),
gitSourceControlInfo(target),
]);
if (!fresh()) return;
if (statusResult.status === "rejected") {
setGitWorkspace({
cwd: target,
loading: false,
value: { status: s, diffStat: EMPTY_DIFF_STAT },
value: EMPTY_GIT_WORKSPACE,
});
if (s.is_repo && s.files.length > 0) {
gitDiffStat(target)
.then((stat) => {
if (!fresh()) return;
setGitWorkspace((current) =>
current.cwd === target
? {
...current,
value: {
...current.value,
diffStat: {
added: stat.added,
deleted: stat.deleted,
truncated: stat.truncated,
},
},
}
: current,
);
})
.catch(() => {});
}
})
.catch(() => {
if (fresh()) {
setGitWorkspace({
cwd: target,
loading: false,
value: EMPTY_GIT_WORKSPACE,
});
return;
}

const status = statusResult.value;
const sourceControl = sourceControlResult.status === "fulfilled"
? sourceControlResult.value
: null;
let forgeError = sourceControlResult.status === "rejected"
? String(sourceControlResult.reason)
: null;
let pullRequest: GitHubPullRequest | null = null;
if (status.is_repo && sourceControl?.provider === "github") {
if (sourceControl.required_cli && !sourceControl.required_cli_available) {
forgeError = `${sourceControl.required_cli} is unavailable`;
} else {
try {
pullRequest = await githubCurrentPullRequest(target);
} catch (error) {
forgeError = String(error);
}
}
}

if (!fresh()) return;
setGitWorkspace({
cwd: target,
loading: false,
value: {
status,
diffStat: EMPTY_DIFF_STAT,
sourceControl,
pullRequest,
forgeError,
},
});
if (status.is_repo && status.files.length > 0) {
gitDiffStat(target)
.then((stat) => {
if (!fresh()) return;
setGitWorkspace((current) =>
current.cwd === target
? {
...current,
value: {
...current.value,
diffStat: {
added: stat.added,
deleted: stat.deleted,
truncated: stat.truncated,
},
},
}
: current,
);
})
.catch(() => {});
}
})().catch(() => {
if (fresh()) {
setGitWorkspace({
cwd: target,
loading: false,
value: EMPTY_GIT_WORKSPACE,
});
}
});
}, [cwd]);

const refreshCheckpoints = useCallback(() => {
Expand Down Expand Up @@ -8033,13 +8093,29 @@ export default function App() {
const activeProjectName = paneFocused
? focusedActiveProjectName
: activeProjectRecord?.name ?? null;
const git = paneFocused
? focusedGit
const paneGitWorkspace = paneFocused
? currentGitWorkspace
: workspaceStateForCwd(
gitWorkspace,
cwd || ".",
EMPTY_GIT_WORKSPACE,
).value.status;
);
const git = paneFocused ? focusedGit : paneGitWorkspace.value.status;
const gitAction = paneFocused
? focusedGitNextAction
: resolveGitNextAction({
status: paneGitWorkspace.value.status,
loading: paneGitWorkspace.loading,
sourceControl: paneGitWorkspace.value.sourceControl,
pullRequest: paneGitWorkspace.value.pullRequest,
forgeError: paneGitWorkspace.value.forgeError,
taskWorktree: Boolean(
paneStored?.worktree_path && !paneStored.worktree_discarded,
),
canCleanup: Boolean(
paneStored?.worktree_path && !paneStored.worktree_discarded,
),
});
// Per-session model/config/usage: the focused pane keeps the authoritative single
// values; a background pane reads its own session's recorded snapshot.
const models = paneFocused
Expand Down Expand Up @@ -8215,7 +8291,7 @@ export default function App() {
</div>

<SessionHeaderActions
canCommit={git?.is_repo === true}
gitAction={gitAction}
actions={scripts}
editorLaunchersAvailable={editorLaunchersAvailable}
fileManagerLabel={fileManagerLabel}
Expand All @@ -8225,7 +8301,11 @@ export default function App() {
onOpenAntigravity={() => void openWorkingDirectory("antigravity")}
onOpenFinder={() => void openWorkingDirectory("finder")}
finderHint={hint("open_finder")}
onCommit={openSourceControl}
onOpenSourceControl={openSourceControl}
onOpenPullRequest={() => manualDockTab("pull-request")}
onCleanupWorktree={() => {
if (paneStored) void discardWorktreeForSession(paneStored);
}}
onCheckpoint={() => void doCheckpoint()}
onPush={() => void doPush().catch(() => {})}
onMoveTask={() => activeSession && setShowTaskHandoff(true)}
Expand Down Expand Up @@ -8690,7 +8770,15 @@ export default function App() {
git: (
<GitDockContent
status={git}
action={gitNextAction}
onOpenSourceControl={openSourceControl}
onPush={() => void doPush().catch(() => {})}
onOpenPullRequest={() => manualDockTab("pull-request")}
onCleanupWorktree={() => {
if (activeSessionRecord) {
void discardWorktreeForSession(activeSessionRecord);
}
}}
/>
),
"pull-request": (
Expand Down
22 changes: 18 additions & 4 deletions apps/desktop/src/components/ui/split-button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import type { ReactNode } from "react";

import { ChevronDown } from "./icons";

import { cn } from "@/lib/utils";
Expand All @@ -20,7 +22,9 @@ type SplitButtonSize = "default" | "sm" | "compact" | "field";

interface SplitButtonProps {
/** Text shown on the primary (left) half. */
label: string;
label: ReactNode;
/** Accessible name when the visible label is responsive or otherwise composite. */
primaryLabel?: string;
/** Handler for the primary button click. */
onClick: () => void;
/** Alternative actions rendered inside the chevron dropdown. */
Expand All @@ -29,6 +33,9 @@ interface SplitButtonProps {
size?: SplitButtonSize;
disabled?: boolean;
className?: string;
primaryClassName?: string;
menuButtonClassName?: string;
menuLabel?: string;
/** Where the dropdown aligns relative to the trigger. */
menuAlign?: "start" | "center" | "end";
menuSide?: "top" | "bottom";
Expand All @@ -48,12 +55,16 @@ const separatorClass: Record<SplitButtonVariant, string> = {
*/
function SplitButton({
label,
primaryLabel,
onClick,
actions,
variant = "default",
size = "default",
disabled = false,
className,
primaryClassName,
menuButtonClassName,
menuLabel = "More actions",
menuAlign = "end",
menuSide = "top",
}: SplitButtonProps) {
Expand All @@ -64,7 +75,8 @@ function SplitButton({
variant={variant}
size={size}
disabled={disabled}
className={className}
aria-label={primaryLabel}
className={cn(className, primaryClassName)}
onClick={onClick}
>
{label}
Expand All @@ -85,7 +97,8 @@ function SplitButton({
variant={variant}
size={size}
disabled={disabled}
className="rounded-r-none focus-visible:z-10"
aria-label={primaryLabel}
className={cn("rounded-r-none focus-visible:z-10", primaryClassName)}
onClick={onClick}
>
{label}
Expand All @@ -99,10 +112,11 @@ function SplitButton({
variant={variant}
size={size}
disabled={disabled}
aria-label="More actions"
aria-label={menuLabel}
className={cn(
"relative rounded-l-none px-1.5 focus-visible:z-10 before:absolute before:left-0 before:h-4 before:w-px",
separatorClass[variant],
menuButtonClassName,
)}
>
<ChevronDown className="size-3.5" />
Expand Down
Loading