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.

Expose available editors and gate Open In options

Julius Marmingeb3de2bd926bf
diff --git a/apps/server/src/open.test.ts b/apps/server/src/open.test.ts
index 8adb3e1a6..1889c8515 100644
--- a/apps/server/src/open.test.ts
+++ b/apps/server/src/open.test.ts
@@ -1,6 +1,15 @@
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+
import { assert, describe, it } from "@effect/vitest";
-import { launchDetached, resolveEditorLaunch } from "./open";
+import {
+ isCommandAvailable,
+ launchDetached,
+ resolveAvailableEditors,
+ resolveEditorLaunch,
+} from "./open";
import { Effect } from "effect";
import { assertSuccess } from "@effect/vitest/utils";
@@ -111,3 +120,50 @@ describe("launchDetached", () => {
}),
);
});
+
+describe("isCommandAvailable", () => {
+ function withTempDir(run: (dir: string) => void): void {
+ const dir = fs.mkdtempSync(path.join(os.tmpdir(), "t3-open-"));
+ try {
+ run(dir);
+ } finally {
+ fs.rmSync(dir, { recursive: true, force: true });
+ }
+ }
+
+ it("resolves win32 commands with PATHEXT", () => {
+ withTempDir((dir) => {
+ fs.writeFileSync(path.join(dir, "code.CMD"), "@echo off\r\n", "utf8");
+ const env = {
+ PATH: dir,
+ PATHEXT: ".COM;.EXE;.BAT;.CMD",
+ } satisfies NodeJS.ProcessEnv;
+ assert.equal(isCommandAvailable("code", { platform: "win32", env }), true);
+ });
+ });
+
+ it("returns false when a command is not on PATH", () => {
+ const env = {
+ PATH: "",
+ PATHEXT: ".COM;.EXE;.BAT;.CMD",
+ } satisfies NodeJS.ProcessEnv;
+ assert.equal(isCommandAvailable("definitely-not-installed", { platform: "win32", env }), false);
+ });
+});
+
+describe("resolveAvailableEditors", () => {
+ it("returns only editors whose launch commands are available", () => {
+ const dir = fs.mkdtempSync(path.join(os.tmpdir(), "t3-editors-"));
+ try {
+ fs.writeFileSync(path.join(dir, "cursor.CMD"), "@echo off\r\n", "utf8");
+ fs.writeFileSync(path.join(dir, "explorer.EXE"), "MZ", "utf8");
+ const editors = resolveAvailableEditors("win32", {
+ PATH: dir,
+ PATHEXT: ".COM;.EXE;.BAT;.CMD",
+ });
+ assert.deepEqual(editors, ["cursor", "file-manager"]);
+ } finally {
+ fs.rmSync(dir, { recursive: true, force: true });
+ }
+ });
+});
diff --git a/apps/server/src/open.ts b/apps/server/src/open.ts
index dcd4e736d..b15ec72de 100644
--- a/apps/server/src/open.ts
+++ b/apps/server/src/open.ts
@@ -7,6 +7,8 @@
* @module Open
*/
import { spawn } from "node:child_process";
+import { accessSync, constants, statSync } from "node:fs";
+import { delimiter, extname, join } from "node:path";
import { EDITORS, type EditorId } from "@t3tools/contracts";
import { ServiceMap, Schema, Effect, Layer } from "effect";
@@ -30,12 +32,122 @@ interface EditorLaunch {
readonly args: ReadonlyArray<string>;
}
+interface CommandAvailabilityOptions {
+ readonly platform?: NodeJS.Platform;
+ readonly env?: NodeJS.ProcessEnv;
+}
+
const LINE_COLUMN_SUFFIX_PATTERN = /:\d+(?::\d+)?$/;
function shouldUseGotoFlag(editorId: EditorId, target: string): boolean {
return (editorId === "cursor" || editorId === "vscode") && LINE_COLUMN_SUFFIX_PATTERN.test(target);
}
+function fileManagerCommandForPlatform(platform: NodeJS.Platform): string {
+ switch (platform) {
+ case "darwin":
+ return "open";
+ case "win32":
+ return "explorer";
+ default:
+ return "xdg-open";
+ }
+}
+
+function stripWrappingQuotes(value: string): string {
+ return value.replace(/^"+|"+$/g, "");
+}
+
+function resolvePathEnvironmentVariable(env: NodeJS.ProcessEnv): string {
+ return env.PATH ?? env.Path ?? env.path ?? "";
+}
+
+function resolveWindowsPathExtensions(env: NodeJS.ProcessEnv): ReadonlyArray<string> {
+ const rawValue = env.PATHEXT;
+ const fallback = [".COM", ".EXE", ".BAT", ".CMD"];
+ if (!rawValue) return fallback;
+
+ const parsed = rawValue
+ .split(";")
+ .map((entry) => entry.trim())
+ .filter((entry) => entry.length > 0)
+ .map((entry) => (entry.startsWith(".") ? entry.toUpperCase() : `.${entry.toUpperCase()}`));
+ return parsed.length > 0 ? Array.from(new Set(parsed)) : fallback;
+}
+
+function resolveCommandCandidates(
+ command: string,
+ platform: NodeJS.Platform,
+ env: NodeJS.ProcessEnv,
+): ReadonlyArray<string> {
+ if (platform !== "win32") return [command];
+ if (extname(command).length > 0) return [command];
+
+ const candidates = [command];
+ for (const extension of resolveWindowsPathExtensions(env)) {
+ candidates.push(`${command}${extension}`);
+ candidates.push(`${command}${extension.toLowerCase()}`);
+ }
+ return Array.from(new Set(candidates));
+}
+
+function isExecutableFile(filePath: string, platform: NodeJS.Platform): boolean {
+ try {
+ const stat = statSync(filePath);
+ if (!stat.isFile()) return false;
+ if (platform === "win32") return true;
+ accessSync(filePath, constants.X_OK);
+ return true;
+ } catch {
+ return false;
+ }
+}
+
+export function isCommandAvailable(
+ command: string,
+ options: CommandAvailabilityOptions = {},
+): boolean {
+ const platform = options.platform ?? process.platform;
+ const env = options.env ?? process.env;
+ const commandCandidates = resolveCommandCandidates(command, platform, env);
+
+ if (command.includes("/") || command.includes("\\")) {
+ return commandCandidates.some((candidate) => isExecutableFile(candidate, platform));
+ }
+
+ const pathValue = resolvePathEnvironmentVariable(env);
+ if (pathValue.length === 0) return false;
+ const pathEntries = pathValue
+ .split(delimiter)
+ .map((entry) => stripWrappingQuotes(entry.trim()))
+ .filter((entry) => entry.length > 0);
+
+ for (const pathEntry of pathEntries) {
+ for (const candidate of commandCandidates) {
+ if (isExecutableFile(join(pathEntry, candidate), platform)) {
+ return true;
+ }
+ }
+ }
+ return false;
+}
+
+export function resolveAvailableEditors(
+ platform: NodeJS.Platform = process.platform,
+ env: NodeJS.ProcessEnv = process.env,
+): ReadonlyArray<EditorId> {
+ const available: EditorId[] = [];
+
+ for (const editor of EDITORS) {
+ const command = editor.command ?? fileManagerCommandForPlatform(platform);
+ if (isCommandAvailable(command, { platform, env })) {
+ available.push(editor.id);
+ }
+ }
+
+ return available;
+}
+
/**
* OpenShape - Service API for browser and editor launch actions.
*/
@@ -81,14 +193,7 @@ export const resolveEditorLaunch = Effect.fnUntraced(function* (
return yield* new OpenError({ message: `Unsupported editor: ${input.editor}` });
}
- switch (platform) {
- case "darwin":
- return { command: "open", args: [input.cwd] };
- case "win32":
- return { command: "explorer", args: [input.cwd] };
- default:
- return { command: "xdg-open", args: [input.cwd] };
- }
+ return { command: fileManagerCommandForPlatform(platform), args: [input.cwd] };
});
export const launchDetached = (launch: EditorLaunch) =>
diff --git a/apps/server/src/wsServer.test.ts b/apps/server/src/wsServer.test.ts
index 1a278e2d3..f288332f8 100644
--- a/apps/server/src/wsServer.test.ts
+++ b/apps/server/src/wsServer.test.ts
@@ -13,6 +13,7 @@ import { makeServerProviderLayer, makeServerRuntimeServicesLayer } from "./serve
import {
DEFAULT_TERMINAL_ID,
+ EDITORS,
EventId,
ORCHESTRATION_WS_CHANNELS,
ORCHESTRATION_WS_METHODS,
@@ -340,6 +341,15 @@ function compileKeybindings(bindings: KeybindingsConfig): ResolvedKeybindingsCon
}
const DEFAULT_RESOLVED_KEYBINDINGS = compileKeybindings([...DEFAULT_KEYBINDINGS]);
+const VALID_EDITOR_IDS = new Set(EDITORS.map((editor) => editor.id));
+
+function expectAvailableEditors(value: unknown): void {
+ expect(Array.isArray(value)).toBe(true);
+ for (const editorId of value as unknown[]) {
+ expect(typeof editorId).toBe("string");
+ expect(VALID_EDITOR_IDS.has(editorId as (typeof EDITORS)[number]["id"])).toBe(true);
+ }
+}
describe("WebSocket Server", () => {
let server: Http.Server | null = null;
@@ -726,7 +736,9 @@ describe("WebSocket Server", () => {
keybindingsConfigPath: keybindingsPath,
keybindings: DEFAULT_RESOLVED_KEYBINDINGS,
issues: [],
+ availableEditors: expect.any(Array),
});
+ expectAvailableEditors((response.result as { availableEditors: unknown }).availableEditors);
});
it("bootstraps default keybindings file when missing", async () => {
@@ -749,7 +761,9 @@ describe("WebSocket Server", () => {
keybindingsConfigPath: keybindingsPath,
keybindings: DEFAULT_RESOLVED_KEYBINDINGS,
issues: [],
+ availableEditors: expect.any(Array),
});
+ expectAvailableEditors((response.result as { availableEditors: unknown }).availableEditors);
const persistedConfig = JSON.parse(
fs.readFileSync(keybindingsPath, "utf8"),
@@ -782,7 +796,9 @@ describe("WebSocket Server", () => {
message: expect.stringContaining("expected JSON array"),
},
],
+ availableEditors: expect.any(Array),
});
+ expectAvailableEditors((response.result as { availableEditors: unknown }).availableEditors);
expect(fs.readFileSync(keybindingsPath, "utf8")).toBe("{ not-json");
});
@@ -814,6 +830,7 @@ describe("WebSocket Server", () => {
keybindingsConfigPath: string;
keybindings: ResolvedKeybindingsConfig;
issues: Array<{ kind: string; index?: number; message: string }>;
+ availableEditors: unknown;
};
expect(result.cwd).toBe("/my/workspace");
expect(result.keybindingsConfigPath).toBe(keybindingsPath);
@@ -832,6 +849,7 @@ describe("WebSocket Server", () => {
expect(result.keybindings).toHaveLength(DEFAULT_RESOLVED_KEYBINDINGS.length);
expect(result.keybindings.some((entry) => entry.command === "terminal.toggle")).toBe(true);
expect(result.keybindings.some((entry) => entry.command === "terminal.new")).toBe(true);
+ expectAvailableEditors(result.availableEditors);
});
it("pushes server.configUpdated issues when keybindings file changes", async () => {
@@ -929,7 +947,9 @@ describe("WebSocket Server", () => {
keybindingsConfigPath: keybindingsPath,
keybindings: compileKeybindings(persistedConfig),
issues: [],
+ availableEditors: expect.any(Array),
});
+ expectAvailableEditors((response.result as { availableEditors: unknown }).availableEditors);
});
it("upserts keybinding rules and updates cached server config", async () => {
@@ -974,7 +994,11 @@ describe("WebSocket Server", () => {
keybindingsConfigPath: keybindingsPath,
keybindings: compileKeybindings(persistedConfig),
issues: [],
+ availableEditors: expect.any(Array),
});
+ expectAvailableEditors(
+ (configResponse.result as { availableEditors: unknown }).availableEditors,
+ );
});
it("returns error for unknown methods", async () => {
diff --git a/apps/server/src/wsServer.ts b/apps/server/src/wsServer.ts
index 3f2c5734d..9e5c4e788 100644
--- a/apps/server/src/wsServer.ts
+++ b/apps/server/src/wsServer.ts
@@ -54,7 +54,7 @@ import { OrchestrationReactor } from "./orchestration/Services/OrchestrationReac
import { ProviderService } from "./provider/Services/ProviderService";
import { CheckpointDiffQuery } from "./checkpointing/Services/CheckpointDiffQuery";
import { clamp } from "effect/Number";
-import { Open } from "./open";
+import { Open, resolveAvailableEditors } from "./open";
import { ServerConfig } from "./config";
import { GitCore } from "./git/Services/GitCore.ts";
import { tryHandleProjectFaviconRequest } from "./projectFaviconRoute";
@@ -193,6 +193,7 @@ export const createServer = Effect.fn(function* (): Effect.fn.Return<
logWebSocketEvents,
autoBootstrapProjectFromCwd,
} = serverConfig;
+ const availableEditors = resolveAvailableEditors();
const gitManager = yield* GitManager;
const terminalManager = yield* TerminalManager;
@@ -734,6 +735,7 @@ export const createServer = Effect.fn(function* (): Effect.fn.Return<
keybindingsConfigPath,
keybindings: keybindingsConfig.keybindings,
issues: keybindingsConfig.issues,
+ availableEditors,
};
case WS_METHODS.serverUpsertKeybinding: {
diff --git a/apps/web/src/components/BranchToolbar.logic.test.ts b/apps/web/src/components/BranchToolbar.logic.test.ts
index 31339930d..58d24845a 100644
--- a/apps/web/src/components/BranchToolbar.logic.test.ts
+++ b/apps/web/src/components/BranchToolbar.logic.test.ts
@@ -1,67 +1,10 @@
-import { ThreadId, type GitBranch } from "@t3tools/contracts";
+import type { GitBranch } from "@t3tools/contracts";
import { describe, expect, it } from "vitest";
import {
dedupeRemoteBranchesWithLocalMatches,
deriveLocalBranchNameFromRemoteRef,
- deriveSyncedLocalBranch,
} from "./BranchToolbar.logic";
-const branches: GitBranch[] = [
- {
- name: "main",
- current: true,
- isDefault: true,
- worktreePath: null,
- },
- {
- name: "feature/demo",
- current: false,
- isDefault: false,
- worktreePath: null,
- },
-];
-
-describe("deriveSyncedLocalBranch", () => {
- it("syncs to git current branch in local mode", () => {
- const threadId = ThreadId.makeUnsafe("thread-1");
- const result = deriveSyncedLocalBranch({
- activeThreadId: threadId,
- activeWorktreePath: null,
- envMode: "local",
- activeThreadBranch: "feature/demo",
- queryBranches: branches,
- });
-
- expect(result).toBe("main");
- });
-
- it("does not sync when creating a new worktree", () => {
- const threadId = ThreadId.makeUnsafe("thread-1");
- const result = deriveSyncedLocalBranch({
- activeThreadId: threadId,
- activeWorktreePath: null,
- envMode: "worktree",
- activeThreadBranch: "feature/demo",
- queryBranches: branches,
- });
-
- expect(result).toBeNull();
- });
-
- it("does not sync when thread already targets a worktree path", () => {
- const threadId = ThreadId.makeUnsafe("thread-1");
- const result = deriveSyncedLocalBranch({
- activeThreadId: threadId,
- activeWorktreePath: "/tmp/repo/worktrees/feature-demo",
- envMode: "local",
- activeThreadBranch: "feature/demo",
- queryBranches: branches,
- });
-
- expect(result).toBeNull();
- });
-});
-
describe("deriveLocalBranchNameFromRemoteRef", () => {
it("strips the remote prefix from a remote ref", () => {
expect(deriveLocalBranchNameFromRemoteRef("origin/feature/demo")).toBe("feature/demo");
diff --git a/apps/web/src/components/BranchToolbar.logic.ts b/apps/web/src/components/BranchToolbar.logic.ts
index 7985033b2..030f73532 100644
--- a/apps/web/src/components/BranchToolbar.logic.ts
+++ b/apps/web/src/components/BranchToolbar.logic.ts
@@ -1,12 +1,4 @@
-import type { GitBranch, ThreadId } from "@t3tools/contracts";
-
-interface DeriveSyncedLocalBranchInput {
- activeThreadId: ThreadId | undefined;
- activeWorktreePath: string | null;
- envMode: "local" | "worktree";
- activeThreadBranch: string | null;
- queryBranches: ReadonlyArray<GitBranch> | undefined;
-}
+import type { GitBranch } from "@t3tools/contracts";
export function deriveLocalBranchNameFromRemoteRef(branchName: string): string {
const firstSeparatorIndex = branchName.indexOf("/");
@@ -55,22 +47,3 @@ export function dedupeRemoteBranchesWithLocalMatches(
return !localBranchCandidates.some((candidate) => localBranchNames.has(candidate));
});
}
-
-export function deriveSyncedLocalBranch({
- activeThreadId,
- activeWorktreePath,
- envMode,
- activeThreadBranch,
- queryBranches,
-}: DeriveSyncedLocalBranchInput): string | null {
- if (!activeThreadId || activeWorktreePath || envMode !== "local") {
- return null;
- }
-
- const currentBranch = queryBranches?.find((branch) => branch.current);
- if (!currentBranch || currentBranch.name === activeThreadBranch) {
- return null;
- }
-
- return currentBranch.name;
-}
diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx
index df5f5fd1d..a651adf43 100644
--- a/apps/web/src/components/ChatView.tsx
+++ b/apps/web/src/components/ChatView.tsx
@@ -147,6 +147,7 @@ const IMAGE_ONLY_BOOTSTRAP_PROMPT =
const EMPTY_ACTIVITIES: OrchestrationThreadActivity[] = [];
const EMPTY_KEYBINDINGS: ResolvedKeybindingsConfig = [];
const EMPTY_PROJECT_ENTRIES: ProjectEntry[] = [];
+const EMPTY_AVAILABLE_EDITORS: EditorId[] = [];
const COMPOSER_PATH_QUERY_DEBOUNCE_MS = 120;
const SCRIPT_TERMINAL_COLS = 120;
const SCRIPT_TERMINAL_ROWS = 30;
@@ -869,10 +870,7 @@ export default function ChatView({ threadId }: ChatViewProps) {
);
const effectivePathQuery = pathTriggerQuery.length > 0 ? debouncedPathQuery : "";
const branchesQuery = useQuery(gitBranchesQueryOptions(gitCwd));
- const keybindingsQuery = useQuery({
- ...serverConfigQueryOptions(),
- select: (config) => config.keybindings,
- });
+ const serverConfigQuery = useQuery(serverConfigQueryOptions());
const workspaceEntriesQuery = useQuery(
projectSearchEntriesQueryOptions({
cwd: gitCwd,
@@ -944,7 +942,8 @@ export default function ChatView({ threadId }: ChatViewProps) {
() => new Set(nonPersistedComposerImageIds),
[nonPersistedComposerImageIds],
);
- const keybindings = keybindingsQuery.data ?? EMPTY_KEYBINDINGS;
+ const keybindings = serverConfigQuery.data?.keybindings ?? EMPTY_KEYBINDINGS;
+ const availableEditors = serverConfigQuery.data?.availableEditors ?? EMPTY_AVAILABLE_EDITORS;
const activeProjectCwd = activeProject?.cwd ?? null;
const activeThreadWorktreePath = activeThread?.worktreePath ?? null;
const threadTerminalRuntimeEnv = useMemo(() => {
@@ -2486,6 +2485,7 @@ export default function ChatView({ threadId }: ChatViewProps) {
activeProject ? (lastInvokedScriptByProjectId[activeProject.id] ?? null) : null
}
keybindings={keybindings}
+ availableEditors={availableEditors}
diffToggleShortcutLabel={diffPanelShortcutLabel}
gitCwd={gitCwd}
diffOpen={diffOpen}
@@ -2899,6 +2899,7 @@ interface ChatHeaderProps {
activeProjectScripts: ProjectScript[] | undefined;
preferredScriptId: string | null;
keybindings: ResolvedKeybindingsConfig;
+ availableEditors: ReadonlyArray<EditorId>;
diffToggleShortcutLabel: string | null;
gitCwd: string | null;
diffOpen: boolean;
@@ -2915,6 +2916,7 @@ const ChatHeader = memo(function ChatHeader({
activeProjectScripts,
preferredScriptId,
keybindings,
+ availableEditors,
diffToggleShortcutLabel,
gitCwd,
diffOpen,
@@ -2951,7 +2953,11 @@ const ChatHeader = memo(function ChatHeader({
/>
)}
{activeProjectName && (
- <OpenInPicker keybindings={keybindings} activeThreadId={activeThreadId} />
+ <OpenInPicker
+ keybindings={keybindings}
+ availableEditors={availableEditors}
+ activeThreadId={activeThreadId}
+ />
)}
{activeProjectName && <GitActionsControl gitCwd={gitCwd} activeThreadId={activeThreadId} />}
<Tooltip>
@@ -3663,9 +3669,11 @@ const ReasoningEffortPicker = memo(function ReasoningEffortPicker(props: {
const OpenInPicker = memo(function OpenInPicker({
keybindings,
+ availableEditors,
activeThreadId,
}: {
keybindings: ResolvedKeybindingsConfig;
+ availableEditors: ReadonlyArray<EditorId>;
activeThreadId: ThreadId | null;
}) {
const [lastEditor, setLastEditor] = useState<EditorId>(() => {
@@ -3673,28 +3681,45 @@ const OpenInPicker = memo(function OpenInPicker({
return EDITORS.some((e) => e.id === stored) ? (stored as EditorId) : EDITORS[0].id;
});
- const options = [
- {
- label: "Cursor",
- Icon: CursorIcon,
- value: "cursor",
- },
- {
- label: "VS Code",
- Icon: VisualStudioCode,
- value: "vscode",
- },
- {
- label: isMacPlatform(navigator.platform)
- ? "Finder"
- : isWindowsPlatform(navigator.platform)
- ? "Explorer"
- : "Files",
- Icon: FolderClosedIcon,
- value: "file-manager",
- },
- ] satisfies { label: string; Icon: Icon; value: EditorId }[];
- const primaryOption = options.find(({ value }) => value === lastEditor);
+ const allOptions = useMemo<Array<{ label: string; Icon: Icon; value: EditorId }>>(
+ () => [
+ {
+ label: "Cursor",
+ Icon: CursorIcon,
+ value: "cursor",
+ },
+ {
+ label: "VS Code",
+ Icon: VisualStudioCode,
+ value: "vscode",
+ },
+ {
+ label: isMacPlatform(navigator.platform)
+ ? "Finder"
+ : isWindowsPlatform(navigator.platform)
+ ? "Explorer"
+ : "Files",
+ Icon: FolderClosedIcon,
+ value: "file-manager",
+ },
+ ],
+ [],
+ );
+ const options = useMemo(
+ () => allOptions.filter((option) => availableEditors.includes(option.value)),
+ [allOptions, availableEditors],
+ );
+
+ const effectiveEditor = options.some((option) => option.value === lastEditor)
+ ? lastEditor
+ : (options[0]?.value ?? null);
+ const primaryOption = options.find(({ value }) => value === effectiveEditor) ?? null;
+
+ useEffect(() => {
+ if (!effectiveEditor || effectiveEditor === lastEditor) return;
+ localStorage.setItem(LAST_EDITOR_KEY, effectiveEditor);
+ setLastEditor(effectiveEditor);
+ }, [effectiveEditor, lastEditor]);
const activeThread = useStore((store) =>
activeThreadId ? store.threads.find((thread) => thread.id === activeThreadId) : undefined,
@@ -3708,13 +3733,14 @@ const OpenInPicker = memo(function OpenInPicker({
(editorId: EditorId | null) => {
const api = readNativeApi();
if (!api || !activeProject) return;
- const editor = editorId ?? lastEditor;
+ const editor = editorId ?? effectiveEditor;
+ if (!editor) return;
const cwd = activeThread?.worktreePath ?? activeProject.cwd;
void api.shell.openInEditor(cwd, editor);
localStorage.setItem(LAST_EDITOR_KEY, editor);
setLastEditor(editor);
},
- [activeProject, activeThread, lastEditor, setLastEditor],
+ [activeProject, activeThread, effectiveEditor, setLastEditor],
);
const openFavoriteEditorShortcutLabel = useMemo(
@@ -3727,18 +3753,24 @@ const OpenInPicker = memo(function OpenInPicker({
const api = readNativeApi();
if (!isOpenFavoriteEditorShortcut(e, keybindings)) return;
if (!api || !activeProject) return;
+ if (!effectiveEditor) return;
e.preventDefault();
const cwd = activeThread?.worktreePath ?? activeProject.cwd;
- void api.shell.openInEditor(cwd, lastEditor);
+ void api.shell.openInEditor(cwd, effectiveEditor);
};
window.addEventListener("keydown", handler);
return () => window.removeEventListener("keydown", handler);
- }, [activeProject, activeThread, keybindings, lastEditor]);
+ }, [activeProject, activeThread, keybindings, effectiveEditor]);
return (
<Group aria-label="Subscription actions">
- <Button size="xs" variant="outline" onClick={() => openInEditor(lastEditor)}>
+ <Button
+ size="xs"
+ variant="outline"
+ disabled={!effectiveEditor || !activeProject}
+ onClick={() => openInEditor(effectiveEditor)}
+ >
{primaryOption?.Icon && <primaryOption.Icon aria-hidden="true" className="size-3.5" />}
<span className="sr-only @sm/header-actions:not-sr-only @sm/header-actions:ml-0.5">
Open
@@ -3750,11 +3782,12 @@ const OpenInPicker = memo(function OpenInPicker({
<ChevronDownIcon aria-hidden="true" className="size-4" />
</MenuTrigger>
<MenuPopup align="end">
+ {options.length === 0 && <MenuItem disabled>No installed editors found</MenuItem>}
{options.map(({ label, Icon, value }) => (
<MenuItem key={value} onClick={() => openInEditor(value)}>
<Icon aria-hidden="true" className="text-muted-foreground" />
{label}
- {value === lastEditor && openFavoriteEditorShortcutLabel && (
+ {value === effectiveEditor && openFavoriteEditorShortcutLabel && (
<MenuShortcut>{openFavoriteEditorShortcutLabel}</MenuShortcut>
)}
</MenuItem>
diff --git a/apps/web/src/components/Icons.tsx b/apps/web/src/components/Icons.tsx
index 70cc5a1d2..1bac0fddf 100644
--- a/apps/web/src/components/Icons.tsx
+++ b/apps/web/src/components/Icons.tsx
@@ -1,4 +1,4 @@
-import type { SVGProps } from "react";
+import { type SVGProps, useId } from "react";
export type Icon = React.FC<SVGProps<SVGSVGElement>>;
@@ -20,109 +20,102 @@ export const CursorIcon: Icon = (props) => (
</svg>
);
-export const VisualStudioCode: Icon = (props) => (
- <svg {...props} fill="none" viewBox="0 0 100 100">
- <mask
- id="vscode__a"
- width="100"
- height="100"
- x="0"
- y="0"
- maskUnits="userSpaceOnUse"
- >
- <path
- fill="#fff"
- fillRule="evenodd"
- d="M70.912 99.317a6.223 6.223 0 0 0 4.96-.19l20.589-9.907A6.25 6.25 0 0 0 100 83.587V16.413a6.25 6.25 0 0 0-3.54-5.632L75.874.874a6.226 6.226 0 0 0-7.104 1.21L29.355 38.04 12.187 25.01a4.162 4.162 0 0 0-5.318.236l-5.506 5.009a4.168 4.168 0 0 0-.004 6.162L16.247 50 1.36 63.583a4.168 4.168 0 0 0 .004 6.162l5.506 5.01a4.162 4.162 0 0 0 5.318.236l17.168-13.032L68.77 97.917a6.217 6.217 0 0 0 2.143 1.4ZM75.015 27.3 45.11 50l29.906 22.701V27.3Z"
- clipRule="evenodd"
- />
- </mask>
- <g mask="url(#vscode__a)">
- <path
- fill="#0065A9"
- d="M96.461 10.796 75.857.876a6.23 6.23 0 0 0-7.107 1.207l-67.451 61.5a4.167 4.167 0 0 0 .004 6.162l5.51 5.009a4.167 4.167 0 0 0 5.32.236l81.228-61.62c2.725-2.067 6.639-.124 6.639 3.297v-.24a6.25 6.25 0 0 0-3.539-5.63Z"
- />
- <g filter="url(#vscode__b)">
+export const VisualStudioCode: Icon = (props) => {
+ const id = useId();
+ const maskId = `${id}-vscode-a`;
+ const topShadowFilterId = `${id}-vscode-b`;
+ const sideShadowFilterId = `${id}-vscode-c`;
+ const overlayGradientId = `${id}-vscode-d`;
+
+ return (
+ <svg {...props} fill="none" viewBox="0 0 100 100">
+ <mask id={maskId} width="100" height="100" x="0" y="0" maskUnits="userSpaceOnUse">
<path
- fill="#007ACC"
- d="m96.461 89.204-20.604 9.92a6.229 6.229 0 0 1-7.107-1.207l-67.451-61.5a4.167 4.167 0 0 1 .004-6.162l5.51-5.009a4.167 4.167 0 0 1 5.32-.236l81.228 61.62c2.725 2.067 6.639.124 6.639-3.297v.24a6.25 6.25 0 0 1-3.539 5.63Z"
+ fill="#fff"
+ fillRule="evenodd"
+ d="M70.912 99.317a6.223 6.223 0 0 0 4.96-.19l20.589-9.907A6.25 6.25 0 0 0 100 83.587V16.413a6.25 6.25 0 0 0-3.54-5.632L75.874.874a6.226 6.226 0 0 0-7.104 1.21L29.355 38.04 12.187 25.01a4.162 4.162 0 0 0-5.318.236l-5.506 5.009a4.168 4.168 0 0 0-.004 6.162L16.247 50 1.36 63.583a4.168 4.168 0 0 0 .004 6.162l5.506 5.01a4.162 4.162 0 0 0 5.318.236l17.168-13.032L68.77 97.917a6.217 6.217 0 0 0 2.143 1.4ZM75.015 27.3 45.11 50l29.906 22.701V27.3Z"
+ clipRule="evenodd"
/>
- </g>
- <g filter="url(#vscode__c)">
+ </mask>
+ <g mask={`url(#${maskId})`}>
<path
- fill="#1F9CF0"
- d="M75.858 99.126a6.232 6.232 0 0 1-7.108-1.21c2.306 2.307 6.25.674 6.25-2.588V4.672c0-3.262-3.944-4.895-6.25-2.589a6.232 6.232 0 0 1 7.108-1.21l20.6 9.908A6.25 6.25 0 0 1 100 16.413v67.174a6.25 6.25 0 0 1-3.541 5.633l-20.601 9.906Z"
- />
- </g>
- <path
- fill="url(#vscode__d)"
- fillRule="evenodd"
- d="M70.851 99.317a6.224 6.224 0 0 0 4.96-.19L96.4 89.22a6.25 6.25 0 0 0 3.54-5.633V16.413a6.25 6.25 0 0 0-3.54-5.632L75.812.874a6.226 6.226 0 0 0-7.104 1.21L29.294 38.04 12.126 25.01a4.162 4.162 0 0 0-5.317.236l-5.507 5.009a4.168 4.168 0 0 0-.004 6.162L16.186 50 1.298 63.583a4.168 4.168 0 0 0 .004 6.162l5.507 5.009a4.162 4.162 0 0 0 5.317.236L29.294 61.96l39.414 35.958a6.218 6.218 0 0 0 2.143 1.4ZM74.954 27.3 45.048 50l29.906 22.701V27.3Z"
- clipRule="evenodd"
- opacity=".25"
- style={{ mixBlendMode: "overlay" }}
- />
- </g>
- <defs>
- <filter
- id="vscode__b"
- width="116.727"
- height="92.246"
- x="-8.394"
- y="15.829"
- colorInterpolationFilters="sRGB"
- filterUnits="userSpaceOnUse"
- >
- <feFlood floodOpacity="0" result="BackgroundImageFix" />
- <feColorMatrix
- in="SourceAlpha"
- values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
- />
- <feOffset />
- <feGaussianBlur stdDeviation="4.167" />
- <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0" />
- <feBlend
- in2="BackgroundImageFix"
- mode="overlay"
- result="effect1_dropShadow"
+ fill="#0065A9"
+ d="M96.461 10.796 75.857.876a6.23 6.23 0 0 0-7.107 1.207l-67.451 61.5a4.167 4.167 0 0 0 .004 6.162l5.51 5.009a4.167 4.167 0 0 0 5.32.236l81.228-61.62c2.725-2.067 6.639-.124 6.639 3.297v-.24a6.25 6.25 0 0 0-3.539-5.63Z"
/>
- <feBlend in="SourceGraphic" in2="effect1_dropShadow" result="shape" />
- </filter>
- <filter
- id="vscode__c"
- width="47.917"
- height="116.151"
- x="60.417"
- y="-8.076"
- colorInterpolationFilters="sRGB"
- filterUnits="userSpaceOnUse"
- >
- <feFlood floodOpacity="0" result="BackgroundImageFix" />
- <feColorMatrix
- in="SourceAlpha"
- values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
- />
- <feOffset />
- <feGaussianBlur stdDeviation="4.167" />
- <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0" />
- <feBlend
- in2="BackgroundImageFix"
- mode="overlay"
- result="effect1_dropShadow"
+ <g filter={`url(#${topShadowFilterId})`}>
+ <path
+ fill="#007ACC"
+ d="m96.461 89.204-20.604 9.92a6.229 6.229 0 0 1-7.107-1.207l-67.451-61.5a4.167 4.167 0 0 1 .004-6.162l5.51-5.009a4.167 4.167 0 0 1 5.32-.236l81.228 61.62c2.725 2.067 6.639.124 6.639-3.297v.24a6.25 6.25 0 0 1-3.539 5.63Z"
+ />
+ </g>
+ <g filter={`url(#${sideShadowFilterId})`}>
+ <path
+ fill="#1F9CF0"
+ d="M75.858 99.126a6.232 6.232 0 0 1-7.108-1.21c2.306 2.307 6.25.674 6.25-2.588V4.672c0-3.262-3.944-4.895-6.25-2.589a6.232 6.232 0 0 1 7.108-1.21l20.6 9.908A6.25 6.25 0 0 1 100 16.413v67.174a6.25 6.25 0 0 1-3.541 5.633l-20.601 9.906Z"
+ />
+ </g>
+ <path
+ fill={`url(#${overlayGradientId})`}
+ fillRule="evenodd"
+ d="M70.851 99.317a6.224 6.224 0 0 0 4.96-.19L96.4 89.22a6.25 6.25 0 0 0 3.54-5.633V16.413a6.25 6.25 0 0 0-3.54-5.632L75.812.874a6.226 6.226 0 0 0-7.104 1.21L29.294 38.04 12.126 25.01a4.162 4.162 0 0 0-5.317.236l-5.507 5.009a4.168 4.168 0 0 0-.004 6.162L16.186 50 1.298 63.583a4.168 4.168 0 0 0 .004 6.162l5.507 5.009a4.162 4.162 0 0 0 5.317.236L29.294 61.96l39.414 35.958a6.218 6.218 0 0 0 2.143 1.4ZM74.954 27.3 45.048 50l29.906 22.701V27.3Z"
+ clipRule="evenodd"
+ opacity=".25"
+ style={{ mixBlendMode: "overlay" }}
/>
- <feBlend in="SourceGraphic" in2="effect1_dropShadow" result="shape" />
- </filter>
- <linearGradient
- id="vscode__d"
- x1="49.939"
- x2="49.939"
- y1=".258"
- y2="99.742"
- gradientUnits="userSpaceOnUse"
- >
- <stop stopColor="#fff" />
- <stop offset="1" stopColor="#fff" stopOpacity="0" />
- </linearGradient>
- </defs>
- </svg>
-);
+ </g>
+ <defs>
+ <filter
+ id={topShadowFilterId}
+ width="116.727"
+ height="92.246"
+ x="-8.394"
+ y="15.829"
+ colorInterpolationFilters="sRGB"
+ filterUnits="userSpaceOnUse"
+ >
+ <feFlood floodOpacity="0" result="BackgroundImageFix" />
+ <feColorMatrix
+ in="SourceAlpha"
+ values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+ />
+ <feOffset />
+ <feGaussianBlur stdDeviation="4.167" />
+ <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0" />
+ <feBlend in2="BackgroundImageFix" mode="overlay" result="effect1_dropShadow" />
+ <feBlend in="SourceGraphic" in2="effect1_dropShadow" result="shape" />
+ </filter>
+ <filter
+ id={sideShadowFilterId}
+ width="47.917"
+ height="116.151"
+ x="60.417"
+ y="-8.076"
+ colorInterpolationFilters="sRGB"
+ filterUnits="userSpaceOnUse"
+ >
+ <feFlood floodOpacity="0" result="BackgroundImageFix" />
+ <feColorMatrix
+ in="SourceAlpha"
+ values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+ />
+ <feOffset />
+ <feGaussianBlur stdDeviation="4.167" />
+ <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0" />
+ <feBlend in2="BackgroundImageFix" mode="overlay" result="effect1_dropShadow" />
+ <feBlend in="SourceGraphic" in2="effect1_dropShadow" result="shape" />
+ </filter>
+ <linearGradient
+ id={overlayGradientId}
+ x1="49.939"
+ x2="49.939"
+ y1=".258"
+ y2="99.742"
+ gradientUnits="userSpaceOnUse"
+ >
+ <stop stopColor="#fff" />
+ <stop offset="1" stopColor="#fff" stopOpacity="0" />
+ </linearGradient>
+ </defs>
+ </svg>
+ );
+};
diff --git a/packages/contracts/src/server.ts b/packages/contracts/src/server.ts
index 0db1180ab..950e81289 100644
--- a/packages/contracts/src/server.ts
+++ b/packages/contracts/src/server.ts
@@ -1,6 +1,7 @@
import { Schema } from "effect";
import { TrimmedNonEmptyString } from "./baseSchemas";
import { KeybindingRule, ResolvedKeybindingsConfig } from "./keybindings";
+import { EditorId } from "./editor";
export const KeybindingsMalformedConfigIssue = Schema.Struct({
kind: Schema.Literal("keybindings.malformed-config"),
@@ -29,6 +30,7 @@ export const ServerConfig = Schema.Struct({
keybindingsConfigPath: TrimmedNonEmptyString,
keybindings: ResolvedKeybindingsConfig,
issues: ServerConfigIssues,
+ availableEditors: Schema.Array(EditorId),
});
export type ServerConfig = typeof ServerConfig.Type;