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
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,3 +117,6 @@ jobs:
"extensions/background-terminals/manager.test.ts"
}
node --test --experimental-strip-types $testPath
- name: Test Windows full-suite isolation
timeout-minutes: 5
run: bun run test
4 changes: 4 additions & 0 deletions scripts/node-test-groups.d.mts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
export function partitionNodeTestsByPlatform(
files: string[],
platform?: NodeJS.Platform,
): { parallel: string[]; serial: string[] };
33 changes: 33 additions & 0 deletions scripts/node-test-groups.mjs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import { isAbsolute, relative, resolve, sep } from "node:path";

const backgroundTerminalsRoot = resolve(
"tests",
"extensions",
"background-terminals",
);

function isBackgroundTerminalsTest(file) {
const relativePath = relative(backgroundTerminalsRoot, file);
return (
relativePath !== "" &&
relativePath !== ".." &&
!relativePath.startsWith(`..${sep}`) &&
!isAbsolute(relativePath)
);
}

export function partitionNodeTestsByPlatform(
files,
platform = process.platform,
) {
if (platform !== "win32") {
return { parallel: files, serial: [] };
}

const parallel = [];
const serial = [];
for (const file of files) {
(isBackgroundTerminalsTest(file) ? serial : parallel).push(file);
}
return { parallel, serial };
}
31 changes: 24 additions & 7 deletions scripts/run-tests.mjs
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { spawnSync } from "node:child_process";
import { resolve } from "node:path";
import { discoverTestFiles } from "./discover-tests.mjs";
import { partitionNodeTestsByPlatform } from "./node-test-groups.mjs";

const files = discoverTestFiles(resolve("tests"));
const nodeTests = files.filter((file) => file.endsWith(".test.ts"));
Expand All@@ -12,13 +13,29 @@ if (nodeTests.length === 0 || vitestTests.length === 0) {
);
}

const nodeResult = spawnSync(
process.execPath,
["--test", "--experimental-strip-types", ...nodeTests],
{ stdio: "inherit" },
);
if (nodeResult.status !== 0) {
process.exit(nodeResult.status ?? 1);
function runNodeTests(files, options = []) {
if (files.length === 0) return 0;
const result = spawnSync(
process.execPath,
["--test", "--experimental-strip-types", ...options, ...files],
{ stdio: "inherit" },
);
return result.status ?? 1;
}

const nodeTestGroups = partitionNodeTestsByPlatform(nodeTests);
const parallelNodeResult = runNodeTests(nodeTestGroups.parallel);
if (parallelNodeResult !== 0) {
process.exit(parallelNodeResult);
}

// Windows process-tree tests must not overlap unrelated Node test files.
// Keep the rest of the suite on Node's default file-level concurrency.
const serialNodeResult = runNodeTests(nodeTestGroups.serial, [
"--test-concurrency=1",
]);
if (serialNodeResult !== 0) {
process.exit(serialNodeResult);
}

// Invoke the CLI module through Node instead of the package-manager shim.
Expand Down
2 changes: 1 addition & 1 deletion tests/extensions/file-mutation-display/render.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ const fixtures: Array<{
content: [{ type: "text", text: "one\ntwo" }],
details: undefined,
},
success: /Read\s+src\/long-file\.ts:10-29/,
success: /Read\s+src[\\/]long-file\.ts:10-29/,
},
{
name: "bash",
Expand Down
13 changes: 8 additions & 5 deletions tests/extensions/file-search/index.spec.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -232,17 +232,19 @@ it.effect("binary resolution: fdfind is accepted as a system fd", () =>

it.effect("binary resolution: an existing cached binary is used silently", () =>
Effect.gen(function* () {
const env = makeEnv({ available: ["/cache/bin/rg"] });
const binDir = join("/cache", "bin");
const cachedBinary = join(binDir, "rg");
const env = makeEnv({ available: [cachedBinary] });
const resolved = yield* resolveBinary(
TOOL_SPECS.rg,
"/cache/bin",
binDir,
darwinArm,
env,
);

assert.deepEqual(resolved, {
tool: "rg",
command: "/cache/bin/rg",
command: cachedBinary,
source: "cached",
});
assert.equal(env.installs.length, 0);
Expand All@@ -253,16 +255,17 @@ it.effect(
"binary resolution: missing everywhere triggers exactly one install",
() =>
Effect.gen(function* () {
const binDir = join("/repo", "bin");
const env = makeEnv({ available: [] });
const resolved = yield* resolveBinary(
TOOL_SPECS.rg,
"/repo/bin",
binDir,
darwinArm,
env,
);

assert.equal(resolved.source, "installed");
assert.equal(resolved.command, "/repo/bin/rg");
assert.equal(resolved.command, join(binDir, "rg"));
assert.equal(env.installs.length, 1);
assert.match(
env.installs[0].url,
Expand Down
88 changes: 72 additions & 16 deletions tests/extensions/git-info/index.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import assert from "node:assert/strict";
import {
chmodSync,
copyFileSync,
existsSync,
mkdirSync,
mkdtempSync,
Expand All@@ -9,7 +10,7 @@ import {
writeFileSync,
} from "node:fs";
import { tmpdir } from "node:os";
import { join } from "node:path";
import { delimiter, join } from "node:path";
import test from "node:test";
import type {
ExtensionAPI,
Expand All@@ -32,10 +33,46 @@ test("automatic refresh stays local until /pr explicitly requests GitHub data",
const callLog = join(root, "gh-calls.log");
mkdirSync(bin);

const gitPath = join(bin, "git");
writeFileSync(
gitPath,
`#!/bin/sh
const isWindows = process.platform === "win32";
const gitPath = join(bin, isWindows ? "git.exe" : "git");
const ghPath = join(bin, isWindows ? "gh.exe" : "gh");
const commandRunner = join(root, "command-runner.cjs");
if (isWindows) {
// Direct Node spawning does not resolve .cmd fixtures without a shell, so
// use copied Node executables with a per-process command shim instead.
writeFileSync(
commandRunner,
`const { appendFileSync } = require("node:fs");
const command = /[\\\\/]git\\.exe$/i.test(process.execPath)
? "git"
: /[\\\\/]gh\\.exe$/i.test(process.execPath)
? "gh"
: null;
const args = [
...(process.argv[1]?.split(/[\\\\/]/).pop() ? [process.argv[1].split(/[\\\\/]/).pop()] : []),
...process.argv.slice(2),
];
if (command === "git") {
const key = \`\${args[0] ?? ""} \${args[1] ?? ""}\`;
if (key === "rev-parse --is-inside-work-tree") process.stdout.write("true\\n");
else if (key === "branch --show-current") process.stdout.write("main\\n");
else if (key === "rev-parse --short") process.stdout.write("abc123\\n");
else if (key === "status --porcelain=v1") process.stdout.write(" M local.ts\\n?? new.ts\\n");
else process.exitCode = 2;
process.exit();
} else if (command === "gh") {
appendFileSync(process.env.GH_CALL_LOG, args.join(" ") + "\\n");
process.stdout.write("{\\"number\\":42,\\"url\\":\\"https://example.test/pr/42\\",\\"state\\":\\"OPEN\\",\\"isDraft\\":false}\\n");
process.exit();
}
`,
);
copyFileSync(process.execPath, gitPath);
copyFileSync(process.execPath, ghPath);
} else {
writeFileSync(
gitPath,
`#!/bin/sh
case "$1 $2" in
"rev-parse --is-inside-work-tree") echo true ;;
"branch --show-current") echo main ;;
Expand All@@ -44,23 +81,31 @@ case "$1 $2" in
*) exit 2 ;;
esac
`,
);
chmodSync(gitPath, 0o755);

const ghPath = join(bin, "gh");
writeFileSync(
ghPath,
`#!/bin/sh
);
chmodSync(gitPath, 0o755);
writeFileSync(
ghPath,
`#!/bin/sh
printf '%s\\n' "$*" >> "$GH_CALL_LOG"
printf '%s\\n' '{"number":42,"url":"https://example.test/pr/42","state":"OPEN","isDraft":false}'
`,
);
chmodSync(ghPath, 0o755);
);
chmodSync(ghPath, 0o755);
}

const previousPath = process.env.PATH;
const previousLog = process.env.GH_CALL_LOG;
process.env.PATH = `${bin}:${previousPath ?? ""}`;
const previousNodeOptions = process.env.NODE_OPTIONS;
process.env.PATH = `${bin}${delimiter}${previousPath ?? ""}`;
process.env.GH_CALL_LOG = callLog;
if (isWindows) {
process.env.NODE_OPTIONS = [
previousNodeOptions,
`--require=${commandRunner}`,
]
.filter(Boolean)
.join(" ");
}

const hooks = new Map<
string,
Expand DownExpand Up@@ -110,7 +155,16 @@ printf '%s\\n' '{"number":42,"url":"https://example.test/pr/42","state":"OPEN","

try {
await hooks.get("session_start")?.({}, ctx);
const local = await localPublished;
let timeoutHandle: ReturnType<typeof setTimeout> | undefined;
const local = await Promise.race([
localPublished,
new Promise<never>((_, reject) => {
timeoutHandle = setTimeout(
() => reject(new Error("Timed out waiting for local git info")),
5_000,
);
}),
]).finally(() => clearTimeout(timeoutHandle));
assert.equal(local.branch, "main");
assert.equal(local.changedFiles, 2);
assert.equal(local.pullRequest, null);
Expand All@@ -127,6 +181,8 @@ printf '%s\\n' '{"number":42,"url":"https://example.test/pr/42","state":"OPEN","
process.env.PATH = previousPath;
if (previousLog === undefined) delete process.env.GH_CALL_LOG;
else process.env.GH_CALL_LOG = previousLog;
if (previousNodeOptions === undefined) delete process.env.NODE_OPTIONS;
else process.env.NODE_OPTIONS = previousNodeOptions;
rmSync(root, { recursive: true, force: true });
}
});
12 changes: 9 additions & 3 deletions tests/extensions/sessions/git-stats.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import assert from "node:assert/strict";
import { mkdtemp, mkdir, rm, symlink } from "node:fs/promises";
import { tmpdir } from "node:os";
import { join } from "node:path";
import { join, resolve } from "node:path";
import test from "node:test";
import { createSessionStatsLoader } from "../../../extensions/sessions/git-stats.ts";
import type { SessionInfoLike } from "../../../extensions/sessions/sessions.ts";
Expand DownExpand Up@@ -105,6 +105,7 @@ test("overlapping viewport work is retained while work that leaves is cancelled"
});
const loader = createSessionStatsLoader({
maxConcurrency: 4,
canonicalizeCwd: async (cwd) => cwd,
runGit: (args, cwd, signal) => {
const id = `${cwd}:${args[0]}`;
started.push(id);
Expand DownExpand Up@@ -140,7 +141,8 @@ test("overlapping viewport work is retained while work that leaves is cancelled"

assert.equal(aborted.length, 4);
assert.equal(
started.filter((entry) => entry.startsWith("/tmp/project-2:")).length,
started.filter((entry) => entry.startsWith(`${resolve("/tmp/project-2")}:`))
.length,
2,
"overlapping work must not restart",
);
Expand DownExpand Up@@ -219,7 +221,11 @@ test("real and symlink workspace paths share one canonical latest bucket", async
const alias = join(root, "alias");
try {
await mkdir(workspace);
await symlink(workspace, alias);
await symlink(
workspace,
alias,
process.platform === "win32" ? "junction" : "dir",
);
const [newest, older] = makeSessions(2).map((entry, index) => ({
...entry,
cwd: index === 0 ? workspace : alias,
Expand Down
18 changes: 12 additions & 6 deletions tests/extensions/sessions/preview-loader.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import assert from "node:assert/strict";
import { appendFileSync, renameSync } from "node:fs";
import { appendFileSync, renameSync, writeFileSync } from "node:fs";
import { mkdtemp, readFile, rm, stat, writeFile } from "node:fs/promises";
import { tmpdir } from "node:os";
import { join } from "node:path";
Expand DownExpand Up@@ -399,10 +399,10 @@ for (const version of [1, 3]) {
: [header(3), message("m1", null, "user", "replaced")];
const fixture = await writeSession(originalEntries);
const replacementPath = join(fixture.directory, "replacement.jsonl");
await writeFile(
replacementPath,
`${replacementEntries.map((entry) => JSON.stringify(entry)).join("\n")}\n`,
);
const replacementContent = `${replacementEntries
.map((entry) => JSON.stringify(entry))
.join("\n")}\n`;
await writeFile(replacementPath, replacementContent);
t.after(() => rm(fixture.directory, { recursive: true, force: true }));

let replaced = false;
Expand All@@ -411,7 +411,13 @@ for (const version of [1, 3]) {
onRead: () => {
if (replaced) return;
replaced = true;
renameSync(replacementPath, fixture.path);
if (process.platform === "win32") {
// Windows rejects rename-over-open. An in-place replacement still
// exercises the loader's changed-file rejection on that platform.
writeFileSync(fixture.path, `${replacementContent}\n`);
} else {
renameSync(replacementPath, fixture.path);
}
},
}),
/changed while preview was loading/,
Expand Down
24 changes: 19 additions & 5 deletions tests/extensions/shared/worktree.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -554,7 +554,12 @@ describe("worktree lifecycle", () => {
`child ${index}\n`,
);
}
assert.equal(fs.readFileSync(path.join(repo, "a.txt"), "utf8"), "hello\n");
assert.equal(
fs
.readFileSync(path.join(repo, "a.txt"), "utf8")
.replaceAll("\r\n", "\n"),
"hello\n",
);

for (const worktree of worktrees) {
if (!worktree) continue;
Expand All@@ -577,10 +582,19 @@ describe("worktree lifecycle", () => {
});
assert.ok(inner.ok);
if (!inner.ok) return;
assert.equal(
// realpath because git resolves symlinks and macOS tmpdirs are one.
fs.realpathSync(path.dirname(path.dirname(inner.worktree.path))),
fs.realpathSync(path.join(repo, ".git")),
const worktreeContainer = fs.statSync(
path.dirname(path.dirname(inner.worktree.path)),
);
const commonGitDirectory = fs.statSync(path.join(repo, ".git"));
assert.deepEqual(
{
dev: worktreeContainer.dev,
ino: worktreeContainer.ino,
},
{
dev: commonGitDirectory.dev,
ino: commonGitDirectory.ino,
},
);

git(repo, "worktree", "remove", "--force", inner.worktree.path);
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
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
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,3 +117,6 @@ jobs:
"extensions/background-terminals/manager.test.ts"
}
node --test --experimental-strip-types $testPath
- name: Test Windows full-suite isolation
timeout-minutes: 5
run: bun run test
4 changes: 4 additions & 0 deletions scripts/node-test-groups.d.mts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
export function partitionNodeTestsByPlatform(
files: string[],
platform?: NodeJS.Platform,
): { parallel: string[]; serial: string[] };
33 changes: 33 additions & 0 deletions scripts/node-test-groups.mjs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import { isAbsolute, relative, resolve, sep } from "node:path";

const backgroundTerminalsRoot = resolve(
"tests",
"extensions",
"background-terminals",
);

function isBackgroundTerminalsTest(file) {
const relativePath = relative(backgroundTerminalsRoot, file);
return (
relativePath !== "" &&
relativePath !== ".." &&
!relativePath.startsWith(`..${sep}`) &&
!isAbsolute(relativePath)
);
}

export function partitionNodeTestsByPlatform(
files,
platform = process.platform,
) {
if (platform !== "win32") {
return { parallel: files, serial: [] };
}

const parallel = [];
const serial = [];
for (const file of files) {
(isBackgroundTerminalsTest(file) ? serial : parallel).push(file);
}
return { parallel, serial };
}
31 changes: 24 additions & 7 deletions scripts/run-tests.mjs
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { spawnSync } from "node:child_process";
import { resolve } from "node:path";
import { discoverTestFiles } from "./discover-tests.mjs";
import { partitionNodeTestsByPlatform } from "./node-test-groups.mjs";

const files = discoverTestFiles(resolve("tests"));
const nodeTests = files.filter((file) => file.endsWith(".test.ts"));
Expand All@@ -12,13 +13,29 @@ if (nodeTests.length === 0 || vitestTests.length === 0) {
);
}

const nodeResult = spawnSync(
process.execPath,
["--test", "--experimental-strip-types", ...nodeTests],
{ stdio: "inherit" },
);
if (nodeResult.status !== 0) {
process.exit(nodeResult.status ?? 1);
function runNodeTests(files, options = []) {
if (files.length === 0) return 0;
const result = spawnSync(
process.execPath,
["--test", "--experimental-strip-types", ...options, ...files],
{ stdio: "inherit" },
);
return result.status ?? 1;
}

const nodeTestGroups = partitionNodeTestsByPlatform(nodeTests);
const parallelNodeResult = runNodeTests(nodeTestGroups.parallel);
if (parallelNodeResult !== 0) {
process.exit(parallelNodeResult);
}

// Windows process-tree tests must not overlap unrelated Node test files.
// Keep the rest of the suite on Node's default file-level concurrency.
const serialNodeResult = runNodeTests(nodeTestGroups.serial, [
"--test-concurrency=1",
]);
if (serialNodeResult !== 0) {
process.exit(serialNodeResult);
}

// Invoke the CLI module through Node instead of the package-manager shim.
Expand Down
2 changes: 1 addition & 1 deletion tests/extensions/file-mutation-display/render.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ const fixtures: Array<{
content: [{ type: "text", text: "one\ntwo" }],
details: undefined,
},
success: /Read\s+src\/long-file\.ts:10-29/,
success: /Read\s+src[\\/]long-file\.ts:10-29/,
},
{
name: "bash",
Expand Down
13 changes: 8 additions & 5 deletions tests/extensions/file-search/index.spec.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -232,17 +232,19 @@ it.effect("binary resolution: fdfind is accepted as a system fd", () =>

it.effect("binary resolution: an existing cached binary is used silently", () =>
Effect.gen(function* () {
const env = makeEnv({ available: ["/cache/bin/rg"] });
const binDir = join("/cache", "bin");
const cachedBinary = join(binDir, "rg");
const env = makeEnv({ available: [cachedBinary] });
const resolved = yield* resolveBinary(
TOOL_SPECS.rg,
"/cache/bin",
binDir,
darwinArm,
env,
);

assert.deepEqual(resolved, {
tool: "rg",
command: "/cache/bin/rg",
command: cachedBinary,
source: "cached",
});
assert.equal(env.installs.length, 0);
Expand All@@ -253,16 +255,17 @@ it.effect(
"binary resolution: missing everywhere triggers exactly one install",
() =>
Effect.gen(function* () {
const binDir = join("/repo", "bin");
const env = makeEnv({ available: [] });
const resolved = yield* resolveBinary(
TOOL_SPECS.rg,
"/repo/bin",
binDir,
darwinArm,
env,
);

assert.equal(resolved.source, "installed");
assert.equal(resolved.command, "/repo/bin/rg");
assert.equal(resolved.command, join(binDir, "rg"));
assert.equal(env.installs.length, 1);
assert.match(
env.installs[0].url,
Expand Down
88 changes: 72 additions & 16 deletions tests/extensions/git-info/index.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import assert from "node:assert/strict";
import {
chmodSync,
copyFileSync,
existsSync,
mkdirSync,
mkdtempSync,
Expand All@@ -9,7 +10,7 @@ import {
writeFileSync,
} from "node:fs";
import { tmpdir } from "node:os";
import { join } from "node:path";
import { delimiter, join } from "node:path";
import test from "node:test";
import type {
ExtensionAPI,
Expand All@@ -32,10 +33,46 @@ test("automatic refresh stays local until /pr explicitly requests GitHub data",
const callLog = join(root, "gh-calls.log");
mkdirSync(bin);

const gitPath = join(bin, "git");
writeFileSync(
gitPath,
`#!/bin/sh
const isWindows = process.platform === "win32";
const gitPath = join(bin, isWindows ? "git.exe" : "git");
const ghPath = join(bin, isWindows ? "gh.exe" : "gh");
const commandRunner = join(root, "command-runner.cjs");
if (isWindows) {
// Direct Node spawning does not resolve .cmd fixtures without a shell, so
// use copied Node executables with a per-process command shim instead.
writeFileSync(
commandRunner,
`const { appendFileSync } = require("node:fs");
const command = /[\\\\/]git\\.exe$/i.test(process.execPath)
? "git"
: /[\\\\/]gh\\.exe$/i.test(process.execPath)
? "gh"
: null;
const args = [
...(process.argv[1]?.split(/[\\\\/]/).pop() ? [process.argv[1].split(/[\\\\/]/).pop()] : []),
...process.argv.slice(2),
];
if (command === "git") {
const key = \`\${args[0] ?? ""} \${args[1] ?? ""}\`;
if (key === "rev-parse --is-inside-work-tree") process.stdout.write("true\\n");
else if (key === "branch --show-current") process.stdout.write("main\\n");
else if (key === "rev-parse --short") process.stdout.write("abc123\\n");
else if (key === "status --porcelain=v1") process.stdout.write(" M local.ts\\n?? new.ts\\n");
else process.exitCode = 2;
process.exit();
} else if (command === "gh") {
appendFileSync(process.env.GH_CALL_LOG, args.join(" ") + "\\n");
process.stdout.write("{\\"number\\":42,\\"url\\":\\"https://example.test/pr/42\\",\\"state\\":\\"OPEN\\",\\"isDraft\\":false}\\n");
process.exit();
}
`,
);
copyFileSync(process.execPath, gitPath);
copyFileSync(process.execPath, ghPath);
} else {
writeFileSync(
gitPath,
`#!/bin/sh
case "$1 $2" in
"rev-parse --is-inside-work-tree") echo true ;;
"branch --show-current") echo main ;;
Expand All@@ -44,23 +81,31 @@ case "$1 $2" in
*) exit 2 ;;
esac
`,
);
chmodSync(gitPath, 0o755);

const ghPath = join(bin, "gh");
writeFileSync(
ghPath,
`#!/bin/sh
);
chmodSync(gitPath, 0o755);
writeFileSync(
ghPath,
`#!/bin/sh
printf '%s\\n' "$*" >> "$GH_CALL_LOG"
printf '%s\\n' '{"number":42,"url":"https://example.test/pr/42","state":"OPEN","isDraft":false}'
`,
);
chmodSync(ghPath, 0o755);
);
chmodSync(ghPath, 0o755);
}

const previousPath = process.env.PATH;
const previousLog = process.env.GH_CALL_LOG;
process.env.PATH = `${bin}:${previousPath ?? ""}`;
const previousNodeOptions = process.env.NODE_OPTIONS;
process.env.PATH = `${bin}${delimiter}${previousPath ?? ""}`;
process.env.GH_CALL_LOG = callLog;
if (isWindows) {
process.env.NODE_OPTIONS = [
previousNodeOptions,
`--require=${commandRunner}`,
]
.filter(Boolean)
.join(" ");
}

const hooks = new Map<
string,
Expand DownExpand Up@@ -110,7 +155,16 @@ printf '%s\\n' '{"number":42,"url":"https://example.test/pr/42","state":"OPEN","

try {
await hooks.get("session_start")?.({}, ctx);
const local = await localPublished;
let timeoutHandle: ReturnType<typeof setTimeout> | undefined;
const local = await Promise.race([
localPublished,
new Promise<never>((_, reject) => {
timeoutHandle = setTimeout(
() => reject(new Error("Timed out waiting for local git info")),
5_000,
);
}),
]).finally(() => clearTimeout(timeoutHandle));
assert.equal(local.branch, "main");
assert.equal(local.changedFiles, 2);
assert.equal(local.pullRequest, null);
Expand All@@ -127,6 +181,8 @@ printf '%s\\n' '{"number":42,"url":"https://example.test/pr/42","state":"OPEN","
process.env.PATH = previousPath;
if (previousLog === undefined) delete process.env.GH_CALL_LOG;
else process.env.GH_CALL_LOG = previousLog;
if (previousNodeOptions === undefined) delete process.env.NODE_OPTIONS;
else process.env.NODE_OPTIONS = previousNodeOptions;
rmSync(root, { recursive: true, force: true });
}
});
12 changes: 9 additions & 3 deletions tests/extensions/sessions/git-stats.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import assert from "node:assert/strict";
import { mkdtemp, mkdir, rm, symlink } from "node:fs/promises";
import { tmpdir } from "node:os";
import { join } from "node:path";
import { join, resolve } from "node:path";
import test from "node:test";
import { createSessionStatsLoader } from "../../../extensions/sessions/git-stats.ts";
import type { SessionInfoLike } from "../../../extensions/sessions/sessions.ts";
Expand DownExpand Up@@ -105,6 +105,7 @@ test("overlapping viewport work is retained while work that leaves is cancelled"
});
const loader = createSessionStatsLoader({
maxConcurrency: 4,
canonicalizeCwd: async (cwd) => cwd,
runGit: (args, cwd, signal) => {
const id = `${cwd}:${args[0]}`;
started.push(id);
Expand DownExpand Up@@ -140,7 +141,8 @@ test("overlapping viewport work is retained while work that leaves is cancelled"

assert.equal(aborted.length, 4);
assert.equal(
started.filter((entry) => entry.startsWith("/tmp/project-2:")).length,
started.filter((entry) => entry.startsWith(`${resolve("/tmp/project-2")}:`))
.length,
2,
"overlapping work must not restart",
);
Expand DownExpand Up@@ -219,7 +221,11 @@ test("real and symlink workspace paths share one canonical latest bucket", async
const alias = join(root, "alias");
try {
await mkdir(workspace);
await symlink(workspace, alias);
await symlink(
workspace,
alias,
process.platform === "win32" ? "junction" : "dir",
);
const [newest, older] = makeSessions(2).map((entry, index) => ({
...entry,
cwd: index === 0 ? workspace : alias,
Expand Down
18 changes: 12 additions & 6 deletions tests/extensions/sessions/preview-loader.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import assert from "node:assert/strict";
import { appendFileSync, renameSync } from "node:fs";
import { appendFileSync, renameSync, writeFileSync } from "node:fs";
import { mkdtemp, readFile, rm, stat, writeFile } from "node:fs/promises";
import { tmpdir } from "node:os";
import { join } from "node:path";
Expand DownExpand Up@@ -399,10 +399,10 @@ for (const version of [1, 3]) {
: [header(3), message("m1", null, "user", "replaced")];
const fixture = await writeSession(originalEntries);
const replacementPath = join(fixture.directory, "replacement.jsonl");
await writeFile(
replacementPath,
`${replacementEntries.map((entry) => JSON.stringify(entry)).join("\n")}\n`,
);
const replacementContent = `${replacementEntries
.map((entry) => JSON.stringify(entry))
.join("\n")}\n`;
await writeFile(replacementPath, replacementContent);
t.after(() => rm(fixture.directory, { recursive: true, force: true }));

let replaced = false;
Expand All@@ -411,7 +411,13 @@ for (const version of [1, 3]) {
onRead: () => {
if (replaced) return;
replaced = true;
renameSync(replacementPath, fixture.path);
if (process.platform === "win32") {
// Windows rejects rename-over-open. An in-place replacement still
// exercises the loader's changed-file rejection on that platform.
writeFileSync(fixture.path, `${replacementContent}\n`);
} else {
renameSync(replacementPath, fixture.path);
}
},
}),
/changed while preview was loading/,
Expand Down
24 changes: 19 additions & 5 deletions tests/extensions/shared/worktree.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -554,7 +554,12 @@ describe("worktree lifecycle", () => {
`child ${index}\n`,
);
}
assert.equal(fs.readFileSync(path.join(repo, "a.txt"), "utf8"), "hello\n");
assert.equal(
fs
.readFileSync(path.join(repo, "a.txt"), "utf8")
.replaceAll("\r\n", "\n"),
"hello\n",
);

for (const worktree of worktrees) {
if (!worktree) continue;
Expand All@@ -577,10 +582,19 @@ describe("worktree lifecycle", () => {
});
assert.ok(inner.ok);
if (!inner.ok) return;
assert.equal(
// realpath because git resolves symlinks and macOS tmpdirs are one.
fs.realpathSync(path.dirname(path.dirname(inner.worktree.path))),
fs.realpathSync(path.join(repo, ".git")),
const worktreeContainer = fs.statSync(
path.dirname(path.dirname(inner.worktree.path)),
);
const commonGitDirectory = fs.statSync(path.join(repo, ".git"));
assert.deepEqual(
{
dev: worktreeContainer.dev,
ino: worktreeContainer.ino,
},
{
dev: commonGitDirectory.dev,
ino: commonGitDirectory.ino,
},
);

git(repo, "worktree", "remove", "--force", inner.worktree.path);
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
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
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,3 +117,6 @@ jobs:
"extensions/background-terminals/manager.test.ts"
}
node --test --experimental-strip-types $testPath
- name: Test Windows full-suite isolation
timeout-minutes: 5
run: bun run test
4 changes: 4 additions & 0 deletions scripts/node-test-groups.d.mts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
export function partitionNodeTestsByPlatform(
files: string[],
platform?: NodeJS.Platform,
): { parallel: string[]; serial: string[] };
33 changes: 33 additions & 0 deletions scripts/node-test-groups.mjs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import { isAbsolute, relative, resolve, sep } from "node:path";

const backgroundTerminalsRoot = resolve(
"tests",
"extensions",
"background-terminals",
);

function isBackgroundTerminalsTest(file) {
const relativePath = relative(backgroundTerminalsRoot, file);
return (
relativePath !== "" &&
relativePath !== ".." &&
!relativePath.startsWith(`..${sep}`) &&
!isAbsolute(relativePath)
);
}

export function partitionNodeTestsByPlatform(
files,
platform = process.platform,
) {
if (platform !== "win32") {
return { parallel: files, serial: [] };
}

const parallel = [];
const serial = [];
for (const file of files) {
(isBackgroundTerminalsTest(file) ? serial : parallel).push(file);
}
return { parallel, serial };
}
31 changes: 24 additions & 7 deletions scripts/run-tests.mjs
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { spawnSync } from "node:child_process";
import { resolve } from "node:path";
import { discoverTestFiles } from "./discover-tests.mjs";
import { partitionNodeTestsByPlatform } from "./node-test-groups.mjs";

const files = discoverTestFiles(resolve("tests"));
const nodeTests = files.filter((file) => file.endsWith(".test.ts"));
Expand All@@ -12,13 +13,29 @@ if (nodeTests.length === 0 || vitestTests.length === 0) {
);
}

const nodeResult = spawnSync(
process.execPath,
["--test", "--experimental-strip-types", ...nodeTests],
{ stdio: "inherit" },
);
if (nodeResult.status !== 0) {
process.exit(nodeResult.status ?? 1);
function runNodeTests(files, options = []) {
if (files.length === 0) return 0;
const result = spawnSync(
process.execPath,
["--test", "--experimental-strip-types", ...options, ...files],
{ stdio: "inherit" },
);
return result.status ?? 1;
}

const nodeTestGroups = partitionNodeTestsByPlatform(nodeTests);
const parallelNodeResult = runNodeTests(nodeTestGroups.parallel);
if (parallelNodeResult !== 0) {
process.exit(parallelNodeResult);
}

// Windows process-tree tests must not overlap unrelated Node test files.
// Keep the rest of the suite on Node's default file-level concurrency.
const serialNodeResult = runNodeTests(nodeTestGroups.serial, [
"--test-concurrency=1",
]);
if (serialNodeResult !== 0) {
process.exit(serialNodeResult);
}

// Invoke the CLI module through Node instead of the package-manager shim.
Expand Down
2 changes: 1 addition & 1 deletion tests/extensions/file-mutation-display/render.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ const fixtures: Array<{
content: [{ type: "text", text: "one\ntwo" }],
details: undefined,
},
success: /Read\s+src\/long-file\.ts:10-29/,
success: /Read\s+src[\\/]long-file\.ts:10-29/,
},
{
name: "bash",
Expand Down
13 changes: 8 additions & 5 deletions tests/extensions/file-search/index.spec.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -232,17 +232,19 @@ it.effect("binary resolution: fdfind is accepted as a system fd", () =>

it.effect("binary resolution: an existing cached binary is used silently", () =>
Effect.gen(function* () {
const env = makeEnv({ available: ["/cache/bin/rg"] });
const binDir = join("/cache", "bin");
const cachedBinary = join(binDir, "rg");
const env = makeEnv({ available: [cachedBinary] });
const resolved = yield* resolveBinary(
TOOL_SPECS.rg,
"/cache/bin",
binDir,
darwinArm,
env,
);

assert.deepEqual(resolved, {
tool: "rg",
command: "/cache/bin/rg",
command: cachedBinary,
source: "cached",
});
assert.equal(env.installs.length, 0);
Expand All@@ -253,16 +255,17 @@ it.effect(
"binary resolution: missing everywhere triggers exactly one install",
() =>
Effect.gen(function* () {
const binDir = join("/repo", "bin");
const env = makeEnv({ available: [] });
const resolved = yield* resolveBinary(
TOOL_SPECS.rg,
"/repo/bin",
binDir,
darwinArm,
env,
);

assert.equal(resolved.source, "installed");
assert.equal(resolved.command, "/repo/bin/rg");
assert.equal(resolved.command, join(binDir, "rg"));
assert.equal(env.installs.length, 1);
assert.match(
env.installs[0].url,
Expand Down
88 changes: 72 additions & 16 deletions tests/extensions/git-info/index.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import assert from "node:assert/strict";
import {
chmodSync,
copyFileSync,
existsSync,
mkdirSync,
mkdtempSync,
Expand All@@ -9,7 +10,7 @@ import {
writeFileSync,
} from "node:fs";
import { tmpdir } from "node:os";
import { join } from "node:path";
import { delimiter, join } from "node:path";
import test from "node:test";
import type {
ExtensionAPI,
Expand All@@ -32,10 +33,46 @@ test("automatic refresh stays local until /pr explicitly requests GitHub data",
const callLog = join(root, "gh-calls.log");
mkdirSync(bin);

const gitPath = join(bin, "git");
writeFileSync(
gitPath,
`#!/bin/sh
const isWindows = process.platform === "win32";
const gitPath = join(bin, isWindows ? "git.exe" : "git");
const ghPath = join(bin, isWindows ? "gh.exe" : "gh");
const commandRunner = join(root, "command-runner.cjs");
if (isWindows) {
// Direct Node spawning does not resolve .cmd fixtures without a shell, so
// use copied Node executables with a per-process command shim instead.
writeFileSync(
commandRunner,
`const { appendFileSync } = require("node:fs");
const command = /[\\\\/]git\\.exe$/i.test(process.execPath)
? "git"
: /[\\\\/]gh\\.exe$/i.test(process.execPath)
? "gh"
: null;
const args = [
...(process.argv[1]?.split(/[\\\\/]/).pop() ? [process.argv[1].split(/[\\\\/]/).pop()] : []),
...process.argv.slice(2),
];
if (command === "git") {
const key = \`\${args[0] ?? ""} \${args[1] ?? ""}\`;
if (key === "rev-parse --is-inside-work-tree") process.stdout.write("true\\n");
else if (key === "branch --show-current") process.stdout.write("main\\n");
else if (key === "rev-parse --short") process.stdout.write("abc123\\n");
else if (key === "status --porcelain=v1") process.stdout.write(" M local.ts\\n?? new.ts\\n");
else process.exitCode = 2;
process.exit();
} else if (command === "gh") {
appendFileSync(process.env.GH_CALL_LOG, args.join(" ") + "\\n");
process.stdout.write("{\\"number\\":42,\\"url\\":\\"https://example.test/pr/42\\",\\"state\\":\\"OPEN\\",\\"isDraft\\":false}\\n");
process.exit();
}
`,
);
copyFileSync(process.execPath, gitPath);
copyFileSync(process.execPath, ghPath);
} else {
writeFileSync(
gitPath,
`#!/bin/sh
case "$1 $2" in
"rev-parse --is-inside-work-tree") echo true ;;
"branch --show-current") echo main ;;
Expand All@@ -44,23 +81,31 @@ case "$1 $2" in
*) exit 2 ;;
esac
`,
);
chmodSync(gitPath, 0o755);

const ghPath = join(bin, "gh");
writeFileSync(
ghPath,
`#!/bin/sh
);
chmodSync(gitPath, 0o755);
writeFileSync(
ghPath,
`#!/bin/sh
printf '%s\\n' "$*" >> "$GH_CALL_LOG"
printf '%s\\n' '{"number":42,"url":"https://example.test/pr/42","state":"OPEN","isDraft":false}'
`,
);
chmodSync(ghPath, 0o755);
);
chmodSync(ghPath, 0o755);
}

const previousPath = process.env.PATH;
const previousLog = process.env.GH_CALL_LOG;
process.env.PATH = `${bin}:${previousPath ?? ""}`;
const previousNodeOptions = process.env.NODE_OPTIONS;
process.env.PATH = `${bin}${delimiter}${previousPath ?? ""}`;
process.env.GH_CALL_LOG = callLog;
if (isWindows) {
process.env.NODE_OPTIONS = [
previousNodeOptions,
`--require=${commandRunner}`,
]
.filter(Boolean)
.join(" ");
}

const hooks = new Map<
string,
Expand DownExpand Up@@ -110,7 +155,16 @@ printf '%s\\n' '{"number":42,"url":"https://example.test/pr/42","state":"OPEN","

try {
await hooks.get("session_start")?.({}, ctx);
const local = await localPublished;
let timeoutHandle: ReturnType<typeof setTimeout> | undefined;
const local = await Promise.race([
localPublished,
new Promise<never>((_, reject) => {
timeoutHandle = setTimeout(
() => reject(new Error("Timed out waiting for local git info")),
5_000,
);
}),
]).finally(() => clearTimeout(timeoutHandle));
assert.equal(local.branch, "main");
assert.equal(local.changedFiles, 2);
assert.equal(local.pullRequest, null);
Expand All@@ -127,6 +181,8 @@ printf '%s\\n' '{"number":42,"url":"https://example.test/pr/42","state":"OPEN","
process.env.PATH = previousPath;
if (previousLog === undefined) delete process.env.GH_CALL_LOG;
else process.env.GH_CALL_LOG = previousLog;
if (previousNodeOptions === undefined) delete process.env.NODE_OPTIONS;
else process.env.NODE_OPTIONS = previousNodeOptions;
rmSync(root, { recursive: true, force: true });
}
});
12 changes: 9 additions & 3 deletions tests/extensions/sessions/git-stats.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import assert from "node:assert/strict";
import { mkdtemp, mkdir, rm, symlink } from "node:fs/promises";
import { tmpdir } from "node:os";
import { join } from "node:path";
import { join, resolve } from "node:path";
import test from "node:test";
import { createSessionStatsLoader } from "../../../extensions/sessions/git-stats.ts";
import type { SessionInfoLike } from "../../../extensions/sessions/sessions.ts";
Expand DownExpand Up@@ -105,6 +105,7 @@ test("overlapping viewport work is retained while work that leaves is cancelled"
});
const loader = createSessionStatsLoader({
maxConcurrency: 4,
canonicalizeCwd: async (cwd) => cwd,
runGit: (args, cwd, signal) => {
const id = `${cwd}:${args[0]}`;
started.push(id);
Expand DownExpand Up@@ -140,7 +141,8 @@ test("overlapping viewport work is retained while work that leaves is cancelled"

assert.equal(aborted.length, 4);
assert.equal(
started.filter((entry) => entry.startsWith("/tmp/project-2:")).length,
started.filter((entry) => entry.startsWith(`${resolve("/tmp/project-2")}:`))
.length,
2,
"overlapping work must not restart",
);
Expand DownExpand Up@@ -219,7 +221,11 @@ test("real and symlink workspace paths share one canonical latest bucket", async
const alias = join(root, "alias");
try {
await mkdir(workspace);
await symlink(workspace, alias);
await symlink(
workspace,
alias,
process.platform === "win32" ? "junction" : "dir",
);
const [newest, older] = makeSessions(2).map((entry, index) => ({
...entry,
cwd: index === 0 ? workspace : alias,
Expand Down
18 changes: 12 additions & 6 deletions tests/extensions/sessions/preview-loader.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import assert from "node:assert/strict";
import { appendFileSync, renameSync } from "node:fs";
import { appendFileSync, renameSync, writeFileSync } from "node:fs";
import { mkdtemp, readFile, rm, stat, writeFile } from "node:fs/promises";
import { tmpdir } from "node:os";
import { join } from "node:path";
Expand DownExpand Up@@ -399,10 +399,10 @@ for (const version of [1, 3]) {
: [header(3), message("m1", null, "user", "replaced")];
const fixture = await writeSession(originalEntries);
const replacementPath = join(fixture.directory, "replacement.jsonl");
await writeFile(
replacementPath,
`${replacementEntries.map((entry) => JSON.stringify(entry)).join("\n")}\n`,
);
const replacementContent = `${replacementEntries
.map((entry) => JSON.stringify(entry))
.join("\n")}\n`;
await writeFile(replacementPath, replacementContent);
t.after(() => rm(fixture.directory, { recursive: true, force: true }));

let replaced = false;
Expand All@@ -411,7 +411,13 @@ for (const version of [1, 3]) {
onRead: () => {
if (replaced) return;
replaced = true;
renameSync(replacementPath, fixture.path);
if (process.platform === "win32") {
// Windows rejects rename-over-open. An in-place replacement still
// exercises the loader's changed-file rejection on that platform.
writeFileSync(fixture.path, `${replacementContent}\n`);
} else {
renameSync(replacementPath, fixture.path);
}
},
}),
/changed while preview was loading/,
Expand Down
24 changes: 19 additions & 5 deletions tests/extensions/shared/worktree.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -554,7 +554,12 @@ describe("worktree lifecycle", () => {
`child ${index}\n`,
);
}
assert.equal(fs.readFileSync(path.join(repo, "a.txt"), "utf8"), "hello\n");
assert.equal(
fs
.readFileSync(path.join(repo, "a.txt"), "utf8")
.replaceAll("\r\n", "\n"),
"hello\n",
);

for (const worktree of worktrees) {
if (!worktree) continue;
Expand All@@ -577,10 +582,19 @@ describe("worktree lifecycle", () => {
});
assert.ok(inner.ok);
if (!inner.ok) return;
assert.equal(
// realpath because git resolves symlinks and macOS tmpdirs are one.
fs.realpathSync(path.dirname(path.dirname(inner.worktree.path))),
fs.realpathSync(path.join(repo, ".git")),
const worktreeContainer = fs.statSync(
path.dirname(path.dirname(inner.worktree.path)),
);
const commonGitDirectory = fs.statSync(path.join(repo, ".git"));
assert.deepEqual(
{
dev: worktreeContainer.dev,
ino: worktreeContainer.ino,
},
{
dev: commonGitDirectory.dev,
ino: commonGitDirectory.ino,
},
);

git(repo, "worktree", "remove", "--force", inner.worktree.path);
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
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
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,3 +117,6 @@ jobs:
"extensions/background-terminals/manager.test.ts"
}
node --test --experimental-strip-types $testPath
- name: Test Windows full-suite isolation
timeout-minutes: 5
run: bun run test
4 changes: 4 additions & 0 deletions scripts/node-test-groups.d.mts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
export function partitionNodeTestsByPlatform(
files: string[],
platform?: NodeJS.Platform,
): { parallel: string[]; serial: string[] };
33 changes: 33 additions & 0 deletions scripts/node-test-groups.mjs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import { isAbsolute, relative, resolve, sep } from "node:path";

const backgroundTerminalsRoot = resolve(
"tests",
"extensions",
"background-terminals",
);

function isBackgroundTerminalsTest(file) {
const relativePath = relative(backgroundTerminalsRoot, file);
return (
relativePath !== "" &&
relativePath !== ".." &&
!relativePath.startsWith(`..${sep}`) &&
!isAbsolute(relativePath)
);
}

export function partitionNodeTestsByPlatform(
files,
platform = process.platform,
) {
if (platform !== "win32") {
return { parallel: files, serial: [] };
}

const parallel = [];
const serial = [];
for (const file of files) {
(isBackgroundTerminalsTest(file) ? serial : parallel).push(file);
}
return { parallel, serial };
}
31 changes: 24 additions & 7 deletions scripts/run-tests.mjs
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { spawnSync } from "node:child_process";
import { resolve } from "node:path";
import { discoverTestFiles } from "./discover-tests.mjs";
import { partitionNodeTestsByPlatform } from "./node-test-groups.mjs";

const files = discoverTestFiles(resolve("tests"));
const nodeTests = files.filter((file) => file.endsWith(".test.ts"));
Expand All@@ -12,13 +13,29 @@ if (nodeTests.length === 0 || vitestTests.length === 0) {
);
}

const nodeResult = spawnSync(
process.execPath,
["--test", "--experimental-strip-types", ...nodeTests],
{ stdio: "inherit" },
);
if (nodeResult.status !== 0) {
process.exit(nodeResult.status ?? 1);
function runNodeTests(files, options = []) {
if (files.length === 0) return 0;
const result = spawnSync(
process.execPath,
["--test", "--experimental-strip-types", ...options, ...files],
{ stdio: "inherit" },
);
return result.status ?? 1;
}

const nodeTestGroups = partitionNodeTestsByPlatform(nodeTests);
const parallelNodeResult = runNodeTests(nodeTestGroups.parallel);
if (parallelNodeResult !== 0) {
process.exit(parallelNodeResult);
}

// Windows process-tree tests must not overlap unrelated Node test files.
// Keep the rest of the suite on Node's default file-level concurrency.
const serialNodeResult = runNodeTests(nodeTestGroups.serial, [
"--test-concurrency=1",
]);
if (serialNodeResult !== 0) {
process.exit(serialNodeResult);
}

// Invoke the CLI module through Node instead of the package-manager shim.
Expand Down
2 changes: 1 addition & 1 deletion tests/extensions/file-mutation-display/render.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ const fixtures: Array<{
content: [{ type: "text", text: "one\ntwo" }],
details: undefined,
},
success: /Read\s+src\/long-file\.ts:10-29/,
success: /Read\s+src[\\/]long-file\.ts:10-29/,
},
{
name: "bash",
Expand Down
13 changes: 8 additions & 5 deletions tests/extensions/file-search/index.spec.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -232,17 +232,19 @@ it.effect("binary resolution: fdfind is accepted as a system fd", () =>

it.effect("binary resolution: an existing cached binary is used silently", () =>
Effect.gen(function* () {
const env = makeEnv({ available: ["/cache/bin/rg"] });
const binDir = join("/cache", "bin");
const cachedBinary = join(binDir, "rg");
const env = makeEnv({ available: [cachedBinary] });
const resolved = yield* resolveBinary(
TOOL_SPECS.rg,
"/cache/bin",
binDir,
darwinArm,
env,
);

assert.deepEqual(resolved, {
tool: "rg",
command: "/cache/bin/rg",
command: cachedBinary,
source: "cached",
});
assert.equal(env.installs.length, 0);
Expand All@@ -253,16 +255,17 @@ it.effect(
"binary resolution: missing everywhere triggers exactly one install",
() =>
Effect.gen(function* () {
const binDir = join("/repo", "bin");
const env = makeEnv({ available: [] });
const resolved = yield* resolveBinary(
TOOL_SPECS.rg,
"/repo/bin",
binDir,
darwinArm,
env,
);

assert.equal(resolved.source, "installed");
assert.equal(resolved.command, "/repo/bin/rg");
assert.equal(resolved.command, join(binDir, "rg"));
assert.equal(env.installs.length, 1);
assert.match(
env.installs[0].url,
Expand Down
88 changes: 72 additions & 16 deletions tests/extensions/git-info/index.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import assert from "node:assert/strict";
import {
chmodSync,
copyFileSync,
existsSync,
mkdirSync,
mkdtempSync,
Expand All@@ -9,7 +10,7 @@ import {
writeFileSync,
} from "node:fs";
import { tmpdir } from "node:os";
import { join } from "node:path";
import { delimiter, join } from "node:path";
import test from "node:test";
import type {
ExtensionAPI,
Expand All@@ -32,10 +33,46 @@ test("automatic refresh stays local until /pr explicitly requests GitHub data",
const callLog = join(root, "gh-calls.log");
mkdirSync(bin);

const gitPath = join(bin, "git");
writeFileSync(
gitPath,
`#!/bin/sh
const isWindows = process.platform === "win32";
const gitPath = join(bin, isWindows ? "git.exe" : "git");
const ghPath = join(bin, isWindows ? "gh.exe" : "gh");
const commandRunner = join(root, "command-runner.cjs");
if (isWindows) {
// Direct Node spawning does not resolve .cmd fixtures without a shell, so
// use copied Node executables with a per-process command shim instead.
writeFileSync(
commandRunner,
`const { appendFileSync } = require("node:fs");
const command = /[\\\\/]git\\.exe$/i.test(process.execPath)
? "git"
: /[\\\\/]gh\\.exe$/i.test(process.execPath)
? "gh"
: null;
const args = [
...(process.argv[1]?.split(/[\\\\/]/).pop() ? [process.argv[1].split(/[\\\\/]/).pop()] : []),
...process.argv.slice(2),
];
if (command === "git") {
const key = \`\${args[0] ?? ""} \${args[1] ?? ""}\`;
if (key === "rev-parse --is-inside-work-tree") process.stdout.write("true\\n");
else if (key === "branch --show-current") process.stdout.write("main\\n");
else if (key === "rev-parse --short") process.stdout.write("abc123\\n");
else if (key === "status --porcelain=v1") process.stdout.write(" M local.ts\\n?? new.ts\\n");
else process.exitCode = 2;
process.exit();
} else if (command === "gh") {
appendFileSync(process.env.GH_CALL_LOG, args.join(" ") + "\\n");
process.stdout.write("{\\"number\\":42,\\"url\\":\\"https://example.test/pr/42\\",\\"state\\":\\"OPEN\\",\\"isDraft\\":false}\\n");
process.exit();
}
`,
);
copyFileSync(process.execPath, gitPath);
copyFileSync(process.execPath, ghPath);
} else {
writeFileSync(
gitPath,
`#!/bin/sh
case "$1 $2" in
"rev-parse --is-inside-work-tree") echo true ;;
"branch --show-current") echo main ;;
Expand All@@ -44,23 +81,31 @@ case "$1 $2" in
*) exit 2 ;;
esac
`,
);
chmodSync(gitPath, 0o755);

const ghPath = join(bin, "gh");
writeFileSync(
ghPath,
`#!/bin/sh
);
chmodSync(gitPath, 0o755);
writeFileSync(
ghPath,
`#!/bin/sh
printf '%s\\n' "$*" >> "$GH_CALL_LOG"
printf '%s\\n' '{"number":42,"url":"https://example.test/pr/42","state":"OPEN","isDraft":false}'
`,
);
chmodSync(ghPath, 0o755);
);
chmodSync(ghPath, 0o755);
}

const previousPath = process.env.PATH;
const previousLog = process.env.GH_CALL_LOG;
process.env.PATH = `${bin}:${previousPath ?? ""}`;
const previousNodeOptions = process.env.NODE_OPTIONS;
process.env.PATH = `${bin}${delimiter}${previousPath ?? ""}`;
process.env.GH_CALL_LOG = callLog;
if (isWindows) {
process.env.NODE_OPTIONS = [
previousNodeOptions,
`--require=${commandRunner}`,
]
.filter(Boolean)
.join(" ");
}

const hooks = new Map<
string,
Expand DownExpand Up@@ -110,7 +155,16 @@ printf '%s\\n' '{"number":42,"url":"https://example.test/pr/42","state":"OPEN","

try {
await hooks.get("session_start")?.({}, ctx);
const local = await localPublished;
let timeoutHandle: ReturnType<typeof setTimeout> | undefined;
const local = await Promise.race([
localPublished,
new Promise<never>((_, reject) => {
timeoutHandle = setTimeout(
() => reject(new Error("Timed out waiting for local git info")),
5_000,
);
}),
]).finally(() => clearTimeout(timeoutHandle));
assert.equal(local.branch, "main");
assert.equal(local.changedFiles, 2);
assert.equal(local.pullRequest, null);
Expand All@@ -127,6 +181,8 @@ printf '%s\\n' '{"number":42,"url":"https://example.test/pr/42","state":"OPEN","
process.env.PATH = previousPath;
if (previousLog === undefined) delete process.env.GH_CALL_LOG;
else process.env.GH_CALL_LOG = previousLog;
if (previousNodeOptions === undefined) delete process.env.NODE_OPTIONS;
else process.env.NODE_OPTIONS = previousNodeOptions;
rmSync(root, { recursive: true, force: true });
}
});
12 changes: 9 additions & 3 deletions tests/extensions/sessions/git-stats.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import assert from "node:assert/strict";
import { mkdtemp, mkdir, rm, symlink } from "node:fs/promises";
import { tmpdir } from "node:os";
import { join } from "node:path";
import { join, resolve } from "node:path";
import test from "node:test";
import { createSessionStatsLoader } from "../../../extensions/sessions/git-stats.ts";
import type { SessionInfoLike } from "../../../extensions/sessions/sessions.ts";
Expand DownExpand Up@@ -105,6 +105,7 @@ test("overlapping viewport work is retained while work that leaves is cancelled"
});
const loader = createSessionStatsLoader({
maxConcurrency: 4,
canonicalizeCwd: async (cwd) => cwd,
runGit: (args, cwd, signal) => {
const id = `${cwd}:${args[0]}`;
started.push(id);
Expand DownExpand Up@@ -140,7 +141,8 @@ test("overlapping viewport work is retained while work that leaves is cancelled"

assert.equal(aborted.length, 4);
assert.equal(
started.filter((entry) => entry.startsWith("/tmp/project-2:")).length,
started.filter((entry) => entry.startsWith(`${resolve("/tmp/project-2")}:`))
.length,
2,
"overlapping work must not restart",
);
Expand DownExpand Up@@ -219,7 +221,11 @@ test("real and symlink workspace paths share one canonical latest bucket", async
const alias = join(root, "alias");
try {
await mkdir(workspace);
await symlink(workspace, alias);
await symlink(
workspace,
alias,
process.platform === "win32" ? "junction" : "dir",
);
const [newest, older] = makeSessions(2).map((entry, index) => ({
...entry,
cwd: index === 0 ? workspace : alias,
Expand Down
18 changes: 12 additions & 6 deletions tests/extensions/sessions/preview-loader.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import assert from "node:assert/strict";
import { appendFileSync, renameSync } from "node:fs";
import { appendFileSync, renameSync, writeFileSync } from "node:fs";
import { mkdtemp, readFile, rm, stat, writeFile } from "node:fs/promises";
import { tmpdir } from "node:os";
import { join } from "node:path";
Expand DownExpand Up@@ -399,10 +399,10 @@ for (const version of [1, 3]) {
: [header(3), message("m1", null, "user", "replaced")];
const fixture = await writeSession(originalEntries);
const replacementPath = join(fixture.directory, "replacement.jsonl");
await writeFile(
replacementPath,
`${replacementEntries.map((entry) => JSON.stringify(entry)).join("\n")}\n`,
);
const replacementContent = `${replacementEntries
.map((entry) => JSON.stringify(entry))
.join("\n")}\n`;
await writeFile(replacementPath, replacementContent);
t.after(() => rm(fixture.directory, { recursive: true, force: true }));

let replaced = false;
Expand All@@ -411,7 +411,13 @@ for (const version of [1, 3]) {
onRead: () => {
if (replaced) return;
replaced = true;
renameSync(replacementPath, fixture.path);
if (process.platform === "win32") {
// Windows rejects rename-over-open. An in-place replacement still
// exercises the loader's changed-file rejection on that platform.
writeFileSync(fixture.path, `${replacementContent}\n`);
} else {
renameSync(replacementPath, fixture.path);
}
},
}),
/changed while preview was loading/,
Expand Down
24 changes: 19 additions & 5 deletions tests/extensions/shared/worktree.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -554,7 +554,12 @@ describe("worktree lifecycle", () => {
`child ${index}\n`,
);
}
assert.equal(fs.readFileSync(path.join(repo, "a.txt"), "utf8"), "hello\n");
assert.equal(
fs
.readFileSync(path.join(repo, "a.txt"), "utf8")
.replaceAll("\r\n", "\n"),
"hello\n",
);

for (const worktree of worktrees) {
if (!worktree) continue;
Expand All@@ -577,10 +582,19 @@ describe("worktree lifecycle", () => {
});
assert.ok(inner.ok);
if (!inner.ok) return;
assert.equal(
// realpath because git resolves symlinks and macOS tmpdirs are one.
fs.realpathSync(path.dirname(path.dirname(inner.worktree.path))),
fs.realpathSync(path.join(repo, ".git")),
const worktreeContainer = fs.statSync(
path.dirname(path.dirname(inner.worktree.path)),
);
const commonGitDirectory = fs.statSync(path.join(repo, ".git"));
assert.deepEqual(
{
dev: worktreeContainer.dev,
ino: worktreeContainer.ino,
},
{
dev: commonGitDirectory.dev,
ino: commonGitDirectory.ino,
},
);

git(repo, "worktree", "remove", "--force", inner.worktree.path);
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
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
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,3 +117,6 @@ jobs:
"extensions/background-terminals/manager.test.ts"
}
node --test --experimental-strip-types $testPath
- name: Test Windows full-suite isolation
timeout-minutes: 5
run: bun run test
4 changes: 4 additions & 0 deletions scripts/node-test-groups.d.mts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
export function partitionNodeTestsByPlatform(
files: string[],
platform?: NodeJS.Platform,
): { parallel: string[]; serial: string[] };
33 changes: 33 additions & 0 deletions scripts/node-test-groups.mjs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import { isAbsolute, relative, resolve, sep } from "node:path";

const backgroundTerminalsRoot = resolve(
"tests",
"extensions",
"background-terminals",
);

function isBackgroundTerminalsTest(file) {
const relativePath = relative(backgroundTerminalsRoot, file);
return (
relativePath !== "" &&
relativePath !== ".." &&
!relativePath.startsWith(`..${sep}`) &&
!isAbsolute(relativePath)
);
}

export function partitionNodeTestsByPlatform(
files,
platform = process.platform,
) {
if (platform !== "win32") {
return { parallel: files, serial: [] };
}

const parallel = [];
const serial = [];
for (const file of files) {
(isBackgroundTerminalsTest(file) ? serial : parallel).push(file);
}
return { parallel, serial };
}
31 changes: 24 additions & 7 deletions scripts/run-tests.mjs
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { spawnSync } from "node:child_process";
import { resolve } from "node:path";
import { discoverTestFiles } from "./discover-tests.mjs";
import { partitionNodeTestsByPlatform } from "./node-test-groups.mjs";

const files = discoverTestFiles(resolve("tests"));
const nodeTests = files.filter((file) => file.endsWith(".test.ts"));
Expand All@@ -12,13 +13,29 @@ if (nodeTests.length === 0 || vitestTests.length === 0) {
);
}

const nodeResult = spawnSync(
process.execPath,
["--test", "--experimental-strip-types", ...nodeTests],
{ stdio: "inherit" },
);
if (nodeResult.status !== 0) {
process.exit(nodeResult.status ?? 1);
function runNodeTests(files, options = []) {
if (files.length === 0) return 0;
const result = spawnSync(
process.execPath,
["--test", "--experimental-strip-types", ...options, ...files],
{ stdio: "inherit" },
);
return result.status ?? 1;
}

const nodeTestGroups = partitionNodeTestsByPlatform(nodeTests);
const parallelNodeResult = runNodeTests(nodeTestGroups.parallel);
if (parallelNodeResult !== 0) {
process.exit(parallelNodeResult);
}

// Windows process-tree tests must not overlap unrelated Node test files.
// Keep the rest of the suite on Node's default file-level concurrency.
const serialNodeResult = runNodeTests(nodeTestGroups.serial, [
"--test-concurrency=1",
]);
if (serialNodeResult !== 0) {
process.exit(serialNodeResult);
}

// Invoke the CLI module through Node instead of the package-manager shim.
Expand Down
2 changes: 1 addition & 1 deletion tests/extensions/file-mutation-display/render.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ const fixtures: Array<{
content: [{ type: "text", text: "one\ntwo" }],
details: undefined,
},
success: /Read\s+src\/long-file\.ts:10-29/,
success: /Read\s+src[\\/]long-file\.ts:10-29/,
},
{
name: "bash",
Expand Down
13 changes: 8 additions & 5 deletions tests/extensions/file-search/index.spec.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -232,17 +232,19 @@ it.effect("binary resolution: fdfind is accepted as a system fd", () =>

it.effect("binary resolution: an existing cached binary is used silently", () =>
Effect.gen(function* () {
const env = makeEnv({ available: ["/cache/bin/rg"] });
const binDir = join("/cache", "bin");
const cachedBinary = join(binDir, "rg");
const env = makeEnv({ available: [cachedBinary] });
const resolved = yield* resolveBinary(
TOOL_SPECS.rg,
"/cache/bin",
binDir,
darwinArm,
env,
);

assert.deepEqual(resolved, {
tool: "rg",
command: "/cache/bin/rg",
command: cachedBinary,
source: "cached",
});
assert.equal(env.installs.length, 0);
Expand All@@ -253,16 +255,17 @@ it.effect(
"binary resolution: missing everywhere triggers exactly one install",
() =>
Effect.gen(function* () {
const binDir = join("/repo", "bin");
const env = makeEnv({ available: [] });
const resolved = yield* resolveBinary(
TOOL_SPECS.rg,
"/repo/bin",
binDir,
darwinArm,
env,
);

assert.equal(resolved.source, "installed");
assert.equal(resolved.command, "/repo/bin/rg");
assert.equal(resolved.command, join(binDir, "rg"));
assert.equal(env.installs.length, 1);
assert.match(
env.installs[0].url,
Expand Down
88 changes: 72 additions & 16 deletions tests/extensions/git-info/index.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import assert from "node:assert/strict";
import {
chmodSync,
copyFileSync,
existsSync,
mkdirSync,
mkdtempSync,
Expand All@@ -9,7 +10,7 @@ import {
writeFileSync,
} from "node:fs";
import { tmpdir } from "node:os";
import { join } from "node:path";
import { delimiter, join } from "node:path";
import test from "node:test";
import type {
ExtensionAPI,
Expand All@@ -32,10 +33,46 @@ test("automatic refresh stays local until /pr explicitly requests GitHub data",
const callLog = join(root, "gh-calls.log");
mkdirSync(bin);

const gitPath = join(bin, "git");
writeFileSync(
gitPath,
`#!/bin/sh
const isWindows = process.platform === "win32";
const gitPath = join(bin, isWindows ? "git.exe" : "git");
const ghPath = join(bin, isWindows ? "gh.exe" : "gh");
const commandRunner = join(root, "command-runner.cjs");
if (isWindows) {
// Direct Node spawning does not resolve .cmd fixtures without a shell, so
// use copied Node executables with a per-process command shim instead.
writeFileSync(
commandRunner,
`const { appendFileSync } = require("node:fs");
const command = /[\\\\/]git\\.exe$/i.test(process.execPath)
? "git"
: /[\\\\/]gh\\.exe$/i.test(process.execPath)
? "gh"
: null;
const args = [
...(process.argv[1]?.split(/[\\\\/]/).pop() ? [process.argv[1].split(/[\\\\/]/).pop()] : []),
...process.argv.slice(2),
];
if (command === "git") {
const key = \`\${args[0] ?? ""} \${args[1] ?? ""}\`;
if (key === "rev-parse --is-inside-work-tree") process.stdout.write("true\\n");
else if (key === "branch --show-current") process.stdout.write("main\\n");
else if (key === "rev-parse --short") process.stdout.write("abc123\\n");
else if (key === "status --porcelain=v1") process.stdout.write(" M local.ts\\n?? new.ts\\n");
else process.exitCode = 2;
process.exit();
} else if (command === "gh") {
appendFileSync(process.env.GH_CALL_LOG, args.join(" ") + "\\n");
process.stdout.write("{\\"number\\":42,\\"url\\":\\"https://example.test/pr/42\\",\\"state\\":\\"OPEN\\",\\"isDraft\\":false}\\n");
process.exit();
}
`,
);
copyFileSync(process.execPath, gitPath);
copyFileSync(process.execPath, ghPath);
} else {
writeFileSync(
gitPath,
`#!/bin/sh
case "$1 $2" in
"rev-parse --is-inside-work-tree") echo true ;;
"branch --show-current") echo main ;;
Expand All@@ -44,23 +81,31 @@ case "$1 $2" in
*) exit 2 ;;
esac
`,
);
chmodSync(gitPath, 0o755);

const ghPath = join(bin, "gh");
writeFileSync(
ghPath,
`#!/bin/sh
);
chmodSync(gitPath, 0o755);
writeFileSync(
ghPath,
`#!/bin/sh
printf '%s\\n' "$*" >> "$GH_CALL_LOG"
printf '%s\\n' '{"number":42,"url":"https://example.test/pr/42","state":"OPEN","isDraft":false}'
`,
);
chmodSync(ghPath, 0o755);
);
chmodSync(ghPath, 0o755);
}

const previousPath = process.env.PATH;
const previousLog = process.env.GH_CALL_LOG;
process.env.PATH = `${bin}:${previousPath ?? ""}`;
const previousNodeOptions = process.env.NODE_OPTIONS;
process.env.PATH = `${bin}${delimiter}${previousPath ?? ""}`;
process.env.GH_CALL_LOG = callLog;
if (isWindows) {
process.env.NODE_OPTIONS = [
previousNodeOptions,
`--require=${commandRunner}`,
]
.filter(Boolean)
.join(" ");
}

const hooks = new Map<
string,
Expand DownExpand Up@@ -110,7 +155,16 @@ printf '%s\\n' '{"number":42,"url":"https://example.test/pr/42","state":"OPEN","

try {
await hooks.get("session_start")?.({}, ctx);
const local = await localPublished;
let timeoutHandle: ReturnType<typeof setTimeout> | undefined;
const local = await Promise.race([
localPublished,
new Promise<never>((_, reject) => {
timeoutHandle = setTimeout(
() => reject(new Error("Timed out waiting for local git info")),
5_000,
);
}),
]).finally(() => clearTimeout(timeoutHandle));
assert.equal(local.branch, "main");
assert.equal(local.changedFiles, 2);
assert.equal(local.pullRequest, null);
Expand All@@ -127,6 +181,8 @@ printf '%s\\n' '{"number":42,"url":"https://example.test/pr/42","state":"OPEN","
process.env.PATH = previousPath;
if (previousLog === undefined) delete process.env.GH_CALL_LOG;
else process.env.GH_CALL_LOG = previousLog;
if (previousNodeOptions === undefined) delete process.env.NODE_OPTIONS;
else process.env.NODE_OPTIONS = previousNodeOptions;
rmSync(root, { recursive: true, force: true });
}
});
12 changes: 9 additions & 3 deletions tests/extensions/sessions/git-stats.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import assert from "node:assert/strict";
import { mkdtemp, mkdir, rm, symlink } from "node:fs/promises";
import { tmpdir } from "node:os";
import { join } from "node:path";
import { join, resolve } from "node:path";
import test from "node:test";
import { createSessionStatsLoader } from "../../../extensions/sessions/git-stats.ts";
import type { SessionInfoLike } from "../../../extensions/sessions/sessions.ts";
Expand DownExpand Up@@ -105,6 +105,7 @@ test("overlapping viewport work is retained while work that leaves is cancelled"
});
const loader = createSessionStatsLoader({
maxConcurrency: 4,
canonicalizeCwd: async (cwd) => cwd,
runGit: (args, cwd, signal) => {
const id = `${cwd}:${args[0]}`;
started.push(id);
Expand DownExpand Up@@ -140,7 +141,8 @@ test("overlapping viewport work is retained while work that leaves is cancelled"

assert.equal(aborted.length, 4);
assert.equal(
started.filter((entry) => entry.startsWith("/tmp/project-2:")).length,
started.filter((entry) => entry.startsWith(`${resolve("/tmp/project-2")}:`))
.length,
2,
"overlapping work must not restart",
);
Expand DownExpand Up@@ -219,7 +221,11 @@ test("real and symlink workspace paths share one canonical latest bucket", async
const alias = join(root, "alias");
try {
await mkdir(workspace);
await symlink(workspace, alias);
await symlink(
workspace,
alias,
process.platform === "win32" ? "junction" : "dir",
);
const [newest, older] = makeSessions(2).map((entry, index) => ({
...entry,
cwd: index === 0 ? workspace : alias,
Expand Down
18 changes: 12 additions & 6 deletions tests/extensions/sessions/preview-loader.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import assert from "node:assert/strict";
import { appendFileSync, renameSync } from "node:fs";
import { appendFileSync, renameSync, writeFileSync } from "node:fs";
import { mkdtemp, readFile, rm, stat, writeFile } from "node:fs/promises";
import { tmpdir } from "node:os";
import { join } from "node:path";
Expand DownExpand Up@@ -399,10 +399,10 @@ for (const version of [1, 3]) {
: [header(3), message("m1", null, "user", "replaced")];
const fixture = await writeSession(originalEntries);
const replacementPath = join(fixture.directory, "replacement.jsonl");
await writeFile(
replacementPath,
`${replacementEntries.map((entry) => JSON.stringify(entry)).join("\n")}\n`,
);
const replacementContent = `${replacementEntries
.map((entry) => JSON.stringify(entry))
.join("\n")}\n`;
await writeFile(replacementPath, replacementContent);
t.after(() => rm(fixture.directory, { recursive: true, force: true }));

let replaced = false;
Expand All@@ -411,7 +411,13 @@ for (const version of [1, 3]) {
onRead: () => {
if (replaced) return;
replaced = true;
renameSync(replacementPath, fixture.path);
if (process.platform === "win32") {
// Windows rejects rename-over-open. An in-place replacement still
// exercises the loader's changed-file rejection on that platform.
writeFileSync(fixture.path, `${replacementContent}\n`);
} else {
renameSync(replacementPath, fixture.path);
}
},
}),
/changed while preview was loading/,
Expand Down
24 changes: 19 additions & 5 deletions tests/extensions/shared/worktree.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -554,7 +554,12 @@ describe("worktree lifecycle", () => {
`child ${index}\n`,
);
}
assert.equal(fs.readFileSync(path.join(repo, "a.txt"), "utf8"), "hello\n");
assert.equal(
fs
.readFileSync(path.join(repo, "a.txt"), "utf8")
.replaceAll("\r\n", "\n"),
"hello\n",
);

for (const worktree of worktrees) {
if (!worktree) continue;
Expand All@@ -577,10 +582,19 @@ describe("worktree lifecycle", () => {
});
assert.ok(inner.ok);
if (!inner.ok) return;
assert.equal(
// realpath because git resolves symlinks and macOS tmpdirs are one.
fs.realpathSync(path.dirname(path.dirname(inner.worktree.path))),
fs.realpathSync(path.join(repo, ".git")),
const worktreeContainer = fs.statSync(
path.dirname(path.dirname(inner.worktree.path)),
);
const commonGitDirectory = fs.statSync(path.join(repo, ".git"));
assert.deepEqual(
{
dev: worktreeContainer.dev,
ino: worktreeContainer.ino,
},
{
dev: commonGitDirectory.dev,
ino: commonGitDirectory.ino,
},
);

git(repo, "worktree", "remove", "--force", inner.worktree.path);
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
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
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,3 +117,6 @@ jobs:
"extensions/background-terminals/manager.test.ts"
}
node --test --experimental-strip-types $testPath
- name: Test Windows full-suite isolation
timeout-minutes: 5
run: bun run test
4 changes: 4 additions & 0 deletions scripts/node-test-groups.d.mts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
export function partitionNodeTestsByPlatform(
files: string[],
platform?: NodeJS.Platform,
): { parallel: string[]; serial: string[] };
33 changes: 33 additions & 0 deletions scripts/node-test-groups.mjs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import { isAbsolute, relative, resolve, sep } from "node:path";

const backgroundTerminalsRoot = resolve(
"tests",
"extensions",
"background-terminals",
);

function isBackgroundTerminalsTest(file) {
const relativePath = relative(backgroundTerminalsRoot, file);
return (
relativePath !== "" &&
relativePath !== ".." &&
!relativePath.startsWith(`..${sep}`) &&
!isAbsolute(relativePath)
);
}

export function partitionNodeTestsByPlatform(
files,
platform = process.platform,
) {
if (platform !== "win32") {
return { parallel: files, serial: [] };
}

const parallel = [];
const serial = [];
for (const file of files) {
(isBackgroundTerminalsTest(file) ? serial : parallel).push(file);
}
return { parallel, serial };
}
31 changes: 24 additions & 7 deletions scripts/run-tests.mjs
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { spawnSync } from "node:child_process";
import { resolve } from "node:path";
import { discoverTestFiles } from "./discover-tests.mjs";
import { partitionNodeTestsByPlatform } from "./node-test-groups.mjs";

const files = discoverTestFiles(resolve("tests"));
const nodeTests = files.filter((file) => file.endsWith(".test.ts"));
Expand All@@ -12,13 +13,29 @@ if (nodeTests.length === 0 || vitestTests.length === 0) {
);
}

const nodeResult = spawnSync(
process.execPath,
["--test", "--experimental-strip-types", ...nodeTests],
{ stdio: "inherit" },
);
if (nodeResult.status !== 0) {
process.exit(nodeResult.status ?? 1);
function runNodeTests(files, options = []) {
if (files.length === 0) return 0;
const result = spawnSync(
process.execPath,
["--test", "--experimental-strip-types", ...options, ...files],
{ stdio: "inherit" },
);
return result.status ?? 1;
}

const nodeTestGroups = partitionNodeTestsByPlatform(nodeTests);
const parallelNodeResult = runNodeTests(nodeTestGroups.parallel);
if (parallelNodeResult !== 0) {
process.exit(parallelNodeResult);
}

// Windows process-tree tests must not overlap unrelated Node test files.
// Keep the rest of the suite on Node's default file-level concurrency.
const serialNodeResult = runNodeTests(nodeTestGroups.serial, [
"--test-concurrency=1",
]);
if (serialNodeResult !== 0) {
process.exit(serialNodeResult);
}

// Invoke the CLI module through Node instead of the package-manager shim.
Expand Down
2 changes: 1 addition & 1 deletion tests/extensions/file-mutation-display/render.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ const fixtures: Array<{
content: [{ type: "text", text: "one\ntwo" }],
details: undefined,
},
success: /Read\s+src\/long-file\.ts:10-29/,
success: /Read\s+src[\\/]long-file\.ts:10-29/,
},
{
name: "bash",
Expand Down
13 changes: 8 additions & 5 deletions tests/extensions/file-search/index.spec.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -232,17 +232,19 @@ it.effect("binary resolution: fdfind is accepted as a system fd", () =>

it.effect("binary resolution: an existing cached binary is used silently", () =>
Effect.gen(function* () {
const env = makeEnv({ available: ["/cache/bin/rg"] });
const binDir = join("/cache", "bin");
const cachedBinary = join(binDir, "rg");
const env = makeEnv({ available: [cachedBinary] });
const resolved = yield* resolveBinary(
TOOL_SPECS.rg,
"/cache/bin",
binDir,
darwinArm,
env,
);

assert.deepEqual(resolved, {
tool: "rg",
command: "/cache/bin/rg",
command: cachedBinary,
source: "cached",
});
assert.equal(env.installs.length, 0);
Expand All@@ -253,16 +255,17 @@ it.effect(
"binary resolution: missing everywhere triggers exactly one install",
() =>
Effect.gen(function* () {
const binDir = join("/repo", "bin");
const env = makeEnv({ available: [] });
const resolved = yield* resolveBinary(
TOOL_SPECS.rg,
"/repo/bin",
binDir,
darwinArm,
env,
);

assert.equal(resolved.source, "installed");
assert.equal(resolved.command, "/repo/bin/rg");
assert.equal(resolved.command, join(binDir, "rg"));
assert.equal(env.installs.length, 1);
assert.match(
env.installs[0].url,
Expand Down
88 changes: 72 additions & 16 deletions tests/extensions/git-info/index.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import assert from "node:assert/strict";
import {
chmodSync,
copyFileSync,
existsSync,
mkdirSync,
mkdtempSync,
Expand All@@ -9,7 +10,7 @@ import {
writeFileSync,
} from "node:fs";
import { tmpdir } from "node:os";
import { join } from "node:path";
import { delimiter, join } from "node:path";
import test from "node:test";
import type {
ExtensionAPI,
Expand All@@ -32,10 +33,46 @@ test("automatic refresh stays local until /pr explicitly requests GitHub data",
const callLog = join(root, "gh-calls.log");
mkdirSync(bin);

const gitPath = join(bin, "git");
writeFileSync(
gitPath,
`#!/bin/sh
const isWindows = process.platform === "win32";
const gitPath = join(bin, isWindows ? "git.exe" : "git");
const ghPath = join(bin, isWindows ? "gh.exe" : "gh");
const commandRunner = join(root, "command-runner.cjs");
if (isWindows) {
// Direct Node spawning does not resolve .cmd fixtures without a shell, so
// use copied Node executables with a per-process command shim instead.
writeFileSync(
commandRunner,
`const { appendFileSync } = require("node:fs");
const command = /[\\\\/]git\\.exe$/i.test(process.execPath)
? "git"
: /[\\\\/]gh\\.exe$/i.test(process.execPath)
? "gh"
: null;
const args = [
...(process.argv[1]?.split(/[\\\\/]/).pop() ? [process.argv[1].split(/[\\\\/]/).pop()] : []),
...process.argv.slice(2),
];
if (command === "git") {
const key = \`\${args[0] ?? ""} \${args[1] ?? ""}\`;
if (key === "rev-parse --is-inside-work-tree") process.stdout.write("true\\n");
else if (key === "branch --show-current") process.stdout.write("main\\n");
else if (key === "rev-parse --short") process.stdout.write("abc123\\n");
else if (key === "status --porcelain=v1") process.stdout.write(" M local.ts\\n?? new.ts\\n");
else process.exitCode = 2;
process.exit();
} else if (command === "gh") {
appendFileSync(process.env.GH_CALL_LOG, args.join(" ") + "\\n");
process.stdout.write("{\\"number\\":42,\\"url\\":\\"https://example.test/pr/42\\",\\"state\\":\\"OPEN\\",\\"isDraft\\":false}\\n");
process.exit();
}
`,
);
copyFileSync(process.execPath, gitPath);
copyFileSync(process.execPath, ghPath);
} else {
writeFileSync(
gitPath,
`#!/bin/sh
case "$1 $2" in
"rev-parse --is-inside-work-tree") echo true ;;
"branch --show-current") echo main ;;
Expand All@@ -44,23 +81,31 @@ case "$1 $2" in
*) exit 2 ;;
esac
`,
);
chmodSync(gitPath, 0o755);

const ghPath = join(bin, "gh");
writeFileSync(
ghPath,
`#!/bin/sh
);
chmodSync(gitPath, 0o755);
writeFileSync(
ghPath,
`#!/bin/sh
printf '%s\\n' "$*" >> "$GH_CALL_LOG"
printf '%s\\n' '{"number":42,"url":"https://example.test/pr/42","state":"OPEN","isDraft":false}'
`,
);
chmodSync(ghPath, 0o755);
);
chmodSync(ghPath, 0o755);
}

const previousPath = process.env.PATH;
const previousLog = process.env.GH_CALL_LOG;
process.env.PATH = `${bin}:${previousPath ?? ""}`;
const previousNodeOptions = process.env.NODE_OPTIONS;
process.env.PATH = `${bin}${delimiter}${previousPath ?? ""}`;
process.env.GH_CALL_LOG = callLog;
if (isWindows) {
process.env.NODE_OPTIONS = [
previousNodeOptions,
`--require=${commandRunner}`,
]
.filter(Boolean)
.join(" ");
}

const hooks = new Map<
string,
Expand DownExpand Up@@ -110,7 +155,16 @@ printf '%s\\n' '{"number":42,"url":"https://example.test/pr/42","state":"OPEN","

try {
await hooks.get("session_start")?.({}, ctx);
const local = await localPublished;
let timeoutHandle: ReturnType<typeof setTimeout> | undefined;
const local = await Promise.race([
localPublished,
new Promise<never>((_, reject) => {
timeoutHandle = setTimeout(
() => reject(new Error("Timed out waiting for local git info")),
5_000,
);
}),
]).finally(() => clearTimeout(timeoutHandle));
assert.equal(local.branch, "main");
assert.equal(local.changedFiles, 2);
assert.equal(local.pullRequest, null);
Expand All@@ -127,6 +181,8 @@ printf '%s\\n' '{"number":42,"url":"https://example.test/pr/42","state":"OPEN","
process.env.PATH = previousPath;
if (previousLog === undefined) delete process.env.GH_CALL_LOG;
else process.env.GH_CALL_LOG = previousLog;
if (previousNodeOptions === undefined) delete process.env.NODE_OPTIONS;
else process.env.NODE_OPTIONS = previousNodeOptions;
rmSync(root, { recursive: true, force: true });
}
});
12 changes: 9 additions & 3 deletions tests/extensions/sessions/git-stats.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import assert from "node:assert/strict";
import { mkdtemp, mkdir, rm, symlink } from "node:fs/promises";
import { tmpdir } from "node:os";
import { join } from "node:path";
import { join, resolve } from "node:path";
import test from "node:test";
import { createSessionStatsLoader } from "../../../extensions/sessions/git-stats.ts";
import type { SessionInfoLike } from "../../../extensions/sessions/sessions.ts";
Expand DownExpand Up@@ -105,6 +105,7 @@ test("overlapping viewport work is retained while work that leaves is cancelled"
});
const loader = createSessionStatsLoader({
maxConcurrency: 4,
canonicalizeCwd: async (cwd) => cwd,
runGit: (args, cwd, signal) => {
const id = `${cwd}:${args[0]}`;
started.push(id);
Expand DownExpand Up@@ -140,7 +141,8 @@ test("overlapping viewport work is retained while work that leaves is cancelled"

assert.equal(aborted.length, 4);
assert.equal(
started.filter((entry) => entry.startsWith("/tmp/project-2:")).length,
started.filter((entry) => entry.startsWith(`${resolve("/tmp/project-2")}:`))
.length,
2,
"overlapping work must not restart",
);
Expand DownExpand Up@@ -219,7 +221,11 @@ test("real and symlink workspace paths share one canonical latest bucket", async
const alias = join(root, "alias");
try {
await mkdir(workspace);
await symlink(workspace, alias);
await symlink(
workspace,
alias,
process.platform === "win32" ? "junction" : "dir",
);
const [newest, older] = makeSessions(2).map((entry, index) => ({
...entry,
cwd: index === 0 ? workspace : alias,
Expand Down
18 changes: 12 additions & 6 deletions tests/extensions/sessions/preview-loader.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import assert from "node:assert/strict";
import { appendFileSync, renameSync } from "node:fs";
import { appendFileSync, renameSync, writeFileSync } from "node:fs";
import { mkdtemp, readFile, rm, stat, writeFile } from "node:fs/promises";
import { tmpdir } from "node:os";
import { join } from "node:path";
Expand DownExpand Up@@ -399,10 +399,10 @@ for (const version of [1, 3]) {
: [header(3), message("m1", null, "user", "replaced")];
const fixture = await writeSession(originalEntries);
const replacementPath = join(fixture.directory, "replacement.jsonl");
await writeFile(
replacementPath,
`${replacementEntries.map((entry) => JSON.stringify(entry)).join("\n")}\n`,
);
const replacementContent = `${replacementEntries
.map((entry) => JSON.stringify(entry))
.join("\n")}\n`;
await writeFile(replacementPath, replacementContent);
t.after(() => rm(fixture.directory, { recursive: true, force: true }));

let replaced = false;
Expand All@@ -411,7 +411,13 @@ for (const version of [1, 3]) {
onRead: () => {
if (replaced) return;
replaced = true;
renameSync(replacementPath, fixture.path);
if (process.platform === "win32") {
// Windows rejects rename-over-open. An in-place replacement still
// exercises the loader's changed-file rejection on that platform.
writeFileSync(fixture.path, `${replacementContent}\n`);
} else {
renameSync(replacementPath, fixture.path);
}
},
}),
/changed while preview was loading/,
Expand Down
24 changes: 19 additions & 5 deletions tests/extensions/shared/worktree.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -554,7 +554,12 @@ describe("worktree lifecycle", () => {
`child ${index}\n`,
);
}
assert.equal(fs.readFileSync(path.join(repo, "a.txt"), "utf8"), "hello\n");
assert.equal(
fs
.readFileSync(path.join(repo, "a.txt"), "utf8")
.replaceAll("\r\n", "\n"),
"hello\n",
);

for (const worktree of worktrees) {
if (!worktree) continue;
Expand All@@ -577,10 +582,19 @@ describe("worktree lifecycle", () => {
});
assert.ok(inner.ok);
if (!inner.ok) return;
assert.equal(
// realpath because git resolves symlinks and macOS tmpdirs are one.
fs.realpathSync(path.dirname(path.dirname(inner.worktree.path))),
fs.realpathSync(path.join(repo, ".git")),
const worktreeContainer = fs.statSync(
path.dirname(path.dirname(inner.worktree.path)),
);
const commonGitDirectory = fs.statSync(path.join(repo, ".git"));
assert.deepEqual(
{
dev: worktreeContainer.dev,
ino: worktreeContainer.ino,
},
{
dev: commonGitDirectory.dev,
ino: commonGitDirectory.ino,
},
);

git(repo, "worktree", "remove", "--force", inner.worktree.path);
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
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
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,3 +117,6 @@ jobs:
"extensions/background-terminals/manager.test.ts"
}
node --test --experimental-strip-types $testPath
- name: Test Windows full-suite isolation
timeout-minutes: 5
run: bun run test
4 changes: 4 additions & 0 deletions scripts/node-test-groups.d.mts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
export function partitionNodeTestsByPlatform(
files: string[],
platform?: NodeJS.Platform,
): { parallel: string[]; serial: string[] };
33 changes: 33 additions & 0 deletions scripts/node-test-groups.mjs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import { isAbsolute, relative, resolve, sep } from "node:path";

const backgroundTerminalsRoot = resolve(
"tests",
"extensions",
"background-terminals",
);

function isBackgroundTerminalsTest(file) {
const relativePath = relative(backgroundTerminalsRoot, file);
return (
relativePath !== "" &&
relativePath !== ".." &&
!relativePath.startsWith(`..${sep}`) &&
!isAbsolute(relativePath)
);
}

export function partitionNodeTestsByPlatform(
files,
platform = process.platform,
) {
if (platform !== "win32") {
return { parallel: files, serial: [] };
}

const parallel = [];
const serial = [];
for (const file of files) {
(isBackgroundTerminalsTest(file) ? serial : parallel).push(file);
}
return { parallel, serial };
}
31 changes: 24 additions & 7 deletions scripts/run-tests.mjs
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { spawnSync } from "node:child_process";
import { resolve } from "node:path";
import { discoverTestFiles } from "./discover-tests.mjs";
import { partitionNodeTestsByPlatform } from "./node-test-groups.mjs";

const files = discoverTestFiles(resolve("tests"));
const nodeTests = files.filter((file) => file.endsWith(".test.ts"));
Expand All@@ -12,13 +13,29 @@ if (nodeTests.length === 0 || vitestTests.length === 0) {
);
}

const nodeResult = spawnSync(
process.execPath,
["--test", "--experimental-strip-types", ...nodeTests],
{ stdio: "inherit" },
);
if (nodeResult.status !== 0) {
process.exit(nodeResult.status ?? 1);
function runNodeTests(files, options = []) {
if (files.length === 0) return 0;
const result = spawnSync(
process.execPath,
["--test", "--experimental-strip-types", ...options, ...files],
{ stdio: "inherit" },
);
return result.status ?? 1;
}

const nodeTestGroups = partitionNodeTestsByPlatform(nodeTests);
const parallelNodeResult = runNodeTests(nodeTestGroups.parallel);
if (parallelNodeResult !== 0) {
process.exit(parallelNodeResult);
}

// Windows process-tree tests must not overlap unrelated Node test files.
// Keep the rest of the suite on Node's default file-level concurrency.
const serialNodeResult = runNodeTests(nodeTestGroups.serial, [
"--test-concurrency=1",
]);
if (serialNodeResult !== 0) {
process.exit(serialNodeResult);
}

// Invoke the CLI module through Node instead of the package-manager shim.
Expand Down
2 changes: 1 addition & 1 deletion tests/extensions/file-mutation-display/render.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ const fixtures: Array<{
content: [{ type: "text", text: "one\ntwo" }],
details: undefined,
},
success: /Read\s+src\/long-file\.ts:10-29/,
success: /Read\s+src[\\/]long-file\.ts:10-29/,
},
{
name: "bash",
Expand Down
13 changes: 8 additions & 5 deletions tests/extensions/file-search/index.spec.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -232,17 +232,19 @@ it.effect("binary resolution: fdfind is accepted as a system fd", () =>

it.effect("binary resolution: an existing cached binary is used silently", () =>
Effect.gen(function* () {
const env = makeEnv({ available: ["/cache/bin/rg"] });
const binDir = join("/cache", "bin");
const cachedBinary = join(binDir, "rg");
const env = makeEnv({ available: [cachedBinary] });
const resolved = yield* resolveBinary(
TOOL_SPECS.rg,
"/cache/bin",
binDir,
darwinArm,
env,
);

assert.deepEqual(resolved, {
tool: "rg",
command: "/cache/bin/rg",
command: cachedBinary,
source: "cached",
});
assert.equal(env.installs.length, 0);
Expand All@@ -253,16 +255,17 @@ it.effect(
"binary resolution: missing everywhere triggers exactly one install",
() =>
Effect.gen(function* () {
const binDir = join("/repo", "bin");
const env = makeEnv({ available: [] });
const resolved = yield* resolveBinary(
TOOL_SPECS.rg,
"/repo/bin",
binDir,
darwinArm,
env,
);

assert.equal(resolved.source, "installed");
assert.equal(resolved.command, "/repo/bin/rg");
assert.equal(resolved.command, join(binDir, "rg"));
assert.equal(env.installs.length, 1);
assert.match(
env.installs[0].url,
Expand Down
88 changes: 72 additions & 16 deletions tests/extensions/git-info/index.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import assert from "node:assert/strict";
import {
chmodSync,
copyFileSync,
existsSync,
mkdirSync,
mkdtempSync,
Expand All@@ -9,7 +10,7 @@ import {
writeFileSync,
} from "node:fs";
import { tmpdir } from "node:os";
import { join } from "node:path";
import { delimiter, join } from "node:path";
import test from "node:test";
import type {
ExtensionAPI,
Expand All@@ -32,10 +33,46 @@ test("automatic refresh stays local until /pr explicitly requests GitHub data",
const callLog = join(root, "gh-calls.log");
mkdirSync(bin);

const gitPath = join(bin, "git");
writeFileSync(
gitPath,
`#!/bin/sh
const isWindows = process.platform === "win32";
const gitPath = join(bin, isWindows ? "git.exe" : "git");
const ghPath = join(bin, isWindows ? "gh.exe" : "gh");
const commandRunner = join(root, "command-runner.cjs");
if (isWindows) {
// Direct Node spawning does not resolve .cmd fixtures without a shell, so
// use copied Node executables with a per-process command shim instead.
writeFileSync(
commandRunner,
`const { appendFileSync } = require("node:fs");
const command = /[\\\\/]git\\.exe$/i.test(process.execPath)
? "git"
: /[\\\\/]gh\\.exe$/i.test(process.execPath)
? "gh"
: null;
const args = [
...(process.argv[1]?.split(/[\\\\/]/).pop() ? [process.argv[1].split(/[\\\\/]/).pop()] : []),
...process.argv.slice(2),
];
if (command === "git") {
const key = \`\${args[0] ?? ""} \${args[1] ?? ""}\`;
if (key === "rev-parse --is-inside-work-tree") process.stdout.write("true\\n");
else if (key === "branch --show-current") process.stdout.write("main\\n");
else if (key === "rev-parse --short") process.stdout.write("abc123\\n");
else if (key === "status --porcelain=v1") process.stdout.write(" M local.ts\\n?? new.ts\\n");
else process.exitCode = 2;
process.exit();
} else if (command === "gh") {
appendFileSync(process.env.GH_CALL_LOG, args.join(" ") + "\\n");
process.stdout.write("{\\"number\\":42,\\"url\\":\\"https://example.test/pr/42\\",\\"state\\":\\"OPEN\\",\\"isDraft\\":false}\\n");
process.exit();
}
`,
);
copyFileSync(process.execPath, gitPath);
copyFileSync(process.execPath, ghPath);
} else {
writeFileSync(
gitPath,
`#!/bin/sh
case "$1 $2" in
"rev-parse --is-inside-work-tree") echo true ;;
"branch --show-current") echo main ;;
Expand All@@ -44,23 +81,31 @@ case "$1 $2" in
*) exit 2 ;;
esac
`,
);
chmodSync(gitPath, 0o755);

const ghPath = join(bin, "gh");
writeFileSync(
ghPath,
`#!/bin/sh
);
chmodSync(gitPath, 0o755);
writeFileSync(
ghPath,
`#!/bin/sh
printf '%s\\n' "$*" >> "$GH_CALL_LOG"
printf '%s\\n' '{"number":42,"url":"https://example.test/pr/42","state":"OPEN","isDraft":false}'
`,
);
chmodSync(ghPath, 0o755);
);
chmodSync(ghPath, 0o755);
}

const previousPath = process.env.PATH;
const previousLog = process.env.GH_CALL_LOG;
process.env.PATH = `${bin}:${previousPath ?? ""}`;
const previousNodeOptions = process.env.NODE_OPTIONS;
process.env.PATH = `${bin}${delimiter}${previousPath ?? ""}`;
process.env.GH_CALL_LOG = callLog;
if (isWindows) {
process.env.NODE_OPTIONS = [
previousNodeOptions,
`--require=${commandRunner}`,
]
.filter(Boolean)
.join(" ");
}

const hooks = new Map<
string,
Expand DownExpand Up@@ -110,7 +155,16 @@ printf '%s\\n' '{"number":42,"url":"https://example.test/pr/42","state":"OPEN","

try {
await hooks.get("session_start")?.({}, ctx);
const local = await localPublished;
let timeoutHandle: ReturnType<typeof setTimeout> | undefined;
const local = await Promise.race([
localPublished,
new Promise<never>((_, reject) => {
timeoutHandle = setTimeout(
() => reject(new Error("Timed out waiting for local git info")),
5_000,
);
}),
]).finally(() => clearTimeout(timeoutHandle));
assert.equal(local.branch, "main");
assert.equal(local.changedFiles, 2);
assert.equal(local.pullRequest, null);
Expand All@@ -127,6 +181,8 @@ printf '%s\\n' '{"number":42,"url":"https://example.test/pr/42","state":"OPEN","
process.env.PATH = previousPath;
if (previousLog === undefined) delete process.env.GH_CALL_LOG;
else process.env.GH_CALL_LOG = previousLog;
if (previousNodeOptions === undefined) delete process.env.NODE_OPTIONS;
else process.env.NODE_OPTIONS = previousNodeOptions;
rmSync(root, { recursive: true, force: true });
}
});
12 changes: 9 additions & 3 deletions tests/extensions/sessions/git-stats.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import assert from "node:assert/strict";
import { mkdtemp, mkdir, rm, symlink } from "node:fs/promises";
import { tmpdir } from "node:os";
import { join } from "node:path";
import { join, resolve } from "node:path";
import test from "node:test";
import { createSessionStatsLoader } from "../../../extensions/sessions/git-stats.ts";
import type { SessionInfoLike } from "../../../extensions/sessions/sessions.ts";
Expand DownExpand Up@@ -105,6 +105,7 @@ test("overlapping viewport work is retained while work that leaves is cancelled"
});
const loader = createSessionStatsLoader({
maxConcurrency: 4,
canonicalizeCwd: async (cwd) => cwd,
runGit: (args, cwd, signal) => {
const id = `${cwd}:${args[0]}`;
started.push(id);
Expand DownExpand Up@@ -140,7 +141,8 @@ test("overlapping viewport work is retained while work that leaves is cancelled"

assert.equal(aborted.length, 4);
assert.equal(
started.filter((entry) => entry.startsWith("/tmp/project-2:")).length,
started.filter((entry) => entry.startsWith(`${resolve("/tmp/project-2")}:`))
.length,
2,
"overlapping work must not restart",
);
Expand DownExpand Up@@ -219,7 +221,11 @@ test("real and symlink workspace paths share one canonical latest bucket", async
const alias = join(root, "alias");
try {
await mkdir(workspace);
await symlink(workspace, alias);
await symlink(
workspace,
alias,
process.platform === "win32" ? "junction" : "dir",
);
const [newest, older] = makeSessions(2).map((entry, index) => ({
...entry,
cwd: index === 0 ? workspace : alias,
Expand Down
18 changes: 12 additions & 6 deletions tests/extensions/sessions/preview-loader.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import assert from "node:assert/strict";
import { appendFileSync, renameSync } from "node:fs";
import { appendFileSync, renameSync, writeFileSync } from "node:fs";
import { mkdtemp, readFile, rm, stat, writeFile } from "node:fs/promises";
import { tmpdir } from "node:os";
import { join } from "node:path";
Expand DownExpand Up@@ -399,10 +399,10 @@ for (const version of [1, 3]) {
: [header(3), message("m1", null, "user", "replaced")];
const fixture = await writeSession(originalEntries);
const replacementPath = join(fixture.directory, "replacement.jsonl");
await writeFile(
replacementPath,
`${replacementEntries.map((entry) => JSON.stringify(entry)).join("\n")}\n`,
);
const replacementContent = `${replacementEntries
.map((entry) => JSON.stringify(entry))
.join("\n")}\n`;
await writeFile(replacementPath, replacementContent);
t.after(() => rm(fixture.directory, { recursive: true, force: true }));

let replaced = false;
Expand All@@ -411,7 +411,13 @@ for (const version of [1, 3]) {
onRead: () => {
if (replaced) return;
replaced = true;
renameSync(replacementPath, fixture.path);
if (process.platform === "win32") {
// Windows rejects rename-over-open. An in-place replacement still
// exercises the loader's changed-file rejection on that platform.
writeFileSync(fixture.path, `${replacementContent}\n`);
} else {
renameSync(replacementPath, fixture.path);
}
},
}),
/changed while preview was loading/,
Expand Down
24 changes: 19 additions & 5 deletions tests/extensions/shared/worktree.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -554,7 +554,12 @@ describe("worktree lifecycle", () => {
`child ${index}\n`,
);
}
assert.equal(fs.readFileSync(path.join(repo, "a.txt"), "utf8"), "hello\n");
assert.equal(
fs
.readFileSync(path.join(repo, "a.txt"), "utf8")
.replaceAll("\r\n", "\n"),
"hello\n",
);

for (const worktree of worktrees) {
if (!worktree) continue;
Expand All@@ -577,10 +582,19 @@ describe("worktree lifecycle", () => {
});
assert.ok(inner.ok);
if (!inner.ok) return;
assert.equal(
// realpath because git resolves symlinks and macOS tmpdirs are one.
fs.realpathSync(path.dirname(path.dirname(inner.worktree.path))),
fs.realpathSync(path.join(repo, ".git")),
const worktreeContainer = fs.statSync(
path.dirname(path.dirname(inner.worktree.path)),
);
const commonGitDirectory = fs.statSync(path.join(repo, ".git"));
assert.deepEqual(
{
dev: worktreeContainer.dev,
ino: worktreeContainer.ino,
},
{
dev: commonGitDirectory.dev,
ino: commonGitDirectory.ino,
},
);

git(repo, "worktree", "remove", "--force", inner.worktree.path);
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
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
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,3 +117,6 @@ jobs:
"extensions/background-terminals/manager.test.ts"
}
node --test --experimental-strip-types $testPath
- name: Test Windows full-suite isolation
timeout-minutes: 5
run: bun run test
4 changes: 4 additions & 0 deletions scripts/node-test-groups.d.mts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
export function partitionNodeTestsByPlatform(
files: string[],
platform?: NodeJS.Platform,
): { parallel: string[]; serial: string[] };
33 changes: 33 additions & 0 deletions scripts/node-test-groups.mjs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import { isAbsolute, relative, resolve, sep } from "node:path";

const backgroundTerminalsRoot = resolve(
"tests",
"extensions",
"background-terminals",
);

function isBackgroundTerminalsTest(file) {
const relativePath = relative(backgroundTerminalsRoot, file);
return (
relativePath !== "" &&
relativePath !== ".." &&
!relativePath.startsWith(`..${sep}`) &&
!isAbsolute(relativePath)
);
}

export function partitionNodeTestsByPlatform(
files,
platform = process.platform,
) {
if (platform !== "win32") {
return { parallel: files, serial: [] };
}

const parallel = [];
const serial = [];
for (const file of files) {
(isBackgroundTerminalsTest(file) ? serial : parallel).push(file);
}
return { parallel, serial };
}
31 changes: 24 additions & 7 deletions scripts/run-tests.mjs
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { spawnSync } from "node:child_process";
import { resolve } from "node:path";
import { discoverTestFiles } from "./discover-tests.mjs";
import { partitionNodeTestsByPlatform } from "./node-test-groups.mjs";

const files = discoverTestFiles(resolve("tests"));
const nodeTests = files.filter((file) => file.endsWith(".test.ts"));
Expand All@@ -12,13 +13,29 @@ if (nodeTests.length === 0 || vitestTests.length === 0) {
);
}

const nodeResult = spawnSync(
process.execPath,
["--test", "--experimental-strip-types", ...nodeTests],
{ stdio: "inherit" },
);
if (nodeResult.status !== 0) {
process.exit(nodeResult.status ?? 1);
function runNodeTests(files, options = []) {
if (files.length === 0) return 0;
const result = spawnSync(
process.execPath,
["--test", "--experimental-strip-types", ...options, ...files],
{ stdio: "inherit" },
);
return result.status ?? 1;
}

const nodeTestGroups = partitionNodeTestsByPlatform(nodeTests);
const parallelNodeResult = runNodeTests(nodeTestGroups.parallel);
if (parallelNodeResult !== 0) {
process.exit(parallelNodeResult);
}

// Windows process-tree tests must not overlap unrelated Node test files.
// Keep the rest of the suite on Node's default file-level concurrency.
const serialNodeResult = runNodeTests(nodeTestGroups.serial, [
"--test-concurrency=1",
]);
if (serialNodeResult !== 0) {
process.exit(serialNodeResult);
}

// Invoke the CLI module through Node instead of the package-manager shim.
Expand Down
2 changes: 1 addition & 1 deletion tests/extensions/file-mutation-display/render.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ const fixtures: Array<{
content: [{ type: "text", text: "one\ntwo" }],
details: undefined,
},
success: /Read\s+src\/long-file\.ts:10-29/,
success: /Read\s+src[\\/]long-file\.ts:10-29/,
},
{
name: "bash",
Expand Down
13 changes: 8 additions & 5 deletions tests/extensions/file-search/index.spec.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -232,17 +232,19 @@ it.effect("binary resolution: fdfind is accepted as a system fd", () =>

it.effect("binary resolution: an existing cached binary is used silently", () =>
Effect.gen(function* () {
const env = makeEnv({ available: ["/cache/bin/rg"] });
const binDir = join("/cache", "bin");
const cachedBinary = join(binDir, "rg");
const env = makeEnv({ available: [cachedBinary] });
const resolved = yield* resolveBinary(
TOOL_SPECS.rg,
"/cache/bin",
binDir,
darwinArm,
env,
);

assert.deepEqual(resolved, {
tool: "rg",
command: "/cache/bin/rg",
command: cachedBinary,
source: "cached",
});
assert.equal(env.installs.length, 0);
Expand All@@ -253,16 +255,17 @@ it.effect(
"binary resolution: missing everywhere triggers exactly one install",
() =>
Effect.gen(function* () {
const binDir = join("/repo", "bin");
const env = makeEnv({ available: [] });
const resolved = yield* resolveBinary(
TOOL_SPECS.rg,
"/repo/bin",
binDir,
darwinArm,
env,
);

assert.equal(resolved.source, "installed");
assert.equal(resolved.command, "/repo/bin/rg");
assert.equal(resolved.command, join(binDir, "rg"));
assert.equal(env.installs.length, 1);
assert.match(
env.installs[0].url,
Expand Down
88 changes: 72 additions & 16 deletions tests/extensions/git-info/index.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import assert from "node:assert/strict";
import {
chmodSync,
copyFileSync,
existsSync,
mkdirSync,
mkdtempSync,
Expand All@@ -9,7 +10,7 @@ import {
writeFileSync,
} from "node:fs";
import { tmpdir } from "node:os";
import { join } from "node:path";
import { delimiter, join } from "node:path";
import test from "node:test";
import type {
ExtensionAPI,
Expand All@@ -32,10 +33,46 @@ test("automatic refresh stays local until /pr explicitly requests GitHub data",
const callLog = join(root, "gh-calls.log");
mkdirSync(bin);

const gitPath = join(bin, "git");
writeFileSync(
gitPath,
`#!/bin/sh
const isWindows = process.platform === "win32";
const gitPath = join(bin, isWindows ? "git.exe" : "git");
const ghPath = join(bin, isWindows ? "gh.exe" : "gh");
const commandRunner = join(root, "command-runner.cjs");
if (isWindows) {
// Direct Node spawning does not resolve .cmd fixtures without a shell, so
// use copied Node executables with a per-process command shim instead.
writeFileSync(
commandRunner,
`const { appendFileSync } = require("node:fs");
const command = /[\\\\/]git\\.exe$/i.test(process.execPath)
? "git"
: /[\\\\/]gh\\.exe$/i.test(process.execPath)
? "gh"
: null;
const args = [
...(process.argv[1]?.split(/[\\\\/]/).pop() ? [process.argv[1].split(/[\\\\/]/).pop()] : []),
...process.argv.slice(2),
];
if (command === "git") {
const key = \`\${args[0] ?? ""} \${args[1] ?? ""}\`;
if (key === "rev-parse --is-inside-work-tree") process.stdout.write("true\\n");
else if (key === "branch --show-current") process.stdout.write("main\\n");
else if (key === "rev-parse --short") process.stdout.write("abc123\\n");
else if (key === "status --porcelain=v1") process.stdout.write(" M local.ts\\n?? new.ts\\n");
else process.exitCode = 2;
process.exit();
} else if (command === "gh") {
appendFileSync(process.env.GH_CALL_LOG, args.join(" ") + "\\n");
process.stdout.write("{\\"number\\":42,\\"url\\":\\"https://example.test/pr/42\\",\\"state\\":\\"OPEN\\",\\"isDraft\\":false}\\n");
process.exit();
}
`,
);
copyFileSync(process.execPath, gitPath);
copyFileSync(process.execPath, ghPath);
} else {
writeFileSync(
gitPath,
`#!/bin/sh
case "$1 $2" in
"rev-parse --is-inside-work-tree") echo true ;;
"branch --show-current") echo main ;;
Expand All@@ -44,23 +81,31 @@ case "$1 $2" in
*) exit 2 ;;
esac
`,
);
chmodSync(gitPath, 0o755);

const ghPath = join(bin, "gh");
writeFileSync(
ghPath,
`#!/bin/sh
);
chmodSync(gitPath, 0o755);
writeFileSync(
ghPath,
`#!/bin/sh
printf '%s\\n' "$*" >> "$GH_CALL_LOG"
printf '%s\\n' '{"number":42,"url":"https://example.test/pr/42","state":"OPEN","isDraft":false}'
`,
);
chmodSync(ghPath, 0o755);
);
chmodSync(ghPath, 0o755);
}

const previousPath = process.env.PATH;
const previousLog = process.env.GH_CALL_LOG;
process.env.PATH = `${bin}:${previousPath ?? ""}`;
const previousNodeOptions = process.env.NODE_OPTIONS;
process.env.PATH = `${bin}${delimiter}${previousPath ?? ""}`;
process.env.GH_CALL_LOG = callLog;
if (isWindows) {
process.env.NODE_OPTIONS = [
previousNodeOptions,
`--require=${commandRunner}`,
]
.filter(Boolean)
.join(" ");
}

const hooks = new Map<
string,
Expand DownExpand Up@@ -110,7 +155,16 @@ printf '%s\\n' '{"number":42,"url":"https://example.test/pr/42","state":"OPEN","

try {
await hooks.get("session_start")?.({}, ctx);
const local = await localPublished;
let timeoutHandle: ReturnType<typeof setTimeout> | undefined;
const local = await Promise.race([
localPublished,
new Promise<never>((_, reject) => {
timeoutHandle = setTimeout(
() => reject(new Error("Timed out waiting for local git info")),
5_000,
);
}),
]).finally(() => clearTimeout(timeoutHandle));
assert.equal(local.branch, "main");
assert.equal(local.changedFiles, 2);
assert.equal(local.pullRequest, null);
Expand All@@ -127,6 +181,8 @@ printf '%s\\n' '{"number":42,"url":"https://example.test/pr/42","state":"OPEN","
process.env.PATH = previousPath;
if (previousLog === undefined) delete process.env.GH_CALL_LOG;
else process.env.GH_CALL_LOG = previousLog;
if (previousNodeOptions === undefined) delete process.env.NODE_OPTIONS;
else process.env.NODE_OPTIONS = previousNodeOptions;
rmSync(root, { recursive: true, force: true });
}
});
12 changes: 9 additions & 3 deletions tests/extensions/sessions/git-stats.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import assert from "node:assert/strict";
import { mkdtemp, mkdir, rm, symlink } from "node:fs/promises";
import { tmpdir } from "node:os";
import { join } from "node:path";
import { join, resolve } from "node:path";
import test from "node:test";
import { createSessionStatsLoader } from "../../../extensions/sessions/git-stats.ts";
import type { SessionInfoLike } from "../../../extensions/sessions/sessions.ts";
Expand DownExpand Up@@ -105,6 +105,7 @@ test("overlapping viewport work is retained while work that leaves is cancelled"
});
const loader = createSessionStatsLoader({
maxConcurrency: 4,
canonicalizeCwd: async (cwd) => cwd,
runGit: (args, cwd, signal) => {
const id = `${cwd}:${args[0]}`;
started.push(id);
Expand DownExpand Up@@ -140,7 +141,8 @@ test("overlapping viewport work is retained while work that leaves is cancelled"

assert.equal(aborted.length, 4);
assert.equal(
started.filter((entry) => entry.startsWith("/tmp/project-2:")).length,
started.filter((entry) => entry.startsWith(`${resolve("/tmp/project-2")}:`))
.length,
2,
"overlapping work must not restart",
);
Expand DownExpand Up@@ -219,7 +221,11 @@ test("real and symlink workspace paths share one canonical latest bucket", async
const alias = join(root, "alias");
try {
await mkdir(workspace);
await symlink(workspace, alias);
await symlink(
workspace,
alias,
process.platform === "win32" ? "junction" : "dir",
);
const [newest, older] = makeSessions(2).map((entry, index) => ({
...entry,
cwd: index === 0 ? workspace : alias,
Expand Down
18 changes: 12 additions & 6 deletions tests/extensions/sessions/preview-loader.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import assert from "node:assert/strict";
import { appendFileSync, renameSync } from "node:fs";
import { appendFileSync, renameSync, writeFileSync } from "node:fs";
import { mkdtemp, readFile, rm, stat, writeFile } from "node:fs/promises";
import { tmpdir } from "node:os";
import { join } from "node:path";
Expand DownExpand Up@@ -399,10 +399,10 @@ for (const version of [1, 3]) {
: [header(3), message("m1", null, "user", "replaced")];
const fixture = await writeSession(originalEntries);
const replacementPath = join(fixture.directory, "replacement.jsonl");
await writeFile(
replacementPath,
`${replacementEntries.map((entry) => JSON.stringify(entry)).join("\n")}\n`,
);
const replacementContent = `${replacementEntries
.map((entry) => JSON.stringify(entry))
.join("\n")}\n`;
await writeFile(replacementPath, replacementContent);
t.after(() => rm(fixture.directory, { recursive: true, force: true }));

let replaced = false;
Expand All@@ -411,7 +411,13 @@ for (const version of [1, 3]) {
onRead: () => {
if (replaced) return;
replaced = true;
renameSync(replacementPath, fixture.path);
if (process.platform === "win32") {
// Windows rejects rename-over-open. An in-place replacement still
// exercises the loader's changed-file rejection on that platform.
writeFileSync(fixture.path, `${replacementContent}\n`);
} else {
renameSync(replacementPath, fixture.path);
}
},
}),
/changed while preview was loading/,
Expand Down
24 changes: 19 additions & 5 deletions tests/extensions/shared/worktree.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -554,7 +554,12 @@ describe("worktree lifecycle", () => {
`child ${index}\n`,
);
}
assert.equal(fs.readFileSync(path.join(repo, "a.txt"), "utf8"), "hello\n");
assert.equal(
fs
.readFileSync(path.join(repo, "a.txt"), "utf8")
.replaceAll("\r\n", "\n"),
"hello\n",
);

for (const worktree of worktrees) {
if (!worktree) continue;
Expand All@@ -577,10 +582,19 @@ describe("worktree lifecycle", () => {
});
assert.ok(inner.ok);
if (!inner.ok) return;
assert.equal(
// realpath because git resolves symlinks and macOS tmpdirs are one.
fs.realpathSync(path.dirname(path.dirname(inner.worktree.path))),
fs.realpathSync(path.join(repo, ".git")),
const worktreeContainer = fs.statSync(
path.dirname(path.dirname(inner.worktree.path)),
);
const commonGitDirectory = fs.statSync(path.join(repo, ".git"));
assert.deepEqual(
{
dev: worktreeContainer.dev,
ino: worktreeContainer.ino,
},
{
dev: commonGitDirectory.dev,
ino: commonGitDirectory.ino,
},
);

git(repo, "worktree", "remove", "--force", inner.worktree.path);
Expand Down
Loading
Loading