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 numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,9 @@ import {
gitDiffStat,
gitPush,
gitRevert,
gitSourceControlInfo,
gitStatus,
githubCurrentPullRequest,
githubImportPlugin,
installMarketplacePlugin,
importPromptImage,
Expand DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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
, '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
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 numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,9 @@ import {
 gitDiffStat,
 gitPush,
 gitRevert,
 gitSourceControlInfo,
 gitStatus,
 githubCurrentPullRequest,
 githubImportPlugin,
 installMarketplacePlugin,
 importPromptImage,
Expand DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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

, '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
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 numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,9 @@ import {
 gitDiffStat,
 gitPush,
 gitRevert,
 gitSourceControlInfo,
 gitStatus,
 githubCurrentPullRequest,
 githubImportPlugin,
 installMarketplacePlugin,
 importPromptImage,
Expand DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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

, '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
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 numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,9 @@ import {
 gitDiffStat,
 gitPush,
 gitRevert,
 gitSourceControlInfo,
 gitStatus,
 githubCurrentPullRequest,
 githubImportPlugin,
 installMarketplacePlugin,
 importPromptImage,
Expand DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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

, '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
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 numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,9 @@ import {
 gitDiffStat,
 gitPush,
 gitRevert,
 gitSourceControlInfo,
 gitStatus,
 githubCurrentPullRequest,
 githubImportPlugin,
 installMarketplacePlugin,
 importPromptImage,
Expand DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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

, '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
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 numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,9 @@ import {
 gitDiffStat,
 gitPush,
 gitRevert,
 gitSourceControlInfo,
 gitStatus,
 githubCurrentPullRequest,
 githubImportPlugin,
 installMarketplacePlugin,
 importPromptImage,
Expand DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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

, '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
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 numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,9 @@ import {
 gitDiffStat,
 gitPush,
 gitRevert,
 gitSourceControlInfo,
 gitStatus,
 githubCurrentPullRequest,
 githubImportPlugin,
 installMarketplacePlugin,
 importPromptImage,
Expand DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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

, '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
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 numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,9 @@ import {
 gitDiffStat,
 gitPush,
 gitRevert,
 gitSourceControlInfo,
 gitStatus,
 githubCurrentPullRequest,
 githubImportPlugin,
 installMarketplacePlugin,
 importPromptImage,
Expand DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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