Skip to content

The open-source app everyone uses to manage agents at work

merge master into pap-1078-qol-fixes

dottafb3b57ab1f96
diff --cc scripts/release-package-map.mjs
index 7995637350,7995637350..60deba3104
--- a/scripts/release-package-map.mjs
+++ b/scripts/release-package-map.mjs
@@@ -123,11 -123,11 +123,14 @@@ function setVersion(version)
`.version("${version}")`,
);
-- if (cliEntry === nextCliEntry) {
-- throw new Error("failed to rewrite CLI version string in cli/src/index.ts");
++ if (cliEntry !== nextCliEntry) {
++ writeFileSync(cliEntryPath, nextCliEntry);
++ return;
}
-- writeFileSync(cliEntryPath, nextCliEntry);
++ if (!cliEntry.includes(".version(cliVersion)")) {
++ throw new Error("failed to rewrite CLI version string in cli/src/index.ts");
++ }
}
function listPackages() {
diff --cc server/src/__tests__/workspace-runtime.test.ts
index cfa17e87c1,cfa17e87c1..3f93ccf688
--- a/server/src/__tests__/workspace-runtime.test.ts
+++ b/server/src/__tests__/workspace-runtime.test.ts
@@@ -552,7 -552,7 +552,7 @@@ describe("realizeExecutionWorkspace", (
} finally {
process.chdir(previousCwd);
}
-- });
++ }, 15_000);
it("records worktree setup and provision operations when a recorder is provided", async () => {
const repoRoot = await createTempRepo();
diff --cc ui/src/lib/keyboardShortcuts.test.ts
index 7fa66bc392,90d4281ad9..1495fe4098
--- a/ui/src/lib/keyboardShortcuts.test.ts
+++ b/ui/src/lib/keyboardShortcuts.test.ts
@@@ -33,13 -33,6 +33,12 @@@ describe("keyboardShortcuts helpers", (
expect(hasBlockingShortcutDialog(document.createElement("div"))).toBe(false);
});
+ it("ignores non-dialog elements that happen to be aria-modal", () => {
+ const root = document.createElement("div");
+ root.innerHTML = `<section aria-modal="true"></section>`;
+
+ expect(hasBlockingShortcutDialog(root)).toBe(false);
+ });
-
it("archives only the first clean y press", () => {
const button = document.createElement("button");