A desktop coding agent with free access to frontier models.
TypeScript
fix: web search off in Settings wins over the env override
ogsamrat7cafb305eef0
diff --git a/apps/server/src/server.ts b/apps/server/src/server.tsindex 0b703e91..1ce30cb1 100644--- a/apps/server/src/server.ts+++ b/apps/server/src/server.ts@@ -188,7 +188,7 @@ import { boxHome } from "./box/common.js";import { buildathonProjectsFile, reproStateFromBody, writeReproState } from "./buildathon-repro.js";import { prepareBoxInstallLog } from "./box/install-log.js";import { rememberServerDefault, watchServerDefault } from "./box/launch.js";-import { rememberWebSearchSwitch, serverWebSearchEnabled, userWebSearchEnabled, watchWebSearchSwitch, webSearchSetting, writeUserWebSearch } from "./web-search.js";+import { rememberWebSearchSwitch, userWebSearchEnabled, webSearchAllowed, watchWebSearchSwitch, webSearchSetting, writeUserWebSearch } from "./web-search.js";import { askSideQuestion, brokerSideCall } from "./side-question.js";import { createChatTracker, rememberComputerUseSwitch } from "./computer-use/desktop.js";import { registerComputerUseRoutes } from "./computer-use/routes.js";@@ -4914,7 +4914,7 @@ function createRoutes(const webSearchState = () => {const stateDir = runtimeStorageDir(config);const user = userWebSearchEnabled(stateDir);- const serverAllows = stockMode() || serverWebSearchEnabled(stateDir);+ const serverAllows = stockMode() || webSearchAllowed({ env: process.env, stateDir });return { enabled: user && serverAllows, user, serverAllows };};addRoute(routes, "GET", "/omnirush/web-search", "client", async () => jsonResponse(webSearchState()));diff --git a/apps/server/src/web-search.test.ts b/apps/server/src/web-search.test.tsindex 4d2b1820..59e5e3bd 100644--- a/apps/server/src/web-search.test.ts+++ b/apps/server/src/web-search.test.ts@@ -143,6 +143,8 @@ describe("the user's Settings switch", () => {writeUserWebSearch(dir, false);expect(webSearchSetting({ env: {}, stateDir: dir })).toMatchObject({ enabled: false, source: "user" });expect(hosted(webSearchSetting({ env: {}, stateDir: dir }))).toEqual([]);+ // The user's off wins over a test rig's OMNIRUSH_WEB_SEARCH=1 too.+ expect(webSearchSetting({ env: { OMNIRUSH_WEB_SEARCH: "1" }, stateDir: dir })).toMatchObject({ enabled: false, source: "user" });writeUserWebSearch(dir, true);expect(hosted(webSearchSetting({ env: {}, stateDir: dir }))).toEqual(serverBlock.models);// The server's switch off wins over the user's on.diff --git a/apps/server/src/web-search.ts b/apps/server/src/web-search.tsindex 7f5eca55..35e74bb3 100644--- a/apps/server/src/web-search.ts+++ b/apps/server/src/web-search.ts@@ -4,8 +4,8 @@* src/web-search.js.** Off unless something turns it on, in this order:- * 1. OMNIRUSH_WEB_SEARCH=1/on or 0/off in the server environment;- * 2. the user's Settings switch (<runtimeStorageDir>/web-search-user.json): off is off; on leaves it to the server;+ * 1. the user's Settings switch (<runtimeStorageDir>/web-search-user.json): off is off; on leaves it to the rest;+ * 2. OMNIRUSH_WEB_SEARCH=1/on or 0/off in the server environment;* 3. the server's switch: GET /collect/capabilities `web_search`* ({ enabled, search_context_size, models, clients, rollout_percent }),* as last seen (<runtimeStorageDir>/web-search-server.json). No block (an@@ -101,19 +101,19 @@ export function writeUserWebSearch(stateDir: string, enabled: boolean): void {writeFileSync(join(stateDir, WEB_SEARCH_USER_FILE), JSON.stringify({ enabled, at: Date.now() }), { mode: 0o600 });}-/** The server's switch as last seen (off when never seen). */-export function serverWebSearchEnabled(stateDir: string | undefined): boolean {- return Boolean(stateDir && rememberedSwitch(stateDir)?.enabled);+/** Whether web search is allowed apart from the user's switch: the environment override, else the server's switch as last seen. */+export function webSearchAllowed({ env = process.env, stateDir }: { env?: NodeJS.ProcessEnv; stateDir?: string } = {}): boolean {+ return webSearchSetting({ env, stateDir, user: true }).enabled;}/** Web search for the engine config; `models` (null: every model with the capability) comes from the server. */-export function webSearchSetting({ env = process.env, stateDir }: { env?: NodeJS.ProcessEnv; stateDir?: string } = {}): WebSearchSetting {+export function webSearchSetting({ env = process.env, stateDir, user }: { env?: NodeJS.ProcessEnv; stateDir?: string; user?: boolean } = {}): WebSearchSetting {const server = stateDir ? rememberedSwitch(stateDir) : null;const size = server?.searchContextSize ?? DEFAULT_SEARCH_CONTEXT_SIZE;+ if (!(user ?? userWebSearchEnabled(stateDir))) return { enabled: false, source: "user", searchContextSize: size, models: null };const asked = String(env.OMNIRUSH_WEB_SEARCH ?? "").trim().toLowerCase();if (["0", "off", "false", "no"].includes(asked)) return { enabled: false, source: "env", searchContextSize: size, models: null };if (["1", "on", "true", "yes"].includes(asked)) return { enabled: true, source: "env", searchContextSize: size, models: null };- if (!userWebSearchEnabled(stateDir)) return { enabled: false, source: "user", searchContextSize: size, models: null };if (server) return { ...server, source: "server" };return { enabled: false, source: "default", searchContextSize: size, models: null };}