hungry-ghost-hive 0.43.2 → 0.45.0
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/agents/base-agent.d.ts +1 -0
- package/dist/agents/base-agent.d.ts.map +1 -1
- package/dist/agents/base-agent.js +4 -0
- package/dist/agents/base-agent.js.map +1 -1
- package/dist/agents/intermediate.js +2 -2
- package/dist/agents/intermediate.js.map +1 -1
- package/dist/agents/junior.js +2 -2
- package/dist/agents/junior.js.map +1 -1
- package/dist/agents/qa.d.ts.map +1 -1
- package/dist/agents/qa.js +5 -5
- package/dist/agents/qa.js.map +1 -1
- package/dist/agents/senior.d.ts.map +1 -1
- package/dist/agents/senior.js +5 -5
- package/dist/agents/senior.js.map +1 -1
- package/dist/agents/tech-lead.d.ts.map +1 -1
- package/dist/agents/tech-lead.js +8 -3
- package/dist/agents/tech-lead.js.map +1 -1
- package/dist/cli/commands/assign.d.ts.map +1 -1
- package/dist/cli/commands/assign.js +4 -2
- package/dist/cli/commands/assign.js.map +1 -1
- package/dist/cli/commands/assign.test.js +5 -0
- package/dist/cli/commands/assign.test.js.map +1 -1
- package/dist/cli/commands/manager/handoff-recovery.d.ts.map +1 -1
- package/dist/cli/commands/manager/handoff-recovery.js +4 -2
- package/dist/cli/commands/manager/handoff-recovery.js.map +1 -1
- package/dist/cli/commands/manager/index.d.ts.map +1 -1
- package/dist/cli/commands/manager/index.js +16 -12
- package/dist/cli/commands/manager/index.js.map +1 -1
- package/dist/cli/commands/manager/tech-lead-lifecycle.d.ts.map +1 -1
- package/dist/cli/commands/manager/tech-lead-lifecycle.js +8 -3
- package/dist/cli/commands/manager/tech-lead-lifecycle.js.map +1 -1
- package/dist/cli/commands/msg.d.ts.map +1 -1
- package/dist/cli/commands/msg.js +8 -7
- package/dist/cli/commands/msg.js.map +1 -1
- package/dist/cli/commands/my-stories.js +3 -3
- package/dist/cli/commands/my-stories.js.map +1 -1
- package/dist/cli/commands/nuke.d.ts.map +1 -1
- package/dist/cli/commands/nuke.js +18 -7
- package/dist/cli/commands/nuke.js.map +1 -1
- package/dist/cli/commands/nuke.test.js +24 -0
- package/dist/cli/commands/nuke.test.js.map +1 -1
- package/dist/cli/commands/pr.js +5 -0
- package/dist/cli/commands/pr.js.map +1 -1
- package/dist/cli/commands/pr.test.js +43 -1
- package/dist/cli/commands/pr.test.js.map +1 -1
- package/dist/cli/commands/req.d.ts +1 -1
- package/dist/cli/commands/req.d.ts.map +1 -1
- package/dist/cli/commands/req.js +9 -6
- package/dist/cli/commands/req.js.map +1 -1
- package/dist/cli/commands/resume.d.ts.map +1 -1
- package/dist/cli/commands/resume.js +4 -1
- package/dist/cli/commands/resume.js.map +1 -1
- package/dist/cli/commands/stories.js +3 -3
- package/dist/cli/commands/stories.js.map +1 -1
- package/dist/cli/dashboard/panels/agents.d.ts.map +1 -1
- package/dist/cli/dashboard/panels/agents.js +7 -3
- package/dist/cli/dashboard/panels/agents.js.map +1 -1
- package/dist/cli-runtimes/chrome.d.ts +17 -0
- package/dist/cli-runtimes/chrome.d.ts.map +1 -0
- package/dist/cli-runtimes/chrome.js +36 -0
- package/dist/cli-runtimes/chrome.js.map +1 -0
- package/dist/cli-runtimes/claude.d.ts +3 -3
- package/dist/cli-runtimes/claude.d.ts.map +1 -1
- package/dist/cli-runtimes/claude.js +14 -8
- package/dist/cli-runtimes/claude.js.map +1 -1
- package/dist/cli-runtimes/codex.d.ts +3 -3
- package/dist/cli-runtimes/codex.d.ts.map +1 -1
- package/dist/cli-runtimes/codex.js +2 -2
- package/dist/cli-runtimes/codex.js.map +1 -1
- package/dist/cli-runtimes/gemini.d.ts +3 -3
- package/dist/cli-runtimes/gemini.d.ts.map +1 -1
- package/dist/cli-runtimes/gemini.js +2 -2
- package/dist/cli-runtimes/gemini.js.map +1 -1
- package/dist/cli-runtimes/index.d.ts +3 -2
- package/dist/cli-runtimes/index.d.ts.map +1 -1
- package/dist/cli-runtimes/index.js +1 -0
- package/dist/cli-runtimes/index.js.map +1 -1
- package/dist/cli-runtimes/index.test.js +133 -1
- package/dist/cli-runtimes/index.test.js.map +1 -1
- package/dist/cli-runtimes/types.d.ts +9 -2
- package/dist/cli-runtimes/types.d.ts.map +1 -1
- package/dist/config/schema.d.ts +8 -0
- package/dist/config/schema.d.ts.map +1 -1
- package/dist/config/schema.js +6 -0
- package/dist/config/schema.js.map +1 -1
- package/dist/context-files/generator.d.ts +1 -1
- package/dist/context-files/generator.d.ts.map +1 -1
- package/dist/context-files/generator.js +3 -2
- package/dist/context-files/generator.js.map +1 -1
- package/dist/context-files/index.test.js +2 -0
- package/dist/context-files/index.test.js.map +1 -1
- package/dist/db/client.d.ts +1 -0
- package/dist/db/client.d.ts.map +1 -1
- package/dist/db/client.js +6 -0
- package/dist/db/client.js.map +1 -1
- package/dist/db/migrations/015-add-story-markdown-path.sql +5 -0
- package/dist/db/queries/stories.d.ts +3 -3
- package/dist/db/queries/stories.d.ts.map +1 -1
- package/dist/db/queries/stories.js +23 -5
- package/dist/db/queries/stories.js.map +1 -1
- package/dist/db/queries/test-helpers.d.ts.map +1 -1
- package/dist/db/queries/test-helpers.js +1 -0
- package/dist/db/queries/test-helpers.js.map +1 -1
- package/dist/git/worktree.d.ts.map +1 -1
- package/dist/git/worktree.js +7 -0
- package/dist/git/worktree.js.map +1 -1
- package/dist/git/worktree.test.js +30 -0
- package/dist/git/worktree.test.js.map +1 -1
- package/dist/orchestrator/prompt-templates.d.ts +3 -1
- package/dist/orchestrator/prompt-templates.d.ts.map +1 -1
- package/dist/orchestrator/prompt-templates.js +16 -8
- package/dist/orchestrator/prompt-templates.js.map +1 -1
- package/dist/orchestrator/prompt-templates.test.js +4 -0
- package/dist/orchestrator/prompt-templates.test.js.map +1 -1
- package/dist/orchestrator/scheduler.d.ts.map +1 -1
- package/dist/orchestrator/scheduler.js +23 -12
- package/dist/orchestrator/scheduler.js.map +1 -1
- package/dist/orchestrator/scheduler.test.js +1 -0
- package/dist/orchestrator/scheduler.test.js.map +1 -1
- package/dist/tmux/manager.d.ts +7 -6
- package/dist/tmux/manager.d.ts.map +1 -1
- package/dist/tmux/manager.js +29 -13
- package/dist/tmux/manager.js.map +1 -1
- package/dist/utils/auto-merge.d.ts.map +1 -1
- package/dist/utils/auto-merge.js +66 -5
- package/dist/utils/auto-merge.js.map +1 -1
- package/dist/utils/auto-merge.test.js +62 -0
- package/dist/utils/auto-merge.test.js.map +1 -1
- package/dist/utils/instance.d.ts +32 -0
- package/dist/utils/instance.d.ts.map +1 -0
- package/dist/utils/instance.js +82 -0
- package/dist/utils/instance.js.map +1 -0
- package/dist/utils/instance.test.d.ts +2 -0
- package/dist/utils/instance.test.d.ts.map +1 -0
- package/dist/utils/instance.test.js +103 -0
- package/dist/utils/instance.test.js.map +1 -0
- package/dist/utils/paths.d.ts +2 -0
- package/dist/utils/paths.d.ts.map +1 -1
- package/dist/utils/paths.js +2 -0
- package/dist/utils/paths.js.map +1 -1
- package/dist/utils/paths.test.js +6 -0
- package/dist/utils/paths.test.js.map +1 -1
- package/dist/utils/story-markdown.d.ts +16 -0
- package/dist/utils/story-markdown.d.ts.map +1 -0
- package/dist/utils/story-markdown.js +82 -0
- package/dist/utils/story-markdown.js.map +1 -0
- package/dist/utils/story-markdown.test.d.ts +2 -0
- package/dist/utils/story-markdown.test.d.ts.map +1 -0
- package/dist/utils/story-markdown.test.js +143 -0
- package/dist/utils/story-markdown.test.js.map +1 -0
- package/package.json +1 -1
- package/src/agents/base-agent.ts +5 -0
- package/src/agents/intermediate.ts +2 -2
- package/src/agents/junior.ts +2 -2
- package/src/agents/qa.ts +13 -8
- package/src/agents/senior.ts +21 -11
- package/src/agents/tech-lead.ts +28 -13
- package/src/cli/commands/assign.test.ts +5 -0
- package/src/cli/commands/assign.ts +4 -2
- package/src/cli/commands/manager/handoff-recovery.ts +4 -2
- package/src/cli/commands/manager/index.ts +16 -11
- package/src/cli/commands/manager/tech-lead-lifecycle.ts +9 -3
- package/src/cli/commands/msg.ts +8 -7
- package/src/cli/commands/my-stories.ts +22 -13
- package/src/cli/commands/nuke.test.ts +31 -0
- package/src/cli/commands/nuke.ts +18 -7
- package/src/cli/commands/pr.test.ts +77 -1
- package/src/cli/commands/pr.ts +5 -0
- package/src/cli/commands/req.ts +13 -6
- package/src/cli/commands/resume.ts +4 -1
- package/src/cli/commands/stories.ts +22 -13
- package/src/cli/dashboard/panels/agents.ts +7 -3
- package/src/cli-runtimes/chrome.ts +43 -0
- package/src/cli-runtimes/claude.ts +26 -9
- package/src/cli-runtimes/codex.ts +12 -3
- package/src/cli-runtimes/gemini.ts +12 -3
- package/src/cli-runtimes/index.test.ts +158 -0
- package/src/cli-runtimes/index.ts +3 -2
- package/src/cli-runtimes/types.ts +19 -2
- package/src/config/schema.ts +6 -0
- package/src/context-files/generator.ts +3 -2
- package/src/context-files/index.test.ts +2 -0
- package/src/db/client.ts +7 -0
- package/src/db/migrations/015-add-story-markdown-path.sql +5 -0
- package/src/db/queries/stories.ts +29 -5
- package/src/db/queries/test-helpers.ts +1 -0
- package/src/git/worktree.test.ts +43 -0
- package/src/git/worktree.ts +10 -0
- package/src/orchestrator/prompt-templates.test.ts +4 -0
- package/src/orchestrator/prompt-templates.ts +20 -8
- package/src/orchestrator/scheduler.test.ts +1 -0
- package/src/orchestrator/scheduler.ts +33 -12
- package/src/tmux/manager.ts +42 -13
- package/src/utils/auto-merge.test.ts +81 -0
- package/src/utils/auto-merge.ts +78 -5
- package/src/utils/instance.test.ts +129 -0
- package/src/utils/instance.ts +95 -0
- package/src/utils/paths.test.ts +8 -0
- package/src/utils/paths.ts +3 -0
- package/src/utils/story-markdown.test.ts +176 -0
- package/src/utils/story-markdown.ts +94 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/tmux/manager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/tmux/manager.ts"],"names":[],"mappings":"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"}
|
package/dist/tmux/manager.js
CHANGED
|
@@ -3,6 +3,7 @@ import { execa } from 'execa';
|
|
|
3
3
|
import { chmodSync, existsSync, mkdirSync, writeFileSync } from 'fs';
|
|
4
4
|
import { tmpdir } from 'os';
|
|
5
5
|
import { dirname, isAbsolute, join, resolve } from 'path';
|
|
6
|
+
import { buildInstanceSessionName, getInstancePrefix, getManagerSessionName, } from '../utils/instance.js';
|
|
6
7
|
// --- Named constants (extracted from inline magic numbers) ---
|
|
7
8
|
/** Default number of pane lines to capture */
|
|
8
9
|
const DEFAULT_CAPTURE_LINES = 100;
|
|
@@ -131,8 +132,12 @@ export async function listTmuxSessions() {
|
|
|
131
132
|
return [];
|
|
132
133
|
}
|
|
133
134
|
}
|
|
134
|
-
export async function getHiveSessions() {
|
|
135
|
+
export async function getHiveSessions(hiveDir) {
|
|
135
136
|
const sessions = await listTmuxSessions();
|
|
137
|
+
if (hiveDir) {
|
|
138
|
+
const prefix = getInstancePrefix(hiveDir);
|
|
139
|
+
return sessions.filter(s => s.name.startsWith(prefix));
|
|
140
|
+
}
|
|
136
141
|
return sessions.filter(s => s.name.startsWith('hive-'));
|
|
137
142
|
}
|
|
138
143
|
export function shellEscapeArg(arg) {
|
|
@@ -189,8 +194,8 @@ export async function killTmuxSession(sessionName) {
|
|
|
189
194
|
// Session might not exist, ignore error
|
|
190
195
|
}
|
|
191
196
|
}
|
|
192
|
-
export async function killAllHiveSessions() {
|
|
193
|
-
const sessions = await getHiveSessions();
|
|
197
|
+
export async function killAllHiveSessions(hiveDir) {
|
|
198
|
+
const sessions = await getHiveSessions(hiveDir);
|
|
194
199
|
let killed = 0;
|
|
195
200
|
for (const session of sessions) {
|
|
196
201
|
try {
|
|
@@ -403,7 +408,10 @@ export async function autoApprovePermission(sessionName, maxRetries = DEFAULT_AP
|
|
|
403
408
|
// Max retries exceeded
|
|
404
409
|
return false;
|
|
405
410
|
}
|
|
406
|
-
export function generateSessionName(agentType, teamName, index) {
|
|
411
|
+
export function generateSessionName(agentType, teamName, index, hiveDir) {
|
|
412
|
+
if (hiveDir) {
|
|
413
|
+
return buildInstanceSessionName(hiveDir, agentType, teamName, index);
|
|
414
|
+
}
|
|
407
415
|
let name = `hive-${agentType}`;
|
|
408
416
|
if (teamName) {
|
|
409
417
|
name += `-${teamName}`;
|
|
@@ -414,29 +422,37 @@ export function generateSessionName(agentType, teamName, index) {
|
|
|
414
422
|
return name;
|
|
415
423
|
}
|
|
416
424
|
const MANAGER_SESSION = 'hive-manager';
|
|
417
|
-
export
|
|
418
|
-
|
|
425
|
+
export function getManagerSession(hiveDir) {
|
|
426
|
+
if (hiveDir) {
|
|
427
|
+
return getManagerSessionName(hiveDir);
|
|
428
|
+
}
|
|
429
|
+
return MANAGER_SESSION;
|
|
430
|
+
}
|
|
431
|
+
export async function isManagerRunning(hiveDir) {
|
|
432
|
+
return isTmuxSessionRunning(getManagerSession(hiveDir));
|
|
419
433
|
}
|
|
420
|
-
export async function startManager(interval = DEFAULT_MANAGER_INTERVAL) {
|
|
421
|
-
|
|
434
|
+
export async function startManager(interval = DEFAULT_MANAGER_INTERVAL, hiveDir) {
|
|
435
|
+
const session = getManagerSession(hiveDir);
|
|
436
|
+
if (await isTmuxSessionRunning(session)) {
|
|
422
437
|
return false; // Already running
|
|
423
438
|
}
|
|
424
439
|
const workDir = findHiveRootFromDir(process.cwd()) || process.cwd();
|
|
425
440
|
const sessionEnv = buildTmuxSessionEnv(workDir);
|
|
426
441
|
// Start the manager in a detached tmux session
|
|
427
|
-
await execa('tmux', ['new-session', '-d', '-s',
|
|
442
|
+
await execa('tmux', ['new-session', '-d', '-s', session, '-c', workDir], {
|
|
428
443
|
env: sessionEnv,
|
|
429
444
|
});
|
|
430
445
|
// Send the manager command
|
|
431
446
|
const managerCommand = `${buildHiveInvokeCommand()} manager start -i ${interval}`;
|
|
432
|
-
await execa('tmux', ['send-keys', '-t',
|
|
447
|
+
await execa('tmux', ['send-keys', '-t', session, managerCommand, 'Enter']);
|
|
433
448
|
return true;
|
|
434
449
|
}
|
|
435
|
-
export async function stopManager() {
|
|
436
|
-
|
|
450
|
+
export async function stopManager(hiveDir) {
|
|
451
|
+
const session = getManagerSession(hiveDir);
|
|
452
|
+
if (!(await isTmuxSessionRunning(session))) {
|
|
437
453
|
return false; // Not running
|
|
438
454
|
}
|
|
439
|
-
await killTmuxSession(
|
|
455
|
+
await killTmuxSession(session);
|
|
440
456
|
return true;
|
|
441
457
|
}
|
|
442
458
|
//# sourceMappingURL=manager.js.map
|
package/dist/tmux/manager.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../src/tmux/manager.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../src/tmux/manager.ts"],"names":[],"mappings":"AAAA,6DAA6D;AAE7D,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC1D,OAAO,EACL,wBAAwB,EACxB,iBAAiB,EACjB,qBAAqB,GACtB,MAAM,sBAAsB,CAAC;AAE9B,gEAAgE;AAEhE,8CAA8C;AAC9C,MAAM,qBAAqB,GAAG,GAAG,CAAC;AAClC,wEAAwE;AACxE,MAAM,qBAAqB,GAAG,GAAG,CAAC;AAClC,mEAAmE;AACnE,MAAM,oBAAoB,GAAG,EAAE,CAAC;AAChC,8DAA8D;AAC9D,MAAM,yBAAyB,GAAG,EAAE,CAAC;AACrC,oDAAoD;AACpD,MAAM,qBAAqB,GAAG,KAAK,CAAC;AACpC,0DAA0D;AAC1D,MAAM,qBAAqB,GAAG,GAAG,CAAC;AAClC,kDAAkD;AAClD,MAAM,0BAA0B,GAAG,CAAC,CAAC;AACrC,iEAAiE;AACjE,MAAM,wBAAwB,GAAG,GAAG,CAAC;AACrC,qDAAqD;AACrD,MAAM,oBAAoB,GAAG,GAAG,CAAC;AACjC,4DAA4D;AAC5D,MAAM,2BAA2B,GAAG,CAAC,CAAC;AACtC,6DAA6D;AAC7D,MAAM,+BAA+B,GAAG,GAAG,CAAC;AAC5C,+DAA+D;AAC/D,MAAM,sBAAsB,GAAG,IAAI,CAAC;AACpC,sDAAsD;AACtD,MAAM,2BAA2B,GAAG,CAAC,CAAC;AACtC,kDAAkD;AAClD,MAAM,sBAAsB,GAAG,GAAG,CAAC;AACnC,gDAAgD;AAChD,MAAM,wBAAwB,GAAG,EAAE,CAAC;AAiBpC,SAAS,mBAAmB,CAAC,QAAgB;IAC3C,IAAI,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAEnC,OAAO,UAAU,KAAK,GAAG,EAAE,CAAC;QAC1B,IAAI,UAAU,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC;YAC1C,OAAO,UAAU,CAAC;QACpB,CAAC;QAED,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;QACtC,IAAI,SAAS,KAAK,UAAU;YAAE,MAAM;QACpC,UAAU,GAAG,SAAS,CAAC;IACzB,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,0BAA0B;IACjC,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACjC,IAAI,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAC;IAC3B,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAC;AAC5E,CAAC;AAED,MAAM,UAAU,sBAAsB;IACpC,MAAM,WAAW,GAAG,0BAA0B,EAAE,CAAC;IACjD,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,cAAc,CAAC,WAAW,CAAC,EAAE,CAAC;AAC9E,CAAC;AAED,SAAS,oBAAoB,CAAC,OAAe;IAC3C,MAAM,QAAQ,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAC9C,IAAI,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAC;IAE3B,MAAM,iBAAiB,GAAG,sBAAsB,EAAE,CAAC;IACnD,IAAI,iBAAiB,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC;IAE9C,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IAC/C,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAExC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACvC,MAAM,WAAW,GAAG;;OAEf,iBAAiB;CACvB,CAAC;IAEA,aAAa,CAAC,QAAQ,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IAC9C,SAAS,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IAE3B,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,mBAAmB,CAAC,OAAe,EAAE,GAA4B;IACxE,MAAM,SAAS,GAAsB,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,CAAC;IACxE,MAAM,OAAO,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAE9C,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,SAAS,GAAG,CAAC,SAAS,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACpE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YACjC,SAAS,CAAC,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,OAAO,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QAC7E,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe;IACnC,IAAI,CAAC;QACH,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,MAAM,EAAE,CAAC;QAChB,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,WAAmB;IAC5D,IAAI,CAAC;QACH,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC,aAAa,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,MAAM,EAAE,CAAC;QAChB,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB;IACpC,IAAI,CAAC;QACH,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,MAAM,EAAE;YACrC,eAAe;YACf,IAAI;YACJ,2EAA2E;SAC5E,CAAC,CAAC;QAEH,OAAO,MAAM;aACV,KAAK,CAAC,IAAI,CAAC;aACX,MAAM,CAAC,OAAO,CAAC;aACf,GAAG,CAAC,IAAI,CAAC,EAAE;YACV,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC3D,OAAO;gBACL,IAAI;gBACJ,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;gBAC9B,OAAO;gBACP,QAAQ,EAAE,QAAQ,KAAK,GAAG;aAC3B,CAAC;QACJ,CAAC,CAAC,CAAC;IACP,CAAC;IAAC,OAAO,MAAM,EAAE,CAAC;QAChB,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,OAAgB;IACpD,MAAM,QAAQ,GAAG,MAAM,gBAAgB,EAAE,CAAC;IAC1C,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,MAAM,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAC1C,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;IACzD,CAAC;IACD,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,GAAW;IACxC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC;AAC3C,CAAC;AAED,SAAS,8BAA8B,CAAC,WAAmB;IACzD,OAAO,WAAW,CAAC,OAAO,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC;AACtD,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,WAAqB,EAAE,UAAmB;IAC1E,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAExC,MAAM,cAAc,GAAG,WAAW,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEjE,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,2FAA2F;IAC3F,OAAO,GAAG,cAAc,cAAc,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC;AACvE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,OAA2B;IAChE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IAE1E,qCAAqC;IACrC,IAAI,MAAM,oBAAoB,CAAC,WAAW,CAAC,EAAE,CAAC;QAC5C,MAAM,eAAe,CAAC,WAAW,CAAC,CAAC;IACrC,CAAC;IAED,iDAAiD;IACjD,MAAM,IAAI,GAAG,CAAC,aAAa,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAErE,MAAM,YAAY,GAAgC;QAChD,GAAG,EAAE,mBAAmB,CAAC,OAAO,EAAE,GAAG,CAAC;KACvC,CAAC;IAEF,MAAM,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;IAExC,sCAAsC;IACtC,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC,CAAC;IAEzE,kCAAkC;IAClC,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3B,IAAI,UAA8B,CAAC;QAEnC,IAAI,aAAa,EAAE,CAAC;YAClB,+EAA+E;YAC/E,6EAA6E;YAC7E,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,EAAE,EAAE,cAAc,CAAC,CAAC;YACjD,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1C,MAAM,eAAe,GAAG,8BAA8B,CAAC,WAAW,CAAC,CAAC;YACpE,UAAU,GAAG,IAAI,CAAC,SAAS,EAAE,GAAG,eAAe,IAAI,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACpE,aAAa,CAAC,UAAU,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QACpD,CAAC;QAED,MAAM,WAAW,GAAG,iBAAiB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QAC/D,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;IAC9E,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,WAAmB;IACvD,IAAI,CAAC;QACH,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC,cAAc,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;IAC3D,CAAC;IAAC,OAAO,MAAM,EAAE,CAAC;QAChB,wCAAwC;IAC1C,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,OAAgB;IACxD,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;IAChD,IAAI,MAAM,GAAG,CAAC,CAAC;IAEf,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,IAAI,CAAC;YACH,MAAM,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACpC,MAAM,EAAE,CAAC;QACX,CAAC;QAAC,OAAO,MAAM,EAAE,CAAC;YAChB,gBAAgB;QAClB,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,WAAmB,EACnB,IAAY,EACZ,UAAU,GAAG,IAAI;IAEjB,IAAI,UAAU,EAAE,CAAC;QACf,iEAAiE;QACjE,wCAAwC;QACxC,8CAA8C;QAC9C,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC;QAChE,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC,CAAC;QACxE,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC;QAC7D,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAExC,IAAI,WAAW,EAAE,CAAC;QAChB,0EAA0E;QAC1E,oDAAoD;QACpD,0EAA0E;QAC1E,wEAAwE;QACxE,yEAAyE;QACzE,4EAA4E;QAC5E,MAAM,UAAU,GAAG,cAAc,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;QAC9C,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC,YAAY,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC;QAC5D,sEAAsE;QACtE,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC,cAAc,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC;IACnF,CAAC;SAAM,CAAC;QACN,yDAAyD;QACzD,6FAA6F;QAC7F,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED,yFAAyF;IACzF,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC;AAC/D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,WAAmB;IAC9D,oCAAoC;IACpC,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC;AAC/D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,WAAmB,EACnB,KAAK,GAAG,qBAAqB;IAE7B,IAAI,CAAC;QACH,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,MAAM,EAAE;YACrC,cAAc;YACd,IAAI;YACJ,WAAW;YACX,IAAI;YACJ,IAAI;YACJ,IAAI,KAAK,EAAE;SACZ,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,OAAO,MAAM,EAAE,CAAC;QAChB,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,WAAmB,EACnB,SAAS,GAAG,qBAAqB,EACjC,cAAc,GAAG,qBAAqB;IAEtC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7B,IAAI,UAAU,GAAG,EAAE,CAAC;IAEpB,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,GAAG,SAAS,EAAE,CAAC;QAC1C,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,yBAAyB,CAAC,CAAC;QAE7E,iEAAiE;QACjE,uDAAuD;QACvD,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YACtD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,sEAAsE;QACtE,kEAAkE;QAClE,IAAI,UAAU,KAAK,MAAM,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/C,OAAO,IAAI,CAAC;QACd,CAAC;QAED,UAAU,GAAG,MAAM,CAAC;QACpB,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC;IACpE,CAAC;IAED,wDAAwD;IACxD,2DAA2D;IAC3D,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,WAAmB,EACnB,WAA0C,QAAQ,EAClD,UAAU,GAAG,0BAA0B;IAEvC,8EAA8E;IAC9E,6EAA6E;IAC7E,IAAI,OAAO,GAAG,CAAC,CAAC;IAEhB,OAAO,OAAO,GAAG,UAAU,EAAE,CAAC;QAC5B,uDAAuD;QACvD,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,wBAAwB,CAAC,CAAC;QAE5E,kCAAkC;QAClC,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,uBAAuB,CAAC,EAAE,CAAC;YAC3D,OAAO,IAAI,CAAC;QACd,CAAC;QAED,+CAA+C;QAC/C,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;YAClD,4DAA4D;YAC5D,uEAAuE;YACvE,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;YAE9D,0CAA0C;YAC1C,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC,CAAC;YAExE,OAAO,EAAE,CAAC;YACV,SAAS;QACX,CAAC;QAED,uEAAuE;QACvE,mEAAmE;QACnE,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;QAC9D,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC,CAAC;QAExE,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,uBAAuB;IACvB,2DAA2D;IAC3D,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC/C,WAAmB,EACnB,OAAe,EACf,UAAU,GAAG,2BAA2B,EACxC,aAAa,GAAG,+BAA+B;IAE/C,kCAAkC;IAClC,MAAM,iBAAiB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAE9C,uCAAuC;IACvC,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC;IAEjE,kEAAkE;IAClE,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,IAAI,QAAQ,GAAG,aAAa,CAAC;IAE7B,OAAO,OAAO,GAAG,UAAU,EAAE,CAAC;QAC5B,qDAAqD;QACrD,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,wBAAwB,CAAC,CAAC;QAE5E,+DAA+D;QAC/D,4DAA4D;QAC5D,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACrE,MAAM,gBAAgB,GACpB,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAExF,IAAI,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACtC,kDAAkD;YAClD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,EAAE,CAAC;QACV,IAAI,OAAO,GAAG,UAAU,EAAE,CAAC;YACzB,2DAA2D;YAC3D,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,GAAG,CAAC,EAAE,sBAAsB,CAAC,CAAC;YAC1D,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;IAED,gDAAgD;IAChD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,WAAmB,EACnB,UAAU,GAAG,2BAA2B;IAExC,IAAI,OAAO,GAAG,CAAC,CAAC;IAEhB,OAAO,OAAO,GAAG,UAAU,EAAE,CAAC;QAC5B,sDAAsD;QACtD,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,wBAAwB,CAAC,CAAC;QAE5E,8CAA8C;QAC9C,MAAM,kBAAkB,GAAG;YACzB,4CAA4C;YAC5C,gCAAgC;YAChC,mCAAmC;YACnC,uBAAuB;YACvB,yBAAyB;YACzB,uBAAuB;SACxB,CAAC;QAEF,MAAM,mBAAmB,GAAG,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAErF,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACzB,gCAAgC;YAChC,OAAO,KAAK,CAAC;QACf,CAAC;QAED,qCAAqC;QACrC,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;QAEpE,+BAA+B;QAC/B,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,sBAAsB,CAAC,CAAC,CAAC;QAE1E,mDAAmD;QACnD,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,wBAAwB,CAAC,CAAC;QAC/E,MAAM,UAAU,GAAG,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QAEhF,IAAI,UAAU,EAAE,CAAC;YACf,OAAO,IAAI,CAAC,CAAC,wBAAwB;QACvC,CAAC;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,uBAAuB;IACvB,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,SAAiB,EACjB,QAAiB,EACjB,KAAc,EACd,OAAgB;IAEhB,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,wBAAwB,CAAC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;IACvE,CAAC;IACD,IAAI,IAAI,GAAG,QAAQ,SAAS,EAAE,CAAC;IAC/B,IAAI,QAAQ,EAAE,CAAC;QACb,IAAI,IAAI,IAAI,QAAQ,EAAE,CAAC;IACzB,CAAC;IACD,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;QACrC,IAAI,IAAI,IAAI,KAAK,EAAE,CAAC;IACtB,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,eAAe,GAAG,cAAc,CAAC;AAEvC,MAAM,UAAU,iBAAiB,CAAC,OAAgB;IAChD,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,qBAAqB,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;IACD,OAAO,eAAe,CAAC;AACzB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,OAAgB;IACrD,OAAO,oBAAoB,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC;AAC1D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,QAAQ,GAAG,wBAAwB,EACnC,OAAgB;IAEhB,MAAM,OAAO,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAC3C,IAAI,MAAM,oBAAoB,CAAC,OAAO,CAAC,EAAE,CAAC;QACxC,OAAO,KAAK,CAAC,CAAC,kBAAkB;IAClC,CAAC;IAED,MAAM,OAAO,GAAG,mBAAmB,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IACpE,MAAM,UAAU,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAEhD,+CAA+C;IAC/C,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC,aAAa,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE;QACvE,GAAG,EAAE,UAAU;KAChB,CAAC,CAAC;IAEH,2BAA2B;IAC3B,MAAM,cAAc,GAAG,GAAG,sBAAsB,EAAE,qBAAqB,QAAQ,EAAE,CAAC;IAClF,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC;IAE3E,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,OAAgB;IAChD,MAAM,OAAO,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAC3C,IAAI,CAAC,CAAC,MAAM,oBAAoB,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;QAC3C,OAAO,KAAK,CAAC,CAAC,cAAc;IAC9B,CAAC;IAED,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;IAC/B,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auto-merge.d.ts","sourceRoot":"","sources":["../../src/utils/auto-merge.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"auto-merge.d.ts","sourceRoot":"","sources":["../../src/utils/auto-merge.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AA0BtD;;;;GAIG;AACH,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,cAAc,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;AAUnF;;;;;;;;;;;;;GAaG;AACH,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,cAAc,GAAG,IAAI,EACzB,QAAQ,CAAC,EAAE,UAAU,GACpB,OAAO,CAAC,MAAM,CAAC,CA2XjB"}
|
package/dist/utils/auto-merge.js
CHANGED
|
@@ -103,16 +103,14 @@ export async function autoMergeApprovedPRs(root, db, withLock) {
|
|
|
103
103
|
try {
|
|
104
104
|
// Check PR state
|
|
105
105
|
let prState;
|
|
106
|
-
let mergeableStatus;
|
|
107
106
|
try {
|
|
108
|
-
const prViewOutput = execSync(`gh pr view ${pr.github_pr_number} --json state,mergeable${repoFlag}`, {
|
|
107
|
+
const prViewOutput = execSync(`gh pr view ${pr.github_pr_number} --json state,mergeable,mergeStateStatus${repoFlag}`, {
|
|
109
108
|
stdio: 'pipe',
|
|
110
109
|
cwd: repoCwd,
|
|
111
110
|
encoding: 'utf-8',
|
|
112
111
|
timeout: PR_STATE_CHECK_TIMEOUT_MS,
|
|
113
112
|
});
|
|
114
113
|
prState = JSON.parse(prViewOutput);
|
|
115
|
-
mergeableStatus = prState.mergeable === 'MERGEABLE';
|
|
116
114
|
}
|
|
117
115
|
catch {
|
|
118
116
|
results.push({ claimed, outcome: { type: 'unknown_state' } });
|
|
@@ -122,7 +120,22 @@ export async function autoMergeApprovedPRs(root, db, withLock) {
|
|
|
122
120
|
results.push({ claimed, outcome: { type: 'already_closed', prState } });
|
|
123
121
|
continue;
|
|
124
122
|
}
|
|
125
|
-
|
|
123
|
+
// Update stale branches that are behind the base branch
|
|
124
|
+
if (prState.mergeStateStatus === 'BEHIND') {
|
|
125
|
+
try {
|
|
126
|
+
execSync(`gh pr update-branch ${pr.github_pr_number}${repoFlag}`, {
|
|
127
|
+
stdio: 'pipe',
|
|
128
|
+
cwd: repoCwd,
|
|
129
|
+
timeout: PR_MERGE_TIMEOUT_MS,
|
|
130
|
+
});
|
|
131
|
+
results.push({ claimed, outcome: { type: 'branch_updated' } });
|
|
132
|
+
}
|
|
133
|
+
catch {
|
|
134
|
+
results.push({ claimed, outcome: { type: 'unknown_state' } });
|
|
135
|
+
}
|
|
136
|
+
continue;
|
|
137
|
+
}
|
|
138
|
+
if (prState.mergeable !== 'MERGEABLE') {
|
|
126
139
|
results.push({ claimed, outcome: { type: 'conflicts' } });
|
|
127
140
|
continue;
|
|
128
141
|
}
|
|
@@ -133,7 +146,29 @@ export async function autoMergeApprovedPRs(root, db, withLock) {
|
|
|
133
146
|
cwd: repoCwd,
|
|
134
147
|
timeout: PR_MERGE_TIMEOUT_MS,
|
|
135
148
|
});
|
|
136
|
-
|
|
149
|
+
// Verify actual merge state: --auto may queue the merge rather than merge immediately
|
|
150
|
+
let postMergeState;
|
|
151
|
+
try {
|
|
152
|
+
const postMergeOutput = execSync(`gh pr view ${pr.github_pr_number} --json state,mergeable,mergeStateStatus${repoFlag}`, {
|
|
153
|
+
stdio: 'pipe',
|
|
154
|
+
cwd: repoCwd,
|
|
155
|
+
encoding: 'utf-8',
|
|
156
|
+
timeout: PR_STATE_CHECK_TIMEOUT_MS,
|
|
157
|
+
});
|
|
158
|
+
postMergeState = JSON.parse(postMergeOutput);
|
|
159
|
+
}
|
|
160
|
+
catch {
|
|
161
|
+
// If we can't re-check, assume it merged (command succeeded)
|
|
162
|
+
results.push({ claimed, outcome: { type: 'merged' } });
|
|
163
|
+
continue;
|
|
164
|
+
}
|
|
165
|
+
if (postMergeState.state === 'MERGED') {
|
|
166
|
+
results.push({ claimed, outcome: { type: 'merged' } });
|
|
167
|
+
}
|
|
168
|
+
else {
|
|
169
|
+
// PR is OPEN with auto-merge enabled — GitHub will merge when CI passes
|
|
170
|
+
results.push({ claimed, outcome: { type: 'auto_merge_pending' } });
|
|
171
|
+
}
|
|
137
172
|
}
|
|
138
173
|
catch (mergeErr) {
|
|
139
174
|
results.push({
|
|
@@ -254,6 +289,32 @@ export async function autoMergeApprovedPRs(root, db, withLock) {
|
|
|
254
289
|
}
|
|
255
290
|
break;
|
|
256
291
|
}
|
|
292
|
+
case 'auto_merge_pending': {
|
|
293
|
+
createLog(phaseDb.db, {
|
|
294
|
+
agentId: 'manager',
|
|
295
|
+
storyId: pr.story_id || undefined,
|
|
296
|
+
eventType: 'PR_MERGE_SKIPPED',
|
|
297
|
+
status: 'info',
|
|
298
|
+
message: `PR #${pr.github_pr_number} is queued for auto-merge, waiting for CI checks to complete`,
|
|
299
|
+
metadata: { pr_id: pr.id },
|
|
300
|
+
});
|
|
301
|
+
break;
|
|
302
|
+
}
|
|
303
|
+
case 'branch_updated': {
|
|
304
|
+
// Reset to 'approved' so the PR is retried on the next cycle once CI passes
|
|
305
|
+
await withTransaction(phaseDb.db, () => {
|
|
306
|
+
updatePullRequest(phaseDb.db, pr.id, { status: 'approved' });
|
|
307
|
+
createLog(phaseDb.db, {
|
|
308
|
+
agentId: 'manager',
|
|
309
|
+
storyId: pr.story_id || undefined,
|
|
310
|
+
eventType: 'PR_MERGE_SKIPPED',
|
|
311
|
+
status: 'info',
|
|
312
|
+
message: `Updated stale branch for PR #${pr.github_pr_number} (was behind base branch), will retry merge`,
|
|
313
|
+
metadata: { pr_id: pr.id },
|
|
314
|
+
});
|
|
315
|
+
}, () => phaseDb.save());
|
|
316
|
+
break;
|
|
317
|
+
}
|
|
257
318
|
case 'merge_failed': {
|
|
258
319
|
await withTransaction(phaseDb.db, () => {
|
|
259
320
|
updatePullRequest(phaseDb.db, pr.id, { status: 'approved' });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auto-merge.js","sourceRoot":"","sources":["../../src/utils/auto-merge.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"auto-merge.js","sourceRoot":"","sources":["../../src/utils/auto-merge.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,10 @@ vi.mock('../config/loader.js', () => ({
|
|
|
11
11
|
vi.mock('./paths.js', () => ({
|
|
12
12
|
getHivePaths: vi.fn(() => ({ hiveDir: '/mock/hive' })),
|
|
13
13
|
}));
|
|
14
|
+
vi.mock('../connectors/project-management/operations.js', () => ({
|
|
15
|
+
postLifecycleComment: vi.fn().mockResolvedValue(undefined),
|
|
16
|
+
syncStatusForStory: vi.fn(),
|
|
17
|
+
}));
|
|
14
18
|
import { loadConfig } from '../config/loader.js';
|
|
15
19
|
import { autoMergeApprovedPRs } from './auto-merge.js';
|
|
16
20
|
const mockLoadConfig = vi.mocked(loadConfig);
|
|
@@ -212,6 +216,64 @@ describe('auto-merge functionality', () => {
|
|
|
212
216
|
// loadConfig should have been called
|
|
213
217
|
expect(mockLoadConfig).toHaveBeenCalledWith('/mock/hive');
|
|
214
218
|
});
|
|
219
|
+
it('should keep PR as queued when auto-merge is pending (PR still open after gh pr merge --auto)', async () => {
|
|
220
|
+
const pr = createPullRequest(db, {
|
|
221
|
+
storyId,
|
|
222
|
+
teamId,
|
|
223
|
+
branchName: 'feature/auto-merge-pending',
|
|
224
|
+
githubPrNumber: 456,
|
|
225
|
+
});
|
|
226
|
+
updatePullRequest(db, pr.id, { status: 'approved' });
|
|
227
|
+
mockLoadConfig.mockReturnValue({
|
|
228
|
+
integrations: {
|
|
229
|
+
autonomy: { level: 'full' },
|
|
230
|
+
source_control: { provider: 'github' },
|
|
231
|
+
project_management: { provider: 'none' },
|
|
232
|
+
},
|
|
233
|
+
});
|
|
234
|
+
// Mock execSync: first call returns OPEN+MERGEABLE, merge command succeeds,
|
|
235
|
+
// second call (post-merge check) returns OPEN (auto-merge pending)
|
|
236
|
+
const mockExecSync = vi.fn();
|
|
237
|
+
mockExecSync
|
|
238
|
+
.mockReturnValueOnce(JSON.stringify({ state: 'OPEN', mergeable: 'MERGEABLE', mergeStateStatus: 'CLEAN' }))
|
|
239
|
+
.mockReturnValueOnce(undefined) // gh pr merge --auto
|
|
240
|
+
.mockReturnValueOnce(JSON.stringify({ state: 'OPEN', mergeable: 'MERGEABLE', mergeStateStatus: 'BLOCKED' }));
|
|
241
|
+
vi.doMock('child_process', () => ({ execSync: mockExecSync }));
|
|
242
|
+
const dbClient = { db, save: vi.fn(), close: vi.fn(), runMigrations: vi.fn() };
|
|
243
|
+
const result = await autoMergeApprovedPRs('/mock/root', dbClient);
|
|
244
|
+
// Should return 0 because the PR was not actually merged yet
|
|
245
|
+
expect(result).toBe(0);
|
|
246
|
+
// PR should remain 'queued' (not rolled back to 'approved' or advanced to 'merged')
|
|
247
|
+
expect(getPullRequestById(db, pr.id)?.status).toBe('queued');
|
|
248
|
+
});
|
|
249
|
+
it('should reset stale branch PR to approved after updating behind branch', async () => {
|
|
250
|
+
const pr = createPullRequest(db, {
|
|
251
|
+
storyId,
|
|
252
|
+
teamId,
|
|
253
|
+
branchName: 'feature/stale-branch',
|
|
254
|
+
githubPrNumber: 789,
|
|
255
|
+
});
|
|
256
|
+
updatePullRequest(db, pr.id, { status: 'approved' });
|
|
257
|
+
mockLoadConfig.mockReturnValue({
|
|
258
|
+
integrations: {
|
|
259
|
+
autonomy: { level: 'full' },
|
|
260
|
+
source_control: { provider: 'github' },
|
|
261
|
+
project_management: { provider: 'none' },
|
|
262
|
+
},
|
|
263
|
+
});
|
|
264
|
+
// Mock execSync: PR state shows BEHIND, then gh pr update-branch succeeds
|
|
265
|
+
const mockExecSync = vi.fn();
|
|
266
|
+
mockExecSync
|
|
267
|
+
.mockReturnValueOnce(JSON.stringify({ state: 'OPEN', mergeable: 'MERGEABLE', mergeStateStatus: 'BEHIND' }))
|
|
268
|
+
.mockReturnValueOnce(undefined); // gh pr update-branch
|
|
269
|
+
vi.doMock('child_process', () => ({ execSync: mockExecSync }));
|
|
270
|
+
const dbClient = { db, save: vi.fn(), close: vi.fn(), runMigrations: vi.fn() };
|
|
271
|
+
const result = await autoMergeApprovedPRs('/mock/root', dbClient);
|
|
272
|
+
// Should return 0 because no merge happened yet
|
|
273
|
+
expect(result).toBe(0);
|
|
274
|
+
// PR should be reset to 'approved' to be retried on next cycle
|
|
275
|
+
expect(getPullRequestById(db, pr.id)?.status).toBe('approved');
|
|
276
|
+
});
|
|
215
277
|
it('should skip approved PRs marked for manual merge', async () => {
|
|
216
278
|
const pr = createPullRequest(db, {
|
|
217
279
|
storyId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auto-merge.test.js","sourceRoot":"","sources":["../../src/utils/auto-merge.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"auto-merge.test.js","sourceRoot":"","sources":["../../src/utils/auto-merge.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Get or create the instance ID for a hive workspace.
|
|
3
|
+
* The ID is stored in .hive/instance.id.
|
|
4
|
+
* Returns null if the hive directory does not exist.
|
|
5
|
+
* Only creates the file if the .hive directory already exists
|
|
6
|
+
* (i.e., this is a real workspace, not a test environment).
|
|
7
|
+
*/
|
|
8
|
+
export declare function getInstanceId(hiveDir: string): string | null;
|
|
9
|
+
/**
|
|
10
|
+
* Get the instance-scoped tmux session prefix.
|
|
11
|
+
* Falls back to 'hive' if no instance ID is available.
|
|
12
|
+
*/
|
|
13
|
+
export declare function getInstancePrefix(hiveDir: string): string;
|
|
14
|
+
/**
|
|
15
|
+
* Build an instance-scoped session name.
|
|
16
|
+
* Pattern: hive-<instanceId>-<agentType>[-<teamName>][-<index>]
|
|
17
|
+
* Falls back to hive-<agentType>[-<teamName>][-<index>] if no instance ID.
|
|
18
|
+
*/
|
|
19
|
+
export declare function buildInstanceSessionName(hiveDir: string, agentType: string, teamName?: string, index?: number): string;
|
|
20
|
+
/**
|
|
21
|
+
* Build the instance-scoped tech lead session name.
|
|
22
|
+
*/
|
|
23
|
+
export declare function getTechLeadSessionName(hiveDir: string): string;
|
|
24
|
+
/**
|
|
25
|
+
* Build the instance-scoped manager session name.
|
|
26
|
+
*/
|
|
27
|
+
export declare function getManagerSessionName(hiveDir: string): string;
|
|
28
|
+
/**
|
|
29
|
+
* Build the instance-scoped manager lock path.
|
|
30
|
+
*/
|
|
31
|
+
export declare function getManagerLockPath(hiveDir: string): string;
|
|
32
|
+
//# sourceMappingURL=instance.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"instance.d.ts","sourceRoot":"","sources":["../../src/utils/instance.ts"],"names":[],"mappings":"AAQA;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAoB5D;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAMzD;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,MAAM,EACjB,KAAK,CAAC,EAAE,MAAM,GACb,MAAM,CAUR;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE9D;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAM1D"}
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
// Licensed under the Hungry Ghost Hive License. See LICENSE.
|
|
2
|
+
import { existsSync, readFileSync, writeFileSync } from 'fs';
|
|
3
|
+
import { nanoid } from 'nanoid';
|
|
4
|
+
import { join } from 'path';
|
|
5
|
+
const INSTANCE_ID_FILE = 'instance.id';
|
|
6
|
+
/**
|
|
7
|
+
* Get or create the instance ID for a hive workspace.
|
|
8
|
+
* The ID is stored in .hive/instance.id.
|
|
9
|
+
* Returns null if the hive directory does not exist.
|
|
10
|
+
* Only creates the file if the .hive directory already exists
|
|
11
|
+
* (i.e., this is a real workspace, not a test environment).
|
|
12
|
+
*/
|
|
13
|
+
export function getInstanceId(hiveDir) {
|
|
14
|
+
if (!existsSync(hiveDir)) {
|
|
15
|
+
return null;
|
|
16
|
+
}
|
|
17
|
+
const instancePath = join(hiveDir, INSTANCE_ID_FILE);
|
|
18
|
+
if (existsSync(instancePath)) {
|
|
19
|
+
const id = readFileSync(instancePath, 'utf-8').trim();
|
|
20
|
+
if (id)
|
|
21
|
+
return id;
|
|
22
|
+
}
|
|
23
|
+
// Generate a short unique ID for this workspace instance
|
|
24
|
+
const id = nanoid(6);
|
|
25
|
+
try {
|
|
26
|
+
writeFileSync(instancePath, id, 'utf-8');
|
|
27
|
+
}
|
|
28
|
+
catch {
|
|
29
|
+
// If write fails (e.g., read-only filesystem), use in-memory ID
|
|
30
|
+
}
|
|
31
|
+
return id;
|
|
32
|
+
}
|
|
33
|
+
/**
|
|
34
|
+
* Get the instance-scoped tmux session prefix.
|
|
35
|
+
* Falls back to 'hive' if no instance ID is available.
|
|
36
|
+
*/
|
|
37
|
+
export function getInstancePrefix(hiveDir) {
|
|
38
|
+
const instanceId = getInstanceId(hiveDir);
|
|
39
|
+
if (instanceId) {
|
|
40
|
+
return `hive-${instanceId}`;
|
|
41
|
+
}
|
|
42
|
+
return 'hive';
|
|
43
|
+
}
|
|
44
|
+
/**
|
|
45
|
+
* Build an instance-scoped session name.
|
|
46
|
+
* Pattern: hive-<instanceId>-<agentType>[-<teamName>][-<index>]
|
|
47
|
+
* Falls back to hive-<agentType>[-<teamName>][-<index>] if no instance ID.
|
|
48
|
+
*/
|
|
49
|
+
export function buildInstanceSessionName(hiveDir, agentType, teamName, index) {
|
|
50
|
+
const prefix = getInstancePrefix(hiveDir);
|
|
51
|
+
let name = `${prefix}-${agentType}`;
|
|
52
|
+
if (teamName) {
|
|
53
|
+
name += `-${teamName}`;
|
|
54
|
+
}
|
|
55
|
+
if (index !== undefined && index > 1) {
|
|
56
|
+
name += `-${index}`;
|
|
57
|
+
}
|
|
58
|
+
return name;
|
|
59
|
+
}
|
|
60
|
+
/**
|
|
61
|
+
* Build the instance-scoped tech lead session name.
|
|
62
|
+
*/
|
|
63
|
+
export function getTechLeadSessionName(hiveDir) {
|
|
64
|
+
return buildInstanceSessionName(hiveDir, 'tech-lead');
|
|
65
|
+
}
|
|
66
|
+
/**
|
|
67
|
+
* Build the instance-scoped manager session name.
|
|
68
|
+
*/
|
|
69
|
+
export function getManagerSessionName(hiveDir) {
|
|
70
|
+
return buildInstanceSessionName(hiveDir, 'manager');
|
|
71
|
+
}
|
|
72
|
+
/**
|
|
73
|
+
* Build the instance-scoped manager lock path.
|
|
74
|
+
*/
|
|
75
|
+
export function getManagerLockPath(hiveDir) {
|
|
76
|
+
const instanceId = getInstanceId(hiveDir);
|
|
77
|
+
if (instanceId) {
|
|
78
|
+
return join(hiveDir, `manager-${instanceId}.lock`);
|
|
79
|
+
}
|
|
80
|
+
return join(hiveDir, 'manager.lock');
|
|
81
|
+
}
|
|
82
|
+
//# sourceMappingURL=instance.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"instance.js","sourceRoot":"","sources":["../../src/utils/instance.ts"],"names":[],"mappings":"AAAA,6DAA6D;AAE7D,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,MAAM,gBAAgB,GAAG,aAAa,CAAC;AAEvC;;;;;;GAMG;AACH,MAAM,UAAU,aAAa,CAAC,OAAe;IAC3C,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;IAErD,IAAI,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QAC7B,MAAM,EAAE,GAAG,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;QACtD,IAAI,EAAE;YAAE,OAAO,EAAE,CAAC;IACpB,CAAC;IAED,yDAAyD;IACzD,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IACrB,IAAI,CAAC;QACH,aAAa,CAAC,YAAY,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;IAC3C,CAAC;IAAC,MAAM,CAAC;QACP,gEAAgE;IAClE,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAC/C,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IAC1C,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,QAAQ,UAAU,EAAE,CAAC;IAC9B,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,wBAAwB,CACtC,OAAe,EACf,SAAiB,EACjB,QAAiB,EACjB,KAAc;IAEd,MAAM,MAAM,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAC1C,IAAI,IAAI,GAAG,GAAG,MAAM,IAAI,SAAS,EAAE,CAAC;IACpC,IAAI,QAAQ,EAAE,CAAC;QACb,IAAI,IAAI,IAAI,QAAQ,EAAE,CAAC;IACzB,CAAC;IACD,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;QACrC,IAAI,IAAI,IAAI,KAAK,EAAE,CAAC;IACtB,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,sBAAsB,CAAC,OAAe;IACpD,OAAO,wBAAwB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;AACxD,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,qBAAqB,CAAC,OAAe;IACnD,OAAO,wBAAwB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;AACtD,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAAC,OAAe;IAChD,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IAC1C,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,IAAI,CAAC,OAAO,EAAE,WAAW,UAAU,OAAO,CAAC,CAAC;IACrD,CAAC;IACD,OAAO,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;AACvC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"instance.test.d.ts","sourceRoot":"","sources":["../../src/utils/instance.test.ts"],"names":[],"mappings":""}
|