Skip to content

A desktop coding agent with free access to frontier models.

TypeScript

fix: prefetch only when the sandbox is required

ogsamrat68ea6fbf7e7f
diff --git a/apps/server/src/box/box-required-service.test.ts b/apps/server/src/box/box-required-service.test.ts
index 5fa32543..69192d19 100644
--- a/apps/server/src/box/box-required-service.test.ts
+++ b/apps/server/src/box/box-required-service.test.ts
@@ -57,7 +57,9 @@ describe("required sandbox: the server's answer", () => {
expect(rememberServerDefault(state, { local_box: { default: "on" } })).toBe(true);
// A newer server says the same thing with more keys: nothing to plan again.
expect(rememberServerDefault(state, { local_box: { default: "on", required: false, required_fallback: null, setup: { prefetch: true } } })).toBe(false);
- expect(serverRequired(state)).toEqual({ required: false, fallback: "native", prefetch: true });
+ // Not required: prefetch is never on and the file holds exactly the keys it held before.
+ expect(serverRequired(state)).toEqual({ required: false, fallback: "native", prefetch: false });
+ expect(Object.keys(JSON.parse(await readFile(join(state, "box-server.json"), "utf8"))).sort()).toEqual(["at", "backends", "default", "max_turn_bytes"]);
expect(rememberServerDefault(state, { local_box: { default: "on", required: true, required_fallback: "native", setup: { prefetch: true } } })).toBe(true);
expect(serverRequired(state)).toEqual({ required: true, fallback: "native", prefetch: true });
expect(rememberServerDefault(state, { local_box: { default: "on", required: true, required_fallback: "native_uncounted", setup: { prefetch: true } } })).toBe(true);
@@ -213,6 +215,17 @@ describe("required sandbox: the desktop's projects", () => {
expect(await boxes.prefetch()).toBe(false);
});
+ test("a server that says `on` with prefetch: no prefetch for a device it does not require", async () => {
+ const stateDir = await temp("state");
+ rememberServerDefault(stateDir, { local_box: { default: "on", required: false, setup: { prefetch: true } } });
+ expect(serverRequired(stateDir).prefetch).toBe(false);
+ const boxes = service({ stateDir, workspaces: [], env: { OMNIRUSH_BOX_HOME: await temp("boxhome") } });
+ let detected = false;
+ (boxes as unknown as { detect: () => Promise<null> }).detect = async () => { detected = true; return null; };
+ expect(await boxes.prefetch()).toBe(false);
+ expect(detected).toBe(false);
+ });
+
test("an older server: unchanged (the project's off still turns it off, no setup, not required)", async () => {
const stateDir = await temp("state");
const root = await temp("project");
diff --git a/apps/server/src/box/launch.ts b/apps/server/src/box/launch.ts
index d88f4d39..30865a68 100644
--- a/apps/server/src/box/launch.ts
+++ b/apps/server/src/box/launch.ts
@@ -72,7 +72,10 @@ export function serverBackends(stateDir: string): string[] | null {
export function serverRequired(stateDir: string): { required: boolean; fallback: RequiredFallback; prefetch: boolean } {
try {
const value = JSON.parse(readFileSync(path.join(stateDir, "box-server.json"), "utf8"));
- return { required: value?.required === true, fallback: requiredFallback(value?.required_fallback), prefetch: value?.prefetch === true };
+ const required = value?.required === true;
+ // Prefetch is part of the requirement: a server that says `on` also says prefetch, and a
+ // device it does not require keeps today's behaviour (the image is fetched by a chat's plan).
+ return { required, fallback: requiredFallback(value?.required_fallback), prefetch: required && value?.prefetch === true };
} catch {
return { required: false, fallback: "native", prefetch: false };
}
@@ -99,7 +102,10 @@ export function rememberServerDefault(stateDir: string, capabilities: { local_bo
const before = JSON.stringify([serverDefault(stateDir), serverBackends(stateDir), was.required, was.required ? was.fallback : null]);
try {
mkdirSync(stateDir, { recursive: true });
- writeFileSync(path.join(stateDir, "box-server.json"), JSON.stringify({ default: value, max_turn_bytes: fields.max_turn_bytes ?? null, backends, required, required_fallback: fallback, prefetch: setup.prefetch === true, at: Date.now() }), { mode: 0o600 });
+ // The required keys are written only when the server requires the sandbox, so the file is
+ // exactly what it was before them otherwise (the CLI's requiredBlock does the same).
+ const extra = required ? { required, required_fallback: fallback, prefetch: setup.prefetch === true } : {};
+ writeFileSync(path.join(stateDir, "box-server.json"), JSON.stringify({ default: value, max_turn_bytes: fields.max_turn_bytes ?? null, backends, ...extra, at: Date.now() }), { mode: 0o600 });
} catch { /* best effort */ }
return before !== JSON.stringify([value, backends, required, required ? fallback : null]);
}