Multi-Agent Collaboration for Team and Friends
TypeScript agent-automationagent-orchestrationagent-workflowai-agentsai-collaborationai-memoryai-workforceautonomous-agentsclaude-codeclaude-code-skillscodexcoding-agentmulti-agentmultiple-agentone-person-businessone-person-companyone-person-teamopencodesolopreneur
fix(web): separate tauri mode from service routing (#661)
Gener8ff894c8e8e2
diff --git a/src/web/src/components/community/machines/pair-machine-sheet.test.ts b/src/web/src/components/community/machines/pair-machine-sheet.test.tsindex ebea7de4d..fa2c4bcae 100644--- a/src/web/src/components/community/machines/pair-machine-sheet.test.ts+++ b/src/web/src/components/community/machines/pair-machine-sheet.test.ts@@ -6,7 +6,7 @@ const mocks = vi.hoisted(() => ({apiFetch: vi.fn(),invoke: vi.fn(),isTauri: vi.fn(() => true),- isLocalMode: vi.fn(() => false),+ isLocalServiceEnvironment: vi.fn(() => false),toastSuccess: vi.fn(),toastError: vi.fn(),}))@@ -27,7 +27,7 @@ vi.mock("@/lib/api/client", () => ({}))vi.mock("@/lib/utils", () => ({- isLocalMode: mocks.isLocalMode,+ isLocalServiceEnvironment: mocks.isLocalServiceEnvironment,WS_DO_PORT_DEFAULT: 8788,}))@@ -56,7 +56,7 @@ describe("PairMachineSheet desktop daemon integration", () => {vi.clearAllMocks()vi.stubGlobal("location", { origin: "https://alook.ai" })mocks.isTauri.mockReturnValue(true)- mocks.isLocalMode.mockReturnValue(false)+ mocks.isLocalServiceEnvironment.mockReturnValue(false)mocks.apiFetch.mockResolvedValue({ tokenId: "cmt_generated", expiresAt: "soon" })mocks.invoke.mockImplementation((command: string) => {if (command === "daemon_runtime_capability") {@@ -245,7 +245,7 @@ describe("PairMachineSheet desktop daemon integration", () => {})it("keeps explicit endpoints only for local development", async () => {- mocks.isLocalMode.mockReturnValue(true)+ mocks.isLocalServiceEnvironment.mockReturnValue(true)vi.stubGlobal("location", { origin: "http://localhost:3000" })let renderer!: TestRenderer.ReactTestRendererdiff --git a/src/web/src/components/community/machines/pair-machine-sheet.tsx b/src/web/src/components/community/machines/pair-machine-sheet.tsxindex ec6a6de63..a4e67f2ef 100644--- a/src/web/src/components/community/machines/pair-machine-sheet.tsx+++ b/src/web/src/components/community/machines/pair-machine-sheet.tsx@@ -8,7 +8,7 @@ import { CommunitySheet } from "@/components/community/shell/community-sheet"import { Button } from "@/components/ui/button"import { apiFetch, toastApiError } from "@/lib/api/client"import { tid } from "@/lib/community/testids"-import { isLocalMode, WS_DO_PORT_DEFAULT } from "@/lib/utils"+import { isLocalServiceEnvironment, WS_DO_PORT_DEFAULT } from "@/lib/utils"import { websocketUrl } from "@/lib/websocket-url"// Production daemons use their built-in endpoints. Local development appends@@ -16,7 +16,7 @@ import { websocketUrl } from "@/lib/websocket-url"// Only ever called once `pendingTokenId` is set, which happens from a// client-only effect — safe to touch `location` in the local branch.function buildPairCommand(machineKey: string, machineId?: string): string {- const isLocal = isLocalMode()+ const isLocal = isLocalServiceEnvironment()const bin = isLocal? "pnpm daemon": "npx --yes @alook/daemon@latest daemon"diff --git a/src/web/src/lib/use-user-ws.ts b/src/web/src/lib/use-user-ws.tsindex b1b74d5a2..4156cf118 100644--- a/src/web/src/lib/use-user-ws.ts+++ b/src/web/src/lib/use-user-ws.ts@@ -18,10 +18,10 @@ import {type CommunityWsSocketReadyState,type CommunityWsSuspensionDurationBucket,} from "@/lib/analytics"-import { isLocalMode, WS_DO_PORT_DEFAULT } from "@/lib/utils"+import { isLocalServiceEnvironment, WS_DO_PORT_DEFAULT } from "@/lib/utils"import { websocketUrl } from "@/lib/websocket-url"-const isLocal = isLocalMode()+const useLocalServices = isLocalServiceEnvironment()const WS_RECONNECT_INIT = Number(process.env.NEXT_PUBLIC_WS_RECONNECT_DELAY_MS) || 1000const WS_RECONNECT_MAX = Number(process.env.NEXT_PUBLIC_WS_RECONNECT_MAX_DELAY_MS) || 30_000const WS_TOKEN_TIMEOUT_MS = Number(process.env.NEXT_PUBLIC_WS_TOKEN_TIMEOUT_MS) || 10_000@@ -350,7 +350,7 @@ export function useUserWs(}}- const wsBaseUrl = isLocal+ const wsBaseUrl = useLocalServices? websocketUrl("user", { local: true, port: wsPort }): websocketUrl("user", { local: false, origin: location.origin })const url = `${wsBaseUrl}?userId=${userId}`diff --git a/src/web/src/lib/utils.test.ts b/src/web/src/lib/utils.test.tsindex 80d1a6c06..a69e0d679 100644--- a/src/web/src/lib/utils.test.ts+++ b/src/web/src/lib/utils.test.ts@@ -1,83 +1,73 @@-import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"+import {+ cliCmd,+ daemonStartCmd,+ getAppMode,+ isLocalServiceEnvironment,+} from "./utils"-let mockHostname: string | undefined;+const originalWindow = globalThis.window-vi.mock("./utils", async () => {- const actual = await vi.importActual<typeof import("./utils")>("./utils");- return {- ...actual,- isLocalMode: () => {- if (mockHostname && ["localhost", "127.0.0.1"].includes(mockHostname)) return true;- return process.env.NODE_ENV === "development";- },- cliCmd: () => {- if (process.env.NODE_ENV === "development") return "pnpm dev:cli";- if (mockHostname && ["localhost", "127.0.0.1"].includes(mockHostname)) {- return "npx @alook/app cli";- }- return "npx @alook/cli";- },- daemonStartCmd: () => {- let base: string;- if (process.env.NODE_ENV === "development") base = "pnpm dev:cli";- else if (mockHostname && ["localhost", "127.0.0.1"].includes(mockHostname)) base = "npx @alook/app cli";- else base = "npx @alook/cli";- const cmd = `${base} daemon start`;- if (process.env.NODE_ENV === "development") return `${cmd} --foreground`;- return cmd;- },- };-});+function setBrowser(hostname: string, tauri = false) {+ vi.stubGlobal("window", {+ ...(tauri ? { __TAURI__: {} } : {}),+ location: { hostname },+ })+}++describe("browser runtime and service environment", () => {+ beforeEach(() => {+ vi.stubEnv("NODE_ENV", "production")+ })-import { isLocalMode, cliCmd, daemonStartCmd } from "./utils";+ afterEach(() => {+ vi.unstubAllEnvs()+ if (originalWindow === undefined) vi.unstubAllGlobals()+ else vi.stubGlobal("window", originalWindow)+ })-beforeEach(() => {- mockHostname = undefined;-});+ it("keeps hosted Tauri in desktop mode while using production services", () => {+ setBrowser("alook.ai", true)-afterEach(() => {- mockHostname = undefined;-});+ expect(getAppMode()).toBe("desktop")+ expect(isLocalServiceEnvironment()).toBe(false)+ expect(cliCmd()).toBe("npx @alook/cli")+ expect(daemonStartCmd()).toBe("npx @alook/cli daemon start")+ })-describe("isLocalMode", () => {- it("returns true on localhost", () => {- mockHostname = "localhost";- expect(isLocalMode()).toBe(true);- });+ it("keeps localhost Tauri in desktop mode while using local services", () => {+ setBrowser("localhost", true)- it("returns true on 127.0.0.1", () => {- mockHostname = "127.0.0.1";- expect(isLocalMode()).toBe(true);- });+ expect(getAppMode()).toBe("desktop")+ expect(isLocalServiceEnvironment()).toBe(true)+ })- it("returns false for non-local hostname in production build", () => {- mockHostname = "alook.ai";- expect(isLocalMode()).toBe(false);- });-});+ it("uses production services in a normal hosted browser", () => {+ setBrowser("alook.ai")-describe("cliCmd", () => {- it("returns 'npx @alook/cli' in production cloud", () => {- mockHostname = "alook.ai";- expect(cliCmd()).toBe("npx @alook/cli");- });+ expect(getAppMode()).toBe("production")+ expect(isLocalServiceEnvironment()).toBe(false)+ })- it("returns 'npx @alook/app cli' on localhost (app mode)", () => {- mockHostname = "localhost";- expect(cliCmd()).toBe("npx @alook/app cli");- });-});+ it("uses production services during server rendering", () => {+ vi.unstubAllGlobals()++ expect(isLocalServiceEnvironment()).toBe(false)+ })++ it.each(["localhost", "127.0.0.1", "0.0.0.0", "::1", "[::1]"])(+ "uses local services for %s",+ (hostname) => {+ setBrowser(hostname)+ expect(isLocalServiceEnvironment()).toBe(true)+ },+ )-describe("daemonStartCmd", () => {- it("no --foreground in production cloud", () => {- mockHostname = "alook.ai";- expect(daemonStartCmd()).toBe("npx @alook/cli daemon start");- expect(daemonStartCmd()).not.toContain("--foreground");- });+ it("uses local services for a development build independently of runtime mode", () => {+ vi.stubEnv("NODE_ENV", "development")+ setBrowser("alook.ai", true)- it("no --foreground in app mode (localhost, production build)", () => {- mockHostname = "localhost";- expect(daemonStartCmd()).toBe("npx @alook/app cli daemon start");- expect(daemonStartCmd()).not.toContain("--foreground");- });-});+ expect(getAppMode()).toBe("desktop")+ expect(isLocalServiceEnvironment()).toBe(true)+ })+})diff --git a/src/web/src/lib/utils.ts b/src/web/src/lib/utils.tsindex 3c34663f4..f608f2678 100644--- a/src/web/src/lib/utils.ts+++ b/src/web/src/lib/utils.ts@@ -20,8 +20,18 @@ export function getAppMode(): AlookMode {return getMode()}-export function isLocalMode(): boolean {- return getMode() !== "production"+const LOCAL_SERVICE_HOSTNAMES = new Set([+ "localhost",+ "127.0.0.1",+ "0.0.0.0",+ "::1",+ "[::1]",+])++export function isLocalServiceEnvironment(): boolean {+ if (process.env.NODE_ENV === "development") return true+ const hostname = typeof window !== "undefined" ? window.location.hostname : undefined+ return hostname !== undefined && LOCAL_SERVICE_HOSTNAMES.has(hostname)}// The local dev WS Durable Object port (see DEV_WS_DO_URL in @alook/shared).