@memnexus-ai/mx-agent-cli 0.1.227 → 0.1.229
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/__tests__/start-report-integration.test.js +1 -0
- package/dist/__tests__/start-report-integration.test.js.map +1 -1
- package/dist/__tests__/start-sync-hardstop.test.js +158 -0
- package/dist/__tests__/start-sync-hardstop.test.js.map +1 -1
- package/dist/__tests__/worktree-link-repair.test.d.ts +2 -0
- package/dist/__tests__/worktree-link-repair.test.d.ts.map +1 -0
- package/dist/__tests__/worktree-link-repair.test.js +471 -0
- package/dist/__tests__/worktree-link-repair.test.js.map +1 -0
- package/dist/commands/start.d.ts.map +1 -1
- package/dist/commands/start.js +76 -1
- package/dist/commands/start.js.map +1 -1
- package/dist/lib/templates.d.ts.map +1 -1
- package/dist/lib/templates.js +17 -0
- package/dist/lib/templates.js.map +1 -1
- package/dist/lib/worktree.d.ts +65 -0
- package/dist/lib/worktree.d.ts.map +1 -1
- package/dist/lib/worktree.js +265 -2
- package/dist/lib/worktree.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,471 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* repairWorktreeLinkIfBroken — self-heal for worktree git links that point at
|
|
3
|
+
* host paths which do not exist inside a devcontainer (#4484).
|
|
4
|
+
*/
|
|
5
|
+
import { describe, it, expect, beforeEach, afterEach } from 'vitest';
|
|
6
|
+
import { spawnSync } from 'child_process';
|
|
7
|
+
import { mkdirSync, rmSync, writeFileSync, readFileSync, existsSync, renameSync } from 'fs';
|
|
8
|
+
import { join } from 'path';
|
|
9
|
+
import { tmpdir } from 'os';
|
|
10
|
+
import { repairWorktreeLinkIfBroken, createGitWorktree, repairSiblingWorktreeLinks } from '../lib/worktree.js';
|
|
11
|
+
import { newProjectPostCreateShTemplate } from '../lib/templates.js';
|
|
12
|
+
let tmpRoot;
|
|
13
|
+
function run(cmd, args, cwd) {
|
|
14
|
+
const r = spawnSync(cmd, args, { cwd, stdio: 'pipe', encoding: 'utf-8' });
|
|
15
|
+
if (r.status !== 0) {
|
|
16
|
+
throw new Error(`${cmd} ${args.join(' ')} failed (${r.status}): ${r.stderr}`);
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
function initRepoWithCommit(dir) {
|
|
20
|
+
mkdirSync(dir, { recursive: true });
|
|
21
|
+
run('git', ['init', dir], dir);
|
|
22
|
+
run('git', ['-C', dir, 'symbolic-ref', 'HEAD', 'refs/heads/main'], dir);
|
|
23
|
+
run('git', ['-C', dir, 'config', 'user.email', 'test@example.com'], dir);
|
|
24
|
+
run('git', ['-C', dir, 'config', 'user.name', 'Test'], dir);
|
|
25
|
+
writeFileSync(join(dir, 'README.md'), '# test\n', 'utf-8');
|
|
26
|
+
run('git', ['-C', dir, 'add', '-A'], dir);
|
|
27
|
+
run('git', ['-C', dir, 'commit', '-m', 'init'], dir);
|
|
28
|
+
}
|
|
29
|
+
/** True when git commands succeed inside the worktree. */
|
|
30
|
+
function gitWorksIn(worktreePath) {
|
|
31
|
+
const r = spawnSync('git', ['status', '--porcelain'], { cwd: worktreePath, stdio: 'pipe' });
|
|
32
|
+
return r.status === 0;
|
|
33
|
+
}
|
|
34
|
+
beforeEach(() => {
|
|
35
|
+
tmpRoot = join(tmpdir(), `mx-agent-wt-repair-${Date.now()}-${Math.random().toString(36).slice(2)}`);
|
|
36
|
+
mkdirSync(tmpRoot, { recursive: true });
|
|
37
|
+
});
|
|
38
|
+
afterEach(() => {
|
|
39
|
+
try {
|
|
40
|
+
rmSync(tmpRoot, { recursive: true, force: true });
|
|
41
|
+
}
|
|
42
|
+
catch { /* ignore */ }
|
|
43
|
+
});
|
|
44
|
+
describe('repairWorktreeLinkIfBroken', () => {
|
|
45
|
+
it('is a no-op for a healthy worktree', () => {
|
|
46
|
+
const repo = join(tmpRoot, 'repo');
|
|
47
|
+
initRepoWithCommit(repo);
|
|
48
|
+
const wt = join(tmpRoot, 'wt', 'feature');
|
|
49
|
+
run('git', ['-C', repo, 'worktree', 'add', wt, '-b', 'feature'], repo);
|
|
50
|
+
const before = readFileSync(join(wt, '.git'), 'utf-8');
|
|
51
|
+
const result = repairWorktreeLinkIfBroken(repo, wt);
|
|
52
|
+
expect(result.status).toBe('healthy');
|
|
53
|
+
expect(readFileSync(join(wt, '.git'), 'utf-8')).toBe(before);
|
|
54
|
+
expect(gitWorksIn(wt)).toBe(true);
|
|
55
|
+
});
|
|
56
|
+
it('repairs a worktree whose gitdir points at a nonexistent path', () => {
|
|
57
|
+
const repo = join(tmpRoot, 'repo');
|
|
58
|
+
initRepoWithCommit(repo);
|
|
59
|
+
const wt = join(tmpRoot, 'wt', 'feature');
|
|
60
|
+
run('git', ['-C', repo, 'worktree', 'add', wt, '-b', 'feature'], repo);
|
|
61
|
+
// Simulate a host-provisioned worktree opened at a different mount point.
|
|
62
|
+
writeFileSync(join(wt, '.git'), `gitdir: /nonexistent/host/path/.git/worktrees/feature\n`, 'utf-8');
|
|
63
|
+
expect(gitWorksIn(wt)).toBe(false);
|
|
64
|
+
const result = repairWorktreeLinkIfBroken(repo, wt);
|
|
65
|
+
expect(result.status).toBe('repaired');
|
|
66
|
+
expect(result.gitdir && existsSync(result.gitdir)).toBe(true);
|
|
67
|
+
expect(gitWorksIn(wt)).toBe(true);
|
|
68
|
+
});
|
|
69
|
+
it('repairs both directions when the back-pointer is broken too', () => {
|
|
70
|
+
// This is what a devcontainer remount actually produces: the worktree's
|
|
71
|
+
// .git file AND the main repo's .git/worktrees/<id>/gitdir back-pointer
|
|
72
|
+
// both hold host paths that do not exist at the new mount point.
|
|
73
|
+
const repo = join(tmpRoot, 'repo');
|
|
74
|
+
initRepoWithCommit(repo);
|
|
75
|
+
const wt = join(tmpRoot, 'wt', 'feature');
|
|
76
|
+
run('git', ['-C', repo, 'worktree', 'add', wt, '-b', 'feature'], repo);
|
|
77
|
+
const backPointer = join(repo, '.git', 'worktrees', 'feature', 'gitdir');
|
|
78
|
+
expect(existsSync(backPointer)).toBe(true);
|
|
79
|
+
writeFileSync(join(wt, '.git'), 'gitdir: /nonexistent/host/path/.git/worktrees/feature\n', 'utf-8');
|
|
80
|
+
writeFileSync(backPointer, '/nonexistent/host/path/wt/feature/.git\n', 'utf-8');
|
|
81
|
+
expect(gitWorksIn(wt)).toBe(false);
|
|
82
|
+
const result = repairWorktreeLinkIfBroken(repo, wt);
|
|
83
|
+
expect(result.status).toBe('repaired');
|
|
84
|
+
// Forward link: worktree .git → main repo's per-worktree dir.
|
|
85
|
+
expect(result.gitdir).toBe(join(repo, '.git', 'worktrees', 'feature'));
|
|
86
|
+
// Back-pointer: main repo → the worktree's .git file, at its real path.
|
|
87
|
+
expect(readFileSync(backPointer, 'utf-8').trim()).toBe(join(wt, '.git'));
|
|
88
|
+
expect(gitWorksIn(wt)).toBe(true);
|
|
89
|
+
});
|
|
90
|
+
it('refuses a rogue directory claiming a live worktree id (steady state)', () => {
|
|
91
|
+
// Attack: an untracked directory dropped under .worktrees/ with a
|
|
92
|
+
// hand-written .git file naming a REAL worktree's id. Handing that to
|
|
93
|
+
// `git worktree repair` would rewrite the victim's entry to point at the
|
|
94
|
+
// attacker's directory. Here the victim's back-pointer is still alive.
|
|
95
|
+
const repo = join(tmpRoot, 'repo');
|
|
96
|
+
initRepoWithCommit(repo);
|
|
97
|
+
const worktrees = join(repo, '.worktrees');
|
|
98
|
+
mkdirSync(worktrees, { recursive: true });
|
|
99
|
+
const victim = join(worktrees, 'victim');
|
|
100
|
+
run('git', ['-C', repo, 'worktree', 'add', victim, '-b', 'victim'], repo);
|
|
101
|
+
const victimBackPointer = join(repo, '.git', 'worktrees', 'victim', 'gitdir');
|
|
102
|
+
const victimBefore = readFileSync(victimBackPointer, 'utf-8');
|
|
103
|
+
const rogue = join(worktrees, 'rogue');
|
|
104
|
+
mkdirSync(rogue, { recursive: true });
|
|
105
|
+
writeFileSync(join(rogue, '.git'), 'gitdir: /nonexistent/.git/worktrees/victim\n', 'utf-8');
|
|
106
|
+
const result = repairWorktreeLinkIfBroken(repo, rogue);
|
|
107
|
+
expect(result.status).toBe('refused');
|
|
108
|
+
expect(result.claimedId).toBe('victim');
|
|
109
|
+
// The victim's link is untouched and still works.
|
|
110
|
+
expect(readFileSync(victimBackPointer, 'utf-8')).toBe(victimBefore);
|
|
111
|
+
expect(gitWorksIn(victim)).toBe(true);
|
|
112
|
+
});
|
|
113
|
+
it('refuses a rogue directory during the remount window (both sides dead)', () => {
|
|
114
|
+
// Case B: right after a host→container remount EVERY back-pointer is dead,
|
|
115
|
+
// so the steady-state guard is blind. The sibling-ownership rule must still
|
|
116
|
+
// stop a rogue directory from claiming the victim's id.
|
|
117
|
+
const repo = join(tmpRoot, 'repo');
|
|
118
|
+
initRepoWithCommit(repo);
|
|
119
|
+
const worktrees = join(repo, '.worktrees');
|
|
120
|
+
mkdirSync(worktrees, { recursive: true });
|
|
121
|
+
const victim = join(worktrees, 'victim');
|
|
122
|
+
run('git', ['-C', repo, 'worktree', 'add', victim, '-b', 'victim'], repo);
|
|
123
|
+
// Simulate the remount: both sides of the victim's link hold host paths.
|
|
124
|
+
const victimBackPointer = join(repo, '.git', 'worktrees', 'victim', 'gitdir');
|
|
125
|
+
writeFileSync(join(victim, '.git'), 'gitdir: /host/repo/.git/worktrees/victim\n', 'utf-8');
|
|
126
|
+
writeFileSync(victimBackPointer, '/host/repo/.worktrees/victim/.git\n', 'utf-8');
|
|
127
|
+
const victimBefore = readFileSync(victimBackPointer, 'utf-8');
|
|
128
|
+
const rogue = join(worktrees, 'rogue');
|
|
129
|
+
mkdirSync(rogue, { recursive: true });
|
|
130
|
+
writeFileSync(join(rogue, '.git'), 'gitdir: /host/repo/.git/worktrees/victim\n', 'utf-8');
|
|
131
|
+
const result = repairWorktreeLinkIfBroken(repo, rogue);
|
|
132
|
+
expect(result.status).toBe('refused');
|
|
133
|
+
expect(result.claimedId).toBe('victim');
|
|
134
|
+
expect(result.conflictingOwner).toBe(victim);
|
|
135
|
+
// The victim's entry was NOT re-pointed at the rogue directory.
|
|
136
|
+
expect(readFileSync(victimBackPointer, 'utf-8')).toBe(victimBefore);
|
|
137
|
+
});
|
|
138
|
+
it('refuses a rogue claim even when the victim .git file was deleted', () => {
|
|
139
|
+
// Case C: the attacker removes the victim's .git file first, so the victim
|
|
140
|
+
// looks less like a worktree. The victim DIRECTORY still exists, which is
|
|
141
|
+
// what the ownership rule keys on.
|
|
142
|
+
const repo = join(tmpRoot, 'repo');
|
|
143
|
+
initRepoWithCommit(repo);
|
|
144
|
+
const worktrees = join(repo, '.worktrees');
|
|
145
|
+
mkdirSync(worktrees, { recursive: true });
|
|
146
|
+
const victim = join(worktrees, 'victim');
|
|
147
|
+
run('git', ['-C', repo, 'worktree', 'add', victim, '-b', 'victim'], repo);
|
|
148
|
+
const victimBackPointer = join(repo, '.git', 'worktrees', 'victim', 'gitdir');
|
|
149
|
+
writeFileSync(victimBackPointer, '/host/repo/.worktrees/victim/.git\n', 'utf-8');
|
|
150
|
+
const victimBefore = readFileSync(victimBackPointer, 'utf-8');
|
|
151
|
+
rmSync(join(victim, '.git'), { force: true });
|
|
152
|
+
const rogue = join(worktrees, 'rogue');
|
|
153
|
+
mkdirSync(rogue, { recursive: true });
|
|
154
|
+
writeFileSync(join(rogue, '.git'), 'gitdir: /host/repo/.git/worktrees/victim\n', 'utf-8');
|
|
155
|
+
const result = repairWorktreeLinkIfBroken(repo, rogue);
|
|
156
|
+
expect(result.status).toBe('refused');
|
|
157
|
+
expect(readFileSync(victimBackPointer, 'utf-8')).toBe(victimBefore);
|
|
158
|
+
});
|
|
159
|
+
it('still repairs the legitimate remount case (both sides dead, own id)', () => {
|
|
160
|
+
// The guards must not block the case #4484 exists for.
|
|
161
|
+
const repo = join(tmpRoot, 'repo');
|
|
162
|
+
initRepoWithCommit(repo);
|
|
163
|
+
const worktrees = join(repo, '.worktrees');
|
|
164
|
+
mkdirSync(worktrees, { recursive: true });
|
|
165
|
+
const wt = join(worktrees, 'teamA');
|
|
166
|
+
run('git', ['-C', repo, 'worktree', 'add', wt, '-b', 'teamA'], repo);
|
|
167
|
+
writeFileSync(join(wt, '.git'), 'gitdir: /host/repo/.git/worktrees/teamA\n', 'utf-8');
|
|
168
|
+
writeFileSync(join(repo, '.git', 'worktrees', 'teamA', 'gitdir'), '/host/repo/.worktrees/teamA/.git\n', 'utf-8');
|
|
169
|
+
expect(gitWorksIn(wt)).toBe(false);
|
|
170
|
+
expect(repairWorktreeLinkIfBroken(repo, wt).status).toBe('repaired');
|
|
171
|
+
expect(gitWorksIn(wt)).toBe(true);
|
|
172
|
+
});
|
|
173
|
+
it('repairs a renamed directory when no sibling owns the claimed id', () => {
|
|
174
|
+
// Documents the allowed path: basename != id, but nothing else claims that
|
|
175
|
+
// id, so there is no victim to hijack.
|
|
176
|
+
const repo = join(tmpRoot, 'repo');
|
|
177
|
+
initRepoWithCommit(repo);
|
|
178
|
+
const worktrees = join(repo, '.worktrees');
|
|
179
|
+
mkdirSync(worktrees, { recursive: true });
|
|
180
|
+
const original = join(worktrees, 'teamA');
|
|
181
|
+
run('git', ['-C', repo, 'worktree', 'add', original, '-b', 'teamA'], repo);
|
|
182
|
+
const renamed = join(worktrees, 'teamA-renamed');
|
|
183
|
+
renameSync(original, renamed);
|
|
184
|
+
writeFileSync(join(renamed, '.git'), 'gitdir: /host/repo/.git/worktrees/teamA\n', 'utf-8');
|
|
185
|
+
writeFileSync(join(repo, '.git', 'worktrees', 'teamA', 'gitdir'), '/host/repo/.worktrees/teamA/.git\n', 'utf-8');
|
|
186
|
+
const result = repairWorktreeLinkIfBroken(repo, renamed);
|
|
187
|
+
expect(result.status).toBe('repaired');
|
|
188
|
+
expect(gitWorksIn(renamed)).toBe(true);
|
|
189
|
+
});
|
|
190
|
+
it('reports unregistered when the main repo has no admin entry (#4485)', () => {
|
|
191
|
+
// Field failure: `git worktree prune` / auto-gc removes admin entries whose
|
|
192
|
+
// .git file does not resolve — the state every host-provisioned worktree is
|
|
193
|
+
// in inside a container. `git worktree repair` then fails with "unable to
|
|
194
|
+
// locate repository", which our old message hid behind "could not be
|
|
195
|
+
// repaired automatically".
|
|
196
|
+
const repo = join(tmpRoot, 'repo');
|
|
197
|
+
initRepoWithCommit(repo);
|
|
198
|
+
const worktrees = join(repo, '.worktrees');
|
|
199
|
+
mkdirSync(worktrees, { recursive: true });
|
|
200
|
+
const wt = join(worktrees, 'teamA');
|
|
201
|
+
run('git', ['-C', repo, 'worktree', 'add', wt, '-b', 'teamA'], repo);
|
|
202
|
+
writeFileSync(join(wt, '.git'), 'gitdir: /host/repo/.git/worktrees/teamA\n', 'utf-8');
|
|
203
|
+
rmSync(join(repo, '.git', 'worktrees', 'teamA'), { recursive: true, force: true });
|
|
204
|
+
const result = repairWorktreeLinkIfBroken(repo, wt);
|
|
205
|
+
expect(result.status).toBe('unregistered');
|
|
206
|
+
expect(result.claimedId).toBe('teamA');
|
|
207
|
+
expect(result.missingAdminEntry).toBe(join(repo, '.git', 'worktrees', 'teamA'));
|
|
208
|
+
// No repair was attempted, so the .git file is untouched.
|
|
209
|
+
expect(readFileSync(join(wt, '.git'), 'utf-8')).toBe('gitdir: /host/repo/.git/worktrees/teamA\n');
|
|
210
|
+
});
|
|
211
|
+
it('documents the verified manual recovery for an unregistered worktree', () => {
|
|
212
|
+
// The recovery printed by start.ts, executed here so the instructions
|
|
213
|
+
// cannot drift from what actually works. It must preserve uncommitted work.
|
|
214
|
+
const repo = join(tmpRoot, 'repo');
|
|
215
|
+
initRepoWithCommit(repo);
|
|
216
|
+
const worktrees = join(repo, '.worktrees');
|
|
217
|
+
mkdirSync(worktrees, { recursive: true });
|
|
218
|
+
const wt = join(worktrees, 'teamA');
|
|
219
|
+
run('git', ['-C', repo, 'worktree', 'add', wt, '-b', 'teamA'], repo);
|
|
220
|
+
writeFileSync(join(wt, 'README.md'), '# test\nlocal edit\n', 'utf-8');
|
|
221
|
+
writeFileSync(join(wt, 'scratch.txt'), 'untracked\n', 'utf-8');
|
|
222
|
+
writeFileSync(join(wt, '.git'), 'gitdir: /host/repo/.git/worktrees/teamA\n', 'utf-8');
|
|
223
|
+
const entry = join(repo, '.git', 'worktrees', 'teamA');
|
|
224
|
+
rmSync(entry, { recursive: true, force: true });
|
|
225
|
+
expect(repairWorktreeLinkIfBroken(repo, wt).status).toBe('unregistered');
|
|
226
|
+
mkdirSync(entry, { recursive: true });
|
|
227
|
+
writeFileSync(join(entry, 'gitdir'), `${join(wt, '.git')}\n`, 'utf-8');
|
|
228
|
+
writeFileSync(join(entry, 'commondir'), '../..\n', 'utf-8');
|
|
229
|
+
writeFileSync(join(entry, 'HEAD'), 'ref: refs/heads/teamA\n', 'utf-8');
|
|
230
|
+
writeFileSync(join(wt, '.git'), `gitdir: ${entry}\n`, 'utf-8');
|
|
231
|
+
run('git', ['-C', wt, 'read-tree', 'HEAD'], wt);
|
|
232
|
+
run('git', ['-C', repo, 'worktree', 'repair', '--', wt], repo);
|
|
233
|
+
expect(gitWorksIn(wt)).toBe(true);
|
|
234
|
+
// Uncommitted work survived: README modified, scratch.txt still untracked.
|
|
235
|
+
const status = spawnSync('git', ['status', '--porcelain'], { cwd: wt, stdio: 'pipe', encoding: 'utf-8' });
|
|
236
|
+
expect(status.stdout).toContain(' M README.md');
|
|
237
|
+
expect(status.stdout).toContain('?? scratch.txt');
|
|
238
|
+
expect(readFileSync(join(wt, 'README.md'), 'utf-8')).toContain('local edit');
|
|
239
|
+
});
|
|
240
|
+
it('reports why repair failed when the link stays broken (#4485)', () => {
|
|
241
|
+
// A gutted admin entry: the directory exists (so the unregistered check
|
|
242
|
+
// passes) but its contents are gone. `git worktree repair` rewrites the
|
|
243
|
+
// .git file and exits 0 anyway, so only the post-repair verification —
|
|
244
|
+
// running git inside the worktree — catches that it still does not work.
|
|
245
|
+
const repo = join(tmpRoot, 'repo');
|
|
246
|
+
initRepoWithCommit(repo);
|
|
247
|
+
const worktrees = join(repo, '.worktrees');
|
|
248
|
+
mkdirSync(worktrees, { recursive: true });
|
|
249
|
+
const wt = join(worktrees, 'teamA');
|
|
250
|
+
run('git', ['-C', repo, 'worktree', 'add', wt, '-b', 'teamA'], repo);
|
|
251
|
+
writeFileSync(join(wt, '.git'), 'gitdir: /host/repo/.git/worktrees/teamA\n', 'utf-8');
|
|
252
|
+
const entry = join(repo, '.git', 'worktrees', 'teamA');
|
|
253
|
+
rmSync(entry, { recursive: true, force: true });
|
|
254
|
+
mkdirSync(entry, { recursive: true });
|
|
255
|
+
const result = repairWorktreeLinkIfBroken(repo, wt);
|
|
256
|
+
expect(result.status).toBe('still-broken');
|
|
257
|
+
expect(result.repairError).toBeTruthy();
|
|
258
|
+
expect(result.repairError).toMatch(/git/i);
|
|
259
|
+
expect(gitWorksIn(wt)).toBe(false);
|
|
260
|
+
});
|
|
261
|
+
it('refuses a gitdir whose final component is not a plain worktree id', () => {
|
|
262
|
+
const repo = join(tmpRoot, 'repo');
|
|
263
|
+
initRepoWithCommit(repo);
|
|
264
|
+
const rogue = join(tmpRoot, 'rogue');
|
|
265
|
+
mkdirSync(rogue, { recursive: true });
|
|
266
|
+
writeFileSync(join(rogue, '.git'), 'gitdir: /nonexistent/.git/worktrees/a b;rm -rf /\n', 'utf-8');
|
|
267
|
+
expect(repairWorktreeLinkIfBroken(repo, rogue).status).toBe('refused');
|
|
268
|
+
});
|
|
269
|
+
it('is a no-op when .git is a directory (not a linked worktree)', () => {
|
|
270
|
+
const repo = join(tmpRoot, 'repo');
|
|
271
|
+
initRepoWithCommit(repo);
|
|
272
|
+
expect(repairWorktreeLinkIfBroken(repo, repo).status).toBe('not-a-worktree');
|
|
273
|
+
expect(gitWorksIn(repo)).toBe(true);
|
|
274
|
+
});
|
|
275
|
+
it('is a no-op when the path has no .git at all', () => {
|
|
276
|
+
const repo = join(tmpRoot, 'repo');
|
|
277
|
+
initRepoWithCommit(repo);
|
|
278
|
+
const plain = join(tmpRoot, 'plain');
|
|
279
|
+
mkdirSync(plain, { recursive: true });
|
|
280
|
+
expect(repairWorktreeLinkIfBroken(repo, plain).status).toBe('not-a-worktree');
|
|
281
|
+
});
|
|
282
|
+
});
|
|
283
|
+
describe('createGitWorktree — prune footgun (#4485)', () => {
|
|
284
|
+
it('heals broken siblings before pruning so their entries survive', () => {
|
|
285
|
+
// Without the pre-prune heal, `git worktree prune` (run on every creation)
|
|
286
|
+
// deletes the admin entry of every worktree whose .git file does not
|
|
287
|
+
// resolve — i.e. every host-provisioned worktree in a fresh container —
|
|
288
|
+
// converting a repairable link into the unrecoverable unregistered state.
|
|
289
|
+
const repo = join(tmpRoot, 'repo');
|
|
290
|
+
initRepoWithCommit(repo);
|
|
291
|
+
const worktrees = join(repo, '.worktrees');
|
|
292
|
+
mkdirSync(worktrees, { recursive: true });
|
|
293
|
+
const healthy = join(worktrees, 'teamA');
|
|
294
|
+
const broken = join(worktrees, 'teamB');
|
|
295
|
+
run('git', ['-C', repo, 'worktree', 'add', healthy, '-b', 'teamA'], repo);
|
|
296
|
+
run('git', ['-C', repo, 'worktree', 'add', broken, '-b', 'teamB'], repo);
|
|
297
|
+
// teamB is in the post-remount state: both sides hold dead host paths.
|
|
298
|
+
writeFileSync(join(broken, '.git'), 'gitdir: /host/repo/.git/worktrees/teamB\n', 'utf-8');
|
|
299
|
+
writeFileSync(join(repo, '.git', 'worktrees', 'teamB', 'gitdir'), '/host/repo/.worktrees/teamB/.git\n', 'utf-8');
|
|
300
|
+
expect(gitWorksIn(broken)).toBe(false);
|
|
301
|
+
createGitWorktree(join(worktrees, 'teamC'), 'worktree/teamC', 'main', repo);
|
|
302
|
+
// teamB's admin entry survived the prune and its link works again.
|
|
303
|
+
expect(existsSync(join(repo, '.git', 'worktrees', 'teamB'))).toBe(true);
|
|
304
|
+
expect(gitWorksIn(broken)).toBe(true);
|
|
305
|
+
expect(gitWorksIn(healthy)).toBe(true);
|
|
306
|
+
expect(gitWorksIn(join(worktrees, 'teamC'))).toBe(true);
|
|
307
|
+
});
|
|
308
|
+
it('still prunes entries whose worktree directory is gone', () => {
|
|
309
|
+
const repo = join(tmpRoot, 'repo');
|
|
310
|
+
initRepoWithCommit(repo);
|
|
311
|
+
const worktrees = join(repo, '.worktrees');
|
|
312
|
+
mkdirSync(worktrees, { recursive: true });
|
|
313
|
+
const stale = join(worktrees, 'teamStale');
|
|
314
|
+
run('git', ['-C', repo, 'worktree', 'add', stale, '-b', 'teamStale'], repo);
|
|
315
|
+
rmSync(stale, { recursive: true, force: true });
|
|
316
|
+
createGitWorktree(join(worktrees, 'teamC'), 'worktree/teamC', 'main', repo);
|
|
317
|
+
expect(existsSync(join(repo, '.git', 'worktrees', 'teamStale'))).toBe(false);
|
|
318
|
+
});
|
|
319
|
+
it('surfaces a sibling the guards refused instead of swallowing it', () => {
|
|
320
|
+
// A refusal during creation is the hijack guard firing where nobody would
|
|
321
|
+
// otherwise see it.
|
|
322
|
+
const repo = join(tmpRoot, 'repo');
|
|
323
|
+
initRepoWithCommit(repo);
|
|
324
|
+
const worktrees = join(repo, '.worktrees');
|
|
325
|
+
mkdirSync(worktrees, { recursive: true });
|
|
326
|
+
const victim = join(worktrees, 'victim');
|
|
327
|
+
run('git', ['-C', repo, 'worktree', 'add', victim, '-b', 'victim'], repo);
|
|
328
|
+
const rogue = join(worktrees, 'rogue');
|
|
329
|
+
mkdirSync(rogue, { recursive: true });
|
|
330
|
+
writeFileSync(join(rogue, '.git'), 'gitdir: /host/repo/.git/worktrees/victim\n', 'utf-8');
|
|
331
|
+
const summary = repairSiblingWorktreeLinks(repo, worktrees);
|
|
332
|
+
expect(summary.refusals).toHaveLength(1);
|
|
333
|
+
expect(summary.refusals[0]).toMatchObject({
|
|
334
|
+
name: 'rogue',
|
|
335
|
+
status: 'refused',
|
|
336
|
+
claimedId: 'victim',
|
|
337
|
+
conflictingOwner: victim,
|
|
338
|
+
});
|
|
339
|
+
});
|
|
340
|
+
it('reports an unregistered sibling as a refusal', () => {
|
|
341
|
+
const repo = join(tmpRoot, 'repo');
|
|
342
|
+
initRepoWithCommit(repo);
|
|
343
|
+
const worktrees = join(repo, '.worktrees');
|
|
344
|
+
mkdirSync(worktrees, { recursive: true });
|
|
345
|
+
const wt = join(worktrees, 'teamA');
|
|
346
|
+
run('git', ['-C', repo, 'worktree', 'add', wt, '-b', 'teamA'], repo);
|
|
347
|
+
writeFileSync(join(wt, '.git'), 'gitdir: /host/repo/.git/worktrees/teamA\n', 'utf-8');
|
|
348
|
+
rmSync(join(repo, '.git', 'worktrees', 'teamA'), { recursive: true, force: true });
|
|
349
|
+
const summary = repairSiblingWorktreeLinks(repo, worktrees);
|
|
350
|
+
expect(summary.repaired).toEqual([]);
|
|
351
|
+
expect(summary.refusals).toMatchObject([{ name: 'teamA', status: 'unregistered' }]);
|
|
352
|
+
});
|
|
353
|
+
it('stops sweeping once the wall-clock budget is exhausted', () => {
|
|
354
|
+
// Each sibling can cost ~30s (repair 15s + verify 15s); ten broken ones
|
|
355
|
+
// would stall creation for five minutes without a budget.
|
|
356
|
+
const repo = join(tmpRoot, 'repo');
|
|
357
|
+
initRepoWithCommit(repo);
|
|
358
|
+
const worktrees = join(repo, '.worktrees');
|
|
359
|
+
mkdirSync(worktrees, { recursive: true });
|
|
360
|
+
for (const name of ['teamA', 'teamB', 'teamC']) {
|
|
361
|
+
const wt = join(worktrees, name);
|
|
362
|
+
run('git', ['-C', repo, 'worktree', 'add', wt, '-b', name], repo);
|
|
363
|
+
writeFileSync(join(wt, '.git'), `gitdir: /host/repo/.git/worktrees/${name}\n`, 'utf-8');
|
|
364
|
+
}
|
|
365
|
+
// Clock jumps past the budget after the first candidate is attempted.
|
|
366
|
+
let ticks = 0;
|
|
367
|
+
const now = () => {
|
|
368
|
+
ticks += 1;
|
|
369
|
+
return ticks <= 2 ? 0 : 60_001;
|
|
370
|
+
};
|
|
371
|
+
const summary = repairSiblingWorktreeLinks(repo, worktrees, { budgetMs: 60_000, now });
|
|
372
|
+
// Only the first candidate was attempted; the rest are reported, not silently
|
|
373
|
+
// dropped. (Note: git's own `worktree repair` fixes every sibling whose
|
|
374
|
+
// back-pointer is intact, so teamB/teamC may end up healed as a side effect —
|
|
375
|
+
// what matters is that WE stopped spending time once the budget ran out.)
|
|
376
|
+
expect(summary.repaired).toEqual(['teamA']);
|
|
377
|
+
expect(summary.skipped).toEqual(['teamB', 'teamC']);
|
|
378
|
+
});
|
|
379
|
+
it('repairSiblingWorktreeLinks tolerates junk and reports what it fixed', () => {
|
|
380
|
+
const repo = join(tmpRoot, 'repo');
|
|
381
|
+
initRepoWithCommit(repo);
|
|
382
|
+
const worktrees = join(repo, '.worktrees');
|
|
383
|
+
mkdirSync(worktrees, { recursive: true });
|
|
384
|
+
const wt = join(worktrees, 'teamA');
|
|
385
|
+
run('git', ['-C', repo, 'worktree', 'add', wt, '-b', 'teamA'], repo);
|
|
386
|
+
writeFileSync(join(wt, '.git'), 'gitdir: /host/repo/.git/worktrees/teamA\n', 'utf-8');
|
|
387
|
+
// Junk neighbours: a plain file, a directory with no .git, and an entry we skip.
|
|
388
|
+
writeFileSync(join(worktrees, 'stray-file'), 'not a worktree\n', 'utf-8');
|
|
389
|
+
mkdirSync(join(worktrees, 'empty-dir'), { recursive: true });
|
|
390
|
+
mkdirSync(join(worktrees, 'skipme'), { recursive: true });
|
|
391
|
+
const summary = repairSiblingWorktreeLinks(repo, worktrees, { skipName: 'skipme' });
|
|
392
|
+
expect(summary.repaired).toEqual(['teamA']);
|
|
393
|
+
expect(summary.skipped).toEqual([]);
|
|
394
|
+
expect(gitWorksIn(wt)).toBe(true);
|
|
395
|
+
});
|
|
396
|
+
it('repairSiblingWorktreeLinks is a no-op when the worktree dir is absent', () => {
|
|
397
|
+
const repo = join(tmpRoot, 'repo');
|
|
398
|
+
initRepoWithCommit(repo);
|
|
399
|
+
expect(repairSiblingWorktreeLinks(repo, join(repo, 'nope'))).toEqual({
|
|
400
|
+
repaired: [],
|
|
401
|
+
refusals: [],
|
|
402
|
+
skipped: [],
|
|
403
|
+
});
|
|
404
|
+
});
|
|
405
|
+
});
|
|
406
|
+
/**
|
|
407
|
+
* Pull the worktree-repair block out of the generated script and re-point it at
|
|
408
|
+
* a temp repo, so the bash can be executed for real instead of only grepped.
|
|
409
|
+
*/
|
|
410
|
+
function extractRepairBlock(script, repoPath) {
|
|
411
|
+
const lines = script.split('\n');
|
|
412
|
+
const start = lines.findIndex((l) => l.startsWith('# Repair git worktree links'));
|
|
413
|
+
expect(start).toBeGreaterThan(-1);
|
|
414
|
+
const end = lines.indexOf('fi', start);
|
|
415
|
+
expect(end).toBeGreaterThan(start);
|
|
416
|
+
return lines.slice(start, end + 1).join('\n').split('/workspace').join(repoPath) + '\n';
|
|
417
|
+
}
|
|
418
|
+
describe('newProjectPostCreateShTemplate', () => {
|
|
419
|
+
it('enumerates worktree directories and applies the ownership rule, non-fatally', () => {
|
|
420
|
+
const script = newProjectPostCreateShTemplate('demo');
|
|
421
|
+
expect(script).toContain('if [ -d /workspace/.worktrees ]; then');
|
|
422
|
+
// Directory enumeration, NOT `git worktree list` — after a remount that
|
|
423
|
+
// command reports dead host paths and would match nothing.
|
|
424
|
+
expect(script).toContain('for wt in /workspace/.worktrees/*/; do');
|
|
425
|
+
expect(script).not.toContain('worktree list --porcelain');
|
|
426
|
+
expect(script).not.toContain('worktree repair /workspace/.worktrees/*/');
|
|
427
|
+
expect(script).toContain('git -C /workspace worktree repair -- "$wt"');
|
|
428
|
+
expect(script).toMatch(/worktree repair .*\|\| true/);
|
|
429
|
+
// Shell parameter expansions must survive template-literal escaping.
|
|
430
|
+
expect(script).toContain('wt="${wt%/}"');
|
|
431
|
+
expect(script).toContain('id="${gd##*/}"');
|
|
432
|
+
expect(script).toContain('[ "${wt##*/}" != "$id" ]');
|
|
433
|
+
});
|
|
434
|
+
it('repairs a remounted worktree and skips a rogue sibling when executed', () => {
|
|
435
|
+
// The regression this replaces: a `git worktree list`-driven loop repaired
|
|
436
|
+
// NOTHING after a remount, because git reports the dead host paths.
|
|
437
|
+
const repo = join(tmpRoot, 'repo');
|
|
438
|
+
initRepoWithCommit(repo);
|
|
439
|
+
const worktrees = join(repo, '.worktrees');
|
|
440
|
+
mkdirSync(worktrees, { recursive: true });
|
|
441
|
+
const teamA = join(worktrees, 'teamA');
|
|
442
|
+
run('git', ['-C', repo, 'worktree', 'add', teamA, '-b', 'teamA'], repo);
|
|
443
|
+
// Remount state: both sides of teamA's link hold host paths.
|
|
444
|
+
const teamABackPointer = join(repo, '.git', 'worktrees', 'teamA', 'gitdir');
|
|
445
|
+
writeFileSync(join(teamA, '.git'), 'gitdir: /host/repo/.git/worktrees/teamA\n', 'utf-8');
|
|
446
|
+
writeFileSync(teamABackPointer, '/host/repo/.worktrees/teamA/.git\n', 'utf-8');
|
|
447
|
+
expect(gitWorksIn(teamA)).toBe(false);
|
|
448
|
+
// A rogue sibling claiming teamA's id, plus a plain directory with no .git.
|
|
449
|
+
const rogue = join(worktrees, 'rogue');
|
|
450
|
+
mkdirSync(rogue, { recursive: true });
|
|
451
|
+
writeFileSync(join(rogue, '.git'), 'gitdir: /host/repo/.git/worktrees/teamA\n', 'utf-8');
|
|
452
|
+
mkdirSync(join(worktrees, 'not-a-worktree'), { recursive: true });
|
|
453
|
+
const blockPath = join(tmpRoot, 'repair-block.sh');
|
|
454
|
+
writeFileSync(blockPath, extractRepairBlock(newProjectPostCreateShTemplate('demo'), repo), 'utf-8');
|
|
455
|
+
const r = spawnSync('bash', [blockPath], { cwd: repo, stdio: 'pipe', encoding: 'utf-8' });
|
|
456
|
+
expect(r.status).toBe(0);
|
|
457
|
+
// The real worktree is repaired...
|
|
458
|
+
expect(gitWorksIn(teamA)).toBe(true);
|
|
459
|
+
// ...and teamA's entry points at teamA, not at the rogue directory.
|
|
460
|
+
expect(readFileSync(teamABackPointer, 'utf-8').trim()).toBe(join(teamA, '.git'));
|
|
461
|
+
});
|
|
462
|
+
it('generates a post-create script bash can parse', () => {
|
|
463
|
+
const script = newProjectPostCreateShTemplate('demo');
|
|
464
|
+
const scriptPath = join(tmpRoot, 'post-create.sh');
|
|
465
|
+
writeFileSync(scriptPath, script, 'utf-8');
|
|
466
|
+
const r = spawnSync('bash', ['-n', scriptPath], { stdio: 'pipe', encoding: 'utf-8' });
|
|
467
|
+
expect(r.stderr).toBe('');
|
|
468
|
+
expect(r.status).toBe(0);
|
|
469
|
+
});
|
|
470
|
+
});
|
|
471
|
+
//# sourceMappingURL=worktree-link-repair.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"worktree-link-repair.test.js","sourceRoot":"","sources":["../../src/__tests__/worktree-link-repair.test.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAC5F,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC;AAC5B,OAAO,EAAE,0BAA0B,EAAE,iBAAiB,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAC/G,OAAO,EAAE,8BAA8B,EAAE,MAAM,qBAAqB,CAAC;AAErE,IAAI,OAAe,CAAC;AAEpB,SAAS,GAAG,CAAC,GAAW,EAAE,IAAc,EAAE,GAAW;IACnD,MAAM,CAAC,GAAG,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;IAC1E,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,GAAG,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,MAAM,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;IAChF,CAAC;AACH,CAAC;AAED,SAAS,kBAAkB,CAAC,GAAW;IACrC,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACpC,GAAG,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IAC/B,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,cAAc,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,GAAG,CAAC,CAAC;IACxE,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,YAAY,EAAE,kBAAkB,CAAC,EAAE,GAAG,CAAC,CAAC;IACzE,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC;IAC5D,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IAC3D,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;IAC1C,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC;AACvD,CAAC;AAED,0DAA0D;AAC1D,SAAS,UAAU,CAAC,YAAoB;IACtC,MAAM,CAAC,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IAC5F,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;AACxB,CAAC;AAED,UAAU,CAAC,GAAG,EAAE;IACd,OAAO,GAAG,IAAI,CAAC,MAAM,EAAE,EAAE,sBAAsB,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACpG,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;AAC1C,CAAC,CAAC,CAAC;AAEH,SAAS,CAAC,GAAG,EAAE;IACb,IAAI,CAAC;QAAC,MAAM,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAAC,CAAC;IAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC;AACnF,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;IAC1C,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;QAC3C,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACnC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACzB,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;QAC1C,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,EAAE,IAAI,CAAC,CAAC;QAEvE,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;QACvD,MAAM,MAAM,GAAG,0BAA0B,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAEpD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACtC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC7D,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8DAA8D,EAAE,GAAG,EAAE;QACtE,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACnC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACzB,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;QAC1C,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,EAAE,IAAI,CAAC,CAAC;QAEvE,0EAA0E;QAC1E,aAAa,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,yDAAyD,EAAE,OAAO,CAAC,CAAC;QACpG,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAEnC,MAAM,MAAM,GAAG,0BAA0B,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAEpD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACvC,MAAM,CAAC,MAAM,CAAC,MAAM,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9D,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;QACrE,wEAAwE;QACxE,wEAAwE;QACxE,iEAAiE;QACjE,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACnC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACzB,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;QAC1C,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,EAAE,IAAI,CAAC,CAAC;QAEvE,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;QACzE,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE3C,aAAa,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,yDAAyD,EAAE,OAAO,CAAC,CAAC;QACpG,aAAa,CAAC,WAAW,EAAE,0CAA0C,EAAE,OAAO,CAAC,CAAC;QAChF,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAEnC,MAAM,MAAM,GAAG,0BAA0B,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAEpD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACvC,8DAA8D;QAC9D,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC;QACvE,wEAAwE;QACxE,MAAM,CAAC,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC;QACzE,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sEAAsE,EAAE,GAAG,EAAE;QAC9E,kEAAkE;QAClE,sEAAsE;QACtE,yEAAyE;QACzE,uEAAuE;QACvE,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACnC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACzB,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC3C,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACzC,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC;QAE1E,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC9E,MAAM,YAAY,GAAG,YAAY,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;QAE9D,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACvC,SAAS,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACtC,aAAa,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,8CAA8C,EAAE,OAAO,CAAC,CAAC;QAE5F,MAAM,MAAM,GAAG,0BAA0B,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAEvD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACtC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACxC,kDAAkD;QAClD,MAAM,CAAC,YAAY,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACpE,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uEAAuE,EAAE,GAAG,EAAE;QAC/E,2EAA2E;QAC3E,4EAA4E;QAC5E,wDAAwD;QACxD,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACnC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACzB,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC3C,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACzC,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC;QAE1E,yEAAyE;QACzE,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC9E,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,4CAA4C,EAAE,OAAO,CAAC,CAAC;QAC3F,aAAa,CAAC,iBAAiB,EAAE,qCAAqC,EAAE,OAAO,CAAC,CAAC;QACjF,MAAM,YAAY,GAAG,YAAY,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;QAE9D,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACvC,SAAS,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACtC,aAAa,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,4CAA4C,EAAE,OAAO,CAAC,CAAC;QAE1F,MAAM,MAAM,GAAG,0BAA0B,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAEvD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACtC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACxC,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC7C,gEAAgE;QAChE,MAAM,CAAC,YAAY,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kEAAkE,EAAE,GAAG,EAAE;QAC1E,2EAA2E;QAC3E,0EAA0E;QAC1E,mCAAmC;QACnC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACnC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACzB,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC3C,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACzC,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC;QAE1E,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC9E,aAAa,CAAC,iBAAiB,EAAE,qCAAqC,EAAE,OAAO,CAAC,CAAC;QACjF,MAAM,YAAY,GAAG,YAAY,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;QAC9D,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAE9C,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACvC,SAAS,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACtC,aAAa,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,4CAA4C,EAAE,OAAO,CAAC,CAAC;QAE1F,MAAM,MAAM,GAAG,0BAA0B,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAEvD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACtC,MAAM,CAAC,YAAY,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qEAAqE,EAAE,GAAG,EAAE;QAC7E,uDAAuD;QACvD,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACnC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACzB,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC3C,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1C,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACpC,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC;QAErE,aAAa,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,2CAA2C,EAAE,OAAO,CAAC,CAAC;QACtF,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,oCAAoC,EAAE,OAAO,CAAC,CAAC;QACjH,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAEnC,MAAM,CAAC,0BAA0B,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACrE,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iEAAiE,EAAE,GAAG,EAAE;QACzE,2EAA2E;QAC3E,uCAAuC;QACvC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACnC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACzB,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC3C,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1C,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC1C,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC;QAE3E,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;QACjD,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC9B,aAAa,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,2CAA2C,EAAE,OAAO,CAAC,CAAC;QAC3F,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,oCAAoC,EAAE,OAAO,CAAC,CAAC;QAEjH,MAAM,MAAM,GAAG,0BAA0B,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEzD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACvC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oEAAoE,EAAE,GAAG,EAAE;QAC5E,4EAA4E;QAC5E,4EAA4E;QAC5E,0EAA0E;QAC1E,qEAAqE;QACrE,2BAA2B;QAC3B,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACnC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACzB,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC3C,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1C,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACpC,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC;QAErE,aAAa,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,2CAA2C,EAAE,OAAO,CAAC,CAAC;QACtF,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAEnF,MAAM,MAAM,GAAG,0BAA0B,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAEpD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC3C,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACvC,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;QAChF,0DAA0D;QAC1D,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;IACpG,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qEAAqE,EAAE,GAAG,EAAE;QAC7E,sEAAsE;QACtE,4EAA4E;QAC5E,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACnC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACzB,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC3C,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1C,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACpC,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC;QAErE,aAAa,CAAC,IAAI,CAAC,EAAE,EAAE,WAAW,CAAC,EAAE,sBAAsB,EAAE,OAAO,CAAC,CAAC;QACtE,aAAa,CAAC,IAAI,CAAC,EAAE,EAAE,aAAa,CAAC,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QAC/D,aAAa,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,2CAA2C,EAAE,OAAO,CAAC,CAAC;QACtF,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QACvD,MAAM,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAChD,MAAM,CAAC,0BAA0B,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAEzE,SAAS,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACtC,aAAa,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACvE,aAAa,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QAC5D,aAAa,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,yBAAyB,EAAE,OAAO,CAAC,CAAC;QACvE,aAAa,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,WAAW,KAAK,IAAI,EAAE,OAAO,CAAC,CAAC;QAC/D,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;QAChD,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;QAE/D,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClC,2EAA2E;QAC3E,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;QAC1G,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QAChD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;QAClD,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,EAAE,WAAW,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IAC/E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8DAA8D,EAAE,GAAG,EAAE;QACtE,wEAAwE;QACxE,wEAAwE;QACxE,uEAAuE;QACvE,yEAAyE;QACzE,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACnC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACzB,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC3C,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1C,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACpC,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC;QAErE,aAAa,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,2CAA2C,EAAE,OAAO,CAAC,CAAC;QACtF,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QACvD,MAAM,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAChD,SAAS,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAEtC,MAAM,MAAM,GAAG,0BAA0B,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAEpD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC3C,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,UAAU,EAAE,CAAC;QACxC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC3C,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;QAC3E,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACnC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACzB,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACrC,SAAS,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACtC,aAAa,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,oDAAoD,EAAE,OAAO,CAAC,CAAC;QAElG,MAAM,CAAC,0BAA0B,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACzE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;QACrE,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACnC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAEzB,MAAM,CAAC,0BAA0B,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC7E,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;QACrD,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACnC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACzB,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACrC,SAAS,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAEtC,MAAM,CAAC,0BAA0B,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAChF,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,2CAA2C,EAAE,GAAG,EAAE;IACzD,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACvE,2EAA2E;QAC3E,qEAAqE;QACrE,wEAAwE;QACxE,0EAA0E;QAC1E,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACnC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACzB,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC3C,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAE1C,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACzC,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACxC,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC;QAC1E,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC;QAEzE,uEAAuE;QACvE,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,2CAA2C,EAAE,OAAO,CAAC,CAAC;QAC1F,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,oCAAoC,EAAE,OAAO,CAAC,CAAC;QACjH,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAEvC,iBAAiB,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,gBAAgB,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QAE5E,mEAAmE;QACnE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxE,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;QAC/D,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACnC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACzB,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC3C,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1C,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QAC3C,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,CAAC,EAAE,IAAI,CAAC,CAAC;QAC5E,MAAM,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAEhD,iBAAiB,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,gBAAgB,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QAE5E,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC/E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gEAAgE,EAAE,GAAG,EAAE;QACxE,0EAA0E;QAC1E,oBAAoB;QACpB,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACnC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACzB,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC3C,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACzC,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC;QAE1E,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACvC,SAAS,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACtC,aAAa,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,4CAA4C,EAAE,OAAO,CAAC,CAAC;QAE1F,MAAM,OAAO,GAAG,0BAA0B,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAE5D,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACzC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;YACxC,IAAI,EAAE,OAAO;YACb,MAAM,EAAE,SAAS;YACjB,SAAS,EAAE,QAAQ;YACnB,gBAAgB,EAAE,MAAM;SACzB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACtD,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACnC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACzB,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC3C,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1C,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACpC,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC;QACrE,aAAa,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,2CAA2C,EAAE,OAAO,CAAC,CAAC;QACtF,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAEnF,MAAM,OAAO,GAAG,0BAA0B,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAE5D,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACrC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,aAAa,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC;IACtF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,GAAG,EAAE;QAChE,wEAAwE;QACxE,0DAA0D;QAC1D,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACnC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACzB,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC3C,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1C,KAAK,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC;YAC/C,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;YACjC,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;YAClE,aAAa,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,qCAAqC,IAAI,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1F,CAAC;QAED,sEAAsE;QACtE,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,MAAM,GAAG,GAAG,GAAW,EAAE;YACvB,KAAK,IAAI,CAAC,CAAC;YACX,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QACjC,CAAC,CAAC;QAEF,MAAM,OAAO,GAAG,0BAA0B,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;QAEvF,8EAA8E;QAC9E,wEAAwE;QACxE,8EAA8E;QAC9E,0EAA0E;QAC1E,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QAC5C,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qEAAqE,EAAE,GAAG,EAAE;QAC7E,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACnC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACzB,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC3C,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1C,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACpC,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC;QACrE,aAAa,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,2CAA2C,EAAE,OAAO,CAAC,CAAC;QAEtF,iFAAiF;QACjF,aAAa,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAC;QAC1E,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7D,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAE1D,MAAM,OAAO,GAAG,0BAA0B,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;QAEpF,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QAC5C,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACpC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uEAAuE,EAAE,GAAG,EAAE;QAC/E,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACnC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACzB,MAAM,CAAC,0BAA0B,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YACnE,QAAQ,EAAE,EAAE;YACZ,QAAQ,EAAE,EAAE;YACZ,OAAO,EAAE,EAAE;SACZ,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH;;;GAGG;AACH,SAAS,kBAAkB,CAAC,MAAc,EAAE,QAAgB;IAC1D,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACjC,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,6BAA6B,CAAC,CAAC,CAAC;IAClF,MAAM,CAAC,KAAK,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;IAClC,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACvC,MAAM,CAAC,GAAG,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;IACnC,OAAO,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC;AAC1F,CAAC;AAED,QAAQ,CAAC,gCAAgC,EAAE,GAAG,EAAE;IAC9C,EAAE,CAAC,6EAA6E,EAAE,GAAG,EAAE;QACrF,MAAM,MAAM,GAAG,8BAA8B,CAAC,MAAM,CAAC,CAAC;QACtD,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,uCAAuC,CAAC,CAAC;QAClE,wEAAwE;QACxE,2DAA2D;QAC3D,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,wCAAwC,CAAC,CAAC;QACnE,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,2BAA2B,CAAC,CAAC;QAC1D,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,0CAA0C,CAAC,CAAC;QACzE,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,4CAA4C,CAAC,CAAC;QACvE,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAC;QACtD,qEAAqE;QACrE,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QACzC,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;QAC3C,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,0BAA0B,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sEAAsE,EAAE,GAAG,EAAE;QAC9E,2EAA2E;QAC3E,oEAAoE;QACpE,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACnC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACzB,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC3C,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1C,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACvC,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC;QAExE,6DAA6D;QAC7D,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC5E,aAAa,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,2CAA2C,EAAE,OAAO,CAAC,CAAC;QACzF,aAAa,CAAC,gBAAgB,EAAE,oCAAoC,EAAE,OAAO,CAAC,CAAC;QAC/E,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAEtC,4EAA4E;QAC5E,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACvC,SAAS,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACtC,aAAa,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,2CAA2C,EAAE,OAAO,CAAC,CAAC;QACzF,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAElE,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;QACnD,aAAa,CAAC,SAAS,EAAE,kBAAkB,CAAC,8BAA8B,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;QACpG,MAAM,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;QAE1F,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACzB,mCAAmC;QACnC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrC,oEAAoE;QACpE,MAAM,CAAC,YAAY,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;IACnF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACvD,MAAM,MAAM,GAAG,8BAA8B,CAAC,MAAM,CAAC,CAAC;QACtD,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;QACnD,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAC3C,MAAM,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;QACtF,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC1B,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AA6BH;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,8BAA8B,UAG1C,CAAC;AACF,eAAO,MAAM,2BAA2B,aAEtC,CAAC;AAEH;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAK3D;AA4BD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAgFjG;AA4FD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAsC5E;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,gEAAgE;IAChE,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,6FAA6F;IAC7F,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,kGAAkG;IAClG,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAID,wBAAsB,QAAQ,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA8uBnE"}
|
package/dist/commands/start.js
CHANGED
|
@@ -9,7 +9,7 @@ import chalk from 'chalk';
|
|
|
9
9
|
import { createRequire } from 'module';
|
|
10
10
|
import { dirname, join } from 'path';
|
|
11
11
|
import { fileURLToPath } from 'url';
|
|
12
|
-
import { findProjectRoot, findWorktreePath, getSlot, getCurrentBranch, } from '../lib/worktree.js';
|
|
12
|
+
import { findProjectRoot, findWorktreePath, getSlot, getCurrentBranch, repairWorktreeLinkIfBroken, } from '../lib/worktree.js';
|
|
13
13
|
import { syncClaudeConfig, deployBaseHooks, deployClaudeMd, writeClaudeLocal, launchClaudeSession, checkPriorSyncFailure, verifyAndHealHooks, logSuccess, logDim, logWarning } from '../lib/claude.js';
|
|
14
14
|
import { launchAgentSession } from '../lib/agent-session.js';
|
|
15
15
|
import { getTeam } from '../lib/catalog.js';
|
|
@@ -391,6 +391,81 @@ export async function runStart(options) {
|
|
|
391
391
|
startupReport.finalize('refused');
|
|
392
392
|
process.exit(1);
|
|
393
393
|
}
|
|
394
|
+
// ── 1b. Repair a broken worktree git link (#4484) ──────────────────
|
|
395
|
+
// Worktrees provisioned on the host record absolute host paths. When the repo
|
|
396
|
+
// is mounted elsewhere (devcontainer at /workspace) those paths are gone and
|
|
397
|
+
// every git op in the worktree fails. Detect and repair before we run any.
|
|
398
|
+
const linkRepair = repairWorktreeLinkIfBroken(projectRoot, worktreePath);
|
|
399
|
+
if (linkRepair.status === 'repaired') {
|
|
400
|
+
logWarning('Worktree git link pointed to a missing path — repaired');
|
|
401
|
+
}
|
|
402
|
+
else if (linkRepair.status === 'refused' ||
|
|
403
|
+
linkRepair.status === 'unregistered' ||
|
|
404
|
+
linkRepair.status === 'still-broken') {
|
|
405
|
+
// Launching here would drop the session into a worktree where every git
|
|
406
|
+
// operation fails, and this error would be buried under later fail-open
|
|
407
|
+
// warnings. Stop, same as the "team not found" path above.
|
|
408
|
+
// These strings come from on-disk link files — strip control chars and cap
|
|
409
|
+
// the length so they cannot forge terminal output.
|
|
410
|
+
const safe = (s) => (s ?? 'unknown').replace(/[\x00-\x1f\x7f]/g, '?').slice(0, 200);
|
|
411
|
+
// Anything that lands inside a command line the operator may paste into a
|
|
412
|
+
// shell must be single-quoted. safe() strips control characters, not shell
|
|
413
|
+
// metacharacters, and a worktree directory name is attacker-controllable
|
|
414
|
+
// (findWorktreePath prefix-matches whatever sits under .worktrees/).
|
|
415
|
+
const shq = (s) => `'${s.replace(/'/g, "'\\''")}'`;
|
|
416
|
+
const { resolve: resolvePath, basename: baseName } = await import('path');
|
|
417
|
+
const wtName = baseName(resolvePath(worktreePath));
|
|
418
|
+
if (!/^[A-Za-z0-9._-]+$/.test(wtName)) {
|
|
419
|
+
console.error(chalk.red('Worktree directory name contains unexpected characters — refusing to print recovery commands.'));
|
|
420
|
+
// Show the path for diagnosis, but replace every character that could
|
|
421
|
+
// mean something to a shell — this line must not become copy-pasteable
|
|
422
|
+
// into a command by accident.
|
|
423
|
+
console.error(chalk.dim(` path: ${safe(worktreePath).replace(/[^A-Za-z0-9._/-]/g, '?')}`));
|
|
424
|
+
console.error(chalk.dim(' Inspect this directory by hand; it was not created by mx-agent.'));
|
|
425
|
+
startupReport.finalize('refused');
|
|
426
|
+
process.exit(1);
|
|
427
|
+
}
|
|
428
|
+
if (linkRepair.status === 'refused') {
|
|
429
|
+
// Deliberately no `worktree repair` command here — running it is exactly
|
|
430
|
+
// the operation that was blocked, and it would rewrite the owner's entry.
|
|
431
|
+
console.error(chalk.red('Worktree git link is broken and was NOT repaired: it claims another worktree\'s identity.'));
|
|
432
|
+
console.error(chalk.dim(` gitdir target: ${safe(linkRepair.gitdir)}`));
|
|
433
|
+
console.error(chalk.dim(` claimed worktree id: ${safe(linkRepair.claimedId)}`));
|
|
434
|
+
if (linkRepair.conflictingOwner) {
|
|
435
|
+
console.error(chalk.dim(` that id already belongs to: ${safe(linkRepair.conflictingOwner)}`));
|
|
436
|
+
}
|
|
437
|
+
console.error(chalk.dim(` Inspect ${shq(`${worktreePath}/.git`)} by hand; remove the directory if it is not a real worktree.`));
|
|
438
|
+
}
|
|
439
|
+
else if (linkRepair.status === 'unregistered') {
|
|
440
|
+
// git dropped the admin entry (prune/auto-gc removes entries whose .git
|
|
441
|
+
// file does not resolve — the state every host-provisioned worktree is in
|
|
442
|
+
// inside a container). `git worktree repair` cannot help, and
|
|
443
|
+
// `git worktree add` refuses an existing directory, so the only recovery
|
|
444
|
+
// is to rebuild the entry. Steps below are verified end-to-end and leave
|
|
445
|
+
// the worktree's files, including uncommitted work, untouched.
|
|
446
|
+
const entry = safe(linkRepair.missingAdminEntry);
|
|
447
|
+
console.error(chalk.red('Worktree is not registered with this repository — `git worktree repair` cannot fix it.'));
|
|
448
|
+
console.error(chalk.dim(` worktree id: ${safe(linkRepair.claimedId)}`));
|
|
449
|
+
console.error(chalk.dim(` missing admin entry: ${entry}`));
|
|
450
|
+
console.error(chalk.dim(' git pruned it because the link was already broken. Re-register it by hand:'));
|
|
451
|
+
console.error(chalk.dim(` BR=<branch> # list candidates: git -C ${shq(projectRoot)} branch --list 'worktree/*'`));
|
|
452
|
+
console.error(chalk.dim(` mkdir -p ${shq(entry)}`));
|
|
453
|
+
console.error(chalk.dim(` printf '%s\\n' ${shq(`${worktreePath}/.git`)} > ${shq(`${entry}/gitdir`)}`));
|
|
454
|
+
console.error(chalk.dim(` printf '../..\\n' > ${shq(`${entry}/commondir`)}`));
|
|
455
|
+
console.error(chalk.dim(` printf 'ref: refs/heads/%s\\n' "$BR" > ${shq(`${entry}/HEAD`)}`));
|
|
456
|
+
console.error(chalk.dim(` printf 'gitdir: %s\\n' ${shq(entry)} > ${shq(`${worktreePath}/.git`)}`));
|
|
457
|
+
console.error(chalk.dim(` git -C ${shq(worktreePath)} read-tree HEAD # rebuild the index; no working-tree changes`));
|
|
458
|
+
console.error(chalk.dim(` git -C ${shq(projectRoot)} worktree repair -- ${shq(worktreePath)}`));
|
|
459
|
+
}
|
|
460
|
+
else {
|
|
461
|
+
console.error(chalk.red('Worktree git link is broken and could not be repaired automatically.'));
|
|
462
|
+
console.error(chalk.dim(` gitdir target does not exist: ${safe(linkRepair.gitdir)}`));
|
|
463
|
+
console.error(chalk.dim(` git said: ${safe(linkRepair.repairError)}`));
|
|
464
|
+
console.error(chalk.dim(` Run: git -C ${shq(projectRoot)} worktree repair -- ${shq(worktreePath)}`));
|
|
465
|
+
}
|
|
466
|
+
startupReport.finalize('refused');
|
|
467
|
+
process.exit(1);
|
|
468
|
+
}
|
|
394
469
|
// ── 2. Resolve slot ────────────────────────────────────────────────
|
|
395
470
|
// The slot key in .slots.json may be the full dir name (e.g. "retrieval-20260222")
|
|
396
471
|
// or just the team slug. Try both.
|