Repository navigation
Claude Login Button #629
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.
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
Merged
Claude Login Button #629
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
dc55192
feat: add Claude login prompt
arul28 c73b2ea
ship: iteration 1 - address Greptile Claude login prompt feedback
arul28 816460c
ship: iteration 2 - avoid unnecessary lane lookup for Claude login
arul28 33e0f59
ship: iteration 3 - handle stale Claude auth signals
arul28 9a4a8d3
ship: iteration 4 - simplify Claude login dispatch guard
arul28 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
85 changes: 85 additions & 0 deletions
85
apps/desktop/src/renderer/components/work/ClaudeLoginPromptButton.test.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| /* @vitest-environment jsdom */ | ||
|
|
||
| import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; | ||
| import { cleanup, fireEvent, render, screen, waitFor } from "@testing-library/react"; | ||
| import { ClaudeLoginPromptButton } from "./ClaudeLoginPromptButton"; | ||
|
|
||
| const originalAde = globalThis.window.ade; | ||
|
|
||
| function installAdeStub() { | ||
| globalThis.window.ade = { | ||
| pty: { | ||
| create: vi.fn().mockResolvedValue({ | ||
| sessionId: "terminal-claude-login", | ||
| ptyId: "pty-claude-login", | ||
| pid: 123, | ||
| }), | ||
| }, | ||
| lanes: { | ||
| list: vi.fn().mockResolvedValue([{ id: "lane-default", name: "Primary" }]), | ||
| }, | ||
| } as any; | ||
| } | ||
|
|
||
| describe("ClaudeLoginPromptButton", () => { | ||
| beforeEach(() => { | ||
| installAdeStub(); | ||
| window.sessionStorage.clear(); | ||
| }); | ||
|
|
||
| afterEach(() => { | ||
| cleanup(); | ||
| window.sessionStorage.clear(); | ||
| if (originalAde === undefined) { | ||
| delete (globalThis.window as any).ade; | ||
| } else { | ||
| globalThis.window.ade = originalAde; | ||
| } | ||
| }); | ||
|
|
||
| it("opens claude auth login in the owning chat terminal", async () => { | ||
| const onRevealTerminal = vi.fn(); | ||
|
|
||
| render( | ||
| <ClaudeLoginPromptButton | ||
| visible | ||
| storageKey="chat:chat-1" | ||
| laneId="lane-1" | ||
| chatSessionId="chat-1" | ||
| onRevealTerminal={onRevealTerminal} | ||
| />, | ||
| ); | ||
|
|
||
| fireEvent.click(screen.getByRole("button", { name: "Login to Claude" })); | ||
|
|
||
| await waitFor(() => { | ||
| expect(window.ade.pty.create).toHaveBeenCalledWith({ | ||
| laneId: "lane-1", | ||
| chatSessionId: "chat-1", | ||
| cols: 100, | ||
| rows: 28, | ||
| title: "Claude login", | ||
| tracked: true, | ||
| toolType: "shell", | ||
| startupCommand: "claude auth login", | ||
| }); | ||
| }); | ||
| expect(onRevealTerminal).toHaveBeenCalledWith({ | ||
| terminalId: "terminal-claude-login", | ||
| ptyId: "pty-claude-login", | ||
| label: "Claude login", | ||
| }); | ||
| }); | ||
|
|
||
| it("dismisses the prompt per storage key", () => { | ||
| const { rerender } = render( | ||
| <ClaudeLoginPromptButton visible storageKey="cli:term-1" laneId="lane-1" />, | ||
| ); | ||
|
|
||
| fireEvent.click(screen.getByRole("button", { name: "Dismiss Claude login prompt" })); | ||
| expect(screen.queryByRole("button", { name: "Login to Claude" })).toBeNull(); | ||
|
|
||
| rerender(<ClaudeLoginPromptButton visible storageKey="cli:term-1" laneId="lane-1" />); | ||
| expect(screen.queryByRole("button", { name: "Login to Claude" })).toBeNull(); | ||
| }); | ||
| }); |
136 changes: 136 additions & 0 deletions
136
apps/desktop/src/renderer/components/work/ClaudeLoginPromptButton.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| import { useCallback, useEffect, useState } from "react"; | ||
| import { SpinnerGap, Terminal, X } from "@phosphor-icons/react"; | ||
| import { CLAUDE_AUTH_LOGIN_COMMAND } from "../../lib/claudeAuthPrompt"; | ||
| import { cn } from "../ui/cn"; | ||
|
|
||
| type RevealTerminalRequest = { | ||
| terminalId: string; | ||
| ptyId: string; | ||
| label: string; | ||
| }; | ||
|
|
||
| function dismissedKey(storageKey: string): string { | ||
| return `ade.claudeLoginPrompt.dismissed.v1:${storageKey}`; | ||
| } | ||
|
|
||
| function readDismissed(storageKey: string): boolean { | ||
| try { | ||
| return window.sessionStorage.getItem(dismissedKey(storageKey)) === "1"; | ||
| } catch { | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| function writeDismissed(storageKey: string): void { | ||
| try { | ||
| window.sessionStorage.setItem(dismissedKey(storageKey), "1"); | ||
| } catch { | ||
| // Best-effort per-window dismissal. | ||
| } | ||
| } | ||
|
|
||
| export function ClaudeLoginPromptButton({ | ||
| visible, | ||
| storageKey, | ||
| laneId, | ||
| chatSessionId, | ||
| onRevealTerminal, | ||
| className, | ||
| }: { | ||
| visible: boolean; | ||
| storageKey: string; | ||
| laneId?: string | null; | ||
| chatSessionId?: string | null; | ||
| onRevealTerminal?: (terminal: RevealTerminalRequest) => void; | ||
| className?: string; | ||
| }) { | ||
| const [dismissed, setDismissed] = useState(() => readDismissed(storageKey)); | ||
| const [opening, setOpening] = useState(false); | ||
| const [error, setError] = useState<string | null>(null); | ||
|
|
||
| useEffect(() => { | ||
| setDismissed(readDismissed(storageKey)); | ||
| setError(null); | ||
| }, [storageKey]); | ||
|
greptile-apps[bot] marked this conversation as resolved.
|
||
|
|
||
| const dismiss = useCallback(() => { | ||
| writeDismissed(storageKey); | ||
| setDismissed(true); | ||
| }, [storageKey]); | ||
|
|
||
| const handleLogin = useCallback(() => { | ||
| if (opening || !window.ade?.pty?.create) return; | ||
|
greptile-apps[bot] marked this conversation as resolved.
|
||
| setOpening(true); | ||
| setError(null); | ||
| void (async () => { | ||
| const resolvedLaneId = laneId ?? (await window.ade.lanes.list({ | ||
| includeArchived: false, | ||
| includeStatus: false, | ||
| }))[0]?.id ?? null; | ||
| if (!resolvedLaneId) { | ||
| throw new Error("No active lane is available for this project."); | ||
| } | ||
|
|
||
| const created = await window.ade.pty.create({ | ||
| laneId: resolvedLaneId, | ||
| ...(chatSessionId ? { chatSessionId } : {}), | ||
| cols: 100, | ||
| rows: 28, | ||
| title: "Claude login", | ||
| tracked: true, | ||
| toolType: "shell", | ||
| startupCommand: CLAUDE_AUTH_LOGIN_COMMAND, | ||
| }); | ||
|
|
||
| const reveal = { | ||
| terminalId: created.sessionId, | ||
| ptyId: created.ptyId, | ||
| label: "Claude login", | ||
| }; | ||
| onRevealTerminal?.(reveal); | ||
| if (!chatSessionId && typeof window !== "undefined") { | ||
| window.dispatchEvent(new CustomEvent("ade:work:select-session", { | ||
| detail: { sessionId: created.sessionId, laneId: resolvedLaneId }, | ||
| })); | ||
| } | ||
| })() | ||
| .catch((err: unknown) => { | ||
| setError(err instanceof Error ? err.message : String(err)); | ||
| }) | ||
| .finally(() => setOpening(false)); | ||
| }, [chatSessionId, laneId, onRevealTerminal, opening]); | ||
|
|
||
| if (!visible || dismissed) return null; | ||
|
|
||
| return ( | ||
| <div className={cn("relative inline-flex shrink-0 items-center", className)}> | ||
| <div className="inline-flex h-6 overflow-hidden rounded-md border border-[#d97757]/35 bg-[#d97757]/15 shadow-[0_0_18px_rgba(217,119,87,0.12)]"> | ||
| <button | ||
| type="button" | ||
| onClick={handleLogin} | ||
| disabled={opening || !window.ade?.pty?.create} | ||
| className="inline-flex h-full items-center gap-1.5 px-2 font-sans text-[10px] font-semibold text-[#ffd7c2] transition-colors hover:bg-[#d97757]/18 disabled:cursor-not-allowed disabled:opacity-55" | ||
| title={error ?? "Open a terminal here and run claude auth login"} | ||
| aria-label="Login to Claude" | ||
| > | ||
| {opening ? <SpinnerGap size={12} className="animate-spin" aria-hidden /> : <Terminal size={12} weight="bold" aria-hidden />} | ||
| <span className="whitespace-nowrap">Login to Claude</span> | ||
| </button> | ||
| <button | ||
| type="button" | ||
| onClick={dismiss} | ||
| className="inline-flex h-full w-5 items-center justify-center border-l border-[#d97757]/25 text-[#ffd7c2]/65 transition-colors hover:bg-[#d97757]/18 hover:text-[#ffe4d5]" | ||
| aria-label="Dismiss Claude login prompt" | ||
| title="Dismiss" | ||
| > | ||
| <X size={10} weight="bold" aria-hidden /> | ||
| </button> | ||
| </div> | ||
| {error ? ( | ||
| <span className="absolute right-0 top-[calc(100%+4px)] z-20 max-w-[16rem] rounded-md border border-red-400/20 bg-red-950/90 px-2 py-1 text-right text-[10px] text-red-100 shadow-lg"> | ||
| {error} | ||
| </span> | ||
| ) : null} | ||
| </div> | ||
| ); | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.