instar 1.3.1147 → 1.3.1148
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/core/AgentWorktreeDetector.d.ts +48 -0
- package/dist/core/AgentWorktreeDetector.d.ts.map +1 -1
- package/dist/core/AgentWorktreeDetector.js +115 -0
- package/dist/core/AgentWorktreeDetector.js.map +1 -1
- package/dist/data/standards-guard-index.json +1 -1
- package/dist/data/standards-guard-index.meta.json +2 -2
- package/dist/data/standards-registry.meta.json +1 -1
- package/package.json +1 -1
- package/src/data/builtin-manifest.json +2 -2
- package/src/data/standards-guard-index.json +1 -1
- package/src/data/standards-guard-index.meta.json +2 -2
- package/src/data/standards-registry.meta.json +1 -1
- package/upgrades/1.3.1148.md +68 -0
- package/upgrades/side-effects/worktree-repo-discovery.md +124 -0
|
@@ -63,6 +63,47 @@ export declare function runDetection(opts: DetectorOptions): Promise<DetectorRes
|
|
|
63
63
|
* mutable file in the read path → the transient-empty failure class is gone.
|
|
64
64
|
*/
|
|
65
65
|
export declare function enumerateSafeRoots(agentsDir?: string): string[];
|
|
66
|
+
/**
|
|
67
|
+
* Derive candidate instar-repo roots from the agent worktrees themselves.
|
|
68
|
+
*
|
|
69
|
+
* WHY THIS EXISTS. The fallback chain below guesses at conventional checkout
|
|
70
|
+
* locations (`~/Documents/Projects/instar`, `~/instar`). An agent whose repo
|
|
71
|
+
* lives anywhere else — e.g. `<agent_home>/.dev/instar`, which is where the
|
|
72
|
+
* dev layout actually puts it — matches none of them, so resolution returned
|
|
73
|
+
* null and every consumer silently did nothing. Meanwhile the answer was
|
|
74
|
+
* sitting on disk the whole time: a linked worktree's `.git` is a FILE whose
|
|
75
|
+
* contents name its owning repo. The worktrees know. Ask them instead of
|
|
76
|
+
* guessing.
|
|
77
|
+
*
|
|
78
|
+
* (2026-07-29 the same blind spot let the reaper report `reclaimable: 0`
|
|
79
|
+
* against 73 worktrees because its `git -C <path> worktree list` was failing
|
|
80
|
+
* outright. The honest-reporting fix landed; the resolution did not.)
|
|
81
|
+
*
|
|
82
|
+
* Deliberately NO subprocess: reading the pointer file is cheaper than
|
|
83
|
+
* `git rev-parse`, cannot block the event loop, and keeps this helper usable
|
|
84
|
+
* from the runtime hot dirs. Returns candidates only — every one is still
|
|
85
|
+
* integrity-validated by `resolveInstarRepo` before it is believed.
|
|
86
|
+
*
|
|
87
|
+
* ORDERED BY COUNT, and the ordering carries a real limitation worth stating.
|
|
88
|
+
* One agent's `.worktrees/` can legitimately hold worktrees of MORE THAN ONE
|
|
89
|
+
* clone of the same upstream — measured on a live agent: 29 worktrees owned by
|
|
90
|
+
* `<home>/.build/instar` and 17 by `<home>/.dev/instar`. This returns the
|
|
91
|
+
* most-owned first, so a single-repo consumer gets the largest coherent set
|
|
92
|
+
* rather than an arbitrary one; it does NOT merge them, and a consumer that
|
|
93
|
+
* takes only `[0]` will not see the smaller repo's worktrees. Consumers that
|
|
94
|
+
* need full coverage must iterate the whole list. The alternative — picking
|
|
95
|
+
* arbitrarily — would make the blind spot unpredictable instead of merely
|
|
96
|
+
* bounded.
|
|
97
|
+
*/
|
|
98
|
+
export declare function discoverInstarRepoFromWorktrees(roots: ReadonlyArray<string>, opts?: {
|
|
99
|
+
maxWorktrees?: number;
|
|
100
|
+
}): string[];
|
|
101
|
+
/**
|
|
102
|
+
* `gitdir: /path/to/repo/.git/worktrees/<slug>` → `/path/to/repo`.
|
|
103
|
+
* Anything that does not have that exact shape names nothing, and returns
|
|
104
|
+
* null rather than a guess.
|
|
105
|
+
*/
|
|
106
|
+
export declare function parseWorktreeGitPointer(contents: string): string | null;
|
|
66
107
|
export interface ResolveDetectorRepoOptions {
|
|
67
108
|
/** Path to user config (defaults to `~/.instar/config.json`). */
|
|
68
109
|
configPath?: string;
|
|
@@ -76,6 +117,13 @@ export interface ResolveDetectorRepoOptions {
|
|
|
76
117
|
* running them has an allowlisted checkout at cwd).
|
|
77
118
|
*/
|
|
78
119
|
cwd?: string;
|
|
120
|
+
/**
|
|
121
|
+
* The CALLER'S OWN agent `.worktrees` root(s), used to derive the owning
|
|
122
|
+
* repo from the worktrees themselves. Omitted ⇒ no worktree-derived
|
|
123
|
+
* candidates. Never pass `enumerateSafeRoots()` here: that spans every agent
|
|
124
|
+
* on the machine and will resolve you to somebody else's repo.
|
|
125
|
+
*/
|
|
126
|
+
worktreeRoots?: ReadonlyArray<string>;
|
|
79
127
|
}
|
|
80
128
|
/**
|
|
81
129
|
* Per spec: the detector uses a deterministic source (config or default
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AgentWorktreeDetector.d.ts","sourceRoot":"","sources":["../../src/core/AgentWorktreeDetector.ts"],"names":[],"mappings":"AAyCA,MAAM,WAAW,eAAe;IAC9B;;iFAE6E;IAC7E,UAAU,EAAE,MAAM,CAAC;IACnB;uCACmC;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB;;;oBAGgB;IAChB,SAAS,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACjC;;gEAE4D;IAC5D,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,kBAAkB,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACnE,yEAAyE;IACzE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;uDACmD;IACnD,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,kBAAkB;IACjC,0FAA0F;IAC1F,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,QAAQ,GAAG,MAAM,GAAG,QAAQ,GAAG,KAAK,CAAC;IAC/C,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,cAAc;IAC7B,0EAA0E;IAC1E,UAAU,EAAE,MAAM,CAAC;IACnB,0EAA0E;IAC1E,OAAO,EAAE,MAAM,CAAC;IAChB,+EAA+E;IAC/E,cAAc,EAAE,MAAM,CAAC;IACvB,uEAAuE;IACvE,OAAO,EAAE,MAAM,CAAC;IAChB,4EAA4E;IAC5E,OAAO,EAAE,MAAM,CAAC;IAChB,iEAAiE;IACjE,QAAQ,EAAE,OAAO,CAAC;CACnB;AAwHD,wBAAsB,YAAY,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC,CA8GjF;AAqCD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CA6B/D;AAID,MAAM,WAAW,0BAA0B;IACzC,iEAAiE;IACjE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qDAAqD;IACrD,aAAa,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACtC,8DAA8D;IAC9D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"AgentWorktreeDetector.d.ts","sourceRoot":"","sources":["../../src/core/AgentWorktreeDetector.ts"],"names":[],"mappings":"AAyCA,MAAM,WAAW,eAAe;IAC9B;;iFAE6E;IAC7E,UAAU,EAAE,MAAM,CAAC;IACnB;uCACmC;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB;;;oBAGgB;IAChB,SAAS,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACjC;;gEAE4D;IAC5D,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,kBAAkB,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACnE,yEAAyE;IACzE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;uDACmD;IACnD,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,kBAAkB;IACjC,0FAA0F;IAC1F,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,QAAQ,GAAG,MAAM,GAAG,QAAQ,GAAG,KAAK,CAAC;IAC/C,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,cAAc;IAC7B,0EAA0E;IAC1E,UAAU,EAAE,MAAM,CAAC;IACnB,0EAA0E;IAC1E,OAAO,EAAE,MAAM,CAAC;IAChB,+EAA+E;IAC/E,cAAc,EAAE,MAAM,CAAC;IACvB,uEAAuE;IACvE,OAAO,EAAE,MAAM,CAAC;IAChB,4EAA4E;IAC5E,OAAO,EAAE,MAAM,CAAC;IAChB,iEAAiE;IACjE,QAAQ,EAAE,OAAO,CAAC;CACnB;AAwHD,wBAAsB,YAAY,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC,CA8GjF;AAqCD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CA6B/D;AAID;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAgB,+BAA+B,CAC7C,KAAK,EAAE,aAAa,CAAC,MAAM,CAAC,EAC5B,IAAI,GAAE;IAAE,YAAY,CAAC,EAAE,MAAM,CAAA;CAAO,GACnC,MAAM,EAAE,CA4CV;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAOvE;AAID,MAAM,WAAW,0BAA0B;IACzC,iEAAiE;IACjE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qDAAqD;IACrD,aAAa,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACtC,8DAA8D;IAC9D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;;;;OAKG;IACH,aAAa,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CACvC;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,GAAE,0BAA+B,GAAG,MAAM,GAAG,IAAI,CA4D9F"}
|
|
@@ -333,6 +333,104 @@ export function enumerateSafeRoots(agentsDir) {
|
|
|
333
333
|
}
|
|
334
334
|
return roots;
|
|
335
335
|
}
|
|
336
|
+
// ── Public helper: ask the worktrees which repo owns them ────────────────
|
|
337
|
+
/**
|
|
338
|
+
* Derive candidate instar-repo roots from the agent worktrees themselves.
|
|
339
|
+
*
|
|
340
|
+
* WHY THIS EXISTS. The fallback chain below guesses at conventional checkout
|
|
341
|
+
* locations (`~/Documents/Projects/instar`, `~/instar`). An agent whose repo
|
|
342
|
+
* lives anywhere else — e.g. `<agent_home>/.dev/instar`, which is where the
|
|
343
|
+
* dev layout actually puts it — matches none of them, so resolution returned
|
|
344
|
+
* null and every consumer silently did nothing. Meanwhile the answer was
|
|
345
|
+
* sitting on disk the whole time: a linked worktree's `.git` is a FILE whose
|
|
346
|
+
* contents name its owning repo. The worktrees know. Ask them instead of
|
|
347
|
+
* guessing.
|
|
348
|
+
*
|
|
349
|
+
* (2026-07-29 the same blind spot let the reaper report `reclaimable: 0`
|
|
350
|
+
* against 73 worktrees because its `git -C <path> worktree list` was failing
|
|
351
|
+
* outright. The honest-reporting fix landed; the resolution did not.)
|
|
352
|
+
*
|
|
353
|
+
* Deliberately NO subprocess: reading the pointer file is cheaper than
|
|
354
|
+
* `git rev-parse`, cannot block the event loop, and keeps this helper usable
|
|
355
|
+
* from the runtime hot dirs. Returns candidates only — every one is still
|
|
356
|
+
* integrity-validated by `resolveInstarRepo` before it is believed.
|
|
357
|
+
*
|
|
358
|
+
* ORDERED BY COUNT, and the ordering carries a real limitation worth stating.
|
|
359
|
+
* One agent's `.worktrees/` can legitimately hold worktrees of MORE THAN ONE
|
|
360
|
+
* clone of the same upstream — measured on a live agent: 29 worktrees owned by
|
|
361
|
+
* `<home>/.build/instar` and 17 by `<home>/.dev/instar`. This returns the
|
|
362
|
+
* most-owned first, so a single-repo consumer gets the largest coherent set
|
|
363
|
+
* rather than an arbitrary one; it does NOT merge them, and a consumer that
|
|
364
|
+
* takes only `[0]` will not see the smaller repo's worktrees. Consumers that
|
|
365
|
+
* need full coverage must iterate the whole list. The alternative — picking
|
|
366
|
+
* arbitrarily — would make the blind spot unpredictable instead of merely
|
|
367
|
+
* bounded.
|
|
368
|
+
*/
|
|
369
|
+
export function discoverInstarRepoFromWorktrees(roots, opts = {}) {
|
|
370
|
+
const cap = opts.maxWorktrees ?? 200;
|
|
371
|
+
const counts = new Map();
|
|
372
|
+
let inspected = 0;
|
|
373
|
+
for (const root of roots) {
|
|
374
|
+
let entries = [];
|
|
375
|
+
try {
|
|
376
|
+
entries = fs.readdirSync(root);
|
|
377
|
+
}
|
|
378
|
+
catch {
|
|
379
|
+
// @silent-fallback-ok — root vanished between enumeration and read.
|
|
380
|
+
continue;
|
|
381
|
+
}
|
|
382
|
+
for (const entry of entries) {
|
|
383
|
+
if (inspected >= cap)
|
|
384
|
+
break;
|
|
385
|
+
const pointer = path.join(root, entry, '.git');
|
|
386
|
+
let stat;
|
|
387
|
+
try {
|
|
388
|
+
stat = fs.statSync(pointer);
|
|
389
|
+
}
|
|
390
|
+
catch {
|
|
391
|
+
// @silent-fallback-ok — not a worktree (no .git at all). Skip.
|
|
392
|
+
continue;
|
|
393
|
+
}
|
|
394
|
+
// A linked worktree's .git is a FILE. A full clone's is a directory, and
|
|
395
|
+
// a clone under .worktrees/ is not a worktree of anything — skip it
|
|
396
|
+
// rather than claim it points somewhere.
|
|
397
|
+
if (!stat.isFile())
|
|
398
|
+
continue;
|
|
399
|
+
inspected++;
|
|
400
|
+
let contents;
|
|
401
|
+
try {
|
|
402
|
+
contents = fs.readFileSync(pointer, 'utf-8');
|
|
403
|
+
}
|
|
404
|
+
catch {
|
|
405
|
+
// @silent-fallback-ok — unreadable pointer; it names nothing.
|
|
406
|
+
continue;
|
|
407
|
+
}
|
|
408
|
+
const repo = parseWorktreeGitPointer(contents);
|
|
409
|
+
if (repo)
|
|
410
|
+
counts.set(repo, (counts.get(repo) ?? 0) + 1);
|
|
411
|
+
}
|
|
412
|
+
if (inspected >= cap)
|
|
413
|
+
break;
|
|
414
|
+
}
|
|
415
|
+
return [...counts.entries()]
|
|
416
|
+
.sort((a, b) => (b[1] - a[1]) || a[0].localeCompare(b[0]))
|
|
417
|
+
.map(([repo]) => repo);
|
|
418
|
+
}
|
|
419
|
+
/**
|
|
420
|
+
* `gitdir: /path/to/repo/.git/worktrees/<slug>` → `/path/to/repo`.
|
|
421
|
+
* Anything that does not have that exact shape names nothing, and returns
|
|
422
|
+
* null rather than a guess.
|
|
423
|
+
*/
|
|
424
|
+
export function parseWorktreeGitPointer(contents) {
|
|
425
|
+
const match = /^\s*gitdir:\s*(.+?)\s*$/m.exec(contents);
|
|
426
|
+
if (!match)
|
|
427
|
+
return null;
|
|
428
|
+
const marker = `${path.sep}.git${path.sep}worktrees${path.sep}`;
|
|
429
|
+
const idx = match[1].indexOf(marker);
|
|
430
|
+
if (idx <= 0)
|
|
431
|
+
return null;
|
|
432
|
+
return match[1].slice(0, idx);
|
|
433
|
+
}
|
|
336
434
|
/**
|
|
337
435
|
* Per spec: the detector uses a deterministic source (config or default
|
|
338
436
|
* chain), NOT `INSTAR_REPO` env var, because env vars can differ between
|
|
@@ -358,6 +456,23 @@ export function resolveDetectorInstarRepo(opts = {}) {
|
|
|
358
456
|
const candidateChain = [];
|
|
359
457
|
if (configRepoPath)
|
|
360
458
|
candidateChain.push(configRepoPath);
|
|
459
|
+
// Ask the worktrees who owns them, BEFORE guessing at conventional
|
|
460
|
+
// locations. An operator-supplied `worktree.repoPath` still wins — this only
|
|
461
|
+
// ever gets consulted where the deterministic answer was absent, which is
|
|
462
|
+
// exactly where resolution used to return null.
|
|
463
|
+
//
|
|
464
|
+
// THE CALLER MUST NAME ITS OWN ROOT. There is deliberately no default here,
|
|
465
|
+
// and `enumerateSafeRoots()` is deliberately NOT it: that helper enumerates
|
|
466
|
+
// EVERY agent on the machine, so defaulting to it resolved this agent to a
|
|
467
|
+
// DIFFERENT agent's repo — whichever one happened to own the most worktrees.
|
|
468
|
+
// (Measured, not hypothesised: with the default in place, echo resolved to
|
|
469
|
+
// instar-codey's repo.) A confident wrong repo is worse than the null this
|
|
470
|
+
// change exists to remove, so absent an explicit root we add no candidate
|
|
471
|
+
// and the pre-existing chain applies unchanged.
|
|
472
|
+
for (const repo of discoverInstarRepoFromWorktrees(opts.worktreeRoots ?? [])) {
|
|
473
|
+
if (!candidateChain.includes(repo))
|
|
474
|
+
candidateChain.push(repo);
|
|
475
|
+
}
|
|
361
476
|
if (opts.fallbackChain) {
|
|
362
477
|
candidateChain.push(...opts.fallbackChain);
|
|
363
478
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AgentWorktreeDetector.js","sourceRoot":"","sources":["../../src/core/AgentWorktreeDetector.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"AgentWorktreeDetector.js","sourceRoot":"","sources":["../../src/core/AgentWorktreeDetector.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,wEAAwE;AACxE,wEAAwE;AACxE,wEAAwE;AACxE,uEAAuE;AACvE,+DAA+D;AAE/D;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AA2D/D,4EAA4E;AAE5E,MAAM,sBAAsB,GAAG,IAAI,CAAC;AACpC,MAAM,gBAAgB,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAC7C,MAAM,cAAc,GAAG,OAAO,CAAC;AAC/B,MAAM,iBAAiB,GAAG,yBAAyB,CAAC;AAEpD,SAAS,eAAe,CAAC,CAAS;IAChC,IAAI,CAAC;QACH,OAAO,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAC5B,CAAC;IAAC,MAAM,CAAC;QACP,sEAAsE;QACtE,sEAAsE;QACtE,0CAA0C;QAC1C,OAAO,CAAC,CAAC;IACX,CAAC;AACH,CAAC;AAED,SAAS,0BAA0B,CAAC,MAAc;IAChD,UAAU;IACV,uBAAuB;IACvB,8BAA8B;IAC9B,WAAW;IACX,YAAY;IACZ,+DAA+D;IAC/D,MAAM,OAAO,GAAwB,EAAE,CAAC;IACxC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACjC,IAAI,OAAO,GAA6B,IAAI,CAAC;IAC7C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YACjC,IAAI,OAAO;gBAAE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACnC,OAAO,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QACzE,CAAC;aAAM,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7C,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;QACtB,CAAC;aAAM,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,OAAO,EAAE,CAAC;YACzC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACtB,OAAO,GAAG,IAAI,CAAC;QACjB,CAAC;IACH,CAAC;IACD,IAAI,OAAO;QAAE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACnC,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,kBAAkB,CAAC,YAAoB,EAAE,SAAgC;IAChF,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;QAC7B,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC;QACrE,IAAI,YAAY,KAAK,IAAI,IAAI,YAAY,CAAC,UAAU,CAAC,WAAW,CAAC;YAAE,OAAO,IAAI,CAAC;IACjF,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,cAAc,CAAC,YAAoB,EAAE,IAAY;IACxD,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACvC,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACvC,MAAM,KAAK,GAAG,EAAE,CAAC,SAAS,CAAC,QAAQ,GAAG,EAAE,CAAC,SAAS,CAAC,OAAO,GAAG,EAAE,CAAC,SAAS,CAAC,QAAQ;QAChF,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC;IAC1B,IAAI,EAAU,CAAC;IACf,IAAI,CAAC;QACH,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,YAAY,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IAC/C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,GAAG,GAA4B,CAAC;QACvC,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,sBAAsB,YAAY,yBAAyB,CAAC,CAAC;QAC/E,CAAC;QACD,MAAM,GAAG,CAAC;IACZ,CAAC;IACD,IAAI,CAAC;QACH,MAAM,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QAC5B,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;QACvC,IAAI,IAAI,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,KAAK,IAAI,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,sBAAsB,YAAY,cAAc,EAAE,CAAC,GAAG,YAAY,IAAI,EAAE,CAAC,CAAC;QAC5F,CAAC;QACD,IAAI,CAAC,EAAE,CAAC,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CACb,sBAAsB,YAAY,UAAU,CAAC,EAAE,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,4BAA4B,CACtG,CAAC;QACJ,CAAC;QACD,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;IAChD,CAAC;YAAS,CAAC;QACT,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IACnB,CAAC;AACH,CAAC;AAED,SAAS,oBAAoB,CAAC,YAAoB;IAChD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC;QAAE,OAAO,IAAI,GAAG,EAAE,CAAC;IACnD,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,gBAAgB,CAAC;IAC7C,IAAI,OAAe,CAAC;IACpB,IAAI,CAAC;QACH,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;IAAC,MAAM,CAAC;QACP,sEAAsE;QACtE,qEAAqE;QACrE,yEAAyE;QACzE,OAAO,IAAI,CAAC;IACd,CAAC;IACD,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACvC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YAAE,SAAS;QAC3B,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAwC,CAAC;YACvE,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,CAAC,MAAM,CAAC,EAAE;gBAAE,SAAS;YAC9C,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACjC,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,MAAM;gBAAE,SAAS;YAC9C,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC7B,CAAC;QAAC,MAAM,CAAC;YACP,mEAAmE;QACrE,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,4EAA4E;AAE5E,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,IAAqB;IACtD,MAAM,MAAM,GAAmB;QAC7B,UAAU,EAAE,CAAC;QACb,OAAO,EAAE,CAAC;QACV,cAAc,EAAE,CAAC;QACjB,OAAO,EAAE,CAAC;QACV,OAAO,EAAE,CAAC;QACV,QAAQ,EAAE,KAAK;KAChB,CAAC;IAEF,IAAI,MAAc,CAAC;IACnB,IAAI,CAAC;QACH,uEAAuE;QACvE,uEAAuE;QACvE,2EAA2E;QAC3E,oEAAoE;QACpE,MAAM,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE;YACvF,QAAQ,EAAE,OAAO;YACjB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;YACjC,OAAO,EAAE,IAAI,CAAC,YAAY,IAAI,sBAAsB;SACrD,CAAC,CAAC,IAAI,EAAE,CAAC;IACZ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,GAAG,GAAkD,CAAC;QAC7D,IAAI,CAAC,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;YACrD,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC;YACvB,gEAAgE;YAChE,MAAM,cAAc,CAClB;gBACE,EAAE,EAAE,2BAA2B;gBAC/B,KAAK,EAAE,2BAA2B;gBAClC,OAAO,EAAE,6BAA6B,IAAI,CAAC,UAAU,0BAA0B,IAAI,CAAC,YAAY,IAAI,sBAAsB,IAAI;gBAC9H,QAAQ,EAAE,oBAAoB;gBAC9B,QAAQ,EAAE,KAAK;gBACf,aAAa,EAAE,yBAAyB;aACzC,EACD,IAAI,EACJ,MAAM,EACN,IAAI,CACL,CAAC;YACF,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,MAAM,GAAG,CAAC;IACZ,CAAC;IAED,MAAM,OAAO,GAAG,0BAA0B,CAAC,MAAM,CAAC,CAAC;IACnD,MAAM,CAAC,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAEnC,MAAM,cAAc,GAAG,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACxD,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;IAEpE,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,MAAM,SAAS,GAAG,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC9C,gCAAgC;QAChC,IAAI,SAAS,KAAK,cAAc,EAAE,CAAC;YAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAAC,SAAS;QAAC,CAAC;QACjE,qBAAqB;QACrB,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;YAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAAC,SAAS;QAAC,CAAC;QAC/C,kCAAkC;QAClC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAAC,SAAS;QAAC,CAAC;QAC/D,gDAAgD;QAChD,IAAI,kBAAkB,CAAC,SAAS,EAAE,aAAa,CAAC,EAAE,CAAC;YAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAAC,SAAS;QAAC,CAAC;QAEjF,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC5B,CAAC;IACD,MAAM,CAAC,cAAc,GAAG,SAAS,CAAC,MAAM,CAAC;IAEzC,2EAA2E;IAC3E,0EAA0E;IAC1E,yEAAyE;IACzE,2EAA2E;IAC3E,yEAAyE;IACzE,oEAAoE;IACpE,oEAAoE;IACpE,qEAAqE;IACrE,YAAY;IACZ,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzB,MAAM,MAAM,GAAG,CAAC,GAAG,SAAS,CAAC,CAAC,IAAI,EAAE,CAAC;QACrC,2EAA2E;QAC3E,uEAAuE;QACvE,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACjG,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnE,MAAM,gBAAgB,GAAG,aAAa,CAAC,MAAM,KAAK,CAAC;YACjD,CAAC,CAAC,mJAAmJ;YACrJ,CAAC,CAAC,EAAE,CAAC;QACP,MAAM,cAAc,CAClB;YACE,EAAE,EAAE,8BAA8B,OAAO,EAAE;YAC3C,KAAK,EAAE,GAAG,SAAS,CAAC,MAAM,yCAAyC;YACnE,OAAO,EAAE,GAAG,MAAM,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,SAAS,CAAC,MAAM,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,0BAA0B,gBAAgB,EAAE;YAClI,WAAW,EACT,wIAAwI;gBACxI,2GAA2G;gBAC3G,kDAAkD;gBAClD,MAAM;gBACN,CAAC,MAAM,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC,CAAC,WAAW,MAAM,CAAC,MAAM,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;YAClE,QAAQ,EAAE,oBAAoB;YAC9B,QAAQ,EAAE,KAAK;YACf,8DAA8D;YAC9D,oEAAoE;YACpE,2DAA2D;YAC3D,aAAa,EAAE,yBAAyB;SACzC,EACD,IAAI,EACJ,MAAM,EACN,KAAK,CACN,CAAC;IACJ,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,KAAK,UAAU,cAAc,CAC3B,IAAwB,EACxB,IAAqB,EACrB,MAAsB,EACtB,UAAmB;IAEnB,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;QACvB,oDAAoD;QACpD,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC/B,MAAM,CAAC,OAAO,EAAE,CAAC;QACjB,OAAO;IACT,CAAC;IACD,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAc,EAAE,iBAAiB,CAAC,CAAC;IACtG,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,MAAM,GAAG,oBAAoB,CAAC,YAAY,CAAC,CAAC;QAClD,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;YACxB,MAAM,CAAC,OAAO,EAAE,CAAC;YACjB,OAAO;QACT,CAAC;IACH,CAAC;IACD,cAAc,CAAC,YAAY,EAAE;QAC3B,EAAE,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QAC5B,SAAS,EAAE,IAAI,CAAC,EAAE;QAClB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,aAAa,EAAE,IAAI,CAAC,aAAa;KAClC,CAAC,CAAC;IACH,MAAM,CAAC,OAAO,EAAE,CAAC;AACnB,CAAC;AAED,4EAA4E;AAE5E;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,kBAAkB,CAAC,SAAkB;IACnD,MAAM,IAAI,GAAG,SAAS,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;IACvE,IAAI,UAAU,GAAa,EAAE,CAAC;IAC9B,IAAI,CAAC;QACH,UAAU,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;aACvD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,cAAc,EAAE,CAAC;aACpD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;IAAC,MAAM,CAAC;QACP,0EAA0E;QAC1E,2DAA2D;QAC3D,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;QAC9B,uEAAuE;QACvE,oEAAoE;QACpE,oEAAoE;QACpE,UAAU;QACV,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;QACtD,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;YACxC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnB,CAAC;QAAC,MAAM,CAAC;YACP,kEAAkE;YAClE,gEAAgE;YAChE,6DAA6D;QAC/D,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,4EAA4E;AAE5E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,MAAM,UAAU,+BAA+B,CAC7C,KAA4B,EAC5B,OAAkC,EAAE;IAEpC,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,IAAI,GAAG,CAAC;IACrC,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;IACzC,IAAI,SAAS,GAAG,CAAC,CAAC;IAElB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,OAAO,GAAa,EAAE,CAAC;QAC3B,IAAI,CAAC;YACH,OAAO,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACjC,CAAC;QAAC,MAAM,CAAC;YACP,oEAAoE;YACpE,SAAS;QACX,CAAC;QACD,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,IAAI,SAAS,IAAI,GAAG;gBAAE,MAAM;YAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;YAC/C,IAAI,IAAI,CAAC;YACT,IAAI,CAAC;gBACH,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YAC9B,CAAC;YAAC,MAAM,CAAC;gBACP,+DAA+D;gBAC/D,SAAS;YACX,CAAC;YACD,yEAAyE;YACzE,oEAAoE;YACpE,yCAAyC;YACzC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;gBAAE,SAAS;YAC7B,SAAS,EAAE,CAAC;YACZ,IAAI,QAAgB,CAAC;YACrB,IAAI,CAAC;gBACH,QAAQ,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC/C,CAAC;YAAC,MAAM,CAAC;gBACP,8DAA8D;gBAC9D,SAAS;YACX,CAAC;YACD,MAAM,IAAI,GAAG,uBAAuB,CAAC,QAAQ,CAAC,CAAC;YAC/C,IAAI,IAAI;gBAAE,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1D,CAAC;QACD,IAAI,SAAS,IAAI,GAAG;YAAE,MAAM;IAC9B,CAAC;IAED,OAAO,CAAC,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;SACzB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SACzD,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;AAC3B,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,uBAAuB,CAAC,QAAgB;IACtD,MAAM,KAAK,GAAG,0BAA0B,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACxD,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACxB,MAAM,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,OAAO,IAAI,CAAC,GAAG,YAAY,IAAI,CAAC,GAAG,EAAE,CAAC;IAChE,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACrC,IAAI,GAAG,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IAC1B,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;AAChC,CAAC;AA0BD;;;;;GAKG;AACH,MAAM,UAAU,yBAAyB,CAAC,OAAmC,EAAE;IAC7E,6EAA6E;IAC7E,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;IACtF,IAAI,cAAc,GAAkB,IAAI,CAAC;IACzC,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAA4B,CAAC;YACtF,MAAM,EAAE,GAAG,GAAG,CAAC,QAA8C,CAAC;YAC9D,IAAI,EAAE,IAAI,OAAO,EAAE,CAAC,QAAQ,KAAK,QAAQ,IAAI,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC;gBAChE,cAAc,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YACtC,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,yEAAyE;QAC3E,CAAC;IACH,CAAC;IAED,MAAM,cAAc,GAAa,EAAE,CAAC;IACpC,IAAI,cAAc;QAAE,cAAc,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IAExD,mEAAmE;IACnE,6EAA6E;IAC7E,0EAA0E;IAC1E,gDAAgD;IAChD,EAAE;IACF,4EAA4E;IAC5E,4EAA4E;IAC5E,2EAA2E;IAC3E,6EAA6E;IAC7E,2EAA2E;IAC3E,2EAA2E;IAC3E,0EAA0E;IAC1E,gDAAgD;IAChD,KAAK,MAAM,IAAI,IAAI,+BAA+B,CAAC,IAAI,CAAC,aAAa,IAAI,EAAE,CAAC,EAAE,CAAC;QAC7E,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChE,CAAC;IAED,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;QACvB,cAAc,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC;IAC7C,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QAC1C,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;QACxE,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;IACjD,CAAC;IAED,sEAAsE;IACtE,uEAAuE;IACvE,uDAAuD;IACvD,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,iBAAiB,CAAC;YAC7B,GAAG,EAAE,EAAE;YACP,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACtC,aAAa,EAAE,cAAc;YAC7B,UAAU,EAAE,QAAQ;SACrB,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAAC,MAAM,CAAC;QACP,qEAAqE;QACrE,sEAAsE;QACtE,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"schemaVersion": 1,
|
|
3
3
|
"generatedFrom": "source-tree",
|
|
4
4
|
"registrySha256": "81b53363a440e832672618965540b3e507ae0d93adcc67ec2b93daf7933b3ab4",
|
|
5
|
-
"packageVersion": "1.3.
|
|
5
|
+
"packageVersion": "1.3.1148",
|
|
6
6
|
"guards": [
|
|
7
7
|
{
|
|
8
8
|
"ref": "docs/audits/phase-b/f10-triage.md",
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"sha256": "
|
|
2
|
+
"sha256": "c4fb233de8c00b924323e7e9b167a5832162a35740c6445ccb7200c863ee9686",
|
|
3
3
|
"registrySha256": "81b53363a440e832672618965540b3e507ae0d93adcc67ec2b93daf7933b3ab4",
|
|
4
|
-
"packageVersion": "1.3.
|
|
4
|
+
"packageVersion": "1.3.1148"
|
|
5
5
|
}
|
package/package.json
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"$schema": "./builtin-manifest.schema.json",
|
|
3
3
|
"schemaVersion": 1,
|
|
4
|
-
"generatedAt": "2026-08-14T23:
|
|
5
|
-
"instarVersion": "1.3.
|
|
4
|
+
"generatedAt": "2026-08-14T23:20:47.847Z",
|
|
5
|
+
"instarVersion": "1.3.1148",
|
|
6
6
|
"entryCount": 202,
|
|
7
7
|
"entries": {
|
|
8
8
|
"hook:session-start": {
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"schemaVersion": 1,
|
|
3
3
|
"generatedFrom": "source-tree",
|
|
4
4
|
"registrySha256": "81b53363a440e832672618965540b3e507ae0d93adcc67ec2b93daf7933b3ab4",
|
|
5
|
-
"packageVersion": "1.3.
|
|
5
|
+
"packageVersion": "1.3.1148",
|
|
6
6
|
"guards": [
|
|
7
7
|
{
|
|
8
8
|
"ref": "docs/audits/phase-b/f10-triage.md",
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"sha256": "
|
|
2
|
+
"sha256": "c4fb233de8c00b924323e7e9b167a5832162a35740c6445ccb7200c863ee9686",
|
|
3
3
|
"registrySha256": "81b53363a440e832672618965540b3e507ae0d93adcc67ec2b93daf7933b3ab4",
|
|
4
|
-
"packageVersion": "1.3.
|
|
4
|
+
"packageVersion": "1.3.1148"
|
|
5
5
|
}
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
# Upgrade Guide — vNEXT
|
|
2
|
+
|
|
3
|
+
<!-- assembled-by: assemble-next-md -->
|
|
4
|
+
<!-- bump: patch -->
|
|
5
|
+
|
|
6
|
+
## What Changed
|
|
7
|
+
|
|
8
|
+
Adds to `src/core/AgentWorktreeDetector.ts`:
|
|
9
|
+
|
|
10
|
+
- `parseWorktreeGitPointer(contents)` — `gitdir: /repo/.git/worktrees/<slug>` → `/repo`; null for anything
|
|
11
|
+
that is not exactly that shape.
|
|
12
|
+
- `discoverInstarRepoFromWorktrees(roots, {maxWorktrees})` — reads each worktree's `.git` pointer FILE under
|
|
13
|
+
the given roots and returns owning repo roots, ordered by how many worktrees name each. No subprocess:
|
|
14
|
+
reading the pointer is cheaper than `git rev-parse`, cannot block the event loop, and keeps the helper
|
|
15
|
+
usable from the runtime hot dirs.
|
|
16
|
+
- `ResolveDetectorRepoOptions.worktreeRoots` — when a caller passes ITS OWN `.worktrees` root(s), discovered
|
|
17
|
+
repos join the candidate chain after the operator-supplied `worktree.repoPath` and before the
|
|
18
|
+
conventional-location guesses. Omitted ⇒ no candidates ⇒ byte-identical behaviour.
|
|
19
|
+
|
|
20
|
+
**Why.** On a live agent: `GET /worktrees/agent-reaper` reported `enumerationOk: false`,
|
|
21
|
+
`enumerationFailures: 98`, `git -C <agent home> worktree list --porcelain → fatal: not a git repository`,
|
|
22
|
+
with 45 worktrees and 27 GB unreclaimed. Separately `resolveDetectorInstarRepo` guessed at
|
|
23
|
+
`~/Documents/Projects/instar` and `~/instar`; neither exists there, so it returned null and callers guarded
|
|
24
|
+
with `if (repo)` skipped silently. Both are the same mistake — a path assumed rather than resolved — while a
|
|
25
|
+
linked worktree's `.git` file names its owner outright.
|
|
26
|
+
|
|
27
|
+
**A misresolution caught during development, now pinned.** The first draft defaulted discovery to
|
|
28
|
+
`enumerateSafeRoots()`, which spans EVERY agent home on the machine; measured on the real box, `echo`
|
|
29
|
+
resolved to `instar-codey`'s repo. A confident wrong repo is worse than null — null makes a consumer skip, a
|
|
30
|
+
wrong repo makes it act. There is now no default: a caller must name its own root.
|
|
31
|
+
|
|
32
|
+
**Declared limitation.** One agent's `.worktrees/` can legitimately hold worktrees of more than one clone of
|
|
33
|
+
the same upstream (measured: 29 owned by `<home>/.build/instar`, 17 by `<home>/.dev/instar`). Both are
|
|
34
|
+
returned, most-owned first, unmerged; a consumer taking only `[0]` gets the largest coherent set, not full
|
|
35
|
+
coverage. Stated in the function's doc comment.
|
|
36
|
+
|
|
37
|
+
**Held back deliberately:** pointing `AgentWorktreeReaper` and `OrphanedWorkSentinel` at the resolved repo
|
|
38
|
+
instead of `config.projectDir`. That is runtime code feeding a guard with delete authority, and the
|
|
39
|
+
misresolution above is evidence that getting it wrong is easy — so it goes through the Tier 2 spec +
|
|
40
|
+
operator-approval path as a small focused follow-up, registered as a commitment.
|
|
41
|
+
|
|
42
|
+
## What to Tell Your User
|
|
43
|
+
|
|
44
|
+
Nothing changes for you in this release. This adds an internal ability — working out which repository a set
|
|
45
|
+
of working copies belongs to by asking the working copies themselves — and deliberately does not plug it in
|
|
46
|
+
anywhere yet.
|
|
47
|
+
|
|
48
|
+
It exists because the background housekeeper that reclaims finished working copies had been handed a path
|
|
49
|
+
that is not a repository, so it failed to look 98 times in a row while 27 GB of finished copies accumulated.
|
|
50
|
+
Wiring this in is a separate change that needs review before it goes near anything with permission to delete
|
|
51
|
+
directories.
|
|
52
|
+
|
|
53
|
+
## Summary of New Capabilities
|
|
54
|
+
|
|
55
|
+
None that you can use. No new command, endpoint, setting, or behaviour. Two internal helper functions and one
|
|
56
|
+
opt-in parameter that nothing passes yet.
|
|
57
|
+
|
|
58
|
+
## Evidence
|
|
59
|
+
|
|
60
|
+
- `tests/unit/agent-worktree-repo-discovery.test.ts` — 14/14 green.
|
|
61
|
+
- Existing detector suites unmodified and green (`AgentWorktreeDetector`, `-attention-wireup`,
|
|
62
|
+
`WorktreeEnumerationFailureStore`) — 19/19 — which is what shows the old path is untouched when no caller
|
|
63
|
+
opts in.
|
|
64
|
+
- `npm run lint` chain green; `tsc --noEmit` clean.
|
|
65
|
+
- Real-machine measurement: with the caller's own root, discovery returns both repos in count order; with no
|
|
66
|
+
root, resolution returns null exactly as before.
|
|
67
|
+
- Side-effects: `upgrades/side-effects/worktree-repo-discovery.md` · ELI16:
|
|
68
|
+
`docs/specs/worktree-repo-discovery.eli16.md`.
|
|
@@ -0,0 +1,124 @@
|
|
|
1
|
+
# Side-Effects Review — ask the worktrees which repo owns them
|
|
2
|
+
|
|
3
|
+
**Version / slug:** `worktree-repo-discovery`
|
|
4
|
+
**Date:** `2026-08-14`
|
|
5
|
+
**Author:** `echo`
|
|
6
|
+
**Second-pass reviewer:** `not required — Tier 1: pure addition with NO caller, therefore no runtime behaviour change on any agent. The consuming wiring is deliberately NOT in this change (see "What is deliberately not here").`
|
|
7
|
+
|
|
8
|
+
## Summary of the change
|
|
9
|
+
|
|
10
|
+
Adds two exported helpers to `src/core/AgentWorktreeDetector.ts` and one option on
|
|
11
|
+
`resolveDetectorInstarRepo`:
|
|
12
|
+
|
|
13
|
+
- `parseWorktreeGitPointer(contents)` — `gitdir: /repo/.git/worktrees/<slug>` → `/repo`, or null for anything
|
|
14
|
+
that is not exactly that shape.
|
|
15
|
+
- `discoverInstarRepoFromWorktrees(roots, {maxWorktrees})` — reads each worktree's `.git` POINTER FILE under
|
|
16
|
+
the given roots and returns the owning repo roots, ordered by how many worktrees name each.
|
|
17
|
+
- `ResolveDetectorRepoOptions.worktreeRoots` — when a caller passes ITS OWN `.worktrees` root(s), the
|
|
18
|
+
discovered repos join the candidate chain after the operator-supplied `worktree.repoPath` and before the
|
|
19
|
+
conventional-location guesses. Omitted ⇒ no candidates ⇒ byte-identical behaviour.
|
|
20
|
+
|
|
21
|
+
**Nothing calls it yet.** This lands the mechanism, verified, with the consuming wiring held back.
|
|
22
|
+
|
|
23
|
+
## Why it exists (observed, not hypothesised)
|
|
24
|
+
|
|
25
|
+
On a live agent, 2026-08-14: `GET /worktrees/agent-reaper` reported `enumerationOk: false`,
|
|
26
|
+
`enumerationFailures: 98`, error `git -C <agent home> worktree list --porcelain → fatal: not a git
|
|
27
|
+
repository` — while 45 worktrees and **27 GB** sat under that agent home.
|
|
28
|
+
|
|
29
|
+
Two blind spots, both a path assumed rather than resolved. `resolveDetectorInstarRepo` guessed at
|
|
30
|
+
`~/Documents/Projects/instar` and `~/instar`; neither exists there, so it returned null and the detector's
|
|
31
|
+
`if (repo)` guard silently skipped every tick. Separately the reaper was wired to `config.projectDir`, which
|
|
32
|
+
on that layout is the agent home and is not a repo at all.
|
|
33
|
+
|
|
34
|
+
The answer was on disk the whole time: a linked worktree's `.git` is a file naming its owning repo. This is
|
|
35
|
+
also the same defect class the reaper's own header records for 2026-07-29 — *"the reaper reported
|
|
36
|
+
`reclaimable: 0` against 73 worktrees because `git -C <path> worktree list` was failing outright."* That fix
|
|
37
|
+
made the failure VISIBLE (`enumerationOk` / `reclaimable: null`), which is how this was found; it did not make
|
|
38
|
+
resolution work.
|
|
39
|
+
|
|
40
|
+
## Decision-point inventory
|
|
41
|
+
|
|
42
|
+
- `parseWorktreeGitPointer` — ADD — pure function; returns null on anything unrecognised.
|
|
43
|
+
- `discoverInstarRepoFromWorktrees` — ADD — filesystem reads only, bounded by `maxWorktrees` (default 200).
|
|
44
|
+
- `ResolveDetectorRepoOptions.worktreeRoots` — ADD — inert unless passed.
|
|
45
|
+
- No runtime block/allow decision added or modified. No caller changed.
|
|
46
|
+
|
|
47
|
+
## 1. Over-block
|
|
48
|
+
|
|
49
|
+
Not applicable in the gate sense (nothing is blocked), but the analogous failure is **naming a wrong repo**,
|
|
50
|
+
and one real instance was caught during development and is now pinned by a test:
|
|
51
|
+
|
|
52
|
+
The first draft defaulted the discovery roots to `enumerateSafeRoots()`. That helper enumerates EVERY agent
|
|
53
|
+
home on the machine, so the agent asking the question resolved to a **different agent's repo** — whichever
|
|
54
|
+
owned the most worktrees. Measured on the real box: `echo` resolved to `instar-codey/repo`. A confident wrong
|
|
55
|
+
repo is strictly worse than the null this change removes — null makes a consumer skip, a wrong repo makes it
|
|
56
|
+
act. The API now has NO default: a caller must name its own root, documented on the option itself, and a test
|
|
57
|
+
asserts resolution takes no worktree candidate when none is named.
|
|
58
|
+
|
|
59
|
+
Other non-answers all return null/empty rather than a guess: a full clone under `.worktrees/` (its `.git` is a
|
|
60
|
+
directory, not a pointer), a malformed pointer, a submodule gitdir with no `/.git/worktrees/` segment, a
|
|
61
|
+
directory with no `.git`, an unreadable file, a missing root.
|
|
62
|
+
|
|
63
|
+
## 2. Under-block
|
|
64
|
+
|
|
65
|
+
**One agent's `.worktrees/` can legitimately hold worktrees of MORE THAN ONE clone of the same upstream.**
|
|
66
|
+
Measured on the agent that surfaced this: 29 worktrees owned by `<home>/.build/instar` and 17 by
|
|
67
|
+
`<home>/.dev/instar`. The helper returns BOTH, most-owned first; it does not merge them. A single-repo
|
|
68
|
+
consumer that takes only `[0]` therefore gets the largest coherent set and still will not see the smaller
|
|
69
|
+
repo's worktrees. That is an improvement over enumerating nothing and it is not full coverage — stated in the
|
|
70
|
+
function's own doc comment rather than left to be discovered.
|
|
71
|
+
|
|
72
|
+
Also unchanged: `resolveInstarRepo` still integrity-validates every candidate, so a discovered path that is
|
|
73
|
+
not a valid instar repo is rejected exactly as before.
|
|
74
|
+
|
|
75
|
+
## 3. Level-of-abstraction fit
|
|
76
|
+
|
|
77
|
+
Filesystem reads in a module that already does filesystem enumeration (`enumerateSafeRoots` next door).
|
|
78
|
+
**Deliberately no subprocess** — reading the pointer file is cheaper than `git rev-parse`, cannot block the
|
|
79
|
+
event loop, and keeps the helper usable from the runtime hot dirs where `lint-no-blocking-process-scans`
|
|
80
|
+
applies.
|
|
81
|
+
|
|
82
|
+
## 4. Signal vs authority compliance
|
|
83
|
+
|
|
84
|
+
The helper produces CANDIDATES, never an authority. Every candidate is still validated by `resolveInstarRepo`
|
|
85
|
+
before anything believes it. An operator-supplied `worktree.repoPath` continues to win outright.
|
|
86
|
+
|
|
87
|
+
## 5. Interactions
|
|
88
|
+
|
|
89
|
+
- `resolveDetectorInstarRepo()` with no `worktreeRoots` is byte-identical to before — verified by the existing
|
|
90
|
+
detector suites (19/19 green, unmodified).
|
|
91
|
+
- No consumer passes `worktreeRoots` in this change, so no runtime path changes on any agent.
|
|
92
|
+
|
|
93
|
+
## 6. External surfaces
|
|
94
|
+
|
|
95
|
+
None. No HTTP route, no config key, no user-visible message. Not an agent capability, so the Agent Awareness
|
|
96
|
+
Standard does not apply.
|
|
97
|
+
|
|
98
|
+
## 7. Rollback cost
|
|
99
|
+
|
|
100
|
+
`git revert` of one source file plus one test file. No migration, no state, no deployed artifact, and — since
|
|
101
|
+
nothing calls it — no behaviour to restore.
|
|
102
|
+
|
|
103
|
+
## What is deliberately NOT here, and why
|
|
104
|
+
|
|
105
|
+
The consuming wiring (pointing `AgentWorktreeReaper` and `OrphanedWorkSentinel` at the resolved repo instead
|
|
106
|
+
of `config.projectDir`) is **held back for a Tier 2 spec + operator approval.** It is runtime code feeding a
|
|
107
|
+
guard with delete authority, and the cross-agent misresolution above is direct evidence that getting
|
|
108
|
+
resolution wrong here is easy. Landing the mechanism first makes that follow-up a small, focused, individually
|
|
109
|
+
reviewable diff. It is registered as a commitment, not an intention.
|
|
110
|
+
|
|
111
|
+
## Conclusion
|
|
112
|
+
|
|
113
|
+
Ship. Verified mechanism, zero runtime effect, one real misresolution caught during development and pinned by
|
|
114
|
+
a test.
|
|
115
|
+
|
|
116
|
+
## Evidence pointers
|
|
117
|
+
|
|
118
|
+
- `tests/unit/agent-worktree-repo-discovery.test.ts` — 14/14 green.
|
|
119
|
+
- Existing detector suites unmodified and green: `AgentWorktreeDetector`, `-attention-wireup`,
|
|
120
|
+
`WorktreeEnumerationFailureStore` — 19/19.
|
|
121
|
+
- Full `npm run lint` chain green; `tsc --noEmit` clean.
|
|
122
|
+
- Real-machine measurement: with the caller's own root, discovery returns
|
|
123
|
+
`[<home>/.build/instar, <home>/.dev/instar]` (29 and 17 worktrees respectively); with no root, resolution
|
|
124
|
+
returns null exactly as before.
|