@empiricalrun/test-gen 0.65.0 → 0.66.0

package/dist/tools/utils/index.js

@@ -1,7 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.GITHUB_API_BASE = void 0;
 exports.makeDashboardRequest = makeDashboardRequest;
 exports.callGitHubProxy = callGitHubProxy;
+exports.parseGitHubUrl = parseGitHubUrl;
+exports.findExistingPR = findExistingPR;
+exports.createPullRequest = createPullRequest;
+exports.updatePullRequest = updatePullRequest;
+exports.findOrCreatePullRequest = findOrCreatePullRequest;
 async function makeDashboardRequest({ path, method = "GET", body, apiKey, }) {
     const requestHeaders = {
         "Content-Type": "application/json",
@@ -33,3 +39,84 @@ async function callGitHubProxy({ method, url, body, apiKey, }) {
         apiKey,
     });
 }
+// Common GitHub constants
+exports.GITHUB_API_BASE = "https://api.github.com/repos/empirical-run";
+function parseGitHubUrl(url) {
+    const githubIndex = url.indexOf("github.com");
+    if (githubIndex === -1) {
+        throw new Error("Invalid GitHub repository URL");
+    }
+    const [owner, repo] = url
+        .substring(githubIndex + "github.com/".length)
+        .replace(".git", "")
+        .split("/");
+    if (!owner || !repo) {
+        throw new Error("Invalid GitHub repository URL format - missing owner or repo");
+    }
+    return { owner, repo };
+}
+async function findExistingPR({ owner, repo, branchName, apiKey, }) {
+    const prs = (await callGitHubProxy({
+        method: "GET",
+        url: `https://api.github.com/repos/${owner}/${repo}/pulls`,
+        body: {
+            head: `${owner}:${branchName}`,
+            state: "open",
+        },
+        apiKey,
+    }));
+    return prs?.find((pr) => pr.head.ref === branchName) || null;
+}
+async function createPullRequest({ owner, repo, title, head, base = "main", body, labels, apiKey, }) {
+    const createPrBody = {
+        title,
+        head,
+        base,
+        body,
+        ...(labels && { labels }),
+    };
+    const pr = (await callGitHubProxy({
+        method: "POST",
+        url: `https://api.github.com/repos/${owner}/${repo}/pulls`,
+        body: createPrBody,
+        apiKey,
+    }));
+    if (!pr || !("number" in pr)) {
+        throw new Error(`Failed to create PR or PR number missing in response.`);
+    }
+    return pr;
+}
+async function updatePullRequest({ owner, repo, prNumber, body, apiKey, }) {
+    const updateBody = {};
+    if (body)
+        updateBody.body = body;
+    return (await callGitHubProxy({
+        method: "PATCH",
+        url: `https://api.github.com/repos/${owner}/${repo}/pulls/${prNumber}`,
+        body: updateBody,
+        apiKey,
+    }));
+}
+async function findOrCreatePullRequest({ owner, repo, branchName, title, body, labels, apiKey, }) {
+    // Check for existing PR
+    const existingPR = await findExistingPR({
+        owner,
+        repo,
+        branchName,
+        apiKey,
+    });
+    if (existingPR) {
+        return { pr: existingPR, isNew: false };
+    }
+    // Create new PR
+    const newPR = await createPullRequest({
+        owner,
+        repo,
+        title,
+        head: branchName,
+        body,
+        labels,
+        apiKey,
+    });
+    return { pr: newPR, isNew: true };
+}

package/dist/utils/git.d.ts

@@ -1,6 +1,7 @@
 export declare function getGitDiff(filepath: string, cwd: string): string;
+export declare function getGitDiffForNewFile(filepath: string, cwd: string): string;
 export declare function checkoutBranch(branchName: string, cwd: string): Promise<void>;
-export declare function commitAsBotUser(commitMessage: string, cwd: string): Promise<void>;
+export declare function commitAsBotUser(commitMessage: string, cwd: string): Promise<boolean>;
 export declare function getCurrentBranchName(repoPath: string): Promise<string>;
 export declare function pullBranch(branchName: string, cwd: string): Promise<void>;
 export declare function commitFilesAndPushBranch({ commitMessage, branchName, files, repoPath, }: {
@@ -10,4 +11,14 @@ export declare function commitFilesAndPushBranch({ commitMessage, branchName, fi
     repoPath: string;
 }): Promise<void>;
 export declare function getFilesChanged(cwd: string): Promise<string[]>;
+export declare function mergePullRequest({ repoName, prNumber, apiKey, }: {
+    repoName: string;
+    prNumber: number;
+    apiKey: string;
+}): Promise<boolean>;
+export declare function deleteBranch({ repoName, branchName, apiKey, }: {
+    repoName: string;
+    branchName: string;
+    apiKey: string;
+}): Promise<void>;
 //# sourceMappingURL=git.d.ts.map

package/dist/utils/git.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../src/utils/git.ts"],"names":[],"mappings":"AAKA,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAMhE;AAED,wBAAsB,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,iBAQnE;AAED,wBAAsB,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,iBAavE;AAED,wBAAsB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,mBAO1D;AAED,wBAAsB,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,iBAE/D;AAED,wBAAsB,wBAAwB,CAAC,EAC7C,aAAa,EACb,UAAU,EACV,KAAK,EACL,QAAQ,GACT,EAAE;IACD,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB,iBAIA;AAED,wBAAsB,eAAe,CAAC,GAAG,EAAE,MAAM,qBAUhD"}
+{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../src/utils/git.ts"],"names":[],"mappings":"AAOA,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAMhE;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAe1E;AAED,wBAAsB,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,iBAQnE;AAED,wBAAsB,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,oBAcvE;AAED,wBAAsB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,mBAO1D;AAED,wBAAsB,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,iBAE/D;AAED,wBAAsB,wBAAwB,CAAC,EAC7C,aAAa,EACb,UAAU,EACV,KAAK,EACL,QAAQ,GACT,EAAE;IACD,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB,iBAIA;AAED,wBAAsB,eAAe,CAAC,GAAG,EAAE,MAAM,qBAUhD;AAED,wBAAsB,gBAAgB,CAAC,EACrC,QAAQ,EACR,QAAQ,EACR,MAAM,GACP,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB,oBA+BA;AAED,wBAAsB,YAAY,CAAC,EACjC,QAAQ,EACR,UAAU,EACV,MAAM,GACP,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAChB,iBAoBA"}

package/dist/utils/git.js

@@ -1,13 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGitDiff = getGitDiff;
+exports.getGitDiffForNewFile = getGitDiffForNewFile;
 exports.checkoutBranch = checkoutBranch;
 exports.commitAsBotUser = commitAsBotUser;
 exports.getCurrentBranchName = getCurrentBranchName;
 exports.pullBranch = pullBranch;
 exports.commitFilesAndPushBranch = commitFilesAndPushBranch;
 exports.getFilesChanged = getFilesChanged;
+exports.mergePullRequest = mergePullRequest;
+exports.deleteBranch = deleteBranch;
 const child_process_1 = require("child_process");
+const utils_1 = require("../tools/utils");
 const GIT_USER_NAME = "empiricalrun[bot]";
 const GIT_USER_EMAIL = "180257021+empiricalrun[bot]@users.noreply.github.com";
 function getGitDiff(filepath, cwd) {
@@ -17,6 +21,23 @@ function getGitDiff(filepath, cwd) {
     });
     return diff;
 }
+function getGitDiffForNewFile(filepath, cwd) {
+    try {
+        const diff = (0, child_process_1.execSync)(`git diff --no-index /dev/null ${filepath}`, {
+            encoding: "utf-8",
+            cwd,
+        });
+        return diff;
+    }
+    catch (error) {
+        // git diff returns exit code 1 when files differ, which is expected for new files
+        if (error.status === 1 && error.stdout) {
+            return error.stdout;
+        }
+        // Re-throw for other errors (exit code 2, etc.)
+        throw error;
+    }
+}
 async function checkoutBranch(branchName, cwd) {
     // TODO: This assumes repoDir is process.cwd()
     try {
@@ -33,10 +54,11 @@ async function commitAsBotUser(commitMessage, cwd) {
         cwd,
     });
     if (!status) {
-        return; // Nothing to commit
+        return false; // Nothing to commit
     }
     const commitMessageWithSkipCi = `${commitMessage} [skip ci]`;
     (0, child_process_1.execSync)(`git -c user.name="${GIT_USER_NAME}" -c user.email="${GIT_USER_EMAIL}" commit -m "${commitMessageWithSkipCi}"`, { cwd });
+    return true;
 }
 async function getCurrentBranchName(repoPath) {
     const branchName = (0, child_process_1.execSync)("git branch --show-current", {
@@ -65,3 +87,46 @@ async function getFilesChanged(cwd) {
         .filter((fileName) => fileName != "");
     return filesChanged;
 }
+async function mergePullRequest({ repoName, prNumber, apiKey, }) {
+    const url = `${utils_1.GITHUB_API_BASE}/${repoName}/pulls/${prNumber}/merge`;
+    const mergeBody = {
+        merge_method: "squash",
+    };
+    try {
+        const response = await (0, utils_1.callGitHubProxy)({
+            method: "PUT",
+            url: url,
+            body: mergeBody,
+            apiKey,
+        });
+        if (!response?.merged) {
+            console.log(`PR #${prNumber} for ${repoName} could not be merged: ${response.message}`);
+            return false;
+        }
+        console.log(`Merged PR #${prNumber} for ${repoName} via proxy`);
+        return true;
+    }
+    catch (error) {
+        console.error(`Error merging PR #${prNumber} for ${repoName} via proxy: ${error.message}`);
+        return false;
+    }
+}
+async function deleteBranch({ repoName, branchName, apiKey, }) {
+    const url = `${utils_1.GITHUB_API_BASE}/${repoName}/git/refs/heads/${branchName}`;
+    try {
+        await (0, utils_1.callGitHubProxy)({
+            method: "DELETE",
+            url: url,
+            apiKey,
+        });
+        console.log(`Deleted branch ${branchName} from ${repoName} via proxy`);
+    }
+    catch (error) {
+        if (error.message?.includes("422")) {
+            console.log(`Branch ${branchName} likely already deleted or never existed on ${repoName}.`);
+        }
+        else {
+            console.error(`Error deleting branch ${branchName} from ${repoName} via proxy: ${error.message}`);
+        }
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@empiricalrun/test-gen",
-  "version": "0.65.0",
+  "version": "0.66.0",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
@@ -62,9 +62,9 @@
     "tsx": "^4.16.2",
     "typescript": "^5.3.3",
     "zod": "^3.23.8",
-    "@empiricalrun/llm": "^0.18.0",
+    "@empiricalrun/llm": "^0.18.1",
     "@empiricalrun/r2-uploader": "^0.3.9",
-    "@empiricalrun/test-run": "^0.10.1"
+    "@empiricalrun/test-run": "^0.10.2"
   },
   "devDependencies": {
     "@playwright/test": "1.47.1",
@@ -79,7 +79,7 @@
     "playwright": "1.47.1",
     "serve-handler": "^6.1.6",
     "ts-patch": "^3.3.0",
-    "@empiricalrun/shared-types": "0.5.0"
+    "@empiricalrun/shared-types": "0.5.1"
   },
   "scripts": {
     "dev": "tspc --build --watch",

package/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/index.ts","./src/actions/assert.ts","./src/actions/click.ts","./src/actions/done.ts","./src/actions/fill.ts","./src/actions/goto.ts","./src/actions/hover.ts","./src/actions/index.ts","./src/actions/next-task.ts","./src/actions/press.ts","./src/actions/skill.ts","./src/actions/text-content.ts","./src/actions/constants/index.ts","./src/actions/utils/index.ts","./src/agent/browsing/index.ts","./src/agent/browsing/run.ts","./src/agent/browsing/utils.ts","./src/agent/chat/agent-loop.ts","./src/agent/chat/exports.ts","./src/agent/chat/index.ts","./src/agent/chat/models.ts","./src/agent/chat/prompt.ts","./src/agent/chat/repo.ts","./src/agent/chat/state.ts","./src/agent/chat/types.ts","./src/agent/chat/utils.ts","./src/agent/codegen/create-test-block.ts","./src/agent/codegen/fix-ts-errors.ts","./src/agent/codegen/generate-code-apply-changes.ts","./src/agent/codegen/lexical-scoped-vars.ts","./src/agent/codegen/repo-edit.ts","./src/agent/codegen/run.ts","./src/agent/codegen/skills-retriever.ts","./src/agent/codegen/test-update-feedback.ts","./src/agent/codegen/types.ts","./src/agent/codegen/update-flow.ts","./src/agent/codegen/use-skill.ts","./src/agent/codegen/utils.ts","./src/agent/cua/computer.ts","./src/agent/cua/index.ts","./src/agent/cua/model.ts","./src/agent/cua/pw-codegen/element-from-point.ts","./src/agent/cua/pw-codegen/types.ts","./src/agent/cua/pw-codegen/pw-pause/index.ts","./src/agent/cua/pw-codegen/pw-pause/utils.ts","./src/agent/diagnosis-agent/index.ts","./src/agent/diagnosis-agent/strict-mode-violation.ts","./src/agent/enrich-prompt/index.ts","./src/agent/enrich-prompt/utils.ts","./src/agent/infer-agent/index.ts","./src/agent/master/action-tool-calls.ts","./src/agent/master/element-annotation.ts","./src/agent/master/execute-browser-action.ts","./src/agent/master/execute-skill-action.ts","./src/agent/master/next-action.ts","./src/agent/master/planner.ts","./src/agent/master/run.ts","./src/agent/master/scroller.ts","./src/agent/master/with-hints.ts","./src/agent/master/browser-tests/cua.spec.ts","./src/agent/master/browser-tests/fixtures.ts","./src/agent/master/browser-tests/index.spec.ts","./src/agent/master/browser-tests/skills.spec.ts","./src/agent/master/icon-descriptor/index.ts","./src/agent/master/icon-descriptor/normalize-svg.ts","./src/agent/planner/run-time-planner.ts","./src/agent/planner/run.ts","./src/artifacts/index.ts","./src/artifacts/utils.ts","./src/bin/index.ts","./src/bin/logger/index.ts","./src/bin/utils/context.ts","./src/bin/utils/index.ts","./src/bin/utils/fs/index.ts","./src/bin/utils/platform/web/index.ts","./src/bin/utils/platform/web/test-files/ts-path-import-validate.ts","./src/bin/utils/scenarios/index.ts","./src/browser-injected-scripts/annotate-elements.spec.ts","./src/constants/index.ts","./src/errors/index.ts","./src/evals/add-scenario-agent.evals.ts","./src/evals/append-create-test-agent.evals.ts","./src/evals/fetch-pom-skills-agent.evals.ts","./src/evals/infer-master-or-code-agent.evals.ts","./src/evals/master-agent.evals.ts","./src/evals/type.ts","./src/evals/update-scenario-agent.evals.ts","./src/file/client.ts","./src/file/server.ts","./src/human-in-the-loop/cli.ts","./src/human-in-the-loop/index.ts","./src/human-in-the-loop/ipc.ts","./src/page/index.ts","./src/prompts/lib/ts-transformer.ts","./src/reporter/index.ts","./src/reporter/lib.ts","./src/session/index.ts","./src/test-build/index.ts","./src/tool-call-service/index.ts","./src/tool-call-service/utils.ts","./src/tools/commit-and-create-pr.ts","./src/tools/diagnosis-fetcher.ts","./src/tools/download-build.ts","./src/tools/list-environments.ts","./src/tools/str_replace_editor.ts","./src/tools/test-gen-browser.ts","./src/tools/test-run.ts","./src/tools/grep/index.ts","./src/tools/grep/ripgrep/index.ts","./src/tools/grep/ripgrep/types.ts","./src/tools/test-run-fetcher/index.ts","./src/tools/test-run-fetcher/types.ts","./src/tools/utils/index.ts","./src/types/handlebars.d.ts","./src/types/index.ts","./src/uploader/index.ts","./src/uploader/utils.ts","./src/utils/checkpoint.ts","./src/utils/env.ts","./src/utils/exec.ts","./src/utils/file-tree.ts","./src/utils/file.ts","./src/utils/git.ts","./src/utils/html.ts","./src/utils/index.ts","./src/utils/json.ts","./src/utils/repo-tree.ts","./src/utils/slug.ts","./src/utils/string.ts","./src/utils/stripAnsi.ts"],"version":"5.8.3"}
+{"root":["./src/index.ts","./src/actions/assert.ts","./src/actions/click.ts","./src/actions/done.ts","./src/actions/fill.ts","./src/actions/goto.ts","./src/actions/hover.ts","./src/actions/index.ts","./src/actions/next-task.ts","./src/actions/press.ts","./src/actions/skill.ts","./src/actions/text-content.ts","./src/actions/constants/index.ts","./src/actions/utils/index.ts","./src/agent/browsing/index.ts","./src/agent/browsing/run.ts","./src/agent/browsing/utils.ts","./src/agent/chat/agent-loop.ts","./src/agent/chat/exports.ts","./src/agent/chat/index.ts","./src/agent/chat/models.ts","./src/agent/chat/prompt.ts","./src/agent/chat/repo.ts","./src/agent/chat/state.ts","./src/agent/chat/types.ts","./src/agent/chat/utils.ts","./src/agent/codegen/create-test-block.ts","./src/agent/codegen/fix-ts-errors.ts","./src/agent/codegen/generate-code-apply-changes.ts","./src/agent/codegen/lexical-scoped-vars.ts","./src/agent/codegen/repo-edit.ts","./src/agent/codegen/run.ts","./src/agent/codegen/skills-retriever.ts","./src/agent/codegen/test-update-feedback.ts","./src/agent/codegen/types.ts","./src/agent/codegen/update-flow.ts","./src/agent/codegen/use-skill.ts","./src/agent/codegen/utils.ts","./src/agent/cua/computer.ts","./src/agent/cua/index.ts","./src/agent/cua/model.ts","./src/agent/cua/pw-codegen/element-from-point.ts","./src/agent/cua/pw-codegen/types.ts","./src/agent/cua/pw-codegen/pw-pause/index.ts","./src/agent/cua/pw-codegen/pw-pause/ipc.ts","./src/agent/cua/pw-codegen/pw-pause/patch.ts","./src/agent/diagnosis-agent/index.ts","./src/agent/diagnosis-agent/strict-mode-violation.ts","./src/agent/enrich-prompt/index.ts","./src/agent/enrich-prompt/utils.ts","./src/agent/infer-agent/index.ts","./src/agent/master/action-tool-calls.ts","./src/agent/master/element-annotation.ts","./src/agent/master/execute-browser-action.ts","./src/agent/master/execute-skill-action.ts","./src/agent/master/next-action.ts","./src/agent/master/planner.ts","./src/agent/master/run.ts","./src/agent/master/scroller.ts","./src/agent/master/with-hints.ts","./src/agent/master/browser-tests/cua.spec.ts","./src/agent/master/browser-tests/fixtures.ts","./src/agent/master/browser-tests/index.spec.ts","./src/agent/master/browser-tests/skills.spec.ts","./src/agent/master/icon-descriptor/index.ts","./src/agent/master/icon-descriptor/normalize-svg.ts","./src/agent/planner/run-time-planner.ts","./src/agent/planner/run.ts","./src/artifacts/index.ts","./src/artifacts/utils.ts","./src/bin/index.ts","./src/bin/logger/index.ts","./src/bin/utils/context.ts","./src/bin/utils/index.ts","./src/bin/utils/fs/index.ts","./src/bin/utils/platform/web/index.ts","./src/bin/utils/platform/web/test-files/ts-path-import-validate.ts","./src/bin/utils/scenarios/index.ts","./src/browser-injected-scripts/annotate-elements.spec.ts","./src/constants/index.ts","./src/errors/index.ts","./src/evals/add-scenario-agent.evals.ts","./src/evals/append-create-test-agent.evals.ts","./src/evals/fetch-pom-skills-agent.evals.ts","./src/evals/infer-master-or-code-agent.evals.ts","./src/evals/master-agent.evals.ts","./src/evals/type.ts","./src/evals/update-scenario-agent.evals.ts","./src/file/client.ts","./src/file/server.ts","./src/human-in-the-loop/cli.ts","./src/human-in-the-loop/index.ts","./src/human-in-the-loop/ipc.ts","./src/page/index.ts","./src/prompts/lib/ts-transformer.ts","./src/reporter/index.ts","./src/reporter/lib.ts","./src/session/index.ts","./src/test-build/index.ts","./src/tool-call-service/index.ts","./src/tool-call-service/utils.ts","./src/tools/commit-and-create-pr.ts","./src/tools/diagnosis-fetcher.ts","./src/tools/download-build.ts","./src/tools/list-environments.ts","./src/tools/str_replace_editor.ts","./src/tools/test-gen-browser.ts","./src/tools/test-run.ts","./src/tools/grep/index.ts","./src/tools/grep/ripgrep/index.ts","./src/tools/grep/ripgrep/types.ts","./src/tools/test-run-fetcher/index.ts","./src/tools/test-run-fetcher/types.ts","./src/tools/upgrade-packages/index.ts","./src/tools/upgrade-packages/utils.ts","./src/tools/utils/index.ts","./src/types/handlebars.d.ts","./src/types/index.ts","./src/uploader/index.ts","./src/uploader/utils.ts","./src/utils/checkpoint.ts","./src/utils/env.ts","./src/utils/exec.ts","./src/utils/file-tree.ts","./src/utils/file.ts","./src/utils/git.ts","./src/utils/html.ts","./src/utils/index.ts","./src/utils/json.ts","./src/utils/repo-tree.ts","./src/utils/slug.ts","./src/utils/string.ts","./src/utils/stripAnsi.ts"],"version":"5.8.3"}

package/dist/agent/cua/pw-codegen/pw-pause/utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/agent/cua/pw-codegen/pw-pause/utils.ts"],"names":[],"mappings":"AAIA;;;;;;;;;GASG;AAEH,wBAAsB,UAAU,CAAC,OAAO,EAAE,MAAM,+BAiB/C;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,OAuB1D;AAED,wBAAsB,sBAAsB,CAAC,OAAO,EAAE,MAAM,iBAoB3D;AAED,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,MAAM,iBAGxD;AAED,wBAAsB,WAAW,CAAC,iBAAiB,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,iBAkBxE"}