diff --git a/apps/mobile/src/state/thread-task-permissions.test.ts b/apps/mobile/src/state/thread-task-permissions.test.ts index d037ac106a025..41472d5cc76cc 100644 --- a/apps/mobile/src/state/thread-task-permissions.test.ts +++ b/apps/mobile/src/state/thread-task-permissions.test.ts @@ -132,6 +132,7 @@ vi.mock("./threads", async () => { sequenceAtom: () => Atom.make(0), pendingRequestsAtom: () => Atom.make(state.pendingRequests), }, + sandboxStartQueue: { sandboxStartRunId: () => Atom.make(null) }, threadEnvironment: { respondToApproval: state.approve, respondToUserInput: state.answer, diff --git a/apps/server/src/sandbox/sandboxSetup.test.ts b/apps/server/src/sandbox/sandboxSetup.test.ts index df8d1a797dfdf..4f979bb650535 100644 --- a/apps/server/src/sandbox/sandboxSetup.test.ts +++ b/apps/server/src/sandbox/sandboxSetup.test.ts @@ -196,13 +196,16 @@ echo x >>"$HOME/curl.calls" ); }); -// Stand-ins for sudo and Tailscale's binaries, so the scripts run without root. The daemon never -// gets a TUN device, which is what a container gives tailscaled. `up` returns before the node has -// registered, as when its first register request hangs past the timeout and a retry succeeds. +// Stand-ins for sudo, systemctl, and Tailscale's binaries, so the scripts run without root and +// never touch the host's tailscaled unit. The daemon never gets a TUN device, which is what a +// container gives tailscaled. `up` returns before the node has registered, as when its first +// register request hangs past the timeout and a retry succeeds. const TAILSCALE_STUBS = { sudo: `#!/bin/sh [ "$1" = -n ] && shift exec "$@"`, + systemctl: `#!/bin/sh +exit 1`, tailscaled: `#!/bin/sh echo "$*" >"$T3_STUB/tailscaled.args" echo "$TS_ASSUME_NETWORK_UP_FOR_TEST" >"$T3_STUB/tailscaled.assume-up" @@ -277,6 +280,9 @@ describe("tailscaleScript", () => { Effect.gen(function* () { const fs = yield* FileSystem.FileSystem; const root = `${stub}/root`; + // Any character device passes the script's TUN check, so kernel mode is tried first. + yield* fs.makeDirectory(`${root}/dev/net`, { recursive: true }); + yield* fs.symlink("/dev/null", `${root}/dev/net/tun`); const authKey = "tskey-auth-'$(touch pwned)\""; const join = tailscaleScript({ authKey, hostname: "t3-sandbox-web", root }); expect(revealsSecret(join.command, authKey)).toBe(false); @@ -302,6 +308,7 @@ describe("tailscaleScript", () => { // A daemon that still answers in the recorded mode is left running. const starts = yield* fs.readFileString(`${stub}/starts`); + expect(starts).toBe("start\nstart\n"); const restart = tailscaleScript({ hostname: "t3-sandbox-web", root }); expect(restart.secrets).toBeUndefined(); const resumed = parseTailscaleReport(yield* run(restart)); diff --git a/apps/server/src/sandbox/sandboxSetup.ts b/apps/server/src/sandbox/sandboxSetup.ts index 720c8189b073a..a0fcbc6e501aa 100644 --- a/apps/server/src/sandbox/sandboxSetup.ts +++ b/apps/server/src/sandbox/sandboxSetup.ts @@ -269,6 +269,7 @@ const AS_ROOT = `as_root() { // `root` prefixes every system path, so tests can run the scripts without root. const tailscalePaths = (root: string) => ({ + tun: `${root}/dev/net/tun`, run: `${root}/run/tailscale`, socket: `${root}/run/tailscale/tailscaled.sock`, pidFile: `${root}/run/tailscale/t3-tailscaled.pid`, @@ -387,7 +388,7 @@ if answering; then fi fi if [ -z "$mode" ]; then - if [ -c /dev/net/tun ] && start kernel && has_tun; then + if [ -c ${paths.tun} ] && start kernel && has_tun; then mode=kernel else stop diff --git a/apps/web/src/components/chat/ThreadRelationshipsControl.remote-parent.browser.test.tsx b/apps/web/src/components/chat/ThreadRelationshipsControl.remote-parent.browser.test.tsx index 08108cd835885..871dc16f89b80 100644 --- a/apps/web/src/components/chat/ThreadRelationshipsControl.remote-parent.browser.test.tsx +++ b/apps/web/src/components/chat/ThreadRelationshipsControl.remote-parent.browser.test.tsx @@ -1,4 +1,9 @@ -import { EnvironmentId, ThreadId, type OrchestrationV2ThreadShell } from "@t3tools/contracts"; +import { + EnvironmentId, + ProviderInstanceId, + ThreadId, + type OrchestrationV2ThreadShell, +} from "@t3tools/contracts"; import * as Cause from "effect/Cause"; import { expect, it, vi } from "vite-plus/test"; @@ -12,10 +17,11 @@ const { read, toast } = vi.hoisted(() => ({ const childEnvironmentId = EnvironmentId.make("child-environment"); const childThreadId = ThreadId.make("child-thread"); const parentEnvironmentId = EnvironmentId.make("parent-environment"); -// The panel reads only identity, lineage and delegation from the current thread. +// The panel reads only identity, model, lineage and delegation from the current thread. const child = { id: childThreadId, title: "Child", + modelSelection: { instanceId: ProviderInstanceId.make("codex"), model: "gpt-5" }, lineage: { rootThreadId: childThreadId, parentThreadId: null, relationshipToParent: null }, forkedFrom: null, delegatedFrom: {