Skip to content

Commit 994ebbb

Browse files
committed
Merge main into per-person computers
Takes #872's allow-list format, which matches an entry by its test and expression rather than its line, with the expressions this branch changed (seats instead of bare Bot ids) and the cleared enterprise-controls entry removed.
2 parents c299092 + 72a0b1f commit 994ebbb

82 files changed

Lines changed: 847 additions & 4672 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎agent-adk/tests/test_model_spec.py‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,3 @@ def test_blank_environment_falls_through_to_the_file(monkeypatch):
3030
monkeypatch.setenv("BOT_PROVIDER", "")
3131
monkeypatch.setenv("BOT_MODEL", " ")
3232
assert bot_settings(BOT_ID) == BotSettings(provider="openai", model="gpt-4o-mini")
33-
34-
35-
def test_this_bots_source_reads_the_spec():
36-
source = (Path(__file__).resolve().parents[1] / "src" / "main.py").read_text(encoding="utf-8")
37-
assert f'bot_settings("agent-adk")' in source

‎agent-ag2/tests/test_model_spec.py‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,3 @@ def test_blank_environment_falls_through_to_the_file(monkeypatch):
3030
monkeypatch.setenv("BOT_PROVIDER", "")
3131
monkeypatch.setenv("BOT_MODEL", " ")
3232
assert bot_settings(BOT_ID) == BotSettings(provider="openai", model="gpt-4o-mini")
33-
34-
35-
def test_this_bots_source_reads_the_spec():
36-
source = (Path(__file__).resolve().parents[1] / "src" / "main.py").read_text(encoding="utf-8")
37-
assert f'bot_settings("agent-ag2")' in source

‎agent-agno/tests/test_model_spec.py‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,3 @@ def test_blank_environment_falls_through_to_the_file(monkeypatch):
3030
monkeypatch.setenv("BOT_PROVIDER", "")
3131
monkeypatch.setenv("BOT_MODEL", " ")
3232
assert bot_settings(BOT_ID) == BotSettings(provider="openai", model="gpt-5.5")
33-
34-
35-
def test_this_bots_source_reads_the_spec():
36-
source = (Path(__file__).resolve().parents[1] / "src" / "main.py").read_text(encoding="utf-8")
37-
assert f'bot_settings("agent-agno")' in source

‎agent-antigravity/tests/test_model_spec.py‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -40,23 +40,3 @@ def test_the_model_is_still_the_deployments_to_choose(monkeypatch):
4040
assert bot_settings(BOT_ID, pinned_provider=PINNED) == BotSettings(
4141
provider="google", model="gemini-3.8-flash"
4242
)
43-
44-
45-
def test_this_bots_source_reads_the_spec_with_the_pin():
46-
source = (Path(__file__).resolve().parents[1] / "src" / "main.py").read_text(encoding="utf-8")
47-
assert 'bot_settings("agent-antigravity", pinned_provider="google")' in source
48-
49-
50-
def test_the_key_and_base_url_come_from_the_provider_row():
51-
"""Not hardcoded here.
52-
53-
`shared/model-providers.json` names Google's key and base-url variables, and a Bot that
54-
spelled them out itself would drift from the file the moment either changed. The base-url
55-
variable is what points this Bot at a Gemini-compatible endpoint — a gateway, or aimock —
56-
instead of Google.
57-
"""
58-
source = (Path(__file__).resolve().parents[1] / "src" / "main.py").read_text(encoding="utf-8")
59-
assert '"key_variable"' in source
60-
assert '"base_url_variable"' in source
61-
assert "GOOGLE_API_KEY" not in source
62-
assert "GOOGLE_GENERATIVE_AI_BASE_URL" not in source

‎agent-computer/tests/aria-snapshot.test.ts‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,6 @@ const CAPTURED = `- generic [ref=e2]:
4646
- button "Submit order" [ref=e44]`;
4747

4848
describe("parseAriaSnapshot, against captured output", () => {
49-
test("the fixture is genuinely valid YAML", () => {
50-
// The guard against the mistake that made this rewrite necessary: an invented fixture will most
51-
// likely fail here first.
52-
expect(() => Bun.YAML.parse(CAPTURED)).not.toThrow();
53-
});
54-
5549
test("keeps the controls and drops the scaffolding", () => {
5650
const { elements } = parseAriaSnapshot(CAPTURED);
5751
// `generic`, `paragraph`, `group` and `text` all carry refs but are not things a Bot can act on,
@@ -132,10 +126,6 @@ describe("parseAriaSnapshot, against captured output", () => {
132126
- checkbox "Extra Cheese" [ref=e9]
133127
- text: Extra Cheese`;
134128

135-
test("the mixed fixture is genuinely valid YAML", () => {
136-
expect(() => Bun.YAML.parse(MIXED)).not.toThrow();
137-
});
138-
139129
test("a half-ticked box is not reported as ticked", () => {
140130
const byName = new Map(
141131
parseAriaSnapshot(MIXED).elements.map((e) => [e.name, e]),

‎agent-computer/tests/viewer.test.ts‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -161,19 +161,6 @@ describe("a close that lands while the browser is still starting", () => {
161161
expect(claim.setFollow(() => {})).toBe(false);
162162
});
163163

164-
test("the claim is released even when the launch threw", async () => {
165-
// `open`'s catch closes the socket after sending an error frame. If nothing released the claim
166-
// there, the slot would stay occupied forever and `forgetIdle` could never sweep the
167-
// session, which is the unbounded growth it exists to stop.
168-
const slot = createViewerSlot();
169-
const socket = { id: "a" };
170-
slot.claim(socket, () => {});
171-
172-
await slot.release(socket);
173-
174-
expect(slot.occupied()).toBe(false);
175-
});
176-
177164
test("releasing the same socket twice is harmless", async () => {
178165
// The catch path closes the socket, so `close` runs release a second time for the same socket.
179166
const slot = createViewerSlot();
@@ -448,18 +435,6 @@ describe("the session sweep asking whether anybody is watching", () => {
448435
expect(slot.occupied()).toBe(true);
449436
});
450437

451-
test("a Bot stays watched until teardown has finished", async () => {
452-
const slot = createViewerSlot();
453-
const socket = { id: "a" };
454-
const claim = slot.claim(socket, () => {});
455-
await claim.install(fakeCast());
456-
457-
const releasing = slot.release(socket);
458-
await releasing;
459-
460-
expect(slot.occupied()).toBe(false);
461-
});
462-
463438
test("a Bot is still watched while its cast is stopping", async () => {
464439
// Occupancy has to count the teardown itself, not just whether somebody holds the slot. The
465440
// sweep drops sessions with nobody watching and no live browser, and a session dropped while its

‎agent-crewai/tests/test_model_spec.py‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,3 @@ def test_blank_environment_falls_through_to_the_file(monkeypatch):
3030
monkeypatch.setenv("BOT_PROVIDER", "")
3131
monkeypatch.setenv("BOT_MODEL", " ")
3232
assert bot_settings(BOT_ID) == BotSettings(provider="openai", model="gpt-5.5")
33-
34-
35-
def test_this_bots_source_reads_the_spec():
36-
source = (Path(__file__).resolve().parents[1] / "src" / "main.py").read_text(encoding="utf-8")
37-
assert f'bot_settings("agent-crewai")' in source

‎agent-crewai/tests/test_token_restoration.py‎

Lines changed: 0 additions & 175 deletions
This file was deleted.

‎agent-langgraph-agui/tests/test_model_spec.py‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,3 @@ def test_blank_environment_falls_through_to_the_file(monkeypatch):
3030
monkeypatch.setenv("BOT_PROVIDER", "")
3131
monkeypatch.setenv("BOT_MODEL", " ")
3232
assert bot_settings(BOT_ID) == BotSettings(provider="openai", model="gpt-4o-mini")
33-
34-
35-
def test_this_bots_source_reads_the_spec():
36-
source = (Path(__file__).resolve().parents[1] / "src" / "main.py").read_text(encoding="utf-8")
37-
assert f'bot_settings("agent-langgraph-agui")' in source

‎agent-langroid/tests/test_model_spec.py‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,3 @@ def test_blank_environment_falls_through_to_the_file(monkeypatch):
3030
monkeypatch.setenv("BOT_PROVIDER", "")
3131
monkeypatch.setenv("BOT_MODEL", " ")
3232
assert bot_settings(BOT_ID) == BotSettings(provider="openai", model="gpt-4o-mini")
33-
34-
35-
def test_this_bots_source_reads_the_spec():
36-
source = (Path(__file__).resolve().parents[1] / "src" / "main.py").read_text(encoding="utf-8")
37-
assert f'bot_settings("agent-langroid")' in source

0 commit comments

Comments
 (0)