Skip to content

Commit 7535186

Browse files
authored
test(update): re-pin launcher invariants to the transactional install contract (#2081)
* docs(devlog): 260819 triage-execution campaign records (010/020/030) * test(update): re-pin launcher invariants to the transactional install contract #2079 replaced the direct global npm install spawn with the staged transactionalNpmUpdate call, breaking three source-invariant pins that anchored on the removed spawn line (dev-head CI run 32204396229). The invariants themselves still hold — stop precedes the destructive step, the history-restore warning precedes it, and every npm spawn goes through the hardened npmInvocation resolver — so the pins now anchor on the transactional call and the runNpm callback's invocation spawn.
1 parent 1ad131a commit 7535186

3 files changed

Lines changed: 49 additions & 3 deletions

File tree

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# 030 — Campaign outcome (260819 triage execution)
2+
3+
## Merged (12 PRs, all --squash --admin after sol-medium review lanes)
4+
5+
| PR | SHA | scope |
6+
|---|---|---|
7+
| #2055 | 2648ffa87 | detail.code workspace denial classification (partial #2046) |
8+
| #2061 | 82b882903 | provider sub-table strip crash fix (scratch 84/0+tsc) |
9+
| #2066 | 963699845 | Claude-on-Antigravity continue nudge (closes #2065) |
10+
| #2045 | 0161a66d9 | NO_PROXY fake-IP boundary (follow-up note posted) |
11+
| #2042 | c472ad0f3 | structured-output opt-out exact-ID |
12+
| #2059 | bd3aa3192 | Lab gate reporting = adapter matching (follow-up note) |
13+
| #2044 | bca251c16 | Cursor text-part tool results (blocker disproved) |
14+
| #1903 | fd85c8238 | Cursor HTTP/1.1 transport (Ingwannu-approved head) |
15+
| #2057 | abaa75a60 | OpenCode Go quota probe docs |
16+
| #2076 | 59964ad77 | OUR #2073 fix: env_key injector contract |
17+
| #2078 | 11e03eb44 | OUR #1926 fix: tsig credential scope + barrier (C4 sec review) |
18+
| #2079 | 1ad131acb | OUR #1942/#1849 fix: transactional update (adversarial review) |
19+
20+
## Downgraded to needs-work (BLOCK verdicts honored, evidence comments)
21+
22+
- #2056 (fail-open shortPercent routing, 5335838673), #2053 (missing reauth
23+
regression test, 5335919807), #2075 (modelInList vs #2042 + FastWire parity,
24+
5335950781), #2072 (assumed-tier billing, 5335998291), #2068 (quota->catalog
25+
peer fail-open, 5335998403).
26+
27+
## Closed
28+
29+
- PRs: #1498 (stale/dont-merge); #1885 already closed upstream of us.
30+
- Issues: #2065 #2073 #1926 #1942 #1849 (by merges), #2064 (fixed-on-dev RCA,
31+
020 doc), #2046 partial-status comment (thread-switch half open).
32+
33+
## Gates
34+
35+
- Push CI: intermediate merge runs cancelled by supersession (concurrency);
36+
full success 59964ad77 mid-train; decisive run on final head 1ad131acb
37+
(32204396229). Windows dispatch leg remains known-red pre-campaign (not a
38+
gate).
39+
- lidge: tsc + isolate suite + privacy on 1ad131acb in ~/.wp9-final
40+
(/tmp/wp9-{tsc,suite,privacy}.log).
41+

‎tests/ocx-launcher-source.test.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,10 @@ describe("ocx.mjs npm launcher (source invariants)", () => {
5151
expect(source).toContain("const latestInvocation = npmInvocation(");
5252
expect(source).toContain("const installInvocation = npmInvocation(");
5353
expect(source).toContain("spawnSync(latestInvocation.file, latestInvocation.args");
54-
expect(source).toContain("spawnSync(installInvocation.file, installInvocation.args");
54+
// #1942: the staged install spawns through the same hardened npmInvocation resolver
55+
// inside the transactional runNpm callback.
56+
expect(source).toContain("const invocation = npmInvocation(args);");
57+
expect(source).toContain("spawnSync(invocation.file, invocation.args");
5558
expect(source).not.toContain("shell: true");
5659
expect(source).not.toContain('"npm.cmd"');
5760
});

‎tests/update-stop-first.test.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ describe("update stops the running proxy before replacing files", () => {
5757
test("npm launcher update path stops via its own launcher path before npm install", () => {
5858
expect(launcherSource).toContain('spawnSync(process.execPath, [launcher, "stop"]');
5959
const stopAt = launcherSource.indexOf('[launcher, "stop"]');
60-
const installAt = launcherSource.indexOf("spawnSync(installInvocation.file, installInvocation.args");
60+
// #1942: the destructive step is now the transactional staged update, not a direct
61+
// global npm install. The stop must still precede it.
62+
const installAt = launcherSource.indexOf("transactionalNpmUpdate({");
6163
expect(stopAt).toBeGreaterThan(-1);
6264
expect(installAt).toBeGreaterThan(-1);
6365
expect(stopAt).toBeLessThan(installAt);
@@ -114,7 +116,7 @@ describe("update stops the running proxy before replacing files", () => {
114116
expect(launcherSource).toContain('name.startsWith("codex-history-backup-") && name.endsWith(".json")');
115117
expect(launcherSource).toContain("if (historyRestoreIncomplete())");
116118
const warnAt = launcherSource.indexOf("Codex resume history was NOT restored");
117-
const installAt = launcherSource.indexOf("spawnSync(installInvocation.file, installInvocation.args");
119+
const installAt = launcherSource.indexOf("transactionalNpmUpdate({");
118120
expect(warnAt).toBeGreaterThan(-1);
119121
expect(installAt).toBeGreaterThan(-1);
120122
expect(warnAt).toBeLessThan(installAt);

0 commit comments

Comments
 (0)