@agentteams/runner 0.0.84 → 0.0.85-dev.211
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/api-client.d.ts +2 -2
- package/dist/api-client.js +66 -66
- package/dist/api-client.js.map +1 -1
- package/dist/api-client.test.js +63 -54
- package/dist/api-client.test.js.map +1 -1
- package/dist/autostart.js +81 -81
- package/dist/autostart.js.map +1 -1
- package/dist/autostart.test.js +35 -35
- package/dist/autostart.test.js.map +1 -1
- package/dist/commands/cleanup.js +4 -4
- package/dist/commands/init.js +14 -14
- package/dist/commands/restart.js +3 -3
- package/dist/commands/start.js +10 -10
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/status.js +7 -7
- package/dist/commands/stop.js +7 -7
- package/dist/commands/uninstall.js +6 -6
- package/dist/commands/update.d.ts +4 -4
- package/dist/commands/update.js +20 -22
- package/dist/commands/update.js.map +1 -1
- package/dist/commands/update.test.js +38 -42
- package/dist/commands/update.test.js.map +1 -1
- package/dist/config.d.ts +1 -1
- package/dist/config.js +12 -12
- package/dist/config.test.js +61 -61
- package/dist/config.test.js.map +1 -1
- package/dist/daemon-control.d.ts +5 -5
- package/dist/daemon-control.js +21 -22
- package/dist/daemon-control.js.map +1 -1
- package/dist/daemon-control.test.js +29 -29
- package/dist/executable.d.ts +3 -3
- package/dist/executable.js +46 -49
- package/dist/executable.js.map +1 -1
- package/dist/executable.test.js +62 -62
- package/dist/executable.test.js.map +1 -1
- package/dist/handlers/trigger-handler.d.ts +6 -6
- package/dist/handlers/trigger-handler.js +172 -134
- package/dist/handlers/trigger-handler.js.map +1 -1
- package/dist/handlers/trigger-handler.test.js +442 -328
- package/dist/handlers/trigger-handler.test.js.map +1 -1
- package/dist/index.js +25 -25
- package/dist/logger.js +1 -1
- package/dist/pid.js +6 -6
- package/dist/poller.d.ts +7 -7
- package/dist/poller.js +55 -54
- package/dist/poller.js.map +1 -1
- package/dist/poller.test.js +264 -180
- package/dist/poller.test.js.map +1 -1
- package/dist/runners/amp.d.ts +1 -1
- package/dist/runners/amp.js +74 -81
- package/dist/runners/amp.js.map +1 -1
- package/dist/runners/antigravity.d.ts +3 -3
- package/dist/runners/antigravity.js +116 -127
- package/dist/runners/antigravity.js.map +1 -1
- package/dist/runners/antigravity.replay.test.js +25 -25
- package/dist/runners/antigravity.replay.test.js.map +1 -1
- package/dist/runners/antigravity.test.js +98 -98
- package/dist/runners/antigravity.test.js.map +1 -1
- package/dist/runners/claude-code.d.ts +1 -1
- package/dist/runners/claude-code.js +85 -84
- package/dist/runners/claude-code.js.map +1 -1
- package/dist/runners/claude-code.test.js +37 -40
- package/dist/runners/claude-code.test.js.map +1 -1
- package/dist/runners/codex.d.ts +1 -1
- package/dist/runners/codex.js +87 -96
- package/dist/runners/codex.js.map +1 -1
- package/dist/runners/codex.test.js +68 -68
- package/dist/runners/codex.test.js.map +1 -1
- package/dist/runners/index.d.ts +1 -1
- package/dist/runners/index.js +10 -10
- package/dist/runners/index.test.js +16 -16
- package/dist/runners/log-reporter.d.ts +2 -2
- package/dist/runners/log-reporter.js +12 -10
- package/dist/runners/log-reporter.js.map +1 -1
- package/dist/runners/log-reporter.test.js +70 -70
- package/dist/runners/log-reporter.test.js.map +1 -1
- package/dist/runners/opencode.d.ts +1 -1
- package/dist/runners/opencode.js +68 -75
- package/dist/runners/opencode.js.map +1 -1
- package/dist/runners/process-control.d.ts +1 -1
- package/dist/runners/process-control.js +13 -11
- package/dist/runners/process-control.js.map +1 -1
- package/dist/runners/stream-json-parser.d.ts +1 -1
- package/dist/runners/stream-json-parser.js +70 -67
- package/dist/runners/stream-json-parser.js.map +1 -1
- package/dist/runners/stream-json-parser.replay.test.js +17 -17
- package/dist/runners/stream-json-parser.replay.test.js.map +1 -1
- package/dist/runners/stream-json-parser.test.js +76 -78
- package/dist/runners/stream-json-parser.test.js.map +1 -1
- package/dist/types.d.ts +4 -4
- package/dist/utils/auth-path-store.js +7 -7
- package/dist/utils/auth-path-store.test.js +24 -29
- package/dist/utils/auth-path-store.test.js.map +1 -1
- package/dist/utils/auto-update.d.ts +4 -4
- package/dist/utils/auto-update.js +30 -28
- package/dist/utils/auto-update.js.map +1 -1
- package/dist/utils/auto-update.test.js +30 -30
- package/dist/utils/convention-evaluator.d.ts +1 -1
- package/dist/utils/convention-evaluator.js +22 -21
- package/dist/utils/convention-evaluator.js.map +1 -1
- package/dist/utils/convention-evaluator.test.js +120 -110
- package/dist/utils/convention-evaluator.test.js.map +1 -1
- package/dist/utils/convention-sync.d.ts +3 -3
- package/dist/utils/convention-sync.js +86 -18
- package/dist/utils/convention-sync.js.map +1 -1
- package/dist/utils/convention-sync.test.js +126 -30
- package/dist/utils/convention-sync.test.js.map +1 -1
- package/dist/utils/git-worktree.js +20 -18
- package/dist/utils/git-worktree.js.map +1 -1
- package/dist/utils/git-worktree.test.js +98 -98
- package/dist/utils/git-worktree.test.js.map +1 -1
- package/dist/utils/origin-issue-safeguard.js +35 -30
- package/dist/utils/origin-issue-safeguard.js.map +1 -1
- package/dist/utils/power-save-blocker.d.ts +4 -4
- package/dist/utils/power-save-blocker.js +33 -33
- package/dist/utils/power-save-blocker.test.js +37 -37
- package/dist/utils/power-save-blocker.test.js.map +1 -1
- package/dist/utils/runner-cleanup.d.ts +3 -3
- package/dist/utils/runner-cleanup.js +13 -13
- package/dist/utils/runner-cleanup.test.js +35 -35
- package/dist/utils/runner-history.js +3 -3
- package/dist/utils/runner-history.test.js +17 -17
- package/package.json +9 -2
- package/readme.md +10 -10
|
@@ -1,16 +1,25 @@
|
|
|
1
|
-
import assert from
|
|
2
|
-
import test, { mock } from
|
|
3
|
-
import { EventEmitter } from
|
|
4
|
-
import { runConventionSync } from
|
|
5
|
-
const createFakeSpawn = (
|
|
6
|
-
return (
|
|
1
|
+
import assert from 'node:assert/strict';
|
|
2
|
+
import test, { mock } from 'node:test';
|
|
3
|
+
import { EventEmitter } from 'node:events';
|
|
4
|
+
import { runConventionSync } from './convention-sync.js';
|
|
5
|
+
const createFakeSpawn = (responses, calls = []) => {
|
|
6
|
+
return (cmd, args, opts) => {
|
|
7
|
+
calls.push({ cmd, args, opts });
|
|
8
|
+
const response = responses.shift() ?? { exitCode: 0 };
|
|
7
9
|
const child = new EventEmitter();
|
|
10
|
+
const stdout = new EventEmitter();
|
|
11
|
+
const stderr = new EventEmitter();
|
|
12
|
+
Object.assign(child, { stdout, stderr });
|
|
8
13
|
process.nextTick(() => {
|
|
9
|
-
if (error) {
|
|
10
|
-
child.emit(
|
|
14
|
+
if (response.error) {
|
|
15
|
+
child.emit('error', response.error);
|
|
11
16
|
}
|
|
12
17
|
else {
|
|
13
|
-
|
|
18
|
+
if (response.stdout)
|
|
19
|
+
stdout.emit('data', response.stdout);
|
|
20
|
+
if (response.stderr)
|
|
21
|
+
stderr.emit('data', response.stderr);
|
|
22
|
+
child.emit('close', response.exitCode);
|
|
14
23
|
}
|
|
15
24
|
});
|
|
16
25
|
return child;
|
|
@@ -19,55 +28,142 @@ const createFakeSpawn = (exitCode, error) => {
|
|
|
19
28
|
test.afterEach(() => {
|
|
20
29
|
mock.restoreAll();
|
|
21
30
|
});
|
|
22
|
-
test(
|
|
31
|
+
test('runConventionSync skips download when status reports no update', async () => {
|
|
23
32
|
const logs = [];
|
|
33
|
+
const calls = [];
|
|
24
34
|
const fakeLogger = {
|
|
25
|
-
info: (message, meta) => {
|
|
26
|
-
|
|
35
|
+
info: (message, meta) => {
|
|
36
|
+
logs.push({ level: 'info', message, meta });
|
|
37
|
+
},
|
|
38
|
+
warn: (message, meta) => {
|
|
39
|
+
logs.push({ level: 'warn', message, meta });
|
|
40
|
+
},
|
|
27
41
|
};
|
|
28
|
-
await runConventionSync(
|
|
29
|
-
|
|
42
|
+
await runConventionSync('/fake/path', {
|
|
43
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
44
|
+
spawn: createFakeSpawn([{ exitCode: 0, stdout: JSON.stringify({ updateAvailable: false }) }], calls),
|
|
30
45
|
logger: fakeLogger,
|
|
31
46
|
});
|
|
47
|
+
assert.deepEqual(calls.map((call) => call.args), [['convention', 'status']]);
|
|
32
48
|
assert.equal(logs.length, 1);
|
|
33
|
-
assert.equal(logs[0].level,
|
|
49
|
+
assert.equal(logs[0].level, 'info');
|
|
50
|
+
assert.match(logs[0].message, /up to date/i);
|
|
51
|
+
});
|
|
52
|
+
test('runConventionSync downloads when status reports an update', async () => {
|
|
53
|
+
const logs = [];
|
|
54
|
+
const calls = [];
|
|
55
|
+
const fakeLogger = {
|
|
56
|
+
info: (message, meta) => {
|
|
57
|
+
logs.push({ level: 'info', message, meta });
|
|
58
|
+
},
|
|
59
|
+
warn: (message, meta) => {
|
|
60
|
+
logs.push({ level: 'warn', message, meta });
|
|
61
|
+
},
|
|
62
|
+
};
|
|
63
|
+
await runConventionSync('/fake/path', {
|
|
64
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
65
|
+
spawn: createFakeSpawn([{ exitCode: 0, stdout: JSON.stringify({ updateAvailable: true }) }, { exitCode: 0 }], calls),
|
|
66
|
+
logger: fakeLogger,
|
|
67
|
+
});
|
|
68
|
+
assert.deepEqual(calls.map((call) => call.args), [
|
|
69
|
+
['convention', 'status'],
|
|
70
|
+
['convention', 'download'],
|
|
71
|
+
]);
|
|
72
|
+
assert.equal(logs.length, 1);
|
|
73
|
+
assert.equal(logs[0].level, 'info');
|
|
34
74
|
assert.match(logs[0].message, /completed/i);
|
|
35
75
|
});
|
|
36
|
-
test(
|
|
76
|
+
test('runConventionSync logs warn when status exits non-zero', async () => {
|
|
77
|
+
const logs = [];
|
|
78
|
+
const calls = [];
|
|
79
|
+
const fakeLogger = {
|
|
80
|
+
info: (message, meta) => {
|
|
81
|
+
logs.push({ level: 'info', message, meta });
|
|
82
|
+
},
|
|
83
|
+
warn: (message, meta) => {
|
|
84
|
+
logs.push({ level: 'warn', message, meta });
|
|
85
|
+
},
|
|
86
|
+
};
|
|
87
|
+
await runConventionSync('/fake/path', {
|
|
88
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
89
|
+
spawn: createFakeSpawn([{ exitCode: 1, stderr: 'not configured' }], calls),
|
|
90
|
+
logger: fakeLogger,
|
|
91
|
+
});
|
|
92
|
+
assert.deepEqual(calls.map((call) => call.args), [['convention', 'status']]);
|
|
93
|
+
assert.equal(logs.length, 1);
|
|
94
|
+
assert.equal(logs[0].level, 'warn');
|
|
95
|
+
assert.match(logs[0].message, /status.*non-zero/i);
|
|
96
|
+
});
|
|
97
|
+
test('runConventionSync logs warn when status returns invalid JSON', async () => {
|
|
37
98
|
const logs = [];
|
|
38
99
|
const fakeLogger = {
|
|
39
|
-
info: (message, meta) => {
|
|
40
|
-
|
|
100
|
+
info: (message, meta) => {
|
|
101
|
+
logs.push({ level: 'info', message, meta });
|
|
102
|
+
},
|
|
103
|
+
warn: (message, meta) => {
|
|
104
|
+
logs.push({ level: 'warn', message, meta });
|
|
105
|
+
},
|
|
41
106
|
};
|
|
42
|
-
await runConventionSync(
|
|
43
|
-
|
|
107
|
+
await runConventionSync('/fake/path', {
|
|
108
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
109
|
+
spawn: createFakeSpawn([{ exitCode: 0, stdout: 'not-json' }]),
|
|
44
110
|
logger: fakeLogger,
|
|
45
111
|
});
|
|
46
112
|
assert.equal(logs.length, 1);
|
|
47
|
-
assert.equal(logs[0].level,
|
|
113
|
+
assert.equal(logs[0].level, 'warn');
|
|
114
|
+
assert.match(logs[0].message, /invalid JSON/i);
|
|
115
|
+
});
|
|
116
|
+
test('runConventionSync logs warn when download exits non-zero', async () => {
|
|
117
|
+
const logs = [];
|
|
118
|
+
const fakeLogger = {
|
|
119
|
+
info: (message, meta) => {
|
|
120
|
+
logs.push({ level: 'info', message, meta });
|
|
121
|
+
},
|
|
122
|
+
warn: (message, meta) => {
|
|
123
|
+
logs.push({ level: 'warn', message, meta });
|
|
124
|
+
},
|
|
125
|
+
};
|
|
126
|
+
await runConventionSync('/fake/path', {
|
|
127
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
128
|
+
spawn: createFakeSpawn([
|
|
129
|
+
{ exitCode: 0, stdout: JSON.stringify({ updateAvailable: true }) },
|
|
130
|
+
{ exitCode: 1, stderr: 'download failed' },
|
|
131
|
+
]),
|
|
132
|
+
logger: fakeLogger,
|
|
133
|
+
});
|
|
134
|
+
assert.equal(logs.length, 1);
|
|
135
|
+
assert.equal(logs[0].level, 'warn');
|
|
48
136
|
assert.match(logs[0].message, /non-zero/i);
|
|
49
137
|
});
|
|
50
|
-
test(
|
|
138
|
+
test('runConventionSync logs warn on spawn error', async () => {
|
|
51
139
|
const logs = [];
|
|
52
140
|
const fakeLogger = {
|
|
53
|
-
info: (message, meta) => {
|
|
54
|
-
|
|
141
|
+
info: (message, meta) => {
|
|
142
|
+
logs.push({ level: 'info', message, meta });
|
|
143
|
+
},
|
|
144
|
+
warn: (message, meta) => {
|
|
145
|
+
logs.push({ level: 'warn', message, meta });
|
|
146
|
+
},
|
|
55
147
|
};
|
|
56
|
-
await runConventionSync(
|
|
57
|
-
|
|
148
|
+
await runConventionSync('/fake/path', {
|
|
149
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
150
|
+
spawn: createFakeSpawn([{ exitCode: null, error: new Error('ENOENT') }]),
|
|
58
151
|
logger: fakeLogger,
|
|
59
152
|
});
|
|
60
153
|
assert.equal(logs.length, 1);
|
|
61
|
-
assert.equal(logs[0].level,
|
|
154
|
+
assert.equal(logs[0].level, 'warn');
|
|
62
155
|
assert.match(logs[0].message, /spawn error/i);
|
|
63
156
|
});
|
|
64
|
-
test(
|
|
157
|
+
test('runConventionSync never throws', async () => {
|
|
65
158
|
const fakeLogger = {
|
|
66
159
|
info: () => { },
|
|
67
160
|
warn: () => { },
|
|
68
161
|
};
|
|
69
|
-
const throwingSpawn = () => {
|
|
70
|
-
|
|
162
|
+
const throwingSpawn = () => {
|
|
163
|
+
throw new Error('unexpected');
|
|
164
|
+
};
|
|
165
|
+
await assert.doesNotReject(runConventionSync('/fake/path', {
|
|
166
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
71
167
|
spawn: throwingSpawn,
|
|
72
168
|
logger: fakeLogger,
|
|
73
169
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convention-sync.test.js","sourceRoot":"","sources":["../../src/utils/convention-sync.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEvC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"convention-sync.test.js","sourceRoot":"","sources":["../../src/utils/convention-sync.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEvC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAezD,MAAM,eAAe,GAAG,CAAC,SAA8B,EAAE,QAAyB,EAAE,EAAE,EAAE;IACtF,OAAO,CAAC,GAAW,EAAE,IAAc,EAAE,IAAY,EAAgB,EAAE;QACjE,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAChC,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;QACtD,MAAM,KAAK,GAAG,IAAI,YAAY,EAAkB,CAAC;QACjD,MAAM,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;QAClC,MAAM,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;QAClC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QACzC,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE;YACpB,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;gBACnB,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;YACtC,CAAC;iBAAM,CAAC;gBACN,IAAI,QAAQ,CAAC,MAAM;oBAAE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;gBAC1D,IAAI,QAAQ,CAAC,MAAM;oBAAE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;gBAC1D,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACzC,CAAC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE;IAClB,IAAI,CAAC,UAAU,EAAE,CAAC;AACpB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,gEAAgE,EAAE,KAAK,IAAI,EAAE;IAChF,MAAM,IAAI,GAA6D,EAAE,CAAC;IAC1E,MAAM,KAAK,GAAoB,EAAE,CAAC;IAClC,MAAM,UAAU,GAAG;QACjB,IAAI,EAAE,CAAC,OAAe,EAAE,IAAa,EAAE,EAAE;YACvC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9C,CAAC;QACD,IAAI,EAAE,CAAC,OAAe,EAAE,IAAa,EAAE,EAAE;YACvC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9C,CAAC;KACF,CAAC;IAEF,MAAM,iBAAiB,CAAC,YAAY,EAAE;QACpC,8DAA8D;QAC9D,KAAK,EAAE,eAAe,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,CAAQ;QAC3G,MAAM,EAAE,UAAU;KACnB,CAAC,CAAC;IAEH,MAAM,CAAC,SAAS,CACd,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAC9B,CAAC,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,CAC3B,CAAC;IACF,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAC7B,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACrC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;AAChD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;IAC3E,MAAM,IAAI,GAA6D,EAAE,CAAC;IAC1E,MAAM,KAAK,GAAoB,EAAE,CAAC;IAClC,MAAM,UAAU,GAAG;QACjB,IAAI,EAAE,CAAC,OAAe,EAAE,IAAa,EAAE,EAAE;YACvC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9C,CAAC;QACD,IAAI,EAAE,CAAC,OAAe,EAAE,IAAa,EAAE,EAAE;YACvC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9C,CAAC;KACF,CAAC;IAEF,MAAM,iBAAiB,CAAC,YAAY,EAAE;QACpC,8DAA8D;QAC9D,KAAK,EAAE,eAAe,CACpB,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,EACrF,KAAK,CACC;QACR,MAAM,EAAE,UAAU;KACnB,CAAC,CAAC;IAEH,MAAM,CAAC,SAAS,CACd,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAC9B;QACE,CAAC,YAAY,EAAE,QAAQ,CAAC;QACxB,CAAC,YAAY,EAAE,UAAU,CAAC;KAC3B,CACF,CAAC;IACF,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAC7B,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACrC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;AAC/C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;IACxE,MAAM,IAAI,GAA6D,EAAE,CAAC;IAC1E,MAAM,KAAK,GAAoB,EAAE,CAAC;IAClC,MAAM,UAAU,GAAG;QACjB,IAAI,EAAE,CAAC,OAAe,EAAE,IAAa,EAAE,EAAE;YACvC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9C,CAAC;QACD,IAAI,EAAE,CAAC,OAAe,EAAE,IAAa,EAAE,EAAE;YACvC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9C,CAAC;KACF,CAAC;IAEF,MAAM,iBAAiB,CAAC,YAAY,EAAE;QACpC,8DAA8D;QAC9D,KAAK,EAAE,eAAe,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,EAAE,KAAK,CAAQ;QACjF,MAAM,EAAE,UAAU;KACnB,CAAC,CAAC;IAEH,MAAM,CAAC,SAAS,CACd,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAC9B,CAAC,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,CAC3B,CAAC;IACF,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAC7B,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACrC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;AACtD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,8DAA8D,EAAE,KAAK,IAAI,EAAE;IAC9E,MAAM,IAAI,GAA6D,EAAE,CAAC;IAC1E,MAAM,UAAU,GAAG;QACjB,IAAI,EAAE,CAAC,OAAe,EAAE,IAAa,EAAE,EAAE;YACvC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9C,CAAC;QACD,IAAI,EAAE,CAAC,OAAe,EAAE,IAAa,EAAE,EAAE;YACvC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9C,CAAC;KACF,CAAC;IAEF,MAAM,iBAAiB,CAAC,YAAY,EAAE;QACpC,8DAA8D;QAC9D,KAAK,EAAE,eAAe,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAQ;QACpE,MAAM,EAAE,UAAU;KACnB,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAC7B,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACrC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;AAClD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;IAC1E,MAAM,IAAI,GAA6D,EAAE,CAAC;IAC1E,MAAM,UAAU,GAAG;QACjB,IAAI,EAAE,CAAC,OAAe,EAAE,IAAa,EAAE,EAAE;YACvC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9C,CAAC;QACD,IAAI,EAAE,CAAC,OAAe,EAAE,IAAa,EAAE,EAAE;YACvC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9C,CAAC;KACF,CAAC;IAEF,MAAM,iBAAiB,CAAC,YAAY,EAAE;QACpC,8DAA8D;QAC9D,KAAK,EAAE,eAAe,CAAC;YACrB,EAAE,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,EAAE;YAClE,EAAE,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,iBAAiB,EAAE;SAC3C,CAAQ;QACT,MAAM,EAAE,UAAU;KACnB,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAC7B,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACrC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;AAC9C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;IAC5D,MAAM,IAAI,GAA6D,EAAE,CAAC;IAC1E,MAAM,UAAU,GAAG;QACjB,IAAI,EAAE,CAAC,OAAe,EAAE,IAAa,EAAE,EAAE;YACvC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9C,CAAC;QACD,IAAI,EAAE,CAAC,OAAe,EAAE,IAAa,EAAE,EAAE;YACvC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9C,CAAC;KACF,CAAC;IAEF,MAAM,iBAAiB,CAAC,YAAY,EAAE;QACpC,8DAA8D;QAC9D,KAAK,EAAE,eAAe,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAQ;QAC/E,MAAM,EAAE,UAAU;KACnB,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAC7B,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACrC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;AACjD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;IAChD,MAAM,UAAU,GAAG;QACjB,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;QACd,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;KACf,CAAC;IAEF,MAAM,aAAa,GAAG,GAAG,EAAE;QACzB,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;IAChC,CAAC,CAAC;IAEF,MAAM,MAAM,CAAC,aAAa,CACxB,iBAAiB,CAAC,YAAY,EAAE;QAC9B,8DAA8D;QAC9D,KAAK,EAAE,aAAoB;QAC3B,MAAM,EAAE,UAAU;KACnB,CAAC,CACH,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
|
-
import { execFileSync } from
|
|
2
|
-
import { copyFileSync, existsSync, mkdirSync, readdirSync, rmSync, symlinkSync } from
|
|
3
|
-
import path from
|
|
1
|
+
import { execFileSync } from 'node:child_process';
|
|
2
|
+
import { copyFileSync, existsSync, mkdirSync, readdirSync, rmSync, symlinkSync } from 'node:fs';
|
|
3
|
+
import path from 'node:path';
|
|
4
4
|
// 모든 git 호출은 이 헬퍼를 통해 실행해야 한다. windowsHide 누락 시 Windows에서
|
|
5
5
|
// 콘솔 미부착 부모(데몬) 프로세스가 git.exe를 띄울 때 콘솔 창이 잠깐 노출된다.
|
|
6
6
|
function runGit(args, cwd) {
|
|
7
|
-
return execFileSync(
|
|
7
|
+
return execFileSync('git', args, { cwd, stdio: 'pipe', windowsHide: true });
|
|
8
8
|
}
|
|
9
9
|
export function isGitRepo(dirPath) {
|
|
10
10
|
try {
|
|
11
|
-
runGit([
|
|
11
|
+
runGit(['rev-parse', '--is-inside-work-tree'], dirPath);
|
|
12
12
|
return true;
|
|
13
13
|
}
|
|
14
14
|
catch {
|
|
@@ -27,11 +27,11 @@ export function normalizeClaudeSandboxPath(authPath) {
|
|
|
27
27
|
}
|
|
28
28
|
export function healWorktreeConfig(authPath, worktreePath) {
|
|
29
29
|
// Ensure .agentteams/ symlink exists
|
|
30
|
-
const sourceAgentteams = path.join(authPath,
|
|
31
|
-
const targetAgentteams = path.join(worktreePath,
|
|
30
|
+
const sourceAgentteams = path.join(authPath, '.agentteams');
|
|
31
|
+
const targetAgentteams = path.join(worktreePath, '.agentteams');
|
|
32
32
|
if (existsSync(sourceAgentteams) && !existsSync(targetAgentteams)) {
|
|
33
33
|
try {
|
|
34
|
-
symlinkSync(sourceAgentteams, targetAgentteams,
|
|
34
|
+
symlinkSync(sourceAgentteams, targetAgentteams, 'dir');
|
|
35
35
|
}
|
|
36
36
|
catch {
|
|
37
37
|
// Non-critical: agent can still work without conventions
|
|
@@ -57,7 +57,7 @@ export function createWorktree(authPath, options) {
|
|
|
57
57
|
mkdirSync(parentDir, { recursive: true });
|
|
58
58
|
}
|
|
59
59
|
try {
|
|
60
|
-
const args = [
|
|
60
|
+
const args = ['worktree', 'add', '-b', branchName, worktreePath];
|
|
61
61
|
if (baseBranch) {
|
|
62
62
|
args.push(baseBranch);
|
|
63
63
|
}
|
|
@@ -70,10 +70,10 @@ export function createWorktree(authPath, options) {
|
|
|
70
70
|
// Copy gitignored .env* files (root + workspace subdirs)
|
|
71
71
|
// Uses copy instead of symlink to avoid Prisma symlink resolution issues
|
|
72
72
|
try {
|
|
73
|
-
const copyEnvFiles = (dir, prefix =
|
|
73
|
+
const copyEnvFiles = (dir, prefix = '') => {
|
|
74
74
|
try {
|
|
75
75
|
for (const entry of readdirSync(dir)) {
|
|
76
|
-
if (!entry.startsWith(
|
|
76
|
+
if (!entry.startsWith('.env'))
|
|
77
77
|
continue;
|
|
78
78
|
const relPath = prefix ? path.join(prefix, entry) : entry;
|
|
79
79
|
const absPath = path.join(authPath, relPath);
|
|
@@ -84,13 +84,15 @@ export function createWorktree(authPath, options) {
|
|
|
84
84
|
}
|
|
85
85
|
}
|
|
86
86
|
}
|
|
87
|
-
catch {
|
|
87
|
+
catch {
|
|
88
|
+
/* ignore read errors */
|
|
89
|
+
}
|
|
88
90
|
};
|
|
89
91
|
// Root level
|
|
90
92
|
copyEnvFiles(authPath);
|
|
91
93
|
// First-level subdirectories (workspace level)
|
|
92
94
|
for (const entry of readdirSync(authPath, { withFileTypes: true })) {
|
|
93
|
-
if (entry.isDirectory() && !entry.name.startsWith(
|
|
95
|
+
if (entry.isDirectory() && !entry.name.startsWith('.') && entry.name !== 'node_modules') {
|
|
94
96
|
copyEnvFiles(path.join(authPath, entry.name), entry.name);
|
|
95
97
|
}
|
|
96
98
|
}
|
|
@@ -106,7 +108,7 @@ export function removeWorktree(authPath, worktreePath, worktreeId) {
|
|
|
106
108
|
throw new Error(`Worktree path does not exist: ${worktreePath}`);
|
|
107
109
|
}
|
|
108
110
|
try {
|
|
109
|
-
runGit([
|
|
111
|
+
runGit(['worktree', 'remove', worktreePath, '--force'], authPath);
|
|
110
112
|
}
|
|
111
113
|
catch {
|
|
112
114
|
// If worktree removal via git fails, try to clean up manually
|
|
@@ -114,7 +116,7 @@ export function removeWorktree(authPath, worktreePath, worktreeId) {
|
|
|
114
116
|
rmSync(worktreePath, { recursive: true, force: true });
|
|
115
117
|
}
|
|
116
118
|
try {
|
|
117
|
-
runGit([
|
|
119
|
+
runGit(['worktree', 'prune'], authPath);
|
|
118
120
|
}
|
|
119
121
|
catch {
|
|
120
122
|
// Ignore prune errors
|
|
@@ -124,14 +126,14 @@ export function removeWorktree(authPath, worktreePath, worktreeId) {
|
|
|
124
126
|
throw new Error(`Worktree directory still exists after removal: ${worktreePath}`);
|
|
125
127
|
}
|
|
126
128
|
try {
|
|
127
|
-
runGit([
|
|
129
|
+
runGit(['branch', '-D', branchName], authPath);
|
|
128
130
|
}
|
|
129
131
|
catch {
|
|
130
132
|
// Branch may not exist or already deleted; ignore
|
|
131
133
|
}
|
|
132
134
|
try {
|
|
133
|
-
runGit([
|
|
134
|
-
runGit([
|
|
135
|
+
runGit(['ls-remote', '--exit-code', 'origin', `refs/heads/${branchName}`], authPath);
|
|
136
|
+
runGit(['push', 'origin', '--delete', branchName], authPath);
|
|
135
137
|
}
|
|
136
138
|
catch {
|
|
137
139
|
// Remote branch may not exist or deletion may fail; ignore
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-worktree.js","sourceRoot":"","sources":["../../src/utils/git-worktree.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAChG,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,0DAA0D;AAC1D,mDAAmD;AACnD,SAAS,MAAM,CAAC,IAAc,EAAE,GAAW;IACzC,OAAO,YAAY,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;AAC9E,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,OAAe;IACvC,IAAI,CAAC;QACH,MAAM,CAAC,CAAC,WAAW,EAAE,uBAAuB,CAAC,EAAE,OAAO,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,QAAgB,EAAE,UAAkB;IACtE,IAAI,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;QACnC,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;IAC5E,CAAC;IACD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACzC,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,IAAI,QAAQ,YAAY,EAAE,MAAM,UAAU,EAAE,CAAC,CAAC;AACzF,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,QAAgB;IACzD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,QAAgB,EAAE,YAAoB;IACvE,qCAAqC;IACrC,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;IAC5D,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;IAChE,IAAI,UAAU,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,CAAC;QAClE,IAAI,CAAC;YACH,WAAW,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,KAAK,CAAC,CAAC;QACzD,CAAC;QAAC,MAAM,CAAC;YACP,yDAAyD;QAC3D,CAAC;IACH,CAAC;IAED,wEAAwE;IACxE,4DAA4D;AAC9D,CAAC;AAED,MAAM,UAAU,cAAc,
|
|
1
|
+
{"version":3,"file":"git-worktree.js","sourceRoot":"","sources":["../../src/utils/git-worktree.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAChG,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,0DAA0D;AAC1D,mDAAmD;AACnD,SAAS,MAAM,CAAC,IAAc,EAAE,GAAW;IACzC,OAAO,YAAY,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;AAC9E,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,OAAe;IACvC,IAAI,CAAC;QACH,MAAM,CAAC,CAAC,WAAW,EAAE,uBAAuB,CAAC,EAAE,OAAO,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,QAAgB,EAAE,UAAkB;IACtE,IAAI,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;QACnC,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;IAC5E,CAAC;IACD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACzC,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,IAAI,QAAQ,YAAY,EAAE,MAAM,UAAU,EAAE,CAAC,CAAC;AACzF,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,QAAgB;IACzD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,QAAgB,EAAE,YAAoB;IACvE,qCAAqC;IACrC,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;IAC5D,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;IAChE,IAAI,UAAU,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,CAAC;QAClE,IAAI,CAAC;YACH,WAAW,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,KAAK,CAAC,CAAC;QACzD,CAAC;QAAC,MAAM,CAAC;YACP,yDAAyD;QAC3D,CAAC;IACH,CAAC;IAED,wEAAwE;IACxE,4DAA4D;AAC9D,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,QAAgB,EAChB,OAGC;IAED,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAC3C,MAAM,YAAY,GAAG,mBAAmB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAC/D,MAAM,UAAU,GAAG,YAAY,UAAU,EAAE,CAAC;IAE5C,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,yBAAyB,QAAQ,EAAE,CAAC,CAAC;IACvD,CAAC;IAED,kDAAkD;IAClD,IAAI,UAAU,CAAC,YAAY,CAAC,IAAI,SAAS,CAAC,YAAY,CAAC,EAAE,CAAC;QACxD,kBAAkB,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAC3C,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAC7C,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3B,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;QACjE,IAAI,UAAU,EAAE,CAAC;YACf,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACxB,CAAC;QACD,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACzB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CACb,gDAAgD,UAAU,KAAK,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CACxH,CAAC;IACJ,CAAC;IAED,kBAAkB,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;IAE3C,yDAAyD;IACzD,yEAAyE;IACzE,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,SAAiB,EAAE,EAAE,EAAE;YACxD,IAAI,CAAC;gBACH,KAAK,MAAM,KAAK,IAAI,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;oBACrC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC;wBAAE,SAAS;oBACxC,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;oBAC1D,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;oBAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;oBAChD,8EAA8E;oBAC9E,IAAI,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;wBAC/C,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;oBAChC,CAAC;gBACH,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,wBAAwB;YAC1B,CAAC;QACH,CAAC,CAAC;QAEF,aAAa;QACb,YAAY,CAAC,QAAQ,CAAC,CAAC;QAEvB,+CAA+C;QAC/C,KAAK,MAAM,KAAK,IAAI,WAAW,CAAC,QAAQ,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;YACnE,IAAI,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;gBACxF,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YAC5D,CAAC;QACH,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,0DAA0D;IAC5D,CAAC;IAED,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,QAAgB,EAAE,YAAoB,EAAE,UAAkB;IACvF,MAAM,UAAU,GAAG,YAAY,UAAU,EAAE,CAAC;IAE5C,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CAAC,iCAAiC,YAAY,EAAE,CAAC,CAAC;IACnE,CAAC;IAED,IAAI,CAAC;QACH,MAAM,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,CAAC,EAAE,QAAQ,CAAC,CAAC;IACpE,CAAC;IAAC,MAAM,CAAC;QACP,8DAA8D;QAC9D,IAAI,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;YAC7B,MAAM,CAAC,YAAY,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACzD,CAAC;QACD,IAAI,CAAC;YACH,MAAM,CAAC,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,QAAQ,CAAC,CAAC;QAC1C,CAAC;QAAC,MAAM,CAAC;YACP,sBAAsB;QACxB,CAAC;IACH,CAAC;IAED,IAAI,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,kDAAkD,YAAY,EAAE,CAAC,CAAC;IACpF,CAAC;IAED,IAAI,CAAC;QACH,MAAM,CAAC,CAAC,QAAQ,EAAE,IAAI,EAAE,UAAU,CAAC,EAAE,QAAQ,CAAC,CAAC;IACjD,CAAC;IAAC,MAAM,CAAC;QACP,kDAAkD;IACpD,CAAC;IAED,IAAI,CAAC;QACH,MAAM,CAAC,CAAC,WAAW,EAAE,aAAa,EAAE,QAAQ,EAAE,cAAc,UAAU,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC;QACrF,MAAM,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC/D,CAAC;IAAC,MAAM,CAAC;QACP,2DAA2D;IAC7D,CAAC;AACH,CAAC"}
|