Skip to content

Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.

fmt

Julius Marmingec743239b5e83
diff --git a/apps/server/src/codexAppServerManager.test.ts b/apps/server/src/codexAppServerManager.test.ts
index e9d384594..4a97814a7 100644
--- a/apps/server/src/codexAppServerManager.test.ts
+++ b/apps/server/src/codexAppServerManager.test.ts
@@ -21,10 +21,16 @@ function createSendTurnHarness() {
};
const requireSession = vi
- .spyOn(manager as unknown as { requireSession: (sessionId: string) => unknown }, "requireSession")
+ .spyOn(
+ manager as unknown as { requireSession: (sessionId: string) => unknown },
+ "requireSession",
+ )
.mockReturnValue(context);
const sendRequest = vi
- .spyOn(manager as unknown as { sendRequest: (...args: unknown[]) => Promise<unknown> }, "sendRequest")
+ .spyOn(
+ manager as unknown as { sendRequest: (...args: unknown[]) => Promise<unknown> },
+ "sendRequest",
+ )
.mockResolvedValue({
turn: {
id: "turn_1",
@@ -109,7 +115,8 @@ describe("isRecoverableThreadResumeError", () => {
describe("sendTurn", () => {
it("sends text and image user input items to turn/start", async () => {
- const { manager, context, requireSession, sendRequest, updateSession } = createSendTurnHarness();
+ const { manager, context, requireSession, sendRequest, updateSession } =
+ createSendTurnHarness();
const result = await manager.sendTurn({
sessionId: "sess_1",
diff --git a/apps/server/src/codexAppServerManager.ts b/apps/server/src/codexAppServerManager.ts
index 0a1d61c09..27da26fb0 100644
--- a/apps/server/src/codexAppServerManager.ts
+++ b/apps/server/src/codexAppServerManager.ts
@@ -258,8 +258,7 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
}
const turnInput: Array<
- | { type: "text"; text: string; text_elements: [] }
- | { type: "image"; url: string }
+ { type: "text"; text: string; text_elements: [] } | { type: "image"; url: string }
> = [];
if (input.input) {
turnInput.push({
@@ -283,8 +282,7 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
const turnStartParams: {
threadId: string;
input: Array<
- | { type: "text"; text: string; text_elements: [] }
- | { type: "image"; url: string }
+ { type: "text"; text: string; text_elements: [] } | { type: "image"; url: string }
>;
model?: string;
effort?: string;
diff --git a/apps/server/src/coreServices.ts b/apps/server/src/coreServices.ts
index 1f123b17c..887ff36a4 100644
--- a/apps/server/src/coreServices.ts
+++ b/apps/server/src/coreServices.ts
@@ -28,8 +28,5 @@ export interface TextGenerationService {
generateCommitMessage(
input: CommitMessageGenerationInput,
): Promise<CommitMessageGenerationResult>;
- generatePrContent(
- input: PrContentGenerationInput,
- ): Promise<PrContentGenerationResult>;
+ generatePrContent(input: PrContentGenerationInput): Promise<PrContentGenerationResult>;
}
-
diff --git a/apps/server/src/git.test.ts b/apps/server/src/git.test.ts
index 2f091b2bb..d20825bc9 100644
--- a/apps/server/src/git.test.ts
+++ b/apps/server/src/git.test.ts
@@ -570,11 +570,7 @@ describe("git integration", () => {
expect(context!.stagedSummary.length).toBeGreaterThan(0);
expect(context!.stagedPatch.length).toBeGreaterThan(0);
- const created = await core.commit(
- tmp.path,
- "Add README update",
- "- include updated content",
- );
+ const created = await core.commit(tmp.path, "Add README update", "- include updated content");
expect(created.commitSha.length).toBeGreaterThan(0);
expect(await git(tmp.path, "log -1 --pretty=%s")).toBe("Add README update");
});
diff --git a/apps/server/src/git.ts b/apps/server/src/git.ts
index eab1805a5..0065e15b3 100644
--- a/apps/server/src/git.ts
+++ b/apps/server/src/git.ts
@@ -101,7 +101,8 @@ function parseNumstatEntries(
for (const line of stdout.split(/\r?\n/g)) {
if (line.trim().length === 0) continue;
const [addedRaw, deletedRaw, ...pathParts] = line.split("\t");
- const rawPath = pathParts.length > 1 ? (pathParts.at(-1) ?? "").trim() : pathParts.join("\t").trim();
+ const rawPath =
+ pathParts.length > 1 ? (pathParts.at(-1) ?? "").trim() : pathParts.join("\t").trim();
if (rawPath.length === 0) continue;
const added = Number.parseInt(addedRaw ?? "0", 10);
const deleted = Number.parseInt(deletedRaw ?? "0", 10);
@@ -311,21 +312,12 @@ export class GitCoreService {
async prepareCommitContext(cwd: string): Promise<GitPreparedCommitContext | null> {
await this.git(cwd, ["add", "-A"]);
- const stagedSummary = await this.gitStdout(cwd, [
- "diff",
- "--cached",
- "--name-status",
- ]);
+ const stagedSummary = await this.gitStdout(cwd, ["diff", "--cached", "--name-status"]);
if (trimStdout(stagedSummary).length === 0) {
return null;
}
- const stagedPatch = await this.gitStdout(cwd, [
- "diff",
- "--cached",
- "--patch",
- "--minimal",
- ]);
+ const stagedPatch = await this.gitStdout(cwd, ["diff", "--cached", "--patch", "--minimal"]);
return {
stagedSummary,
diff --git a/apps/server/src/gitManager.test.ts b/apps/server/src/gitManager.test.ts
index 13d5baafd..f2d399c8b 100644
--- a/apps/server/src/gitManager.test.ts
+++ b/apps/server/src/gitManager.test.ts
@@ -5,11 +5,7 @@ import path from "node:path";
import { afterEach, describe, expect, it } from "vitest";
import { GitManager } from "./gitManager";
-import {
- type ProcessRunOptions,
- type ProcessRunResult,
- runProcess,
-} from "./processRunner";
+import { type ProcessRunOptions, type ProcessRunResult, runProcess } from "./processRunner";
interface FakeGhScenario {
prListSequence?: string[];
@@ -71,9 +67,7 @@ async function createBareRemote(): Promise<string> {
return remoteDir;
}
-function createTextGenerator(
- overrides: Partial<FakeGitTextGenerator> = {},
-): FakeGitTextGenerator {
+function createTextGenerator(overrides: Partial<FakeGitTextGenerator> = {}): FakeGitTextGenerator {
return {
generateCommitMessage: async () => ({
subject: "Implement stacked git actions",
@@ -126,8 +120,7 @@ function createRunnerWithFakeGh(scenario: FakeGhScenario = {}): {
if (args[0] === "pr" && args[1] === "create") {
return {
stdout:
- (scenario.createdPrUrl ??
- "https://github.com/pingdotgg/codething-mvp/pull/101") + "\n",
+ (scenario.createdPrUrl ?? "https://github.com/pingdotgg/codething-mvp/pull/101") + "\n",
stderr: "",
code: 0,
signal: null,
diff --git a/apps/server/src/gitManager.ts b/apps/server/src/gitManager.ts
index 91d8ea212..a9d768951 100644
--- a/apps/server/src/gitManager.ts
+++ b/apps/server/src/gitManager.ts
@@ -20,11 +20,7 @@ import type {
} from "./coreServices";
import { CodexTextGenerator } from "./codexTextGenerator";
import { GitCoreService } from "./git";
-import {
- type ProcessRunOptions,
- type ProcessRunResult,
- runProcess,
-} from "./processRunner";
+import { type ProcessRunOptions, type ProcessRunResult, runProcess } from "./processRunner";
const GH_CLI_TIMEOUT_MS = 30_000;
@@ -58,11 +54,7 @@ function parseOpenPrList(raw: unknown): OpenPrInfo[] {
const url = record.url;
const baseRefName = record.baseRefName;
const headRefName = record.headRefName;
- if (
- typeof number !== "number" ||
- !Number.isInteger(number) ||
- number <= 0
- ) {
+ if (typeof number !== "number" || !Number.isInteger(number) || number <= 0) {
continue;
}
if (
@@ -98,8 +90,7 @@ function sanitizeCommitMessage(
): CommitMessageGenerationResult {
const rawSubject = generated.subject.trim().split(/\r?\n/g)[0]?.trim() ?? "";
const subject = rawSubject.replace(/[.]+$/g, "").trim();
- const safeSubject =
- subject.length > 0 ? subject.slice(0, 72).trimEnd() : "Update project files";
+ const safeSubject = subject.length > 0 ? subject.slice(0, 72).trimEnd() : "Update project files";
return {
subject: safeSubject,
body: generated.body.trim(),
@@ -143,10 +134,7 @@ function extractBranchFromRef(ref: string): string {
return normalized.slice(firstSlash + 1).trim();
}
-function asCommandNotFound(
- command: string,
- error: unknown,
-): Error | undefined {
+function asCommandNotFound(command: string, error: unknown): Error | undefined {
if (!(error instanceof Error)) return undefined;
if (!error.message.includes(`Command not found: ${command}`)) return undefined;
if (command === "gh") {
@@ -226,9 +214,7 @@ export class GitManager {
};
}
- async runStackedAction(
- raw: GitRunStackedActionInput,
- ): Promise<GitRunStackedActionResult> {
+ async runStackedAction(raw: GitRunStackedActionInput): Promise<GitRunStackedActionResult> {
const input = gitRunStackedActionInputSchema.parse(raw);
const wantsPush = input.action !== "commit";
const wantsPr = input.action === "commit_push_pr";
@@ -241,11 +227,7 @@ export class GitManager {
throw new Error("Cannot create a pull request from detached HEAD.");
}
- const commit = await this.runCommitStep(
- input.cwd,
- initialStatus.branch,
- input.commitMessage,
- );
+ const commit = await this.runCommitStep(input.cwd, initialStatus.branch, input.commitMessage);
const push = wantsPush
? await this.gitCore.pushCurrentBranch(input.cwd, initialStatus.branch)
@@ -353,10 +335,7 @@ export class GitManager {
throw asCommandNotFound("codex", error) ?? error;
}
- const bodyFile = path.join(
- os.tmpdir(),
- `t3code-pr-body-${process.pid}-${randomUUID()}.md`,
- );
+ const bodyFile = path.join(os.tmpdir(), `t3code-pr-body-${process.pid}-${randomUUID()}.md`);
await fs.writeFile(bodyFile, generated.body, "utf8");
try {
@@ -401,10 +380,7 @@ export class GitManager {
};
}
- private async findOpenPr(
- cwd: string,
- branch: string,
- ): Promise<OpenPrInfo | null> {
+ private async findOpenPr(cwd: string, branch: string): Promise<OpenPrInfo | null> {
const stdout = await this.runGhStdout(cwd, [
"pr",
"list",
@@ -437,10 +413,7 @@ export class GitManager {
branch: string,
upstreamRef: string | null,
): Promise<string> {
- const configured = await this.gitCore.readConfigValue(
- cwd,
- `branch.${branch}.gh-merge-base`,
- );
+ const configured = await this.gitCore.readConfigValue(cwd, `branch.${branch}.gh-merge-base`);
if (configured) return configured;
if (upstreamRef) {
@@ -477,10 +450,7 @@ export class GitManager {
return result.stdout;
}
- private async runGhCommand(
- cwd: string,
- args: readonly string[],
- ): Promise<ProcessRunResult> {
+ private async runGhCommand(cwd: string, args: readonly string[]): Promise<ProcessRunResult> {
try {
return await this.run("gh", args, {
cwd,
diff --git a/apps/server/src/processRunner.test.ts b/apps/server/src/processRunner.test.ts
index f7756ac95..dd909116d 100644
--- a/apps/server/src/processRunner.test.ts
+++ b/apps/server/src/processRunner.test.ts
@@ -5,23 +5,15 @@ import { runProcess } from "./processRunner";
describe("runProcess", () => {
it("fails when output exceeds max buffer in default mode", async () => {
await expect(
- runProcess(
- "node",
- ["-e", "process.stdout.write('x'.repeat(2048))"],
- { maxBufferBytes: 128 },
- ),
+ runProcess("node", ["-e", "process.stdout.write('x'.repeat(2048))"], { maxBufferBytes: 128 }),
).rejects.toThrow("exceeded stdout buffer limit");
});
it("truncates output when outputMode is truncate", async () => {
- const result = await runProcess(
- "node",
- ["-e", "process.stdout.write('x'.repeat(2048))"],
- {
- maxBufferBytes: 128,
- outputMode: "truncate",
- },
- );
+ const result = await runProcess("node", ["-e", "process.stdout.write('x'.repeat(2048))"], {
+ maxBufferBytes: 128,
+ outputMode: "truncate",
+ });
expect(result.code).toBe(0);
expect(result.stdout.length).toBeLessThanOrEqual(128);
diff --git a/apps/server/src/processRunner.ts b/apps/server/src/processRunner.ts
index cb6e9f89e..858da5ae3 100644
--- a/apps/server/src/processRunner.ts
+++ b/apps/server/src/processRunner.ts
@@ -24,11 +24,7 @@ function commandLabel(command: string, args: readonly string[]): string {
return [command, ...args].join(" ");
}
-function normalizeSpawnError(
- command: string,
- args: readonly string[],
- error: unknown,
-): Error {
+function normalizeSpawnError(command: string, args: readonly string[], error: unknown): Error {
if (!(error instanceof Error)) {
return new Error(`Failed to run ${commandLabel(command, args)}.`);
}
@@ -38,9 +34,7 @@ function normalizeSpawnError(
return new Error(`Command not found: ${command}`);
}
- return new Error(
- `Failed to run ${commandLabel(command, args)}: ${error.message}`,
- );
+ return new Error(`Failed to run ${commandLabel(command, args)}: ${error.message}`);
}
function normalizeExitError(
@@ -56,17 +50,11 @@ function normalizeExitError(
return new Error(`${commandLabel(command, args)} ${reason}.${detail}`);
}
-function normalizeStdinError(
- command: string,
- args: readonly string[],
- error: unknown,
-): Error {
+function normalizeStdinError(command: string, args: readonly string[], error: unknown): Error {
if (!(error instanceof Error)) {
return new Error(`Failed to write stdin for ${commandLabel(command, args)}.`);
}
- return new Error(
- `Failed to write stdin for ${commandLabel(command, args)}: ${error.message}`,
- );
+ return new Error(`Failed to write stdin for ${commandLabel(command, args)}: ${error.message}`);
}
function normalizeBufferError(
@@ -161,22 +149,13 @@ export async function runProcess(
});
};
- const appendOutput = (
- stream: "stdout" | "stderr",
- chunk: Buffer | string,
- ): Error | null => {
- const chunkBuffer =
- typeof chunk === "string" ? Buffer.from(chunk) : chunk;
+ const appendOutput = (stream: "stdout" | "stderr", chunk: Buffer | string): Error | null => {
+ const chunkBuffer = typeof chunk === "string" ? Buffer.from(chunk) : chunk;
const text = chunkBuffer.toString();
const byteLength = chunkBuffer.length;
if (stream === "stdout") {
if (outputMode === "truncate") {
- const appended = appendChunkWithinLimit(
- stdout,
- stdoutBytes,
- chunkBuffer,
- maxBufferBytes,
- );
+ const appended = appendChunkWithinLimit(stdout, stdoutBytes, chunkBuffer, maxBufferBytes);
stdout = appended.next;
stdoutBytes = appended.nextBytes;
stdoutTruncated = stdoutTruncated || appended.truncated;
@@ -189,12 +168,7 @@ export async function runProcess(
}
} else {
if (outputMode === "truncate") {
- const appended = appendChunkWithinLimit(
- stderr,
- stderrBytes,
- chunkBuffer,
- maxBufferBytes,
- );
+ const appended = appendChunkWithinLimit(stderr, stderrBytes, chunkBuffer, maxBufferBytes);
stderr = appended.next;
stderrBytes = appended.nextBytes;
stderrTruncated = stderrTruncated || appended.truncated;
@@ -241,10 +215,7 @@ export async function runProcess(
};
finalize(() => {
- if (
- !options.allowNonZeroExit &&
- (timedOut || (code !== null && code !== 0))
- ) {
+ if (!options.allowNonZeroExit && (timedOut || (code !== null && code !== 0))) {
reject(normalizeExitError(command, args, result));
return;
}
diff --git a/apps/server/src/ptyAdapter.ts b/apps/server/src/ptyAdapter.ts
index 104a0648b..903b5911b 100644
--- a/apps/server/src/ptyAdapter.ts
+++ b/apps/server/src/ptyAdapter.ts
@@ -40,12 +40,7 @@ function resolveNodePtySpawnHelperPath(): string | null {
const candidates = [
path.join(packageDir, "build", "Release", "spawn-helper"),
path.join(packageDir, "build", "Debug", "spawn-helper"),
- path.join(
- packageDir,
- "prebuilds",
- `${process.platform}-${process.arch}`,
- "spawn-helper",
- ),
+ path.join(packageDir, "prebuilds", `${process.platform}-${process.arch}`, "spawn-helper"),
];
for (const candidate of candidates) {
@@ -128,10 +123,7 @@ export class NodePtyAdapter implements PtyAdapter {
cols: input.cols,
rows: input.rows,
env: input.env,
- name:
- globalThis.process.platform === "win32"
- ? "xterm-color"
- : "xterm-256color",
+ name: globalThis.process.platform === "win32" ? "xterm-color" : "xterm-256color",
});
return new NodePtyProcess(ptyProcess);
}
diff --git a/apps/server/src/terminalManager.test.ts b/apps/server/src/terminalManager.test.ts
index efbd8ce62..55b11068b 100644
--- a/apps/server/src/terminalManager.test.ts
+++ b/apps/server/src/terminalManager.test.ts
@@ -2,7 +2,11 @@ import fs from "node:fs";
import os from "node:os";
import path from "node:path";
-import { DEFAULT_TERMINAL_ID, type TerminalEvent, type TerminalOpenInput } from "@t3tools/contracts";
+import {
+ DEFAULT_TERMINAL_ID,
+ type TerminalEvent,
+ type TerminalOpenInput,
+} from "@t3tools/contracts";
import { afterEach, describe, expect, it } from "vitest";
import type { PtyAdapter, PtyExitEvent, PtyProcess, PtySpawnInput } from "./ptyAdapter";
@@ -161,7 +165,10 @@ describe("TerminalManager", () => {
it("spawns lazily and reuses running terminal per thread", async () => {
const { manager, ptyAdapter } = makeManager();
- const [first, second] = await Promise.all([manager.open(openInput()), manager.open(openInput())]);
+ const [first, second] = await Promise.all([
+ manager.open(openInput()),
+ manager.open(openInput()),
+ ]);
const third = await manager.open(openInput());
expect(first.threadId).toBe("thread-1");
@@ -299,18 +306,14 @@ describe("TerminalManager", () => {
hasRunningSubprocess = true;
await waitFor(
() =>
- events.some(
- (event) => event.type === "activity" && event.hasRunningSubprocess === true,
- ),
+ events.some((event) => event.type === "activity" && event.hasRunningSubprocess === true),
1_200,
);
hasRunningSubprocess = false;
await waitFor(
() =>
- events.some(
- (event) => event.type === "activity" && event.hasRunningSubprocess === false,
- ),
+ events.some((event) => event.type === "activity" && event.hasRunningSubprocess === false),
1_200,
);
@@ -368,12 +371,8 @@ describe("TerminalManager", () => {
expect(defaultProcess.killed).toBe(true);
expect(sidecarProcess.killed).toBe(true);
- expect(fs.existsSync(multiTerminalHistoryLogPath(logsDir, "thread-1", "default"))).toBe(
- false,
- );
- expect(fs.existsSync(multiTerminalHistoryLogPath(logsDir, "thread-1", "sidecar"))).toBe(
- false,
- );
+ expect(fs.existsSync(multiTerminalHistoryLogPath(logsDir, "thread-1", "default"))).toBe(false);
+ expect(fs.existsSync(multiTerminalHistoryLogPath(logsDir, "thread-1", "sidecar"))).toBe(false);
manager.dispose();
});
@@ -415,9 +414,7 @@ describe("TerminalManager", () => {
} else {
expect(
ptyAdapter.spawnInputs.some((input) =>
- ["/bin/zsh", "/bin/bash", "/bin/sh", "zsh", "bash", "sh"].includes(
- input.shell,
- ),
+ ["/bin/zsh", "/bin/bash", "/bin/sh", "zsh", "bash", "sh"].includes(input.shell),
),
).toBe(true);
}
diff --git a/apps/server/src/terminalManager.ts b/apps/server/src/terminalManager.ts
index 8e1b39eb8..b6fb31af3 100644
--- a/apps/server/src/terminalManager.ts
+++ b/apps/server/src/terminalManager.ts
@@ -26,11 +26,7 @@ import { runProcess } from "./processRunner";
const DEFAULT_HISTORY_LINE_LIMIT = 5_000;
const DEFAULT_PERSIST_DEBOUNCE_MS = 40;
const DEFAULT_SUBPROCESS_POLL_INTERVAL_MS = 1_000;
-const TERMINAL_ENV_BLOCKLIST = new Set([
- "PORT",
- "ELECTRON_RENDERER_PORT",
- "ELECTRON_RUN_AS_NODE",
-]);
+const TERMINAL_ENV_BLOCKLIST = new Set(["PORT", "ELECTRON_RENDERER_PORT", "ELECTRON_RUN_AS_NODE"]);
type TerminalSubprocessChecker = (terminalPid: number) => Promise<boolean>;
@@ -102,12 +98,7 @@ function resolveShellCandidates(shellResolver: () => string): string[] {
const requested = normalizeShellCommand(shellResolver());
if (process.platform === "win32") {
- return uniqueShells([
- requested,
- process.env.ComSpec ?? null,
- "powershell.exe",
- "cmd.exe",
- ]);
+ return uniqueShells([requested, process.env.ComSpec ?? null, "powershell.exe", "cmd.exe"]);
}
return uniqueShells([
@@ -431,11 +422,7 @@ export class TerminalManager extends EventEmitter<TerminalManagerEvents> {
const input = terminalCloseInputSchema.parse(raw);
await this.runWithThreadLock(input.threadId, async () => {
if (input.terminalId) {
- await this.closeSession(
- input.threadId,
- input.terminalId,
- input.deleteHistory === true,
- );
+ await this.closeSession(input.threadId, input.terminalId, input.deleteHistory === true);
return;
}
@@ -517,13 +504,9 @@ export class TerminalManager extends EventEmitter<TerminalManagerEvents> {
if (!ptyProcess) {
const detail =
- lastSpawnError instanceof Error
- ? lastSpawnError.message
- : "Terminal start failed";
+ lastSpawnError instanceof Error ? lastSpawnError.message : "Terminal start failed";
const tried =
- shellCandidates.length > 0
- ? ` Tried shells: ${shellCandidates.join(", ")}.`
- : "";
+ shellCandidates.length > 0 ? ` Tried shells: ${shellCandidates.join(", ")}.` : "";
throw new Error(`${detail}.${tried}`.trim());
}
@@ -969,10 +952,7 @@ export class TerminalManager extends EventEmitter<TerminalManagerEvents> {
return path.join(this.logsDir, `${legacySafeThreadId(threadId)}.log`);
}
- private async runWithThreadLock<T>(
- threadId: string,
- task: () => Promise<T>,
- ): Promise<T> {
+ private async runWithThreadLock<T>(threadId: string, task: () => Promise<T>): Promise<T> {
const previous = this.threadLocks.get(threadId) ?? Promise.resolve();
let release: () => void = () => {};
const current = new Promise<void>((resolve) => {
diff --git a/apps/server/src/wsServer.test.ts b/apps/server/src/wsServer.test.ts
index 1f84d880a..baf70eaca 100644
--- a/apps/server/src/wsServer.test.ts
+++ b/apps/server/src/wsServer.test.ts
@@ -224,9 +224,7 @@ describe("WebSocket Server", () => {
...(options.authToken ? { authToken: options.authToken } : {}),
projectRegistry: new ProjectRegistry(stateDir),
...(options.gitManager ? { gitManager: options.gitManager as never } : {}),
- ...(options.terminalManager
- ? { terminalManager: options.terminalManager }
- : {}),
+ ...(options.terminalManager ? { terminalManager: options.terminalManager } : {}),
});
}
@@ -602,9 +600,7 @@ describe("WebSocket Server", () => {
it("returns errors from git.runStackedAction", async () => {
const gitManager = {
status: vi.fn(),
- runStackedAction: vi
- .fn()
- .mockRejectedValue(new Error("Cannot push from detached HEAD.")),
+ runStackedAction: vi.fn().mockRejectedValue(new Error("Cannot push from detached HEAD.")),
};
server = createTestServer({ cwd: "/test", gitManager });
diff --git a/apps/web/src/components/BranchToolbar.tsx b/apps/web/src/components/BranchToolbar.tsx
index 9e25228f8..b60d38126 100644
--- a/apps/web/src/components/BranchToolbar.tsx
+++ b/apps/web/src/components/BranchToolbar.tsx
@@ -214,13 +214,16 @@ export default function BranchToolbar({ envMode, onEnvModeChange, envLocked }: B
const branch = branchByName.get(branchName);
if (!branch) return null;
- const hasSecondaryWorktree = branch.worktreePath && branch.worktreePath !== activeProject.cwd;
+ const hasSecondaryWorktree =
+ branch.worktreePath && branch.worktreePath !== activeProject.cwd;
return (
<ComboboxItem
hideIndicator
key={branchName}
value={branchName}
- className={branchName === activeThread.branch ? "bg-accent text-foreground" : undefined}
+ className={
+ branchName === activeThread.branch ? "bg-accent text-foreground" : undefined
+ }
onClick={() => selectBranch(branch)}
>
<div className="flex w-full items-center justify-between gap-2">
diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx
index 9f3f5fb85..dbb646c2b 100644
--- a/apps/web/src/components/ChatView.tsx
+++ b/apps/web/src/components/ChatView.tsx
@@ -1304,7 +1304,9 @@ export default function ChatView() {
</form>
</div>
- {isGitRepo && <BranchToolbar envMode={envMode} onEnvModeChange={setEnvMode} envLocked={envLocked} />}
+ {isGitRepo && (
+ <BranchToolbar envMode={envMode} onEnvModeChange={setEnvMode} envLocked={envLocked} />
+ )}
{activeThread.terminalOpen && api && activeProject && (
<ThreadTerminalDrawer
diff --git a/apps/web/src/components/GitActionsControl.logic.test.ts b/apps/web/src/components/GitActionsControl.logic.test.ts
index 6eba57429..0bd7e49b3 100644
--- a/apps/web/src/components/GitActionsControl.logic.test.ts
+++ b/apps/web/src/components/GitActionsControl.logic.test.ts
@@ -383,7 +383,11 @@ describe("when: working tree has local changes", () => {
describe("when: on default branch without open PR", () => {
it("resolveQuickAction returns commit and push when local changes exist", () => {
- const quick = resolveQuickAction(status({ branch: "main", hasWorkingTreeChanges: true }), false, true);
+ const quick = resolveQuickAction(
+ status({ branch: "main", hasWorkingTreeChanges: true }),
+ false,
+ true,
+ );
assert.deepInclude(quick, {
kind: "run_action",
action: "commit_push",
@@ -393,7 +397,11 @@ describe("when: on default branch without open PR", () => {
});
it("resolveQuickAction returns push when branch is ahead", () => {
- const quick = resolveQuickAction(status({ branch: "main", aheadCount: 2, openPr: null }), false, true);
+ const quick = resolveQuickAction(
+ status({ branch: "main", aheadCount: 2, openPr: null }),
+ false,
+ true,
+ );
assert.deepInclude(quick, {
kind: "run_action",
action: "commit_push",
@@ -405,7 +413,10 @@ describe("when: on default branch without open PR", () => {
describe("when: working tree has local changes and branch is behind upstream", () => {
it("resolveQuickAction still prefers commit, push, and create PR", () => {
- const quick = resolveQuickAction(status({ hasWorkingTreeChanges: true, behindCount: 1 }), false);
+ const quick = resolveQuickAction(
+ status({ hasWorkingTreeChanges: true, behindCount: 1 }),
+ false,
+ );
assert.deepInclude(quick, {
kind: "run_action",
action: "commit_push_pr",
@@ -486,7 +497,10 @@ describe("when: HEAD is detached and there are no local changes", () => {
describe("when: branch has no upstream configured", () => {
it("resolveQuickAction returns disabled commit state when clean and no commits are ahead", () => {
- const quick = resolveQuickAction(status({ hasUpstream: false, openPr: null, aheadCount: 0 }), false);
+ const quick = resolveQuickAction(
+ status({ hasUpstream: false, openPr: null, aheadCount: 0 }),
+ false,
+ );
assert.deepInclude(quick, {
kind: "show_hint",
label: "Commit",
@@ -540,7 +554,10 @@ describe("when: branch has no upstream configured", () => {
});
it("buildMenuItems disables push and create PR when no commits are ahead", () => {
- const items = buildMenuItems(status({ hasUpstream: false, openPr: null, aheadCount: 0 }), false);
+ const items = buildMenuItems(
+ status({ hasUpstream: false, openPr: null, aheadCount: 0 }),
+ false,
+ );
assert.deepEqual(items, [
{
id: "commit",
diff --git a/apps/web/src/components/GitActionsControl.logic.ts b/apps/web/src/components/GitActionsControl.logic.ts
index ea9fd0ea0..d00fcbc74 100644
--- a/apps/web/src/components/GitActionsControl.logic.ts
+++ b/apps/web/src/components/GitActionsControl.logic.ts
@@ -1,4 +1,8 @@
-import type { GitRunStackedActionResult, GitStackedAction, GitStatusResult } from "@t3tools/contracts";
+import type {
+ GitRunStackedActionResult,
+ GitStackedAction,
+ GitStatusResult,
+} from "@t3tools/contracts";
export type GitActionIconName = "commit" | "push" | "pr";
@@ -29,16 +33,20 @@ function shortenSha(sha: string | undefined): string | null {
return sha.slice(0, SHORT_SHA_LENGTH);
}
-function truncateText(value: string | undefined, maxLength = TOAST_DESCRIPTION_MAX): string | undefined {
+function truncateText(
+ value: string | undefined,
+ maxLength = TOAST_DESCRIPTION_MAX,
+): string | undefined {
if (!value) return undefined;
if (value.length <= maxLength) return value;
if (maxLength <= 3) return "...".slice(0, maxLength);
return `${value.slice(0, Math.max(0, maxLength - 3)).trimEnd()}...`;
}
-export function summarizeGitResult(
- result: GitRunStackedActionResult,
-): { title: string; description?: string } {
+export function summarizeGitResult(result: GitRunStackedActionResult): {
+ title: string;
+ description?: string;
+} {
const withDescription = (title: string, description: string | undefined) =>
description ? { title, description } : { title };
@@ -79,12 +87,7 @@ export function buildMenuItems(
const hasOpenPr = gitStatus.openPr !== null;
const isBehind = gitStatus.behindCount > 0;
const canCommit = !isBusy && hasChanges;
- const canPush =
- !isBusy &&
- hasBranch &&
- !hasChanges &&
- !isBehind &&
- gitStatus.aheadCount > 0;
+ const canPush = !isBusy && hasBranch && !hasChanges && !isBehind && gitStatus.aheadCount > 0;
const canCreatePr =
!isBusy &&
hasBranch &&
@@ -215,4 +218,3 @@ export function requiresDefaultBranchConfirmation(
if (!isDefaultBranch) return false;
return action === "commit_push" || action === "commit_push_pr";
}
-
diff --git a/apps/web/src/components/GitActionsControl.tsx b/apps/web/src/components/GitActionsControl.tsx
index 179e98640..141e4e1c5 100644
--- a/apps/web/src/components/GitActionsControl.tsx
+++ b/apps/web/src/components/GitActionsControl.tsx
@@ -1,8 +1,4 @@
-import {
- type GitStatusResult,
- type GitStackedAction,
- type NativeApi,
-} from "@t3tools/contracts";
+import { type GitStatusResult, type GitStackedAction, type NativeApi } from "@t3tools/contracts";
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
import { useCallback, useMemo, useState } from "react";
import { ChevronDownIcon, CloudUploadIcon, GitCommitIcon, InfoIcon } from "lucide-react";
@@ -195,9 +191,9 @@ export default function GitActionsControl({ api, gitCwd }: GitActionsControlProp
? (quickAction.hint ?? "This action is currently unavailable.")
: null;
const [isQuickActionPopoverOpen, setIsQuickActionPopoverOpen] = useState(false);
- const [openDisabledMenuItemId, setOpenDisabledMenuItemId] = useState<GitActionMenuItem["id"] | null>(
- null,
- );
+ const [openDisabledMenuItemId, setOpenDisabledMenuItemId] = useState<
+ GitActionMenuItem["id"] | null
+ >(null);
const refreshGitStatus = useCallback(async () => {
if (!api || !gitCwd) return;
@@ -240,13 +236,7 @@ export default function GitActionsControl({ api, gitCwd }: GitActionsControlProp
}, [api, gitStatus?.openPr?.url]);
const runGitActionWithToast = useCallback(
- async ({
- action,
- commitMessage,
- }: {
- action: GitStackedAction;
- commitMessage?: string;
- }) => {
+ async ({ action, commitMessage }: { action: GitStackedAction; commitMessage?: string }) => {
const confirmed = await maybeConfirmPushToDefaultBranch(action);
if (!confirmed) return;
@@ -396,8 +386,7 @@ export default function GitActionsControl({ api, gitCwd }: GitActionsControlProp
: activeDialogAction === "push"
? "commit_push"
: "commit_push_pr";
- const commitMessage =
- activeDialogAction === "commit" ? dialogCommitMessage.trim() : "";
+ const commitMessage = activeDialogAction === "commit" ? dialogCommitMessage.trim() : "";
setActiveDialogAction(null);
void runGitActionWithToast({
action,
@@ -503,7 +492,11 @@ export default function GitActionsControl({ api, gitCwd }: GitActionsControlProp
</MenuTrigger>
<MenuPopup align="end" sideOffset={4}>
{gitActionMenuItems.map((item) => {
- const disabledReason = getMenuActionDisabledReason(item, gitStatus, isGitActionRunning);
+ const disabledReason = getMenuActionDisabledReason(
+ item,
+ gitStatus,
+ isGitActionRunning,
+ );
if (item.disabled && disabledReason) {
return (
<Popover
@@ -611,7 +604,9 @@ export default function GitActionsControl({ api, gitCwd }: GitActionsControlProp
<>
<span className="text-success">+{gitStatus.workingTree.insertions}</span>
<span className="text-muted-foreground"> / </span>
- <span className="text-destructive">-{gitStatus.workingTree.deletions}</span>
+ <span className="text-destructive">
+ -{gitStatus.workingTree.deletions}
+ </span>
</>
)}
</span>
diff --git a/apps/web/src/components/ThreadTerminalDrawer.tsx b/apps/web/src/components/ThreadTerminalDrawer.tsx
index b1a19087a..03b057b2e 100644
--- a/apps/web/src/components/ThreadTerminalDrawer.tsx
+++ b/apps/web/src/components/ThreadTerminalDrawer.tsx
@@ -28,16 +28,11 @@ const MAX_DRAWER_HEIGHT_RATIO = 0.75;
function maxDrawerHeight(): number {
if (typeof window === "undefined") return DEFAULT_THREAD_TERMINAL_HEIGHT;
- return Math.max(
- MIN_DRAWER_HEIGHT,
- Math.floor(window.innerHeight * MAX_DRAWER_HEIGHT_RATIO),
- );
+ return Math.max(MIN_DRAWER_HEIGHT, Math.floor(window.innerHeight * MAX_DRAWER_HEIGHT_RATIO));
}
function clampDrawerHeight(height: number): number {
- const safeHeight = Number.isFinite(height)
- ? height
- : DEFAULT_THREAD_TERMINAL_HEIGHT;
+ const safeHeight = Number.isFinite(height) ? height : DEFAULT_THREAD_TERMINAL_HEIGHT;
const maxHeight = maxDrawerHeight();
return Math.min(Math.max(Math.round(safeHeight), MIN_DRAWER_HEIGHT), maxHeight);
}
@@ -51,8 +46,7 @@ function terminalThemeFromApp(): ITheme {
const bodyStyles = getComputedStyle(document.body);
const background =
bodyStyles.backgroundColor || (isDark ? "rgb(14, 18, 24)" : "rgb(255, 255, 255)");
- const foreground =
- bodyStyles.color || (isDark ? "rgb(237, 241, 247)" : "rgb(28, 33, 41)");
+ const foreground = bodyStyles.color || (isDark ? "rgb(237, 241, 247)" : "rgb(28, 33, 41)");
if (isDark) {
return {
@@ -146,8 +140,7 @@ function TerminalViewport({
lineHeight: 1.2,
fontSize: 12,
scrollback: 5_000,
- fontFamily:
- '"SF Mono", "SFMono-Regular", Consolas, "Liberation Mono", Menlo, monospace',
+ fontFamily: '"SF Mono", "SFMono-Regular", Consolas, "Liberation Mono", Menlo, monospace',
theme: terminalThemeFromApp(),
});
terminal.loadAddon(fitAddon);
@@ -538,8 +531,9 @@ export default function ThreadTerminalDrawer({
return indexByTerminal >= 0 ? indexByTerminal : 0;
}, [activeTerminalGroupId, resolvedActiveTerminalId, resolvedTerminalGroups]);
- const visibleTerminalIds =
- resolvedTerminalGroups[resolvedActiveGroupIndex]?.terminalIds ?? [resolvedActiveTerminalId];
+ const visibleTerminalIds = resolvedTerminalGroups[resolvedActiveGroupIndex]?.terminalIds ?? [
+ resolvedActiveTerminalId,
+ ];
const hasTerminalSidebar = normalizedTerminalIds.length > 1;
const isSplitView = visibleTerminalIds.length > 1;
const showGroupHeaders =
@@ -707,9 +701,7 @@ export default function ThreadTerminalDrawer({
<div
key={terminalId}
className={`min-h-0 min-w-0 border-l first:border-l-0 ${
- terminalId === resolvedActiveTerminalId
- ? "border-border"
- : "border-border/70"
+ terminalId === resolvedActiveTerminalId ? "border-border" : "border-border/70"
}`}
onMouseDown={() => {
if (terminalId !== resolvedActiveTerminalId) {
@@ -785,7 +777,8 @@ export default function ThreadTerminalDrawer({
<div className="min-h-0 flex-1 overflow-y-auto px-1 py-1">
{resolvedTerminalGroups.map((terminalGroup, groupIndex) => {
- const isGroupActive = terminalGroup.terminalIds.includes(resolvedActiveTerminalId);
+ const isGroupActive =
+ terminalGroup.terminalIds.includes(resolvedActiveTerminalId);
const groupActiveTerminalId = isGroupActive
? resolvedActiveTerminalId
: (terminalGroup.terminalIds[0] ?? resolvedActiveTerminalId);
@@ -808,7 +801,9 @@ export default function ThreadTerminalDrawer({
</button>
)}
- <div className={showGroupHeaders ? "ml-1 border-l border-border/60 pl-1.5" : ""}>
+ <div
+ className={showGroupHeaders ? "ml-1 border-l border-border/60 pl-1.5" : ""}
+ >
{terminalGroup.terminalIds.map((terminalId) => {
const isActive = terminalId === resolvedActiveTerminalId;
return (
diff --git a/apps/web/src/components/ui/alert-dialog.tsx b/apps/web/src/components/ui/alert-dialog.tsx
index 3c53b4cf3..5c65f261f 100644
--- a/apps/web/src/components/ui/alert-dialog.tsx
+++ b/apps/web/src/components/ui/alert-dialog.tsx
@@ -11,15 +11,10 @@ const AlertDialog = AlertDialogPrimitive.Root;
const AlertDialogPortal = AlertDialogPrimitive.Portal;
function AlertDialogTrigger(props: AlertDialogPrimitive.Trigger.Props) {
- return (
- <AlertDialogPrimitive.Trigger data-slot="alert-dialog-trigger" {...props} />
- );
+ return <AlertDialogPrimitive.Trigger data-slot="alert-dialog-trigger" {...props} />;
}
-function AlertDialogBackdrop({
- className,
- ...props
-}: AlertDialogPrimitive.Backdrop.Props) {
+function AlertDialogBackdrop({ className, ...props }: AlertDialogPrimitive.Backdrop.Props) {
return (
<AlertDialogPrimitive.Backdrop
className={cn(
@@ -32,10 +27,7 @@ function AlertDialogBackdrop({
);
}
-function AlertDialogViewport({
- className,
- ...props
-}: AlertDialogPrimitive.Viewport.Props) {
+function AlertDialogViewport({ className, ...props }: AlertDialogPrimitive.Viewport.Props) {
return (
<AlertDialogPrimitive.Viewport
className={cn(
@@ -59,10 +51,7 @@ function AlertDialogPopup({
<AlertDialogPortal>
<AlertDialogBackdrop />
<AlertDialogViewport
- className={cn(
- bottomStickOnMobile &&
- "max-sm:grid-rows-[1fr_auto] max-sm:p-0 max-sm:pt-12",
- )}
+ className={cn(bottomStickOnMobile && "max-sm:grid-rows-[1fr_auto] max-sm:p-0 max-sm:pt-12")}
>
<AlertDialogPrimitive.Popup
className={cn(
@@ -79,16 +68,10 @@ function AlertDialogPopup({
);
}
-function AlertDialogHeader({
- className,
- ...props
-}: React.ComponentProps<"div">) {
+function AlertDialogHeader({ className, ...props }: React.ComponentProps<"div">) {
return (
<div
- className={cn(
- "flex flex-col gap-2 p-6 text-center max-sm:pb-4 sm:text-left",
- className,
- )}
+ className={cn("flex flex-col gap-2 p-6 text-center max-sm:pb-4 sm:text-left", className)}
data-slot="alert-dialog-header"
{...props}
/>
@@ -116,26 +99,17 @@ function AlertDialogFooter({
);
}
-function AlertDialogTitle({
- className,
- ...props
-}: AlertDialogPrimitive.Title.Props) {
+function AlertDialogTitle({ className, ...props }: AlertDialogPrimitive.Title.Props) {
return (
<AlertDialogPrimitive.Title
- className={cn(
- "font-heading font-semibold text-xl leading-none",
- className,
- )}
+ className={cn("font-heading font-semibold text-xl leading-none", className)}
data-slot="alert-dialog-title"
{...props}
/>
);
}
-function AlertDialogDescription({
- className,
- ...props
-}: AlertDialogPrimitive.Description.Props) {
+function AlertDialogDescription({ className, ...props }: AlertDialogPrimitive.Description.Props) {
return (
<AlertDialogPrimitive.Description
className={cn("text-muted-foreground text-sm", className)}
@@ -146,9 +120,7 @@ function AlertDialogDescription({
}
function AlertDialogClose(props: AlertDialogPrimitive.Close.Props) {
- return (
- <AlertDialogPrimitive.Close data-slot="alert-dialog-close" {...props} />
- );
+ return <AlertDialogPrimitive.Close data-slot="alert-dialog-close" {...props} />;
}
export {
diff --git a/apps/web/src/components/ui/alert.tsx b/apps/web/src/components/ui/alert.tsx
index 8906426d5..41013f95b 100644
--- a/apps/web/src/components/ui/alert.tsx
+++ b/apps/web/src/components/ui/alert.tsx
@@ -11,10 +11,8 @@ const alertVariants = cva(
},
variants: {
variant: {
- default:
- "bg-transparent dark:bg-input/32 [&>svg]:text-muted-foreground",
- error:
- "border-destructive/32 bg-destructive/4 [&>svg]:text-destructive",
+ default: "bg-transparent dark:bg-input/32 [&>svg]:text-muted-foreground",
+ error: "border-destructive/32 bg-destructive/4 [&>svg]:text-destructive",
info: "border-info/32 bg-info/4 [&>svg]:text-info",
success: "border-success/32 bg-success/4 [&>svg]:text-success",
warning: "border-warning/32 bg-warning/4 [&>svg]:text-warning",
@@ -48,16 +46,10 @@ function AlertTitle({ className, ...props }: React.ComponentProps<"div">) {
);
}
-function AlertDescription({
- className,
- ...props
-}: React.ComponentProps<"div">) {
+function AlertDescription({ className, ...props }: React.ComponentProps<"div">) {
return (
<div
- className={cn(
- "flex flex-col gap-2.5 text-muted-foreground [svg~&]:col-start-2",
- className,
- )}
+ className={cn("flex flex-col gap-2.5 text-muted-foreground [svg~&]:col-start-2", className)}
data-slot="alert-description"
{...props}
/>
diff --git a/apps/web/src/components/ui/autocomplete.tsx b/apps/web/src/components/ui/autocomplete.tsx
index ec8b862a2..98ad1e431 100644
--- a/apps/web/src/components/ui/autocomplete.tsx
+++ b/apps/web/src/components/ui/autocomplete.tsx
@@ -121,11 +121,7 @@ function AutocompletePopup({
);
}
-function AutocompleteItem({
- className,
- children,
- ...props
-}: AutocompletePrimitive.Item.Props) {
+function AutocompleteItem({ className, children, ...props }: AutocompletePrimitive.Item.Props) {
return (
<AutocompletePrimitive.Item
className={cn(
@@ -140,10 +136,7 @@ function AutocompleteItem({
);
}
-function AutocompleteSeparator({
- className,
- ...props
-}: AutocompletePrimitive.Separator.Props) {
+function AutocompleteSeparator({ className, ...props }: AutocompletePrimitive.Separator.Props) {
return (
<AutocompletePrimitive.Separator
className={cn("mx-2 my-1 h-px bg-border last:hidden", className)}
@@ -153,10 +146,7 @@ function AutocompleteSeparator({
);
}
-function AutocompleteGroup({
- className,
- ...props
-}: AutocompletePrimitive.Group.Props) {
+function AutocompleteGroup({ className, ...props }: AutocompletePrimitive.Group.Props) {
return (
<AutocompletePrimitive.Group
className={cn("[[role=group]+&]:mt-1.5", className)}
@@ -166,26 +156,17 @@ function AutocompleteGroup({
);
}
-function AutocompleteGroupLabel({
- className,
- ...props
-}: AutocompletePrimitive.GroupLabel.Props) {
+function AutocompleteGroupLabel({ className, ...props }: AutocompletePrimitive.GroupLabel.Props) {
return (
<AutocompletePrimitive.GroupLabel
- className={cn(
- "px-2 py-1.5 font-medium text-muted-foreground text-xs",
- className,
- )}
+ className={cn("px-2 py-1.5 font-medium text-muted-foreground text-xs", className)}
data-slot="autocomplete-group-label"
{...props}
/>
);
}
-function AutocompleteEmpty({
- className,
- ...props
-}: AutocompletePrimitive.Empty.Props) {
+function AutocompleteEmpty({ className, ...props }: AutocompletePrimitive.Empty.Props) {
return (
<AutocompletePrimitive.Empty
className={cn(
@@ -198,36 +179,21 @@ function AutocompleteEmpty({
);
}
-function AutocompleteRow({
- className,
- ...props
-}: AutocompletePrimitive.Row.Props) {
+function AutocompleteRow({ className, ...props }: AutocompletePrimitive.Row.Props) {
return (
- <AutocompletePrimitive.Row
- className={className}
- data-slot="autocomplete-row"
- {...props}
- />
+ <AutocompletePrimitive.Row className={className} data-slot="autocomplete-row" {...props} />
);
}
function AutocompleteValue({ ...props }: AutocompletePrimitive.Value.Props) {
- return (
- <AutocompletePrimitive.Value data-slot="autocomplete-value" {...props} />
- );
+ return <AutocompletePrimitive.Value data-slot="autocomplete-value" {...props} />;
}
-function AutocompleteList({
- className,
- ...props
-}: AutocompletePrimitive.List.Props) {
+function AutocompleteList({ className, ...props }: AutocompletePrimitive.List.Props) {
return (
<ScrollArea scrollbarGutter scrollFade>
<AutocompletePrimitive.List
- className={cn(
- "not-empty:scroll-py-1 not-empty:p-1 in-data-has-overflow-y:pe-3",
- className,
- )}
+ className={cn("not-empty:scroll-py-1 not-empty:p-1 in-data-has-overflow-y:pe-3", className)}
data-slot="autocomplete-list"
{...props}
/>
@@ -235,10 +201,7 @@ function AutocompleteList({
);
}
-function AutocompleteClear({
- className,
- ...props
-}: AutocompletePrimitive.Clear.Props) {
+function AutocompleteClear({ className, ...props }: AutocompletePrimitive.Clear.Props) {
return (
<AutocompletePrimitive.Clear
className={cn(
@@ -253,10 +216,7 @@ function AutocompleteClear({
);
}
-function AutocompleteStatus({
- className,
- ...props
-}: AutocompletePrimitive.Status.Props) {
+function AutocompleteStatus({ className, ...props }: AutocompletePrimitive.Status.Props) {
return (
<AutocompletePrimitive.Status
className={cn(
@@ -269,15 +229,8 @@ function AutocompleteStatus({
);
}
-function AutocompleteCollection({
- ...props
-}: AutocompletePrimitive.Collection.Props) {
- return (
- <AutocompletePrimitive.Collection
- data-slot="autocomplete-collection"
- {...props}
- />
- );
+function AutocompleteCollection({ ...props }: AutocompletePrimitive.Collection.Props) {
+ return <AutocompletePrimitive.Collection data-slot="autocomplete-collection" {...props} />;
}
function AutocompleteTrigger({
diff --git a/apps/web/src/components/ui/badge.tsx b/apps/web/src/components/ui/badge.tsx
index c0f163963..e06d9b9a0 100644
--- a/apps/web/src/components/ui/badge.tsx
+++ b/apps/web/src/components/ui/badge.tsx
@@ -21,17 +21,13 @@ const badgeVariants = cva(
sm: "h-5 min-w-5 rounded-[.25rem] px-[calc(--spacing(1)-1px)] text-xs sm:h-4 sm:min-w-4 sm:text-[.625rem]",
},
variant: {
- default:
- "bg-primary text-primary-foreground [button&,a&]:hover:bg-primary/90",
- destructive:
- "bg-destructive text-white [button&,a&]:hover:bg-destructive/90",
- error:
- "bg-destructive/8 text-destructive-foreground dark:bg-destructive/16",
+ default: "bg-primary text-primary-foreground [button&,a&]:hover:bg-primary/90",
+ destructive: "bg-destructive text-white [button&,a&]:hover:bg-destructive/90",
+ error: "bg-destructive/8 text-destructive-foreground dark:bg-destructive/16",
info: "bg-info/8 text-info-foreground dark:bg-info/16",
outline:
"border-input bg-background text-foreground dark:bg-input/32 [button&,a&]:hover:bg-accent/50 dark:[button&,a&]:hover:bg-input/48",
- secondary:
- "bg-secondary text-secondary-foreground [button&,a&]:hover:bg-secondary/90",
+ secondary: "bg-secondary text-secondary-foreground [button&,a&]:hover:bg-secondary/90",
success: "bg-success/8 text-success-foreground dark:bg-success/16",
warning: "bg-warning/8 text-warning-foreground dark:bg-warning/16",
},
diff --git a/apps/web/src/components/ui/card.tsx b/apps/web/src/components/ui/card.tsx
index 3e4e3dcf4..f1428d13d 100644
--- a/apps/web/src/components/ui/card.tsx
+++ b/apps/web/src/components/ui/card.tsx
@@ -5,11 +5,7 @@ import { useRender } from "@base-ui/react/use-render";
import { cn } from "~/lib/utils";
-function Card({
- className,
- render,
- ...props
-}: useRender.ComponentProps<"div">) {
+function Card({ className, render, ...props }: useRender.ComponentProps<"div">) {
const defaultProps = {
className: cn(
"relative flex flex-col rounded-2xl border bg-card not-dark:bg-clip-padding text-card-foreground shadow-xs/5 before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-2xl)-1px)] before:shadow-[0_1px_--theme(--color-black/4%)] dark:before:shadow-[0_-1px_--theme(--color-white/6%)]",
@@ -25,11 +21,7 @@ function Card({
});
}
-function CardFrame({
- className,
- render,
- ...props
-}: useRender.ComponentProps<"div">) {
+function CardFrame({ className, render, ...props }: useRender.ComponentProps<"div">) {
const defaultProps = {
className: cn(
"[--clip-top:-1rem] [--clip-bottom:-1rem] *:data-[slot=card]:first:[--clip-top:1px] *:data-[slot=card]:last:[--clip-bottom:1px] flex flex-col relative rounded-2xl border bg-card before:bg-muted/72 not-dark:bg-clip-padding text-card-foreground shadow-xs/5 before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-2xl)-1px)] before:shadow-[0_1px_--theme(--color-black/4%)] dark:before:shadow-[0_-1px_--theme(--color-white/6%)] *:data-[slot=card]:-m-px *:not-last:data-[slot=card]:rounded-b-xl *:not-last:data-[slot=card]:before:rounded-b-[calc(var(--radius-xl)-1px)] *:not-first:data-[slot=card]:rounded-t-xl *:not-first:data-[slot=card]:before:rounded-t-[calc(var(--radius-xl)-1px)] *:data-[slot=card]:[clip-path:inset(var(--clip-top)_1px_var(--clip-bottom)_1px_round_calc(var(--radius-2xl)-1px))] *:data-[slot=card]:shadow-none *:data-[slot=card]:before:hidden *:data-[slot=card]:bg-clip-padding",
@@ -45,11 +37,7 @@ function CardFrame({
});
}
-function CardFrameHeader({
- className,
- render,
- ...props
-}: useRender.ComponentProps<"div">) {
+function CardFrameHeader({ className, render, ...props }: useRender.ComponentProps<"div">) {
const defaultProps = {
className: cn("relative flex flex-col px-6 py-4", className),
"data-slot": "card-frame-header",
@@ -62,11 +50,7 @@ function CardFrameHeader({
});
}
-function CardFrameTitle({
- className,
- render,
- ...props
-}: useRender.ComponentProps<"div">) {
+function CardFrameTitle({ className, render, ...props }: useRender.ComponentProps<"div">) {
const defaultProps = {
className: cn("font-semibold text-sm", className),
"data-slot": "card-frame-title",
@@ -79,11 +63,7 @@ function CardFrameTitle({
});
}
-function CardFrameDescription({
- className,
- render,
- ...props
-}: useRender.ComponentProps<"div">) {
+function CardFrameDescription({ className, render, ...props }: useRender.ComponentProps<"div">) {
const defaultProps = {
className: cn("text-muted-foreground text-sm", className),
"data-slot": "card-frame-description",
@@ -96,11 +76,7 @@ function CardFrameDescription({
});
}
-function CardFrameFooter({
- className,
- render,
- ...props
-}: useRender.ComponentProps<"div">) {
+function CardFrameFooter({ className, render, ...props }: useRender.ComponentProps<"div">) {
const defaultProps = {
className: cn("px-6 py-4", className),
"data-slot": "card-frame-footer",
@@ -113,11 +89,7 @@ function CardFrameFooter({
});
}
-function CardHeader({
- className,
- render,
- ...props
-}: useRender.ComponentProps<"div">) {
+function CardHeader({ className, render, ...props }: useRender.ComponentProps<"div">) {
const defaultProps = {
className: cn(
"grid auto-rows-min grid-rows-[auto_auto] items-start gap-1.5 p-6 in-[[data-slot=card]:has(>[data-slot=card-panel])]:pb-4 has-data-[slot=card-action]:grid-cols-[1fr_auto]",
@@ -133,11 +105,7 @@ function CardHeader({
});
}
-function CardTitle({
- className,
- render,
- ...props
-}: useRender.ComponentProps<"div">) {
+function CardTitle({ className, render, ...props }: useRender.ComponentProps<"div">) {
const defaultProps = {
className: cn("font-semibold text-lg leading-none", className),
"data-slot": "card-title",
@@ -150,11 +118,7 @@ function CardTitle({
});
}
-function CardDescription({
- className,
- render,
- ...props
-}: useRender.ComponentProps<"div">) {
+function CardDescription({ className, render, ...props }: useRender.ComponentProps<"div">) {
const defaultProps = {
className: cn("text-muted-foreground text-sm", className),
"data-slot": "card-description",
@@ -167,11 +131,7 @@ function CardDescription({
});
}
-function CardAction({
- className,
- render,
- ...props
-}: useRender.ComponentProps<"div">) {
+function CardAction({ className, render, ...props }: useRender.ComponentProps<"div">) {
const defaultProps = {
className: cn(
"col-start-2 row-span-2 row-start-1 self-start justify-self-end inline-flex",
@@ -187,11 +147,7 @@ function CardAction({
});
}
-function CardPanel({
- className,
- render,
- ...props
-}: useRender.ComponentProps<"div">) {
+function CardPanel({ className, render, ...props }: useRender.ComponentProps<"div">) {
const defaultProps = {
className: cn(
"flex-1 p-6 in-[[data-slot=card]:has(>[data-slot=card-header]:not(.border-b))]:pt-0 in-[[data-slot=card]:has(>[data-slot=card-footer]:not(.border-t))]:pb-0",
@@ -207,11 +163,7 @@ function CardPanel({
});
}
-function CardFooter({
- className,
- render,
- ...props
-}: useRender.ComponentProps<"div">) {
+function CardFooter({ className, render, ...props }: useRender.ComponentProps<"div">) {
const defaultProps = {
className: cn(
"flex items-center p-6 in-[[data-slot=card]:has(>[data-slot=card-panel])]:pt-4",
diff --git a/apps/web/src/components/ui/command.tsx b/apps/web/src/components/ui/command.tsx
index bc95d2c6f..700dd483f 100644
--- a/apps/web/src/components/ui/command.tsx
+++ b/apps/web/src/components/ui/command.tsx
@@ -23,18 +23,10 @@ const CommandDialogPortal = CommandDialogPrimitive.Portal;
const CommandCreateHandle = CommandDialogPrimitive.createHandle;
function CommandDialogTrigger(props: CommandDialogPrimitive.Trigger.Props) {
- return (
- <CommandDialogPrimitive.Trigger
- data-slot="command-dialog-trigger"
- {...props}
- />
- );
+ return <CommandDialogPrimitive.Trigger data-slot="command-dialog-trigger" {...props} />;
}
-function CommandDialogBackdrop({
- className,
- ...props
-}: CommandDialogPrimitive.Backdrop.Props) {
+function CommandDialogBackdrop({ className, ...props }: CommandDialogPrimitive.Backdrop.Props) {
return (
<CommandDialogPrimitive.Backdrop
className={cn(
@@ -47,10 +39,7 @@ function CommandDialogBackdrop({
);
}
-function CommandDialogViewport({
- className,
- ...props
-}: CommandDialogPrimitive.Viewport.Props) {
+function CommandDialogViewport({ className, ...props }: CommandDialogPrimitive.Viewport.Props) {
return (
<CommandDialogPrimitive.Viewport
className={cn(
@@ -63,11 +52,7 @@ function CommandDialogViewport({
);
}
-function CommandDialogPopup({
- className,
- children,
- ...props
-}: CommandDialogPrimitive.Popup.Props) {
+function CommandDialogPopup({ className, children, ...props }: CommandDialogPrimitive.Popup.Props) {
return (
<CommandDialogPortal>
<CommandDialogBackdrop />
@@ -125,10 +110,7 @@ function CommandInput({
);
}
-function CommandList({
- className,
- ...props
-}: React.ComponentProps<typeof AutocompleteList>) {
+function CommandList({ className, ...props }: React.ComponentProps<typeof AutocompleteList>) {
return (
<AutocompleteList
className={cn("not-empty:scroll-py-2 not-empty:p-2", className)}
@@ -138,10 +120,7 @@ function CommandList({
);
}
-function CommandEmpty({
- className,
- ...props
-}: React.ComponentProps<typeof AutocompleteEmpty>) {
+function CommandEmpty({ className, ...props }: React.ComponentProps<typeof AutocompleteEmpty>) {
return (
<AutocompleteEmpty
className={cn("not-empty:py-6", className)}
@@ -160,17 +139,8 @@ function CommandPanel({ className, ...props }: React.ComponentProps<"div">) {
);
}
-function CommandGroup({
- className,
- ...props
-}: React.ComponentProps<typeof AutocompleteGroup>) {
- return (
- <AutocompleteGroup
- className={className}
- data-slot="command-group"
- {...props}
- />
- );
+function CommandGroup({ className, ...props }: React.ComponentProps<typeof AutocompleteGroup>) {
+ return <AutocompleteGroup className={className} data-slot="command-group" {...props} />;
}
function CommandGroupLabel({
@@ -178,30 +148,17 @@ function CommandGroupLabel({
...props
}: React.ComponentProps<typeof AutocompleteGroupLabel>) {
return (
- <AutocompleteGroupLabel
- className={className}
- data-slot="command-group-label"
- {...props}
- />
+ <AutocompleteGroupLabel className={className} data-slot="command-group-label" {...props} />
);
}
-function CommandCollection({
- ...props
-}: React.ComponentProps<typeof AutocompleteCollection>) {
+function CommandCollection({ ...props }: React.ComponentProps<typeof AutocompleteCollection>) {
return <AutocompleteCollection data-slot="command-collection" {...props} />;
}
-function CommandItem({
- className,
- ...props
-}: React.ComponentProps<typeof AutocompleteItem>) {
+function CommandItem({ className, ...props }: React.ComponentProps<typeof AutocompleteItem>) {
return (
- <AutocompleteItem
- className={cn("py-1.5", className)}
- data-slot="command-item"
- {...props}
- />
+ <AutocompleteItem className={cn("py-1.5", className)} data-slot="command-item" {...props} />
);
}
diff --git a/apps/web/src/components/ui/dialog.tsx b/apps/web/src/components/ui/dialog.tsx
index d75c4bea0..080ac8099 100644
--- a/apps/web/src/components/ui/dialog.tsx
+++ b/apps/web/src/components/ui/dialog.tsx
@@ -20,10 +20,7 @@ function DialogClose(props: DialogPrimitive.Close.Props) {
return <DialogPrimitive.Close data-slot="dialog-close" {...props} />;
}
-function DialogBackdrop({
- className,
- ...props
-}: DialogPrimitive.Backdrop.Props) {
+function DialogBackdrop({ className, ...props }: DialogPrimitive.Backdrop.Props) {
return (
<DialogPrimitive.Backdrop
className={cn(
@@ -36,10 +33,7 @@ function DialogBackdrop({
);
}
-function DialogViewport({
- className,
- ...props
-}: DialogPrimitive.Viewport.Props) {
+function DialogViewport({ className, ...props }: DialogPrimitive.Viewport.Props) {
return (
<DialogPrimitive.Viewport
className={cn(
@@ -66,10 +60,7 @@ function DialogPopup({
<DialogPortal>
<DialogBackdrop />
<DialogViewport
- className={cn(
- bottomStickOnMobile &&
- "max-sm:grid-rows-[1fr_auto] max-sm:p-0 max-sm:pt-12",
- )}
+ className={cn(bottomStickOnMobile && "max-sm:grid-rows-[1fr_auto] max-sm:p-0 max-sm:pt-12")}
>
<DialogPrimitive.Popup
className={cn(
@@ -135,20 +126,14 @@ function DialogFooter({
function DialogTitle({ className, ...props }: DialogPrimitive.Title.Props) {
return (
<DialogPrimitive.Title
- className={cn(
- "font-heading font-semibold text-xl leading-none",
- className,
- )}
+ className={cn("font-heading font-semibold text-xl leading-none", className)}
data-slot="dialog-title"
{...props}
/>
);
}
-function DialogDescription({
- className,
- ...props
-}: DialogPrimitive.Description.Props) {
+function DialogDescription({ className, ...props }: DialogPrimitive.Description.Props) {
return (
<DialogPrimitive.Description
className={cn("text-muted-foreground text-sm", className)}
diff --git a/apps/web/src/components/ui/empty.tsx b/apps/web/src/components/ui/empty.tsx
index cbcad5341..5390dd665 100644
--- a/apps/web/src/components/ui/empty.tsx
+++ b/apps/web/src/components/ui/empty.tsx
@@ -18,10 +18,7 @@ function Empty({ className, ...props }: React.ComponentProps<"div">) {
function EmptyHeader({ className, ...props }: React.ComponentProps<"div">) {
return (
<div
- className={cn(
- "flex max-w-sm flex-col items-center text-center",
- className,
- )}
+ className={cn("flex max-w-sm flex-col items-center text-center", className)}
data-slot="empty-header"
{...props}
/>
@@ -73,10 +70,7 @@ function EmptyMedia({
/>
</>
)}
- <div
- className={cn(emptyMediaVariants({ className, variant }))}
- {...props}
- />
+ <div className={cn(emptyMediaVariants({ className, variant }))} {...props} />
</div>
);
}
@@ -117,11 +111,4 @@ function EmptyContent({ className, ...props }: React.ComponentProps<"div">) {
);
}
-export {
- Empty,
- EmptyHeader,
- EmptyTitle,
- EmptyDescription,
- EmptyContent,
- EmptyMedia,
-};
+export { Empty, EmptyHeader, EmptyTitle, EmptyDescription, EmptyContent, EmptyMedia };
diff --git a/apps/web/src/components/ui/field.tsx b/apps/web/src/components/ui/field.tsx
index 47ad20052..1bf65b6c8 100644
--- a/apps/web/src/components/ui/field.tsx
+++ b/apps/web/src/components/ui/field.tsx
@@ -29,18 +29,11 @@ function FieldLabel({ className, ...props }: FieldPrimitive.Label.Props) {
function FieldItem({ className, ...props }: FieldPrimitive.Item.Props) {
return (
- <FieldPrimitive.Item
- className={cn("flex", className)}
- data-slot="field-item"
- {...props}
- />
+ <FieldPrimitive.Item className={cn("flex", className)} data-slot="field-item" {...props} />
);
}
-function FieldDescription({
- className,
- ...props
-}: FieldPrimitive.Description.Props) {
+function FieldDescription({ className, ...props }: FieldPrimitive.Description.Props) {
return (
<FieldPrimitive.Description
className={cn("text-muted-foreground text-xs", className)}
@@ -63,12 +56,4 @@ function FieldError({ className, ...props }: FieldPrimitive.Error.Props) {
const FieldControl = FieldPrimitive.Control;
const FieldValidity = FieldPrimitive.Validity;
-export {
- Field,
- FieldLabel,
- FieldDescription,
- FieldError,
- FieldControl,
- FieldItem,
- FieldValidity,
-};
+export { Field, FieldLabel, FieldDescription, FieldError, FieldControl, FieldItem, FieldValidity };
diff --git a/apps/web/src/components/ui/fieldset.tsx b/apps/web/src/components/ui/fieldset.tsx
index 9c054e210..23763b982 100644
--- a/apps/web/src/components/ui/fieldset.tsx
+++ b/apps/web/src/components/ui/fieldset.tsx
@@ -13,10 +13,7 @@ function Fieldset({ className, ...props }: FieldsetPrimitive.Root.Props) {
/>
);
}
-function FieldsetLegend({
- className,
- ...props
-}: FieldsetPrimitive.Legend.Props) {
+function FieldsetLegend({ className, ...props }: FieldsetPrimitive.Legend.Props) {
return (
<FieldsetPrimitive.Legend
className={cn("font-semibold text-foreground", className)}
diff --git a/apps/web/src/components/ui/input-group.tsx b/apps/web/src/components/ui/input-group.tsx
index b6e142c70..2d6316273 100644
--- a/apps/web/src/components/ui/input-group.tsx
+++ b/apps/web/src/components/ui/input-group.tsx
@@ -60,9 +60,9 @@ function InputGroupAddon({
if (isInteractive) return;
e.preventDefault();
const parent = e.currentTarget.parentElement;
- const input = parent?.querySelector<
- HTMLInputElement | HTMLTextAreaElement
- >("input, textarea");
+ const input = parent?.querySelector<HTMLInputElement | HTMLTextAreaElement>(
+ "input, textarea",
+ );
if (input && !parent?.querySelector("input:focus, textarea:focus")) {
input.focus();
}
@@ -92,10 +92,4 @@ function InputGroupTextarea({ className, ...props }: TextareaProps) {
return <Textarea className={className} unstyled {...props} />;
}
-export {
- InputGroup,
- InputGroupAddon,
- InputGroupText,
- InputGroupInput,
- InputGroupTextarea,
-};
+export { InputGroup, InputGroupAddon, InputGroupText, InputGroupInput, InputGroupTextarea };
diff --git a/apps/web/src/components/ui/input.tsx b/apps/web/src/components/ui/input.tsx
index a137f39a5..001a240dd 100644
--- a/apps/web/src/components/ui/input.tsx
+++ b/apps/web/src/components/ui/input.tsx
@@ -5,10 +5,7 @@ import type * as React from "react";
import { cn } from "~/lib/utils";
-type InputProps = Omit<
- InputPrimitive.Props & React.RefAttributes<HTMLInputElement>,
- "size"
-> & {
+type InputProps = Omit<InputPrimitive.Props & React.RefAttributes<HTMLInputElement>, "size"> & {
size?: "sm" | "default" | "lg" | number;
unstyled?: boolean;
nativeInput?: boolean;
@@ -23,8 +20,7 @@ function Input({
}: InputProps) {
const inputClassName = cn(
"h-8.5 w-full min-w-0 rounded-[inherit] px-[calc(--spacing(3)-1px)] leading-8.5 outline-none placeholder:text-muted-foreground/72 sm:h-7.5 sm:leading-7.5 [transition:background-color_5000000s_ease-in-out_0s]",
- size === "sm" &&
- "h-7.5 px-[calc(--spacing(2.5)-1px)] leading-7.5 sm:h-6.5 sm:leading-6.5",
+ size === "sm" && "h-7.5 px-[calc(--spacing(2.5)-1px)] leading-7.5 sm:h-6.5 sm:leading-6.5",
size === "lg" && "h-9.5 leading-9.5 sm:h-8.5 sm:leading-8.5",
props.type === "search" &&
"[&::-webkit-search-cancel-button]:appearance-none [&::-webkit-search-decoration]:appearance-none [&::-webkit-search-results-button]:appearance-none [&::-webkit-search-results-decoration]:appearance-none",
diff --git a/apps/web/src/components/ui/label.tsx b/apps/web/src/components/ui/label.tsx
index ff8ded33c..d61934025 100644
--- a/apps/web/src/components/ui/label.tsx
+++ b/apps/web/src/components/ui/label.tsx
@@ -5,11 +5,7 @@ import { useRender } from "@base-ui/react/use-render";
import { cn } from "~/lib/utils";
-function Label({
- className,
- render,
- ...props
-}: useRender.ComponentProps<"label">) {
+function Label({ className, render, ...props }: useRender.ComponentProps<"label">) {
const defaultProps = {
className: cn(
"inline-flex items-center gap-2 text-base/4.5 sm:text-sm/4 font-medium text-foreground",
diff --git a/apps/web/src/components/ui/menu.tsx b/apps/web/src/components/ui/menu.tsx
index b5c055e81..8f2833e41 100644
--- a/apps/web/src/components/ui/menu.tsx
+++ b/apps/web/src/components/ui/menu.tsx
@@ -12,17 +12,9 @@ const Menu = MenuPrimitive.Root;
const MenuPortal = MenuPrimitive.Portal;
-function MenuTrigger({
- className,
- children,
- ...props
-}: MenuPrimitive.Trigger.Props) {
+function MenuTrigger({ className, children, ...props }: MenuPrimitive.Trigger.Props) {
return (
- <MenuPrimitive.Trigger
- className={className}
- data-slot="menu-trigger"
- {...props}
- >
+ <MenuPrimitive.Trigger className={className} data-slot="menu-trigger" {...props}>
{children}
</MenuPrimitive.Trigger>
);
@@ -63,9 +55,7 @@ function MenuPopup({
data-slot="menu-popup"
{...props}
>
- <div className="max-h-(--available-height) w-full overflow-y-auto p-1">
- {children}
- </div>
+ <div className="max-h-(--available-height) w-full overflow-y-auto p-1">{children}</div>
</MenuPrimitive.Popup>
</MenuPrimitive.Positioner>
</MenuPrimitive.Portal>
@@ -113,9 +103,7 @@ function MenuCheckboxItem({
checked={checked}
className={cn(
"grid min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-default items-center gap-2 rounded-sm py-1 ps-2 text-base text-foreground outline-none data-disabled:pointer-events-none data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
- variant === "switch"
- ? "grid-cols-[1fr_auto] gap-4 pe-1.5"
- : "grid-cols-[1rem_1fr] pe-4",
+ variant === "switch" ? "grid-cols-[1fr_auto] gap-4 pe-1.5" : "grid-cols-[1rem_1fr] pe-4",
className,
)}
data-slot="menu-checkbox-item"
@@ -159,11 +147,7 @@ function MenuRadioGroup(props: MenuPrimitive.RadioGroup.Props) {
return <MenuPrimitive.RadioGroup data-slot="menu-radio-group" {...props} />;
}
-function MenuRadioItem({
- className,
- children,
- ...props
-}: MenuPrimitive.RadioItem.Props) {
+function MenuRadioItem({ className, children, ...props }: MenuPrimitive.RadioItem.Props) {
return (
<MenuPrimitive.RadioItem
className={cn(
diff --git a/apps/web/src/components/ui/popover.tsx b/apps/web/src/components/ui/popover.tsx
index 9a4a8a324..a2ed52503 100644
--- a/apps/web/src/components/ui/popover.tsx
+++ b/apps/web/src/components/ui/popover.tsx
@@ -8,17 +8,9 @@ const PopoverCreateHandle = PopoverPrimitive.createHandle;
const Popover = PopoverPrimitive.Root;
-function PopoverTrigger({
- className,
- children,
- ...props
-}: PopoverPrimitive.Trigger.Props) {
+function PopoverTrigger({ className, children, ...props }: PopoverPrimitive.Trigger.Props) {
return (
- <PopoverPrimitive.Trigger
- className={className}
- data-slot="popover-trigger"
- {...props}
- >
+ <PopoverPrimitive.Trigger className={className} data-slot="popover-trigger" {...props}>
{children}
</PopoverPrimitive.Trigger>
);
@@ -94,10 +86,7 @@ function PopoverTitle({ className, ...props }: PopoverPrimitive.Title.Props) {
);
}
-function PopoverDescription({
- className,
- ...props
-}: PopoverPrimitive.Description.Props) {
+function PopoverDescription({ className, ...props }: PopoverPrimitive.Description.Props) {
return (
<PopoverPrimitive.Description
className={cn("text-muted-foreground text-sm", className)}
diff --git a/apps/web/src/components/ui/scroll-area.tsx b/apps/web/src/components/ui/scroll-area.tsx
index d39b1d156..0d28d9593 100644
--- a/apps/web/src/components/ui/scroll-area.tsx
+++ b/apps/web/src/components/ui/scroll-area.tsx
@@ -15,17 +15,13 @@ function ScrollArea({
scrollbarGutter?: boolean;
}) {
return (
- <ScrollAreaPrimitive.Root
- className={cn("size-full min-h-0", className)}
- {...props}
- >
+ <ScrollAreaPrimitive.Root className={cn("size-full min-h-0", className)} {...props}>
<ScrollAreaPrimitive.Viewport
className={cn(
"h-full overscroll-contain rounded-[inherit] outline-none transition-shadows focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background data-has-overflow-x:overscroll-x-contain",
scrollFade &&
"mask-t-from-[calc(100%-min(var(--fade-size),var(--scroll-area-overflow-y-start)))] mask-b-from-[calc(100%-min(var(--fade-size),var(--scroll-area-overflow-y-end)))] mask-l-from-[calc(100%-min(var(--fade-size),var(--scroll-area-overflow-x-start)))] mask-r-from-[calc(100%-min(var(--fade-size),var(--scroll-area-overflow-x-end)))] [--fade-size:1.5rem]",
- scrollbarGutter &&
- "data-has-overflow-y:pe-2.5 data-has-overflow-x:pb-2.5",
+ scrollbarGutter && "data-has-overflow-y:pe-2.5 data-has-overflow-x:pb-2.5",
)}
data-slot="scroll-area-viewport"
>
diff --git a/apps/web/src/components/ui/separator.tsx b/apps/web/src/components/ui/separator.tsx
index 170049a7b..b74ce987b 100644
--- a/apps/web/src/components/ui/separator.tsx
+++ b/apps/web/src/components/ui/separator.tsx
@@ -2,11 +2,7 @@ import { Separator as SeparatorPrimitive } from "@base-ui/react/separator";
import { cn } from "~/lib/utils";
-function Separator({
- className,
- orientation = "horizontal",
- ...props
-}: SeparatorPrimitive.Props) {
+function Separator({ className, orientation = "horizontal", ...props }: SeparatorPrimitive.Props) {
return (
<SeparatorPrimitive
className={cn(
diff --git a/apps/web/src/components/ui/sheet.tsx b/apps/web/src/components/ui/sheet.tsx
index 0b8bafb2a..c5ca5101b 100644
--- a/apps/web/src/components/ui/sheet.tsx
+++ b/apps/web/src/components/ui/sheet.tsx
@@ -144,20 +144,14 @@ function SheetFooter({
function SheetTitle({ className, ...props }: SheetPrimitive.Title.Props) {
return (
<SheetPrimitive.Title
- className={cn(
- "font-heading font-semibold text-xl leading-none",
- className,
- )}
+ className={cn("font-heading font-semibold text-xl leading-none", className)}
data-slot="sheet-title"
{...props}
/>
);
}
-function SheetDescription({
- className,
- ...props
-}: SheetPrimitive.Description.Props) {
+function SheetDescription({ className, ...props }: SheetPrimitive.Description.Props) {
return (
<SheetPrimitive.Description
className={cn("text-muted-foreground text-sm", className)}
diff --git a/apps/web/src/components/ui/spinner.tsx b/apps/web/src/components/ui/spinner.tsx
index a4e863f15..362b78f95 100644
--- a/apps/web/src/components/ui/spinner.tsx
+++ b/apps/web/src/components/ui/spinner.tsx
@@ -1,10 +1,7 @@
import { Loader2Icon } from "lucide-react";
import { cn } from "~/lib/utils";
-function Spinner({
- className,
- ...props
-}: React.ComponentProps<typeof Loader2Icon>) {
+function Spinner({ className, ...props }: React.ComponentProps<typeof Loader2Icon>) {
return (
<Loader2Icon
aria-label="Loading"
diff --git a/apps/web/src/components/ui/textarea.tsx b/apps/web/src/components/ui/textarea.tsx
index f9911e51e..586ae8e44 100644
--- a/apps/web/src/components/ui/textarea.tsx
+++ b/apps/web/src/components/ui/textarea.tsx
@@ -11,12 +11,7 @@ type TextareaProps = React.ComponentProps<"textarea"> & {
unstyled?: boolean;
};
-function Textarea({
- className,
- size = "default",
- unstyled = false,
- ...props
-}: TextareaProps) {
+function Textarea({ className, size = "default", unstyled = false, ...props }: TextareaProps) {
return (
<span
className={
@@ -36,8 +31,7 @@ function Textarea({
"field-sizing-content min-h-17.5 w-full rounded-[inherit] px-[calc(--spacing(3)-1px)] py-[calc(--spacing(1.5)-1px)] outline-none max-sm:min-h-20.5",
size === "sm" &&
"min-h-16.5 px-[calc(--spacing(2.5)-1px)] py-[calc(--spacing(1)-1px)] max-sm:min-h-19.5",
- size === "lg" &&
- "min-h-18.5 py-[calc(--spacing(2)-1px)] max-sm:min-h-21.5",
+ size === "lg" && "min-h-18.5 py-[calc(--spacing(2)-1px)] max-sm:min-h-21.5",
)}
data-slot="textarea"
{...mergeProps(defaultProps, props)}
diff --git a/apps/web/src/components/ui/toast.tsx b/apps/web/src/components/ui/toast.tsx
index 39f20030d..8c406bcbe 100644
--- a/apps/web/src/components/ui/toast.tsx
+++ b/apps/web/src/components/ui/toast.tsx
@@ -35,11 +35,7 @@ interface ToastProviderProps extends Toast.Provider.Props {
position?: ToastPosition;
}
-function ToastProvider({
- children,
- position = "top-right",
- ...props
-}: ToastProviderProps) {
+function ToastProvider({ children, position = "top-right", ...props }: ToastProviderProps) {
return (
<Toast.Provider toastManager={toastManager} {...props}>
{children}
@@ -69,9 +65,7 @@ function Toasts({ position = "top-right" }: { position: ToastPosition }) {
data-slot="toast-viewport"
>
{toasts.map((toast) => {
- const Icon = toast.type
- ? TOAST_ICONS[toast.type as keyof typeof TOAST_ICONS]
- : null;
+ const Icon = toast.type ? TOAST_ICONS[toast.type as keyof typeof TOAST_ICONS] : null;
return (
<Toast.Root
@@ -139,10 +133,7 @@ function Toasts({ position = "top-right" }: { position: ToastPosition }) {
)}
<div className="flex flex-col gap-0.5">
- <Toast.Title
- className="font-medium"
- data-slot="toast-title"
- />
+ <Toast.Title className="font-medium" data-slot="toast-title" />
<Toast.Description
className="text-muted-foreground"
data-slot="toast-description"
@@ -150,10 +141,7 @@ function Toasts({ position = "top-right" }: { position: ToastPosition }) {
</div>
</div>
{toast.actionProps && (
- <Toast.Action
- className={buttonVariants({ size: "xs" })}
- data-slot="toast-action"
- >
+ <Toast.Action className={buttonVariants({ size: "xs" })} data-slot="toast-action">
{toast.actionProps.children}
</Toast.Action>
)}
@@ -180,16 +168,10 @@ function AnchoredToasts() {
return (
<Toast.Portal data-slot="toast-portal-anchored">
- <Toast.Viewport
- className="outline-none"
- data-slot="toast-viewport-anchored"
- >
+ <Toast.Viewport className="outline-none" data-slot="toast-viewport-anchored">
{toasts.map((toast) => {
- const Icon = toast.type
- ? TOAST_ICONS[toast.type as keyof typeof TOAST_ICONS]
- : null;
- const tooltipStyle =
- (toast.data as { tooltipStyle?: boolean })?.tooltipStyle ?? false;
+ const Icon = toast.type ? TOAST_ICONS[toast.type as keyof typeof TOAST_ICONS] : null;
+ const tooltipStyle = (toast.data as { tooltipStyle?: boolean })?.tooltipStyle ?? false;
const positionerProps = toast.positionerProps;
if (!positionerProps?.anchor) {
@@ -231,10 +213,7 @@ function AnchoredToasts() {
)}
<div className="flex flex-col gap-0.5">
- <Toast.Title
- className="font-medium"
- data-slot="toast-title"
- />
+ <Toast.Title className="font-medium" data-slot="toast-title" />
<Toast.Description
className="text-muted-foreground"
data-slot="toast-description"
diff --git a/apps/web/src/persistenceSchema.test.ts b/apps/web/src/persistenceSchema.test.ts
index 277d86ab2..70f4e9e5f 100644
--- a/apps/web/src/persistenceSchema.test.ts
+++ b/apps/web/src/persistenceSchema.test.ts
@@ -55,9 +55,7 @@ describe("hydratePersistedState", () => {
expect(hydrated?.threads[0]?.terminalGroups).toEqual([
{ id: `group-${DEFAULT_THREAD_TERMINAL_ID}`, terminalIds: [DEFAULT_THREAD_TERMINAL_ID] },
]);
- expect(hydrated?.threads[0]?.activeTerminalGroupId).toBe(
- `group-${DEFAULT_THREAD_TERMINAL_ID}`,
- );
+ expect(hydrated?.threads[0]?.activeTerminalGroupId).toBe(`group-${DEFAULT_THREAD_TERMINAL_ID}`);
expect(hydrated?.threads[0]?.messages[0]?.streaming).toBe(false);
expect(hydrated?.runtimeMode).toBe("full-access");
});
@@ -105,9 +103,7 @@ describe("hydratePersistedState", () => {
expect(hydrated?.threads[0]?.terminalGroups).toEqual([
{ id: `group-${DEFAULT_THREAD_TERMINAL_ID}`, terminalIds: [DEFAULT_THREAD_TERMINAL_ID] },
]);
- expect(hydrated?.threads[0]?.activeTerminalGroupId).toBe(
- `group-${DEFAULT_THREAD_TERMINAL_ID}`,
- );
+ expect(hydrated?.threads[0]?.activeTerminalGroupId).toBe(`group-${DEFAULT_THREAD_TERMINAL_ID}`);
expect(hydrated?.activeThreadId).toBe("t-1");
expect(hydrated?.runtimeMode).toBe("full-access");
});
@@ -221,9 +217,7 @@ describe("hydratePersistedState", () => {
},
{ id: "group-term-3", terminalIds: ["term-3"] },
]);
- expect(hydrated?.threads[0]?.activeTerminalGroupId).toBe(
- `group-${DEFAULT_THREAD_TERMINAL_ID}`,
- );
+ expect(hydrated?.threads[0]?.activeTerminalGroupId).toBe(`group-${DEFAULT_THREAD_TERMINAL_ID}`);
});
it("defaults terminalHeight when hydrating v5 payloads", () => {
@@ -261,9 +255,7 @@ describe("hydratePersistedState", () => {
expect(hydrated?.threads[0]?.terminalGroups).toEqual([
{ id: `group-${DEFAULT_THREAD_TERMINAL_ID}`, terminalIds: [DEFAULT_THREAD_TERMINAL_ID] },
]);
- expect(hydrated?.threads[0]?.activeTerminalGroupId).toBe(
- `group-${DEFAULT_THREAD_TERMINAL_ID}`,
- );
+ expect(hydrated?.threads[0]?.activeTerminalGroupId).toBe(`group-${DEFAULT_THREAD_TERMINAL_ID}`);
});
});
diff --git a/apps/web/src/persistenceSchema.ts b/apps/web/src/persistenceSchema.ts
index aaf10de75..544816e73 100644
--- a/apps/web/src/persistenceSchema.ts
+++ b/apps/web/src/persistenceSchema.ts
@@ -52,9 +52,7 @@ const persistedThreadSchema = z.object({
title: z.string().min(1),
model: z.string().min(1),
terminalOpen: z.boolean().default(false),
- terminalHeight: z.number().int().min(120).max(4_096).default(
- DEFAULT_THREAD_TERMINAL_HEIGHT,
- ),
+ terminalHeight: z.number().int().min(120).max(4_096).default(DEFAULT_THREAD_TERMINAL_HEIGHT),
terminalIds: z.array(z.string().trim().min(1)).default([DEFAULT_THREAD_TERMINAL_ID]),
activeTerminalId: z.string().trim().min(1).default(DEFAULT_THREAD_TERMINAL_ID),
terminalGroups: z.array(persistedTerminalGroupSchema).default([]),
@@ -149,9 +147,10 @@ function hydrateThread(
thread: z.infer<typeof persistedThreadSchema>,
isLegacyPayload: boolean,
): Thread {
- const terminalIds = [...new Set(thread.terminalIds.map((id) => id.trim()).filter((id) => id.length > 0))];
- const safeTerminalIds =
- terminalIds.length > 0 ? terminalIds : [DEFAULT_THREAD_TERMINAL_ID];
+ const terminalIds = [
+ ...new Set(thread.terminalIds.map((id) => id.trim()).filter((id) => id.length > 0)),
+ ];
+ const safeTerminalIds = terminalIds.length > 0 ? terminalIds : [DEFAULT_THREAD_TERMINAL_ID];
const activeTerminalId = safeTerminalIds.includes(thread.activeTerminalId)
? thread.activeTerminalId
: (safeTerminalIds[0] ?? DEFAULT_THREAD_TERMINAL_ID);
@@ -197,7 +196,9 @@ function hydrateThread(
if (normalizedGroups.length === 0 && thread.terminalLayout === "split") {
const splitTerminalIds = [
- ...new Set((thread.splitTerminalIds ?? []).map((id) => id.trim()).filter((id) => id.length > 0)),
+ ...new Set(
+ (thread.splitTerminalIds ?? []).map((id) => id.trim()).filter((id) => id.length > 0),
+ ),
].filter((terminalId) => safeTerminalIdSet.has(terminalId));
if (splitTerminalIds.length >= 2) {
const splitGroupTerminalIds = splitTerminalIds.slice(0, 2);
@@ -228,7 +229,9 @@ function hydrateThread(
const activeGroupIndex =
activeGroupIndexFromId >= 0
? activeGroupIndexFromId
- : (activeGroupIndexFromTerminal >= 0 ? activeGroupIndexFromTerminal : 0);
+ : activeGroupIndexFromTerminal >= 0
+ ? activeGroupIndexFromTerminal
+ : 0;
const activeTerminalGroupId =
normalizedGroups[activeGroupIndex]?.id ??
normalizedGroups[0]?.id ??
diff --git a/apps/web/src/store.test.ts b/apps/web/src/store.test.ts
index 7497e46ba..176a6a73f 100644
--- a/apps/web/src/store.test.ts
+++ b/apps/web/src/store.test.ts
@@ -244,11 +244,7 @@ describe("store reducer thread continuity", () => {
terminalId: "term-3",
});
- expect(next.threads[0]?.terminalIds).toEqual([
- DEFAULT_THREAD_TERMINAL_ID,
- "term-2",
- "term-3",
- ]);
+ expect(next.threads[0]?.terminalIds).toEqual([DEFAULT_THREAD_TERMINAL_ID, "term-2", "term-3"]);
expect(next.threads[0]?.terminalGroups).toEqual([
{
id: `group-${DEFAULT_THREAD_TERMINAL_ID}`,
diff --git a/apps/web/src/store.ts b/apps/web/src/store.ts
index 79cbfa707..eb2135055 100644
--- a/apps/web/src/store.ts
+++ b/apps/web/src/store.ts
@@ -101,17 +101,12 @@ function readPersistedState(): AppState {
try {
const rawCurrent = window.localStorage.getItem(PERSISTED_STATE_KEY);
- const legacyValues = LEGACY_PERSISTED_STATE_KEYS.map((key) =>
- window.localStorage.getItem(key),
- );
+ const legacyValues = LEGACY_PERSISTED_STATE_KEYS.map((key) => window.localStorage.getItem(key));
const rawLegacy = legacyValues.find((value) => value !== null) ?? null;
const raw = rawCurrent ?? rawLegacy;
if (!raw) return initialState;
const rawCodethingV1 = window.localStorage.getItem("codething:renderer-state:v1");
- const hydrated = hydratePersistedState(
- raw,
- !rawCurrent && raw === rawCodethingV1,
- );
+ const hydrated = hydratePersistedState(raw, !rawCurrent && raw === rawCodethingV1);
if (!hydrated) return initialState;
return { ...hydrated, diffOpen: false };
@@ -183,10 +178,7 @@ function assignUniqueGroupId(groupId: string, usedGroupIds: Set<string>): string
return uniqueGroupId;
}
-function normalizeTerminalGroups(
- thread: Thread,
- terminalIds: string[],
-): ThreadTerminalGroup[] {
+function normalizeTerminalGroups(thread: Thread, terminalIds: string[]): ThreadTerminalGroup[] {
const validTerminalIdSet = new Set(terminalIds);
const assignedTerminalIds = new Set<string>();
const usedGroupIds = new Set<string>();
@@ -248,14 +240,13 @@ function normalizeThreadTerminals(thread: Thread): Thread {
const activeGroupIndexFromId = terminalGroups.findIndex(
(group) => group.id === thread.activeTerminalGroupId,
);
- const activeGroupIndexFromTerminal = findGroupIndexByTerminalId(
- terminalGroups,
- activeTerminalId,
- );
+ const activeGroupIndexFromTerminal = findGroupIndexByTerminalId(terminalGroups, activeTerminalId);
const activeGroupIndex =
activeGroupIndexFromId >= 0
? activeGroupIndexFromId
- : (activeGroupIndexFromTerminal >= 0 ? activeGroupIndexFromTerminal : 0);
+ : activeGroupIndexFromTerminal >= 0
+ ? activeGroupIndexFromTerminal
+ : 0;
const activeTerminalGroupId =
terminalGroups[activeGroupIndex]?.id ??
terminalGroups[0]?.id ??
@@ -301,9 +292,9 @@ function closeThreadTerminal(thread: Thread, terminalId: string): Thread {
const closedTerminalGroupIndex = closedTerminalGroup
? closedTerminalGroup.terminalIds.indexOf(terminalId)
: -1;
- const remainingTerminalsInClosedGroup = (
- closedTerminalGroup?.terminalIds ?? []
- ).filter((id) => id !== terminalId);
+ const remainingTerminalsInClosedGroup = (closedTerminalGroup?.terminalIds ?? []).filter(
+ (id) => id !== terminalId,
+ );
const nextActiveTerminalId =
thread.activeTerminalId === terminalId
? (remainingTerminalsInClosedGroup[
@@ -562,10 +553,7 @@ export function reducer(state: AppState, action: Action): AppState {
activeGroupIndex = terminalGroups.length - 1;
}
- const existingGroupIndex = findGroupIndexByTerminalId(
- terminalGroups,
- action.terminalId,
- );
+ const existingGroupIndex = findGroupIndexByTerminalId(terminalGroups, action.terminalId);
if (existingGroupIndex >= 0) {
terminalGroups[existingGroupIndex]!.terminalIds = terminalGroups[
existingGroupIndex
@@ -674,10 +662,7 @@ export function reducer(state: AppState, action: Action): AppState {
threads: updateThread(state.threads, action.event.threadId, (thread) => {
const normalizedThread = normalizeThreadTerminals(thread);
const runningTerminalIdSet = new Set(normalizedThread.runningTerminalIds);
- if (
- action.event.type === "started" ||
- action.event.type === "restarted"
- ) {
+ if (action.event.type === "started" || action.event.type === "restarted") {
runningTerminalIdSet.delete(action.event.terminalId);
} else if (action.event.type === "activity") {
if (action.event.hasRunningSubprocess) {
diff --git a/apps/web/src/terminal-links.test.ts b/apps/web/src/terminal-links.test.ts
index 4764fa3d9..1e5fb3940 100644
--- a/apps/web/src/terminal-links.test.ts
+++ b/apps/web/src/terminal-links.test.ts
@@ -57,10 +57,7 @@ describe("resolvePathLinkTarget", () => {
it("keeps absolute paths unchanged", () => {
expect(
- resolvePathLinkTarget(
- "/Users/julius/project/src/main.ts:12",
- "/Users/julius/project",
- ),
+ resolvePathLinkTarget("/Users/julius/project/src/main.ts:12", "/Users/julius/project"),
).toBe("/Users/julius/project/src/main.ts:12");
});
});
diff --git a/apps/web/src/terminal-shortcuts.test.ts b/apps/web/src/terminal-shortcuts.test.ts
index 0da37e0a8..bbc13f068 100644
--- a/apps/web/src/terminal-shortcuts.test.ts
+++ b/apps/web/src/terminal-shortcuts.test.ts
@@ -19,70 +19,45 @@ function event(overrides: Partial<ShortcutEventLike> = {}): ShortcutEventLike {
describe("isTerminalToggleShortcut", () => {
it("matches Cmd+J on macOS", () => {
- expect(
- isTerminalToggleShortcut(event({ metaKey: true }), "MacIntel"),
- ).toBe(true);
+ expect(isTerminalToggleShortcut(event({ metaKey: true }), "MacIntel")).toBe(true);
});
it("matches Ctrl+J on non-macOS", () => {
- expect(
- isTerminalToggleShortcut(event({ ctrlKey: true }), "Win32"),
- ).toBe(true);
+ expect(isTerminalToggleShortcut(event({ ctrlKey: true }), "Win32")).toBe(true);
});
it("rejects wrong modifiers", () => {
- expect(
- isTerminalToggleShortcut(
- event({ ctrlKey: true, shiftKey: true }),
- "Win32",
- ),
- ).toBe(false);
- expect(
- isTerminalToggleShortcut(event({ metaKey: true, altKey: true }), "MacIntel"),
- ).toBe(false);
+ expect(isTerminalToggleShortcut(event({ ctrlKey: true, shiftKey: true }), "Win32")).toBe(false);
+ expect(isTerminalToggleShortcut(event({ metaKey: true, altKey: true }), "MacIntel")).toBe(
+ false,
+ );
});
it("rejects non-j keys", () => {
- expect(
- isTerminalToggleShortcut(event({ key: "k", ctrlKey: true }), "Linux"),
- ).toBe(false);
+ expect(isTerminalToggleShortcut(event({ key: "k", ctrlKey: true }), "Linux")).toBe(false);
});
});
describe("isTerminalClearShortcut", () => {
it("matches Ctrl+L on all platforms", () => {
- expect(
- isTerminalClearShortcut(event({ key: "l", ctrlKey: true }), "Linux"),
- ).toBe(true);
- expect(
- isTerminalClearShortcut(event({ key: "l", ctrlKey: true }), "MacIntel"),
- ).toBe(true);
+ expect(isTerminalClearShortcut(event({ key: "l", ctrlKey: true }), "Linux")).toBe(true);
+ expect(isTerminalClearShortcut(event({ key: "l", ctrlKey: true }), "MacIntel")).toBe(true);
});
it("matches Cmd+K on macOS", () => {
- expect(
- isTerminalClearShortcut(event({ key: "k", metaKey: true }), "MacIntel"),
- ).toBe(true);
+ expect(isTerminalClearShortcut(event({ key: "k", metaKey: true }), "MacIntel")).toBe(true);
});
it("rejects Cmd+K on non-macOS", () => {
- expect(
- isTerminalClearShortcut(event({ key: "k", metaKey: true }), "Win32"),
- ).toBe(false);
+ expect(isTerminalClearShortcut(event({ key: "k", metaKey: true }), "Win32")).toBe(false);
});
it("rejects wrong modifiers", () => {
expect(
- isTerminalClearShortcut(
- event({ key: "l", ctrlKey: true, shiftKey: true }),
- "Linux",
- ),
+ isTerminalClearShortcut(event({ key: "l", ctrlKey: true, shiftKey: true }), "Linux"),
).toBe(false);
expect(
- isTerminalClearShortcut(
- event({ key: "k", metaKey: true, altKey: true }),
- "MacIntel",
- ),
+ isTerminalClearShortcut(event({ key: "k", metaKey: true, altKey: true }), "MacIntel"),
).toBe(false);
});
});
diff --git a/apps/web/src/terminal-shortcuts.ts b/apps/web/src/terminal-shortcuts.ts
index 4dbd7019b..bc76a145f 100644
--- a/apps/web/src/terminal-shortcuts.ts
+++ b/apps/web/src/terminal-shortcuts.ts
@@ -31,13 +31,7 @@ export function isTerminalClearShortcut(
): boolean {
const key = event.key.toLowerCase();
- if (
- key === "l" &&
- event.ctrlKey &&
- !event.metaKey &&
- !event.altKey &&
- !event.shiftKey
- ) {
+ if (key === "l" && event.ctrlKey && !event.metaKey && !event.altKey && !event.shiftKey) {
return true;
}
diff --git a/packages/contracts/src/git.test.ts b/packages/contracts/src/git.test.ts
index 01cdc1936..596f9c8aa 100644
--- a/packages/contracts/src/git.test.ts
+++ b/packages/contracts/src/git.test.ts
@@ -47,9 +47,7 @@ describe("git contracts", () => {
it("accepts supported stacked actions", () => {
expect(gitStackedActionSchema.parse("commit")).toBe("commit");
expect(gitStackedActionSchema.parse("commit_push")).toBe("commit_push");
- expect(gitStackedActionSchema.parse("commit_push_pr")).toBe(
- "commit_push_pr",
- );
+ expect(gitStackedActionSchema.parse("commit_push_pr")).toBe("commit_push_pr");
});
it("parses stacked action input", () => {
diff --git a/packages/contracts/src/git.ts b/packages/contracts/src/git.ts
index d971d0655..5b275df1c 100644
--- a/packages/contracts/src/git.ts
+++ b/packages/contracts/src/git.ts
@@ -100,23 +100,11 @@ export const gitStatusResultSchema = z.object({
.nullable(),
});
-export const gitStackedActionSchema = z.enum([
- "commit",
- "commit_push",
- "commit_push_pr",
-]);
+export const gitStackedActionSchema = z.enum(["commit", "commit_push", "commit_push_pr"]);
const gitCommitStepStatusSchema = z.enum(["created", "skipped_no_changes"]);
-const gitPushStepStatusSchema = z.enum([
- "pushed",
- "skipped_not_requested",
- "skipped_up_to_date",
-]);
-const gitPrStepStatusSchema = z.enum([
- "created",
- "opened_existing",
- "skipped_not_requested",
-]);
+const gitPushStepStatusSchema = z.enum(["pushed", "skipped_not_requested", "skipped_up_to_date"]);
+const gitPrStepStatusSchema = z.enum(["created", "opened_existing", "skipped_not_requested"]);
export const gitRunStackedActionInputSchema = z.object({
cwd: z.string().trim().min(1),
diff --git a/packages/contracts/src/ipc.ts b/packages/contracts/src/ipc.ts
index 9b971cc34..4216172e7 100644
--- a/packages/contracts/src/ipc.ts
+++ b/packages/contracts/src/ipc.ts
@@ -105,9 +105,7 @@ export interface NativeApi {
// Stacked action API
pull: (input: GitPullInput) => Promise<GitPullResult>;
status: (input: GitStatusInput) => Promise<GitStatusResult>;
- runStackedAction: (
- input: GitRunStackedActionInput,
- ) => Promise<GitRunStackedActionResult>;
+ runStackedAction: (input: GitRunStackedActionInput) => Promise<GitRunStackedActionResult>;
};
contextMenu: {
show: <T extends string>(
diff --git a/packages/contracts/src/terminal.ts b/packages/contracts/src/terminal.ts
index 57d2d9f63..3b1d82e44 100644
--- a/packages/contracts/src/terminal.ts
+++ b/packages/contracts/src/terminal.ts
@@ -36,12 +36,7 @@ export const terminalCloseInputSchema = terminalThreadInputSchema.extend({
deleteHistory: z.boolean().optional(),
});
-export const terminalSessionStatusSchema = z.enum([
- "starting",
- "running",
- "exited",
- "error",
-]);
+export const terminalSessionStatusSchema = z.enum(["starting", "running", "exited", "error"]);
export const terminalSessionSnapshotSchema = z.object({
threadId: z.string().min(1),