@mycompbox/compbox-cli 1.21.18 → 1.21.20

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.
Files changed (91) hide show
  1. package/.tsbuildinfo +1 -1
  2. package/agents/internal/feature-worker.md +311 -0
  3. package/agents/orchestrator.md +1203 -0
  4. package/agents/planner.md +694 -0
  5. package/agents/request-formulator.md +450 -0
  6. package/commands/run.d.ts +4 -1
  7. package/commands/run.d.ts.map +1 -1
  8. package/commands/run.js +116 -15
  9. package/commands/run.js.map +1 -1
  10. package/commands/workspace.d.ts +41 -2
  11. package/commands/workspace.d.ts.map +1 -1
  12. package/commands/workspace.js +148 -7
  13. package/commands/workspace.js.map +1 -1
  14. package/index.js +3193 -453
  15. package/package.json +1 -1
  16. package/utils/agent-invoker.d.ts +157 -13
  17. package/utils/agent-invoker.d.ts.map +1 -1
  18. package/utils/agent-invoker.js +587 -87
  19. package/utils/agent-invoker.js.map +1 -1
  20. package/utils/agent-permissions.d.ts +44 -0
  21. package/utils/agent-permissions.d.ts.map +1 -0
  22. package/utils/agent-permissions.js +229 -0
  23. package/utils/agent-permissions.js.map +1 -0
  24. package/utils/agent-store.d.ts +141 -0
  25. package/utils/agent-store.d.ts.map +1 -0
  26. package/utils/agent-store.js +493 -0
  27. package/utils/agent-store.js.map +1 -0
  28. package/utils/agent-trial.d.ts +34 -0
  29. package/utils/agent-trial.d.ts.map +1 -0
  30. package/utils/agent-trial.js +180 -0
  31. package/utils/agent-trial.js.map +1 -0
  32. package/utils/api-client.d.ts +11 -0
  33. package/utils/api-client.d.ts.map +1 -1
  34. package/utils/api-client.js +31 -0
  35. package/utils/api-client.js.map +1 -1
  36. package/utils/belt-engine.d.ts +72 -0
  37. package/utils/belt-engine.d.ts.map +1 -0
  38. package/utils/belt-engine.js +136 -0
  39. package/utils/belt-engine.js.map +1 -0
  40. package/utils/bundled-agents.d.ts +29 -0
  41. package/utils/bundled-agents.d.ts.map +1 -0
  42. package/utils/bundled-agents.js +73 -0
  43. package/utils/bundled-agents.js.map +1 -0
  44. package/utils/cloud-preflight.d.ts +26 -4
  45. package/utils/cloud-preflight.d.ts.map +1 -1
  46. package/utils/cloud-preflight.js +90 -7
  47. package/utils/cloud-preflight.js.map +1 -1
  48. package/utils/custom-agent-contract.d.ts +44 -0
  49. package/utils/custom-agent-contract.d.ts.map +1 -0
  50. package/utils/custom-agent-contract.js +122 -0
  51. package/utils/custom-agent-contract.js.map +1 -0
  52. package/utils/custom-agent-permissions.d.ts +48 -0
  53. package/utils/custom-agent-permissions.d.ts.map +1 -0
  54. package/utils/custom-agent-permissions.js +109 -0
  55. package/utils/custom-agent-permissions.js.map +1 -0
  56. package/utils/custom-agent-runner.d.ts +99 -0
  57. package/utils/custom-agent-runner.d.ts.map +1 -0
  58. package/utils/custom-agent-runner.js +227 -0
  59. package/utils/custom-agent-runner.js.map +1 -0
  60. package/utils/custom-agent-sync.d.ts +59 -0
  61. package/utils/custom-agent-sync.d.ts.map +1 -0
  62. package/utils/custom-agent-sync.js +197 -0
  63. package/utils/custom-agent-sync.js.map +1 -0
  64. package/utils/key-run.d.ts +9 -0
  65. package/utils/key-run.d.ts.map +1 -1
  66. package/utils/key-run.js +18 -0
  67. package/utils/key-run.js.map +1 -1
  68. package/utils/mailbox-client.d.ts +115 -2
  69. package/utils/mailbox-client.d.ts.map +1 -1
  70. package/utils/mailbox-client.js +114 -6
  71. package/utils/mailbox-client.js.map +1 -1
  72. package/utils/merge-guard.d.ts +48 -7
  73. package/utils/merge-guard.d.ts.map +1 -1
  74. package/utils/merge-guard.js +152 -17
  75. package/utils/merge-guard.js.map +1 -1
  76. package/utils/pxpipe-savings.d.ts +12 -0
  77. package/utils/pxpipe-savings.d.ts.map +1 -0
  78. package/utils/pxpipe-savings.js +68 -0
  79. package/utils/pxpipe-savings.js.map +1 -0
  80. package/utils/run-timings.d.ts +3 -0
  81. package/utils/run-timings.d.ts.map +1 -1
  82. package/utils/run-timings.js +2 -0
  83. package/utils/run-timings.js.map +1 -1
  84. package/utils/run-workspace.d.ts +18 -0
  85. package/utils/run-workspace.d.ts.map +1 -1
  86. package/utils/run-workspace.js +46 -5
  87. package/utils/run-workspace.js.map +1 -1
  88. package/utils/wrap-up.d.ts +8 -0
  89. package/utils/wrap-up.d.ts.map +1 -1
  90. package/utils/wrap-up.js +24 -2
  91. package/utils/wrap-up.js.map +1 -1
@@ -1,4 +1,5 @@
1
1
  import { accessSync, chmodSync, constants, mkdirSync, readdirSync, renameSync, statSync, writeFileSync, } from "node:fs";
2
+ import { createHash } from "node:crypto";
2
3
  import { isAbsolute, join } from "node:path";
3
4
  import { isOnPath } from "./package-manager-shims.js";
4
5
  /**
@@ -36,12 +37,76 @@ export function mergeGuardDisallowedTools(baseBranch) {
36
37
  export function mergeGuardArgs(baseBranch) {
37
38
  return ["--disallowedTools", ...mergeGuardDisallowedTools(baseBranch)];
38
39
  }
40
+ /**
41
+ * Custom agents (ENG-569) can never merge or deploy, whatever their stored
42
+ * permissions or skills say. These Bash patterns are refused at the tool
43
+ * layer on top of the merge guard; they are fixed and can't be loosened.
44
+ */
45
+ export const CUSTOM_AGENT_DEPLOY_DISALLOWED_TOOLS = Object.freeze([
46
+ "Bash(gh workflow run:*)",
47
+ "Bash(gh release create:*)",
48
+ "Bash(gh api *deployments*)",
49
+ "Bash(gh api *dispatches*)",
50
+ "Bash(npm publish:*)",
51
+ "Bash(pnpm publish:*)",
52
+ "Bash(yarn publish:*)",
53
+ "Bash(yarn npm publish:*)",
54
+ "Bash(vercel:*)",
55
+ "Bash(netlify deploy:*)",
56
+ "Bash(fly deploy:*)",
57
+ "Bash(flyctl deploy:*)",
58
+ "Bash(railway up:*)",
59
+ "Bash(heroku:*)",
60
+ "Bash(firebase deploy:*)",
61
+ "Bash(wrangler deploy:*)",
62
+ "Bash(wrangler publish:*)",
63
+ "Bash(serverless deploy:*)",
64
+ "Bash(sls deploy:*)",
65
+ "Bash(cdk deploy:*)",
66
+ "Bash(terraform apply:*)",
67
+ "Bash(pulumi up:*)",
68
+ "Bash(kubectl apply:*)",
69
+ "Bash(kubectl rollout:*)",
70
+ "Bash(helm install:*)",
71
+ "Bash(helm upgrade:*)",
72
+ "Bash(gcloud run deploy:*)",
73
+ "Bash(gcloud app deploy:*)",
74
+ "Bash(aws deploy:*)",
75
+ "Bash(docker push:*)",
76
+ ]);
77
+ /** `gh` subcommands the custom agent shim refuses on top of `pr merge` (deploy paths). */
78
+ export const CUSTOM_AGENT_GH_DENY = Object.freeze([
79
+ "workflow run",
80
+ "release create",
81
+ ]);
82
+ /** Refusal shown when a custom agent tries to merge or deploy. */
83
+ export const CUSTOM_AGENT_REFUSED_MESSAGE = "Custom agents can't merge pull requests or deploy. Report it in your findings and stop.";
84
+ /** Every `--disallowedTools` pattern for a custom agent run: merge guard + deploy denylist. */
85
+ export function customAgentDisallowedTools(baseBranch) {
86
+ return [...mergeGuardDisallowedTools(baseBranch), ...CUSTOM_AGENT_DEPLOY_DISALLOWED_TOOLS];
87
+ }
39
88
  /** Shell single-quote a value for a generated script. */
40
89
  function shQuote(value) {
41
90
  return `'${value.replace(/'/g, `'\\''`)}'`;
42
91
  }
43
- /** The POSIX `gh` shim: refuses merges, passes everything else to the real gh. */
44
- export function ghShimScript(realGhPath) {
92
+ /** Refusal for a `gh` subcommand the company's agent permissions deny (ENG-579). */
93
+ export const DECLARED_GH_REFUSED_MESSAGE = "Your company's agent permissions don't allow this gh command in a CompBox run.";
94
+ /** `gh` subcommands safe to embed in a shim: one or two lowercase words. */
95
+ function safeGhDeny(ghDeny) {
96
+ return ghDeny
97
+ .map((d) => d.trim())
98
+ .filter((d) => /^[a-z][a-z0-9-]*( [a-z][a-z0-9-]*)?$/.test(d))
99
+ .map((d) => {
100
+ const [first = "", second] = d.split(" ");
101
+ return [first, second ?? null];
102
+ });
103
+ }
104
+ /**
105
+ * The POSIX `gh` shim: refuses merges (and any declared `ghDeny` subcommands,
106
+ * ENG-579), passes everything else to the real gh.
107
+ */
108
+ export function ghShimScript(realGhPath, ghDeny = []) {
109
+ const declared = safeGhDeny(ghDeny);
45
110
  return [
46
111
  "#!/bin/sh",
47
112
  "# Written by CompBox (ENG-346): the build agent may open and update pull",
@@ -67,22 +132,35 @@ export function ghShimScript(realGhPath) {
67
132
  " esac",
68
133
  " done",
69
134
  "fi",
135
+ ...(declared.length > 0
136
+ ? [
137
+ `DMSG=${shQuote(DECLARED_GH_REFUSED_MESSAGE)}`,
138
+ ...declared.map(([a, b]) => b
139
+ ? `if [ "$first" = "${a}" ] && [ "$second" = "${b}" ]; then echo "$DMSG" >&2; exit 1; fi`
140
+ : `if [ "$first" = "${a}" ]; then echo "$DMSG" >&2; exit 1; fi`),
141
+ ]
142
+ : []),
70
143
  'exec "$REAL_GH" "$@"',
71
144
  "",
72
145
  ].join("\n");
73
146
  }
74
147
  /** The Windows `gh.cmd` shim (same rules, simpler matching). */
75
- export function ghShimCmd(realGhPath) {
148
+ export function ghShimCmd(realGhPath, ghDeny = []) {
149
+ const declared = safeGhDeny(ghDeny);
76
150
  return [
77
151
  "@echo off",
78
152
  "rem Written by CompBox (ENG-346): the build agent may not merge pull requests.",
79
153
  'if /I "%~1"=="pr" if /I "%~2"=="merge" goto refuse',
80
154
  'if /I "%~1"=="api" (echo %* | findstr /R /C:"pulls/.*/merge" /C:"mergePullRequest" /C:"enablePullRequestAutoMerge" >nul && goto refuse)',
155
+ ...declared.map(([a, b]) => b ? `if /I "%~1"=="${a}" if /I "%~2"=="${b}" goto refusedeclared` : `if /I "%~1"=="${a}" goto refusedeclared`),
81
156
  `"${realGhPath}" %*`,
82
157
  "exit /b %ERRORLEVEL%",
83
158
  ":refuse",
84
159
  `echo ${MERGE_REFUSED_MESSAGE} 1>&2`,
85
160
  "exit /b 1",
161
+ ...(declared.length > 0
162
+ ? [":refusedeclared", `echo ${DECLARED_GH_REFUSED_MESSAGE} 1>&2`, "exit /b 1"]
163
+ : []),
86
164
  "",
87
165
  ].join("\r\n");
88
166
  }
@@ -111,14 +189,14 @@ export function resolveRealGh(path, platform = process.platform) {
111
189
  * when it can't be written (a guard that can't be installed never stops a run;
112
190
  * the other two layers still apply).
113
191
  */
114
- export function ensureMergeGuardShims(binDir, realGhPath, platform = process.platform) {
192
+ export function ensureMergeGuardShims(binDir, realGhPath, platform = process.platform, ghDeny = []) {
115
193
  try {
116
194
  mkdirSync(binDir, { recursive: true });
117
195
  if (platform === "win32") {
118
- writeAtomic(join(binDir, "gh.cmd"), ghShimCmd(realGhPath), 0o755);
196
+ writeAtomic(join(binDir, "gh.cmd"), ghShimCmd(realGhPath, ghDeny), 0o755);
119
197
  }
120
198
  else {
121
- writeAtomic(join(binDir, "gh"), ghShimScript(realGhPath), 0o755);
199
+ writeAtomic(join(binDir, "gh"), ghShimScript(realGhPath, ghDeny), 0o755);
122
200
  }
123
201
  return binDir;
124
202
  }
@@ -127,13 +205,20 @@ export function ensureMergeGuardShims(binDir, realGhPath, platform = process.pla
127
205
  }
128
206
  }
129
207
  /** Puts the merge-guard shim folder first on the agent's PATH (when a real gh exists). */
130
- export function withMergeGuardPath(path, binDir, platform = process.platform) {
208
+ export function withMergeGuardPath(path, binDir, platform = process.platform, ghDeny = []) {
131
209
  if (!binDir)
132
210
  return path;
133
211
  const realGh = resolveRealGh(path, platform);
134
212
  if (!realGh)
135
213
  return path;
136
- const dir = ensureMergeGuardShims(binDir, realGh, platform);
214
+ // ENG-579: a shim with declared denials gets its own folder (named by the
215
+ // rules), so concurrent runs with different permissions never overwrite
216
+ // each other's shim.
217
+ const rules = [...new Set(ghDeny.map((d) => d.trim()))].sort();
218
+ const shimDir = rules.length > 0
219
+ ? join(binDir, `declared-${createHash("sha256").update(rules.join("\n")).digest("hex").slice(0, 12)}`)
220
+ : binDir;
221
+ const dir = ensureMergeGuardShims(shimDir, realGh, platform, rules);
137
222
  if (!dir)
138
223
  return path;
139
224
  const sep = platform === "win32" ? ";" : ":";
@@ -149,7 +234,8 @@ export function withMergeGuardPath(path, binDir, platform = process.platform) {
149
234
  * branch known when the run copy was made is always protected too. The repo's
150
235
  * own pre-push hook (in `origHooksDir`) still runs afterwards.
151
236
  */
152
- export function prePushHookScript(baseBranch, origHooksDir) {
237
+ export function prePushHookScript(baseBranch, origHooksDir, extraProtected = []) {
238
+ const extra = extraProtected.filter((b) => /^[A-Za-z0-9._/-]+$/.test(b) && !b.includes(".."));
153
239
  return [
154
240
  "#!/bin/sh",
155
241
  "# Written by CompBox (ENG-346): the build agent pushes its feature branch;",
@@ -162,6 +248,8 @@ export function prePushHookScript(baseBranch, origHooksDir) {
162
248
  'default="${default#"$remote"/}"',
163
249
  'if [ -n "$default" ]; then protected="$default"; else protected="main master"; fi',
164
250
  'if [ -n "$BASE" ]; then protected="$protected $BASE"; fi',
251
+ // ENG-579: branches the company's agent permissions protect.
252
+ ...(extra.length > 0 ? [`protected="$protected ${extra.join(" ")}"`] : []),
165
253
  'input=$(cat)',
166
254
  "refused=0",
167
255
  'while read -r local_ref local_sha remote_ref remote_sha; do',
@@ -213,6 +301,45 @@ function existingHooks(dir) {
213
301
  return [];
214
302
  }
215
303
  }
304
+ /**
305
+ * ENG-394: env that points `core.hooksPath` at `hooksDir` for every git the
306
+ * child runs, so the repo's own hooks (e.g. a pre-commit running the whole
307
+ * test suite) don't fire on each agent commit — the build's own checks run
308
+ * them once at the end. Uses GIT_CONFIG_COUNT/KEY_n/VALUE_n (git >= 2.31),
309
+ * appended after any entries already set; older git just ignores it and the
310
+ * hooks run as before. A malformed existing count is left alone (git would
311
+ * otherwise reject every command). Pure — unit tested.
312
+ */
313
+ export function withHooksDisabled(env, hooksDir) {
314
+ const raw = env.GIT_CONFIG_COUNT?.trim();
315
+ if (raw && !/^\d+$/.test(raw))
316
+ return env;
317
+ const n = raw ? Number(raw) : 0;
318
+ return {
319
+ ...env,
320
+ GIT_CONFIG_COUNT: String(n + 1),
321
+ [`GIT_CONFIG_KEY_${String(n)}`]: "core.hooksPath",
322
+ [`GIT_CONFIG_VALUE_${String(n)}`]: hooksDir,
323
+ };
324
+ }
325
+ /**
326
+ * ENG-573: `env` without any git config injected through the environment
327
+ * (GIT_CONFIG_COUNT / GIT_CONFIG_KEY_n / GIT_CONFIG_VALUE_n and
328
+ * GIT_CONFIG_PARAMETERS). Those outrank the run copy's per-worktree config, so
329
+ * an inherited `core.hooksPath` override (e.g. from a parent CompBox run)
330
+ * would silently replace the pre-push guard. Pure.
331
+ */
332
+ export function withoutInheritedGitConfig(env) {
333
+ const out = {};
334
+ for (const [key, value] of Object.entries(env)) {
335
+ if (key === "GIT_CONFIG_COUNT" || key === "GIT_CONFIG_PARAMETERS")
336
+ continue;
337
+ if (key.startsWith("GIT_CONFIG_KEY_") || key.startsWith("GIT_CONFIG_VALUE_"))
338
+ continue;
339
+ out[key] = value;
340
+ }
341
+ return out;
342
+ }
216
343
  /**
217
344
  * Installs the pre-push guard in a run copy (a git worktree under
218
345
  * ~/.compbox/runs). Returns false (never throws) when it wasn't installed.
@@ -229,29 +356,37 @@ function existingHooks(dir) {
229
356
  * A folder that isn't a linked worktree (e.g. the person's checkout) is never
230
357
  * touched.
231
358
  */
232
- export async function installPrePushGuard(runDir, baseBranch, git) {
359
+ export async function installPrePushGuard(runDir, baseBranch, git, extraProtected = []) {
360
+ return (await installPrePushGuardDir(runDir, baseBranch, git, extraProtected)) !== null;
361
+ }
362
+ /**
363
+ * ENG-573: installPrePushGuard, returning the hooks folder holding the guard
364
+ * (null when it wasn't installed), so a caller can also point its child's
365
+ * `core.hooksPath` at it through the environment.
366
+ */
367
+ export async function installPrePushGuardDir(runDir, baseBranch, git, extraProtected = []) {
233
368
  try {
234
369
  const gitDirRes = await git(["rev-parse", "--path-format=absolute", "--git-dir"], runDir);
235
370
  const commonRes = await git(["rev-parse", "--path-format=absolute", "--git-common-dir"], runDir);
236
371
  const gitDir = gitDirRes.stdout.trim();
237
372
  const commonDir = commonRes.stdout.trim();
238
373
  if (gitDirRes.status !== 0 || commonRes.status !== 0 || !gitDir || !commonDir)
239
- return false;
374
+ return null;
240
375
  if (gitDir === commonDir)
241
- return false; // not a linked worktree: never the person's checkout
376
+ return null; // not a linked worktree: never the person's checkout
242
377
  const hooksDir = join(gitDir, "compbox-hooks");
243
378
  // The hooks folder the repo uses today (shared config), so its hooks still run.
244
379
  // A bare repository has no work tree to guard: never switch it to
245
380
  // per-worktree config.
246
381
  const bare = (await git(["config", "--bool", "core.bare"], runDir)).stdout.trim();
247
382
  if (bare === "true")
248
- return false;
383
+ return null;
249
384
  // Any configured hooks folder (repo, global or system config), so the
250
385
  // person's own hooks still run.
251
386
  const current = (await git(["config", "--get", "core.hooksPath"], runDir)).stdout.trim();
252
387
  const orig = current && current !== hooksDir ? current : join(commonDir, "hooks");
253
388
  mkdirSync(hooksDir, { recursive: true });
254
- writeAtomic(join(hooksDir, "pre-push"), prePushHookScript(baseBranch, orig), 0o755);
389
+ writeAtomic(join(hooksDir, "pre-push"), prePushHookScript(baseBranch, orig, extraProtected), 0o755);
255
390
  // Pass through only the hooks the repo actually has: a wrapper per hook
256
391
  // name would make git spawn a shell for every ref update.
257
392
  const origAbs = isAbsolute(orig) ? orig : join(runDir, orig);
@@ -261,11 +396,11 @@ export async function installPrePushGuard(runDir, baseBranch, git) {
261
396
  writeAtomic(join(hooksDir, name), passThroughHookScript(name, orig), 0o755);
262
397
  }
263
398
  if ((await git(["config", "extensions.worktreeConfig", "true"], runDir)).status !== 0)
264
- return false;
265
- return (await git(["config", "--worktree", "core.hooksPath", hooksDir], runDir)).status === 0;
399
+ return null;
400
+ return (await git(["config", "--worktree", "core.hooksPath", hooksDir], runDir)).status === 0 ? hooksDir : null;
266
401
  }
267
402
  catch {
268
- return false;
403
+ return null;
269
404
  }
270
405
  }
271
406
  //# sourceMappingURL=merge-guard.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"merge-guard.js","sourceRoot":"","sources":["../../src/utils/merge-guard.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"merge-guard.js","sourceRoot":"","sources":["../../src/utils/merge-guard.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,12 @@
1
+ /** Default location of the pxpipe proxy event log. */
2
+ export declare function defaultPxpipeEventsPath(): string;
3
+ /**
4
+ * Measured tokens saved by pxpipe for events whose timestamp falls inside
5
+ * [startMs, endMs]. Per event: baseline_tokens minus the tokens actually billed
6
+ * (input + cache_create + cache_read), floored at 0.
7
+ *
8
+ * Returns null (never throws) when the file is missing/unreadable or no usable
9
+ * event falls in the window — "unknown", not zero.
10
+ */
11
+ export declare function readMeasuredTokensSaved(startMs: number, endMs: number, eventsPath?: string): Promise<number | null>;
12
+ //# sourceMappingURL=pxpipe-savings.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"pxpipe-savings.d.ts","sourceRoot":"","sources":["../../src/utils/pxpipe-savings.ts"],"names":[],"mappings":"AAIA,sDAAsD;AACtD,wBAAgB,uBAAuB,IAAI,MAAM,CAEhD;AASD;;;;;;;GAOG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,UAAU,GAAE,MAAkC,GAC7C,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAuCxB"}
@@ -0,0 +1,68 @@
1
+ import { homedir } from "node:os";
2
+ import { join } from "node:path";
3
+ import { open } from "node:fs/promises";
4
+ /** Default location of the pxpipe proxy event log. */
5
+ export function defaultPxpipeEventsPath() {
6
+ return join(homedir(), ".pxpipe", "events.jsonl");
7
+ }
8
+ /** How much of the file tail to read (events.jsonl can be tens of MB). */
9
+ const TAIL_BYTES = 4 * 1024 * 1024;
10
+ function num(v) {
11
+ return typeof v === "number" && Number.isFinite(v) ? v : null;
12
+ }
13
+ /**
14
+ * Measured tokens saved by pxpipe for events whose timestamp falls inside
15
+ * [startMs, endMs]. Per event: baseline_tokens minus the tokens actually billed
16
+ * (input + cache_create + cache_read), floored at 0.
17
+ *
18
+ * Returns null (never throws) when the file is missing/unreadable or no usable
19
+ * event falls in the window — "unknown", not zero.
20
+ */
21
+ export async function readMeasuredTokensSaved(startMs, endMs, eventsPath = defaultPxpipeEventsPath()) {
22
+ try {
23
+ const handle = await open(eventsPath, "r");
24
+ try {
25
+ const { size } = await handle.stat();
26
+ if (size === 0)
27
+ return null;
28
+ const length = Math.min(size, TAIL_BYTES);
29
+ const buf = Buffer.alloc(length);
30
+ await handle.read(buf, 0, length, size - length);
31
+ let lines = buf.toString("utf-8").split("\n");
32
+ // A partial read starts mid-line; drop the first fragment.
33
+ if (size > length)
34
+ lines = lines.slice(1);
35
+ let total = 0;
36
+ let matched = 0;
37
+ for (const line of lines) {
38
+ if (!line.trim())
39
+ continue;
40
+ let ev;
41
+ try {
42
+ ev = JSON.parse(line);
43
+ }
44
+ catch {
45
+ continue; // malformed line
46
+ }
47
+ const ts = typeof ev.ts === "string" ? Date.parse(ev.ts) : NaN;
48
+ if (!Number.isFinite(ts) || ts < startMs || ts > endMs)
49
+ continue;
50
+ const baseline = num(ev.baseline_tokens);
51
+ const input = num(ev.input_tokens);
52
+ if (baseline === null || input === null)
53
+ continue;
54
+ const actual = input + (num(ev.cache_create_tokens) ?? 0) + (num(ev.cache_read_tokens) ?? 0);
55
+ total += Math.max(0, baseline - actual);
56
+ matched++;
57
+ }
58
+ return matched > 0 ? total : null;
59
+ }
60
+ finally {
61
+ await handle.close();
62
+ }
63
+ }
64
+ catch {
65
+ return null;
66
+ }
67
+ }
68
+ //# sourceMappingURL=pxpipe-savings.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"pxpipe-savings.js","sourceRoot":"","sources":["../../src/utils/pxpipe-savings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAExC,sDAAsD;AACtD,MAAM,UAAU,uBAAuB;IACrC,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;AACpD,CAAC;AAED,0EAA0E;AAC1E,MAAM,UAAU,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;AAEnC,SAAS,GAAG,CAAC,CAAU;IACrB,OAAO,OAAO,CAAC,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAChE,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,OAAe,EACf,KAAa,EACb,aAAqB,uBAAuB,EAAE;IAE9C,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QAC3C,IAAI,CAAC;YACH,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;YACrC,IAAI,IAAI,KAAK,CAAC;gBAAE,OAAO,IAAI,CAAC;YAC5B,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YAC1C,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACjC,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,IAAI,GAAG,MAAM,CAAC,CAAC;YACjD,IAAI,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC9C,2DAA2D;YAC3D,IAAI,IAAI,GAAG,MAAM;gBAAE,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAE1C,IAAI,KAAK,GAAG,CAAC,CAAC;YACd,IAAI,OAAO,GAAG,CAAC,CAAC;YAChB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;oBAAE,SAAS;gBAC3B,IAAI,EAA2B,CAAC;gBAChC,IAAI,CAAC;oBACH,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAA4B,CAAC;gBACnD,CAAC;gBAAC,MAAM,CAAC;oBACP,SAAS,CAAC,iBAAiB;gBAC7B,CAAC;gBACD,MAAM,EAAE,GAAG,OAAO,EAAE,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;gBAC/D,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,OAAO,IAAI,EAAE,GAAG,KAAK;oBAAE,SAAS;gBACjE,MAAM,QAAQ,GAAG,GAAG,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC;gBACzC,MAAM,KAAK,GAAG,GAAG,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC;gBACnC,IAAI,QAAQ,KAAK,IAAI,IAAI,KAAK,KAAK,IAAI;oBAAE,SAAS;gBAClD,MAAM,MAAM,GAAG,KAAK,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC7F,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC,CAAC;gBACxC,OAAO,EAAE,CAAC;YACZ,CAAC;YACD,OAAO,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;QACpC,CAAC;gBAAS,CAAC;YACT,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;QACvB,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}
@@ -55,5 +55,8 @@ export declare function buildJobTimings(input: {
55
55
  startedAtMs: number;
56
56
  endedAtMs: number;
57
57
  fastMode: JobTimings["fastMode"];
58
+ /** ENG-591: which path ran the build and, for the belt, each step's duration. */
59
+ path?: JobTimings["path"];
60
+ beltSteps?: JobTimings["beltSteps"];
58
61
  }): JobTimings;
59
62
  //# sourceMappingURL=run-timings.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"run-timings.d.ts","sourceRoot":"","sources":["../../src/utils/run-timings.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEpD,4EAA4E;AAC5E,MAAM,WAAW,kBAAkB;IACjC,qCAAqC;IACrC,KAAK,EAAE,MAAM,CAAC;IACd,qDAAqD;IACrD,OAAO,EAAE,MAAM,CAAC;CACjB;AAYD;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,kBAAkB,GAAG,IAAI,CAqB9E;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,CAAC,kBAAkB,GAAG,IAAI,CAAC,EAAE,GAAG;IAC1E,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB,CASA;AAKD;;;;;GAKG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,OAAO,CAAM;IACrB,OAAO,CAAC,QAAQ,CAAuB;IACvC,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,KAAK,CAAK;IAElB,+DAA+D;IAC/D,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAOxC,4EAA4E;IAC5E,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAK1B,OAAO,CAAC,IAAI;IAmBZ,2DAA2D;IAC3D,IAAI,EAAE,IAAI,MAAM,GAAG,IAAI,CAEtB;CACF;AAED,yDAAyD;AACzD,wBAAgB,eAAe,CAAC,KAAK,EAAE;IACrC,OAAO,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,GAAG,SAAS,CAAC;IACxD,IAAI,EAAE,CAAC,kBAAkB,GAAG,IAAI,CAAC,EAAE,CAAC;IACpC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;CAClC,GAAG,UAAU,CAab"}
1
+ {"version":3,"file":"run-timings.d.ts","sourceRoot":"","sources":["../../src/utils/run-timings.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEpD,4EAA4E;AAC5E,MAAM,WAAW,kBAAkB;IACjC,qCAAqC;IACrC,KAAK,EAAE,MAAM,CAAC;IACd,qDAAqD;IACrD,OAAO,EAAE,MAAM,CAAC;CACjB;AAYD;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,kBAAkB,GAAG,IAAI,CAqB9E;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,CAAC,kBAAkB,GAAG,IAAI,CAAC,EAAE,GAAG;IAC1E,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB,CASA;AAKD;;;;;GAKG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,OAAO,CAAM;IACrB,OAAO,CAAC,QAAQ,CAAuB;IACvC,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,KAAK,CAAK;IAElB,+DAA+D;IAC/D,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAOxC,4EAA4E;IAC5E,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAK1B,OAAO,CAAC,IAAI;IAmBZ,2DAA2D;IAC3D,IAAI,EAAE,IAAI,MAAM,GAAG,IAAI,CAEtB;CACF;AAED,yDAAyD;AACzD,wBAAgB,eAAe,CAAC,KAAK,EAAE;IACrC,OAAO,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,GAAG,SAAS,CAAC;IACxD,IAAI,EAAE,CAAC,kBAAkB,GAAG,IAAI,CAAC,EAAE,CAAC;IACpC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;IACjC,iFAAiF;IACjF,IAAI,CAAC,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;IAC1B,SAAS,CAAC,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC;CACrC,GAAG,UAAU,CAeb"}
@@ -116,6 +116,8 @@ export class CiWaitTracker {
116
116
  export function buildJobTimings(input) {
117
117
  const { modelMs, toolMs } = aggregateRunDurations(input.runs);
118
118
  return {
119
+ ...(input.path && { path: input.path }),
120
+ ...(input.beltSteps && { beltSteps: input.beltSteps }),
119
121
  installMs: input.install?.ms ?? null,
120
122
  cacheHit: input.install?.cacheHit ?? null,
121
123
  modelMs,
@@ -1 +1 @@
1
- {"version":3,"file":"run-timings.js","sourceRoot":"","sources":["../../src/utils/run-timings.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"run-timings.js","sourceRoot":"","sources":["../../src/utils/run-timings.ts"],"names":[],"mappings":"AAcA,SAAS,WAAW,CAAC,KAAc;IACjC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAC7E,MAAM,CAAC,GAAG,KAAgC,CAAC;IAC3C,MAAM,GAAG,GAAG,CAAC,CAAC,eAAe,CAAC;IAC9B,MAAM,KAAK,GAAG,CAAC,CAAC,WAAW,CAAC;IAC5B,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IACtE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC;IAC1F,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;AACxC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,oBAAoB,CAAC,MAAc;IACjD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;IAC9B,IAAI,CAAC,OAAO;QAAE,OAAO,IAAI,CAAC;IAC1B,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;QAC/C,IAAI,KAAK;YAAE,OAAO,KAAK,CAAC;IAC1B,CAAC;IAAC,MAAM,CAAC;QACP,iDAAiD;IACnD,CAAC;IACD,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAClC,KAAK,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3C,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;QACpC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,SAAS;QACpC,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;YAC5C,IAAI,KAAK;gBAAE,OAAO,KAAK,CAAC;QAC1B,CAAC;QAAC,MAAM,CAAC;YACP,YAAY;QACd,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,qBAAqB,CAAC,IAAmC;IAIvE,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC;QAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IAC9F,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,KAAK,MAAM,GAAG,IAAI,IAA4B,EAAE,CAAC;QAC/C,OAAO,IAAI,GAAG,CAAC,KAAK,CAAC;QACrB,MAAM,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC;IACjD,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;AAC7B,CAAC;AAED,MAAM,QAAQ,GAAG,2CAA2C,CAAC;AAC7D,MAAM,MAAM,GAAG,iDAAiD,CAAC;AAEjE;;;;;GAKG;AACH,MAAM,OAAO,aAAa;IAChB,OAAO,GAAG,EAAE,CAAC;IACb,QAAQ,GAAkB,IAAI,CAAC;IAC/B,OAAO,GAAG,CAAC,CAAC;IACZ,KAAK,GAAG,CAAC,CAAC;IAElB,+DAA+D;IAC/D,IAAI,CAAC,KAAa,EAAE,KAAa;QAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QAClC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC;QACjC,KAAK,MAAM,IAAI,IAAI,KAAK;YAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACnD,CAAC;IAED,4EAA4E;IAC5E,KAAK,CAAC,KAAa;QACjB,IAAI,IAAI,CAAC,OAAO;YAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACjD,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;IACpB,CAAC;IAEO,IAAI,CAAC,IAAY,EAAE,KAAa;QACtC,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClC,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;YAC3D,OAAO;QACT,CAAC;QACD,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9B,IAAI,CAAC,GAAG;YAAE,OAAO;QACjB,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QACpD,IAAI,EAAE,GAAkB,IAAI,CAAC;QAC7B,IAAI,OAAO;YAAE,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;aACvC,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI;YAAE,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC/F,IAAI,EAAE,KAAK,IAAI,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC;YAC3B,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;YACnB,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;QAClB,CAAC;QACD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IACvB,CAAC;IAED,2DAA2D;IAC3D,IAAI,EAAE;QACJ,OAAO,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;IAC9C,CAAC;CACF;AAED,yDAAyD;AACzD,MAAM,UAAU,eAAe,CAAC,KAU/B;IACC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,qBAAqB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC9D,OAAO;QACL,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;QACvC,GAAG,CAAC,KAAK,CAAC,SAAS,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC;QACtD,SAAS,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE,IAAI,IAAI;QACpC,QAAQ,EAAE,KAAK,CAAC,OAAO,EAAE,QAAQ,IAAI,IAAI;QACzC,OAAO;QACP,MAAM;QACN,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,gFAAgF;QAChF,UAAU,EAAE,IAAI;QAChB,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC,WAAW,CAAC;QACzD,QAAQ,EAAE,KAAK,CAAC,QAAQ;KACzB,CAAC;AACJ,CAAC"}
@@ -41,6 +41,20 @@ export type CommandRunner = (command: string, args: string[], cwd: string) => Pr
41
41
  /** Set to "0" to keep finished runs local: no push, no pull request. */
42
42
  export declare const RUN_PUSH_ENV = "COMPBOX_RUN_PUSH";
43
43
  export declare const defaultCommandRunner: CommandRunner;
44
+ /** ENG-507: folder name, inside a run's workspace, holding that run's own gcloud config. */
45
+ export declare const GCLOUD_CONFIG_DIRNAME = ".gcloud";
46
+ /** ENG-507: `<run workspace>/.gcloud`. */
47
+ export declare function gcloudConfigDir(dir: string): string;
48
+ /**
49
+ * ENG-507: pure. `env` with CLOUDSDK_CONFIG pointing at the run's own gcloud
50
+ * folder, so a job can never switch the person's main gcloud login. Nothing
51
+ * is copied in from ~/.config/gcloud; keyless auth writes its own.
52
+ */
53
+ export declare function withIsolatedGcloud(env: NodeJS.ProcessEnv, dir: string): NodeJS.ProcessEnv;
54
+ /** ENG-507: creates the run's gcloud folder (private, and self-ignored by git). Idempotent. */
55
+ export declare function createGcloudConfigDir(dir: string): string;
56
+ /** ENG-507: removes the run's gcloud folder. Never throws. */
57
+ export declare function removeGcloudConfigDir(dir: string): void;
44
58
  export interface RunWorkspace {
45
59
  /** The worktree the orchestrator runs in. */
46
60
  dir: string;
@@ -78,6 +92,8 @@ export interface ReopenInput {
78
92
  runDir: string;
79
93
  /** The run's branch, when known (the paused job's result). */
80
94
  branch?: string | null;
95
+ /** ENG-579: extra branches the agent permissions protect from pushes. */
96
+ protectedBranches?: string[];
81
97
  }
82
98
  export interface FinishInput {
83
99
  workspace: RunWorkspace;
@@ -284,6 +300,8 @@ export declare class RunWorkspaceManager {
284
300
  branch?: string;
285
301
  activeRunDirs?: string[];
286
302
  fresh?: boolean;
303
+ /** ENG-579: extra branches the agent permissions protect from pushes. */
304
+ protectedBranches?: string[];
287
305
  }): Promise<PrepareResult>;
288
306
  /**
289
307
  * ENG-349: installs dependencies through a shared per-project store. When the
@@ -1 +1 @@
1
- {"version":3,"file":"run-workspace.d.ts","sourceRoot":"","sources":["../../src/utils/run-workspace.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAgBH,OAAO,EAAwB,KAAK,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAIjF,OAAO,EAiBL,KAAK,cAAc,EACpB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAiB,MAAM,cAAc,CAAC;AAE5E,sCAAsC;AACtC,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,MAAM,MAAM,aAAa,GAAG,CAC1B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,EAAE,MAAM,KACR,OAAO,CAAC,aAAa,CAAC,CAAC;AAE5B,wEAAwE;AACxE,eAAO,MAAM,YAAY,qBAAqB,CAAC;AAM/C,eAAO,MAAM,oBAAoB,EAAE,aAmC/B,CAAC;AAEL,MAAM,WAAW,YAAY;IAC3B,6CAA6C;IAC7C,GAAG,EAAE,MAAM,CAAC;IACZ,4DAA4D;IAC5D,UAAU,EAAE,MAAM,CAAC;IACnB,iEAAiE;IACjE,MAAM,EAAE,MAAM,CAAC;IACf,mFAAmF;IACnF,OAAO,EAAE,MAAM,CAAC;IAChB,sDAAsD;IACtD,UAAU,EAAE,MAAM,CAAC;IACnB,6DAA6D;IAC7D,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,oGAAoG;IACpG,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,+FAA+F;IAC/F,OAAO,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAC;CAC7C;AAED,MAAM,MAAM,aAAa,GACrB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,SAAS,EAAE,YAAY,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,GACtD;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEjC,4EAA4E;AAC5E,MAAM,WAAW,WAAW;IAC1B,wDAAwD;IACxD,UAAU,EAAE,MAAM,CAAC;IACnB,uEAAuE;IACvE,MAAM,EAAE,MAAM,CAAC;IACf,8DAA8D;IAC9D,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAED,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,YAAY,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,qDAAqD;IACrD,SAAS,EAAE,OAAO,CAAC;IACnB,2DAA2D;IAC3D,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;OAIG;IACH,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB;;;;OAIG;IACH,SAAS,CAAC,EAAE;QAAE,gBAAgB,CAAC,EAAE,gBAAgB,CAAA;KAAE,CAAC;IACpD;;;;OAIG;IACH,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE;QAAE,OAAO,EAAE,iBAAiB,CAAC;QAAC,WAAW,EAAE,OAAO,CAAA;KAAE,CAAC;CAChE;AAKD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,iBAAiB,GAAG,MAAM,CAcrE;AAED;;;;GAIG;AACH,MAAM,MAAM,gBAAgB,GAAG,CAAC,KAAK,EAAE;IACrC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,KAAK,OAAO,CAAC;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEhD,iDAAiD;AACjD,MAAM,MAAM,eAAe,GACvB;IAAE,OAAO,EAAE,YAAY,CAAA;CAAE,GACzB;IAAE,OAAO,EAAE,QAAQ,CAAC;IAAC,aAAa,EAAE,MAAM,EAAE,CAAA;CAAE,GAC9C;IAAE,OAAO,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACxD;IAAE,OAAO,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAE3C,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,6CAA6C;IAC7C,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,+EAA+E;IAC/E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,2DAA2D;IAC3D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;OAIG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,kEAAkE;IAClE,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,2EAA2E;IAC3E,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;;OAIG;IACH,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,0CAA0C;IAC1C,MAAM,CAAC,EAAE;QAAE,MAAM,EAAE,YAAY,CAAC;QAAC,KAAK,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;CACtE;AAED,+EAA+E;AAC/E,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CASvD;AAED,8DAA8D;AAC9D,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAOnD;AAwBD;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAW9C;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,MAAM,EACX,MAAM,GAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAoB,EAC9C,IAAI,GAAE,cAAmB,GACxB,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,IAAI,CAG3B;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,MAAM,GAAG,IAAI,CAMf;AAUD,wBAAgB,YAAY,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAStF;AAED,+EAA+E;AAC/E,MAAM,MAAM,eAAe,GAAG,CAAC,KAAK,EAAE;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;CAChB,KAAK,OAAO,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEhD,MAAM,WAAW,gBAAgB;IAC/B,0DAA0D;IAC1D,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,GAAG,CAAC,EAAE,aAAa,CAAC;IACpB,GAAG,CAAC,EAAE,MAAM,IAAI,CAAC;IACjB,0DAA0D;IAC1D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IACnC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9C,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,sGAAsG;IACtG,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,+GAA+G;IAC/G,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,wEAAwE;IACxE,aAAa,CAAC,EAAE,MAAM,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACnD,qEAAqE;IACrE,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;IAC1C,oDAAoD;IACpD,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;IAC3C,qEAAqE;IACrE,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IACtC,0DAA0D;IAC1D,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAgB;IACpC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAa;IACjC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA4B;IACnD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqC;IAC9D,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAoB;IACxC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA8B;IAC9D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqB;IACjD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAmD;IACjF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkC;IAC1D,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkC;IAC3D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA2B;IACtD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;gBAEjB,IAAI,GAAE,gBAAqB;IAsCvC,OAAO,CAAC,GAAG;IAIX;;;;OAIG;IACH,OAAO,CAAC,UAAU;IAiBlB,OAAO,CAAC,WAAW;IAInB,0EAA0E;IAC1E,OAAO,CAAC,cAAc;IAmBtB,kFAAkF;IAClF,OAAO,CAAC,kBAAkB;IAgB1B,oFAAoF;IACpF;;;;OAIG;IACG,OAAO,CACX,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,IAAI,GAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAA;KAAO,GACxE,OAAO,CAAC,aAAa,CAAC;IAyCzB;;;;;;OAMG;YACW,WAAW;IA6CzB;;;;;;OAMG;YACW,cAAc;IA0C5B;;;;;OAKG;YACW,oBAAoB;IAwClC,wEAAwE;YAC1D,aAAa;IAQ3B,2EAA2E;YAC7D,WAAW;IAsCzB;;;;;;;;;OASG;IACG,MAAM,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC;IAkBxD;;;;;OAKG;YACW,WAAW;YAOX,YAAY;IA2E1B,6GAA6G;YAC/F,iBAAiB;YAMjB,cAAc;IA+H5B;;;;;;OAMG;YACW,mBAAmB;IAmDjC,8FAA8F;YAChF,gBAAgB;IAyB9B,qFAAqF;YACvE,aAAa;IAyB3B,+EAA+E;IACzE,MAAM,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;YAsBzC,YAAY;IA+R1B;;;;OAIG;YACW,qBAAqB;IAOnC;;;;;;OAMG;YACW,eAAe;IAyG7B,sDAAsD;YACxC,eAAe;IAK7B;;;OAGG;YACW,gBAAgB;IAkC9B,oEAAoE;YACtD,OAAO;IAMrB;;;;OAIG;YACW,cAAc;CAY7B"}
1
+ {"version":3,"file":"run-workspace.d.ts","sourceRoot":"","sources":["../../src/utils/run-workspace.ts"],"names":[],"mappings":"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"}
@@ -70,6 +70,37 @@ export const defaultCommandRunner = (command, args, cwd) => new Promise((resolve
70
70
  done({ status: code ?? 1, stdout, stderr });
71
71
  });
72
72
  });
73
+ /** ENG-507: folder name, inside a run's workspace, holding that run's own gcloud config. */
74
+ export const GCLOUD_CONFIG_DIRNAME = ".gcloud";
75
+ /** ENG-507: `<run workspace>/.gcloud`. */
76
+ export function gcloudConfigDir(dir) {
77
+ return join(dir, GCLOUD_CONFIG_DIRNAME);
78
+ }
79
+ /**
80
+ * ENG-507: pure. `env` with CLOUDSDK_CONFIG pointing at the run's own gcloud
81
+ * folder, so a job can never switch the person's main gcloud login. Nothing
82
+ * is copied in from ~/.config/gcloud; keyless auth writes its own.
83
+ */
84
+ export function withIsolatedGcloud(env, dir) {
85
+ return { ...env, CLOUDSDK_CONFIG: gcloudConfigDir(dir) };
86
+ }
87
+ /** ENG-507: creates the run's gcloud folder (private, and self-ignored by git). Idempotent. */
88
+ export function createGcloudConfigDir(dir) {
89
+ const path = gcloudConfigDir(dir);
90
+ mkdirSync(path, { recursive: true, mode: 0o700 });
91
+ // Credentials may land here; `*` keeps `git add -A` from ever committing them.
92
+ writeFileSync(join(path, ".gitignore"), "*\n");
93
+ return path;
94
+ }
95
+ /** ENG-507: removes the run's gcloud folder. Never throws. */
96
+ export function removeGcloudConfigDir(dir) {
97
+ try {
98
+ rmSync(gcloudConfigDir(dir), { recursive: true, force: true });
99
+ }
100
+ catch {
101
+ // Best-effort.
102
+ }
103
+ }
73
104
  /** Longest question text put into a pull request body (GitHub caps bodies at 65,536). */
74
105
  const PR_QUESTION_MAX_CHARS = 20_000;
75
106
  /**
@@ -327,7 +358,7 @@ export class RunWorkspaceManager {
327
358
  const { workspace, notes } = created;
328
359
  const { dir, branch } = workspace;
329
360
  // ENG-346: the agent can't push to the default branch from this run copy.
330
- await this.guardPushes(projectDir, dir, workspace.baseBranch);
361
+ await this.guardPushes(projectDir, dir, workspace.baseBranch, opts.protectedBranches, branch);
331
362
  const installed = await this.installDeps(projectDir, dir);
332
363
  if (installed) {
333
364
  const { command, args, res } = installed;
@@ -347,6 +378,7 @@ export class RunWorkspaceManager {
347
378
  }
348
379
  workspace.install = { ms: installed.ms, cacheHit: installed.cacheHit };
349
380
  }
381
+ createGcloudConfigDir(workspace.dir);
350
382
  return { ok: true, workspace, notes };
351
383
  }
352
384
  /**
@@ -551,7 +583,7 @@ export class RunWorkspaceManager {
551
583
  });
552
584
  // ENG-346: a re-created (or older) run copy gets the push guard too.
553
585
  if (reopened.ok) {
554
- await this.guardPushes(input.projectDir, reopened.workspace.dir, reopened.workspace.baseBranch);
586
+ await this.guardPushes(input.projectDir, reopened.workspace.dir, reopened.workspace.baseBranch, input.protectedBranches, reopened.workspace.branch);
555
587
  }
556
588
  return reopened;
557
589
  }
@@ -561,9 +593,11 @@ export class RunWorkspaceManager {
561
593
  * installPrePushGuard). Best-effort: a guard that can't be installed never
562
594
  * stops a run (the agent's disallowed tools and gh shim still apply).
563
595
  */
564
- async guardPushes(projectDir, dir, baseBranch) {
596
+ async guardPushes(projectDir, dir, baseBranch, protectedBranches = [], runBranch) {
597
+ // ENG-579: the run's own branch is never protected (the runner pushes it).
598
+ const extra = protectedBranches.filter((b) => b !== runBranch);
565
599
  // The repo lock: extensions.worktreeConfig is written to the shared config.
566
- await withRepoLock(projectDir, () => installPrePushGuard(dir, baseBranch || null, (args, cwd) => this.git(args, cwd)));
600
+ await withRepoLock(projectDir, () => installPrePushGuard(dir, baseBranch || null, (args, cwd) => this.git(args, cwd), extra));
567
601
  }
568
602
  async reopenLocked(input) {
569
603
  const { projectDir } = input;
@@ -830,7 +864,14 @@ export class RunWorkspaceManager {
830
864
  /** Commits, pushes and opens the pull request; then cleans up the worktree. */
831
865
  async finish(input) {
832
866
  return withRepoLock(input.workspace.projectDir, async () => {
833
- const result = await this.finishLocked(input);
867
+ let result;
868
+ try {
869
+ result = await this.finishLocked(input);
870
+ }
871
+ finally {
872
+ // ENG-507: the run's gcloud folder never outlives the run (kept copies included).
873
+ removeGcloudConfigDir(input.workspace.dir);
874
+ }
834
875
  // ENG-349: a folder kept for a waiting job's reply is never pruned. The
835
876
  // marker is written before the lock is released, so no prune slips in.
836
877
  if (input.waiting?.keepRunCopy && result.keptWorktree) {