@neuralnomads/codenomad-dev 0.20.0-dev-20260917-aa51cbb9 → 0.20.0-dev-20260918-a311de98
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/api-types.js.map +1 -1
- package/dist/events/bus.js +2 -0
- package/dist/events/bus.js.map +1 -1
- package/dist/filesystem/__tests__/browser.test.js +10 -10
- package/dist/filesystem/__tests__/browser.test.js.map +1 -1
- package/dist/filesystem/__tests__/responsiveness.test.js +79 -0
- package/dist/filesystem/__tests__/responsiveness.test.js.map +1 -0
- package/dist/filesystem/__tests__/search-cache.test.js +48 -9
- package/dist/filesystem/__tests__/search-cache.test.js.map +1 -1
- package/dist/filesystem/__tests__/search.test.js +8 -8
- package/dist/filesystem/__tests__/search.test.js.map +1 -1
- package/dist/filesystem/__tests__/write-order.test.js +64 -0
- package/dist/filesystem/__tests__/write-order.test.js.map +1 -0
- package/dist/filesystem/browser.js +44 -46
- package/dist/filesystem/browser.js.map +1 -1
- package/dist/filesystem/file-access.js +19 -0
- package/dist/filesystem/file-access.js.map +1 -0
- package/dist/filesystem/search-cache.js +35 -9
- package/dist/filesystem/search-cache.js.map +1 -1
- package/dist/filesystem/search.js +9 -8
- package/dist/filesystem/search.js.map +1 -1
- package/dist/index.js +28 -18
- package/dist/index.js.map +1 -1
- package/dist/opencode/automation/desktop-plugin.js +69 -0
- package/dist/opencode/automation/desktop-plugin.js.map +1 -0
- package/dist/opencode/automation/desktop-plugin.test.js +155 -0
- package/dist/opencode/automation/desktop-plugin.test.js.map +1 -0
- package/dist/opencode/automation-plugin.js +90 -24
- package/dist/opencode/automation-plugin.js.map +1 -1
- package/dist/opencode/automation-plugin.test.js +14 -1
- package/dist/opencode/automation-plugin.test.js.map +1 -1
- package/dist/opencode/compatibility/contract-fixture.js +13 -1
- package/dist/opencode/compatibility/contract-fixture.js.map +1 -1
- package/dist/opencode/compatibility/location.js +13 -0
- package/dist/opencode/compatibility/location.js.map +1 -1
- package/dist/opencode/compatibility/location.test.js +44 -0
- package/dist/opencode/compatibility/location.test.js.map +1 -1
- package/dist/opencode/compatibility/runtime.js.map +1 -1
- package/dist/opencode/compatibility/transport.js +3 -0
- package/dist/opencode/compatibility/transport.js.map +1 -1
- package/dist/opencode/compatibility/transport.test.js +40 -0
- package/dist/opencode/compatibility/transport.test.js.map +1 -1
- package/dist/opencode/desktop-plugin-installation.js +103 -0
- package/dist/opencode/desktop-plugin-installation.js.map +1 -0
- package/dist/opencode/desktop-plugin-lifecycle.js +117 -0
- package/dist/opencode/desktop-plugin-lifecycle.js.map +1 -0
- package/dist/opencode/desktop-plugin-lifecycle.test.js +180 -0
- package/dist/opencode/desktop-plugin-lifecycle.test.js.map +1 -0
- package/dist/opencode/desktop-plugin-paths.js +30 -0
- package/dist/opencode/desktop-plugin-paths.js.map +1 -0
- package/dist/opencode/desktop-plugin-paths.test.js +46 -0
- package/dist/opencode/desktop-plugin-paths.test.js.map +1 -0
- package/dist/opencode/desktop-plugin-presence.js +42 -0
- package/dist/opencode/desktop-plugin-presence.js.map +1 -0
- package/dist/opencode/pruning-installation.js +3 -63
- package/dist/opencode/pruning-installation.js.map +1 -1
- package/dist/opencode/pruning-lifecycle.js +3 -64
- package/dist/opencode/pruning-lifecycle.js.map +1 -1
- package/dist/opencode/session-pruning/presence.js +1 -41
- package/dist/opencode/session-pruning/presence.js.map +1 -1
- package/dist/permissions/opencode-yolo-metadata.js +3 -1
- package/dist/permissions/opencode-yolo-metadata.js.map +1 -1
- package/dist/permissions/opencode-yolo-metadata.test.js +2 -2
- package/dist/permissions/opencode-yolo-metadata.test.js.map +1 -1
- package/dist/plugins/automation/plugin.mjs +504 -0
- package/dist/plugins/session-pruning/plugin.mjs +1 -1
- package/dist/server/routes/automation-plugin.js +31 -4
- package/dist/server/routes/automation-plugin.js.map +1 -1
- package/dist/server/routes/automation-plugin.test.js +46 -0
- package/dist/server/routes/automation-plugin.test.js.map +1 -1
- package/dist/server/routes/filesystem.js +3 -3
- package/dist/server/routes/filesystem.js.map +1 -1
- package/dist/server/routes/workspaces.js +13 -7
- package/dist/server/routes/workspaces.js.map +1 -1
- package/dist/server/routes/workspaces.test.js +31 -0
- package/dist/server/routes/workspaces.test.js.map +1 -1
- package/dist/server/routes/worktrees.js +232 -41
- package/dist/server/routes/worktrees.js.map +1 -1
- package/dist/server/routes/worktrees.test.js +113 -40
- package/dist/server/routes/worktrees.test.js.map +1 -1
- package/dist/workspaces/__tests__/git-worktrees.test.js +2 -2
- package/dist/workspaces/__tests__/git-worktrees.test.js.map +1 -1
- package/dist/workspaces/__tests__/native-worktree-fixture.js +22 -0
- package/dist/workspaces/__tests__/native-worktree-fixture.js.map +1 -0
- package/dist/workspaces/git-status.test.js +24 -1
- package/dist/workspaces/git-status.test.js.map +1 -1
- package/dist/workspaces/git-worktrees.js +37 -204
- package/dist/workspaces/git-worktrees.js.map +1 -1
- package/dist/workspaces/host-opencode-service.test.js +58 -1
- package/dist/workspaces/host-opencode-service.test.js.map +1 -1
- package/dist/workspaces/instance-events.js +5 -0
- package/dist/workspaces/instance-events.js.map +1 -1
- package/dist/workspaces/instance-events.test.js +36 -1
- package/dist/workspaces/instance-events.test.js.map +1 -1
- package/dist/workspaces/manager.js +124 -14
- package/dist/workspaces/manager.js.map +1 -1
- package/dist/workspaces/manager.test.js +25 -0
- package/dist/workspaces/manager.test.js.map +1 -1
- package/dist/workspaces/native-service-start.js +13 -0
- package/dist/workspaces/native-service-start.js.map +1 -0
- package/dist/workspaces/native-service-start.test.js +65 -0
- package/dist/workspaces/native-service-start.test.js.map +1 -0
- package/dist/workspaces/native-worktrees.js +140 -0
- package/dist/workspaces/native-worktrees.js.map +1 -0
- package/dist/workspaces/opencode-cli-service.js +10 -2
- package/dist/workspaces/opencode-cli-service.js.map +1 -1
- package/dist/workspaces/opencode-service.js +24 -2
- package/dist/workspaces/opencode-service.js.map +1 -1
- package/dist/workspaces/opencode-service.test.js +62 -0
- package/dist/workspaces/opencode-service.test.js.map +1 -1
- package/dist/workspaces/project-session-families.js +376 -0
- package/dist/workspaces/project-session-families.js.map +1 -0
- package/dist/workspaces/project-session-families.test.js +341 -0
- package/dist/workspaces/project-session-families.test.js.map +1 -0
- package/dist/workspaces/worktree-directory.js +36 -18
- package/dist/workspaces/worktree-directory.js.map +1 -1
- package/dist/workspaces/worktree-directory.test.js +123 -5
- package/dist/workspaces/worktree-directory.test.js.map +1 -1
- package/dist/workspaces/worktree-inventory.js +79 -0
- package/dist/workspaces/worktree-inventory.js.map +1 -0
- package/dist/workspaces/worktree-inventory.test.js +156 -0
- package/dist/workspaces/worktree-inventory.test.js.map +1 -0
- package/dist/workspaces/worktree-map.js +2 -5
- package/dist/workspaces/worktree-map.js.map +1 -1
- package/dist/workspaces/wsl-opencode-service.test.js +16 -2
- package/dist/workspaces/wsl-opencode-service.test.js.map +1 -1
- package/package.json +4 -3
- package/public/assets/App-I9uNKt0K.js +54 -0
- package/public/assets/App-I9uNKt0K.js.map +1 -0
- package/public/assets/{FilesTab-DY3Vr-3r.js → FilesTab-_xb_Aq0c.js} +3 -3
- package/public/assets/{FilesTab-DY3Vr-3r.js.map → FilesTab-_xb_Aq0c.js.map} +1 -1
- package/public/assets/{GitChangesTab-BD6CJngE.js → GitChangesTab-Cz0RckYn.js} +3 -3
- package/public/assets/{GitChangesTab-BD6CJngE.js.map → GitChangesTab-Cz0RckYn.js.map} +1 -1
- package/public/assets/{SplitFilePanel-BdY6d_6m.js → SplitFilePanel-DVkVS5C0.js} +2 -2
- package/public/assets/{SplitFilePanel-BdY6d_6m.js.map → SplitFilePanel-DVkVS5C0.js.map} +1 -1
- package/public/assets/{StatusTab-C-_2yaPa.js → StatusTab-DU1H4ngp.js} +2 -2
- package/public/assets/{StatusTab-C-_2yaPa.js.map → StatusTab-DU1H4ngp.js.map} +1 -1
- package/public/assets/{align-justify-DI8VTZ4G.js → align-justify-Czy9hp3K.js} +2 -2
- package/public/assets/{align-justify-DI8VTZ4G.js.map → align-justify-Czy9hp3K.js.map} +1 -1
- package/public/assets/{bundle-full-D_M65Eb_.js → bundle-full-CMakdq_6.js} +2 -2
- package/public/assets/{bundle-full-D_M65Eb_.js.map → bundle-full-CMakdq_6.js.map} +1 -1
- package/public/assets/{client-state-CWCzCOz6.js → client-state-DGbupmmR.js} +2 -2
- package/public/assets/{client-state-CWCzCOz6.js.map → client-state-DGbupmmR.js.map} +1 -1
- package/public/assets/{diff-viewer-CGPsYEr3.js → diff-viewer-CSOlh3i1.js} +2 -2
- package/public/assets/{diff-viewer-CGPsYEr3.js.map → diff-viewer-CSOlh3i1.js.map} +1 -1
- package/public/assets/index-B0BLbbT3.js +2 -0
- package/public/assets/{index-BxRFHpJd.js.map → index-B0BLbbT3.js.map} +1 -1
- package/public/assets/index-B52s_Dh2.js +2 -0
- package/public/assets/index-B52s_Dh2.js.map +1 -0
- package/public/assets/index-B8W9is7z.js +2 -0
- package/public/assets/index-B8W9is7z.js.map +1 -0
- package/public/assets/index-Bn8a8ymh.js +2 -0
- package/public/assets/index-Bn8a8ymh.js.map +1 -0
- package/public/assets/index-CWaDoBhJ.js +2 -0
- package/public/assets/index-CWaDoBhJ.js.map +1 -0
- package/public/assets/{index-MeFffHqb.css → index-CXEtEGDL.css} +1 -1
- package/public/assets/index-CbuT2QEY.js +2 -0
- package/public/assets/index-CbuT2QEY.js.map +1 -0
- package/public/assets/{index-Ddjkirek.js → index-Cq5Hfa6i.js} +2 -2
- package/public/assets/{index-Ddjkirek.js.map → index-Cq5Hfa6i.js.map} +1 -1
- package/public/assets/index-D03eJbIp.js +2 -0
- package/public/assets/index-D03eJbIp.js.map +1 -0
- package/public/assets/index-DDK0Fk7j.js +2 -0
- package/public/assets/index-DDK0Fk7j.js.map +1 -0
- package/public/assets/index-DftCJdT3.js +2 -0
- package/public/assets/index-DftCJdT3.js.map +1 -0
- package/public/assets/index-_N9V2vB3.js +3 -0
- package/public/assets/index-_N9V2vB3.js.map +1 -0
- package/public/assets/index-zo6cKyNQ.js +2 -0
- package/public/assets/index-zo6cKyNQ.js.map +1 -0
- package/public/assets/{loading-Gqh6NPUr.js → loading-B2-6L7aO.js} +2 -2
- package/public/assets/{loading-Gqh6NPUr.js.map → loading-B2-6L7aO.js.map} +1 -1
- package/public/assets/main-pZWMgVoG.js +42 -0
- package/public/assets/main-pZWMgVoG.js.map +1 -0
- package/public/assets/{markdown-BWnjyvnX.js → markdown-CH9bocix.js} +4 -4
- package/public/assets/{markdown-BWnjyvnX.js.map → markdown-CH9bocix.js.map} +1 -1
- package/public/assets/monaco-viewer-Bv1s0h2m.js +27 -0
- package/public/assets/monaco-viewer-Bv1s0h2m.js.map +1 -0
- package/public/assets/{startup-state-settings-card-C4E2Itop.js → startup-state-settings-card-mmovljyz.js} +2 -2
- package/public/assets/{startup-state-settings-card-C4E2Itop.js.map → startup-state-settings-card-mmovljyz.js.map} +1 -1
- package/public/assets/{terminal-square-C3wutdV0.js → terminal-square-U8R46SS0.js} +2 -2
- package/public/assets/{terminal-square-C3wutdV0.js.map → terminal-square-U8R46SS0.js.map} +1 -1
- package/public/assets/tool-call-AnfwOPww.js +60 -0
- package/public/assets/tool-call-AnfwOPww.js.map +1 -0
- package/public/assets/unified-picker-DtvQUEiv.js +2 -0
- package/public/assets/unified-picker-DtvQUEiv.js.map +1 -0
- package/public/assets/{wrap-text-CkBxzt04.js → wrap-text-Bh1AU9Re.js} +2 -2
- package/public/assets/{wrap-text-CkBxzt04.js.map → wrap-text-Bh1AU9Re.js.map} +1 -1
- package/public/index.html +4 -4
- package/public/loading.html +4 -4
- package/public/sw.js +1 -1
- package/public/sw.js.map +1 -1
- package/public/assets/App-BROhwPo9.js +0 -54
- package/public/assets/App-BROhwPo9.js.map +0 -1
- package/public/assets/index-B8-lAqjr.js +0 -2
- package/public/assets/index-B8-lAqjr.js.map +0 -1
- package/public/assets/index-BeUewQym.js +0 -2
- package/public/assets/index-BeUewQym.js.map +0 -1
- package/public/assets/index-BxRFHpJd.js +0 -2
- package/public/assets/index-Bzv1kU-S.js +0 -2
- package/public/assets/index-Bzv1kU-S.js.map +0 -1
- package/public/assets/index-C9tI4CRG.js +0 -2
- package/public/assets/index-C9tI4CRG.js.map +0 -1
- package/public/assets/index-CGYHFZ6F.js +0 -2
- package/public/assets/index-CGYHFZ6F.js.map +0 -1
- package/public/assets/index-CMEAjBFp.js +0 -2
- package/public/assets/index-CMEAjBFp.js.map +0 -1
- package/public/assets/index-Cazypvyc.js +0 -2
- package/public/assets/index-Cazypvyc.js.map +0 -1
- package/public/assets/index-CwqzofWP.js +0 -2
- package/public/assets/index-CwqzofWP.js.map +0 -1
- package/public/assets/index-Da9yOa6q.js +0 -2
- package/public/assets/index-Da9yOa6q.js.map +0 -1
- package/public/assets/index-HHgvEOAH.js +0 -3
- package/public/assets/index-HHgvEOAH.js.map +0 -1
- package/public/assets/main-Cbx7KdTr.js +0 -38
- package/public/assets/main-Cbx7KdTr.js.map +0 -1
- package/public/assets/monaco-viewer-BEJIiZWL.js +0 -27
- package/public/assets/monaco-viewer-BEJIiZWL.js.map +0 -1
- package/public/assets/tool-call-DNsAQ_m4.js +0 -60
- package/public/assets/tool-call-DNsAQ_m4.js.map +0 -1
- package/public/assets/unified-picker-tB7y17Qz.js +0 -2
- package/public/assets/unified-picker-tB7y17Qz.js.map +0 -1
|
@@ -1,59 +1,105 @@
|
|
|
1
1
|
import assert from "node:assert/strict";
|
|
2
2
|
import { execFileSync } from "node:child_process";
|
|
3
|
-
import { mkdirSync, mkdtempSync,
|
|
3
|
+
import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
|
|
4
4
|
import { tmpdir } from "node:os";
|
|
5
5
|
import path from "node:path";
|
|
6
6
|
import { describe, it } from "node:test";
|
|
7
7
|
import Fastify from "fastify";
|
|
8
8
|
import { registerWorktreeRoutes } from "./worktrees";
|
|
9
9
|
import { WorktreeDeletionFence } from "../../workspaces/worktree-session-evacuation";
|
|
10
|
+
import { readLocationContext } from "../../opencode/compatibility/location";
|
|
11
|
+
import { fixtureCatalogue } from "../../workspaces/__tests__/native-worktree-fixture";
|
|
10
12
|
describe("worktree routes", () => {
|
|
11
|
-
it("
|
|
12
|
-
const temp = mkdtempSync(path.join(tmpdir(), "codenomad-
|
|
13
|
-
const
|
|
14
|
-
const
|
|
13
|
+
it("reserves the physical worktree and rejects a same-HEAD replacement before deletion", async () => {
|
|
14
|
+
const temp = mkdtempSync(path.join(tmpdir(), "codenomad-worktree-route-"));
|
|
15
|
+
const repo = path.join(temp, "repo");
|
|
16
|
+
const linked = path.join(temp, "feature-worktree");
|
|
17
|
+
const workspacePath = path.join(repo, "apps", "web");
|
|
18
|
+
const linkedWorkspacePath = path.join(linked, "apps", "web");
|
|
15
19
|
const app = Fastify({ logger: false });
|
|
16
20
|
try {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
execFileSync("git", ["-C",
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
const
|
|
21
|
+
mkdirSync(repo, { recursive: true });
|
|
22
|
+
execFileSync("git", ["init", "-b", "main", repo], { stdio: "ignore" });
|
|
23
|
+
mkdirSync(workspacePath, { recursive: true });
|
|
24
|
+
writeFileSync(path.join(workspacePath, "README.md"), "nested workspace\n");
|
|
25
|
+
execFileSync("git", ["-C", repo, "add", "."], { stdio: "ignore" });
|
|
26
|
+
execFileSync("git", ["-C", repo, "-c", "user.name=CodeNomad", "-c", "user.email=test@example.com", "commit", "--allow-empty", "-m", "init"], { stdio: "ignore" });
|
|
27
|
+
execFileSync("git", ["-C", repo, "worktree", "add", "-b", "feature", linked], { stdio: "ignore" });
|
|
28
|
+
const originalLocation = { directory: path.join(linked, "..cache", "session"), workspaceID: "native-feature" };
|
|
29
|
+
const current = {
|
|
30
|
+
id: "session",
|
|
31
|
+
projectID: "project",
|
|
32
|
+
cost: 0,
|
|
33
|
+
tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
|
|
34
|
+
time: { created: 1, updated: 1 },
|
|
35
|
+
location: originalLocation,
|
|
36
|
+
};
|
|
37
|
+
let lists = 0;
|
|
25
38
|
const client = {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
39
|
+
project: { list: async () => [{ id: "project" }] },
|
|
40
|
+
debug: { location: { list: async () => [] } },
|
|
41
|
+
shell: { list: async () => ({ data: [] }) },
|
|
42
|
+
pty: { list: async () => ({ data: [] }) },
|
|
43
|
+
experimental: { persistentPty: { list: async () => [] } },
|
|
44
|
+
location: {
|
|
45
|
+
get: async ({ location }) => ({
|
|
46
|
+
directory: location?.directory ?? workspacePath,
|
|
47
|
+
workspaceID: path.resolve(location?.directory ?? workspacePath) === path.resolve(linkedWorkspacePath) ? "native-feature" : undefined,
|
|
48
|
+
project: { id: "project", directory: workspacePath, canonical: workspacePath },
|
|
49
|
+
}),
|
|
50
|
+
},
|
|
31
51
|
session: {
|
|
32
|
-
list: async (
|
|
33
|
-
|
|
34
|
-
|
|
52
|
+
list: async () => {
|
|
53
|
+
if (++lists === 3) {
|
|
54
|
+
execFileSync("git", ["-C", repo, "worktree", "remove", "--force", linked], { stdio: "ignore" });
|
|
55
|
+
execFileSync("git", ["-C", repo, "worktree", "add", linked, "feature"], { stdio: "ignore" });
|
|
56
|
+
writeFileSync(path.join(linked, "replacement.txt"), "must survive\n");
|
|
57
|
+
}
|
|
58
|
+
return { data: [structuredClone(current)], cursor: {} };
|
|
59
|
+
},
|
|
60
|
+
active: async () => ({}),
|
|
61
|
+
move: async ({ directory }, options) => {
|
|
62
|
+
current.location = readLocationContext(options?.headers["x-codenomad-location"], "legacy") ?? { directory };
|
|
35
63
|
},
|
|
36
|
-
|
|
37
|
-
move: async () => { assert.fail("Active sessions must not move"); },
|
|
64
|
+
get: async () => structuredClone(current),
|
|
38
65
|
},
|
|
39
66
|
};
|
|
67
|
+
let reserved = "";
|
|
68
|
+
let released = false;
|
|
40
69
|
const manager = {
|
|
41
|
-
|
|
70
|
+
getWorktrees: () => fixtureCatalogue(workspacePath),
|
|
71
|
+
get: () => ({
|
|
72
|
+
id: "workspace",
|
|
73
|
+
path: workspacePath,
|
|
74
|
+
status: "ready",
|
|
75
|
+
proxyPath: "/workspaces/workspace/instance",
|
|
76
|
+
binaryId: "opencode",
|
|
77
|
+
binaryLabel: "opencode",
|
|
78
|
+
createdAt: "2026-01-01T00:00:00.000Z",
|
|
79
|
+
updatedAt: "2026-01-01T00:00:00.000Z",
|
|
80
|
+
}),
|
|
81
|
+
reserveWorktreeDeletion: async (directory) => {
|
|
82
|
+
reserved = directory;
|
|
83
|
+
return () => { released = true; };
|
|
84
|
+
},
|
|
42
85
|
getSharedServiceClient: async () => client,
|
|
43
|
-
|
|
86
|
+
getServiceLocation: () => ({ directory: workspacePath }),
|
|
44
87
|
getServiceDirectoryForPath: async (_id, directory) => {
|
|
45
|
-
|
|
46
|
-
return
|
|
88
|
+
assert.notEqual(path.resolve(directory), path.resolve(linked), "OpenCode must receive the mirrored workspace path");
|
|
89
|
+
return directory;
|
|
47
90
|
},
|
|
48
|
-
getWorktreeIdentityForPath: async (_id, directory) => path.resolve(directory)
|
|
91
|
+
getWorktreeIdentityForPath: async (_id, directory) => (path.resolve(directory).startsWith(path.resolve(linked)) ? "workspace:feature" : "workspace:root"),
|
|
49
92
|
};
|
|
50
93
|
registerWorktreeRoutes(app, { workspaceManager: manager, worktreeDeletionFence: new WorktreeDeletionFence() });
|
|
51
|
-
const
|
|
52
|
-
|
|
53
|
-
assert.
|
|
54
|
-
assert.
|
|
55
|
-
assert.
|
|
56
|
-
assert.
|
|
94
|
+
const slug = (await fixtureCatalogue(workspacePath)).worktrees.find(entry => entry.branch === "feature").slug;
|
|
95
|
+
const response = await app.inject({ method: "DELETE", url: `/api/workspaces/workspace/worktrees/${slug}` });
|
|
96
|
+
assert.equal(response.statusCode, 409);
|
|
97
|
+
assert.equal(path.resolve(reserved), path.resolve(linked));
|
|
98
|
+
assert.equal(released, true);
|
|
99
|
+
assert.equal(path.resolve(current.location.directory), path.resolve(workspacePath));
|
|
100
|
+
assert.equal(execFileSync("git", ["-C", linked, "status", "--short"], { encoding: "utf8" }).trim(), "?? replacement.txt");
|
|
101
|
+
const inventory = execFileSync("git", ["-C", repo, "worktree", "list", "--porcelain"], { encoding: "utf8" });
|
|
102
|
+
assert.ok(inventory.replace(/\\/g, "/").includes(linked.replace(/\\/g, "/")));
|
|
57
103
|
}
|
|
58
104
|
finally {
|
|
59
105
|
await app.close();
|
|
@@ -72,10 +118,26 @@ describe("worktree routes", () => {
|
|
|
72
118
|
execFileSync("git", ["-C", temp, "worktree", "add", "-b", "doomed", target]);
|
|
73
119
|
const workspace = { id: "workspace", path: temp, status: "ready" };
|
|
74
120
|
const nativeSession = { id: "unloaded", projectID: "project", location: { directory: target }, cost: 0, tokens: {}, time: { created: 1, updated: 1 } };
|
|
121
|
+
let blocker = "shell";
|
|
75
122
|
const client = {
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
123
|
+
project: { list: async () => [{ id: "project" }] },
|
|
124
|
+
debug: { location: { list: async () => [{ directory: path.join(temp, "unrelated"), workspaceID: "root-location" }] } },
|
|
125
|
+
shell: { list: async (_input, options) => ({
|
|
126
|
+
data: blocker === "shell" && readLocationContext(options?.headers["x-codenomad-location"], "legacy")?.workspaceID === "root-location"
|
|
127
|
+
? [{ id: "sh_blocker", status: "running", cwd: target }]
|
|
128
|
+
: [],
|
|
129
|
+
}) },
|
|
130
|
+
pty: { list: async (_input, options) => ({
|
|
131
|
+
data: blocker === "pty" && readLocationContext(options?.headers["x-codenomad-location"], "legacy")?.workspaceID === "root-location"
|
|
132
|
+
? [{ id: "pty_blocker", status: "running", cwd: target }]
|
|
133
|
+
: [],
|
|
134
|
+
}) },
|
|
135
|
+
experimental: { persistentPty: { list: async () => (blocker === "persistent" ? [{ id: "pty_persistent", status: "running", cwd: target }] : []) } },
|
|
136
|
+
location: {
|
|
137
|
+
get: async ({ location }) => ({
|
|
138
|
+
directory: location?.directory ?? temp,
|
|
139
|
+
project: { id: "project", canonical: temp, directory: temp },
|
|
140
|
+
}),
|
|
79
141
|
},
|
|
80
142
|
session: {
|
|
81
143
|
list: async () => ({ data: [nativeSession], cursor: {} }),
|
|
@@ -84,18 +146,29 @@ describe("worktree routes", () => {
|
|
|
84
146
|
if (input.directory === temp)
|
|
85
147
|
throw new Error("native move failed");
|
|
86
148
|
},
|
|
149
|
+
get: async () => nativeSession,
|
|
87
150
|
},
|
|
88
151
|
};
|
|
89
152
|
const manager = {
|
|
153
|
+
getWorktrees: () => fixtureCatalogue(temp),
|
|
90
154
|
get: () => workspace,
|
|
91
155
|
getSharedServiceClient: async () => client,
|
|
92
|
-
|
|
156
|
+
getServiceLocation: () => ({ directory: temp }),
|
|
93
157
|
getServiceDirectoryForPath: async (_id, directory) => directory,
|
|
158
|
+
reserveWorktreeDeletion: async () => () => undefined,
|
|
94
159
|
getWorktreeIdentityForPath: async () => "workspace:doomed",
|
|
95
160
|
};
|
|
96
161
|
registerWorktreeRoutes(app, { workspaceManager: manager, worktreeDeletionFence: new WorktreeDeletionFence() });
|
|
97
|
-
const
|
|
98
|
-
|
|
162
|
+
const slug = (await fixtureCatalogue(temp)).worktrees.find(entry => entry.branch === "doomed").slug;
|
|
163
|
+
for (const [kind, message] of [["shell", "Running Shell"], ["pty", "Running PTY"], ["persistent", "Running persistent PTY"]]) {
|
|
164
|
+
blocker = kind;
|
|
165
|
+
const blocked = await app.inject({ method: "DELETE", url: `/api/workspaces/workspace/worktrees/${slug}` });
|
|
166
|
+
assert.equal(blocked.statusCode, 409);
|
|
167
|
+
assert.match(blocked.json().error, new RegExp(message));
|
|
168
|
+
}
|
|
169
|
+
blocker = undefined;
|
|
170
|
+
const response = await app.inject({ method: "DELETE", url: `/api/workspaces/workspace/worktrees/${slug}` });
|
|
171
|
+
assert.equal(response.statusCode, 502);
|
|
99
172
|
assert.match(response.json().error, /native move failed/);
|
|
100
173
|
assert.match(execFileSync("git", ["-C", temp, "worktree", "list", "--porcelain"], { encoding: "utf8" }), /doomed/);
|
|
101
174
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktrees.test.js","sourceRoot":"","sources":["../../../src/server/routes/worktrees.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAA;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AACrF,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAChC,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,OAAO,MAAM,SAAS,CAAA;AAI7B,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAA;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,8CAA8C,CAAA;AAEpF,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,EAAE,CAAC,sFAAsF,EAAE,KAAK,IAAI,EAAE;QACpG,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,2BAA2B,CAAC,CAAC,CAAA;QAC1E,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;QACxC,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;QACxC,MAAM,GAAG,GAAG,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAA;QACtC,IAAI,CAAC;YACH,YAAY,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,uBAAuB,EAAE,IAAI,CAAC,CAAC,CAAA;YAC5D,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,QAAQ,CAAC,CAAA;YACrD,YAAY,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC,CAAA;YACrD,YAAY,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,0BAA0B,EAAE,IAAI,EAAE,iCAAiC,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAA;YACpI,YAAY,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAA;YAC5E,SAAS,CAAC,MAAM,CAAC,CAAA;YACjB,MAAM,QAAQ,GAAa,EAAE,CAAA;YAC7B,MAAM,UAAU,GAAa,EAAE,CAAA;YAC/B,MAAM,MAAM,GAAG;gBACb,QAAQ,EAAE,EAAE,GAAG,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,EAAE;gBACpD,OAAO,EAAE,EAAE,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;wBAC3B,EAAE,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE;wBAClD,EAAE,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,MAAM,CAAC,EAAE;qBACtE,EAAE;gBACH,OAAO,EAAE;oBACP,IAAI,EAAE,KAAK,EAAE,EAAE,OAAO,EAAuB,EAAE,EAAE;wBAC/C,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;wBACtB,OAAO,EAAE,IAAI,EAAE,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAA;oBAC/G,CAAC;oBACD,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC;oBACrD,IAAI,EAAE,KAAK,IAAI,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAA,CAAC,CAAC;iBACnE;aAC2B,CAAA;YAC9B,MAAM,OAAO,GAAG;gBACd,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;gBAC7D,sBAAsB,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM;gBAC1C,mBAAmB,EAAE,GAAG,EAAE,CAAC,IAAI;gBAC/B,0BAA0B,EAAE,KAAK,EAAE,GAAW,EAAE,SAAiB,EAAE,EAAE;oBACnE,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;oBAC1B,OAAO,YAAY,CAAC,SAAS,CAAC,CAAA;gBAChC,CAAC;gBACD,0BAA0B,EAAE,KAAK,EAAE,GAAW,EAAE,SAAiB,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,gBAAgB;aAChI,CAAA;YAChC,sBAAsB,CAAC,GAAG,EAAE,EAAE,gBAAgB,EAAE,OAAO,EAAE,qBAAqB,EAAE,IAAI,qBAAqB,EAAE,EAAE,CAAC,CAAA;YAC9G,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,4CAA4C,EAAE,CAAC,CAAA;YAC1G,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,CAAA;YACtC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,iDAAiD,CAAC,CAAA;YACtF,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,SAAS,CAAC,CAAC,CAAA;YACvC,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,qDAAqD,CAAC,CAAA;YAC7F,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAA;QACpH,CAAC;gBAAS,CAAC;YACT,MAAM,GAAG,CAAC,KAAK,EAAE,CAAA;YACjB,MAAM,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;QAChD,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,iEAAiE,EAAE,KAAK,IAAI,EAAE;QAC/E,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,4BAA4B,CAAC,CAAC,CAAA;QAC3E,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;QACxC,MAAM,GAAG,GAAG,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAA;QACtC,IAAI,CAAC;YACH,YAAY,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,uBAAuB,EAAE,IAAI,CAAC,CAAC,CAAA;YAC5D,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,QAAQ,CAAC,CAAA;YACrD,YAAY,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC,CAAA;YACrD,YAAY,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,0BAA0B,EAAE,IAAI,EAAE,iCAAiC,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAA;YACpI,YAAY,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAA;YAE5E,MAAM,SAAS,GAAG,EAAE,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAyB,CAAA;YACzF,MAAM,aAAa,GAAG,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,EAAiB,CAAA;YACrK,MAAM,MAAM,GAAG;gBACb,QAAQ,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAuC,EAAE,EAAE,CAAC,QAAQ,EAAE;gBACxF,OAAO,EAAE;oBACP,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC;iBAC9G;gBACD,OAAO,EAAE;oBACP,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;oBACzD,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;oBACxB,IAAI,EAAE,KAAK,EAAE,KAA4B,EAAE,EAAE;wBAC3C,IAAI,KAAK,CAAC,SAAS,KAAK,IAAI;4BAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;oBACrE,CAAC;iBACF;aAC2B,CAAA;YAC9B,MAAM,OAAO,GAAG;gBACd,GAAG,EAAE,GAAG,EAAE,CAAC,SAAS;gBACpB,sBAAsB,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM;gBAC1C,mBAAmB,EAAE,GAAG,EAAE,CAAC,IAAI;gBAC/B,0BAA0B,EAAE,KAAK,EAAE,GAAW,EAAE,SAAiB,EAAE,EAAE,CAAC,SAAS;gBAC/E,0BAA0B,EAAE,KAAK,IAAI,EAAE,CAAC,kBAAkB;aAC5B,CAAA;YAChC,sBAAsB,CAAC,GAAG,EAAE,EAAE,gBAAgB,EAAE,OAAO,EAAE,qBAAqB,EAAE,IAAI,qBAAqB,EAAE,EAAE,CAAC,CAAA;YAE9G,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,4CAA4C,EAAE,CAAC,CAAA;YAE1G,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,CAAA;YACtC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAA;YACzD,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAA;QACpH,CAAC;gBAAS,CAAC;YACT,MAAM,GAAG,CAAC,KAAK,EAAE,CAAA;YACjB,MAAM,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;QAChD,CAAC;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA","sourcesContent":["import assert from \"node:assert/strict\"\nimport { execFileSync } from \"node:child_process\"\nimport { mkdirSync, mkdtempSync, realpathSync, rmSync, writeFileSync } from \"node:fs\"\nimport { tmpdir } from \"node:os\"\nimport path from \"node:path\"\nimport { describe, it } from \"node:test\"\nimport Fastify from \"fastify\"\nimport type { OpenCodeClient, SessionInfo } from \"@opencode/client\"\nimport type { WorkspaceDescriptor } from \"../../api-types\"\nimport type { WorkspaceManager } from \"../../workspaces/manager\"\nimport { registerWorktreeRoutes } from \"./worktrees\"\nimport { WorktreeDeletionFence } from \"../../workspaces/worktree-session-evacuation\"\n\ndescribe(\"worktree routes\", () => {\n it(\"uses exact project paths despite a nested project sharing the root worktree identity\", async () => {\n const temp = mkdtempSync(path.join(tmpdir(), \"codenomad-nested-project-\"))\n const target = path.join(temp, \"doomed\")\n const nested = path.join(temp, \"nested\")\n const app = Fastify({ logger: false })\n try {\n execFileSync(\"git\", [\"init\", \"--initial-branch=main\", temp])\n writeFileSync(path.join(temp, \"README.md\"), \"test\\n\")\n execFileSync(\"git\", [\"-C\", temp, \"add\", \"README.md\"])\n execFileSync(\"git\", [\"-C\", temp, \"-c\", \"user.name=CodeNomad Test\", \"-c\", \"user.email=test@codenomad.local\", \"commit\", \"-m\", \"test\"])\n execFileSync(\"git\", [\"-C\", temp, \"worktree\", \"add\", \"-b\", \"doomed\", target])\n mkdirSync(nested)\n const projects: string[] = []\n const exactPaths: string[] = []\n const client = {\n location: { get: async () => ({ directory: temp }) },\n project: { list: async () => [\n { id: \"nested\", canonical: nested, sandboxes: [] },\n { id: \"project\", canonical: realpathSync(temp), sandboxes: [target] },\n ] },\n session: {\n list: async ({ project }: { project: string }) => {\n projects.push(project)\n return { data: project === \"project\" ? [{ id: \"active\", location: { directory: target } }] : [], cursor: {} }\n },\n active: async () => ({ active: { type: \"running\" } }),\n move: async () => { assert.fail(\"Active sessions must not move\") },\n },\n } as unknown as OpenCodeClient\n const manager = {\n get: () => ({ id: \"workspace\", path: temp, status: \"ready\" }),\n getSharedServiceClient: async () => client,\n getServiceDirectory: () => temp,\n getServiceDirectoryForPath: async (_id: string, directory: string) => {\n exactPaths.push(directory)\n return realpathSync(directory)\n },\n getWorktreeIdentityForPath: async (_id: string, directory: string) => path.resolve(directory) === path.resolve(target) ? \"workspace:doomed\" : \"workspace:root\",\n } as unknown as WorkspaceManager\n registerWorktreeRoutes(app, { workspaceManager: manager, worktreeDeletionFence: new WorktreeDeletionFence() })\n const response = await app.inject({ method: \"DELETE\", url: \"/api/workspaces/workspace/worktrees/doomed\" })\n assert.equal(response.statusCode, 400)\n assert.match(response.json().error, /Active sessions block worktree deletion: active/)\n assert.deepEqual(projects, [\"project\"])\n assert.ok(exactPaths.includes(nested), \"Project candidates must use the exact-path resolver\")\n assert.match(execFileSync(\"git\", [\"-C\", temp, \"worktree\", \"list\", \"--porcelain\"], { encoding: \"utf8\" }), /doomed/)\n } finally {\n await app.close()\n rmSync(temp, { recursive: true, force: true })\n }\n })\n\n it(\"fails a direct delete call closed when session evacuation fails\", async () => {\n const temp = mkdtempSync(path.join(tmpdir(), \"codenomad-delete-worktree-\"))\n const target = path.join(temp, \"doomed\")\n const app = Fastify({ logger: false })\n try {\n execFileSync(\"git\", [\"init\", \"--initial-branch=main\", temp])\n writeFileSync(path.join(temp, \"README.md\"), \"test\\n\")\n execFileSync(\"git\", [\"-C\", temp, \"add\", \"README.md\"])\n execFileSync(\"git\", [\"-C\", temp, \"-c\", \"user.name=CodeNomad Test\", \"-c\", \"user.email=test@codenomad.local\", \"commit\", \"-m\", \"test\"])\n execFileSync(\"git\", [\"-C\", temp, \"worktree\", \"add\", \"-b\", \"doomed\", target])\n\n const workspace = { id: \"workspace\", path: temp, status: \"ready\" } as WorkspaceDescriptor\n const nativeSession = { id: \"unloaded\", projectID: \"project\", location: { directory: target }, cost: 0, tokens: {}, time: { created: 1, updated: 1 } } as SessionInfo\n const client = {\n location: { get: async ({ location }: { location: { directory: string } }) => location },\n project: {\n list: async () => [{ id: \"project\", canonical: temp, sandboxes: [target], time: { created: 1, updated: 1 } }],\n },\n session: {\n list: async () => ({ data: [nativeSession], cursor: {} }),\n active: async () => ({}),\n move: async (input: { directory: string }) => {\n if (input.directory === temp) throw new Error(\"native move failed\")\n },\n },\n } as unknown as OpenCodeClient\n const manager = {\n get: () => workspace,\n getSharedServiceClient: async () => client,\n getServiceDirectory: () => temp,\n getServiceDirectoryForPath: async (_id: string, directory: string) => directory,\n getWorktreeIdentityForPath: async () => \"workspace:doomed\",\n } as unknown as WorkspaceManager\n registerWorktreeRoutes(app, { workspaceManager: manager, worktreeDeletionFence: new WorktreeDeletionFence() })\n\n const response = await app.inject({ method: \"DELETE\", url: \"/api/workspaces/workspace/worktrees/doomed\" })\n\n assert.equal(response.statusCode, 400)\n assert.match(response.json().error, /native move failed/)\n assert.match(execFileSync(\"git\", [\"-C\", temp, \"worktree\", \"list\", \"--porcelain\"], { encoding: \"utf8\" }), /doomed/)\n } finally {\n await app.close()\n rmSync(temp, { recursive: true, force: true })\n }\n })\n})\n"]}
|
|
1
|
+
{"version":3,"file":"worktrees.test.js","sourceRoot":"","sources":["../../../src/server/routes/worktrees.test.ts"],"names":[],"mappings":"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","sourcesContent":["import assert from \"node:assert/strict\"\nimport { execFileSync } from \"node:child_process\"\nimport { mkdirSync, mkdtempSync, rmSync, writeFileSync } from \"node:fs\"\nimport { tmpdir } from \"node:os\"\nimport path from \"node:path\"\nimport { describe, it } from \"node:test\"\nimport type { OpenCodeClient, SessionInfo } from \"@opencode/client\"\nimport Fastify from \"fastify\"\nimport type { WorkspaceDescriptor } from \"../../api-types\"\nimport type { WorkspaceManager } from \"../../workspaces/manager\"\nimport { registerWorktreeRoutes } from \"./worktrees\"\nimport { WorktreeDeletionFence } from \"../../workspaces/worktree-session-evacuation\"\nimport { readLocationContext } from \"../../opencode/compatibility/location\"\nimport { fixtureCatalogue } from \"../../workspaces/__tests__/native-worktree-fixture\"\n\ndescribe(\"worktree routes\", () => {\nit(\"reserves the physical worktree and rejects a same-HEAD replacement before deletion\", async () => {\n const temp = mkdtempSync(path.join(tmpdir(), \"codenomad-worktree-route-\"))\n const repo = path.join(temp, \"repo\")\n const linked = path.join(temp, \"feature-worktree\")\n const workspacePath = path.join(repo, \"apps\", \"web\")\n const linkedWorkspacePath = path.join(linked, \"apps\", \"web\")\n const app = Fastify({ logger: false })\n\n try {\n mkdirSync(repo, { recursive: true })\n execFileSync(\"git\", [\"init\", \"-b\", \"main\", repo], { stdio: \"ignore\" })\n mkdirSync(workspacePath, { recursive: true })\n writeFileSync(path.join(workspacePath, \"README.md\"), \"nested workspace\\n\")\n execFileSync(\"git\", [\"-C\", repo, \"add\", \".\"], { stdio: \"ignore\" })\n execFileSync(\"git\", [\"-C\", repo, \"-c\", \"user.name=CodeNomad\", \"-c\", \"user.email=test@example.com\", \"commit\", \"--allow-empty\", \"-m\", \"init\"], { stdio: \"ignore\" })\n execFileSync(\"git\", [\"-C\", repo, \"worktree\", \"add\", \"-b\", \"feature\", linked], { stdio: \"ignore\" })\n\n const originalLocation = { directory: path.join(linked, \"..cache\", \"session\"), workspaceID: \"native-feature\" }\n const current: SessionInfo = {\n id: \"session\",\n projectID: \"project\",\n cost: 0,\n tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },\n time: { created: 1, updated: 1 },\n location: originalLocation,\n }\n let lists = 0\n const client = {\n project: { list: async () => [{ id: \"project\" }] },\n debug: { location: { list: async () => [] } },\n shell: { list: async () => ({ data: [] }) },\n pty: { list: async () => ({ data: [] }) },\n experimental: { persistentPty: { list: async () => [] } },\n location: {\n get: async ({ location }: { location?: { directory?: string } }) => ({\n directory: location?.directory ?? workspacePath,\n workspaceID: path.resolve(location?.directory ?? workspacePath) === path.resolve(linkedWorkspacePath) ? \"native-feature\" : undefined,\n project: { id: \"project\", directory: workspacePath, canonical: workspacePath },\n }),\n },\n session: {\n list: async () => {\n if (++lists === 3) {\n execFileSync(\"git\", [\"-C\", repo, \"worktree\", \"remove\", \"--force\", linked], { stdio: \"ignore\" })\n execFileSync(\"git\", [\"-C\", repo, \"worktree\", \"add\", linked, \"feature\"], { stdio: \"ignore\" })\n writeFileSync(path.join(linked, \"replacement.txt\"), \"must survive\\n\")\n }\n return { data: [structuredClone(current)], cursor: {} }\n },\n active: async () => ({}),\n move: async ({ directory }: { directory: string }, options?: { headers: Record<string, string> }) => {\n current.location = readLocationContext(options?.headers[\"x-codenomad-location\"], \"legacy\") ?? { directory }\n },\n get: async () => structuredClone(current),\n },\n } as unknown as OpenCodeClient\n let reserved = \"\"\n let released = false\n const manager = {\n getWorktrees: () => fixtureCatalogue(workspacePath),\n get: () => ({\n id: \"workspace\",\n path: workspacePath,\n status: \"ready\",\n proxyPath: \"/workspaces/workspace/instance\",\n binaryId: \"opencode\",\n binaryLabel: \"opencode\",\n createdAt: \"2026-01-01T00:00:00.000Z\",\n updatedAt: \"2026-01-01T00:00:00.000Z\",\n }),\n reserveWorktreeDeletion: async (directory: string) => {\n reserved = directory\n return () => { released = true }\n },\n getSharedServiceClient: async () => client,\n getServiceLocation: () => ({ directory: workspacePath }),\n getServiceDirectoryForPath: async (_id: string, directory: string) => {\n assert.notEqual(path.resolve(directory), path.resolve(linked), \"OpenCode must receive the mirrored workspace path\")\n return directory\n },\n getWorktreeIdentityForPath: async (_id: string, directory: string) => (\n path.resolve(directory).startsWith(path.resolve(linked)) ? \"workspace:feature\" : \"workspace:root\"\n ),\n } as unknown as WorkspaceManager\n registerWorktreeRoutes(app, { workspaceManager: manager, worktreeDeletionFence: new WorktreeDeletionFence() })\n\n const slug = (await fixtureCatalogue(workspacePath)).worktrees.find(entry => entry.branch === \"feature\")!.slug\n const response = await app.inject({ method: \"DELETE\", url: `/api/workspaces/workspace/worktrees/${slug}` })\n\n assert.equal(response.statusCode, 409)\n assert.equal(path.resolve(reserved), path.resolve(linked))\n assert.equal(released, true)\n assert.equal(path.resolve(current.location.directory), path.resolve(workspacePath))\n assert.equal(execFileSync(\"git\", [\"-C\", linked, \"status\", \"--short\"], { encoding: \"utf8\" }).trim(), \"?? replacement.txt\")\n const inventory = execFileSync(\"git\", [\"-C\", repo, \"worktree\", \"list\", \"--porcelain\"], { encoding: \"utf8\" })\n assert.ok(inventory.replace(/\\\\/g, \"/\").includes(linked.replace(/\\\\/g, \"/\")))\n } finally {\n await app.close()\n rmSync(temp, { recursive: true, force: true })\n }\n})\n\nit(\"fails a direct delete call closed when session evacuation fails\", async () => {\n const temp = mkdtempSync(path.join(tmpdir(), \"codenomad-delete-worktree-\"))\n const target = path.join(temp, \"doomed\")\n const app = Fastify({ logger: false })\n try {\n execFileSync(\"git\", [\"init\", \"--initial-branch=main\", temp])\n writeFileSync(path.join(temp, \"README.md\"), \"test\\n\")\n execFileSync(\"git\", [\"-C\", temp, \"add\", \"README.md\"])\n execFileSync(\"git\", [\"-C\", temp, \"-c\", \"user.name=CodeNomad Test\", \"-c\", \"user.email=test@codenomad.local\", \"commit\", \"-m\", \"test\"])\n execFileSync(\"git\", [\"-C\", temp, \"worktree\", \"add\", \"-b\", \"doomed\", target])\n\n const workspace = { id: \"workspace\", path: temp, status: \"ready\" } as WorkspaceDescriptor\n const nativeSession = { id: \"unloaded\", projectID: \"project\", location: { directory: target }, cost: 0, tokens: {}, time: { created: 1, updated: 1 } } as SessionInfo\n let blocker: \"shell\" | \"pty\" | \"persistent\" | undefined = \"shell\"\n const client = {\n project: { list: async () => [{ id: \"project\" }] },\n debug: { location: { list: async () => [{ directory: path.join(temp, \"unrelated\"), workspaceID: \"root-location\" }] } },\n shell: { list: async (_input: unknown, options?: { headers: Record<string, string> }) => ({\n data: blocker === \"shell\" && readLocationContext(options?.headers[\"x-codenomad-location\"], \"legacy\")?.workspaceID === \"root-location\"\n ? [{ id: \"sh_blocker\", status: \"running\", cwd: target }]\n : [],\n }) },\n pty: { list: async (_input: unknown, options?: { headers: Record<string, string> }) => ({\n data: blocker === \"pty\" && readLocationContext(options?.headers[\"x-codenomad-location\"], \"legacy\")?.workspaceID === \"root-location\"\n ? [{ id: \"pty_blocker\", status: \"running\", cwd: target }]\n : [],\n }) },\n experimental: { persistentPty: { list: async () => (\n blocker === \"persistent\" ? [{ id: \"pty_persistent\", status: \"running\", cwd: target }] : []\n ) } },\n location: {\n get: async ({ location }: { location?: { directory?: string } }) => ({\n directory: location?.directory ?? temp,\n project: { id: \"project\", canonical: temp, directory: temp },\n }),\n },\n session: {\n list: async () => ({ data: [nativeSession], cursor: {} }),\n active: async () => ({}),\n move: async (input: { directory: string }) => {\n if (input.directory === temp) throw new Error(\"native move failed\")\n },\n get: async () => nativeSession,\n },\n } as unknown as OpenCodeClient\n const manager = {\n getWorktrees: () => fixtureCatalogue(temp),\n get: () => workspace,\n getSharedServiceClient: async () => client,\n getServiceLocation: () => ({ directory: temp }),\n getServiceDirectoryForPath: async (_id: string, directory: string) => directory,\n reserveWorktreeDeletion: async () => () => undefined,\n getWorktreeIdentityForPath: async () => \"workspace:doomed\",\n } as unknown as WorkspaceManager\n registerWorktreeRoutes(app, { workspaceManager: manager, worktreeDeletionFence: new WorktreeDeletionFence() })\n\n const slug = (await fixtureCatalogue(temp)).worktrees.find(entry => entry.branch === \"doomed\")!.slug\n for (const [kind, message] of [[\"shell\", \"Running Shell\"], [\"pty\", \"Running PTY\"], [\"persistent\", \"Running persistent PTY\"]] as const) {\n blocker = kind\n const blocked = await app.inject({ method: \"DELETE\", url: `/api/workspaces/workspace/worktrees/${slug}` })\n assert.equal(blocked.statusCode, 409)\n assert.match(blocked.json().error, new RegExp(message))\n }\n blocker = undefined\n\n const response = await app.inject({ method: \"DELETE\", url: `/api/workspaces/workspace/worktrees/${slug}` })\n\n assert.equal(response.statusCode, 502)\n assert.match(response.json().error, /native move failed/)\n assert.match(execFileSync(\"git\", [\"-C\", temp, \"worktree\", \"list\", \"--porcelain\"], { encoding: \"utf8\" }), /doomed/)\n } finally {\n await app.close()\n rmSync(temp, { recursive: true, force: true })\n }\n})\n})\n"]}
|
|
@@ -4,7 +4,7 @@ import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
|
|
|
4
4
|
import { tmpdir } from "node:os";
|
|
5
5
|
import path from "node:path";
|
|
6
6
|
import { describe, it } from "node:test";
|
|
7
|
-
import {
|
|
7
|
+
import { fixtureCatalogue } from "./native-worktree-fixture";
|
|
8
8
|
describe("listWorktrees", () => {
|
|
9
9
|
it("uses the selected workspace folder for the root worktree directory", async () => {
|
|
10
10
|
const temp = mkdtempSync(path.join(tmpdir(), "codenomad-git-worktrees-"));
|
|
@@ -16,7 +16,7 @@ describe("listWorktrees", () => {
|
|
|
16
16
|
writeFileSync(path.join(repoRoot, "README.md"), "test\n");
|
|
17
17
|
execFileSync("git", ["-C", repoRoot, "add", "README.md"]);
|
|
18
18
|
execFileSync("git", ["-C", repoRoot, "-c", "user.name=CodeNomad Test", "-c", "user.email=test@codenomad.local", "commit", "-m", "test"]);
|
|
19
|
-
const worktrees = await
|
|
19
|
+
const { worktrees } = await fixtureCatalogue(workspaceFolder);
|
|
20
20
|
assert.equal(worktrees[0]?.slug, "root");
|
|
21
21
|
assert.equal(worktrees[0]?.directory, workspaceFolder);
|
|
22
22
|
assert.equal(worktrees[0]?.kind, "root");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-worktrees.test.js","sourceRoot":"","sources":["../../../src/workspaces/__tests__/git-worktrees.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAA;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AACvE,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAChC,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"git-worktrees.test.js","sourceRoot":"","sources":["../../../src/workspaces/__tests__/git-worktrees.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAA;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AACvE,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAChC,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAE5D,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,oEAAoE,EAAE,KAAK,IAAI,EAAE;QAClF,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,0BAA0B,CAAC,CAAC,CAAA;QACzE,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QACxC,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;QAErD,IAAI,CAAC;YACH,YAAY,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,uBAAuB,EAAE,QAAQ,CAAC,CAAC,CAAA;YAChE,SAAS,CAAC,eAAe,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;YAC/C,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,EAAE,QAAQ,CAAC,CAAA;YACzD,YAAY,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC,CAAA;YACzD,YAAY,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,0BAA0B,EAAE,IAAI,EAAE,iCAAiC,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAA;YAExI,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,gBAAgB,CAAC,eAAe,CAAC,CAAA;YAE7D,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;YACxC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,eAAe,CAAC,CAAA;YACtD,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;YACxC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;YAC1C,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAA;QACpD,CAAC;gBAAS,CAAC;YACT,MAAM,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;QAChD,CAAC;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA","sourcesContent":["import assert from \"node:assert/strict\"\nimport { execFileSync } from \"node:child_process\"\nimport { mkdirSync, mkdtempSync, rmSync, writeFileSync } from \"node:fs\"\nimport { tmpdir } from \"node:os\"\nimport path from \"node:path\"\nimport { describe, it } from \"node:test\"\nimport { fixtureCatalogue } from \"./native-worktree-fixture\"\n\ndescribe(\"listWorktrees\", () => {\n it(\"uses the selected workspace folder for the root worktree directory\", async () => {\n const temp = mkdtempSync(path.join(tmpdir(), \"codenomad-git-worktrees-\"))\n const repoRoot = path.join(temp, \"repo\")\n const workspaceFolder = path.join(repoRoot, \"proj-1\")\n\n try {\n execFileSync(\"git\", [\"init\", \"--initial-branch=main\", repoRoot])\n mkdirSync(workspaceFolder, { recursive: true })\n writeFileSync(path.join(repoRoot, \"README.md\"), \"test\\n\")\n execFileSync(\"git\", [\"-C\", repoRoot, \"add\", \"README.md\"])\n execFileSync(\"git\", [\"-C\", repoRoot, \"-c\", \"user.name=CodeNomad Test\", \"-c\", \"user.email=test@codenomad.local\", \"commit\", \"-m\", \"test\"])\n\n const { worktrees } = await fixtureCatalogue(workspaceFolder)\n\n assert.equal(worktrees[0]?.slug, \"root\")\n assert.equal(worktrees[0]?.directory, workspaceFolder)\n assert.equal(worktrees[0]?.kind, \"root\")\n assert.equal(worktrees[0]?.branch, \"main\")\n assert.notEqual(worktrees[0]?.directory, repoRoot)\n } finally {\n rmSync(temp, { recursive: true, force: true })\n }\n })\n})\n"]}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { execFileSync } from "node:child_process";
|
|
2
|
+
import path from "node:path";
|
|
3
|
+
import { listNativeWorktrees } from "../native-worktrees";
|
|
4
|
+
// Only the native discovery transport is replaced. Filesystem identity, Git
|
|
5
|
+
// annotations, nested projection and the production catalogue remain real.
|
|
6
|
+
export function fixtureCatalogue(workspacePath) {
|
|
7
|
+
const git = (directory, ...args) => execFileSync("git", ["-C", directory, ...args], { encoding: "utf8" }).trim();
|
|
8
|
+
const client = {
|
|
9
|
+
location: { get: async ({ location }) => {
|
|
10
|
+
const directory = git(location.directory, "rev-parse", "--show-toplevel");
|
|
11
|
+
const common = git(directory, "rev-parse", "--path-format=absolute", "--git-common-dir");
|
|
12
|
+
return { directory: location.directory, project: { id: "fixture", directory, canonical: path.dirname(common) } };
|
|
13
|
+
} },
|
|
14
|
+
worktree: {
|
|
15
|
+
refresh: async () => { },
|
|
16
|
+
list: async () => git(workspacePath, "worktree", "list", "--porcelain", "-z").split("\0")
|
|
17
|
+
.filter(field => field.startsWith("worktree ")).map(field => ({ directory: field.slice(9) })),
|
|
18
|
+
},
|
|
19
|
+
};
|
|
20
|
+
return listNativeWorktrees({ client, workspacePath, location: { directory: workspacePath }, toHost: async (directory) => directory });
|
|
21
|
+
}
|
|
22
|
+
//# sourceMappingURL=native-worktree-fixture.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"native-worktree-fixture.js","sourceRoot":"","sources":["../../../src/workspaces/__tests__/native-worktree-fixture.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,IAAI,MAAM,WAAW,CAAA;AAE5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AAEzD,4EAA4E;AAC5E,2EAA2E;AAC3E,MAAM,UAAU,gBAAgB,CAAC,aAAqB;IACpD,MAAM,GAAG,GAAG,CAAC,SAAiB,EAAE,GAAG,IAAc,EAAE,EAAE,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA;IAClI,MAAM,MAAM,GAAG;QACb,QAAQ,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAuC,EAAE,EAAE;gBAC3E,MAAM,SAAS,GAAG,GAAG,CAAC,QAAQ,CAAC,SAAS,EAAE,WAAW,EAAE,iBAAiB,CAAC,CAAA;gBACzE,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,WAAW,EAAE,wBAAwB,EAAE,kBAAkB,CAAC,CAAA;gBACxF,OAAO,EAAE,SAAS,EAAE,QAAQ,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,CAAA;YAClH,CAAC,EAAE;QACH,QAAQ,EAAE;YACR,OAAO,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC;YACvB,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,GAAG,CAAC,aAAa,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;iBACtF,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;SAChG;KAC2B,CAAA;IAC9B,OAAO,mBAAmB,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,EAAE,MAAM,EAAE,KAAK,EAAC,SAAS,EAAC,EAAE,CAAC,SAAS,EAAE,CAAC,CAAA;AACrI,CAAC","sourcesContent":["import { execFileSync } from \"node:child_process\"\nimport path from \"node:path\"\nimport type { OpenCodeClient } from \"@opencode/client\"\nimport { listNativeWorktrees } from \"../native-worktrees\"\n\n// Only the native discovery transport is replaced. Filesystem identity, Git\n// annotations, nested projection and the production catalogue remain real.\nexport function fixtureCatalogue(workspacePath: string) {\n const git = (directory: string, ...args: string[]) => execFileSync(\"git\", [\"-C\", directory, ...args], { encoding: \"utf8\" }).trim()\n const client = {\n location: { get: async ({ location }: { location: { directory: string } }) => {\n const directory = git(location.directory, \"rev-parse\", \"--show-toplevel\")\n const common = git(directory, \"rev-parse\", \"--path-format=absolute\", \"--git-common-dir\")\n return { directory: location.directory, project: { id: \"fixture\", directory, canonical: path.dirname(common) } }\n } },\n worktree: {\n refresh: async () => {},\n list: async () => git(workspacePath, \"worktree\", \"list\", \"--porcelain\", \"-z\").split(\"\\0\")\n .filter(field => field.startsWith(\"worktree \")).map(field => ({ directory: field.slice(9) })),\n },\n } as unknown as OpenCodeClient\n return listNativeWorktrees({ client, workspacePath, location: { directory: workspacePath }, toHost: async directory => directory })\n}\n"]}
|
|
@@ -1,15 +1,35 @@
|
|
|
1
1
|
import assert from "node:assert/strict";
|
|
2
2
|
import { mkdtemp, rm } from "node:fs/promises";
|
|
3
|
+
import fs from "node:fs/promises";
|
|
3
4
|
import { tmpdir } from "node:os";
|
|
5
|
+
import { syncBuiltinESMExports } from "node:module";
|
|
4
6
|
import path from "node:path";
|
|
5
7
|
import { describe, it } from "node:test";
|
|
6
8
|
import { getWorktreeGitStatus, invalidateWorktreeGitStatus } from "./git-status";
|
|
7
9
|
describe("worktree git status singleflight", () => {
|
|
8
|
-
it("coalesces concurrent requests and runs again after settlement", async () => {
|
|
10
|
+
it("coalesces concurrent requests and runs again after settlement", async (t) => {
|
|
9
11
|
const directory = await mkdtemp(path.join(tmpdir(), "codenomad-git-status-"));
|
|
10
12
|
let calls = 0;
|
|
11
13
|
let release;
|
|
12
14
|
const blocked = new Promise((resolve) => { release = resolve; });
|
|
15
|
+
// Both callers must finish canonicalization before releasing the Git work.
|
|
16
|
+
// Otherwise a fast first read can settle while the second realpath is still
|
|
17
|
+
// in the filesystem queue, legitimately starting a separate flight.
|
|
18
|
+
const realpath = fs.realpath;
|
|
19
|
+
let canonicalized = 0;
|
|
20
|
+
let ready;
|
|
21
|
+
const bothCanonicalized = new Promise((resolve) => { ready = resolve; });
|
|
22
|
+
const canonicalization = t.mock.method(fs, "realpath", async (value) => {
|
|
23
|
+
const result = await realpath(value);
|
|
24
|
+
canonicalized += 1;
|
|
25
|
+
if (canonicalized === 2)
|
|
26
|
+
ready();
|
|
27
|
+
await bothCanonicalized;
|
|
28
|
+
return result;
|
|
29
|
+
});
|
|
30
|
+
// Native ESM named imports do not see default-export monkey patches until
|
|
31
|
+
// synchronized. The CI runner uses ESM even when a local tsx run uses CJS.
|
|
32
|
+
syncBuiltinESMExports();
|
|
13
33
|
const run = async () => {
|
|
14
34
|
calls += 1;
|
|
15
35
|
await blocked;
|
|
@@ -30,6 +50,9 @@ describe("worktree git status singleflight", () => {
|
|
|
30
50
|
assert.equal(calls, 10);
|
|
31
51
|
}
|
|
32
52
|
finally {
|
|
53
|
+
release();
|
|
54
|
+
canonicalization.mock.restore();
|
|
55
|
+
syncBuiltinESMExports();
|
|
33
56
|
await rm(directory, { recursive: true, force: true });
|
|
34
57
|
}
|
|
35
58
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-status.test.js","sourceRoot":"","sources":["../../src/workspaces/git-status.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAA;AACvC,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAChC,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAA;AAExC,OAAO,EAAE,oBAAoB,EAAE,2BAA2B,EAAE,MAAM,cAAc,CAAA;AAEhF,QAAQ,CAAC,kCAAkC,EAAE,GAAG,EAAE;IAChD,EAAE,CAAC,+DAA+D,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"git-status.test.js","sourceRoot":"","sources":["../../src/workspaces/git-status.test.ts"],"names":[],"mappings":"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","sourcesContent":["import assert from \"node:assert/strict\"\nimport { mkdtemp, rm } from \"node:fs/promises\"\nimport fs from \"node:fs/promises\"\nimport { tmpdir } from \"node:os\"\nimport { syncBuiltinESMExports } from \"node:module\"\nimport path from \"node:path\"\nimport { describe, it } from \"node:test\"\n\nimport { getWorktreeGitStatus, invalidateWorktreeGitStatus } from \"./git-status\"\n\ndescribe(\"worktree git status singleflight\", () => {\n it(\"coalesces concurrent requests and runs again after settlement\", async (t) => {\n const directory = await mkdtemp(path.join(tmpdir(), \"codenomad-git-status-\"))\n let calls = 0\n let release!: () => void\n const blocked = new Promise<void>((resolve) => { release = resolve })\n // Both callers must finish canonicalization before releasing the Git work.\n // Otherwise a fast first read can settle while the second realpath is still\n // in the filesystem queue, legitimately starting a separate flight.\n const realpath = fs.realpath\n let canonicalized = 0\n let ready!: () => void\n const bothCanonicalized = new Promise<void>((resolve) => { ready = resolve })\n const canonicalization = t.mock.method(fs, \"realpath\", async (value: string) => {\n const result = await realpath(value)\n canonicalized += 1\n if (canonicalized === 2) ready()\n await bothCanonicalized\n return result\n })\n // Native ESM named imports do not see default-export monkey patches until\n // synchronized. The CI runner uses ESM even when a local tsx run uses CJS.\n syncBuiltinESMExports()\n const run = async () => {\n calls += 1\n await blocked\n return { ok: true as const, stdout: \"\" }\n }\n\n try {\n const first = getWorktreeGitStatus({ workspaceFolder: directory }, run)\n const second = getWorktreeGitStatus({ workspaceFolder: path.join(directory, \".\") }, run)\n const deadline = Date.now() + 1_000\n while (calls === 0 && Date.now() < deadline) {\n await new Promise<void>((resolve) => setImmediate(resolve))\n }\n assert.equal(calls, 5)\n release()\n assert.deepEqual(await Promise.all([first, second]), [[], []])\n assert.equal(calls, 5)\n\n await getWorktreeGitStatus({ workspaceFolder: directory }, run)\n assert.equal(calls, 10)\n } finally {\n release()\n canonicalization.mock.restore()\n syncBuiltinESMExports()\n await rm(directory, { recursive: true, force: true })\n }\n })\n\n it(\"starts a new generation after a successful mutation while an older read is blocked\", async () => {\n const directory = await mkdtemp(path.join(tmpdir(), \"codenomad-git-status-\"))\n let calls = 0\n let releaseOld!: () => void\n const oldBlocked = new Promise<void>((resolve) => { releaseOld = resolve })\n const run = async () => {\n calls += 1\n if (calls <= 5) await oldBlocked\n return { ok: true as const, stdout: \"\" }\n }\n\n try {\n const oldRead = getWorktreeGitStatus({ workspaceFolder: directory }, run)\n while (calls < 5) await new Promise<void>((resolve) => setImmediate(resolve))\n await invalidateWorktreeGitStatus(path.join(directory, \".\"))\n const newRead = getWorktreeGitStatus({ workspaceFolder: directory }, run)\n assert.deepEqual(await newRead, [])\n assert.equal(calls, 10)\n releaseOld()\n assert.deepEqual(await oldRead, [])\n\n await getWorktreeGitStatus({ workspaceFolder: directory }, run)\n assert.equal(calls, 15)\n } finally {\n await rm(directory, { recursive: true, force: true })\n }\n })\n\n it(\"cleans up a rejected flight so the next read can retry\", async () => {\n const directory = await mkdtemp(path.join(tmpdir(), \"codenomad-git-status-\"))\n let fail = true\n let calls = 0\n const run = async () => {\n calls += 1\n return fail\n ? { ok: false as const, error: new Error(\"status failed\") }\n : { ok: true as const, stdout: \"\" }\n }\n\n try {\n await assert.rejects(getWorktreeGitStatus({ workspaceFolder: directory }, run), /status failed/)\n fail = false\n assert.deepEqual(await getWorktreeGitStatus({ workspaceFolder: directory }, run), [])\n assert.equal(calls, 10)\n } finally {\n await rm(directory, { recursive: true, force: true })\n }\n })\n})\n"]}
|