Closed
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 numberDiff line numberDiff 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 CursorFix 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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;
Comment thread
cursor[bot] marked this conversation as resolved.
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 CursorFix in Web

Reviewed by Cursor Bugbot for commit b909b94. Configure here.


function resolveCommandEditorArgs(
editor: (typeof EDITORS)[number],
target: string,
Expand DownExpand 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Closed
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 numberDiff line numberDiff 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 CursorFix 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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;
Comment thread
cursor[bot] marked this conversation as resolved.
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 CursorFix in Web

Reviewed by Cursor Bugbot for commit b909b94. Configure here.


function resolveCommandEditorArgs(
editor: (typeof EDITORS)[number],
target: string,
Expand DownExpand 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
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 numberDiff line numberDiff 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 CursorFix 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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;
Comment thread
cursor[bot] marked this conversation as resolved.
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 CursorFix in Web

Reviewed by Cursor Bugbot for commit b909b94. Configure here.


function resolveCommandEditorArgs(
editor: (typeof EDITORS)[number],
target: string,
Expand DownExpand 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
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 numberDiff line numberDiff 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 CursorFix 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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;
Comment thread
cursor[bot] marked this conversation as resolved.
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 CursorFix in Web

Reviewed by Cursor Bugbot for commit b909b94. Configure here.


function resolveCommandEditorArgs(
editor: (typeof EDITORS)[number],
target: string,
Expand DownExpand 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Closed
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 numberDiff line numberDiff 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 CursorFix 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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;
Comment thread
cursor[bot] marked this conversation as resolved.
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 CursorFix in Web

Reviewed by Cursor Bugbot for commit b909b94. Configure here.


function resolveCommandEditorArgs(
editor: (typeof EDITORS)[number],
target: string,
Expand DownExpand 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
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 numberDiff line numberDiff 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 CursorFix 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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;
Comment thread
cursor[bot] marked this conversation as resolved.
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 CursorFix in Web

Reviewed by Cursor Bugbot for commit b909b94. Configure here.


function resolveCommandEditorArgs(
editor: (typeof EDITORS)[number],
target: string,
Expand DownExpand 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
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 numberDiff line numberDiff 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 CursorFix 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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;
Comment thread
cursor[bot] marked this conversation as resolved.
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 CursorFix in Web

Reviewed by Cursor Bugbot for commit b909b94. Configure here.


function resolveCommandEditorArgs(
editor: (typeof EDITORS)[number],
target: string,
Expand DownExpand 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Closed
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 numberDiff line numberDiff 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 CursorFix 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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;
Comment thread
cursor[bot] marked this conversation as resolved.
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 CursorFix in Web

Reviewed by Cursor Bugbot for commit b909b94. Configure here.


function resolveCommandEditorArgs(
editor: (typeof EDITORS)[number],
target: string,
Expand DownExpand 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 DownExpand 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