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.
Use Effect child process for editor launches (#2659)
cursor[bot]d15909af1560
diff --git a/apps/server/package.json b/apps/server/package.jsonindex c045331dd..304242a1f 100644--- a/apps/server/package.json+++ b/apps/server/package.json@@ -31,8 +31,7 @@"@opencode-ai/sdk": "^1.3.15","@pierre/diffs": "catalog:","effect": "catalog:",- "node-pty": "^1.1.0",- "open": "^10.1.0"+ "node-pty": "^1.1.0"},"devDependencies": {"@effect/language-service": "catalog:",diff --git a/apps/server/src/open.ts b/apps/server/src/open.tsdeleted file mode 100644index 4b2e6ef27..000000000--- a/apps/server/src/open.ts+++ /dev/null@@ -1,241 +0,0 @@-// @effect-diagnostics nodeBuiltinImport:off-/**- * Open - Browser/editor launch service interface.- *- * Owns process launch helpers for opening URLs in a browser and workspace- * paths in a configured editor.- *- * @module Open- */-import { spawn } from "node:child_process";--import { EDITORS, OpenError, type EditorId } from "@t3tools/contracts";-import { isCommandAvailable, type CommandAvailabilityOptions } from "@t3tools/shared/shell";-import * as Context from "effect/Context";-import * as Effect from "effect/Effect";-import * as Layer from "effect/Layer";--// ==============================-// Definitions-// ==============================--export { OpenError };-export { isCommandAvailable } from "@t3tools/shared/shell";--export interface OpenInEditorInput {- readonly cwd: string;- readonly editor: EditorId;-}--interface EditorLaunch {- readonly command: string;- readonly args: ReadonlyArray<string>;-}--const TARGET_WITH_POSITION_PATTERN = /^(.*?):(\d+)(?::(\d+))?$/;--function parseTargetPathAndPosition(target: string): {- path: string;- line: string | undefined;- column: string | undefined;-} | null {- const match = TARGET_WITH_POSITION_PATTERN.exec(target);- if (!match?.[1] || !match[2]) {- return null;- }-- return {- path: match[1],- line: match[2],- column: match[3],- };-}--function resolveCommandEditorArgs(- editor: (typeof EDITORS)[number],- target: string,-): ReadonlyArray<string> {- const parsedTarget = parseTargetPathAndPosition(target);-- switch (editor.launchStyle) {- case "direct-path":- return [target];- case "goto":- return parsedTarget ? ["--goto", target] : [target];- case "line-column": {- if (!parsedTarget) {- return [target];- }-- const { path, line, column } = parsedTarget;- return [...(line ? ["--line", line] : []), ...(column ? ["--column", column] : []), path];- }- }-}--function resolveEditorArgs(- editor: (typeof EDITORS)[number],- target: string,-): ReadonlyArray<string> {- const baseArgs = "baseArgs" in editor ? editor.baseArgs : [];- return [...baseArgs, ...resolveCommandEditorArgs(editor, target)];-}--function resolveAvailableCommand(- commands: ReadonlyArray<string>,- options: CommandAvailabilityOptions = {},-): string | null {- for (const command of commands) {- if (isCommandAvailable(command, options)) {- return command;- }- }- return null;-}--function fileManagerCommandForPlatform(platform: NodeJS.Platform): string {- switch (platform) {- case "darwin":- return "open";- case "win32":- return "explorer";- default:- return "xdg-open";- }-}--export function resolveAvailableEditors(- platform: NodeJS.Platform = process.platform,- env: NodeJS.ProcessEnv = process.env,-): ReadonlyArray<EditorId> {- const available: EditorId[] = [];-- for (const editor of EDITORS) {- if (editor.commands === null) {- const command = fileManagerCommandForPlatform(platform);- if (isCommandAvailable(command, { platform, env })) {- available.push(editor.id);- }- continue;- }-- const command = resolveAvailableCommand(editor.commands, { platform, env });- if (command !== null) {- available.push(editor.id);- }- }-- return available;-}--/**- * OpenShape - Service API for browser and editor launch actions.- */-export interface OpenShape {- /**- * Open a URL target in the default browser.- */- readonly openBrowser: (target: string) => Effect.Effect<void, OpenError>;-- /**- * Open a workspace path in a selected editor integration.- *- * Launches the editor as a detached process so server startup is not blocked.- */- readonly openInEditor: (input: OpenInEditorInput) => Effect.Effect<void, OpenError>;-}--/**- * Open - Service tag for browser/editor launch operations.- */-export class Open extends Context.Service<Open, OpenShape>()("t3/open") {}--// ==============================-// Implementations-// ==============================--export const resolveEditorLaunch = Effect.fn("resolveEditorLaunch")(function* (- input: OpenInEditorInput,- platform: NodeJS.Platform = process.platform,- env: NodeJS.ProcessEnv = process.env,-): Effect.fn.Return<EditorLaunch, OpenError> {- yield* Effect.annotateCurrentSpan({- "open.editor": input.editor,- "open.cwd": input.cwd,- "open.platform": platform,- });- const editorDef = EDITORS.find((editor) => editor.id === input.editor);- if (!editorDef) {- return yield* new OpenError({ message: `Unknown editor: ${input.editor}` });- }-- if (editorDef.commands) {- const command =- resolveAvailableCommand(editorDef.commands, { platform, env }) ?? editorDef.commands[0];- return {- command,- args: resolveEditorArgs(editorDef, input.cwd),- };- }-- if (editorDef.id !== "file-manager") {- return yield* new OpenError({ message: `Unsupported editor: ${input.editor}` });- }-- return { command: fileManagerCommandForPlatform(platform), args: [input.cwd] };-});--export const launchDetached = (launch: EditorLaunch) =>- Effect.gen(function* () {- if (!isCommandAvailable(launch.command)) {- return yield* new OpenError({ message: `Editor command not found: ${launch.command}` });- }-- yield* Effect.callback<void, OpenError>((resume) => {- let child;- try {- const isWin32 = process.platform === "win32";- child = spawn(- launch.command,- isWin32 ? launch.args.map((a) => `"${a}"`) : [...launch.args],- {- detached: true,- stdio: "ignore",- shell: isWin32,- },- );- } catch (error) {- return resume(- Effect.fail(new OpenError({ message: "failed to spawn detached process", cause: error })),- );- }-- const handleSpawn = () => {- child.unref();- resume(Effect.void);- };-- child.once("spawn", handleSpawn);- child.once("error", (cause) =>- resume(Effect.fail(new OpenError({ message: "failed to spawn detached process", cause }))),- );- });- });--const make = Effect.gen(function* () {- const open = yield* Effect.tryPromise({- try: () => import("open"),- catch: (cause) => new OpenError({ message: "failed to load browser opener", cause }),- });-- return {- openBrowser: (target) =>- Effect.tryPromise({- try: () => open.default(target),- catch: (cause) => new OpenError({ message: "Browser auto-open failed", cause }),- }),- openInEditor: (input) => Effect.flatMap(resolveEditorLaunch(input), launchDetached),- } satisfies OpenShape;-});--export const OpenLive = Layer.effect(Open, make);diff --git a/apps/server/src/open.test.ts b/apps/server/src/process/externalLauncher.test.tssimilarity index 68%rename from apps/server/src/open.test.tsrename to apps/server/src/process/externalLauncher.test.tsindex f600a0502..151600c47 100644--- a/apps/server/src/open.test.ts+++ b/apps/server/src/process/externalLauncher.test.ts@@ -2,16 +2,52 @@ import * as NodeServices from "@effect/platform-node/NodeServices";import { assert, it } from "@effect/vitest";import { assertSuccess } from "@effect/vitest/utils";import * as Effect from "effect/Effect";+import * as Encoding from "effect/Encoding";import * as FileSystem from "effect/FileSystem";+import * as Layer from "effect/Layer";import * as Path from "effect/Path";import * as Random from "effect/Random";+import * as Sink from "effect/Sink";+import * as Stream from "effect/Stream";+import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";import {isCommandAvailable,- launchDetached,+ launchBrowser,+ launchEditorProcess,resolveAvailableEditors,+ resolveBrowserLaunch,resolveEditorLaunch,-} from "./open.ts";+} from "./externalLauncher.ts";++function encodeUtf16LeBase64(input: string): string {+ const bytes = new Uint8Array(input.length * 2);+ for (let index = 0; index < input.length; index += 1) {+ const code = input.charCodeAt(index);+ bytes[index * 2] = code & 0xff;+ bytes[index * 2 + 1] = code >>> 8;+ }+ return Encoding.encodeBase64(bytes);+}++function makeMockDetachedHandle(onUnref: () => void = () => undefined) {+ return ChildProcessSpawner.makeHandle({+ pid: ChildProcessSpawner.ProcessId(1),+ exitCode: Effect.succeed(ChildProcessSpawner.ExitCode(0)),+ isRunning: Effect.succeed(true),+ kill: () => Effect.void,+ unref: Effect.sync(() => {+ onUnref();+ return Effect.void;+ }),+ stdin: Sink.drain,+ stdout: Stream.empty,+ stderr: Stream.empty,+ all: Stream.empty,+ getInputFd: () => Sink.drain,+ getOutputFd: () => Stream.empty,+ });+}it.layer(NodeServices.layer)("resolveEditorLaunch", (it) => {it.effect("returns commands for command-based editors", () =>@@ -216,70 +252,70 @@ it.layer(NodeServices.layer)("resolveEditorLaunch", (it) => {});const lineAndColumn = yield* resolveEditorLaunch(- { cwd: "/tmp/workspace/src/open.ts:71:5", editor: "cursor" },+ { cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "cursor" },"darwin",{ PATH: "" },);assert.deepEqual(lineAndColumn, {command: "cursor",- args: ["--goto", "/tmp/workspace/src/open.ts:71:5"],+ args: ["--goto", "/tmp/workspace/src/process/externalLauncher.ts:71:5"],});const traeLineAndColumn = yield* resolveEditorLaunch(- { cwd: "/tmp/workspace/src/open.ts:71:5", editor: "trae" },+ { cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "trae" },"darwin",);assert.deepEqual(traeLineAndColumn, {command: "trae",- args: ["--goto", "/tmp/workspace/src/open.ts:71:5"],+ args: ["--goto", "/tmp/workspace/src/process/externalLauncher.ts:71:5"],});const kiroLineAndColumn = yield* resolveEditorLaunch(- { cwd: "/tmp/workspace/src/open.ts:71:5", editor: "kiro" },+ { cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "kiro" },"darwin",{ PATH: "" },);assert.deepEqual(kiroLineAndColumn, {command: "kiro",- args: ["ide", "--goto", "/tmp/workspace/src/open.ts:71:5"],+ args: ["ide", "--goto", "/tmp/workspace/src/process/externalLauncher.ts:71:5"],});const vscodeLineAndColumn = yield* resolveEditorLaunch(- { cwd: "/tmp/workspace/src/open.ts:71:5", editor: "vscode" },+ { cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "vscode" },"darwin",{ PATH: "" },);assert.deepEqual(vscodeLineAndColumn, {command: "code",- args: ["--goto", "/tmp/workspace/src/open.ts:71:5"],+ args: ["--goto", "/tmp/workspace/src/process/externalLauncher.ts:71:5"],});const vscodeInsidersLineAndColumn = yield* resolveEditorLaunch(- { cwd: "/tmp/workspace/src/open.ts:71:5", editor: "vscode-insiders" },+ { cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "vscode-insiders" },"darwin",);assert.deepEqual(vscodeInsidersLineAndColumn, {command: "code-insiders",- args: ["--goto", "/tmp/workspace/src/open.ts:71:5"],+ args: ["--goto", "/tmp/workspace/src/process/externalLauncher.ts:71:5"],});const vscodiumLineAndColumn = yield* resolveEditorLaunch(- { cwd: "/tmp/workspace/src/open.ts:71:5", editor: "vscodium" },+ { cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "vscodium" },"darwin",);assert.deepEqual(vscodiumLineAndColumn, {command: "codium",- args: ["--goto", "/tmp/workspace/src/open.ts:71:5"],+ args: ["--goto", "/tmp/workspace/src/process/externalLauncher.ts:71:5"],});const zedLineAndColumn = yield* resolveEditorLaunch(- { cwd: "/tmp/workspace/src/open.ts:71:5", editor: "zed" },+ { cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "zed" },"darwin",{ PATH: "" },);assert.deepEqual(zedLineAndColumn, {command: "zed",- args: ["/tmp/workspace/src/open.ts:71:5"],+ args: ["/tmp/workspace/src/process/externalLauncher.ts:71:5"],});const zedLineOnly = yield* resolveEditorLaunch(@@ -302,102 +338,102 @@ it.layer(NodeServices.layer)("resolveEditorLaunch", (it) => {});const ideaLineAndColumn = yield* resolveEditorLaunch(- { cwd: "/tmp/workspace/src/open.ts:71:5", editor: "idea" },+ { cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "idea" },"darwin",);assert.deepEqual(ideaLineAndColumn, {command: "idea",- args: ["--line", "71", "--column", "5", "/tmp/workspace/src/open.ts"],+ args: ["--line", "71", "--column", "5", "/tmp/workspace/src/process/externalLauncher.ts"],});const aquaLineAndColumn = yield* resolveEditorLaunch(- { cwd: "/tmp/workspace/src/open.ts:71:5", editor: "aqua" },+ { cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "aqua" },"darwin",);assert.deepEqual(aquaLineAndColumn, {command: "aqua",- args: ["--line", "71", "--column", "5", "/tmp/workspace/src/open.ts"],+ args: ["--line", "71", "--column", "5", "/tmp/workspace/src/process/externalLauncher.ts"],});const clionLineAndColumn = yield* resolveEditorLaunch(- { cwd: "/tmp/workspace/src/open.ts:71:5", editor: "clion" },+ { cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "clion" },"darwin",);assert.deepEqual(clionLineAndColumn, {command: "clion",- args: ["--line", "71", "--column", "5", "/tmp/workspace/src/open.ts"],+ args: ["--line", "71", "--column", "5", "/tmp/workspace/src/process/externalLauncher.ts"],});const datagripLineAndColumn = yield* resolveEditorLaunch(- { cwd: "/tmp/workspace/src/open.ts:71:5", editor: "datagrip" },+ { cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "datagrip" },"darwin",);assert.deepEqual(datagripLineAndColumn, {command: "datagrip",- args: ["--line", "71", "--column", "5", "/tmp/workspace/src/open.ts"],+ args: ["--line", "71", "--column", "5", "/tmp/workspace/src/process/externalLauncher.ts"],});const dataspellLineAndColumn = yield* resolveEditorLaunch(- { cwd: "/tmp/workspace/src/open.ts:71:5", editor: "dataspell" },+ { cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "dataspell" },"darwin",);assert.deepEqual(dataspellLineAndColumn, {command: "dataspell",- args: ["--line", "71", "--column", "5", "/tmp/workspace/src/open.ts"],+ args: ["--line", "71", "--column", "5", "/tmp/workspace/src/process/externalLauncher.ts"],});const golandLineAndColumn = yield* resolveEditorLaunch(- { cwd: "/tmp/workspace/src/open.ts:71:5", editor: "goland" },+ { cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "goland" },"darwin",);assert.deepEqual(golandLineAndColumn, {command: "goland",- args: ["--line", "71", "--column", "5", "/tmp/workspace/src/open.ts"],+ args: ["--line", "71", "--column", "5", "/tmp/workspace/src/process/externalLauncher.ts"],});const phpstormLineAndColumn = yield* resolveEditorLaunch(- { cwd: "/tmp/workspace/src/open.ts:71:5", editor: "phpstorm" },+ { cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "phpstorm" },"darwin",);assert.deepEqual(phpstormLineAndColumn, {command: "phpstorm",- args: ["--line", "71", "--column", "5", "/tmp/workspace/src/open.ts"],+ args: ["--line", "71", "--column", "5", "/tmp/workspace/src/process/externalLauncher.ts"],});const pycharmLineAndColumn = yield* resolveEditorLaunch(- { cwd: "/tmp/workspace/src/open.ts:71:5", editor: "pycharm" },+ { cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "pycharm" },"darwin",);assert.deepEqual(pycharmLineAndColumn, {command: "pycharm",- args: ["--line", "71", "--column", "5", "/tmp/workspace/src/open.ts"],+ args: ["--line", "71", "--column", "5", "/tmp/workspace/src/process/externalLauncher.ts"],});const riderLineAndColumn = yield* resolveEditorLaunch(- { cwd: "/tmp/workspace/src/open.ts:71:5", editor: "rider" },+ { cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "rider" },"darwin",);assert.deepEqual(riderLineAndColumn, {command: "rider",- args: ["--line", "71", "--column", "5", "/tmp/workspace/src/open.ts"],+ args: ["--line", "71", "--column", "5", "/tmp/workspace/src/process/externalLauncher.ts"],});const rubymineLineAndColumn = yield* resolveEditorLaunch(- { cwd: "/tmp/workspace/src/open.ts:71:5", editor: "rubymine" },+ { cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "rubymine" },"darwin",);assert.deepEqual(rubymineLineAndColumn, {command: "rubymine",- args: ["--line", "71", "--column", "5", "/tmp/workspace/src/open.ts"],+ args: ["--line", "71", "--column", "5", "/tmp/workspace/src/process/externalLauncher.ts"],});const rustroverLineAndColumn = yield* resolveEditorLaunch(- { cwd: "/tmp/workspace/src/open.ts:71:5", editor: "rustrover" },+ { cwd: "/tmp/workspace/src/process/externalLauncher.ts:71:5", editor: "rustrover" },"darwin",);assert.deepEqual(rustroverLineAndColumn, {command: "rustrover",- args: ["--line", "71", "--column", "5", "/tmp/workspace/src/open.ts"],+ args: ["--line", "71", "--column", "5", "/tmp/workspace/src/process/externalLauncher.ts"],});const webstormLineOnly = yield* resolveEditorLaunch(@@ -415,7 +451,7 @@ it.layer(NodeServices.layer)("resolveEditorLaunch", (it) => {Effect.gen(function* () {const fs = yield* FileSystem.FileSystem;const path = yield* Path.Path;- const dir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-open-test-" });+ const dir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-external-launcher-test-" });yield* fs.writeFileString(path.join(dir, "zeditor"), "#!/bin/sh\nexit 0\n");yield* fs.chmod(path.join(dir, "zeditor"), 0o755);@@ -477,23 +513,147 @@ it.layer(NodeServices.layer)("resolveEditorLaunch", (it) => {);});-it.layer(NodeServices.layer)("launchDetached", (it) => {- it.effect("resolves when command can be spawned", () =>+it("resolveBrowserLaunch maps default browser launchers by platform", () => {+ const target = "https://example.com/some path?name=o'hara";++ assert.deepEqual(resolveBrowserLaunch(target, "darwin").command, "open");+ assert.deepEqual(resolveBrowserLaunch(target, "darwin").args, [target]);+ assert.deepEqual(resolveBrowserLaunch(target, "darwin").options, {+ detached: true,+ stdin: "ignore",+ stdout: "ignore",+ stderr: "ignore",+ });++ assert.deepEqual(resolveBrowserLaunch(target, "linux", {}).command, "xdg-open");+ assert.deepEqual(resolveBrowserLaunch(target, "linux", {}).args, [target]);++ const windows = resolveBrowserLaunch(target, "win32", {+ SYSTEMROOT: "C:\\Windows",+ });+ assert.equal(windows.command, "C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe");+ assert.deepEqual(windows.args, [+ "-NoProfile",+ "-NonInteractive",+ "-ExecutionPolicy",+ "Bypass",+ "-EncodedCommand",+ encodeUtf16LeBase64(+ "$ProgressPreference = 'SilentlyContinue'; Start 'https://example.com/some path?name=o''hara'",+ ),+ ]);+ assert.deepEqual(windows.options, {+ detached: true,+ shell: false,+ stdin: "ignore",+ stdout: "ignore",+ stderr: "ignore",+ });+});++it("resolveBrowserLaunch opens through Windows from WSL when not remote", () => {+ const launch = resolveBrowserLaunch("https://example.com", "linux", {+ WSL_DISTRO_NAME: "Ubuntu",+ });+ assert.equal(launch.command, "/mnt/c/Windows/System32/WindowsPowerShell/v1.0/powershell.exe");+ assert.equal(launch.options.detached, true);+});++it("resolveBrowserLaunch keeps xdg-open for WSL over SSH", () => {+ const launch = resolveBrowserLaunch("https://example.com", "linux", {+ WSL_DISTRO_NAME: "Ubuntu",+ SSH_CONNECTION: "client server",+ });+ assert.equal(launch.command, "xdg-open");+});++it.layer(NodeServices.layer)("launchBrowser", (it) => {+ it.effect("spawns through the ChildProcessSpawner service and unrefs the handle", () =>+ Effect.gen(function* () {+ let spawnedCommand: ChildProcess.StandardCommand | undefined;+ let didUnref = false;++ const spawnerLayer = Layer.mock(ChildProcessSpawner.ChildProcessSpawner, {+ spawn: (command) =>+ Effect.sync(() => {+ assert.equal(ChildProcess.isStandardCommand(command), true);+ if (!ChildProcess.isStandardCommand(command)) {+ throw new Error("Expected a standard command");+ }+ spawnedCommand = command;+ return makeMockDetachedHandle(() => {+ didUnref = true;+ });+ }),+ });++ const result = yield* launchBrowser("https://example.com").pipe(+ Effect.provide(spawnerLayer),+ Effect.result,+ );++ assertSuccess(result, undefined);+ assert.ok(spawnedCommand);+ const expectedLaunch = resolveBrowserLaunch("https://example.com");+ assert.equal(spawnedCommand.command, expectedLaunch.command);+ assert.deepEqual(spawnedCommand.args, expectedLaunch.args);+ assert.deepEqual(spawnedCommand.options, expectedLaunch.options);+ assert.equal(didUnref, true);+ }),+ );+});++it.layer(NodeServices.layer)("launchEditorProcess", (it) => {+ it.effect("spawns through the ChildProcessSpawner service and unrefs the handle", () =>Effect.gen(function* () {- const result = yield* launchDetached({+ let spawnedCommand: ChildProcess.StandardCommand | undefined;+ let didUnref = false;+ const expectedArgs = ["-e", "process.exit(0)"];++ const spawnerLayer = Layer.mock(ChildProcessSpawner.ChildProcessSpawner, {+ spawn: (command) =>+ Effect.sync(() => {+ assert.equal(ChildProcess.isStandardCommand(command), true);+ if (!ChildProcess.isStandardCommand(command)) {+ throw new Error("Expected a standard command");+ }+ spawnedCommand = command;+ return makeMockDetachedHandle(() => {+ didUnref = true;+ });+ }),+ });++ const result = yield* launchEditorProcess({command: process.execPath,- args: ["-e", "process.exit(0)"],- }).pipe(Effect.result);+ args: expectedArgs,+ }).pipe(Effect.provide(spawnerLayer), Effect.result);+assertSuccess(result, undefined);+ assert.ok(spawnedCommand);+ assert.equal(spawnedCommand.command, process.execPath);+ assert.deepEqual(+ spawnedCommand.args,+ process.platform === "win32" ? expectedArgs.map((arg) => `"${arg}"`) : expectedArgs,+ );+ assert.deepEqual(spawnedCommand.options, {+ detached: true,+ shell: process.platform === "win32",+ stdin: "ignore",+ stdout: "ignore",+ stderr: "ignore",+ });+ assert.equal(didUnref, true);}),);it.effect("rejects when command does not exist", () =>Effect.gen(function* () {- const result = yield* launchDetached({+ const spawnerLayer = Layer.mock(ChildProcessSpawner.ChildProcessSpawner, {});+ const result = yield* launchEditorProcess({command: `t3code-no-such-command-${yield* Random.nextUUIDv4}`,args: [],- }).pipe(Effect.result);+ }).pipe(Effect.provide(spawnerLayer), Effect.result);assert.equal(result._tag, "Failure");}),);@@ -504,7 +664,7 @@ it.layer(NodeServices.layer)("isCommandAvailable", (it) => {Effect.gen(function* () {const fs = yield* FileSystem.FileSystem;const path = yield* Path.Path;- const dir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-open-test-" });+ const dir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-external-launcher-test-" });yield* fs.writeFileString(path.join(dir, "code.CMD"), "@echo off\r\n");const env = {PATH: dir,@@ -526,7 +686,7 @@ it.layer(NodeServices.layer)("isCommandAvailable", (it) => {Effect.gen(function* () {const fs = yield* FileSystem.FileSystem;const path = yield* Path.Path;- const dir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-open-test-" });+ const dir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-external-launcher-test-" });yield* fs.writeFileString(path.join(dir, "npm"), "echo nope\r\n");const env = {PATH: dir,@@ -540,7 +700,7 @@ it.layer(NodeServices.layer)("isCommandAvailable", (it) => {Effect.gen(function* () {const fs = yield* FileSystem.FileSystem;const path = yield* Path.Path;- const dir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-open-test-" });+ const dir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-external-launcher-test-" });yield* fs.writeFileString(path.join(dir, "my.tool.CMD"), "@echo off\r\n");const env = {PATH: dir,@@ -554,8 +714,8 @@ it.layer(NodeServices.layer)("isCommandAvailable", (it) => {Effect.gen(function* () {const fs = yield* FileSystem.FileSystem;const path = yield* Path.Path;- const firstDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-open-test-" });- const secondDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-open-test-" });+ const firstDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-external-launcher-test-" });+ const secondDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-external-launcher-test-" });yield* fs.writeFileString(path.join(firstDir, "code.CMD"), "@echo off\r\n");yield* fs.writeFileString(path.join(secondDir, "code.CMD"), "MZ");const env = {diff --git a/apps/server/src/process/externalLauncher.ts b/apps/server/src/process/externalLauncher.tsnew file mode 100644index 000000000..cbfee1d70--- /dev/null+++ b/apps/server/src/process/externalLauncher.ts@@ -0,0 +1,364 @@+/**+ * ExternalLauncher - external application launch service interface.+ *+ * Owns process launch helpers for browser URLs and workspace paths+ * in configured editor integrations.+ *+ * @module ExternalLauncher+ */+import {+ EDITORS,+ ExternalLauncherError,+ type EditorId,+ type LaunchEditorInput,+} from "@t3tools/contracts";+import { isCommandAvailable, type CommandAvailabilityOptions } from "@t3tools/shared/shell";+import * as Context from "effect/Context";+import * as Effect from "effect/Effect";+import * as Encoding from "effect/Encoding";+import * as Layer from "effect/Layer";+import * as Option from "effect/Option";+import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";++// ==============================+// Definitions+// ==============================++export { ExternalLauncherError };+export type { LaunchEditorInput };+export { isCommandAvailable } from "@t3tools/shared/shell";++interface EditorLaunch {+ readonly command: string;+ readonly args: ReadonlyArray<string>;+}++interface ProcessLaunch {+ readonly command: string;+ readonly args: ReadonlyArray<string>;+ readonly options: ChildProcess.CommandOptions;+}++interface TargetPathAndPosition {+ readonly path: string;+ readonly line: string;+ readonly column: Option.Option<string>;+}++const TARGET_WITH_POSITION_PATTERN = /^(.*?):(\d+)(?::(\d+))?$/;+const POWERSHELL_ARGUMENTS_PREFIX = [+ "-NoProfile",+ "-NonInteractive",+ "-ExecutionPolicy",+ "Bypass",+ "-EncodedCommand",+] as const;++const DETACHED_IGNORE_STDIO_OPTIONS = {+ detached: true,+ stdin: "ignore",+ stdout: "ignore",+ stderr: "ignore",+} as const satisfies ChildProcess.CommandOptions;++function parseTargetPathAndPosition(target: string): Option.Option<TargetPathAndPosition> {+ const match = TARGET_WITH_POSITION_PATTERN.exec(target);+ if (!match?.[1] || !match[2]) {+ return Option.none();+ }++ return Option.some({+ path: match[1],+ line: match[2],+ column: Option.fromUndefinedOr(match[3]),+ });+}++function resolveCommandEditorArgs(+ editor: (typeof EDITORS)[number],+ target: string,+): ReadonlyArray<string> {+ const parsedTarget = parseTargetPathAndPosition(target);++ switch (editor.launchStyle) {+ case "direct-path":+ return [target];+ case "goto":+ return Option.isSome(parsedTarget) ? ["--goto", target] : [target];+ case "line-column":+ return Option.match(parsedTarget, {+ onNone: () => [target],+ onSome: ({ path, line, column }) => [+ "--line",+ line,+ ...Option.match(column, {+ onNone: () => [],+ onSome: (value) => ["--column", value],+ }),+ path,+ ],+ });+ }+}++function resolveEditorArgs(+ editor: (typeof EDITORS)[number],+ target: string,+): ReadonlyArray<string> {+ const baseArgs = "baseArgs" in editor ? editor.baseArgs : [];+ return [...baseArgs, ...resolveCommandEditorArgs(editor, target)];+}++function resolveAvailableCommand(+ commands: ReadonlyArray<string>,+ options: CommandAvailabilityOptions = {},+): Option.Option<string> {+ for (const command of commands) {+ if (isCommandAvailable(command, options)) {+ return Option.some(command);+ }+ }+ return Option.none();+}++function encodeUtf16LeBase64(input: string): string {+ const bytes = new Uint8Array(input.length * 2);+ for (let index = 0; index < input.length; index += 1) {+ const code = input.charCodeAt(index);+ bytes[index * 2] = code & 0xff;+ bytes[index * 2 + 1] = code >>> 8;+ }+ return Encoding.encodeBase64(bytes);+}++function escapePowerShellStringLiteral(input: string): string {+ return `'${input.replaceAll("'", "''")}'`;+}++function resolvePowerShellPath(env: NodeJS.ProcessEnv = process.env): string {+ return `${env.SYSTEMROOT || env.windir || String.raw`C:\Windows`}\\System32\\WindowsPowerShell\\v1.0\\powershell.exe`;+}++function resolveWslPowerShellPath(): string {+ return "/mnt/c/Windows/System32/WindowsPowerShell/v1.0/powershell.exe";+}++function shouldUseWindowsBrowserFromWsl(+ platform: NodeJS.Platform,+ env: NodeJS.ProcessEnv = process.env,+): boolean {+ return (+ platform === "linux" &&+ (env.WSL_DISTRO_NAME !== undefined || env.WSL_INTEROP !== undefined) &&+ env.SSH_CONNECTION === undefined &&+ env.SSH_TTY === undefined &&+ env.container === undefined+ );+}++function resolveWindowsBrowserLaunch(target: string, command: string): ProcessLaunch {+ const encodedCommand = encodeUtf16LeBase64(+ `$ProgressPreference = 'SilentlyContinue'; Start ${escapePowerShellStringLiteral(target)}`,+ );+ return {+ command,+ args: [...POWERSHELL_ARGUMENTS_PREFIX, encodedCommand],+ options: {+ detached: true,+ shell: false,+ stdin: "ignore",+ stdout: "ignore",+ stderr: "ignore",+ },+ };+}++function fileManagerCommandForPlatform(platform: NodeJS.Platform): string {+ switch (platform) {+ case "darwin":+ return "open";+ case "win32":+ return "explorer";+ default:+ return "xdg-open";+ }+}++export function resolveBrowserLaunch(+ target: string,+ platform: NodeJS.Platform = process.platform,+ env: NodeJS.ProcessEnv = process.env,+): ProcessLaunch {+ if (platform === "darwin") {+ return {+ command: "open",+ args: [target],+ options: DETACHED_IGNORE_STDIO_OPTIONS,+ };+ }++ if (platform === "win32") {+ return resolveWindowsBrowserLaunch(target, resolvePowerShellPath(env));+ }++ if (shouldUseWindowsBrowserFromWsl(platform, env)) {+ return resolveWindowsBrowserLaunch(target, resolveWslPowerShellPath());+ }++ return {+ command: "xdg-open",+ args: [target],+ options: DETACHED_IGNORE_STDIO_OPTIONS,+ };+}++export function resolveAvailableEditors(+ platform: NodeJS.Platform = process.platform,+ env: NodeJS.ProcessEnv = process.env,+): ReadonlyArray<EditorId> {+ const available: EditorId[] = [];++ for (const editor of EDITORS) {+ if (editor.commands === null) {+ const command = fileManagerCommandForPlatform(platform);+ if (isCommandAvailable(command, { platform, env })) {+ available.push(editor.id);+ }+ continue;+ }++ const command = resolveAvailableCommand(editor.commands, { platform, env });+ if (Option.isSome(command)) {+ available.push(editor.id);+ }+ }++ return available;+}++/**+ * ExternalLauncherShape - Service API for browser and editor launch actions.+ */+export interface ExternalLauncherShape {+ /**+ * Launch a URL target in the default browser.+ */+ readonly launchBrowser: (target: string) => Effect.Effect<void, ExternalLauncherError>;++ /**+ * Launch a workspace path in a selected editor integration.+ *+ * Launches the editor as a detached process so server startup is not blocked.+ */+ readonly launchEditor: (input: LaunchEditorInput) => Effect.Effect<void, ExternalLauncherError>;+}++/**+ * ExternalLauncher - Service tag for browser/editor launch operations.+ */+export class ExternalLauncher extends Context.Service<ExternalLauncher, ExternalLauncherShape>()(+ "t3/process/ExternalLauncher",+) {}++// ==============================+// Implementations+// ==============================++export const resolveEditorLaunch = Effect.fn("resolveEditorLaunch")(function* (+ input: LaunchEditorInput,+ platform: NodeJS.Platform = process.platform,+ env: NodeJS.ProcessEnv = process.env,+): Effect.fn.Return<EditorLaunch, ExternalLauncherError> {+ yield* Effect.annotateCurrentSpan({+ "externalLauncher.editor": input.editor,+ "externalLauncher.cwd": input.cwd,+ "externalLauncher.platform": platform,+ });+ const editorDef = EDITORS.find((editor) => editor.id === input.editor);+ if (!editorDef) {+ return yield* new ExternalLauncherError({ message: `Unknown editor: ${input.editor}` });+ }++ if (editorDef.commands) {+ const command = Option.getOrElse(+ resolveAvailableCommand(editorDef.commands, { platform, env }),+ () => editorDef.commands[0],+ );+ return {+ command,+ args: resolveEditorArgs(editorDef, input.cwd),+ };+ }++ if (editorDef.id !== "file-manager") {+ return yield* new ExternalLauncherError({ message: `Unsupported editor: ${input.editor}` });+ }++ return { command: fileManagerCommandForPlatform(platform), args: [input.cwd] };+});++const launchAndUnref = Effect.fn("externalLauncher.launchAndUnref")(function* (+ launch: ProcessLaunch,+ errorMessage: string,+): Effect.fn.Return<void, ExternalLauncherError, ChildProcessSpawner.ChildProcessSpawner> {+ const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;+ const command = ChildProcess.make(launch.command, launch.args, launch.options);++ yield* spawner.spawn(command).pipe(+ Effect.flatMap((handle) => handle.unref),+ Effect.asVoid,+ Effect.scoped,+ Effect.mapError((cause) => new ExternalLauncherError({ message: errorMessage, cause })),+ );+});++export const launchBrowser = Effect.fn("externalLauncher.launchBrowser")(function* (+ target: string,+): Effect.fn.Return<void, ExternalLauncherError, ChildProcessSpawner.ChildProcessSpawner> {+ return yield* launchAndUnref(resolveBrowserLaunch(target), "Browser auto-open failed");+});++export const launchEditorProcess = Effect.fn("externalLauncher.launchEditorProcess")(function* (+ launch: EditorLaunch,+): Effect.fn.Return<void, ExternalLauncherError, ChildProcessSpawner.ChildProcessSpawner> {+ if (!isCommandAvailable(launch.command)) {+ return yield* new ExternalLauncherError({+ message: `Editor command not found: ${launch.command}`,+ });+ }++ const isWin32 = process.platform === "win32";+ yield* launchAndUnref(+ {+ command: launch.command,+ args: isWin32 ? launch.args.map((arg) => `"${arg}"`) : [...launch.args],+ options: {+ detached: true,+ shell: isWin32,+ stdin: "ignore",+ stdout: "ignore",+ stderr: "ignore",+ },+ },+ "failed to spawn detached process",+ );+});++const make = Effect.gen(function* () {+ const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;++ return {+ launchBrowser: (target) =>+ launchBrowser(target).pipe(+ Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),+ ),+ launchEditor: (input) =>+ Effect.flatMap(resolveEditorLaunch(input), (launch) =>+ launchEditorProcess(launch).pipe(+ Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),+ ),+ ),+ } satisfies ExternalLauncherShape;+});++export const layer = Layer.effect(ExternalLauncher, make);diff --git a/apps/server/src/server.test.ts b/apps/server/src/server.test.tsindex 8394897c4..b08de8922 100644--- a/apps/server/src/server.test.ts+++ b/apps/server/src/server.test.ts@@ -10,7 +10,7 @@ import {GitCommandError,KeybindingRule,MessageId,- OpenError,+ ExternalLauncherError,type OrchestrationThreadShell,TerminalNotRunningError,type OrchestrationCommand,@@ -63,7 +63,7 @@ import {} from "./checkpointing/Services/CheckpointDiffQuery.ts";import { GitManager, type GitManagerShape } from "./git/GitManager.ts";import { Keybindings, type KeybindingsShape } from "./keybindings.ts";-import { Open, type OpenShape } from "./open.ts";+import * as ExternalLauncher from "./process/externalLauncher.ts";import {OrchestrationEngineService,type OrchestrationEngineShape,@@ -319,7 +319,7 @@ const buildAppUnderTest = (options?: {keybindings?: Partial<KeybindingsShape>;providerRegistry?: Partial<ProviderRegistryShape>;serverSettings?: Partial<ServerSettingsShape>;- open?: Partial<OpenShape>;+ externalLauncher?: Partial<ExternalLauncher.ExternalLauncherShape>;vcsDriver?: Partial<VcsDriver.VcsDriverShape>;vcsDriverRegistry?: Partial<VcsDriverRegistry.VcsDriverRegistryShape>;gitVcsDriver?: Partial<GitVcsDriver.GitVcsDriverShape>;@@ -540,8 +540,8 @@ const buildAppUnderTest = (options?: {}),),Layer.provide(- Layer.mock(Open)({- ...options?.layers?.open,+ Layer.mock(ExternalLauncher.ExternalLauncher)({+ ...options?.layers?.externalLauncher,}),),Layer.provide(@@ -2517,8 +2517,8 @@ it.layer(NodeServices.layer)("server router seam", (it) => {let openedInput: { cwd: string; editor: EditorId } | null = null;yield* buildAppUnderTest({layers: {- open: {- openInEditor: (input) =>+ externalLauncher: {+ launchEditor: (input) =>Effect.sync(() => {openedInput = input;}),@@ -2542,11 +2542,13 @@ it.layer(NodeServices.layer)("server router seam", (it) => {it.effect("routes websocket rpc shell.openInEditor errors", () =>Effect.gen(function* () {- const openError = new OpenError({ message: "Editor command not found: cursor" });+ const externalLauncherError = new ExternalLauncherError({+ message: "Editor command not found: cursor",+ });yield* buildAppUnderTest({layers: {- open: {- openInEditor: () => Effect.fail(openError),+ externalLauncher: {+ launchEditor: () => Effect.fail(externalLauncherError),},},});@@ -2561,7 +2563,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {).pipe(Effect.result),);- assertFailure(result, openError);+ assertFailure(result, externalLauncherError);}).pipe(Effect.provide(NodeHttpServer.layerTest)),);diff --git a/apps/server/src/server.ts b/apps/server/src/server.tsindex 813cdae73..73319133b 100644--- a/apps/server/src/server.ts+++ b/apps/server/src/server.ts@@ -13,7 +13,7 @@ import {} from "./http.ts";import { fixPath } from "./os-jank.ts";import { websocketRpcRouteLayer } from "./ws.ts";-import { OpenLive } from "./open.ts";+import * as ExternalLauncher from "./process/externalLauncher.ts";import { layerConfig as SqlitePersistenceLayerLive } from "./persistence/Layers/Sqlite.ts";import { ServerLifecycleEventsLive } from "./serverLifecycleEvents.ts";import { AnalyticsServiceLayerLive } from "./telemetry/Layers/AnalyticsService.ts";@@ -282,7 +282,7 @@ const RuntimeDependenciesLive = RuntimeCoreDependenciesLive.pipe(Layer.provideMerge(ProcessDiagnostics.layer),Layer.provideMerge(TraceDiagnostics.layer),Layer.provideMerge(AnalyticsServiceLayerLive),- Layer.provideMerge(OpenLive),+ Layer.provideMerge(ExternalLauncher.layer),Layer.provideMerge(ServerLifecycleEventsLive),Layer.provide(NetService.layer),);diff --git a/apps/server/src/serverRuntimeStartup.ts b/apps/server/src/serverRuntimeStartup.tsindex 59fde3422..9ec536105 100644--- a/apps/server/src/serverRuntimeStartup.ts+++ b/apps/server/src/serverRuntimeStartup.ts@@ -23,7 +23,7 @@ import * as DateTime from "effect/DateTime";import { ServerConfig } from "./config.ts";import { Keybindings } from "./keybindings.ts";-import { Open } from "./open.ts";+import * as ExternalLauncher from "./process/externalLauncher.ts";import { OrchestrationEngineService } from "./orchestration/Services/OrchestrationEngine.ts";import { ProjectionSnapshotQuery } from "./orchestration/Services/ProjectionSnapshotQuery.ts";import { OrchestrationReactor } from "./orchestration/Services/OrchestrationReactor.ts";@@ -261,9 +261,9 @@ const maybeOpenBrowser = (target: string) =>if (serverConfig.noBrowser) {return;}- const { openBrowser } = yield* Open;+ const externalLauncher = yield* ExternalLauncher.ExternalLauncher;- yield* openBrowser(target).pipe(+ yield* externalLauncher.launchBrowser(target).pipe(Effect.catch(() =>Effect.logInfo("browser auto-open unavailable", {hint: `Open ${target} in your browser.`,diff --git a/apps/server/src/ws.ts b/apps/server/src/ws.tsindex 001c9baff..f87bff7b9 100644--- a/apps/server/src/ws.ts+++ b/apps/server/src/ws.ts@@ -40,7 +40,7 @@ import { RpcSerialization, RpcServer } from "effect/unstable/rpc";import { CheckpointDiffQuery } from "./checkpointing/Services/CheckpointDiffQuery.ts";import { ServerConfig } from "./config.ts";import { Keybindings } from "./keybindings.ts";-import { Open, resolveAvailableEditors } from "./open.ts";+import * as ExternalLauncher from "./process/externalLauncher.ts";import { normalizeDispatchCommand } from "./orchestration/Normalizer.ts";import { OrchestrationEngineService } from "./orchestration/Services/OrchestrationEngine.ts";import { ProjectionSnapshotQuery } from "./orchestration/Services/ProjectionSnapshotQuery.ts";@@ -163,7 +163,7 @@ const makeWsRpcLayer = (currentSessionId: AuthSessionId) =>const orchestrationEngine = yield* OrchestrationEngineService;const checkpointDiffQuery = yield* CheckpointDiffQuery;const keybindings = yield* Keybindings;- const open = yield* Open;+ const externalLauncher = yield* ExternalLauncher.ExternalLauncher;const gitWorkflow = yield* GitWorkflowService;const vcsProvisioning = yield* VcsProvisioningService;const vcsStatusBroadcaster = yield* VcsStatusBroadcaster;@@ -583,7 +583,7 @@ const makeWsRpcLayer = (currentSessionId: AuthSessionId) =>keybindings: keybindingsConfig.keybindings,issues: keybindingsConfig.issues,providers,- availableEditors: resolveAvailableEditors(),+ availableEditors: ExternalLauncher.resolveAvailableEditors(),observability: {logsDirectoryPath: config.logsDir,localTracingEnabled: true,@@ -970,7 +970,7 @@ const makeWsRpcLayer = (currentSessionId: AuthSessionId) =>{ "rpc.aggregate": "workspace" },),[WS_METHODS.shellOpenInEditor]: (input) =>- observeRpcEffect(WS_METHODS.shellOpenInEditor, open.openInEditor(input), {+ observeRpcEffect(WS_METHODS.shellOpenInEditor, externalLauncher.launchEditor(input), {"rpc.aggregate": "workspace",}),[WS_METHODS.filesystemBrowse]: (input) =>diff --git a/bun.lock b/bun.lockindex d9d3baaf8..9f0c7bf49 100644--- a/bun.lock+++ b/bun.lock@@ -17,7 +17,7 @@},"apps/desktop": {"name": "@t3tools/desktop",- "version": "0.0.22",+ "version": "0.0.23","dependencies": {"@effect/platform-node": "catalog:","effect": "catalog:",@@ -52,7 +52,7 @@},"apps/server": {"name": "t3",- "version": "0.0.22",+ "version": "0.0.23","bin": {"t3": "./dist/bin.mjs",},@@ -65,7 +65,6 @@"@pierre/diffs": "catalog:","effect": "catalog:","node-pty": "^1.1.0",- "open": "^10.1.0",},"devDependencies": {"@effect/language-service": "catalog:",@@ -85,7 +84,7 @@},"apps/web": {"name": "@t3tools/web",- "version": "0.0.22",+ "version": "0.0.23","dependencies": {"@base-ui/react": "^1.4.1","@dnd-kit/core": "^6.3.1",@@ -167,7 +166,7 @@},"packages/contracts": {"name": "@t3tools/contracts",- "version": "0.0.22",+ "version": "0.0.23","dependencies": {"effect": "catalog:",},@@ -1038,8 +1037,6 @@"bun-types": ["[email protected]", "", { "dependencies": { "@types/node": "*" } }, "sha512-1KGPpoxQWl9f6wcZh57LvrPIInQMn2TQ7jsgxqpRzg+l0QPOFvJVH7HmvHo/AiPgwXy+/Thf6Ov3EdVn1vOabg=="],- "bundle-name": ["[email protected]", "", { "dependencies": { "run-applescript": "^7.0.0" } }, "sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q=="],-"bytes": ["[email protected]", "", {}, "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="],"cac": ["[email protected]", "", {}, "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ=="],@@ -1126,16 +1123,10 @@"decompress-response": ["[email protected]", "", { "dependencies": { "mimic-response": "^3.1.0" } }, "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ=="],- "default-browser": ["[email protected]", "", { "dependencies": { "bundle-name": "^4.1.0", "default-browser-id": "^5.0.0" } }, "sha512-H9LMLr5zwIbSxrmvikGuI/5KGhZ8E2zH3stkMgM5LpOWDutGM2JZaj460Udnf1a+946zc7YBgrqEWwbk7zHvGw=="],-- "default-browser-id": ["[email protected]", "", {}, "sha512-x1VCxdX4t+8wVfd1so/9w+vQ4vx7lKd2Qp5tDRutErwmR85OgmfX7RlLRMWafRMY7hbEiXIbudNrjOAPa/hL8Q=="],-"defer-to-connect": ["[email protected]", "", {}, "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg=="],"define-data-property": ["[email protected]", "", { "dependencies": { "es-define-property": "^1.0.0", "es-errors": "^1.3.0", "gopd": "^1.0.1" } }, "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A=="],- "define-lazy-prop": ["[email protected]", "", {}, "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg=="],-"define-properties": ["[email protected]", "", { "dependencies": { "define-data-property": "^1.0.1", "has-property-descriptors": "^1.0.0", "object-keys": "^1.1.1" } }, "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg=="],"defu": ["[email protected]", "", {}, "sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg=="],@@ -1664,8 +1655,6 @@"oniguruma-to-es": ["[email protected]", "", { "dependencies": { "oniguruma-parser": "^0.12.1", "regex": "^6.1.0", "regex-recursion": "^6.0.2" } }, "sha512-Zjygswjpsewa0NLTsiizVuMQZbp0MDyM6lIt66OxsF21npUDlzpHi1Mgb/qhQdkb+dWFTzJmFbEWdvZgRho8eQ=="],- "open": ["[email protected]", "", { "dependencies": { "default-browser": "^5.2.1", "define-lazy-prop": "^3.0.0", "is-inside-container": "^1.0.0", "wsl-utils": "^0.1.0" } }, "sha512-YgBpdJHPyQ2UE5x+hlSXcnejzAvD0b22U2OuAP+8OnlJT+PjWPxtgmGqKKc+RgTM63U9gN0YzrYc71R2WT/hTA=="],-"outvariant": ["[email protected]", "", {}, "sha512-+Sl2UErvtsoajRDKCE5/dBz4DIvHXQQnAxtQTF04OJxY0+DyZXSo5P5Bb7XYWOh81syohlYL24hbDwxedPUJCA=="],"oxfmt": ["[email protected]", "", { "dependencies": { "tinypool": "2.1.0" }, "optionalDependencies": { "@oxfmt/binding-android-arm-eabi": "0.40.0", "@oxfmt/binding-android-arm64": "0.40.0", "@oxfmt/binding-darwin-arm64": "0.40.0", "@oxfmt/binding-darwin-x64": "0.40.0", "@oxfmt/binding-freebsd-x64": "0.40.0", "@oxfmt/binding-linux-arm-gnueabihf": "0.40.0", "@oxfmt/binding-linux-arm-musleabihf": "0.40.0", "@oxfmt/binding-linux-arm64-gnu": "0.40.0", "@oxfmt/binding-linux-arm64-musl": "0.40.0", "@oxfmt/binding-linux-ppc64-gnu": "0.40.0", "@oxfmt/binding-linux-riscv64-gnu": "0.40.0", "@oxfmt/binding-linux-riscv64-musl": "0.40.0", "@oxfmt/binding-linux-s390x-gnu": "0.40.0", "@oxfmt/binding-linux-x64-gnu": "0.40.0", "@oxfmt/binding-linux-x64-musl": "0.40.0", "@oxfmt/binding-openharmony-arm64": "0.40.0", "@oxfmt/binding-win32-arm64-msvc": "0.40.0", "@oxfmt/binding-win32-ia32-msvc": "0.40.0", "@oxfmt/binding-win32-x64-msvc": "0.40.0" }, "bin": { "oxfmt": "bin/oxfmt" } }, "sha512-g0C3I7xUj4b4DcagevM9kgH6+pUHytikxUcn3/VUkvzTNaaXBeyZqb7IBsHwojeXm4mTBEC/aBjBTMVUkZwWUQ=="],@@ -1820,8 +1809,6 @@"router": ["[email protected]", "", { "dependencies": { "debug": "^4.4.0", "depd": "^2.0.0", "is-promise": "^4.0.0", "parseurl": "^1.3.3", "path-to-regexp": "^8.0.0" } }, "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ=="],- "run-applescript": ["[email protected]", "", {}, "sha512-DPe5pVFaAsinSaV6QjQ6gdiedWDcRCbUuiQfQa2wmWV7+xC9bGulGI8+TdRmoFkAPaBXk8CrAbnlY2ISniJ47Q=="],-"safer-buffer": ["[email protected]", "", {}, "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="],"sax": ["[email protected]", "", {}, "sha512-21IYA3Q5cQf089Z6tgaUTr7lDAyzoTPx5HRtbhsME8Udispad8dC/+sziTNugOEx54ilvatQ9YCzl4KQLPcRHA=="],@@ -2110,8 +2097,6 @@"ws": ["[email protected]", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-sAt8BhgNbzCtgGbt2OxmpuryO63ZoDk/sqaB/znQm94T4fCEsy/yV+7CdC1kJhOU9lboAEU7R3kquuycDoibVA=="],- "wsl-utils": ["[email protected]", "", { "dependencies": { "is-wsl": "^3.1.0" } }, "sha512-h3Fbisa2nKGPxCpm89Hk33lBLsnaGBvctQopaBSOW/uIs6FTe1ATyAnKFJrzVs9vpGdsTe73WF3V4lIsk4Gacw=="],-"xxhash-wasm": ["[email protected]", "", {}, "sha512-147y/6YNh+tlp6nd/2pWq38i9h6mz/EuQ6njIrmW8D1BS5nCqs0P6DG+m6zTGnNz5I+uhZ0SHxBs9BsPrwcKDA=="],"y18n": ["[email protected]", "", {}, "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="],diff --git a/packages/contracts/src/editor.ts b/packages/contracts/src/editor.tsindex 4bf84d829..c80ef4816 100644--- a/packages/contracts/src/editor.ts+++ b/packages/contracts/src/editor.ts@@ -44,13 +44,16 @@ export const EDITORS = [export const EditorId = Schema.Literals(EDITORS.map((e) => e.id));export type EditorId = typeof EditorId.Type;-export const OpenInEditorInput = Schema.Struct({+export const LaunchEditorInput = Schema.Struct({cwd: TrimmedNonEmptyString,editor: EditorId,});-export type OpenInEditorInput = typeof OpenInEditorInput.Type;+export type LaunchEditorInput = typeof LaunchEditorInput.Type;-export class OpenError extends Schema.TaggedErrorClass<OpenError>()("OpenError", {- message: Schema.String,- cause: Schema.optional(Schema.Defect),-}) {}+export class ExternalLauncherError extends Schema.TaggedErrorClass<ExternalLauncherError>()(+ "ExternalLauncherError",+ {+ message: Schema.String,+ cause: Schema.optional(Schema.Defect),+ },+) {}diff --git a/packages/contracts/src/rpc.ts b/packages/contracts/src/rpc.tsindex 705621b5d..eb0c82beb 100644--- a/packages/contracts/src/rpc.ts+++ b/packages/contracts/src/rpc.ts@@ -2,7 +2,7 @@ import * as Schema from "effect/Schema";import * as Rpc from "effect/unstable/rpc/Rpc";import * as RpcGroup from "effect/unstable/rpc/RpcGroup";-import { OpenError, OpenInEditorInput } from "./editor.ts";+import { ExternalLauncherError, LaunchEditorInput } from "./editor.ts";import { AuthAccessStreamEvent } from "./auth.ts";import {FilesystemBrowseInput,@@ -266,8 +266,8 @@ export const WsProjectsWriteFileRpc = Rpc.make(WS_METHODS.projectsWriteFile, {});export const WsShellOpenInEditorRpc = Rpc.make(WS_METHODS.shellOpenInEditor, {- payload: OpenInEditorInput,- error: OpenError,+ payload: LaunchEditorInput,+ error: ExternalLauncherError,});export const WsFilesystemBrowseRpc = Rpc.make(WS_METHODS.filesystemBrowse, {