Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions apps/server/spawned2.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
started
started
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Debug test files accidentally committed to repository

Medium Severity

apps/server/spawned2.txt (containing "started" output) and apps/server/tmp-test.cmd (a batch file that appends to spawned2.txt) are debug/test artifacts that were accidentally included in the commit. These files are not referenced by any production or test code and appear to be leftovers from manual testing of process spawning.

Additional Locations (1)
Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit 8d257e2. Configure here.

14 changes: 3 additions & 11 deletions apps/server/src/codexAppServerManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ import {
resolveCodexModelForAccount,
type CodexAccountSnapshot,
} from "./provider/codexAccount";
import { buildCodexInitializeParams, killCodexChildProcess } from "./provider/codexAppServer";
import { buildCodexInitializeParams } from "./provider/codexAppServer";
import { killChildProcessTree } from "./process/killTree";

export { buildCodexInitializeParams } from "./provider/codexAppServer";
export { readCodexAccountSnapshot, resolveCodexModelForAccount } from "./provider/codexAccount";
Expand Down Expand Up @@ -312,15 +313,6 @@ function mapCodexRuntimeMode(runtimeMode: RuntimeMode): {
}
}

/**
* On Windows with `shell: true`, `child.kill()` only terminates the `cmd.exe`
* wrapper, leaving the actual command running. Use `taskkill /T` to kill the
* entire process tree instead.
*/
function killChildTree(child: ChildProcessWithoutNullStreams): void {
killCodexChildProcess(child);
}

export function normalizeCodexModelSlug(
model: string | undefined | null,
preferredId?: string,
Expand Down Expand Up @@ -914,7 +906,7 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
context.output.close();

if (!context.child.killed) {
killChildTree(context.child);
killChildProcessTree(context.child);
}

this.updateSession(context, {
Expand Down
14 changes: 6 additions & 8 deletions apps/server/src/git/Layers/GitCore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import {
} from "../remoteRefs.ts";
import { ServerConfig } from "../../config.ts";
import { decodeJsonResult } from "@t3tools/shared/schemaJson";
import { limitChunkToByteLimit } from "../../process/outputBuffer";

const DEFAULT_TIMEOUT_MS = 30_000;
const DEFAULT_MAX_OUTPUT_BYTES = 1_000_000;
Expand Down Expand Up @@ -618,8 +619,8 @@ const collectOutput = Effect.fn("collectOutput")(function* <E>(
if (truncateOutputAtMaxBytes && truncated) {
return;
}
const nextBytes = bytes + chunk.byteLength;
if (!truncateOutputAtMaxBytes && nextBytes > maxOutputBytes) {
const limitedChunk = limitChunkToByteLimit(chunk, bytes, maxOutputBytes);
if (!truncateOutputAtMaxBytes && limitedChunk.overflow) {
return yield* new GitCommandError({
operation: input.operation,
command: quoteGitCommand(input.args),
Expand All @@ -628,12 +629,9 @@ const collectOutput = Effect.fn("collectOutput")(function* <E>(
});
}

const chunkToDecode =
truncateOutputAtMaxBytes && nextBytes > maxOutputBytes
? chunk.subarray(0, Math.max(0, maxOutputBytes - bytes))
: chunk;
bytes += chunkToDecode.byteLength;
truncated = truncateOutputAtMaxBytes && nextBytes > maxOutputBytes;
const chunkToDecode = truncateOutputAtMaxBytes ? limitedChunk.chunk : chunk;
bytes = truncateOutputAtMaxBytes ? limitedChunk.nextBytes : bytes + chunk.byteLength;
truncated = truncateOutputAtMaxBytes && limitedChunk.truncated;

const decoded = decoder.decode(chunkToDecode, { stream: !truncated });
text += decoded;
Expand Down
14 changes: 14 additions & 0 deletions apps/server/src/open.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,20 @@ it.layer(NodeServices.layer)("resolveEditorLaunch", (it) => {
});
}),
);

it.effect("uses explorer with a VS Code protocol target on Windows", () =>
Effect.gen(function* () {
const launch = yield* resolveEditorLaunch(
{ cwd: "C:\\work\\100% real\\file.ts:12:4", editor: "vscode" },
"win32",
{ PATH: "" },
);
assert.deepEqual(launch, {
command: "explorer",
args: ["vscode://file/C:/work/100%25%20real/file.ts:12:4"],
});
}),
);
});

it.layer(NodeServices.layer)("launchDetached", (it) => {
Expand Down
53 changes: 52 additions & 1 deletion apps/server/src/open.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import { spawn } from "node:child_process";
import { accessSync, constants, statSync } from "node:fs";
import { extname, join } from "node:path";
import { pathToFileURL } from "node:url";

import { EDITORS, OpenError, type EditorId } from "@t3tools/contracts";
import { Context, Effect, Layer } from "effect";
Expand All @@ -35,6 +36,11 @@ interface CommandAvailabilityOptions {
}

const TARGET_WITH_POSITION_PATTERN = /^(.*?):(\d+)(?::(\d+))?$/;
const WINDOWS_EDITOR_URI_SCHEMES: Partial<Record<EditorId, string>> = {
vscode: "vscode",
"vscode-insiders": "vscode-insiders",
vscodium: "vscodium",
};

function parseTargetPathAndPosition(target: string): {
path: string;
Expand All @@ -53,6 +59,36 @@ function parseTargetPathAndPosition(target: string): {
};
}

function splitTargetPathAndSuffix(target: string): {
path: string;
suffix: string;
} {
const parsedTarget = parseTargetPathAndPosition(target);
if (!parsedTarget) {
return { path: target, suffix: "" };
}

return {
path: parsedTarget.path,
suffix: parsedTarget.column
? `:${parsedTarget.line}:${parsedTarget.column}`
: `:${parsedTarget.line}`,
};
}

function makeWindowsEditorProtocolTarget(editor: EditorId, target: string): string | undefined {
const scheme = WINDOWS_EDITOR_URI_SCHEMES[editor];
if (!scheme) return undefined;

const { path, suffix } = splitTargetPathAndSuffix(target);
const fileUrl = pathToFileURL(path).href;
const fileTarget = fileUrl.startsWith("file:///")
? fileUrl.slice("file:///".length)
: fileUrl.replace(/^file:\/\//, "");

return `${scheme}://file/${fileTarget}${suffix}`;
}
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Duplicate makeWindowsEditorProtocolTarget across two files

Low Severity

makeWindowsEditorProtocolTarget, WINDOWS_EDITOR_URI_SCHEMES, and their helper functions (splitTargetPathAndSuffix / splitLineColumnSuffix) are independently implemented in both open.ts and DesktopLauncher.ts with near-identical logic. A bug fix in one would need to be mirrored in the other.

Additional Locations (1)
Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit b909b94. Configure here.


function resolveCommandEditorArgs(
editor: (typeof EDITORS)[number],
target: string,
Expand Down Expand Up @@ -268,6 +304,16 @@ export const resolveEditorLaunch = Effect.fn("resolveEditorLaunch")(function* (
return yield* new OpenError({ message: `Unknown editor: ${input.editor}` });
}

if (platform === "win32") {
const protocolTarget = makeWindowsEditorProtocolTarget(input.editor, input.cwd);
if (protocolTarget) {
return {
command: fileManagerCommandForPlatform(platform),
args: [protocolTarget],
};
}
}

if (editorDef.commands) {
const command =
resolveAvailableCommand(editorDef.commands, { platform, env }) ?? editorDef.commands[0];
Expand Down Expand Up @@ -296,7 +342,12 @@ export const launchDetached = (launch: EditorLaunch) =>
child = spawn(launch.command, [...launch.args], {
detached: true,
stdio: "ignore",
shell: process.platform === "win32",
shell:
process.platform === "win32" &&
launch.command.toLowerCase() !== "explorer" &&
!launch.command.toLowerCase().endsWith("\\explorer.exe") &&
!launch.command.toLowerCase().endsWith("/explorer.exe"),
...(process.platform === "win32" ? { windowsHide: true } : {}),
});
} catch (error) {
return resume(
Expand Down
Loading
Loading