Skip to content

Commit bc40bcd

Browse files
committed
fix(deps): resolve renovate update checks
1 parent dff5d4e commit bc40bcd

8 files changed

Lines changed: 18 additions & 62 deletions

File tree

packages/app/src/docker-git/api-client-auth.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ import type {
2525
AuthGithubLoginCommand,
2626
AuthGithubLogoutCommand,
2727
AuthGithubStatusCommand,
28-
AuthGrokLogoutCommand,
29-
AuthGrokStatusCommand,
3028
AuthGitlabLoginCommand,
3129
AuthGitlabLogoutCommand,
32-
AuthGitlabStatusCommand
30+
AuthGitlabStatusCommand,
31+
AuthGrokLogoutCommand,
32+
AuthGrokStatusCommand
3333
} from "./frontend-lib/core/domain.js"
3434
import { resolvePathFromCwd } from "./frontend-lib/usecases/path-helpers.js"
3535
import type { ApiAuthRequiredError, ApiRequestError } from "./host-errors.js"

packages/app/src/docker-git/api-client.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ export {
3131
githubLogin,
3232
githubLogout,
3333
githubStatus,
34-
grokLogout,
35-
grokStatus,
3634
gitlabLogin,
3735
gitlabLogout,
38-
gitlabStatus
36+
gitlabStatus,
37+
grokLogout,
38+
grokStatus
3939
} from "./api-client-auth.js"
4040
export {
4141
type ApiContainerTask,

packages/app/src/docker-git/program-auth.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import {
99
githubLogin,
1010
githubLogout,
1111
githubStatus,
12-
grokLogout,
13-
grokStatus,
1412
gitlabLogin,
1513
gitlabLogout,
1614
gitlabStatus,
15+
grokLogout,
16+
grokStatus,
1717
type JsonValue,
1818
renderJsonPayload
1919
} from "./api-client.js"
@@ -45,8 +45,9 @@ export type RoutedAuthCommand = Extract<
4545
}
4646
>
4747

48-
const withControllerReady = <E, R>(effect: Effect.Effect<void, E, R>) =>
49-
pipe(ensureControllerReady(), Effect.zipRight(effect))
48+
const withControllerReady = <R>(
49+
effect: Effect.Effect<void, CliError, R>
50+
): Effect.Effect<void, CliError, R | ControllerRuntime> => pipe(ensureControllerReady(), Effect.zipRight(effect))
5051

5152
const renderAuthPayload = (payload: JsonValue) => Effect.log(renderJsonPayload(payload))
5253

@@ -111,7 +112,7 @@ const handleGrokLoginCommand = (
111112
) =>
112113
withControllerReady(
113114
createAuthTerminalSession("GrokOauth", command.label).pipe(
114-
Effect.flatMap((session) =>
115+
Effect.flatMap((session): Effect.Effect<void, CliError> =>
115116
session === null
116117
? Effect.fail(missingAuthTerminalSessionError("GrokOauth"))
117118
: attachTerminalSession({

packages/app/src/web/app-ready-terminal-screen.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import type { ReadyLayoutProps } from "./app-ready-layout.js"
77
import { Box, Text } from "./elements.js"
88
import { TaskPanel } from "./panel-tasks.js"
99
import { TerminalPanel } from "./panel-terminal.js"
10-
import type { TerminalExitInfo } from "./terminal-panel-runtime-types.js"
1110
import { type BrowserScreen, projectPickerScreen } from "./screen.js"
1211
import { shouldShowTerminalTabs } from "./terminal-mobile-layout.js"
12+
import type { TerminalExitInfo } from "./terminal-panel-runtime-types.js"
1313
import { terminalSessionId } from "./terminal-state.js"
1414
import { type ActiveTerminalSession, isPendingActiveTerminalSession, terminalTitleById } from "./terminal.js"
1515

@@ -525,6 +525,7 @@ export const TerminalScreen = (props: TerminalScreenProps): JSX.Element | null =
525525
setTerminalView("terminal")
526526
}}
527527
onLoadProjectTaskLogs={props.onLoadProjectTaskLogs}
528+
onAuthTerminalExitSuccess={props.onAuthTerminalExitSuccess}
528529
onOpenProjectBrowserById={props.onOpenProjectBrowserById}
529530
onOpenProjectTaskManagerById={(projectId) => {
530531
setTerminalView("tasks")

packages/app/src/web/panel-terminal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import "xterm/css/xterm.css"
33
import { type CSSProperties, type JSX, useCallback, useEffect, useRef, useState } from "react"
44

55
import {
6-
type TerminalExitInfo,
76
isModifierOnlyTerminalKey,
87
type MobileTerminalKey,
98
mobileTerminalKeyInput,
109
terminalControlCharacterForKey
1110
} from "./terminal-mobile-controls.js"
1211
import { resolveTerminalCompactHeaderMode, resolveTerminalTypingMode } from "./terminal-mobile-layout.js"
12+
import type { TerminalExitInfo } from "./terminal-panel-runtime-types.js"
1313
import {
1414
type TerminalConnectionState,
1515
type TerminalInputController,

packages/app/src/web/terminal-panel-runtime.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,8 @@ export const useTerminalSessionLifecycle = (
240240
}
241241

242242
export {
243-
type TerminalExitInfo,
244243
type TerminalConnectionState,
244+
type TerminalExitInfo,
245245
type TerminalInputController,
246246
type TerminalStatus
247247
} from "./terminal-panel-runtime-types.js"

packages/app/tests/docker-git/core-templates.test.ts

Lines changed: 0 additions & 46 deletions
This file was deleted.

packages/lib/tests/usecases/auth-grok.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ describe("authGrokLogin", () => {
9191
expect(dockerfile).not.toContain("npm install -g grok-dev")
9292
})
9393

94-
it("uses the official Grok device-auth login mode", () => {
94+
it("uses the official Grok browser login mode", () => {
9595
const args = buildDockerGrokAuthArgs({
9696
cwd: "/workspace",
9797
image: "docker-git-auth-grok:latest",
@@ -103,7 +103,7 @@ describe("authGrokLogin", () => {
103103
expect(args).toContain("MCP_PLAYWRIGHT_ISOLATED=1")
104104
expect(args).not.toContain("NO_BROWSER=true")
105105
expect(args).not.toContain("GROK_NO_BROWSER=true")
106-
expect(args.slice(-4)).toEqual(["docker-git-auth-grok:latest", "grok", "login", "--device-auth"])
106+
expect(args.slice(-3)).toEqual(["docker-git-auth-grok:latest", "grok", "login"])
107107
})
108108

109109
it.effect("stores API key and writes Grok settings with Playwright MCP and no sandbox", () =>

0 commit comments

Comments
 (0)