Skip to content

Commit 687446c

Browse files
donjor-agent[bot]donjor
authored andcommitted
chore(fork): retire the legacy project-windows domain
## What Changed - Retires the legacy `project-windows` Fork-Domain - `FORK_DOMAINS` and the PR template drop it; the template gains the missing `thread-fork` - `fork-delta.md`: its row and section go; live facts and rebase-scan paths move to `multi-window`, `workspaces` and `fork-meta` - Script test fixtures use `multi-window` ## Why The domain was held only because history trailers carried it. A trunk rewrite (`9d33294dc2` → `ef043b3c97`, tree-equal, `fork:fold prove` exit 0) retagged its 10 commits, so the domain can go. Closes #1336 ## Checklist - [x] This PR is small and focused - [x] I explained what changed and why ## Fork trailers Fork-Domain: fork-meta Fork-Tier: core Co-authored-by: donjor <[email protected]>
1 parent ac05889 commit 687446c

6 files changed

Lines changed: 43 additions & 47 deletions

File tree

‎.github/pull_request_template.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ the change. Upload evidence to GitHub and embed or link it here. Never commit PR
5555
github-issues
5656
markdown-editing
5757
multi-window
58-
project-windows
5958
thread-ordering
59+
thread-fork
6060
upstream-fixes
6161
workspace-files
6262
workspaces

‎scripts/fork-delta.test.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,16 @@ const fixture =
6969
record(
7070
"aaaaaaaaa",
7171
"fix(web): scope markdown actions",
72-
"Fork-Domain: project-windows\nFork-Tier: bugfix\nFork-Upstreamable: yes\n",
72+
"Fork-Domain: multi-window\nFork-Tier: bugfix\nFork-Upstreamable: yes\n",
7373
) +
7474
record(
7575
"bbbbbbbbb",
7676
"feat(desktop): register windows | by identity",
77-
"Fork-Domain: project-windows\nFork-Tier: core\n",
77+
"Fork-Domain: multi-window\nFork-Tier: core\n",
7878
) +
7979
record("ccccccccc", "docs(readme): hyprws", "Fork-Domain: fork-meta\nFork-Tier: qol\n") +
8080
record("ddddddddd", "chore: untagged", "") +
81-
record("eeeeeeeee", "fix(web): wrong tier", "Fork-Domain: project-windows\nFork-Tier: polish\n");
81+
record("eeeeeeeee", "fix(web): wrong tier", "Fork-Domain: multi-window\nFork-Tier: polish\n");
8282

8383
it("asks git for the fork range in stack order", () => {
8484
assert.deepStrictEqual(forkLogArguments("upstream/main", "HEAD").slice(0, 2), [
@@ -96,7 +96,7 @@ it("parses trailers and omits absent ones", () => {
9696
short: "aaaaaaaaa",
9797
authorDate: DEFAULT_AUTHOR_DATE,
9898
subject: "fix(web): scope markdown actions",
99-
domain: "project-windows",
99+
domain: "multi-window",
100100
tier: "bugfix",
101101
upstreamable: "yes",
102102
});
@@ -126,7 +126,7 @@ it("ignores trailer-free walk fixups entirely: the autosquash folds them after t
126126
record(
127127
"aaaaaaaaa",
128128
"fix(web): scope markdown actions",
129-
"Fork-Domain: project-windows\nFork-Tier: bugfix\nFork-Upstreamable: yes\n",
129+
"Fork-Domain: multi-window\nFork-Tier: bugfix\nFork-Upstreamable: yes\n",
130130
),
131131
);
132132
const folded = dropTransientFixups(withFixup);
@@ -196,7 +196,7 @@ it("reads trailers a stack comment and co-author paragraph sit below (134a11855d
196196
it("renders one table per domain with tiers ordered core, qol, bugfix", () => {
197197
const markdown = renderMarkdown(buildLedger("upstream/main", "HEAD", parseForkLog(fixture)));
198198
const lines = markdown.split("\n");
199-
const projectWindows = lines.indexOf("## project-windows");
199+
const projectWindows = lines.indexOf("## multi-window");
200200
const forkMeta = lines.indexOf("## fork-meta");
201201
assert.ok(projectWindows !== -1 && forkMeta !== -1);
202202
assert.strictEqual(
@@ -217,7 +217,7 @@ it("renders one table per domain with tiers ordered core, qol, bugfix", () => {
217217

218218
it("selects one domain with its findings in stack order", () => {
219219
const ledger = buildLedger("upstream/main", "HEAD", parseForkLog(fixture));
220-
const selected = selectDomain(ledger, "project-windows");
220+
const selected = selectDomain(ledger, "multi-window");
221221
assert.isNotNull(selected);
222222
assert.deepStrictEqual(
223223
selected.commits.map((commit) => commit.short),

‎scripts/fork-scan.test.ts‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ vp run fork:scan
3131
3232
| Fork commit | Domain | Upstream replacement |
3333
| --- | --- | --- |
34-
| \`apps/web/src/retired.ts\` | project-windows | gone |
34+
| \`apps/web/src/retired.ts\` | multi-window | gone |
3535
36-
## project-windows
36+
## multi-window
3737
3838
### Shape
3939
@@ -72,7 +72,7 @@ const scanInput = (overrides: Partial<ScanInput> = {}): ScanInput => ({
7272
base: "base",
7373
head: "HEAD",
7474
target: "upstream/main",
75-
commits: [commit("aaaaaaa", "project-windows")],
75+
commits: [commit("aaaaaaa", "multi-window")],
7676
filesBySha: new Map([["aaaaaaa".padEnd(40, "0"), ["apps/web/src/components/Sidebar.logic.ts"]]]),
7777
scans: parseRebaseScans(ledger),
7878
forkChanged: new Set(["apps/web/src/components/Sidebar.logic.ts"]),
@@ -82,8 +82,8 @@ const scanInput = (overrides: Partial<ScanInput> = {}): ScanInput => ({
8282

8383
it("reads one pattern per code span from every domain's rebase scan", () => {
8484
const scans = parseRebaseScans(ledger);
85-
assert.deepStrictEqual([...scans.keys()], ["project-windows", "upstream-fixes"]);
86-
assert.deepStrictEqual(scans.get("project-windows"), [
85+
assert.deepStrictEqual([...scans.keys()], ["multi-window", "upstream-fixes"]);
86+
assert.deepStrictEqual(scans.get("multi-window"), [
8787
"apps/desktop/src/window/DesktopWindow.ts",
8888
"apps/desktop/src/ipc/**",
8989
"apps/web/src/routes/project.*",
@@ -98,10 +98,10 @@ it("reads the multi-window and workspaces rebase scans from the ledger (RSI-Soft
9898
const markdown = git.run(["show", `HEAD:${LEDGER_PATH}`]);
9999
assert.isAbove(root.length, 0, "the scan test runs inside a git checkout");
100100
const scans = parseRebaseScans(markdown);
101-
const projectWindows = scans.get("project-windows") ?? [];
101+
const multiWindow = scans.get("multi-window") ?? [];
102102
const workspaces = scans.get("workspaces") ?? [];
103-
assert.strictEqual(projectWindows.length, 96);
104-
assert.include(projectWindows, "apps/desktop/src/window/DesktopWindow.ts");
103+
assert.include(multiWindow, "apps/desktop/src/preview/Manager*.ts");
104+
assert.include(multiWindow, "apps/desktop/src/window/DesktopWindow.ts");
105105
assert.isTrue(
106106
workspaces.some((pattern) =>
107107
matchesScanPattern(pattern, "apps/web/src/components/Sidebar.tsx"),
@@ -112,7 +112,7 @@ it("reads the multi-window and workspaces rebase scans from the ledger (RSI-Soft
112112
workspaces.some((pattern) =>
113113
matchesScanPattern(pattern, "apps/desktop/src/window/DesktopWindow.ts"),
114114
),
115-
"a project-windows-only path must not match the workspaces scan",
115+
"a multi-window-only path must not match the workspaces scan",
116116
);
117117
});
118118

@@ -145,16 +145,16 @@ it("fails a file both the fork and upstream changed that the scan omits", () =>
145145
const result = buildScanResult(scanInput());
146146
assert.deepStrictEqual(result.domains, [
147147
{
148-
domain: "project-windows",
148+
domain: "multi-window",
149149
commitCount: 1,
150150
sharedCount: 1,
151151
gaps: ["apps/web/src/components/Sidebar.logic.ts"],
152152
},
153153
]);
154154
assert.deepStrictEqual(scanFailures(result), [
155-
"project-windows: rebase scan omits apps/web/src/components/Sidebar.logic.ts",
155+
"multi-window: rebase scan omits apps/web/src/components/Sidebar.logic.ts",
156156
]);
157-
assert.include(renderScanReport(result), "MISSING project-windows");
157+
assert.include(renderScanReport(result), "MISSING multi-window");
158158
});
159159

160160
it("ignores a file only the fork changed and a file only upstream changed", () => {
@@ -179,7 +179,7 @@ it("accepts a file a scan pattern covers", () => {
179179
);
180180
assert.deepStrictEqual(scanFailures(covered), []);
181181
assert.deepStrictEqual(covered.overlaps, [
182-
{ path: "apps/desktop/src/ipc/methods/preview.ts", domain: "project-windows", covered: true },
182+
{ path: "apps/desktop/src/ipc/methods/preview.ts", domain: "multi-window", covered: true },
183183
]);
184184
});
185185

@@ -201,7 +201,7 @@ it("fails a domain that has commits but no rebase scan, and skips untagged commi
201201
it("attributes one shared file to every domain whose commits touch it", () => {
202202
const result = buildScanResult(
203203
scanInput({
204-
commits: [commit("aaaaaaa", "project-windows"), commit("bbbbbbb", "upstream-fixes")],
204+
commits: [commit("aaaaaaa", "multi-window"), commit("bbbbbbb", "upstream-fixes")],
205205
filesBySha: new Map([
206206
["aaaaaaa".padEnd(40, "0"), ["apps/server/src/provider/Layers/GrokAdapter.ts"]],
207207
["bbbbbbb".padEnd(40, "0"), ["apps/server/src/provider/Layers/GrokAdapter.ts"]],
@@ -212,7 +212,7 @@ it("attributes one shared file to every domain whose commits touch it", () => {
212212
);
213213
assert.deepStrictEqual(
214214
result.overlaps.map((overlap) => `${overlap.domain}:${overlap.covered}`),
215-
["project-windows:false", "upstream-fixes:true"],
215+
["multi-window:false", "upstream-fixes:true"],
216216
);
217217
});
218218

‎scripts/lib/fork-hook-guard.test.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const input = (
1010
tier?: string,
1111
upstreamLines?: ReadonlyMap<string, ReadonlySet<string>>,
1212
) => ({
13-
commit: { short: "abc1234", domain: "project-windows", ...(tier === undefined ? {} : { tier }) },
13+
commit: { short: "abc1234", domain: "multi-window", ...(tier === undefined ? {} : { tier }) },
1414
files: [path],
1515
changedLines: new Map([[path, { added }]]),
1616
upstreamFiles: new Set([path]),
@@ -20,7 +20,7 @@ const input = (
2020
it("passes a marked insertion", () => {
2121
assert.deepStrictEqual(
2222
hookGuardWarnings(
23-
input(["import { forkThing } from './forkThing.ts'; // fork-hook: project-windows/thing"]),
23+
input(["import { forkThing } from './forkThing.ts'; // fork-hook: multi-window/thing"]),
2424
),
2525
[],
2626
);
@@ -37,7 +37,7 @@ it("refuses an unmarked rewrap with no exemption", () => {
3737
// rewrapping a landed line is marked by a human, not exempted.
3838
const path = "apps/web/src/thing.ts";
3939
const warnings = hookGuardWarnings({
40-
commit: { short: "abc1234", domain: "project-windows" },
40+
commit: { short: "abc1234", domain: "multi-window" },
4141
files: [path],
4242
changedLines: new Map([
4343
[path, { added: ["const x = foo(", " 1,", ");"], removed: ["const x = foo(1);"] }],
@@ -75,7 +75,7 @@ it("passes a marked hook plus a restored line", () => {
7575
assert.deepStrictEqual(
7676
hookGuardWarnings(
7777
input(
78-
["export const forkThing = 1; // fork-hook: project-windows/thing", restored],
78+
["export const forkThing = 1; // fork-hook: multi-window/thing", restored],
7979
path,
8080
undefined,
8181
new Map([[path, new Set([restored])]]),
@@ -94,7 +94,7 @@ it("behaves as before without the map", () => {
9494
it("stays silent on package.json, where no marker comment can be written", () => {
9595
assert.deepStrictEqual(
9696
hookGuardWarnings({
97-
commit: { short: "abc1234", domain: "project-windows" },
97+
commit: { short: "abc1234", domain: "multi-window" },
9898
files: ["package.json"],
9999
changedLines: new Map([["package.json", { added: [' "fork": true,'] }]]),
100100
upstreamFiles: new Set(["package.json"]),
@@ -106,7 +106,7 @@ it("stays silent on package.json, where no marker comment can be written", () =>
106106
it("exempts an upstreamable bugfix", () => {
107107
assert.deepStrictEqual(
108108
hookGuardWarnings({
109-
commit: { short: "abc1234", domain: "project-windows", tier: "bugfix", upstreamable: "yes" },
109+
commit: { short: "abc1234", domain: "multi-window", tier: "bugfix", upstreamable: "yes" },
110110
files: ["apps/web/src/thing.ts"],
111111
changedLines: new Map([["apps/web/src/thing.ts", { added: ["export const x = 1;"] }]]),
112112
upstreamFiles: new Set(["apps/web/src/thing.ts"]),

‎scripts/lib/fork-hooks.test.ts‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,11 @@ it("accepts the multi-window and workspaces domains for markers (RSI-Software/t3
157157

158158
it("parses a trailing line marker and strips it without touching the code", () => {
159159
const line =
160-
'import { spawnTarget } from "./spawnTarget.fork.ts"; // fork-hook: project-windows/spawn-target';
160+
'import { spawnTarget } from "./spawnTarget.fork.ts"; // fork-hook: multi-window/spawn-target';
161161
const hooks = parseForkHookMarkers(`const stale = 1;\n${line}\nb`);
162162
assert.strictEqual(hooks.length, 1);
163163
assert.deepInclude(hooks[0], {
164-
key: "project-windows/spawn-target",
164+
key: "multi-window/spawn-target",
165165
kind: "line",
166166
startLine: 2,
167167
endLine: 2,
@@ -172,18 +172,15 @@ it("parses a trailing line marker and strips it without touching the code", () =
172172
);
173173
assert.match(line, FORK_HOOK_LINE_SUFFIX);
174174
assert.strictEqual(FORK_HOOK_LINE_MARKER.test(line.trim()), false);
175-
assert.strictEqual(
176-
FORK_HOOK_LINE_MARKER.test("// fork-hook: project-windows/spawn-target"),
177-
true,
178-
);
175+
assert.strictEqual(FORK_HOOK_LINE_MARKER.test("// fork-hook: multi-window/spawn-target"), true);
179176
});
180177

181178
it("parses a trailing block-comment marker (CSS) and bounds it to its line", () => {
182-
const line = '@import "./index.fork.css"; /* fork-hook: project-windows/index-fork-css */';
179+
const line = '@import "./index.fork.css"; /* fork-hook: multi-window/index-fork-css */';
183180
const hooks = parseForkHookMarkers(`@import "tailwindcss";\n${line}\n.wco {}`);
184181
assert.strictEqual(hooks.length, 1);
185182
assert.deepInclude(hooks[0], {
186-
key: "project-windows/index-fork-css",
183+
key: "multi-window/index-fork-css",
187184
kind: "line",
188185
startLine: 2,
189186
endLine: 2,
@@ -203,15 +200,15 @@ it("does not mark a mid-line or non-trailing comment", () => {
203200
it("parses a JSX pair and bounds the region inclusively", () => {
204201
const content = [
205202
"<div>",
206-
" {/* fork-hook: project-windows/preview-pane */}",
203+
" {/* fork-hook: multi-window/preview-pane */}",
207204
" <PreviewPane />",
208205
" {/* fork-hook-end */}",
209206
"</div>",
210207
].join("\n");
211208
const hooks = parseForkHookMarkers(content);
212209
assert.strictEqual(hooks.length, 1);
213210
assert.deepInclude(hooks[0], {
214-
key: "project-windows/preview-pane",
211+
key: "multi-window/preview-pane",
215212
kind: "jsx",
216213
startLine: 2,
217214
endLine: 4,
@@ -349,23 +346,23 @@ it("keeps a trailing fork-hook marker on its line through the repo formatter", a
349346
for (const [filepath, snippet] of [
350347
[
351348
"hook.ts",
352-
'import { spawnTarget } from "./spawnTarget.fork.ts"; // fork-hook: project-windows/spawn-target\nexport const one = 1;\n',
349+
'import { spawnTarget } from "./spawnTarget.fork.ts"; // fork-hook: multi-window/spawn-target\nexport const one = 1;\n',
353350
],
354351
[
355352
"hook.ts",
356-
"registerWindowPolicy(resolveWindowPolicy(input)); // fork-hook: project-windows/register-policy\nexport const two = 2;\n",
353+
"registerWindowPolicy(resolveWindowPolicy(input)); // fork-hook: multi-window/register-policy\nexport const two = 2;\n",
357354
],
358355
[
359356
"hook.ts",
360-
"const policy = resolveWindowPolicy(input); // fork-hook: project-windows/window-policy\nexport const three = 3;\n",
357+
"const policy = resolveWindowPolicy(input); // fork-hook: multi-window/window-policy\nexport const three = 3;\n",
361358
],
362359
[
363360
"hook.tsx",
364-
"const row = <Row policy={windowPolicy} />; // fork-hook: project-windows/window-policy-row\nexport const four = 4;\n",
361+
"const row = <Row policy={windowPolicy} />; // fork-hook: multi-window/window-policy-row\nexport const four = 4;\n",
365362
],
366363
[
367364
"hook.tsx",
368-
"export const five = { windowPolicy: resolveWindowPolicy(input) }; // fork-hook: project-windows/window-policy-prop\n",
365+
"export const five = { windowPolicy: resolveWindowPolicy(input) }; // fork-hook: multi-window/window-policy-prop\n",
369366
],
370367
] as const) {
371368
const formatted = await fmt(filepath, snippet);
@@ -384,15 +381,15 @@ it("keeps a trailing fork-hook marker on its line through the repo formatter", a
384381
[
385382
"export const View = () => (",
386383
" <div>",
387-
" {/* fork-hook: project-windows/preview-pane */}",
384+
" {/* fork-hook: multi-window/preview-pane */}",
388385
" <PreviewPane />",
389386
" {/* fork-hook-end */}",
390387
" </div>",
391388
");",
392389
"",
393390
].join("\n"),
394391
);
395-
assert.include(jsx, "{/* fork-hook: project-windows/preview-pane */}");
392+
assert.include(jsx, "{/* fork-hook: multi-window/preview-pane */}");
396393
assert.include(jsx, "{/* fork-hook-end */}");
397394
const open = jsx.split("\n").findIndex((line) => line.includes("fork-hook:"));
398395
const close = jsx.split("\n").findIndex((line) => line.includes("fork-hook-end"));

‎scripts/lib/fork-trailers.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ export const FORK_DOMAINS = [
88
"github-issues",
99
"markdown-editing",
1010
"multi-window",
11-
"project-windows",
1211
"thread-ordering",
1312
"thread-fork",
1413
"upstream-fixes",

0 commit comments

Comments
 (0)