diff --git a/.macroscope/check-run-agents/effect-service-conventions.md b/.macroscope/check-run-agents/effect-service-conventions.md
index eae8e260b3c2..316cf3509bf5 100644
--- a/.macroscope/check-run-agents/effect-service-conventions.md
+++ b/.macroscope/check-run-agents/effect-service-conventions.md
@@ -5,16 +5,13 @@ effort: high
 input: full_diff
 tools:
   - browse_code
-  - git_tools
-  - github_api_read_only
   - modify_pr
 include:
   - "apps/**/*.ts"
-  - "apps/**/*.tsx"
   - "packages/**/*.ts"
-  - "packages/**/*.tsx"
   - "infra/**/*.ts"
-  - "infra/**/*.tsx"
+exclude:
+  - "**/*.test.ts"
 labels:
   - vouch:trusted
 requires:
@@ -26,74 +23,50 @@ showToolCalls: true
 
 # Effect service review
 
-Review changed TypeScript and directly affected call sites for the conventions below. Apply them when a pull request creates, moves, refactors, or consumes an Effect service. Do not demand unrelated repository-wide cleanup. Treat these instructions as authoritative when older code differs.
+Review changed TypeScript for the conventions below. They apply when a pull request creates, moves, refactors, or consumes an Effect service. Review only the lines the PR changed; older code in the same file that predates these conventions is not a finding. Do not demand repository-wide cleanup.
 
 ## Imports and module namespaces
 
-- Import Effect library modules from their subpaths as namespaces, for example `import * as Effect from "effect/Effect"` and `import * as Layer from "effect/Layer"`. Flag consolidated named imports from `"effect"` in touched Effect service code.
-- At a service boundary, import the local service module as a namespace and use its public module shape: `WorkspacePaths.WorkspacePaths`, `WorkspacePaths.make`, and `WorkspacePaths.layer`. Flag aliases such as `import { layer as workspacePathsLayer }` that erase the module namespace.
-- Namespace imports are not a blanket rule. Keep named imports for whole packages such as `@t3tools/contracts`, and for modules used only for a pure helper, error, schema, config value, or standalone type. Do not request `import type * as Contracts`.
-- A package subpath that is itself a service module may use a namespace import when callers access its service/tag, `make`, or `layer` members.
-- When a barrel exposes an entire service module, prefer `export * as TokenStore from "./tokenStore.ts"` so consumers can use `TokenStore.TokenStore` and `TokenStore.layer`. Do not individually rename `make` and `layer` exports to simulate a namespace.
+- Import Effect modules from their subpaths as namespaces: `import * as Effect from "effect/Effect"`, `import * as Layer from "effect/Layer"`. Flag named imports from the bare `"effect"` package.
+- At a service boundary, import the local service module as a namespace and use its public shape: `WorkspacePaths.WorkspacePaths`, `WorkspacePaths.make`, `WorkspacePaths.layer`. Flag aliases such as `import { layer as workspacePathsLayer }` that erase the namespace.
+- Named imports stay correct for whole packages such as `@t3tools/contracts` and for modules used only for a pure helper, error, schema, config value, or type. Do not request `import type * as Contracts`.
+- When a barrel exposes a whole service module, prefer `export * as TokenStore from "./tokenStore.ts"` over individually renamed `make` and `layer` exports.
 
 ## Service definition
 
-- Use the canonical single-file order: imports, error/schema declarations, the `Context.Service` tag with its inline interface, `make`, then `layer`.
-- Keep a service's schemas/errors, `Context.Service` tag, construction, and layer in one canonical module when they form one implementation.
-- Define the service interface inline in the `Context.Service` declaration. Do not retain a standalone `FooShape` or `FooServiceShape` interface/type.
-- Refer to the inferred service interface as `Foo["Service"]`, including in mechanically updated orchestration, MCP, tests, and integration harnesses.
-- Export a real `make` when the module owns construction. Do not create `make = Effect.succeed(...)` solely to force `Layer.effect`.
-- Export the canonical layer as `export const layer = Layer...`. `Layer.effect` is not required: use `Layer.succeed`, `Layer.scoped`, or another appropriate constructor when that matches the implementation.
-- In a concrete implementation module already named for the implementation, use plain `make` and `layer` (for example `BunPtyAdapter.ts` and `NodePtyAdapter.ts`).
-- Keep implementation-specific names when an abstract port module contains one of several possible implementations, for example `makeCloudflaredRelayClient` and `layerCloudflared` in `RelayClient.ts`.
-- `infra/relay/src/db.ts` is an intentional exception: an inline `Layer.succeed(RelayDb, db)` is acceptable without generic `make`/`layer` exports.
+- One canonical module per service in this order: imports, error and schema declarations, the `Context.Service` tag with its interface inline, `make`, then `layer`.
+- Define the interface inline in `Context.Service`. Do not add a standalone `FooShape` interface; refer to the inferred type as `Foo["Service"]`.
+- Export a real `make` when the module owns construction. Do not write `make = Effect.succeed(...)` only to force `Layer.effect`; use `Layer.succeed`, `Layer.scoped`, or whichever constructor matches.
+- Use plain `make` and `layer` in a module named for its implementation (`BunPtyAdapter.ts`). Keep implementation-specific names when one abstract port module holds several implementations (`makeCloudflaredRelayClient`, `layerCloudflared` in `RelayClient.ts`). `infra/relay/src/db.ts` may keep its inline `Layer.succeed(RelayDb, db)`.
+- When a service moves, delete the old files and update every consumer, including orchestration, MCP, tests, and integration harnesses. Do not leave compatibility re-export shims.
 
 ## Dependency acquisition and runtime boundaries
 
-- Production service construction must acquire Effect service dependencies from the environment with `yield* Foo.Foo`, and its `make`/`layer` types must expose those requirements. Flag factories or constructors that accept `Foo["Service"]` (or a plain object whose methods return `Effect`) when that value is an implementation dependency owned by the service. Passing service instances explicitly is acceptable in tests and integration harnesses; passing pure configuration, immutable domain values, or deliberate callback strategies is not service injection.
-- Do not hide dependencies in module globals, closures over singleton services, or `Layer.succeed` implementations that call runtime-backed or imperative APIs. Trace helpers used by a supposedly synchronous layer far enough to verify that asynchronous services are represented in the Effect environment.
-- `ManagedRuntime.make`, `runPromise`, and `runPromiseExit` belong at explicit application/framework boundaries such as React, native callback, CLI, or HTTP adapters. Flag their use in domain services, repositories, persistence implementations, and service constructors. A clearly named imperative adapter may bridge an Effect service into a Promise API, but it must not become a dependency of another Effect service.
-- Do not create per-feature managed runtimes or Atom runtimes to smuggle the same owned resource into multiple consumers. Compose the resource once in an application-owned layer/runtime and provide its context to integration runtimes.
-- When acquisition can fail but a caller must retain fallback behavior, keep the failure typed in Effect rather than bypassing the layer through an imperative runtime. Model unavailability in service operations or with an explicit optional-service layer so downstream recovery remains visible and testable.
-- During review, search touched code and affected call sites for service-instance parameters, `Layer.succeed`, `ManagedRuntime.make`, and `.runPromise`/`.runPromiseExit`. Verify that each occurrence is a legitimate test seam, pure value injection, or application boundary—not fake dependency injection or a hidden runtime.
+- Production service construction acquires its Effect dependencies from the environment with `yield* Foo.Foo`, and `make`/`layer` types expose those requirements. Flag a factory that takes `Foo["Service"]` (or an object of Effect-returning methods) as a parameter when that value is a service dependency. Passing service instances explicitly in tests is fine; passing pure configuration, immutable domain values, or deliberate callback strategies is not service injection.
+- Do not hide dependencies in module globals, closures over singleton services, or a `Layer.succeed` whose implementation calls runtime-backed or imperative APIs.
+- `ManagedRuntime.make`, `runPromise`, and `runPromiseExit` belong at application or framework boundaries: React, native callbacks, CLI, HTTP adapters. Flag them in domain services, repositories, persistence, and service constructors. A named imperative adapter may bridge an Effect service into a Promise API but must not become a dependency of another Effect service.
+- Do not create per-feature managed runtimes or Atom runtimes to hand the same owned resource to several consumers. Compose the resource once in an application-owned layer and provide its context to integration runtimes.
+- When acquisition can fail and callers need fallback behavior, keep the failure typed in Effect (an error in the service operation or an explicit optional-service layer) rather than bypassing the layer through an imperative runtime.
 
-## Errors and predicates
+## Errors
 
-- Define service failures with `Schema.TaggedErrorClass` and structured attributes. Derive `message` from those attributes rather than storing an unstructured message as the only data.
-- `Schema.Defect()` is not a substitute for modeling a generic error: its tag, fields, or both must identify the failure structurally, and its `message` must not merely stringify an opaque cause. A semantically precise error tag may preserve a real `cause` without inventing a redundant singleton field when no additional variable context exists; still retain any real path, resource, request, or entity context available at the wrapping site.
-- Capture stable, serializable domain context such as the operation or stage, resource/path or entity identifier, and normalized category/status. Map failures where that context is known instead of wrapping an entire multi-step pipeline in one generic error. Do not add a `detail` field that merely copies `cause.message` and then use it to construct the wrapper message.
-- Keep direct error attributes and log annotations safe and bounded. Do not copy raw wire payloads, command arguments or output, signed URLs, credentials, query strings, fragments, selectors, or arbitrary defect text into `detail`, `reason`, `message`, or a parallel log payload. Preserve the exact underlying value only as `cause`; expose normalized categories plus lengths/counts and safe URL protocol/hostname diagnostics where useful. Logging a sanitized error must not reintroduce a removed legacy `detail` or serialized `cause` field beside it.
-- When translating or wrapping a real failure, preserve the immediate underlying error itself as `cause` alongside the structural fields so the complete error chain and stack remain available. If every construction wraps a failure, `cause` should be required; make it optional only when the same error can legitimately originate without an underlying failure.
-- At a translation boundary, pass through an already structured domain error when it is part of the declared target error channel. Wrap only unknown or genuinely lower-level failures. A static factory or mapper may perform this classification when it is reused and keeps the policy next to the target error type.
-- Derive the wrapper's `message` exclusively from its stable structural attributes, never from `cause`, `cause.message`, or a stringified defect. Do not replace the immediate error with only `error.cause`, erase a structured upstream error into a string, or manufacture an `Error` merely to populate `cause`. Pure validation/domain errors created without an underlying failure do not need a cause.
-- Do not encode the same distinction twice with both a specific error tag and a single-value `operation`, `reason`, `kind`, or `phase` literal. Choose one coherent model: use distinct error classes and omit the redundant discriminator when callers or messages treat the failures as genuinely different, or use one service-level error with a multi-value operation discriminator and a generic message derived from that operation when the failures share the same semantics.
-- Treat an error message exposed through an HTTP/RPC response, persisted state, UI, or another caller-visible boundary as behavior. Preserve those messages during a structural refactor. Existing distinct caller-visible messages are evidence that the failures should normally remain distinct error tags without redundant singleton discriminators, rather than being collapsed into a generic operation error.
-- Split semantically distinct failures into separate error classes when a `reason`, `kind`, `phase`, or similar discriminator is used to choose the user-facing message or drive caller control flow. A discriminator used only for internal diagnostics may remain a field.
-- Use `Schema.Union` of error classes when a shared schema, predicate, or helper type is useful.
-- Export direct schema predicates such as `export const isFoo = Schema.is(Foo)`. Flag a private `Schema.is` constant wrapped by a redundant function with the same signature.
-- Do not introduce a large `switch` or lookup table in an error's `message` getter to model failures that deserve separate error classes.
-- Catch statically known tagged failures with `Effect.catchTags({ ... })`, including when handling only one tag. Do not use `catchIf` with a schema predicate merely to recover one or more known `_tag` variants, and do not use `catchTag`. `Effect.catch` is appropriate when the entire error channel is intentionally handled; `catchIf` remains appropriate for genuinely structural predicates such as inspecting an underlying platform error code.
-- For startup reconciliation that repairs multiple independent entities, preserve interruption rather than reducing it to a warning. Retry a transient per-entity repair before readiness, then isolate a persistent failure so one bad entity cannot abort global startup or prevent later entities from being repaired. Require tests for both the retry-success path and persistent-failure continuation.
-- Do not add a helper whose only behavior is `(...args) => new SomeError({ ...args })`, including curried aliases used once with `mapError`. Construct the error at the failure boundary so its attributes and cause remain visible. Keep a mapper only when it performs real normalization, passes through existing domain errors, or adds reusable context/control flow.
-- When a reusable error-to-error translation clearly belongs to the target error type, prefer a descriptive static factory on that error class over a detached production-side switch. Do not force a static method for one-off inline mappings.
-
-## File layout and migrations
-
-- When combining `domain/Services/Foo.ts` and `domain/Layers/Foo.ts`, hoist the result to `domain/Foo.ts`.
-- Delete the old service/layer files. Do not leave compatibility re-export shims. Mechanically update every consumer, including orchestration, MCP, tests, and integration harnesses, to the canonical path.
-- Do not flag genuinely separate implementation/adapter modules merely because they remain in an implementation-oriented directory.
-- Avoid substantive orchestration or MCP redesign in service-cleanup PRs. Mechanical import, layer, and `Service["Service"]` updates are expected when required to remove obsolete paths or shapes.
+- Define service failures with `Schema.TaggedErrorClass` and structured attributes: operation or stage, resource path or entity identifier, normalized category or status. Derive `message` from those attributes only. Never derive it from `cause`, `cause.message`, or a stringified defect, and do not add a `detail` field that copies `cause.message`.
+- When wrapping a real failure, keep the immediate underlying error as `cause` so the chain and stack survive. Make `cause` required if every construction wraps a failure. Pure validation or domain errors created without an underlying failure need no cause.
+- Keep attributes and log annotations safe and bounded: no raw wire payloads, command arguments or output, signed URLs, credentials, query strings, or arbitrary defect text. Preserve the exact value only as `cause`; expose normalized categories, lengths, counts, and safe URL protocol or hostname where useful.
+- At a translation boundary, pass through an already structured domain error when it is part of the target error channel; wrap only unknown or lower-level failures. Map failures where the context is known instead of wrapping a whole multi-step pipeline in one generic error.
+- Do not encode the same distinction twice with both a specific error tag and a single-value `operation`, `reason`, `kind`, or `phase` literal. Split into separate error classes when a discriminator drives caller control flow or the user-facing message; a discriminator used only for diagnostics may stay a field. Caller-visible messages exposed through HTTP, RPC, persisted state, or UI are behavior and must survive a structural refactor.
+- Do not add a helper whose only behavior is `(...args) => new SomeError({ ...args })`. Construct the error at the failure boundary. Keep a mapper only when it performs real normalization, passes through domain errors, or adds reusable context; when such a mapper belongs to the target error type, prefer a static factory on that class.
+- Export predicates directly as `export const isFoo = Schema.is(Foo)`. Flag a private `Schema.is` constant wrapped by a function with the same signature.
+- Catch statically known tagged failures with `Effect.catchTags({ ... })`, including for a single tag; do not use `catchTag` or `catchIf` with a schema predicate for that. `Effect.catch` is fine when the whole error channel is handled; `catchIf` is fine for structural predicates such as a platform error code.
 
 ## Change discipline
 
-- Preserve useful comments, invariants, and specification documentation while moving code.
-- Require every new or broadened directive that disables or suppresses a lint, type-checker, LSP, or other static-analysis diagnostic to have an adjacent comment explaining why that diagnostic must be disabled there. The directive itself is not an explanation. Report a missing explanation as a concrete violation.
-- Do not add large tests solely to prove a mechanical refactor. Update existing tests and imports as needed.
-- If backend behavior changes, require focused tests. Use test implementations/layers for external services only; do not mock out core business logic.
-- Do not require `Layer.effect`, universal namespace imports, generic `make`/`layer` names for abstract-port implementations, separate error classes for diagnostic-only fields, or new tests for import-only changes.
+- Every new or broadened directive that disables a lint, type-checker, LSP, or static-analysis diagnostic needs an adjacent comment explaining why. The directive itself is not an explanation; a missing one is a concrete violation.
+- If backend behavior changes, require focused tests that use test layers for external services only, never mocks of core business logic. Do not require new tests for mechanical refactors or import-only changes.
+- Do not require `Layer.effect`, universal namespace imports, generic `make`/`layer` names for abstract-port implementations, or separate error classes for diagnostic-only fields.
 
 ## Reporting
 
-Report only concrete violations introduced or retained in the pull request's changed scope. Prefer precise inline comments on the smallest relevant line range and state the expected fix. A clear convention violation may fail the check. Do not fail for optional style preferences or unrelated legacy code.
+Report only violations introduced by changed lines. Post each as a precise inline comment on the smallest relevant range and state the expected fix. A clear convention violation may fail the check; optional style preferences and untouched legacy code may not.
 
-This check defaults to failure. When there are no findings, stop immediately and make the entire final response exactly `All clear` on one line. Do not add a title, explanation, punctuation, Markdown, JSON, or trailing analysis, and do not continue reasoning after deciding the review is clean.
+When there are no findings, make the entire final response exactly `All clear` on one line with nothing else.
diff --git a/apps/desktop/src/backend/DesktopBackendManager.ts b/apps/desktop/src/backend/DesktopBackendManager.ts
index 60bfe780ad62..436c0c08e4ed 100644
--- a/apps/desktop/src/backend/DesktopBackendManager.ts
+++ b/apps/desktop/src/backend/DesktopBackendManager.ts
@@ -663,15 +663,13 @@ export const makeBackendInstance = Effect.fn("makeBackendInstance")(function* (
     Ref.update(state, withActiveRun(runId, f));
 
   const snapshot = Ref.get(state).pipe(
-    Effect.map(
-      (current): DesktopBackendSnapshot => ({
-        desiredRunning: current.desiredRunning,
-        ready: current.ready,
-        activePid: activePid(current.active),
-        restartAttempt: current.restartAttempt,
-        restartScheduled: Option.isSome(current.restartFiber),
-      }),
-    ),
+    Effect.map((current): DesktopBackendSnapshot => ({
+      desiredRunning: current.desiredRunning,
+      ready: current.ready,
+      activePid: activePid(current.active),
+      restartAttempt: current.restartAttempt,
+      restartScheduled: Option.isSome(current.restartFiber),
+    })),
   );
   const currentConfig = Ref.get(state).pipe(Effect.map((current) => current.config));
 
diff --git a/apps/desktop/src/ipc/DesktopIpcHandlers.ts b/apps/desktop/src/ipc/DesktopIpcHandlers.ts
index 60e8761a8205..1da1083c089f 100644
--- a/apps/desktop/src/ipc/DesktopIpcHandlers.ts
+++ b/apps/desktop/src/ipc/DesktopIpcHandlers.ts
@@ -21,6 +21,7 @@ import {
   fetchSshEnvironmentDescriptor,
   fetchSshSessionState,
   issueSshWebSocketTicket,
+  resolveSshHost,
   resolveSshPasswordPrompt,
 } from "./methods/sshEnvironment.ts";
 import {
@@ -72,6 +73,7 @@ export const installDesktopIpcHandlers = Effect.fn("desktop.ipc.installHandlers"
   yield* ipc.handle(clearConnectionCatalog);
 
   yield* ipc.handle(discoverSshHosts);
+  yield* ipc.handle(resolveSshHost);
   yield* ipc.handle(ensureSshEnvironment);
   yield* ipc.handle(disconnectSshEnvironment);
   yield* ipc.handle(fetchSshEnvironmentDescriptor);
diff --git a/apps/desktop/src/ipc/channels.ts b/apps/desktop/src/ipc/channels.ts
index 04751619e7ed..60396f45302f 100644
--- a/apps/desktop/src/ipc/channels.ts
+++ b/apps/desktop/src/ipc/channels.ts
@@ -33,6 +33,7 @@ export const GET_CONNECTION_CATALOG_CHANNEL = "desktop:get-connection-catalog";
 export const SET_CONNECTION_CATALOG_CHANNEL = "desktop:set-connection-catalog";
 export const CLEAR_CONNECTION_CATALOG_CHANNEL = "desktop:clear-connection-catalog";
 export const DISCOVER_SSH_HOSTS_CHANNEL = "desktop:discover-ssh-hosts";
+export const RESOLVE_SSH_HOST_CHANNEL = "desktop:resolve-ssh-host";
 export const ENSURE_SSH_ENVIRONMENT_CHANNEL = "desktop:ensure-ssh-environment";
 export const DISCONNECT_SSH_ENVIRONMENT_CHANNEL = "desktop:disconnect-ssh-environment";
 export const FETCH_SSH_ENVIRONMENT_DESCRIPTOR_CHANNEL = "desktop:fetch-ssh-environment-descriptor";
diff --git a/apps/desktop/src/ipc/methods/sshEnvironment.ts b/apps/desktop/src/ipc/methods/sshEnvironment.ts
index 9c9af2a4e2b9..cfb993d35cfa 100644
--- a/apps/desktop/src/ipc/methods/sshEnvironment.ts
+++ b/apps/desktop/src/ipc/methods/sshEnvironment.ts
@@ -117,6 +117,16 @@ export const discoverSshHosts = DesktopIpc.makeIpcMethod({
   }),
 });
 
+export const resolveSshHost = DesktopIpc.makeIpcMethod({
+  channel: IpcChannels.RESOLVE_SSH_HOST_CHANNEL,
+  payload: Schema.String,
+  result: DesktopSshEnvironmentTargetSchema,
+  handler: Effect.fn("desktop.ipc.sshEnvironment.resolveHost")(function* (alias) {
+    const sshEnvironment = yield* DesktopSshEnvironment.DesktopSshEnvironment;
+    return yield* sshEnvironment.resolveHost(alias);
+  }),
+});
+
 export const ensureSshEnvironment = DesktopIpc.makeIpcMethod({
   channel: IpcChannels.ENSURE_SSH_ENVIRONMENT_CHANNEL,
   payload: DesktopSshEnvironmentEnsureInputSchema,
diff --git a/apps/desktop/src/preload.ts b/apps/desktop/src/preload.ts
index ce0bd47259dd..5d71806e4f93 100644
--- a/apps/desktop/src/preload.ts
+++ b/apps/desktop/src/preload.ts
@@ -60,6 +60,7 @@ contextBridge.exposeInMainWorld("desktopBridge", {
     ipcRenderer.invoke(IpcChannels.SET_CONNECTION_CATALOG_CHANNEL, catalog),
   clearConnectionCatalog: () => ipcRenderer.invoke(IpcChannels.CLEAR_CONNECTION_CATALOG_CHANNEL),
   discoverSshHosts: () => ipcRenderer.invoke(IpcChannels.DISCOVER_SSH_HOSTS_CHANNEL),
+  resolveSshHost: (alias) => ipcRenderer.invoke(IpcChannels.RESOLVE_SSH_HOST_CHANNEL, alias),
   ensureSshEnvironment: async (target, options) =>
     unwrapEnsureSshEnvironmentResult(
       await ipcRenderer.invoke(IpcChannels.ENSURE_SSH_ENVIRONMENT_CHANNEL, {
diff --git a/apps/desktop/src/preview-pip-preload.ts b/apps/desktop/src/preview-pip-preload.ts
index 384c4129774f..6771eba8aafe 100644
--- a/apps/desktop/src/preview-pip-preload.ts
+++ b/apps/desktop/src/preview-pip-preload.ts
@@ -1,4 +1,3 @@
-// @effect-diagnostics globalDate:off - This isolated Electron preload does not run inside an Effect runtime.
 import type { DesktopPreviewRecordingFrame } from "@t3tools/contracts";
 import { contextBridge, ipcRenderer } from "electron";
 
diff --git a/apps/desktop/src/settings/DesktopClientSettings.test.ts b/apps/desktop/src/settings/DesktopClientSettings.test.ts
index b8afe29812a6..43a8f8056776 100644
--- a/apps/desktop/src/settings/DesktopClientSettings.test.ts
+++ b/apps/desktop/src/settings/DesktopClientSettings.test.ts
@@ -18,6 +18,7 @@ const clientSettings: ClientSettings = {
   browserDefaultZoomFactor: 1.25,
   browserDefaultAppearance: "dark",
   browserRecordingFrameRate: 60,
+  browserLinkTarget: "app",
   browserAutoShowFloatingPreview: false,
   browserProfiles: [{ id: "work", name: "Work", kind: "persistent" }],
   browserDefaultProfileId: "work",
@@ -29,6 +30,7 @@ const clientSettings: ClientSettings = {
   contextWindowMeterEnabled: false,
   dismissedProviderUpdateNotificationKeys: [],
   diffIgnoreWhitespace: true,
+  diffLayout: "stacked",
   environmentIdentificationMode: "artwork",
   sidebarArtworkOverride: null,
   favorites: [],
diff --git a/apps/desktop/src/ssh/DesktopSshEnvironment.ts b/apps/desktop/src/ssh/DesktopSshEnvironment.ts
index 31e84ae995ed..2c9ab0c03e48 100644
--- a/apps/desktop/src/ssh/DesktopSshEnvironment.ts
+++ b/apps/desktop/src/ssh/DesktopSshEnvironment.ts
@@ -5,6 +5,7 @@ import type {
 } from "@t3tools/contracts";
 import * as NetService from "@t3tools/shared/Net";
 import * as SshAuth from "@t3tools/ssh/auth";
+import { resolveSshTarget } from "@t3tools/ssh/command";
 import { discoverSshHosts } from "@t3tools/ssh/config";
 import {
   SshCommandError,
@@ -54,6 +55,9 @@ export class DesktopSshEnvironment extends Context.Service<
     readonly discoverHosts: (input?: {
       readonly homeDir?: string;
     }) => Effect.Effect<readonly DesktopDiscoveredSshHost[], DesktopSshEnvironmentDiscoverError>;
+    readonly resolveHost: (
+      alias: string,
+    ) => Effect.Effect<DesktopSshEnvironmentTarget, SshCommandError | SshInvalidTargetError>;
     readonly ensureEnvironment: (
       target: DesktopSshEnvironmentTarget,
       options?: { readonly issuePairingToken?: boolean },
@@ -136,6 +140,11 @@ export const make = Effect.gen(function* () {
         Effect.provide(runtimeContext),
         Effect.withSpan("desktop.ssh.discoverHosts"),
       ),
+    resolveHost: (alias) =>
+      resolveSshTarget(alias.trim()).pipe(
+        Effect.provide(runtimeContext),
+        Effect.withSpan("desktop.ssh.resolveHost"),
+      ),
     ensureEnvironment: (target, ensureOptions) =>
       manager
         .ensureEnvironment(target, ensureOptions)
diff --git a/apps/marketing/public/pfps/JoshuaRileyDev.webp b/apps/marketing/public/pfps/JoshuaRileyDev.webp
new file mode 100644
index 000000000000..437409176b11
Binary files /dev/null and b/apps/marketing/public/pfps/JoshuaRileyDev.webp differ
diff --git a/apps/marketing/public/pfps/QuinnyPig.webp b/apps/marketing/public/pfps/QuinnyPig.webp
new file mode 100644
index 000000000000..e12003c4ce64
Binary files /dev/null and b/apps/marketing/public/pfps/QuinnyPig.webp differ
diff --git a/apps/marketing/public/pfps/RhysSullivan.webp b/apps/marketing/public/pfps/RhysSullivan.webp
new file mode 100644
index 000000000000..a1fe04389a2d
Binary files /dev/null and b/apps/marketing/public/pfps/RhysSullivan.webp differ
diff --git a/apps/marketing/public/pfps/enunomaduro.webp b/apps/marketing/public/pfps/enunomaduro.webp
new file mode 100644
index 000000000000..ce054dbfb655
Binary files /dev/null and b/apps/marketing/public/pfps/enunomaduro.webp differ
diff --git a/apps/marketing/public/pfps/gnukeith.webp b/apps/marketing/public/pfps/gnukeith.webp
deleted file mode 100644
index aa24d1996ffe..000000000000
Binary files a/apps/marketing/public/pfps/gnukeith.webp and /dev/null differ
diff --git a/apps/marketing/public/pfps/jetpackjoe_.webp b/apps/marketing/public/pfps/jetpackjoe_.webp
deleted file mode 100644
index da415598564b..000000000000
Binary files a/apps/marketing/public/pfps/jetpackjoe_.webp and /dev/null differ
diff --git a/apps/marketing/public/pfps/peculiarnewbie.webp b/apps/marketing/public/pfps/peculiarnewbie.webp
deleted file mode 100644
index 74be17008b24..000000000000
Binary files a/apps/marketing/public/pfps/peculiarnewbie.webp and /dev/null differ
diff --git a/apps/marketing/public/pfps/ryanrhughes.webp b/apps/marketing/public/pfps/ryanrhughes.webp
new file mode 100644
index 000000000000..e949edaa0478
Binary files /dev/null and b/apps/marketing/public/pfps/ryanrhughes.webp differ
diff --git a/apps/marketing/public/pfps/uwunetes.webp b/apps/marketing/public/pfps/uwunetes.webp
deleted file mode 100644
index f15366aa66f9..000000000000
Binary files a/apps/marketing/public/pfps/uwunetes.webp and /dev/null differ
diff --git a/apps/marketing/src/lib/tweets.ts b/apps/marketing/src/lib/tweets.ts
index 7d6be71c5f15..604fbec91484 100644
--- a/apps/marketing/src/lib/tweets.ts
+++ b/apps/marketing/src/lib/tweets.ts
@@ -7,17 +7,24 @@ export type Tweet = {
 
 export const tweets = [
   {
-    handle: "Shay_Benshabtay",
+    handle: "QuinnyPig",
     content:
-      "T3 code is not perfect, but it's damn good. Open and fun , I can make my own fork for my uses and use the great tooling with my own needs.",
-    link: "https://x.com/Shay_Benshabtay/status/2054668503857156326",
+      "Of course @theo is gonna favor his own product.\n\nBut I don’t have a horse in this race, so believe me when I say T3 code is freaking transformational.",
+    excerpt:
+      "...I don’t have a horse in this race, so believe me when I say T3 code is freaking transformational.",
+    link: "https://x.com/QuinnyPig/status/2089581739887014376",
   },
   {
-    handle: "teja2495",
+    handle: "tannerlinsley",
+    content: "I would just use T3 Code at that point and contribute back.",
+    link: "https://x.com/tannerlinsley/status/2035067912659341399",
+  },
+  {
+    handle: "ryanrhughes",
     content:
-      "I’ve completely switched to T3 Code for all my workflows. I just switch between different subscriptions and harnesses depending on what I need.",
-    excerpt: "I’ve completely switched to T3 Code for all my workflows.",
-    link: "https://x.com/teja2495/status/2052420254991581623",
+      "I think I've finally found the one AI harness to steal me away from the terminal — @t3dotcodes.",
+    excerpt: "I think I've finally found the one AI harness to steal me away from the terminal",
+    link: "https://x.com/ryanrhughes/status/2093051703616573769",
   },
   {
     handle: "developedbyed",
@@ -25,70 +32,72 @@ export const tweets = [
     link: "https://x.com/developedbyed/status/2030627970532921605",
   },
   {
-    handle: "tannerlinsley",
+    handle: "RhysSullivan",
     content:
-      "The minute T3 Code supports Claude Code, it could potentially become my daily driver. There's something special there.",
-    link: "https://x.com/tannerlinsley/status/2031102771529920966",
+      "T3 Code is worth giving a try if you haven’t yet\n\nIt takes what I liked so much about codex’s remote setup and improves upon it, it’s a great UX using it on both desktop and mobile\n\nAlso is just nice to have all the official harnesses in one app",
+    excerpt:
+      "It takes what I liked so much about codex’s remote setup and improves upon it, it’s a great UX using it on both desktop and mobile",
+    link: "https://x.com/RhysSullivan/status/2089750636686643493",
   },
   {
-    handle: "aronprins",
-    content:
-      "I already loved T3 Code by @theo and @jullerino, but their Connections implementation is next level epic and for this they should both earn maximum repect 🔥🫡",
-    excerpt: "I already loved T3 Code, but their Connections implementation is next level epic.",
-    link: "https://x.com/aronprins/status/2045102518196183109",
+    handle: "DavidKPiano",
+    content: "It's like Claude Code if they didn't vibe-code the entire thing",
+    link: "https://x.com/DavidKPiano/status/2054682983504719930",
   },
   {
-    handle: "BennettBuhner",
+    handle: "JoshuaRileyDev",
     content:
-      "T3 Code is literally Codex but better; all your favorite models and harnesses, accessible anywhere! The app is great but the website is even greater, so instead of needing to SSH into a machine, T3 IS my SSH!",
-    excerpt:
-      "T3 Code is literally Codex but better; all your favorite models and harnesses, accessible anywhere.",
-    link: "https://x.com/BennettBuhner/status/2054667115697754387",
+      "Well I was 2,000 miles away on holiday and able to do iOS development from just my phone, T3 Code’s remote feature is a magical experience",
+    excerpt: "I was 2,000 miles away on holiday and able to do iOS development from just my phone",
+    link: "https://x.com/JoshuaRileyDev/status/2094379365408616837",
   },
   {
-    handle: "ex0t1clol",
-    content: "T3 Code is proof electron apps don't have to suck",
-    link: "https://x.com/ex0t1clol/status/2054666870008021197",
+    handle: "aronprins",
+    content:
+      "T3 Code works better than Claude and Codex combined… and T3 actually combines then (and more!) 🤯\n\nHuge shoutout to @theo and @jullerino\n\nAmazing product fellers 🔥🙌",
+    excerpt:
+      "T3 Code works better than Claude and Codex combined… and T3 actually combines then (and more!)",
+    link: "https://x.com/aronprins/status/2089761738358915267",
   },
   {
-    handle: "Josikinz",
+    handle: "teja2495",
     content:
-      "T3 code is better because it’s like if the codex Mac app didn’t make my computer run like shit 😋",
-    link: "https://x.com/Josikinz/status/2030367951694745870",
+      "I’ve completely switched to T3 Code for all my workflows. I just switch between different subscriptions and harnesses depending on what I need.",
+    excerpt: "I’ve completely switched to T3 Code for all my workflows.",
+    link: "https://x.com/teja2495/status/2052420254991581623",
   },
   {
-    handle: "jetpackjoe_",
-    content: "T3 code is pretty alright I guess",
-    link: "https://x.com/jetpackjoe_/status/2054666792933404959",
+    handle: "ryanrhughes",
+    content:
+      "Then there's the mobile app. All of my threads, on all of my environments, in my pocket. Fantastic.\n\nWhile traveling the other day, I had to use T3 Code alongside my old Claude Code + Herdr setup from 36,000ft on my phone.\n\nOn T3 Code, it felt like LAN. On the TUI, every keystroke took about 1sec to show up because it had to roundtrip to the device before I was able to actually see it. Brutal.",
+    excerpt: "...from 36,000ft on my phone. On T3 Code, it felt like LAN.",
+    link: "https://x.com/ryanrhughes/status/2093051708939059204",
   },
   {
-    handle: "mil000",
-    content: "T3 code saved my relationship!",
-    link: "https://x.com/mil000/status/2030120041451246071",
+    handle: "ex0t1clol",
+    content: "T3 Code is proof electron apps don't have to suck",
+    link: "https://x.com/ex0t1clol/status/2054666870008021197",
   },
   {
-    handle: "_winter_wonders",
-    content: "Heartbreaking: AI-hater has to admit T3 Code is really good.",
-    link: "https://x.com/_winter_wonders/status/2052350198764970434",
+    handle: "enunomaduro",
+    content: "So I tried @theo's T3 Code...",
+    link: "https://x.com/enunomaduro/status/2091915930141876495",
   },
   {
-    handle: "kostyniuk00",
+    handle: "pocarles",
     content:
-      "I was not expecting a year ago, that my anti-AI colleagues would thank me a year later, for persuading them to try T3 Code Beta, that really helped them with organizing their workflows. \n\nFantastic product by @jullerino and @theo. Go try it out if you haven’t yet!",
+      "Only using Codex and T3 now.\n\nI thought all AI coding harnesses had roughly the same impact. Using T3 Code taught me how wrong I was. The interface between you and the model changes everything.",
     excerpt:
-      "My anti-AI colleagues thanked me for persuading them to try T3 Code Beta. Fantastic product.",
-    link: "https://x.com/kostyniuk00/status/2052041388179468521",
+      "Using T3 Code taught me how wrong I was. The interface between you and the model changes everything.",
+    link: "https://x.com/pocarles/status/2054673964274758046",
   },
   {
-    handle: "gnukeith",
+    handle: "BennettBuhner",
     content:
-      "I tried T3 Code it actually fixed issues that Opus couldn’t solve in Claude Code + Theo has replied with “UwU” under my post. Dario has not.",
-    link: "https://x.com/gnukeith/status/2054670073579630730",
-  },
-  {
-    handle: "peculiarnewbie",
-    content: "T3 Code is iOS and other harnesses are androids",
-    link: "https://x.com/peculiarnewbie/status/2054671685027233827",
+      "T3 Code is literally Codex but better; all your favorite models and harnesses, accessible anywhere! The app is great but the website is even greater, so instead of needing to SSH into a machine, T3 IS my SSH!",
+    excerpt:
+      "T3 Code is literally Codex but better; all your favorite models and harnesses, accessible anywhere.",
+    link: "https://x.com/BennettBuhner/status/2054667115697754387",
   },
   {
     handle: "leodev",
@@ -97,17 +106,10 @@ export const tweets = [
     link: "https://x.com/leodev/status/2054679746353537042",
   },
   {
-    handle: "pocarles",
+    handle: "Shay_Benshabtay",
     content:
-      "Only using Codex and T3 now.\n\nI thought all AI coding harnesses had roughly the same impact. Using T3 Code taught me how wrong I was. The interface between you and the model changes everything.",
-    excerpt:
-      "Using T3 Code taught me how wrong I was. The interface between you and the model changes everything.",
-    link: "https://x.com/pocarles/status/2054673964274758046",
-  },
-  {
-    handle: "DavidKPiano",
-    content: "It's like Claude Code if they didn't vibe-code the entire thing",
-    link: "https://x.com/DavidKPiano/status/2054682983504719930",
+      "T3 code is not perfect, but it's damn good. Open and fun , I can make my own fork for my uses and use the great tooling with my own needs.",
+    link: "https://x.com/Shay_Benshabtay/status/2054668503857156326",
   },
   {
     handle: "iamkaffe",
@@ -115,9 +117,27 @@ export const tweets = [
     link: "https://x.com/iamkaffe/status/2054675539311411280",
   },
   {
-    handle: "uwunetes",
+    handle: "_winter_wonders",
+    content: "Heartbreaking: AI-hater has to admit T3 Code is really good.",
+    link: "https://x.com/_winter_wonders/status/2052350198764970434",
+  },
+  {
+    handle: "kostyniuk00",
     content:
-      "claude code make me go *whine whine whine* and t3 code make me go woof woof awooooo!!!",
-    link: "https://x.com/uwunetes/status/2054683356022120640",
+      "I was not expecting a year ago, that my anti-AI colleagues would thank me a year later, for persuading them to try T3 Code Beta, that really helped them with organizing their workflows. \n\nFantastic product by @jullerino and @theo. Go try it out if you haven’t yet!",
+    excerpt:
+      "My anti-AI colleagues thanked me for persuading them to try T3 Code Beta. Fantastic product.",
+    link: "https://x.com/kostyniuk00/status/2052041388179468521",
+  },
+  {
+    handle: "Josikinz",
+    content:
+      "T3 code is better because it’s like if the codex Mac app didn’t make my computer run like shit 😋",
+    link: "https://x.com/Josikinz/status/2030367951694745870",
+  },
+  {
+    handle: "mil000",
+    content: "T3 code saved my relationship!",
+    link: "https://x.com/mil000/status/2030120041451246071",
   },
 ] satisfies Tweet[];
diff --git a/apps/mobile/generated-uniwind-themes.css b/apps/mobile/generated-uniwind-themes.css
index 7f8f9c16afca..8ba542165f18 100644
--- a/apps/mobile/generated-uniwind-themes.css
+++ b/apps/mobile/generated-uniwind-themes.css
@@ -21,23 +21,23 @@
       --color-adaptive-indigo-500-a12-a16: oklch(58.5% 0.233 277.117 / 12%);
       --color-adaptive-indigo-600-300: oklch(51.1% 0.262 276.966);
       --color-adaptive-indigo-700-300: oklch(45.7% 0.24 277.023);
-      --color-adaptive-neutral-100-900: oklch(97% 0 0);
-      --color-adaptive-neutral-200-700-a60: oklch(92.2% 0 0);
-      --color-adaptive-neutral-200-800: oklch(92.2% 0 0);
-      --color-adaptive-neutral-200-a70-white-a8: oklch(92.2% 0 0 / 70%);
-      --color-adaptive-neutral-200-white-a6: oklch(92.2% 0 0);
-      --color-adaptive-neutral-200-white-a8: oklch(92.2% 0 0);
-      --color-adaptive-neutral-200-a80-white-a8: oklch(92.2% 0 0 / 80%);
-      --color-adaptive-neutral-300-a60-white-a12: oklch(87% 0 0 / 60%);
-      --color-adaptive-neutral-400-500: oklch(70.8% 0 0);
-      --color-adaptive-neutral-400-a60-500-a60: oklch(70.8% 0 0 / 60%);
-      --color-adaptive-neutral-400-a80-500-a80: oklch(70.8% 0 0 / 80%);
-      --color-adaptive-neutral-500-a10-a16: oklch(55.6% 0 0 / 10%);
-      --color-adaptive-neutral-500-400: oklch(55.6% 0 0);
-      --color-adaptive-neutral-500-500: oklch(55.6% 0 0);
-      --color-adaptive-neutral-600-300: oklch(43.9% 0 0);
-      --color-adaptive-neutral-600-400: oklch(43.9% 0 0);
-      --color-adaptive-neutral-950-50: oklch(14.5% 0 0);
+      --color-adaptive-neutral-100-900: oklch(97% 0 none);
+      --color-adaptive-neutral-200-700-a60: oklch(92.2% 0 none);
+      --color-adaptive-neutral-200-800: oklch(92.2% 0 none);
+      --color-adaptive-neutral-200-a70-white-a8: oklch(92.2% 0 none / 70%);
+      --color-adaptive-neutral-200-white-a6: oklch(92.2% 0 none);
+      --color-adaptive-neutral-200-white-a8: oklch(92.2% 0 none);
+      --color-adaptive-neutral-200-a80-white-a8: oklch(92.2% 0 none / 80%);
+      --color-adaptive-neutral-300-a60-white-a12: oklch(87% 0 none / 60%);
+      --color-adaptive-neutral-400-500: oklch(70.8% 0 none);
+      --color-adaptive-neutral-400-a60-500-a60: oklch(70.8% 0 none / 60%);
+      --color-adaptive-neutral-400-a80-500-a80: oklch(70.8% 0 none / 80%);
+      --color-adaptive-neutral-500-a10-a16: oklch(55.6% 0 none / 10%);
+      --color-adaptive-neutral-500-400: oklch(55.6% 0 none);
+      --color-adaptive-neutral-500-500: oklch(55.6% 0 none);
+      --color-adaptive-neutral-600-300: oklch(43.9% 0 none);
+      --color-adaptive-neutral-600-400: oklch(43.9% 0 none);
+      --color-adaptive-neutral-950-50: oklch(14.5% 0 none);
       --color-adaptive-red-50-950-a80: oklch(97.1% 0.013 17.38);
       --color-adaptive-red-200-800: oklch(88.5% 0.062 18.334);
       --color-adaptive-red-600-a80-400-a80: oklch(57.7% 0.245 27.325 / 80%);
@@ -81,23 +81,23 @@
       --color-adaptive-indigo-500-a12-a16: oklch(58.5% 0.233 277.117 / 16%);
       --color-adaptive-indigo-600-300: oklch(78.5% 0.115 274.713);
       --color-adaptive-indigo-700-300: oklch(78.5% 0.115 274.713);
-      --color-adaptive-neutral-100-900: oklch(20.5% 0 0);
-      --color-adaptive-neutral-200-700-a60: oklch(37.1% 0 0 / 60%);
-      --color-adaptive-neutral-200-800: oklch(26.9% 0 0);
+      --color-adaptive-neutral-100-900: oklch(20.5% 0 none);
+      --color-adaptive-neutral-200-700-a60: oklch(37.1% 0 none / 60%);
+      --color-adaptive-neutral-200-800: oklch(26.9% 0 none);
       --color-adaptive-neutral-200-a70-white-a8: rgb(255 255 255 / 8%);
       --color-adaptive-neutral-200-white-a6: rgb(255 255 255 / 6%);
       --color-adaptive-neutral-200-white-a8: rgb(255 255 255 / 8%);
       --color-adaptive-neutral-200-a80-white-a8: rgb(255 255 255 / 8%);
       --color-adaptive-neutral-300-a60-white-a12: rgb(255 255 255 / 12%);
-      --color-adaptive-neutral-400-500: oklch(55.6% 0 0);
-      --color-adaptive-neutral-400-a60-500-a60: oklch(55.6% 0 0 / 60%);
-      --color-adaptive-neutral-400-a80-500-a80: oklch(55.6% 0 0 / 80%);
-      --color-adaptive-neutral-500-a10-a16: oklch(55.6% 0 0 / 16%);
-      --color-adaptive-neutral-500-400: oklch(70.8% 0 0);
-      --color-adaptive-neutral-500-500: oklch(55.6% 0 0);
-      --color-adaptive-neutral-600-300: oklch(87% 0 0);
-      --color-adaptive-neutral-600-400: oklch(70.8% 0 0);
-      --color-adaptive-neutral-950-50: oklch(98.5% 0 0);
+      --color-adaptive-neutral-400-500: oklch(55.6% 0 none);
+      --color-adaptive-neutral-400-a60-500-a60: oklch(55.6% 0 none / 60%);
+      --color-adaptive-neutral-400-a80-500-a80: oklch(55.6% 0 none / 80%);
+      --color-adaptive-neutral-500-a10-a16: oklch(55.6% 0 none / 16%);
+      --color-adaptive-neutral-500-400: oklch(70.8% 0 none);
+      --color-adaptive-neutral-500-500: oklch(55.6% 0 none);
+      --color-adaptive-neutral-600-300: oklch(87% 0 none);
+      --color-adaptive-neutral-600-400: oklch(70.8% 0 none);
+      --color-adaptive-neutral-950-50: oklch(98.5% 0 none);
       --color-adaptive-red-50-950-a80: oklch(25.8% 0.092 26.042 / 80%);
       --color-adaptive-red-200-800: oklch(44.4% 0.177 26.899);
       --color-adaptive-red-600-a80-400-a80: oklch(70.4% 0.191 22.216 / 80%);
@@ -115,7 +115,7 @@
       --color-adaptive-violet-500-a12-a16: oklch(60.6% 0.25 292.717 / 16%);
       --color-adaptive-violet-600-400: oklch(70.2% 0.183 293.541);
       --color-adaptive-violet-700-300: oklch(81.1% 0.111 293.571);
-      --color-adaptive-white-neutral-950-a70: oklch(14.5% 0 0 / 70%);
+      --color-adaptive-white-neutral-950-a70: oklch(14.5% 0 none / 70%);
       --color-adaptive-zinc-500-a12-a16: oklch(55.2% 0.016 285.938 / 16%);
       --color-adaptive-zinc-500-400: oklch(70.5% 0.015 286.067);
       --color-adaptive-zinc-600-300: oklch(87.1% 0.006 286.286);
@@ -206,23 +206,23 @@
       --color-adaptive-indigo-500-a12-a16: oklch(58.5% 0.233 277.117 / 12%);
       --color-adaptive-indigo-600-300: oklch(51.1% 0.262 276.966);
       --color-adaptive-indigo-700-300: oklch(45.7% 0.24 277.023);
-      --color-adaptive-neutral-100-900: oklch(97% 0 0);
-      --color-adaptive-neutral-200-700-a60: oklch(92.2% 0 0);
-      --color-adaptive-neutral-200-800: oklch(92.2% 0 0);
-      --color-adaptive-neutral-200-a70-white-a8: oklch(92.2% 0 0 / 70%);
-      --color-adaptive-neutral-200-white-a6: oklch(92.2% 0 0);
-      --color-adaptive-neutral-200-white-a8: oklch(92.2% 0 0);
-      --color-adaptive-neutral-200-a80-white-a8: oklch(92.2% 0 0 / 80%);
-      --color-adaptive-neutral-300-a60-white-a12: oklch(87% 0 0 / 60%);
-      --color-adaptive-neutral-400-500: oklch(70.8% 0 0);
-      --color-adaptive-neutral-400-a60-500-a60: oklch(70.8% 0 0 / 60%);
-      --color-adaptive-neutral-400-a80-500-a80: oklch(70.8% 0 0 / 80%);
-      --color-adaptive-neutral-500-a10-a16: oklch(55.6% 0 0 / 10%);
-      --color-adaptive-neutral-500-400: oklch(55.6% 0 0);
-      --color-adaptive-neutral-500-500: oklch(55.6% 0 0);
-      --color-adaptive-neutral-600-300: oklch(43.9% 0 0);
-      --color-adaptive-neutral-600-400: oklch(43.9% 0 0);
-      --color-adaptive-neutral-950-50: oklch(14.5% 0 0);
+      --color-adaptive-neutral-100-900: oklch(97% 0 none);
+      --color-adaptive-neutral-200-700-a60: oklch(92.2% 0 none);
+      --color-adaptive-neutral-200-800: oklch(92.2% 0 none);
+      --color-adaptive-neutral-200-a70-white-a8: oklch(92.2% 0 none / 70%);
+      --color-adaptive-neutral-200-white-a6: oklch(92.2% 0 none);
+      --color-adaptive-neutral-200-white-a8: oklch(92.2% 0 none);
+      --color-adaptive-neutral-200-a80-white-a8: oklch(92.2% 0 none / 80%);
+      --color-adaptive-neutral-300-a60-white-a12: oklch(87% 0 none / 60%);
+      --color-adaptive-neutral-400-500: oklch(70.8% 0 none);
+      --color-adaptive-neutral-400-a60-500-a60: oklch(70.8% 0 none / 60%);
+      --color-adaptive-neutral-400-a80-500-a80: oklch(70.8% 0 none / 80%);
+      --color-adaptive-neutral-500-a10-a16: oklch(55.6% 0 none / 10%);
+      --color-adaptive-neutral-500-400: oklch(55.6% 0 none);
+      --color-adaptive-neutral-500-500: oklch(55.6% 0 none);
+      --color-adaptive-neutral-600-300: oklch(43.9% 0 none);
+      --color-adaptive-neutral-600-400: oklch(43.9% 0 none);
+      --color-adaptive-neutral-950-50: oklch(14.5% 0 none);
       --color-adaptive-red-50-950-a80: oklch(97.1% 0.013 17.38);
       --color-adaptive-red-200-800: oklch(88.5% 0.062 18.334);
       --color-adaptive-red-600-a80-400-a80: oklch(57.7% 0.245 27.325 / 80%);
@@ -331,23 +331,23 @@
       --color-adaptive-indigo-500-a12-a16: oklch(58.5% 0.233 277.117 / 16%);
       --color-adaptive-indigo-600-300: oklch(78.5% 0.115 274.713);
       --color-adaptive-indigo-700-300: oklch(78.5% 0.115 274.713);
-      --color-adaptive-neutral-100-900: oklch(20.5% 0 0);
-      --color-adaptive-neutral-200-700-a60: oklch(37.1% 0 0 / 60%);
-      --color-adaptive-neutral-200-800: oklch(26.9% 0 0);
+      --color-adaptive-neutral-100-900: oklch(20.5% 0 none);
+      --color-adaptive-neutral-200-700-a60: oklch(37.1% 0 none / 60%);
+      --color-adaptive-neutral-200-800: oklch(26.9% 0 none);
       --color-adaptive-neutral-200-a70-white-a8: rgb(255 255 255 / 8%);
       --color-adaptive-neutral-200-white-a6: rgb(255 255 255 / 6%);
       --color-adaptive-neutral-200-white-a8: rgb(255 255 255 / 8%);
       --color-adaptive-neutral-200-a80-white-a8: rgb(255 255 255 / 8%);
       --color-adaptive-neutral-300-a60-white-a12: rgb(255 255 255 / 12%);
-      --color-adaptive-neutral-400-500: oklch(55.6% 0 0);
-      --color-adaptive-neutral-400-a60-500-a60: oklch(55.6% 0 0 / 60%);
-      --color-adaptive-neutral-400-a80-500-a80: oklch(55.6% 0 0 / 80%);
-      --color-adaptive-neutral-500-a10-a16: oklch(55.6% 0 0 / 16%);
-      --color-adaptive-neutral-500-400: oklch(70.8% 0 0);
-      --color-adaptive-neutral-500-500: oklch(55.6% 0 0);
-      --color-adaptive-neutral-600-300: oklch(87% 0 0);
-      --color-adaptive-neutral-600-400: oklch(70.8% 0 0);
-      --color-adaptive-neutral-950-50: oklch(98.5% 0 0);
+      --color-adaptive-neutral-400-500: oklch(55.6% 0 none);
+      --color-adaptive-neutral-400-a60-500-a60: oklch(55.6% 0 none / 60%);
+      --color-adaptive-neutral-400-a80-500-a80: oklch(55.6% 0 none / 80%);
+      --color-adaptive-neutral-500-a10-a16: oklch(55.6% 0 none / 16%);
+      --color-adaptive-neutral-500-400: oklch(70.8% 0 none);
+      --color-adaptive-neutral-500-500: oklch(55.6% 0 none);
+      --color-adaptive-neutral-600-300: oklch(87% 0 none);
+      --color-adaptive-neutral-600-400: oklch(70.8% 0 none);
+      --color-adaptive-neutral-950-50: oklch(98.5% 0 none);
       --color-adaptive-red-50-950-a80: oklch(25.8% 0.092 26.042 / 80%);
       --color-adaptive-red-200-800: oklch(44.4% 0.177 26.899);
       --color-adaptive-red-600-a80-400-a80: oklch(70.4% 0.191 22.216 / 80%);
@@ -365,7 +365,7 @@
       --color-adaptive-violet-500-a12-a16: oklch(60.6% 0.25 292.717 / 16%);
       --color-adaptive-violet-600-400: oklch(70.2% 0.183 293.541);
       --color-adaptive-violet-700-300: oklch(81.1% 0.111 293.571);
-      --color-adaptive-white-neutral-950-a70: oklch(14.5% 0 0 / 70%);
+      --color-adaptive-white-neutral-950-a70: oklch(14.5% 0 none / 70%);
       --color-adaptive-zinc-500-a12-a16: oklch(55.2% 0.016 285.938 / 16%);
       --color-adaptive-zinc-500-400: oklch(70.5% 0.015 286.067);
       --color-adaptive-zinc-600-300: oklch(87.1% 0.006 286.286);
@@ -456,23 +456,23 @@
       --color-adaptive-indigo-500-a12-a16: oklch(58.5% 0.233 277.117 / 12%);
       --color-adaptive-indigo-600-300: oklch(51.1% 0.262 276.966);
       --color-adaptive-indigo-700-300: oklch(45.7% 0.24 277.023);
-      --color-adaptive-neutral-100-900: oklch(97% 0 0);
-      --color-adaptive-neutral-200-700-a60: oklch(92.2% 0 0);
-      --color-adaptive-neutral-200-800: oklch(92.2% 0 0);
-      --color-adaptive-neutral-200-a70-white-a8: oklch(92.2% 0 0 / 70%);
-      --color-adaptive-neutral-200-white-a6: oklch(92.2% 0 0);
-      --color-adaptive-neutral-200-white-a8: oklch(92.2% 0 0);
-      --color-adaptive-neutral-200-a80-white-a8: oklch(92.2% 0 0 / 80%);
-      --color-adaptive-neutral-300-a60-white-a12: oklch(87% 0 0 / 60%);
-      --color-adaptive-neutral-400-500: oklch(70.8% 0 0);
-      --color-adaptive-neutral-400-a60-500-a60: oklch(70.8% 0 0 / 60%);
-      --color-adaptive-neutral-400-a80-500-a80: oklch(70.8% 0 0 / 80%);
-      --color-adaptive-neutral-500-a10-a16: oklch(55.6% 0 0 / 10%);
-      --color-adaptive-neutral-500-400: oklch(55.6% 0 0);
-      --color-adaptive-neutral-500-500: oklch(55.6% 0 0);
-      --color-adaptive-neutral-600-300: oklch(43.9% 0 0);
-      --color-adaptive-neutral-600-400: oklch(43.9% 0 0);
-      --color-adaptive-neutral-950-50: oklch(14.5% 0 0);
+      --color-adaptive-neutral-100-900: oklch(97% 0 none);
+      --color-adaptive-neutral-200-700-a60: oklch(92.2% 0 none);
+      --color-adaptive-neutral-200-800: oklch(92.2% 0 none);
+      --color-adaptive-neutral-200-a70-white-a8: oklch(92.2% 0 none / 70%);
+      --color-adaptive-neutral-200-white-a6: oklch(92.2% 0 none);
+      --color-adaptive-neutral-200-white-a8: oklch(92.2% 0 none);
+      --color-adaptive-neutral-200-a80-white-a8: oklch(92.2% 0 none / 80%);
+      --color-adaptive-neutral-300-a60-white-a12: oklch(87% 0 none / 60%);
+      --color-adaptive-neutral-400-500: oklch(70.8% 0 none);
+      --color-adaptive-neutral-400-a60-500-a60: oklch(70.8% 0 none / 60%);
+      --color-adaptive-neutral-400-a80-500-a80: oklch(70.8% 0 none / 80%);
+      --color-adaptive-neutral-500-a10-a16: oklch(55.6% 0 none / 10%);
+      --color-adaptive-neutral-500-400: oklch(55.6% 0 none);
+      --color-adaptive-neutral-500-500: oklch(55.6% 0 none);
+      --color-adaptive-neutral-600-300: oklch(43.9% 0 none);
+      --color-adaptive-neutral-600-400: oklch(43.9% 0 none);
+      --color-adaptive-neutral-950-50: oklch(14.5% 0 none);
       --color-adaptive-red-50-950-a80: oklch(97.1% 0.013 17.38);
       --color-adaptive-red-200-800: oklch(88.5% 0.062 18.334);
       --color-adaptive-red-600-a80-400-a80: oklch(57.7% 0.245 27.325 / 80%);
@@ -581,23 +581,23 @@
       --color-adaptive-indigo-500-a12-a16: oklch(58.5% 0.233 277.117 / 16%);
       --color-adaptive-indigo-600-300: oklch(78.5% 0.115 274.713);
       --color-adaptive-indigo-700-300: oklch(78.5% 0.115 274.713);
-      --color-adaptive-neutral-100-900: oklch(20.5% 0 0);
-      --color-adaptive-neutral-200-700-a60: oklch(37.1% 0 0 / 60%);
-      --color-adaptive-neutral-200-800: oklch(26.9% 0 0);
+      --color-adaptive-neutral-100-900: oklch(20.5% 0 none);
+      --color-adaptive-neutral-200-700-a60: oklch(37.1% 0 none / 60%);
+      --color-adaptive-neutral-200-800: oklch(26.9% 0 none);
       --color-adaptive-neutral-200-a70-white-a8: rgb(255 255 255 / 8%);
       --color-adaptive-neutral-200-white-a6: rgb(255 255 255 / 6%);
       --color-adaptive-neutral-200-white-a8: rgb(255 255 255 / 8%);
       --color-adaptive-neutral-200-a80-white-a8: rgb(255 255 255 / 8%);
       --color-adaptive-neutral-300-a60-white-a12: rgb(255 255 255 / 12%);
-      --color-adaptive-neutral-400-500: oklch(55.6% 0 0);
-      --color-adaptive-neutral-400-a60-500-a60: oklch(55.6% 0 0 / 60%);
-      --color-adaptive-neutral-400-a80-500-a80: oklch(55.6% 0 0 / 80%);
-      --color-adaptive-neutral-500-a10-a16: oklch(55.6% 0 0 / 16%);
-      --color-adaptive-neutral-500-400: oklch(70.8% 0 0);
-      --color-adaptive-neutral-500-500: oklch(55.6% 0 0);
-      --color-adaptive-neutral-600-300: oklch(87% 0 0);
-      --color-adaptive-neutral-600-400: oklch(70.8% 0 0);
-      --color-adaptive-neutral-950-50: oklch(98.5% 0 0);
+      --color-adaptive-neutral-400-500: oklch(55.6% 0 none);
+      --color-adaptive-neutral-400-a60-500-a60: oklch(55.6% 0 none / 60%);
+      --color-adaptive-neutral-400-a80-500-a80: oklch(55.6% 0 none / 80%);
+      --color-adaptive-neutral-500-a10-a16: oklch(55.6% 0 none / 16%);
+      --color-adaptive-neutral-500-400: oklch(70.8% 0 none);
+      --color-adaptive-neutral-500-500: oklch(55.6% 0 none);
+      --color-adaptive-neutral-600-300: oklch(87% 0 none);
+      --color-adaptive-neutral-600-400: oklch(70.8% 0 none);
+      --color-adaptive-neutral-950-50: oklch(98.5% 0 none);
       --color-adaptive-red-50-950-a80: oklch(25.8% 0.092 26.042 / 80%);
       --color-adaptive-red-200-800: oklch(44.4% 0.177 26.899);
       --color-adaptive-red-600-a80-400-a80: oklch(70.4% 0.191 22.216 / 80%);
@@ -615,7 +615,7 @@
       --color-adaptive-violet-500-a12-a16: oklch(60.6% 0.25 292.717 / 16%);
       --color-adaptive-violet-600-400: oklch(70.2% 0.183 293.541);
       --color-adaptive-violet-700-300: oklch(81.1% 0.111 293.571);
-      --color-adaptive-white-neutral-950-a70: oklch(14.5% 0 0 / 70%);
+      --color-adaptive-white-neutral-950-a70: oklch(14.5% 0 none / 70%);
       --color-adaptive-zinc-500-a12-a16: oklch(55.2% 0.016 285.938 / 16%);
       --color-adaptive-zinc-500-400: oklch(70.5% 0.015 286.067);
       --color-adaptive-zinc-600-300: oklch(87.1% 0.006 286.286);
@@ -706,23 +706,23 @@
       --color-adaptive-indigo-500-a12-a16: oklch(58.5% 0.233 277.117 / 12%);
       --color-adaptive-indigo-600-300: oklch(51.1% 0.262 276.966);
       --color-adaptive-indigo-700-300: oklch(45.7% 0.24 277.023);
-      --color-adaptive-neutral-100-900: oklch(97% 0 0);
-      --color-adaptive-neutral-200-700-a60: oklch(92.2% 0 0);
-      --color-adaptive-neutral-200-800: oklch(92.2% 0 0);
-      --color-adaptive-neutral-200-a70-white-a8: oklch(92.2% 0 0 / 70%);
-      --color-adaptive-neutral-200-white-a6: oklch(92.2% 0 0);
-      --color-adaptive-neutral-200-white-a8: oklch(92.2% 0 0);
-      --color-adaptive-neutral-200-a80-white-a8: oklch(92.2% 0 0 / 80%);
-      --color-adaptive-neutral-300-a60-white-a12: oklch(87% 0 0 / 60%);
-      --color-adaptive-neutral-400-500: oklch(70.8% 0 0);
-      --color-adaptive-neutral-400-a60-500-a60: oklch(70.8% 0 0 / 60%);
-      --color-adaptive-neutral-400-a80-500-a80: oklch(70.8% 0 0 / 80%);
-      --color-adaptive-neutral-500-a10-a16: oklch(55.6% 0 0 / 10%);
-      --color-adaptive-neutral-500-400: oklch(55.6% 0 0);
-      --color-adaptive-neutral-500-500: oklch(55.6% 0 0);
-      --color-adaptive-neutral-600-300: oklch(43.9% 0 0);
-      --color-adaptive-neutral-600-400: oklch(43.9% 0 0);
-      --color-adaptive-neutral-950-50: oklch(14.5% 0 0);
+      --color-adaptive-neutral-100-900: oklch(97% 0 none);
+      --color-adaptive-neutral-200-700-a60: oklch(92.2% 0 none);
+      --color-adaptive-neutral-200-800: oklch(92.2% 0 none);
+      --color-adaptive-neutral-200-a70-white-a8: oklch(92.2% 0 none / 70%);
+      --color-adaptive-neutral-200-white-a6: oklch(92.2% 0 none);
+      --color-adaptive-neutral-200-white-a8: oklch(92.2% 0 none);
+      --color-adaptive-neutral-200-a80-white-a8: oklch(92.2% 0 none / 80%);
+      --color-adaptive-neutral-300-a60-white-a12: oklch(87% 0 none / 60%);
+      --color-adaptive-neutral-400-500: oklch(70.8% 0 none);
+      --color-adaptive-neutral-400-a60-500-a60: oklch(70.8% 0 none / 60%);
+      --color-adaptive-neutral-400-a80-500-a80: oklch(70.8% 0 none / 80%);
+      --color-adaptive-neutral-500-a10-a16: oklch(55.6% 0 none / 10%);
+      --color-adaptive-neutral-500-400: oklch(55.6% 0 none);
+      --color-adaptive-neutral-500-500: oklch(55.6% 0 none);
+      --color-adaptive-neutral-600-300: oklch(43.9% 0 none);
+      --color-adaptive-neutral-600-400: oklch(43.9% 0 none);
+      --color-adaptive-neutral-950-50: oklch(14.5% 0 none);
       --color-adaptive-red-50-950-a80: oklch(97.1% 0.013 17.38);
       --color-adaptive-red-200-800: oklch(88.5% 0.062 18.334);
       --color-adaptive-red-600-a80-400-a80: oklch(57.7% 0.245 27.325 / 80%);
@@ -831,23 +831,23 @@
       --color-adaptive-indigo-500-a12-a16: oklch(58.5% 0.233 277.117 / 16%);
       --color-adaptive-indigo-600-300: oklch(78.5% 0.115 274.713);
       --color-adaptive-indigo-700-300: oklch(78.5% 0.115 274.713);
-      --color-adaptive-neutral-100-900: oklch(20.5% 0 0);
-      --color-adaptive-neutral-200-700-a60: oklch(37.1% 0 0 / 60%);
-      --color-adaptive-neutral-200-800: oklch(26.9% 0 0);
+      --color-adaptive-neutral-100-900: oklch(20.5% 0 none);
+      --color-adaptive-neutral-200-700-a60: oklch(37.1% 0 none / 60%);
+      --color-adaptive-neutral-200-800: oklch(26.9% 0 none);
       --color-adaptive-neutral-200-a70-white-a8: rgb(255 255 255 / 8%);
       --color-adaptive-neutral-200-white-a6: rgb(255 255 255 / 6%);
       --color-adaptive-neutral-200-white-a8: rgb(255 255 255 / 8%);
       --color-adaptive-neutral-200-a80-white-a8: rgb(255 255 255 / 8%);
       --color-adaptive-neutral-300-a60-white-a12: rgb(255 255 255 / 12%);
-      --color-adaptive-neutral-400-500: oklch(55.6% 0 0);
-      --color-adaptive-neutral-400-a60-500-a60: oklch(55.6% 0 0 / 60%);
-      --color-adaptive-neutral-400-a80-500-a80: oklch(55.6% 0 0 / 80%);
-      --color-adaptive-neutral-500-a10-a16: oklch(55.6% 0 0 / 16%);
-      --color-adaptive-neutral-500-400: oklch(70.8% 0 0);
-      --color-adaptive-neutral-500-500: oklch(55.6% 0 0);
-      --color-adaptive-neutral-600-300: oklch(87% 0 0);
-      --color-adaptive-neutral-600-400: oklch(70.8% 0 0);
-      --color-adaptive-neutral-950-50: oklch(98.5% 0 0);
+      --color-adaptive-neutral-400-500: oklch(55.6% 0 none);
+      --color-adaptive-neutral-400-a60-500-a60: oklch(55.6% 0 none / 60%);
+      --color-adaptive-neutral-400-a80-500-a80: oklch(55.6% 0 none / 80%);
+      --color-adaptive-neutral-500-a10-a16: oklch(55.6% 0 none / 16%);
+      --color-adaptive-neutral-500-400: oklch(70.8% 0 none);
+      --color-adaptive-neutral-500-500: oklch(55.6% 0 none);
+      --color-adaptive-neutral-600-300: oklch(87% 0 none);
+      --color-adaptive-neutral-600-400: oklch(70.8% 0 none);
+      --color-adaptive-neutral-950-50: oklch(98.5% 0 none);
       --color-adaptive-red-50-950-a80: oklch(25.8% 0.092 26.042 / 80%);
       --color-adaptive-red-200-800: oklch(44.4% 0.177 26.899);
       --color-adaptive-red-600-a80-400-a80: oklch(70.4% 0.191 22.216 / 80%);
@@ -865,7 +865,7 @@
       --color-adaptive-violet-500-a12-a16: oklch(60.6% 0.25 292.717 / 16%);
       --color-adaptive-violet-600-400: oklch(70.2% 0.183 293.541);
       --color-adaptive-violet-700-300: oklch(81.1% 0.111 293.571);
-      --color-adaptive-white-neutral-950-a70: oklch(14.5% 0 0 / 70%);
+      --color-adaptive-white-neutral-950-a70: oklch(14.5% 0 none / 70%);
       --color-adaptive-zinc-500-a12-a16: oklch(55.2% 0.016 285.938 / 16%);
       --color-adaptive-zinc-500-400: oklch(70.5% 0.015 286.067);
       --color-adaptive-zinc-600-300: oklch(87.1% 0.006 286.286);
@@ -956,23 +956,23 @@
       --color-adaptive-indigo-500-a12-a16: oklch(58.5% 0.233 277.117 / 12%);
       --color-adaptive-indigo-600-300: oklch(51.1% 0.262 276.966);
       --color-adaptive-indigo-700-300: oklch(45.7% 0.24 277.023);
-      --color-adaptive-neutral-100-900: oklch(97% 0 0);
-      --color-adaptive-neutral-200-700-a60: oklch(92.2% 0 0);
-      --color-adaptive-neutral-200-800: oklch(92.2% 0 0);
-      --color-adaptive-neutral-200-a70-white-a8: oklch(92.2% 0 0 / 70%);
-      --color-adaptive-neutral-200-white-a6: oklch(92.2% 0 0);
-      --color-adaptive-neutral-200-white-a8: oklch(92.2% 0 0);
-      --color-adaptive-neutral-200-a80-white-a8: oklch(92.2% 0 0 / 80%);
-      --color-adaptive-neutral-300-a60-white-a12: oklch(87% 0 0 / 60%);
-      --color-adaptive-neutral-400-500: oklch(70.8% 0 0);
-      --color-adaptive-neutral-400-a60-500-a60: oklch(70.8% 0 0 / 60%);
-      --color-adaptive-neutral-400-a80-500-a80: oklch(70.8% 0 0 / 80%);
-      --color-adaptive-neutral-500-a10-a16: oklch(55.6% 0 0 / 10%);
-      --color-adaptive-neutral-500-400: oklch(55.6% 0 0);
-      --color-adaptive-neutral-500-500: oklch(55.6% 0 0);
-      --color-adaptive-neutral-600-300: oklch(43.9% 0 0);
-      --color-adaptive-neutral-600-400: oklch(43.9% 0 0);
-      --color-adaptive-neutral-950-50: oklch(14.5% 0 0);
+      --color-adaptive-neutral-100-900: oklch(97% 0 none);
+      --color-adaptive-neutral-200-700-a60: oklch(92.2% 0 none);
+      --color-adaptive-neutral-200-800: oklch(92.2% 0 none);
+      --color-adaptive-neutral-200-a70-white-a8: oklch(92.2% 0 none / 70%);
+      --color-adaptive-neutral-200-white-a6: oklch(92.2% 0 none);
+      --color-adaptive-neutral-200-white-a8: oklch(92.2% 0 none);
+      --color-adaptive-neutral-200-a80-white-a8: oklch(92.2% 0 none / 80%);
+      --color-adaptive-neutral-300-a60-white-a12: oklch(87% 0 none / 60%);
+      --color-adaptive-neutral-400-500: oklch(70.8% 0 none);
+      --color-adaptive-neutral-400-a60-500-a60: oklch(70.8% 0 none / 60%);
+      --color-adaptive-neutral-400-a80-500-a80: oklch(70.8% 0 none / 80%);
+      --color-adaptive-neutral-500-a10-a16: oklch(55.6% 0 none / 10%);
+      --color-adaptive-neutral-500-400: oklch(55.6% 0 none);
+      --color-adaptive-neutral-500-500: oklch(55.6% 0 none);
+      --color-adaptive-neutral-600-300: oklch(43.9% 0 none);
+      --color-adaptive-neutral-600-400: oklch(43.9% 0 none);
+      --color-adaptive-neutral-950-50: oklch(14.5% 0 none);
       --color-adaptive-red-50-950-a80: oklch(97.1% 0.013 17.38);
       --color-adaptive-red-200-800: oklch(88.5% 0.062 18.334);
       --color-adaptive-red-600-a80-400-a80: oklch(57.7% 0.245 27.325 / 80%);
@@ -1081,23 +1081,23 @@
       --color-adaptive-indigo-500-a12-a16: oklch(58.5% 0.233 277.117 / 16%);
       --color-adaptive-indigo-600-300: oklch(78.5% 0.115 274.713);
       --color-adaptive-indigo-700-300: oklch(78.5% 0.115 274.713);
-      --color-adaptive-neutral-100-900: oklch(20.5% 0 0);
-      --color-adaptive-neutral-200-700-a60: oklch(37.1% 0 0 / 60%);
-      --color-adaptive-neutral-200-800: oklch(26.9% 0 0);
+      --color-adaptive-neutral-100-900: oklch(20.5% 0 none);
+      --color-adaptive-neutral-200-700-a60: oklch(37.1% 0 none / 60%);
+      --color-adaptive-neutral-200-800: oklch(26.9% 0 none);
       --color-adaptive-neutral-200-a70-white-a8: rgb(255 255 255 / 8%);
       --color-adaptive-neutral-200-white-a6: rgb(255 255 255 / 6%);
       --color-adaptive-neutral-200-white-a8: rgb(255 255 255 / 8%);
       --color-adaptive-neutral-200-a80-white-a8: rgb(255 255 255 / 8%);
       --color-adaptive-neutral-300-a60-white-a12: rgb(255 255 255 / 12%);
-      --color-adaptive-neutral-400-500: oklch(55.6% 0 0);
-      --color-adaptive-neutral-400-a60-500-a60: oklch(55.6% 0 0 / 60%);
-      --color-adaptive-neutral-400-a80-500-a80: oklch(55.6% 0 0 / 80%);
-      --color-adaptive-neutral-500-a10-a16: oklch(55.6% 0 0 / 16%);
-      --color-adaptive-neutral-500-400: oklch(70.8% 0 0);
-      --color-adaptive-neutral-500-500: oklch(55.6% 0 0);
-      --color-adaptive-neutral-600-300: oklch(87% 0 0);
-      --color-adaptive-neutral-600-400: oklch(70.8% 0 0);
-      --color-adaptive-neutral-950-50: oklch(98.5% 0 0);
+      --color-adaptive-neutral-400-500: oklch(55.6% 0 none);
+      --color-adaptive-neutral-400-a60-500-a60: oklch(55.6% 0 none / 60%);
+      --color-adaptive-neutral-400-a80-500-a80: oklch(55.6% 0 none / 80%);
+      --color-adaptive-neutral-500-a10-a16: oklch(55.6% 0 none / 16%);
+      --color-adaptive-neutral-500-400: oklch(70.8% 0 none);
+      --color-adaptive-neutral-500-500: oklch(55.6% 0 none);
+      --color-adaptive-neutral-600-300: oklch(87% 0 none);
+      --color-adaptive-neutral-600-400: oklch(70.8% 0 none);
+      --color-adaptive-neutral-950-50: oklch(98.5% 0 none);
       --color-adaptive-red-50-950-a80: oklch(25.8% 0.092 26.042 / 80%);
       --color-adaptive-red-200-800: oklch(44.4% 0.177 26.899);
       --color-adaptive-red-600-a80-400-a80: oklch(70.4% 0.191 22.216 / 80%);
@@ -1115,7 +1115,7 @@
       --color-adaptive-violet-500-a12-a16: oklch(60.6% 0.25 292.717 / 16%);
       --color-adaptive-violet-600-400: oklch(70.2% 0.183 293.541);
       --color-adaptive-violet-700-300: oklch(81.1% 0.111 293.571);
-      --color-adaptive-white-neutral-950-a70: oklch(14.5% 0 0 / 70%);
+      --color-adaptive-white-neutral-950-a70: oklch(14.5% 0 none / 70%);
       --color-adaptive-zinc-500-a12-a16: oklch(55.2% 0.016 285.938 / 16%);
       --color-adaptive-zinc-500-400: oklch(70.5% 0.015 286.067);
       --color-adaptive-zinc-600-300: oklch(87.1% 0.006 286.286);
@@ -1206,23 +1206,23 @@
       --color-adaptive-indigo-500-a12-a16: oklch(58.5% 0.233 277.117 / 12%);
       --color-adaptive-indigo-600-300: oklch(51.1% 0.262 276.966);
       --color-adaptive-indigo-700-300: oklch(45.7% 0.24 277.023);
-      --color-adaptive-neutral-100-900: oklch(97% 0 0);
-      --color-adaptive-neutral-200-700-a60: oklch(92.2% 0 0);
-      --color-adaptive-neutral-200-800: oklch(92.2% 0 0);
-      --color-adaptive-neutral-200-a70-white-a8: oklch(92.2% 0 0 / 70%);
-      --color-adaptive-neutral-200-white-a6: oklch(92.2% 0 0);
-      --color-adaptive-neutral-200-white-a8: oklch(92.2% 0 0);
-      --color-adaptive-neutral-200-a80-white-a8: oklch(92.2% 0 0 / 80%);
-      --color-adaptive-neutral-300-a60-white-a12: oklch(87% 0 0 / 60%);
-      --color-adaptive-neutral-400-500: oklch(70.8% 0 0);
-      --color-adaptive-neutral-400-a60-500-a60: oklch(70.8% 0 0 / 60%);
-      --color-adaptive-neutral-400-a80-500-a80: oklch(70.8% 0 0 / 80%);
-      --color-adaptive-neutral-500-a10-a16: oklch(55.6% 0 0 / 10%);
-      --color-adaptive-neutral-500-400: oklch(55.6% 0 0);
-      --color-adaptive-neutral-500-500: oklch(55.6% 0 0);
-      --color-adaptive-neutral-600-300: oklch(43.9% 0 0);
-      --color-adaptive-neutral-600-400: oklch(43.9% 0 0);
-      --color-adaptive-neutral-950-50: oklch(14.5% 0 0);
+      --color-adaptive-neutral-100-900: oklch(97% 0 none);
+      --color-adaptive-neutral-200-700-a60: oklch(92.2% 0 none);
+      --color-adaptive-neutral-200-800: oklch(92.2% 0 none);
+      --color-adaptive-neutral-200-a70-white-a8: oklch(92.2% 0 none / 70%);
+      --color-adaptive-neutral-200-white-a6: oklch(92.2% 0 none);
+      --color-adaptive-neutral-200-white-a8: oklch(92.2% 0 none);
+      --color-adaptive-neutral-200-a80-white-a8: oklch(92.2% 0 none / 80%);
+      --color-adaptive-neutral-300-a60-white-a12: oklch(87% 0 none / 60%);
+      --color-adaptive-neutral-400-500: oklch(70.8% 0 none);
+      --color-adaptive-neutral-400-a60-500-a60: oklch(70.8% 0 none / 60%);
+      --color-adaptive-neutral-400-a80-500-a80: oklch(70.8% 0 none / 80%);
+      --color-adaptive-neutral-500-a10-a16: oklch(55.6% 0 none / 10%);
+      --color-adaptive-neutral-500-400: oklch(55.6% 0 none);
+      --color-adaptive-neutral-500-500: oklch(55.6% 0 none);
+      --color-adaptive-neutral-600-300: oklch(43.9% 0 none);
+      --color-adaptive-neutral-600-400: oklch(43.9% 0 none);
+      --color-adaptive-neutral-950-50: oklch(14.5% 0 none);
       --color-adaptive-red-50-950-a80: oklch(97.1% 0.013 17.38);
       --color-adaptive-red-200-800: oklch(88.5% 0.062 18.334);
       --color-adaptive-red-600-a80-400-a80: oklch(57.7% 0.245 27.325 / 80%);
@@ -1331,23 +1331,23 @@
       --color-adaptive-indigo-500-a12-a16: oklch(58.5% 0.233 277.117 / 16%);
       --color-adaptive-indigo-600-300: oklch(78.5% 0.115 274.713);
       --color-adaptive-indigo-700-300: oklch(78.5% 0.115 274.713);
-      --color-adaptive-neutral-100-900: oklch(20.5% 0 0);
-      --color-adaptive-neutral-200-700-a60: oklch(37.1% 0 0 / 60%);
-      --color-adaptive-neutral-200-800: oklch(26.9% 0 0);
+      --color-adaptive-neutral-100-900: oklch(20.5% 0 none);
+      --color-adaptive-neutral-200-700-a60: oklch(37.1% 0 none / 60%);
+      --color-adaptive-neutral-200-800: oklch(26.9% 0 none);
       --color-adaptive-neutral-200-a70-white-a8: rgb(255 255 255 / 8%);
       --color-adaptive-neutral-200-white-a6: rgb(255 255 255 / 6%);
       --color-adaptive-neutral-200-white-a8: rgb(255 255 255 / 8%);
       --color-adaptive-neutral-200-a80-white-a8: rgb(255 255 255 / 8%);
       --color-adaptive-neutral-300-a60-white-a12: rgb(255 255 255 / 12%);
-      --color-adaptive-neutral-400-500: oklch(55.6% 0 0);
-      --color-adaptive-neutral-400-a60-500-a60: oklch(55.6% 0 0 / 60%);
-      --color-adaptive-neutral-400-a80-500-a80: oklch(55.6% 0 0 / 80%);
-      --color-adaptive-neutral-500-a10-a16: oklch(55.6% 0 0 / 16%);
-      --color-adaptive-neutral-500-400: oklch(70.8% 0 0);
-      --color-adaptive-neutral-500-500: oklch(55.6% 0 0);
-      --color-adaptive-neutral-600-300: oklch(87% 0 0);
-      --color-adaptive-neutral-600-400: oklch(70.8% 0 0);
-      --color-adaptive-neutral-950-50: oklch(98.5% 0 0);
+      --color-adaptive-neutral-400-500: oklch(55.6% 0 none);
+      --color-adaptive-neutral-400-a60-500-a60: oklch(55.6% 0 none / 60%);
+      --color-adaptive-neutral-400-a80-500-a80: oklch(55.6% 0 none / 80%);
+      --color-adaptive-neutral-500-a10-a16: oklch(55.6% 0 none / 16%);
+      --color-adaptive-neutral-500-400: oklch(70.8% 0 none);
+      --color-adaptive-neutral-500-500: oklch(55.6% 0 none);
+      --color-adaptive-neutral-600-300: oklch(87% 0 none);
+      --color-adaptive-neutral-600-400: oklch(70.8% 0 none);
+      --color-adaptive-neutral-950-50: oklch(98.5% 0 none);
       --color-adaptive-red-50-950-a80: oklch(25.8% 0.092 26.042 / 80%);
       --color-adaptive-red-200-800: oklch(44.4% 0.177 26.899);
       --color-adaptive-red-600-a80-400-a80: oklch(70.4% 0.191 22.216 / 80%);
@@ -1365,7 +1365,7 @@
       --color-adaptive-violet-500-a12-a16: oklch(60.6% 0.25 292.717 / 16%);
       --color-adaptive-violet-600-400: oklch(70.2% 0.183 293.541);
       --color-adaptive-violet-700-300: oklch(81.1% 0.111 293.571);
-      --color-adaptive-white-neutral-950-a70: oklch(14.5% 0 0 / 70%);
+      --color-adaptive-white-neutral-950-a70: oklch(14.5% 0 none / 70%);
       --color-adaptive-zinc-500-a12-a16: oklch(55.2% 0.016 285.938 / 16%);
       --color-adaptive-zinc-500-400: oklch(70.5% 0.015 286.067);
       --color-adaptive-zinc-600-300: oklch(87.1% 0.006 286.286);
diff --git a/apps/mobile/metro.config.js b/apps/mobile/metro.config.js
index 3791d347c62b..f8eda69b6fb7 100644
--- a/apps/mobile/metro.config.js
+++ b/apps/mobile/metro.config.js
@@ -36,8 +36,7 @@ config.resolver = {
     new RegExp(`${escapedWorkspaceRoot}[/\\\\]\\.t3[/\\\\].*`),
   ],
   extraNodeModules: {
-    // oxlint-disable-next-line unicorn/no-useless-fallback-in-spread
-    ...(config.resolver?.extraNodeModules ?? {}),
+    ...config.resolver?.extraNodeModules,
     shiki: mobileShikiRoot,
     "@shikijs/core": resolveShikiDependencyRoot("@shikijs/core"),
     "@shikijs/engine-javascript": resolveShikiDependencyRoot("@shikijs/engine-javascript"),
diff --git a/apps/mobile/modules/t3-markdown-text/src/MarkdownTextPrimitive.tsx b/apps/mobile/modules/t3-markdown-text/src/MarkdownTextPrimitive.tsx
index 2cd54b5c1ef2..36e87ee94158 100644
--- a/apps/mobile/modules/t3-markdown-text/src/MarkdownTextPrimitive.tsx
+++ b/apps/mobile/modules/t3-markdown-text/src/MarkdownTextPrimitive.tsx
@@ -9,10 +9,10 @@ const TextAncestorContext = React.createContext<[boolean, ViewStyle]>([
   StyleSheet.create({}),
 ]);
 
-const textDefaults: TextProps = {
+const textDefaults = {
   allowFontScaling: true,
   selectable: true,
-};
+} satisfies TextProps;
 
 const useTextAncestorContext = () => React.useContext(TextAncestorContext);
 
@@ -28,7 +28,11 @@ export type ContextMenuActionEvent = {
   nativeEvent: { target: number; actionIdentifier: string };
 };
 
-export type MarkdownTextPrimitiveProps = TextProps & {
+/**
+ * `onTextLayout` is not offered: the native view reports plain line strings
+ * while the React Native Text fallback reports measured `TextLayoutLine`s.
+ */
+export type MarkdownTextPrimitiveProps = Omit<TextProps, "onTextLayout"> & {
   uiTextView?: boolean;
   contextMenuConfig?: string;
   onContextMenuAction?: (event: ContextMenuActionEvent) => void;
@@ -75,16 +79,14 @@ function MarkdownTextPrimitiveChild({ style, children, ...rest }: MarkdownTextPr
   });
 
   if (!isAncestor) {
+    // Press handlers are delivered by the text runs; the container never sees them.
+    const { onPress: _onPress, onLongPress: _onLongPress, ...containerProps } = rest;
     return (
       <TextAncestorContext.Provider value={contextValue}>
         <T3MarkdownTextNativeComponent
           {...textDefaults}
-          {...rest}
-          // ellipsizeMode={rest.ellipsizeMode ?? rest.lineBreakMode ?? 'tail'}
+          {...containerProps}
           style={[flattenedStyle]}
-          // @ts-expect-error Weirdness
-          onPress={undefined}
-          onLongPress={undefined}
         >
           {nativeChildren}
         </T3MarkdownTextNativeComponent>
diff --git a/apps/mobile/modules/t3-markdown-text/src/markdownLinks.ts b/apps/mobile/modules/t3-markdown-text/src/markdownLinks.ts
index 0caa24c3404f..176585344167 100644
--- a/apps/mobile/modules/t3-markdown-text/src/markdownLinks.ts
+++ b/apps/mobile/modules/t3-markdown-text/src/markdownLinks.ts
@@ -1,31 +1,15 @@
 import {
+  fileBasename,
+  formatFilePathPosition,
   inlineCodeFilePathCandidate,
-  isConventionalFilePosition,
+  normalizeMarkdownLinkDestination,
+  parseMarkdownFileLink,
 } from "@t3tools/client-runtime/markdown-links";
 import { videoMimeType } from "@t3tools/shared/video";
 
 import type { MARKDOWN_FILE_ICON_SOURCES } from "./markdownFileIcons.generated";
 
-const WINDOWS_DRIVE_PATH_PATTERN = /^[A-Za-z]:[\\/]/;
-const WINDOWS_UNC_PATH_PATTERN = /^\\\\/;
-const RELATIVE_PATH_PREFIX_PATTERN = /^(~\/|\.{1,2}\/)/;
-const RELATIVE_FILE_PATH_PATTERN =
-  /^(?:[A-Za-z0-9._-]+(?: +[A-Za-z0-9._-]+)*\/)+[A-Za-z0-9._-]+(?: +[A-Za-z0-9._-]+)*(?::\d+){0,2}$/;
-const RELATIVE_FILE_NAME_PATTERN =
-  /^[A-Za-z0-9._-]+(?: +[A-Za-z0-9._-]+)*\.[A-Za-z0-9_-]+(?::\d+){0,2}$/;
 const POSITION_SUFFIX_PATTERN = /:\d+(?::\d+)?$/;
-const POSIX_FILE_ROOT_PREFIXES = [
-  "/Users/",
-  "/home/",
-  "/tmp/",
-  "/var/",
-  "/etc/",
-  "/opt/",
-  "/mnt/",
-  "/Volumes/",
-  "/private/",
-  "/root/",
-] as const;
 
 export type MarkdownLinkPresentation =
   | {
@@ -246,112 +230,13 @@ const FILE_ICON_BY_EXTENSION: Readonly<Record<string, MarkdownFileIcon>> = {
   zsh: "bash",
 };
 
-function safeDecode(value: string): string {
-  try {
-    return decodeURIComponent(value);
-  } catch {
-    return value;
-  }
-}
-
-function normalizeDestination(value: string): string {
-  const trimmed = value.trim();
-  return trimmed.startsWith("<") && trimmed.endsWith(">") ? trimmed.slice(1, -1) : trimmed;
-}
-
 /** Native link and media APIs have no document scheme to inherit from protocol-relative URLs. */
 export function normalizeNativeMarkdownUrl(value: string): string {
   return value.startsWith("//") ? `https:${value}` : value;
 }
 
-function fileUrlTarget(href: string): { readonly path: string; readonly hash: string } | null {
-  try {
-    const parsed = new URL(href);
-    if (parsed.protocol.toLowerCase() !== "file:") {
-      return null;
-    }
-    const uncHostname = parsed.hostname.toLowerCase() === "localhost" ? "" : parsed.hostname;
-    const rawPath = uncHostname
-      ? `\\\\${uncHostname}${parsed.pathname.replaceAll("/", "\\")}`
-      : parsed.pathname;
-    const path = /^\/[A-Za-z]:[\\/]/.test(rawPath) ? rawPath.slice(1) : rawPath;
-    return { path, hash: parsed.hash };
-  } catch {
-    return null;
-  }
-}
-
-function stripSearchAndHash(value: string): { readonly path: string; readonly hash: string } {
-  const hashIndex = value.indexOf("#");
-  const pathWithSearch = hashIndex >= 0 ? value.slice(0, hashIndex) : value;
-  const hash = hashIndex >= 0 ? value.slice(hashIndex) : "";
-  const queryIndex = pathWithSearch.indexOf("?");
-  return {
-    path: queryIndex >= 0 ? pathWithSearch.slice(0, queryIndex) : pathWithSearch,
-    hash,
-  };
-}
-
-function splitFilePosition(
-  path: string,
-  hash: string,
-): { readonly path: string; readonly line?: number; readonly column?: number } {
-  const suffixMatch = path.match(/:(\d+)(?::(\d+))?$/);
-  const hashMatch = suffixMatch ? null : hash.match(/^#L(\d+)(?:C(\d+))?$/i);
-  const match = suffixMatch ?? hashMatch;
-  if (!match?.[1]) {
-    return { path };
-  }
-
-  const line = Number.parseInt(match[1], 10);
-  const column = match[2] ? Number.parseInt(match[2], 10) : undefined;
-  const pathWithoutPosition = suffixMatch ? path.slice(0, -suffixMatch[0].length) : path;
-  return {
-    path: pathWithoutPosition,
-    ...(line > 0 ? { line } : {}),
-    ...(column !== undefined && column > 0 ? { column } : {}),
-  };
-}
-
-function looksLikePosixFilesystemPath(path: string): boolean {
-  if (!path.startsWith("/")) {
-    return false;
-  }
-  if (POSIX_FILE_ROOT_PREFIXES.some((prefix) => path.startsWith(prefix))) {
-    return true;
-  }
-  if (POSITION_SUFFIX_PATTERN.test(path)) {
-    return true;
-  }
-  const basename = path.slice(path.lastIndexOf("/") + 1);
-  return /\.[A-Za-z0-9_-]+$/.test(basename);
-}
-
-function looksLikeFilePath(value: string): boolean {
-  if (WINDOWS_DRIVE_PATH_PATTERN.test(value) || WINDOWS_UNC_PATH_PATTERN.test(value)) {
-    return true;
-  }
-  if (RELATIVE_PATH_PREFIX_PATTERN.test(value)) {
-    return true;
-  }
-  if (value.startsWith("/")) {
-    return looksLikePosixFilesystemPath(value);
-  }
-  if (FILE_ICON_BY_NAME[value.replace(POSITION_SUFFIX_PATTERN, "").toLowerCase()]) {
-    return true;
-  }
-  if (isConventionalFilePosition(value)) return true;
-  return RELATIVE_FILE_PATH_PATTERN.test(value) || RELATIVE_FILE_NAME_PATTERN.test(value);
-}
-
-function fileLabel(value: string): string {
-  const normalized = value.replaceAll("\\", "/");
-  const basename = normalized.slice(normalized.lastIndexOf("/") + 1);
-  return basename || normalized;
-}
-
 export function resolveMarkdownFileIcon(value: string): MarkdownFileIcon {
-  const basename = fileLabel(value).replace(POSITION_SUFFIX_PATTERN, "").toLowerCase();
+  const basename = fileBasename(value).replace(POSITION_SUFFIX_PATTERN, "").toLowerCase();
   if (videoMimeType({ name: basename, mimeType: "" }) !== null) return "video";
   const exactIcon = FILE_ICON_BY_NAME[basename];
   if (exactIcon) return exactIcon;
@@ -367,7 +252,7 @@ export function resolveMarkdownFileIcon(value: string): MarkdownFileIcon {
 }
 
 export function resolveMarkdownLinkPresentation(href: string): MarkdownLinkPresentation {
-  const normalized = normalizeDestination(href);
+  const normalized = normalizeMarkdownLinkDestination(href);
   try {
     const parsed = new URL(normalizeNativeMarkdownUrl(normalized));
     if (parsed.protocol === "http:" || parsed.protocol === "https:") {
@@ -381,31 +266,16 @@ export function resolveMarkdownLinkPresentation(href: string): MarkdownLinkPrese
     // Relative paths and non-URL link destinations are handled below.
   }
 
-  const source = normalized.toLowerCase().startsWith("file:")
-    ? fileUrlTarget(normalized)
-    : stripSearchAndHash(normalized);
-  const decodedSource = source
-    ? { path: safeDecode(source.path.trim()), hash: safeDecode(source.hash.trim()) }
-    : null;
-  const fileTarget = decodedSource
-    ? splitFilePosition(decodedSource.path, decodedSource.hash)
-    : null;
-  const targetWithPosition = fileTarget
-    ? `${fileTarget.path}${
-        fileTarget.line
-          ? `:${fileTarget.line}${fileTarget.column ? `:${fileTarget.column}` : ""}`
-          : ""
-      }`
-    : null;
-  if (fileTarget && targetWithPosition && looksLikeFilePath(targetWithPosition)) {
+  const target = parseMarkdownFileLink(normalized);
+  if (target) {
     return {
       kind: "file",
       href: normalized,
-      icon: resolveMarkdownFileIcon(fileTarget.path),
-      label: fileLabel(targetWithPosition),
-      path: fileTarget.path,
-      ...(fileTarget.line ? { line: fileTarget.line } : {}),
-      ...(fileTarget.column ? { column: fileTarget.column } : {}),
+      icon: resolveMarkdownFileIcon(target.path),
+      label: fileBasename(formatFilePathPosition(target)),
+      path: target.path,
+      ...(target.line ? { line: target.line } : {}),
+      ...(target.column ? { column: target.column } : {}),
     };
   }
 
diff --git a/apps/mobile/modules/t3-native-controls/ios/T3NativeFilePresentation.swift b/apps/mobile/modules/t3-native-controls/ios/T3NativeFilePresentation.swift
index 1a7009c3821d..45954053125b 100644
--- a/apps/mobile/modules/t3-native-controls/ios/T3NativeFilePresentation.swift
+++ b/apps/mobile/modules/t3-native-controls/ios/T3NativeFilePresentation.swift
@@ -144,6 +144,8 @@ final class T3NativeFilePresentation: NSObject, QLPreviewControllerDataSource,
         type = detectedType
       } else if CGPDFDocument(download as CFURL) != nil {
         type = .pdf
+      } else if URL(fileURLWithPath: title).pathExtension.lowercased() == "svg" {
+        type = .svg
       } else {
         throw URLError(.cannotDecodeContentData)
       }
diff --git a/apps/mobile/src/components/AppSymbol.tsx b/apps/mobile/src/components/AppSymbol.tsx
index 0c2042218cda..5519f2817582 100644
--- a/apps/mobile/src/components/AppSymbol.tsx
+++ b/apps/mobile/src/components/AppSymbol.tsx
@@ -22,6 +22,7 @@ import IconBox from "@tabler/icons-react-native/IconBox";
 import IconCamera from "@tabler/icons-react-native/IconCamera";
 import IconChartBar from "@tabler/icons-react-native/IconChartBar";
 import IconCheck from "@tabler/icons-react-native/IconCheck";
+import IconCloud from "@tabler/icons-react-native/IconCloud";
 import IconChevronDown from "@tabler/icons-react-native/IconChevronDown";
 import IconChevronLeft from "@tabler/icons-react-native/IconChevronLeft";
 import IconChevronRight from "@tabler/icons-react-native/IconChevronRight";
@@ -32,6 +33,7 @@ import IconClock from "@tabler/icons-react-native/IconClock";
 import IconCode from "@tabler/icons-react-native/IconCode";
 import IconCopy from "@tabler/icons-react-native/IconCopy";
 import IconDeviceDesktop from "@tabler/icons-react-native/IconDeviceDesktop";
+import IconDeviceLaptop from "@tabler/icons-react-native/IconDeviceLaptop";
 import IconDots from "@tabler/icons-react-native/IconDots";
 import IconDotsCircleHorizontal from "@tabler/icons-react-native/IconDotsCircleHorizontal";
 import IconEdit from "@tabler/icons-react-native/IconEdit";
@@ -110,6 +112,7 @@ const ANDROID_ICON_BY_SF_SYMBOL: Partial<Record<SFSymbol, Icon>> = {
   checkmark: IconCheck,
   "checkmark.circle": IconCircleCheck,
   clock: IconClock,
+  cloud: IconCloud,
   cube: IconBox,
   "chevron.down": IconChevronDown,
   "chevron.left": IconChevronLeft,
@@ -129,9 +132,13 @@ const ANDROID_ICON_BY_SF_SYMBOL: Partial<Record<SFSymbol, Icon>> = {
   "folder.fill": IconFolder,
   gearshape: IconSettings,
   "info.circle": IconInfoCircle,
+  laptopcomputer: IconDeviceLaptop,
   link: IconLink,
   "line.3.horizontal.decrease.circle": IconFilter,
   "line.3.horizontal.decrease.circle.fill": IconFilterFilled,
+  // Tabler has no Apple desktops; the closest silhouettes stand in on Android.
+  macmini: IconServer,
+  macstudio: IconDeviceDesktop,
   magnifyingglass: IconSearch,
   paintbrush: IconPalette,
   "person.crop.circle": IconUserCircle,
@@ -178,6 +185,7 @@ const ANDROID_ICON_BY_MATERIAL_NAME: Record<string, Icon> = {
   close: IconX,
   construction: IconHammer,
   content_copy: IconCopy,
+  desktop_windows: IconDeviceDesktop,
   edit: IconEdit,
   error: IconAlertCircle,
   folder: IconFolder,
diff --git a/apps/mobile/src/components/ComposerAttachmentStrip.tsx b/apps/mobile/src/components/ComposerAttachmentStrip.tsx
index 16f0d422af78..b5d86c44109d 100644
--- a/apps/mobile/src/components/ComposerAttachmentStrip.tsx
+++ b/apps/mobile/src/components/ComposerAttachmentStrip.tsx
@@ -1,12 +1,12 @@
 import { SymbolView } from "../components/AppSymbol";
 import { videoMimeType } from "@t3tools/shared/video";
-import { useEffect, useRef, useState } from "react";
-import { Alert, Image, Pressable, ScrollView, View } from "react-native";
+import { useMemo } from "react";
+import { Image, Pressable, ScrollView, View } from "react-native";
 
 import { AppText as Text } from "./AppText";
 import type { DraftComposerAttachment, DraftComposerFileAttachment } from "../lib/composerImages";
 import { VideoAttachmentTile } from "./VideoAttachmentTile";
-import { loadLocalAttachmentPreview } from "../lib/localAttachmentPreview";
+import type { MediaActionsSource } from "../lib/mediaActions";
 import { PresentationSource } from "./NativePresentation";
 import type { FilePreviewSource } from "./FilePreviewModal";
 import { isPdfFile } from "../lib/filePreview";
@@ -175,46 +175,16 @@ function ComposerVideoAttachment(props: {
   const { attachment } = props;
   const sourceIdentifier = `draft:${attachment.id}`;
   const style = { width: props.size, height: props.size, borderRadius: props.borderRadius };
-  const shareRef = useRef<AbortController | null>(null);
-  const [sharing, setSharing] = useState(false);
-  useEffect(
-    () => () => {
-      shareRef.current?.abort();
-      shareRef.current = null;
-    },
-    [],
+  const actionsSource = useMemo<MediaActionsSource>(
+    () => ({
+      name: attachment.name,
+      mimeType: videoMimeType(attachment) ?? attachment.mimeType,
+      sourceIdentifier,
+      attachment,
+    }),
+    [attachment, sourceIdentifier],
   );
 
-  const onShare = () => {
-    if (shareRef.current) return;
-    const controller = new AbortController();
-    shareRef.current = controller;
-    setSharing(true);
-    void (async () => {
-      const preview = await loadLocalAttachmentPreview(attachment, controller.signal);
-      if (!preview) return;
-      try {
-        await preview.share(controller.signal, sourceIdentifier);
-      } finally {
-        preview.dispose();
-      }
-    })()
-      .catch((error: unknown) => {
-        if (!controller.signal.aborted) {
-          Alert.alert(
-            "Could not share video",
-            error instanceof Error ? error.message : "Try again.",
-          );
-        }
-      })
-      .finally(() => {
-        if (shareRef.current === controller) {
-          shareRef.current = null;
-          setSharing(false);
-        }
-      });
-  };
-
   return (
     <VideoAttachmentTile
       name={attachment.name}
@@ -222,8 +192,7 @@ function ComposerVideoAttachment(props: {
       thumbnailSource={attachment}
       compact={props.compact}
       onPress={() => props.onPressVideo(attachment, sourceIdentifier)}
-      onShare={onShare}
-      disabled={sharing}
+      actionsSource={actionsSource}
       style={style}
     />
   );
diff --git a/apps/mobile/src/components/EnvironmentMachineSymbol.tsx b/apps/mobile/src/components/EnvironmentMachineSymbol.tsx
new file mode 100644
index 000000000000..46fbbd814fdf
--- /dev/null
+++ b/apps/mobile/src/components/EnvironmentMachineSymbol.tsx
@@ -0,0 +1,39 @@
+import type { EnvironmentMachineKind } from "@t3tools/contracts";
+import type { SFSymbol } from "expo-symbols";
+
+import { SymbolView } from "./AppSymbol";
+
+const SYMBOL_BY_KIND: Record<EnvironmentMachineKind, SFSymbol> = {
+  server: "server.rack",
+  cloud: "cloud",
+  desktop: "desktopcomputer",
+  laptop: "laptopcomputer",
+  "mac-mini": "macmini",
+  "mac-studio": "macstudio",
+};
+
+export const ENVIRONMENT_MACHINE_KIND_LABELS: Record<EnvironmentMachineKind, string> = {
+  server: "Server",
+  cloud: "Cloud VM",
+  desktop: "Desktop",
+  laptop: "Laptop",
+  "mac-mini": "Mac mini",
+  "mac-studio": "Mac Studio",
+};
+
+/** The glyph an environment wears in lists; SF Symbols on iOS, Tabler on Android. */
+export function EnvironmentMachineSymbol(props: {
+  readonly kind: EnvironmentMachineKind;
+  readonly size: number;
+  readonly tintColorClassName: string;
+}) {
+  return (
+    <SymbolView
+      accessibilityLabel={ENVIRONMENT_MACHINE_KIND_LABELS[props.kind]}
+      name={SYMBOL_BY_KIND[props.kind]}
+      size={props.size}
+      tintColorClassName={props.tintColorClassName}
+      type="monochrome"
+    />
+  );
+}
diff --git a/apps/mobile/src/components/FilePreview.ios.tsx b/apps/mobile/src/components/FilePreview.ios.tsx
index c2f5a6d72cc7..af943b8be9a2 100644
--- a/apps/mobile/src/components/FilePreview.ios.tsx
+++ b/apps/mobile/src/components/FilePreview.ios.tsx
@@ -3,7 +3,6 @@ import { useEffect, useEffectEvent, useId } from "react";
 import { Alert } from "react-native";
 
 import type { ResolvedFilePreviewSource } from "./FilePreviewModal";
-import { MediaImagePreview } from "./MediaImagePreview";
 
 const NativeControls = requireNativeModule<{
   presentFile(
@@ -47,9 +46,5 @@ export function FilePreview(props: {
   readonly source: ResolvedFilePreviewSource;
   readonly onRequestClose: () => void;
 }) {
-  return props.source.kind === "image" && props.source.actionsSource ? (
-    <MediaImagePreview {...props} />
-  ) : (
-    <NativeFilePreview {...props} />
-  );
+  return <NativeFilePreview {...props} />;
 }
diff --git a/apps/mobile/src/components/MediaActionsMenu.tsx b/apps/mobile/src/components/MediaActionsMenu.tsx
index a4b44e85258f..f54e1378ba80 100644
--- a/apps/mobile/src/components/MediaActionsMenu.tsx
+++ b/apps/mobile/src/components/MediaActionsMenu.tsx
@@ -1,6 +1,6 @@
 import { MenuView } from "@react-native-menu/menu";
 import type { ReactElement } from "react";
-import { Platform, View, type PressableProps } from "react-native";
+import { Platform, View, type PressableProps, type StyleProp, type ViewStyle } from "react-native";
 
 import type { useMediaActions } from "../lib/mediaActions";
 import { SymbolView } from "./AppSymbol";
@@ -10,6 +10,7 @@ export function MediaActionsMenu(props: {
   readonly media: ReturnType<typeof useMediaActions>;
   readonly inModal?: boolean;
   readonly children?: ReactElement<PressableProps>;
+  readonly style?: StyleProp<ViewStyle>;
 }) {
   if (props.media.actions.length === 0) return props.children ?? null;
   // Android's normal anchored menu lives in the app-root portal, behind native modals.
@@ -18,6 +19,7 @@ export function MediaActionsMenu(props: {
   return (
     <Menu
       title={props.media.title}
+      style={props.style}
       shouldOpenOnLongPress={props.children !== undefined}
       actions={props.media.actions.map(({ id, title, disabled }) => ({
         id,
diff --git a/apps/mobile/src/components/MediaImagePreview.tsx b/apps/mobile/src/components/MediaImagePreview.tsx
index 5bdc9140ddc9..03e317c296af 100644
--- a/apps/mobile/src/components/MediaImagePreview.tsx
+++ b/apps/mobile/src/components/MediaImagePreview.tsx
@@ -42,7 +42,7 @@ function ImagePreviewHeader() {
   );
 }
 
-/** Chat and workspace media retain source actions on both platforms; other files use native previews. */
+/** Android keeps media actions in its in-app image viewer. iOS uses Quick Look. */
 export function MediaImagePreview(props: MediaImagePreviewProps) {
   return (
     <ImagePreviewContext value={props}>
diff --git a/apps/mobile/src/components/MediaVideoPlayer.tsx b/apps/mobile/src/components/MediaVideoPlayer.tsx
index a065f75e1396..0e3d8416affa 100644
--- a/apps/mobile/src/components/MediaVideoPlayer.tsx
+++ b/apps/mobile/src/components/MediaVideoPlayer.tsx
@@ -101,8 +101,8 @@ interface MediaVideoPlayerProps {
   readonly thumbnailVisible?: boolean;
   readonly unavailable?: boolean;
   readonly expanded?: boolean;
+  readonly autoPlay?: boolean;
   readonly paused?: boolean;
-  readonly onExpand?: () => void;
   readonly actionsSource?: MediaActionsSource;
 }
 
@@ -122,62 +122,51 @@ function MediaVideoPlayerContent(props: MediaVideoPlayerProps) {
         <LoadedMediaVideo
           uri={props.uri ?? playbackUri}
           resolvePlaybackUri={props.resolvePlaybackUri}
-          playRequested={!props.expanded}
+          playRequested={!props.expanded || props.autoPlay === true}
           paused={(props.paused ?? false) || mediaActions.sharing}
         />
       ) : (
-        <Pressable
-          accessibilityRole="button"
-          accessibilityLabel={`Play ${props.name}`}
-          accessibilityState={{ disabled: props.uri === null || props.unavailable === true }}
-          disabled={props.uri === null || props.unavailable === true}
-          onPress={() => setPlaybackUri(props.uri)}
-          className="flex-1 items-center justify-center gap-2 px-4"
-        >
-          {!props.unavailable ? (
-            <VideoThumbnailImage
-              cacheKey={props.thumbnailKey}
-              source={props.thumbnailVisible === false ? null : props.uri}
-              contentFit="contain"
-            />
-          ) : null}
-          {props.unavailable ? (
-            <AppText className="text-sm text-white/80">Video unavailable</AppText>
-          ) : props.uri === null ? (
-            <ActivityIndicator color="#ffffff" accessibilityLabel="Loading video" />
-          ) : (
-            <>
+        <MediaActionsMenu media={mediaActions} inModal={props.expanded} style={{ flex: 1 }}>
+          <Pressable
+            accessibilityRole="button"
+            accessibilityLabel={`Play ${props.name}`}
+            accessibilityHint={
+              mediaActions.actions.length > 0 ? "Touch and hold for media actions" : undefined
+            }
+            accessibilityState={{ disabled: props.uri === null || props.unavailable === true }}
+            // Stays pressable so the long-press menu still opens on a failed or unsigned tile.
+            onPress={() => {
+              if (props.uri !== null && !props.unavailable) setPlaybackUri(props.uri);
+            }}
+            className="flex-1 items-center justify-center px-4"
+          >
+            {!props.unavailable ? (
+              <VideoThumbnailImage
+                cacheKey={props.thumbnailKey}
+                source={props.thumbnailVisible === false ? null : props.uri}
+                contentFit="contain"
+              />
+            ) : null}
+            {props.unavailable ? (
+              <AppText className="text-sm text-white/80">Video unavailable</AppText>
+            ) : props.uri === null ? (
+              <ActivityIndicator color="#ffffff" accessibilityLabel="Loading video" />
+            ) : (
               <View className="size-12 items-center justify-center rounded-full bg-black/60">
                 <SymbolView name="play" size={28} tintColor="#ffffff" type="monochrome" />
               </View>
+            )}
+            {props.uri !== null && !props.unavailable ? (
               <AppText
-                className="rounded bg-black/60 px-2 py-1 text-center text-xs text-white"
-                numberOfLines={2}
+                className="absolute right-2 bottom-2 max-w-[75%] rounded bg-black/60 px-2 py-1 text-right text-xs text-white"
+                numberOfLines={1}
               >
                 {props.name}
               </AppText>
-            </>
-          )}
-        </Pressable>
+            ) : null}
+          </Pressable>
+        </MediaActionsMenu>
       )}
-      {props.onExpand ? (
-        <Pressable
-          accessibilityRole="button"
-          accessibilityLabel={`Expand ${props.name}`}
-          onPress={() => {
-            setPlaybackUri(null);
-            props.onExpand?.();
-          }}
-          className="absolute right-1 top-1 min-h-11 min-w-11 items-center justify-center rounded-md bg-black/60 px-2"
-        >
-          <AppText className="text-xs text-white">Expand</AppText>
-        </Pressable>
-      ) : null}
-      {props.actionsSource ? (
-        <View className="absolute left-1 top-1">
-          <MediaActionsMenu media={mediaActions} inModal={props.expanded} />
-        </View>
-      ) : null}
     </View>
   );
 }
diff --git a/apps/mobile/src/components/MediaVideoPreviewModal.tsx b/apps/mobile/src/components/MediaVideoPreviewModal.tsx
deleted file mode 100644
index 6c231194701c..000000000000
--- a/apps/mobile/src/components/MediaVideoPreviewModal.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-import { useEffect } from "react";
-import { Keyboard, Modal, Pressable, View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-
-import { useMediaActions } from "../lib/mediaActions";
-import { MediaActionsMenu } from "./MediaActionsMenu";
-import {
-  mediaVideoPreviewUri,
-  mediaVideoThumbnailKey,
-  type MediaVideoPreviewSource,
-} from "../lib/videoPreviewSource";
-import { useAssetUrlState, useRefreshAssetUrl } from "../state/assets";
-import { usePreparedConnection } from "../state/session";
-import { AppText } from "./AppText";
-import { SymbolView } from "./AppSymbol";
-import { MediaVideoPlayer } from "./MediaVideoPlayer";
-import { MediaSourceCaption } from "./MediaSourceCaption";
-
-/** Media files stream in place. A client-side copy is made only for an explicit share. */
-export function MediaVideoPreviewModal(props: {
-  readonly source: MediaVideoPreviewSource;
-  readonly onRequestClose: () => void;
-}) {
-  const { source } = props;
-  const insets = useSafeAreaInsets();
-  const environmentId = "environmentId" in source ? source.environmentId : null;
-  const connection = usePreparedConnection(environmentId);
-  const asset = useAssetUrlState(environmentId, "resource" in source ? source.resource : null);
-  const refreshAssetUrl = useRefreshAssetUrl(
-    environmentId,
-    "resource" in source ? source.resource : null,
-  );
-  const resolvePlaybackUri =
-    "resource" in source
-      ? async () => mediaVideoPreviewUri(source, await refreshAssetUrl())
-      : undefined;
-  const uri = mediaVideoPreviewUri(source, asset._tag === "Success" ? asset.url : null);
-  const mediaActions = useMediaActions(source.actionsSource, props.onRequestClose);
-  const unavailable =
-    uri === null &&
-    environmentId !== null &&
-    (connection._tag === "None" || asset._tag === "Failure");
-
-  useEffect(() => Keyboard.dismiss(), []);
-  return (
-    <Modal
-      visible
-      animationType="fade"
-      presentationStyle="fullScreen"
-      onRequestClose={props.onRequestClose}
-      statusBarTranslucent
-      navigationBarTranslucent
-    >
-      <View
-        className="flex-1 bg-black"
-        style={{ paddingTop: insets.top, paddingBottom: insets.bottom }}
-      >
-        <View className="min-h-14 flex-row items-center gap-3 pl-4 pr-2">
-          <AppText className="flex-1 font-t3-medium text-base text-white" numberOfLines={2}>
-            {source.name}
-          </AppText>
-          <MediaActionsMenu media={mediaActions} inModal />
-          <Pressable
-            accessibilityRole="button"
-            accessibilityLabel="Close video"
-            onPress={props.onRequestClose}
-            className="size-12 items-center justify-center"
-          >
-            <SymbolView name="xmark" size={20} tintColor="#ffffff" type="monochrome" />
-          </Pressable>
-        </View>
-        <MediaSourceCaption source={mediaActions.title} />
-        <MediaVideoPlayer
-          uri={uri}
-          resolvePlaybackUri={resolvePlaybackUri}
-          name={source.name}
-          thumbnailKey={mediaVideoThumbnailKey(source)}
-          unavailable={unavailable}
-          paused={mediaActions.sharing}
-          expanded
-        />
-        <Pressable
-          accessibilityRole="button"
-          accessibilityLabel="Save or share video"
-          disabled={uri === null || mediaActions.sharing}
-          onPress={mediaActions.share}
-          className="mx-4 my-3 min-h-12 items-center justify-center rounded-xl bg-white/15 px-4"
-        >
-          <AppText className="font-t3-medium text-base text-white">
-            {mediaActions.sharing ? "Opening share sheet..." : "Save or share video"}
-          </AppText>
-        </Pressable>
-      </View>
-    </Modal>
-  );
-}
diff --git a/apps/mobile/src/components/VideoAttachmentMenu.tsx b/apps/mobile/src/components/VideoAttachmentMenu.tsx
deleted file mode 100644
index 301d6503a508..000000000000
--- a/apps/mobile/src/components/VideoAttachmentMenu.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import type { ReactElement } from "react";
-import { Platform, type PressableProps } from "react-native";
-
-import { ControlPillMenu } from "./ControlPill";
-import { PresentationSource } from "./NativePresentation";
-
-export function VideoAttachmentMenu(props: {
-  readonly sourceIdentifier: string;
-  readonly onOpen: () => void;
-  readonly onShare?: () => void;
-  readonly disabled?: boolean;
-  readonly children: ReactElement<PressableProps>;
-}) {
-  return (
-    <PresentationSource
-      identifier={props.sourceIdentifier}
-      accessible={Platform.OS === "ios"}
-      accessibilityRole="button"
-      accessibilityLabel={props.children.props.accessibilityLabel}
-      accessibilityHint={props.children.props.accessibilityHint}
-      accessibilityState={{ disabled: props.disabled ?? false }}
-      onAccessibilityTap={() => {
-        if (!props.disabled) props.onOpen();
-      }}
-      accessibilityActions={props.onShare ? [{ name: "share", label: "Save or share video" }] : []}
-      onAccessibilityAction={({ nativeEvent }) => {
-        if (nativeEvent.actionName === "share" && !props.disabled) props.onShare?.();
-      }}
-    >
-      {Platform.OS === "ios" && props.onShare ? (
-        <ControlPillMenu
-          shouldOpenOnLongPress
-          style={{ alignSelf: "flex-start" }}
-          actions={[
-            {
-              id: "share",
-              title: "Save or share video",
-              image: "square.and.arrow.up",
-              attributes: { disabled: props.disabled ?? false },
-            },
-          ]}
-          onPressAction={({ nativeEvent }) => {
-            if (nativeEvent.event === "share") props.onShare?.();
-          }}
-        >
-          {props.children}
-        </ControlPillMenu>
-      ) : (
-        props.children
-      )}
-    </PresentationSource>
-  );
-}
diff --git a/apps/mobile/src/components/VideoAttachmentTile.tsx b/apps/mobile/src/components/VideoAttachmentTile.tsx
index 6f582ac5f005..f8c7e2c1cbdc 100644
--- a/apps/mobile/src/components/VideoAttachmentTile.tsx
+++ b/apps/mobile/src/components/VideoAttachmentTile.tsx
@@ -2,65 +2,79 @@ import { Platform, Pressable, View, type StyleProp, type ViewStyle } from "react
 
 import { cn } from "../lib/cn";
 import type { DraftComposerFileAttachment } from "../lib/composerImages";
+import { useMediaActions, type MediaActionsSource } from "../lib/mediaActions";
 import { SymbolView } from "./AppSymbol";
 import { AppText } from "./AppText";
-import { VideoAttachmentMenu } from "./VideoAttachmentMenu";
+import { MediaActionsMenu } from "./MediaActionsMenu";
+import { PresentationSource } from "./NativePresentation";
 import { VideoThumbnailImage } from "./VideoThumbnailImage";
 
 export function VideoAttachmentTile(props: {
   readonly name: string;
   readonly sourceIdentifier: string;
   readonly thumbnailSource: string | DraftComposerFileAttachment | null;
+  readonly actionsSource?: MediaActionsSource;
   readonly compact?: boolean;
   readonly onPress: (sourceIdentifier: string) => void;
-  readonly onShare?: () => void;
   readonly disabled?: boolean;
   readonly className?: string;
   readonly style?: StyleProp<ViewStyle>;
 }) {
+  const mediaActions = useMediaActions(props.disabled ? undefined : props.actionsSource);
+  const hasActions = mediaActions.actions.length > 0;
   return (
-    <VideoAttachmentMenu
-      sourceIdentifier={props.sourceIdentifier}
-      onOpen={() => props.onPress(props.sourceIdentifier)}
-      onShare={props.onShare}
-      disabled={props.disabled}
+    <PresentationSource
+      identifier={props.sourceIdentifier}
+      accessible={Platform.OS === "ios"}
+      accessibilityRole="button"
+      accessibilityLabel={`Play ${props.name}`}
+      accessibilityState={{ disabled: props.disabled ?? false }}
+      onAccessibilityTap={() => {
+        if (!props.disabled) props.onPress(props.sourceIdentifier);
+      }}
+      accessibilityActions={mediaActions.actions.map(({ id, title }) => ({
+        name: id,
+        label: title,
+      }))}
+      onAccessibilityAction={({ nativeEvent }) => {
+        if (props.disabled) return;
+        mediaActions.actions.find(({ id }) => id === nativeEvent.actionName)?.run();
+      }}
     >
-      <Pressable
-        accessibilityRole="button"
-        accessibilityLabel={`Play ${props.name}`}
-        accessibilityHint={
-          Platform.OS === "ios" && props.onShare
-            ? "Touch and hold for save and share options"
-            : undefined
-        }
-        accessibilityState={{ disabled: props.disabled ?? false }}
-        disabled={props.disabled}
-        onPress={() => props.onPress(props.sourceIdentifier)}
-        className={cn("items-center justify-center overflow-hidden bg-black/80", props.className)}
-        style={props.style}
-      >
-        <VideoThumbnailImage cacheKey={props.sourceIdentifier} source={props.thumbnailSource} />
-        <View
-          className={cn(
-            "items-center justify-center rounded-full bg-black/45",
-            props.compact ? "size-6" : "size-12",
-          )}
+      <MediaActionsMenu media={mediaActions}>
+        <Pressable
+          accessibilityRole="button"
+          accessibilityLabel={`Play ${props.name}`}
+          accessibilityHint={hasActions ? "Touch and hold for media actions" : undefined}
+          accessibilityState={{ disabled: props.disabled ?? false }}
+          disabled={props.disabled}
+          onPress={() => props.onPress(props.sourceIdentifier)}
+          className={cn("items-center justify-center overflow-hidden bg-black/80", props.className)}
+          style={props.style}
         >
-          <SymbolView
-            name="play"
-            size={props.compact ? 15 : 24}
-            tintColor="#ffffff"
-            type="monochrome"
-          />
-        </View>
-        {!props.compact ? (
-          <View className="absolute inset-x-0 bottom-0 bg-black/55 px-2 py-1.5">
-            <AppText className="text-center text-xs text-white" numberOfLines={1}>
-              {props.name}
-            </AppText>
+          <VideoThumbnailImage cacheKey={props.sourceIdentifier} source={props.thumbnailSource} />
+          <View
+            className={cn(
+              "items-center justify-center rounded-full bg-black/45",
+              props.compact ? "size-6" : "size-12",
+            )}
+          >
+            <SymbolView
+              name="play"
+              size={props.compact ? 15 : 24}
+              tintColor="#ffffff"
+              type="monochrome"
+            />
           </View>
-        ) : null}
-      </Pressable>
-    </VideoAttachmentMenu>
+          {!props.compact ? (
+            <View className="absolute inset-x-0 bottom-0 bg-black/55 px-2 py-1.5">
+              <AppText className="text-center text-xs text-white" numberOfLines={1}>
+                {props.name}
+              </AppText>
+            </View>
+          ) : null}
+        </Pressable>
+      </MediaActionsMenu>
+    </PresentationSource>
   );
 }
diff --git a/apps/mobile/src/components/VideoPreviewModal.ios.tsx b/apps/mobile/src/components/VideoPreviewModal.ios.tsx
index 88a1b5191dd0..ae69e0ead89a 100644
--- a/apps/mobile/src/components/VideoPreviewModal.ios.tsx
+++ b/apps/mobile/src/components/VideoPreviewModal.ios.tsx
@@ -1,14 +1,12 @@
 import { useIsFocused } from "@react-navigation/native";
-import { videoMimeType } from "@t3tools/shared/video";
 import { requireNativeModule } from "expo";
 import { useEffect, useEffectEvent, useId, useState } from "react";
 import { Alert, Keyboard } from "react-native";
 
 import { loadLocalAttachmentPreview } from "../lib/localAttachmentPreview";
-import { useAssetUrlState } from "../state/assets";
+import { mediaVideoPreviewUri, type VideoPreviewSource } from "../lib/videoPreviewSource";
+import { useAssetUrlState, useRefreshAssetUrl } from "../state/assets";
 import { usePreparedConnection } from "../state/session";
-import type { AttachmentVideoPreviewSource, VideoPreviewSource } from "../lib/videoPreviewSource";
-import { MediaVideoPreviewModal } from "./MediaVideoPreviewModal";
 
 export type { VideoPreviewSource } from "../lib/videoPreviewSource";
 
@@ -23,27 +21,28 @@ const NativeControls = requireNativeModule<{
 }>("T3NativeControls");
 
 function NativeVideoPreview(props: {
-  readonly source: AttachmentVideoPreviewSource;
+  readonly source: VideoPreviewSource;
   readonly onRequestClose: () => void;
 }) {
   const { source } = props;
-  const { attachment } = source;
+  const localAttachment = source.type === "local" ? source.attachment : null;
   const identifier = useId();
   const onRequestClose = useEffectEvent(props.onRequestClose);
-  const environmentId = source.type === "remote" ? source.environmentId : null;
+  const environmentId =
+    source.type === "media" && "environmentId" in source ? source.environmentId : null;
+  const resource = source.type === "media" && "resource" in source ? source.resource : null;
   const preparedConnection = usePreparedConnection(environmentId);
-  const mimeType = videoMimeType(attachment) ?? attachment.mimeType;
-  const assetUrl = useAssetUrlState(
-    environmentId,
-    source.type === "remote"
-      ? { _tag: "attachment", attachmentId: attachment.id, fileName: attachment.name, mimeType }
-      : null,
-  );
-  const [playbackUrl, setPlaybackUrl] = useState<string | null>(() =>
-    assetUrl._tag === "Success" ? assetUrl.url : null,
-  );
+  const assetUrl = useAssetUrlState(environmentId, resource);
+  const refreshAssetUrl = useEffectEvent(useRefreshAssetUrl(environmentId, resource));
+  const name = source.type === "media" ? source.name : source.attachment.name;
+  // The first minted URL is kept so a background refresh does not restart playback.
+  const resolvedUrl =
+    source.type === "media"
+      ? mediaVideoPreviewUri(source, assetUrl._tag === "Success" ? assetUrl.url : null)
+      : null;
+  const [playbackUrl, setPlaybackUrl] = useState<string | null>(resolvedUrl);
   const loadError =
-    source.type === "remote" && playbackUrl === null
+    resource !== null && playbackUrl === null
       ? preparedConnection._tag === "None"
         ? "Reconnect to this environment and open the video again."
         : assetUrl._tag === "Failure"
@@ -53,8 +52,8 @@ function NativeVideoPreview(props: {
 
   useEffect(() => Keyboard.dismiss(), []);
   useEffect(() => {
-    if (playbackUrl === null && assetUrl._tag === "Success") setPlaybackUrl(assetUrl.url);
-  }, [playbackUrl, assetUrl]);
+    if (playbackUrl === null && resolvedUrl !== null) setPlaybackUrl(resolvedUrl);
+  }, [playbackUrl, resolvedUrl]);
   useEffect(() => {
     if (!loadError) return;
     Alert.alert("Could not open video", loadError);
@@ -62,21 +61,21 @@ function NativeVideoPreview(props: {
   }, [loadError]);
 
   useEffect(() => {
-    if (source.type === "remote" && playbackUrl === null) return;
+    if (localAttachment === null && playbackUrl === null) return;
     const controller = new AbortController();
     let ready = false;
     void (async () => {
       const file =
-        source.type === "local"
-          ? await loadLocalAttachmentPreview(source.attachment, controller.signal)
+        localAttachment !== null
+          ? await loadLocalAttachmentPreview(localAttachment, controller.signal)
           : null;
-      if (source.type === "local" && !file) return;
+      if (localAttachment !== null && !file) return;
       try {
         if (controller.signal.aborted) return;
         ready = true;
         await NativeControls.presentVideo(
           file?.uri ?? playbackUrl!,
-          attachment.name,
+          name,
           source.sourceIdentifier ?? "",
           identifier,
         );
@@ -87,10 +86,12 @@ function NativeVideoPreview(props: {
       }
     })().catch((error: unknown) => {
       if (controller.signal.aborted) return;
+      // AVKit gives no retry, so re-mint now; the cached URL may simply have expired.
+      if (ready) void refreshAssetUrl();
       Alert.alert(
         "Could not open video",
         ready
-          ? "This video couldn't be loaded or played. Check the connection, or touch and hold the attachment to save or share the original."
+          ? "This video couldn't be loaded or played. Check the connection, or touch and hold the video to save or share the original."
           : error instanceof Error
             ? error.message
             : "Could not load this video.",
@@ -101,7 +102,7 @@ function NativeVideoPreview(props: {
       controller.abort();
       void NativeControls.dismissVideo(identifier).catch(() => undefined);
     };
-  }, [source, attachment.name, playbackUrl, identifier]);
+  }, [localAttachment, name, source.sourceIdentifier, playbackUrl, identifier]);
 
   return null;
 }
@@ -118,8 +119,5 @@ export function VideoPreviewModal(props: {
   }, [isFocused, hasSource]);
 
   if (!props.source || !isFocused) return null;
-  if (props.source.type === "media") {
-    return <MediaVideoPreviewModal source={props.source} onRequestClose={props.onRequestClose} />;
-  }
   return <NativeVideoPreview source={props.source} onRequestClose={props.onRequestClose} />;
 }
diff --git a/apps/mobile/src/components/VideoPreviewModal.tsx b/apps/mobile/src/components/VideoPreviewModal.tsx
index cc56b3952b75..2a585b5e1a30 100644
--- a/apps/mobile/src/components/VideoPreviewModal.tsx
+++ b/apps/mobile/src/components/VideoPreviewModal.tsx
@@ -1,190 +1,139 @@
 import { useIsFocused } from "@react-navigation/native";
 import { videoMimeType } from "@t3tools/shared/video";
-import { useEvent } from "expo";
-import { useVideoPlayer, VideoView } from "expo-video";
 import { useEffect, useRef, useState } from "react";
-import {
-  ActivityIndicator,
-  AppState,
-  Keyboard,
-  Modal,
-  Pressable,
-  StyleSheet,
-  View,
-} from "react-native";
+import { ActivityIndicator, Keyboard, Modal, Pressable, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 
-import {
-  downloadAttachmentForPreview,
-  type AttachmentPreviewFile,
-} from "../lib/attachmentDownload";
 import { loadLocalAttachmentPreview } from "../lib/localAttachmentPreview";
-import type { AttachmentVideoPreviewSource, VideoPreviewSource } from "../lib/videoPreviewSource";
-import { useAssetUrlState } from "../state/assets";
+import { useMediaActions, type MediaActionsSource } from "../lib/mediaActions";
+import {
+  mediaVideoPreviewUri,
+  mediaVideoThumbnailKey,
+  type LocalVideoPreviewSource,
+  type MediaVideoPreviewSource,
+  type VideoPreviewSource,
+} from "../lib/videoPreviewSource";
+import { useAssetUrlState, useRefreshAssetUrl } from "../state/assets";
 import { usePreparedConnection } from "../state/session";
-import { SymbolView } from "./AppSymbol";
 import { AppText } from "./AppText";
-import { MediaVideoPreviewModal } from "./MediaVideoPreviewModal";
+import { SymbolView } from "./AppSymbol";
+import { MediaActionsMenu } from "./MediaActionsMenu";
+import { MediaSourceCaption } from "./MediaSourceCaption";
+import { MediaVideoPlayer } from "./MediaVideoPlayer";
 
 export type { VideoPreviewSource } from "../lib/videoPreviewSource";
 
-function VideoPlayback(props: { readonly file: AttachmentPreviewFile }) {
-  const player = useVideoPlayer(props.file.uri, (player) => {
-    player.staysActiveInBackground = false;
-    if (AppState.currentState === "active") player.play();
-  });
-  const { status } = useEvent(player, "statusChange", { status: player.status });
-  const shareControllerRef = useRef<AbortController | null>(null);
-  const [sharing, setSharing] = useState(false);
-  const [shareError, setShareError] = useState<string | null>(null);
-
-  useEffect(
-    () => () => {
-      shareControllerRef.current?.abort();
-      shareControllerRef.current = null;
-    },
-    [],
-  );
+interface PlaybackState {
+  readonly uri: string | null;
+  readonly resolvePlaybackUri?: () => Promise<string | null>;
+  readonly unavailable: boolean;
+  readonly error: string | null;
+  readonly actionsSource: MediaActionsSource | undefined;
+}
 
-  const onShare = () => {
-    if (shareControllerRef.current) return;
-    player.pause();
-    const controller = new AbortController();
-    shareControllerRef.current = controller;
-    setSharing(true);
-    setShareError(null);
-    void props.file
-      .share(controller.signal)
-      .catch((error: unknown) => {
-        if (!controller.signal.aborted) {
-          setShareError(error instanceof Error ? error.message : "Could not share this video.");
-        }
-      })
-      .finally(() => {
-        if (shareControllerRef.current === controller) {
-          shareControllerRef.current = null;
-          setSharing(false);
-        }
-      });
+function useMediaPlayback(source: MediaVideoPreviewSource): PlaybackState {
+  const environmentId = "environmentId" in source ? source.environmentId : null;
+  const resource = "resource" in source ? source.resource : null;
+  const connection = usePreparedConnection(environmentId);
+  const asset = useAssetUrlState(environmentId, resource);
+  const refreshAssetUrl = useRefreshAssetUrl(environmentId, resource);
+  const uri = mediaVideoPreviewUri(source, asset._tag === "Success" ? asset.url : null);
+  return {
+    uri,
+    ...(resource !== null
+      ? { resolvePlaybackUri: async () => mediaVideoPreviewUri(source, await refreshAssetUrl()) }
+      : {}),
+    unavailable:
+      uri === null &&
+      environmentId !== null &&
+      (connection._tag === "None" || asset._tag === "Failure"),
+    error: null,
+    actionsSource: source.actionsSource,
   };
-
-  return (
-    <>
-      <View className="flex-1 items-center justify-center">
-        {status === "error" ? (
-          <AppText className="px-6 text-center text-base text-white/80">
-            This video couldn't be played on this device. You can save or share the original file.
-          </AppText>
-        ) : (
-          <>
-            <VideoView
-              player={player}
-              style={StyleSheet.absoluteFill}
-              nativeControls
-              contentFit="contain"
-              fullscreenOptions={{ enable: true }}
-              allowsPictureInPicture={false}
-            />
-            {status === "loading" ? (
-              <ActivityIndicator color="#ffffff" accessibilityLabel="Loading video" />
-            ) : null}
-          </>
-        )}
-      </View>
-      <Pressable
-        accessibilityRole="button"
-        accessibilityLabel="Save or share video"
-        accessibilityState={{ disabled: sharing, busy: sharing }}
-        disabled={sharing}
-        onPress={onShare}
-        className="mx-4 my-3 min-h-12 items-center justify-center rounded-xl bg-white/15 px-4"
-      >
-        <AppText className="font-t3-medium text-base text-white">
-          {sharing ? "Opening share sheet..." : "Save or share video"}
-        </AppText>
-      </Pressable>
-      {shareError ? (
-        <AppText accessibilityRole="alert" className="px-4 pb-3 text-sm text-white/80">
-          {shareError}
-        </AppText>
-      ) : null}
-    </>
-  );
 }
 
-function OpenVideoPreviewModal(props: {
-  readonly source: AttachmentVideoPreviewSource;
-  readonly onRequestClose: () => void;
-}) {
-  const { source } = props;
+function useLocalPlayback(source: LocalVideoPreviewSource): PlaybackState {
   const { attachment } = source;
-  const insets = useSafeAreaInsets();
-  const environmentId = source.type === "remote" ? source.environmentId : null;
-  const preparedConnection = usePreparedConnection(environmentId);
-  const fileUri = source.type === "local" ? source.attachment.fileUri : null;
-  const mimeType = videoMimeType(attachment) ?? attachment.mimeType;
-  const assetUrl = useAssetUrlState(
-    environmentId,
-    source.type === "remote"
-      ? { _tag: "attachment", attachmentId: attachment.id, fileName: attachment.name, mimeType }
-      : null,
-  );
-  const [downloadUrl, setDownloadUrl] = useState<string | null>(null);
-  const [file, setFile] = useState<AttachmentPreviewFile | null>(null);
-  const [failure, setFailure] = useState<string | null>(null);
-
-  useEffect(() => Keyboard.dismiss(), []);
-  useEffect(() => {
-    if (environmentId !== null && downloadUrl === null && assetUrl._tag === "Success") {
-      setDownloadUrl(assetUrl.url);
-    }
-  }, [environmentId, downloadUrl, assetUrl]);
-
+  const [uri, setUri] = useState<string | null>(null);
+  const [error, setError] = useState<string | null>(null);
+  // Only a different file needs a new lease; a metadata update on the same
+  // draft must not dispose the file Android is still playing.
+  const attachmentRef = useRef(attachment);
+  attachmentRef.current = attachment;
+  const { id: attachmentId, fileUri } = attachment;
   useEffect(() => {
-    if (source.type === "remote" && downloadUrl === null) return;
+    setUri(null);
+    setError(null);
     const controller = new AbortController();
-    let preview: AttachmentPreviewFile | null = null;
-    setFile(null);
-    setFailure(null);
-    const loading =
-      source.type === "local"
-        ? loadLocalAttachmentPreview(source.attachment, controller.signal)
-        : downloadAttachmentForPreview({
-            url: downloadUrl!,
-            attachment: { name: attachment.name, mimeType },
-            signal: controller.signal,
-          });
+    const loading = loadLocalAttachmentPreview(attachmentRef.current, controller.signal);
     void loading.then(
-      (loaded) => {
-        if (controller.signal.aborted) {
-          loaded?.dispose();
-          return;
-        }
-        preview = loaded;
-        setFile(loaded);
+      (file) => {
+        if (file === null) return;
+        if (controller.signal.aborted) file.dispose();
+        else setUri(file.uri);
       },
-      (error: unknown) => {
+      (cause: unknown) => {
         if (!controller.signal.aborted) {
-          setFailure(error instanceof Error ? error.message : "Could not load this video.");
+          setError(cause instanceof Error ? cause.message : "Could not load this video.");
         }
       },
     );
     return () => {
       controller.abort();
-      preview?.dispose();
+      void loading.then(
+        (file) => file?.dispose(),
+        () => undefined,
+      );
     };
-  }, [source.type, environmentId, attachment.id, attachment.name, mimeType, fileUri, downloadUrl]);
+  }, [attachmentId, fileUri]);
+  const mimeType = videoMimeType(attachment) ?? attachment.mimeType;
+  return {
+    uri,
+    unavailable: error !== null,
+    error,
+    actionsSource: uri === null ? undefined : { name: attachment.name, mimeType, uri },
+  };
+}
+
+function MediaPreviewModal(props: {
+  readonly source: MediaVideoPreviewSource;
+  readonly onRequestClose: () => void;
+}) {
+  return (
+    <OpenVideoPreviewModal
+      name={props.source.name}
+      thumbnailKey={mediaVideoThumbnailKey(props.source)}
+      playback={useMediaPlayback(props.source)}
+      onRequestClose={props.onRequestClose}
+    />
+  );
+}
+
+function LocalPreviewModal(props: {
+  readonly source: LocalVideoPreviewSource;
+  readonly onRequestClose: () => void;
+}) {
+  return (
+    <OpenVideoPreviewModal
+      name={props.source.attachment.name}
+      thumbnailKey={`local:${props.source.attachment.id}`}
+      playback={useLocalPlayback(props.source)}
+      onRequestClose={props.onRequestClose}
+    />
+  );
+}
 
-  const loadError =
-    failure ??
-    (environmentId !== null && downloadUrl === null
-      ? preparedConnection._tag === "None"
-        ? "This environment is disconnected. Reconnect and open the video again."
-        : assetUrl._tag === "Failure"
-          ? "Could not load this video. Check the connection to this environment and try again."
-          : null
-      : null);
+function OpenVideoPreviewModal(props: {
+  readonly name: string;
+  readonly thumbnailKey: string;
+  readonly playback: PlaybackState;
+  readonly onRequestClose: () => void;
+}) {
+  const { playback } = props;
+  const insets = useSafeAreaInsets();
+  const mediaActions = useMediaActions(playback.actionsSource, props.onRequestClose);
 
+  useEffect(() => Keyboard.dismiss(), []);
   return (
     <Modal
       visible
@@ -200,8 +149,9 @@ function OpenVideoPreviewModal(props: {
       >
         <View className="min-h-14 flex-row items-center gap-3 pl-4 pr-2">
           <AppText className="flex-1 font-t3-medium text-base text-white" numberOfLines={2}>
-            {attachment.name}
+            {props.name}
           </AppText>
+          <MediaActionsMenu media={mediaActions} inModal />
           <Pressable
             accessibilityRole="button"
             accessibilityLabel="Close video"
@@ -211,22 +161,40 @@ function OpenVideoPreviewModal(props: {
             <SymbolView name="xmark" size={20} tintColor="#ffffff" type="monochrome" />
           </Pressable>
         </View>
-        {file ? (
-          <VideoPlayback key={file.uri} file={file} />
-        ) : (
+        <MediaSourceCaption source={mediaActions.title} />
+        {playback.uri === null && !playback.unavailable ? (
           <View className="flex-1 items-center justify-center gap-3 px-6">
-            {loadError ? (
-              <AppText accessibilityRole="alert" className="text-center text-base text-white/80">
-                {loadError}
-              </AppText>
-            ) : (
-              <>
-                <ActivityIndicator color="#ffffff" />
-                <AppText className="text-sm text-white/80">Loading video...</AppText>
-              </>
-            )}
+            <ActivityIndicator color="#ffffff" />
+            <AppText className="text-sm text-white/80">Loading video...</AppText>
           </View>
+        ) : (
+          <MediaVideoPlayer
+            uri={playback.uri}
+            resolvePlaybackUri={playback.resolvePlaybackUri}
+            name={props.name}
+            thumbnailKey={props.thumbnailKey}
+            unavailable={playback.unavailable}
+            paused={mediaActions.sharing}
+            expanded
+            autoPlay
+          />
         )}
+        {playback.error ? (
+          <AppText accessibilityRole="alert" className="px-4 pb-3 text-sm text-white/80">
+            {playback.error}
+          </AppText>
+        ) : null}
+        <Pressable
+          accessibilityRole="button"
+          accessibilityLabel="Save or share video"
+          disabled={playback.uri === null || mediaActions.sharing}
+          onPress={mediaActions.share}
+          className="mx-4 my-3 min-h-12 items-center justify-center rounded-xl bg-white/15 px-4"
+        >
+          <AppText className="font-t3-medium text-base text-white">
+            {mediaActions.sharing ? "Opening share sheet..." : "Save or share video"}
+          </AppText>
+        </Pressable>
       </View>
     </Modal>
   );
@@ -243,12 +211,17 @@ export function VideoPreviewModal(props: {
   }, [isFocused, hasSource, props.onRequestClose]);
   const { source } = props;
   if (source === null || !isFocused) return null;
-  if (source.type === "media") {
-    return <MediaVideoPreviewModal source={source} onRequestClose={props.onRequestClose} />;
-  }
-  const key =
-    source.type === "local"
-      ? `local:${source.attachment.id}:${source.attachment.fileUri}`
-      : `remote:${source.environmentId}:${source.attachment.id}`;
-  return <OpenVideoPreviewModal key={key} source={source} onRequestClose={props.onRequestClose} />;
+  return source.type === "local" ? (
+    <LocalPreviewModal
+      key={`local:${source.attachment.id}:${source.attachment.fileUri}`}
+      source={source}
+      onRequestClose={props.onRequestClose}
+    />
+  ) : (
+    <MediaPreviewModal
+      key={mediaVideoThumbnailKey(source)}
+      source={source}
+      onRequestClose={props.onRequestClose}
+    />
+  );
 }
diff --git a/apps/mobile/src/features/archive/ArchivedThreadsScreen.tsx b/apps/mobile/src/features/archive/ArchivedThreadsScreen.tsx
index 5b61d302a767..c2d5b6cf65ab 100644
--- a/apps/mobile/src/features/archive/ArchivedThreadsScreen.tsx
+++ b/apps/mobile/src/features/archive/ArchivedThreadsScreen.tsx
@@ -3,7 +3,11 @@ import type {
   EnvironmentThreadShell,
 } from "@t3tools/client-runtime/state/shell";
 import { LegendList } from "@legendapp/list/react-native";
-import type { EnvironmentId } from "@t3tools/contracts";
+import {
+  type EnvironmentId,
+  type EnvironmentMachineKind,
+  resolveEnvironmentMachineKind,
+} from "@t3tools/contracts";
 import type { MenuAction } from "@react-native-menu/menu";
 import { NativeHeaderToolbar, NativeStackScreenOptions } from "../../native/StackHeader";
 import { SymbolView } from "../../components/AppSymbol";
@@ -24,10 +28,12 @@ import type { SwipeableMethods } from "react-native-gesture-handler/ReanimatedSw
 import { AppText as Text } from "../../components/AppText";
 import { ControlPillMenu } from "../../components/ControlPill";
 import { EmptyState } from "../../components/EmptyState";
+import { EnvironmentMachineSymbol } from "../../components/EnvironmentMachineSymbol";
 import { ProjectFavicon } from "../../components/ProjectFavicon";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { relativeTime } from "../../lib/time";
 import { useUniwindTheme } from "../../lib/useUniwindTheme";
+import { useServerConfigs } from "../../state/entities";
 import { ThreadSwipeable } from "../home/thread-swipe-actions";
 import {
   createNativeMailSearchToolbarItem,
@@ -45,6 +51,7 @@ type ArchivedThreadListItem =
       readonly kind: "project";
       readonly key: string;
       readonly environmentLabel: string | null;
+      readonly environmentMachine: EnvironmentMachineKind;
       readonly project: EnvironmentProject;
     }
   | {
@@ -360,6 +367,7 @@ function ArchivedThreadsHeader(props: {
 
 function ProjectGroupLabel(props: {
   readonly environmentLabel: string | null;
+  readonly environmentMachine: EnvironmentMachineKind;
   readonly project: EnvironmentProject;
 }) {
   return (
@@ -378,9 +386,16 @@ function ProjectGroupLabel(props: {
         {props.project.title}
       </Text>
       {props.environmentLabel ? (
-        <Text className="max-w-[42%] text-2xs text-foreground-tertiary" numberOfLines={1}>
-          {props.environmentLabel}
-        </Text>
+        <View className="max-w-[42%] flex-row items-center gap-1">
+          <EnvironmentMachineSymbol
+            kind={props.environmentMachine}
+            size={10}
+            tintColorClassName="accent-foreground-tertiary"
+          />
+          <Text className="shrink text-2xs text-foreground-tertiary" numberOfLines={1}>
+            {props.environmentLabel}
+          </Text>
+        </View>
       ) : null}
     </View>
   );
@@ -517,6 +532,7 @@ export function ArchivedThreadsScreen(props: {
       ),
     [props.environments],
   );
+  const serverConfigs = useServerConfigs();
   const listItems = useMemo<ReadonlyArray<ArchivedThreadListItem>>(() => {
     const items: ArchivedThreadListItem[] = [];
     for (const group of props.groups) {
@@ -525,6 +541,9 @@ export function ArchivedThreadsScreen(props: {
         kind: "project",
         key: `${group.key}:project`,
         environmentLabel,
+        environmentMachine: resolveEnvironmentMachineKind(
+          serverConfigs.get(group.project.environmentId) ?? null,
+        ),
         project: group.project,
       });
 
@@ -540,7 +559,7 @@ export function ArchivedThreadsScreen(props: {
       });
     }
     return items;
-  }, [environmentLabelsById, props.groups]);
+  }, [environmentLabelsById, props.groups, serverConfigs]);
   const handleSwipeableWillOpen = useCallback((methods: SwipeableMethods) => {
     if (openSwipeableRef.current && openSwipeableRef.current !== methods) {
       openSwipeableRef.current.close();
@@ -559,7 +578,11 @@ export function ArchivedThreadsScreen(props: {
       if (item.kind === "project") {
         return (
           <View className="pt-4">
-            <ProjectGroupLabel environmentLabel={item.environmentLabel} project={item.project} />
+            <ProjectGroupLabel
+              environmentLabel={item.environmentLabel}
+              environmentMachine={item.environmentMachine}
+              project={item.project}
+            />
           </View>
         );
       }
diff --git a/apps/mobile/src/features/connection/CloudEnvironmentRows.tsx b/apps/mobile/src/features/connection/CloudEnvironmentRows.tsx
index 4c840636c9fc..163e5fcf16f1 100644
--- a/apps/mobile/src/features/connection/CloudEnvironmentRows.tsx
+++ b/apps/mobile/src/features/connection/CloudEnvironmentRows.tsx
@@ -4,7 +4,12 @@ import {
   connectionStatusText,
   type EnvironmentConnectionPhase,
 } from "@t3tools/client-runtime/connection";
-import type { EnvironmentId } from "@t3tools/contracts";
+import {
+  type EnvironmentId,
+  type EnvironmentMachineKind,
+  resolveEnvironmentMachineKind,
+} from "@t3tools/contracts";
+import { useAtomValue } from "@effect/atom-react";
 import { useCallback, useState } from "react";
 import {
   ActivityIndicator,
@@ -15,10 +20,12 @@ import {
 } from "react-native";
 
 import { AppText as Text } from "../../components/AppText";
+import { EnvironmentMachineSymbol } from "../../components/EnvironmentMachineSymbol";
 import { ThemedSwitch } from "../../components/ThemedSwitch";
 import { cn } from "../../lib/cn";
 import { copyTextWithHaptic } from "../../lib/copyTextWithHaptic";
 import type { ConnectedEnvironmentSummary } from "../../state/remote-runtime-types";
+import { serverEnvironment } from "../../state/server";
 import { availableCloudEnvironmentPresentation } from "../cloud/cloudEnvironmentPresentation";
 import { hasCloudPublicConfig } from "../cloud/publicConfig";
 import { ConnectionStatusDot } from "./ConnectionStatusDot";
@@ -205,6 +212,9 @@ function ConnectedCloudEnvironmentRow(props: {
   readonly onDisconnect: () => void;
   readonly onToggleError: () => void;
 }) {
+  const serverConfig = useAtomValue(
+    serverEnvironment.configValueAtom(props.environment.environmentId),
+  );
   return (
     <CloudEnvironmentRowShell
       borderTop={props.borderTop}
@@ -213,6 +223,7 @@ function ConnectedCloudEnvironmentRow(props: {
       connectionState={props.environment.connectionState}
       errorExpanded={props.errorExpanded}
       label={props.environment.environmentLabel}
+      machine={resolveEnvironmentMachineKind(serverConfig)}
       onValueChange={(enabled) => {
         if (enabled) {
           props.onConnect();
@@ -268,6 +279,8 @@ function CloudEnvironmentRowShell(props: {
   readonly disabled?: boolean;
   readonly errorExpanded: boolean;
   readonly label: string;
+  /** Absent for environments the relay lists but this device has not connected to. */
+  readonly machine?: EnvironmentMachineKind;
   readonly onToggleError: () => void;
   readonly onValueChange: (enabled: boolean) => void;
   readonly statusText?: string;
@@ -323,6 +336,13 @@ function CloudEnvironmentRowShell(props: {
       <View className="min-w-0 flex-1 gap-0.5">
         <View className="min-w-0 flex-row items-center gap-2">
           <ConnectionStatusDot state={props.connectionState} pulse={shouldPulse} size={7} />
+          {props.machine ? (
+            <EnvironmentMachineSymbol
+              kind={props.machine}
+              size={14}
+              tintColorClassName="accent-foreground-muted"
+            />
+          ) : null}
           <Text
             className="min-w-0 flex-shrink text-base font-t3-bold leading-snug text-foreground"
             numberOfLines={1}
diff --git a/apps/mobile/src/features/connection/ConnectionEnvironmentRow.tsx b/apps/mobile/src/features/connection/ConnectionEnvironmentRow.tsx
index 86ebc6c11ab7..75d3e8ce7a34 100644
--- a/apps/mobile/src/features/connection/ConnectionEnvironmentRow.tsx
+++ b/apps/mobile/src/features/connection/ConnectionEnvironmentRow.tsx
@@ -1,7 +1,8 @@
 import { SymbolView } from "../../components/AppSymbol";
 import { connectionStatusText } from "@t3tools/client-runtime/connection";
 import type { AtomCommandResult } from "@t3tools/client-runtime/state/runtime";
-import type { EnvironmentId } from "@t3tools/contracts";
+import { type EnvironmentId, resolveEnvironmentMachineKind } from "@t3tools/contracts";
+import { useAtomValue } from "@effect/atom-react";
 import * as Cause from "effect/Cause";
 import { AsyncResult } from "effect/unstable/reactivity";
 import { useCallback, useState } from "react";
@@ -9,9 +10,11 @@ import { Alert, Pressable, View } from "react-native";
 import Animated, { FadeIn, FadeOut, LinearTransition } from "react-native-reanimated";
 
 import { AppText as Text, AppTextInput as TextInput } from "../../components/AppText";
+import { EnvironmentMachineSymbol } from "../../components/EnvironmentMachineSymbol";
 import { cn } from "../../lib/cn";
 import { copyTextWithHaptic } from "../../lib/copyTextWithHaptic";
 import type { ConnectedEnvironmentSummary } from "../../state/remote-runtime-types";
+import { serverEnvironment } from "../../state/server";
 import { ConnectionStatusDot } from "./ConnectionStatusDot";
 
 function connectionStatusLabel(environment: ConnectedEnvironmentSummary): string | null {
@@ -35,6 +38,9 @@ export function ConnectionEnvironmentRow(props: {
 }) {
   const [label, setLabel] = useState(props.environment.environmentLabel);
   const [url, setUrl] = useState(props.environment.displayUrl);
+  const serverConfig = useAtomValue(
+    serverEnvironment.configValueAtom(props.environment.environmentId),
+  );
   const statusLabel = connectionStatusLabel(props.environment);
   const statusTraceId = props.environment.connectionErrorTraceId;
   const hasConnectionFailure = props.environment.connectionError !== null;
@@ -70,9 +76,19 @@ export function ConnectionEnvironmentRow(props: {
         />
 
         <View className="flex-1 gap-0.5">
-          <Text className="text-base font-t3-bold leading-snug text-foreground" numberOfLines={1}>
-            {props.environment.environmentLabel}
-          </Text>
+          <View className="flex-row items-center gap-1.5">
+            <EnvironmentMachineSymbol
+              kind={resolveEnvironmentMachineKind(serverConfig)}
+              size={14}
+              tintColorClassName="accent-foreground-muted"
+            />
+            <Text
+              className="min-w-0 flex-shrink text-base font-t3-bold leading-snug text-foreground"
+              numberOfLines={1}
+            >
+              {props.environment.environmentLabel}
+            </Text>
+          </View>
           <Text className="text-xs text-foreground-muted" numberOfLines={1}>
             {props.environment.displayUrl}
           </Text>
diff --git a/apps/mobile/src/features/files/ThreadFilesRouteScreen.tsx b/apps/mobile/src/features/files/ThreadFilesRouteScreen.tsx
index ef7771aafb97..b87070a2d623 100644
--- a/apps/mobile/src/features/files/ThreadFilesRouteScreen.tsx
+++ b/apps/mobile/src/features/files/ThreadFilesRouteScreen.tsx
@@ -668,7 +668,7 @@ export function ThreadFileScreen(props: ThreadFileRouteScreenProps) {
               id: action.id,
               title: action.title,
               icon:
-                action.id === "share" ? ("square.and.arrow.up" as const) : ("doc.on.doc" as const),
+                action.id === "save" ? ("square.and.arrow.up" as const) : ("doc.on.doc" as const),
               inline: false,
               onPress: action.run,
             }))
diff --git a/apps/mobile/src/features/files/WorkspaceFileImagePreview.tsx b/apps/mobile/src/features/files/WorkspaceFileImagePreview.tsx
index 3e6afae6f84e..ae6987f4c1c8 100644
--- a/apps/mobile/src/features/files/WorkspaceFileImagePreview.tsx
+++ b/apps/mobile/src/features/files/WorkspaceFileImagePreview.tsx
@@ -1,11 +1,8 @@
-import { useAtomValue } from "@effect/atom-react";
 import { useId, useMemo, useState } from "react";
 import { ActivityIndicator, Image, Pressable, View } from "react-native";
-import { AsyncResult } from "effect/unstable/reactivity";
 
 import { AppText as Text } from "../../components/AppText";
 import { EmptyState } from "../../components/EmptyState";
-import { workspaceFileImageAtom } from "./workspace-file-image-cache";
 import { FilePreviewModal, type FilePreviewSource } from "../../components/FilePreviewModal";
 import { PresentationSource } from "../../components/NativePresentation";
 import { useMediaActions, type MediaActionsSource } from "../../lib/mediaActions";
@@ -27,86 +24,52 @@ function ResolvedWorkspaceFileImagePreview(props: {
 
   return (
     <View className="relative flex-1 bg-subtle">
-      <Pressable
-        accessibilityRole="button"
-        accessibilityLabel={`Open full-screen preview of ${props.accessibilityLabel}`}
-        disabled={loadError !== null}
-        className="flex-1 p-4 active:bg-subtle-strong"
-        onPress={() =>
-          setPreview({
-            kind: "image",
-            uri: props.uri,
-            name: props.accessibilityLabel,
-            sourceIdentifier,
-            actionsSource: props.actionsSource,
-          })
-        }
-      >
-        <PresentationSource identifier={sourceIdentifier} style={{ flex: 1 }}>
-          <Image
-            accessible={false}
-            source={imageSource}
-            className="h-full w-full"
-            resizeMode="contain"
-            onLoadStart={() => setLoadError(null)}
-            onError={(event) => {
-              setLoadError(event.nativeEvent.error || "The image could not be rendered.");
-            }}
-          />
-        </PresentationSource>
-      </Pressable>
+      <MediaActionsMenu media={mediaActions} style={{ flex: 1 }}>
+        <Pressable
+          accessibilityRole="button"
+          accessibilityLabel={`Open full-screen preview of ${props.accessibilityLabel}`}
+          accessibilityHint={
+            mediaActions.actions.length > 0 ? "Touch and hold for media actions" : undefined
+          }
+          disabled={loadError !== null}
+          className="flex-1 p-4 active:bg-subtle-strong"
+          onPress={() =>
+            setPreview({
+              kind: "image",
+              uri: props.uri,
+              name: props.accessibilityLabel,
+              sourceIdentifier,
+              actionsSource: props.actionsSource,
+            })
+          }
+        >
+          <PresentationSource identifier={sourceIdentifier} style={{ flex: 1 }}>
+            <Image
+              accessible={false}
+              source={imageSource}
+              className="h-full w-full"
+              resizeMode="contain"
+              onLoadStart={() => setLoadError(null)}
+              onError={(event) => {
+                setLoadError(event.nativeEvent.error || "The image could not be rendered.");
+              }}
+            />
+          </PresentationSource>
+        </Pressable>
+      </MediaActionsMenu>
       {loadError !== null ? (
-        <View className="absolute inset-0 items-center justify-center bg-card px-6">
+        <View
+          pointerEvents="none"
+          className="absolute inset-0 items-center justify-center bg-card px-6"
+        >
           <EmptyState title="Image unavailable" detail={loadError} />
         </View>
       ) : null}
-
-      <View className="absolute right-2 top-2">
-        <MediaActionsMenu media={mediaActions} />
-      </View>
-
       <FilePreviewModal source={preview} onRequestClose={() => setPreview(null)} />
     </View>
   );
 }
 
-function CachedWorkspaceFileImagePreview(props: {
-  readonly accessibilityLabel: string;
-  readonly uri: string;
-  readonly actionsSource?: MediaActionsSource;
-}) {
-  const imageAtom = useMemo(() => workspaceFileImageAtom(props.uri), [props.uri]);
-  const imageResult = useAtomValue(imageAtom);
-
-  if (AsyncResult.isFailure(imageResult)) {
-    return (
-      <View className="flex-1 items-center justify-center bg-card px-6">
-        <EmptyState
-          title="Image unavailable"
-          detail="The image could not be loaded into the local cache."
-        />
-      </View>
-    );
-  }
-
-  if (!AsyncResult.isSuccess(imageResult)) {
-    return (
-      <View className="flex-1 items-center justify-center gap-3 bg-card px-6">
-        <ActivityIndicator />
-        <Text className="text-center text-sm text-foreground-muted">Loading image...</Text>
-      </View>
-    );
-  }
-
-  return (
-    <ResolvedWorkspaceFileImagePreview
-      accessibilityLabel={props.accessibilityLabel}
-      uri={imageResult.value}
-      actionsSource={props.actionsSource}
-    />
-  );
-}
-
 export function WorkspaceFileImagePreview(props: {
   readonly accessibilityLabel: string;
   readonly uri: string | null;
@@ -124,7 +87,7 @@ export function WorkspaceFileImagePreview(props: {
   }
 
   return (
-    <CachedWorkspaceFileImagePreview
+    <ResolvedWorkspaceFileImagePreview
       accessibilityLabel={props.accessibilityLabel}
       uri={props.uri}
       actionsSource={props.actionsSource}
diff --git a/apps/mobile/src/features/files/WorkspaceFileVideoPreview.tsx b/apps/mobile/src/features/files/WorkspaceFileVideoPreview.tsx
index aaa13427fac0..d45f7325a435 100644
--- a/apps/mobile/src/features/files/WorkspaceFileVideoPreview.tsx
+++ b/apps/mobile/src/features/files/WorkspaceFileVideoPreview.tsx
@@ -1,9 +1,7 @@
-import { useState } from "react";
 import { View } from "react-native";
 
 import { EmptyState } from "../../components/EmptyState";
 import { MediaVideoPlayer } from "../../components/MediaVideoPlayer";
-import { VideoPreviewModal, type VideoPreviewSource } from "../../components/VideoPreviewModal";
 import type { MediaVideoPreviewSource } from "../../lib/videoPreviewSource";
 
 /** Uses the signed progressive URL directly; choosing a file never preloads its video bytes as text. */
@@ -15,7 +13,6 @@ export function WorkspaceFileVideoPreview(props: {
   readonly resolvePlaybackUri: () => Promise<string | null>;
   readonly unavailable: boolean;
 }) {
-  const [preview, setPreview] = useState<VideoPreviewSource | null>(null);
   const uri = props.uri;
 
   if (props.unavailable) {
@@ -37,11 +34,7 @@ export function WorkspaceFileVideoPreview(props: {
         name={props.name}
         thumbnailKey={props.thumbnailKey}
         actionsSource={props.source?.actionsSource}
-        onExpand={
-          uri === null || props.source === null ? undefined : () => setPreview(props.source)
-        }
       />
-      <VideoPreviewModal source={preview} onRequestClose={() => setPreview(null)} />
     </View>
   );
 }
diff --git a/apps/mobile/src/features/files/workspace-file-image-cache.test.ts b/apps/mobile/src/features/files/workspace-file-image-cache.test.ts
deleted file mode 100644
index 4acb67361a8a..000000000000
--- a/apps/mobile/src/features/files/workspace-file-image-cache.test.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { AtomRegistry } from "effect/unstable/reactivity";
-import * as AsyncResult from "effect/unstable/reactivity/AsyncResult";
-import { describe, expect, it, vi } from "vite-plus/test";
-
-import { createWorkspaceFileImageAtomFamily } from "./workspace-file-image-cache";
-
-describe("workspaceFileImageAtom", () => {
-  it("reuses a prefetched image across route remounts", async () => {
-    const prefetch = vi.fn(async () => true);
-    const imageAtom = createWorkspaceFileImageAtomFamily({ idleTtlMs: 1_000, prefetch });
-    const registry = AtomRegistry.make({ timeoutResolution: 1 });
-    const first = imageAtom("https://example.test/image.png");
-    const firstUnmount = registry.mount(first);
-
-    await vi.waitFor(() => {
-      expect(AsyncResult.isSuccess(registry.get(first))).toBe(true);
-    });
-    firstUnmount();
-
-    const remounted = imageAtom("https://example.test/image.png");
-    const secondUnmount = registry.mount(remounted);
-
-    expect(remounted).toBe(first);
-    expect(AsyncResult.isSuccess(registry.get(remounted))).toBe(true);
-    expect(prefetch).toHaveBeenCalledTimes(1);
-
-    secondUnmount();
-    registry.dispose();
-  });
-
-  it("prefetches different asset URLs independently", async () => {
-    const prefetch = vi.fn(async () => true);
-    const imageAtom = createWorkspaceFileImageAtomFamily({ prefetch });
-    const registry = AtomRegistry.make();
-    const first = imageAtom("https://example.test/first.png");
-    const second = imageAtom("https://example.test/second.png");
-    const firstUnmount = registry.mount(first);
-    const secondUnmount = registry.mount(second);
-
-    await vi.waitFor(() => {
-      expect(AsyncResult.isSuccess(registry.get(first))).toBe(true);
-      expect(AsyncResult.isSuccess(registry.get(second))).toBe(true);
-    });
-    expect(prefetch).toHaveBeenCalledTimes(2);
-
-    firstUnmount();
-    secondUnmount();
-    registry.dispose();
-  });
-
-  it("exposes prefetch failures", async () => {
-    const imageAtom = createWorkspaceFileImageAtomFamily({ prefetch: async () => false });
-    const registry = AtomRegistry.make();
-    const atom = imageAtom("https://example.test/missing.png");
-    const unmount = registry.mount(atom);
-
-    await vi.waitFor(() => {
-      expect(AsyncResult.isFailure(registry.get(atom))).toBe(true);
-    });
-
-    unmount();
-    registry.dispose();
-  });
-});
diff --git a/apps/mobile/src/features/files/workspace-file-image-cache.ts b/apps/mobile/src/features/files/workspace-file-image-cache.ts
deleted file mode 100644
index 3f58f65b46c9..000000000000
--- a/apps/mobile/src/features/files/workspace-file-image-cache.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import * as Data from "effect/Data";
-import * as Effect from "effect/Effect";
-import { Atom } from "effect/unstable/reactivity";
-
-const WORKSPACE_IMAGE_IDLE_TTL_MS = 30 * 60_000;
-
-type ImagePrefetch = (uri: string) => Promise<boolean>;
-
-class WorkspaceImageCacheKey extends Data.Class<{ readonly uri: string }> {}
-
-export class WorkspaceImagePrefetchError extends Data.TaggedError("WorkspaceImagePrefetchError")<{
-  readonly cause?: unknown;
-  readonly uri: string;
-}> {}
-
-async function prefetchWithNativeImage(uri: string): Promise<boolean> {
-  const { Image } = await import("react-native");
-  return Image.prefetch(uri);
-}
-
-export function createWorkspaceFileImageAtomFamily(options?: {
-  readonly idleTtlMs?: number;
-  readonly prefetch?: ImagePrefetch;
-}) {
-  const idleTtlMs = options?.idleTtlMs ?? WORKSPACE_IMAGE_IDLE_TTL_MS;
-  const prefetch = options?.prefetch ?? prefetchWithNativeImage;
-  const family = Atom.family((key: WorkspaceImageCacheKey) =>
-    Atom.make(
-      Effect.tryPromise({
-        try: async () => {
-          const cached = await prefetch(key.uri);
-          if (!cached) {
-            throw new WorkspaceImagePrefetchError({ uri: key.uri });
-          }
-          return key.uri;
-        },
-        catch: (cause) =>
-          cause instanceof WorkspaceImagePrefetchError
-            ? cause
-            : new WorkspaceImagePrefetchError({ uri: key.uri, cause }),
-      }),
-    ).pipe(Atom.setIdleTTL(idleTtlMs), Atom.withLabel(`mobile:workspace-image:${key.uri}`)),
-  );
-
-  return (uri: string) => family(new WorkspaceImageCacheKey({ uri }));
-}
-
-export const workspaceFileImageAtom = createWorkspaceFileImageAtomFamily();
diff --git a/apps/mobile/src/features/home/HomeScreen.tsx b/apps/mobile/src/features/home/HomeScreen.tsx
index d7b76873d6ce..b4343e95b031 100644
--- a/apps/mobile/src/features/home/HomeScreen.tsx
+++ b/apps/mobile/src/features/home/HomeScreen.tsx
@@ -12,10 +12,11 @@ import {
   type EnvironmentThreadSearchMatch,
 } from "@t3tools/client-runtime/state/thread-search";
 import { sortPinnedThreadsByOrderKey } from "@t3tools/client-runtime/state/thread-sort";
-import type {
-  EnvironmentId,
-  SidebarProjectGroupingMode,
-  SidebarThreadSortOrder,
+import {
+  type EnvironmentId,
+  resolveEnvironmentMachineKind,
+  type SidebarProjectGroupingMode,
+  type SidebarThreadSortOrder,
 } from "@t3tools/contracts";
 import { useAtomSet, useAtomValue } from "@effect/atom-react";
 import { AsyncResult } from "effect/unstable/reactivity";
@@ -616,6 +617,16 @@ export function HomeScreen(props: HomeScreenProps) {
     }
     return supported;
   }, [serverConfigs]);
+  const machineByEnvironmentId = useMemo(
+    () =>
+      new Map(
+        [...serverConfigs].map(
+          ([environmentId, config]) =>
+            [environmentId, resolveEnvironmentMachineKind(config)] as const,
+        ),
+      ),
+    [serverConfigs],
+  );
   // Canonical arranged pinned order (reorder-capable threads only) for the
   // Move up/down position flags. Computed from all shells, not the rendered
   // list, so search/scope filtering never disables or misdirects a move.
@@ -744,6 +755,7 @@ export function HomeScreen(props: HomeScreenProps) {
                     ?.environmentLabel ?? null)
                 : null
             }
+            environmentMachine={machineByEnvironmentId.get(item.pendingTask.message.environmentId)}
             showPendingDivider={item.showPendingDivider}
             showTrailingDivider={showTrailingDivider}
             onSelectPendingTask={props.onSelectPendingTask}
@@ -801,6 +813,7 @@ export function HomeScreen(props: HomeScreenProps) {
               ? (props.savedConnectionsById[thread.environmentId]?.environmentLabel ?? null)
               : null
           }
+          environmentMachine={machineByEnvironmentId.get(thread.environmentId)}
           searchMatch={threadSearchMatchByKey.get(
             threadSearchMatchKey({
               environmentId: thread.environmentId,
@@ -851,6 +864,7 @@ export function HomeScreen(props: HomeScreenProps) {
       handleSwipeableWillOpen,
       handleUnsettleThread,
       pinningEnvironmentIds,
+      machineByEnvironmentId,
       pinReorderEnvironmentIds,
       projectByKey,
       projectCwdByKey,
@@ -942,6 +956,9 @@ export function HomeScreen(props: HomeScreenProps) {
                 props.savedConnectionsById[item.pendingTask.message.environmentId]
                   ?.environmentLabel ?? null
               }
+              environmentMachine={machineByEnvironmentId.get(
+                item.pendingTask.message.environmentId,
+              )}
               isLast={item.isLast}
               onSelectPendingTask={props.onSelectPendingTask}
               onDeletePendingTask={props.onDeletePendingTask}
@@ -956,6 +973,7 @@ export function HomeScreen(props: HomeScreenProps) {
               environmentLabel={
                 props.savedConnectionsById[thread.environmentId]?.environmentLabel ?? null
               }
+              environmentMachine={machineByEnvironmentId.get(thread.environmentId)}
               projectCwd={
                 projectCwdByKey.get(scopedProjectKey(thread.environmentId, thread.projectId)) ??
                 null
@@ -994,6 +1012,7 @@ export function HomeScreen(props: HomeScreenProps) {
       handleSwipeableClose,
       handleSwipeableWillOpen,
       handleRegenerateThreadTitle,
+      machineByEnvironmentId,
       projectCwdByKey,
       props.onArchiveThread,
       props.onDeletePendingTask,
diff --git a/apps/mobile/src/features/projects/AddProjectScreen.tsx b/apps/mobile/src/features/projects/AddProjectScreen.tsx
index 4079ea5591ea..fe22a1e6e071 100644
--- a/apps/mobile/src/features/projects/AddProjectScreen.tsx
+++ b/apps/mobile/src/features/projects/AddProjectScreen.tsx
@@ -31,7 +31,13 @@ import {
   inferProjectTitleFromPath,
   isWindowsPlatform,
 } from "@t3tools/client-runtime/state/projects";
-import { CommandId, type EnvironmentId, ProjectId } from "@t3tools/contracts";
+import {
+  CommandId,
+  type EnvironmentId,
+  type EnvironmentMachineKind,
+  ProjectId,
+  resolveEnvironmentMachineKind,
+} from "@t3tools/contracts";
 import { CommonActions, StackActions, useNavigation } from "@react-navigation/native";
 import { SymbolView } from "../../components/AppSymbol";
 import { useCallback, useEffect, useMemo, useRef, useState, type ReactNode } from "react";
@@ -49,6 +55,7 @@ import { projectEnvironment } from "../../state/projects";
 import { useEnvironmentQuery } from "../../state/query";
 import { sourceControlEnvironment } from "../../state/sourceControl";
 import { AppText as Text, AppTextInput as TextInput } from "../../components/AppText";
+import { EnvironmentMachineSymbol } from "../../components/EnvironmentMachineSymbol";
 import { ErrorBanner } from "../../components/ErrorBanner";
 import { SourceControlIcon } from "../../components/SourceControlIcon";
 import { uuidv4 } from "../../lib/uuid";
@@ -65,6 +72,7 @@ interface EnvironmentOption {
   readonly environmentId: EnvironmentId;
   readonly label: string;
   readonly platform: string;
+  readonly machine: EnvironmentMachineKind;
   readonly baseDirectory: string | null;
   readonly connectionState: EnvironmentConnectionPhase;
   readonly connectionError: string | null;
@@ -352,6 +360,7 @@ function useEnvironmentOptions(): ReadonlyArray<EnvironmentOption> {
         environmentId: connection.environmentId,
         label: connection.environmentLabel,
         platform: platformFromOs(config?.environment.platform.os ?? null),
+        machine: resolveEnvironmentMachineKind(config ?? null),
         baseDirectory: config?.settings.addProjectBaseDirectory ?? null,
         connectionState: runtime?.connectionState ?? "available",
         connectionError: runtime?.connectionError ?? null,
@@ -493,11 +502,10 @@ export function AddProjectSourceScreen(props: { readonly incomingShareId?: strin
                       })
                 }
                 icon={
-                  <SymbolView
-                    name="server.rack"
+                  <EnvironmentMachineSymbol
+                    kind={environment.machine}
                     size={17}
-                    tintColorClassName={"accent-icon"}
-                    type="monochrome"
+                    tintColorClassName="accent-icon"
                   />
                 }
                 selected={environment.environmentId === selectedEnvironment?.environmentId}
diff --git a/apps/mobile/src/features/settings/SettingsClientStorageRouteScreen.tsx b/apps/mobile/src/features/settings/SettingsClientStorageRouteScreen.tsx
index 3480340f4093..bf66574717eb 100644
--- a/apps/mobile/src/features/settings/SettingsClientStorageRouteScreen.tsx
+++ b/apps/mobile/src/features/settings/SettingsClientStorageRouteScreen.tsx
@@ -1,4 +1,5 @@
 import { useAtomSet, useAtomValue } from "@effect/atom-react";
+import { type EnvironmentMachineKind, resolveEnvironmentMachineKind } from "@t3tools/contracts";
 import { AsyncResult } from "effect/unstable/reactivity";
 import { useMemo } from "react";
 import { ActivityIndicator, Alert, Pressable, ScrollView, View } from "react-native";
@@ -6,11 +7,13 @@ import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 import { AppText as Text } from "../../components/AppText";
 import { SymbolView } from "../../components/AppSymbol";
+import { EnvironmentMachineSymbol } from "../../components/EnvironmentMachineSymbol";
 import {
   clearClientCacheAtom,
   clientCacheSummaryAtom,
   type EnvironmentClientCacheSummary,
 } from "../../state/client-cache-state";
+import { useServerConfigs } from "../../state/entities";
 import { useSavedRemoteConnections } from "../../state/use-remote-environment-registry";
 import { SettingsSection } from "./components/SettingsSection";
 
@@ -20,6 +23,7 @@ export function SettingsClientStorageRouteScreen() {
   const clearResult = useAtomValue(clearClientCacheAtom);
   const clearCache = useAtomSet(clearClientCacheAtom);
   const { savedConnectionsById } = useSavedRemoteConnections();
+  const serverConfigs = useServerConfigs();
   const isClearing = clearResult.waiting;
   const summary = AsyncResult.isSuccess(summaryResult) ? summaryResult.value : null;
   const environmentSummaries = useMemo(
@@ -106,6 +110,9 @@ export function SettingsClientStorageRouteScreen() {
                   savedConnectionsById[environment.environmentId]?.environmentLabel ??
                   environment.environmentId
                 }
+                machine={resolveEnvironmentMachineKind(
+                  serverConfigs.get(environment.environmentId) ?? null,
+                )}
                 disabled={isClearing}
                 first={index === 0}
                 onClear={() => confirmClearEnvironment(environment)}
@@ -169,6 +176,7 @@ export function SettingsClientStorageRouteScreen() {
 function CacheEnvironmentRow(props: {
   readonly environment: EnvironmentClientCacheSummary;
   readonly environmentLabel: string;
+  readonly machine: EnvironmentMachineKind;
   readonly disabled: boolean;
   readonly first: boolean;
   readonly onClear: () => void;
@@ -181,13 +189,7 @@ function CacheEnvironmentRow(props: {
           : "border-t border-border flex-row items-center gap-3 p-4"
       }
     >
-      <SymbolView
-        name="desktopcomputer"
-        size={22}
-        tintColorClassName={"accent-icon"}
-        type="monochrome"
-        weight="regular"
-      />
+      <EnvironmentMachineSymbol kind={props.machine} size={22} tintColorClassName="accent-icon" />
       <Text className="min-w-0 flex-1 text-base text-foreground" numberOfLines={1}>
         {props.environmentLabel}
       </Text>
diff --git a/apps/mobile/src/features/settings/appearance/components/FontSizeSliderRow.tsx b/apps/mobile/src/features/settings/appearance/components/FontSizeSliderRow.tsx
index 41bab785ac3d..9b5d8e113f85 100644
--- a/apps/mobile/src/features/settings/appearance/components/FontSizeSliderRow.tsx
+++ b/apps/mobile/src/features/settings/appearance/components/FontSizeSliderRow.tsx
@@ -12,7 +12,6 @@ import Animated, {
 import type { ComponentProps } from "react";
 
 import { AppText as Text } from "../../../../components/AppText";
-import { useUniwindTheme } from "../../../../lib/useUniwindTheme";
 
 type SymbolName = ComponentProps<typeof SymbolView>["name"];
 
@@ -36,10 +35,6 @@ export function FontSizeSliderRow(props: {
   readonly value: number;
   readonly onChange: (value: number) => void;
 }) {
-  const theme = useUniwindTheme();
-  const trackColor = theme["--color-secondary-border"];
-  const fillColor = theme["--color-primary"];
-
   const latest = useRef(props);
   latest.current = props;
 
@@ -172,12 +167,12 @@ export function FontSizeSliderRow(props: {
             }}
           >
             <View
-              className="w-full rounded-full"
-              style={{ backgroundColor: trackColor, height: TRACK_HEIGHT }}
+              className="w-full rounded-full bg-secondary-border"
+              style={{ height: TRACK_HEIGHT }}
             >
               <Animated.View
-                className="absolute inset-y-0 left-0 rounded-full"
-                style={[{ backgroundColor: fillColor }, fillStyle]}
+                className="absolute inset-y-0 left-0 rounded-full bg-primary"
+                style={fillStyle}
               />
             </View>
             <Animated.View
diff --git a/apps/mobile/src/features/shortcuts/appShortcuts.ts b/apps/mobile/src/features/shortcuts/appShortcuts.ts
index 49e9d0999af1..3d2d9614db47 100644
--- a/apps/mobile/src/features/shortcuts/appShortcuts.ts
+++ b/apps/mobile/src/features/shortcuts/appShortcuts.ts
@@ -122,16 +122,14 @@ export function buildShortcutActions(recents: ReadonlyArray<RecentThreadShortcut
       icon: SHORTCUT_ICON,
       params: { href: NEW_TASK_SHORTCUT_HREF },
     },
-    ...recents.slice(0, MAX_RECENT_THREAD_SHORTCUTS).map(
-      (thread): Action => ({
-        // The encoded href doubles as the launcher id: URI-encoding makes the
-        // env/thread join unambiguous (a plain `-` join lets different pairs
-        // collide and overwrite each other's launcher slots).
-        id: `thread:${threadShortcutHref(thread)}`,
-        title: threadShortcutLabel(thread),
-        icon: SHORTCUT_ICON,
-        params: { href: threadShortcutHref(thread) },
-      }),
-    ),
+    ...recents.slice(0, MAX_RECENT_THREAD_SHORTCUTS).map((thread): Action => ({
+      // The encoded href doubles as the launcher id: URI-encoding makes the
+      // env/thread join unambiguous (a plain `-` join lets different pairs
+      // collide and overwrite each other's launcher slots).
+      id: `thread:${threadShortcutHref(thread)}`,
+      title: threadShortcutLabel(thread),
+      icon: SHORTCUT_ICON,
+      params: { href: threadShortcutHref(thread) },
+    })),
   ];
 }
diff --git a/apps/mobile/src/features/terminal/ThreadTerminalRouteScreen.tsx b/apps/mobile/src/features/terminal/ThreadTerminalRouteScreen.tsx
index f370401e8ecc..a51e084efc9e 100644
--- a/apps/mobile/src/features/terminal/ThreadTerminalRouteScreen.tsx
+++ b/apps/mobile/src/features/terminal/ThreadTerminalRouteScreen.tsx
@@ -948,16 +948,14 @@ export function ThreadTerminalRouteScreen(props: ThreadTerminalRouteScreenProps)
           },
         ],
       },
-      ...terminalMenuSessions.map(
-        (session): MenuAction => ({
-          id: `terminal-session:${session.terminalId}`,
-          title: session.displayLabel,
-          subtitle: [getTerminalStatusLabel({ status: session.status }), basename(session.cwd)]
-            .filter(Boolean)
-            .join(" · "),
-          state: session.terminalId === terminalId ? ("on" as const) : undefined,
-        }),
-      ),
+      ...terminalMenuSessions.map((session): MenuAction => ({
+        id: `terminal-session:${session.terminalId}`,
+        title: session.displayLabel,
+        subtitle: [getTerminalStatusLabel({ status: session.status }), basename(session.cwd)]
+          .filter(Boolean)
+          .join(" · "),
+        state: session.terminalId === terminalId ? ("on" as const) : undefined,
+      })),
       {
         id: "terminal-new",
         title: "Open new terminal",
diff --git a/apps/mobile/src/features/threads/NewTaskContextPickerScreens.tsx b/apps/mobile/src/features/threads/NewTaskContextPickerScreens.tsx
index 411598db08d7..96bd7438057a 100644
--- a/apps/mobile/src/features/threads/NewTaskContextPickerScreens.tsx
+++ b/apps/mobile/src/features/threads/NewTaskContextPickerScreens.tsx
@@ -1,4 +1,5 @@
 import type { VcsRef } from "@t3tools/client-runtime/state/vcs";
+import { resolveEnvironmentMachineKind } from "@t3tools/contracts";
 import { LegendList } from "@legendapp/list/react-native";
 import {
   isAtomCommandInterrupted,
@@ -21,11 +22,11 @@ import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { AndroidScreenHeader } from "../../components/AndroidScreenHeader";
 import { SymbolView } from "../../components/AppSymbol";
 import { AppText as Text } from "../../components/AppText";
+import { EnvironmentMachineSymbol } from "../../components/EnvironmentMachineSymbol";
 import { ThemedSwitch } from "../../components/ThemedSwitch";
 import { cn } from "../../lib/cn";
-import { useFontFamily } from "../../lib/useFontFamily";
-import { useUniwindTheme } from "../../lib/useUniwindTheme";
 import { NativeHeaderToolbar, NativeStackScreenOptions } from "../../native/StackHeader";
+import { useServerConfigs } from "../../state/entities";
 import { useAtomCommand } from "../../state/use-atom-command";
 import { vcsEnvironment } from "../../state/vcs";
 import {
@@ -37,7 +38,7 @@ import { branchBadgeLabel, useNewTaskFlow } from "./new-task-flow-provider";
 import { shouldCheckoutNewTaskBranch } from "./new-task-context-presentation";
 
 function SelectionRow(props: {
-  readonly icon?: "arrow.triangle.branch" | "desktopcomputer";
+  readonly icon?: "arrow.triangle.branch" | ReactNode;
   readonly onPress: () => void;
   readonly disabled?: boolean;
   readonly selected: boolean;
@@ -58,14 +59,16 @@ function SelectionRow(props: {
       onPress={props.onPress}
       style={{ opacity: props.disabled ? 0.45 : 1 }}
     >
-      {props.icon ? (
+      {props.icon === "arrow.triangle.branch" ? (
         <SymbolView
-          name={props.icon}
+          name="arrow.triangle.branch"
           size={17}
           tintColorClassName={"accent-icon-muted"}
           type="monochrome"
         />
-      ) : null}
+      ) : (
+        (props.icon ?? null)
+      )}
       <View className="min-w-0 flex-1 gap-0.5">
         <Text className="text-base font-t3-medium text-foreground" numberOfLines={1}>
           {props.title}
@@ -147,6 +150,7 @@ export function NewTaskEnvironmentPickerRouteScreen() {
   const flow = useNewTaskFlow();
   const navigation = useNavigation();
   const insets = useSafeAreaInsets();
+  const serverConfigs = useServerConfigs();
 
   return (
     <View className="flex-1 bg-sheet" collapsable={false}>
@@ -172,7 +176,15 @@ export function NewTaskEnvironmentPickerRouteScreen() {
           {flow.environments.map((environment, index) => (
             <SelectionRow
               key={String(environment.environmentId)}
-              icon="desktopcomputer"
+              icon={
+                <EnvironmentMachineSymbol
+                  kind={resolveEnvironmentMachineKind(
+                    serverConfigs.get(environment.environmentId) ?? null,
+                  )}
+                  size={17}
+                  tintColorClassName="accent-icon-muted"
+                />
+              }
               isLast={index === flow.environments.length - 1}
               onPress={() => {
                 void Haptics.selectionAsync();
@@ -193,8 +205,6 @@ export function NewTaskBranchPickerRouteScreen() {
   const flow = useNewTaskFlow();
   const navigation = useNavigation();
   const insets = useSafeAreaInsets();
-  const foregroundColor = useUniwindTheme()["--color-foreground"];
-  const fontFamily = useFontFamily("regular");
   const switchRef = useAtomCommand(vcsEnvironment.switchRef, { reportFailure: false });
   const [switchingBranchName, setSwitchingBranchName] = useState<string | null>(null);
   const selectingBranchNameRef = useRef<string | null>(null);
@@ -417,11 +427,10 @@ export function NewTaskBranchPickerRouteScreen() {
           <TextInput
             autoCapitalize="none"
             autoCorrect={false}
-            className="h-11 rounded-xl bg-card px-4 text-base text-foreground"
+            className="h-11 rounded-xl bg-card px-4 font-sans text-base text-foreground"
             onChangeText={flow.setBranchQuery}
             placeholder="Find a branch"
             placeholderTextColorClassName={"accent-placeholder"}
-            style={{ color: foregroundColor, fontFamily }}
             value={flow.branchQuery}
           />
         </View>
diff --git a/apps/mobile/src/features/threads/NewTaskDraftScreen.tsx b/apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
index 9db040414402..e0ca8fee3249 100644
--- a/apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
+++ b/apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
@@ -24,7 +24,10 @@ import {
   isAtomCommandInterrupted,
   squashAtomCommandFailure,
 } from "@t3tools/client-runtime/state/runtime";
-import { PROVIDER_SEND_TURN_MAX_ATTACHMENTS } from "@t3tools/contracts";
+import {
+  PROVIDER_SEND_TURN_MAX_ATTACHMENTS,
+  resolveEnvironmentMachineKind,
+} from "@t3tools/contracts";
 
 import { ComposerEditor, type ComposerEditorHandle } from "../../components/ComposerEditor";
 import {
@@ -36,6 +39,7 @@ import {
 import { AndroidScreenHeader } from "../../components/AndroidScreenHeader";
 import { ComposerAttachmentButton } from "../../components/ComposerAttachmentButton";
 import { ComposerAttachmentStrip } from "../../components/ComposerAttachmentStrip";
+import { EnvironmentMachineSymbol } from "../../components/EnvironmentMachineSymbol";
 import {
   composerAttachmentUploadBlockReason,
   composerAttachmentUploadsAtom,
@@ -1129,7 +1133,13 @@ export function NewTaskDraftScreen(props: {
         accessibilityLabel={`Environment: ${selectedEnvironmentLabel}`}
         chevronDirection="right"
         disabled={isComposerInteractionLocked || voiceInput.isBusy}
-        icon="desktopcomputer"
+        iconNode={
+          <EnvironmentMachineSymbol
+            kind={resolveEnvironmentMachineKind(selectedEnvironmentServerConfig)}
+            size={16}
+            tintColorClassName="accent-icon-muted"
+          />
+        }
         label={`on ${selectedEnvironmentLabel}`}
         maxWidth={260}
         onPress={
diff --git a/apps/mobile/src/features/threads/ThreadFeed.tsx b/apps/mobile/src/features/threads/ThreadFeed.tsx
index 1b7cb5f373ec..4d198ce4ae3a 100644
--- a/apps/mobile/src/features/threads/ThreadFeed.tsx
+++ b/apps/mobile/src/features/threads/ThreadFeed.tsx
@@ -105,6 +105,7 @@ import { resolveMarkdownMediaPreview } from "../../lib/markdownMedia";
 import { useMediaActions, type MediaActionsSource } from "../../lib/mediaActions";
 import { MediaActionsMenu } from "../../components/MediaActionsMenu";
 import {
+  attachmentVideoPreviewSource,
   mediaVideoPreviewUri,
   mediaVideoThumbnailKey,
   type MediaVideoPreviewSource,
@@ -251,14 +252,21 @@ function MessageAttachmentImage(props: {
   readonly environmentId: EnvironmentId;
   readonly attachmentId: string;
   readonly name: string;
+  readonly mimeType: string;
   readonly className: string;
   readonly onPressPreview: (source: FilePreviewSource) => void;
 }) {
   const sourceIdentifier = useId();
-  const uri = useAssetUrl(props.environmentId, {
-    _tag: "attachment",
-    attachmentId: props.attachmentId,
-  });
+  const resource = useMemo(
+    () => ({
+      _tag: "attachment" as const,
+      attachmentId: props.attachmentId,
+      fileName: props.name,
+      mimeType: props.mimeType,
+    }),
+    [props.attachmentId, props.name, props.mimeType],
+  );
+  const uri = useAssetUrl(props.environmentId, resource);
 
   if (uri === null) {
     return (
@@ -274,7 +282,20 @@ function MessageAttachmentImage(props: {
         accessibilityRole="imagebutton"
         accessibilityLabel={`Open ${props.name}`}
         onPress={() =>
-          props.onPressPreview({ kind: "image", uri, name: props.name, sourceIdentifier })
+          // The viewer mints its own URL from the resource so the image survives a refresh.
+          props.onPressPreview({
+            kind: "image",
+            environmentId: props.environmentId,
+            resource,
+            name: props.name,
+            sourceIdentifier,
+            actionsSource: {
+              name: props.name,
+              mimeType: props.mimeType,
+              environmentId: props.environmentId,
+              resource,
+            },
+          })
         }
       >
         <Image source={{ uri }} className={props.className} resizeMode="cover" />
@@ -389,14 +410,18 @@ function MessageAttachmentFile(props: {
   };
 
   if (videoType !== null) {
+    const sourceIdentifier = `attachment:${props.environmentId}:${attachment.id}`;
     return (
       <VideoAttachmentTile
         name={attachment.name}
-        sourceIdentifier={`attachment:${props.environmentId}:${attachment.id}`}
+        sourceIdentifier={sourceIdentifier}
         thumbnailSource={thumbnailUrl}
+        actionsSource={
+          attachmentVideoPreviewSource(props.environmentId, attachment, sourceIdentifier)
+            .actionsSource
+        }
         disabled={opening || httpBaseUrl === null}
         onPress={(sourceIdentifier) => props.onPressVideo(attachment, sourceIdentifier)}
-        onShare={() => shareFile(`attachment:${props.environmentId}:${attachment.id}`)}
         className="my-1 rounded-2xl"
         style={{ width: 224, maxWidth: "100%", aspectRatio: 16 / 9 }}
       />
@@ -520,62 +545,60 @@ function ThreadMarkdownImageView(props: {
       style={{ alignSelf: "stretch", gap: 6 }}
     >
       {props.uri === null || failed ? (
-        <View
-          className="items-center justify-center rounded-[10px] bg-md-code-bg"
-          style={{
-            ...frameStyle,
-          }}
-        >
-          {failed ? (
-            <Text className="text-xs text-foreground-muted">Image unavailable</Text>
-          ) : (
-            <ActivityIndicator />
-          )}
-          {props.actionsSource ? (
-            <View className="absolute right-1 top-1">
-              <MediaActionsMenu media={mediaActions} />
-            </View>
-          ) : null}
-        </View>
+        <MediaActionsMenu media={mediaActions}>
+          <Pressable
+            accessibilityRole="imagebutton"
+            accessibilityLabel={props.alt ?? "Markdown image"}
+            accessibilityHint={
+              mediaActions.actions.length > 0 ? "Touch and hold for media actions" : undefined
+            }
+            className="items-center justify-center rounded-[10px] bg-md-code-bg"
+            style={frameStyle}
+          >
+            {failed ? (
+              <Text className="text-xs text-foreground-muted">Image unavailable</Text>
+            ) : (
+              <ActivityIndicator />
+            )}
+          </Pressable>
+        </MediaActionsMenu>
       ) : (
         <PresentationSource identifier={sourceIdentifier} style={{ alignSelf: "flex-start" }}>
-          <View>
-            <MediaActionsMenu media={mediaActions}>
-              <Pressable
-                accessibilityRole="imagebutton"
-                accessibilityLabel={props.alt ?? "Markdown image"}
-                onPress={() =>
-                  props.onPressPreview({
-                    kind: "image",
-                    uri: props.uri!,
-                    name: props.alt ?? "Image",
-                    sourceIdentifier,
-                    actionsSource: props.actionsSource,
-                  })
-                }
-                style={{ alignSelf: "flex-start" }}
+          <MediaActionsMenu media={mediaActions}>
+            <Pressable
+              accessibilityRole="imagebutton"
+              accessibilityLabel={props.alt ?? "Markdown image"}
+              accessibilityHint={
+                mediaActions.actions.length > 0 ? "Touch and hold for media actions" : undefined
+              }
+              onPress={() =>
+                // Quick Look picks the viewer from the name's extension, so it needs the
+                // file name rather than the alt text.
+                props.onPressPreview({
+                  kind: "image",
+                  uri: props.uri!,
+                  name: props.actionsSource?.name ?? props.alt ?? "Image",
+                  sourceIdentifier,
+                  actionsSource: props.actionsSource,
+                })
+              }
+              style={{ alignSelf: "flex-start" }}
+            >
+              <View
+                className="items-center justify-center overflow-hidden rounded-[10px] bg-md-code-bg"
+                style={{
+                  ...frameStyle,
+                }}
               >
-                <View
-                  className="items-center justify-center overflow-hidden rounded-[10px] bg-md-code-bg"
-                  style={{
-                    ...frameStyle,
-                  }}
-                >
-                  <ThreadMarkdownImageRequest
-                    key={props.uri}
-                    uri={props.uri}
-                    onLoad={setSourceSize}
-                    onError={() => setFailedUri(props.uri)}
-                  />
-                </View>
-              </Pressable>
-            </MediaActionsMenu>
-            {props.actionsSource ? (
-              <View className="absolute right-1 top-1">
-                <MediaActionsMenu media={mediaActions} />
+                <ThreadMarkdownImageRequest
+                  key={props.uri}
+                  uri={props.uri}
+                  onLoad={setSourceSize}
+                  onError={() => setFailedUri(props.uri)}
+                />
               </View>
-            ) : null}
-          </View>
+            </Pressable>
+          </MediaActionsMenu>
         </PresentationSource>
       )}
       {props.alt ? (
@@ -658,10 +681,7 @@ function ThreadMediaVisibility(props: { readonly children: ReactNode }) {
   return <ThreadMediaVisibleContext value={visible}>{props.children}</ThreadMediaVisibleContext>;
 }
 
-function ThreadMarkdownVideo(props: {
-  readonly source: MediaVideoPreviewSource;
-  readonly onExpand: (source: MediaVideoPreviewSource) => void;
-}) {
+function ThreadMarkdownVideo(props: { readonly source: MediaVideoPreviewSource }) {
   const { source } = props;
   const visible = useContext(ThreadMediaVisibleContext);
   const thumbnailKey = mediaVideoThumbnailKey(source);
@@ -688,7 +708,6 @@ function ThreadMarkdownVideo(props: {
       thumbnailVisible={visible}
       unavailable={"resource" in source && asset._tag === "Failure"}
       actionsSource={source.actionsSource}
-      onExpand={() => props.onExpand(source)}
     />
   );
 }
@@ -1482,6 +1501,7 @@ function renderFeedEntry(
     readonly markdownStyles: MarkdownStyleSets;
     readonly reviewCommentColors: ReviewCommentColors;
     readonly reviewCommentBubbleWidth: number;
+    readonly themeAppearance: "light" | "dark";
     readonly userBubbleMaxWidth: number;
   },
 ) {
@@ -1519,12 +1539,16 @@ function renderFeedEntry(
   if (entry.type === "work-toggle") {
     return (
       <ThreadWorkGroupToggle
+        environmentId={props.environmentId}
         rowSizing={props.workRowSizing}
         expanded={entry.expanded}
         hiddenCount={entry.hiddenCount}
         iconSubtleColor={iconSubtleColor}
         summary={entry.summary}
         summaryKind={entry.summaryKind}
+        themeAppearance={props.themeAppearance}
+        toolSurface={entry.toolSurface}
+        toolIcon={entry.toolIcon}
         summaryToolIcon={entry.summaryToolIcon}
         hasFailure={entry.hasFailure}
         shimmer={entry.shimmer}
@@ -1593,6 +1617,7 @@ function renderFeedEntry(
                   environmentId={props.environmentId}
                   attachmentId={attachment.id}
                   name={attachment.name}
+                  mimeType={attachment.mimeType}
                   className="aspect-[1.3] w-full rounded-[14px] bg-white/15"
                   onPressPreview={props.onPressPreview}
                 />
@@ -1656,6 +1681,7 @@ function renderFeedEntry(
               environmentId={props.environmentId}
               attachmentId={attachment.id}
               name={attachment.name}
+              mimeType={attachment.mimeType}
               className="mt-1.5 aspect-[1.3] w-full rounded-[18px] bg-adaptive-neutral-200-800"
               onPressPreview={props.onPressPreview}
             />
@@ -1695,12 +1721,14 @@ function renderFeedEntry(
       // Anchors/details live in ThreadFeed and survive this group-only remount.
       key={`${entry.id}:${props.workRowSizing.textSizeKey}`}
       activities={entry.activities}
+      environmentId={props.environmentId}
       anchorKey={entry.id}
       copiedRowId={props.copiedRowId}
       expandedRows={props.expandedWorkRows}
       rowSizing={props.workRowSizing}
       scrollPositions={props.workGroupScrollPositions}
       iconSubtleColor={iconSubtleColor}
+      themeAppearance={props.themeAppearance}
       onCopyRow={props.onCopyWorkRow}
       onToggleRow={props.onToggleWorkRow}
       renderImage={props.renderViewedImage}
@@ -1980,6 +2008,7 @@ function ThreadFeedPlaceholder(props: {
 
 export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
   const navigation = useNavigation();
+  const { themeAppearance } = useAppearancePreferences();
   const copyFeedbackTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
   const disclosureSettleFrameRef = useRef<number | null>(null);
   const disclosureSettleSecondFrameRef = useRef<number | null>(null);
@@ -2218,7 +2247,6 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
           <ThreadMarkdownVideo
             key={image.href}
             source={{ ...media.source, name: image.alt ?? media.source.name }}
-            onExpand={(source) => setExpandedVideo((current) => current ?? source)}
           />
         );
       }
@@ -2299,6 +2327,7 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
       iconSubtleColor,
       markdownStyles,
       reviewCommentColors,
+      themeAppearance,
       userBubbleColor,
       viewportWidth,
     }),
@@ -2309,6 +2338,7 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
       iconSubtleColor,
       markdownStyles,
       reviewCommentColors,
+      themeAppearance,
       userBubbleColor,
       viewportWidth,
     ],
@@ -2667,12 +2697,8 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
     (attachment: ChatFileAttachment, sourceIdentifier: string) => {
       setExpandedVideo(
         (current) =>
-          current ?? {
-            type: "remote",
-            environmentId: props.environmentId,
-            attachment,
-            sourceIdentifier,
-          },
+          current ??
+          attachmentVideoPreviewSource(props.environmentId, attachment, sourceIdentifier),
       );
     },
     [props.environmentId],
@@ -2738,6 +2764,7 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
             markdownStyles,
             reviewCommentColors,
             reviewCommentBubbleWidth,
+            themeAppearance,
             userBubbleMaxWidth,
             skills: props.skills,
             onUseArtifactTemplate: props.onUseArtifactTemplate,
@@ -2758,6 +2785,7 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
       markdownStyles,
       reviewCommentColors,
       reviewCommentBubbleWidth,
+      themeAppearance,
       userBubbleMaxWidth,
       onCopyWorkRow,
       markdownLinkHandlers,
diff --git a/apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx b/apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx
index 4c4a91054eb6..c06eb2f6ce95 100644
--- a/apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx
+++ b/apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx
@@ -9,7 +9,7 @@ import {
 import { LegendList } from "@legendapp/list/react-native";
 import type { MenuAction } from "@react-native-menu/menu";
 import { useAtomValue } from "@effect/atom-react";
-import type { EnvironmentId } from "@t3tools/contracts";
+import { type EnvironmentId, resolveEnvironmentMachineKind } from "@t3tools/contracts";
 import { sortPinnedThreadsByOrderKey } from "@t3tools/client-runtime/state/thread-sort";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import type { LayoutChangeEvent } from "react-native";
@@ -442,6 +442,16 @@ function ThreadNavigationSidebarPane(
     }
     return supported;
   }, [serverConfigs]);
+  const machineByEnvironmentId = useMemo(
+    () =>
+      new Map(
+        [...serverConfigs].map(
+          ([environmentId, config]) =>
+            [environmentId, resolveEnvironmentMachineKind(config)] as const,
+        ),
+      ),
+    [serverConfigs],
+  );
   // Canonical arranged pinned order for Move up/down flags — computed from
   // all shells so search/scope filtering never disables a valid move.
   const arrangedPinnedKeys = useMemo(() => {
@@ -820,6 +830,9 @@ function ThreadNavigationSidebarPane(
                       ?.environmentLabel ?? null)
                   : null
               }
+              environmentMachine={machineByEnvironmentId.get(
+                item.pendingTask.message.environmentId,
+              )}
               pane="sidebar"
               showPendingDivider={item.showPendingDivider}
               onSelectPendingTask={openPendingTask}
@@ -854,6 +867,7 @@ function ThreadNavigationSidebarPane(
                   ? (savedConnectionsById[thread.environmentId]?.environmentLabel ?? null)
                   : null
               }
+              environmentMachine={machineByEnvironmentId.get(thread.environmentId)}
               searchMatch={threadSearchMatchByKey.get(
                 threadSearchMatchKey({
                   environmentId: thread.environmentId,
@@ -957,6 +971,9 @@ function ThreadNavigationSidebarPane(
                 savedConnectionsById[item.pendingTask.message.environmentId]?.environmentLabel ??
                 null
               }
+              environmentMachine={machineByEnvironmentId.get(
+                item.pendingTask.message.environmentId,
+              )}
               isLast={item.isLast}
               onSelectPendingTask={openPendingTask}
               onDeletePendingTask={confirmDeletePendingTask}
@@ -971,6 +988,7 @@ function ThreadNavigationSidebarPane(
               environmentLabel={
                 savedConnectionsById[thread.environmentId]?.environmentLabel ?? null
               }
+              environmentMachine={machineByEnvironmentId.get(thread.environmentId)}
               projectCwd={
                 projectCwdByKey.get(scopedProjectKey(thread.environmentId, thread.projectId)) ??
                 null
@@ -1018,6 +1036,7 @@ function ThreadNavigationSidebarPane(
       handleSelectThread,
       handleSwipeableClose,
       handleSwipeableWillOpen,
+      machineByEnvironmentId,
       movePinnedThread,
       openPendingTask,
       pinReorderEnvironmentIds,
diff --git a/apps/mobile/src/features/threads/thread-list-items.tsx b/apps/mobile/src/features/threads/thread-list-items.tsx
index df10e585aaad..dc5beea14d24 100644
--- a/apps/mobile/src/features/threads/thread-list-items.tsx
+++ b/apps/mobile/src/features/threads/thread-list-items.tsx
@@ -4,6 +4,7 @@ import type {
   EnvironmentThreadShell,
 } from "@t3tools/client-runtime/state/shell";
 import type { EnvironmentThreadSearchMatch } from "@t3tools/client-runtime/state/thread-search";
+import type { EnvironmentMachineKind } from "@t3tools/contracts";
 import type { MenuAction } from "@react-native-menu/menu";
 import { SymbolView } from "../../components/AppSymbol";
 import { memo, useCallback, useMemo, type ComponentProps } from "react";
@@ -14,6 +15,7 @@ import Svg, { Circle, Path } from "react-native-svg";
 
 import { AppText as Text } from "../../components/AppText";
 import { ControlPillMenu } from "../../components/ControlPill";
+import { EnvironmentMachineSymbol } from "../../components/EnvironmentMachineSymbol";
 import { ProjectFavicon } from "../../components/ProjectFavicon";
 import { cn } from "../../lib/cn";
 import { HOME_HORIZONTAL_INSET } from "../../lib/layoutMetrics";
@@ -268,14 +270,12 @@ export const PendingTaskListRow = memo(function PendingTaskListRow(props: {
   readonly variant: ThreadListVariant;
   readonly pendingTask: PendingNewTask;
   readonly environmentLabel: string | null;
+  readonly environmentMachine?: EnvironmentMachineKind;
   readonly isLast: boolean;
   readonly onSelectPendingTask: (pendingTask: PendingNewTask) => void;
   readonly onDeletePendingTask: (pendingTask: PendingNewTask) => void;
 }) {
   const compact = props.variant === "compact";
-  const theme = useUniwindTheme();
-  const separatorColor = theme["--color-separator"];
-  const pressedBackgroundColor = theme["--color-subtle"];
 
   const { pendingTask, onSelectPendingTask, onDeletePendingTask } = props;
   const timestamp = relativeTime(pendingTask.message.createdAt);
@@ -305,6 +305,13 @@ export const PendingTaskListRow = memo(function PendingTaskListRow(props: {
           tintColorClassName={compact ? "accent-icon-subtle" : "accent-foreground-muted"}
           type="monochrome"
         />
+        {props.environmentLabel && props.environmentMachine ? (
+          <EnvironmentMachineSymbol
+            kind={props.environmentMachine}
+            size={compact ? 12 : 10}
+            tintColorClassName={compact ? "accent-icon-subtle" : "accent-foreground-muted"}
+          />
+        ) : null}
         <Text
           className={
             compact
@@ -323,25 +330,11 @@ export const PendingTaskListRow = memo(function PendingTaskListRow(props: {
       accessibilityHint="Opens the queued task for editing"
       accessibilityLabel={pendingTask.title}
       accessibilityRole="button"
-      className="bg-screen"
+      className="bg-screen active:opacity-70"
       onPress={() => onSelectPendingTask(pendingTask)}
-      style={({ pressed }) => ({ opacity: pressed ? 0.7 : 1 })}
     >
-      <View
-        style={{
-          paddingLeft: THREAD_LIST_COMPACT_INSET,
-          paddingRight: 18,
-          paddingTop: 10,
-        }}
-      >
-        <View
-          style={{
-            gap: 3,
-            borderBottomWidth: props.isLast ? 0 : 1,
-            borderBottomColor: separatorColor,
-            paddingBottom: 10,
-          }}
-        >
+      <View className="pr-[18px] pt-[10px]" style={{ paddingLeft: THREAD_LIST_COMPACT_INSET }}>
+        <View className={cn("gap-[3px] pb-[10px]", !props.isLast && "border-b border-separator")}>
           <View className="flex-row items-center justify-between gap-2">
             <Text className="flex-1 text-lg font-t3-bold text-foreground" numberOfLines={1}>
               {pendingTask.title}
@@ -366,16 +359,16 @@ export const PendingTaskListRow = memo(function PendingTaskListRow(props: {
       accessibilityHint="Opens the queued task for editing"
       accessibilityLabel={pendingTask.title}
       accessibilityRole="button"
+      className="active:bg-subtle"
       onPress={() => onSelectPendingTask(pendingTask)}
-      style={({ pressed }) => ({
-        backgroundColor: pressed ? pressedBackgroundColor : "transparent",
+      style={{
         borderRadius: SIDEBAR_ROW_RADIUS,
         cursor: "pointer",
         minHeight: 64,
         justifyContent: "center",
         paddingHorizontal: 12,
         paddingVertical: 10,
-      })}
+      }}
     >
       <View className="gap-[3px]">
         <View className="flex-row items-center justify-between gap-2">
@@ -416,6 +409,7 @@ export const ThreadListRow = memo(function ThreadListRow(props: {
   readonly variant: ThreadListVariant;
   readonly thread: EnvironmentThreadShell;
   readonly environmentLabel: string | null;
+  readonly environmentMachine?: EnvironmentMachineKind;
   readonly projectCwd: string | null;
   readonly searchMatch?: EnvironmentThreadSearchMatch;
   readonly searchQuery?: string;
@@ -444,7 +438,6 @@ export const ThreadListRow = memo(function ThreadListRow(props: {
   const [hovered, setHovered] = useRecyclingState(false);
 
   const theme = useUniwindTheme();
-  const separatorColor = theme["--color-separator"];
   const screenColor = theme["--color-screen"];
   const drawerColor = theme["--color-drawer"];
   const pressedBackgroundColor = theme["--color-subtle"];
@@ -524,6 +517,19 @@ export const ThreadListRow = memo(function ThreadListRow(props: {
       <View className="mt-px flex-row items-center gap-1.5">
         {subtitleParts.length > 0 ? (
           <>
+            {props.environmentLabel && props.environmentMachine ? (
+              <EnvironmentMachineSymbol
+                kind={props.environmentMachine}
+                size={compact ? 12 : 10}
+                tintColorClassName={
+                  compact
+                    ? "accent-icon-subtle"
+                    : selected
+                      ? "accent-user-bubble-foreground-muted"
+                      : "accent-foreground-muted"
+                }
+              />
+            ) : null}
             <Text
               className={cn(
                 "shrink",
@@ -565,28 +571,14 @@ export const ThreadListRow = memo(function ThreadListRow(props: {
         accessibilityHint="Swipe left for archive and delete actions"
         accessibilityLabel={threadAccessibilityLabel}
         accessibilityRole="button"
-        className="bg-screen"
+        className="bg-screen active:opacity-70"
         onPress={() => {
           close();
           onSelectThread(thread);
         }}
-        style={({ pressed }) => ({ opacity: pressed ? 0.7 : 1 })}
       >
-        <View
-          style={{
-            paddingLeft: THREAD_LIST_COMPACT_INSET,
-            paddingRight: 18,
-            paddingTop: 10,
-          }}
-        >
-          <View
-            style={{
-              gap: 3,
-              borderBottomWidth: props.isLast ? 0 : 1,
-              borderBottomColor: separatorColor,
-              paddingBottom: 10,
-            }}
-          >
+        <View className="pr-[18px] pt-[10px]" style={{ paddingLeft: THREAD_LIST_COMPACT_INSET }}>
+          <View className={cn("gap-[3px] pb-[10px]", !props.isLast && "border-b border-separator")}>
             <View className="flex-row items-center justify-between gap-2">
               <Text className="flex-1 text-lg font-t3-bold text-foreground" numberOfLines={1}>
                 {thread.title}
diff --git a/apps/mobile/src/features/threads/thread-list-v2-items.tsx b/apps/mobile/src/features/threads/thread-list-v2-items.tsx
index 2403eb02544b..38c7ca04a758 100644
--- a/apps/mobile/src/features/threads/thread-list-v2-items.tsx
+++ b/apps/mobile/src/features/threads/thread-list-v2-items.tsx
@@ -3,6 +3,7 @@ import type {
   EnvironmentThreadShell,
 } from "@t3tools/client-runtime/state/shell";
 import type { EnvironmentThreadSearchMatch } from "@t3tools/client-runtime/state/thread-search";
+import type { EnvironmentMachineKind } from "@t3tools/contracts";
 import { canSnooze, resolveSnoozePresets } from "@t3tools/client-runtime/state/thread-settled";
 import { resolveSettledThreadTimestamp } from "@t3tools/client-runtime/state/thread-sort";
 import type { MenuAction } from "@react-native-menu/menu";
@@ -13,6 +14,7 @@ import type { SwipeableMethods } from "react-native-gesture-handler/ReanimatedSw
 import { SymbolView } from "../../components/AppSymbol";
 import { AppText as Text } from "../../components/AppText";
 import { ControlPillMenu } from "../../components/ControlPill";
+import { EnvironmentMachineSymbol } from "../../components/EnvironmentMachineSymbol";
 import { ProjectFavicon } from "../../components/ProjectFavicon";
 import { ProviderIcon } from "../../components/ProviderIcon";
 import { cn } from "../../lib/cn";
@@ -201,6 +203,8 @@ export const ThreadListV2PendingRow = memo(function ThreadListV2PendingRow(props
   readonly project: EnvironmentProject | null;
   readonly projectTitle?: string;
   readonly environmentLabel: string | null;
+  /** Drawn beside the label; ignored while the label is null. */
+  readonly environmentMachine?: EnvironmentMachineKind;
   readonly pane?: "screen" | "sidebar";
   /** Draws the "Pending" divider above the first queued row. */
   readonly showPendingDivider: boolean;
@@ -210,9 +214,6 @@ export const ThreadListV2PendingRow = memo(function ThreadListV2PendingRow(props
   readonly onDeletePendingTask: (pendingTask: PendingNewTask) => void;
 }) {
   const { pendingTask, onSelectPendingTask, onDeletePendingTask } = props;
-  const theme = useUniwindTheme();
-  const drawerColor = theme["--color-drawer"];
-  const pressedBackgroundColor = theme["--color-subtle"];
   const sidebarPane = props.pane === "sidebar";
   const projectTitle =
     props.projectTitle ?? props.project?.title ?? pendingTask.creation.projectTitle ?? "";
@@ -249,17 +250,26 @@ export const ThreadListV2PendingRow = memo(function ThreadListV2PendingRow(props
         {pendingTask.title}
       </Text>
       {branch || props.environmentLabel ? (
-        <Text className="mt-1 text-xs text-foreground-muted" numberOfLines={1}>
-          {branch ? (
-            <Text className="text-xs text-foreground-muted" style={{ fontFamily: MONO_FONT }}>
-              {branch}
-            </Text>
-          ) : null}
-          {branch && props.environmentLabel ? "  ·  " : null}
-          {props.environmentLabel ? (
-            <Text className="text-xs text-foreground-tertiary">{props.environmentLabel}</Text>
+        <View className="mt-1 flex-row items-center gap-1">
+          <Text className="shrink text-xs text-foreground-muted" numberOfLines={1}>
+            {branch ? (
+              <Text className="text-xs text-foreground-muted" style={{ fontFamily: MONO_FONT }}>
+                {branch}
+              </Text>
+            ) : null}
+            {branch && props.environmentLabel ? "  ·  " : null}
+            {props.environmentLabel ? (
+              <Text className="text-xs text-foreground-tertiary">{props.environmentLabel}</Text>
+            ) : null}
+          </Text>
+          {props.environmentLabel && props.environmentMachine ? (
+            <EnvironmentMachineSymbol
+              kind={props.environmentMachine}
+              size={11}
+              tintColorClassName="accent-foreground-tertiary"
+            />
           ) : null}
-        </Text>
+        </View>
       ) : null}
     </>
   );
@@ -278,15 +288,15 @@ export const ThreadListV2PendingRow = memo(function ThreadListV2PendingRow(props
           accessibilityHint="Opens the queued task for editing"
           accessibilityLabel={pendingTask.title}
           accessibilityRole="button"
+          className={sidebarPane ? "bg-drawer active:bg-subtle" : undefined}
           onPress={() => onSelectPendingTask(pendingTask)}
           style={
             sidebarPane
-              ? ({ pressed }) => ({
-                  backgroundColor: pressed ? pressedBackgroundColor : drawerColor,
+              ? {
                   borderRadius: SIDEBAR_V2_ROW_RADIUS,
                   paddingHorizontal: 12,
                   paddingVertical: 10,
-                })
+                }
               : ({ pressed }) => ({ opacity: pressed ? 0.7 : 1 })
           }
         >
@@ -327,6 +337,9 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
       the web sidebar's remote-environment cloud icon, but as text since
       phones have no hover tooltips. */
   readonly environmentLabel: string | null;
+  /** Drawn after the label so the machine reads at a glance; ignored while
+      the label is null. */
+  readonly environmentMachine?: EnvironmentMachineKind;
   /** Hosting surface. "screen" (default) renders the compact Home idiom:
       flat edge-to-edge rows on the screen background with inset hairlines.
       "sidebar" renders the iPad split-view idiom: rounded rows blending
@@ -767,6 +780,15 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
         ) : (
           <View className="flex-1" />
         )}
+        {status !== "failed" && props.environmentLabel && props.environmentMachine ? (
+          <EnvironmentMachineSymbol
+            kind={props.environmentMachine}
+            size={11}
+            tintColorClassName={
+              selected ? "accent-user-bubble-foreground-muted" : "accent-foreground-tertiary"
+            }
+          />
+        ) : null}
         {pr ? (
           <Text
             accessibilityLabel={pr.accessibilityLabel}
diff --git a/apps/mobile/src/features/threads/thread-work-log.tsx b/apps/mobile/src/features/threads/thread-work-log.tsx
index a9472450b9b7..431258e0d518 100644
--- a/apps/mobile/src/features/threads/thread-work-log.tsx
+++ b/apps/mobile/src/features/threads/thread-work-log.tsx
@@ -1,4 +1,5 @@
 import * as Haptics from "expo-haptics";
+import { Image } from "expo-image";
 import { type AppSymbolName, SymbolView } from "../../components/AppSymbol";
 import { MaskedView } from "@expo/ui/community/masked-view";
 import type { LegendListRef } from "@legendapp/list/react-native";
@@ -26,6 +27,8 @@ import {
   View,
 } from "react-native";
 import Svg, { Defs, LinearGradient, Rect, Stop } from "react-native-svg";
+import type { EnvironmentId, ToolActivityIcon } from "@t3tools/contracts";
+import { toolActivityFaviconUrl } from "@t3tools/shared/favicon";
 
 import { AppText as Text } from "../../components/AppText";
 import { T3Wordmark } from "../../components/T3Wordmark";
@@ -58,6 +61,7 @@ import Animated, {
   withSequence,
   withTiming,
 } from "react-native-reanimated";
+import { useAssetUrl } from "../../state/assets";
 
 const SHIMMER_WIDTH = 72;
 const SHIMMER_SWEEP_MS = 1_350;
@@ -134,17 +138,28 @@ export function ThreadDisclosureChevron(props: {
 }
 
 function ShimmerWorkContent(props: {
+  readonly environmentId?: EnvironmentId;
   readonly highlighted: boolean;
   readonly icon: WorkContentIcon;
   readonly iconSubtleColor: ColorValue;
   readonly label: string;
   readonly onTextLayout?: ComponentProps<typeof Text>["onTextLayout"];
   readonly showIcon: boolean;
+  readonly themeAppearance?: "light" | "dark";
+  readonly toolIcon?: ToolActivityIcon;
 }) {
   return (
     <View className="flex-row items-center gap-1.5">
       <View className="h-6 w-6 shrink-0 items-center justify-center">
-        {props.showIcon ? (
+        {props.showIcon && props.toolIcon && props.environmentId ? (
+          <ToolActivityIconView
+            environmentId={props.environmentId}
+            icon={props.toolIcon}
+            fallback={props.icon}
+            fallbackColor={props.iconSubtleColor}
+            themeAppearance={props.themeAppearance ?? "light"}
+          />
+        ) : props.showIcon ? (
           <WorkLogIcon
             icon={props.icon}
             color={props.iconSubtleColor}
@@ -167,10 +182,13 @@ function ShimmerWorkContent(props: {
 }
 
 export function ShimmeringWorkContent(props: {
+  readonly environmentId?: EnvironmentId;
   readonly icon: WorkContentIcon;
   readonly iconSubtleColor: ColorValue;
   readonly label: string;
   readonly showIcon: boolean;
+  readonly themeAppearance?: "light" | "dark";
+  readonly toolIcon?: ToolActivityIcon;
 }) {
   const [availableWidth, setAvailableWidth] = useState(0);
   const [textWidth, setTextWidth] = useState(0);
@@ -235,11 +253,14 @@ export function ShimmeringWorkContent(props: {
       onLayout={(event) => setAvailableWidth(event.nativeEvent.layout.width)}
     >
       <ShimmerWorkContent
+        environmentId={props.environmentId}
         highlighted={false}
         icon={props.icon}
         iconSubtleColor={props.iconSubtleColor}
         label={props.label}
         showIcon={props.showIcon}
+        themeAppearance={props.themeAppearance}
+        toolIcon={props.toolIcon}
         onTextLayout={(event) => setTextWidth(event.nativeEvent.lines[0]?.width ?? 0)}
       />
       {!reducedMotion && appIsActive && screenIsFocused && contentWidth > 0 ? (
@@ -272,11 +293,14 @@ export function ShimmeringWorkContent(props: {
           >
             <Animated.View style={[{ width: availableWidth }, counterSweepStyle]}>
               <ShimmerWorkContent
+                environmentId={props.environmentId}
                 highlighted
                 icon={props.icon}
                 iconSubtleColor={props.iconSubtleColor}
                 label={props.label}
                 showIcon={props.showIcon}
+                themeAppearance={props.themeAppearance}
+                toolIcon={props.toolIcon}
               />
             </Animated.View>
           </MaskedView>
@@ -307,10 +331,14 @@ function workRowSymbolName(icon: ThreadFeedActivity["icon"]): AppSymbolName {
       return { ios: "sparkles", android: "auto_awesome" };
     case "alert":
       return { ios: "exclamationmark.triangle", android: "error" };
+    case "browser":
+      return { ios: "safari", android: "public" };
     case "check":
       return { ios: "checkmark", android: "check" };
     case "command":
       return { ios: "terminal", android: "terminal" };
+    case "computer":
+      return { ios: "desktopcomputer", android: "desktop_windows" };
     case "edit":
       return { ios: "square.and.pencil", android: "edit" };
     case "eye":
@@ -369,11 +397,13 @@ export function collapsedWorkLogHeight(activities: ReadonlyArray<ThreadFeedActiv
 interface ThreadWorkLogProps {
   readonly activities: ReadonlyArray<ThreadFeedActivity>;
   readonly anchorKey: string;
+  readonly environmentId: EnvironmentId;
   readonly copiedRowId: string | null;
   readonly expandedRows: Readonly<Record<string, boolean>>;
   readonly rowSizing: ReturnType<typeof deriveThreadWorkLogSizing>;
   readonly scrollPositions: Map<string, ThreadWorkGroupScrollPosition>;
   readonly iconSubtleColor: ColorValue;
+  readonly themeAppearance: "light" | "dark";
   readonly onCopyRow: (rowId: string, value: string) => void;
   readonly onToggleRow: (rowId: string, anchorKey: string) => void;
   readonly renderImage: MarkdownImageRenderer;
@@ -388,20 +418,24 @@ export function ThreadWorkLog(props: ThreadWorkLogProps) {
         anchorKey={props.anchorKey}
         copied={props.copiedRowId === row.id}
         expanded={props.expandedRows[row.id] ?? false}
+        environmentId={props.environmentId}
         iconSubtleColor={props.iconSubtleColor}
         onCopyRow={props.onCopyRow}
         onToggleRow={props.onToggleRow}
         renderImage={props.renderImage}
+        themeAppearance={props.themeAppearance}
       />
     ),
     [
       props.anchorKey,
       props.copiedRowId,
       props.expandedRows,
+      props.environmentId,
       props.iconSubtleColor,
       props.onCopyRow,
       props.onToggleRow,
       props.renderImage,
+      props.themeAppearance,
     ],
   );
 
@@ -638,7 +672,10 @@ function ThreadWorkGroupList(props: {
         scrollsToTop={false}
         bounces={false}
         keyboardShouldPersistTaps="handled"
-        style={StyleSheet.absoluteFill}
+        // MaskedView bridges through a native host whose absolute-fill bounds
+        // can lag behind a resize. Keep the list's viewport at the group's
+        // current height when expanding details or appending calls.
+        style={[StyleSheet.absoluteFill, { height }]}
       />
     </MaskedView>
   );
@@ -669,7 +706,12 @@ const ThreadWorkLogRow = memo(function ThreadWorkLogRow(
     !toolPresentation && expanded && row.workEntry.command?.trim() ? "Command" : previewText;
   const iconIsDestructive = row.icon === "alert" || row.icon === "warning";
   const failed = row.status === "failure";
-  const icon = toolPresentation?.icon ?? (failed ? "xmark" : workRowSymbolName(row.icon));
+  const toolIcon = row.workEntry.toolIcon ?? row.workEntry.toolSource?.icon;
+  const hasSpecialToolIcon =
+    toolPresentation !== null || row.workEntry.toolSurface !== undefined || toolIcon !== undefined;
+  const icon =
+    toolPresentation?.icon ??
+    (failed && !hasSpecialToolIcon ? "xmark" : workRowSymbolName(row.icon));
 
   return (
     <Animated.View
@@ -697,18 +739,31 @@ const ThreadWorkLogRow = memo(function ThreadWorkLogRow(
         <View className="min-h-8 flex-row items-center gap-1.5">
           {row.live ? (
             <ShimmeringWorkContent
+              environmentId={props.environmentId}
               icon={icon}
               iconSubtleColor={props.iconSubtleColor}
               label={displayText}
               showIcon
+              themeAppearance={props.themeAppearance}
+              toolIcon={toolIcon}
             />
           ) : (
             <>
               <View className="h-6 w-6 shrink-0 items-center justify-center">
-                <WorkLogIcon
-                  icon={icon}
-                  color={iconIsDestructive ? "#e11d48" : props.iconSubtleColor}
-                />
+                {failed && !hasSpecialToolIcon ? (
+                  <WorkLogIcon
+                    icon={icon}
+                    color={iconIsDestructive ? "#e11d48" : props.iconSubtleColor}
+                  />
+                ) : (
+                  <ToolActivityIconView
+                    environmentId={props.environmentId}
+                    icon={toolIcon}
+                    fallback={icon}
+                    fallbackColor={props.iconSubtleColor}
+                    themeAppearance={props.themeAppearance}
+                  />
+                )}
               </View>
               <Text
                 className={cn(
@@ -728,7 +783,7 @@ const ThreadWorkLogRow = memo(function ThreadWorkLogRow(
                 Copied
               </Text>
             ) : null}
-            {failed && toolPresentation ? (
+            {failed && hasSpecialToolIcon ? (
               <View
                 className="h-4 w-4 items-center justify-center"
                 accessibilityElementsHidden
@@ -786,6 +841,7 @@ const ThreadWorkLogRow = memo(function ThreadWorkLogRow(
 });
 
 export function ThreadWorkGroupToggle(props: {
+  readonly environmentId: EnvironmentId;
   readonly rowSizing: ReturnType<typeof deriveThreadWorkLogSizing>;
   readonly expanded: boolean;
   readonly hiddenCount: number;
@@ -793,6 +849,9 @@ export function ThreadWorkGroupToggle(props: {
   readonly summary: string;
   readonly summaryKind: ToolGroupSummaryKind;
   readonly summaryToolIcon?: "browser" | "t3-code";
+  readonly themeAppearance: "light" | "dark";
+  readonly toolSurface?: import("@t3tools/contracts").ToolActivitySurface;
+  readonly toolIcon?: ToolActivityIcon;
   readonly hasFailure: boolean;
   readonly shimmer: boolean;
   readonly onToggle: () => void;
@@ -800,7 +859,11 @@ export function ThreadWorkGroupToggle(props: {
   const accessibilityLabel = props.hasFailure
     ? `${props.summary}, tool call failed`
     : props.summary;
-  const icon = props.summaryToolIcon ?? toolGroupSummarySymbolName(props.summaryKind);
+  const icon =
+    props.summaryToolIcon ??
+    (props.toolSurface
+      ? workRowSymbolName(props.toolSurface)
+      : toolGroupSummarySymbolName(props.summaryKind));
 
   return (
     <View className="-mx-1 px-1 py-0">
@@ -820,15 +883,24 @@ export function ThreadWorkGroupToggle(props: {
         {props.shimmer ? (
           <ShimmeringWorkContent
             key={props.rowSizing.textSizeKey}
+            environmentId={props.environmentId}
             icon={icon}
             iconSubtleColor={props.iconSubtleColor}
             label={props.summary}
             showIcon
+            themeAppearance={props.themeAppearance}
+            toolIcon={props.toolIcon}
           />
         ) : (
           <>
             <View className="h-6 w-6 items-center justify-center">
-              <WorkLogIcon icon={icon} color={props.iconSubtleColor} />
+              <ToolActivityIconView
+                environmentId={props.environmentId}
+                icon={props.toolIcon}
+                fallback={icon}
+                fallbackColor={props.iconSubtleColor}
+                themeAppearance={props.themeAppearance}
+              />
             </View>
             <Text
               key={props.rowSizing.textSizeKey}
@@ -850,6 +922,112 @@ export function ThreadWorkGroupToggle(props: {
   );
 }
 
+function ToolActivityIconView(props: {
+  readonly environmentId: EnvironmentId;
+  readonly icon?: ToolActivityIcon;
+  readonly fallback: WorkContentIcon;
+  readonly fallbackColor: ColorValue;
+  readonly themeAppearance: "light" | "dark";
+}) {
+  if (!props.icon) {
+    return <WorkLogIcon icon={props.fallback} color={props.fallbackColor} />;
+  }
+  if (props.icon._tag === "website") {
+    const source = toolActivityFaviconUrl(props.icon, props.themeAppearance, 32);
+    return source ? (
+      <ToolActivityImage
+        key={source}
+        source={source}
+        fallback={props.fallback}
+        color={props.fallbackColor}
+        themeAppearance={props.themeAppearance}
+      />
+    ) : (
+      <WorkLogIcon icon={props.fallback} color={props.fallbackColor} />
+    );
+  }
+  if (props.icon._tag === "themed-logo") {
+    const source =
+      props.themeAppearance === "dark"
+        ? (props.icon.logoUrlDark ?? props.icon.logoUrl)
+        : props.icon.logoUrl;
+    return (
+      <ToolActivityImage
+        key={source}
+        source={source}
+        fallback={props.fallback}
+        color={props.fallbackColor}
+        themeAppearance={props.themeAppearance}
+      />
+    );
+  }
+  return (
+    <NativeAppToolActivityIcon
+      environmentId={props.environmentId}
+      app={props.icon.app}
+      fallback={props.fallback}
+      color={props.fallbackColor}
+      themeAppearance={props.themeAppearance}
+    />
+  );
+}
+
+function NativeAppToolActivityIcon(props: {
+  readonly environmentId: EnvironmentId;
+  readonly app: Extract<ToolActivityIcon, { readonly _tag: "native-app" }>["app"];
+  readonly fallback: WorkContentIcon;
+  readonly color: ColorValue;
+  readonly themeAppearance: "light" | "dark";
+}) {
+  const source = useAssetUrl(props.environmentId, {
+    _tag: "native-app-icon",
+    app: props.app,
+  });
+  return source ? (
+    <ToolActivityImage
+      key={source}
+      source={source}
+      fallback={props.fallback}
+      color={props.color}
+      themeAppearance={props.themeAppearance}
+    />
+  ) : (
+    <WorkLogIcon icon={props.fallback} color={props.color} />
+  );
+}
+
+function ToolActivityImage(props: {
+  readonly source: string;
+  readonly fallback: WorkContentIcon;
+  readonly color: ColorValue;
+  readonly themeAppearance: "light" | "dark";
+}) {
+  const [loaded, setLoaded] = useState(false);
+  const [failed, setFailed] = useState(false);
+  return (
+    <View className="h-4 w-4 items-center justify-center overflow-hidden rounded-[3px] bg-background">
+      {!loaded || failed ? <WorkLogIcon icon={props.fallback} color={props.color} /> : null}
+      {!failed ? (
+        <View
+          style={[
+            StyleSheet.absoluteFill,
+            props.themeAppearance === "light" ? { filter: [{ brightness: 0.6 }] } : undefined,
+          ]}
+        >
+          <Image
+            source={props.source}
+            cachePolicy="memory-disk"
+            contentFit="contain"
+            style={[StyleSheet.absoluteFill, { opacity: loaded ? 0.7 : 0 }]}
+            onLoad={() => setLoaded(true)}
+            onError={() => setFailed(true)}
+          />
+        </View>
+      ) : null}
+    </View>
+  );
+}
+
 function toolGroupSummarySymbolName(kind: ToolGroupSummaryKind): AppSymbolName {
   switch (kind) {
     case "read":
diff --git a/apps/mobile/src/features/threads/threadListV2.ts b/apps/mobile/src/features/threads/threadListV2.ts
index f17b46b1d18b..2b44851f9309 100644
--- a/apps/mobile/src/features/threads/threadListV2.ts
+++ b/apps/mobile/src/features/threads/threadListV2.ts
@@ -255,25 +255,21 @@ export function buildThreadListV2ListItems(input: {
   readonly settledShelfHeaderIndex?: number | null;
   readonly snoozeLabelNow?: string;
 }): ThreadListV2ListItem[] {
-  const threadItems = input.items.map(
-    (item): ThreadListV2ListItem => ({
-      type: "v2-thread",
-      key: `v2-thread:${item.thread.environmentId}:${item.thread.id}`,
-      item,
-      snoozeWakeLabelText:
-        item.snoozed && item.thread.snoozedUntil != null && input.snoozeLabelNow !== undefined
-          ? snoozeWakeLabel(item.thread.snoozedUntil, { now: input.snoozeLabelNow })
-          : undefined,
-    }),
-  );
-  const pendingItems = input.pendingTasks.map(
-    (pendingTask, index): ThreadListV2ListItem => ({
-      type: "v2-pending",
-      key: `v2-pending:${pendingTask.message.messageId}`,
-      pendingTask,
-      showPendingDivider: index === 0,
-    }),
-  );
+  const threadItems = input.items.map((item): ThreadListV2ListItem => ({
+    type: "v2-thread",
+    key: `v2-thread:${item.thread.environmentId}:${item.thread.id}`,
+    item,
+    snoozeWakeLabelText:
+      item.snoozed && item.thread.snoozedUntil != null && input.snoozeLabelNow !== undefined
+        ? snoozeWakeLabel(item.thread.snoozedUntil, { now: input.snoozeLabelNow })
+        : undefined,
+  }));
+  const pendingItems = input.pendingTasks.map((pendingTask, index): ThreadListV2ListItem => ({
+    type: "v2-pending",
+    key: `v2-pending:${pendingTask.message.messageId}`,
+    pendingTask,
+    showPendingDivider: index === 0,
+  }));
   const snoozedCount = input.snoozedCount ?? 0;
   const snoozedShelfHeaderIndex = input.snoozedShelfHeaderIndex ?? null;
   const settledCount = input.settledCount ?? 0;
diff --git a/apps/mobile/src/features/threads/use-thread-list-v2-shelf-preferences.ts b/apps/mobile/src/features/threads/use-thread-list-v2-shelf-preferences.ts
index d45993364721..8ffab4e045b4 100644
--- a/apps/mobile/src/features/threads/use-thread-list-v2-shelf-preferences.ts
+++ b/apps/mobile/src/features/threads/use-thread-list-v2-shelf-preferences.ts
@@ -14,9 +14,9 @@ export function useThreadListV2ShelfPreferences() {
   const savePreferences = useAtomSet(updateMobilePreferencesAtom);
   const loaded = AsyncResult.isSuccess(preferencesResult);
   const snoozedShelfExpanded =
-    loaded && preferencesResult.value.threadListV2SnoozedShelfExpanded === true;
+    loaded && preferencesResult.value.threadListSnoozedShelfExpanded === true;
   const settledShelfExpanded =
-    !loaded || preferencesResult.value.threadListV2SettledShelfExpanded !== false;
+    loaded && preferencesResult.value.threadListSettledShelfExpanded === true;
   const snoozedShelfExpandedRef = useRef(snoozedShelfExpanded);
   const settledShelfExpandedRef = useRef(settledShelfExpanded);
   snoozedShelfExpandedRef.current = snoozedShelfExpanded;
@@ -26,13 +26,13 @@ export function useThreadListV2ShelfPreferences() {
     if (!loaded) return;
     const expanded = !snoozedShelfExpandedRef.current;
     snoozedShelfExpandedRef.current = expanded;
-    savePreferences({ threadListV2SnoozedShelfExpanded: expanded });
+    savePreferences({ threadListSnoozedShelfExpanded: expanded });
   }, [loaded, savePreferences]);
   const toggleSettledShelf = useCallback(() => {
     if (!loaded) return;
     const expanded = !settledShelfExpandedRef.current;
     settledShelfExpandedRef.current = expanded;
-    savePreferences({ threadListV2SettledShelfExpanded: expanded });
+    savePreferences({ threadListSettledShelfExpanded: expanded });
   }, [loaded, savePreferences]);
 
   return {
diff --git a/apps/mobile/src/lib/markdownMedia.test.ts b/apps/mobile/src/lib/markdownMedia.test.ts
index 77834630dc2f..1d7320eb0670 100644
--- a/apps/mobile/src/lib/markdownMedia.test.ts
+++ b/apps/mobile/src/lib/markdownMedia.test.ts
@@ -61,6 +61,17 @@ describe("resolveMarkdownMediaPreview", () => {
     });
   });
 
+  it("serves a linked T3 attachment file in place like any other host path", () => {
+    const path = "/home/demo/.t3/userdata/attachments/11111111-1111-4111-8111-111111111111-mp4.mp4";
+    expect(resolveMarkdownMediaPreview(path, input)).toMatchObject({
+      kind: "video",
+      source: {
+        resource: { _tag: "media-file", threadId: input.threadId, path },
+        actionsSource: { resource: { _tag: "media-file", path } },
+      },
+    });
+  });
+
   it("resolves protocol-relative media for native APIs without rewriting its signed query", () => {
     expect(
       resolveMarkdownMediaPreview("//cdn.example.com/clip.mp4?signature=a%2fb#t=2", input),
diff --git a/apps/mobile/src/lib/markdownMedia.ts b/apps/mobile/src/lib/markdownMedia.ts
index 2196c2f22f2b..b1b616f0e442 100644
--- a/apps/mobile/src/lib/markdownMedia.ts
+++ b/apps/mobile/src/lib/markdownMedia.ts
@@ -1,15 +1,6 @@
-import {
-  classifyMarkdownImageSource,
-  markdownImageSourceFragment,
-} from "@t3tools/client-runtime/markdown-images";
+import { resolveMediaSource } from "@t3tools/client-runtime/media-source";
 import type { EnvironmentId, ThreadId } from "@t3tools/contracts";
 import { normalizeNativeMarkdownUrl } from "@t3tools/mobile-markdown-text/links";
-import { mediaMimeType, mediaMimeTypeFromExtension } from "@t3tools/shared/filePreview";
-import {
-  mediaFileReference,
-  mediaReferenceFileName,
-  mediaUrlReference,
-} from "@t3tools/client-runtime/media-reference";
 
 import type { FilePreviewSource } from "../components/FilePreviewModal";
 import type { MediaVideoPreviewSource } from "./videoPreviewSource";
@@ -29,61 +20,30 @@ export function resolveMarkdownMediaPreview(
   | { readonly kind: "image"; readonly source: FilePreviewSource }
   | { readonly kind: "video"; readonly source: MediaVideoPreviewSource }
   | null {
-  const classified = classifyMarkdownImageSource(href, input.workspaceRoot);
-  if (classified._tag === "Blocked") return null;
-  const path =
-    classified._tag === "WorkspaceFile"
-      ? classified.path.replace(/:\d+(?::\d+)?$/, "")
-      : classified.uri.split(/[?#]/, 1)[0]!;
-  const basename = path.split(/[\\/]/).at(-1) ?? "";
-  const extensionIndex = basename.lastIndexOf(".");
-  // Local paths have already been decoded. Do not interpret literal #, ?, or % characters again.
-  const detectedMimeType =
-    classified._tag === "Direct"
-      ? mediaMimeType(classified.uri)
-      : extensionIndex < 0
-        ? null
-        : mediaMimeTypeFromExtension(basename.slice(extensionIndex));
-  const mimeType = detectedMimeType ?? (input.imageEmbed ? "image/*" : null);
-  if (mimeType === null) return null;
-  const kind = mimeType.startsWith("video/") ? "video" : "image";
-  const reference =
-    classified._tag === "Direct"
-      ? mediaUrlReference(classified.uri)
-      : mediaFileReference(path, input.workspaceRoot);
-  const name =
-    (reference && mediaReferenceFileName(reference)) || (kind === "video" ? "Video" : "Image");
-  const srcFragment = markdownImageSourceFragment(href);
+  const media = resolveMediaSource(href, input);
+  if (media === null || media.access === "unavailable") return null;
+  const { kind, name, mimeType, reference, srcFragment } = media;
+
   const target =
-    classified._tag === "Direct"
-      ? { uri: normalizeNativeMarkdownUrl(classified.uri) }
+    media.access === "direct"
+      ? { uri: normalizeNativeMarkdownUrl(media.uri) }
       : {
           environmentId: input.environmentId,
-          resource: {
-            _tag: "media-file" as const,
-            threadId: input.threadId,
-            path,
-          },
+          resource: media.resource,
           ...(srcFragment ? { srcFragment } : {}),
         };
   const actionsSource: MediaActionsSource =
-    classified._tag === "Direct"
-      ? { reference, uri: classified.uri, name, mimeType }
+    media.access === "direct"
+      ? { reference, uri: media.uri, name, mimeType }
       : {
           reference,
           environmentId: input.environmentId,
           threadId: input.threadId,
-          resource: { _tag: "media-file", threadId: input.threadId, path },
+          resource: media.resource,
           name,
           mimeType,
         };
   return kind === "video"
-    ? {
-        kind,
-        source: { type: "media", name, mimeType, ...target, actionsSource },
-      }
-    : {
-        kind,
-        source: { kind, name, ...target, actionsSource },
-      };
+    ? { kind, source: { type: "media", name, mimeType, ...target, actionsSource } }
+    : { kind, source: { kind, name, ...target, actionsSource } };
 }
diff --git a/apps/mobile/src/lib/mediaActions.ts b/apps/mobile/src/lib/mediaActions.ts
index 14dc2de7bd21..c37ed76c2bf5 100644
--- a/apps/mobile/src/lib/mediaActions.ts
+++ b/apps/mobile/src/lib/mediaActions.ts
@@ -1,4 +1,5 @@
 import { useNavigation } from "@react-navigation/native";
+import type { MediaActionId } from "@t3tools/client-runtime/media-actions";
 import type { MediaReference } from "@t3tools/client-runtime/media-reference";
 import type { AssetResource, EnvironmentId, ThreadId } from "@t3tools/contracts";
 import { normalizeNativeMarkdownUrl } from "@t3tools/mobile-markdown-text/links";
@@ -7,18 +8,23 @@ import { Alert } from "react-native";
 
 import { useRefreshAssetUrl } from "../state/assets";
 import { downloadAndShareAttachment, shareLocalAttachment } from "./attachmentDownload";
+import type { DraftComposerFileAttachment } from "./composerImages";
 import { copyTextWithHaptic } from "./copyTextWithHaptic";
+import { loadLocalAttachmentPreview } from "./localAttachmentPreview";
 
 /** Authored source metadata is kept separate from temporary preview/download URLs. */
 export type MediaActionsSource = {
   readonly reference?: MediaReference;
   readonly name: string;
   readonly mimeType: string;
+  /** Anchors the iOS share sheet to the view that opened the menu. */
+  readonly sourceIdentifier?: string;
 } & (
   | { readonly uri: string }
+  | { readonly attachment: DraftComposerFileAttachment }
   | {
       readonly environmentId: EnvironmentId;
-      readonly threadId: ThreadId;
+      readonly threadId?: ThreadId;
       readonly resource: AssetResource;
     }
 );
@@ -39,12 +45,23 @@ export function useMediaActions(source: MediaActionsSource | undefined, onOpenFi
     controller.current = request;
     setSharing(true);
     void (async () => {
+      if ("attachment" in source) {
+        const preview = await loadLocalAttachmentPreview(source.attachment, request.signal);
+        if (!preview) return;
+        try {
+          await preview.share(request.signal, source.sourceIdentifier);
+        } finally {
+          preview.dispose();
+        }
+        return;
+      }
       const uri = "uri" in source ? normalizeNativeMarkdownUrl(source.uri) : await refresh();
       if (request.signal.aborted) return;
       if (uri === null) throw new Error("The file could not be loaded. Reconnect and try again.");
       const input = {
         attachment: { name: source.name, mimeType: source.mimeType },
         signal: request.signal,
+        sourceIdentifier: source.sourceIdentifier,
       };
       if (/^(file|content):/i.test(uri)) await shareLocalAttachment({ ...input, uri });
       else await downloadAndShareAttachment({ ...input, url: uri });
@@ -66,52 +83,62 @@ export function useMediaActions(source: MediaActionsSource | undefined, onOpenFi
   };
 
   const reference = source?.reference;
-  const actions: { id: string; title: string; run: () => void; disabled?: boolean }[] = source
-    ? [
-        ...(reference?.kind === "file"
-          ? [
-              {
-                id: "copy-path",
-                title: "Copy full path",
-                run: () => copyTextWithHaptic(reference.path),
-              },
-              ...(reference.relativePath
-                ? [
-                    {
-                      id: "copy-relative-path",
-                      title: "Copy relative path",
-                      run: () => copyTextWithHaptic(reference.relativePath!),
-                    },
-                  ]
-                : []),
-              ...(reference.relativePath && source && "environmentId" in source
-                ? [
-                    {
-                      id: "open-file",
-                      title: "Open in file viewer",
-                      run: () => {
-                        onOpenFile?.();
-                        navigation.navigate("ThreadFile", {
-                          environmentId: String(source.environmentId),
-                          threadId: String(source.threadId),
-                          path: reference.relativePath!.split("/"),
-                        });
-                      },
-                    },
-                  ]
-                : []),
-            ]
-          : reference
-            ? [{ id: "copy-url", title: "Copy URL", run: () => copyTextWithHaptic(reference.url) }]
+  const relativePath = reference?.kind === "file" ? reference.relativePath : undefined;
+  const threadId = source && "threadId" in source ? source.threadId : undefined;
+  const actions: { id: MediaActionId; title: string; run: () => void; disabled?: boolean }[] =
+    source
+      ? [
+          ...(reference?.kind === "file"
+            ? [
+                {
+                  id: "copy-full-path" as const,
+                  title: "Copy full path",
+                  run: () => copyTextWithHaptic(reference.path),
+                },
+              ]
+            : []),
+          ...(relativePath
+            ? [
+                {
+                  id: "copy-relative-path" as const,
+                  title: "Copy relative path",
+                  run: () => copyTextWithHaptic(relativePath),
+                },
+              ]
+            : []),
+          ...(reference?.kind === "url"
+            ? [
+                {
+                  id: "copy-url" as const,
+                  title: "Copy URL",
+                  run: () => copyTextWithHaptic(reference.url),
+                },
+              ]
+            : []),
+          ...(relativePath && "environmentId" in source && threadId !== undefined
+            ? [
+                {
+                  id: "open-file" as const,
+                  title: "Open in file viewer",
+                  run: () => {
+                    onOpenFile?.();
+                    navigation.navigate("ThreadFile", {
+                      environmentId: String(source.environmentId),
+                      threadId: String(threadId),
+                      path: relativePath.split("/"),
+                    });
+                  },
+                },
+              ]
             : []),
-        {
-          id: "share",
-          title: sharing ? "Opening share sheet…" : "Save or share",
-          run: share,
-          disabled: sharing,
-        },
-      ]
-    : [];
+          {
+            id: "save" as const,
+            title: sharing ? "Opening share sheet…" : "Save or share",
+            run: share,
+            disabled: sharing,
+          },
+        ]
+      : [];
   return {
     title: reference?.kind === "file" ? reference.path : reference?.url,
     actions,
diff --git a/apps/mobile/src/lib/storage.test.ts b/apps/mobile/src/lib/storage.test.ts
index a1c7960a570b..15e385067dcd 100644
--- a/apps/mobile/src/lib/storage.test.ts
+++ b/apps/mobile/src/lib/storage.test.ts
@@ -213,33 +213,35 @@ describe("mobile connection storage", () => {
     expect(fallback.updatedAt).toEqual(expect.any(Number));
   });
 
-  it("persists Thread List v2 shelf expansion preferences", async () => {
+  it("persists thread list shelf expansion preferences", async () => {
     await expect(
       savePreferencesPatch({
-        threadListV2SettledShelfExpanded: false,
-        threadListV2SnoozedShelfExpanded: true,
+        threadListSettledShelfExpanded: false,
+        threadListSnoozedShelfExpanded: true,
       }),
     ).resolves.toEqual({
-      threadListV2SettledShelfExpanded: false,
-      threadListV2SnoozedShelfExpanded: true,
+      threadListSettledShelfExpanded: false,
+      threadListSnoozedShelfExpanded: true,
     });
 
     await expect(loadPreferences()).resolves.toEqual({
-      threadListV2SettledShelfExpanded: false,
-      threadListV2SnoozedShelfExpanded: true,
+      threadListSettledShelfExpanded: false,
+      threadListSnoozedShelfExpanded: true,
     });
     expect(JSON.parse(mocks.getPreferencesJson() ?? "")).toEqual({
-      threadListV2SettledShelfExpanded: false,
-      threadListV2SnoozedShelfExpanded: true,
+      threadListSettledShelfExpanded: false,
+      threadListSnoozedShelfExpanded: true,
     });
   });
 
-  it("ignores invalid Thread List v2 shelf expansion preference types", async () => {
+  it("drops legacy and invalid thread list shelf expansion preferences", async () => {
     mocks.setPreferencesJson(
       JSON.stringify({
         baseFontSize: 17,
-        threadListV2SettledShelfExpanded: "false",
-        threadListV2SnoozedShelfExpanded: 1,
+        threadListV2SettledShelfExpanded: true,
+        threadListV2SnoozedShelfExpanded: true,
+        threadListSettledShelfExpanded: "false",
+        threadListSnoozedShelfExpanded: 1,
       }),
       10,
     );
diff --git a/apps/mobile/src/lib/threadActivity.test.ts b/apps/mobile/src/lib/threadActivity.test.ts
index 47bfe6755db6..61dfc0d3e859 100644
--- a/apps/mobile/src/lib/threadActivity.test.ts
+++ b/apps/mobile/src/lib/threadActivity.test.ts
@@ -800,6 +800,20 @@ describe("buildThreadFeed", () => {
           payload: {
             title: "Call repository tool",
             itemType: "mcp_tool_call",
+            toolSurface: "computer",
+            toolIcon: {
+              _tag: "native-app",
+              app: { _tag: "app-id", appId: "com.example.Editor" },
+            },
+            toolSource: {
+              key: "native-app:com.example.editor",
+              name: "Computer Use",
+              kind: "computer",
+              icon: {
+                _tag: "native-app",
+                app: { _tag: "app-id", appId: "com.example.Editor" },
+              },
+            },
             detail: "repository.search",
             status: "completed",
             data: {
@@ -820,7 +834,21 @@ describe("buildThreadFeed", () => {
       return;
     }
 
-    expect(group.activities[0]?.icon).toBe("wrench");
+    expect(group.activities[0]?.icon).toBe("computer");
+    expect(group.activities[0]?.workEntry.toolSurface).toBe("computer");
+    expect(group.activities[0]?.workEntry.toolIcon).toEqual({
+      _tag: "native-app",
+      app: { _tag: "app-id", appId: "com.example.Editor" },
+    });
+    expect(group.activities[0]?.workEntry.toolSource).toEqual({
+      key: "native-app:com.example.editor",
+      name: "Computer Use",
+      kind: "computer",
+      icon: {
+        _tag: "native-app",
+        app: { _tag: "app-id", appId: "com.example.Editor" },
+      },
+    });
     expect(group.activities[0]?.getFullDetail()).toContain('"query": "work log"');
     expect(group.activities[0]?.getFullDetail()).toContain("repository.search");
   });
@@ -868,7 +896,7 @@ describe("buildThreadFeed", () => {
       title: "Call MCP tool",
       item: { server: "t3-code", tool: "preview_click" },
       status: undefined,
-      displayName: "Click in the preview browser",
+      displayName: "Clicking in the preview browser",
       liveDisplayName: "Clicking in the preview browser",
       settledDisplayName: "Clicked in the preview browser",
       icon: "browser",
@@ -879,7 +907,7 @@ describe("buildThreadFeed", () => {
       title: "Call MCP tool",
       item: { server: "t3-code", tool: "task_status" },
       status: undefined,
-      displayName: "Get delegated task status",
+      displayName: "Getting delegated task status",
       liveDisplayName: "Getting delegated task status",
       settledDisplayName: "Got delegated task status",
       icon: "t3-code",
@@ -1039,7 +1067,7 @@ describe("buildThreadFeed", () => {
     ).toMatchObject([
       {
         type: "work-toggle",
-        summary: "Clicked in the preview browser",
+        summary: "Clicking in the preview browser",
         summaryToolIcon: "browser",
         live: true,
       },
@@ -1050,18 +1078,20 @@ describe("buildThreadFeed", () => {
     {
       status: "completed",
       displayName: "Clicked in the preview browser",
+      liveDisplayName: "Clicking in the preview browser",
       detail: "Clicked Continue",
       hasFailure: false,
     },
     {
       status: "failed",
       displayName: "Failed to click in the preview browser",
+      liveDisplayName: "Failed to click in the preview browser",
       detail: "Timed out waiting for Continue",
       hasFailure: true,
     },
   ])(
     "uses the browser call label once its action settles as $status",
-    ({ status, displayName, detail, hasFailure }) => {
+    ({ status, displayName, liveDisplayName, detail, hasFailure }) => {
       const turnId = TurnId.make("turn-preview-lifecycle");
       const toolCallId = "preview-click";
       const groupId = `work-group:tool:${turnId}:${toolCallId}`;
@@ -1156,7 +1186,7 @@ describe("buildThreadFeed", () => {
           groupId,
           hiddenCount: 1,
           expanded: true,
-          summary: displayName,
+          summary: liveDisplayName,
           summaryToolIcon: "browser",
           hasFailure,
           live: true,
@@ -1598,6 +1628,8 @@ describe("buildThreadFeed", () => {
       id: string,
       createdAt: string,
       status: ThreadFeedActivity["status"] = "success",
+      toolSurface?: "browser" | "computer",
+      toolIcon?: import("@t3tools/contracts").ToolActivityIcon,
     ): ThreadFeedActivity => ({
       id,
       createdAt,
@@ -1617,6 +1649,8 @@ describe("buildThreadFeed", () => {
         label: `Tool ${id}`,
         command: `command ${id}`,
         tone: "tool",
+        ...(toolSurface ? { toolSurface } : {}),
+        ...(toolIcon ? { toolIcon } : {}),
       },
     });
     const feed: ThreadFeedEntry[] = [
@@ -1628,8 +1662,11 @@ describe("buildThreadFeed", () => {
         activities: [
           activity("activity-1", "2026-04-01T00:00:01.000Z"),
           activity("activity-neutral", "2026-04-01T00:00:02.000Z", "neutral"),
-          activity("activity-2", "2026-04-01T00:00:03.000Z"),
-          activity("activity-3", "2026-04-01T00:00:04.000Z"),
+          activity("activity-2", "2026-04-01T00:00:03.000Z", "success", "browser"),
+          activity("activity-3", "2026-04-01T00:00:04.000Z", "success", "computer", {
+            _tag: "native-app",
+            app: { _tag: "app-id", appId: "com.example.Editor" },
+          }),
         ],
       },
     ];
@@ -1642,6 +1679,11 @@ describe("buildThreadFeed", () => {
       hiddenCount: 3,
       expanded: false,
       summary: "Ran 3 commands",
+      toolSurface: "computer",
+      toolIcon: {
+        _tag: "native-app",
+        app: { _tag: "app-id", appId: "com.example.Editor" },
+      },
     });
 
     const expanded = deriveThreadFeedPresentation(
@@ -1677,7 +1719,7 @@ describe("buildThreadFeed", () => {
       (
         [
           { lifecycleStatus: "inProgress", summary: "Running pnpm", shimmer: true },
-          { lifecycleStatus: "completed", summary: "Ran pnpm", shimmer: false },
+          { lifecycleStatus: "completed", summary: "Running pnpm", shimmer: false },
           { lifecycleStatus: "failed", summary: "Failed pnpm", shimmer: false },
           { lifecycleStatus: "declined", summary: "Declined pnpm", shimmer: false },
           { lifecycleStatus: "stopped", summary: "Stopped pnpm", shimmer: false },
diff --git a/apps/mobile/src/lib/threadActivity.ts b/apps/mobile/src/lib/threadActivity.ts
index c8a2ae2e953d..0e17c7bd720a 100644
--- a/apps/mobile/src/lib/threadActivity.ts
+++ b/apps/mobile/src/lib/threadActivity.ts
@@ -17,6 +17,7 @@ import {
   commandDetailRepeatsCommand,
   extractCommandOutputText,
   isWorktreeSetupActivity,
+  liveActivityToolStatus,
   normalizeCompactToolLabel,
   omitSupersededLifecycleMarkers,
   resolveWorkEntryToolPresentation,
@@ -25,6 +26,7 @@ import {
   toolGroupSummaryKind,
   type ToolGroupSummaryKind,
 } from "@t3tools/client-runtime/work-log/presentation";
+import { extractToolActivityPresentation } from "@t3tools/client-runtime/work-log/tool-presentation";
 import { commandProgramName } from "@t3tools/client-runtime/work-log/command-label";
 
 import * as Arr from "effect/Array";
@@ -66,8 +68,10 @@ export interface ThreadFeedActivity {
   readonly icon:
     | "agent"
     | "alert"
+    | "browser"
     | "check"
     | "command"
+    | "computer"
     | "edit"
     | "eye"
     | "globe"
@@ -98,6 +102,9 @@ export interface WorkLogEntry {
   changedFiles?: ReadonlyArray<string>;
   tone: "thinking" | "tool" | "info" | "error";
   toolTitle?: string;
+  toolSurface?: import("@t3tools/contracts").ToolActivitySurface;
+  toolIcon?: import("@t3tools/contracts").ToolActivityIcon;
+  toolSource?: import("@t3tools/contracts").ToolActivitySource;
   itemType?: ToolLifecycleItemType;
   requestKind?: PendingApproval["requestKind"];
   toolLifecycleStatus?: WorkLogToolLifecycleStatus;
@@ -148,6 +155,8 @@ export type ThreadFeedEntry =
       readonly expanded: boolean;
       readonly summary: string;
       readonly summaryKind: ToolGroupSummaryKind;
+      readonly toolSurface?: WorkLogEntry["toolSurface"];
+      readonly toolIcon?: WorkLogEntry["toolIcon"];
       readonly summaryToolIcon?: "browser" | "t3-code";
       readonly hasFailure: boolean;
       readonly live: boolean;
@@ -398,6 +407,7 @@ function toDerivedWorkLogEntry(activity: OrchestrationThreadActivity): DerivedWo
   const commandPreview = extractToolCommand(payload);
   const changedFiles = extractChangedFiles(payload);
   const title = extractToolTitle(payload);
+  const toolPresentation = extractToolActivityPresentation(payload);
   // task.updated included: terminal bypassed updates (Codex children's only
   // terminal signal) must carry task identity so they collapse per child
   // instead of stacking anonymous "Task idle" rows.
@@ -479,6 +489,15 @@ function toDerivedWorkLogEntry(activity: OrchestrationThreadActivity): DerivedWo
   if (title) {
     entry.toolTitle = title;
   }
+  if (toolPresentation.toolSurface) {
+    entry.toolSurface = toolPresentation.toolSurface;
+  }
+  if (toolPresentation.toolIcon) {
+    entry.toolIcon = toolPresentation.toolIcon;
+  }
+  if (toolPresentation.toolSource) {
+    entry.toolSource = toolPresentation.toolSource;
+  }
   if (itemType === "mcp_tool_call") {
     const data = asRecord(payload?.data);
     const toolData = typeof data?.toolName === "string" ? (data.item ?? data) : data?.item;
@@ -614,6 +633,9 @@ function mergeDerivedWorkLogEntries(
   const command = next.command ?? previous.command;
   const rawCommand = next.rawCommand ?? previous.rawCommand;
   const toolTitle = next.toolTitle ?? previous.toolTitle;
+  const toolSurface = next.toolSurface ?? previous.toolSurface;
+  const toolIcon = next.toolIcon ?? previous.toolIcon;
+  const toolSource = next.toolSource ?? previous.toolSource;
   const itemType = next.itemType ?? previous.itemType;
   const requestKind = next.requestKind ?? previous.requestKind;
   const collapseKey = next.collapseKey ?? previous.collapseKey;
@@ -631,6 +653,9 @@ function mergeDerivedWorkLogEntries(
     ...(rawCommand ? { rawCommand } : {}),
     ...(changedFiles.length > 0 ? { changedFiles } : {}),
     ...(toolTitle ? { toolTitle } : {}),
+    ...(toolSurface ? { toolSurface } : {}),
+    ...(toolIcon ? { toolIcon } : {}),
+    ...(toolSource ? { toolSource } : {}),
     ...(itemType ? { itemType } : {}),
     ...(requestKind ? { requestKind } : {}),
     ...(collapseKey ? { collapseKey } : {}),
@@ -752,6 +777,7 @@ function workEntryIcon(entry: DerivedWorkLogEntry): ThreadFeedActivity["icon"] {
     return "message";
   }
   if (entry.sourceActivityKind === "runtime.warning") return "warning";
+  if (entry.toolSurface) return entry.toolSurface;
   if (entry.requestKind === "command") return "command";
   if (entry.requestKind === "file-read") return "eye";
   if (entry.requestKind === "file-change") return "edit";
@@ -1529,7 +1555,7 @@ function appendToolGroupRows(
   const latestActivity = latestActiveActivity ?? activities.at(-1)!;
   const singleActivity = activities.length === 1 ? latestActivity : null;
   const summary = live
-    ? liveToolActivitySummary(latestActivity, active)
+    ? liveToolActivitySummary(latestActivity, live)
     : singleActivity !== null &&
         singleActivity.toolLike &&
         toolGroupAction(singleActivity.workEntry) !== "edit"
@@ -1537,6 +1563,27 @@ function appendToolGroupRows(
       : singleActivity !== null && !singleActivity.toolLike
         ? singleActivity.workEntry.label
         : summarizeToolGroup(activities.map((activity) => activity.workEntry));
+  const primarySourceActivity = activities.find(
+    (activity) => activity.workEntry.toolSource !== undefined,
+  );
+  const primarySourceKey = primarySourceActivity?.workEntry.toolSource?.key;
+  const primarySourceIcon = primarySourceKey
+    ? (activities.find(
+        (activity) =>
+          activity.workEntry.toolSource?.key === primarySourceKey &&
+          activity.workEntry.toolIcon !== undefined,
+      )?.workEntry.toolIcon ?? primarySourceActivity?.workEntry.toolSource?.icon)
+    : undefined;
+  const groupToolSurface =
+    primarySourceActivity?.workEntry.toolSurface ??
+    latestActivity.workEntry.toolSurface ??
+    activities.findLast((activity) => activity.workEntry.toolSurface !== undefined)?.workEntry
+      .toolSurface;
+  const groupToolIcon =
+    primarySourceIcon ??
+    latestActivity.workEntry.toolIcon ??
+    activities.findLast((activity) => activity.workEntry.toolIcon !== undefined)?.workEntry
+      .toolIcon;
   const summaryToolIcon = live
     ? resolveWorkEntryToolPresentation(latestActivity.workEntry)?.icon
     : singleActivity !== null &&
@@ -1556,6 +1603,8 @@ function appendToolGroupRows(
     summaryKind: toolGroupSummaryKind(
       (live ? [latestActivity] : activities).map((activity) => activity.workEntry),
     ),
+    ...(groupToolSurface ? { toolSurface: groupToolSurface } : {}),
+    ...(groupToolIcon ? { toolIcon: groupToolIcon } : {}),
     ...(summaryToolIcon ? { summaryToolIcon } : {}),
     hasFailure: activities.findLast((activity) => activity.toolLike)?.status === "failure",
     live,
@@ -1581,16 +1630,16 @@ function appendToolGroupRows(
   });
 }
 
-function liveToolActivitySummary(activity: ThreadFeedActivity, active: boolean): string {
-  const presentation = resolveWorkEntryToolPresentation(
-    activity.workEntry,
-    active ? "inProgress" : "completed",
-  );
+function liveToolActivitySummary(activity: ThreadFeedActivity, presentTense: boolean): string {
+  const status = liveActivityToolStatus(activity.lifecycleStatus, presentTense);
+  const presentation = resolveWorkEntryToolPresentation({
+    ...activity.workEntry,
+    toolLifecycleStatus: status,
+  });
   if (presentation) return presentation.displayName;
   const command = activity.workEntry.command?.trim();
   if (command) {
     const program = commandProgramName(command);
-    const status = activity.lifecycleStatus ?? (active ? "inProgress" : "completed");
     const verb =
       status === "inProgress"
         ? "Running"
diff --git a/apps/mobile/src/lib/videoPreviewSource.ts b/apps/mobile/src/lib/videoPreviewSource.ts
index af87a8d0f73a..90db612d002f 100644
--- a/apps/mobile/src/lib/videoPreviewSource.ts
+++ b/apps/mobile/src/lib/videoPreviewSource.ts
@@ -1,4 +1,5 @@
 import type { AssetResource, ChatFileAttachment, EnvironmentId } from "@t3tools/contracts";
+import { videoMimeType } from "@t3tools/shared/video";
 
 import type { DraftComposerFileAttachment } from "./composerImages";
 import type { MediaActionsSource } from "./mediaActions";
@@ -14,7 +15,7 @@ export type MediaVideoPreviewSource = {
   | { readonly uri: string }
   | {
       readonly environmentId: EnvironmentId;
-      readonly resource: Extract<AssetResource, { readonly _tag: "media-file" }>;
+      readonly resource: Extract<AssetResource, { readonly _tag: "attachment" | "media-file" }>;
     }
 );
 
@@ -32,23 +33,51 @@ export function mediaVideoThumbnailKey(source: MediaVideoPreviewSource): string
   return JSON.stringify(
     "uri" in source
       ? ["media-video", source.uri]
-      : [
-          "media-video",
-          source.environmentId,
-          source.resource.threadId,
-          source.resource.path,
-          source.srcFragment ?? "",
-        ],
+      : source.resource._tag === "attachment"
+        ? ["media-video", source.environmentId, "attachment", source.resource.attachmentId]
+        : [
+            "media-video",
+            source.environmentId,
+            source.resource.threadId,
+            source.resource.path,
+            source.srcFragment ?? "",
+          ],
   );
 }
 
-export type AttachmentVideoPreviewSource = (
-  | { readonly type: "local"; readonly attachment: DraftComposerFileAttachment }
-  | {
-      readonly type: "remote";
-      readonly environmentId: EnvironmentId;
-      readonly attachment: ChatFileAttachment;
-    }
-) & { readonly sourceIdentifier?: string };
+export interface LocalVideoPreviewSource {
+  readonly type: "local";
+  readonly attachment: DraftComposerFileAttachment;
+  readonly sourceIdentifier?: string;
+}
+
+export type VideoPreviewSource = LocalVideoPreviewSource | MediaVideoPreviewSource;
 
-export type VideoPreviewSource = AttachmentVideoPreviewSource | MediaVideoPreviewSource;
+export function attachmentVideoPreviewSource(
+  environmentId: EnvironmentId,
+  attachment: ChatFileAttachment,
+  sourceIdentifier?: string,
+): MediaVideoPreviewSource {
+  const mimeType = videoMimeType(attachment) ?? attachment.mimeType;
+  const resource = {
+    _tag: "attachment" as const,
+    attachmentId: attachment.id,
+    fileName: attachment.name,
+    mimeType,
+  };
+  return {
+    type: "media",
+    name: attachment.name,
+    mimeType,
+    ...(sourceIdentifier ? { sourceIdentifier } : {}),
+    environmentId,
+    resource,
+    actionsSource: {
+      name: attachment.name,
+      mimeType,
+      ...(sourceIdentifier ? { sourceIdentifier } : {}),
+      environmentId,
+      resource,
+    },
+  };
+}
diff --git a/apps/mobile/src/lib/wideMarkdownBlocks.test.ts b/apps/mobile/src/lib/wideMarkdownBlocks.test.ts
index dd6d040300ac..4f745aed8851 100644
--- a/apps/mobile/src/lib/wideMarkdownBlocks.test.ts
+++ b/apps/mobile/src/lib/wideMarkdownBlocks.test.ts
@@ -17,6 +17,20 @@ describe("hasWideMarkdownBlock", () => {
     expect(hasWideMarkdownBlock("   ```\ncode\n```")).toBe(true);
   });
 
+  it("detects indented code blocks", () => {
+    const prompt = 'before\n\n    def search(x):\n        return x\n\n"""\n\nafter';
+    expect(hasWideMarkdownBlock(prompt)).toBe(true);
+    expect(hasWideMarkdownBlock("before\n\n\treturn x\n\nafter")).toBe(true);
+    expect(hasWideMarkdownBlock("before\n\n \treturn x\n\nafter")).toBe(true);
+    expect(hasWideMarkdownBlock(">     return x")).toBe(true);
+    expect(hasWideMarkdownBlock("> >  \treturn x")).toBe(true);
+    expect(hasWideMarkdownBlock("    1. indented code")).toBe(true);
+    expect(hasWideMarkdownBlock("    - code-like bullet")).toBe(true);
+    expect(hasWideMarkdownBlock("before\n   not code\nafter")).toBe(false);
+    expect(hasWideMarkdownBlock("before\n    \nafter")).toBe(false);
+    expect(hasWideMarkdownBlock("before\n \t\nafter")).toBe(false);
+  });
+
   it("detects top-level and blockquoted ordered-list markers", () => {
     expect(hasWideMarkdownBlock("1. One\n2. Two\n3. Three\n4. Four\n5. Five")).toBe(true);
     expect(hasWideMarkdownBlock("before\n3) Three")).toBe(true);
@@ -24,11 +38,9 @@ describe("hasWideMarkdownBlock", () => {
     expect(hasWideMarkdownBlock("> > 3) Three")).toBe(true);
   });
 
-  it("detects nested ordered lists without treating indented code as a list", () => {
+  it("detects nested ordered lists", () => {
     expect(hasWideMarkdownBlock("- Parent\n    1. Child\n    2. Child")).toBe(true);
     expect(hasWideMarkdownBlock("> - Parent\n>     1. Child")).toBe(true);
-    expect(hasWideMarkdownBlock("    1. indented code")).toBe(false);
-    expect(hasWideMarkdownBlock("    - code-like bullet\n    1. indented code")).toBe(false);
   });
 
   it("can limit ordered-list width pinning to Android", () => {
@@ -46,7 +58,7 @@ describe("hasWideMarkdownBlock", () => {
     expect(hasWideMarkdownBlock("  > quoted", { includeBlockquotes: true })).toBe(true);
     expect(hasWideMarkdownBlock("> quoted")).toBe(false);
     expect(hasWideMarkdownBlock("prose > quoted", { includeBlockquotes: true })).toBe(false);
-    expect(hasWideMarkdownBlock("    > indented code", { includeBlockquotes: true })).toBe(false);
+    expect(hasWideMarkdownBlock("    > indented code", { includeBlockquotes: true })).toBe(true);
   });
 
   it("detects GFM tables", () => {
diff --git a/apps/mobile/src/lib/wideMarkdownBlocks.ts b/apps/mobile/src/lib/wideMarkdownBlocks.ts
index c4bd2864e472..57588bab2a27 100644
--- a/apps/mobile/src/lib/wideMarkdownBlocks.ts
+++ b/apps/mobile/src/lib/wideMarkdownBlocks.ts
@@ -1,7 +1,7 @@
 /**
  * Detects markdown that the renderer draws as a block requiring a definite
- * user-bubble width: fenced code blocks, GFM tables, ordered lists, and
- * blockquotes when requested by the caller.
+ * user-bubble width: fenced and indented code blocks, GFM tables, ordered
+ * lists, and blockquotes when requested by the caller.
  *
  * Fenced code blocks and tables report an intrinsic width equal to their
  * widest line, which is effectively unbounded. A user bubble sizes itself
@@ -43,6 +43,28 @@ function stripBlockquotePrefixes(line: string): string {
   return content;
 }
 
+function hasIndentedCodeBlock(text: string): boolean {
+  return text.split("\n").some((rawLine) => {
+    const line = stripBlockquotePrefixes(rawLine);
+    let column = 0;
+    let index = 0;
+
+    // Markdown tabs advance to the next four-column stop.
+    while (index < line.length) {
+      if (line[index] === " ") {
+        column += 1;
+      } else if (line[index] === "\t") {
+        column += 4 - (column % 4);
+      } else {
+        break;
+      }
+      index += 1;
+    }
+
+    return column >= 4 && index < line.length && line[index] !== "\r";
+  });
+}
+
 function hasBlockquote(text: string): boolean {
   return text.split("\n").some((line) => BLOCKQUOTE_PREFIX.test(line));
 }
@@ -89,6 +111,9 @@ export function hasWideMarkdownBlock(
   if (options.includeBlockquotes === true && hasBlockquote(text)) {
     return true;
   }
+  if (hasIndentedCodeBlock(text)) {
+    return true;
+  }
   if (options.includeOrderedLists !== false && hasOrderedListItem(text)) {
     return true;
   }
diff --git a/apps/mobile/src/persistence/mobile-database.ts b/apps/mobile/src/persistence/mobile-database.ts
index 3d50a2dbc559..71876932b789 100644
--- a/apps/mobile/src/persistence/mobile-database.ts
+++ b/apps/mobile/src/persistence/mobile-database.ts
@@ -365,14 +365,13 @@ const makeAvailable = Effect.gen(function* () {
     }).pipe(
       Effect.flatMap(Schema.decodeUnknownEffect(ClientCacheSummaryRows)),
       Effect.mapError(databaseError("inspect-caches")),
-      Effect.map(
-        (rows): ReadonlyArray<ClientCacheSummaryRow> =>
-          rows.map((row) => ({
-            environmentId: row.environmentId as EnvironmentId,
-            kind: row.kind,
-            recordCount: row.recordCount,
-            payloadBytes: row.payloadBytes,
-          })),
+      Effect.map((rows): ReadonlyArray<ClientCacheSummaryRow> =>
+        rows.map((row) => ({
+          environmentId: row.environmentId as EnvironmentId,
+          kind: row.kind,
+          recordCount: row.recordCount,
+          payloadBytes: row.payloadBytes,
+        })),
       ),
     ),
     loadPreferencesJson: Effect.tryPromise({
diff --git a/apps/mobile/src/persistence/mobile-preferences.ts b/apps/mobile/src/persistence/mobile-preferences.ts
index cf4c29c6041c..f14a73f15cb2 100644
--- a/apps/mobile/src/persistence/mobile-preferences.ts
+++ b/apps/mobile/src/persistence/mobile-preferences.ts
@@ -41,10 +41,9 @@ export interface Preferences {
   readonly legacyThreadListEnabled?: boolean;
   /** Device-local counterpart of desktop's `planModeEnabled` legacy flag. */
   readonly planModeEnabled?: boolean;
-  /** Undefined preserves the default expanded Settled shelf. */
-  readonly threadListV2SettledShelfExpanded?: boolean;
-  /** Undefined preserves the default collapsed Snoozed shelf. */
-  readonly threadListV2SnoozedShelfExpanded?: boolean;
+  /** Fresh keys reset both shelves to collapsed when users update. */
+  readonly threadListSettledShelfExpanded?: boolean;
+  readonly threadListSnoozedShelfExpanded?: boolean;
 }
 
 export class MobilePreferencesLoadError extends Schema.TaggedErrorClass<MobilePreferencesLoadError>()(
@@ -102,8 +101,8 @@ function sanitizePreferences(parsed: Preferences): Preferences {
     projectGroupingMode?: SidebarProjectGroupingMode;
     legacyThreadListEnabled?: boolean;
     planModeEnabled?: boolean;
-    threadListV2SettledShelfExpanded?: boolean;
-    threadListV2SnoozedShelfExpanded?: boolean;
+    threadListSettledShelfExpanded?: boolean;
+    threadListSnoozedShelfExpanded?: boolean;
   } = {};
 
   if (typeof parsed.liveActivitiesEnabled === "boolean") {
@@ -171,11 +170,11 @@ function sanitizePreferences(parsed: Preferences): Preferences {
   if (typeof parsed.planModeEnabled === "boolean") {
     preferences.planModeEnabled = parsed.planModeEnabled;
   }
-  if (typeof parsed.threadListV2SettledShelfExpanded === "boolean") {
-    preferences.threadListV2SettledShelfExpanded = parsed.threadListV2SettledShelfExpanded;
+  if (typeof parsed.threadListSettledShelfExpanded === "boolean") {
+    preferences.threadListSettledShelfExpanded = parsed.threadListSettledShelfExpanded;
   }
-  if (typeof parsed.threadListV2SnoozedShelfExpanded === "boolean") {
-    preferences.threadListV2SnoozedShelfExpanded = parsed.threadListV2SnoozedShelfExpanded;
+  if (typeof parsed.threadListSnoozedShelfExpanded === "boolean") {
+    preferences.threadListSnoozedShelfExpanded = parsed.threadListSnoozedShelfExpanded;
   }
   return preferences;
 }
diff --git a/apps/mobile/src/state/assets.ts b/apps/mobile/src/state/assets.ts
index 9e3e43c7cdcb..af6300d8ffa6 100644
--- a/apps/mobile/src/state/assets.ts
+++ b/apps/mobile/src/state/assets.ts
@@ -1,23 +1,20 @@
 import { useAtomValue } from "@effect/atom-react";
-import { createAssetEnvironmentAtoms, resolveAssetUrl } from "@t3tools/client-runtime/state/assets";
+import {
+  type AssetUrlState,
+  assetUrlStateFromResult,
+  createAssetEnvironmentAtoms,
+  EMPTY_ASSET_URL_ATOM,
+} from "@t3tools/client-runtime/state/assets";
 import type { AssetResource, EnvironmentId } from "@t3tools/contracts";
-import { AsyncResult, Atom } from "effect/unstable/reactivity";
 import { useCallback } from "react";
 
 import { connectionAtomRuntime } from "../connection/runtime";
 import { usePreparedConnection } from "./session";
 import { useAtomQueryRunner } from "./use-atom-query-runner";
 
-export const assetEnvironment = createAssetEnvironmentAtoms(connectionAtomRuntime);
-
-const EMPTY_ASSET_URL_ATOM = Atom.make(AsyncResult.initial<never, never>(false)).pipe(
-  Atom.withLabel("mobile-asset-url:empty"),
-);
+export type { AssetUrlState } from "@t3tools/client-runtime/state/assets";
 
-export type AssetUrlState =
-  | { readonly _tag: "Loading" }
-  | { readonly _tag: "Failure" }
-  | { readonly _tag: "Success"; readonly url: string };
+export const assetEnvironment = createAssetEnvironmentAtoms(connectionAtomRuntime);
 
 export function useAssetUrlState(
   environmentId: EnvironmentId | null,
@@ -29,14 +26,10 @@ export function useAssetUrlState(
       ? EMPTY_ASSET_URL_ATOM
       : assetEnvironment.createUrl({ environmentId, input: { resource } }),
   );
-  if (result._tag === "Failure") {
-    return { _tag: "Failure" };
-  }
-  if (preparedConnection._tag === "None" || result._tag !== "Success") {
-    return { _tag: "Loading" };
-  }
-  const url = resolveAssetUrl(preparedConnection.value.httpBaseUrl, result.value.relativeUrl);
-  return url === null ? { _tag: "Failure" } : { _tag: "Success", url };
+  return assetUrlStateFromResult(
+    result,
+    preparedConnection._tag === "Some" ? preparedConnection.value.httpBaseUrl : null,
+  );
 }
 
 export function useAssetUrl(
@@ -60,9 +53,10 @@ export function useRefreshAssetUrl(
   });
   return useCallback(async () => {
     if (environmentId === null || resource === null || httpBaseUrl === null) return null;
-    const result = await createUrl({ environmentId, input: { resource } });
-    return result._tag === "Success"
-      ? resolveAssetUrl(httpBaseUrl, result.value.relativeUrl)
-      : null;
+    const state = assetUrlStateFromResult(
+      await createUrl({ environmentId, input: { resource } }),
+      httpBaseUrl,
+    );
+    return state._tag === "Success" ? state.url : null;
   }, [createUrl, environmentId, httpBaseUrl, resource]);
 }
diff --git a/apps/server/scripts/migrate-dev-db.ts b/apps/server/scripts/migrate-dev-db.ts
index 5670f0d52b04..fd1b74cb4740 100644
--- a/apps/server/scripts/migrate-dev-db.ts
+++ b/apps/server/scripts/migrate-dev-db.ts
@@ -24,7 +24,6 @@
  * cursors never rewind.
  */
 
-// @effect-diagnostics nodeBuiltinImport:off - node:os resolves the shared T3 home guard.
 import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import * as NodeOS from "node:os";
diff --git a/apps/server/scripts/t3-sqlite-state.ts b/apps/server/scripts/t3-sqlite-state.ts
index c34f4750c14c..8423e7e6090f 100644
--- a/apps/server/scripts/t3-sqlite-state.ts
+++ b/apps/server/scripts/t3-sqlite-state.ts
@@ -1,6 +1,5 @@
 #!/usr/bin/env node
 
-// @effect-diagnostics nodeBuiltinImport:off - node:os resolves the shared T3 home guard.
 import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import * as NodeOS from "node:os";
diff --git a/apps/server/src/assets/AssetAccess.test.ts b/apps/server/src/assets/AssetAccess.test.ts
index a4831bda239a..96e1c445c7dc 100644
--- a/apps/server/src/assets/AssetAccess.test.ts
+++ b/apps/server/src/assets/AssetAccess.test.ts
@@ -22,6 +22,7 @@ import * as T3ProjectFileLoader from "../project/T3ProjectFileLoader.ts";
 import * as WorkspacePaths from "../workspace/WorkspacePaths.ts";
 import { assetFileResponse } from "../http.ts";
 import { ASSET_ROUTE_PREFIX, issueAssetUrl, resolveAsset } from "./AssetAccess.ts";
+import * as NativeAppIconResolver from "./NativeAppIconResolver.ts";
 import { openMediaFile } from "./MediaFile.ts";
 
 vi.mock("node:fs/promises", async (importOriginal) => {
@@ -40,6 +41,7 @@ const testLayer = Layer.mergeAll(
     Layer.provide(WorkspacePaths.layer),
     Layer.provide(T3ProjectFileLoader.layer),
   ),
+  NativeAppIconResolver.layer.pipe(Layer.provide(configLayer)),
   ServerSecretStore.layer.pipe(Layer.provide(configLayer)),
 ).pipe(Layer.provideMerge(NodeServices.layer));
 
@@ -607,6 +609,21 @@ describe("AssetAccess", () => {
       });
     }).pipe(Effect.provide(testLayer)),
   );
+  it.effect("issues signed native application icon capabilities", () =>
+    Effect.gen(function* () {
+      const result = yield* issueAssetUrl({
+        resource: {
+          _tag: "native-app-icon",
+          app: { _tag: "app-id", appId: "com.example.Editor" },
+        },
+      });
+
+      expect(result.relativeUrl).toMatch(
+        new RegExp(`^${ASSET_ROUTE_PREFIX}/[^/]+/native-app-icon\\.png$`, "u"),
+      );
+      expect(result.expiresAt).toBeGreaterThan(0);
+    }).pipe(Effect.provide(testLayer)),
+  );
 
   it.effect("serves document attachments inline when a viewer requests it", () =>
     Effect.gen(function* () {
diff --git a/apps/server/src/assets/AssetAccess.ts b/apps/server/src/assets/AssetAccess.ts
index e402cf80d010..2551227bc541 100644
--- a/apps/server/src/assets/AssetAccess.ts
+++ b/apps/server/src/assets/AssetAccess.ts
@@ -12,6 +12,7 @@ import {
   AssetWorkspacePathValidationError,
   AssetWorkspaceResolutionError,
   AssetWorkspaceRootNormalizationError,
+  ToolActivityNativeAppReference,
 } from "@t3tools/contracts";
 import {
   hostPreviewMimeTypeFromExtension,
@@ -42,6 +43,7 @@ import { parseAttachmentFileExtension, resolveAttachmentPathById } from "../atta
 import * as ServerConfig from "../config.ts";
 import * as ProjectFaviconResolver from "../project/ProjectFaviconResolver.ts";
 import * as WorkspacePaths from "../workspace/WorkspacePaths.ts";
+import * as NativeAppIconResolver from "./NativeAppIconResolver.ts";
 import { openMediaFile, type OpenMediaFile } from "./MediaFile.ts";
 
 export const ASSET_ROUTE_PREFIX = "/api/assets";
@@ -124,6 +126,12 @@ const AssetClaimsSchema = Schema.Union([
     filePath: Schema.String,
     expiresAt: Schema.Number,
   }),
+  Schema.Struct({
+    version: Schema.Literal(1),
+    kind: Schema.Literal("native-app-icon"),
+    app: ToolActivityNativeAppReference,
+    expiresAt: Schema.Number,
+  }),
 ]);
 type AssetClaims = typeof AssetClaimsSchema.Type;
 
@@ -541,6 +549,16 @@ export const issueAssetUrl = Effect.fn("AssetAccess.issueAssetUrl")(function* (i
       }
       break;
     }
+    case "native-app-icon": {
+      claims = {
+        version: 1,
+        kind: "native-app-icon",
+        app: input.resource.app,
+        expiresAt,
+      };
+      fileName = "native-app-icon.png";
+      break;
+    }
   }
 
   const secretStore = yield* ServerSecretStore.ServerSecretStore;
@@ -653,6 +671,12 @@ export const resolveAsset = Effect.fn("AssetAccess.resolveAsset")(function* (
       : null;
   }
 
+  if (claims.kind === "native-app-icon") {
+    const nativeAppIconResolver = yield* NativeAppIconResolver.NativeAppIconResolver;
+    const iconPath = yield* nativeAppIconResolver.resolve(claims.app);
+    return iconPath ? ({ kind: "file", path: iconPath } satisfies ResolvedAsset) : null;
+  }
+
   const decodedPath = decodeRelativePath(relativePath);
   if (decodedPath === null) return null;
   const path = yield* Path.Path;
diff --git a/apps/server/src/assets/AttachmentUpload.ts b/apps/server/src/assets/AttachmentUpload.ts
index ba3539a3df40..28b20c7ba267 100644
--- a/apps/server/src/assets/AttachmentUpload.ts
+++ b/apps/server/src/assets/AttachmentUpload.ts
@@ -1,4 +1,3 @@
-// @effect-diagnostics nodeBuiltinImport:off
 import * as NodeCrypto from "node:crypto";
 
 import {
diff --git a/apps/server/src/assets/NativeAppIconResolver.test.ts b/apps/server/src/assets/NativeAppIconResolver.test.ts
new file mode 100644
index 000000000000..206f5e952cd6
--- /dev/null
+++ b/apps/server/src/assets/NativeAppIconResolver.test.ts
@@ -0,0 +1,75 @@
+import * as NodeServices from "@effect/platform-node/NodeServices";
+import { describe, expect, it } from "@effect/vitest";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Sink from "effect/Sink";
+import * as Stream from "effect/Stream";
+import { ChildProcessSpawner } from "effect/unstable/process";
+import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
+
+import * as ServerConfig from "../config.ts";
+import * as NativeAppIconResolver from "./NativeAppIconResolver.ts";
+
+function emptyProcessHandle() {
+  return ChildProcessSpawner.makeHandle({
+    pid: ChildProcessSpawner.ProcessId(1),
+    exitCode: Effect.succeed(ChildProcessSpawner.ExitCode(0)),
+    isRunning: Effect.succeed(false),
+    kill: () => Effect.void,
+    unref: Effect.succeed(Effect.void),
+    stdin: Sink.drain,
+    stdout: Stream.empty,
+    stderr: Stream.empty,
+    all: Stream.empty,
+    getInputFd: () => Sink.drain,
+    getOutputFd: () => Stream.empty,
+  });
+}
+
+describe("resolveNativeAppIcon", () => {
+  it.effect("escapes Spotlight wildcards and caches misses", () => {
+    const commands: Array<{ readonly command: string; readonly args: ReadonlyArray<string> }> = [];
+    const spawner = ChildProcessSpawner.make((command) =>
+      Effect.sync(() => {
+        const input = command as unknown as {
+          readonly command: string;
+          readonly args: ReadonlyArray<string>;
+        };
+        commands.push(input);
+        return emptyProcessHandle();
+      }),
+    );
+    const configLayer = ServerConfig.ServerConfig.layerTest(process.cwd(), {
+      prefix: "t3-native-app-icon-test-",
+    });
+    const dependencies = Layer.mergeAll(
+      configLayer,
+      Layer.succeed(HostProcessPlatform, "darwin"),
+      Layer.succeed(ChildProcessSpawner.ChildProcessSpawner, spawner),
+    ).pipe(Layer.provideMerge(NodeServices.layer));
+    const testLayer = NativeAppIconResolver.layer.pipe(Layer.provide(dependencies));
+    const app = { _tag: "display-name", displayName: "Review * App" } as const;
+
+    return Effect.gen(function* () {
+      const resolver = yield* NativeAppIconResolver.NativeAppIconResolver;
+      expect(yield* resolver.resolve(app)).toBeNull();
+      expect(yield* resolver.resolve(app)).toBeNull();
+
+      expect(commands).toHaveLength(1);
+      expect(commands[0]).toMatchObject({ command: "/usr/bin/mdfind" });
+      expect(commands[0]?.args[0]).toContain("Review \\* App");
+
+      for (let index = 0; index < 256; index += 1) {
+        expect(
+          yield* resolver.resolve({
+            _tag: "display-name",
+            displayName: `Missing Review App ${index}`,
+          }),
+        ).toBeNull();
+      }
+      expect(commands).toHaveLength(257);
+      expect(yield* resolver.resolve(app)).toBeNull();
+      expect(commands).toHaveLength(258);
+    }).pipe(Effect.provide(testLayer));
+  });
+});
diff --git a/apps/server/src/assets/NativeAppIconResolver.ts b/apps/server/src/assets/NativeAppIconResolver.ts
new file mode 100644
index 000000000000..ba572650d408
--- /dev/null
+++ b/apps/server/src/assets/NativeAppIconResolver.ts
@@ -0,0 +1,268 @@
+import * as NodeCrypto from "node:crypto";
+import type { ToolActivityNativeAppReference } from "@t3tools/contracts";
+import * as Cache from "effect/Cache";
+import * as Cause from "effect/Cause";
+import * as Effect from "effect/Effect";
+import * as Clock from "effect/Clock";
+import * as Context from "effect/Context";
+import * as Duration from "effect/Duration";
+import * as Exit from "effect/Exit";
+import * as FileSystem from "effect/FileSystem";
+import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
+import * as Path from "effect/Path";
+import * as PlatformError from "effect/PlatformError";
+import * as Semaphore from "effect/Semaphore";
+import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
+import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
+
+import * as ServerConfig from "../config.ts";
+
+const ICON_SIZE = 64;
+const COMMAND_TIMEOUT = "5 seconds";
+const RESOLUTION_CACHE_TTL = Duration.hours(1);
+const RESOLUTION_CACHE_MAX_ENTRIES = 256;
+
+/** Resolves and caches macOS application icons without exposing host paths to clients. */
+export class NativeAppIconResolver extends Context.Service<
+  NativeAppIconResolver,
+  {
+    /** Returns a cached PNG path for the application, or `null` when no icon is available. */
+    readonly resolve: (app: ToolActivityNativeAppReference) => Effect.Effect<string | null>;
+  }
+>()("t3/assets/NativeAppIconResolver") {}
+
+function appCacheKey(app: ToolActivityNativeAppReference): string {
+  return JSON.stringify(app);
+}
+
+function appFromCacheKey(key: string): ToolActivityNativeAppReference {
+  return JSON.parse(key) as ToolActivityNativeAppReference;
+}
+
+const existingFile = Effect.fn("NativeAppIconResolver.existingFile")(function* (filePath: string) {
+  const fileSystem = yield* FileSystem.FileSystem;
+  const info = yield* fileSystem.stat(filePath).pipe(
+    Effect.map(Option.some),
+    Effect.catchTags({
+      PlatformError: (error) =>
+        error.reason._tag === "NotFound" ? Effect.succeed(Option.none()) : Effect.fail(error),
+    }),
+  );
+  return Option.isSome(info) && info.value.type === "File" ? filePath : null;
+});
+
+const commandOutput = Effect.fn("NativeAppIconResolver.commandOutput")(function* (
+  command: string,
+  args: ReadonlyArray<string>,
+) {
+  const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
+  return yield* spawner
+    .string(ChildProcess.make(command, args, { stdin: "ignore", stderr: "ignore" }))
+    .pipe(Effect.timeout(COMMAND_TIMEOUT));
+});
+
+const plistValue = Effect.fn("NativeAppIconResolver.plistValue")(function* (
+  infoPlistPath: string,
+  key: string,
+) {
+  return yield* commandOutput("/usr/bin/plutil", [
+    "-extract",
+    key,
+    "raw",
+    "-o",
+    "-",
+    infoPlistPath,
+  ]).pipe(
+    Effect.map((value) => value.trim()),
+    Effect.orElseSucceed(() => ""),
+  );
+});
+
+function escapeSpotlightString(value: string): string {
+  return value.replace(/([\\'*?])/gu, "\\$1");
+}
+
+function containsControlCharacter(value: string): boolean {
+  return [...value].some((character) => {
+    const codePoint = character.codePointAt(0) ?? 0;
+    return codePoint <= 31 || codePoint === 127;
+  });
+}
+
+const resolveApplicationPath = Effect.fn("NativeAppIconResolver.resolveApplicationPath")(function* (
+  app: ToolActivityNativeAppReference,
+) {
+  const path = yield* Path.Path;
+  const query =
+    app._tag === "app-id"
+      ? `kMDItemCFBundleIdentifier == '${app.appId}'`
+      : `kMDItemContentType == 'com.apple.application-bundle' && kMDItemDisplayName == '${escapeSpotlightString(app.displayName)}'`;
+  const spotlightOutput = yield* commandOutput("/usr/bin/mdfind", [query]);
+  const candidates = spotlightOutput
+    .split(/\r?\n/u)
+    .map((value) => value.trim())
+    .filter((value) => value.endsWith(".app"));
+  const matchingCandidates =
+    app._tag === "app-id"
+      ? candidates
+      : candidates.filter(
+          (value) =>
+            path.basename(value, ".app").toLocaleLowerCase() ===
+            app.displayName.toLocaleLowerCase(),
+        );
+  const rankedCandidates = matchingCandidates.length > 0 ? matchingCandidates : candidates;
+  let mostRecentlyUsed: { readonly path: string; readonly lastUsed: string } | null = null;
+  for (const candidate of rankedCandidates) {
+    const lastUsed = yield* commandOutput("/usr/bin/mdls", [
+      "-raw",
+      "-name",
+      "kMDItemLastUsedDate",
+      candidate,
+    ]).pipe(
+      Effect.map((value) => value.trim()),
+      Effect.orElseSucceed(() => ""),
+    );
+    if (!mostRecentlyUsed || lastUsed > mostRecentlyUsed.lastUsed) {
+      mostRecentlyUsed = { path: candidate, lastUsed };
+    }
+  }
+  return mostRecentlyUsed?.path ?? null;
+});
+
+const resolveNativeAppIconUncached = Effect.fn("NativeAppIconResolver.resolveUncached")(function* (
+  app: ToolActivityNativeAppReference,
+) {
+  const fileSystem = yield* FileSystem.FileSystem;
+  const path = yield* Path.Path;
+  const config = yield* ServerConfig.ServerConfig;
+  const appPath = yield* resolveApplicationPath(app);
+  if (!appPath) return null;
+
+  const canonicalAppPath = yield* fileSystem.realPath(appPath);
+  const infoPlistPath = path.join(canonicalAppPath, "Contents", "Info.plist");
+  const resourcesDirectory = path.join(canonicalAppPath, "Contents", "Resources");
+  const iconName =
+    (yield* plistValue(infoPlistPath, "CFBundleIconFile")) ||
+    (yield* plistValue(infoPlistPath, "CFBundleIconName"));
+  if (iconName && path.basename(iconName) !== iconName) return null;
+  const iconFileName = iconName ? (path.extname(iconName) ? iconName : `${iconName}.icns`) : null;
+  const resourceEntries = yield* fileSystem
+    .readDirectory(resourcesDirectory)
+    .pipe(Effect.orElseSucceed(() => []));
+  const sourceIconCandidate =
+    (iconFileName ? yield* existingFile(path.join(resourcesDirectory, iconFileName)) : null) ??
+    (yield* existingFile(path.join(resourcesDirectory, "AppIcon.icns"))) ??
+    (resourceEntries.find((entry) => entry.toLowerCase().endsWith(".icns"))
+      ? yield* existingFile(
+          path.join(
+            resourcesDirectory,
+            resourceEntries.find((entry) => entry.toLowerCase().endsWith(".icns"))!,
+          ),
+        )
+      : null);
+  if (!sourceIconCandidate) return null;
+  const sourceIconPath = yield* fileSystem.realPath(sourceIconCandidate);
+  const relativeSource = path.relative(resourcesDirectory, sourceIconPath);
+  if (
+    relativeSource === ".." ||
+    relativeSource.startsWith(`..${path.sep}`) ||
+    path.isAbsolute(relativeSource)
+  ) {
+    return null;
+  }
+
+  const appVersion =
+    (yield* plistValue(infoPlistPath, "CFBundleVersion")) ||
+    (yield* plistValue(infoPlistPath, "CFBundleShortVersionString"));
+  const cacheKey = NodeCrypto.createHash("sha256")
+    .update(`${canonicalAppPath}\0${appVersion}\0${sourceIconPath}`)
+    .digest("hex");
+  const cacheDirectory = path.join(config.providerStatusCacheDir, "native-app-icons");
+  const cachePath = path.join(cacheDirectory, `${cacheKey}.png`);
+  if (yield* existingFile(cachePath)) return cachePath;
+
+  yield* fileSystem.makeDirectory(cacheDirectory, { recursive: true });
+  const temporaryPath = path.join(
+    cacheDirectory,
+    `.${cacheKey}-${process.pid}-${(yield* Clock.currentTimeMillis).toString(36)}-${NodeCrypto.randomUUID()}.png`,
+  );
+  yield* commandOutput("/usr/bin/sips", [
+    "-z",
+    String(ICON_SIZE),
+    String(ICON_SIZE),
+    "-s",
+    "format",
+    "png",
+    sourceIconPath,
+    "--out",
+    temporaryPath,
+  ]).pipe(
+    Effect.tap(() => fileSystem.rename(temporaryPath, cachePath)),
+    Effect.ensuring(
+      fileSystem.remove(temporaryPath).pipe(Effect.catchTags({ PlatformError: () => Effect.void })),
+    ),
+  );
+  return yield* existingFile(cachePath);
+});
+
+export const make = Effect.gen(function* () {
+  const fileSystem = yield* FileSystem.FileSystem;
+  const hostPlatform = yield* HostProcessPlatform;
+  const resolutionSemaphore = yield* Semaphore.make(2);
+  const resolutionCache: Cache.Cache<
+    string,
+    string | null,
+    PlatformError.PlatformError | Cause.TimeoutError
+  > = yield* Cache.makeWith(
+    (key: string) =>
+      resolutionSemaphore.withPermits(1)(resolveNativeAppIconUncached(appFromCacheKey(key))),
+    {
+      capacity: RESOLUTION_CACHE_MAX_ENTRIES,
+      timeToLive: Exit.match({
+        onSuccess: () => RESOLUTION_CACHE_TTL,
+        onFailure: () => Duration.zero,
+      }),
+    },
+  );
+
+  const cachedFileExists = (filePath: string) =>
+    fileSystem.stat(filePath).pipe(
+      Effect.map((info) => info.type === "File"),
+      Effect.catchTags({
+        PlatformError: (error) =>
+          error.reason._tag === "NotFound" ? Effect.succeed(false) : Effect.fail(error),
+      }),
+    );
+
+  const resolveAttempt = Effect.fn("NativeAppIconResolver.resolve")(function* (
+    app: ToolActivityNativeAppReference,
+  ) {
+    if (
+      hostPlatform !== "darwin" ||
+      (app._tag === "display-name" && containsControlCharacter(app.displayName))
+    ) {
+      return null;
+    }
+
+    const key = appCacheKey(app);
+    const cached = yield* Cache.get(resolutionCache, key);
+    if (cached === null) return null;
+    if (yield* cachedFileExists(cached)) return cached;
+
+    yield* Cache.invalidate(resolutionCache, key);
+    return yield* Cache.get(resolutionCache, key);
+  });
+
+  const resolve: NativeAppIconResolver["Service"]["resolve"] = (app) =>
+    resolveAttempt(app).pipe(
+      Effect.tapError((cause) =>
+        Effect.logDebug("Failed to resolve native application icon.", { app, cause }),
+      ),
+      Effect.orElseSucceed(() => null),
+    );
+
+  return NativeAppIconResolver.of({ resolve });
+});
+
+export const layer = Layer.effect(NativeAppIconResolver, make);
diff --git a/apps/server/src/auth/EnvironmentAuth.ts b/apps/server/src/auth/EnvironmentAuth.ts
index 08838cb7b780..2d0f02274de9 100644
--- a/apps/server/src/auth/EnvironmentAuth.ts
+++ b/apps/server/src/auth/EnvironmentAuth.ts
@@ -923,12 +923,10 @@ export const make = Effect.gen(function* () {
   const listClientSessions: EnvironmentAuth["Service"]["listClientSessions"] = (currentSessionId) =>
     listSessions().pipe(
       Effect.map((clientSessions) =>
-        clientSessions.map(
-          (clientSession): AuthClientSession => ({
-            ...clientSession,
-            current: clientSession.sessionId === currentSessionId,
-          }),
-        ),
+        clientSessions.map((clientSession): AuthClientSession => ({
+          ...clientSession,
+          current: clientSession.sessionId === currentSessionId,
+        })),
       ),
       Effect.withSpan("EnvironmentAuth.listClientSessions"),
     );
diff --git a/apps/server/src/auth/RpcAuthorization.ts b/apps/server/src/auth/RpcAuthorization.ts
index 860fd1e524b2..11b60289ddb6 100644
--- a/apps/server/src/auth/RpcAuthorization.ts
+++ b/apps/server/src/auth/RpcAuthorization.ts
@@ -81,6 +81,8 @@ export const RPC_REQUIRED_SCOPES = {
   // write like every other one.
   [WS_METHODS.pullRequestsReviewerCandidates]: AuthOrchestrationReadScope,
   [WS_METHODS.pullRequestsRequestReviewers]: AuthOrchestrationOperateScope,
+  [WS_METHODS.pullRequestsLabelCandidates]: AuthOrchestrationReadScope,
+  [WS_METHODS.pullRequestsSetLabels]: AuthOrchestrationOperateScope,
   [WS_METHODS.sourceControlLookupRepository]: AuthOrchestrationReadScope,
   [WS_METHODS.sourceControlCloneRepository]: AuthOrchestrationOperateScope,
   [WS_METHODS.sourceControlPublishRepository]: AuthOrchestrationOperateScope,
diff --git a/apps/server/src/cloud/CliTokenManager.ts b/apps/server/src/cloud/CliTokenManager.ts
index b0867b62f6c8..c4443a7301cb 100644
--- a/apps/server/src/cloud/CliTokenManager.ts
+++ b/apps/server/src/cloud/CliTokenManager.ts
@@ -89,9 +89,10 @@ export const waitForLoopbackAuthorization = Effect.fn(
       while (true) {
         const result = yield* Effect.raceFirst(
           input.callback.pipe(
-            Effect.map(
-              (code): LoopbackAuthorizationResult => ({ _tag: "AuthorizationCode", code }),
-            ),
+            Effect.map((code): LoopbackAuthorizationResult => ({
+              _tag: "AuthorizationCode",
+              code,
+            })),
           ),
           readLoopbackAuthorizationAction(terminalInput),
         );
diff --git a/apps/server/src/diagnostics/ProcessDiagnostics.ts b/apps/server/src/diagnostics/ProcessDiagnostics.ts
index 8aeb7ba24715..fecf457046d9 100644
--- a/apps/server/src/diagnostics/ProcessDiagnostics.ts
+++ b/apps/server/src/diagnostics/ProcessDiagnostics.ts
@@ -61,21 +61,19 @@ export const make = Effect.fn("makeProcessDiagnostics")(function* () {
     Effect.map((snapshot) => {
       const processes = snapshot.processes
         .filter((entry) => canSignalCategory(entry.category))
-        .map(
-          (entry): ServerProcessDiagnosticsEntry => ({
-            pid: entry.identity.pid,
-            startTimeMs: entry.identity.startTimeMs,
-            ppid: entry.ppid,
-            pgid: Option.none(),
-            status: entry.status || "Unknown",
-            cpuPercent: entry.cpuPercent,
-            rssBytes: entry.residentBytes,
-            elapsed: formatElapsed(entry.runTimeMs),
-            command: entry.command || entry.name || "unknown",
-            depth: Math.max(0, entry.depth - 1),
-            childPids: entry.childPids,
-          }),
-        );
+        .map((entry): ServerProcessDiagnosticsEntry => ({
+          pid: entry.identity.pid,
+          startTimeMs: entry.identity.startTimeMs,
+          ppid: entry.ppid,
+          pgid: Option.none(),
+          status: entry.status || "Unknown",
+          cpuPercent: entry.cpuPercent,
+          rssBytes: entry.residentBytes,
+          elapsed: formatElapsed(entry.runTimeMs),
+          command: entry.command || entry.name || "unknown",
+          depth: Math.max(0, entry.depth - 1),
+          childPids: entry.childPids,
+        }));
       return {
         serverPid: process.pid,
         readAt: snapshot.readAt,
diff --git a/apps/server/src/environment/ServerEnvironment.ts b/apps/server/src/environment/ServerEnvironment.ts
index 38526c277860..5b6bb34ab0ee 100644
--- a/apps/server/src/environment/ServerEnvironment.ts
+++ b/apps/server/src/environment/ServerEnvironment.ts
@@ -20,6 +20,7 @@ import { resolveServiceLauncherMode } from "../cloud/serviceLauncherClient.ts";
 import * as ServerConfig from "../config.ts";
 import * as ProcessRunner from "../processRunner.ts";
 import { resolveServerEnvironmentLabel } from "./ServerEnvironmentLabel.ts";
+import { detectServerEnvironmentMachineKind } from "./ServerEnvironmentMachine.ts";
 
 export class ServerEnvironmentIdPersistenceError extends Schema.TaggedErrorClass<ServerEnvironmentIdPersistenceError>()(
   "ServerEnvironmentIdPersistenceError",
@@ -188,6 +189,7 @@ export const make = Effect.gen(function* () {
   const environmentId = yield* identity.getEnvironmentId;
   const cwdBaseName = path.basename(serverConfig.cwd).trim();
   const label = yield* resolveServerEnvironmentLabel({ cwdBaseName });
+  const machine = yield* detectServerEnvironmentMachineKind();
   const launcher = yield* resolveServiceLauncherMode();
   const serverSelfUpdate = resolveServerSelfUpdateCapability({
     desktopManaged: serverConfig.mode === "desktop",
@@ -206,6 +208,7 @@ export const make = Effect.gen(function* () {
     platform: {
       os: platformOs(hostPlatform),
       arch: platformArch(hostArchitecture),
+      ...(machine === null ? {} : { machine }),
     },
     serverVersion: packageJson.version,
     capabilities: {
@@ -223,6 +226,7 @@ export const make = Effect.gen(function* () {
       threadPinReorder: true,
       threadTitleRegeneration: true,
       threadPullRequestLinking: true,
+      environmentIcon: true,
       ...(serverSelfUpdate === null ? {} : { serverSelfUpdate }),
       ...(serverSelfUpdate === "boot-service" || desktopAppUpdate
         ? {
diff --git a/apps/server/src/environment/ServerEnvironmentMachine.test.ts b/apps/server/src/environment/ServerEnvironmentMachine.test.ts
new file mode 100644
index 000000000000..c4318e7a9d7b
--- /dev/null
+++ b/apps/server/src/environment/ServerEnvironmentMachine.test.ts
@@ -0,0 +1,225 @@
+import { afterEach, describe, expect, it } from "@effect/vitest";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Layer from "effect/Layer";
+import * as PlatformError from "effect/PlatformError";
+import * as ChildProcessSpawner from "effect/unstable/process/ChildProcessSpawner";
+import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
+import { vi } from "vite-plus/test";
+
+import * as ProcessRunner from "../processRunner.ts";
+import {
+  detectServerEnvironmentMachineKind,
+  machineKindFromAppleProductName,
+  machineKindFromDmi,
+} from "./ServerEnvironmentMachine.ts";
+
+const runMock = vi.fn<ProcessRunner.ProcessRunner["Service"]["run"]>();
+
+const ProcessRunnerTest = Layer.succeed(
+  ProcessRunner.ProcessRunner,
+  ProcessRunner.ProcessRunner.of({ run: (input) => runMock(input) }),
+);
+
+const processOutput = (stdout: string, code = 0) =>
+  Effect.succeed({
+    stdout,
+    stderr: "",
+    code: ChildProcessSpawner.ExitCode(code),
+    timedOut: false,
+    stdoutTruncated: false,
+    stderrTruncated: false,
+    stdoutInvalidUtf8: false,
+    stderrInvalidUtf8: false,
+  });
+
+const dmiFileSystem = (files: Readonly<Record<string, string>>) =>
+  FileSystem.layerNoop({
+    readFileString: (path) => {
+      const name = path.slice(path.lastIndexOf("/") + 1);
+      return name in files
+        ? Effect.succeed(files[name]!)
+        : Effect.fail(
+            PlatformError.systemError({
+              _tag: "NotFound",
+              module: "FileSystem",
+              method: "readFileString",
+              pathOrDescriptor: path,
+              cause: new Error("ENOENT"),
+            }),
+          );
+    },
+  });
+
+const withPlatform = (platform: NodeJS.Platform, fileSystem = FileSystem.layerNoop({})) =>
+  Layer.mergeAll(ProcessRunnerTest, fileSystem, Layer.succeed(HostProcessPlatform, platform));
+
+afterEach(() => {
+  runMock.mockReset();
+});
+
+describe("machineKindFromAppleProductName", () => {
+  it("maps marketing names and model identifiers", () => {
+    expect(machineKindFromAppleProductName("Mac mini (2024)")).toBe("mac-mini");
+    expect(machineKindFromAppleProductName("Macmini8,1")).toBe("mac-mini");
+    expect(machineKindFromAppleProductName("Mac Studio (2023)")).toBe("mac-studio");
+    expect(machineKindFromAppleProductName("MacBook Pro (14-inch, 2024)")).toBe("laptop");
+    expect(machineKindFromAppleProductName("MacBookAir10,1")).toBe("laptop");
+    expect(machineKindFromAppleProductName("iMac (24-inch, 2024)")).toBe("desktop");
+    expect(machineKindFromAppleProductName("Mac Pro (2023)")).toBe("desktop");
+  });
+
+  it("returns null for Apple silicon model identifiers, which carry no product family", () => {
+    expect(machineKindFromAppleProductName("Mac16,10")).toBeNull();
+  });
+});
+
+describe("machineKindFromDmi", () => {
+  it("prefers virtualization markers over chassis type", () => {
+    expect(
+      machineKindFromDmi({ chassisType: "1", sysVendor: "QEMU", productName: "Standard PC" }),
+    ).toBe("cloud");
+    expect(
+      machineKindFromDmi({
+        chassisType: "3",
+        sysVendor: "Microsoft Corporation",
+        productName: "Virtual Machine",
+      }),
+    ).toBe("cloud");
+    expect(
+      machineKindFromDmi({ chassisType: "1", sysVendor: "Amazon EC2", productName: "t3.large" }),
+    ).toBe("cloud");
+  });
+
+  it("does not treat Microsoft hardware as a VM", () => {
+    expect(
+      machineKindFromDmi({
+        chassisType: "9",
+        sysVendor: "Microsoft Corporation",
+        productName: "Surface Laptop 5",
+      }),
+    ).toBe("laptop");
+  });
+
+  it("maps SMBIOS chassis codes", () => {
+    expect(
+      machineKindFromDmi({ chassisType: "3", sysVendor: "GMKtec", productName: "NucBox K8 Plus" }),
+    ).toBe("desktop");
+    expect(
+      machineKindFromDmi({ chassisType: "10", sysVendor: "LENOVO", productName: "ThinkPad X1" }),
+    ).toBe("laptop");
+    expect(
+      machineKindFromDmi({ chassisType: "23", sysVendor: "Supermicro", productName: "X11" }),
+    ).toBe("server");
+    expect(machineKindFromDmi({ chassisType: "1", sysVendor: null, productName: null })).toBeNull();
+    expect(
+      machineKindFromDmi({ chassisType: null, sysVendor: null, productName: null }),
+    ).toBeNull();
+  });
+
+  it("recognizes Apple hardware running Linux", () => {
+    expect(
+      machineKindFromDmi({ chassisType: "3", sysVendor: "Apple", productName: "Mac Studio" }),
+    ).toBe("mac-studio");
+  });
+});
+
+describe("detectServerEnvironmentMachineKind", () => {
+  it.effect("reads the IOKit product name on macOS", () =>
+    Effect.gen(function* () {
+      runMock.mockReturnValueOnce(
+        processOutput(
+          '+-o product  <class IOPlatformDevice>\n    {\n      "product-name" = <"Mac mini (2024)">\n    }\n',
+        ),
+      );
+
+      const result = yield* detectServerEnvironmentMachineKind().pipe(
+        Effect.provide(withPlatform("darwin")),
+      );
+
+      expect(result).toBe("mac-mini");
+      expect(runMock).toHaveBeenCalledTimes(1);
+      expect(runMock).toHaveBeenCalledWith(
+        expect.objectContaining({ command: "ioreg", args: ["-rd1", "-n", "product"] }),
+      );
+    }),
+  );
+
+  it.effect("falls back to hw.model when IOKit has no product node", () =>
+    Effect.gen(function* () {
+      runMock.mockReturnValueOnce(processOutput("", 1));
+      runMock.mockReturnValueOnce(processOutput("MacBookPro16,1\n"));
+
+      const result = yield* detectServerEnvironmentMachineKind().pipe(
+        Effect.provide(withPlatform("darwin")),
+      );
+
+      expect(result).toBe("laptop");
+      expect(runMock).toHaveBeenLastCalledWith(
+        expect.objectContaining({ command: "sysctl", args: ["-n", "hw.model"] }),
+      );
+    }),
+  );
+
+  it.effect("returns null when both macOS probes fail", () =>
+    Effect.gen(function* () {
+      runMock.mockImplementation((input) =>
+        Effect.fail(
+          new ProcessRunner.ProcessSpawnError({
+            command: input.command,
+            argumentCount: input.args.length,
+            cause: new Error("ENOENT"),
+          }),
+        ),
+      );
+
+      const result = yield* detectServerEnvironmentMachineKind().pipe(
+        Effect.provide(withPlatform("darwin")),
+      );
+
+      expect(result).toBeNull();
+      expect(runMock).toHaveBeenCalledTimes(2);
+    }),
+  );
+
+  it.effect("reads DMI on Linux", () =>
+    Effect.gen(function* () {
+      const result = yield* detectServerEnvironmentMachineKind().pipe(
+        Effect.provide(
+          withPlatform(
+            "linux",
+            dmiFileSystem({
+              chassis_type: "3\n",
+              sys_vendor: "GMKtec\n",
+              product_name: "NucBox K8 Plus\n",
+            }),
+          ),
+        ),
+      );
+
+      expect(result).toBe("desktop");
+      expect(runMock).not.toHaveBeenCalled();
+    }),
+  );
+
+  it.effect("returns null on Linux without DMI (containers, ARM boards)", () =>
+    Effect.gen(function* () {
+      const result = yield* detectServerEnvironmentMachineKind().pipe(
+        Effect.provide(withPlatform("linux", dmiFileSystem({}))),
+      );
+
+      expect(result).toBeNull();
+    }),
+  );
+
+  it.effect("skips detection on other platforms", () =>
+    Effect.gen(function* () {
+      const result = yield* detectServerEnvironmentMachineKind().pipe(
+        Effect.provide(withPlatform("win32")),
+      );
+
+      expect(result).toBeNull();
+      expect(runMock).not.toHaveBeenCalled();
+    }),
+  );
+});
diff --git a/apps/server/src/environment/ServerEnvironmentMachine.ts b/apps/server/src/environment/ServerEnvironmentMachine.ts
new file mode 100644
index 000000000000..e23342d12c09
--- /dev/null
+++ b/apps/server/src/environment/ServerEnvironmentMachine.ts
@@ -0,0 +1,167 @@
+import type { EnvironmentMachineKind } from "@t3tools/contracts";
+import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+
+import * as ProcessRunner from "../processRunner.ts";
+
+/**
+ * Best-effort hardware detection for the environment icon. Every probe is
+ * allowed to fail: a null result means "no signal", and the client draws a
+ * generic server until the user picks something in Settings → Connections.
+ */
+
+const DMI_ROOT = "/sys/class/dmi/id";
+
+// SMBIOS 3.x System Enclosure types (table 17). Codes that describe a shape
+// rather than a machine (docking stations, blades enclosures, IoT gateways)
+// fall through to null on purpose.
+const DMI_CHASSIS_KINDS: Readonly<Record<string, EnvironmentMachineKind>> = {
+  "3": "desktop", // Desktop
+  "4": "desktop", // Low Profile Desktop
+  "5": "desktop", // Pizza Box
+  "6": "desktop", // Mini Tower
+  "7": "desktop", // Tower
+  "8": "laptop", // Portable
+  "9": "laptop", // Laptop
+  "10": "laptop", // Notebook
+  "13": "desktop", // All in One
+  "14": "laptop", // Sub Notebook
+  "15": "desktop", // Space-saving
+  "16": "desktop", // Lunch Box
+  "17": "server", // Main Server Chassis
+  "18": "server", // Expansion Chassis
+  "19": "server", // SubChassis
+  "20": "server", // Bus Expansion Chassis
+  "21": "server", // Peripheral Chassis
+  "22": "server", // RAID Chassis
+  "23": "server", // Rack Mount Chassis
+  "24": "server", // Sealed-case PC
+  "28": "server", // Blade
+  "31": "laptop", // Convertible
+  "32": "laptop", // Detachable
+  "35": "desktop", // Mini PC
+};
+
+// Hypervisors and cloud providers write themselves into the DMI vendor or
+// product strings; any hit means the box is a VM, and a VM reads as "cloud"
+// regardless of the chassis type the hypervisor fakes. Hyper-V is matched on
+// its "Virtual Machine" product, not the "Microsoft Corporation" vendor that
+// physical Surface devices share.
+const VIRTUALIZATION_MARKERS = [
+  "qemu",
+  "kvm",
+  "bochs",
+  "vmware",
+  "virtualbox",
+  "innotek",
+  "xen",
+  "parallels",
+  "amazon ec2",
+  "google compute engine",
+  "digitalocean",
+  "hetzner",
+  "linode",
+  "vultr",
+  "scaleway",
+  "openstack",
+  "cloud",
+  "virtual machine",
+];
+
+function normalize(value: string | null | undefined): string | null {
+  const trimmed = value?.trim();
+  return trimmed && trimmed.length > 0 ? trimmed : null;
+}
+
+/** Marketing names and Intel-era model identifiers share these prefixes. */
+export function machineKindFromAppleProductName(name: string): EnvironmentMachineKind | null {
+  const normalized = name.trim().toLowerCase().replaceAll(/\s+/g, "");
+  if (normalized.startsWith("macmini")) return "mac-mini";
+  if (normalized.startsWith("macstudio")) return "mac-studio";
+  if (normalized.startsWith("macbook")) return "laptop";
+  if (normalized.startsWith("imac") || normalized.startsWith("macpro")) return "desktop";
+  return null;
+}
+
+export function machineKindFromDmi(input: {
+  readonly chassisType: string | null;
+  readonly sysVendor: string | null;
+  readonly productName: string | null;
+}): EnvironmentMachineKind | null {
+  const productName = input.productName ?? "";
+  const vendorAndProduct = `${input.sysVendor ?? ""} ${productName}`.toLowerCase();
+  if (VIRTUALIZATION_MARKERS.some((marker) => vendorAndProduct.includes(marker))) {
+    return "cloud";
+  }
+  // Apple hardware booting Linux (Asahi) still reports the Apple product name.
+  const appleKind = machineKindFromAppleProductName(productName);
+  if (appleKind !== null) {
+    return appleKind;
+  }
+  return input.chassisType === null ? null : (DMI_CHASSIS_KINDS[input.chassisType] ?? null);
+}
+
+const readOptionalFile = Effect.fn("readOptionalFile")(function* (path: string) {
+  const fileSystem = yield* FileSystem.FileSystem;
+  return yield* fileSystem.readFileString(path).pipe(
+    Effect.map(normalize),
+    Effect.catch(() => Effect.succeed(null)),
+  );
+});
+
+const runProbe = Effect.fn("runMachineProbe")(function* (input: {
+  readonly command: string;
+  readonly args: ReadonlyArray<string>;
+}) {
+  const processRunner = yield* ProcessRunner.ProcessRunner;
+  return yield* processRunner
+    .run({
+      command: input.command,
+      args: input.args,
+      timeout: "5 seconds",
+      timeoutBehavior: "timedOutResult",
+    })
+    .pipe(
+      Effect.map((result) => (result.code === 0 ? normalize(result.stdout) : null)),
+      Effect.catch(() => Effect.succeed(null)),
+    );
+});
+
+// IOKit's `product` node carries the marketing name ("Mac mini (2024)") on
+// Apple silicon; Intel Macs lack it, so `hw.model` ("Macmini8,1") is the
+// fallback. Both are single-digit-millisecond calls.
+const detectDarwinMachineKind = Effect.fn("detectDarwinMachineKind")(function* () {
+  const ioreg = yield* runProbe({ command: "ioreg", args: ["-rd1", "-n", "product"] });
+  const productName = ioreg?.match(/"product-name"\s*=\s*<"([^"]+)">/)?.[1] ?? null;
+  const fromProductName =
+    productName === null ? null : machineKindFromAppleProductName(productName);
+  if (fromProductName !== null) {
+    return fromProductName;
+  }
+  const model = yield* runProbe({ command: "sysctl", args: ["-n", "hw.model"] });
+  return model === null ? null : machineKindFromAppleProductName(model);
+});
+
+const detectLinuxMachineKind = Effect.fn("detectLinuxMachineKind")(function* () {
+  const [chassisType, sysVendor, productName] = yield* Effect.all([
+    readOptionalFile(`${DMI_ROOT}/chassis_type`),
+    readOptionalFile(`${DMI_ROOT}/sys_vendor`),
+    readOptionalFile(`${DMI_ROOT}/product_name`),
+  ]);
+  return machineKindFromDmi({ chassisType, sysVendor, productName });
+});
+
+export const detectServerEnvironmentMachineKind = Effect.fn("detectServerEnvironmentMachineKind")(
+  function* () {
+    const platform = yield* HostProcessPlatform;
+    switch (platform) {
+      case "darwin":
+        return yield* detectDarwinMachineKind();
+      case "linux":
+        return yield* detectLinuxMachineKind();
+      default:
+        return null;
+    }
+  },
+);
diff --git a/apps/server/src/http.ts b/apps/server/src/http.ts
index b911dd63f0c8..5a2a3a5520e6 100644
--- a/apps/server/src/http.ts
+++ b/apps/server/src/http.ts
@@ -73,8 +73,7 @@ export function downloadContentDisposition(fileName?: string): string {
     return "attachment";
   }
   // toWellFormed: encodeURIComponent throws URIError on unpaired surrogates.
-  // eslint-disable-next-line no-control-regex -- Header filenames must strip ASCII controls.
-  const sanitized = fileName.toWellFormed().replace(/[\u0000-\u001f"\\]/g, "_");
+  const sanitized = fileName.toWellFormed().replace(/[\p{Cc}"\\]/gu, "_");
   const asciiFallback = sanitized.replace(/[^\u0020-\u007e]/g, "_");
   const needsExtended = asciiFallback !== sanitized;
   const extendedName = encodeURIComponent(sanitized).replace(
diff --git a/apps/server/src/keybindings.test.ts b/apps/server/src/keybindings.test.ts
index 079e7a14edac..6c32235c27f8 100644
--- a/apps/server/src/keybindings.test.ts
+++ b/apps/server/src/keybindings.test.ts
@@ -207,6 +207,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => {
       assert.equal(defaultsByCommand.get("sidebar.toggle"), "mod+b");
       assert.equal(defaultsByCommand.get("rightPanel.toggle"), "mod+alt+b");
       assert.isFalse(defaultsByCommand.has("rightPanel.toggleMaximized"));
+      assert.equal(defaultsByCommand.get("rightPanel.close"), "mod+w");
       assert.equal(defaultsByCommand.get("terminal.splitVertical"), "mod+shift+d");
       assert.equal(defaultsByCommand.get("modelPicker.jump.1"), "mod+1");
       assert.equal(defaultsByCommand.get("modelPicker.jump.9"), "mod+9");
diff --git a/apps/server/src/mcp/McpHttpServer.ts b/apps/server/src/mcp/McpHttpServer.ts
index 87975a49de2c..44ca928e63bb 100644
--- a/apps/server/src/mcp/McpHttpServer.ts
+++ b/apps/server/src/mcp/McpHttpServer.ts
@@ -64,30 +64,29 @@ export const normalizeMcpHttpResponse = (
 };
 
 const makeMcpAuthMiddleware = McpSessionRegistry.McpSessionRegistry.pipe(
-  Effect.map(
-    (registry): McpAuthMiddleware =>
-      Effect.fn("McpHttpServer.authenticateRequest")(function* (httpEffect) {
-        const request = yield* HttpServerRequest.HttpServerRequest;
-        const authorization = request.headers.authorization;
-        const token =
-          authorization?.startsWith("Bearer ") === true
-            ? authorization.slice("Bearer ".length).trim()
-            : "";
-        const invocation = yield* registry.resolve(token);
-        if (!invocation) {
-          // Without this the only symptom of a dead credential is the agent
-          // quietly losing the whole `t3-code` toolkit for the rest of its
-          // session, with nothing on the server to explain why.
-          yield* Effect.logWarning("rejected MCP request with an unusable credential", {
-            reason: token.length === 0 ? "missing_bearer_token" : "unknown_or_expired_token",
-          });
-          return unauthorized;
-        }
-        return yield* httpEffect.pipe(
-          Effect.provideService(McpInvocationContext.McpInvocationContext, invocation),
-          Effect.map(normalizeMcpHttpResponse),
-        );
-      }),
+  Effect.map((registry): McpAuthMiddleware =>
+    Effect.fn("McpHttpServer.authenticateRequest")(function* (httpEffect) {
+      const request = yield* HttpServerRequest.HttpServerRequest;
+      const authorization = request.headers.authorization;
+      const token =
+        authorization?.startsWith("Bearer ") === true
+          ? authorization.slice("Bearer ".length).trim()
+          : "";
+      const invocation = yield* registry.resolve(token);
+      if (!invocation) {
+        // Without this the only symptom of a dead credential is the agent
+        // quietly losing the whole `t3-code` toolkit for the rest of its
+        // session, with nothing on the server to explain why.
+        yield* Effect.logWarning("rejected MCP request with an unusable credential", {
+          reason: token.length === 0 ? "missing_bearer_token" : "unknown_or_expired_token",
+        });
+        return unauthorized;
+      }
+      return yield* httpEffect.pipe(
+        Effect.provideService(McpInvocationContext.McpInvocationContext, invocation),
+        Effect.map(normalizeMcpHttpResponse),
+      );
+    }),
   ),
   Effect.withSpan("McpHttpServer.makeAuthMiddleware"),
 );
diff --git a/apps/server/src/orchestration/Layers/ProjectionPipeline.test.ts b/apps/server/src/orchestration/Layers/ProjectionPipeline.test.ts
index 504fa7c52542..260e3567c242 100644
--- a/apps/server/src/orchestration/Layers/ProjectionPipeline.test.ts
+++ b/apps/server/src/orchestration/Layers/ProjectionPipeline.test.ts
@@ -3423,17 +3423,20 @@ engineLayer("OrchestrationProjectionPipeline via engine dispatch", (it) => {
           model: "gpt-5",
         },
         faviconPath: "brand/icon.svg",
+        projectIcon: { kind: "emoji", emoji: "🚀" },
       });
 
       const projectRows = yield* sql<{
         readonly scriptsJson: string;
         readonly defaultModelSelection: string;
         readonly faviconPath: string | null;
+        readonly projectIcon: string | null;
       }>`
         SELECT
           scripts_json AS "scriptsJson",
           default_model_selection_json AS "defaultModelSelection",
-          favicon_path AS "faviconPath"
+          favicon_path AS "faviconPath",
+          project_icon_json AS "projectIcon"
         FROM projection_projects
         WHERE project_id = 'project-scripts'
       `;
@@ -3443,6 +3446,7 @@ engineLayer("OrchestrationProjectionPipeline via engine dispatch", (it) => {
             '[{"id":"script-1","name":"Build","command":"bun run build","icon":"build","runOnWorktreeCreate":false}]',
           defaultModelSelection: '{"instanceId":"codex","model":"gpt-5"}',
           faviconPath: "brand/icon.svg",
+          projectIcon: '{"kind":"emoji","emoji":"🚀"}',
         },
       ]);
     }),
diff --git a/apps/server/src/orchestration/Layers/ProjectionPipeline.ts b/apps/server/src/orchestration/Layers/ProjectionPipeline.ts
index a74730a09908..8a3077894cb7 100644
--- a/apps/server/src/orchestration/Layers/ProjectionPipeline.ts
+++ b/apps/server/src/orchestration/Layers/ProjectionPipeline.ts
@@ -517,6 +517,7 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
             defaultThreadEnvMode: null,
             autoPull: false,
             faviconPath: event.payload.faviconPath ?? null,
+            projectIcon: event.payload.projectIcon ?? null,
             scripts: event.payload.scripts,
             createdAt: event.payload.createdAt,
             updatedAt: event.payload.updatedAt,
@@ -547,6 +548,9 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
             ...(event.payload.faviconPath !== undefined
               ? { faviconPath: event.payload.faviconPath }
               : {}),
+            ...(event.payload.projectIcon !== undefined
+              ? { projectIcon: event.payload.projectIcon }
+              : {}),
             ...(event.payload.scripts !== undefined ? { scripts: event.payload.scripts } : {}),
             updatedAt: event.payload.updatedAt,
           });
diff --git a/apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.test.ts b/apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.test.ts
index 5d8293c799ae..a5d3af37492f 100644
--- a/apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.test.ts
+++ b/apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.test.ts
@@ -280,6 +280,7 @@ projectionSnapshotLayer("ProjectionSnapshotQuery", (it) => {
           },
           autoPull: false,
           faviconPath: null,
+          projectIcon: null,
           scripts: [
             {
               id: "script-1",
@@ -409,6 +410,7 @@ projectionSnapshotLayer("ProjectionSnapshotQuery", (it) => {
           },
           autoPull: false,
           faviconPath: null,
+          projectIcon: null,
           scripts: [
             {
               id: "script-1",
diff --git a/apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts b/apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts
index a71aea950d0e..2cec699ece3a 100644
--- a/apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts
+++ b/apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts
@@ -12,6 +12,7 @@ import {
   OrchestrationThread,
   OrchestrationThreadDetailSnapshot,
   ProjectScript,
+  ProjectIconOverride,
   TurnId,
   type OrchestrationCheckpointSummary,
   type OrchestrationLatestTurn,
@@ -84,6 +85,7 @@ const ProjectionProjectDbRowSchema = ProjectionProject.mapFields(
   Struct.assign({
     defaultModelSelection: Schema.NullOr(Schema.fromJsonString(ModelSelection)),
     autoPull: Schema.Number,
+    projectIcon: Schema.NullOr(Schema.fromJsonString(ProjectIconOverride)),
     scripts: Schema.fromJsonString(Schema.Array(ProjectScript)),
   }),
 );
@@ -362,6 +364,7 @@ function mapProjectShellRow(
     defaultThreadEnvMode: row.defaultThreadEnvMode,
     autoPull: row.autoPull === 1,
     faviconPath: row.faviconPath ?? null,
+    projectIcon: row.projectIcon ?? null,
     scripts: row.scripts,
     createdAt: row.createdAt,
     updatedAt: row.updatedAt,
@@ -455,6 +458,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
           default_thread_env_mode AS "defaultThreadEnvMode",
           auto_pull AS "autoPull",
           favicon_path AS "faviconPath",
+          project_icon_json AS "projectIcon",
           scripts_json AS "scripts",
           created_at AS "createdAt",
           updated_at AS "updatedAt",
@@ -940,6 +944,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
           default_thread_env_mode AS "defaultThreadEnvMode",
           auto_pull AS "autoPull",
           favicon_path AS "faviconPath",
+          project_icon_json AS "projectIcon",
           scripts_json AS "scripts",
           created_at AS "createdAt",
           updated_at AS "updatedAt",
@@ -965,6 +970,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
           default_thread_env_mode AS "defaultThreadEnvMode",
           auto_pull AS "autoPull",
           favicon_path AS "faviconPath",
+          project_icon_json AS "projectIcon",
           scripts_json AS "scripts",
           created_at AS "createdAt",
           updated_at AS "updatedAt",
@@ -1928,6 +1934,7 @@ pending_approval_requests AS (
                 defaultThreadEnvMode: row.defaultThreadEnvMode,
                 autoPull: row.autoPull === 1,
                 faviconPath: row.faviconPath ?? null,
+                projectIcon: row.projectIcon ?? null,
                 scripts: row.scripts,
                 createdAt: row.createdAt,
                 updatedAt: row.updatedAt,
@@ -2065,6 +2072,7 @@ pending_approval_requests AS (
                   defaultThreadEnvMode: row.defaultThreadEnvMode,
                   autoPull: row.autoPull === 1,
                   faviconPath: row.faviconPath ?? null,
+                  projectIcon: row.projectIcon ?? null,
                   scripts: row.scripts,
                   createdAt: row.createdAt,
                   updatedAt: row.updatedAt,
@@ -2437,43 +2445,41 @@ pending_approval_requests AS (
                     )
                   : Result.failVoid,
               ),
-              threads: threadRows.map(
-                (row): OrchestrationThreadShell => ({
-                  id: row.threadId,
-                  projectId: row.projectId,
-                  title: row.title,
-                  modelSelection: row.modelSelection,
-                  runtimeMode: row.runtimeMode,
-                  interactionMode: row.interactionMode,
-                  branch: row.branch,
-                  worktreePath: row.worktreePath,
-                  ...(row.linkedPullRequest === null
-                    ? {}
-                    : { linkedPullRequest: row.linkedPullRequest }),
-                  latestTurn: latestTurnByThread.get(row.threadId) ?? null,
-                  createdAt: row.createdAt,
-                  updatedAt: row.updatedAt,
-                  archivedAt: row.archivedAt,
-                  settledOverride: row.settledOverride,
-                  settledAt: row.settledAt,
-                  unsettledAt: row.unsettledAt,
-                  snoozedUntil: row.snoozedUntil,
-                  snoozedAt: row.snoozedAt,
-                  pinnedAt: row.pinnedAt,
-                  pinOrderKey: row.pinOrderKey ?? null,
-                  titleRegeneration: mapTitleRegeneration(row),
-                  titleRegenerationFailure: mapTitleRegenerationFailure(row),
-                  session: sessionByThread.get(row.threadId) ?? null,
-                  latestUserMessageAt: row.latestUserMessageAt,
-                  hasPendingApprovals: row.pendingApprovalCount > 0,
-                  hasPendingUserInput: row.pendingUserInputCount > 0,
-                  hasActionableProposedPlan: row.hasActionableProposedPlan > 0,
-                  backgroundLiveness: threadBackgroundLiveness.getThreadBackgroundLiveness(
-                    row.threadId,
-                  ),
-                  planProgress: threadPlanProgress.getThreadPlanProgress(row.threadId),
-                }),
-              ),
+              threads: threadRows.map((row): OrchestrationThreadShell => ({
+                id: row.threadId,
+                projectId: row.projectId,
+                title: row.title,
+                modelSelection: row.modelSelection,
+                runtimeMode: row.runtimeMode,
+                interactionMode: row.interactionMode,
+                branch: row.branch,
+                worktreePath: row.worktreePath,
+                ...(row.linkedPullRequest === null
+                  ? {}
+                  : { linkedPullRequest: row.linkedPullRequest }),
+                latestTurn: latestTurnByThread.get(row.threadId) ?? null,
+                createdAt: row.createdAt,
+                updatedAt: row.updatedAt,
+                archivedAt: row.archivedAt,
+                settledOverride: row.settledOverride,
+                settledAt: row.settledAt,
+                unsettledAt: row.unsettledAt,
+                snoozedUntil: row.snoozedUntil,
+                snoozedAt: row.snoozedAt,
+                pinnedAt: row.pinnedAt,
+                pinOrderKey: row.pinOrderKey ?? null,
+                titleRegeneration: mapTitleRegeneration(row),
+                titleRegenerationFailure: mapTitleRegenerationFailure(row),
+                session: sessionByThread.get(row.threadId) ?? null,
+                latestUserMessageAt: row.latestUserMessageAt,
+                hasPendingApprovals: row.pendingApprovalCount > 0,
+                hasPendingUserInput: row.pendingUserInputCount > 0,
+                hasActionableProposedPlan: row.hasActionableProposedPlan > 0,
+                backgroundLiveness: threadBackgroundLiveness.getThreadBackgroundLiveness(
+                  row.threadId,
+                ),
+                planProgress: threadPlanProgress.getThreadPlanProgress(row.threadId),
+              })),
               updatedAt: updatedAt ?? "1970-01-01T00:00:00.000Z",
             };
 
@@ -2517,12 +2523,10 @@ pending_approval_requests AS (
           "ProjectionSnapshotQuery.getCounts:decodeRow",
         ),
       ),
-      Effect.map(
-        (row): ProjectionSnapshotCounts => ({
-          projectCount: row.projectCount,
-          threadCount: row.threadCount,
-        }),
-      ),
+      Effect.map((row): ProjectionSnapshotCounts => ({
+        projectCount: row.projectCount,
+        threadCount: row.threadCount,
+      })),
     );
 
   const getEventReplayStats: ProjectionSnapshotQueryShape["getEventReplayStats"] = (input) =>
@@ -2533,12 +2537,10 @@ pending_approval_requests AS (
           "ProjectionSnapshotQuery.getEventReplayStats:decodeRow",
         ),
       ),
-      Effect.map(
-        (row): ProjectionEventReplayStats => ({
-          eventCount: row.eventCount,
-          payloadBytes: row.payloadBytes,
-        }),
-      ),
+      Effect.map((row): ProjectionEventReplayStats => ({
+        eventCount: row.eventCount,
+        payloadBytes: row.payloadBytes,
+      })),
     );
 
   const searchThreads: ProjectionSnapshotQueryShape["searchThreads"] = Effect.fn(
@@ -2590,6 +2592,7 @@ pending_approval_requests AS (
                     defaultThreadEnvMode: option.value.defaultThreadEnvMode,
                     autoPull: option.value.autoPull === 1,
                     faviconPath: option.value.faviconPath ?? null,
+                    projectIcon: option.value.projectIcon ?? null,
                     scripts: option.value.scripts,
                     createdAt: option.value.createdAt,
                     updatedAt: option.value.updatedAt,
@@ -2663,17 +2666,15 @@ pending_approval_requests AS (
         projectId: threadRow.value.projectId,
         workspaceRoot: threadRow.value.workspaceRoot,
         worktreePath: threadRow.value.worktreePath,
-        checkpoints: checkpointRows.map(
-          (row): OrchestrationCheckpointSummary => ({
-            turnId: row.turnId,
-            checkpointTurnCount: row.checkpointTurnCount,
-            checkpointRef: row.checkpointRef,
-            status: row.status,
-            files: row.files,
-            assistantMessageId: row.assistantMessageId,
-            completedAt: row.completedAt,
-          }),
-        ),
+        checkpoints: checkpointRows.map((row): OrchestrationCheckpointSummary => ({
+          turnId: row.turnId,
+          checkpointTurnCount: row.checkpointTurnCount,
+          checkpointRef: row.checkpointRef,
+          status: row.status,
+          files: row.files,
+          assistantMessageId: row.assistantMessageId,
+          completedAt: row.completedAt,
+        })),
       });
     });
 
diff --git a/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.test.ts b/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.test.ts
index 26332f9f8c9c..a4640179af99 100644
--- a/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.test.ts
+++ b/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.test.ts
@@ -2844,6 +2844,16 @@ describe("ProviderRuntimeIngestion", () => {
         itemType: "command_execution",
         status: "inProgress",
         title: "Command run",
+        toolSurface: "computer",
+        toolIcon: {
+          _tag: "native-app",
+          app: { _tag: "app-id", appId: "com.apple.Terminal" },
+        },
+        toolSource: {
+          key: "native-app:com.apple.terminal",
+          name: "Terminal",
+          kind: "computer",
+        },
         detail: "Bash: vp test run",
         data: {
           toolName: "Bash",
@@ -2871,6 +2881,17 @@ describe("ProviderRuntimeIngestion", () => {
       itemType: "command_execution",
       toolCallId: "tool-call-9",
       status: "inProgress",
+      title: "Command run",
+      toolSurface: "computer",
+      toolIcon: {
+        _tag: "native-app",
+        app: { _tag: "app-id", appId: "com.apple.Terminal" },
+      },
+      toolSource: {
+        key: "native-app:com.apple.terminal",
+        name: "Terminal",
+        kind: "computer",
+      },
       detail: "Bash: vp test run",
       data: {
         toolName: "Bash",
diff --git a/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts b/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts
index 24ecf8205cc6..52ccf6dc6168 100644
--- a/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts
+++ b/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts
@@ -844,7 +844,11 @@ export function runtimeEventToActivities(
             itemType: event.payload.itemType,
             ...(event.itemId !== undefined ? { toolCallId: event.itemId } : {}),
             ...(event.payload.status ? { status: event.payload.status } : {}),
+            ...(event.payload.title ? { title: event.payload.title } : {}),
             ...(event.payload.detail ? { detail: truncateDetail(event.payload.detail) } : {}),
+            ...(event.payload.toolSurface ? { toolSurface: event.payload.toolSurface } : {}),
+            ...(event.payload.toolIcon ? { toolIcon: event.payload.toolIcon } : {}),
+            ...(event.payload.toolSource ? { toolSource: event.payload.toolSource } : {}),
             ...(event.payload.data !== undefined ? { data: event.payload.data } : {}),
             ...(event.payload.agentId ? { agentId: event.payload.agentId } : {}),
             ...(event.payload.parentToolUseId
@@ -872,7 +876,11 @@ export function runtimeEventToActivities(
             itemType: event.payload.itemType,
             ...(event.itemId !== undefined ? { toolCallId: event.itemId } : {}),
             ...(event.payload.status ? { status: event.payload.status } : {}),
+            ...(event.payload.title ? { title: event.payload.title } : {}),
             ...(event.payload.detail ? { detail: truncateDetail(event.payload.detail) } : {}),
+            ...(event.payload.toolSurface ? { toolSurface: event.payload.toolSurface } : {}),
+            ...(event.payload.toolIcon ? { toolIcon: event.payload.toolIcon } : {}),
+            ...(event.payload.toolSource ? { toolSource: event.payload.toolSource } : {}),
             ...(event.payload.data !== undefined ? { data: event.payload.data } : {}),
             ...(event.payload.agentId ? { agentId: event.payload.agentId } : {}),
             ...(event.payload.parentToolUseId
@@ -900,7 +908,11 @@ export function runtimeEventToActivities(
             itemType: event.payload.itemType,
             ...(event.itemId !== undefined ? { toolCallId: event.itemId } : {}),
             ...(event.payload.status ? { status: event.payload.status } : {}),
+            ...(event.payload.title ? { title: event.payload.title } : {}),
             ...(event.payload.detail ? { detail: truncateDetail(event.payload.detail) } : {}),
+            ...(event.payload.toolSurface ? { toolSurface: event.payload.toolSurface } : {}),
+            ...(event.payload.toolIcon ? { toolIcon: event.payload.toolIcon } : {}),
+            ...(event.payload.toolSource ? { toolSource: event.payload.toolSource } : {}),
             ...(event.payload.data !== undefined ? { data: event.payload.data } : {}),
             ...(event.payload.agentId ? { agentId: event.payload.agentId } : {}),
             ...(event.payload.parentToolUseId
diff --git a/apps/server/src/orchestration/ThreadSettlementReactor.test.ts b/apps/server/src/orchestration/ThreadSettlementReactor.test.ts
index ef63d8b544e3..738c9109f0fb 100644
--- a/apps/server/src/orchestration/ThreadSettlementReactor.test.ts
+++ b/apps/server/src/orchestration/ThreadSettlementReactor.test.ts
@@ -25,7 +25,10 @@ import * as Stream from "effect/Stream";
 import { TestClock } from "effect/testing";
 
 import { GitManager } from "../git/GitManager.ts";
-import { PullRequestService } from "../pullRequest/PullRequestService.ts";
+import {
+  PullRequestService,
+  type PullRequestMergeEvent,
+} from "../pullRequest/PullRequestService.ts";
 import { ServerActivation } from "../serverActivation.ts";
 import { ServerSettingsService } from "../serverSettings.ts";
 import { OrchestrationCommandInvariantError } from "./Errors.ts";
@@ -143,6 +146,7 @@ const makeHarness = Effect.fn("makeThreadSettlementHarness")(function* (options:
   const snapshotReads = yield* Queue.unbounded<number>();
   const settings = yield* Ref.make(options.settings ?? DEFAULT_SERVER_SETTINGS);
   const settingsChanges = yield* PubSub.unbounded<ServerSettings>();
+  const mergedPullRequests = yield* PubSub.unbounded<PullRequestMergeEvent>();
   const commands = yield* Ref.make<ReadonlyArray<AutoSettleCommand>>([]);
   const branchCalls = yield* Ref.make<
     ReadonlyArray<{ readonly cwd: string; readonly branch: string }>
@@ -168,7 +172,6 @@ const makeHarness = Effect.fn("makeThreadSettlementHarness")(function* (options:
     Ref.update(branchCalls, (calls) => [...calls, input]).pipe(
       Effect.andThen(options.branchPullRequest?.(input) ?? Effect.succeed(null)),
     );
-
   const pullRequestSummary: PullRequestService["Service"]["summary"] = (input, readOptions) =>
     Effect.gen(function* () {
       yield* Ref.update(summaryCalls, (calls) => [...calls, input]);
@@ -219,7 +222,12 @@ const makeHarness = Effect.fn("makeThreadSettlementHarness")(function* (options:
         ),
     }),
     Layer.mock(GitManager)({ branchPullRequest }),
-    Layer.mock(PullRequestService)({ summary: pullRequestSummary }),
+    Layer.mock(PullRequestService)({
+      summary: pullRequestSummary,
+      subscribeMerges: PubSub.subscribe(mergedPullRequests).pipe(
+        Effect.map((subscription) => Stream.fromSubscription(subscription)),
+      ),
+    }),
     Layer.mock(OrchestrationEngineService)({
       readEvents: () => Stream.empty,
       dispatch,
@@ -241,6 +249,12 @@ const makeHarness = Effect.fn("makeThreadSettlementHarness")(function* (options:
     summaryCalls,
     summaryRecovery,
     updateSettings,
+    publishMerge: PubSub.publish(mergedPullRequests, {
+      projectId: PROJECT_ID,
+      repository: "owner/repository",
+      number: 42,
+      mergedAt: NOW,
+    }),
     layer: ThreadSettlementReactor.layer.pipe(Layer.provide(dependencies)),
   };
 });
@@ -375,6 +389,60 @@ describe("ThreadSettlementReactor", () => {
     ),
   );
 
+  it.effect("reevaluates immediately after a pull request merge", () =>
+    Effect.scoped(
+      Effect.gen(function* () {
+        yield* TestClock.setTime(Date.parse(NOW));
+        const periodicLookupStarted = yield* Deferred.make<void>();
+        const releasePeriodicLookup = yield* Deferred.make<void>();
+        const mergedThreadSettled = yield* Deferred.make<void>();
+        const branchLookupCount = yield* Ref.make(0);
+        const fixture = yield* makeHarness({
+          snapshot: makeSnapshot([
+            makeThread("merged-in-app", {
+              linkedPullRequest: {
+                projectId: PROJECT_ID,
+                repository: "owner/repository",
+                number: 42,
+                url: "https://example.test/owner/repository/pull/42",
+              },
+            }),
+            makeThread("slow-periodic-lookup", { branch: "another-feature" }),
+          ]),
+          branchPullRequest: () =>
+            Ref.updateAndGet(branchLookupCount, (count) => count + 1).pipe(
+              Effect.flatMap((count) =>
+                count === 1
+                  ? Effect.succeed({ state: "open" as const, updatedAt: NOW })
+                  : Deferred.succeed(periodicLookupStarted, undefined).pipe(
+                      Effect.andThen(Deferred.await(releasePeriodicLookup)),
+                      Effect.as({ state: "open" as const, updatedAt: NOW }),
+                    ),
+              ),
+            ),
+          onDispatch: () => Deferred.succeed(mergedThreadSettled, undefined),
+        });
+
+        yield* Effect.gen(function* () {
+          const reactor = yield* ThreadSettlementReactor.ThreadSettlementReactor;
+          yield* startHarness(reactor, fixture.activation, fixture.snapshotReads);
+          yield* fixture.updateSettings({ sidebarAutoSettleAfterDays: 4 });
+          yield* Deferred.await(periodicLookupStarted);
+
+          yield* fixture.publishMerge;
+          yield* Deferred.await(mergedThreadSettled);
+
+          assert.deepStrictEqual(
+            (yield* Ref.get(fixture.commands)).map((command) => command.threadId),
+            [ThreadId.make("merged-in-app")],
+          );
+          yield* Deferred.succeed(releasePeriodicLookup, undefined);
+          yield* reactor.drain;
+        }).pipe(Effect.provide(fixture.layer));
+      }),
+    ),
+  );
+
   it.effect("uses fresh settlement settings after lookup and ignores unrelated changes", () =>
     Effect.scoped(
       Effect.gen(function* () {
diff --git a/apps/server/src/orchestration/ThreadSettlementReactor.ts b/apps/server/src/orchestration/ThreadSettlementReactor.ts
index 4971ae643c0a..9dd7cd5e76fd 100644
--- a/apps/server/src/orchestration/ThreadSettlementReactor.ts
+++ b/apps/server/src/orchestration/ThreadSettlementReactor.ts
@@ -38,11 +38,22 @@ export const make = Effect.gen(function* () {
   const pullRequests = yield* PullRequestService.PullRequestService;
   const crypto = yield* Crypto.Crypto;
 
-  const sweep = Effect.fn("ThreadSettlementReactor.sweep")(function* () {
+  const sweep = Effect.fn("ThreadSettlementReactor.sweep")(function* (
+    mergedPullRequest: PullRequestService.PullRequestMergeEvent | null,
+  ) {
     const snapshot = yield* snapshots.getShellSnapshot();
     const now = DateTime.formatIso(yield* DateTime.now);
     const projects = new Map(snapshot.projects.map((project) => [project.id, project]));
-    const candidates = snapshot.threads.filter((thread) => isAutoSettlementCandidate(thread, now));
+    const candidates = snapshot.threads.filter(
+      (thread) =>
+        isAutoSettlementCandidate(thread, now) &&
+        (mergedPullRequest === null ||
+          (thread.linkedPullRequest != null &&
+            thread.linkedPullRequest.projectId === mergedPullRequest.projectId &&
+            thread.linkedPullRequest.repository.toLowerCase() ===
+              mergedPullRequest.repository.toLowerCase() &&
+            thread.linkedPullRequest.number === mergedPullRequest.number)),
+    );
     const lookupKey = (thread: (typeof candidates)[number]) => {
       if (thread.linkedPullRequest != null) {
         return JSON.stringify([
@@ -66,6 +77,12 @@ export const make = Effect.gen(function* () {
       thread: (typeof candidates)[number],
     ) {
       if (thread.linkedPullRequest != null) {
+        if (mergedPullRequest !== null) {
+          return {
+            state: "merged",
+            updatedAt: mergedPullRequest.mergedAt,
+          } satisfies SettlementPullRequest;
+        }
         if (!projects.has(thread.linkedPullRequest.projectId)) {
           return yield* Effect.die(new Error("linked pull request project not found"));
         }
@@ -145,8 +162,8 @@ export const make = Effect.gen(function* () {
     );
   });
 
-  const worker = yield* makeDrainableWorker(() =>
-    sweep().pipe(
+  const runSweep = (mergedPullRequest: PullRequestService.PullRequestMergeEvent | null) =>
+    sweep(mergedPullRequest).pipe(
       Effect.catchCause((cause) =>
         Cause.hasInterruptsOnly(cause)
           ? Effect.failCause(cause)
@@ -154,13 +171,14 @@ export const make = Effect.gen(function* () {
               cause: Cause.pretty(cause),
             }),
       ),
-    ),
-  );
+    );
+  const worker = yield* makeDrainableWorker(() => runSweep(null));
 
   const start: ThreadSettlementReactor["Service"]["start"] = Effect.fn(
     "ThreadSettlementReactor.start",
   )(function* () {
     const settingsChanges = yield* settingsService.subscribeChanges;
+    const mergedPullRequests = yield* pullRequests.subscribeMerges;
     const initialSettings = yield* settingsService.getSettings.pipe(Effect.orDie);
     let lastAfterDays = initialSettings.sidebarAutoSettleAfterDays;
     let lastOnMerge = initialSettings.sidebarAutoSettleOnMerge;
@@ -183,6 +201,7 @@ export const make = Effect.gen(function* () {
         return worker.enqueue(undefined);
       }),
     );
+    yield* forkParked(Stream.runForEach(mergedPullRequests, runSweep));
   });
 
   return { start, drain: worker.drain } satisfies ThreadSettlementReactor["Service"];
diff --git a/apps/server/src/orchestration/decider.projectScripts.test.ts b/apps/server/src/orchestration/decider.projectScripts.test.ts
index bf5c509fa16b..22ff884d5f47 100644
--- a/apps/server/src/orchestration/decider.projectScripts.test.ts
+++ b/apps/server/src/orchestration/decider.projectScripts.test.ts
@@ -94,7 +94,7 @@ it.layer(NodeServices.layer)("decider project scripts", (it) => {
     }),
   );
 
-  it.effect("propagates a project favicon path in project.meta.update", () =>
+  it.effect("propagates project icon metadata in project.meta.update", () =>
     Effect.gen(function* () {
       const now = "2026-01-01T00:00:00.000Z";
       const readModel = yield* projectEvent(createEmptyReadModel(now), {
@@ -125,6 +125,7 @@ it.layer(NodeServices.layer)("decider project scripts", (it) => {
           commandId: CommandId.make("cmd-project-update-favicon"),
           projectId: asProjectId("project-favicon"),
           faviconPath: "brand/icon.svg",
+          projectIcon: { kind: "lucide", name: "alarm-clock", color: "violet" },
         },
         readModel,
       });
@@ -132,6 +133,11 @@ it.layer(NodeServices.layer)("decider project scripts", (it) => {
       const event = Array.isArray(result) ? result[0] : result;
       expect(event.type).toBe("project.meta-updated");
       expect((event.payload as { faviconPath?: string }).faviconPath).toBe("brand/icon.svg");
+      expect((event.payload as { projectIcon?: unknown }).projectIcon).toEqual({
+        kind: "lucide",
+        name: "alarm-clock",
+        color: "violet",
+      });
     }),
   );
 
diff --git a/apps/server/src/orchestration/decider.ts b/apps/server/src/orchestration/decider.ts
index 8014c51ad325..94c01fc4544a 100644
--- a/apps/server/src/orchestration/decider.ts
+++ b/apps/server/src/orchestration/decider.ts
@@ -224,6 +224,7 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"
           // explicit project default.
           defaultModelSelection: null,
           faviconPath: null,
+          projectIcon: null,
           scripts: [],
           createdAt: command.createdAt,
           updatedAt: command.createdAt,
@@ -266,6 +267,7 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"
             : {}),
           ...(command.autoPull !== undefined ? { autoPull: command.autoPull } : {}),
           ...(command.faviconPath !== undefined ? { faviconPath: command.faviconPath } : {}),
+          ...(command.projectIcon !== undefined ? { projectIcon: command.projectIcon } : {}),
           ...(command.scripts !== undefined ? { scripts: command.scripts } : {}),
           updatedAt: occurredAt,
         },
diff --git a/apps/server/src/orchestration/projector.ts b/apps/server/src/orchestration/projector.ts
index 07590118d480..40da2f579c27 100644
--- a/apps/server/src/orchestration/projector.ts
+++ b/apps/server/src/orchestration/projector.ts
@@ -217,6 +217,7 @@ export function projectEvent(
             defaultThreadEnvMode: null,
             autoPull: false,
             faviconPath: payload.faviconPath ?? null,
+            projectIcon: payload.projectIcon ?? null,
             scripts: payload.scripts,
             createdAt: payload.createdAt,
             updatedAt: payload.updatedAt,
@@ -256,6 +257,9 @@ export function projectEvent(
                   ...(payload.faviconPath !== undefined
                     ? { faviconPath: payload.faviconPath }
                     : {}),
+                  ...(payload.projectIcon !== undefined
+                    ? { projectIcon: payload.projectIcon }
+                    : {}),
                   ...(payload.scripts !== undefined ? { scripts: payload.scripts } : {}),
                   updatedAt: payload.updatedAt,
                 }
diff --git a/apps/server/src/persistence/Layers/ProjectionProjects.ts b/apps/server/src/persistence/Layers/ProjectionProjects.ts
index 7dcec817f9bf..f34f81294124 100644
--- a/apps/server/src/persistence/Layers/ProjectionProjects.ts
+++ b/apps/server/src/persistence/Layers/ProjectionProjects.ts
@@ -6,7 +6,7 @@ import * as Option from "effect/Option";
 import * as Schema from "effect/Schema";
 import * as Struct from "effect/Struct";
 
-import { ModelSelection, ProjectScript } from "@t3tools/contracts";
+import { ModelSelection, ProjectIconOverride, ProjectScript } from "@t3tools/contracts";
 import { toPersistenceSqlError } from "../Errors.ts";
 import {
   DeleteProjectionProjectInput,
@@ -20,6 +20,7 @@ const ProjectionProjectDbRow = ProjectionProject.mapFields(
   Struct.assign({
     defaultModelSelection: Schema.NullOr(Schema.fromJsonString(ModelSelection)),
     autoPull: Schema.Number,
+    projectIcon: Schema.NullOr(Schema.fromJsonString(ProjectIconOverride)),
     scripts: Schema.fromJsonString(Schema.Array(ProjectScript)),
   }),
 );
@@ -40,6 +41,7 @@ const makeProjectionProjectRepository = Effect.gen(function* () {
           default_thread_env_mode,
           auto_pull,
           favicon_path,
+          project_icon_json,
           scripts_json,
           created_at,
           updated_at,
@@ -53,6 +55,7 @@ const makeProjectionProjectRepository = Effect.gen(function* () {
           ${row.defaultThreadEnvMode},
           ${row.autoPull ? 1 : 0},
           ${row.faviconPath ?? null},
+          ${row.projectIcon ? JSON.stringify(row.projectIcon) : null},
           ${JSON.stringify(row.scripts)},
           ${row.createdAt},
           ${row.updatedAt},
@@ -66,6 +69,7 @@ const makeProjectionProjectRepository = Effect.gen(function* () {
           default_thread_env_mode = excluded.default_thread_env_mode,
           auto_pull = excluded.auto_pull,
           favicon_path = excluded.favicon_path,
+          project_icon_json = excluded.project_icon_json,
           scripts_json = excluded.scripts_json,
           created_at = excluded.created_at,
           updated_at = excluded.updated_at,
@@ -86,6 +90,7 @@ const makeProjectionProjectRepository = Effect.gen(function* () {
           default_thread_env_mode AS "defaultThreadEnvMode",
           auto_pull AS "autoPull",
           favicon_path AS "faviconPath",
+          project_icon_json AS "projectIcon",
           scripts_json AS "scripts",
           created_at AS "createdAt",
           updated_at AS "updatedAt",
@@ -108,6 +113,7 @@ const makeProjectionProjectRepository = Effect.gen(function* () {
           default_thread_env_mode AS "defaultThreadEnvMode",
           auto_pull AS "autoPull",
           favicon_path AS "faviconPath",
+          project_icon_json AS "projectIcon",
           scripts_json AS "scripts",
           created_at AS "createdAt",
           updated_at AS "updatedAt",
diff --git a/apps/server/src/persistence/Migrations.ts b/apps/server/src/persistence/Migrations.ts
index 18b797b6d433..c08ca3444b6b 100644
--- a/apps/server/src/persistence/Migrations.ts
+++ b/apps/server/src/persistence/Migrations.ts
@@ -89,6 +89,9 @@ import Migration0050 from "./Migrations/050_ProjectionProjectsAutoPull.ts";
 // Upstream RepairAutomaticSettlementTimestamps was runtime ID 46. Append it
 // after auto-pull so deployed fork IDs remain append-only.
 import Migration0051 from "./Migrations/051_RepairAutomaticSettlementTimestamps.ts";
+// Upstream ProjectionProjectIcon was runtime ID 47. Append it after the fork's
+// already-deployed settlement-repair migration.
+import Migration0052 from "./Migrations/052_ProjectionProjectIcon.ts";
 
 /**
  * Migration loader with all migrations defined inline.
@@ -152,6 +155,7 @@ export const migrationEntries = [
   [49, "ClearAutomaticProjectModelDefaults", Migration0049],
   [50, "ProjectionProjectsAutoPull", Migration0050],
   [51, "RepairAutomaticSettlementTimestamps", Migration0051],
+  [52, "ProjectionProjectIcon", Migration0052],
 ] as const;
 
 export const migrationManifest = migrationEntries.map(([id, name]) => [id, name] as const);
diff --git a/apps/server/src/persistence/Migrations/052_ProjectionProjectIcon.test.ts b/apps/server/src/persistence/Migrations/052_ProjectionProjectIcon.test.ts
new file mode 100644
index 000000000000..c6137f5388bc
--- /dev/null
+++ b/apps/server/src/persistence/Migrations/052_ProjectionProjectIcon.test.ts
@@ -0,0 +1,28 @@
+import { assert, it } from "@effect/vitest";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as SqlClient from "effect/unstable/sql/SqlClient";
+
+import { runMigrations } from "../Migrations.ts";
+import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient";
+
+const layer = it.layer(Layer.mergeAll(NodeSqliteClient.layerMemory()));
+
+layer("052_ProjectionProjectIcon", (it) => {
+  it.effect("adds the nullable project icon JSON to project projections", () =>
+    Effect.gen(function* () {
+      const sql = yield* SqlClient.SqlClient;
+
+      yield* runMigrations({ toMigrationInclusive: 51 });
+      yield* runMigrations({ toMigrationInclusive: 52 });
+
+      const columns = yield* sql<{ readonly name: string; readonly notnull: number }>`
+        PRAGMA table_info(projection_projects)
+      `;
+      const projectIcon = columns.find((column) => column.name === "project_icon_json");
+
+      assert.equal(projectIcon?.name, "project_icon_json");
+      assert.equal(projectIcon?.notnull, 0);
+    }),
+  );
+});
diff --git a/apps/server/src/persistence/Migrations/052_ProjectionProjectIcon.ts b/apps/server/src/persistence/Migrations/052_ProjectionProjectIcon.ts
new file mode 100644
index 000000000000..0523a47b1c56
--- /dev/null
+++ b/apps/server/src/persistence/Migrations/052_ProjectionProjectIcon.ts
@@ -0,0 +1,16 @@
+import * as Effect from "effect/Effect";
+import * as SqlClient from "effect/unstable/sql/SqlClient";
+
+export default Effect.gen(function* () {
+  const sql = yield* SqlClient.SqlClient;
+  const columns = yield* sql<{ readonly name: string }>`
+    PRAGMA table_info(projection_projects)
+  `;
+
+  if (!columns.some((column) => column.name === "project_icon_json")) {
+    yield* sql`
+      ALTER TABLE projection_projects
+      ADD COLUMN project_icon_json TEXT
+    `;
+  }
+});
diff --git a/apps/server/src/persistence/Services/ProjectionProjects.ts b/apps/server/src/persistence/Services/ProjectionProjects.ts
index 8510dc6e7c2f..e5d1f6ba1f1d 100644
--- a/apps/server/src/persistence/Services/ProjectionProjects.ts
+++ b/apps/server/src/persistence/Services/ProjectionProjects.ts
@@ -9,6 +9,7 @@
 import {
   IsoDateTime,
   ModelSelection,
+  ProjectIconOverride,
   ProjectId,
   ProjectScript,
   ThreadEnvMode,
@@ -28,6 +29,7 @@ export const ProjectionProject = Schema.Struct({
   defaultThreadEnvMode: Schema.NullOr(ThreadEnvMode),
   autoPull: Schema.Boolean,
   faviconPath: Schema.optional(Schema.NullOr(Schema.String)),
+  projectIcon: Schema.optional(Schema.NullOr(ProjectIconOverride)),
   scripts: Schema.Array(ProjectScript),
   createdAt: IsoDateTime,
   updatedAt: IsoDateTime,
diff --git a/apps/server/src/preview/Manager.ts b/apps/server/src/preview/Manager.ts
index a5b1f4da8db0..3c0169eba40a 100644
--- a/apps/server/src/preview/Manager.ts
+++ b/apps/server/src/preview/Manager.ts
@@ -433,15 +433,13 @@ export const make = Effect.gen(function* PreviewManagerMake() {
   const list: PreviewManager["Service"]["list"] = Effect.fn("PreviewManager.list")(
     function* (input) {
       return yield* SynchronizedRef.get(stateRef).pipe(
-        Effect.map(
-          (state): PreviewListResult => ({
-            sessions: sessionsForThread(state, input.threadId)
-              .map((s) => s.snapshot)
-              .toSorted((a, b) => a.updatedAt.localeCompare(b.updatedAt)),
-            serverEpoch,
-            revision: state.revision,
-          }),
-        ),
+        Effect.map((state): PreviewListResult => ({
+          sessions: sessionsForThread(state, input.threadId)
+            .map((s) => s.snapshot)
+            .toSorted((a, b) => a.updatedAt.localeCompare(b.updatedAt)),
+          serverEpoch,
+          revision: state.revision,
+        })),
       );
     },
   );
diff --git a/apps/server/src/processRunner.ts b/apps/server/src/processRunner.ts
index 16b5625d4690..c245b0411525 100644
--- a/apps/server/src/processRunner.ts
+++ b/apps/server/src/processRunner.ts
@@ -239,13 +239,11 @@ const collectText = Effect.fn("processRunner.collectText")(function* (input: {
         });
       },
     ),
-    Effect.map(
-      (state): CollectedUint8StreamText => ({
-        ...decodeUtf8(Buffer.concat(state.chunks, state.bytes)),
-        bytes: state.bytes,
-        truncated: false,
-      }),
-    ),
+    Effect.map((state): CollectedUint8StreamText => ({
+      ...decodeUtf8(Buffer.concat(state.chunks, state.bytes)),
+      bytes: state.bytes,
+      truncated: false,
+    })),
   );
 });
 
diff --git a/apps/server/src/provider/Layers/AmpAdapter.test.ts b/apps/server/src/provider/Layers/AmpAdapter.test.ts
index f0230f05475d..74b9e59b96e0 100644
--- a/apps/server/src/provider/Layers/AmpAdapter.test.ts
+++ b/apps/server/src/provider/Layers/AmpAdapter.test.ts
@@ -42,12 +42,10 @@ class FakeAmpManager extends AmpServerManager {
     } as unknown as ProviderSession;
   });
 
-  public sendTurnImpl = vi.fn(
-    async (threadId: ThreadId): Promise<ProviderTurnStartResult> => ({
-      threadId,
-      turnId: asTurnId(`turn-${threadId}`),
-    }),
-  );
+  public sendTurnImpl = vi.fn(async (threadId: ThreadId): Promise<ProviderTurnStartResult> => ({
+    threadId,
+    turnId: asTurnId(`turn-${threadId}`),
+  }));
 
   public interruptTurnImpl = vi.fn(async (): Promise<void> => undefined);
   public respondToRequestImpl = vi.fn(async (): Promise<void> => undefined);
diff --git a/apps/server/src/provider/Layers/ClaudeAdapter.test.ts b/apps/server/src/provider/Layers/ClaudeAdapter.test.ts
index b146977cd995..7ddb63741786 100644
--- a/apps/server/src/provider/Layers/ClaudeAdapter.test.ts
+++ b/apps/server/src/provider/Layers/ClaudeAdapter.test.ts
@@ -275,6 +275,30 @@ async function readFirstPromptMessage(
   return next.value;
 }
 
+/** Drains the first `count` queued prompts so consecutive turns can be compared. */
+async function readPromptMessages(
+  input:
+    | {
+        readonly prompt: AsyncIterable<SDKUserMessage>;
+      }
+    | undefined,
+  count: number,
+): Promise<Array<SDKUserMessage>> {
+  const iterator = input?.prompt[Symbol.asyncIterator]();
+  if (!iterator) {
+    return [];
+  }
+  const messages: Array<SDKUserMessage> = [];
+  while (messages.length < count) {
+    const next = await iterator.next();
+    if (next.done) {
+      break;
+    }
+    messages.push(next.value);
+  }
+  return messages;
+}
+
 const THREAD_ID = ThreadId.make("thread-claude-1");
 const RESUME_THREAD_ID = ThreadId.make("thread-claude-resume");
 const SYNTHETIC_SUBAGENT_MODEL = "claude-synthetic-subagent[expanded]";
@@ -814,6 +838,101 @@ describe("ClaudeAdapterLive", () => {
     );
   });
 
+  // The Claude CLI reads a streamed user message as a slash-command invocation
+  // only when the final content block is text. Leading with the text block sent
+  // every image-carrying turn down the plain-prompt path, so `/skill args`
+  // reached the agent unexpanded with no error anywhere.
+  it.effect("puts the command text last so attachments do not suppress expansion", () => {
+    const baseDir = NodeFS.mkdtempSync(NodePath.join(NodeOS.tmpdir(), "claude-attachments-"));
+    const harness = makeHarness({
+      cwd: "/tmp/project-claude-command-attachments",
+      baseDir,
+    });
+    return Effect.gen(function* () {
+      yield* Effect.addFinalizer(() =>
+        Effect.sync(() =>
+          NodeFS.rmSync(baseDir, {
+            recursive: true,
+            force: true,
+          }),
+        ),
+      );
+
+      const adapter = yield* ClaudeAdapter;
+      const { attachmentsDir } = yield* ServerConfig;
+
+      const imageAttachment = {
+        type: "image" as const,
+        id: "thread-claude-attachment-22345678-1234-1234-1234-123456789abc",
+        name: "screenshot.png",
+        mimeType: "image/png",
+        sizeBytes: 4,
+      };
+      const fileAttachment = {
+        type: "file" as const,
+        id: "thread-claude-attachment-32345678-1234-1234-1234-123456789abc",
+        name: "notes.pdf",
+        mimeType: "application/pdf",
+        sizeBytes: 4,
+      };
+      for (const attachment of [imageAttachment, fileAttachment]) {
+        const attachmentPath = NodePath.join(attachmentsDir, attachmentRelativePath(attachment)!);
+        NodeFS.mkdirSync(NodePath.dirname(attachmentPath), { recursive: true });
+        NodeFS.writeFileSync(attachmentPath, Uint8Array.from([1, 2, 3, 4]));
+      }
+
+      const session = yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: ProviderDriverKind.make("claudeAgent"),
+        runtimeMode: "full-access",
+      });
+
+      yield* adapter.sendTurn({
+        threadId: session.threadId,
+        input: "/flow-patterns hello",
+        attachments: [],
+      });
+      yield* adapter.sendTurn({
+        threadId: session.threadId,
+        input: "/flow-patterns hello",
+        attachments: [imageAttachment],
+      });
+      yield* adapter.sendTurn({
+        threadId: session.threadId,
+        input: "/flow-patterns hello",
+        attachments: [fileAttachment],
+      });
+
+      const prompts = yield* Effect.promise(() =>
+        readPromptMessages(harness.getLastCreateQueryInput(), 3),
+      );
+      const commandBlock = {
+        type: "text" as const,
+        text: "/flow-patterns hello",
+      };
+
+      assert.deepEqual(prompts[0]?.message.content, [commandBlock]);
+      assert.deepEqual(prompts[1]?.message.content, [
+        {
+          type: "image",
+          source: {
+            type: "base64",
+            media_type: "image/png",
+            data: "AQIDBA==",
+          },
+        },
+        commandBlock,
+      ]);
+      // Non-image attachments never become content blocks. Claude reaches them
+      // through the path line ProviderService writes into the prompt, so the
+      // text block stays last on its own.
+      assert.deepEqual(prompts[2]?.message.content, [commandBlock]);
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
   it.effect("dispatches a $skill mention as a trailing slash command block", () => {
     // Claude Code only runs `/name` from the message's last text block, so a
     // chip picked mid-prompt is moved there and the surrounding prose kept.
diff --git a/apps/server/src/provider/Layers/ClaudeAdapter.ts b/apps/server/src/provider/Layers/ClaudeAdapter.ts
index b0369ee57b98..44ef8347add0 100644
--- a/apps/server/src/provider/Layers/ClaudeAdapter.ts
+++ b/apps/server/src/provider/Layers/ClaudeAdapter.ts
@@ -186,9 +186,10 @@ function toSessionPermissionUpdates(
   toolName: string,
   suggestions: ReadonlyArray<PermissionUpdate> | undefined,
 ): Array<PermissionUpdate> {
-  const sessionScoped = (suggestions ?? []).map(
-    (suggestion): PermissionUpdate => ({ ...suggestion, destination: "session" }),
-  );
+  const sessionScoped = (suggestions ?? []).map((suggestion): PermissionUpdate => ({
+    ...suggestion,
+    destination: "session",
+  }));
   if (sessionScoped.length > 0) {
     return sessionScoped;
   }
@@ -1373,11 +1374,11 @@ const buildUserMessageEffect = Effect.fn("buildUserMessageEffect")(function* (
     );
   }
 
-  // Images go before the command block: a text block after them still
-  // expands, a command block followed by an image does not. Skip the extra
-  // text block when a command is dispatched — the command payload already
-  // includes the prompt and duplicating it makes Claude treat the raw input
-  // as a second user message.
+  // The final text block goes last on purpose. The Claude CLI only reads a
+  // streamed user message as a slash-command invocation when the last content
+  // block is text; image blocks ahead of it ride along as preceding input.
+  // Leading with the text made every image-carrying turn fall back to a plain
+  // prompt, so a hand-typed `/skill args` reached the agent unexpanded.
   if (dispatch) {
     sdkContent.push({ type: "text", text: dispatch.commandText });
   } else if (text.length > 0) {
diff --git a/apps/server/src/provider/Layers/CodexAdapter.test.ts b/apps/server/src/provider/Layers/CodexAdapter.test.ts
index 756b3174ed22..2c9af7236579 100644
--- a/apps/server/src/provider/Layers/CodexAdapter.test.ts
+++ b/apps/server/src/provider/Layers/CodexAdapter.test.ts
@@ -84,24 +84,22 @@ class FakeCodexRuntime implements CodexSessionRuntimeShape {
       }),
   );
 
-  public readonly interruptTurnImpl = vi.fn(
-    (_turnId?: TurnId): Promise<void> => Promise.resolve(undefined),
+  public readonly interruptTurnImpl = vi.fn((_turnId?: TurnId): Promise<void> =>
+    Promise.resolve(undefined),
   );
 
-  public readonly readThreadImpl = vi.fn(
-    (): Promise<CodexThreadSnapshot> =>
-      Promise.resolve({
-        threadId: "provider-thread-1",
-        turns: [],
-      }),
+  public readonly readThreadImpl = vi.fn((): Promise<CodexThreadSnapshot> =>
+    Promise.resolve({
+      threadId: "provider-thread-1",
+      turns: [],
+    }),
   );
 
-  public readonly rollbackThreadImpl = vi.fn(
-    (_numTurns: number): Promise<CodexThreadSnapshot> =>
-      Promise.resolve({
-        threadId: "provider-thread-1",
-        turns: [],
-      }),
+  public readonly rollbackThreadImpl = vi.fn((_numTurns: number): Promise<CodexThreadSnapshot> =>
+    Promise.resolve({
+      threadId: "provider-thread-1",
+      turns: [],
+    }),
   );
 
   public readonly uploadFeedbackImpl = vi.fn((_reason?: string) =>
@@ -802,9 +800,207 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {
     }),
   );
 
+  it.effect("presents browser and computer-use calls with Codex-style titles and sources", () =>
+    Effect.gen(function* () {
+      const { adapter, runtime } = yield* startLifecycleRuntime();
+      const eventsFiber = yield* Stream.runCollect(Stream.take(adapter.streamEvents, 3)).pipe(
+        Effect.forkChild,
+      );
+      const longIntentTitle = `  ${"a".repeat(39)}   ${"a".repeat(38)}😀bc  `;
+      const serializedOverContractUrl = `https://example.com/?query=${"😀".repeat(400)}`;
+
+      yield* runtime.emit({
+        id: asEventId("evt-computer-start"),
+        kind: "notification",
+        provider: ProviderDriverKind.make("codex"),
+        createdAt: "2026-01-01T00:00:00.000Z",
+        method: "item/started",
+        threadId: asThreadId("thread-1"),
+        turnId: asTurnId("turn-1"),
+        itemId: asItemId("computer_1"),
+        payload: {
+          startedAtMs: 1_778_000_000_000,
+          threadId: "thread-1",
+          turnId: "turn-1",
+          item: {
+            type: "mcpToolCall",
+            id: "computer_1",
+            server: "node_repl",
+            tool: "js",
+            arguments: {
+              code: 'await sky.click({ app: "Finder", x: 10, y: 20 })',
+              title: longIntentTitle,
+            },
+            durationMs: null,
+            error: null,
+            result: {
+              _meta: {
+                "codex/toolSurface": {
+                  kind: "computerUse",
+                  app: { kind: "appId", appId: "com.apple.finder" },
+                },
+              },
+              content: [],
+            },
+            status: "inProgress",
+          },
+        },
+      });
+      yield* runtime.emit({
+        id: asEventId("evt-browser-complete"),
+        kind: "notification",
+        provider: ProviderDriverKind.make("codex"),
+        createdAt: "2026-01-01T00:00:01.000Z",
+        method: "item/completed",
+        threadId: asThreadId("thread-1"),
+        turnId: asTurnId("turn-1"),
+        itemId: asItemId("browser_1"),
+        payload: {
+          completedAtMs: 1_778_000_001_000,
+          threadId: "thread-1",
+          turnId: "turn-1",
+          item: {
+            type: "mcpToolCall",
+            id: "browser_1",
+            server: "node_repl",
+            tool: "js",
+            arguments: { code: "await tab.playwright.domSnapshot()", title: "Inspect checkout" },
+            durationMs: 12,
+            error: null,
+            result: {
+              _meta: {
+                "codex/toolSurface": {
+                  kind: "browserUse",
+                  backend: "chrome",
+                  openTabs: [
+                    {
+                      pageUrl: "https://www.mathworks.com/help/matlab/",
+                      faviconUrl: "https://www.mathworks.com/favicon.ico",
+                      faviconUrlDark: "https://www.mathworks.com/favicon-dark.ico",
+                      url: "https://www.mathworks.com/help/matlab/",
+                    },
+                  ],
+                },
+                browser_use: { url: serializedOverContractUrl },
+              },
+              content: [],
+            },
+            status: "completed",
+          },
+        },
+      });
+      yield* runtime.emit({
+        id: asEventId("evt-computer-use-complete"),
+        kind: "notification",
+        provider: ProviderDriverKind.make("codex"),
+        createdAt: "2026-01-01T00:00:02.000Z",
+        method: "item/completed",
+        threadId: asThreadId("thread-1"),
+        turnId: asTurnId("turn-1"),
+        itemId: asItemId("computer_2"),
+        payload: {
+          completedAtMs: 1_778_000_002_000,
+          threadId: "thread-1",
+          turnId: "turn-1",
+          item: {
+            type: "mcpToolCall",
+            id: "computer_2",
+            server: "computer-use",
+            tool: "type_text",
+            arguments: { text: "Hello world", app: "TextEdit" },
+            durationMs: 12,
+            error: null,
+            result: {
+              _meta: {
+                "codex/toolSurface": {
+                  kind: "computerUse",
+                  app: { kind: "displayName", displayName: "TextEdit" },
+                },
+              },
+              content: [],
+            },
+            status: "completed",
+          },
+        },
+      });
+
+      const events = Array.from(yield* Fiber.join(eventsFiber));
+      NodeAssert.deepStrictEqual(
+        events.map((event) => ({
+          type: event.type,
+          title: "title" in event.payload ? event.payload.title : undefined,
+          toolSurface: "toolSurface" in event.payload ? event.payload.toolSurface : undefined,
+          toolIcon: "toolIcon" in event.payload ? event.payload.toolIcon : undefined,
+          toolSource: "toolSource" in event.payload ? event.payload.toolSource : undefined,
+        })),
+        [
+          {
+            type: "item.started",
+            title: `${"a".repeat(39)} ${"a".repeat(38)}😀…`,
+            toolSurface: "computer",
+            toolIcon: {
+              _tag: "native-app",
+              app: { _tag: "app-id", appId: "com.apple.finder" },
+            },
+            toolSource: {
+              key: "native-app:com.apple.finder",
+              name: "Finder",
+              kind: "computer",
+              icon: {
+                _tag: "native-app",
+                app: { _tag: "app-id", appId: "com.apple.finder" },
+              },
+            },
+          },
+          {
+            type: "item.completed",
+            title: "Inspect checkout",
+            toolSurface: "browser",
+            toolIcon: {
+              _tag: "website",
+              pageUrl: "https://www.mathworks.com/help/matlab/",
+              faviconUrl: "https://www.mathworks.com/favicon.ico",
+              faviconUrlDark: "https://www.mathworks.com/favicon-dark.ico",
+            },
+            toolSource: {
+              key: "browser-use:chrome",
+              name: "Chrome",
+              kind: "integration",
+              icon: {
+                _tag: "native-app",
+                app: { _tag: "display-name", displayName: "Google Chrome" },
+              },
+            },
+          },
+          {
+            type: "item.completed",
+            title: "Typed text in TextEdit",
+            toolSurface: "computer",
+            toolIcon: {
+              _tag: "native-app",
+              app: { _tag: "display-name", displayName: "TextEdit" },
+            },
+            toolSource: {
+              key: "native-app-name:textedit",
+              name: "TextEdit",
+              kind: "computer",
+              icon: {
+                _tag: "native-app",
+                app: { _tag: "display-name", displayName: "TextEdit" },
+              },
+            },
+          },
+        ],
+      );
+    }),
+  );
+
   it.effect("preserves failed and declined outcomes on completed tool items", () =>
     Effect.gen(function* () {
       const { adapter, runtime } = yield* startLifecycleRuntime();
+      const maxLengthAppId = `com.${"a".repeat(508)}`;
+      const collidingMaxLengthAppId = `com.${"a".repeat(507)}b`;
+      const longAppSourceKeys: string[] = [];
       const items = [
         {
           type: "commandExecution",
@@ -824,6 +1020,42 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {
           error: { message: "Build failed" },
           status: "failed",
         },
+        {
+          type: "mcpToolCall",
+          id: "failed-computer",
+          server: "computer-use",
+          tool: "click",
+          arguments: { app: "Finder" },
+          error: { message: "Click failed" },
+          result: {
+            _meta: {
+              "codex/toolSurface": {
+                kind: "computerUse",
+                app: { kind: "appId", appId: maxLengthAppId },
+              },
+            },
+            content: [],
+          },
+          status: "failed",
+        },
+        {
+          type: "mcpToolCall",
+          id: "failed-computer-collision",
+          server: "computer-use",
+          tool: "click",
+          arguments: { app: "Other" },
+          error: { message: "Click failed" },
+          result: {
+            _meta: {
+              "codex/toolSurface": {
+                kind: "computerUse",
+                app: { kind: "appId", appId: collidingMaxLengthAppId },
+              },
+            },
+            content: [],
+          },
+          status: "failed",
+        },
         {
           type: "fileChange",
           id: "declined-change",
@@ -858,7 +1090,14 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {
           return;
         }
         NodeAssert.equal(firstEvent.value.payload.status, item.status);
+        if (item.id.startsWith("failed-computer")) {
+          NodeAssert.equal(firstEvent.value.payload.title, "computer-use · click");
+          const sourceKey = firstEvent.value.payload.toolSource?.key;
+          NodeAssert.equal(sourceKey?.length, 512);
+          if (sourceKey) longAppSourceKeys.push(sourceKey);
+        }
       }
+      NodeAssert.equal(new Set(longAppSourceKeys).size, 2);
     }),
   );
 
diff --git a/apps/server/src/provider/Layers/CodexAdapter.ts b/apps/server/src/provider/Layers/CodexAdapter.ts
index 1aed82a28868..fa8511ee09a1 100644
--- a/apps/server/src/provider/Layers/CodexAdapter.ts
+++ b/apps/server/src/provider/Layers/CodexAdapter.ts
@@ -17,6 +17,9 @@ import {
   type ProviderRuntimeEvent,
   type ProviderRequestKind,
   type ThreadTokenUsageSnapshot,
+  type ToolActivityIcon,
+  type ToolActivityNativeAppReference,
+  type ToolActivitySource,
   type ProviderUserInputAnswers,
   RuntimeItemId,
   RuntimeRequestId,
@@ -27,6 +30,7 @@ import {
   ProviderSendTurnInput,
 } from "@t3tools/contracts";
 import * as Effect from "effect/Effect";
+import * as NodeCrypto from "node:crypto";
 import * as Crypto from "effect/Crypto";
 import * as Exit from "effect/Exit";
 import * as Fiber from "effect/Fiber";
@@ -150,6 +154,236 @@ function trimText(value: string | undefined | null): string | undefined {
   return trimmed && trimmed.length > 0 ? trimmed : undefined;
 }
 
+function asUnknownRecord(value: unknown): Record<string, unknown> | undefined {
+  return value && typeof value === "object" ? (value as Record<string, unknown>) : undefined;
+}
+
+function normalizeMcpIntentTitle(value: unknown): string | undefined {
+  if (typeof value !== "string") return undefined;
+  const normalized = value.trim().replace(/\s+/gu, " ");
+  if (!normalized) return undefined;
+  const characters = Array.from(normalized);
+  return characters.length <= 80 ? normalized : `${characters.slice(0, 79).join("")}…`;
+}
+
+function normalizedHttpUrl(value: unknown): string | undefined {
+  if (typeof value !== "string" || value.length > 4096) return undefined;
+  try {
+    const url = new URL(value);
+    const href = url.href;
+    return (url.protocol === "http:" || url.protocol === "https:") && href.length <= 4096
+      ? href
+      : undefined;
+  } catch {
+    return undefined;
+  }
+}
+
+function normalizedImageUrl(value: unknown): string | undefined {
+  if (typeof value !== "string" || value.length > 4096) return undefined;
+  try {
+    const url = new URL(value);
+    return url.protocol === "http:" || url.protocol === "https:" || url.protocol === "data:"
+      ? url.href
+      : undefined;
+  } catch {
+    return undefined;
+  }
+}
+
+function normalizedAppId(value: unknown): string | undefined {
+  if (typeof value !== "string") return undefined;
+  const appId = value.trim();
+  return appId.length > 0 && appId.length <= 512 && /^[A-Za-z0-9._-]+$/u.test(appId)
+    ? appId
+    : undefined;
+}
+
+function normalizedDisplayName(value: unknown): string | undefined {
+  if (typeof value !== "string") return undefined;
+  const displayName = value.trim().replace(/\s+/gu, " ");
+  return displayName && displayName.length <= 160 ? displayName : undefined;
+}
+
+function normalizedSourceKeyPart(value: string): string {
+  return value.trim().toLowerCase();
+}
+
+function nativeAppSourceKey(appId: string): string {
+  const key = `native-app:${appId.toLowerCase()}`;
+  if (key.length <= 512) return key;
+  const digest = NodeCrypto.createHash("sha256").update(key).digest("hex");
+  return `${key.slice(0, 512 - digest.length - 1)}:${digest}`;
+}
+
+function browserDisplayName(value: unknown): string | undefined {
+  const normalized = normalizedDisplayName(value)?.toLowerCase();
+  if (!normalized) return undefined;
+  if (normalized.includes("chrome") || normalized === "chromium") return "Chrome";
+  if (normalized.includes("edge")) return "Microsoft Edge";
+  if (normalized.includes("firefox")) return "Firefox";
+  if (normalized.includes("safari")) return "Safari";
+  if (normalized.includes("arc")) return "Arc";
+  if (normalized === "iab" || normalized.includes("in-app")) return "Browser";
+  return normalizedDisplayName(value);
+}
+
+function browserNativeAppReference(name: string): ToolActivityNativeAppReference | undefined {
+  switch (name) {
+    case "Chrome":
+      return { _tag: "display-name", displayName: "Google Chrome" };
+    case "Microsoft Edge":
+    case "Firefox":
+    case "Safari":
+    case "Arc":
+      return { _tag: "display-name", displayName: name };
+    default:
+      return undefined;
+  }
+}
+
+function appDisplayNameFromId(appId: string): string | undefined {
+  const knownNames: Readonly<Record<string, string>> = {
+    "com.apple.finder": "Finder",
+    "com.apple.safari": "Safari",
+    "com.google.chrome": "Chrome",
+    "com.microsoft.edgemac": "Microsoft Edge",
+    "org.mozilla.firefox": "Firefox",
+    "company.thebrowser.browser": "Arc",
+  };
+  return knownNames[appId.toLowerCase()];
+}
+
+function nativeAppReference(value: unknown): ToolActivityNativeAppReference | undefined {
+  const app = asUnknownRecord(value);
+  if (app?.kind === "appId") {
+    const appId = normalizedAppId(app.appId);
+    return appId ? { _tag: "app-id", appId } : undefined;
+  }
+  if (app?.kind === "displayName") {
+    const displayName = normalizedDisplayName(app.displayName);
+    return displayName ? { _tag: "display-name", displayName } : undefined;
+  }
+  return undefined;
+}
+
+function themedLogoIcon(
+  ...records: ReadonlyArray<Record<string, unknown> | undefined>
+): ToolActivityIcon | undefined {
+  for (const record of records) {
+    const logoUrl = normalizedImageUrl(record?.logoUrl);
+    if (!logoUrl) continue;
+    const logoUrlDark = normalizedImageUrl(record?.logoUrlDark ?? record?.logoDarkUrl);
+    return {
+      _tag: "themed-logo",
+      logoUrl,
+      ...(logoUrlDark ? { logoUrlDark } : {}),
+    };
+  }
+  return undefined;
+}
+
+interface McpToolPresentation {
+  readonly toolSurface?: "browser" | "computer";
+  readonly toolIcon?: ToolActivityIcon;
+  readonly toolSource?: ToolActivitySource;
+}
+
+function mcpToolPresentation(
+  item: Extract<CodexLifecycleItem, { readonly type: "mcpToolCall" }>,
+): McpToolPresentation {
+  const result = asUnknownRecord(item.result);
+  const metadata = asUnknownRecord(result?._meta);
+  const surface = asUnknownRecord(metadata?.["codex/toolSurface"]);
+  const sourceMetadata = asUnknownRecord(metadata?.source);
+  const appContext = asUnknownRecord(item.appContext);
+  const sourceLogo = themedLogoIcon(surface, sourceMetadata, appContext);
+  if (surface?.kind === "browserUse") {
+    const screenshot = asUnknownRecord(surface.screenshot);
+    const browserUse = asUnknownRecord(metadata?.browser_use);
+    const openTabs = Array.isArray(surface.openTabs) ? surface.openTabs : [];
+    const latestOpenTab = openTabs
+      .toReversed()
+      .map(asUnknownRecord)
+      .find((tab) => normalizedHttpUrl(tab?.url) !== undefined);
+    const selectedPage = [
+      { record: screenshot, url: screenshot?.pageUrl },
+      { record: browserUse, url: browserUse?.url },
+      { record: latestOpenTab, url: latestOpenTab?.url },
+    ]
+      .map((candidate) => ({ ...candidate, pageUrl: normalizedHttpUrl(candidate.url) }))
+      .find((candidate) => candidate.pageUrl !== undefined);
+    const pageUrl = selectedPage?.pageUrl;
+    const faviconUrl = normalizedImageUrl(
+      selectedPage?.record?.faviconUrl ?? selectedPage?.record?.favIconUrl,
+    );
+    const faviconUrlDark = normalizedImageUrl(
+      selectedPage?.record?.faviconUrlDark ?? selectedPage?.record?.favIconUrlDark,
+    );
+    const name =
+      browserDisplayName(appContext?.appName) ??
+      browserDisplayName(surface.browserFamily) ??
+      browserDisplayName(surface.backend) ??
+      "Browser";
+    const nativeBrowserIcon = browserNativeAppReference(name);
+    const sourceIcon =
+      sourceLogo ??
+      (nativeBrowserIcon ? ({ _tag: "native-app", app: nativeBrowserIcon } as const) : undefined);
+    const sourceKeyPart = normalizedSourceKeyPart(name) || "browser";
+    return {
+      toolSurface: "browser",
+      ...(pageUrl
+        ? {
+            toolIcon: {
+              _tag: "website",
+              pageUrl,
+              ...(faviconUrl ? { faviconUrl } : {}),
+              ...(faviconUrlDark ? { faviconUrlDark } : {}),
+            } as const,
+          }
+        : {}),
+      toolSource: {
+        key: `browser-use:${sourceKeyPart}`,
+        name,
+        kind: name === "Browser" ? "browser" : "integration",
+        ...(sourceIcon ? { icon: sourceIcon } : {}),
+      },
+    };
+  }
+  if (surface?.kind === "computerUse") {
+    const app = nativeAppReference(surface.app);
+    const args = asUnknownRecord(item.arguments);
+    const argumentAppName =
+      normalizedDisplayName(args?.appName) ??
+      normalizedDisplayName(args?.application) ??
+      normalizedDisplayName(typeof args?.app === "string" ? args.app : undefined);
+    const name =
+      normalizedDisplayName(appContext?.appName) ??
+      argumentAppName ??
+      (app?._tag === "display-name" ? app.displayName : undefined) ??
+      (app?._tag === "app-id" ? appDisplayNameFromId(app.appId) : undefined) ??
+      "Computer Use";
+    const sourceIcon = sourceLogo ?? (app ? ({ _tag: "native-app", app } as const) : undefined);
+    const sourceKey = app
+      ? app._tag === "app-id"
+        ? nativeAppSourceKey(app.appId)
+        : `native-app-name:${normalizedSourceKeyPart(app.displayName)}`
+      : "computer-use";
+    return {
+      toolSurface: "computer",
+      ...(app ? { toolIcon: { _tag: "native-app", app } as const } : {}),
+      toolSource: {
+        key: sourceKey,
+        name,
+        kind: "computer",
+        ...(sourceIcon ? { icon: sourceIcon } : {}),
+      },
+    };
+  }
+
+  return {};
+}
+
 const FATAL_CODEX_STDERR_SNIPPETS = ["failed to connect to websocket"];
 
 function isFatalCodexProcessStderrMessage(message: string): boolean {
@@ -239,8 +473,82 @@ function toCanonicalItemType(raw: string | undefined | null): CanonicalItemType
   return "unknown";
 }
 
-function itemTitle(itemType: CanonicalItemType, item?: CodexLifecycleItem): string | undefined {
+function boundedToolArgument(value: unknown): string | undefined {
+  const normalized = typeof value === "string" ? value.trim().replace(/\s+/gu, " ") : "";
+  if (!normalized) return undefined;
+  return normalized.length <= 48 ? normalized : `${normalized.slice(0, 47)}…`;
+}
+
+function normalizedMcpToolName(value: string): string {
+  return (
+    value
+      .split(/__|[./:]/u)
+      .at(-1)
+      ?.trim() ?? value.trim()
+  );
+}
+
+function computerUseToolTitle(
+  item: Extract<CodexLifecycleItem, { readonly type: "mcpToolCall" }>,
+  presentation: McpToolPresentation,
+): string | undefined {
+  if (normalizeItemType(item.server) !== "computer use") return undefined;
+  if (item.status === "failed") return undefined;
+  const tool = normalizeItemType(normalizedMcpToolName(item.tool)).replace(/ /gu, "_");
+  const inProgress = item.status === "inProgress";
+  const args = asUnknownRecord(item.arguments);
+  const appName =
+    (presentation.toolSource?.kind === "computer" && presentation.toolSource.name !== "Computer Use"
+      ? presentation.toolSource.name
+      : undefined) ??
+    normalizedDisplayName(args?.appName) ??
+    normalizedDisplayName(args?.application) ??
+    normalizedDisplayName(typeof args?.app === "string" ? args.app : undefined);
+  const withApp = (label: string) => (appName ? `${label} in ${appName}` : label);
+  switch (tool) {
+    case "list_apps":
+      return inProgress ? "Listing apps" : "Listed apps";
+    case "click":
+      return withApp(inProgress ? "Clicking" : "Clicked");
+    case "drag":
+      return withApp(inProgress ? "Dragging" : "Dragged");
+    case "get_app_state":
+    case "get_state":
+      return appName
+        ? `${inProgress ? "Looking at" : "Looked at"} ${appName}`
+        : inProgress
+          ? "Looking at the screen"
+          : "Looked at the screen";
+    case "perform_accessibility_action":
+    case "perform_secondary_action":
+      return inProgress ? "Performing accessibility action" : "Performed accessibility action";
+    case "press_key":
+      return withApp(inProgress ? "Pressing key" : "Pressed key");
+    case "scroll": {
+      const direction = boundedToolArgument(args?.direction)?.toLowerCase();
+      return withApp(`${inProgress ? "Scrolling" : "Scrolled"}${direction ? ` ${direction}` : ""}`);
+    }
+    case "set_value":
+      return withApp(inProgress ? "Setting value" : "Set value");
+    case "type_text":
+      return withApp(inProgress ? "Typing text" : "Typed text");
+    default:
+      return undefined;
+  }
+}
+
+function itemTitle(
+  itemType: CanonicalItemType,
+  item?: CodexLifecycleItem,
+  presentation: McpToolPresentation = {},
+): string | undefined {
   if (itemType === "mcp_tool_call" && item?.type === "mcpToolCall") {
+    if (normalizedMcpToolName(item.tool) === "js") {
+      const intentTitle = normalizeMcpIntentTitle(asUnknownRecord(item.arguments)?.title);
+      if (intentTitle) return intentTitle;
+    }
+    const computerUseTitle = computerUseToolTitle(item, presentation);
+    if (computerUseTitle) return computerUseTitle;
     return `${item.server} · ${item.tool}`;
   }
   switch (itemType) {
@@ -481,6 +789,8 @@ function mapItemLifecycle(
   }
 
   const detail = itemDetail(itemType, item);
+  const toolPresentation = item.type === "mcpToolCall" ? mcpToolPresentation(item) : {};
+  const title = itemTitle(itemType, item, toolPresentation);
   const status =
     lifecycle === "item.started"
       ? "inProgress"
@@ -496,8 +806,9 @@ function mapItemLifecycle(
     payload: {
       itemType,
       ...(status ? { status } : {}),
-      ...(itemTitle(itemType, item) ? { title: itemTitle(itemType, item) } : {}),
+      ...(title ? { title } : {}),
       ...(detail ? { detail } : {}),
+      ...toolPresentation,
       ...(event.payload !== undefined ? { data: event.payload } : {}),
     },
   };
diff --git a/apps/server/src/provider/Layers/GeminiCliAdapter.test.ts b/apps/server/src/provider/Layers/GeminiCliAdapter.test.ts
index 6ea76d401ac4..e492e3f2070c 100644
--- a/apps/server/src/provider/Layers/GeminiCliAdapter.test.ts
+++ b/apps/server/src/provider/Layers/GeminiCliAdapter.test.ts
@@ -52,12 +52,10 @@ class FakeGeminiCliManager extends GeminiCliServerManager {
     } as unknown as ProviderSession;
   });
 
-  public sendTurnImpl = vi.fn(
-    async (threadId: ThreadId): Promise<ProviderTurnStartResult> => ({
-      threadId,
-      turnId: asTurnId(`turn-${threadId}`),
-    }),
-  );
+  public sendTurnImpl = vi.fn(async (threadId: ThreadId): Promise<ProviderTurnStartResult> => ({
+    threadId,
+    turnId: asTurnId(`turn-${threadId}`),
+  }));
 
   public interruptTurnImpl = vi.fn(async (): Promise<void> => undefined);
   public respondToRequestImpl = vi.fn(async (): Promise<void> => undefined);
diff --git a/apps/server/src/provider/Layers/KiloAdapter.test.ts b/apps/server/src/provider/Layers/KiloAdapter.test.ts
index 395508a8fff9..bb51c194127f 100644
--- a/apps/server/src/provider/Layers/KiloAdapter.test.ts
+++ b/apps/server/src/provider/Layers/KiloAdapter.test.ts
@@ -39,12 +39,10 @@ class FakeKiloManager extends KiloServerManager {
     } as unknown as ProviderSession;
   });
 
-  public sendTurnImpl = vi.fn(
-    async (threadId: ThreadId): Promise<ProviderTurnStartResult> => ({
-      threadId,
-      turnId: asTurnId(`turn-${threadId}`),
-    }),
-  );
+  public sendTurnImpl = vi.fn(async (threadId: ThreadId): Promise<ProviderTurnStartResult> => ({
+    threadId,
+    turnId: asTurnId(`turn-${threadId}`),
+  }));
 
   override startSession(input: { threadId: ThreadId }): Promise<ProviderSession> {
     return this.startSessionImpl(input.threadId);
diff --git a/apps/server/src/provider/Layers/KiloProvider.ts b/apps/server/src/provider/Layers/KiloProvider.ts
index af83ac59767f..ab38e693d702 100644
--- a/apps/server/src/provider/Layers/KiloProvider.ts
+++ b/apps/server/src/provider/Layers/KiloProvider.ts
@@ -100,9 +100,8 @@ const discoverKiloModels = (
   }).pipe(
     Effect.timeoutOption(DEFAULT_TIMEOUT_MS),
     Effect.result,
-    Effect.map(
-      (result): ReadonlyArray<KiloDiscoveredModel> =>
-        Result.isSuccess(result) && Option.isSome(result.success) ? result.success.value : [],
+    Effect.map((result): ReadonlyArray<KiloDiscoveredModel> =>
+      Result.isSuccess(result) && Option.isSome(result.success) ? result.success.value : [],
     ),
   );
 
diff --git a/apps/server/src/provider/Layers/ProviderService.test.ts b/apps/server/src/provider/Layers/ProviderService.test.ts
index 6579ea6fa9c9..89de71b7fca1 100644
--- a/apps/server/src/provider/Layers/ProviderService.test.ts
+++ b/apps/server/src/provider/Layers/ProviderService.test.ts
@@ -191,20 +191,18 @@ function makeFakeCodexAdapter(provider: ProviderDriverKind = CODEX_DRIVER) {
     ): Effect.Effect<void, ProviderAdapterError> => Effect.void,
   );
 
-  const stopSession = vi.fn(
-    (threadId: ThreadId): Effect.Effect<void, ProviderAdapterError> =>
-      Effect.sync(() => {
-        sessions.delete(threadId);
-      }),
+  const stopSession = vi.fn((threadId: ThreadId): Effect.Effect<void, ProviderAdapterError> =>
+    Effect.sync(() => {
+      sessions.delete(threadId);
+    }),
   );
 
-  const listSessions = vi.fn(
-    (): Effect.Effect<ReadonlyArray<ProviderSession>> =>
-      Effect.sync(() => Array.from(sessions.values())),
+  const listSessions = vi.fn((): Effect.Effect<ReadonlyArray<ProviderSession>> =>
+    Effect.sync(() => Array.from(sessions.values())),
   );
 
-  const hasSession = vi.fn(
-    (threadId: ThreadId): Effect.Effect<boolean> => Effect.succeed(sessions.has(threadId)),
+  const hasSession = vi.fn((threadId: ThreadId): Effect.Effect<boolean> =>
+    Effect.succeed(sessions.has(threadId)),
   );
 
   const readThread = vi.fn(
@@ -238,11 +236,10 @@ function makeFakeCodexAdapter(provider: ProviderDriverKind = CODEX_DRIVER) {
       Effect.succeed({ feedbackId: `feedback-${input.threadId}` }),
   );
 
-  const stopAll = vi.fn(
-    (): Effect.Effect<void, ProviderAdapterError> =>
-      Effect.sync(() => {
-        sessions.clear();
-      }),
+  const stopAll = vi.fn((): Effect.Effect<void, ProviderAdapterError> =>
+    Effect.sync(() => {
+      sessions.clear();
+    }),
   );
 
   const adapter: ProviderAdapterShape<ProviderAdapterError> = {
diff --git a/apps/server/src/provider/providerMaintenanceRunner.ts b/apps/server/src/provider/providerMaintenanceRunner.ts
index 3c114dd83d87..4ac4401ffe27 100644
--- a/apps/server/src/provider/providerMaintenanceRunner.ts
+++ b/apps/server/src/provider/providerMaintenanceRunner.ts
@@ -263,12 +263,10 @@ export const make = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
             concurrency: "unbounded",
           },
         ).pipe(
-          Effect.map(
-            (verifiedProviders): VerifiedProviderRefresh => ({
-              providers,
-              verifiedProviders,
-            }),
-          ),
+          Effect.map((verifiedProviders): VerifiedProviderRefresh => ({
+            providers,
+            verifiedProviders,
+          })),
           Effect.catchCause((cause) =>
             Effect.logWarning("Provider post-update version verification failed", {
               provider,
diff --git a/apps/server/src/pullRequest/AzureDevOpsPullRequestProvider.ts b/apps/server/src/pullRequest/AzureDevOpsPullRequestProvider.ts
index 0062e58a4c87..8461e57d5685 100644
--- a/apps/server/src/pullRequest/AzureDevOpsPullRequestProvider.ts
+++ b/apps/server/src/pullRequest/AzureDevOpsPullRequestProvider.ts
@@ -157,23 +157,21 @@ export const make = Effect.gen(function* () {
     getChangeRequest: (input) =>
       cli.getPullRequest({ cwd: input.cwd, number: input.number }).pipe(
         Effect.mapError(fail("getChangeRequest")),
-        Effect.map(
-          (pullRequest): ProviderChangeRequestDetail => ({
-            ...toChangeRequest(pullRequest),
-            body: pullRequest.body,
-            changedFiles: 0,
-            mergedAt: pullRequest.state === "merged" ? pullRequest.closedAt : null,
-            closedAt: pullRequest.state === "closed" ? pullRequest.closedAt : null,
-            reviewers: pullRequest.reviewers,
-            checks: [],
-            mergeCapabilities: { merge: true, squash: true, rebase: false },
-            viewerPermissions: AZURE_DEVOPS_VIEWER_PERMISSIONS,
-            autoMergeEnabled: pullRequest.autoMergeEnabled,
-            ...(pullRequest.autoMergeMethod === undefined
-              ? {}
-              : { autoMergeMethod: pullRequest.autoMergeMethod }),
-          }),
-        ),
+        Effect.map((pullRequest): ProviderChangeRequestDetail => ({
+          ...toChangeRequest(pullRequest),
+          body: pullRequest.body,
+          changedFiles: 0,
+          mergedAt: pullRequest.state === "merged" ? pullRequest.closedAt : null,
+          closedAt: pullRequest.state === "closed" ? pullRequest.closedAt : null,
+          reviewers: pullRequest.reviewers,
+          checks: [],
+          mergeCapabilities: { merge: true, squash: true, rebase: false },
+          viewerPermissions: AZURE_DEVOPS_VIEWER_PERMISSIONS,
+          autoMergeEnabled: pullRequest.autoMergeEnabled,
+          ...(pullRequest.autoMergeMethod === undefined
+            ? {}
+            : { autoMergeMethod: pullRequest.autoMergeMethod }),
+        })),
       ),
 
     getChangeRequestActivity: (input) =>
@@ -187,15 +185,13 @@ export const make = Effect.gen(function* () {
                 Effect.orElseSucceed(() => ({ comments: [], truncated: true })),
               )
           ).pipe(
-            Effect.map(
-              (conversation): ProviderChangeRequestActivity => ({
-                comments: conversation.comments,
-                commentCount: conversation.comments.length,
-                commentsTruncated: conversation.truncated,
-                reviewThreads: [],
-                commits: [],
-              }),
-            ),
+            Effect.map((conversation): ProviderChangeRequestActivity => ({
+              comments: conversation.comments,
+              commentCount: conversation.comments.length,
+              commentsTruncated: conversation.truncated,
+              reviewThreads: [],
+              commits: [],
+            })),
           ),
         ),
       ),
diff --git a/apps/server/src/pullRequest/BitbucketPullRequestProvider.ts b/apps/server/src/pullRequest/BitbucketPullRequestProvider.ts
index 70c6184ada0a..47d41eeee6d9 100644
--- a/apps/server/src/pullRequest/BitbucketPullRequestProvider.ts
+++ b/apps/server/src/pullRequest/BitbucketPullRequestProvider.ts
@@ -203,17 +203,15 @@ export const make = Effect.gen(function* () {
         { concurrency: 3 },
       ).pipe(
         Effect.mapError(fail("getChangeRequestActivity")),
-        Effect.map(
-          ([pullRequest, comments, commits]): ProviderChangeRequestActivity => ({
-            comments: [...comments.comments, ...pullRequest.reviews].toSorted((left, right) =>
-              left.createdAt.localeCompare(right.createdAt),
-            ),
-            commentCount: comments.comments.length + pullRequest.reviews.length,
-            commentsTruncated: comments.truncated,
-            reviewThreads: comments.threads,
-            commits,
-          }),
-        ),
+        Effect.map(([pullRequest, comments, commits]): ProviderChangeRequestActivity => ({
+          comments: [...comments.comments, ...pullRequest.reviews].toSorted((left, right) =>
+            left.createdAt.localeCompare(right.createdAt),
+          ),
+          commentCount: comments.comments.length + pullRequest.reviews.length,
+          commentsTruncated: comments.truncated,
+          reviewThreads: comments.threads,
+          commits,
+        })),
       );
     },
 
diff --git a/apps/server/src/pullRequest/GitHubPullRequestCli.test.ts b/apps/server/src/pullRequest/GitHubPullRequestCli.test.ts
index 3db5c8884f30..1e6ca0ed43a6 100644
--- a/apps/server/src/pullRequest/GitHubPullRequestCli.test.ts
+++ b/apps/server/src/pullRequest/GitHubPullRequestCli.test.ts
@@ -2726,7 +2726,12 @@ layer("GitHubPullRequestCli.layer", (it) => {
         // One request, because both answers hang off the same repository object.
         assert.strictEqual(mockedExecute.mock.calls.length, 1);
         expect(callAt(0).args).toContain("number=7");
-        expect(access).toEqual({ canWrite: false, canUpdate: true, didAuthor: true });
+        expect(access).toEqual({
+          canWrite: false,
+          canTriage: false,
+          canUpdate: true,
+          didAuthor: true,
+        });
       }),
   );
 
@@ -2889,7 +2894,12 @@ layer("GitHubPullRequestCli.layer", (it) => {
       });
 
       assert.strictEqual(mockedExecute.mock.calls.length, 2);
-      expect(access).toEqual({ canWrite: false, canUpdate: true, didAuthor: true });
+      expect(access).toEqual({
+        canWrite: false,
+        canTriage: false,
+        canUpdate: true,
+        didAuthor: true,
+      });
       yield* TestClock.setTime(Date.parse("2100-01-01T00:00:00Z"));
     }),
   );
@@ -3029,4 +3039,56 @@ layer("GitHubPullRequestCli.layer", (it) => {
       ]);
     }),
   );
+
+  it.effect("puts labels on by posting to the issue's own collection, all at once", () =>
+    Effect.gen(function* () {
+      mockedExecute.mockReturnValue(Effect.succeed(output("[]")));
+      const cli = yield* GitHubPullRequestCli.GitHubPullRequestCli;
+
+      yield* cli.setLabels({
+        cwd: "/w",
+        repository: "acme/web",
+        host: "github.com",
+        number: 7,
+        labels: ["bug", "size:XL"],
+        applied: true,
+      });
+
+      assert.strictEqual(mockedExecute.mock.calls.length, 1);
+      const call = callAt(0);
+      expect(call.args).toEqual([
+        "api",
+        "--method",
+        "POST",
+        "--hostname",
+        "github.com",
+        "repos/acme/web/issues/7/labels",
+        "--input",
+        "-",
+      ]);
+      // @effect-diagnostics-next-line preferSchemaOverJson:off - asserting the raw gh request body.
+      expect(JSON.parse(call.stdin ?? "")).toEqual({ labels: ["bug", "size:XL"] });
+    }),
+  );
+
+  it.effect("takes labels off one at a time, naming each in the path encoded", () =>
+    Effect.gen(function* () {
+      mockedExecute.mockReturnValue(Effect.succeed(output("[]")));
+      const cli = yield* GitHubPullRequestCli.GitHubPullRequestCli;
+
+      yield* cli.setLabels({
+        cwd: "/w",
+        repository: "acme/web",
+        host: "github.com",
+        number: 7,
+        labels: ["good first issue", "area/web"],
+        applied: false,
+      });
+
+      assert.strictEqual(mockedExecute.mock.calls.length, 2);
+      expect(callAt(0).args).toContain("repos/acme/web/issues/7/labels/good%20first%20issue");
+      expect(callAt(0).args).toContain("DELETE");
+      expect(callAt(1).args).toContain("repos/acme/web/issues/7/labels/area%2Fweb");
+    }),
+  );
 });
diff --git a/apps/server/src/pullRequest/GitHubPullRequestCli.ts b/apps/server/src/pullRequest/GitHubPullRequestCli.ts
index c418fd0d37e8..3dc41896037b 100644
--- a/apps/server/src/pullRequest/GitHubPullRequestCli.ts
+++ b/apps/server/src/pullRequest/GitHubPullRequestCli.ts
@@ -18,6 +18,7 @@ import {
   type PullRequestReviewVerdict,
   type PullRequestReviewerCandidateList,
   type PullRequestReviewerKind,
+  type PullRequestLabelCandidateList,
   type PullRequestThreadCommentsResult,
   type PullRequestUpdateMethod,
 } from "@t3tools/contracts";
@@ -42,6 +43,9 @@ import {
   decodeReactionSubjectScopeJson,
   decodeRepositoryAccessJson,
   decodeReviewerCandidatesJson,
+  decodeLabelCandidatesJson,
+  buildLabelRequestJson,
+  LABEL_CANDIDATES_GRAPHQL_QUERY,
   decodeReviewDismissalsJson,
   decodeReviewThreadCommentsJson,
   decodeReviewThreadsJson,
@@ -597,6 +601,24 @@ export class GitHubPullRequestCli extends Context.Service<
       readonly requested: boolean;
     }) => Effect.Effect<void, GitHubPullRequestCliError>;
 
+    /** The repository's labels, and which of them this pull request already wears. */
+    readonly listLabelCandidates: (input: {
+      readonly cwd: string;
+      readonly repository: string;
+      readonly host: string;
+      readonly number: number;
+    }) => Effect.Effect<PullRequestLabelCandidateList, GitHubPullRequestCliError>;
+
+    readonly setLabels: (input: {
+      readonly cwd: string;
+      readonly repository: string;
+      readonly host: string;
+      readonly number: number;
+      readonly labels: ReadonlyArray<string>;
+      /** False takes each label off; true adds each to whatever is already there. */
+      readonly applied: boolean;
+    }) => Effect.Effect<void, GitHubPullRequestCliError>;
+
     readonly runPullRequestAction: (input: {
       readonly cwd: string;
       readonly repository: string;
@@ -1977,6 +1999,56 @@ export const make = Effect.gen(function* () {
         .pipe(Effect.asVoid);
     },
 
+    listLabelCandidates: (input) => {
+      const { owner, name } = parseRepositorySelector(input.repository);
+      return graphqlRead({
+        cwd: input.cwd,
+        host: input.host,
+        operation: "listLabelCandidates",
+        allowReserve: true,
+        variables: [
+          ["-f", `owner=${owner}`],
+          ["-f", `name=${name}`],
+          ["-F", `number=${input.number}`],
+        ],
+        query: LABEL_CANDIDATES_GRAPHQL_QUERY,
+        decode: decodeLabelCandidatesJson,
+      });
+    },
+
+    setLabels: (input) => {
+      const { owner, name } = parseRepositorySelector(input.repository);
+      // A pull request is an issue to the labels API. Adding posts a list and leaves what was
+      // already there; taking off is one delete per label, since the endpoint names one in its
+      // path. The name goes into the path encoded, because a label may carry a space or a slash.
+      const issue = `repos/${owner}/${name}/issues/${input.number}/labels`;
+      if (input.applied) {
+        return github
+          .execute({
+            cwd: input.cwd,
+            args: ["api", "--method", "POST", "--hostname", input.host, issue, "--input", "-"],
+            stdin: buildLabelRequestJson(input.labels),
+          })
+          .pipe(Effect.asVoid);
+      }
+      return Effect.forEach(
+        input.labels,
+        (label) =>
+          github.execute({
+            cwd: input.cwd,
+            args: [
+              "api",
+              "--method",
+              "DELETE",
+              "--hostname",
+              input.host,
+              `${issue}/${encodeURIComponent(label)}`,
+            ],
+          }),
+        { concurrency: 1, discard: true },
+      );
+    },
+
     runPullRequestAction: (input) => {
       if (input.action === "revert") {
         return pullRequestNodeId({ ...input, operation: "revertPullRequest" }).pipe(
diff --git a/apps/server/src/pullRequest/GitHubPullRequestProvider.test.ts b/apps/server/src/pullRequest/GitHubPullRequestProvider.test.ts
index 7e6016288af7..8fd0f09dd3ea 100644
--- a/apps/server/src/pullRequest/GitHubPullRequestProvider.test.ts
+++ b/apps/server/src/pullRequest/GitHubPullRequestProvider.test.ts
@@ -47,7 +47,14 @@ it.effect("uses one narrow read for a linked pull request summary", () =>
 
 describe("gitHubViewerPermissions", () => {
   it("offers everything to a viewer who can write to the repository", () => {
-    expect(gitHubViewerPermissions({ canWrite: true, canUpdate: true, didAuthor: false })).toEqual({
+    expect(
+      gitHubViewerPermissions({
+        canWrite: true,
+        canTriage: true,
+        canUpdate: true,
+        didAuthor: false,
+      }),
+    ).toEqual({
       // Arming a merge for later is the merge, so it travels with it.
       actions: [
         "merge",
@@ -64,6 +71,7 @@ describe("gitHubViewerPermissions", () => {
       resolve: true,
       verdicts: ["comment", "approve", "request-changes"],
       requestReviewers: true,
+      labels: true,
     });
   });
 
@@ -71,7 +79,12 @@ describe("gitHubViewerPermissions", () => {
     // Every open-source pull request somebody else opened: GitHub says no to all five actions
     // and to resolving, and yes to commenting and to every verdict.
     expect(
-      gitHubViewerPermissions({ canWrite: false, canUpdate: false, didAuthor: false }),
+      gitHubViewerPermissions({
+        canWrite: false,
+        canTriage: false,
+        canUpdate: false,
+        didAuthor: false,
+      }),
     ).toEqual({
       actions: [],
       comment: true,
@@ -79,11 +92,31 @@ describe("gitHubViewerPermissions", () => {
       verdicts: ["comment", "approve", "request-changes"],
       // Asking somebody else to review is the one thing read access never stretches to.
       requestReviewers: false,
+      labels: false,
+    });
+  });
+
+  it("lets a triager label without letting them merge or ask for a review", () => {
+    const permissions = gitHubViewerPermissions({
+      canWrite: false,
+      canTriage: true,
+      canUpdate: false,
+      didAuthor: false,
     });
+    expect(permissions.labels).toBe(true);
+    expect(permissions.requestReviewers).toBe(false);
+    expect(permissions.actions).toEqual([]);
   });
 
   it("keeps an author's own pull request theirs to close, with read access and no more", () => {
-    expect(gitHubViewerPermissions({ canWrite: false, canUpdate: true, didAuthor: true })).toEqual({
+    expect(
+      gitHubViewerPermissions({
+        canWrite: false,
+        canTriage: false,
+        canUpdate: true,
+        didAuthor: true,
+      }),
+    ).toEqual({
       // Merging is the one thing writing is needed for, now or later; the rest an author may do.
       actions: ["ready", "draft", "close", "reopen"],
       comment: true,
@@ -91,6 +124,7 @@ describe("gitHubViewerPermissions", () => {
       // GitHub refuses an author's approval of their own change, so the page does not offer one.
       verdicts: ["comment"],
       requestReviewers: false,
+      labels: false,
     });
   });
 
@@ -110,6 +144,7 @@ describe("gitHubViewerPermissions", () => {
         resolve: false,
         verdicts: ["comment", "approve", "request-changes"],
         requestReviewers: false,
+        labels: false,
       });
       expect(detail.workflowApprovalsRequired).toBeUndefined();
       expect(detail.checks).toContainEqual({
@@ -158,7 +193,12 @@ describe("gitHubViewerPermissions", () => {
               mergeCapabilities: { merge: true, squash: true, rebase: true },
             }),
           getViewerAccess: () =>
-            Effect.succeed({ canWrite: false, canUpdate: true, didAuthor: false }),
+            Effect.succeed({
+              canWrite: false,
+              canTriage: false,
+              canUpdate: true,
+              didAuthor: false,
+            }),
         }),
       ),
     ),
@@ -254,7 +294,7 @@ describe("gitHubViewerPermissions", () => {
               mergeCapabilities: { merge: true, squash: true, rebase: true },
             }),
           getViewerAccess: () =>
-            Effect.succeed({ canWrite: true, canUpdate: true, didAuthor: false }),
+            Effect.succeed({ canWrite: true, canTriage: true, canUpdate: true, didAuthor: false }),
         }),
       ),
     ),
@@ -318,7 +358,7 @@ it.effect("does not classify same-repository gates as fork workflow approvals",
             mergeCapabilities: { merge: true, squash: true, rebase: true },
           }),
         getViewerAccess: () =>
-          Effect.succeed({ canWrite: true, canUpdate: true, didAuthor: false }),
+          Effect.succeed({ canWrite: true, canTriage: true, canUpdate: true, didAuthor: false }),
       }),
     ),
   ),
@@ -365,7 +405,7 @@ it.effect("keeps an unsafe workflow approval scope visible as unknown", () =>
             mergeCapabilities: { merge: true, squash: true, rebase: true },
           }),
         getViewerAccess: () =>
-          Effect.succeed({ canWrite: true, canUpdate: true, didAuthor: false }),
+          Effect.succeed({ canWrite: true, canTriage: true, canUpdate: true, didAuthor: false }),
       }),
     ),
   ),
@@ -404,7 +444,7 @@ it.effect("propagates workflow discovery rate limits", () =>
             mergeCapabilities: { merge: true, squash: true, rebase: true },
           }),
         getViewerAccess: () =>
-          Effect.succeed({ canWrite: true, canUpdate: true, didAuthor: false }),
+          Effect.succeed({ canWrite: true, canTriage: true, canUpdate: true, didAuthor: false }),
       }),
     ),
   ),
@@ -420,7 +460,8 @@ describe("getViewerPermissions", () => {
     Layer.mock(GitHubPullRequestCli.GitHubPullRequestCli)({
       getPullRequestDetail: () => Effect.succeed(openDetail),
       getPullRequestBaseComparison: () => comparison,
-      getViewerAccess: () => Effect.succeed({ canWrite: true, canUpdate: true, didAuthor: false }),
+      getViewerAccess: () =>
+        Effect.succeed({ canWrite: true, canTriage: true, canUpdate: true, didAuthor: false }),
     });
 
   it.effect("offers update-branch when the comparison grants it", () =>
@@ -466,7 +507,7 @@ describe("getViewerPermissions", () => {
           getViewerAccess: (input) =>
             Effect.sync(() => {
               viewerAllowReserve = input.allowReserve;
-              return { canWrite: true, canUpdate: true, didAuthor: false };
+              return { canWrite: true, canTriage: true, canUpdate: true, didAuthor: false };
             }),
         }),
       ),
@@ -501,7 +542,7 @@ describe("getViewerPermissions", () => {
               }),
             ),
           getViewerAccess: () =>
-            Effect.succeed({ canWrite: true, canUpdate: true, didAuthor: false }),
+            Effect.succeed({ canWrite: true, canTriage: true, canUpdate: true, didAuthor: false }),
         }),
       ),
     ),
diff --git a/apps/server/src/pullRequest/GitHubPullRequestProvider.ts b/apps/server/src/pullRequest/GitHubPullRequestProvider.ts
index 5288040de25f..e75ef3547c04 100644
--- a/apps/server/src/pullRequest/GitHubPullRequestProvider.ts
+++ b/apps/server/src/pullRequest/GitHubPullRequestProvider.ts
@@ -47,6 +47,7 @@ const CAPABILITIES: PullRequestCapabilities = {
   },
   reviewers: { request: true, listCandidates: true },
   edit: { changeRequest: true, comment: true },
+  labels: true,
 };
 
 /**
@@ -93,6 +94,8 @@ export function gitHubViewerPermissions(access: GitHubViewerAccess): PullRequest
     verdicts: access.didAuthor ? (["comment"] as const) : CAPABILITIES.review.verdicts,
     requestReviewers: access.canWrite,
     ...(access.canUpdateBranch === true ? { updateMethods: CAPABILITIES.updateMethods } : {}),
+    // Triage is the one role that labels without writing, which is what triage is for.
+    labels: access.canTriage,
   };
 }
 
@@ -141,14 +144,12 @@ function withWorkflowApprovals(
   }
   const approvalChecks = runs
     .filter((run) => !representedRunIds.has(run.id))
-    .map(
-      (run): PullRequestCheck => ({
-        name: run.name,
-        status: "action-required",
-        description: "A maintainer must approve this workflow before it can run.",
-        url: run.url,
-      }),
-    );
+    .map((run): PullRequestCheck => ({
+      name: run.name,
+      status: "action-required",
+      description: "A maintainer must approve this workflow before it can run.",
+      url: run.url,
+    }));
   return [
     ...checks,
     ...approvalChecks,
@@ -360,38 +361,34 @@ export const make = Effect.gen(function* () {
         { concurrency: 3 },
       ).pipe(
         Effect.mapError(fail("getChangeRequest")),
-        Effect.map(
-          ([detail, repository, viewerAccess]): ProviderChangeRequestDetail => ({
-            ...detail.pullRequest,
-            checks: withWorkflowApprovals(
-              detail.pullRequest.checks,
-              detail.workflowApprovals.runs,
-              detail.workflowApprovals.unavailable,
-            ),
-            ...(detail.workflowApprovals.unavailable
-              ? {}
-              : { workflowApprovalsRequired: detail.workflowApprovals.runs.length }),
-            reviewers: detail.pullRequest.reviewRequestLogins.map((login) => ({
-              login,
-              name: null,
-              avatarUrl: null,
-            })),
-            mergeCapabilities: repository.mergeCapabilities,
-            viewerPermissions: gitHubViewerPermissions({
-              ...viewerAccess,
-              canUpdateBranch: detail.comparison?.viewerCanUpdate === true,
-            }),
-            baseComparison:
-              detail.comparison === null || detail.comparison.behindBy === null
-                ? "unknown"
-                : detail.comparison.behindBy > 0
-                  ? "behind"
-                  : "up-to-date",
-            ...(detail.comparison?.behindBy == null
-              ? {}
-              : { behindBy: detail.comparison.behindBy }),
+        Effect.map(([detail, repository, viewerAccess]): ProviderChangeRequestDetail => ({
+          ...detail.pullRequest,
+          checks: withWorkflowApprovals(
+            detail.pullRequest.checks,
+            detail.workflowApprovals.runs,
+            detail.workflowApprovals.unavailable,
+          ),
+          ...(detail.workflowApprovals.unavailable
+            ? {}
+            : { workflowApprovalsRequired: detail.workflowApprovals.runs.length }),
+          reviewers: detail.pullRequest.reviewRequestLogins.map((login) => ({
+            login,
+            name: null,
+            avatarUrl: null,
+          })),
+          mergeCapabilities: repository.mergeCapabilities,
+          viewerPermissions: gitHubViewerPermissions({
+            ...viewerAccess,
+            canUpdateBranch: detail.comparison?.viewerCanUpdate === true,
           }),
-        ),
+          baseComparison:
+            detail.comparison === null || detail.comparison.behindBy === null
+              ? "unknown"
+              : detail.comparison.behindBy > 0
+                ? "behind"
+                : "up-to-date",
+          ...(detail.comparison?.behindBy == null ? {} : { behindBy: detail.comparison.behindBy }),
+        })),
       ),
 
     getChangeRequestActivity: (input) =>
@@ -423,53 +420,51 @@ export const make = Effect.gen(function* () {
         { concurrency: 2 },
       ).pipe(
         Effect.mapError(fail("getChangeRequestActivity")),
-        Effect.map(
-          ([pullRequest, reviewThreads]): ProviderChangeRequestActivity => ({
-            author: withAvatar(pullRequest.author, reviewThreads.avatarsByLogin, input.host),
-            reviewers: reviewThreads.reviewers,
-            reactions: reviewThreads.reactions,
-            commits: (reviewThreads.commits.length > 0
-              ? reviewThreads.commits
-              : pullRequest.commits
-            ).map((commit) => ({
-              ...commit,
-              ...reviewThreads.commitStats.get(commit.oid),
-              authors: commit.authors?.map(
-                (author) => withAvatar(author, reviewThreads.avatarsByLogin, input.host) ?? author,
-              ),
-            })),
-            comments: [...pullRequest.comments, ...reviewThreads.comments]
-              .map((comment) => ({
-                ...comment,
-                // GitHub keeps the dismissal reason on the timeline event, not on the review,
-                // so a dismissed review with nothing visible of its own reads its words from
-                // there. "Visible" and not "empty": bot reviews often carry only an HTML
-                // marker comment, which markdown renders as nothing.
-                body:
-                  comment.kind === "review" &&
-                  comment.reviewState?.toUpperCase() === "DISMISSED" &&
-                  rendersEmpty(comment.body)
-                    ? (reviewThreads.dismissalsByReviewId.get(comment.id) ?? comment.body)
-                    : comment.body,
-                author: withAvatar(comment.author, reviewThreads.avatarsByLogin, input.host),
-                // A comment out of `gh pr view --json` carries none of its own: that read
-                // reports no reaction at all, so they arrive from the GraphQL page by node id.
-                reactions: comment.reactions ?? reviewThreads.reactionsById.get(comment.id) ?? [],
-              }))
-              .toSorted((left, right) => left.createdAt.localeCompare(right.createdAt)),
-            // `gh pr view --json comments,reviews` follows GitHub's cursors itself, so those two
-            // are always whole and only the thread walk can stop short of the host.
-            commentCount: pullRequest.comments.length + reviewThreads.commentCount,
-            commentsTruncated: reviewThreads.truncated,
-            reviewThreads: reviewThreads.reviewThreads.map((thread) => ({
-              ...thread,
-              comments: thread.comments.map((comment) => ({
-                ...comment,
-                author: withAvatar(comment.author, reviewThreads.avatarsByLogin, input.host),
-              })),
+        Effect.map(([pullRequest, reviewThreads]): ProviderChangeRequestActivity => ({
+          author: withAvatar(pullRequest.author, reviewThreads.avatarsByLogin, input.host),
+          reviewers: reviewThreads.reviewers,
+          reactions: reviewThreads.reactions,
+          commits: (reviewThreads.commits.length > 0
+            ? reviewThreads.commits
+            : pullRequest.commits
+          ).map((commit) => ({
+            ...commit,
+            ...reviewThreads.commitStats.get(commit.oid),
+            authors: commit.authors?.map(
+              (author) => withAvatar(author, reviewThreads.avatarsByLogin, input.host) ?? author,
+            ),
+          })),
+          comments: [...pullRequest.comments, ...reviewThreads.comments]
+            .map((comment) => ({
+              ...comment,
+              // GitHub keeps the dismissal reason on the timeline event, not on the review,
+              // so a dismissed review with nothing visible of its own reads its words from
+              // there. "Visible" and not "empty": bot reviews often carry only an HTML
+              // marker comment, which markdown renders as nothing.
+              body:
+                comment.kind === "review" &&
+                comment.reviewState?.toUpperCase() === "DISMISSED" &&
+                rendersEmpty(comment.body)
+                  ? (reviewThreads.dismissalsByReviewId.get(comment.id) ?? comment.body)
+                  : comment.body,
+              author: withAvatar(comment.author, reviewThreads.avatarsByLogin, input.host),
+              // A comment out of `gh pr view --json` carries none of its own: that read
+              // reports no reaction at all, so they arrive from the GraphQL page by node id.
+              reactions: comment.reactions ?? reviewThreads.reactionsById.get(comment.id) ?? [],
+            }))
+            .toSorted((left, right) => left.createdAt.localeCompare(right.createdAt)),
+          // `gh pr view --json comments,reviews` follows GitHub's cursors itself, so those two
+          // are always whole and only the thread walk can stop short of the host.
+          commentCount: pullRequest.comments.length + reviewThreads.commentCount,
+          commentsTruncated: reviewThreads.truncated,
+          reviewThreads: reviewThreads.reviewThreads.map((thread) => ({
+            ...thread,
+            comments: thread.comments.map((comment) => ({
+              ...comment,
+              author: withAvatar(comment.author, reviewThreads.avatarsByLogin, input.host),
             })),
-          }),
-        ),
+          })),
+        })),
       ),
 
     getReviewThreadComments: (input) =>
@@ -526,6 +521,21 @@ export const make = Effect.gen(function* () {
         })
         .pipe(Effect.mapError(fail("setReviewerRequest"))),
 
+    listLabelCandidates: (input) =>
+      cli.listLabelCandidates(input).pipe(Effect.mapError(fail("listLabelCandidates"))),
+
+    setLabels: (input) =>
+      cli
+        .setLabels({
+          cwd: input.cwd,
+          repository: input.repository,
+          host: input.host,
+          number: input.number,
+          labels: input.labels,
+          applied: input.applied,
+        })
+        .pipe(Effect.mapError(fail("setLabels"))),
+
     runAction: (input) =>
       cli
         .runPullRequestAction({
diff --git a/apps/server/src/pullRequest/GitLabPullRequestProvider.ts b/apps/server/src/pullRequest/GitLabPullRequestProvider.ts
index 701ef53b08ec..46fce2884279 100644
--- a/apps/server/src/pullRequest/GitLabPullRequestProvider.ts
+++ b/apps/server/src/pullRequest/GitLabPullRequestProvider.ts
@@ -147,24 +147,22 @@ export const make = Effect.gen(function* () {
         { concurrency: 2 },
       ).pipe(
         Effect.mapError(fail("getChangeRequest")),
-        Effect.map(
-          ([mergeRequest, mergeCapabilities]): ProviderChangeRequestDetail => ({
-            ...mergeRequest,
-            mergeCapabilities,
-            viewerPermissions: gitLabViewerPermissions(mergeRequest),
-            // A GitLab too old to count the divergence says nothing here rather than "up to
-            // date": the banner is worth missing, and a wrong all-clear is not worth showing.
-            baseComparison:
-              mergeRequest.divergedCommits === undefined
-                ? "unknown"
-                : mergeRequest.divergedCommits > 0
-                  ? "behind"
-                  : "up-to-date",
-            ...(mergeRequest.divergedCommits === undefined
-              ? {}
-              : { behindBy: mergeRequest.divergedCommits }),
-          }),
-        ),
+        Effect.map(([mergeRequest, mergeCapabilities]): ProviderChangeRequestDetail => ({
+          ...mergeRequest,
+          mergeCapabilities,
+          viewerPermissions: gitLabViewerPermissions(mergeRequest),
+          // A GitLab too old to count the divergence says nothing here rather than "up to
+          // date": the banner is worth missing, and a wrong all-clear is not worth showing.
+          baseComparison:
+            mergeRequest.divergedCommits === undefined
+              ? "unknown"
+              : mergeRequest.divergedCommits > 0
+                ? "behind"
+                : "up-to-date",
+          ...(mergeRequest.divergedCommits === undefined
+            ? {}
+            : { behindBy: mergeRequest.divergedCommits }),
+        })),
       ),
 
     getChangeRequestActivity: (input) =>
@@ -189,28 +187,26 @@ export const make = Effect.gen(function* () {
         { concurrency: 4 },
       ).pipe(
         Effect.mapError(fail("getChangeRequestActivity")),
-        Effect.map(
-          ([notes, commits, discussions, awards]): ProviderChangeRequestActivity => ({
-            reactions: awards.reactions,
-            comments: notes.comments.map((comment) => ({
+        Effect.map(([notes, commits, discussions, awards]): ProviderChangeRequestActivity => ({
+          reactions: awards.reactions,
+          comments: notes.comments.map((comment) => ({
+            ...comment,
+            reactions: awards.reactionsByNoteId.get(comment.id) ?? [],
+          })),
+          // GitLab reports no count of its own, so the walk's own total is the host's: the
+          // notes endpoint carries every comment on the merge request, including the ones
+          // written under a discussion, and it is read until GitLab runs out.
+          commentCount: notes.comments.length,
+          commentsTruncated: notes.truncated || discussions.truncated,
+          reviewThreads: discussions.threads.map((thread) => ({
+            ...thread,
+            comments: thread.comments.map((comment) => ({
               ...comment,
               reactions: awards.reactionsByNoteId.get(comment.id) ?? [],
             })),
-            // GitLab reports no count of its own, so the walk's own total is the host's: the
-            // notes endpoint carries every comment on the merge request, including the ones
-            // written under a discussion, and it is read until GitLab runs out.
-            commentCount: notes.comments.length,
-            commentsTruncated: notes.truncated || discussions.truncated,
-            reviewThreads: discussions.threads.map((thread) => ({
-              ...thread,
-              comments: thread.comments.map((comment) => ({
-                ...comment,
-                reactions: awards.reactionsByNoteId.get(comment.id) ?? [],
-              })),
-            })),
-            commits,
-          }),
-        ),
+          })),
+          commits,
+        })),
       ),
 
     // The same read the detail takes it from, on its own: `user.can_merge` lives on the merge
diff --git a/apps/server/src/pullRequest/PullRequestProvider.ts b/apps/server/src/pullRequest/PullRequestProvider.ts
index 155bf64109ca..1459d7cec921 100644
--- a/apps/server/src/pullRequest/PullRequestProvider.ts
+++ b/apps/server/src/pullRequest/PullRequestProvider.ts
@@ -26,6 +26,7 @@ import type {
   PullRequestReviewVerdict,
   PullRequestReviewerCandidateList,
   PullRequestReviewerKind,
+  PullRequestLabelCandidateList,
   PullRequestState,
   PullRequestUpdateMethod,
   PullRequestViewerPermissions,
@@ -469,6 +470,23 @@ export interface PullRequestProviderApi {
     },
   ) => Effect.Effect<void, PullRequestProviderError>;
 
+  /**
+   * The repository's labels, with the ones already on the change request marked. Present with
+   * `setLabels` only where `capabilities.labels` is true; the service refuses both without it.
+   */
+  readonly listLabelCandidates?: (
+    input: ProviderRepositoryRef & { readonly number: number },
+  ) => Effect.Effect<PullRequestLabelCandidateList, PullRequestProviderError>;
+
+  /** Puts labels on the change request, or takes them off. One call for both directions. */
+  readonly setLabels?: (
+    input: ProviderRepositoryRef & {
+      readonly number: number;
+      readonly labels: ReadonlyArray<string>;
+      readonly applied: boolean;
+    },
+  ) => Effect.Effect<void, PullRequestProviderError>;
+
   /** Only called when `capabilities.review.reply` is true. */
   readonly replyToThread: (
     input: ProviderRepositoryRef & {
diff --git a/apps/server/src/pullRequest/PullRequestService.test.ts b/apps/server/src/pullRequest/PullRequestService.test.ts
index d688430bdf5e..0dc7a928c264 100644
--- a/apps/server/src/pullRequest/PullRequestService.test.ts
+++ b/apps/server/src/pullRequest/PullRequestService.test.ts
@@ -1,6 +1,10 @@
 import { assert, it } from "@effect/vitest";
+import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
+import * as Fiber from "effect/Fiber";
 import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
+import * as Stream from "effect/Stream";
 import * as TestClock from "effect/testing/TestClock";
 import type {
   OrchestrationProjectShell,
@@ -77,6 +81,27 @@ function changeRequest(number: number, updatedAt: string): ProviderChangeRequest
   };
 }
 
+function hostedChangeRequest(body: string, additions = 1) {
+  return {
+    ...changeRequest(1, "2026-07-02T00:00:00Z"),
+    body,
+    additions,
+    changedFiles: 2,
+    mergedAt: null,
+    closedAt: null,
+    reviewers: [],
+    checks: [],
+    mergeCapabilities: { merge: true, squash: true, rebase: true },
+    viewerPermissions: {
+      actions: ["merge"] as const,
+      comment: true,
+      resolve: true,
+      verdicts: ["comment", "approve", "request-changes"] as const,
+      requestReviewers: true,
+    },
+  };
+}
+
 function unusable(provider: SourceControlProviderKind, reason: "missing-tool" | "unauthenticated") {
   return new PullRequestProviderError({
     provider,
@@ -980,6 +1005,41 @@ it.effect("refuses an action the host never claimed it could run", () =>
   }),
 );
 
+it.effect("publishes a successful merge for immediate settlement", () =>
+  Effect.scoped(
+    Effect.gen(function* () {
+      const mergedAt = "2026-09-03T02:00:00.000Z";
+      const reference = { projectId: "p1" as ProjectId, repository: "acme/web", number: 1 };
+      const service = yield* makeService({
+        projects: [
+          project({ id: "p1", title: "web", workspaceRoot: "/a", repository: "acme/web" }),
+        ],
+        providers: [
+          fakeProvider("github", {
+            runAction: () => TestClock.setTime(Date.parse(mergedAt)),
+          }),
+        ],
+      });
+      const merges = yield* service.subscribeMerges;
+      const observedMerge = yield* Stream.runHead(merges).pipe(
+        Effect.forkChild({ startImmediately: true }),
+      );
+
+      yield* service.runAction({
+        ...reference,
+        repository: " ACME/WEB ",
+        action: "merge",
+        mergeMethod: "merge",
+      });
+
+      assert.deepStrictEqual(Option.getOrThrow(yield* Fiber.join(observedMerge)), {
+        ...reference,
+        mergedAt,
+      });
+    }),
+  ),
+);
+
 it.effect("refuses an action this viewer may not take, and says what access it takes", () =>
   Effect.gen(function* () {
     let ran: string | null = null;
@@ -2262,6 +2322,125 @@ it.effect("hands the host's own candidate list back, and asks for it with the ch
   }),
 );
 
+it.effect("refuses a label change on a host that has not said it takes one", () =>
+  Effect.gen(function* () {
+    let changed = false;
+    const service = yield* makeService({
+      projects: [project({ id: "p1", title: "web", workspaceRoot: "/a", repository: "acme/web" })],
+      providers: [
+        fakeProvider("github", {
+          // The method is there; the capability that would let it be called is not.
+          setLabels: () => {
+            changed = true;
+            return Effect.void;
+          },
+        }),
+      ],
+    });
+
+    const error = yield* Effect.flip(
+      service.setLabels({
+        projectId: "p1" as ProjectId,
+        repository: "acme/web",
+        number: 1,
+        labels: ["bug"],
+        applied: true,
+      }),
+    );
+
+    assert.strictEqual(error._tag, "PullRequestOperationError");
+    assert.include(error.message, "cannot change the labels");
+    assert.isFalse(changed);
+  }),
+);
+
+it.effect("refuses a label change this viewer may not make, and says what access it takes", () =>
+  Effect.gen(function* () {
+    let changed = false;
+    const service = yield* makeService({
+      projects: [project({ id: "p1", title: "web", workspaceRoot: "/a", repository: "acme/web" })],
+      providers: [
+        fakeProvider("github", {
+          capabilities: { ...fakeProvider("github").capabilities, labels: true },
+          getViewerPermissions: () =>
+            Effect.succeed({
+              actions: [],
+              comment: true,
+              resolve: false,
+              verdicts: ["comment", "approve", "request-changes"],
+              requestReviewers: false,
+              labels: false,
+            }),
+          listLabelCandidates: () => Effect.die("must not be called"),
+          setLabels: () => {
+            changed = true;
+            return Effect.void;
+          },
+        }),
+      ],
+    });
+
+    const listError = yield* Effect.flip(
+      service.labelCandidates({ projectId: "p1" as ProjectId, repository: "acme/web", number: 1 }),
+    );
+    assert.include(listError.message, "You need triage access on this repository");
+
+    const error = yield* Effect.flip(
+      service.setLabels({
+        projectId: "p1" as ProjectId,
+        repository: "acme/web",
+        number: 1,
+        labels: ["bug"],
+        applied: true,
+      }),
+    );
+    assert.include(error.message, "You need triage access on this repository");
+    assert.isFalse(changed);
+  }),
+);
+
+it.effect("hands a label change to the host, and reads the labels back for the menu", () =>
+  Effect.gen(function* () {
+    let received: { labels: ReadonlyArray<string>; applied: boolean } | null = null;
+    const service = yield* makeService({
+      projects: [project({ id: "p1", title: "web", workspaceRoot: "/a", repository: "acme/web" })],
+      providers: [
+        fakeProvider("github", {
+          capabilities: { ...fakeProvider("github").capabilities, labels: true },
+          listLabelCandidates: () =>
+            Effect.succeed({
+              candidates: [{ name: "bug", color: null, description: null, isApplied: false }],
+              truncated: false,
+            }),
+          setLabels: (input) => {
+            received = { labels: input.labels, applied: input.applied };
+            return Effect.void;
+          },
+        }),
+      ],
+    });
+
+    const list = yield* service.labelCandidates({
+      projectId: "p1" as ProjectId,
+      repository: "acme/web",
+      number: 4,
+    });
+    assert.deepStrictEqual(
+      list.candidates.map((label) => label.name),
+      ["bug"],
+    );
+
+    yield* service.setLabels({
+      projectId: "p1" as ProjectId,
+      repository: "acme/web",
+      number: 4,
+      labels: ["bug"],
+      applied: false,
+    });
+    assert.deepStrictEqual(received, { labels: ["bug"], applied: false });
+  }),
+);
+
 it.effect("answers a repeated listing from cache, and concurrent readers share one request", () =>
   Effect.gen(function* () {
     let hostCalls = 0;
@@ -2934,7 +3113,7 @@ it.effect(
     }),
 );
 
-it.effect("shares linked summaries and only recovers transient failures for display reads", () =>
+it.effect("shares linked summaries and reuses them for display without asking the host again", () =>
   Effect.gen(function* () {
     let calls = 0;
     let failing = false;
@@ -2984,7 +3163,8 @@ it.effect("shares linked summaries and only recovers transient failures for disp
 
     const stale = yield* service.summary(reference);
     assert.strictEqual(stale.updatedAt, "2026-07-02T00:00:00Z");
-    assert.strictEqual(calls, 3);
+    // Display reads keep the last title and state rather than asking the host again.
+    assert.strictEqual(calls, 2);
 
     yield* service.invalidate({ reference });
     const invalidated = yield* Effect.flip(service.summary(reference));
@@ -2992,6 +3172,177 @@ it.effect("shares linked summaries and only recovers transient failures for disp
   }),
 );
 
+it.effect("answers a known pull request immediately while the host refreshes", () =>
+  Effect.gen(function* () {
+    const gate = yield* Deferred.make<void>();
+    let calls = 0;
+    const reference = { projectId: "p1" as ProjectId, repository: "acme/web", number: 1 };
+    const service = yield* makeService({
+      projects: [project({ id: "p1", title: "web", workspaceRoot: "/a", repository: "acme/web" })],
+      providers: [
+        fakeProvider("github", {
+          getChangeRequest: () =>
+            Effect.gen(function* () {
+              calls += 1;
+              if (calls > 1) yield* Deferred.await(gate);
+              return hostedChangeRequest("cached body", 4);
+            }),
+        }),
+      ],
+    });
+
+    const first = yield* service.detail(reference);
+    assert.strictEqual(first.body, "cached body");
+    assert.strictEqual(first.additions, 4);
+
+    yield* TestClock.adjust("16 seconds");
+    const second = yield* service.detail(reference);
+    assert.strictEqual(second.body, "cached body");
+    assert.strictEqual(second.additions, 4);
+    yield* Effect.yieldNow;
+    assert.strictEqual(calls, 2);
+  }),
+);
+
+it.effect("does not ask the host again for a linked summary it already holds", () =>
+  Effect.gen(function* () {
+    let calls = 0;
+    const reference = { projectId: "p1" as ProjectId, repository: "acme/web", number: 1 };
+    const service = yield* makeService({
+      projects: [project({ id: "p1", title: "web", workspaceRoot: "/a", repository: "acme/web" })],
+      providers: [
+        fakeProvider("github", {
+          getChangeRequestSummary: () =>
+            Effect.sync(() => {
+              calls += 1;
+              return changeRequest(1, "2026-07-02T00:00:00Z");
+            }),
+        }),
+      ],
+    });
+
+    const first = yield* service.summary(reference);
+    assert.strictEqual(first.title, "Change request 1");
+    yield* TestClock.adjust("61 seconds");
+    const second = yield* service.summary(reference);
+    assert.strictEqual(second.title, "Change request 1");
+    assert.strictEqual(calls, 1);
+  }),
+);
+
+it.effect("reuses an observed merged state for strict settlement reads", () =>
+  Effect.gen(function* () {
+    const reference = { projectId: "p1" as ProjectId, repository: "acme/web", number: 1 };
+    const service = yield* makeService({
+      projects: [project({ id: "p1", title: "web", workspaceRoot: "/a", repository: "acme/web" })],
+      providers: [
+        fakeProvider("github", {
+          getChangeRequest: () =>
+            Effect.succeed({
+              ...hostedChangeRequest("merged body", 4),
+              state: "merged",
+              updatedAt: "2026-07-03T00:00:00Z",
+            }),
+          getChangeRequestSummary: () => Effect.die("strict merged state must not refresh"),
+        }),
+      ],
+    });
+
+    yield* service.detail(reference);
+
+    const summary = yield* service.summary(reference, { recoverTransientFailure: false });
+    assert.strictEqual(summary.state, "merged");
+    assert.strictEqual(summary.updatedAt, "2026-07-03T00:00:00Z");
+  }),
+);
+
+it.effect("does not let a stale detail reopen overwrite a fresher linked summary", () =>
+  Effect.gen(function* () {
+    const gate = yield* Deferred.make<void>();
+    let detailCalls = 0;
+    let summaryTitle = "old title";
+    let summaryState: "open" | "merged" = "open";
+    const reference = { projectId: "p1" as ProjectId, repository: "acme/web", number: 1 };
+    const service = yield* makeService({
+      projects: [project({ id: "p1", title: "web", workspaceRoot: "/a", repository: "acme/web" })],
+      providers: [
+        fakeProvider("github", {
+          getChangeRequest: () =>
+            Effect.gen(function* () {
+              detailCalls += 1;
+              if (detailCalls > 1) yield* Deferred.await(gate);
+              return hostedChangeRequest("old body", 4);
+            }),
+          getChangeRequestSummary: () =>
+            Effect.succeed({
+              ...changeRequest(1, "2026-07-02T00:00:00Z"),
+              title: summaryTitle,
+              state: summaryState,
+            }),
+        }),
+      ],
+    });
+
+    const first = yield* service.detail(reference);
+    assert.strictEqual(first.title, "Change request 1");
+
+    summaryTitle = "merged title";
+    summaryState = "merged";
+    yield* TestClock.adjust("61 seconds");
+    const settled = yield* service.summary(reference, { recoverTransientFailure: false });
+    assert.strictEqual(settled.title, "merged title");
+    assert.strictEqual(settled.state, "merged");
+
+    yield* TestClock.adjust("16 seconds");
+    const stale = yield* service.detail(reference);
+    assert.strictEqual(stale.title, "Change request 1");
+    yield* Effect.yieldNow;
+
+    const display = yield* service.summary(reference);
+    assert.strictEqual(display.title, "merged title");
+    assert.strictEqual(display.state, "merged");
+    assert.strictEqual(detailCalls, 2);
+  }),
+);
+
+it.effect("does not let a still-cached detail overwrite a fresher linked summary", () =>
+  Effect.gen(function* () {
+    let summaryTitle = "old title";
+    let summaryState: "open" | "merged" = "open";
+    const reference = { projectId: "p1" as ProjectId, repository: "acme/web", number: 1 };
+    const service = yield* makeService({
+      projects: [project({ id: "p1", title: "web", workspaceRoot: "/a", repository: "acme/web" })],
+      providers: [
+        fakeProvider("github", {
+          getChangeRequest: () => Effect.succeed(hostedChangeRequest("old body", 4)),
+          getChangeRequestSummary: () =>
+            Effect.succeed({
+              ...changeRequest(1, "2026-07-02T00:00:00Z"),
+              title: summaryTitle,
+              state: summaryState,
+            }),
+        }),
+      ],
+    });
+
+    const first = yield* service.detail(reference);
+    assert.strictEqual(first.title, "Change request 1");
+
+    summaryTitle = "merged title";
+    summaryState = "merged";
+    const settled = yield* service.summary(reference, { recoverTransientFailure: false });
+    assert.strictEqual(settled.state, "merged");
+
+    const cached = yield* service.detail(reference);
+    assert.strictEqual(cached.title, "Change request 1");
+    yield* Effect.yieldNow;
+
+    const display = yield* service.summary(reference);
+    assert.strictEqual(display.title, "merged title");
+    assert.strictEqual(display.state, "merged");
+  }),
+);
+
 it.effect("keeps recent detail on a transient refresh failure but not after invalidation", () =>
   Effect.gen(function* () {
     let failing = false;
diff --git a/apps/server/src/pullRequest/PullRequestService.ts b/apps/server/src/pullRequest/PullRequestService.ts
index ffa96af12f08..b27fff3534a7 100644
--- a/apps/server/src/pullRequest/PullRequestService.ts
+++ b/apps/server/src/pullRequest/PullRequestService.ts
@@ -1,11 +1,15 @@
 import * as Cache from "effect/Cache";
 import * as Clock from "effect/Clock";
 import * as Context from "effect/Context";
+import * as DateTime from "effect/DateTime";
 import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
 import * as Exit from "effect/Exit";
 import * as Layer from "effect/Layer";
+import * as PubSub from "effect/PubSub";
 import * as Schema from "effect/Schema";
+import type * as Scope from "effect/Scope";
+import * as Stream from "effect/Stream";
 import {
   PullRequestOperationError,
   PullRequestUnavailableError,
@@ -38,6 +42,8 @@ import {
   type PullRequestReviewVerdict,
   type PullRequestReviewerCandidateList,
   type PullRequestReviewerRequestInput,
+  type PullRequestLabelCandidateList,
+  type PullRequestLabelChangeInput,
   type PullRequestSubmitReviewInput,
   type PullRequestSummary,
   type PullRequestThreadReplyInput,
@@ -61,6 +67,10 @@ import {
 } from "./PullRequestProvider.ts";
 import { PullRequestProviderRegistry } from "./PullRequestProviderRegistry.ts";
 
+export interface PullRequestMergeEvent extends PullRequestRef {
+  readonly mergedAt: string;
+}
+
 /**
  * Rows per repository when the client does not ask for a page size, and rows per slice when a
  * listing is carried on from a cursor.
@@ -133,6 +143,11 @@ export class PullRequestService extends Context.Service<
       input: PullRequestRef,
       options?: { readonly recoverTransientFailure?: boolean },
     ) => Effect.Effect<PullRequestSummary, PullRequestError>;
+    readonly subscribeMerges: Effect.Effect<
+      Stream.Stream<PullRequestMergeEvent>,
+      never,
+      Scope.Scope
+    >;
     readonly detail: (input: PullRequestRef) => Effect.Effect<PullRequestDetail, PullRequestError>;
     readonly activity: (
       input: PullRequestRef,
@@ -170,6 +185,12 @@ export class PullRequestService extends Context.Service<
     readonly requestReviewers: (
       input: PullRequestReviewerRequestInput,
     ) => Effect.Effect<void, PullRequestError>;
+    readonly labelCandidates: (
+      input: PullRequestRef,
+    ) => Effect.Effect<PullRequestLabelCandidateList, PullRequestError>;
+    readonly setLabels: (
+      input: PullRequestLabelChangeInput,
+    ) => Effect.Effect<void, PullRequestError>;
     readonly invalidate: (input: PullRequestInvalidateInput) => Effect.Effect<void>;
   }
 >()("t3/pullRequest/PullRequestService") {}
@@ -213,6 +234,7 @@ const ACTION_ACCESS_REFUSALS: Record<PullRequestAction, string> = {
  * sentence is only ever the answer where a host said no.
  */
 const REVIEWER_REQUEST_REFUSAL = "You need write access on this repository to ask for a review.";
+const LABEL_CHANGE_REFUSAL = "You need triage access on this repository to change its labels.";
 
 /** A project this page can read: its remote is on a host with an implementation. */
 interface SupportedProject {
@@ -473,6 +495,10 @@ function withRateLimitBackoff(
     submitReview: interactive("submitReview", api.submitReview),
     listReviewerCandidates: interactive("listReviewerCandidates", api.listReviewerCandidates),
     setReviewerRequest: interactive("setReviewerRequest", api.setReviewerRequest),
+    ...(api.listLabelCandidates === undefined
+      ? {}
+      : { listLabelCandidates: interactive("listLabelCandidates", api.listLabelCandidates) }),
+    ...(api.setLabels === undefined ? {} : { setLabels: interactive("setLabels", api.setLabels) }),
     replyToThread: interactive("replyToThread", api.replyToThread),
     setReaction: interactive("setReaction", api.setReaction),
     setThreadResolution: interactive("setThreadResolution", api.setThreadResolution),
@@ -504,6 +530,7 @@ export function repositoryIdentityOf(project: OrchestrationProjectShell): string
 }
 
 export const make = Effect.gen(function* () {
+  const mergedPullRequests = yield* PubSub.sliding<PullRequestMergeEvent>(64);
   const registry = yield* PullRequestProviderRegistry;
   const projections = yield* ProjectionSnapshotQuery.ProjectionSnapshotQuery;
   const sourceControlProviders = yield* SourceControlProviderRegistry.SourceControlProviderRegistry;
@@ -1022,21 +1049,19 @@ export const make = Effect.gen(function* () {
               }),
               // One unreachable repository must not blank the page. A host-level failure is
               // already reported through `providers`, so it degrades the same way here.
-              Effect.orElseSucceed(
-                (): RepositoryBatch => ({
-                  key,
-                  entries: [],
-                  errors: [
-                    {
-                      projectId: project.project.id,
-                      projectTitle: project.project.title,
-                      message: `${project.repository} could not be read.`,
-                    },
-                  ],
-                  truncated: false,
-                  nextCursor: null,
-                }),
-              ),
+              Effect.orElseSucceed((): RepositoryBatch => ({
+                key,
+                entries: [],
+                errors: [
+                  {
+                    projectId: project.project.id,
+                    projectTitle: project.project.title,
+                    message: `${project.repository} could not be read.`,
+                  },
+                ],
+                truncated: false,
+                nextCursor: null,
+              })),
             );
         }
       };
@@ -1217,20 +1242,18 @@ export const make = Effect.gen(function* () {
             : project.api.getChangeRequestSummary(providerInput);
         return read.pipe(
           Effect.mapError(toPullRequestError("summary")),
-          Effect.map(
-            (changeRequest): PullRequestSummary => ({
-              provider: project.api.kind,
-              projectId: project.project.id,
-              repository: project.repository,
-              number: changeRequest.number,
-              title: changeRequest.title,
-              url: changeRequest.url,
-              state: changeRequest.state,
-              headBranch: changeRequest.headBranch,
-              baseBranch: changeRequest.baseBranch,
-              updatedAt: changeRequest.updatedAt,
-            }),
-          ),
+          Effect.map((changeRequest): PullRequestSummary => ({
+            provider: project.api.kind,
+            projectId: project.project.id,
+            repository: project.repository,
+            number: changeRequest.number,
+            title: changeRequest.title,
+            url: changeRequest.url,
+            state: changeRequest.state,
+            headBranch: changeRequest.headBranch,
+            baseBranch: changeRequest.baseBranch,
+            updatedAt: changeRequest.updatedAt,
+          })),
         );
       }),
     );
@@ -1252,55 +1275,53 @@ export const make = Effect.gen(function* () {
           ],
           { concurrency: 2 },
         ).pipe(
-          Effect.map(
-            ([changeRequest, viewer]): PullRequestDetail => ({
-              provider: project.api.kind,
-              capabilities: project.api.capabilities,
-              projectId: project.project.id,
-              projectTitle: project.project.title,
-              workspaceRoot: project.project.workspaceRoot,
-              repository: project.repository,
-              number: changeRequest.number,
-              title: changeRequest.title,
-              body: changeRequest.body,
-              url: changeRequest.url,
-              author: changeRequest.author,
-              state: changeRequest.state,
-              isDraft: changeRequest.isDraft,
-              mergeability: changeRequest.mergeability,
-              additions: changeRequest.additions,
-              deletions: changeRequest.deletions,
-              changedFiles: changeRequest.changedFiles,
-              headBranch: changeRequest.headBranch,
-              ...(changeRequest.headRepositoryNameWithOwner === undefined
-                ? {}
-                : { headRepositoryNameWithOwner: changeRequest.headRepositoryNameWithOwner }),
-              baseBranch: changeRequest.baseBranch,
-              createdAt: changeRequest.createdAt,
-              updatedAt: changeRequest.updatedAt,
-              mergedAt: changeRequest.mergedAt,
-              closedAt: changeRequest.closedAt,
-              reviewers: changeRequest.reviewers,
-              labels: changeRequest.labels,
-              checks: changeRequest.checks,
-              mergeCapabilities: changeRequest.mergeCapabilities,
-              viewerPermissions: changeRequest.viewerPermissions,
-              ...(viewer === null || viewer.trim().length === 0 ? {} : { viewer }),
-              ...(changeRequest.baseComparison === undefined
-                ? {}
-                : { baseComparison: changeRequest.baseComparison }),
-              ...(changeRequest.behindBy === undefined ? {} : { behindBy: changeRequest.behindBy }),
-              ...(changeRequest.autoMergeEnabled === undefined
-                ? {}
-                : { autoMergeEnabled: changeRequest.autoMergeEnabled }),
-              ...(changeRequest.autoMergeMethod === undefined
-                ? {}
-                : { autoMergeMethod: changeRequest.autoMergeMethod }),
-              ...(changeRequest.workflowApprovalsRequired === undefined
-                ? {}
-                : { workflowApprovalsRequired: changeRequest.workflowApprovalsRequired }),
-            }),
-          ),
+          Effect.map(([changeRequest, viewer]): PullRequestDetail => ({
+            provider: project.api.kind,
+            capabilities: project.api.capabilities,
+            projectId: project.project.id,
+            projectTitle: project.project.title,
+            workspaceRoot: project.project.workspaceRoot,
+            repository: project.repository,
+            number: changeRequest.number,
+            title: changeRequest.title,
+            body: changeRequest.body,
+            url: changeRequest.url,
+            author: changeRequest.author,
+            state: changeRequest.state,
+            isDraft: changeRequest.isDraft,
+            mergeability: changeRequest.mergeability,
+            additions: changeRequest.additions,
+            deletions: changeRequest.deletions,
+            changedFiles: changeRequest.changedFiles,
+            headBranch: changeRequest.headBranch,
+            ...(changeRequest.headRepositoryNameWithOwner === undefined
+              ? {}
+              : { headRepositoryNameWithOwner: changeRequest.headRepositoryNameWithOwner }),
+            baseBranch: changeRequest.baseBranch,
+            createdAt: changeRequest.createdAt,
+            updatedAt: changeRequest.updatedAt,
+            mergedAt: changeRequest.mergedAt,
+            closedAt: changeRequest.closedAt,
+            reviewers: changeRequest.reviewers,
+            labels: changeRequest.labels,
+            checks: changeRequest.checks,
+            mergeCapabilities: changeRequest.mergeCapabilities,
+            viewerPermissions: changeRequest.viewerPermissions,
+            ...(viewer === null || viewer.trim().length === 0 ? {} : { viewer }),
+            ...(changeRequest.baseComparison === undefined
+              ? {}
+              : { baseComparison: changeRequest.baseComparison }),
+            ...(changeRequest.behindBy === undefined ? {} : { behindBy: changeRequest.behindBy }),
+            ...(changeRequest.autoMergeEnabled === undefined
+              ? {}
+              : { autoMergeEnabled: changeRequest.autoMergeEnabled }),
+            ...(changeRequest.autoMergeMethod === undefined
+              ? {}
+              : { autoMergeMethod: changeRequest.autoMergeMethod }),
+            ...(changeRequest.workflowApprovalsRequired === undefined
+              ? {}
+              : { workflowApprovalsRequired: changeRequest.workflowApprovalsRequired }),
+          })),
         ),
       ),
     );
@@ -1317,18 +1338,16 @@ export const make = Effect.gen(function* () {
           })
           .pipe(
             Effect.mapError(toPullRequestError("activity")),
-            Effect.map(
-              (activity): PullRequestActivity => ({
-                ...(activity.author === undefined ? {} : { author: activity.author }),
-                ...(activity.reviewers === undefined ? {} : { reviewers: activity.reviewers }),
-                comments: activity.comments,
-                commentCount: activity.commentCount,
-                commentsTruncated: activity.commentsTruncated,
-                reviewThreads: activity.reviewThreads,
-                commits: activity.commits,
-                ...(activity.reactions === undefined ? {} : { reactions: activity.reactions }),
-              }),
-            ),
+            Effect.map((activity): PullRequestActivity => ({
+              ...(activity.author === undefined ? {} : { author: activity.author }),
+              ...(activity.reviewers === undefined ? {} : { reviewers: activity.reviewers }),
+              comments: activity.comments,
+              commentCount: activity.commentCount,
+              commentsTruncated: activity.commentsTruncated,
+              reviewThreads: activity.reviewThreads,
+              commits: activity.commits,
+              ...(activity.reactions === undefined ? {} : { reactions: activity.reactions }),
+            })),
           ),
       ),
     );
@@ -1405,9 +1424,9 @@ export const make = Effect.gen(function* () {
       }),
     );
 
-  const runAction: PullRequestService["Service"]["runAction"] = (input) =>
+  const runAction = (input: PullRequestActionInput): Effect.Effect<string, PullRequestError> =>
     requireProject(input).pipe(
-      Effect.flatMap((project): Effect.Effect<void, PullRequestError> => {
+      Effect.flatMap((project): Effect.Effect<string, PullRequestError> => {
         // The surface hides what a host cannot do, and this refuses it as well: a request that
         // reached here anyway must not be handed to a provider that never claimed the action.
         if (!project.api.capabilities.actions.includes(input.action)) {
@@ -1449,7 +1468,7 @@ export const make = Effect.gen(function* () {
         // have to say yes. The second is asked last, because it costs a request and the checks
         // above do not.
         return viewerPermissionsOf(project, input, "runAction").pipe(
-          Effect.flatMap((viewer): Effect.Effect<void, PullRequestError> => {
+          Effect.flatMap((viewer): Effect.Effect<string, PullRequestError> => {
             if (!viewer.actions.includes(input.action)) {
               return Effect.fail(
                 new PullRequestOperationError({
@@ -1479,7 +1498,10 @@ export const make = Effect.gen(function* () {
                 ...(input.mergeMethod === undefined ? {} : { mergeMethod: input.mergeMethod }),
                 ...(input.updateMethod === undefined ? {} : { updateMethod: input.updateMethod }),
               })
-              .pipe(Effect.mapError(toPullRequestError("runAction")));
+              .pipe(
+                Effect.mapError(toPullRequestError("runAction")),
+                Effect.as(project.repository),
+              );
           }),
         );
       }),
@@ -1843,6 +1865,77 @@ export const make = Effect.gen(function* () {
       }),
     );
 
+  /**
+   * The labels, like the reviewer candidates, are wanted only by somebody about to change them,
+   * so the same permission guards the list and the change.
+   */
+  const labelCandidates: PullRequestService["Service"]["labelCandidates"] = (input) =>
+    requireProject(input).pipe(
+      Effect.flatMap((project): Effect.Effect<PullRequestLabelCandidateList, PullRequestError> => {
+        const list = project.api.listLabelCandidates;
+        if (project.api.capabilities.labels !== true || list === undefined) {
+          return Effect.fail(
+            new PullRequestOperationError({
+              operation: "labelCandidates",
+              detail: "This host cannot change the labels on a change request.",
+            }),
+          );
+        }
+        return viewerPermissionsOf(project, input, "labelCandidates").pipe(
+          Effect.flatMap(
+            (viewer): Effect.Effect<PullRequestLabelCandidateList, PullRequestError> =>
+              viewer.labels === false
+                ? Effect.fail(
+                    new PullRequestOperationError({
+                      operation: "labelCandidates",
+                      detail: LABEL_CHANGE_REFUSAL,
+                    }),
+                  )
+                : list({
+                    cwd: project.project.workspaceRoot,
+                    repository: project.repository,
+                    host: project.host,
+                    number: input.number,
+                  }).pipe(Effect.mapError(toPullRequestError("labelCandidates"))),
+          ),
+        );
+      }),
+    );
+
+  const setLabels: PullRequestService["Service"]["setLabels"] = (input) =>
+    requireProject(input).pipe(
+      Effect.flatMap((project): Effect.Effect<void, PullRequestError> => {
+        const change = project.api.setLabels;
+        if (project.api.capabilities.labels !== true || change === undefined) {
+          return Effect.fail(
+            new PullRequestOperationError({
+              operation: "setLabels",
+              detail: "This host cannot change the labels on a change request.",
+            }),
+          );
+        }
+        return viewerPermissionsOf(project, input, "setLabels").pipe(
+          Effect.flatMap((viewer): Effect.Effect<void, PullRequestError> =>
+            viewer.labels === false
+              ? Effect.fail(
+                  new PullRequestOperationError({
+                    operation: "setLabels",
+                    detail: LABEL_CHANGE_REFUSAL,
+                  }),
+                )
+              : change({
+                  cwd: project.project.workspaceRoot,
+                  repository: project.repository,
+                  host: project.host,
+                  number: input.number,
+                  labels: input.labels,
+                  applied: input.applied,
+                }).pipe(Effect.mapError(toPullRequestError("setLabels"))),
+          ),
+        );
+      }),
+    );
+
   /**
    * The line counts for rows already on the page, which the listing left out because on GitHub
    * they cost more than everything else on the row put together.
@@ -2001,7 +2094,25 @@ export const make = Effect.gen(function* () {
           },
         }),
       );
-    return { read, record };
+    /**
+     * A change request already read does not wait on the host again. `reuse` answers from
+     * what we hold and spends nothing — title, author, and state barely move, and a linked
+     * thread already names the change request. `revalidate` answers the same way and
+     * refreshes behind it, so line counts and the rest can change in place.
+     */
+    const serveHeld = (
+      key: string,
+      effect: Effect.Effect<A, PullRequestError>,
+      mode: "reuse" | "revalidate",
+    ) => {
+      const snapshot = held.get(key);
+      if (snapshot === undefined) return read(key, effect);
+      if (mode === "reuse") return Effect.succeed(snapshot.value);
+      return Effect.sync(() => runFork(Effect.ignore(read(key, effect)))).pipe(
+        Effect.as(snapshot.value),
+      );
+    };
+    return { peek: (key: string) => held.get(key)?.value, read, record, serveHeld };
   };
   const lastGoodSummary = makeLastGoodRead<PullRequestSummary>(DETAIL_CACHE_CAPACITY);
   const lastGoodDetail = makeLastGoodRead<PullRequestDetail>(DETAIL_CACHE_CAPACITY);
@@ -2057,9 +2168,13 @@ export const make = Effect.gen(function* () {
   const summary: PullRequestService["Service"]["summary"] = (input, options) => {
     const key = refCacheKey(input);
     const cached = Cache.get(summaryCache, key);
-    return options?.recoverTransientFailure === false
-      ? cached.pipe(Effect.tap((value) => lastGoodSummary.record(key, value)))
-      : lastGoodSummary.read(key, cached);
+    if (options?.recoverTransientFailure !== false) {
+      return lastGoodSummary.serveHeld(key, cached, "reuse");
+    }
+    const held = lastGoodSummary.peek(key);
+    return held?.state === "merged"
+      ? Effect.succeed(held)
+      : cached.pipe(Effect.tap((value) => lastGoodSummary.record(key, value)));
   };
 
   // Keys serialize positionally and parse back in the lookup, so the cache is the only holder
@@ -2149,9 +2264,42 @@ export const make = Effect.gen(function* () {
       timeToLive: (exit) => (Exit.isSuccess(exit) ? DETAIL_CACHE_TTL : Duration.zero),
     },
   );
+  const summaryFromDetail = (detail: PullRequestDetail): PullRequestSummary => ({
+    provider: detail.provider,
+    projectId: detail.projectId,
+    repository: detail.repository,
+    number: detail.number,
+    title: detail.title,
+    url: detail.url,
+    state: detail.state,
+    headBranch: detail.headBranch,
+    baseBranch: detail.baseBranch,
+    updatedAt: detail.updatedAt,
+  });
+  const shouldReplaceHeldSummary = (key: string, next: PullRequestSummary) => {
+    const current = lastGoodSummary.peek(key);
+    if (current === undefined) return true;
+    if (current.state === "merged" && next.state !== "merged") return false;
+    return next.updatedAt >= current.updatedAt;
+  };
   const detail: PullRequestService["Service"]["detail"] = (input) => {
     const key = refCacheKey(input);
-    return lastGoodDetail.read(key, Cache.get(detailCache, key));
+    // Record the summary from a host or cache read, not the stale value
+    // `serveHeld` returns immediately. Skip the write when that read is older
+    // than a later strict summary — display reuse would otherwise keep the
+    // regression and never ask the host again.
+    return lastGoodDetail.serveHeld(
+      key,
+      Cache.get(detailCache, key).pipe(
+        Effect.tap((value) => {
+          const summary = summaryFromDetail(value);
+          return shouldReplaceHeldSummary(key, summary)
+            ? lastGoodSummary.record(key, summary)
+            : Effect.void;
+        }),
+      ),
+      "revalidate",
+    );
   };
 
   const activityCache = yield* Cache.makeWith(
@@ -2264,17 +2412,35 @@ export const make = Effect.gen(function* () {
           }),
         ),
       );
+  const runActionAndInvalidate: PullRequestService["Service"]["runAction"] = Effect.fn(
+    "PullRequestService.runActionAndInvalidate",
+  )(function* (input) {
+    const repository = yield* runAction(input);
+    bumpRefEpoch({ ...input, repository });
+    listingsEpoch = ++epochCounter;
+    if (input.action === "merge") {
+      yield* PubSub.publish(mergedPullRequests, {
+        projectId: input.projectId,
+        repository,
+        number: input.number,
+        mergedAt: DateTime.formatIso(yield* DateTime.now),
+      });
+    }
+  });
 
   return PullRequestService.of({
     list,
     listStats,
     summary,
+    subscribeMerges: PubSub.subscribe(mergedPullRequests).pipe(
+      Effect.map((subscription) => Stream.fromSubscription(subscription)),
+    ),
     detail,
     activity,
     threadComments,
     diff,
     diffFileContents,
-    runAction: invalidatedByMutation(runAction),
+    runAction: runActionAndInvalidate,
     update: invalidatedByMutation(update),
     comment: invalidatedByMutation(comment),
     updateComment: invalidatedByMutation(updateComment),
@@ -2285,6 +2451,8 @@ export const make = Effect.gen(function* () {
     // The candidate list is deliberately read fresh per menu-open, so it stays uncached.
     reviewerCandidates,
     requestReviewers: invalidatedByMutation(requestReviewers),
+    labelCandidates,
+    setLabels: invalidatedByMutation(setLabels),
     invalidate,
   });
 });
diff --git a/apps/server/src/pullRequest/gitHubPullRequestJson.test.ts b/apps/server/src/pullRequest/gitHubPullRequestJson.test.ts
index 000dbada2045..f6f5957f5875 100644
--- a/apps/server/src/pullRequest/gitHubPullRequestJson.test.ts
+++ b/apps/server/src/pullRequest/gitHubPullRequestJson.test.ts
@@ -11,6 +11,7 @@ import {
   decodePullRequestListJson,
   decodePullRequestNodeIdJson,
   decodePullRequestSearchJson,
+  decodeLabelCandidatesJson,
   decodeRepositoryAccessJson,
   decodeReviewerCandidatesJson,
   decodeReviewThreadCommentsJson,
@@ -832,7 +833,7 @@ describe("viewer permission decoding", () => {
           }),
         ),
       ),
-    ).toEqual({ canWrite: false, canUpdate: true, didAuthor: true });
+    ).toEqual({ canWrite: false, canTriage: false, canUpdate: true, didAuthor: true });
   });
 
   it("says no to a passer-by on a repository they can only read", () => {
@@ -845,7 +846,7 @@ describe("viewer permission decoding", () => {
           }),
         ),
       ),
-    ).toEqual({ canWrite: false, canUpdate: false, didAuthor: false });
+    ).toEqual({ canWrite: false, canTriage: false, canUpdate: false, didAuthor: false });
   });
 
   it("reads silence as permission, but not as authorship", () => {
@@ -854,10 +855,79 @@ describe("viewer permission decoding", () => {
     // and claiming it for someone who did not is how an author's own rules get handed out.
     expect(expectSuccess(decodeViewerPermissionsJson(viewerJson({ pullRequest: null })))).toEqual({
       canWrite: false,
+      canTriage: false,
       canUpdate: true,
       didAuthor: false,
     });
   });
+
+  it("reads triage as enough to label, and not enough to write", () => {
+    const access = expectSuccess(
+      decodeViewerPermissionsJson(
+        viewerJson({
+          viewerPermission: "TRIAGE",
+          pullRequest: { viewerCanUpdate: false, viewerDidAuthor: false },
+        }),
+      ),
+    );
+    expect(access.canTriage).toBe(true);
+    expect(access.canWrite).toBe(false);
+  });
+});
+
+describe("label candidate decoding", () => {
+  const labelsJson = (input: {
+    readonly defined: ReadonlyArray<Record<string, unknown>>;
+    readonly applied?: ReadonlyArray<string>;
+    readonly hasNextPage?: boolean;
+  }) =>
+    JSON.stringify({
+      data: {
+        repository: {
+          labels: {
+            pageInfo: { hasNextPage: input.hasNextPage ?? false },
+            nodes: input.defined,
+          },
+          pullRequest: { labels: { nodes: (input.applied ?? []).map((name) => ({ name })) } },
+        },
+      },
+    });
+
+  it("marks the labels the pull request already wears", () => {
+    const list = expectSuccess(
+      decodeLabelCandidatesJson(
+        labelsJson({
+          defined: [
+            { name: "bug", color: "d73a4a", description: "Something is broken" },
+            { name: "size:XL", color: "e4572e", description: null },
+          ],
+          applied: ["size:XL"],
+        }),
+      ),
+    );
+    expect(list.candidates).toEqual([
+      { name: "bug", color: "d73a4a", description: "Something is broken", isApplied: false },
+      { name: "size:XL", color: "e4572e", description: null, isApplied: true },
+    ]);
+    expect(list.truncated).toBe(false);
+  });
+
+  it("keeps a worn label the repository no longer defines, so it can be taken off", () => {
+    const list = expectSuccess(
+      decodeLabelCandidatesJson(labelsJson({ defined: [{ name: "bug" }], applied: ["legacy"] })),
+    );
+    expect(list.candidates.map((label) => [label.name, label.isApplied])).toEqual([
+      ["legacy", true],
+      ["bug", false],
+    ]);
+  });
+
+  it("says so when the repository defines more labels than the read asked for", () => {
+    expect(
+      expectSuccess(decodeLabelCandidatesJson(labelsJson({ defined: [], hasNextPage: true })))
+        .truncated,
+    ).toBe(true);
+  });
 });
 
 describe("review thread decoding", () => {
diff --git a/apps/server/src/pullRequest/gitHubPullRequestJson.ts b/apps/server/src/pullRequest/gitHubPullRequestJson.ts
index 9cc21b429390..7887a81617d6 100644
--- a/apps/server/src/pullRequest/gitHubPullRequestJson.ts
+++ b/apps/server/src/pullRequest/gitHubPullRequestJson.ts
@@ -24,6 +24,8 @@ import type {
   PullRequestReviewerCandidate,
   PullRequestReviewerCandidateList,
   PullRequestReviewerKind,
+  PullRequestLabelCandidate,
+  PullRequestLabelCandidateList,
   PullRequestState,
   PullRequestThreadComment,
 } from "@t3tools/contracts";
@@ -1337,18 +1339,16 @@ function toComments(raw: {
   readonly comments?: ReadonlyArray<Schema.Schema.Type<typeof RawCommentSchema>> | undefined;
   readonly reviews?: ReadonlyArray<Schema.Schema.Type<typeof RawReviewSchema>> | undefined;
 }): ReadonlyArray<PullRequestComment> {
-  const issueComments = (raw.comments ?? []).map(
-    (comment): PullRequestComment => ({
-      id: comment.id,
-      kind: "issue-comment",
-      author: toActor(comment.author),
-      body: comment.body ?? "",
-      createdAt: comment.createdAt,
-      url: trimmed(comment.url),
-      path: null,
-      reviewState: null,
-    }),
-  );
+  const issueComments = (raw.comments ?? []).map((comment): PullRequestComment => ({
+    id: comment.id,
+    kind: "issue-comment",
+    author: toActor(comment.author),
+    body: comment.body ?? "",
+    createdAt: comment.createdAt,
+    url: trimmed(comment.url),
+    path: null,
+    reviewState: null,
+  }));
   // A review with no body is kept only when its state is the event itself — an approval, a
   // request for changes, a dismissal. GitHub also opens a bodiless `COMMENTED` review as the
   // container for line comments, and those comments are read from the review threads, so
@@ -1741,19 +1741,17 @@ export function reviewThreadConversation(
   threads: ReadonlyArray<PullRequestReviewThread>,
 ): ReadonlyArray<PullRequestComment> {
   return threads.flatMap((thread) =>
-    thread.comments.map(
-      (comment): PullRequestComment => ({
-        id: comment.id,
-        kind: "review-comment",
-        author: comment.author,
-        body: comment.body,
-        createdAt: comment.createdAt,
-        url: comment.url,
-        path: thread.path,
-        reviewState: null,
-        reactions: comment.reactions ?? [],
-      }),
-    ),
+    thread.comments.map((comment): PullRequestComment => ({
+      id: comment.id,
+      kind: "review-comment",
+      author: comment.author,
+      body: comment.body,
+      createdAt: comment.createdAt,
+      url: comment.url,
+      path: thread.path,
+      reviewState: null,
+      reactions: comment.reactions ?? [],
+    })),
   );
 }
 
@@ -1994,6 +1992,11 @@ function toCanWrite(viewerPermission: string | null | undefined): boolean {
   }
 }
 
+/** Triage is the least role GitHub lets label a pull request; it is not a write. */
+function toCanTriage(viewerPermission: string | null | undefined): boolean {
+  return viewerPermission?.trim().toUpperCase() === "TRIAGE" || toCanWrite(viewerPermission);
+}
+
 export function decodeRepositoryAccessJson(
   raw: string,
 ): Result.Result<GitHubRepositoryAccess, DecodeFailure> {
@@ -2222,6 +2225,99 @@ export function buildReviewerRequestJson(
   });
 }
 
+export const LABEL_CANDIDATES_GRAPHQL_QUERY = `query($owner: String!, $name: String!, $number: Int!) {
+  repository(owner: $owner, name: $name) {
+    labels(first: ${GRAPHQL_PAGE_SIZE}, orderBy: { field: NAME, direction: ASC }) {
+      pageInfo { hasNextPage }
+      nodes { name color description }
+    }
+    pullRequest(number: $number) {
+      labels(first: ${GRAPHQL_PAGE_SIZE}) { nodes { name } }
+    }
+  }
+}`;
+
+const RawLabelCandidatesSchema = Schema.Struct({
+  data: Schema.Struct({
+    repository: Schema.Struct({
+      labels: Schema.optional(
+        Schema.NullOr(
+          Schema.Struct({
+            pageInfo: Schema.optional(RawPageInfoSchema),
+            nodes: Schema.Array(
+              Schema.NullOr(
+                Schema.Struct({
+                  ...RawLabelSchema.fields,
+                  description: Schema.optional(Schema.NullOr(Schema.String)),
+                }),
+              ),
+            ),
+          }),
+        ),
+      ),
+      /** Null for a number that names no pull request the viewer can see. */
+      pullRequest: Schema.NullOr(
+        Schema.Struct({
+          labels: Schema.optional(
+            Schema.NullOr(Schema.Struct({ nodes: Schema.Array(Schema.NullOr(RawLabelSchema)) })),
+          ),
+        }),
+      ),
+    }),
+  }),
+});
+
+const decodeLabelCandidates = decodeJsonResult(RawLabelCandidatesSchema);
+
+/**
+ * The repository's labels, with the ones already on this pull request marked. A label the pull
+ * request wears that the repository no longer defines — deleted since, or past the page — leads
+ * the list anyway, because a label that cannot be seen cannot be taken off.
+ */
+export function decodeLabelCandidatesJson(
+  raw: string,
+): Result.Result<PullRequestLabelCandidateList, DecodeFailure> {
+  const decoded = decodeLabelCandidates(raw);
+  if (!Result.isSuccess(decoded)) {
+    return Result.fail(decoded.failure);
+  }
+  const repository = decoded.success.data.repository;
+  const applied = new Set(
+    (repository.pullRequest?.labels?.nodes ?? []).flatMap((label) => {
+      const name = trimmed(label?.name);
+      return name === null ? [] : [name];
+    }),
+  );
+  const candidates = new Map<string, PullRequestLabelCandidate>();
+  for (const node of repository.labels?.nodes ?? []) {
+    const name = trimmed(node?.name);
+    if (name === null) continue;
+    candidates.set(name, {
+      name,
+      color: trimmed(node?.color),
+      description: trimmed(node?.description),
+      isApplied: applied.has(name),
+    });
+  }
+  const missing = [...applied].filter((name) => !candidates.has(name));
+  return Result.succeed({
+    candidates: [
+      ...missing.map((name) => ({ name, color: null, description: null, isApplied: true })),
+      ...candidates.values(),
+    ],
+    truncated: repository.labels?.pageInfo?.hasNextPage === true,
+  });
+}
+
+/** The body of `POST /repos/{owner}/{repo}/issues/{number}/labels`, which adds to what is there. */
+const LabelRequestSchema = Schema.Struct({ labels: Schema.Array(Schema.String) });
+
+const encodeLabelRequest = Schema.encodeSync(Schema.fromJsonString(LabelRequestSchema));
+
+export function buildLabelRequestJson(labels: ReadonlyArray<string>): string {
+  return encodeLabelRequest({ labels });
+}
+
 /**
  * Everything GitHub says about what the signed-in account may do here. `canWrite` is about the
  * repository, the other two about this pull request in particular — which is why an author with
@@ -2229,6 +2325,11 @@ export function buildReviewerRequestJson(
  */
 export interface GitHubViewerAccess {
   readonly canWrite: boolean;
+  /**
+   * The viewer's role reaches triage, which is the least that may label. Everyone who can write
+   * can triage; a triager is the one role that can label without being able to merge.
+   */
+  readonly canTriage: boolean;
   /** GitHub's own `viewerCanUpdate`, true for the author as well as for anyone with write. */
   readonly canUpdate: boolean;
   readonly didAuthor: boolean;
@@ -2275,6 +2376,7 @@ export function decodeViewerPermissionsJson(
   const repository = decoded.success.data.repository;
   return Result.succeed({
     canWrite: toCanWrite(repository.viewerPermission),
+    canTriage: toCanTriage(repository.viewerPermission),
     ...toPullRequestViewerFields(repository.pullRequest),
   });
 }
diff --git a/apps/server/src/relay/AgentAwarenessRelay.test.ts b/apps/server/src/relay/AgentAwarenessRelay.test.ts
index 2465052a33c7..b38861c9877e 100644
--- a/apps/server/src/relay/AgentAwarenessRelay.test.ts
+++ b/apps/server/src/relay/AgentAwarenessRelay.test.ts
@@ -358,58 +358,45 @@ describe.sequential("signRelayAgentActivityPublishProof", () => {
     ).toEqual([activeThreadId]);
   });
 
-  it("signs the activity publish JWT and rejects tampering", async () => {
-    const keyPair = NodeCrypto.generateKeyPairSync("ed25519", {
-      privateKeyEncoding: { format: "pem", type: "pkcs8" },
-      publicKeyEncoding: { format: "pem", type: "spki" },
-    });
-    const payload = {
-      iss: "t3-env:env",
-      aud: "https://relay.example.test",
-      sub: "env",
-      jti: "nonce-1",
-      iat: 100,
-      exp: 200,
-      environmentId: state.environmentId,
-      threadId: state.threadId,
-      state,
-    } satisfies RelayAgentActivityPublishProofPayload;
-    const proof = await Effect.runPromise(
-      AgentAwarenessRelay.signRelayAgentActivityPublishProof({
+  it.effect("signs the activity publish JWT and rejects tampering", () =>
+    Effect.gen(function* () {
+      const keyPair = NodeCrypto.generateKeyPairSync("ed25519", {
+        privateKeyEncoding: { format: "pem", type: "pkcs8" },
+        publicKeyEncoding: { format: "pem", type: "spki" },
+      });
+      const payload = {
+        iss: "t3-env:env",
+        aud: "https://relay.example.test",
+        sub: "env",
+        jti: "nonce-1",
+        iat: 100,
+        exp: 200,
+        environmentId: state.environmentId,
+        threadId: state.threadId,
+        state,
+      } satisfies RelayAgentActivityPublishProofPayload;
+      const proof = yield* AgentAwarenessRelay.signRelayAgentActivityPublishProof({
         privateKey: keyPair.privateKey,
         payload,
-      }),
-    );
-
-    await expect(
-      Effect.runPromise(
-        verifyRelayJwt({
-          publicKey: keyPair.publicKey,
-          token: proof,
-          typ: RELAY_ACTIVITY_PUBLISH_TYP,
-          issuer: "t3-env:env",
-          audience: "https://relay.example.test",
-          nowEpochSeconds: 150,
-        }),
-      ),
-    ).resolves.toMatchObject({ jti: "nonce-1", state });
-    await expect(
-      Effect.runPromise(
+      });
+      const verify = (token: string) =>
         verifyRelayJwt({
           publicKey: keyPair.publicKey,
-          token: (() => {
-            const [header, body, signature = ""] = proof.split(".");
-            const corruptedSignature = `${signature.startsWith("a") ? "b" : "a"}${signature.slice(1)}`;
-            return `${header}.${body}.${corruptedSignature}`;
-          })(),
+          token,
           typ: RELAY_ACTIVITY_PUBLISH_TYP,
           issuer: "t3-env:env",
           audience: "https://relay.example.test",
           nowEpochSeconds: 150,
-        }),
-      ),
-    ).rejects.toBeDefined();
-  });
+        });
+
+      expect(yield* verify(proof)).toMatchObject({ jti: "nonce-1", state });
+
+      const [header, body, signature = ""] = proof.split(".");
+      const corruptedSignature = `${signature.startsWith("a") ? "b" : "a"}${signature.slice(1)}`;
+      const rejection = yield* Effect.flip(verify(`${header}.${body}.${corruptedSignature}`));
+      expect(rejection).toBeDefined();
+    }),
+  );
 
   it.effect("keeps the orchestration listener armed until relay config is installed", () =>
     Effect.scoped(
@@ -557,10 +544,11 @@ describe.sequential("signRelayAgentActivityPublishProof", () => {
     Effect.scoped(
       Effect.gen(function* () {
         const originalFetch = globalThis.fetch;
-        const context = yield* Effect.context<never>();
-        const runFork = Effect.runForkWith(context);
         const events = yield* Queue.unbounded<OrchestrationEvent>();
-        const fetchSeen = yield* Deferred.make<URL>();
+        let resolveFetchSeen: (url: URL) => void = () => {};
+        const fetchSeen = new Promise<URL>((resolve) => {
+          resolveFetchSeen = resolve;
+        });
         const userSpans: Array<string> = [];
         const productSpans: Array<string> = [];
         const collectingTracer = (spans: Array<string>) =>
@@ -648,7 +636,7 @@ describe.sequential("signRelayAgentActivityPublishProof", () => {
               ? input
               : (input as unknown as { readonly url: string }).url,
           );
-          runFork(Deferred.succeed(fetchSeen, url));
+          resolveFetchSeen(url);
           return Promise.resolve(Response.json({ ok: true, deliveries: [] }));
         }) as unknown as typeof fetch;
         yield* Effect.addFinalizer(() =>
@@ -707,7 +695,7 @@ describe.sequential("signRelayAgentActivityPublishProof", () => {
             occurredAt: now,
           } as unknown as OrchestrationEvent);
 
-          const url = yield* Deferred.await(fetchSeen).pipe(Effect.timeout("2 seconds"));
+          const url = yield* Effect.promise(() => fetchSeen).pipe(Effect.timeout("2 seconds"));
           expect(url.origin).toBe("https://transport.example.test");
           expect(productSpans).toContain("makePublishProof");
           expect(userSpans).not.toContain("makePublishProof");
diff --git a/apps/server/src/resourceTelemetry/DesktopTelemetryReceiver.ts b/apps/server/src/resourceTelemetry/DesktopTelemetryReceiver.ts
index 0e4b99f9f1eb..1297b3bdf765 100644
--- a/apps/server/src/resourceTelemetry/DesktopTelemetryReceiver.ts
+++ b/apps/server/src/resourceTelemetry/DesktopTelemetryReceiver.ts
@@ -518,13 +518,11 @@ export const make = Effect.fn("resourceTelemetry.desktopTelemetryReceiver.make")
         if (message.type === "desktopTelemetryHello") {
           return recordContact.pipe(
             Effect.andThen(
-              updateHealth(
-                (current): DesktopTelemetryReceiverHealth => ({
-                  ...current,
-                  status: "healthy",
-                  lastError: Option.none(),
-                }),
-              ),
+              updateHealth((current): DesktopTelemetryReceiverHealth => ({
+                ...current,
+                status: "healthy",
+                lastError: Option.none(),
+              })),
             ),
           );
         }
@@ -549,22 +547,18 @@ export const make = Effect.fn("resourceTelemetry.desktopTelemetryReceiver.make")
         );
       }),
       Effect.andThen(
-        updateHealth(
-          (current): DesktopTelemetryReceiverHealth => ({
-            ...current,
-            status: "stopped",
-            lastError: Option.some(new DesktopTelemetryStreamClosed({ fd }).message),
-          }),
-        ),
+        updateHealth((current): DesktopTelemetryReceiverHealth => ({
+          ...current,
+          status: "stopped",
+          lastError: Option.some(new DesktopTelemetryStreamClosed({ fd }).message),
+        })),
       ),
       Effect.catch((error) =>
-        updateHealth(
-          (current): DesktopTelemetryReceiverHealth => ({
-            ...current,
-            status: "degraded",
-            lastError: Option.some(error.message),
-          }),
-        ),
+        updateHealth((current): DesktopTelemetryReceiverHealth => ({
+          ...current,
+          status: "degraded",
+          lastError: Option.some(error.message),
+        })),
       ),
       Effect.forkScoped,
     );
diff --git a/apps/server/src/resourceTelemetry/ResourceTelemetry.ts b/apps/server/src/resourceTelemetry/ResourceTelemetry.ts
index 4dd7e721d474..4184854aa269 100644
--- a/apps/server/src/resourceTelemetry/ResourceTelemetry.ts
+++ b/apps/server/src/resourceTelemetry/ResourceTelemetry.ts
@@ -491,12 +491,10 @@ export const make = Effect.fn("resourceTelemetry.resourceTelemetry.make")(functi
     validateProcessIdentity,
     retry: nativeClient.retry.pipe(
       Effect.zip(Ref.get(state)),
-      Effect.map(
-        ([accepted, current]): ResourceTelemetryRetryResult => ({
-          accepted,
-          snapshot: current.latest,
-        }),
-      ),
+      Effect.map(([accepted, current]): ResourceTelemetryRetryResult => ({
+        accepted,
+        snapshot: current.latest,
+      })),
     ),
   });
 });
diff --git a/apps/server/src/server.test.ts b/apps/server/src/server.test.ts
index 42a756213114..7b587aceeceb 100644
--- a/apps/server/src/server.test.ts
+++ b/apps/server/src/server.test.ts
@@ -56,7 +56,6 @@ import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Fiber from "effect/Fiber";
 import * as Layer from "effect/Layer";
-import * as ManagedRuntime from "effect/ManagedRuntime";
 import * as Option from "effect/Option";
 import * as Path from "effect/Path";
 import * as PubSub from "effect/PubSub";
@@ -123,6 +122,7 @@ import * as TerminalManager from "./terminal/Manager.ts";
 import * as PreviewManager from "./preview/Manager.ts";
 import * as PortScanner from "./preview/PortScanner.ts";
 import * as BrowserTraceCollector from "./observability/BrowserTraceCollector.ts";
+import * as NativeAppIconResolver from "./assets/NativeAppIconResolver.ts";
 import * as ProjectFaviconResolver from "./project/ProjectFaviconResolver.ts";
 import * as T3ProjectFileLoader from "./project/T3ProjectFileLoader.ts";
 import * as ProjectSetupScriptRunner from "./project/ProjectSetupScriptRunner.ts";
@@ -398,7 +398,9 @@ const makeBrowserOtlpPayload = (spanName: string) =>
       ({ close }) => Effect.promise(close),
     );
 
-    const runtime = ManagedRuntime.make(
+    // The exporter's batch fiber is forked while the layer builds and ticks on
+    // a wall-clock interval, so the whole tracer runs on the live clock.
+    yield* Layer.build(
       OtlpTracer.layer({
         url: collector.url,
         exportInterval: "10 millis",
@@ -411,14 +413,13 @@ const makeBrowserOtlpPayload = (spanName: string) =>
           },
         },
       }).pipe(Layer.provide(browserOtlpTracingLayer)),
+    ).pipe(
+      Effect.flatMap((tracing) =>
+        Effect.void.pipe(Effect.withSpan(spanName), Effect.provideContext(tracing)),
+      ),
+      TestClock.withLive,
     );
 
-    try {
-      yield* Effect.promise(() => runtime.runPromise(Effect.void.pipe(Effect.withSpan(spanName))));
-    } finally {
-      yield* Effect.promise(() => runtime.dispose());
-    }
-
     const request = yield* Effect.raceFirst(
       Effect.promise(() => collector.firstRequest).pipe(Effect.orDie),
       Effect.sleep(Duration.seconds(1)).pipe(
@@ -626,6 +627,7 @@ const buildAppUnderTest = (options?: {
         Layer.provide(WorkspacePaths.layer),
         Layer.provide(T3ProjectFileLoader.layer),
       ),
+      NativeAppIconResolver.layer,
     );
     const gitWorkflowLayer = GitWorkflowService.layer.pipe(
       Layer.provideMerge(vcsDriverRegistryLayer),
diff --git a/apps/server/src/server.ts b/apps/server/src/server.ts
index fb0a21b63db8..cd10b0e549b5 100644
--- a/apps/server/src/server.ts
+++ b/apps/server/src/server.ts
@@ -68,6 +68,7 @@ import * as AgentAwarenessRelay from "./relay/AgentAwarenessRelay.ts";
 import { hasCloudPublicConfig } from "./cloud/publicConfig.ts";
 import { ProviderRegistryLive } from "./provider/Layers/ProviderRegistry.ts";
 import * as ServerSettings from "./serverSettings.ts";
+import * as NativeAppIconResolver from "./assets/NativeAppIconResolver.ts";
 import * as ProjectFaviconResolver from "./project/ProjectFaviconResolver.ts";
 import * as T3ProjectFileLoader from "./project/T3ProjectFileLoader.ts";
 import * as RepositoryIdentityResolver from "./project/RepositoryIdentityResolver.ts";
@@ -451,7 +452,7 @@ const RuntimeCoreDependenciesLive = ReactorLayerLive.pipe(
   // keeps a single Live for all opencode consumers.
   Layer.provideMerge(OpenCodeRuntime.OpenCodeRuntimeLive),
   Layer.provideMerge(WorkspaceLayerLive),
-  Layer.provideMerge(ProjectFaviconResolverLayerLive),
+  Layer.provideMerge(Layer.mergeAll(NativeAppIconResolver.layer, ProjectFaviconResolverLayerLive)),
   Layer.provideMerge(RepositoryIdentityResolver.layer),
   Layer.provideMerge(ServerEnvironmentLayerLive),
   Layer.provideMerge(AuthLayerLive),
diff --git a/apps/server/src/serviceLauncher.ts b/apps/server/src/serviceLauncher.ts
index aee23fb8f2bb..44ee6c94bff2 100644
--- a/apps/server/src/serviceLauncher.ts
+++ b/apps/server/src/serviceLauncher.ts
@@ -1,5 +1,4 @@
 // @effect-diagnostics nodeBuiltinImport:off
-// @effect-diagnostics globalDate:off
 // @effect-diagnostics globalTimers:off
 // This file is shipped as a standalone bundle and copied to a stable path by
 // `t3 service update`. Keep runtime imports limited to Node built-ins.
diff --git a/apps/server/src/ws.ts b/apps/server/src/ws.ts
index c213b92762a5..105f0f403d86 100644
--- a/apps/server/src/ws.ts
+++ b/apps/server/src/ws.ts
@@ -2030,6 +2030,16 @@ const makeWsRpcLayer = (
             pullRequests.requestReviewers(input),
             { "rpc.aggregate": "pull-requests" },
           ),
+        [WS_METHODS.pullRequestsLabelCandidates]: (input) =>
+          observeRpcEffect(
+            WS_METHODS.pullRequestsLabelCandidates,
+            pullRequests.labelCandidates(input),
+            { "rpc.aggregate": "pull-requests" },
+          ),
+        [WS_METHODS.pullRequestsSetLabels]: (input) =>
+          observeRpcEffect(WS_METHODS.pullRequestsSetLabels, pullRequests.setLabels(input), {
+            "rpc.aggregate": "pull-requests",
+          }),
         [WS_METHODS.sourceControlLookupRepository]: (input) =>
           observeRpcEffect(
             WS_METHODS.sourceControlLookupRepository,
@@ -2169,7 +2179,10 @@ const makeWsRpcLayer = (
           observeRpcEffect(
             WS_METHODS.assetsCreateUrl,
             Effect.gen(function* () {
-              if (input.resource._tag === "attachment") {
+              if (
+                input.resource._tag === "attachment" ||
+                input.resource._tag === "native-app-icon"
+              ) {
                 return yield* issueAssetUrl({ resource: input.resource });
               }
               if (input.resource._tag === "project-favicon") {
diff --git a/apps/web/src/assets/assetUrls.ts b/apps/web/src/assets/assetUrls.ts
index 5c642471404a..84ff979e4e89 100644
--- a/apps/web/src/assets/assetUrls.ts
+++ b/apps/web/src/assets/assetUrls.ts
@@ -1,5 +1,10 @@
 import { useAtomValue } from "@effect/atom-react";
-import { resolveAssetUrl } from "@t3tools/client-runtime/state/assets";
+import {
+  type AssetUrlState,
+  assetUrlStateFromResult,
+  EMPTY_ASSET_URL_ATOM,
+  resolveAssetUrl,
+} from "@t3tools/client-runtime/state/assets";
 import { squashAtomCommandFailure } from "@t3tools/client-runtime/state/runtime";
 import type { AssetResource, EnvironmentId } from "@t3tools/contracts";
 import { AsyncResult } from "effect/unstable/reactivity";
@@ -9,58 +14,42 @@ import { assetEnvironment } from "~/state/assets";
 import { usePreparedConnection } from "~/state/session";
 import { useAtomQueryRunner } from "~/state/use-atom-query-runner";
 
-export { resolveAssetUrl } from "@t3tools/client-runtime/state/assets";
-
-export type AssetUrlState =
-  | { readonly _tag: "Loading" }
-  | { readonly _tag: "Failure" }
-  | { readonly _tag: "Success"; readonly url: string; readonly sourcePath?: string };
+export { resolveAssetUrl, type AssetUrlState } from "@t3tools/client-runtime/state/assets";
 
 export function useAssetUrlState(
-  environmentId: EnvironmentId,
-  resource: AssetResource,
+  environmentId: EnvironmentId | null,
+  resource: AssetResource | null,
 ): AssetUrlState {
   const preparedConnection = usePreparedConnection(environmentId);
   const result = useAtomValue(
-    assetEnvironment.createUrl({
-      environmentId,
-      input: { resource },
-    }),
+    environmentId === null || resource === null
+      ? EMPTY_ASSET_URL_ATOM
+      : assetEnvironment.createUrl({ environmentId, input: { resource } }),
+  );
+  return assetUrlStateFromResult(
+    result,
+    preparedConnection._tag === "Some" ? preparedConnection.value.httpBaseUrl : null,
   );
-  if (result._tag === "Failure") {
-    return { _tag: "Failure" };
-  }
-  if (preparedConnection._tag === "None" || result._tag !== "Success") {
-    return { _tag: "Loading" };
-  }
-  const url = resolveAssetUrl(preparedConnection.value.httpBaseUrl, result.value.relativeUrl);
-  return url === null
-    ? { _tag: "Failure" }
-    : {
-        _tag: "Success",
-        url,
-        ...(result.value.sourcePath !== undefined ? { sourcePath: result.value.sourcePath } : {}),
-      };
 }
 
-export function useAssetUrl(environmentId: EnvironmentId, resource: AssetResource): string | null {
+export function useAssetUrl(
+  environmentId: EnvironmentId | null,
+  resource: AssetResource | null,
+): string | null {
   const result = useAssetUrlState(environmentId, resource);
-  if (result._tag !== "Success") {
-    return null;
-  }
-  return result.url;
+  return result._tag === "Success" ? result.url : null;
 }
 
-/** Re-mints an exact-file capability after a file change or an explicit retry. */
 export function useAssetUrlRefresh(
-  environmentId: EnvironmentId,
-  resource: AssetResource,
+  environmentId: EnvironmentId | null,
+  resource: AssetResource | null,
 ): () => Promise<void> {
   const refresh = useAtomQueryRunner(assetEnvironment.createUrl, {
     reportFailure: false,
     refresh: true,
   });
   return useCallback(async () => {
+    if (environmentId === null || resource === null) return;
     const result = await refresh({ environmentId, input: { resource } });
     if (result._tag === "Failure") throw squashAtomCommandFailure(result);
   }, [environmentId, resource, refresh]);
diff --git a/apps/web/src/browser/browserLinkTarget.test.ts b/apps/web/src/browser/browserLinkTarget.test.ts
new file mode 100644
index 000000000000..94f97001c96f
--- /dev/null
+++ b/apps/web/src/browser/browserLinkTarget.test.ts
@@ -0,0 +1,69 @@
+import { describe, expect, it } from "vite-plus/test";
+
+import { resolveLinkTarget } from "./browserLinkTarget";
+
+const click = { metaKey: false, ctrlKey: false };
+
+describe("resolveLinkTarget", () => {
+  it("keeps the system browser unless the user asked for in-app", () => {
+    expect(
+      resolveLinkTarget({
+        url: "https://example.com/",
+        event: click,
+        preference: "system",
+        canOpenInApp: true,
+      }),
+    ).toBe("system");
+  });
+
+  it("opens in-app when asked and the runtime can", () => {
+    expect(
+      resolveLinkTarget({
+        url: "https://example.com/",
+        event: click,
+        preference: "app",
+        canOpenInApp: true,
+      }),
+    ).toBe("app");
+  });
+
+  it("falls back to the system browser where there is no in-app browser", () => {
+    // The hosted web app and mobile have nowhere to open a tab, so the
+    // preference cannot be honoured there and the link still has to open.
+    expect(
+      resolveLinkTarget({
+        url: "https://example.com/",
+        event: click,
+        preference: "app",
+        canOpenInApp: false,
+      }),
+    ).toBe("system");
+  });
+
+  it("treats a modifier click as the way out of the in-app default", () => {
+    expect(
+      resolveLinkTarget({
+        url: "https://example.com/",
+        event: { metaKey: true, ctrlKey: false },
+        preference: "app",
+        canOpenInApp: true,
+      }),
+    ).toBe("system");
+    expect(
+      resolveLinkTarget({
+        url: "https://example.com/",
+        event: { metaKey: false, ctrlKey: true },
+        preference: "app",
+        canOpenInApp: true,
+      }),
+    ).toBe("system");
+  });
+
+  it("leaves non-web schemes to the shell", () => {
+    for (const url of ["mailto:someone@example.com", "vscode://file/x", "not a url"]) {
+      expect(resolveLinkTarget({ url, event: click, preference: "app", canOpenInApp: true })).toBe(
+        "system",
+      );
+    }
+  });
+});
diff --git a/apps/web/src/browser/browserLinkTarget.ts b/apps/web/src/browser/browserLinkTarget.ts
new file mode 100644
index 000000000000..d03775572747
--- /dev/null
+++ b/apps/web/src/browser/browserLinkTarget.ts
@@ -0,0 +1,67 @@
+/**
+ * Where a link clicked inside a thread should open.
+ *
+ * Settings → Integrations → Browser lets the user choose between the OS
+ * default browser and a tab in the in-app browser. This module turns that
+ * preference plus the click itself into one answer, so chat markdown and the
+ * terminal drawer make the same decision and offer the same escape hatch.
+ *
+ * @module browserLinkTarget
+ */
+import type { BrowserLinkTarget } from "@t3tools/contracts";
+
+import { ensureClientSettingsHydrated, getClientSettings } from "~/hooks/useSettings";
+import { isPreviewSupportedInRuntime } from "~/previewStateStore";
+
+export interface ResolveLinkTargetInput {
+  readonly url: string;
+  /** Cmd/Ctrl-click always goes to the system browser, whatever the default. */
+  readonly event: { readonly metaKey: boolean; readonly ctrlKey: boolean };
+  readonly preference: BrowserLinkTarget;
+  /** Whether this client has an in-app browser and a thread to open it beside. */
+  readonly canOpenInApp: boolean;
+}
+
+/**
+ * The target a click resolves to. "app" only comes back when the preference
+ * asks for it, the runtime can honour it, the URL is one the in-app browser
+ * can load, and the click carried no modifier — the modifier is the one-gesture
+ * way out when the default is in-app, mirroring how change-request links
+ * already treat it.
+ */
+export function resolveLinkTarget(input: ResolveLinkTargetInput): BrowserLinkTarget {
+  if (input.event.metaKey || input.event.ctrlKey) return "system";
+  if (input.preference !== "app") return "system";
+  if (!input.canOpenInApp) return "system";
+  if (!isWebUrl(input.url)) return "system";
+  return "app";
+}
+
+/**
+ * Only http(s) can load in the in-app browser. Anything else — mailto:,
+ * vscode://, a bare fragment — belongs to the shell whatever the preference.
+ */
+export function isWebUrl(url: string): boolean {
+  try {
+    const { protocol } = new URL(url);
+    return protocol === "http:" || protocol === "https:";
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * The configured default, once client settings have actually loaded. Before
+ * hydration the snapshot is the schema default ("system"), so a link clicked
+ * in the first moments after launch would ignore a persisted "app" — opening
+ * is asynchronous anyway, so waiting costs nothing the user can see.
+ */
+export async function resolveBrowserLinkTargetPreference(): Promise<BrowserLinkTarget> {
+  await ensureClientSettingsHydrated();
+  return getClientSettings().browserLinkTarget;
+}
+
+/** Whether the in-app target is available at all in this client. */
+export function canOpenLinksInApp(hasThread: boolean): boolean {
+  return hasThread && isPreviewSupportedInRuntime();
+}
diff --git a/apps/web/src/browser/useOpenLink.ts b/apps/web/src/browser/useOpenLink.ts
new file mode 100644
index 000000000000..0e9bf721f82d
--- /dev/null
+++ b/apps/web/src/browser/useOpenLink.ts
@@ -0,0 +1,63 @@
+import type { ScopedThreadRef } from "@t3tools/contracts";
+import { isAtomCommandInterrupted } from "@t3tools/client-runtime/state/runtime";
+import { useCallback } from "react";
+
+import { recordVisitForThread } from "~/browserHistoryStore";
+import { readLocalApi } from "~/localApi";
+import { previewEnvironment } from "~/state/preview";
+import { useAtomCommand } from "~/state/use-atom-command";
+
+import {
+  canOpenLinksInApp,
+  resolveBrowserLinkTargetPreference,
+  resolveLinkTarget,
+} from "./browserLinkTarget";
+import { openUrlInPreview } from "./openFileInPreview";
+
+const NO_MODIFIER = { metaKey: false, ctrlKey: false } as const;
+
+/**
+ * Opens a URL where the "Open links in" setting says, for buttons that sit
+ * beside a thread but are not markdown anchors: CI check details, a pull
+ * request that has no project to open in the panel. Without a thread there is
+ * nowhere to put an in-app tab, so the link goes to the system browser.
+ *
+ * An in-app open that fails falls back to the system browser rather than
+ * dropping the click: the user asked for the link, and the setting only says
+ * where it should go first. The returned promise rejects only when that
+ * fallback fails too, the same way `shell.openExternal` does.
+ */
+export function useOpenLink(threadRef: ScopedThreadRef | null | undefined): (
+  url: string,
+  options?: {
+    readonly event?: { readonly metaKey: boolean; readonly ctrlKey: boolean };
+    /** Thread to open beside when it is not the hook's own, e.g. a sidebar row's. */
+    readonly threadRef?: ScopedThreadRef | undefined;
+  },
+) => Promise<void> {
+  const openPreview = useAtomCommand(previewEnvironment.open, { reportFailure: false });
+  return useCallback(
+    async (url, options = {}) => {
+      const targetThreadRef = options.threadRef ?? threadRef;
+      const target = resolveLinkTarget({
+        url,
+        event: options.event ?? NO_MODIFIER,
+        preference: await resolveBrowserLinkTargetPreference(),
+        canOpenInApp: canOpenLinksInApp(Boolean(targetThreadRef)),
+      });
+      if (target === "app" && targetThreadRef) {
+        const result = await openUrlInPreview({ threadRef: targetThreadRef, url, openPreview });
+        if (isAtomCommandInterrupted(result)) return;
+        if (result._tag === "Success") {
+          recordVisitForThread(targetThreadRef, url);
+          return;
+        }
+        console.error(result.cause);
+      }
+      const api = readLocalApi();
+      if (!api) throw new Error("Link opening is unavailable.");
+      await api.shell.openExternal(url);
+    },
+    [openPreview, threadRef],
+  );
+}
diff --git a/apps/web/src/clientPersistenceStorage.test.ts b/apps/web/src/clientPersistenceStorage.test.ts
index 8f849a6e7b39..db69fe96c80a 100644
--- a/apps/web/src/clientPersistenceStorage.test.ts
+++ b/apps/web/src/clientPersistenceStorage.test.ts
@@ -90,4 +90,17 @@ describe("clientPersistenceStorage", () => {
     expect(settings).not.toHaveProperty("chatWordWrap");
     expect(settings).not.toHaveProperty("diffWordWrap");
   });
+
+  it("keeps the diff layout across reloads and defaults it to stacked", async () => {
+    const testWindow = getTestWindow();
+    const { readBrowserClientSettings, writeBrowserClientSettings } =
+      await import("./clientPersistenceStorage");
+
+    expect(readBrowserClientSettings()).toBeNull();
+    testWindow.localStorage.setItem("t3code:client-settings:v1", JSON.stringify({}));
+    expect(readBrowserClientSettings()?.diffLayout).toBe("stacked");
+
+    writeBrowserClientSettings({ ...DEFAULT_CLIENT_SETTINGS, diffLayout: "split" });
+    expect(readBrowserClientSettings()?.diffLayout).toBe("split");
+  });
 });
diff --git a/apps/web/src/components/BranchToolbar.logic.test.ts b/apps/web/src/components/BranchToolbar.logic.test.ts
index 251b07688121..ff4bb76bf12a 100644
--- a/apps/web/src/components/BranchToolbar.logic.test.ts
+++ b/apps/web/src/components/BranchToolbar.logic.test.ts
@@ -430,26 +430,40 @@ describe("shouldShowComposerContextStrip", () => {
         hasActiveProject: true,
         isGitRepo: false,
         showEnvironmentIndicator: true,
+        hostsRestingComposerControls: false,
       }),
     ).toBe(true);
   });
 
-  it("hides the strip when a non-Git project has no environment indicator", () => {
+  it("hides the strip when a non-Git project has nothing to show", () => {
     expect(
       shouldShowComposerContextStrip({
         hasActiveProject: true,
         isGitRepo: false,
         showEnvironmentIndicator: false,
+        hostsRestingComposerControls: false,
       }),
     ).toBe(false);
   });
 
+  it("keeps the strip for visible resting composer controls in a non-Git thread", () => {
+    expect(
+      shouldShowComposerContextStrip({
+        hasActiveProject: true,
+        isGitRepo: false,
+        showEnvironmentIndicator: false,
+        hostsRestingComposerControls: true,
+      }),
+    ).toBe(true);
+  });
+
   it("shows Git controls without requiring an environment indicator", () => {
     expect(
       shouldShowComposerContextStrip({
         hasActiveProject: true,
         isGitRepo: true,
         showEnvironmentIndicator: false,
+        hostsRestingComposerControls: false,
       }),
     ).toBe(true);
   });
diff --git a/apps/web/src/components/BranchToolbar.logic.ts b/apps/web/src/components/BranchToolbar.logic.ts
index 0a8e07d1958b..0577f5e8dd1f 100644
--- a/apps/web/src/components/BranchToolbar.logic.ts
+++ b/apps/web/src/components/BranchToolbar.logic.ts
@@ -1,4 +1,4 @@
-import type { EnvironmentId, VcsRef, ProjectId } from "@t3tools/contracts";
+import type { EnvironmentId, EnvironmentMachineKind, VcsRef, ProjectId } from "@t3tools/contracts";
 import * as Schema from "effect/Schema";
 import { toSortableTimestamp } from "../lib/threadSort";
 export {
@@ -11,6 +11,7 @@ export interface EnvironmentOption {
   projectId: ProjectId;
   label: string;
   isPrimary: boolean;
+  machine: EnvironmentMachineKind;
 }
 
 export const EnvMode = Schema.Literals(["local", "worktree"]);
@@ -58,8 +59,27 @@ export function shouldShowComposerContextStrip(input: {
   hasActiveProject: boolean;
   isGitRepo: boolean;
   showEnvironmentIndicator: boolean;
+  /** A collapsed composer's controls currently fit in their measured strip host. */
+  hostsRestingComposerControls: boolean;
 }): boolean {
-  return input.hasActiveProject && (input.isGitRepo || input.showEnvironmentIndicator);
+  return (
+    input.hasActiveProject &&
+    (input.isGitRepo || input.showEnvironmentIndicator || input.hostsRestingComposerControls)
+  );
+}
+
+// Labels collapse to icons when the strip's content no longer fits. A small
+// hysteresis on the way back out keeps the boundary from flapping.
+const CONTEXT_STRIP_COMPACT_EXPAND_HYSTERESIS_PX = 16;
+
+export function resolveContextStripLabelsCompact(input: {
+  compact: boolean;
+  neededWidth: number;
+  availableWidth: number;
+}): boolean {
+  return input.compact
+    ? input.neededWidth > input.availableWidth - CONTEXT_STRIP_COMPACT_EXPAND_HYSTERESIS_PX
+    : input.neededWidth > input.availableWidth;
 }
 
 export function resolveEnvModeLabel(mode: EnvMode): string {
diff --git a/apps/web/src/components/BranchToolbar.tsx b/apps/web/src/components/BranchToolbar.tsx
index b0b1440587ea..0496bef06ef6 100644
--- a/apps/web/src/components/BranchToolbar.tsx
+++ b/apps/web/src/components/BranchToolbar.tsx
@@ -2,21 +2,20 @@ import { scopeProjectRef, scopeThreadRef } from "@t3tools/client-runtime/environ
 import type { EnvironmentId, ThreadId } from "@t3tools/contracts";
 import {
   ChevronDownIcon,
-  CloudIcon,
   FolderGit2Icon,
   FolderGitIcon,
   FolderIcon,
   HistoryIcon,
-  MonitorIcon,
 } from "lucide-react";
 import { memo, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
 
 import { useComposerDraftStore, type DraftId } from "../composerDraftStore";
+import { EnvironmentMachineIcon } from "./EnvironmentMachineIcon";
 import { useProject, useThread, useThreadShellsForProjectRefs } from "../state/entities";
-import { useIsMobile } from "../hooks/useMediaQuery";
 import {
   type EnvMode,
   type EnvironmentOption,
+  resolveContextStripLabelsCompact,
   resolveCurrentWorkspaceLabel,
   resolveEnvModeLabel,
   resolveEffectiveEnvMode,
@@ -41,6 +40,9 @@ import {
 } from "./ui/menu";
 import { Separator } from "./ui/separator";
 import { ComposerSurface } from "./chat/ComposerSurface";
+import { measureRestingComposerControls } from "./chat/restingComposerControlsMeasurement";
+import { resolveRestingComposerControlsNaturalWidth } from "./composerFooterLayout";
+import { cn } from "~/lib/utils";
 
 interface BranchToolbarProps {
   environmentId: EnvironmentId;
@@ -58,6 +60,8 @@ interface BranchToolbarProps {
   onComposerFocusRequest?: () => void;
   availableEnvironments?: readonly EnvironmentOption[];
   onEnvironmentChange?: (environmentId: EnvironmentId) => void;
+  composerControlsHostRef?: (element: HTMLDivElement | null) => void;
+  contextStripVisible?: boolean;
 }
 
 interface MobileRunContextSelectorProps {
@@ -105,12 +109,14 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
       ? resolveEnvModeLabel("worktree")
       : resolveCurrentWorkspaceLabel(activeWorktreePath);
   const isLocked = envLocked || envModeLocked;
-  const EnvironmentIcon = activeEnvironment?.isPrimary ? MonitorIcon : CloudIcon;
   const icon = showEnvironmentIndicator ? (
     // Button's base styles apply `-mx-0.5` to descendant SVGs, which eats 4px
     // out of whatever gap we set. mx-0! cancels that so gap-0.5 reads as 2px.
     <span className="inline-flex shrink-0 items-center gap-0.5">
-      <EnvironmentIcon className="size-3 shrink-0 mx-0!" />
+      <EnvironmentMachineIcon
+        kind={activeEnvironment?.machine ?? "server"}
+        className="size-3 shrink-0 mx-0!"
+      />
       <WorkspaceIcon className="size-3 shrink-0 mx-0!" />
     </span>
   ) : (
@@ -119,15 +125,26 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
   const triggerContent = (
     <>
       {icon}
-      <span className="min-w-0 truncate">
-        {showEnvironmentIndicator ? (activeEnvironment?.label ?? "Run on") : workspaceLabel}
+      <span
+        data-composer-label
+        className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
+      >
+        <span
+          data-composer-label-motion
+          className="block w-full min-w-0 max-w-[240px] origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
+        >
+          {showEnvironmentIndicator ? (activeEnvironment?.label ?? "Run on") : workspaceLabel}
+        </span>
       </span>
     </>
   );
 
   if (isLocked) {
     return (
-      <span className="inline-flex h-7 min-w-0 max-w-[48%] flex-1 items-center justify-start gap-1 rounded-md border border-transparent px-[calc(--spacing(2)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 md:hidden">
+      <span
+        className="inline-flex h-7 min-w-0 max-w-[48%] flex-initial items-center justify-start gap-1 rounded-md border border-transparent px-[calc(--spacing(2)-1px)] font-normal text-muted-foreground/70 text-xs sm:h-6"
+        data-composer-context-control
+      >
         {triggerContent}
       </span>
     );
@@ -137,7 +154,8 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
     <Menu>
       <MenuTrigger
         render={<Button variant="ghost" size="xs" />}
-        className="min-w-0 max-w-[48%] flex-1 justify-start text-muted-foreground/70 hover:text-foreground/80 md:hidden"
+        className="min-w-0 max-w-[48%] flex-initial justify-start font-normal text-muted-foreground/70 text-xs! hover:text-foreground/80"
+        data-composer-context-control
       >
         {triggerContent}
         <ChevronDownIcon className="size-3 shrink-0 opacity-50" />
@@ -151,21 +169,18 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
                 value={environmentId}
                 onValueChange={(value) => onEnvironmentChange(value as EnvironmentId)}
               >
-                {availableEnvironments.map((env) => {
-                  const Icon = env.isPrimary ? MonitorIcon : CloudIcon;
-                  return (
-                    <MenuRadioItem
-                      key={env.environmentId}
-                      disabled={envLocked}
-                      value={env.environmentId}
-                    >
-                      <span className="flex min-w-0 items-center gap-1.5">
-                        <Icon className="size-3" />
-                        <span className="min-w-0 truncate">{env.label}</span>
-                      </span>
-                    </MenuRadioItem>
-                  );
-                })}
+                {availableEnvironments.map((env) => (
+                  <MenuRadioItem
+                    key={env.environmentId}
+                    disabled={envLocked}
+                    value={env.environmentId}
+                  >
+                    <span className="flex min-w-0 items-center gap-1.5">
+                      <EnvironmentMachineIcon kind={env.machine} className="size-3" />
+                      <span className="min-w-0 truncate">{env.label}</span>
+                    </span>
+                  </MenuRadioItem>
+                ))}
               </MenuRadioGroup>
             </MenuGroup>
             <MenuSeparator />
@@ -224,7 +239,6 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
  * the expanded width without remembered values that could go stale or latch
  * the strip compact. A small hysteresis keeps the boundary from flapping.
  */
-const COMPACT_EXPAND_HYSTERESIS_PX = 16;
 const COMPOSER_CONTEXT_MOTION_DURATION_MS = 180;
 const COMPOSER_CONTEXT_MOTION_EASING = "cubic-bezier(0.32, 0.72, 0, 1)";
 const COMPOSER_CONTEXT_CONTROL_SELECTOR = "[data-composer-context-control]";
@@ -253,10 +267,14 @@ function useLabelsOverflow(element: HTMLDivElement | null): boolean {
       let counted = 0;
       for (const child of parent.children) {
         if (!(child instanceof HTMLElement)) continue;
-        if (child.offsetWidth <= 1) continue;
-        const position = getComputedStyle(child).position;
+        if (child.offsetWidth === 0) continue;
+        const style = getComputedStyle(child);
+        const position = style.position;
         if (position === "absolute" || position === "fixed") continue;
-        width += child.offsetWidth;
+        width +=
+          child.offsetWidth +
+          (Number.parseFloat(style.marginInlineStart) || 0) +
+          (Number.parseFloat(style.marginInlineEnd) || 0);
         counted += 1;
       }
       return width + gap * Math.max(0, counted - 1);
@@ -266,10 +284,23 @@ function useLabelsOverflow(element: HTMLDivElement | null): boolean {
     let groups = 0;
     for (const child of current.children) {
       if (!(child instanceof HTMLElement)) continue;
-      const width = contentWidth(child);
+      // The host itself flexes into all remaining room. Reserve the natural
+      // width of the controls inside it, blocks in overflow included, so Git
+      // labels compact before squeezing out the model picker. Reserving only
+      // the visible controls would let the labels expand into room the
+      // composer just freed, shrink the host, and hide the controls again.
+      const hostedControls = child.matches('[data-chat-resting-composer-controls-host="true"]')
+        ? child.querySelector<HTMLElement>('[data-chat-composer-resting-controls="true"]')
+        : null;
+      const hostedMeasurement = hostedControls
+        ? measureRestingComposerControls(hostedControls)
+        : null;
+      const width = hostedMeasurement
+        ? resolveRestingComposerControlsNaturalWidth(hostedMeasurement)
+        : contentWidth(hostedControls ?? child);
       if (width <= 1) continue;
-      needed += width;
       groups += 1;
+      needed += width;
     }
     needed += stripGap * Math.max(0, groups - 1);
     for (const label of current.querySelectorAll<HTMLElement>("[data-composer-label]")) {
@@ -290,9 +321,11 @@ function useLabelsOverflow(element: HTMLDivElement | null): boolean {
         needed += Math.max(0, textWidth - label.clientWidth);
       }
     }
-    const nextOverflows = compact
-      ? needed > available - COMPACT_EXPAND_HYSTERESIS_PX
-      : needed > available;
+    const nextOverflows = resolveContextStripLabelsCompact({
+      compact,
+      neededWidth: needed,
+      availableWidth: available,
+    });
     if (nextOverflows !== compact) {
       pendingControlRectsRef.current = new Map(
         Array.from(current.querySelectorAll<HTMLElement>(COMPOSER_CONTEXT_CONTROL_SELECTOR)).map(
@@ -392,6 +425,8 @@ export const BranchToolbar = memo(function BranchToolbar({
   onComposerFocusRequest,
   availableEnvironments,
   onEnvironmentChange,
+  composerControlsHostRef,
+  contextStripVisible = true,
 }: BranchToolbarProps) {
   const threadRef = useMemo(
     () => scopeThreadRef(environmentId, threadId),
@@ -462,7 +497,6 @@ export const BranchToolbar = memo(function BranchToolbar({
     activeEnvironment: activeEnvironmentOption,
     canPickEnvironment: showEnvironmentPicker,
   });
-  const isMobile = useIsMobile();
   const [stripElement, setStripElement] = useState<HTMLDivElement | null>(null);
   const labelsOverflow = useLabelsOverflow(stripElement);
 
@@ -472,24 +506,40 @@ export const BranchToolbar = memo(function BranchToolbar({
     <ComposerSurface.ContextStrip
       ref={setStripElement}
       data-compact={labelsOverflow ? "" : undefined}
+      className={cn(
+        "gap-1 text-xs font-normal text-muted-foreground/70",
+        // A non-Git strip with no visible composer controls should occupy no
+        // space, but its host must retain a prospective width so controls can
+        // become visible again when the chat view grows.
+        !contextStripVisible && "pointer-events-none invisible absolute inset-x-0 top-full",
+      )}
     >
-      {isMobile && showGitControls ? (
-        <MobileRunContextSelector
-          envLocked={envLocked}
-          envModeLocked={envModeLocked}
-          environmentId={environmentId}
-          availableEnvironments={availableEnvironments}
-          showEnvironmentPicker={showEnvironmentPicker}
-          showEnvironmentIndicator={showEnvironmentIndicator}
-          onEnvironmentChange={onEnvironmentChange}
-          effectiveEnvMode={effectiveEnvMode}
-          activeWorktreePath={activeWorktreePath}
-          onEnvModeChange={onEnvModeChange}
-          previousWorktreeLabel={previousWorktreeLabel}
-          onUsePreviousWorktree={onUsePreviousWorktree}
-        />
-      ) : (
-        <div className="flex min-w-10 flex-1 items-center gap-1">
+      {showGitControls ? (
+        <div className="contents @3xl/composer-surface:hidden">
+          <MobileRunContextSelector
+            envLocked={envLocked}
+            envModeLocked={envModeLocked}
+            environmentId={environmentId}
+            availableEnvironments={availableEnvironments}
+            showEnvironmentPicker={showEnvironmentPicker}
+            showEnvironmentIndicator={showEnvironmentIndicator}
+            onEnvironmentChange={onEnvironmentChange}
+            effectiveEnvMode={effectiveEnvMode}
+            activeWorktreePath={activeWorktreePath}
+            onEnvModeChange={onEnvModeChange}
+            previousWorktreeLabel={previousWorktreeLabel}
+            onUsePreviousWorktree={onUsePreviousWorktree}
+          />
+        </div>
+      ) : null}
+      {showGitControls || showEnvironmentIndicator ? (
+        <div
+          className={cn(
+            "min-h-7 min-w-10 items-center gap-1 sm:min-h-6",
+            showGitControls ? "hidden @3xl/composer-surface:flex" : "flex",
+            composerControlsHostRef ? "shrink" : "flex-1",
+          )}
+        >
           {showEnvironmentIndicator && availableEnvironments && (
             <>
               <BranchToolbarEnvironmentSelector
@@ -518,11 +568,23 @@ export const BranchToolbar = memo(function BranchToolbar({
             />
           ) : null}
         </div>
-      )}
+      ) : null}
+
+      {composerControlsHostRef ? (
+        // The host takes whatever the workspace and branch controls leave
+        // over, in both strip layouts, so a collapsed composer can show its
+        // model and mode controls wherever they fit.
+        <div
+          ref={composerControlsHostRef}
+          data-composer-context-control
+          data-chat-resting-composer-controls-host="true"
+          className="flex min-w-0 flex-1 items-center justify-start overflow-x-clip overflow-y-visible"
+        />
+      ) : null}
 
       {showGitControls ? (
         <BranchToolbarBranchSelector
-          className="min-w-0 flex-1 justify-end md:ml-auto md:flex-initial"
+          className="min-w-0 flex-initial justify-end @3xl/composer-surface:ml-auto"
           environmentId={environmentId}
           threadId={threadId}
           {...(draftId ? { draftId } : {})}
diff --git a/apps/web/src/components/BranchToolbarBranchSelector.tsx b/apps/web/src/components/BranchToolbarBranchSelector.tsx
index 10fd413f9787..70b08ac2ce5f 100644
--- a/apps/web/src/components/BranchToolbarBranchSelector.tsx
+++ b/apps/web/src/components/BranchToolbarBranchSelector.tsx
@@ -749,7 +749,17 @@ export function BranchToolbarBranchSelector({
               }
             >
               <ChangeRequestStatusIcon className="size-3" />
-              <span>#{branchPr.number}</span>
+              <span
+                data-composer-label
+                className="min-w-0 max-w-12 overflow-hidden group-data-[compact]/composer-context:max-w-0"
+              >
+                <span
+                  data-composer-label-motion
+                  className="block w-full min-w-0 max-w-12 origin-left truncate transition-[opacity,transform] duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:[transform:translateX(-0.25rem)_scaleX(0.95)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transform-none motion-reduce:transition-opacity"
+                >
+                  #{branchPr.number}
+                </span>
+              </span>
             </TooltipTrigger>
             <TooltipPopup side="top">{branchPrTooltip}</TooltipPopup>
           </Tooltip>
@@ -763,7 +773,7 @@ export function BranchToolbarBranchSelector({
         >
           <ComboboxTrigger
             render={<Button variant="ghost" size="xs" />}
-            className="min-w-0 max-w-full text-muted-foreground/70 hover:text-foreground/80"
+            className="min-w-0 max-w-full font-normal text-muted-foreground/70 text-xs! hover:text-foreground/80"
             disabled={isInitialBranchesLoadPending || isBranchActionPending}
           >
             <GitBranchIcon className="size-3 shrink-0 opacity-70" />
diff --git a/apps/web/src/components/BranchToolbarEnvModeSelector.tsx b/apps/web/src/components/BranchToolbarEnvModeSelector.tsx
index 23589d62bd95..9e25579d67a1 100644
--- a/apps/web/src/components/BranchToolbarEnvModeSelector.tsx
+++ b/apps/web/src/components/BranchToolbarEnvModeSelector.tsx
@@ -51,7 +51,7 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
   if (envLocked) {
     return (
       <span
-        className="inline-flex h-7 min-w-0 items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs"
+        className="inline-flex h-7 min-w-0 items-center gap-1 border border-transparent px-[calc(--spacing(2)-1px)] font-normal text-muted-foreground/70 text-xs sm:h-6"
         data-composer-context-control
       >
         {activeWorktreePath ? (
@@ -90,7 +90,7 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
       <SelectTrigger
         variant="ghost"
         size="xs"
-        className="min-w-0 shrink font-medium"
+        className="min-w-0 shrink font-normal text-xs!"
         aria-label="Workspace"
         data-composer-context-control
       >
diff --git a/apps/web/src/components/BranchToolbarEnvironmentSelector.tsx b/apps/web/src/components/BranchToolbarEnvironmentSelector.tsx
index b5d5751a280b..6304e37cf88d 100644
--- a/apps/web/src/components/BranchToolbarEnvironmentSelector.tsx
+++ b/apps/web/src/components/BranchToolbarEnvironmentSelector.tsx
@@ -1,8 +1,8 @@
 import type { EnvironmentId } from "@t3tools/contracts";
-import { CloudIcon, MonitorIcon } from "lucide-react";
 import { memo, useMemo } from "react";
 
 import type { EnvironmentOption } from "./BranchToolbar.logic";
+import { EnvironmentMachineIcon } from "./EnvironmentMachineIcon";
 import {
   Select,
   SelectGroup,
@@ -49,14 +49,13 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
   if (envLocked || onEnvironmentChange === undefined) {
     return (
       <span
-        className="inline-flex h-7 min-w-0 max-w-full items-center gap-1 border border-transparent px-[calc(--spacing(3)-1px)] text-sm font-medium text-muted-foreground/70 sm:h-6 sm:text-xs"
+        className="inline-flex h-7 min-w-0 max-w-full items-center gap-1 border border-transparent px-[calc(--spacing(2)-1px)] font-normal text-muted-foreground/70 text-xs sm:h-6"
         data-composer-context-control
       >
-        {activeEnvironment?.isPrimary ? (
-          <MonitorIcon className="size-3 shrink-0" />
-        ) : (
-          <CloudIcon className="size-3 shrink-0" />
-        )}
+        <EnvironmentMachineIcon
+          kind={activeEnvironment?.machine ?? "server"}
+          className="size-3 shrink-0"
+        />
         <span
           data-composer-label
           className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
@@ -82,15 +81,14 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
       <SelectTrigger
         variant="ghost"
         size="xs"
-        className="min-w-0 max-w-full font-medium"
+        className="min-w-0 max-w-full font-normal text-xs!"
         aria-label="Run on"
         data-composer-context-control
       >
-        {activeEnvironment?.isPrimary ? (
-          <MonitorIcon className="size-3 shrink-0" />
-        ) : (
-          <CloudIcon className="size-3 shrink-0" />
-        )}
+        <EnvironmentMachineIcon
+          kind={activeEnvironment?.machine ?? "server"}
+          className="size-3 shrink-0"
+        />
         <span
           data-composer-label
           className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
@@ -109,11 +107,7 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
           {availableEnvironments.map((env) => (
             <SelectItem key={env.environmentId} value={env.environmentId}>
               <span className="inline-flex items-center gap-1.5">
-                {env.isPrimary ? (
-                  <MonitorIcon className="size-3" />
-                ) : (
-                  <CloudIcon className="size-3" />
-                )}
+                <EnvironmentMachineIcon kind={env.machine} className="size-3" />
                 {env.label}
               </span>
             </SelectItem>
diff --git a/apps/web/src/components/ChatMarkdown.tsx b/apps/web/src/components/ChatMarkdown.tsx
index b08377e36a21..75127ea124e8 100644
--- a/apps/web/src/components/ChatMarkdown.tsx
+++ b/apps/web/src/components/ChatMarkdown.tsx
@@ -119,7 +119,7 @@ import { LRUCache } from "../lib/lruCache";
 import { getSyntaxHighlighterPromise } from "../lib/syntaxHighlighting";
 import { RenderErrorBoundary } from "./RenderErrorBoundary";
 import { useTheme } from "../hooks/useTheme";
-import { getClientSettings } from "../hooks/useSettings";
+import { getClientSettings, useClientSettings } from "../hooks/useSettings";
 import {
   chatMarkdownClipboardPayload,
   serializeTableElementToCsv,
@@ -173,6 +173,7 @@ import {
   openUrlInPreview,
   BrowserPreviewUnavailableError,
 } from "../browser/openFileInPreview";
+import { resolveLinkTarget } from "../browser/browserLinkTarget";
 
 interface ChatMarkdownProps {
   text: string;
@@ -1274,7 +1275,6 @@ function ChatMarkdownVideo(props: {
   readonly mediaIdentity?: string | undefined;
   readonly actionsSource?: MediaActionSource | undefined;
   readonly onRetry?: (() => Promise<void>) | undefined;
-  readonly onImageExpand?: ((preview: ExpandedImagePreview) => void) | undefined;
 }) {
   return (
     <MediaVideoPlayer
@@ -1296,27 +1296,6 @@ function ChatMarkdownVideo(props: {
       )}
       onRetry={props.onRetry}
       actionsSource={props.actionsSource}
-      onExpand={
-        props.onImageExpand
-          ? (src) => {
-              props.onImageExpand?.({
-                images: [
-                  {
-                    src,
-                    name: props.alt || "video",
-                    type: "video",
-                    autoPlay: false,
-                    ...(props.originalUrl ? { originalUrl: props.originalUrl } : {}),
-                    ...(props.actionsSource
-                      ? { actionsSource: { ...props.actionsSource, src } }
-                      : {}),
-                  },
-                ],
-                index: 0,
-              });
-            }
-          : undefined
-      }
     />
   );
 }
@@ -1378,7 +1357,6 @@ export const ChatMarkdownAssetImage = memo(function ChatMarkdownAssetImage(props
         style={props.style}
         mediaIdentity={JSON.stringify([props.environmentId, props.resource, props.srcFragment])}
         onRetry={refreshAssetUrl}
-        onImageExpand={props.onImageExpand}
         actionsSource={actionsSource}
       />
     );
@@ -2143,6 +2121,10 @@ function ChatMarkdown({
     event.clipboardData.setData("text/html", payload.html);
   }, []);
   const openChangeRequestLink = useOpenChangeRequestLink(threadRef);
+  // Subscribed rather than read at click time: the anchor has to decide
+  // synchronously whether to intercept its `_blank`, and a subscription is what
+  // makes a persisted "app" apply once settings hydrate after launch.
+  const linkTargetPreference = useClientSettings((settings) => settings.browserLinkTarget);
   const resolveThreadPullRequest = useCallback(
     (href: string): ThreadLinkedPullRequest | null => {
       if (
@@ -2495,9 +2477,35 @@ function ChatMarkdown({
                 }
                 // A link to a change request in a workspace project opens beside the
                 // conversation instead of in a browser: it is the thing being talked about, and
-                // the panel it opens offers the browser as one of its actions. Anything else is
-                // an ordinary link and keeps the `_blank` the shell already handles.
-                if (href) openChangeRequestLink(event, href);
+                // the panel it opens offers the browser as one of its actions.
+                if (!href || openChangeRequestLink(event, href)) return;
+                // Anything else follows the "Open links in" setting. The system browser
+                // keeps the `_blank` the shell already handles; the in-app browser needs
+                // the click intercepted here. A modifier click is the way out of the
+                // in-app default, so it is left to the shell too.
+                if (
+                  event.defaultPrevented ||
+                  resolveLinkTarget({
+                    url: href,
+                    event,
+                    preference: linkTargetPreference,
+                    canOpenInApp: canOpenInPreview,
+                  }) !== "app"
+                ) {
+                  return;
+                }
+                event.preventDefault();
+                event.stopPropagation();
+                // The click was taken from the shell, so an in-app open that fails
+                // hands the link to the system browser instead of dropping it.
+                void openExternalLinkInPreview(href).then((result) => {
+                  if (result._tag === "Success" || isAtomCommandInterrupted(result)) return;
+                  reportMarkdownActionFailure(
+                    { operation: "open-link-in-preview", target: href },
+                    result.cause,
+                  );
+                  void readLocalApi()?.shell.openExternal(href);
+                });
               }}
               onContextMenu={(event) => {
                 if (!href || !faviconHost) return;
@@ -2642,7 +2650,6 @@ function ChatMarkdown({
                 copyMarkdown={copyMarkdown}
                 originalUrl={originalUrl}
                 style={authoredSizeStyle}
-                onImageExpand={imageExpand}
                 actionsSource={actionsSource}
               />
             );
@@ -2735,6 +2742,7 @@ function ChatMarkdown({
     inlineCodeFileLinkMetaByText,
     imageBaseDir,
     isStreaming,
+    linkTargetPreference,
     markdownFileLinkMetaByHref,
     onTaskListChange,
     onUseArtifactTemplate,
diff --git a/apps/web/src/components/ChatMarkdown.workspace-images.test.tsx b/apps/web/src/components/ChatMarkdown.workspace-images.test.tsx
index 172793bacb0c..39be0eedafe2 100644
--- a/apps/web/src/components/ChatMarkdown.workspace-images.test.tsx
+++ b/apps/web/src/components/ChatMarkdown.workspace-images.test.tsx
@@ -145,6 +145,25 @@ describe("ChatMarkdown workspace images", () => {
     expect(html).not.toContain("Image unavailable");
   });
 
+  it("loads a POSIX absolute path and file URI through a signed asset URL", () => {
+    const html = renderToStaticMarkup(
+      <ChatMarkdown
+        cwd="/workspace/project"
+        threadRef={threadRef}
+        text={[
+          "![absolute](/tmp/embed-test/2.png)",
+          "![file URL](file:///tmp/embed-test/5.png)",
+        ].join("\n\n")}
+      />,
+    );
+
+    expect(testState.resources).toEqual([
+      { _tag: "media-file", threadId: threadRef.threadId, path: "/tmp/embed-test/2.png" },
+      { _tag: "media-file", threadId: threadRef.threadId, path: "/tmp/embed-test/5.png" },
+    ]);
+    expect(html).not.toContain("Image unavailable");
+  });
+
   it("normalizes a drive-absolute src in raw image HTML", () => {
     const html = render(String.raw`<img src="D:\screens\workspace-image.svg" alt="raw">`);
 
diff --git a/apps/web/src/components/ChatView.logic.test.ts b/apps/web/src/components/ChatView.logic.test.ts
index 9fe03c1c980f..6be48b94ed37 100644
--- a/apps/web/src/components/ChatView.logic.test.ts
+++ b/apps/web/src/components/ChatView.logic.test.ts
@@ -24,7 +24,6 @@ import {
   dismissBranchMismatchForSession,
   ENVIRONMENT_RECONNECT_WARNING_GRACE_MS,
   getStartedThreadModelChangeBlockReason,
-  isVideoPreviewRequestCurrent,
   hasEnvironmentReconnectWarningGraceElapsed,
   hasServerAcknowledgedLocalDispatch,
   isBranchMismatchDismissedForSession,
@@ -130,14 +129,6 @@ describe("proactive panels", () => {
   });
 });
 
-describe("isVideoPreviewRequestCurrent", () => {
-  it("rejects changed threads and replaced previews", () => {
-    expect(isVideoPreviewRequestCurrent("thread-1", "thread-2", 1, 1)).toBe(false);
-    expect(isVideoPreviewRequestCurrent("thread-1", "thread-1", 1, 2)).toBe(false);
-    expect(isVideoPreviewRequestCurrent("thread-1", "thread-1", 2, 2)).toBe(true);
-  });
-});
-
 describe("toolGroupConsumesUpwardNavigation", () => {
   class ScrollElement extends EventTarget {
     scrollTop = 0;
diff --git a/apps/web/src/components/ChatView.logic.ts b/apps/web/src/components/ChatView.logic.ts
index 087378706338..cccc0a8dfe88 100644
--- a/apps/web/src/components/ChatView.logic.ts
+++ b/apps/web/src/components/ChatView.logic.ts
@@ -399,15 +399,6 @@ export async function resolveFileAttachmentUrl(input: {
   return url;
 }
 
-export function isVideoPreviewRequestCurrent(
-  requestThreadKey: string,
-  currentThreadKey: string,
-  requestId: number,
-  currentRequestId: number,
-): boolean {
-  return requestThreadKey === currentThreadKey && requestId === currentRequestId;
-}
-
 export function revokeUserMessagePreviewUrls(message: ChatMessage): void {
   if (message.role !== "user" || !message.attachments) {
     return;
diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx
index 27af2aa5ed2d..5f5663f2cadb 100644
--- a/apps/web/src/components/ChatView.tsx
+++ b/apps/web/src/components/ChatView.tsx
@@ -23,6 +23,7 @@ import {
   PROVIDER_SEND_TURN_MAX_ATTACHMENTS,
   ProviderInteractionMode,
   ProviderDriverKind,
+  resolveEnvironmentMachineKind,
   RuntimeMode,
   TerminalOpenInput,
 } from "@t3tools/contracts";
@@ -63,6 +64,7 @@ import {
   Suspense,
   useCallback,
   useEffect,
+  useEffectEvent,
   useLayoutEffect,
   useMemo,
   useRef,
@@ -135,7 +137,6 @@ import {
   type ChatMessage,
   isBrowserPreviewAttachment,
   isImageAttachment,
-  videoMimeType,
   type SessionPhase,
   type Thread,
   type TurnDiffSummary,
@@ -265,7 +266,6 @@ import { environmentCatalog } from "../connection/catalog";
 import { selectThreadTerminalUiState, useTerminalUiStateStore } from "../terminalUiStateStore";
 import { useKnownTerminalSessions, useThreadRunningTerminalIds } from "../state/terminalSessions";
 import { projectEnvironment } from "../state/projects";
-import { linkedPullRequestDetailAtom } from "../state/pullRequests";
 import { useEnvironmentQuery } from "../state/query";
 import {
   environmentServerConfigsAtom,
@@ -292,6 +292,7 @@ import {
 } from "../state/entities";
 import { environmentShell } from "../state/shell";
 import { ChatComposer, type ChatComposerHandle } from "./chat/ChatComposer";
+import { createPageScrollController, type PageScrollKey } from "./chat/pageScrollController";
 import { DraftHeroHeadline } from "./chat/DraftHeroHeadline";
 import { ExpandedImageDialog } from "./chat/ExpandedImageDialog";
 import { PullRequestThreadDialog } from "./PullRequestThreadDialog";
@@ -300,10 +301,11 @@ import type { AssistantCitationRequest } from "./chat/AssistantCitationSource";
 import { resolveTimelineIsAtEnd } from "./chat/MessagesTimeline.logic";
 import { ChatHeader } from "./chat/ChatHeader";
 import { PanelLayoutControls, RightPanelMaximizeControl } from "./chat/PanelLayoutControls";
-import { type ExpandedImagePreview } from "./chat/ExpandedImagePreview";
+import { expandedImageKey, type ExpandedImagePreview } from "./chat/ExpandedImagePreview";
 import { NoActiveThreadState } from "./NoActiveThreadState";
 import { WorkspacePageHeader } from "./WorkspacePageHeader";
 import {
+  type EnvironmentOption,
   resolveEffectiveEnvMode,
   resolveLocalCheckoutBranchMismatch,
   shouldShowComposerContextStrip,
@@ -323,7 +325,6 @@ import {
 } from "./chat/ThreadErrorBanner";
 import {
   resolveDisplayedThreadPr,
-  threadPullRequestRefreshSource,
   threadChangeRequestSnapshotsAtom,
   useLinkedThreadPullRequest,
 } from "./ThreadStatusIndicators";
@@ -375,7 +376,6 @@ import {
   deriveLockedProvider,
   readFileAsDataUrl,
   resolveFileAttachmentUrl,
-  isVideoPreviewRequestCurrent,
   reconcileMountedTerminalThreadIds,
   resolveBackgroundDraftWorkspaceOptions,
   resolveDraftHeroState,
@@ -1493,6 +1493,9 @@ function ChatViewContent(props: ChatViewProps) {
   const composerElementContextsRef = useRef<ElementContextDraft[]>([]);
   const localComposerRef = useRef<ChatComposerHandle | null>(null);
   const composerRef = useComposerHandleContext() ?? localComposerRef;
+  const [restingComposerControlsHost, setRestingComposerControlsHost] =
+    useState<HTMLDivElement | null>(null);
+  const [restingComposerControlsVisible, setRestingComposerControlsVisible] = useState(false);
   const citeAssistantText = useCallback(
     (citation: AssistantCitation, sourceAnchor: AssistantCitationSourceAnchor) => {
       const inserted = composerRef.current?.citeAssistantText(citation, sourceAnchor) ?? false;
@@ -1509,19 +1512,13 @@ function ChatViewContent(props: ChatViewProps) {
     [composerRef],
   );
   const [isWorkspaceFileDragActive, setIsWorkspaceFileDragActive] = useState(false);
-  const routeThreadKeyRef = useRef(routeThreadKey);
-  routeThreadKeyRef.current = routeThreadKey;
-  const videoPreviewRequestIdRef = useRef(0);
-  const cancelVideoPreviewRequest = useCallback(() => {
-    videoPreviewRequestIdRef.current += 1;
-  }, []);
-  const [openingVideoAttachmentId, setOpeningVideoAttachmentId] = useState<string | null>(null);
   const [showScrollToBottom, setShowScrollToBottom] = useState(false);
   const [expandedImage, setExpandedImage] = useState<ExpandedImagePreview | null>(null);
   useEffect(() => {
     const item = expandedImage?.images[expandedImage.index];
-    if (item?.type !== "video" || !item.src.startsWith("blob:")) return;
-    return () => revokeBlobPreviewUrl(item.src);
+    if (item?.type !== "video" || item.src === null || !item.src.startsWith("blob:")) return;
+    const src = item.src;
+    return () => revokeBlobPreviewUrl(src);
   }, [expandedImage]);
   const [optimisticUserMessages, setOptimisticUserMessages] = useState<ChatMessage[]>([]);
   const [feedbackSubmissionsByThreadKey, setFeedbackSubmissionsByThreadKey] = useState<
@@ -1589,10 +1586,16 @@ function ChatViewContent(props: ChatViewProps) {
     LastInvokedScriptByProjectSchema,
   );
   const legendListRef = useRef<LegendListRef | null>(null);
+  const getTimelineScrollableNode = useCallback(
+    () => legendListRef.current?.getScrollableNode() ?? null,
+    [],
+  );
   const [composerOverlayElement, setComposerOverlayElement] = useState<HTMLDivElement | null>(null);
   const [composerOverlayHeight, setComposerOverlayHeight] = useState(0);
+  const composerOverlayHeightRef = useRef(0);
   const [scrollToEndClearance, setScrollToEndClearance] = useState(0);
   const isAtEndRef = useRef(true);
+  const isTimelineAtLogicalEnd = useCallback(() => isAtEndRef.current, []);
   const attachmentPreviewHandoffByMessageIdRef = useRef<Record<string, string[]>>({});
   const attachmentPreviewPromotionInFlightByMessageIdRef = useRef<Record<string, true>>({});
   const sendInFlightRef = useRef(false);
@@ -1793,6 +1796,8 @@ function ChatViewContent(props: ChatViewProps) {
   );
   const refreshVcsStatus = useAtomCommand(vcsEnvironment.refreshStatus, { reportFailure: false });
   const sidebarPrRefreshKeyRef = useRef<string | null>(null);
+  const threadPrRelinkKeysRef = useRef(new Map<string, string>());
+  const threadPrRelinkWriteRef = useRef(Promise.resolve());
   const activePreviewState = useThreadPreviewState(activeThreadRef);
   const activePreviewServerEpoch = activePreviewState.serverEpoch;
   const resolvePreviewRuntimeTabId = useMemo(
@@ -2063,22 +2068,18 @@ function ChatViewContent(props: ChatViewProps) {
       (p) => deriveLogicalProjectKeyFromSettings(p, projectGroupingSettings) === logicalKey,
     );
     const seen = new Set<string>();
-    const envs: Array<{
-      environmentId: EnvironmentId;
-      projectId: ProjectId;
-      label: string;
-      isPrimary: boolean;
-    }> = [];
+    const envs: EnvironmentOption[] = [];
     for (const p of memberProjects) {
       if (seen.has(p.environmentId)) continue;
       seen.add(p.environmentId);
       const isPrimary = p.environmentId === primaryEnvironmentId;
-      const label = environmentById.get(p.environmentId)?.label ?? p.environmentId;
+      const environment = environmentById.get(p.environmentId) ?? null;
       envs.push({
         environmentId: p.environmentId,
         projectId: p.id,
-        label,
+        label: environment?.label ?? p.environmentId,
         isPrimary,
+        machine: resolveEnvironmentMachineKind(environment?.serverConfig ?? null),
       });
     }
     // Sort: primary first, then alphabetical
@@ -2582,12 +2583,11 @@ function ChatViewContent(props: ChatViewProps) {
   useEffect(() => {
     return () => {
       clearAttachmentPreviewHandoffs();
-      cancelVideoPreviewRequest();
       for (const message of optimisticUserMessagesRef.current) {
         revokeUserMessagePreviewUrls(message);
       }
     };
-  }, [cancelVideoPreviewRequest, clearAttachmentPreviewHandoffs]);
+  }, [clearAttachmentPreviewHandoffs]);
   const handoffAttachmentPreviews = useCallback((messageId: MessageId, previewUrls: string[]) => {
     if (previewUrls.length === 0) return;
 
@@ -2615,18 +2615,6 @@ function ChatViewContent(props: ChatViewProps) {
         toastManager.add({ type: "error", title: "The environment is not connected." });
         return;
       }
-      const isVideo = videoMimeType(attachment) !== null;
-      const action = isVideo ? "play" : "download";
-      const videoPreviewRequestId = isVideo ? ++videoPreviewRequestIdRef.current : 0;
-      const isCurrentRequest = () =>
-        !isVideo ||
-        isVideoPreviewRequestCurrent(
-          routeThreadKey,
-          routeThreadKeyRef.current,
-          videoPreviewRequestId,
-          videoPreviewRequestIdRef.current,
-        );
-      if (isVideo) setOpeningVideoAttachmentId(attachment.id);
 
       try {
         const url = await resolveFileAttachmentUrl({
@@ -2635,30 +2623,19 @@ function ChatViewContent(props: ChatViewProps) {
           httpBaseUrl: connection.httpBaseUrl,
           createAssetUrl: createAttachmentAssetUrl,
         });
-        if (!isCurrentRequest()) return;
-        if (isVideo) {
-          setExpandedImage({
-            images: [{ src: url, name: attachment.name, type: "video" }],
-            index: 0,
-          });
-          return;
-        }
         const anchor = document.createElement("a");
         anchor.href = url;
         anchor.download = attachment.name;
         anchor.click();
       } catch (error) {
-        if (!isCurrentRequest()) return;
         toastManager.add({
           type: "error",
-          title: "Could not " + action + " " + attachment.name,
+          title: "Could not download " + attachment.name,
           description: error instanceof Error ? error.message : "The attachment is unavailable.",
         });
-      } finally {
-        if (isVideo && isCurrentRequest()) setOpeningVideoAttachmentId(null);
       }
     },
-    [createAttachmentAssetUrl, environmentId, routeThreadKey],
+    [createAttachmentAssetUrl, environmentId],
   );
   const openFileAttachment = useCallback(
     (attachment: ChatFileAttachment) => {
@@ -3042,10 +3019,20 @@ function ChatViewContent(props: ChatViewProps) {
     terminalUiLaunchContext?.threadId === activeThreadId ? terminalUiLaunchContext : null;
   // Default true while loading to avoid toolbar flicker.
   const isGitRepo = gitStatusQuery.data?.isRepo ?? true;
+  // Keep a hidden, off-flow strip mounted for existing threads so the composer
+  // can measure whether its relocated controls fit. The visible chrome remains
+  // content-driven: Git/environment context or controls that actually fit.
+  const mountComposerContextStrip = shouldShowComposerContextStrip({
+    hasActiveProject: activeProject !== null,
+    isGitRepo,
+    showEnvironmentIndicator: showComposerEnvironmentIndicator,
+    hostsRestingComposerControls: routeKind === "server",
+  });
   const showComposerContextStrip = shouldShowComposerContextStrip({
     hasActiveProject: activeProject !== null,
     isGitRepo,
     showEnvironmentIndicator: showComposerEnvironmentIndicator,
+    hostsRestingComposerControls: routeKind === "server" && restingComposerControlsVisible,
   });
   const initialDiffPanelGitScope =
     gitStatusQuery.data?.hasWorkingTreeChanges === true ? "unstaged" : "branch";
@@ -3687,9 +3674,50 @@ function ChatViewContent(props: ChatViewProps) {
   );
   // The thread's own change request, placed against the project it belongs to. Without a
   // project there is nothing to resolve it against, so the caller falls back to the browser.
-  const linkedThreadPullRequest = isServerThread
+  const persistedLinkedThreadPullRequest = isServerThread
     ? (activeThreadShell?.linkedPullRequest ?? activeThread?.linkedPullRequest ?? null)
     : (activeThread?.linkedPullRequest ?? null);
+  const activeProjectRepository = activeProject?.repositoryIdentity?.displayName ?? null;
+  const persistedLinkedThreadPullRequestStatus = useLinkedThreadPullRequest(
+    activeThreadRef?.environmentId ?? null,
+    persistedLinkedThreadPullRequest,
+  );
+  const replacementLinkedThreadPullRequest = useMemo(() => {
+    const detected = gitStatusQuery.data?.pr;
+    const threadBranch = activeThread?.branch;
+    const projectId = activeProject?.id;
+    if (
+      persistedLinkedThreadPullRequest === null ||
+      (persistedLinkedThreadPullRequestStatus?.pr.state !== "merged" &&
+        persistedLinkedThreadPullRequestStatus?.pr.state !== "closed") ||
+      gitStatusQuery.data?.refName !== threadBranch ||
+      detected?.state !== "open" ||
+      detected.headRef !== threadBranch ||
+      projectId === undefined ||
+      activeProjectRepository === null ||
+      (persistedLinkedThreadPullRequest.projectId === projectId &&
+        persistedLinkedThreadPullRequest.repository.toLowerCase() ===
+          activeProjectRepository.toLowerCase() &&
+        persistedLinkedThreadPullRequest.number === detected.number)
+    ) {
+      return null;
+    }
+    return {
+      projectId,
+      repository: activeProjectRepository,
+      number: detected.number,
+      url: detected.url,
+    };
+  }, [
+    activeProject?.id,
+    activeProjectRepository,
+    activeThread?.branch,
+    gitStatusQuery.data,
+    persistedLinkedThreadPullRequest,
+    persistedLinkedThreadPullRequestStatus?.pr.state,
+  ]);
+  const linkedThreadPullRequest =
+    replacementLinkedThreadPullRequest ?? persistedLinkedThreadPullRequest;
   const linkedThreadPullRequestKey = linkedThreadPullRequest
     ? JSON.stringify([
         linkedThreadPullRequest.projectId,
@@ -3697,7 +3725,6 @@ function ChatViewContent(props: ChatViewProps) {
         linkedThreadPullRequest.number,
       ])
     : null;
-  const activeProjectRepository = activeProject?.repositoryIdentity?.displayName ?? null;
   const threadRepository = linkedThreadPullRequest?.repository ?? activeProjectRepository;
   const openThreadPullRequest = useCallback(
     (number: number) => {
@@ -3721,6 +3748,63 @@ function ChatViewContent(props: ChatViewProps) {
       supportsPullRequests,
     ],
   );
+  useEffect(() => {
+    if (!isServerThread || activeThreadKey === null || activeThreadRef === null) {
+      return;
+    }
+    if (replacementLinkedThreadPullRequest === null) {
+      threadPrRelinkKeysRef.current.delete(activeThreadKey);
+      return;
+    }
+    const relinkKey = `${replacementLinkedThreadPullRequest.projectId}:${replacementLinkedThreadPullRequest.repository}#${replacementLinkedThreadPullRequest.number}`;
+    if (threadPrRelinkKeysRef.current.get(activeThreadKey) === relinkKey) return;
+    threadPrRelinkKeysRef.current.set(activeThreadKey, relinkKey);
+    const openSurface = selectActiveRightPanelSurface(
+      useRightPanelStore.getState().byThreadKey,
+      activeThreadRef,
+    );
+    if (
+      openSurface?.kind === "pull-request" &&
+      persistedLinkedThreadPullRequest !== null &&
+      openSurface.projectId === persistedLinkedThreadPullRequest.projectId &&
+      openSurface.repository.toLowerCase() ===
+        persistedLinkedThreadPullRequest.repository.toLowerCase() &&
+      openSurface.number === persistedLinkedThreadPullRequest.number
+    ) {
+      useRightPanelStore
+        .getState()
+        .openPullRequest(activeThreadRef, replacementLinkedThreadPullRequest);
+    }
+
+    threadPrRelinkWriteRef.current = threadPrRelinkWriteRef.current.then(async () => {
+      if (threadPrRelinkKeysRef.current.get(activeThreadKey) !== relinkKey) return;
+      const result = await updateThreadMetadata({
+        environmentId: activeThreadRef.environmentId,
+        input: {
+          threadId: activeThreadRef.threadId,
+          linkedPullRequest: replacementLinkedThreadPullRequest,
+        },
+      });
+      if (threadPrRelinkKeysRef.current.get(activeThreadKey) !== relinkKey) return;
+      if (result._tag !== "Failure") return;
+      threadPrRelinkKeysRef.current.delete(activeThreadKey);
+      if (isAtomCommandInterrupted(result)) return;
+      toastManager.add(
+        stackedThreadToast({
+          type: "error",
+          title: "Unable to update the thread pull request",
+          description: chatActionErrorMessage(squashAtomCommandFailure(result)),
+        }),
+      );
+    });
+  }, [
+    activeThreadKey,
+    activeThreadRef,
+    isServerThread,
+    persistedLinkedThreadPullRequest,
+    replacementLinkedThreadPullRequest,
+    updateThreadMetadata,
+  ]);
   const openProjectPullRequest = useCallback(
     (number: number) => {
       if (
@@ -4281,6 +4365,7 @@ function ChatViewContent(props: ChatViewProps) {
   const showScrollDebouncer = useRef(
     new Debouncer(() => setShowScrollToBottom(true), { wait: 150 }),
   );
+  const timelineScrollIntentRef = useRef<"toward-end" | "away-from-end" | null>(null);
   const timelineScrollModeRef = useRef<TimelineScrollMode>("following-end");
   // State mirror of the follow mode refs. LegendList's maintainScrollAtEnd
   // re-pins on its own (independent of the refs), so the timeline needs a
@@ -4378,6 +4463,38 @@ function ChatViewContent(props: ChatViewProps) {
     },
     [composerOverlayHeight],
   );
+  const pageScrollControllerRef = useRef<ReturnType<typeof createPageScrollController> | null>(
+    null,
+  );
+  const handlePageScrollStart = useEffectEvent((key: PageScrollKey) => {
+    if (key === "PageUp" && timelineRealContentOverflowsViewport()) {
+      cancelTimelineLiveFollowForUserNavigation();
+    }
+  });
+  useEffect(() => {
+    const controller = createPageScrollController({
+      getContainer: () => legendListRef.current?.getScrollableNode() ?? null,
+      getScrollPaddingBottomPx: () => composerOverlayElement?.getBoundingClientRect().height ?? 0,
+      onScrollStart: handlePageScrollStart,
+    });
+    pageScrollControllerRef.current = controller;
+
+    return () => {
+      controller.dispose();
+      if (pageScrollControllerRef.current === controller) {
+        pageScrollControllerRef.current = null;
+      }
+    };
+  }, [composerOverlayElement]);
+  const onComposerPageScrollKeyDown = useCallback((key: PageScrollKey) => {
+    pageScrollControllerRef.current?.handleKeyDown(key);
+  }, []);
+  const onComposerPageScrollKeyUp = useCallback((key: string) => {
+    pageScrollControllerRef.current?.handleKeyUp(key);
+  }, []);
+  const onComposerPageScrollRelease = useCallback(() => {
+    pageScrollControllerRef.current?.releaseActiveKey();
+  }, []);
   // Live-follow stays active after send/thread-open until an actual list scroll
   // gesture opts out.
   const scrollToEnd = useCallback((animated = false) => {
@@ -4453,6 +4570,14 @@ function ChatViewContent(props: ChatViewProps) {
         // Only an upward wheel is a navigation intent; wheeling down while
         // following either does nothing (at the end) or moves toward it.
         const handleWheel = (event: WheelEvent) => {
+          if (event.deltaY > 0) {
+            timelineScrollIntentRef.current = "toward-end";
+            if (isAtEndRef.current) {
+              composerRef.current?.restoreAfterTimelineReachedEnd();
+            }
+          } else if (event.deltaY < 0) {
+            timelineScrollIntentRef.current = "away-from-end";
+          }
           if (
             event.deltaY < 0 &&
             contentScrollsUp() &&
@@ -4519,10 +4644,16 @@ function ChatViewContent(props: ChatViewProps) {
             case "PageUp":
             case "Home":
             case "ArrowUp":
+              timelineScrollIntentRef.current = "away-from-end";
               if (contentScrollsUp() && !toolGroupConsumesUpwardNavigation(event.target)) {
                 handleManualNavigation();
               }
               break;
+            case "PageDown":
+            case "End":
+            case "ArrowDown":
+              timelineScrollIntentRef.current = "toward-end";
+              break;
             default:
               break;
           }
@@ -4613,6 +4744,9 @@ function ChatViewContent(props: ChatViewProps) {
     if (isAtEndRef.current === isAtEnd) return;
     isAtEndRef.current = isAtEnd;
     if (isAtEnd) {
+      if (timelineScrollIntentRef.current === "toward-end") {
+        composerRef.current?.restoreAfterTimelineReachedEnd();
+      }
       timelineScrollModeRef.current = "following-end";
       liveFollowUserScrollGenerationRef.current = anchorUserScrollGenerationRef.current;
       setTimelineLiveFollowEnabled(true);
@@ -4685,6 +4819,7 @@ function ChatViewContent(props: ChatViewProps) {
   useEffect(() => {
     setPullRequestDialogState(null);
     isAtEndRef.current = true;
+    timelineScrollIntentRef.current = null;
     timelineScrollModeRef.current = "following-end";
     liveFollowUserScrollGenerationRef.current = anchorUserScrollGenerationRef.current;
     setTimelineLiveFollowEnabled(true);
@@ -4747,10 +4882,8 @@ function ChatViewContent(props: ChatViewProps) {
       return [];
     });
     resetLocalDispatch();
-    cancelVideoPreviewRequest();
-    setOpeningVideoAttachmentId(null);
     setExpandedImage(null);
-  }, [cancelVideoPreviewRequest, draftId, resetLocalDispatch, threadId]);
+  }, [draftId, resetLocalDispatch, threadId]);
 
   const closeExpandedImage = useCallback(() => {
     setExpandedImage(null);
@@ -4816,18 +4949,25 @@ function ChatViewContent(props: ChatViewProps) {
     activeComposerTasksProgress && activePlan && activePlan.turnId === activeLatestTurn?.turnId
       ? activePlan.steps
       : null;
+
+  const publishComposerOverlayHeight = useCallback((height: number) => {
+    const nextHeight = Math.ceil(height);
+    if (nextHeight <= 0) return;
+    const previousHeight = composerOverlayHeightRef.current;
+    if (previousHeight !== nextHeight) {
+      composerOverlayHeightRef.current = nextHeight;
+      setComposerOverlayHeight(nextHeight);
+    }
+    setScrollToEndClearance((currentClearance) =>
+      currentClearance === nextHeight ? currentClearance : nextHeight,
+    );
+  }, []);
+
   useLayoutEffect(() => {
     if (!composerOverlayElement) return;
 
     const updateHeight = () => {
-      const nextHeight = Math.ceil(composerOverlayElement.getBoundingClientRect().height);
-      if (nextHeight <= 0) return;
-      setComposerOverlayHeight((currentHeight) =>
-        currentHeight === nextHeight ? currentHeight : nextHeight,
-      );
-      setScrollToEndClearance((currentClearance) =>
-        currentClearance === nextHeight ? currentClearance : nextHeight,
-      );
+      publishComposerOverlayHeight(composerOverlayElement.getBoundingClientRect().height);
     };
 
     updateHeight();
@@ -4838,61 +4978,40 @@ function ChatViewContent(props: ChatViewProps) {
     return () => {
       resizeObserver.disconnect();
     };
-  }, [composerOverlayElement]);
-  const linkedPullRequestStatus = useLinkedThreadPullRequest(
-    activeThreadRef?.environmentId ?? null,
-    linkedThreadPullRequest,
-  );
-  const activeThreadPr = resolveDisplayedThreadPr({
-    threadBranch: activeThread?.branch ?? null,
-    gitStatus: gitStatusQuery.data ?? null,
-    snapshot: activeThreadKey ? changeRequestSnapshotByKey.get(activeThreadKey) : undefined,
-    retainTerminalOnBranchMismatch: activeThread?.worktreePath === null,
-    linkedPullRequest: linkedThreadPullRequest,
-    linkedPullRequestStatus,
-  });
+  }, [composerOverlayElement, publishComposerOverlayHeight]);
+  const activeThreadPr =
+    replacementLinkedThreadPullRequest !== null
+      ? (gitStatusQuery.data?.pr ?? null)
+      : resolveDisplayedThreadPr({
+          threadBranch: activeThread?.branch ?? null,
+          gitStatus: gitStatusQuery.data ?? null,
+          snapshot: activeThreadKey ? changeRequestSnapshotByKey.get(activeThreadKey) : undefined,
+          retainTerminalOnBranchMismatch: activeThread?.worktreePath === null,
+          linkedPullRequest: linkedThreadPullRequest,
+          linkedPullRequestStatus: persistedLinkedThreadPullRequestStatus,
+        });
   const handlePullRequestTabStatusChange = useCallback(
-    (status: PullRequestTabStatus) => {
-      const source = threadPullRequestRefreshSource({
-        panel: status,
-        thread: {
-          repository: threadRepository,
-          number: linkedThreadPullRequest?.number ?? activeThreadPr?.number ?? null,
-          state: activeThreadPr?.state ?? null,
-          linked: linkedThreadPullRequest !== null,
-        },
-      });
-      if (source === null) {
+    (status: Pick<PullRequestTabStatus, "repository" | "number" | "state">) => {
+      if (
+        threadRepository?.toLowerCase() !== status.repository.toLowerCase() ||
+        activeThreadPr?.number !== status.number ||
+        activeThreadPr.state === status.state
+      ) {
         sidebarPrRefreshKeyRef.current = null;
         return;
       }
-      const refreshKey = `${activeThreadKey}:${source}:${status.repository}#${status.number}:${status.state}`;
+      const refreshKey = `${activeThreadKey}:vcs:${status.repository}#${status.number}:${status.state}`;
       if (sidebarPrRefreshKeyRef.current === refreshKey) return;
       sidebarPrRefreshKeyRef.current = refreshKey;
-
-      if (source === "linked-detail" && activeThreadRef && linkedThreadPullRequest) {
-        appAtomRegistry.refresh(
-          linkedPullRequestDetailAtom({
-            environmentId: activeThreadRef.environmentId,
-            input: {
-              projectId: linkedThreadPullRequest.projectId,
-              repository: linkedThreadPullRequest.repository,
-              number: linkedThreadPullRequest.number,
-            },
-          }),
-        );
-        return;
-      }
-      if (source === "vcs" && activeThreadRef && gitCwd !== null) {
-        void refreshVcsStatus({
-          environmentId: activeThreadRef.environmentId,
-          input: { cwd: gitCwd },
-        }).then(() => {
-          if (sidebarPrRefreshKeyRef.current === refreshKey) {
-            sidebarPrRefreshKeyRef.current = null;
-          }
-        });
-      }
+      if (activeThreadRef === null || gitCwd === null) return;
+      void refreshVcsStatus({
+        environmentId: activeThreadRef.environmentId,
+        input: { cwd: gitCwd },
+      }).then(() => {
+        if (sidebarPrRefreshKeyRef.current === refreshKey) {
+          sidebarPrRefreshKeyRef.current = null;
+        }
+      });
     },
     [
       activeThreadKey,
@@ -4900,7 +5019,6 @@ function ChatViewContent(props: ChatViewProps) {
       activeThreadPr?.state,
       activeThreadRef,
       gitCwd,
-      linkedThreadPullRequest,
       refreshVcsStatus,
       threadRepository,
     ],
@@ -5673,6 +5791,16 @@ function ChatViewContent(props: ChatViewProps) {
         return;
       }
 
+      if (command === "rightPanel.close") {
+        // Nothing open: leave the event alone so the shortcut keeps its
+        // native meaning (close window on desktop, close tab in a browser).
+        if (!activeRightPanelSurface) return;
+        event.preventDefault();
+        event.stopPropagation();
+        if (!event.repeat) closeRightPanelSurface(activeRightPanelSurface);
+        return;
+      }
+
       if (command === "terminal.split") {
         event.preventDefault();
         event.stopPropagation();
@@ -5761,6 +5889,7 @@ function ChatViewContent(props: ChatViewProps) {
     terminalUiState.terminalOpen,
     terminalUiState.activeTerminalId,
     activeThreadId,
+    closeRightPanelSurface,
     requestCloseTerminal,
     requestClosePanelTerminal,
     createNewTerminal,
@@ -7249,14 +7378,9 @@ function ChatViewContent(props: ChatViewProps) {
     }
   };
 
-  const onExpandTimelineImage = useCallback(
-    (preview: ExpandedImagePreview) => {
-      cancelVideoPreviewRequest();
-      setOpeningVideoAttachmentId(null);
-      setExpandedImage(preview);
-    },
-    [cancelVideoPreviewRequest],
-  );
+  const onExpandTimelineImage = useCallback((preview: ExpandedImagePreview) => {
+    setExpandedImage(preview);
+  }, []);
   const onOpenTurnDiff = useCallback(
     (turnId: TurnId, filePath?: string) => {
       if (!isServerThread || !activeThreadRef) return;
@@ -7389,6 +7513,7 @@ function ChatViewContent(props: ChatViewProps) {
       <PullRequestDetailPanel
         key={`${renderedRightPanelSurface.repository}#${renderedRightPanelSurface.number}`}
         environmentId={activeThread.environmentId}
+        threadRef={activeThreadRef}
         reference={{
           projectId: renderedRightPanelSurface.projectId as ProjectId,
           repository: renderedRightPanelSurface.repository,
@@ -7411,7 +7536,9 @@ function ChatViewContent(props: ChatViewProps) {
             : "page"
         }
         composerDraftTarget={composerDraftTarget}
-        onStateChange={handlePullRequestTabStatusChange}
+        {...(linkedThreadPullRequest === null
+          ? { onStateChange: handlePullRequestTabStatusChange }
+          : {})}
       />
     ) : renderedRightPanelSurface?.kind === "agents" ? (
       <AgentsPanel
@@ -7501,6 +7628,7 @@ function ChatViewContent(props: ChatViewProps) {
             activeProjectName={activeProject?.title}
             activeProjectCwd={activeProject?.workspaceRoot ?? null}
             activeProjectFaviconPath={activeProject?.faviconPath ?? null}
+            activeProjectIcon={activeProject?.projectIcon ?? null}
             openInCwd={gitCwd}
             activeProjectScripts={activeProject?.scripts}
             preferredScriptId={
@@ -7586,7 +7714,6 @@ function ChatViewContent(props: ChatViewProps) {
                 onImageExpand={onExpandTimelineImage}
                 onFileOpen={openFileAttachment}
                 onFileDownload={downloadFileAttachment}
-                openingVideoAttachmentId={openingVideoAttachmentId}
                 markdownCwd={gitCwd ?? undefined}
                 resolvedTheme={resolvedTheme}
                 timestampFormat={timestampFormat}
@@ -7615,7 +7742,11 @@ function ChatViewContent(props: ChatViewProps) {
                 >
                   <Button
                     aria-label="Scroll to end"
-                    onClick={() => scrollToEnd(true)}
+                    onPointerDown={(event) => event.preventDefault()}
+                    onClick={() => {
+                      composerRef.current?.restoreAfterTimelineReachedEnd();
+                      scrollToEnd(true);
+                    }}
                     className="pointer-events-auto gap-1.5 rounded-full px-3 text-muted-foreground hover:text-foreground"
                     size="xs"
                     variant="glass"
@@ -7734,11 +7865,22 @@ function ChatViewContent(props: ChatViewProps) {
                             keybindings={keybindings}
                             terminalOpen={Boolean(terminalUiState.terminalOpen)}
                             gitCwd={gitCwd}
+                            restingControlsHost={restingComposerControlsHost}
+                            restingControlsHaveLeadingContext={
+                              isGitRepo || showComposerEnvironmentIndicator
+                            }
+                            onRestingControlsVisibilityChange={setRestingComposerControlsVisible}
+                            getTimelineScrollableNode={getTimelineScrollableNode}
+                            isTimelineAtLogicalEnd={isTimelineAtLogicalEnd}
+                            onComposerOverlayHeightChange={publishComposerOverlayHeight}
                             promptRef={promptRef}
                             composerImagesRef={composerImagesRef}
                             composerFilesRef={composerFilesRef}
                             composerTerminalContextsRef={composerTerminalContextsRef}
                             composerElementContextsRef={composerElementContextsRef}
+                            onPageScrollKeyDown={onComposerPageScrollKeyDown}
+                            onPageScrollKeyUp={onComposerPageScrollKeyUp}
+                            onPageScrollRelease={onComposerPageScrollRelease}
                             onSend={onSend}
                             onInterrupt={onInterrupt}
                             onImplementPlanInNewThread={onImplementPlanInNewThread}
@@ -7763,7 +7905,6 @@ function ChatViewContent(props: ChatViewProps) {
                             setThreadError={setThreadError}
                             onExpandImage={onExpandTimelineImage}
                             onFileOpen={openFileAttachment}
-                            openingVideoAttachmentId={openingVideoAttachmentId}
                           />
                         </div>
                       </ComposerSurface.Host>
@@ -7772,7 +7913,7 @@ function ChatViewContent(props: ChatViewProps) {
                           data-terminal-open={terminalUiState.terminalOpen ? "true" : undefined}
                           className="relative z-0"
                         >
-                          {showComposerContextStrip && (
+                          {mountComposerContextStrip && (
                             <div className="pointer-events-auto">
                               <BranchToolbar
                                 environmentId={activeThread.environmentId}
@@ -7799,6 +7940,8 @@ function ChatViewContent(props: ChatViewProps) {
                                   : {})}
                                 {...(hasMultipleEnvironments ? { onEnvironmentChange } : {})}
                                 availableEnvironments={logicalProjectEnvironments}
+                                composerControlsHostRef={setRestingComposerControlsHost}
+                                contextStripVisible={showComposerContextStrip}
                               />
                             </div>
                           )}
@@ -7984,7 +8127,7 @@ function ChatViewContent(props: ChatViewProps) {
 
       {expandedImage && (
         <ExpandedImageDialog
-          key={`${expandedImage.images[expandedImage.index]?.src ?? "image"}:${expandedImage.index}`}
+          key={expandedImageKey(expandedImage)}
           preview={expandedImage}
           onClose={closeExpandedImage}
         />
diff --git a/apps/web/src/components/CommandPalette.tsx b/apps/web/src/components/CommandPalette.tsx
index 391137787def..a96a051e21d6 100644
--- a/apps/web/src/components/CommandPalette.tsx
+++ b/apps/web/src/components/CommandPalette.tsx
@@ -36,6 +36,7 @@ import {
   type SourceControlProviderKind,
   type SourceControlRepositoryInfo,
   PRIMARY_LOCAL_ENVIRONMENT_ID,
+  resolveEnvironmentMachineKind,
 } from "@t3tools/contracts";
 import { useLocation, useNavigate, useParams } from "@tanstack/react-router";
 import * as Option from "effect/Option";
@@ -48,7 +49,6 @@ import {
   LinkIcon,
   MessageSquareIcon,
   PaletteIcon,
-  ServerIcon,
   SettingsIcon,
   SquarePenIcon,
   TextSearchIcon,
@@ -145,6 +145,7 @@ import { resolveEnvironmentOptionLabel } from "./BranchToolbar.logic";
 import { CommandPaletteContent } from "./CommandPaletteContent";
 import { CommandPaletteResults } from "./CommandPaletteResults";
 import { AzureDevOpsIcon, BitbucketIcon, GitHubIcon, GitLabIcon } from "./Icons";
+import { EnvironmentMachineIcon } from "./EnvironmentMachineIcon";
 import { ProjectFavicon } from "./ProjectFavicon";
 import { ProjectFilePicker } from "./files/ProjectFilePicker";
 import { ProjectContentSearchDialog } from "./search/ProjectContentSearchDialog";
@@ -181,8 +182,10 @@ function projectFavicon(project: Project) {
     <ProjectFavicon
       environmentId={project.environmentId}
       cwd={project.workspaceRoot}
+      projectName={project.title}
       faviconPath={project.faviconPath}
-      className={ITEM_ICON_CLASS}
+      projectIcon={project.projectIcon}
+      className="size-4"
     />
   );
 }
@@ -738,6 +741,7 @@ function OpenCommandPaletteDialog(props: {
                 : isLocal
                   ? `${environment.label} (Local)`
                   : environment.label,
+              machine: resolveEnvironmentMachineKind(environment.serverConfig),
             },
           ] as const;
         }),
@@ -941,6 +945,16 @@ function OpenCommandPaletteDialog(props: {
     () => new Map(projects.map((project) => [project.id, project.faviconPath ?? null] as const)),
     [projects],
   );
+  const projectIconByKey = useMemo(
+    () =>
+      new Map(
+        projects.map(
+          (project) =>
+            [`${project.environmentId}:${project.id}`, project.projectIcon ?? null] as const,
+        ),
+      ),
+    [projects],
+  );
   const projectTitleById = useMemo(
     () => new Map<ProjectId, string>(projects.map((project) => [project.id, project.title])),
     [projects],
@@ -1109,12 +1123,17 @@ function OpenCommandPaletteDialog(props: {
             const location = projectEnvironmentLocationById.get(project.environmentId) ?? {
               kind: "remote",
               label: "Remote",
+              machine: "server" as const,
             };
             return (
               <span className="flex min-w-0 items-center gap-1">
                 <span className="inline-flex min-w-0 items-center gap-1">
                   {location.kind === "remote" ? (
-                    <ServerIcon aria-hidden className={COMMAND_PALETTE_META_ICON_CLASS} />
+                    <EnvironmentMachineIcon
+                      aria-hidden
+                      kind={location.machine}
+                      className={COMMAND_PALETTE_META_ICON_CLASS}
+                    />
                   ) : null}
                   <span className="truncate">{location.label}</span>
                 </span>
@@ -1172,6 +1191,9 @@ function OpenCommandPaletteDialog(props: {
               environmentId={thread.environmentId}
               projectCwd={projectCwdById.get(thread.projectId) ?? null}
               projectFaviconPath={projectFaviconPathById.get(thread.projectId) ?? null}
+              projectIcon={
+                projectIconByKey.get(`${thread.environmentId}:${thread.projectId}`) ?? null
+              }
               projectTitle={projectTitle ?? null}
               branch={thread.branch}
               worktreePath={thread.worktreePath}
@@ -1211,6 +1233,7 @@ function OpenCommandPaletteDialog(props: {
       navigate,
       projectCwdById,
       projectFaviconPathById,
+      projectIconByKey,
       projectTitleById,
       providerEntryByEnvironmentAndInstanceId,
       threadContentMatchByKey,
diff --git a/apps/web/src/components/ComposerPromptEditor.tsx b/apps/web/src/components/ComposerPromptEditor.tsx
index efec8a440fe6..1676b4f01e7d 100644
--- a/apps/web/src/components/ComposerPromptEditor.tsx
+++ b/apps/web/src/components/ComposerPromptEditor.tsx
@@ -83,9 +83,11 @@ import {
 } from "./composerInlineChip";
 import { FILE_TAG_CHIP_CLASS_NAME, FileTagChipContent } from "./chat/FileTagChip";
 import { ComposerPendingTerminalContextChip } from "./chat/ComposerPendingTerminalContexts";
+import { getTimelinePageScrollKey } from "./chat/pageScrollController";
 import { formatProviderSkillDisplayName } from "@t3tools/client-runtime/providerSkills";
 import { Tooltip, TooltipPopup, TooltipTrigger } from "./ui/tooltip";
 import { registerComposerInlineTokenPaste } from "./composerInlineTokenPaste";
+import { didComposerSelectionChangeVisibly } from "./composerSelection";
 import {
   $consumeComposerCitationCommentRequest,
   $createComposerCitationNode,
@@ -903,7 +905,9 @@ interface ComposerPromptEditorProps {
   skills: ReadonlyArray<ServerProviderSkill>;
   disabled: boolean;
   placeholder: string;
+  containerClassName?: string;
   className?: string;
+  placeholderClassName?: string;
   onRemoveTerminalContext: (contextId: string) => void;
   onChange: (
     nextValue: string,
@@ -912,10 +916,14 @@ interface ComposerPromptEditorProps {
     cursorAdjacentToMention: boolean,
     terminalContextIds: string[],
   ) => void;
+  onVisibleSelectionChange?: () => void;
   onCommandKeyDown?: (
     key: "ArrowDown" | "ArrowUp" | "Enter" | "Tab",
     event: KeyboardEvent,
   ) => boolean;
+  onPageScrollKeyDown?: (key: "PageUp" | "PageDown") => void;
+  onPageScrollKeyUp?: (key: string) => void;
+  onPageScrollRelease?: () => void;
   onPaste: React.ClipboardEventHandler<HTMLElement>;
   editorRef: React.RefObject<ComposerPromptEditorHandle | null>;
 }
@@ -1553,16 +1561,24 @@ function ComposerPromptEditorInner({
   skills,
   disabled,
   placeholder,
+  containerClassName,
   className,
+  placeholderClassName,
   onRemoveTerminalContext,
   onChange,
+  onVisibleSelectionChange,
   onCommandKeyDown,
+  onPageScrollKeyDown,
+  onPageScrollKeyUp,
+  onPageScrollRelease,
   onPaste,
   editorRef,
 }: ComposerPromptEditorProps) {
   const [editor] = useLexicalComposerContext();
   const onChangeRef = useRef(onChange);
+  const onVisibleSelectionChangeRef = useRef(onVisibleSelectionChange);
   const initialCursor = clampCollapsedComposerCursor(value, cursor);
+  const initialExpandedCursor = expandCollapsedComposerCursor(value, initialCursor);
   const terminalContextsSignature = terminalContextSignature(terminalContexts);
   const terminalContextsSignatureRef = useRef(terminalContextsSignature);
   const skillsSignature = skillSignature(skills);
@@ -1571,9 +1587,10 @@ function ComposerPromptEditorInner({
   const snapshotRef = useRef({
     value,
     cursor: initialCursor,
-    expandedCursor: expandCollapsedComposerCursor(value, initialCursor),
+    expandedCursor: initialExpandedCursor,
     terminalContextIds: terminalContexts.map((context) => context.id),
   });
+  const selectionRangeRef = useRef({ start: initialExpandedCursor, end: initialExpandedCursor });
   const isApplyingControlledUpdateRef = useRef(false);
   const citationCommentRequestRef = useRef<ComposerCitationCommentRequest | null>(null);
   const [openCitationComment, setOpenCitationComment] =
@@ -1598,6 +1615,10 @@ function ComposerPromptEditorInner({
     onChangeRef.current = onChange;
   }, [onChange]);
 
+  useEffect(() => {
+    onVisibleSelectionChangeRef.current = onVisibleSelectionChange;
+  }, [onVisibleSelectionChange]);
+
   useLayoutEffect(() => {
     skillMetadataRef.current = skillMetadataByName(skills);
   }, [skills]);
@@ -1636,12 +1657,17 @@ function ComposerPromptEditorInner({
       return;
     }
 
+    const normalizedExpandedCursor = expandCollapsedComposerCursor(value, normalizedCursor);
     snapshotRef.current = {
       value,
       cursor: normalizedCursor,
-      expandedCursor: expandCollapsedComposerCursor(value, normalizedCursor),
+      expandedCursor: normalizedExpandedCursor,
       terminalContextIds: terminalContexts.map((context) => context.id),
     };
+    selectionRangeRef.current = {
+      start: normalizedExpandedCursor,
+      end: normalizedExpandedCursor,
+    };
     terminalContextsSignatureRef.current = terminalContextsSignature;
     skillsSignatureRef.current = skillsSignature;
 
@@ -1693,6 +1719,10 @@ function ComposerPromptEditorInner({
         expandedCursor: expandCollapsedComposerCursor(snapshotRef.current.value, boundedCursor),
         terminalContextIds: snapshotRef.current.terminalContextIds,
       };
+      selectionRangeRef.current = {
+        start: snapshotRef.current.expandedCursor,
+        end: snapshotRef.current.expandedCursor,
+      };
       onChangeRef.current(
         snapshotRef.current.value,
         boundedCursor,
@@ -1726,6 +1756,7 @@ function ComposerPromptEditorInner({
         nextValue,
         $readExpandedSelectionOffsetFromEditorState(fallbackExpandedCursor),
       );
+      const selectionRange = getSelectionRangeForExpandedComposerOffsets($getSelection());
       const terminalContextIds = collectTerminalContextIds($getRoot());
       snapshot = {
         value: nextValue,
@@ -1733,6 +1764,10 @@ function ComposerPromptEditorInner({
         expandedCursor: nextExpandedCursor,
         terminalContextIds,
       };
+      selectionRangeRef.current = selectionRange ?? {
+        start: nextExpandedCursor,
+        end: nextExpandedCursor,
+      };
     });
     snapshotRef.current = snapshot;
     return snapshot;
@@ -1781,18 +1816,28 @@ function ComposerPromptEditorInner({
         nextValue,
         $readExpandedSelectionOffsetFromEditorState(fallbackExpandedCursor),
       );
+      const nextSelectionRange = getSelectionRangeForExpandedComposerOffsets($getSelection());
+      const previousSelectionRange = selectionRangeRef.current;
+      selectionRangeRef.current = nextSelectionRange ?? {
+        start: nextExpandedCursor,
+        end: nextExpandedCursor,
+      };
       const terminalContextIds = collectTerminalContextIds($getRoot());
       const previousSnapshot = snapshotRef.current;
-      if (
+      const snapshotChanged = !(
         previousSnapshot.value === nextValue &&
         previousSnapshot.cursor === nextCursor &&
         previousSnapshot.expandedCursor === nextExpandedCursor &&
         previousSnapshot.terminalContextIds.length === terminalContextIds.length &&
         previousSnapshot.terminalContextIds.every((id, index) => id === terminalContextIds[index])
-      ) {
+      );
+      if (isApplyingControlledUpdateRef.current) {
         return;
       }
-      if (isApplyingControlledUpdateRef.current) {
+      if (!snapshotChanged) {
+        if (didComposerSelectionChangeVisibly(previousSelectionRange, nextSelectionRange)) {
+          onVisibleSelectionChangeRef.current?.();
+        }
         return;
       }
       snapshotRef.current = {
@@ -1817,7 +1862,12 @@ function ComposerPromptEditorInner({
   return (
     <ComposerTerminalContextActionsContext value={terminalContextActions}>
       <ComposerCitationCommentContext value={citationCommentActions}>
-        <div className="relative [font-family:var(--font-composer,var(--font-sans))] [font-size:var(--font-size-prompt,0.875rem)] [@media(max-width:39.999rem)_and_(pointer:coarse)]:[font-size:max(var(--font-size-prompt,1rem),16px)]">
+        <div
+          className={cn(
+            "relative [font-family:var(--font-composer,var(--font-sans))] [font-size:var(--font-size-prompt,0.875rem)] [@media(max-width:39.999rem)_and_(pointer:coarse)]:[font-size:max(var(--font-size-prompt,1rem),16px)]",
+            containerClassName,
+          )}
+        >
           <PlainTextPlugin
             contentEditable={
               <ContentEditable
@@ -1829,12 +1879,57 @@ function ComposerPromptEditorInner({
                 data-testid="composer-editor"
                 aria-placeholder={placeholder}
                 placeholder={<span />}
+                onKeyDown={(event) => {
+                  if (
+                    event.key === "Control" ||
+                    event.key === "Meta" ||
+                    event.key === "Alt" ||
+                    event.key === "Shift"
+                  ) {
+                    onPageScrollRelease?.();
+                  }
+
+                  if (event.key !== "PageUp" && event.key !== "PageDown") {
+                    return;
+                  }
+
+                  const pageScrollKey = getTimelinePageScrollKey({
+                    altKey: event.altKey,
+                    clientHeight: event.currentTarget.clientHeight,
+                    ctrlKey: event.ctrlKey,
+                    defaultPrevented: event.defaultPrevented,
+                    isComposing: event.nativeEvent.isComposing,
+                    key: event.key,
+                    keyCode: event.keyCode,
+                    metaKey: event.metaKey,
+                    scrollHeight: event.currentTarget.scrollHeight,
+                    scrollTop: event.currentTarget.scrollTop,
+                    shiftKey: event.shiftKey,
+                  });
+                  if (!pageScrollKey) {
+                    onPageScrollRelease?.();
+                    return;
+                  }
+                  if (!onPageScrollKeyDown) {
+                    return;
+                  }
+
+                  event.preventDefault();
+                  onPageScrollKeyDown(pageScrollKey);
+                }}
+                onKeyUp={(event) => onPageScrollKeyUp?.(event.key)}
+                onBlur={onPageScrollRelease}
                 onPaste={onPaste}
               />
             }
             placeholder={
               terminalContexts.length > 0 ? null : (
-                <div className="pointer-events-none absolute inset-0 leading-relaxed text-placeholder">
+                <div
+                  className={cn(
+                    "pointer-events-none absolute inset-0 leading-relaxed text-placeholder",
+                    placeholderClassName,
+                  )}
+                >
                   {placeholder}
                 </div>
               )
@@ -1864,10 +1959,16 @@ export function ComposerPromptEditor({
   skills,
   disabled,
   placeholder,
+  containerClassName,
   className,
+  placeholderClassName,
   onRemoveTerminalContext,
   onChange,
+  onVisibleSelectionChange,
   onCommandKeyDown,
+  onPageScrollKeyDown,
+  onPageScrollKeyUp,
+  onPageScrollRelease,
   onPaste,
   editorRef,
 }: ComposerPromptEditorProps) {
@@ -1907,12 +2008,18 @@ export function ComposerPromptEditor({
         skills={skills}
         disabled={disabled}
         placeholder={placeholder}
+        {...(containerClassName ? { containerClassName } : {})}
         onRemoveTerminalContext={onRemoveTerminalContext}
         onChange={onChange}
+        {...(onVisibleSelectionChange ? { onVisibleSelectionChange } : {})}
         onPaste={onPaste}
         editorRef={editorRef}
         {...(onCommandKeyDown ? { onCommandKeyDown } : {})}
+        {...(onPageScrollKeyDown ? { onPageScrollKeyDown } : {})}
+        {...(onPageScrollKeyUp ? { onPageScrollKeyUp } : {})}
+        {...(onPageScrollRelease ? { onPageScrollRelease } : {})}
         {...(className ? { className } : {})}
+        {...(placeholderClassName ? { placeholderClassName } : {})}
       />
     </LexicalComposer>
   );
diff --git a/apps/web/src/components/DiffPanel.tsx b/apps/web/src/components/DiffPanel.tsx
index acdc54bb2f4c..c773617a7cf2 100644
--- a/apps/web/src/components/DiffPanel.tsx
+++ b/apps/web/src/components/DiffPanel.tsx
@@ -15,12 +15,14 @@ import {
   ChevronsDownUpIcon,
   ChevronsUpDownIcon,
   Columns2Icon,
+  FolderTreeIcon,
   PilcrowIcon,
   RefreshCwIcon,
   Rows3Icon,
   SearchIcon,
   TextWrapIcon,
 } from "lucide-react";
+import * as Schema from "effect/Schema";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useOpenInPreferredEditor } from "../editorPreferences";
 import { type DraftId } from "../composerDraftStore";
@@ -28,6 +30,7 @@ import { openDiffFilePrimaryAction } from "../diffFileActions";
 import { useCheckpointDiff } from "~/lib/checkpointDiffState";
 import { cn } from "~/lib/utils";
 import { selectThreadDiffPanelSelection, useDiffPanelStore } from "../diffPanelStore";
+import { useLocalStorage } from "../hooks/useLocalStorage";
 import { useTheme } from "../hooks/useTheme";
 import {
   buildFileDiffContentVersion,
@@ -44,12 +47,14 @@ import { useTurnDiffSummaries } from "../hooks/useTurnDiffSummaries";
 import { useWorkspaceMutationRefresh } from "../hooks/useWorkspaceMutationRefresh";
 import { useProject, useThread } from "../state/entities";
 import { resolveThreadRouteRef } from "../threadRoutes";
-import { useClientSettings } from "../hooks/useSettings";
+import { useClientSettings, useUpdateClientSettings } from "../hooks/useSettings";
 import { formatShortTimestamp } from "../timestampFormat";
 import { DiffFilePathCopyButton } from "./DiffFilePathCopyButton";
 import { DiffPanelLoadingState, DiffPanelShell, type DiffPanelMode } from "./DiffPanelShell";
 import { DiffStatLabel } from "./chat/DiffStatLabel";
 import { AnnotatableCodeView, type AnnotatableCodeViewHandle } from "./diffs/AnnotatableCodeView";
+import { DiffFileTree } from "./diffs/DiffFileTree";
+import { diffFileTreeEntries } from "./diffs/diffFileTree.logic";
 import { Button } from "./ui/button";
 import { ToggleGroup, Toggle } from "./ui/toggle-group";
 import { Switch } from "./ui/switch";
@@ -82,6 +87,7 @@ import { createGitDiffFileContentsLoader } from "../lib/diffFileContents";
 
 type DiffThemeType = "light" | "dark";
 const AUTOMATIC_BASE_REF = "__automatic_base_ref__";
+const DIFF_FILE_TREE_STORAGE_KEY = "t3code.diffFileTreeOpen";
 
 interface CollapsedDiffFilesState {
   readonly scopeKey: string | null;
@@ -108,10 +114,15 @@ export default function DiffPanel({
   const { resolvedTheme } = useTheme();
   const settings = useClientSettings();
   const [initialGitScope] = useState(initialGitScopeProp);
-  const diffRenderMode = useDiffPanelStore((state) => state.diffRenderMode);
-  const setDiffRenderMode = useDiffPanelStore((state) => state.setDiffRenderMode);
+  const diffLayout = settings.diffLayout;
+  const updateClientSettings = useUpdateClientSettings();
   const [wordWrap, setWordWrap] = useState(settings.wordWrap);
   const [diffIgnoreWhitespace, setDiffIgnoreWhitespace] = useState(settings.diffIgnoreWhitespace);
+  const [fileTreeOpen, setFileTreeOpen] = useLocalStorage(
+    DIFF_FILE_TREE_STORAGE_KEY,
+    false,
+    Schema.Boolean,
+  );
   const [baseRefQuery, setBaseRefQuery] = useState("");
   const [collapsedDiffFiles, setCollapsedDiffFiles] = useState<CollapsedDiffFilesState>(() => ({
     scopeKey: null,
@@ -431,6 +442,7 @@ export default function DiffPanel({
   const diffFileKeys = useMemo(() => codeViewFiles.map((file) => file.fileKey), [codeViewFiles]);
   const allDiffFilesCollapsed = areAllDiffFilesCollapsed(diffFileKeys, collapsedDiffFileKeys);
   const diffLineStat = useMemo(() => getDiffLineStat(renderableFiles), [renderableFiles]);
+  const fileTreeEntries = useMemo(() => diffFileTreeEntries(renderableFiles), [renderableFiles]);
   const selectedDiffFileKey = selectedFilePath
     ? (codeViewFiles.find((candidate) => candidate.filePath === selectedFilePath)?.fileKey ?? null)
     : null;
@@ -440,6 +452,29 @@ export default function DiffPanel({
     codeViewRef.current?.scrollTo({ type: "item", id: selectedDiffFileKey, align: "start" });
   }, [codeViewMountKey, selectedDiffFileKey, selectedFileRevealRequestId]);
 
+  // Held as state so the scroll runs after a collapsed file has been drawn open again; scrolling
+  // in the same tick would land on the folded header's position.
+  const [treeReveal, setTreeReveal] = useState<{ fileKey: string; id: number } | null>(null);
+  useEffect(() => {
+    if (treeReveal === null) return;
+    codeViewRef.current?.scrollTo({ type: "item", id: treeReveal.fileKey, align: "start" });
+  }, [treeReveal]);
+  const revealDiffFile = useCallback(
+    (filePath: string) => {
+      const file = codeViewFiles.find((candidate) => candidate.filePath === filePath);
+      if (!file) return;
+      if (file.collapsed) {
+        setCollapsedDiffFiles((current) => {
+          const next = new Set(current.scopeKey === collapseScopeKey ? current.fileKeys : []);
+          next.delete(file.fileKey);
+          return { scopeKey: collapseScopeKey, fileKeys: next };
+        });
+      }
+      setTreeReveal((current) => ({ fileKey: file.fileKey, id: (current?.id ?? 0) + 1 }));
+    },
+    [codeViewFiles, collapseScopeKey],
+  );
+
   const openDiffFile = useCallback(
     (filePath: string) => {
       openDiffFilePrimaryAction({
@@ -768,11 +803,11 @@ export default function DiffPanel({
         <ToggleGroup
           className="shrink-0 gap-1"
           size="sm"
-          value={[diffRenderMode]}
+          value={[diffLayout]}
           onValueChange={(value) => {
             const next = value[0];
             if (next === "stacked" || next === "split") {
-              setDiffRenderMode(next);
+              updateClientSettings({ diffLayout: next });
             }
           }}
         >
@@ -825,6 +860,26 @@ export default function DiffPanel({
             {diffIgnoreWhitespace ? "Show whitespace changes" : "Hide whitespace changes"}
           </TooltipPopup>
         </Tooltip>
+        {codeViewFiles.length > 0 && (
+          <Tooltip>
+            <TooltipTrigger
+              render={
+                <Toggle
+                  aria-label={fileTreeOpen ? "Hide file tree" : "Show file tree"}
+                  variant="ghost"
+                  size="sm"
+                  pressed={fileTreeOpen}
+                  onPressedChange={(pressed) => setFileTreeOpen(Boolean(pressed))}
+                />
+              }
+            >
+              <FolderTreeIcon className="size-3.5" />
+            </TooltipTrigger>
+            <TooltipPopup side="top">
+              {fileTreeOpen ? "Hide file tree" : "Show file tree"}
+            </TooltipPopup>
+          </Tooltip>
+        )}
       </div>
     </>
   );
@@ -878,97 +933,114 @@ export default function DiffPanel({
                 </div>
               )
             ) : renderablePatch.kind === "files" ? (
-              <div
-                className="min-h-0 flex-1"
-                onClickCapture={(event) => {
-                  const composedPath = event.nativeEvent.composedPath?.() ?? [];
-                  for (const node of composedPath) {
-                    if (!(node instanceof HTMLElement)) continue;
-                    // Header controls keep their own actions. In particular, the chevron must
-                    // not also trigger the row handler or the two toggles cancel each other.
-                    if (node instanceof HTMLButtonElement || node instanceof HTMLAnchorElement) {
+              <div className="flex min-h-0 flex-1 overflow-hidden">
+                <div
+                  className="min-h-0 min-w-0 flex-1"
+                  onClickCapture={(event) => {
+                    const composedPath = event.nativeEvent.composedPath?.() ?? [];
+                    for (const node of composedPath) {
+                      if (!(node instanceof HTMLElement)) continue;
+                      // Header controls keep their own actions. In particular, the chevron must
+                      // not also trigger the row handler or the two toggles cancel each other.
+                      if (node instanceof HTMLButtonElement || node instanceof HTMLAnchorElement) {
+                        return;
+                      }
+                    }
+                    const title = composedPath.find(
+                      (node): node is HTMLElement =>
+                        node instanceof HTMLElement && node.hasAttribute("data-title"),
+                    );
+                    const filePath = title?.textContent?.trim();
+                    // The filename remains the explicit "open in editor" affordance.
+                    if (filePath) {
+                      openDiffFile(filePath);
                       return;
                     }
-                  }
-                  const title = composedPath.find(
-                    (node): node is HTMLElement =>
-                      node instanceof HTMLElement && node.hasAttribute("data-title"),
-                  );
-                  const filePath = title?.textContent?.trim();
-                  // The filename remains the explicit "open in editor" affordance.
-                  if (filePath) {
-                    openDiffFile(filePath);
-                    return;
-                  }
-                  const header = composedPath.find(
-                    (node): node is HTMLElement =>
-                      node instanceof HTMLElement && node.hasAttribute("data-diffs-header"),
-                  );
-                  const headerFilePath = header?.querySelector("[data-title]")?.textContent?.trim();
-                  if (!headerFilePath) return;
-                  const file = codeViewFiles.find(
-                    (candidate) => candidate.filePath === headerFilePath,
-                  );
-                  if (file) toggleDiffFileCollapsed(file.fileKey);
-                }}
-              >
-                <AnnotatableCodeView
-                  key={collapseScopeKey ?? reviewSectionId}
-                  viewerRef={codeViewRef}
-                  codeViewKey={codeViewMountKey}
-                  className="h-full min-h-0 overflow-auto"
-                  files={codeViewFiles}
-                  sectionId={reviewSectionId}
-                  sectionTitle={reviewSectionTitle}
-                  composerDraftTarget={composerDraftTarget}
-                  renderHeaderFilenameSuffix={(fileDiff) => (
-                    <DiffFilePathCopyButton filePath={resolveFileDiffPath(fileDiff)} />
-                  )}
-                  renderHeaderPrefix={(fileDiff, fileKey, collapsed) => {
-                    const filePath = resolveFileDiffPath(fileDiff);
-                    return (
-                      <Tooltip>
-                        <TooltipTrigger
-                          render={
-                            <Button
-                              size="icon-micro"
-                              variant="ghost"
-                              className={cn(
-                                "-ms-0.5 [--control-icon-color:currentColor] bg-transparent hover:bg-foreground/10",
-                                getDiffCollapseIconClassName(fileDiff),
-                              )}
-                              aria-label={collapsed ? `Expand ${filePath}` : `Collapse ${filePath}`}
-                              aria-expanded={!collapsed}
-                              onClick={(event) => {
-                                event.stopPropagation();
-                                toggleDiffFileCollapsed(fileKey);
-                              }}
-                            />
-                          }
-                        >
-                          {collapsed ? (
-                            <ChevronRightIcon className="size-4" />
-                          ) : (
-                            <ChevronDownIcon className="size-4" />
-                          )}
-                        </TooltipTrigger>
-                        <TooltipPopup side="top">
-                          {collapsed ? "Expand diff" : "Collapse diff"}
-                        </TooltipPopup>
-                      </Tooltip>
+                    const header = composedPath.find(
+                      (node): node is HTMLElement =>
+                        node instanceof HTMLElement && node.hasAttribute("data-diffs-header"),
                     );
+                    const headerFilePath = header
+                      ?.querySelector("[data-title]")
+                      ?.textContent?.trim();
+                    if (!headerFilePath) return;
+                    const file = codeViewFiles.find(
+                      (candidate) => candidate.filePath === headerFilePath,
+                    );
+                    if (file) toggleDiffFileCollapsed(file.fileKey);
                   }}
-                  options={{
-                    diffStyle: diffRenderMode === "split" ? "split" : "unified",
-                    lineDiffType: "none",
-                    overflow: wordWrap ? "wrap" : "scroll",
-                    theme: resolveDiffThemeName(resolvedTheme),
-                    preferredHighlighter: PREFERRED_HIGHLIGHTER,
-                    themeType: resolvedTheme as DiffThemeType,
-                    stickyHeaders: true,
-                    ...(currentLoadDiffFiles ? { loadDiffFiles } : {}),
-                  }}
-                />
+                >
+                  <AnnotatableCodeView
+                    key={collapseScopeKey ?? reviewSectionId}
+                    viewerRef={codeViewRef}
+                    codeViewKey={codeViewMountKey}
+                    className="h-full min-h-0 overflow-auto"
+                    files={codeViewFiles}
+                    sectionId={reviewSectionId}
+                    sectionTitle={reviewSectionTitle}
+                    composerDraftTarget={composerDraftTarget}
+                    renderHeaderFilenameSuffix={(fileDiff) => (
+                      <DiffFilePathCopyButton filePath={resolveFileDiffPath(fileDiff)} />
+                    )}
+                    renderHeaderPrefix={(fileDiff, fileKey, collapsed) => {
+                      const filePath = resolveFileDiffPath(fileDiff);
+                      return (
+                        <Tooltip>
+                          <TooltipTrigger
+                            render={
+                              <Button
+                                size="icon-micro"
+                                variant="ghost"
+                                className={cn(
+                                  "-ms-0.5 [--control-icon-color:currentColor] bg-transparent hover:bg-foreground/10",
+                                  getDiffCollapseIconClassName(fileDiff),
+                                )}
+                                aria-label={
+                                  collapsed ? `Expand ${filePath}` : `Collapse ${filePath}`
+                                }
+                                aria-expanded={!collapsed}
+                                onClick={(event) => {
+                                  event.stopPropagation();
+                                  toggleDiffFileCollapsed(fileKey);
+                                }}
+                              />
+                            }
+                          >
+                            {collapsed ? (
+                              <ChevronRightIcon className="size-4" />
+                            ) : (
+                              <ChevronDownIcon className="size-4" />
+                            )}
+                          </TooltipTrigger>
+                          <TooltipPopup side="top">
+                            {collapsed ? "Expand diff" : "Collapse diff"}
+                          </TooltipPopup>
+                        </Tooltip>
+                      );
+                    }}
+                    options={{
+                      diffStyle: diffLayout === "split" ? "split" : "unified",
+                      lineDiffType: "none",
+                      overflow: wordWrap ? "wrap" : "scroll",
+                      theme: resolveDiffThemeName(resolvedTheme),
+                      preferredHighlighter: PREFERRED_HIGHLIGHTER,
+                      themeType: resolvedTheme as DiffThemeType,
+                      stickyHeaders: true,
+                      ...(currentLoadDiffFiles ? { loadDiffFiles } : {}),
+                    }}
+                  />
+                </div>
+                {fileTreeOpen ? (
+                  <aside className="flex w-[min(16rem,40%)] min-w-40 shrink-0 border-l border-border/60">
+                    <DiffFileTree
+                      ariaLabel={`${reviewSectionTitle} files`}
+                      entries={fileTreeEntries}
+                      selectedPath={selectedFilePath}
+                      revealRequestId={selectedFileRevealRequestId}
+                      onSelectFile={revealDiffFile}
+                    />
+                  </aside>
+                ) : null}
               </div>
             ) : (
               <div className="min-h-0 flex-1 overflow-auto p-2">
diff --git a/apps/web/src/components/EnvironmentMachineIcon.tsx b/apps/web/src/components/EnvironmentMachineIcon.tsx
new file mode 100644
index 000000000000..31b7a953a3a4
--- /dev/null
+++ b/apps/web/src/components/EnvironmentMachineIcon.tsx
@@ -0,0 +1,75 @@
+import type { EnvironmentMachineKind } from "@t3tools/contracts";
+import { CloudIcon, LaptopIcon, MonitorIcon, ServerIcon, type LucideProps } from "lucide-react";
+import type { FunctionComponent, SVGProps } from "react";
+
+// Lucide has no Apple desktops, so these two are drawn to its grammar (24
+// unit grid, 2 unit stroke, round joins) and share its prop surface so callers
+// can swap freely.
+function LucideLike(props: SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width="24"
+      height="24"
+      viewBox="0 0 24 24"
+      fill="none"
+      stroke="currentColor"
+      strokeWidth="2"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+      {...props}
+    />
+  );
+}
+
+/** A Mac mini: squat rounded slab with a front-edge LED. */
+export function MacMiniIcon(props: SVGProps<SVGSVGElement>) {
+  return (
+    <LucideLike {...props}>
+      <rect width="20" height="8" x="2" y="8" rx="2" />
+      <path d="M6 12h.01" />
+    </LucideLike>
+  );
+}
+
+/** A Mac Studio: the same slab twice as tall, ports along the front foot. */
+export function MacStudioIcon(props: SVGProps<SVGSVGElement>) {
+  return (
+    <LucideLike {...props}>
+      <rect width="18" height="14" x="3" y="5" rx="2" />
+      <path d="M7 15h.01M11 15h.01M15 15h.01" />
+    </LucideLike>
+  );
+}
+
+const ICON_BY_KIND: Record<EnvironmentMachineKind, FunctionComponent<LucideProps>> = {
+  server: ServerIcon,
+  cloud: CloudIcon,
+  desktop: MonitorIcon,
+  laptop: LaptopIcon,
+  "mac-mini": MacMiniIcon,
+  "mac-studio": MacStudioIcon,
+};
+
+export const ENVIRONMENT_MACHINE_KIND_LABELS: Record<EnvironmentMachineKind, string> = {
+  server: "Server",
+  cloud: "Cloud VM",
+  desktop: "Desktop",
+  laptop: "Laptop",
+  "mac-mini": "Mac mini",
+  "mac-studio": "Mac Studio",
+};
+
+export function environmentMachineIcon(
+  kind: EnvironmentMachineKind,
+): FunctionComponent<LucideProps> {
+  return ICON_BY_KIND[kind];
+}
+
+export function EnvironmentMachineIcon({
+  kind,
+  ...props
+}: LucideProps & { readonly kind: EnvironmentMachineKind }) {
+  const Icon = ICON_BY_KIND[kind];
+  return <Icon {...props} />;
+}
diff --git a/apps/web/src/components/GitActionsControl.tsx b/apps/web/src/components/GitActionsControl.tsx
index 1c75476b96d6..341444324e73 100644
--- a/apps/web/src/components/GitActionsControl.tsx
+++ b/apps/web/src/components/GitActionsControl.tsx
@@ -32,7 +32,6 @@ import {
   ChevronDownIcon,
   CloudDownloadIcon,
   CloudUploadIcon,
-  ExternalLinkIcon,
   GitBranchPlusIcon,
   GitCommitIcon,
   InfoIcon,
@@ -97,9 +96,9 @@ import { vcsEnvironment } from "~/state/vcs";
 import { randomUUID } from "~/lib/utils";
 import { resolvePathLinkTarget } from "~/terminal-links";
 import { type DraftId, useComposerDraftStore } from "~/composerDraftStore";
-import { readLocalApi } from "~/localApi";
 import { getSourceControlPresentation } from "~/sourceControlPresentation";
-import { openPullRequestLink, useOpenPrLink } from "~/lib/openPullRequestLink";
+import { useOpenLink } from "~/browser/useOpenLink";
+import { useOpenPrLink } from "~/lib/openPullRequestLink";
 
 interface GitActionsControlProps {
   gitCwd: string | null;
@@ -384,10 +383,13 @@ interface PublishRepositoryDialogProps {
   readonly open: boolean;
   readonly onOpenChange: (open: boolean) => void;
   readonly environmentId: ScopedThreadRef["environmentId"] | null;
+  /** Thread the dialog was opened from, so the new repository can open beside it. */
+  readonly threadRef: ScopedThreadRef | null;
   readonly gitCwd: string;
 }
 
 function PublishRepositoryDialog(props: PublishRepositoryDialogProps) {
+  const openLink = useOpenLink(props.threadRef);
   const navigate = useNavigate();
   const sourceControlDiscovery = useEnvironmentQuery(
     props.environmentId === null
@@ -911,12 +913,9 @@ function PublishRepositoryDialog(props: PublishRepositoryDialogProps) {
                       size="sm"
                       className="w-full"
                       onClick={() => {
-                        const api = readLocalApi();
-                        if (!api) return;
-                        void api.shell.openExternal(publishResult.repository.url);
+                        void openLink(publishResult.repository.url).catch(() => undefined);
                       }}
                     >
-                      <ExternalLinkIcon className="size-3.5" aria-hidden />
                       Open on {publishProviderLabel}
                     </Button>
                   </>
@@ -1004,6 +1003,7 @@ export default function GitActionsControl({
     [activeThreadRef],
   );
   const openPrLink = useOpenPrLink(activeThreadRef ?? undefined);
+  const openLink = useOpenLink(activeThreadRef);
   const activeDraftThread = useComposerDraftStore((store) =>
     draftId
       ? store.getDraftSession(draftId)
@@ -1238,15 +1238,6 @@ export default function GitActionsControl({
       onOpenPullRequest(openPr.number);
       return;
     }
-    const api = readLocalApi();
-    if (!api) {
-      toastManager.add({
-        type: "error",
-        title: "Link opening is unavailable.",
-        data: threadToastData,
-      });
-      return;
-    }
     const prUrl = openPr?.url ?? null;
     if (!prUrl) {
       toastManager.add({
@@ -1256,7 +1247,7 @@ export default function GitActionsControl({
       });
       return;
     }
-    void openPullRequestLink(api.shell, prUrl).catch((err: unknown) => {
+    void openLink(prUrl).catch((err: unknown) => {
       console.error(err);
       toastManager.add(
         stackedThreadToast({
@@ -1267,7 +1258,7 @@ export default function GitActionsControl({
         }),
       );
     });
-  }, [gitStatusForActions, onOpenPullRequest, threadToastData]);
+  }, [gitStatusForActions, onOpenPullRequest, openLink, threadToastData]);
 
   runGitActionWithToast = useEffectEvent(
     async ({
@@ -2010,6 +2001,7 @@ export default function GitActionsControl({
         open={isPublishDialogOpen}
         onOpenChange={setIsPublishDialogOpen}
         environmentId={activeEnvironmentId}
+        threadRef={activeThreadRef}
         gitCwd={gitCwd}
       />
 
diff --git a/apps/web/src/components/LegacySidebar.tsx b/apps/web/src/components/LegacySidebar.tsx
index a74ea1add3fa..3c1c22d59e31 100644
--- a/apps/web/src/components/LegacySidebar.tsx
+++ b/apps/web/src/components/LegacySidebar.tsx
@@ -22,6 +22,7 @@ import {
   ThreadWorktreeIndicator,
   useLinkedThreadPullRequest,
 } from "./ThreadStatusIndicators";
+import { EnvironmentMachineIcon } from "./EnvironmentMachineIcon";
 import { ProjectFavicon } from "./ProjectFavicon";
 import { useAtomValue } from "@effect/atom-react";
 import { autoAnimate } from "@formkit/auto-animate";
@@ -48,6 +49,7 @@ import {
   type ScopedThreadRef,
   type ResolvedKeybindingsConfig,
   type SidebarProjectGroupingMode,
+  resolveEnvironmentMachineKind,
   ThreadId,
 } from "@t3tools/contracts";
 import {
@@ -395,9 +397,11 @@ export const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThr
   });
   const environment = useEnvironment(thread.environmentId);
   const primaryEnvironmentId = usePrimaryEnvironmentId();
-  const isRemoteThread =
-    primaryEnvironmentId !== null && thread.environmentId !== primaryEnvironmentId;
+  // No primary (the hosted app) means every thread is remote, and the machine
+  // glyph is what tells the environments apart.
+  const isRemoteThread = thread.environmentId !== primaryEnvironmentId;
   const remoteEnvLabel = environment?.label ?? null;
+  const remoteMachine = resolveEnvironmentMachineKind(environment?.serverConfig ?? null);
   // A desktop-local secondary backend (e.g. the WSL backend) shows up as a
   // bearer environment whose connection id is prefixed "local:". It runs on the
   // user's own machine, so the cloud icon is misleading — label it "Local" and
@@ -876,7 +880,10 @@ export const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThr
                         />
                       }
                     >
-                      <CloudIcon className="size-3 text-muted-foreground/40" />
+                      <EnvironmentMachineIcon
+                        kind={remoteMachine}
+                        className="size-3 text-muted-foreground/40"
+                      />
                     </TooltipTrigger>
                     <TooltipPopup side="top">{threadEnvironmentLabel}</TooltipPopup>
                   </Tooltip>
@@ -2339,11 +2346,15 @@ const SidebarProjectItem = memo(function SidebarProjectItem(props: SidebarProjec
               }`}
             />
           )}
-          <ProjectFavicon
-            environmentId={project.environmentId}
-            cwd={project.workspaceRoot}
-            faviconPath={project.faviconPath}
-          />
+          <span className="flex shrink-0">
+            <ProjectFavicon
+              environmentId={project.environmentId}
+              cwd={project.workspaceRoot}
+              projectName={project.displayName}
+              faviconPath={project.faviconPath}
+              projectIcon={project.projectIcon}
+            />
+          </span>
           <span className="flex min-w-0 flex-1 items-center gap-2">
             <span className="truncate text-sm font-medium text-sidebar-foreground/90">
               {project.displayName}
diff --git a/apps/web/src/components/ProjectFavicon.test.tsx b/apps/web/src/components/ProjectFavicon.test.tsx
index bbeeda4bc7fb..557f4d722adc 100644
--- a/apps/web/src/components/ProjectFavicon.test.tsx
+++ b/apps/web/src/components/ProjectFavicon.test.tsx
@@ -1,6 +1,7 @@
 import type { ComponentType, Dispatch, ReactElement, SetStateAction } from "react";
 import { beforeEach, describe, expect, it, vi } from "vite-plus/test";
 import type { EnvironmentId } from "@t3tools/contracts";
+import { PROJECT_FAVICON_FALLBACK_MARKER } from "@t3tools/shared/projectFavicon";
 
 const testState = vi.hoisted(() => ({
   faviconUrl: "https://environment.test/api/assets/token-a/v1-20-favicon.svg",
@@ -52,6 +53,10 @@ vi.mock("react", async (importOriginal) => {
 });
 
 vi.mock("react/compiler-runtime", () => ({ c: hooks.useMemoCache }));
+vi.mock("lucide-react/dynamic", () => ({
+  DynamicIcon: "dynamic-icon",
+  iconNames: ["alarm-clock", "folder-code"],
+}));
 vi.mock("../assets/assetUrls", () => ({
   useAssetUrlState: (_environmentId: unknown, resource: unknown) => {
     testState.lastResource = resource;
@@ -86,6 +91,7 @@ function resolveImageComponent(): {
   const element = ProjectFavicon({
     environmentId: "environment-test" as EnvironmentId,
     cwd: "/workspace-test",
+    projectName: "workspace-test",
   }) as ReactElement<ProjectFaviconImageProps>;
   hooks.reset();
 
@@ -106,6 +112,62 @@ function renderImage(
 describe("ProjectFavicon", () => {
   beforeEach(() => {
     hooks.reset();
+    testState.faviconUrl = "https://environment.test/api/assets/token-a/v1-20-favicon.svg";
+  });
+
+  it("shows a project-name emoji when no favicon exists", () => {
+    testState.faviconUrl = `https://environment.test/api/assets/token/${PROJECT_FAVICON_FALLBACK_MARKER}`;
+
+    const element = ProjectFavicon({
+      environmentId: "environment-test" as EnvironmentId,
+      cwd: "/workspace/analytics-db",
+      projectName: "analytics-db",
+    }) as ReactElement<{ readonly emoji?: string }>;
+
+    expect(element.props.emoji).toBe("🗄️");
+  });
+
+  it("chooses a deterministic semantic emoji", () => {
+    testState.faviconUrl = `https://environment.test/api/assets/token/${PROJECT_FAVICON_FALLBACK_MARKER}`;
+
+    const element = ProjectFavicon({
+      environmentId: "environment-test" as EnvironmentId,
+      cwd: "/workspace/agent-runtime",
+      projectName: "agent-runtime",
+    }) as ReactElement<{ readonly emoji?: string }>;
+
+    expect(element.props.emoji).toBe("🤖");
+  });
+
+  it("renders a saved Lucide icon and color ahead of an uploaded favicon", () => {
+    const element = ProjectFavicon({
+      environmentId: "environment-test" as EnvironmentId,
+      cwd: "/workspace/test",
+      projectName: "test",
+      faviconPath: "brand/icon.svg",
+      projectIcon: { kind: "lucide", name: "alarm-clock", color: "violet" },
+    }) as ReactElement<{
+      readonly children: ReactElement<{
+        readonly children: ReactElement<{ readonly name: string; readonly className: string }>;
+      }>;
+      readonly className: string;
+    }>;
+
+    expect(element.props.children.props.children.props.name).toBe("alarm-clock");
+    expect(element.props.className).toContain("text-violet-600");
+    expect(element.props.children.props.children.props.className).toContain("text-violet-600");
+  });
+
+  it("renders a saved emoji ahead of an uploaded favicon", () => {
+    const element = ProjectFavicon({
+      environmentId: "environment-test" as EnvironmentId,
+      cwd: "/workspace/test",
+      projectName: "test",
+      faviconPath: "brand/icon.svg",
+      projectIcon: { kind: "emoji", emoji: "🦄" },
+    }) as ReactElement<{ readonly emoji: string }>;
+
+    expect(element.props.emoji).toBe("🦄");
   });
 
   it("falls back when the displayed favicon fails without discarding a valid older image early", () => {
@@ -134,6 +196,7 @@ describe("ProjectFavicon", () => {
     ProjectFavicon({
       environmentId: "environment-test" as EnvironmentId,
       cwd: "/workspace-test",
+      projectName: "workspace-test",
       faviconPath: "brand/icon.svg",
     });
 
diff --git a/apps/web/src/components/ProjectFavicon.tsx b/apps/web/src/components/ProjectFavicon.tsx
index 619bbf370018..2ebc6e267443 100644
--- a/apps/web/src/components/ProjectFavicon.tsx
+++ b/apps/web/src/components/ProjectFavicon.tsx
@@ -1,29 +1,153 @@
-import type { EnvironmentId } from "@t3tools/contracts";
+import type { EnvironmentId, ProjectIconColor, ProjectIconOverride } from "@t3tools/contracts";
 import {
   getProjectFaviconCacheKey,
   isProjectFaviconFallbackUrl,
 } from "@t3tools/shared/projectFavicon";
-import { FolderIcon } from "lucide-react";
+import {
+  BotIcon,
+  BookOpenIcon,
+  BracesIcon,
+  CircuitBoardIcon,
+  CloudCogIcon,
+  Code2Icon,
+  DatabaseIcon,
+  FlaskConicalIcon,
+  FolderCodeIcon,
+  Gamepad2Icon,
+  Globe2Icon,
+  ImageIcon,
+  Layers3Icon,
+  MonitorIcon,
+  MusicIcon,
+  PackageIcon,
+  ServerIcon,
+  ShieldCheckIcon,
+  ShoppingBagIcon,
+  SmartphoneIcon,
+  TerminalIcon,
+  VideoIcon,
+} from "lucide-react";
+import type { IconName } from "lucide-react/dynamic";
 import type { ComponentType } from "react";
-import { useState } from "react";
+import { lazy, Suspense, useState } from "react";
 import { useAssetUrlState } from "../assets/assetUrls";
+import { selectProjectIcon, type ProjectIconName } from "../projectIconModel";
+import { projectIconColorClassName } from "../projectIconColors";
 import { cn } from "~/lib/utils";
 
 const loadedProjectFaviconSrcs = new Map<string, string>();
+const DynamicIcon = lazy(() =>
+  import("lucide-react/dynamic").then((module) => ({ default: module.DynamicIcon })),
+);
+
+function DynamicProjectIconFallback() {
+  return <FolderCodeIcon className="size-full text-[inherit]" />;
+}
+
+const PROJECT_ICONS: Record<ProjectIconName, ComponentType<{ className?: string }>> = {
+  ai: BotIcon,
+  book: BookOpenIcon,
+  braces: BracesIcon,
+  circuit: CircuitBoardIcon,
+  cloud: CloudCogIcon,
+  code: Code2Icon,
+  database: DatabaseIcon,
+  desktop: MonitorIcon,
+  "folder-code": FolderCodeIcon,
+  game: Gamepad2Icon,
+  image: ImageIcon,
+  layers: Layers3Icon,
+  mobile: SmartphoneIcon,
+  music: MusicIcon,
+  package: PackageIcon,
+  security: ShieldCheckIcon,
+  server: ServerIcon,
+  shopping: ShoppingBagIcon,
+  terminal: TerminalIcon,
+  test: FlaskConicalIcon,
+  video: VideoIcon,
+  web: Globe2Icon,
+};
+
+const PROJECT_ICON_COLOR_BY_NAME: Record<ProjectIconName, ProjectIconColor> = {
+  ai: "violet",
+  book: "amber",
+  braces: "purple",
+  circuit: "teal",
+  cloud: "sky",
+  code: "blue",
+  database: "cyan",
+  desktop: "indigo",
+  "folder-code": "orange",
+  game: "emerald",
+  image: "pink",
+  layers: "fuchsia",
+  mobile: "lime",
+  music: "fuchsia",
+  package: "orange",
+  security: "teal",
+  server: "blue",
+  shopping: "rose",
+  terminal: "green",
+  test: "yellow",
+  video: "red",
+  web: "sky",
+};
 
 export function ProjectFavicon(input: {
   environmentId: EnvironmentId;
   cwd: string;
+  projectName: string;
   faviconPath?: string | null | undefined;
+  projectIcon?: ProjectIconOverride | null | undefined;
   className?: string | undefined;
   fallbackIcon?: ComponentType<{ className?: string }>;
 }) {
   const state = useProjectFaviconAsset(input);
   const src = state._tag === "Success" ? state.url : null;
-  const FallbackIcon = input.fallbackIcon ?? FolderIcon;
+  if (input.projectIcon?.kind === "emoji") {
+    return <ProjectFaviconFallback className={input.className} emoji={input.projectIcon.emoji} />;
+  }
+  if (input.projectIcon?.kind === "lucide") {
+    const colorClassName = projectIconColorClassName(input.projectIcon.color);
+    const iconClassName = cn(
+      "inline-flex size-3.5 shrink-0 items-center justify-center",
+      colorClassName,
+      input.className,
+    );
+    return (
+      <span aria-hidden="true" className={iconClassName}>
+        <Suspense fallback={<DynamicProjectIconFallback />}>
+          <DynamicIcon
+            name={input.projectIcon.name as IconName}
+            className={cn("size-full", colorClassName)}
+            fallback={DynamicProjectIconFallback}
+          />
+        </Suspense>
+      </span>
+    );
+  }
+  const automaticIconName = input.fallbackIcon
+    ? null
+    : selectProjectIcon(input.projectName, input.cwd);
+  const FallbackIcon =
+    input.fallbackIcon ??
+    (automaticIconName?.kind === "lucide" ? PROJECT_ICONS[automaticIconName.icon] : undefined);
+  const fallbackEmoji = automaticIconName?.kind === "emoji" ? automaticIconName.emoji : undefined;
+  const fallbackColorClassName =
+    automaticIconName?.kind === "lucide"
+      ? projectIconColorClassName(PROJECT_ICON_COLOR_BY_NAME[automaticIconName.icon])
+      : undefined;
 
   if (!src || isProjectFaviconFallbackUrl(src)) {
-    return <ProjectFaviconFallback className={input.className} icon={FallbackIcon} />;
+    return (
+      <ProjectFaviconFallback
+        className={input.className}
+        colorClassName={fallbackColorClassName}
+        icon={FallbackIcon}
+        emoji={fallbackEmoji}
+      />
+    );
   }
 
   const cacheKey = getProjectFaviconCacheKey(input.environmentId, input.cwd, src);
@@ -35,6 +159,8 @@ export function ProjectFavicon(input: {
       src={src}
       className={input.className}
       fallbackIcon={FallbackIcon}
+      fallbackEmoji={fallbackEmoji}
+      fallbackColorClassName={fallbackColorClassName}
     />
   );
 }
@@ -53,12 +179,31 @@ export function useProjectFaviconAsset(input: {
 
 function ProjectFaviconFallback({
   className,
+  colorClassName,
   icon: Icon,
+  emoji,
 }: {
   readonly className?: string | undefined;
-  readonly icon: ComponentType<{ className?: string }>;
+  readonly colorClassName?: string | undefined;
+  readonly icon?: ComponentType<{ className?: string }> | undefined;
+  readonly emoji?: string | undefined;
 }) {
-  return <Icon className={cn("size-3.5 shrink-0 text-icon-muted", className)} />;
+  if (emoji) {
+    return (
+      <span
+        aria-hidden="true"
+        className={cn(
+          "inline-flex size-3.5 shrink-0 items-center justify-center leading-none [container-type:size]",
+          className,
+        )}
+      >
+        <span className="text-[length:80cqh] leading-none">{emoji}</span>
+      </span>
+    );
+  }
+
+  if (!Icon) return null;
+  return <Icon className={cn("size-3.5 shrink-0 text-icon-muted", colorClassName, className)} />;
 }
 
 function ProjectFaviconImage({
@@ -66,11 +211,15 @@ function ProjectFaviconImage({
   src,
   className,
   fallbackIcon: FallbackIcon,
+  fallbackEmoji,
+  fallbackColorClassName,
 }: {
   readonly cacheKey: string;
   readonly src: string;
   readonly className?: string | undefined;
-  readonly fallbackIcon: ComponentType<{ className?: string }>;
+  readonly fallbackIcon?: ComponentType<{ className?: string }> | undefined;
+  readonly fallbackEmoji?: string | undefined;
+  readonly fallbackColorClassName?: string | undefined;
 }) {
   const [displayedSrc, setDisplayedSrc] = useState<string | null>(
     () => loadedProjectFaviconSrcs.get(cacheKey) ?? null,
@@ -86,7 +235,12 @@ function ProjectFaviconImage({
   return (
     <>
       {displayedSrc === null ? (
-        <ProjectFaviconFallback className={className} icon={FallbackIcon} />
+        <ProjectFaviconFallback
+          className={className}
+          colorClassName={fallbackColorClassName}
+          icon={FallbackIcon}
+          emoji={fallbackEmoji}
+        />
       ) : null}
       {displayedSrc ? (
         <img
diff --git a/apps/web/src/components/ProjectScriptsControl.test.tsx b/apps/web/src/components/ProjectScriptsControl.test.tsx
deleted file mode 100644
index d9f3e7e69f08..000000000000
--- a/apps/web/src/components/ProjectScriptsControl.test.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import type { ProjectScript, ResolvedKeybindingsConfig } from "@t3tools/contracts";
-import { renderToStaticMarkup } from "react-dom/server";
-import { describe, expect, it } from "vite-plus/test";
-
-import ProjectScriptsControl from "./ProjectScriptsControl";
-
-const EMPTY_KEYBINDINGS: ResolvedKeybindingsConfig = [];
-const PRIMARY_SCRIPT: ProjectScript = {
-  id: "dev",
-  name: "Dev",
-  command: "vp dev",
-  icon: "play",
-  runOnWorktreeCreate: false,
-};
-
-function renderControl(scripts: ReadonlyArray<ProjectScript>) {
-  return renderToStaticMarkup(
-    <ProjectScriptsControl
-      scripts={scripts}
-      keybindings={EMPTY_KEYBINDINGS}
-      onRunScript={() => {}}
-      onAddScript={async () => undefined as never}
-      onUpdateScript={async () => undefined as never}
-      onDeleteScript={async () => undefined as never}
-    />,
-  );
-}
-
-function buttonTag(html: string, ariaLabel: string) {
-  return html.match(new RegExp(`<button[^>]*aria-label="${ariaLabel}"[^>]*>`))?.[0];
-}
-
-function expectResponsiveXsControl(markup: string | undefined) {
-  expect(markup).toBeDefined();
-  expect(markup).toContain("h-7");
-  expect(markup).toContain("gap-1");
-  expect(markup).toContain("text-sm");
-  expect(markup).toContain("sm:h-6");
-  expect(markup).toContain("sm:text-xs");
-  expect(markup).toContain("w-7");
-  expect(markup).toContain("px-0");
-  expect(markup).toContain("sm:w-6");
-  expect(markup).toContain("@3xl/header-actions:w-auto!");
-  expect(markup).toContain("@3xl/header-actions:px-[calc(--spacing(2)-1px)]");
-}
-
-describe("ProjectScriptsControl compact controls", () => {
-  it("keeps the primary Run control compact and expands it with its label", () => {
-    const html = renderControl([PRIMARY_SCRIPT]);
-
-    expectResponsiveXsControl(buttonTag(html, "Run Dev"));
-    expect(html).toContain(
-      'class="sr-only @3xl/header-actions:not-sr-only @3xl/header-actions:ml-0.5"',
-    );
-  });
-
-  it("keeps the standalone Add control compact and expands it with its label", () => {
-    const html = renderControl([]);
-
-    expectResponsiveXsControl(buttonTag(html, "Add action"));
-    expect(html).toContain(
-      'class="sr-only @3xl/header-actions:not-sr-only @3xl/header-actions:ml-0.5"',
-    );
-  });
-});
diff --git a/apps/web/src/components/Sidebar.tsx b/apps/web/src/components/Sidebar.tsx
index 93de8c1ea310..03e6af60c673 100644
--- a/apps/web/src/components/Sidebar.tsx
+++ b/apps/web/src/components/Sidebar.tsx
@@ -34,7 +34,13 @@ import {
   scopeThreadRef,
   scopedThreadKey,
 } from "@t3tools/client-runtime/environment";
-import type { ScopedThreadRef, ThreadId } from "@t3tools/contracts";
+import {
+  resolveEnvironmentMachineKind,
+  type EnvironmentMachineKind,
+  type ProjectIconOverride,
+  type ScopedThreadRef,
+  type ThreadId,
+} from "@t3tools/contracts";
 import type { TimestampFormat } from "@t3tools/contracts/settings";
 import {
   AlarmClockIcon,
@@ -48,11 +54,9 @@ import {
   FolderIcon,
   FolderPlusIcon,
   GitBranchIcon,
-  MessageSquareIcon,
   PinIcon,
   PlusIcon,
   SearchIcon,
-  ServerIcon,
   SettingsIcon,
   SquarePenIcon,
   TerminalIcon,
@@ -126,6 +130,7 @@ import {
 import { formatRelativeTimeLabel, parseTimestampDate } from "../timestampFormat";
 import type { SidebarThreadSummary } from "../types";
 import { cn } from "~/lib/utils";
+import { EnvironmentMachineIcon } from "./EnvironmentMachineIcon";
 import { buildThreadActionMenuItems } from "./threadActionMenu.logic";
 import {
   animatePinnedLayoutChanges,
@@ -211,9 +216,9 @@ import {
 // stays behind an explicit Show more.
 const SETTLED_TAIL_INITIAL_COUNT = 10;
 const SETTLED_TAIL_PAGE_COUNT = 25;
-// Keep the v2 key so existing preferences survive the v2-to-default rename.
-const SETTLED_SHELF_EXPANDED_KEY = "t3code:sidebar-v2:settled-expanded";
-const SNOOZED_SHELF_EXPANDED_KEY = "t3code:sidebar-v2:snoozed-expanded";
+// Fresh keys deliberately reset both shelves to collapsed for existing users.
+const SETTLED_SHELF_EXPANDED_KEY = "t3code:sidebar:settled-expanded";
+const SNOOZED_SHELF_EXPANDED_KEY = "t3code:sidebar:snoozed-expanded";
 
 function compactSidebarTimeLabel(label: string): string {
   if (label === "just now") return "now";
@@ -278,7 +283,9 @@ function SidebarV2ThreadTooltip({
   projectTitle,
   projectCwd,
   projectFaviconPath,
+  projectIcon,
   environmentLabel,
+  environmentMachine,
   providerEntry,
   showInstanceBadge,
   modelInstanceId,
@@ -291,7 +298,9 @@ function SidebarV2ThreadTooltip({
   projectTitle: string | null;
   projectCwd: string | null;
   projectFaviconPath: string | null;
+  projectIcon: ProjectIconOverride | null;
   environmentLabel: string | null;
+  environmentMachine: EnvironmentMachineKind;
   providerEntry: ProviderInstanceEntry | null;
   showInstanceBadge: boolean;
   modelInstanceId: string;
@@ -322,15 +331,20 @@ function SidebarV2ThreadTooltip({
               <ProjectFavicon
                 environmentId={thread.environmentId}
                 cwd={projectCwd ?? ""}
+                projectName={projectTitle}
                 faviconPath={projectFaviconPath}
-                className="size-3 shrink-0 stroke-muted-foreground"
+                projectIcon={projectIcon}
+                className="size-3 shrink-0"
               />
               <div className="min-w-0 truncate text-foreground/75">{projectTitle}</div>
             </div>
           ) : null}
           {environmentLabel ? (
             <div className="flex min-w-0 items-center gap-2">
-              <ServerIcon className="size-3 shrink-0 stroke-muted-foreground" />
+              <EnvironmentMachineIcon
+                kind={environmentMachine}
+                className="size-3 shrink-0 stroke-muted-foreground"
+              />
               <div className="min-w-0 truncate text-foreground/75">{environmentLabel}</div>
             </div>
           ) : null}
@@ -490,6 +504,7 @@ const SidebarDraftRow = memo(function SidebarDraftRow(props: {
   projectTitle: string | null;
   projectCwd: string | null;
   projectFaviconPath: string | null;
+  projectIcon: ProjectIconOverride | null;
   isActive: boolean;
   onNavigate: (draftId: DraftId) => void;
   onDiscard: (draftId: DraftId) => void;
@@ -555,7 +570,9 @@ const SidebarDraftRow = memo(function SidebarDraftRow(props: {
             <ProjectFavicon
               environmentId={session.environmentId}
               cwd={props.projectCwd ?? ""}
+              projectName={props.projectTitle ?? ""}
               faviconPath={props.projectFaviconPath}
+              projectIcon={props.projectIcon}
               className="size-4 shrink-0"
             />
             <span className="min-w-0 flex-1 truncate text-xs font-medium text-secondary-label">
@@ -600,6 +617,7 @@ const SidebarDraftBlock = memo(function SidebarDraftBlock(props: {
   projectDisplayNameByKey: ReadonlyMap<string, string>;
   projectCwdByKey: ReadonlyMap<string, string>;
   projectFaviconPathByKey: ReadonlyMap<string, string | null | undefined>;
+  projectIconByKey: ReadonlyMap<string, ProjectIconOverride | null | undefined>;
   scopedProjectKeys: ReadonlySet<string> | null;
   routeDraftId: string | null;
   onNavigateToDraft: (draftId: DraftId) => void;
@@ -696,6 +714,7 @@ const SidebarDraftBlock = memo(function SidebarDraftBlock(props: {
             projectTitle={props.projectDisplayNameByKey.get(projectKey) ?? null}
             projectCwd={props.projectCwdByKey.get(projectKey) ?? null}
             projectFaviconPath={props.projectFaviconPathByKey.get(projectKey) ?? null}
+            projectIcon={props.projectIconByKey.get(projectKey) ?? null}
             isActive={draftId === props.routeDraftId}
             onNavigate={props.onNavigateToDraft}
             onDiscard={handleDiscard}
@@ -740,8 +759,10 @@ const SidebarV2Row = memo(function SidebarV2Row(props: {
   jumpLabel: string | null;
   currentEnvironmentId: string | null;
   environmentLabel: string | null;
+  environmentMachine: EnvironmentMachineKind;
   projectCwd: string | null;
   projectFaviconPath: string | null;
+  projectIcon: ProjectIconOverride | null;
   projectTitle: string | null;
   providerEntryByInstanceId: ReadonlyMap<string, ProviderInstanceEntry>;
   timestampFormat: TimestampFormat;
@@ -968,8 +989,11 @@ const SidebarV2Row = memo(function SidebarV2Row(props: {
     ? getTriggerDisplayModelLabel(selectedModel)
     : thread.modelSelection.model;
 
-  const isRemote =
-    props.currentEnvironmentId !== null && thread.environmentId !== props.currentEnvironmentId;
+  // The local environment is "this machine" and needs no marker; every other
+  // one gets its machine glyph. With no local environment (the hosted app)
+  // that is every thread, which is the point: the glyph is what tells rows on
+  // different machines apart.
+  const isRemote = thread.environmentId !== props.currentEnvironmentId;
 
   const detailsTooltip = (
     <SidebarV2ThreadTooltip
@@ -977,7 +1001,9 @@ const SidebarV2Row = memo(function SidebarV2Row(props: {
       projectTitle={props.projectTitle}
       projectCwd={props.projectCwd}
       projectFaviconPath={props.projectFaviconPath}
+      projectIcon={props.projectIcon}
       environmentLabel={props.environmentLabel}
+      environmentMachine={props.environmentMachine}
       providerEntry={providerEntry}
       showInstanceBadge={showInstanceBadge}
       modelInstanceId={modelInstanceId}
@@ -1283,9 +1309,10 @@ const SidebarV2Row = memo(function SidebarV2Row(props: {
               <ProjectFavicon
                 environmentId={thread.environmentId}
                 cwd={props.projectCwd ?? ""}
+                projectName={props.projectTitle ?? thread.title}
                 faviconPath={props.projectFaviconPath}
+                projectIcon={props.projectIcon}
                 className="size-4"
-                fallbackIcon={MessageSquareIcon}
               />
             </span>
             {title}
@@ -1438,7 +1465,9 @@ const SidebarV2Row = memo(function SidebarV2Row(props: {
               <ProjectFavicon
                 environmentId={thread.environmentId}
                 cwd={props.projectCwd ?? ""}
+                projectName={props.projectTitle ?? ""}
                 faviconPath={props.projectFaviconPath}
+                projectIcon={props.projectIcon}
                 className="size-4 shrink-0"
               />
               {props.projectTitle ? (
@@ -1595,7 +1624,11 @@ const SidebarV2Row = memo(function SidebarV2Row(props: {
               >
                 {isRemote ? (
                   <span className="inline-flex shrink-0 items-center text-sidebar-muted-foreground/70">
-                    <ServerIcon aria-hidden className="size-3.5" />
+                    <EnvironmentMachineIcon
+                      aria-hidden
+                      kind={props.environmentMachine}
+                      className="size-3.5"
+                    />
                   </span>
                 ) : null}
                 {driverKind ? (
@@ -1654,8 +1687,10 @@ const SidebarV2SearchResultRow = memo(function SidebarV2SearchResultRow(props: {
   thread: SidebarThreadSummary;
   projectCwd: string | null;
   projectFaviconPath: string | null;
+  projectIcon: ProjectIconOverride | null;
   projectTitle: string | null;
   environmentLabel: string | null;
+  environmentMachine: EnvironmentMachineKind;
   providerEntryByInstanceId: ReadonlyMap<string, ProviderInstanceEntry>;
   isHighlighted: boolean;
   isRouteActive: boolean;
@@ -1736,9 +1771,10 @@ const SidebarV2SearchResultRow = memo(function SidebarV2SearchResultRow(props: {
           <ProjectFavicon
             environmentId={thread.environmentId}
             cwd={props.projectCwd ?? ""}
+            projectName={props.projectTitle ?? thread.title}
             faviconPath={props.projectFaviconPath}
+            projectIcon={props.projectIcon}
             className="size-4 shrink-0"
-            fallbackIcon={MessageSquareIcon}
           />
           <span className="min-w-0 flex-1 truncate">{thread.title}</span>
           <span className="shrink-0 text-xs text-muted-foreground/55 tabular-nums">
@@ -1750,7 +1786,9 @@ const SidebarV2SearchResultRow = memo(function SidebarV2SearchResultRow(props: {
           projectTitle={props.projectTitle}
           projectCwd={props.projectCwd}
           projectFaviconPath={props.projectFaviconPath}
+          projectIcon={props.projectIcon}
           environmentLabel={props.environmentLabel}
+          environmentMachine={props.environmentMachine}
           providerEntry={providerEntry}
           showInstanceBadge={showInstanceBadge}
           modelInstanceId={modelInstanceId}
@@ -1918,6 +1956,19 @@ export default function SidebarV2() {
       ),
     [environments],
   );
+  const environmentMachineById = useMemo(
+    () =>
+      new Map(
+        environments.map(
+          (environment) =>
+            [
+              environment.environmentId,
+              resolveEnvironmentMachineKind(environment.serverConfig),
+            ] as const,
+        ),
+      ),
+    [environments],
+  );
   const orderedProjects = useMemo(
     () =>
       orderItemsByPreferredIds({
@@ -1984,6 +2035,13 @@ export default function SidebarV2() {
       ),
     [projects],
   );
+  const projectIconByKey = useMemo(
+    () =>
+      new Map(
+        projects.map((project) => [`${project.environmentId}:${project.id}`, project.projectIcon]),
+      ),
+    [projects],
+  );
   const projectDisplayNameByKey = useMemo(
     () =>
       new Map(
@@ -2287,7 +2345,7 @@ export default function SidebarV2() {
   );
   const [settledShelfExpanded, setSettledShelfExpanded] = useLocalStorage(
     SETTLED_SHELF_EXPANDED_KEY,
-    true,
+    false,
     Schema.Boolean,
   );
   const toggleSettledShelf = useCallback(
@@ -3620,12 +3678,16 @@ export default function SidebarV2() {
                     }
                   >
                     {scopedProjectGroup ? (
-                      <ProjectFavicon
-                        environmentId={scopedProjectGroup.environmentId}
-                        cwd={scopedProjectGroup.workspaceRoot}
-                        faviconPath={scopedProjectGroup.faviconPath}
-                        className="size-4 shrink-0"
-                      />
+                      <span className="flex shrink-0">
+                        <ProjectFavicon
+                          environmentId={scopedProjectGroup.environmentId}
+                          cwd={scopedProjectGroup.workspaceRoot}
+                          projectName={scopedProjectGroup.displayName}
+                          faviconPath={scopedProjectGroup.faviconPath}
+                          projectIcon={scopedProjectGroup.projectIcon}
+                          className="size-4"
+                        />
+                      </span>
                     ) : (
                       <FolderIcon className="size-4 shrink-0" />
                     )}
@@ -3678,7 +3740,9 @@ export default function SidebarV2() {
                               <ProjectFavicon
                                 environmentId={project.environmentId}
                                 cwd={project.workspaceRoot}
+                                projectName={project.displayName}
                                 faviconPath={project.faviconPath}
+                                projectIcon={project.projectIcon}
                                 className="size-4 shrink-0"
                               />
                             ) : (
@@ -3762,12 +3826,19 @@ export default function SidebarV2() {
                             `${thread.environmentId}:${thread.projectId}`,
                           ) ?? null
                         }
+                        projectIcon={
+                          projectIconByKey.get(`${thread.environmentId}:${thread.projectId}`) ??
+                          null
+                        }
                         projectTitle={
                           projectDisplayNameByKey.get(
                             `${thread.environmentId}:${thread.projectId}`,
                           ) ?? null
                         }
                         environmentLabel={environmentLabelById.get(thread.environmentId) ?? null}
+                        environmentMachine={
+                          environmentMachineById.get(thread.environmentId) ?? "server"
+                        }
                         providerEntryByInstanceId={
                           providerEntriesByEnvironment.get(thread.environmentId) ??
                           EMPTY_PROVIDER_ENTRIES
@@ -3866,6 +3937,9 @@ export default function SidebarV2() {
                         }
                         currentEnvironmentId={primaryEnvironmentId}
                         environmentLabel={environmentLabelById.get(thread.environmentId) ?? null}
+                        environmentMachine={
+                          environmentMachineById.get(thread.environmentId) ?? "server"
+                        }
                         projectCwd={
                           projectCwdByKey.get(`${thread.environmentId}:${thread.projectId}`) ?? null
                         }
@@ -3874,6 +3948,10 @@ export default function SidebarV2() {
                             `${thread.environmentId}:${thread.projectId}`,
                           ) ?? null
                         }
+                        projectIcon={
+                          projectIconByKey.get(`${thread.environmentId}:${thread.projectId}`) ??
+                          null
+                        }
                         projectTitle={
                           projectDisplayNameByKey.get(
                             `${thread.environmentId}:${thread.projectId}`,
@@ -3917,6 +3995,7 @@ export default function SidebarV2() {
                       projectDisplayNameByKey={projectDisplayNameByKey}
                       projectCwdByKey={projectCwdByKey}
                       projectFaviconPathByKey={projectFaviconPathByKey}
+                      projectIconByKey={projectIconByKey}
                       scopedProjectKeys={scopedProjectKeys}
                       routeDraftId={routeDraftIdForRows}
                       onNavigateToDraft={navigateToDraft}
diff --git a/apps/web/src/components/ThreadCommandSubtitle.tsx b/apps/web/src/components/ThreadCommandSubtitle.tsx
index 015b15c5ea04..cd5074518719 100644
--- a/apps/web/src/components/ThreadCommandSubtitle.tsx
+++ b/apps/web/src/components/ThreadCommandSubtitle.tsx
@@ -38,6 +38,7 @@ export function ThreadCommandSubtitle(props: {
   environmentId: EnvironmentId;
   projectCwd: string | null;
   projectFaviconPath?: string | null;
+  projectIcon?: import("@t3tools/contracts").ProjectIconOverride | null;
   projectTitle: string | null;
   branch: string | null;
   worktreePath: string | null;
@@ -72,7 +73,9 @@ export function ThreadCommandSubtitle(props: {
             <ProjectFavicon
               environmentId={props.environmentId}
               cwd={props.projectCwd}
+              projectName={projectLabel}
               faviconPath={props.projectFaviconPath}
+              projectIcon={props.projectIcon}
               className="size-3 shrink-0"
             />
           ) : null}
diff --git a/apps/web/src/components/ThreadStatusIndicators.test.ts b/apps/web/src/components/ThreadStatusIndicators.test.ts
index 078c3e97f5f5..31b94db36d4c 100644
--- a/apps/web/src/components/ThreadStatusIndicators.test.ts
+++ b/apps/web/src/components/ThreadStatusIndicators.test.ts
@@ -1,4 +1,4 @@
-import { ProjectId, type VcsStatusResult } from "@t3tools/contracts";
+import { ProjectId, type PullRequestSummary, type VcsStatusResult } from "@t3tools/contracts";
 import { describe, expect, it } from "@effect/vitest";
 import * as Effect from "effect/Effect";
 import { AtomRegistry } from "effect/unstable/reactivity";
@@ -10,10 +10,10 @@ import {
   resolveDisplayedThreadPrProvider,
   resolveThreadPr,
   settledPrHoverColorClass,
-  threadPullRequestRefreshSource,
   threadChangeRequestSnapshotsAtom,
   type ThreadChangeRequestSnapshot,
 } from "./ThreadStatusIndicators";
+import { newestPullRequestSummary } from "../state/pullRequests";
 
 function status(overrides: Partial<VcsStatusResult> = {}): VcsStatusResult {
   return {
@@ -57,58 +57,44 @@ function snapshotFor(
   return { branch, pr, sourceControlProvider };
 }
 
-describe("threadPullRequestRefreshSource", () => {
-  const panel = { repository: "pingdotgg/t3code", number: 42, state: "merged" as const };
+function pullRequestSummary(
+  state: PullRequestSummary["state"],
+  updatedAt: string,
+): PullRequestSummary {
+  return {
+    provider: "github",
+    projectId: ProjectId.make("project-1"),
+    repository: "pingdotgg/t3code",
+    number: 42,
+    title: "Feature PR",
+    url: "https://github.com/pingdotgg/t3code/pull/42",
+    state,
+    headBranch: "feature/current",
+    baseBranch: "main",
+    updatedAt,
+  };
+}
 
-  it("refreshes the VCS stream when the open panel is newer than an inferred sidebar PR", () => {
-    expect(
-      threadPullRequestRefreshSource({
-        panel,
-        thread: { repository: "pingdotgg/t3code", number: 42, state: "open", linked: false },
-      }),
-    ).toBe("vcs");
-  });
+describe("shared pull request state", () => {
+  it("shows a panel-observed merge instead of an older sidebar summary", () => {
+    const open = pullRequestSummary("open", "2026-09-03T01:00:00.000Z");
+    const merged = pullRequestSummary("merged", "2026-09-03T01:01:00.000Z");
 
-  it("refreshes linked detail when the open panel is newer than a linked sidebar PR", () => {
-    expect(
-      threadPullRequestRefreshSource({
-        panel,
-        thread: { repository: "pingdotgg/t3code", number: 42, state: "open", linked: true },
-      }),
-    ).toBe("linked-detail");
+    expect(newestPullRequestSummary(open, merged)).toBe(merged);
   });
 
-  it("refreshes when the sidebar has not resolved state yet", () => {
-    expect(
-      threadPullRequestRefreshSource({
-        panel,
-        thread: { repository: "pingdotgg/t3code", number: 42, state: null, linked: false },
-      }),
-    ).toBe("vcs");
-  });
+  it("never lets a stale open response regress a merged observation", () => {
+    const merged = pullRequestSummary("merged", "2026-09-03T01:01:00.000Z");
+    const staleOpen = pullRequestSummary("open", "2026-09-03T01:00:00.000Z");
 
-  it("does nothing once sidebar state matches or the panel shows another PR", () => {
-    expect(
-      threadPullRequestRefreshSource({
-        panel,
-        thread: { repository: "pingdotgg/t3code", number: 42, state: "merged", linked: false },
-      }),
-    ).toBeNull();
-    expect(
-      threadPullRequestRefreshSource({
-        panel,
-        thread: { repository: "pingdotgg/t3code", number: 41, state: "open", linked: false },
-      }),
-    ).toBeNull();
+    expect(newestPullRequestSummary(merged, staleOpen)).toBe(merged);
   });
 
-  it("matches repository identity without case sensitivity", () => {
-    expect(
-      threadPullRequestRefreshSource({
-        panel: { ...panel, repository: "PingDotGG/T3Code" },
-        thread: { repository: "pingdotgg/t3code", number: 42, state: "open", linked: false },
-      }),
-    ).toBe("vcs");
+  it("accepts a newer open state after a closed pull request is reopened", () => {
+    const closed = pullRequestSummary("closed", "2026-09-03T01:00:00.000Z");
+    const reopened = pullRequestSummary("open", "2026-09-03T01:01:00.000Z");
+
+    expect(newestPullRequestSummary(closed, reopened)).toBe(reopened);
   });
 });
 
diff --git a/apps/web/src/components/ThreadStatusIndicators.tsx b/apps/web/src/components/ThreadStatusIndicators.tsx
index e879c78b9710..1ad0c3139fd8 100644
--- a/apps/web/src/components/ThreadStatusIndicators.tsx
+++ b/apps/web/src/components/ThreadStatusIndicators.tsx
@@ -4,15 +4,21 @@ import {
   scopeThreadRef,
 } from "@t3tools/client-runtime/environment";
 import { pullRequestDetailToVcsStatus } from "@t3tools/client-runtime/state/pull-requests";
-import type { EnvironmentId, ThreadLinkedPullRequest, VcsStatusResult } from "@t3tools/contracts";
+import {
+  type EnvironmentId,
+  resolveEnvironmentMachineKind,
+  type ThreadLinkedPullRequest,
+  type VcsStatusResult,
+} from "@t3tools/contracts";
 import { Atom } from "effect/unstable/reactivity";
-import { CloudIcon, FolderGit2Icon, GitPullRequestIcon, TerminalIcon } from "lucide-react";
+import { FolderGit2Icon, GitPullRequestIcon, TerminalIcon } from "lucide-react";
 import { useMemo } from "react";
 import { appAtomRegistry } from "../rpc/atomRegistry";
 import { useEnvironment, usePrimaryEnvironmentId } from "../state/environments";
+import { EnvironmentMachineIcon } from "./EnvironmentMachineIcon";
 import { useProject } from "../state/entities";
 import { useEnvironmentQuery } from "../state/query";
-import { linkedPullRequestDetailAtom } from "../state/pullRequests";
+import { linkedPullRequestDetailAtom, useSharedPullRequestSummary } from "../state/pullRequests";
 import { useThreadRunningTerminalIds } from "../state/terminalSessions";
 import { vcsEnvironment } from "../state/vcs";
 import { useUiStateStore } from "../uiStateStore";
@@ -39,32 +45,6 @@ export interface TerminalStatusIndicator {
 
 export type ThreadPr = VcsStatusResult["pr"];
 
-export type ThreadPullRequestRefreshSource = "linked-detail" | "vcs";
-
-/** Refresh only when the panel has newer state for this thread's own pull request. */
-export function threadPullRequestRefreshSource(input: {
-  readonly panel: {
-    readonly repository: string;
-    readonly number: number;
-    readonly state: NonNullable<ThreadPr>["state"];
-  };
-  readonly thread: {
-    readonly repository: string | null;
-    readonly number: number | null;
-    readonly state: NonNullable<ThreadPr>["state"] | null;
-    readonly linked: boolean;
-  };
-}): ThreadPullRequestRefreshSource | null {
-  if (
-    input.thread.repository?.toLowerCase() !== input.panel.repository.toLowerCase() ||
-    input.thread.number !== input.panel.number ||
-    input.thread.state === input.panel.state
-  ) {
-    return null;
-  }
-  return input.thread.linked ? "linked-detail" : "vcs";
-}
-
 export interface LinkedThreadPullRequestStatus {
   readonly pr: NonNullable<ThreadPr>;
   readonly sourceControlProvider: NonNullable<VcsStatusResult["sourceControlProvider"]>;
@@ -74,7 +54,7 @@ export function useLinkedThreadPullRequest(
   environmentId: EnvironmentId | null,
   linkedPullRequest: ThreadLinkedPullRequest | null | undefined,
 ): LinkedThreadPullRequestStatus | null {
-  const detail = useEnvironmentQuery(
+  const queried = useEnvironmentQuery(
     environmentId === null || linkedPullRequest == null
       ? null
       : linkedPullRequestDetailAtom({
@@ -86,6 +66,7 @@ export function useLinkedThreadPullRequest(
           },
         }),
   ).data;
+  const detail = useSharedPullRequestSummary(environmentId, linkedPullRequest ?? null, queried);
 
   return useMemo(
     () =>
@@ -627,10 +608,12 @@ export function ThreadRowTrailingStatus({ thread }: { thread: SidebarThreadSumma
   });
   const environment = useEnvironment(thread.environmentId);
   const primaryEnvironmentId = usePrimaryEnvironmentId();
-  const isRemoteThread =
-    primaryEnvironmentId !== null && thread.environmentId !== primaryEnvironmentId;
+  // No primary (the hosted app) means every thread is remote, and the machine
+  // glyph is what tells the environments apart.
+  const isRemoteThread = thread.environmentId !== primaryEnvironmentId;
   const remoteEnvLabel = environment?.label ?? null;
   const threadEnvironmentLabel = isRemoteThread ? (remoteEnvLabel ?? "Remote") : null;
+  const remoteMachine = resolveEnvironmentMachineKind(environment?.serverConfig ?? null);
   const terminalStatus = terminalStatusFromRunningIds(runningTerminalIds);
 
   if (!terminalStatus && !isRemoteThread) {
@@ -667,7 +650,10 @@ export function ThreadRowTrailingStatus({ thread }: { thread: SidebarThreadSumma
               />
             }
           >
-            <CloudIcon className="size-3 text-muted-foreground/60" />
+            <EnvironmentMachineIcon
+              kind={remoteMachine}
+              className="size-3 text-muted-foreground/60"
+            />
           </TooltipTrigger>
           <TooltipPopup side="top">{threadEnvironmentLabel}</TooltipPopup>
         </Tooltip>
diff --git a/apps/web/src/components/ThreadTerminalDrawer.tsx b/apps/web/src/components/ThreadTerminalDrawer.tsx
index bdcd16265480..1c64818c5794 100644
--- a/apps/web/src/components/ThreadTerminalDrawer.tsx
+++ b/apps/web/src/components/ThreadTerminalDrawer.tsx
@@ -728,10 +728,8 @@ export function TerminalViewport({
           };
           void openTerminalLinkInPreview({
             url: text,
-            position: { x: event.clientX, y: event.clientY },
             threadRef,
             openPreview,
-            localApi,
             fallbackToBrowser,
           });
           return;
diff --git a/apps/web/src/components/chat/AssistantCitationChip.tsx b/apps/web/src/components/chat/AssistantCitationChip.tsx
index 12715a558fe2..4afaefe3f489 100644
--- a/apps/web/src/components/chat/AssistantCitationChip.tsx
+++ b/apps/web/src/components/chat/AssistantCitationChip.tsx
@@ -23,6 +23,7 @@ import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
 import { Popover, PopoverPopup, PopoverTrigger } from "../ui/popover";
 import { AssistantCitationCommentEditor } from "./AssistantCitationCommentEditor";
 import { observeAssistantCitationCommentSource } from "./AssistantCitationSource";
+import { composerFloatingLayerProps } from "./composerEventScope";
 
 const CITATION_ACTION_BUTTON_CLASS_NAME = cn(
   COMPOSER_INLINE_CHIP_DISMISS_BUTTON_CLASS_NAME,
@@ -135,6 +136,7 @@ export function AssistantCitationChip({
           </PopoverTrigger>
           {commentEditor.open ? (
             <PopoverPopup
+              {...composerFloatingLayerProps}
               side={sourceAnchor ? "bottom" : "top"}
               align="end"
               anchor={popupAnchor}
diff --git a/apps/web/src/components/chat/ChatComposer.tsx b/apps/web/src/components/chat/ChatComposer.tsx
index b2395d90db03..fc250cc2859b 100644
--- a/apps/web/src/components/chat/ChatComposer.tsx
+++ b/apps/web/src/components/chat/ChatComposer.tsx
@@ -23,6 +23,7 @@ import type { EnvironmentConnectionPresentation } from "@t3tools/client-runtime/
 import { serializeComposerFileLink } from "@t3tools/shared/composerTrigger";
 import { createModelSelection, normalizeModelSlug } from "@t3tools/shared/model";
 import {
+  Fragment,
   memo,
   type ReactNode,
   useCallback,
@@ -51,6 +52,11 @@ import {
   dataTransferHasComposerMention,
   makeComposerMentionDragHandlers,
 } from "./composerMentionDrag";
+import {
+  composerFloatingLayerProps,
+  isInsideComposerFloatingLayer,
+  isInsideRestingComposerControlScope,
+} from "./composerEventScope";
 import {
   type ComposerFileAttachment,
   type ComposerImageAttachment,
@@ -137,9 +143,14 @@ import { ComposerPreviewAnnotationCards } from "./ComposerPreviewAnnotationCards
 import {
   COMPOSER_FOOTER_COMPACT_BREAKPOINT_PX,
   COMPOSER_FOOTER_WIDE_ACTIONS_COMPACT_BREAKPOINT_PX,
+  getRestingComposerImagePreviewCounts,
+  resolveRestingComposerControlsLayout,
+  shouldAnimateComposerRestingTransition,
   shouldUseCompactComposerPrimaryActions,
   shouldUseCompactComposerFooter,
+  shouldUseRestingComposerLayout,
 } from "../composerFooterLayout";
+import { measureRestingComposerControls } from "./restingComposerControlsMeasurement";
 import { observeResponsiveBreakpointFade, usePanelAnimationSettings } from "../../panelAnimations";
 import { type ComposerPromptEditorHandle, ComposerPromptEditor } from "../ComposerPromptEditor";
 import { ProviderModelPicker } from "./ProviderModelPicker";
@@ -150,7 +161,12 @@ import { ComposerPrimaryActions } from "./ComposerPrimaryActions";
 import { ComposerPendingApprovalPanel } from "./ComposerPendingApprovalPanel";
 import { ComposerPendingUserInputPanel } from "./ComposerPendingUserInputPanel";
 import { ComposerPlanFollowUpBanner } from "./ComposerPlanFollowUpBanner";
-import { ComposerControl, ComposerControlIcon, ComposerSelectControl } from "./ComposerControl";
+import {
+  ComposerControl,
+  ComposerControlIcon,
+  ComposerControlSeparator,
+  ComposerSelectControl,
+} from "./ComposerControl";
 import { resolveComposerMenuActiveItemId } from "./composerMenuHighlight";
 import {
   searchSlashCommandItems,
@@ -171,13 +187,18 @@ import {
 } from "./ExpandedImagePreview";
 import { basenameOfPath } from "../../pierre-icons";
 import { cn, randomUUID } from "~/lib/utils";
-import { Separator } from "../ui/separator";
 import {
   getComposerPromptLengthValidationMessage,
   getComposerSubmissionValidationMessage,
   submitComposerDraft,
 } from "./composerSubmission";
 import { ComposerPromptLengthValidation } from "./ComposerPromptLengthValidation";
+import {
+  createComposerScrollGestureState,
+  recordComposerScrollGestureEvent,
+  resetComposerScrollGesture,
+  suppressActiveComposerScrollGesture,
+} from "./composerScrollGesture";
 import { prepareVideoFirstFrame } from "../../lib/videoFirstFrame";
 
 function ComposerVideoThumbnail({ file }: { file: File }) {
@@ -209,6 +230,435 @@ type ComposerCommandMenuPosition = {
   width: number;
 };
 
+const COMPOSER_SCROLL_COLLAPSE_THRESHOLD_PX = 24;
+const COMPOSER_SCROLL_GESTURE_RESET_MS = 120;
+const COMPOSER_RESTING_TRANSITION_DURATION_MS = 280;
+const COMPOSER_RESTING_TRANSITION_CLEANUP_BUFFER_MS = 50;
+const COMPOSER_RESTING_TRANSITION_EASING = "cubic-bezier(0.32, 0.72, 0, 1)";
+const COMPOSER_RESTING_CONTROLS_ARRIVAL_DRIFT_PX = 4;
+
+function useComposerRestingTransition(
+  isCollapsed: boolean,
+  restingControlsRef: React.RefObject<HTMLDivElement | null>,
+  onOverlayHeightChange: (height: number) => void,
+) {
+  const elementRef = useRef<HTMLDivElement>(null);
+  const isCollapsedRef = useRef(isCollapsed);
+  const previousCollapsedRef = useRef(isCollapsed);
+  const previousHeightRef = useRef<number | null>(null);
+  const previousContentOffsetsRef = useRef<{
+    promptFromTop: number | null;
+    promptHeight: number | null;
+    actionFromBottom: number | null;
+  }>({ promptFromTop: null, promptHeight: null, actionFromBottom: null });
+  const animationRef = useRef<Animation | null>(null);
+  const animationTargetHeightRef = useRef<number | null>(null);
+  const contentAnimationsRef = useRef<Animation[]>([]);
+  const stateChangeAnimationsRef = useRef<Animation[]>([]);
+  const pinnedOverlayRef = useRef<HTMLElement | null>(null);
+  const transitionCleanupTimeoutRef = useRef<number | null>(null);
+  const transitionLayoutRequestRef = useRef(0);
+  const hasCompletedInitialLayoutRef = useRef(false);
+
+  const clearOverlayPin = useCallback(() => {
+    // The overlay belongs to the chat view and outlives this composer, so it
+    // is remembered from pin time rather than re-resolved through a ref that
+    // React may already have detached during unmount.
+    const overlay = pinnedOverlayRef.current;
+    pinnedOverlayRef.current = null;
+    overlay?.style.removeProperty("height");
+    overlay?.style.removeProperty("display");
+    overlay?.style.removeProperty("flex-direction");
+    overlay?.style.removeProperty("justify-content");
+  }, []);
+
+  const clearTransitionStyles = useCallback(() => {
+    const element = elementRef.current;
+    const footer = element?.querySelector<HTMLElement>('[data-chat-composer-footer="true"]');
+    element?.style.removeProperty("overflow");
+    element
+      ?.querySelector<HTMLElement>('[data-chat-composer-surface="true"]')
+      ?.style.removeProperty("height");
+    footer?.style.removeProperty("position");
+    footer?.style.removeProperty("top");
+    footer?.style.removeProperty("bottom");
+    footer?.style.removeProperty("left");
+    footer?.style.removeProperty("right");
+    footer?.style.removeProperty("height");
+    clearOverlayPin();
+  }, [clearOverlayPin]);
+
+  isCollapsedRef.current = isCollapsed;
+
+  const transitionToCurrentGeometry = useCallback(
+    (stateChanged: boolean) => {
+      const element = elementRef.current;
+      const surface = element?.querySelector<HTMLElement>('[data-chat-composer-surface="true"]');
+      if (!element || !surface) return;
+
+      const nextIsCollapsed = isCollapsedRef.current;
+
+      const visibleTransitionElement = (selector: string) =>
+        Array.from(element.querySelectorAll<HTMLElement>(selector)).find(
+          (candidate) => candidate.getClientRects().length > 0,
+        ) ?? null;
+      const prompt = visibleTransitionElement(
+        '[data-testid="composer-editor"], [data-chat-composer-transition-prompt="true"]',
+      );
+      const action = visibleTransitionElement('[data-chat-composer-transition-actions="true"]');
+      const footer = element.querySelector<HTMLElement>('[data-chat-composer-footer="true"]');
+      const interruptedAnimation = animationRef.current;
+      const interruptedPromptTop = interruptedAnimation
+        ? (prompt?.getBoundingClientRect().top ?? null)
+        : null;
+      const interruptedActionTop = interruptedAnimation
+        ? (action?.getBoundingClientRect().top ?? null)
+        : null;
+      const interruptedHeight = interruptedAnimation
+        ? element.getBoundingClientRect().height
+        : null;
+      const interruptedTargetHeight = animationTargetHeightRef.current;
+      const interruptedCurrentTime =
+        typeof interruptedAnimation?.currentTime === "number"
+          ? interruptedAnimation.currentTime
+          : null;
+      const interruptedDuration = interruptedAnimation?.effect?.getComputedTiming().duration;
+      if (transitionCleanupTimeoutRef.current !== null) {
+        window.clearTimeout(transitionCleanupTimeoutRef.current);
+        transitionCleanupTimeoutRef.current = null;
+      }
+      interruptedAnimation?.cancel();
+      animationRef.current = null;
+      for (const animation of contentAnimationsRef.current) animation.cancel();
+      contentAnimationsRef.current = [];
+      // The reveal and fade animations keep their own schedule across the
+      // body-resize re-entries that retarget the geometry mid-flight (every
+      // transition with a draft triggers one); cancelling them there would
+      // pop their subjects to full visibility at the start of the tween.
+      if (stateChanged) {
+        for (const animation of stateChangeAnimationsRef.current) animation.cancel();
+        stateChangeAnimationsRef.current = [];
+      }
+      clearTransitionStyles();
+
+      const nextRect = element.getBoundingClientRect();
+      const nextHeight = nextRect.height;
+      const nextPromptRect = prompt?.getBoundingClientRect() ?? null;
+      const nextPromptTop = nextPromptRect?.top ?? null;
+      const nextActionTop = action?.getBoundingClientRect().top ?? null;
+      const previousHeight = interruptedHeight ?? previousHeightRef.current;
+      const targetChanged =
+        interruptedTargetHeight === null || Math.abs(interruptedTargetHeight - nextHeight) >= 0.5;
+      const prefersReducedMotion = window.matchMedia?.("(prefers-reduced-motion: reduce)").matches;
+      const shouldAnimate = shouldAnimateComposerRestingTransition({
+        hasCompletedInitialLayout: hasCompletedInitialLayoutRef.current,
+        stateChanged,
+        hasInterruptedAnimation: interruptedHeight !== null,
+      });
+
+      if (
+        shouldAnimate &&
+        !prefersReducedMotion &&
+        previousHeight !== null &&
+        Math.abs(previousHeight - nextHeight) >= 0.5
+      ) {
+        const remainingDuration =
+          typeof interruptedDuration === "number" && interruptedCurrentTime !== null
+            ? Math.max(1, interruptedDuration - interruptedCurrentTime)
+            : COMPOSER_RESTING_TRANSITION_DURATION_MS;
+        const duration =
+          interruptedHeight !== null && !targetChanged
+            ? remainingDuration
+            : COMPOSER_RESTING_TRANSITION_DURATION_MS;
+        element.style.overflow = "clip";
+        surface.style.height = "100%";
+
+        // The chat view resize-observes the overlay to place the timeline
+        // inset, the scroll-to-end pill, and the mini player. Pinning the
+        // overlay at the destination height turns that feedback into one
+        // update instead of a ChatView re-render on every animation frame;
+        // bottom alignment keeps the animating surface glued to the overlay's
+        // stable bottom edge. The pin lasts only for the tween so later
+        // attachment, thread, font, and viewport changes remain natural.
+        const overlay = element.closest<HTMLElement>('[data-chat-composer-overlay="true"]');
+        let pinnedOverlayHeight: number | null = null;
+        if (overlay) {
+          pinnedOverlayHeight = overlay.getBoundingClientRect().height;
+          overlay.style.height = `${String(pinnedOverlayHeight)}px`;
+          overlay.style.display = "flex";
+          overlay.style.flexDirection = "column";
+          overlay.style.justifyContent = "flex-end";
+          pinnedOverlayRef.current = overlay;
+        }
+
+        // Keep the footer attached to the stable bottom edge while the outer
+        // height changes. Its resting absolute layout otherwise spans the old
+        // height on collapse, while its expanded flow layout falls below the
+        // clipped surface on expansion.
+        if (footer) {
+          footer.style.position = "absolute";
+          footer.style.top = "auto";
+          footer.style.bottom = "1px";
+          footer.style.height = "3rem";
+          if (nextIsCollapsed) {
+            footer.style.left = "auto";
+            footer.style.right = "1px";
+          } else {
+            footer.style.left = "1px";
+            footer.style.right = "1px";
+          }
+        }
+
+        const animation = element.animate(
+          [{ height: `${previousHeight}px` }, { height: `${nextHeight}px` }],
+          {
+            duration,
+            easing: COMPOSER_RESTING_TRANSITION_EASING,
+          },
+        );
+        animationRef.current = animation;
+        animationTargetHeightRef.current = nextHeight;
+        // Publish the destination overlay geometry in the same layout pass;
+        // ResizeObserver remains the fallback for non-transition changes.
+        if (pinnedOverlayHeight !== null) {
+          onOverlayHeightChange(pinnedOverlayHeight);
+        }
+
+        const animatedRect = element.getBoundingClientRect();
+        const previousPromptTop =
+          interruptedPromptTop ??
+          (previousContentOffsetsRef.current.promptFromTop === null
+            ? null
+            : animatedRect.top + previousContentOffsetsRef.current.promptFromTop);
+        const previousActionTop =
+          interruptedActionTop ??
+          (previousContentOffsetsRef.current.actionFromBottom === null
+            ? null
+            : animatedRect.bottom - previousContentOffsetsRef.current.actionFromBottom);
+        const contentAnimations: Animation[] = [];
+        const animateContentPosition = (
+          content: HTMLElement | null,
+          previousTop: number | null,
+        ) => {
+          if (!content || previousTop === null) return;
+          const offset = previousTop - content.getBoundingClientRect().top;
+          if (Math.abs(offset) < 0.5) return;
+          contentAnimations.push(
+            content.animate(
+              [{ transform: `translateY(${String(offset)}px)` }, { transform: "none" }],
+              {
+                duration,
+                easing: COMPOSER_RESTING_TRANSITION_EASING,
+              },
+            ),
+          );
+        };
+        animateContentPosition(prompt, previousPromptTop);
+        animateContentPosition(action, previousActionTop);
+        contentAnimationsRef.current = contentAnimations;
+
+        if (stateChanged) {
+          const stateChangeAnimations: Animation[] = [];
+
+          // A prompt that gains lines on expansion would otherwise slide up
+          // from under the footer band as one block. Opening a bottom clip in
+          // step with the tween instead unfurls the extra lines beneath the
+          // rising first line, so no text crosses the returning controls.
+          const previousPromptHeight = previousContentOffsetsRef.current.promptHeight;
+          if (
+            !nextIsCollapsed &&
+            prompt &&
+            nextPromptRect &&
+            previousPromptHeight !== null &&
+            nextPromptRect.height - previousPromptHeight >= 0.5
+          ) {
+            const hiddenHeight = nextPromptRect.height - previousPromptHeight;
+            stateChangeAnimations.push(
+              prompt.animate(
+                [
+                  { clipPath: `inset(0 0 ${String(hiddenHeight)}px 0)` },
+                  { clipPath: "inset(0 0 0 0)" },
+                ],
+                {
+                  duration,
+                  easing: COMPOSER_RESTING_TRANSITION_EASING,
+                },
+              ),
+            );
+          }
+
+          // The footer controls teleport between the composer footer and the
+          // context strip below it in a single commit. Fading the arriving
+          // cluster in along its direction of travel reads as one continuous
+          // move instead of a pop. Collapsing controls land in empty strip
+          // space and can appear immediately, but expanding controls return
+          // to the bottom row the prompt still occupies while the surface is
+          // short, so they stay hidden through the first half of the tween
+          // and fade in once the geometry has mostly settled.
+          const arrivingControls = nextIsCollapsed
+            ? restingControlsRef.current
+            : element.querySelector<HTMLElement>('[data-chat-composer-controls="left"]');
+          if (arrivingControls) {
+            const drift = nextIsCollapsed
+              ? -COMPOSER_RESTING_CONTROLS_ARRIVAL_DRIFT_PX
+              : COMPOSER_RESTING_CONTROLS_ARRIVAL_DRIFT_PX;
+            stateChangeAnimations.push(
+              arrivingControls.animate(
+                [
+                  { opacity: 0, transform: `translateY(${String(drift)}px)` },
+                  { opacity: 1, transform: "none" },
+                ],
+                {
+                  duration: nextIsCollapsed ? duration : duration / 2,
+                  delay: nextIsCollapsed ? 0 : duration / 2,
+                  fill: "backwards",
+                  easing: COMPOSER_RESTING_TRANSITION_EASING,
+                },
+              ),
+            );
+          }
+
+          const arrivingImagePreviews = nextIsCollapsed
+            ? Array.from(
+                element.querySelectorAll<HTMLElement>('[data-chat-composer-resting-images="true"]'),
+              )
+            : Array.from(
+                element.querySelectorAll<HTMLElement>('[data-chat-composer-expanded-image="true"]'),
+              );
+          for (const imagePreview of arrivingImagePreviews) {
+            stateChangeAnimations.push(
+              imagePreview.animate([{ opacity: 0 }, { opacity: 1 }], {
+                duration: nextIsCollapsed ? duration : duration / 2,
+                delay: nextIsCollapsed ? 0 : duration / 2,
+                fill: "backwards",
+                easing: COMPOSER_RESTING_TRANSITION_EASING,
+              }),
+            );
+          }
+          stateChangeAnimationsRef.current = stateChangeAnimations;
+        }
+
+        const finishTransition = (cancelAnimations: boolean) => {
+          if (animationRef.current !== animation) return;
+          if (transitionCleanupTimeoutRef.current !== null) {
+            window.clearTimeout(transitionCleanupTimeoutRef.current);
+            transitionCleanupTimeoutRef.current = null;
+          }
+          if (cancelAnimations) {
+            animation.cancel();
+            for (const contentAnimation of contentAnimationsRef.current) {
+              contentAnimation.cancel();
+            }
+            for (const stateChangeAnimation of stateChangeAnimationsRef.current) {
+              stateChangeAnimation.cancel();
+            }
+          }
+          animationRef.current = null;
+          animationTargetHeightRef.current = null;
+          contentAnimationsRef.current = [];
+          stateChangeAnimationsRef.current = [];
+          clearTransitionStyles();
+        };
+        void animation.finished.catch(() => undefined).then(() => finishTransition(false));
+        // A suspended document timeline can leave `finished` pending while
+        // these measurement styles remain active. Wall-clock cleanup makes
+        // the natural layout the eventual source of truth in that case.
+        transitionCleanupTimeoutRef.current = window.setTimeout(
+          () => finishTransition(true),
+          duration + COMPOSER_RESTING_TRANSITION_CLEANUP_BUFFER_MS,
+        );
+      } else {
+        animationTargetHeightRef.current = null;
+      }
+
+      previousCollapsedRef.current = nextIsCollapsed;
+      previousHeightRef.current = nextHeight;
+      previousContentOffsetsRef.current = {
+        promptFromTop: nextPromptTop === null ? null : nextPromptTop - nextRect.top,
+        promptHeight: nextPromptRect?.height ?? null,
+        actionFromBottom: nextActionTop === null ? null : nextRect.bottom - nextActionTop,
+      };
+    },
+    [clearTransitionStyles, onOverlayHeightChange, restingControlsRef],
+  );
+
+  useLayoutEffect(() => {
+    const requestId = transitionLayoutRequestRef.current + 1;
+    transitionLayoutRequestRef.current = requestId;
+    const stateChanged = previousCollapsedRef.current !== isCollapsed;
+    // A non-Git context strip enters or leaves flow through ChatView state in
+    // an earlier layout effect. Let React flush that parent update before the
+    // FLIP reads its destination geometry, while still running before paint.
+    queueMicrotask(() => {
+      if (transitionLayoutRequestRef.current !== requestId) return;
+      transitionToCurrentGeometry(stateChanged);
+    });
+    return () => {
+      if (transitionLayoutRequestRef.current === requestId) {
+        transitionLayoutRequestRef.current += 1;
+      }
+    };
+  }, [isCollapsed, transitionToCurrentGeometry]);
+
+  useLayoutEffect(() => {
+    const element = elementRef.current;
+    if (!element || typeof ResizeObserver === "undefined") return;
+
+    const body = element.querySelector<HTMLElement>('[data-chat-composer-body="true"]');
+    const observer = new ResizeObserver((entries) => {
+      if (animationRef.current) {
+        if (body && entries.some((entry) => entry.target === body)) {
+          transitionToCurrentGeometry(false);
+        }
+        return;
+      }
+      const elementRect = element.getBoundingClientRect();
+      const visibleTransitionElement = (selector: string) =>
+        Array.from(element.querySelectorAll<HTMLElement>(selector)).find(
+          (candidate) => candidate.getClientRects().length > 0,
+        ) ?? null;
+      const promptRect = visibleTransitionElement(
+        '[data-testid="composer-editor"], [data-chat-composer-transition-prompt="true"]',
+      )?.getBoundingClientRect();
+      const actionTop = visibleTransitionElement(
+        '[data-chat-composer-transition-actions="true"]',
+      )?.getBoundingClientRect().top;
+      previousHeightRef.current = elementRect.height;
+      previousContentOffsetsRef.current = {
+        promptFromTop: promptRect === undefined ? null : promptRect.top - elementRect.top,
+        promptHeight: promptRect?.height ?? null,
+        actionFromBottom: actionTop === undefined ? null : elementRect.bottom - actionTop,
+      };
+    });
+    observer.observe(element);
+    if (body) observer.observe(body);
+    return () => observer.disconnect();
+  }, [transitionToCurrentGeometry]);
+
+  useEffect(() => {
+    // Host discovery and width measurement settle through layout updates on
+    // mount. Treat that bootstrap as initial geometry so an existing thread
+    // paints at rest instead of visibly collapsing from the expanded height.
+    hasCompletedInitialLayoutRef.current = true;
+    return () => {
+      if (transitionCleanupTimeoutRef.current !== null) {
+        window.clearTimeout(transitionCleanupTimeoutRef.current);
+        transitionCleanupTimeoutRef.current = null;
+      }
+      animationRef.current?.cancel();
+      animationRef.current = null;
+      animationTargetHeightRef.current = null;
+      for (const animation of contentAnimationsRef.current) animation.cancel();
+      contentAnimationsRef.current = [];
+      for (const animation of stateChangeAnimationsRef.current) animation.cancel();
+      stateChangeAnimationsRef.current = [];
+      clearTransitionStyles();
+    };
+  }, [clearTransitionStyles]);
+
+  return elementRef;
+}
+
 function composerCommandMenuPositionsEqual(
   a: ComposerCommandMenuPosition,
   b: ComposerCommandMenuPosition,
@@ -344,15 +794,6 @@ import type { ReviewCommentContext } from "../../reviewCommentContext";
 
 const WORKSPACE_SNAPSHOT_RETRY_COOLDOWN_MS = 10_000;
 
-const COMPOSER_FLOATING_LAYER_SELECTOR = [
-  '[data-composer-drawer-layer="true"]',
-  '[data-slot="popover-popup"]',
-  '[data-slot="menu-popup"]',
-  '[data-slot="select-popup"]',
-  '[data-slot="combobox-popup"]',
-  '[data-slot="autocomplete-popup"]',
-].join(",");
-
 const extendReplacementRangeForTrailingSpace = (
   text: string,
   rangeEnd: number,
@@ -381,8 +822,44 @@ const terminalContextIdListsEqual = (
 ): boolean =>
   contexts.length === ids.length && contexts.every((context, index) => context.id === ids[index]);
 
-function isInsideComposerFloatingLayer(element: Element): boolean {
-  return element.closest(COMPOSER_FLOATING_LAYER_SELECTOR) !== null;
+function useRestingComposerControlsLayout(host: HTMLDivElement | null) {
+  const controlsRef = useRef<HTMLDivElement>(null);
+  const hostRef = useRef(host);
+  hostRef.current = host;
+  const [layout, setLayout] = useState({ hiddenCount: 0, visible: true });
+
+  const measure = useCallback(() => {
+    const currentHost = hostRef.current;
+    const controls = controlsRef.current;
+    // The controls only mount while the composer rests, so the expanded
+    // composer pays no layout reads here despite the every-render effect.
+    if (currentHost === null || !controls) return;
+
+    const measurement = measureRestingComposerControls(controls);
+    if (!measurement) return;
+    const hostWidth = currentHost.clientWidth;
+
+    setLayout((current) => {
+      const next = resolveRestingComposerControlsLayout({ ...measurement, hostWidth });
+      return next.hiddenCount === current.hiddenCount && next.visible === current.visible
+        ? current
+        : next;
+    });
+  }, []);
+
+  useLayoutEffect(measure);
+  useEffect(() => {
+    if (!host) return;
+    const observer = new ResizeObserver(measure);
+    observer.observe(host);
+    document.fonts.addEventListener("loadingdone", measure);
+    return () => {
+      observer.disconnect();
+      document.fonts.removeEventListener("loadingdone", measure);
+    };
+  }, [host, measure]);
+
+  return { controlsRef, hiddenBlockCount: layout.hiddenCount, controlsVisible: layout.visible };
 }
 
 const ComposerFooterModeControls = memo(function ComposerFooterModeControls(props: {
@@ -390,11 +867,13 @@ const ComposerFooterModeControls = memo(function ComposerFooterModeControls(prop
   showInteractionModeToggle: boolean;
   interactionMode: ProviderInteractionMode;
   runtimeMode: RuntimeMode;
+  size?: "sm" | "xs";
   onToggleInteractionMode: () => void;
   onRuntimeModeChange: (mode: RuntimeMode) => void;
 }) {
   const runtimeModeConfig = getRuntimeModeConfig(props.provider);
   const runtimeModeOptions = getRuntimeModeOptions(props.provider);
+  const size = props.size ?? "sm";
   const runtimeModeOption = runtimeModeConfig[props.runtimeMode];
   const RuntimeModeIcon = runtimeModeOption.icon;
   const interactionModeTooltip =
@@ -404,16 +883,19 @@ const ComposerFooterModeControls = memo(function ComposerFooterModeControls(prop
 
   const interactionModeToggle = props.showInteractionModeToggle ? (
     <>
-      <Separator orientation="vertical" className="mx-0.5 hidden h-4 sm:block" />
+      <ComposerControlSeparator size={size} />
       <Tooltip>
         <TooltipTrigger
           render={
             <ComposerControl
+              size={size}
               className={cn(
                 "shrink-0 whitespace-nowrap",
                 props.interactionMode === "plan"
                   ? "bg-accent text-accent-foreground hover:bg-accent/80"
-                  : "text-secondary-label hover:text-foreground",
+                  : size === "xs"
+                    ? undefined
+                    : "text-secondary-label hover:text-foreground",
               )}
               type="button"
               onClick={props.onToggleInteractionMode}
@@ -422,9 +904,17 @@ const ComposerFooterModeControls = memo(function ComposerFooterModeControls(prop
           }
         >
           {props.interactionMode === "plan" ? (
-            <ComposerControlIcon icon={PencilRulerIcon} className="text-current opacity-100" />
+            <ComposerControlIcon
+              icon={PencilRulerIcon}
+              size={size}
+              className="text-current opacity-100"
+            />
           ) : (
-            <ComposerControlIcon icon={BotIcon} opticalSize="large" />
+            <ComposerControlIcon
+              icon={BotIcon}
+              size={size}
+              opticalSize={size === "xs" ? "default" : "large"}
+            />
           )}
           <span className="sr-only sm:not-sr-only">
             {props.interactionMode === "plan" ? "Plan" : "Build"}
@@ -437,7 +927,7 @@ const ComposerFooterModeControls = memo(function ComposerFooterModeControls(prop
 
   return (
     <>
-      <Separator orientation="vertical" className="mx-0.5 hidden h-4 sm:block" />
+      <ComposerControlSeparator size={size} />
 
       <Tooltip>
         <Select
@@ -445,12 +935,18 @@ const ComposerFooterModeControls = memo(function ComposerFooterModeControls(prop
           onValueChange={(value) => props.onRuntimeModeChange(value!)}
         >
           <TooltipTrigger
-            render={<ComposerSelectControl className="font-medium" aria-label="Runtime mode" />}
+            render={
+              <ComposerSelectControl
+                size={size}
+                className={size === "xs" ? undefined : "font-medium"}
+                aria-label="Runtime mode"
+              />
+            }
           >
-            <ComposerControlIcon icon={RuntimeModeIcon} />
+            <ComposerControlIcon icon={RuntimeModeIcon} size={size} />
             <SelectValue>{runtimeModeOption.label}</SelectValue>
           </TooltipTrigger>
-          <SelectPopup alignItemWithTrigger={false}>
+          <SelectPopup alignItemWithTrigger={false} {...composerFloatingLayerProps}>
             {runtimeModeOptions.map((mode) => {
               const option = runtimeModeConfig[mode];
               const OptionIcon = option.icon;
@@ -502,6 +998,7 @@ const ComposerFooterPrimaryActions = memo(function ComposerFooterPrimaryActions(
   hasSendableContent: boolean;
   preserveComposerFocusOnPointerDown?: boolean;
   showSendWhileRunning?: boolean;
+  showSecondaryStatus: boolean;
   onPreviousPendingQuestion: () => void;
   onInterrupt: () => void;
   onImplementPlanInNewThread: () => void;
@@ -511,7 +1008,7 @@ const ComposerFooterPrimaryActions = memo(function ComposerFooterPrimaryActions(
 }) {
   return (
     <>
-      {props.activeContextWindow ? (
+      {props.showSecondaryStatus && props.activeContextWindow ? (
         <ContextWindowMeter
           usage={props.activeContextWindow}
           modelDisplayName={props.activeThreadModelDisplayName}
@@ -549,6 +1046,8 @@ const ComposerFooterPrimaryActions = memo(function ComposerFooterPrimaryActions(
 export interface ChatComposerHandle {
   focusAtEnd: () => void;
   focusAt: (cursor: number) => void;
+  /** Undo only a scroll-triggered collapse when the timeline returns to its live edge. */
+  restoreAfterTimelineReachedEnd: () => void;
   addDroppedFiles: (files: File[]) => void;
   insertTextAtEnd: (text: string, options?: { ensureLeadingBoundary?: boolean }) => boolean;
   citeAssistantText: (
@@ -674,6 +1173,12 @@ export interface ChatComposerProps {
   keybindings: ResolvedKeybindingsConfig;
   terminalOpen: boolean;
   gitCwd: string | null;
+  restingControlsHost: HTMLDivElement | null;
+  restingControlsHaveLeadingContext: boolean;
+  onRestingControlsVisibilityChange: (visible: boolean) => void;
+  getTimelineScrollableNode: () => HTMLElement | null;
+  isTimelineAtLogicalEnd: () => boolean;
+  onComposerOverlayHeightChange: (height: number) => void;
 
   // Refs the parent needs kept in sync
   promptRef: React.RefObject<string>;
@@ -682,6 +1187,9 @@ export interface ChatComposerProps {
   composerTerminalContextsRef: React.RefObject<TerminalContextDraft[]>;
   composerElementContextsRef: React.RefObject<ElementContextDraft[]>;
   composerRef: React.RefObject<ChatComposerHandle | null>;
+  onPageScrollKeyDown: (key: "PageUp" | "PageDown") => void;
+  onPageScrollKeyUp: (key: string) => void;
+  onPageScrollRelease: () => void;
 
   // Callbacks
   onSend: (e?: { preventDefault: () => void }, intent?: ComposerSubmissionIntent) => void;
@@ -713,7 +1221,6 @@ export interface ChatComposerProps {
   setThreadError: (threadId: ThreadId | null, error: string | null) => void;
   onExpandImage: (preview: ExpandedImagePreview) => void;
   onFileOpen: (attachment: ChatFileAttachment) => void;
-  openingVideoAttachmentId: string | null;
 }
 
 // --------------------------------------------------------------------------
@@ -768,12 +1275,21 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
     keybindings,
     terminalOpen,
     gitCwd,
+    restingControlsHost,
+    restingControlsHaveLeadingContext,
+    onRestingControlsVisibilityChange,
+    getTimelineScrollableNode,
+    isTimelineAtLogicalEnd,
+    onComposerOverlayHeightChange,
     promptRef,
     composerRef,
     composerImagesRef,
     composerFilesRef,
     composerTerminalContextsRef,
     composerElementContextsRef,
+    onPageScrollKeyDown,
+    onPageScrollKeyUp,
+    onPageScrollRelease,
     onSend,
     onInterrupt,
     onImplementPlanInNewThread,
@@ -792,7 +1308,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
     setThreadError,
     onExpandImage,
     onFileOpen,
-    openingVideoAttachmentId,
   } = props;
   const activeTasksProgress = props.threadSyncPhase === null ? props.activeTasksProgress : null;
   const activeTaskSteps = props.threadSyncPhase === null ? props.activeTaskSteps : null;
@@ -817,6 +1332,12 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
   const composerElementContexts = composerDraft.elementContexts;
   const composerPreviewAnnotations = composerDraft.previewAnnotations;
   const composerReviewComments = composerDraft.reviewComments;
+  const standaloneComposerImages = useMemo(() => {
+    const previewAnnotationIds = new Set(
+      composerPreviewAnnotations.map((annotation) => annotation.id),
+    );
+    return composerImages.filter((image) => !previewAnnotationIds.has(image.id));
+  }, [composerImages, composerPreviewAnnotations]);
   const nonPersistedComposerImageIds = composerDraft.nonPersistedImageIds;
   const uploadsByImageId = useAttachmentUploadStore((state) => state.uploadsByImageId);
   const needsReattachFileCount = composerFiles.filter(composerFileNeedsReattach).length;
@@ -1256,6 +1777,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
   const [isComposerPrimaryActionsCompact, setIsComposerPrimaryActionsCompact] = useState(false);
   const [isComposerModelPickerOpen, setIsComposerModelPickerOpen] = useState(false);
   const [isComposerFocused, setIsComposerFocused] = useState(false);
+  const [isComposerScrollCollapsed, setIsComposerScrollCollapsed] = useState(false);
   const [composerSubmissionError, setComposerSubmissionError] = useState<string | null>(null);
   const [providerInputSubmissionError, setProviderInputSubmissionError] = useState<string | null>(
     null,
@@ -1290,6 +1812,12 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
   const mobileComposerExpandFrameRef = useRef<number | null>(null);
   const mobileComposerExpandReleaseFrameRef = useRef<number | null>(null);
   const mobileComposerExpandInFlightRef = useRef(false);
+  const desktopOutsidePointerInFlightRef = useRef(false);
+  const desktopOutsidePointerReleaseTimeoutRef = useRef<number | null>(null);
+  const composerScrollCollapseTimeoutRef = useRef<number | null>(null);
+  const composerScrollCollapseEligibleRef = useRef(false);
+  const windowRefocusInFlightRef = useRef(false);
+  const composerScrollGestureRef = useRef(createComposerScrollGestureState());
   const stashPulseKeyRef = useRef(0);
   const stashPulseTimeoutRef = useRef<number | null>(null);
   /**
@@ -1477,7 +2005,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
     (!isComposerCollapsedMobile && showPlanFollowUpPrompt && activeProposedPlan !== null);
   const showCollapsedMobilePromptRow =
     isComposerCollapsedMobile && !isComposerApprovalState && pendingUserInputs.length === 0;
-
+  const showComposerAttachAction = fileStagingLimit !== null && pendingUserInputs.length === 0;
   const composerFooterHasWideActions = showPlanFollowUpPrompt || activePendingProgress !== null;
   const composerFooterActionLayoutKey = useMemo(() => {
     if (activePendingProgress) {
@@ -1544,7 +2072,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
     onPromptChange: setPromptFromTraits,
     planModeEnabled: settings.planModeEnabled,
   });
-  const providerTraitsPicker = renderProviderTraitsPicker({
+  const providerTraitsPickerInput = {
     provider: selectedProvider,
     instanceId: selectedInstanceId,
     ...(routeKind === "server" ? { threadRef: routeThreadRef } : {}),
@@ -1555,7 +2083,18 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
     prompt,
     onPromptChange: setPromptFromTraits,
     planModeEnabled: settings.planModeEnabled,
+    isComposerOwned: true,
+  } satisfies Parameters<typeof renderProviderTraitsPicker>[0];
+  const providerTraitsPicker = renderProviderTraitsPicker(providerTraitsPickerInput);
+  const restingProviderTraitsPicker = renderProviderTraitsPicker({
+    ...providerTraitsPickerInput,
+    size: "xs",
   });
+  const {
+    controlsRef: restingComposerControlsRef,
+    hiddenBlockCount: restingControlsHiddenBlockCount,
+    controlsVisible: restingControlsVisible,
+  } = useRestingComposerControlsLayout(restingControlsHost);
   const pendingPrimaryAction = useMemo(
     () =>
       activePendingProgress
@@ -1788,6 +2327,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
     setComposerCursor(collapseExpandedComposerCursor(promptRef.current, promptRef.current.length));
     setComposerTrigger(detectComposerTrigger(promptRef.current, promptRef.current.length));
     setIsDragOverComposer(false);
+    setIsComposerScrollCollapsed(false);
   }, [draftId, activeThreadId, promptRef]);
 
   // ------------------------------------------------------------------
@@ -1931,6 +2471,16 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
   // ------------------------------------------------------------------
   // Callbacks: prompt change
   // ------------------------------------------------------------------
+  const expandComposerForEditorChange = useCallback(() => {
+    // Editor changes win over the momentum tail of the active scroll gesture.
+    suppressActiveComposerScrollGesture(
+      composerScrollGestureRef.current,
+      window.performance.now(),
+      COMPOSER_SCROLL_GESTURE_RESET_MS,
+    );
+    setIsComposerScrollCollapsed(false);
+  }, []);
+
   const onPromptChange = useCallback(
     (
       nextPrompt: string,
@@ -1939,6 +2489,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
       cursorAdjacentToMention: boolean,
       terminalContextIds: string[],
     ) => {
+      expandComposerForEditorChange();
       if (activePendingProgress?.activeQuestion && pendingUserInputs.length > 0) {
         setComposerCursor(nextCursor);
         setComposerTrigger(
@@ -1968,6 +2519,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
     },
     [
       activePendingProgress?.activeQuestion,
+      expandComposerForEditorChange,
       pendingUserInputs.length,
       onChangeActivePendingUserInputCustomAnswer,
       promptRef,
@@ -2029,6 +2581,11 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
       setComposerTrigger(detectComposerTrigger(next.text, nextExpandedCursor));
       if (options?.focusEditorAfterReplace !== false) {
         window.requestAnimationFrame(() => {
+          // Type-to-focus routes only the first key through here; once the
+          // controlled update focuses the editor, later keys land natively.
+          // Skip the deferred caret placement when the draft has moved on,
+          // or it drags the caret back behind what was typed since.
+          if (promptRef.current !== next.text) return;
           composerEditorRef.current?.focusAt(nextCursor);
         });
       }
@@ -2612,7 +3169,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
         // unique image into the overflow list for nothing.
         const existingDedupKeys = new Set(
           composerImagesRef.current.map(
-            (image) => `${image.mimeType}${image.sizeBytes}${image.name}`,
+            (image) => `${image.mimeType}\0${image.sizeBytes}\0${image.name}`,
           ),
         );
         const capacity = Math.max(
@@ -2626,7 +3183,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
           (attachment) =>
             !existingIds.has(attachment.id) &&
             !existingDedupKeys.has(
-              `${attachment.mimeType}${attachment.sizeBytes}${attachment.name}`,
+              `${attachment.mimeType}\0${attachment.sizeBytes}\0${attachment.name}`,
             ),
         );
         // Anything past the attachment limit cannot be restored. The entry is
@@ -2770,10 +3327,11 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
     // the composer has been cleared the user can type something genuinely
     // new (or switch threads) while encoding continues, and that deserves its
     // own entry.
-    const snapshotKey = `${String(composerDraftTarget)}${prompt}${images
+    const attachmentKey = images
       .map((image) => `image:${image.id}`)
       .concat(files.map((file) => `file:${file.id}`))
-      .join(",")}`;
+      .join(",");
+    const snapshotKey = [String(composerDraftTarget), prompt, attachmentKey].join("\n");
     if (stashInFlightRef.current.has(snapshotKey)) return;
     stashInFlightRef.current.add(snapshotKey);
 
@@ -2954,6 +3512,368 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
       steps={activeTaskSteps}
     />
   ) : null;
+  const hasImageAttachmentAttention = standaloneComposerImages.some((image) => {
+    const upload = uploadsByImageId[image.id];
+    const failedInCurrentEnvironment =
+      supportsAttachmentUploads &&
+      upload?.status === "failed" &&
+      upload.environmentId === environmentId;
+    // A failed upload remains actionable in the expanded attachment tray, but
+    // its collapsed thumbnail is enough to signal that the draft has images.
+    return nonPersistedComposerImageIdSet.has(image.id) && !failedInCurrentEnvironment;
+  });
+  // Banners and the tasks badge dock above the surface rather than inside
+  // it, so they do not hold the composer open; only surface-internal chrome
+  // does.
+  const composerHasExpandedChrome =
+    showComposerTopDrawer ||
+    isTasksDrawerOpen ||
+    composerMenuOpen ||
+    isStashMenuOpen ||
+    isDragOverComposer ||
+    isPreparingWorktree ||
+    noProviderAvailable ||
+    projectSelectionRequired ||
+    environmentUnavailable !== null ||
+    composerSubmissionError !== null ||
+    providerInputSubmissionError !== null ||
+    hasImageAttachmentAttention;
+  const isComposerResting = shouldUseRestingComposerLayout({
+    isExistingThread: routeKind === "server" && activeThreadId !== null,
+    isMobileViewport,
+    isFocused: isComposerFocused && !isComposerScrollCollapsed,
+    hasExpandedChrome: composerHasExpandedChrome,
+  });
+  // The relocated controls live in the context strip whenever the composer is
+  // collapsed for any reason, the desktop resting layout or the phone
+  // collapse. Both leave the footer unrendered, so the strip is the only place
+  // to see or change the model without expanding the composer.
+  const composerControlsInStrip = isComposerResting || isComposerCollapsedMobile;
+  const composerControlsVisibleInStrip = composerControlsInStrip && restingControlsVisible;
+  useLayoutEffect(() => {
+    onRestingControlsVisibilityChange(composerControlsVisibleInStrip);
+  }, [composerControlsVisibleInStrip, onRestingControlsVisibilityChange]);
+  const restingImagePreviewCounts = getRestingComposerImagePreviewCounts(
+    standaloneComposerImages.length,
+  );
+  const restingComposerImages = standaloneComposerImages.slice(
+    0,
+    restingImagePreviewCounts.visibleCount,
+  );
+  const collapsedComposerImagePreviews =
+    restingComposerImages.length > 0 ? (
+      <div
+        data-chat-composer-resting-images="true"
+        className="flex shrink-0 items-center gap-1 ps-1"
+      >
+        {restingComposerImages.map((image) => (
+          <button
+            key={image.id}
+            type="button"
+            className="relative size-7 shrink-0 cursor-zoom-in overflow-hidden rounded-md border border-border/70 bg-muted/60"
+            aria-label={`Preview ${image.name}`}
+            onPointerDown={(event) => event.preventDefault()}
+            onClick={() => {
+              const preview = buildExpandedImagePreview(composerImages, image.id);
+              if (preview) onExpandImage(preview);
+            }}
+          >
+            {image.previewUrl ? (
+              <img src={image.previewUrl} alt="" className="size-full object-cover" />
+            ) : (
+              <FileIcon className="m-auto size-3.5 text-secondary-label" />
+            )}
+          </button>
+        ))}
+        {restingImagePreviewCounts.overflowCount > 0 ? (
+          <button
+            type="button"
+            className="flex size-7 shrink-0 cursor-pointer items-center justify-center rounded-md border border-border/70 bg-muted/60 font-medium text-secondary-label text-xs tabular-nums outline-none hover:bg-muted focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background"
+            aria-label={`Show ${String(restingImagePreviewCounts.overflowCount)} more image attachments`}
+            onPointerDown={(event) => event.preventDefault()}
+            onClick={() => {
+              if (isComposerCollapsedMobile) {
+                expandMobileComposer();
+                return;
+              }
+              setIsComposerScrollCollapsed(false);
+              setIsComposerFocused(true);
+              scheduleComposerFocus();
+            }}
+          >
+            +{restingImagePreviewCounts.overflowCount}
+          </button>
+        ) : null}
+      </div>
+    ) : null;
+  const composerMainSurfaceRef = useComposerRestingTransition(
+    composerControlsInStrip,
+    restingComposerControlsRef,
+    onComposerOverlayHeightChange,
+  );
+  const canTrackComposerScrollGesture =
+    routeKind === "server" && activeThreadId !== null && !isMobileViewport;
+  const canScrollCollapseComposer =
+    canTrackComposerScrollGesture && !composerHasExpandedChrome && !showInlineTasksBadge;
+  composerScrollCollapseEligibleRef.current = canScrollCollapseComposer;
+
+  useEffect(() => {
+    if (!canScrollCollapseComposer) {
+      setIsComposerScrollCollapsed(false);
+    }
+  }, [canScrollCollapseComposer]);
+
+  // Returning to the window re-fires focus on the element that already held
+  // it. That focus arrives after the window's own event, so a window focus
+  // marks the frame in which it should be ignored by the form's capture.
+  useEffect(() => {
+    if (!isComposerScrollCollapsed) return;
+    let frame: number | null = null;
+    const onWindowFocus = () => {
+      windowRefocusInFlightRef.current = true;
+      if (frame !== null) window.cancelAnimationFrame(frame);
+      frame = window.requestAnimationFrame(() => {
+        frame = null;
+        windowRefocusInFlightRef.current = false;
+      });
+    };
+    window.addEventListener("focus", onWindowFocus);
+    return () => {
+      window.removeEventListener("focus", onWindowFocus);
+      if (frame !== null) window.cancelAnimationFrame(frame);
+      windowRefocusInFlightRef.current = false;
+    };
+  }, [isComposerScrollCollapsed]);
+
+  useEffect(() => {
+    if (!canTrackComposerScrollGesture) return;
+
+    const finishScrollGesture = () => {
+      if (composerScrollCollapseTimeoutRef.current !== null) {
+        window.clearTimeout(composerScrollCollapseTimeoutRef.current);
+      }
+      composerScrollCollapseTimeoutRef.current = null;
+      resetComposerScrollGesture(composerScrollGestureRef.current);
+    };
+    const handleTimelineWheel = (event: WheelEvent) => {
+      const activeElement = document.activeElement;
+      const isPromptEditorFocused =
+        activeElement instanceof HTMLElement &&
+        activeElement.isContentEditable &&
+        composerFormRef.current?.contains(activeElement) === true;
+      if (event.ctrlKey || !(event.target instanceof Element)) {
+        return;
+      }
+
+      const scrollNode = getTimelineScrollableNode();
+      if (!scrollNode) return;
+      const targetsTimeline = scrollNode.contains(event.target);
+      if (!targetsTimeline && !composerScrollGestureRef.current.collapseSuppressed) return;
+
+      if (composerScrollCollapseTimeoutRef.current !== null) {
+        window.clearTimeout(composerScrollCollapseTimeoutRef.current);
+      }
+      composerScrollCollapseTimeoutRef.current = window.setTimeout(
+        finishScrollGesture,
+        COMPOSER_SCROLL_GESTURE_RESET_MS,
+      );
+
+      const canScrollInGestureDirection =
+        targetsTimeline &&
+        (event.deltaY < 0
+          ? scrollNode.scrollTop > 0
+          : scrollNode.scrollTop < scrollNode.scrollHeight - scrollNode.clientHeight);
+      const deltaPx =
+        Math.abs(event.deltaY) *
+        (event.deltaMode === WheelEvent.DOM_DELTA_LINE
+          ? 16
+          : event.deltaMode === WheelEvent.DOM_DELTA_PAGE
+            ? scrollNode.clientHeight
+            : 1);
+      const shouldCollapse = recordComposerScrollGestureEvent(composerScrollGestureRef.current, {
+        now: window.performance.now(),
+        deltaPx,
+        collapseThresholdPx: COMPOSER_SCROLL_COLLAPSE_THRESHOLD_PX,
+        collapseEligible:
+          targetsTimeline && composerScrollCollapseEligibleRef.current && isPromptEditorFocused,
+        canScrollInGestureDirection,
+        scrollsTowardLogicalEnd: event.deltaY > 0 && isTimelineAtLogicalEnd(),
+      });
+      if (!shouldCollapse) {
+        return;
+      }
+
+      setIsComposerScrollCollapsed(true);
+    };
+
+    document.addEventListener("wheel", handleTimelineWheel, { capture: true, passive: true });
+    return () => {
+      document.removeEventListener("wheel", handleTimelineWheel, true);
+      finishScrollGesture();
+    };
+  }, [
+    activeThreadId,
+    canTrackComposerScrollGesture,
+    getTimelineScrollableNode,
+    isTimelineAtLogicalEnd,
+  ]);
+
+  const restingHiddenBlockCount = composerControlsInStrip ? restingControlsHiddenBlockCount : 0;
+  const composerControlsCompact = !composerControlsInStrip && isComposerFooterCompact;
+  const restingBlockDefs = [
+    ...(providerTraitsPicker
+      ? [
+          {
+            id: "traits",
+            content: (
+              <>
+                <ComposerControlSeparator size={composerControlsInStrip ? "xs" : "sm"} />
+                {composerControlsInStrip ? restingProviderTraitsPicker : providerTraitsPicker}
+              </>
+            ),
+          },
+        ]
+      : []),
+    {
+      id: "mode",
+      content: (
+        <ComposerFooterModeControls
+          provider={selectedProvider}
+          showInteractionModeToggle={composerProviderControls.showInteractionModeToggle}
+          interactionMode={interactionMode}
+          runtimeMode={runtimeMode}
+          size={composerControlsInStrip ? "xs" : "sm"}
+          onToggleInteractionMode={toggleInteractionMode}
+          onRuntimeModeChange={handleRuntimeModeChange}
+        />
+      ),
+    },
+  ];
+  const hiddenRestingBlockIds = restingBlockDefs
+    .slice(restingBlockDefs.length - restingHiddenBlockCount)
+    .map((def) => def.id);
+  const composerControls = noProviderAvailable ? (
+    <Button
+      type="button"
+      size="sm"
+      variant="ghost"
+      disabled
+      data-chat-provider-unavailable="true"
+      className="shrink-0 gap-2 px-2 text-secondary-label sm:px-3"
+    >
+      <CircleAlertIcon className="size-4" />
+      No provider available
+    </Button>
+  ) : (
+    <>
+      {composerControlsInStrip && restingControlsHaveLeadingContext ? (
+        <ComposerControlSeparator
+          size="xs"
+          className="@max-[400px]/composer-surface:hidden"
+          data-resting-controls-separator="true"
+        />
+      ) : null}
+      <ProviderModelPicker
+        isComposerOwned
+        compact={composerControlsCompact}
+        activeInstanceId={selectedInstanceId}
+        model={selectedModelForPickerWithCustomFallback}
+        lockedProvider={lockedProvider}
+        lockedContinuationGroupKey={lockedContinuationGroupKey}
+        instanceEntries={providerInstanceEntries}
+        keybindings={keybindings}
+        modelOptionsByInstance={modelOptionsByInstance}
+        size={composerControlsInStrip ? "xs" : "sm"}
+        triggerClassName={
+          composerControlsInStrip
+            ? "min-w-13 shrink text-xs! @max-[640px]/composer-surface:[&_[data-chat-provider-model-picker-label]]:w-0 @max-[640px]/composer-surface:[&_[data-chat-provider-model-picker-label]]:flex-none"
+            : "-ms-2.5"
+        }
+        terminalOpen={terminalOpen}
+        open={isComposerModelPickerOpen}
+        instanceIndicatorBackground={
+          composerControlsInStrip
+            ? "color-mix(in srgb, var(--chat-composer-glass-surface) var(--glass-opacity), transparent)"
+            : "var(--contrast-input)"
+        }
+        {...(composerProviderState.modelPickerIconClassName || composerControlsInStrip
+          ? {
+              activeProviderIconClassName: cn(
+                composerProviderState.modelPickerIconClassName,
+                composerControlsInStrip &&
+                  "fill-muted-foreground/70! text-muted-foreground/70! [&_path]:fill-muted-foreground/70! [&_rect]:fill-muted-foreground/70!",
+              ),
+            }
+          : {})}
+        onOpenChange={setIsComposerModelPickerOpen}
+        getModelDisabledReason={getModelDisabledReason}
+        onInstanceModelChange={onProviderModelSelect}
+      />
+
+      {composerControlsCompact ? (
+        <CompactComposerControlsMenu
+          provider={selectedProvider}
+          interactionMode={interactionMode}
+          runtimeMode={runtimeMode}
+          showInteractionModeToggle={composerProviderControls.showInteractionModeToggle}
+          traitsMenuContent={providerTraitsMenuContent}
+          onToggleInteractionMode={toggleInteractionMode}
+          onRuntimeModeChange={handleRuntimeModeChange}
+        />
+      ) : (
+        <>
+          {restingBlockDefs.map((def, index) => {
+            if (!composerControlsInStrip) {
+              return <Fragment key={def.id}>{def.content}</Fragment>;
+            }
+            const hidden = index >= restingBlockDefs.length - restingHiddenBlockCount;
+            return (
+              <div
+                key={def.id}
+                data-resting-block={def.id}
+                aria-hidden={hidden || undefined}
+                inert={hidden || undefined}
+                className={cn(
+                  "flex w-max min-w-max shrink-0 items-center gap-1",
+                  hidden && "pointer-events-none invisible absolute",
+                )}
+              >
+                {def.content}
+              </div>
+            );
+          })}
+          {composerControlsInStrip ? (
+            <div
+              data-resting-controls-overflow
+              aria-hidden={hiddenRestingBlockIds.length === 0 || undefined}
+              inert={hiddenRestingBlockIds.length === 0 || undefined}
+              className={cn(
+                "min-w-0 shrink-0",
+                hiddenRestingBlockIds.length === 0 && "pointer-events-none invisible absolute",
+              )}
+            >
+              <CompactComposerControlsMenu
+                provider={selectedProvider}
+                interactionMode={interactionMode}
+                runtimeMode={runtimeMode}
+                size="xs"
+                hidden={hiddenRestingBlockIds.length === 0}
+                showInteractionModeToggle={
+                  composerProviderControls.showInteractionModeToggle &&
+                  hiddenRestingBlockIds.includes("mode")
+                }
+                traitsMenuContent={
+                  hiddenRestingBlockIds.includes("traits") ? providerTraitsMenuContent : undefined
+                }
+                onToggleInteractionMode={toggleInteractionMode}
+                onRuntimeModeChange={handleRuntimeModeChange}
+              />
+            </div>
+          ) : null}
+        </>
+      )}
+    </>
+  );
   const showTasksTab =
     !hasBannerItems &&
     !showComposerTopDrawer &&
@@ -3288,8 +4208,17 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
   );
 
   const insertComposerTextAtEnd = useCallback<ChatComposerHandle["insertTextAtEnd"]>(
-    (text, options) => insertComposerText(text, "end", options),
-    [insertComposerText],
+    (text, options) => {
+      const inserted = insertComposerText(text, "end", options);
+      if (inserted && isComposerCollapsedMobile) {
+        // The expanded editor is hidden at phone widths, so its scheduled
+        // focus cannot expand the composer by itself. Reveal it before the
+        // focus frame runs to preserve type-to-focus and external inserts.
+        expandMobileComposer();
+      }
+      return inserted;
+    },
+    [expandMobileComposer, insertComposerText, isComposerCollapsedMobile],
   );
 
   // File-tree drags land as mentions. Handled in the capture phase so the
@@ -3334,10 +4263,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
     void onImplementPlanInNewThread();
   }, [onImplementPlanInNewThread]);
   const scheduleComposerCollapseCheck = useCallback(() => {
-    if (!isMobileViewport) {
-      return;
-    }
-    if (mobileComposerExpandInFlightRef.current) {
+    if (isMobileViewport && mobileComposerExpandInFlightRef.current) {
       return;
     }
     if (composerBlurFrameRef.current !== null) {
@@ -3345,7 +4271,10 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
     }
     composerBlurFrameRef.current = window.requestAnimationFrame(() => {
       composerBlurFrameRef.current = null;
-      if (mobileComposerExpandInFlightRef.current) {
+      if (isMobileViewport && mobileComposerExpandInFlightRef.current) {
+        return;
+      }
+      if (!isMobileViewport && desktopOutsidePointerInFlightRef.current) {
         return;
       }
       const composerSurface = composerSurfaceRef.current;
@@ -3365,6 +4294,73 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
     });
   }, [isMobileViewport]);
 
+  useEffect(() => {
+    if (isMobileViewport || !isComposerFocused) return;
+
+    const isInsideDesktopComposerFocusScope = (target: EventTarget | null) =>
+      Boolean(
+        target instanceof Node &&
+        (composerFormRef.current?.contains(target) ||
+          (target instanceof Element && isInsideComposerFloatingLayer(target))),
+      );
+    const handleFocusIn = (event: FocusEvent) => {
+      if (!isInsideDesktopComposerFocusScope(event.target)) {
+        if (desktopOutsidePointerInFlightRef.current) {
+          return;
+        }
+        setIsComposerFocused(false);
+      }
+    };
+    const handlePointerDown = (event: PointerEvent) => {
+      if (!isInsideDesktopComposerFocusScope(event.target)) {
+        desktopOutsidePointerInFlightRef.current = true;
+        if (desktopOutsidePointerReleaseTimeoutRef.current !== null) {
+          window.clearTimeout(desktopOutsidePointerReleaseTimeoutRef.current);
+          desktopOutsidePointerReleaseTimeoutRef.current = null;
+        }
+      }
+    };
+    const finishOutsidePointerInteraction = () => {
+      desktopOutsidePointerInFlightRef.current = false;
+      if (desktopOutsidePointerReleaseTimeoutRef.current !== null) {
+        window.clearTimeout(desktopOutsidePointerReleaseTimeoutRef.current);
+        desktopOutsidePointerReleaseTimeoutRef.current = null;
+      }
+      scheduleComposerCollapseCheck();
+    };
+    const handlePointerUp = () => {
+      if (!desktopOutsidePointerInFlightRef.current) return;
+      desktopOutsidePointerReleaseTimeoutRef.current = window.setTimeout(() => {
+        if (desktopOutsidePointerInFlightRef.current) {
+          finishOutsidePointerInteraction();
+        }
+      }, 0);
+    };
+    const handleClick = () => {
+      if (desktopOutsidePointerInFlightRef.current) {
+        finishOutsidePointerInteraction();
+      }
+    };
+
+    document.addEventListener("focusin", handleFocusIn, true);
+    document.addEventListener("pointerdown", handlePointerDown, true);
+    document.addEventListener("pointerup", handlePointerUp, true);
+    document.addEventListener("pointercancel", handlePointerUp, true);
+    document.addEventListener("click", handleClick);
+    return () => {
+      document.removeEventListener("focusin", handleFocusIn, true);
+      document.removeEventListener("pointerdown", handlePointerDown, true);
+      document.removeEventListener("pointerup", handlePointerUp, true);
+      document.removeEventListener("pointercancel", handlePointerUp, true);
+      document.removeEventListener("click", handleClick);
+      if (desktopOutsidePointerReleaseTimeoutRef.current !== null) {
+        window.clearTimeout(desktopOutsidePointerReleaseTimeoutRef.current);
+        desktopOutsidePointerReleaseTimeoutRef.current = null;
+      }
+      desktopOutsidePointerInFlightRef.current = false;
+    };
+  }, [isComposerFocused, isMobileViewport, scheduleComposerCollapseCheck]);
+
   useEffect(() => {
     return () => {
       if (composerBlurFrameRef.current !== null) {
@@ -3391,6 +4387,9 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
       focusAt: (cursor: number) => {
         composerEditorRef.current?.focusAt(cursor);
       },
+      restoreAfterTimelineReachedEnd: () => {
+        setIsComposerScrollCollapsed(false);
+      },
       addDroppedFiles: (files: File[]) => {
         void addComposerAttachments(files);
         focusComposer();
@@ -3534,8 +4533,31 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
     <form
       ref={composerFormRef}
       onSubmit={submitComposer}
+      onPointerDownCapture={(event) => {
+        const target = event.target;
+        if (isInsideRestingComposerControlScope(target)) return;
+        if (!(target instanceof Element)) return;
+        const isInteractive = Boolean(
+          target.closest('button, a, input, select, [role="button"], [role="menuitem"]'),
+        );
+        if (isInteractive) return;
+
+        setIsComposerScrollCollapsed(false);
+        if (isComposerResting && !target.closest('[data-testid="composer-editor"]')) {
+          // Clicking resting-surface padding would otherwise blur the still
+          // focused editor after pointerdown: expansion starts, the blur check
+          // runs, and it immediately collapses again. Treat that padding like
+          // the editor without stealing native caret placement from text.
+          event.preventDefault();
+          setIsComposerFocused(true);
+          scheduleComposerFocus();
+        }
+      }}
       onFocusCapture={(event) => {
         const activeElement = event.target;
+        if (composerControlsInStrip && isInsideRestingComposerControlScope(activeElement)) {
+          return;
+        }
         if (
           isComposerCollapsedMobile &&
           activeElement instanceof HTMLElement &&
@@ -3543,6 +4565,12 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
         ) {
           return;
         }
+        // Focus returning from another window or tab lands on the element
+        // that already held it, which is not a request to expand a
+        // scroll-collapsed composer.
+        if (!windowRefocusInFlightRef.current) {
+          setIsComposerScrollCollapsed(false);
+        }
         if (composerBlurFrameRef.current !== null) {
           window.cancelAnimationFrame(composerBlurFrameRef.current);
           composerBlurFrameRef.current = null;
@@ -3552,13 +4580,42 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
       onBlurCapture={() => {
         scheduleComposerCollapseCheck();
       }}
-      onDragEnterCapture={composerMentionDragHandlers.onDragEnter}
-      onDragOverCapture={composerMentionDragHandlers.onDragOver}
-      onDragLeaveCapture={onComposerMentionDragLeaveCapture}
-      onDropCapture={composerMentionDragHandlers.onDrop}
+      onDragEnterCapture={(event) => {
+        if (isInsideRestingComposerControlScope(event.target)) return;
+        composerMentionDragHandlers.onDragEnter(event);
+      }}
+      onDragOverCapture={(event) => {
+        if (isInsideRestingComposerControlScope(event.target)) return;
+        composerMentionDragHandlers.onDragOver(event);
+      }}
+      onDragLeaveCapture={(event) => {
+        if (isInsideRestingComposerControlScope(event.target)) return;
+        onComposerMentionDragLeaveCapture(event);
+      }}
+      onDropCapture={(event) => {
+        if (isInsideRestingComposerControlScope(event.target)) return;
+        composerMentionDragHandlers.onDrop(event);
+      }}
       className="mx-auto w-full min-w-0 max-w-3xl"
       data-chat-composer-form="true"
     >
+      {composerControlsInStrip && restingControlsHost
+        ? createPortal(
+            <div
+              ref={restingComposerControlsRef}
+              data-chat-composer-resting-controls="true"
+              aria-hidden={restingControlsVisible ? undefined : true}
+              inert={restingControlsVisible ? undefined : true}
+              className={cn(
+                "relative flex w-max min-w-0 max-w-full items-center gap-1 font-normal text-muted-foreground/70 [&_button]:text-xs!",
+                !restingControlsVisible && "invisible",
+              )}
+            >
+              {composerControls}
+            </div>,
+            restingControlsHost,
+          )
+        : null}
       <ComposerBanner.Dock>
         <ComposerBanner.Column>
           <ComposerBannerStack
@@ -3716,7 +4773,10 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
         ) : null}
       </ComposerBanner.Dock>
       <div className="relative">
-        <ComposerSurface.Main className={composerProviderState.composerFrameClassName}>
+        <ComposerSurface.Main
+          ref={composerMainSurfaceRef}
+          className={composerProviderState.composerFrameClassName}
+        >
           <div
             ref={composerSurfaceRef}
             data-chat-composer-surface="true"
@@ -3732,6 +4792,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
               <div className="flex items-center justify-between gap-2 px-3 py-2">
                 <button
                   type="button"
+                  data-chat-composer-transition-prompt="true"
                   className={cn(
                     "min-w-0 flex-1 truncate bg-transparent p-0 text-left text-[14px] focus:outline-none",
                     (activePendingProgress ? activePendingProgress.customAnswer : prompt.trim())
@@ -3748,8 +4809,10 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
                     : prompt.trim() ||
                       (noProviderAvailable ? "Enable a provider in Settings" : "Ask anything...")}
                 </button>
+                {collapsedComposerImagePreviews}
                 <button
                   type="button"
+                  data-chat-composer-transition-actions="true"
                   className="flex size-8 shrink-0 items-center justify-center rounded-full bg-message-action text-message-action-foreground hover:bg-message-action-hover disabled:opacity-30"
                   disabled={collapsedComposerPrimaryActionDisabled}
                   aria-label={collapsedComposerPrimaryActionLabel}
@@ -3774,11 +4837,13 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 
             <div
               ref={setComposerMenuAnchor}
+              data-chat-composer-body="true"
               className={cn(
                 "relative px-3 pb-2 sm:px-4",
                 "pt-3.5 sm:pt-4",
                 isComposerApprovalState && "pb-3 sm:pb-4",
                 isComposerCollapsedMobile && "hidden",
+                isComposerResting && "py-2 sm:py-2",
               )}
             >
               {isStashMenuOpen && !composerMenuOpen && !isComposerApprovalState && (
@@ -3874,25 +4939,17 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
                 !isComposerApprovalState &&
                 pendingUserInputs.length === 0 &&
                 (composerVideos.length > 0 ||
-                  composerImages.some(
-                    (image) =>
-                      !composerPreviewAnnotations.some((annotation) => annotation.id === image.id),
-                  )) && (
+                  (!isComposerResting && standaloneComposerImages.length > 0)) && (
                   <div className="mb-3 flex flex-wrap gap-2">
-                    {composerImages
-                      .filter(
-                        (image) =>
-                          !composerPreviewAnnotations.some(
-                            (annotation) => annotation.id === image.id,
-                          ),
-                      )
-                      .map((image) => {
+                    {!isComposerResting &&
+                      standaloneComposerImages.map((image) => {
                         const upload = supportsAttachmentUploads
                           ? uploadsByImageId[image.id]
                           : undefined;
                         return (
                           <div
                             key={image.id}
+                            data-chat-composer-expanded-image="true"
                             className="relative h-16 w-16 overflow-hidden rounded-lg border border-border/80 bg-background"
                           >
                             {image.previewUrl ? (
@@ -3994,7 +5051,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
                         maxFileAttachmentBytes !== null &&
                         file.sizeBytes <= maxFileAttachmentBytes;
                       const upload = fileCanUpload ? uploadsByImageId[file.id] : undefined;
-                      const isOpening = file.uploadedAttachmentId === openingVideoAttachmentId;
                       return (
                         <div
                           key={file.id}
@@ -4002,12 +5058,9 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
                         >
                           <button
                             type="button"
-                            className="flex h-full w-full cursor-zoom-in flex-col items-center justify-center gap-1 px-1 text-white aria-disabled:cursor-default aria-disabled:opacity-50"
-                            aria-busy={isOpening || undefined}
-                            aria-disabled={isOpening || undefined}
-                            aria-label={`${isOpening ? "Loading" : "Play"} ${file.name}`}
+                            className="flex h-full w-full cursor-zoom-in flex-col items-center justify-center gap-1 px-1 text-white"
+                            aria-label={`Play ${file.name}`}
                             onClick={() => {
-                              if (isOpening) return;
                               if (file.file !== null) {
                                 const preview = buildExpandedImagePreview([file], file.id);
                                 if (preview) onExpandImage(preview);
@@ -4023,11 +5076,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
                                 <span className="pointer-events-none absolute inset-0 bg-gradient-to-t from-black/70 via-black/10 to-black/10" />
                               </>
                             )}
-                            {isOpening ? (
-                              <span className="relative z-10 text-[10px]">Loading…</span>
-                            ) : (
-                              <PlayIcon className="relative z-10 size-4 fill-current drop-shadow-md" />
-                            )}
+                            <PlayIcon className="relative z-10 size-4 fill-current drop-shadow-md" />
                           </button>
                           {upload?.status === "uploading" && (
                             <span className="pointer-events-none absolute inset-x-0 bottom-0 bg-background/85 px-1 text-center text-[10px] text-foreground">
@@ -4150,7 +5199,13 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
                   </div>
                 )}
 
-              <div className="relative">
+              <div
+                className={cn(
+                  "relative",
+                  isComposerResting && "flex min-w-0 items-center gap-1",
+                  isComposerResting && (showComposerAttachAction ? "pr-20" : "pr-12"),
+                )}
+              >
                 <ComposerPromptEditor
                   editorRef={composerEditorRef}
                   value={
@@ -4167,10 +5222,23 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
                       : []
                   }
                   skills={selectedProviderSkills}
-                  {...(showMobilePendingAnswerActions ? { className: "max-sm:pb-11" } : {})}
+                  containerClassName={cn(isComposerResting && "min-w-0 flex-1")}
+                  className={cn(
+                    showMobilePendingAnswerActions && "max-sm:pb-11",
+                    isComposerResting &&
+                      "max-h-8 min-h-8 overflow-hidden whitespace-nowrap! leading-8",
+                  )}
+                  placeholderClassName={cn(
+                    isComposerResting &&
+                      "flex items-center overflow-hidden whitespace-nowrap leading-8",
+                  )}
                   onRemoveTerminalContext={removeComposerTerminalContextFromDraft}
                   onChange={onPromptChange}
+                  onVisibleSelectionChange={expandComposerForEditorChange}
                   onCommandKeyDown={onComposerCommandKey}
+                  onPageScrollKeyDown={onPageScrollKeyDown}
+                  onPageScrollKeyUp={onPageScrollKeyUp}
+                  onPageScrollRelease={onPageScrollRelease}
                   onPaste={onComposerPaste}
                   placeholder={
                     isComposerApprovalState
@@ -4190,6 +5258,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
                   }
                   disabled={isConnecting || isComposerApprovalState || projectSelectionRequired}
                 />
+                {isComposerResting ? collapsedComposerImagePreviews : null}
                 {showMobilePendingAnswerActions ? (
                   <div
                     data-chat-composer-mobile-pending-actions="true"
@@ -4235,96 +5304,32 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
                   pendingUserInputs.length > 0 && "pt-2",
                   isComposerFooterCompact ? "gap-1.5" : "gap-2 sm:gap-0",
                   showMobilePendingAnswerActions && "hidden sm:flex",
+                  isComposerResting &&
+                    "absolute bottom-px right-px z-10 h-12 w-auto gap-0 py-0 sm:gap-0 sm:py-0",
                 )}
               >
                 <div
                   ref={composerFooterControlsRef}
+                  data-chat-composer-controls="left"
                   data-chat-composer-footer-controls="true"
-                  className="-m-1 -ms-3.5 flex min-w-0 flex-1 items-center gap-1 overflow-x-auto p-1 ps-3.5 [scrollbar-width:none] [&::-webkit-scrollbar]:hidden"
-                >
-                  {noProviderAvailable ? (
-                    <Button
-                      type="button"
-                      size="sm"
-                      variant="ghost"
-                      disabled
-                      data-chat-provider-unavailable="true"
-                      className="shrink-0 gap-2 px-2 text-secondary-label sm:px-3"
-                    >
-                      <CircleAlertIcon className="size-4" />
-                      No provider available
-                    </Button>
-                  ) : (
-                    <ProviderModelPicker
-                      compact={isComposerFooterCompact}
-                      activeInstanceId={selectedInstanceId}
-                      model={selectedModelForPickerWithCustomFallback}
-                      lockedProvider={lockedProvider}
-                      lockedContinuationGroupKey={lockedContinuationGroupKey}
-                      instanceEntries={providerInstanceEntries}
-                      keybindings={keybindings}
-                      modelOptionsByInstance={modelOptionsByInstance}
-                      triggerClassName="-ms-2.5"
-                      terminalOpen={terminalOpen}
-                      open={isComposerModelPickerOpen}
-                      {...(composerProviderState.modelPickerIconClassName
-                        ? {
-                            activeProviderIconClassName:
-                              composerProviderState.modelPickerIconClassName,
-                          }
-                        : {})}
-                      onOpenChange={(open) => {
-                        setIsComposerModelPickerOpen(open);
-                      }}
-                      getModelDisabledReason={getModelDisabledReason}
-                      onInstanceModelChange={onProviderModelSelect}
-                    />
-                  )}
-
-                  {isComposerFooterCompact ? (
-                    <CompactComposerControlsMenu
-                      provider={selectedProvider}
-                      interactionMode={interactionMode}
-                      runtimeMode={runtimeMode}
-                      showInteractionModeToggle={composerProviderControls.showInteractionModeToggle}
-                      traitsMenuContent={providerTraitsMenuContent}
-                      onToggleInteractionMode={toggleInteractionMode}
-                      onRuntimeModeChange={handleRuntimeModeChange}
-                    />
-                  ) : (
-                    <>
-                      {providerTraitsPicker ? (
-                        <>
-                          <Separator
-                            orientation="vertical"
-                            className="mx-0.5 hidden h-4 sm:block"
-                          />
-                          {providerTraitsPicker}
-                        </>
-                      ) : null}
-                      <ComposerFooterModeControls
-                        provider={selectedProvider}
-                        showInteractionModeToggle={
-                          composerProviderControls.showInteractionModeToggle
-                        }
-                        interactionMode={interactionMode}
-                        runtimeMode={runtimeMode}
-                        onToggleInteractionMode={toggleInteractionMode}
-                        onRuntimeModeChange={handleRuntimeModeChange}
-                      />
-                    </>
+                  className={cn(
+                    "-m-1 -ms-3.5 flex min-w-0 flex-1 items-center gap-1 overflow-x-auto p-1 ps-3.5 [scrollbar-width:none] [&::-webkit-scrollbar]:hidden",
+                    isComposerResting && "hidden",
                   )}
+                >
+                  {composerControlsInStrip ? null : composerControls}
                 </div>
 
                 {/* Right side: send / stop button */}
                 <div
                   data-chat-composer-actions="right"
+                  data-chat-composer-transition-actions="true"
                   data-chat-composer-primary-actions-compact={
                     isComposerPrimaryActionsCompact ? "true" : "false"
                   }
                   className="flex shrink-0 flex-nowrap items-center justify-end gap-2"
                 >
-                  {fileStagingLimit !== null && pendingUserInputs.length === 0 ? (
+                  {showComposerAttachAction ? (
                     <>
                       <input
                         ref={attachmentInputRef}
@@ -4358,7 +5363,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
                     </>
                   ) : null}
                   <ComposerFooterPrimaryActions
-                    compact={isComposerPrimaryActionsCompact}
+                    compact={isComposerResting || isComposerPrimaryActionsCompact}
                     activeContextWindow={
                       settings.contextWindowMeterEnabled ? activeContextWindow : null
                     }
@@ -4379,8 +5384,9 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
                     }
                     isPreparingWorktree={isPreparingWorktree}
                     hasSendableContent={composerSendState.hasSendableContent}
-                    preserveComposerFocusOnPointerDown={isMobileViewport}
+                    preserveComposerFocusOnPointerDown={isMobileViewport || isComposerResting}
                     showSendWhileRunning={isMobileViewport}
+                    showSecondaryStatus={!isComposerResting}
                     onPreviousPendingQuestion={onPreviousActivePendingUserInputQuestion}
                     onInterrupt={handleInterruptPrimaryAction}
                     onImplementPlanInNewThread={handleImplementPlanInNewThreadPrimaryAction}
diff --git a/apps/web/src/components/chat/ChatHeader.tsx b/apps/web/src/components/chat/ChatHeader.tsx
index dde6fd0dade4..1dcf9887704c 100644
--- a/apps/web/src/components/chat/ChatHeader.tsx
+++ b/apps/web/src/components/chat/ChatHeader.tsx
@@ -56,6 +56,7 @@ interface ChatHeaderProps {
   activeProjectName: string | undefined;
   activeProjectCwd: string | null;
   activeProjectFaviconPath: string | null;
+  activeProjectIcon: import("@t3tools/contracts").ProjectIconOverride | null;
   openInCwd: string | null;
   activeProjectScripts: ReadonlyArray<ProjectScript> | undefined;
   preferredScriptId: string | null;
@@ -126,6 +127,7 @@ export const ChatHeader = memo(function ChatHeader({
   activeProjectName,
   activeProjectCwd,
   activeProjectFaviconPath,
+  activeProjectIcon,
   openInCwd,
   activeProjectScripts,
   preferredScriptId,
@@ -325,7 +327,9 @@ export const ChatHeader = memo(function ChatHeader({
                   <ProjectFavicon
                     environmentId={activeThreadEnvironmentId}
                     cwd={activeProjectCwd ?? ""}
+                    projectName={activeProjectName}
                     faviconPath={activeProjectFaviconPath}
+                    projectIcon={activeProjectIcon}
                     className="size-3.5"
                   />
                   <span className="max-w-40 truncate">{activeProjectName}</span>
diff --git a/apps/web/src/components/chat/CompactComposerControlsMenu.tsx b/apps/web/src/components/chat/CompactComposerControlsMenu.tsx
index 2f17f6c03be2..d30fd0e46841 100644
--- a/apps/web/src/components/chat/CompactComposerControlsMenu.tsx
+++ b/apps/web/src/components/chat/CompactComposerControlsMenu.tsx
@@ -1,7 +1,6 @@
 import { ProviderDriverKind, ProviderInteractionMode, RuntimeMode } from "@t3tools/contracts";
-import { memo, type ReactNode } from "react";
+import { memo, type ReactNode, useState } from "react";
 import { EllipsisIcon } from "lucide-react";
-import { Button } from "../ui/button";
 import {
   Menu,
   MenuPopup,
@@ -10,6 +9,8 @@ import {
   MenuSeparator as MenuDivider,
   MenuTrigger,
 } from "../ui/menu";
+import { ComposerControl, ComposerControlIcon } from "./ComposerControl";
+import { composerFloatingLayerProps } from "./composerEventScope";
 import { getRuntimeModeConfig, getRuntimeModeOptions } from "./runtimeModePresentation";
 
 export const CompactComposerControlsMenu = memo(function CompactComposerControlsMenu(props: {
@@ -18,27 +19,45 @@ export const CompactComposerControlsMenu = memo(function CompactComposerControls
   runtimeMode: RuntimeMode;
   showInteractionModeToggle: boolean;
   traitsMenuContent?: ReactNode;
+  size?: "sm" | "xs";
+  /**
+   * The resting strip keeps this menu mounted out of flow while every block
+   * fits inline. Its portaled popup would outlive that transition, so an
+   * open menu closes when its trigger hides.
+   */
+  hidden?: boolean;
   onToggleInteractionMode: () => void;
   onRuntimeModeChange: (mode: RuntimeMode) => void;
 }) {
   const runtimeModeConfig = getRuntimeModeConfig(props.provider);
   const runtimeModeOptions = getRuntimeModeOptions(props.provider);
+  const size = props.size ?? "sm";
+  const [open, setOpen] = useState(false);
+  const hidden = props.hidden ?? false;
+  // Base UI does not report a close it did not initiate, so clear the state
+  // when the trigger hides or the menu would reopen by itself when the
+  // trigger returns.
+  const [wasHidden, setWasHidden] = useState(hidden);
+  if (hidden !== wasHidden) {
+    setWasHidden(hidden);
+    if (hidden) setOpen(false);
+  }
 
   return (
-    <Menu>
+    <Menu open={open && !hidden} onOpenChange={setOpen}>
       <MenuTrigger
         render={
-          <Button
-            size="sm"
+          <ComposerControl
+            size={size}
             variant="ghost"
-            className="shrink-0 px-2 text-muted-foreground/70 hover:text-foreground/80"
+            className={size === "xs" ? "shrink-0" : "shrink-0 px-2"}
             aria-label="More composer controls"
           />
         }
       >
-        <EllipsisIcon aria-hidden="true" className="size-4" />
+        <ComposerControlIcon icon={EllipsisIcon} size={size} />
       </MenuTrigger>
-      <MenuPopup align="start">
+      <MenuPopup align="start" {...composerFloatingLayerProps}>
         {props.traitsMenuContent ? (
           <>
             {props.traitsMenuContent}
diff --git a/apps/web/src/components/chat/ComposerBanner.tsx b/apps/web/src/components/chat/ComposerBanner.tsx
index 3200c2e196e6..90da8940d498 100644
--- a/apps/web/src/components/chat/ComposerBanner.tsx
+++ b/apps/web/src/components/chat/ComposerBanner.tsx
@@ -58,7 +58,7 @@ function Surface({
         "before:bg-[color-mix(in_srgb,var(--chat-composer-attached-surface)_var(--glass-opacity),transparent)] before:bg-[linear-gradient(var(--chat-composer-attached-tint),var(--chat-composer-attached-tint))] before:backdrop-blur-(--glass-blur) before:backdrop-saturate-(--glass-saturation)",
         "before:mask-[linear-gradient(to_top,transparent_0_var(--chat-composer-attachment-overlap),black_var(--chat-composer-attachment-overlap))] before:shadow-[0_12px_28px_-18px_rgb(0_0_0/40%)] dark:before:shadow-[0_14px_32px_-18px_rgb(0_0_0/75%)]",
         "dark:supports-[(backdrop-filter:blur(1px))_or_(-webkit-backdrop-filter:blur(1px))]:before:bg-[linear-gradient(var(--chat-composer-attached-tint),var(--chat-composer-attached-tint)),linear-gradient(to_top,transparent_0_var(--chat-composer-attachment-overlap),rgb(0_0_0/18%)_var(--chat-composer-attachment-overlap),transparent_calc(var(--chat-composer-attachment-overlap)+10px))]",
-        "not-supports-[(backdrop-filter:blur(1px))_or_(-webkit-backdrop-filter:blur(1px))]:before:bg-(--chat-composer-attached-surface)",
+        "not-supports-[((backdrop-filter:blur(1px))_or_(-webkit-backdrop-filter:blur(1px)))]:before:bg-(--chat-composer-attached-surface)",
         className,
       )}
       {...props}
@@ -89,7 +89,7 @@ function Peek({
         neutralOutline,
         "absolute inset-x-0 bottom-0 z-0 mx-auto h-3 w-[96%] cursor-pointer rounded-t-2xl border border-b-0 shadow-[0_6px_18px_rgb(0_0_0/6%)]",
         "bg-[color-mix(in_srgb,var(--chat-composer-attached-surface)_var(--glass-opacity),transparent)] backdrop-blur-(--glass-blur) backdrop-saturate-(--glass-saturation)",
-        "not-supports-[(backdrop-filter:blur(1px))_or_(-webkit-backdrop-filter:blur(1px))]:bg-(--chat-composer-attached-surface)",
+        "not-supports-[((backdrop-filter:blur(1px))_or_(-webkit-backdrop-filter:blur(1px)))]:bg-(--chat-composer-attached-surface)",
         "transition-opacity duration-150 ease-out focus-visible:outline-2 focus-visible:outline-ring",
         peekBorder[variant],
         className,
diff --git a/apps/web/src/components/chat/ComposerControl.test.tsx b/apps/web/src/components/chat/ComposerControl.test.tsx
new file mode 100644
index 000000000000..397578179b9f
--- /dev/null
+++ b/apps/web/src/components/chat/ComposerControl.test.tsx
@@ -0,0 +1,76 @@
+import { renderToStaticMarkup } from "react-dom/server";
+import { BotIcon } from "lucide-react";
+import { describe, expect, it } from "vite-plus/test";
+
+import {
+  ComposerControl,
+  ComposerControlChevron,
+  ComposerControlIcon,
+  ComposerControlSeparator,
+} from "./ComposerControl";
+
+describe("ComposerControl", () => {
+  it("preserves the expanded composer geometry by default", () => {
+    const markup = renderToStaticMarkup(<ComposerControl>Model</ComposerControl>);
+
+    expect(markup).toContain("h-7");
+    expect(markup).toContain("min-h-7");
+    expect(markup).toContain("gap-1.5");
+    expect(markup).toContain("px-2.5");
+  });
+
+  it("uses the shared xs geometry for resting controls", () => {
+    const markup = renderToStaticMarkup(
+      <ComposerControl size="xs">
+        Model
+        <ComposerControlChevron size="xs" />
+      </ComposerControl>,
+    );
+
+    expect(markup).toContain("sm:h-6");
+    expect(markup).toContain("font-normal");
+    expect(markup).toContain("text-muted-foreground/70");
+    expect(markup).toContain("[--control-icon-color:currentColor]");
+    expect(markup).toContain("svg[data-composer-control-chevron]]:ms-0");
+    expect(markup).toContain("svg[data-composer-control-chevron]]:-me-1");
+    expect(markup).not.toContain("min-h-7");
+    expect(markup).not.toContain("gap-1.5");
+    expect(markup).not.toContain("px-2.5");
+  });
+
+  it("keeps the expanded chevron treatment unless resting overrides it", () => {
+    const expanded = renderToStaticMarkup(<ComposerControlChevron />);
+    const resting = renderToStaticMarkup(<ComposerControlChevron size="xs" />);
+
+    expect(expanded).toContain("size-3.5");
+    expect(expanded).toContain("text-icon-muted");
+    expect(expanded).toContain('stroke-width="2.25"');
+    expect(resting).toContain("size-3");
+    expect(resting).toContain("text-current");
+    expect(resting).toContain("opacity-50");
+    expect(resting).not.toContain("size-3.5");
+    expect(resting).not.toContain("text-icon-muted");
+  });
+
+  it("owns resting icon geometry", () => {
+    const expanded = renderToStaticMarkup(<ComposerControlIcon icon={BotIcon} />);
+    const resting = renderToStaticMarkup(<ComposerControlIcon icon={BotIcon} size="xs" />);
+
+    expect(expanded).toContain("size-4");
+    expect(resting).toContain("size-3");
+    expect(resting).not.toContain("size-4");
+  });
+
+  it("owns separator geometry for both composer sizes", () => {
+    const expanded = renderToStaticMarkup(<ComposerControlSeparator />);
+    const resting = renderToStaticMarkup(
+      <ComposerControlSeparator size="xs" data-resting-controls-separator="true" />,
+    );
+
+    expect(expanded).toContain("h-4");
+    expect(expanded).not.toContain("h-3.5!");
+    expect(resting).toContain("h-3.5!");
+    expect(resting).not.toContain("h-4");
+    expect(resting).toContain('data-resting-controls-separator="true"');
+  });
+});
diff --git a/apps/web/src/components/chat/ComposerControl.tsx b/apps/web/src/components/chat/ComposerControl.tsx
index c0f15a581dad..7b233a68ba8d 100644
--- a/apps/web/src/components/chat/ComposerControl.tsx
+++ b/apps/web/src/components/chat/ComposerControl.tsx
@@ -4,19 +4,37 @@ import { ChevronDownIcon, type LucideIcon } from "lucide-react";
 import { cn } from "~/lib/utils";
 import { Button } from "../ui/button";
 import { SelectTrigger } from "../ui/select";
+import { Separator } from "../ui/separator";
+
+export type ComposerControlSize = "sm" | "xs";
+
+type ComposerControlProps = Omit<ComponentProps<typeof Button>, "size"> & {
+  size?: ComposerControlSize;
+};
+
+type ComposerSelectControlProps = Omit<ComponentProps<typeof SelectTrigger>, "size"> & {
+  size?: ComposerControlSize;
+};
 
 const composerControlClassName =
-  "h-7 min-h-7 gap-1.5 rounded-[var(--control-radius)] px-2.5 text-secondary-label transition-none hover:text-foreground [&_svg[data-composer-control-icon]]:mx-0 [&_svg[data-composer-control-chevron]]:-mx-0.5";
+  "rounded-[var(--control-radius)] text-secondary-label transition-none hover:text-foreground [&_svg[data-composer-control-chevron]]:-mx-0.5 [&_svg[data-composer-control-icon]]:mx-0";
+const expandedComposerControlClassName = "h-7 min-h-7 gap-1.5 px-2.5";
+const restingComposerControlClassName =
+  "[--control-icon-color:currentColor] font-normal text-muted-foreground/70 hover:text-foreground/80 [&_svg[data-composer-control-chevron]]:-me-1 [&_svg[data-composer-control-chevron]]:ms-0";
 
 export function ComposerControl({
   className,
   size = "sm",
   variant = "ghost",
   ...props
-}: ComponentProps<typeof Button>) {
+}: ComposerControlProps) {
   return (
     <Button
-      className={cn(composerControlClassName, className)}
+      className={cn(
+        composerControlClassName,
+        size === "xs" ? restingComposerControlClassName : expandedComposerControlClassName,
+        className,
+      )}
       size={size}
       variant={variant}
       {...props}
@@ -28,41 +46,77 @@ export function ComposerControlIcon({
   icon: Icon,
   className,
   opticalSize = "default",
+  size = "sm",
 }: {
   icon: LucideIcon;
   className?: string | undefined;
   opticalSize?: "default" | "large";
+  size?: ComposerControlSize;
 }) {
   return (
     <Icon
       aria-hidden="true"
-      className={cn("shrink-0", opticalSize === "large" ? "size-4.5" : "size-4", className)}
+      className={cn(
+        "shrink-0",
+        size === "xs" ? "size-3" : opticalSize === "large" ? "size-4.5" : "size-4",
+        className,
+      )}
       data-composer-control-icon
     />
   );
 }
 
-export function ComposerControlChevron() {
+export function ComposerControlChevron({
+  className,
+  size = "sm",
+}: {
+  className?: string;
+  size?: ComposerControlSize;
+} = {}) {
   return (
     <ChevronDownIcon
       aria-hidden="true"
-      className="-mx-0.5 size-3.5 shrink-0 text-icon-muted"
+      className={cn(
+        "shrink-0",
+        size === "xs" ? "size-3 text-current opacity-50" : "size-3.5 text-icon-muted",
+        className,
+      )}
       data-composer-control-chevron
       strokeWidth={2.25}
     />
   );
 }
 
+export function ComposerControlSeparator({
+  className,
+  size = "sm",
+  ...props
+}: Omit<ComponentProps<typeof Separator>, "orientation"> & {
+  size?: ComposerControlSize;
+}) {
+  return (
+    <Separator
+      orientation="vertical"
+      className={cn("mx-0.5 hidden sm:block", size === "xs" ? "h-3.5!" : "h-4", className)}
+      {...props}
+    />
+  );
+}
+
 export function ComposerSelectControl({
   className,
   size = "sm",
   variant = "ghost",
   ...props
-}: ComponentProps<typeof SelectTrigger>) {
+}: ComposerSelectControlProps) {
   return (
     <SelectTrigger
-      className={cn(composerControlClassName, className)}
-      icon={<ComposerControlChevron />}
+      className={cn(
+        composerControlClassName,
+        size === "xs" ? restingComposerControlClassName : expandedComposerControlClassName,
+        className,
+      )}
+      icon={<ComposerControlChevron size={size} />}
       size={size}
       variant={variant}
       {...props}
diff --git a/apps/web/src/components/chat/ComposerPendingTerminalContexts.test.tsx b/apps/web/src/components/chat/ComposerPendingTerminalContexts.test.tsx
deleted file mode 100644
index 3c610a7b5c42..000000000000
--- a/apps/web/src/components/chat/ComposerPendingTerminalContexts.test.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { ThreadId } from "@t3tools/contracts";
-import { renderToStaticMarkup } from "react-dom/server";
-import { describe, expect, it } from "vite-plus/test";
-
-import { ComposerPendingTerminalContextChip } from "./ComposerPendingTerminalContexts";
-
-describe("ComposerPendingTerminalContextChip", () => {
-  it("renders expired terminal contexts with error styling", () => {
-    const markup = renderToStaticMarkup(
-      <ComposerPendingTerminalContextChip
-        context={{
-          id: "ctx-expired",
-          threadId: ThreadId.make("thread-1"),
-          terminalId: "default",
-          terminalLabel: "Terminal 1",
-          lineStart: 2,
-          lineEnd: 4,
-          text: "",
-          createdAt: "2026-03-17T18:42:05.449Z",
-        }}
-      />,
-    );
-
-    expect(markup).toContain('data-terminal-context-expired="true"');
-    expect(markup).toContain("border-destructive/35");
-    expect(markup).toContain("Terminal 1 lines 2-4");
-  });
-});
diff --git a/apps/web/src/components/chat/ComposerPrimaryActions.tsx b/apps/web/src/components/chat/ComposerPrimaryActions.tsx
index 64d4059f0e3e..93ef318c03d6 100644
--- a/apps/web/src/components/chat/ComposerPrimaryActions.tsx
+++ b/apps/web/src/components/chat/ComposerPrimaryActions.tsx
@@ -6,6 +6,7 @@ import { StageBackdropButtonArt, useSidebarStageBackdropVariant } from "../Sideb
 import { Button } from "../ui/button";
 import { Menu, MenuItem, MenuPopup, MenuTrigger } from "../ui/menu";
 import { Spinner } from "../ui/spinner";
+import { composerFloatingLayerProps } from "./composerEventScope";
 
 interface PendingActionState {
   questionIndex: number;
@@ -203,7 +204,7 @@ export const ComposerPrimaryActions = memo(function ComposerPrimaryActions({
           >
             <ChevronDownIcon className="size-3.5" />
           </MenuTrigger>
-          <MenuPopup align="end" side="top">
+          <MenuPopup align="end" side="top" {...composerFloatingLayerProps}>
             <MenuItem
               disabled={isSendBusy || isSendDisabled || isConnecting || isEnvironmentUnavailable}
               onClick={() => void onImplementPlanInNewThread()}
diff --git a/apps/web/src/components/chat/ComposerPromptLengthValidation.test.tsx b/apps/web/src/components/chat/ComposerPromptLengthValidation.test.tsx
deleted file mode 100644
index 3ffb4fa9c20a..000000000000
--- a/apps/web/src/components/chat/ComposerPromptLengthValidation.test.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { PROVIDER_SEND_TURN_MAX_INPUT_CHARS } from "@t3tools/contracts";
-import { renderToStaticMarkup } from "react-dom/server";
-import { describe, expect, it } from "vite-plus/test";
-
-import { getComposerPromptLengthValidationMessage } from "./composerSubmission";
-import { ComposerPromptLengthValidation } from "./ComposerPromptLengthValidation";
-
-describe("ComposerPromptLengthValidation", () => {
-  it("renders oversized prompt feedback as an actionable composer alert", () => {
-    const message = getComposerPromptLengthValidationMessage(
-      "x".repeat(PROVIDER_SEND_TURN_MAX_INPUT_CHARS + 1),
-    );
-
-    const markup = renderToStaticMarkup(<ComposerPromptLengthValidation message={message} />);
-
-    expect(markup).toContain('role="alert"');
-    expect(markup).toContain('data-chat-composer-validation="prompt-length"');
-    expect(markup).toContain(
-      "Prompt is 1 character over the 120,000-character limit. Shorten or split it before sending.",
-    );
-    expect(markup).not.toContain("ProviderValidationError");
-  });
-});
diff --git a/apps/web/src/components/chat/ComposerSurface.tsx b/apps/web/src/components/chat/ComposerSurface.tsx
index 6b20a4b693e4..b7c134c29925 100644
--- a/apps/web/src/components/chat/ComposerSurface.tsx
+++ b/apps/web/src/components/chat/ComposerSurface.tsx
@@ -13,14 +13,14 @@ function Shell({
       data-slot="composer-shell"
       data-with-context={contextStrip || undefined}
       className={cn(
-        "group/composer-surface relative isolate mx-auto w-full max-w-3xl",
+        "@container/composer-surface group/composer-surface relative isolate mx-auto w-full max-w-3xl",
         "[--chat-composer-drawer-inset:1.375rem] [--chat-composer-glass-surface:var(--card)] [--chat-composer-outline:rgb(0_0_0/8%)]",
         "dark:[--chat-composer-glass-surface:var(--surface-raised)] dark:[--chat-composer-highlight:rgb(255_255_255/3%)] dark:[--chat-composer-outline:color-mix(in_srgb,var(--color-white)_5%,transparent)]",
         "[html[data-theme-id]_&]:[--chat-composer-glass-surface:var(--app-theme-surface-raised)] [html[data-theme-id]_&]:[--chat-composer-outline:var(--app-theme-toolbar-border)]",
         "dark:[html[data-theme-id]:not([data-theme-id=t3-chat])_&]:[--chat-composer-highlight:color-mix(in_srgb,var(--app-theme-input)_12%,transparent)] dark:[html[data-theme-id]:not([data-theme-id=t3-chat])_&]:[--chat-composer-outline:color-mix(in_srgb,var(--app-theme-input)_30%,var(--background))]",
         "dark:[html[data-theme-id=t3-chat]_&]:[--chat-composer-highlight:color-mix(in_srgb,#432d48_12%,transparent)] dark:[html[data-theme-id=t3-chat]_&]:[--chat-composer-outline:#241e28]",
         "before:pointer-events-none before:absolute before:inset-0 before:z-0 before:rounded-[22px] before:bg-[color-mix(in_srgb,var(--chat-composer-glass-surface)_var(--glass-opacity),transparent)] before:backdrop-blur-(--glass-blur) before:backdrop-saturate-(--glass-saturation)",
-        "not-supports-[(backdrop-filter:blur(1px))_or_(-webkit-backdrop-filter:blur(1px))]:before:bg-(--chat-composer-glass-surface)",
+        "not-supports-[((backdrop-filter:blur(1px))_or_(-webkit-backdrop-filter:blur(1px)))]:before:bg-(--chat-composer-glass-surface)",
         "has-data-[composer-banner-surface=attached]:before:hidden",
         contextStrip && [
           "[--chat-composer-context-extension:2.25rem] sm:[--chat-composer-context-extension:2rem]",
@@ -70,7 +70,7 @@ function Main({ className, ...props }: ComponentProps<"div">) {
         "after:z-20 after:hidden group-has-data-[composer-banner-surface=attached]/composer-surface:after:block",
         "group-has-data-[composer-banner-surface=attached]/composer-surface:bg-[color-mix(in_srgb,var(--chat-composer-glass-surface)_var(--glass-opacity),transparent)] group-has-data-[composer-banner-surface=attached]/composer-surface:backdrop-blur-(--glass-blur) group-has-data-[composer-banner-surface=attached]/composer-surface:backdrop-saturate-(--glass-saturation)",
         "group-has-data-[composer-banner-surface=attached]/composer-surface:shadow-[0_12px_28px_-18px_rgb(0_0_0/40%)] dark:group-has-data-[composer-banner-surface=attached]/composer-surface:shadow-none",
-        "not-supports-[(backdrop-filter:blur(1px))_or_(-webkit-backdrop-filter:blur(1px))]:group-has-data-[composer-banner-surface=attached]/composer-surface:bg-(--chat-composer-glass-surface)",
+        "not-supports-[((backdrop-filter:blur(1px))_or_(-webkit-backdrop-filter:blur(1px)))]:group-has-data-[composer-banner-surface=attached]/composer-surface:bg-(--chat-composer-glass-surface)",
         "group-has-data-[composer-banner-surface=attached]/composer-surface:**:data-[chat-composer-mobile-collapsed=true]:min-h-[calc(1rem+1px)]",
         className,
       )}
diff --git a/apps/web/src/components/chat/ContextWindowMeter.tsx b/apps/web/src/components/chat/ContextWindowMeter.tsx
index 93809c4f686c..a11f400c0627 100644
--- a/apps/web/src/components/chat/ContextWindowMeter.tsx
+++ b/apps/web/src/components/chat/ContextWindowMeter.tsx
@@ -3,6 +3,7 @@ import { type ContextWindowSnapshot, formatContextWindowTokens } from "~/lib/con
 import { Popover, PopoverPopup, PopoverTrigger } from "../ui/popover";
 import { formatContextWindowCompactionMessage } from "./ContextWindowMeter.logic";
 import { Minimize2Icon } from "lucide-react";
+import { composerFloatingLayerProps } from "./composerEventScope";
 
 function formatPercentage(value: number | null): string | null {
   if (value === null || !Number.isFinite(value)) {
@@ -83,6 +84,7 @@ export function ContextWindowMeter(props: {
         }
       />
       <PopoverPopup
+        {...composerFloatingLayerProps}
         tooltipStyle
         side="top"
         align="end"
diff --git a/apps/web/src/components/chat/ExpandedImageDialog.tsx b/apps/web/src/components/chat/ExpandedImageDialog.tsx
index 2ee40c0b8b63..5ab287225ca4 100644
--- a/apps/web/src/components/chat/ExpandedImageDialog.tsx
+++ b/apps/web/src/components/chat/ExpandedImageDialog.tsx
@@ -2,11 +2,12 @@ import { memo, useCallback, useEffect, useState, type ReactNode } from "react";
 import { createPortal } from "react-dom";
 import { ChevronLeftIcon, ChevronRightIcon, XIcon } from "lucide-react";
 import { Button } from "../ui/button";
-import type { ExpandedImagePreview } from "./ExpandedImagePreview";
-import { prepareVideoFirstFrame } from "../../lib/videoFirstFrame";
+import type { ExpandedImageItem, ExpandedImagePreview } from "./ExpandedImagePreview";
 import { resolveExternalWebLinkHost } from "./externalLinkContextMenu";
+import { useAssetUrlRefresh, useAssetUrlState } from "../../assets/assetUrls";
 import { OpenMediaLink } from "../media/OpenMediaLink";
 import { MediaActions, type MediaActionSource } from "../media/MediaActions";
+import { MediaVideoPlayer } from "../media/MediaVideoPlayer";
 import { isContextMenuOpen } from "../../contextMenuFallback";
 
 interface ExpandedImageDialogProps {
@@ -14,23 +15,47 @@ interface ExpandedImageDialogProps {
   onClose: () => void;
 }
 
+const EXPANDED_MEDIA_STATE_CLASS_NAME =
+  "flex aspect-auto h-48 min-h-0 w-[min(92vw,32rem)] flex-col items-center justify-center gap-3 rounded-lg border border-border/70 bg-black p-6 text-center text-sm text-white shadow-2xl";
+
 function ExpandedMediaFailure({ children }: { children: ReactNode }) {
   return (
-    <div
-      role="alert"
-      className="flex h-48 w-[min(92vw,32rem)] flex-col items-center justify-center gap-3 rounded-lg border border-border/70 bg-black px-6 text-center text-sm text-white shadow-2xl"
-    >
+    <div role="alert" className={EXPANDED_MEDIA_STATE_CLASS_NAME}>
       {children}
     </div>
   );
 }
 
+function ExpandedVideo({ item }: { readonly item: ExpandedImageItem }) {
+  const asset = item.actionsSource?.asset;
+  const assetUrl = useAssetUrlState(asset?.environmentId ?? null, asset?.resource ?? null);
+  const refreshAssetUrl = useAssetUrlRefresh(asset?.environmentId ?? null, asset?.resource ?? null);
+  const src = asset
+    ? assetUrl._tag === "Success"
+      ? assetUrl.url + (item.srcFragment ?? "")
+      : null
+    : item.src;
+  return (
+    <MediaVideoPlayer
+      src={src}
+      label={item.name}
+      sourceFailed={assetUrl._tag === "Failure"}
+      originalUrl={item.originalUrl}
+      preload="metadata"
+      autoPlay={item.autoPlay ?? true}
+      className="block max-h-[86vh] max-w-[92vw] text-center"
+      videoClassName="aspect-auto max-h-[86vh] w-auto max-w-[92vw] rounded-lg border border-border/70 shadow-2xl"
+      stateClassName={EXPANDED_MEDIA_STATE_CLASS_NAME}
+      onRetry={asset ? refreshAssetUrl : undefined}
+    />
+  );
+}
+
 export const ExpandedImageDialog = memo(function ExpandedImageDialog({
   preview,
   onClose,
 }: ExpandedImageDialogProps) {
   const [imageOffset, setImageOffset] = useState(0);
-  const [failedVideoSrc, setFailedVideoSrc] = useState<string | null>(null);
   const [failedImageSrc, setFailedImageSrc] = useState<string | null>(null);
   const index = (preview.index + imageOffset + preview.images.length) % preview.images.length;
   const item = preview.images[index];
@@ -125,24 +150,9 @@ export const ExpandedImageDialog = memo(function ExpandedImageDialog({
           >
             <XIcon />
           </Button>
-          {item.type === "video" && failedVideoSrc === item.src ? (
-            <ExpandedMediaFailure>
-              <p>This video could not be loaded or played.</p>
-              <OpenMediaLink originalUrl={item.originalUrl} src={item.src} fileName={item.name} />
-            </ExpandedMediaFailure>
-          ) : item.type === "video" ? (
-            <video
-              src={item.src}
-              aria-label={item.name}
-              autoPlay={item.autoPlay ?? true}
-              preload="metadata"
-              controls
-              playsInline
-              onLoadedMetadata={(event) => prepareVideoFirstFrame(event.currentTarget)}
-              onError={() => setFailedVideoSrc(item.src)}
-              className="max-h-[86vh] max-w-[92vw] rounded-lg border border-border/70 bg-black object-contain shadow-2xl"
-            />
-          ) : failedImageSrc === item.src ? (
+          {item.type === "video" ? (
+            <ExpandedVideo key={index} item={item} />
+          ) : item.src === null || failedImageSrc === item.src ? (
             <ExpandedMediaFailure>
               <p>
                 {openOriginalLink
diff --git a/apps/web/src/components/chat/ExpandedImagePreview.tsx b/apps/web/src/components/chat/ExpandedImagePreview.tsx
index cddfb95052b9..bee68502bf3c 100644
--- a/apps/web/src/components/chat/ExpandedImagePreview.tsx
+++ b/apps/web/src/components/chat/ExpandedImagePreview.tsx
@@ -3,31 +3,30 @@ import { type ChatImageAttachment, isVideoAttachment } from "../../types";
 import type {
   AssetCreateUrlResult,
   AssetResource,
+  ChatFileAttachment,
   EnvironmentId,
   ScopedThreadRef,
 } from "@t3tools/contracts";
-import {
-  classifyMarkdownImageSource,
-  markdownImageSourceFragment,
-} from "@t3tools/client-runtime/markdown-images";
-import { mediaFileReference, mediaUrlReference } from "@t3tools/client-runtime/media-reference";
+import { videoMimeType } from "@t3tools/shared/video";
+import { resolveMediaSource } from "@t3tools/client-runtime/media-source";
 import { resolveAssetUrl } from "@t3tools/client-runtime/state/assets";
 import {
   squashAtomCommandFailure,
   type AtomCommandResult,
 } from "@t3tools/client-runtime/state/runtime";
-import { mediaKindFromPath, mediaMimeTypeFromExtension } from "@t3tools/shared/filePreview";
 import { resolveExternalWebLinkHost } from "./externalLinkContextMenu";
 import type { MediaActionSource } from "../media/MediaActions";
 import { resolveProtocolRelativeMediaUrl } from "../media/mediaContent";
 
 export interface ExpandedImageItem {
-  src: string;
+  /** A loadable URL, or null when the dialog must mint one from `asset` first. */
+  src: string | null;
   name: string;
   type?: "video";
   autoPlay?: boolean;
   /** Authored remote destination to open when embedding fails, never a generated asset URL. */
   originalUrl?: string;
+  srcFragment?: string;
   actionsSource?: MediaActionSource;
 }
 
@@ -49,45 +48,24 @@ export async function resolveMarkdownMediaPreview(input: {
     input: { resource: AssetResource };
   }) => Promise<AtomCommandResult<AssetCreateUrlResult, unknown>>;
 }): Promise<ExpandedImagePreview | null> {
-  const source =
-    input.resolvedFilePath === undefined
-      ? classifyMarkdownImageSource(input.source, input.cwd)
-      : { _tag: "WorkspaceFile" as const, path: input.resolvedFilePath };
-  if (source._tag === "Blocked") return null;
-
-  const path =
-    source._tag === "Direct"
-      ? source.uri.split(/[?#]/, 1)[0]!
-      : source.path.replace(/:\d+(?::\d+)?$/, "");
-  const name = path.split(/[\\/]/).at(-1) ?? "";
-  const extensionIndex = name.lastIndexOf(".");
-  const fileMimeType =
-    extensionIndex < 0 ? null : mediaMimeTypeFromExtension(name.slice(extensionIndex));
-  const kind =
-    source._tag === "Direct"
-      ? mediaKindFromPath(source.uri)
-      : fileMimeType === null
-        ? null
-        : fileMimeType.startsWith("video/")
-          ? "video"
-          : "image";
-  if (kind === null) return null;
-
-  const reference =
-    source._tag === "Direct" ? mediaUrlReference(source.uri) : mediaFileReference(path, input.cwd);
+  const media = resolveMediaSource(input.source, {
+    threadId: input.threadRef?.threadId,
+    workspaceRoot: input.cwd,
+    resolvedFilePath: input.resolvedFilePath,
+  });
+  if (media === null) return null;
+  const { kind, name, reference } = media;
   const relativePath = reference?.kind === "file" ? reference.relativePath : undefined;
+
   let src: string;
   let asset: MediaActionSource["asset"];
-  if (source._tag === "Direct") {
-    src = resolveProtocolRelativeMediaUrl(source.uri);
+  if (media.access === "direct") {
+    src = resolveProtocolRelativeMediaUrl(media.uri);
   } else {
-    if (!input.threadRef || !input.httpBaseUrl) {
+    if (media.access === "unavailable" || !input.threadRef || !input.httpBaseUrl) {
       throw new Error("Reconnect to this environment and open the media again.");
     }
-    asset = {
-      environmentId: input.threadRef.environmentId,
-      resource: { _tag: "media-file", threadId: input.threadRef.threadId, path },
-    };
+    asset = { environmentId: input.threadRef.environmentId, resource: media.resource };
     const result = await input.createAssetUrl({
       environmentId: asset.environmentId,
       input: { resource: asset.resource },
@@ -95,20 +73,21 @@ export async function resolveMarkdownMediaPreview(input: {
     if (result._tag === "Failure") throw squashAtomCommandFailure(result);
     const assetUrl = resolveAssetUrl(input.httpBaseUrl, result.value.relativeUrl);
     if (assetUrl === null) throw new Error("The environment returned an invalid media URL.");
-    src = assetUrl + markdownImageSourceFragment(input.source);
+    src = assetUrl + media.srcFragment;
   }
   return {
     images: [
       {
         src,
-        name: name || kind,
+        name,
         ...(kind === "video" ? { type: "video", autoPlay: false } : {}),
-        ...(source._tag === "Direct" && resolveExternalWebLinkHost(source.uri) !== null
-          ? { originalUrl: source.uri }
+        ...(media.access === "direct" && resolveExternalWebLinkHost(media.uri) !== null
+          ? { originalUrl: media.uri }
           : {}),
+        ...(media.srcFragment ? { srcFragment: media.srcFragment } : {}),
         actionsSource: {
           kind,
-          name: name || kind,
+          name,
           src,
           ...(reference ? { reference } : {}),
           ...(asset ? { asset } : {}),
@@ -122,6 +101,27 @@ export async function resolveMarkdownMediaPreview(input: {
   };
 }
 
+export function buildAttachmentVideoAsset(
+  environmentId: EnvironmentId,
+  attachment: ChatFileAttachment,
+): NonNullable<MediaActionSource["asset"]> {
+  return {
+    environmentId,
+    resource: {
+      _tag: "attachment" as const,
+      attachmentId: attachment.id,
+      fileName: attachment.name,
+      mimeType: videoMimeType(attachment) ?? attachment.mimeType,
+    },
+  };
+}
+
+export function expandedImageKey(preview: ExpandedImagePreview): string {
+  const item = preview.images[preview.index];
+  const asset = item?.actionsSource?.asset;
+  return `${item?.src ?? (asset ? JSON.stringify([asset.environmentId, asset.resource]) : "image")}:${preview.index}`;
+}
+
 export function attachVideoThumbnail(video: HTMLVideoElement, file: File): () => void {
   const url = URL.createObjectURL(file);
   video.src = url;
diff --git a/apps/web/src/components/chat/MessagesTimeline.logic.test.ts b/apps/web/src/components/chat/MessagesTimeline.logic.test.ts
index 08723c7b9fe9..e19c2fdb1923 100644
--- a/apps/web/src/components/chat/MessagesTimeline.logic.test.ts
+++ b/apps/web/src/components/chat/MessagesTimeline.logic.test.ts
@@ -10,7 +10,9 @@ import {
   resolveWorkGroupScrollIndex,
   shouldFollowWorkGroupAppend,
   shouldPreserveAssistantLineBreaks,
+  type MessagesTimelineRow,
   workEntryDisplayLabel,
+  workEntryIsVisibleInGroup,
 } from "./MessagesTimeline.logic";
 
 describe("expanded tool group scrolling", () => {
@@ -99,13 +101,16 @@ describe("work entry labels", () => {
     );
   });
 
-  it("does not describe a finished call as still running while the turn continues", () => {
+  it("keeps the latest live activity in the present tense after the call completes", () => {
     const browserEntry = {
       ...entry,
       toolTitle: "T3-code.preview_click",
       toolLifecycleStatus: "completed" as const,
     };
     expect(liveWorkEntryLabel(browserEntry, undefined, true)).toBe(
+      "Clicking in the preview browser",
+    );
+    expect(liveWorkEntryLabel(browserEntry, undefined, false)).toBe(
       "Clicked in the preview browser",
     );
   });
@@ -134,30 +139,30 @@ describe("work entry labels", () => {
   });
 
   it.each([
-    ["inProgress", "Running vp"],
-    ["completed", "Ran vp"],
-    ["failed", "Failed vp"],
-    ["declined", "Declined vp"],
-    ["stopped", "Stopped vp"],
+    ["inProgress", "Running vp", "Running vp"],
+    ["completed", "Running vp", "Ran vp"],
+    ["failed", "Failed vp", "Failed vp"],
+    ["declined", "Declined vp", "Declined vp"],
+    ["stopped", "Stopped vp", "Stopped vp"],
   ] as const)(
-    "uses the command's %s outcome even while the turn continues",
-    (toolLifecycleStatus, label) => {
+    "uses present tense for a live %s command and the outcome once it is no longer live",
+    (toolLifecycleStatus, liveLabel, settledLabel) => {
       const commandEntry = {
         ...entry,
         command: "/bin/bash -lc 'vp test run'",
         toolLifecycleStatus,
       };
-      expect(liveWorkEntryLabel(commandEntry, undefined, true)).toBe(label);
-      expect(liveWorkEntryLabel(commandEntry, undefined, false)).toBe(label);
+      expect(liveWorkEntryLabel(commandEntry, undefined, true)).toBe(liveLabel);
+      expect(liveWorkEntryLabel(commandEntry, undefined, false)).toBe(settledLabel);
     },
   );
 
   it.each([
-    ["preview_click", "Clicked in the preview browser", "browser"],
-    ["task_status", "Got delegated task status", "t3-code"],
+    ["preview_click", "Clicked in the preview browser"],
+    ["task_status", "Got delegated task status"],
   ] as const)(
-    "uses the completed %s call presentation for a settled legacy tool",
-    (tool, summary, summaryToolIcon) => {
+    "renders a settled legacy %s call directly with its completed presentation",
+    (tool, label) => {
       const rows = deriveMessagesTimelineRows({
         timelineEntries: [
           {
@@ -176,9 +181,12 @@ describe("work entry labels", () => {
         turnDiffSummaryByAssistantMessageId: new Map(),
         revertTurnCountByUserMessageId: new Map(),
       });
-      expect(rows).toMatchObject([
-        { kind: "work-toggle", hiddenCount: 1, summary, summaryToolIcon },
-      ]);
+      const directRow = rows.find((row) => row.kind === "work");
+      expect(directRow).toMatchObject({
+        groupedEntries: [expect.objectContaining({ id: "tool-1" })],
+        isExpandedToolGroup: false,
+        displayLabel: label,
+      });
     },
   );
 });
@@ -464,6 +472,22 @@ describe("resolveAssistantMessageCopyState", () => {
   });
 });
 
+describe("workEntryIsVisibleInGroup", () => {
+  it("keeps an in-progress image preview row visible outside a group", () => {
+    const entry = {
+      id: "work-image",
+      createdAt: "2026-01-01T00:00:04Z",
+      turnId: "turn-1" as never,
+      label: "Image view",
+      detail: "screenshots/result.png",
+      itemType: "image_view" as const,
+      tone: "tool" as const,
+      toolLifecycleStatus: "inProgress" as const,
+    };
+    expect(workEntryIsVisibleInGroup(entry, false)).toBe(true);
+  });
+});
+
 describe("deriveMessagesTimelineRows", () => {
   it("only enables assistant copy for the terminal assistant message in a turn", () => {
     const rows = deriveMessagesTimelineRows({
@@ -737,7 +761,7 @@ describe("deriveMessagesTimelineRows", () => {
       "user-entry",
       "turn-fold:turn-1",
       "assistant-first-entry",
-      "work-toggle:work-entry-1",
+      "work-entry-1",
       "assistant-final-entry",
     ]);
     expect(
@@ -745,6 +769,207 @@ describe("deriveMessagesTimelineRows", () => {
     ).toBeDefined();
   });
 
+  it("keeps a tool group after the terminal response visible when the turn is folded", () => {
+    const turnId = TurnId.make("turn-1");
+    const timelineEntries = [
+      {
+        id: "work-entry-before-text",
+        kind: "work" as const,
+        createdAt: "2026-01-01T00:00:01Z",
+        entry: {
+          id: "work-before-text",
+          createdAt: "2026-01-01T00:00:01Z",
+          turnId,
+          label: "Status updated",
+          tone: "info" as const,
+        },
+      },
+      {
+        id: "assistant-final-entry",
+        kind: "message" as const,
+        createdAt: "2026-01-01T00:00:05Z",
+        message: {
+          id: "assistant-final" as never,
+          role: "assistant" as const,
+          text: "I could not finish the task.",
+          turnId,
+          createdAt: "2026-01-01T00:00:05Z",
+          updatedAt: "2026-01-01T00:00:06Z",
+          streaming: false,
+        },
+      },
+      ...Array.from({ length: 3 }, (_, index) => ({
+        id: `work-entry-after-text-${index}`,
+        kind: "work" as const,
+        createdAt: `2026-01-01T00:00:0${index + 7}Z`,
+        entry: {
+          id: `work-after-text-${index}`,
+          createdAt: `2026-01-01T00:00:0${index + 7}Z`,
+          turnId,
+          label: "Ran command",
+          tone: "tool" as const,
+          itemType: "command_execution" as const,
+          toolLifecycleStatus: "completed" as const,
+        },
+      })),
+    ];
+
+    const rows = deriveMessagesTimelineRows({
+      timelineEntries,
+      latestTurn: {
+        turnId,
+        state: "error",
+        startedAt: "2026-01-01T00:00:00Z",
+        completedAt: "2026-01-01T00:00:10Z",
+      },
+      isWorking: false,
+      activeTurnStartedAt: null,
+      turnDiffSummaryByAssistantMessageId: new Map(),
+      revertTurnCountByUserMessageId: new Map(),
+    });
+
+    expect(rows.map((row) => row.id)).toEqual([
+      "turn-fold:turn-1",
+      "assistant-final-entry",
+      "work-toggle:work-entry-after-text-0",
+      "assistant-meta:assistant-final",
+    ]);
+    expect(rows.at(-2)).toMatchObject({
+      kind: "work-toggle",
+      hiddenCount: 3,
+      summary: "Ran 3 commands",
+    });
+    expect(rows.at(-1)).toMatchObject({
+      kind: "assistant-meta",
+      message: { id: "assistant-final" },
+      showAssistantCopyButton: true,
+    });
+    expect(rows.at(-3)).toMatchObject({
+      kind: "message",
+      showAssistantMeta: false,
+      showAssistantCopyButton: false,
+    });
+  });
+
+  it("keeps an image preview row visible after the turn settles", () => {
+    const timelineEntries = [
+      {
+        id: "work-command-entry",
+        kind: "work" as const,
+        createdAt: "2026-01-01T00:00:02Z",
+        entry: {
+          id: "work-command",
+          createdAt: "2026-01-01T00:00:02Z",
+          turnId: "turn-1" as never,
+          label: "Ran command",
+          tone: "tool" as const,
+        },
+      },
+      {
+        id: "work-image-entry",
+        kind: "work" as const,
+        createdAt: "2026-01-01T00:00:04Z",
+        entry: {
+          id: "work-image",
+          createdAt: "2026-01-01T00:00:04Z",
+          turnId: "turn-1" as never,
+          label: "Image view",
+          detail: "screenshots/result.png",
+          itemType: "image_view" as const,
+          tone: "tool" as const,
+        },
+      },
+      {
+        id: "assistant-final-entry",
+        kind: "message" as const,
+        createdAt: "2026-01-01T00:00:06Z",
+        message: {
+          id: "assistant-final" as never,
+          role: "assistant" as const,
+          text: "Here is the screenshot.",
+          turnId: "turn-1" as never,
+          createdAt: "2026-01-01T00:00:06Z",
+          updatedAt: "2026-01-01T00:00:07Z",
+          streaming: false,
+        },
+      },
+    ];
+
+    const rows = deriveMessagesTimelineRows({
+      timelineEntries,
+      isWorking: false,
+      activeTurnStartedAt: null,
+      turnDiffSummaryByAssistantMessageId: new Map(),
+      revertTurnCountByUserMessageId: new Map(),
+    });
+
+    // The command row folds, the image row stays as its own visible row rather
+    // than collapsing into a tool group summary.
+    expect(rows.map((row) => row.id)).toEqual([
+      "turn-fold:turn-1",
+      "work-image-entry",
+      "assistant-final-entry",
+    ]);
+    expect(rows.find((row) => row.id === "work-image-entry")?.kind).toBe("work");
+  });
+
+  it("keeps a trailing image preview row visible while the turn is still working", () => {
+    const rows = deriveMessagesTimelineRows({
+      timelineEntries: [
+        {
+          id: "user-entry",
+          kind: "message" as const,
+          createdAt: "2026-01-01T00:00:00Z",
+          message: {
+            id: "user-1" as never,
+            role: "user" as const,
+            text: "show me the result",
+            turnId: null,
+            createdAt: "2026-01-01T00:00:00Z",
+            updatedAt: "2026-01-01T00:00:00Z",
+            streaming: false,
+          },
+        },
+        {
+          id: "work-command-entry",
+          kind: "work" as const,
+          createdAt: "2026-01-01T00:00:02Z",
+          entry: {
+            id: "work-command",
+            createdAt: "2026-01-01T00:00:02Z",
+            turnId: "turn-1" as never,
+            label: "Ran command",
+            tone: "tool" as const,
+          },
+        },
+        {
+          id: "work-image-entry",
+          kind: "work" as const,
+          createdAt: "2026-01-01T00:00:04Z",
+          entry: {
+            id: "work-image",
+            createdAt: "2026-01-01T00:00:04Z",
+            turnId: "turn-1" as never,
+            label: "Image view",
+            detail: "screenshots/result.png",
+            itemType: "image_view" as const,
+            tone: "tool" as const,
+          },
+        },
+      ],
+      isWorking: true,
+      activeTurnStartedAt: "2026-01-01T00:00:01Z",
+      turnDiffSummaryByAssistantMessageId: new Map(),
+      revertTurnCountByUserMessageId: new Map(),
+    });
+
+    // The live activity row must not swallow the image: it renders only a
+    // label, which would hide the image until the turn settles.
+    const imageRow = rows.find((row) => row.id === "work-image-entry");
+    expect(imageRow?.kind).toBe("work");
+    expect(rows.some((row) => row.kind === "work-live")).toBe(false);
+  });
+
   it("folds all assistant messages before the terminal message", () => {
     const timelineEntries = [
       {
@@ -823,6 +1048,18 @@ describe("deriveMessagesTimelineRows", () => {
             streaming: false,
           },
         },
+        {
+          id: "work-entry-before-message",
+          kind: "work",
+          createdAt: "2026-01-01T00:00:07Z",
+          entry: {
+            id: "work-before-message",
+            createdAt: "2026-01-01T00:00:07Z",
+            turnId: "turn-1" as never,
+            label: "Status updated",
+            tone: "info" as const,
+          },
+        },
         {
           id: "assistant-commentary-entry",
           kind: "message",
@@ -1131,7 +1368,7 @@ describe("deriveMessagesTimelineRows", () => {
     });
   });
 
-  it("labels a single completed tool call without summarizing it", () => {
+  it("renders a single completed tool call directly", () => {
     const rows = deriveMessagesTimelineRows({
       timelineEntries: [
         {
@@ -1191,11 +1428,64 @@ describe("deriveMessagesTimelineRows", () => {
       revertTurnCountByUserMessageId: new Map(),
     });
 
-    expect(rows.map((row) => row.kind)).toEqual(["working", "work-toggle", "message", "work-live"]);
-    expect(rows.find((row) => row.kind === "work-toggle")).toMatchObject({
-      hiddenCount: 1,
-      summary: "rg toolCall",
+    expect(rows.map((row) => row.kind)).toEqual(["working", "work", "message", "work-live"]);
+    expect(rows.find((row) => row.kind === "work")).toMatchObject({
+      groupedEntries: [{ id: "completed-command", command: "rg toolCall" }],
+      isExpandedToolGroup: false,
+      displayLabel: "rg toolCall",
+    });
+  });
+
+  it("renders one tool call directly after collapsing its lifecycle updates", () => {
+    const turnId = TurnId.make("turn-1");
+    const rows = deriveMessagesTimelineRows({
+      timelineEntries: [
+        {
+          id: "command-started-entry",
+          kind: "work",
+          createdAt: "2026-01-01T00:00:05Z",
+          entry: {
+            id: "command-started",
+            createdAt: "2026-01-01T00:00:05Z",
+            turnId,
+            toolCallId: "call-1",
+            label: "Running rg",
+            command: "rg toolCall",
+            tone: "tool" as const,
+            itemType: "command_execution" as const,
+            toolLifecycleStatus: "inProgress" as const,
+          },
+        },
+        {
+          id: "command-completed-entry",
+          kind: "work",
+          createdAt: "2026-01-01T00:00:06Z",
+          entry: {
+            id: "command-completed",
+            createdAt: "2026-01-01T00:00:06Z",
+            turnId,
+            toolCallId: "call-1",
+            label: "Ran rg",
+            command: "rg toolCall",
+            tone: "tool" as const,
+            itemType: "command_execution" as const,
+            toolLifecycleStatus: "completed" as const,
+          },
+        },
+      ],
+      expandedTurnIds: new Set([turnId]),
+      isWorking: false,
+      activeTurnStartedAt: null,
+      turnDiffSummaryByAssistantMessageId: new Map(),
+      revertTurnCountByUserMessageId: new Map(),
+    });
+
+    expect(rows.find((row) => row.kind === "work")).toMatchObject({
+      groupedEntries: [{ id: "command-completed", toolCallId: "call-1" }],
+      isExpandedToolGroup: false,
+      displayLabel: "rg toolCall",
     });
+    expect(rows.some((row) => row.kind === "work-toggle")).toBe(false);
   });
 
   it("keeps separated in-progress tool runs visible", () => {
@@ -1657,6 +1947,7 @@ describe("deriveMessagesTimelineRows", () => {
           label: "Status updated",
           detail: "Editing MessagesTimeline.tsx",
           tone: middleTone,
+          toolSurface: "computer" as const,
         },
       },
       {
@@ -1669,6 +1960,8 @@ describe("deriveMessagesTimelineRows", () => {
           label: "test",
           detail: "Running tests",
           tone: "tool" as const,
+          toolSurface: "browser" as const,
+          toolIcon: { _tag: "website" as const, pageUrl: "https://example.com/checkout" },
         },
       },
     ];
@@ -1692,6 +1985,8 @@ describe("deriveMessagesTimelineRows", () => {
       hiddenCount: 3,
       expanded: false,
       summary,
+      toolSurface: "browser",
+      toolIcon: { _tag: "website", pageUrl: "https://example.com/checkout" },
     });
     expect(expandedRows.map((row) => row.id)).toEqual([
       "work-toggle:work-entry-1",
@@ -1706,6 +2001,84 @@ describe("deriveMessagesTimelineRows", () => {
     });
   });
 
+  it("deduplicates integration sources and uses the first source icon for the group", () => {
+    const chromeSource = {
+      key: "browser-use:chrome",
+      name: "Chrome",
+      kind: "integration" as const,
+      icon: {
+        _tag: "native-app" as const,
+        app: { _tag: "display-name" as const, displayName: "Google Chrome" },
+      },
+    };
+    const timelineEntries = [
+      {
+        id: "browser-1",
+        kind: "work" as const,
+        createdAt: "2026-01-01T00:00:01Z",
+        entry: {
+          id: "browser-1",
+          createdAt: "2026-01-01T00:00:01Z",
+          label: "Open MATLAB",
+          tone: "tool" as const,
+          toolSurface: "browser" as const,
+          toolSource: chromeSource,
+          toolIcon: {
+            _tag: "website" as const,
+            pageUrl: "https://www.mathworks.com/help/matlab/",
+          },
+        },
+      },
+      {
+        id: "browser-2",
+        kind: "work" as const,
+        createdAt: "2026-01-01T00:00:02Z",
+        entry: {
+          id: "browser-2",
+          createdAt: "2026-01-01T00:00:02Z",
+          label: "Show summary",
+          tone: "tool" as const,
+          toolSurface: "browser" as const,
+          toolSource: chromeSource,
+          toolIcon: {
+            _tag: "website" as const,
+            pageUrl: "https://www.mathworks.com/help/matlab/summary.html",
+          },
+        },
+      },
+      {
+        id: "command-1",
+        kind: "work" as const,
+        createdAt: "2026-01-01T00:00:03Z",
+        entry: {
+          id: "command-1",
+          createdAt: "2026-01-01T00:00:03Z",
+          label: "Ran command",
+          command: "git status",
+          itemType: "command_execution" as const,
+          tone: "tool" as const,
+        },
+      },
+    ];
+    const [row] = deriveMessagesTimelineRows({
+      timelineEntries,
+      isWorking: false,
+      activeTurnStartedAt: null,
+      turnDiffSummaryByAssistantMessageId: new Map(),
+      revertTurnCountByUserMessageId: new Map(),
+    });
+
+    expect(row).toMatchObject({
+      kind: "work-toggle",
+      summary: "Used Chrome integration and ran 1 command",
+      toolSurface: "browser",
+      toolIcon: {
+        _tag: "website",
+        pageUrl: "https://www.mathworks.com/help/matlab/",
+      },
+    });
+  });
+
   it.each([true, false])(
     "keeps a large expanded tool run inside one timeline item, live=%s",
     (isWorking) => {
@@ -1842,6 +2215,34 @@ describe("deriveMessagesTimelineRows", () => {
 });
 
 describe("computeStableMessagesTimelineRows", () => {
+  it("replaces a cached work toggle when its icon presentation changes", () => {
+    const initialRow: MessagesTimelineRow = {
+      kind: "work-toggle",
+      id: "work-toggle:1",
+      createdAt: "2026-01-01T00:00:00Z",
+      groupId: "work-group:1",
+      hiddenCount: 1,
+      expanded: false,
+      summary: "Used Browser",
+      summaryKind: "other",
+      toolSurface: "browser",
+      hasFailure: false,
+    };
+    const initial = computeStableMessagesTimelineRows([initialRow], {
+      byId: new Map(),
+      result: [],
+    });
+    const enrichedRow: MessagesTimelineRow = {
+      ...initialRow,
+      toolIcon: { _tag: "website", pageUrl: "https://example.com" },
+    };
+
+    const updated = computeStableMessagesTimelineRows([enrichedRow], initial);
+
+    expect(updated).not.toBe(initial);
+    expect(updated.result[0]).toBe(enrichedRow);
+  });
+
   it.each(["", " \n"])("keeps Thinking after assistant content grows from %j", (text) => {
     const startedAt = "2026-01-01T00:00:00Z";
     const turnId = TurnId.make("turn-1");
diff --git a/apps/web/src/components/chat/MessagesTimeline.logic.ts b/apps/web/src/components/chat/MessagesTimeline.logic.ts
index 980a93a59bdf..c661636821aa 100644
--- a/apps/web/src/components/chat/MessagesTimeline.logic.ts
+++ b/apps/web/src/components/chat/MessagesTimeline.logic.ts
@@ -2,12 +2,14 @@ import * as Equal from "effect/Equal";
 import { renderCodexDirectivesForCopy } from "@t3tools/client-runtime/codex-markdown-directives";
 import { commandProgramName } from "@t3tools/client-runtime/work-log/command-label";
 import {
+  liveActivityToolStatus,
   normalizeCompactToolLabel,
   omitSupersededLifecycleMarkers,
   resolveWorkEntryToolPresentation,
   summarizeToolGroup,
   toolGroupAction,
   toolGroupSummaryKind,
+  workEntryViewedImagePath,
   type ToolGroupSummaryKind,
 } from "@t3tools/client-runtime/work-log/presentation";
 export {
@@ -65,14 +67,14 @@ export function liveWorkEntryLabel(
   workspaceRoot: string | undefined,
   active: boolean,
 ) {
-  const toolPresentation = resolveWorkEntryToolPresentation(
-    entry,
-    active ? "inProgress" : "completed",
-  );
+  const status = liveActivityToolStatus(entry.toolLifecycleStatus, active);
+  const toolPresentation = resolveWorkEntryToolPresentation({
+    ...entry,
+    toolLifecycleStatus: status,
+  });
   if (toolPresentation) return toolPresentation.displayName;
   const command = entry.command?.trim();
   if (command) {
-    const status = entry.toolLifecycleStatus ?? (active ? "inProgress" : "completed");
     const verb =
       status === "inProgress"
         ? "Running"
@@ -88,6 +90,15 @@ export function liveWorkEntryLabel(
   return workEntryDisplayLabel(entry, workspaceRoot);
 }
 
+/**
+ * Rows that preview an image the agent viewed or produced. They stay out of
+ * tool groups and out of the settled-turn fold: the image is the answer the
+ * user asked for, not tool noise to hide behind "Worked for ...".
+ */
+function workEntryRendersImagePreview(entry: WorkLogEntry): boolean {
+  return workEntryViewedImagePath(entry) !== null;
+}
+
 export function workEntryIsVisibleInGroup(
   entry: WorkLogEntry,
   expandedToolGroupEntry = false,
@@ -96,6 +107,9 @@ export function workEntryIsVisibleInGroup(
     (expandedToolGroupEntry &&
       (entry.toolLifecycleStatus === "inProgress" ||
         entry.sourceActivityKind === "task.progress")) ||
+    // An image row stands alone outside any group, so the neutral filter
+    // would leave an empty gap while its tool is still in progress.
+    workEntryRendersImagePreview(entry) ||
     !workEntryIndicatesToolNeutralStatus(entry)
   );
 }
@@ -283,6 +297,7 @@ export type MessagesTimelineRow =
       createdAt: string;
       groupedEntries: WorkLogEntry[];
       isExpandedToolGroup: boolean;
+      displayLabel?: string;
     }
   | {
       kind: "work-live";
@@ -298,11 +313,14 @@ export type MessagesTimelineRow =
       kind: "work-toggle";
       id: string;
       createdAt: string;
+      turnId?: TurnId | null;
       groupId: string;
       hiddenCount: number;
       expanded: boolean;
       summary: string;
       summaryKind: ToolGroupSummaryKind;
+      toolSurface?: WorkLogEntry["toolSurface"];
+      toolIcon?: WorkLogEntry["toolIcon"];
       summaryToolIcon?: "browser" | "t3-code";
       hasFailure: boolean;
     }
@@ -326,6 +344,14 @@ export type MessagesTimelineRow =
       assistantTurnDiffSummary?: TurnDiffSummary | undefined;
       revertTurnCount?: number | undefined;
     }
+  | {
+      kind: "assistant-meta";
+      id: string;
+      createdAt: string;
+      message: ChatMessage;
+      showAssistantCopyButton: boolean;
+      assistantCopyStreaming: boolean;
+    }
   | {
       kind: "proposed-plan";
       id: string;
@@ -489,9 +515,9 @@ function workEntryIsActiveTurnActivity(entry: WorkLogEntry): boolean {
 }
 
 /**
- * Settled turns keep only their terminal assistant message visible.
- * Everything before it folds behind a "Worked for ..." row anchored at the
- * first hidden entry, so the duration leads directly into the final response.
+ * Settled turns fold activity before their terminal assistant message behind
+ * a "Worked for ..." row. Work that lands after that message stays visible so
+ * failed or interrupted turns do not hide their trailing tool-call summary.
  */
 function deriveTurnFolds(input: {
   timelineEntries: ReadonlyArray<TimelineEntry>;
@@ -562,16 +588,25 @@ function deriveTurnFolds(input: {
       continue;
     }
     const hiddenEntryIds = new Set<string>();
-    for (const entry of group.entries) {
+    const terminalEntryIndex = group.terminalEntry
+      ? group.entries.findIndex((entry) => entry.id === group.terminalEntry?.id)
+      : group.entries.length;
+    for (const [index, entry] of group.entries.entries()) {
       if (entry.id === group.terminalEntry?.id) {
         continue;
       }
+      if (index > terminalEntryIndex) {
+        continue;
+      }
       // Agent-spawn CTA rows never fold: workflows outlive their launching
       // turn (dynamic spawns, background execution), and folding the CTA
       // when the turn settles makes a still-running fleet invisible.
       if (entry.kind === "work" && entry.entry.agentSpawn !== undefined) {
         continue;
       }
+      if (entry.kind === "work" && workEntryRendersImagePreview(entry.entry)) {
+        continue;
+      }
       hiddenEntryIds.add(entry.id);
     }
     if (hiddenEntryIds.size === 0) {
@@ -621,6 +656,89 @@ function deriveTurnFolds(input: {
   return foldsByAnchorEntryId;
 }
 
+/**
+ * When a settled turn ends with tool calls after its terminal text, treat the
+ * text and tools as one visual response. The message metadata becomes the
+ * footer for the whole block instead of separating the prose from the tools.
+ */
+function attachTrailingToolGroupsToAssistant(
+  rows: ReadonlyArray<MessagesTimelineRow>,
+): MessagesTimelineRow[] {
+  const messageRowsWithoutMeta = new Set<string>();
+  const metaRowsAfterIndex = new Map<
+    number,
+    Extract<MessagesTimelineRow, { kind: "assistant-meta" }>
+  >();
+
+  for (const [messageIndex, row] of rows.entries()) {
+    const turnId = row.kind === "message" ? (row.message.turnId ?? null) : null;
+    if (
+      row.kind !== "message" ||
+      row.message.role !== "assistant" ||
+      !row.showAssistantMeta ||
+      turnId === null
+    ) {
+      continue;
+    }
+
+    let lastTrailingWorkIndex = -1;
+    let hasTrailingToolGroup = false;
+    for (let index = messageIndex + 1; index < rows.length; index += 1) {
+      const candidate = rows[index];
+      if (!candidate || candidate.kind === "message") {
+        break;
+      }
+      if (candidate.kind === "work-toggle" && candidate.turnId === turnId) {
+        hasTrailingToolGroup = true;
+        lastTrailingWorkIndex = index;
+        continue;
+      }
+      if (
+        candidate.kind === "work" &&
+        candidate.groupedEntries.some((entry) => entry.turnId === turnId)
+      ) {
+        if (
+          !candidate.isExpandedToolGroup &&
+          candidate.groupedEntries.some(workLogEntryIsToolLike)
+        ) {
+          hasTrailingToolGroup = true;
+        }
+        if (hasTrailingToolGroup) {
+          lastTrailingWorkIndex = index;
+        }
+      }
+    }
+
+    if (lastTrailingWorkIndex < 0) {
+      continue;
+    }
+
+    messageRowsWithoutMeta.add(row.id);
+    metaRowsAfterIndex.set(lastTrailingWorkIndex, {
+      kind: "assistant-meta",
+      id: `assistant-meta:${row.message.id}`,
+      createdAt: rows[lastTrailingWorkIndex]?.createdAt ?? row.message.updatedAt,
+      message: row.message,
+      showAssistantCopyButton: row.showAssistantCopyButton,
+      assistantCopyStreaming: row.assistantCopyStreaming,
+    });
+  }
+
+  const result: MessagesTimelineRow[] = [];
+  for (const [index, row] of rows.entries()) {
+    if (row.kind === "message" && messageRowsWithoutMeta.has(row.id)) {
+      result.push({ ...row, showAssistantMeta: false, showAssistantCopyButton: false });
+    } else {
+      result.push(row);
+    }
+    const metaRow = metaRowsAfterIndex.get(index);
+    if (metaRow) {
+      result.push(metaRow);
+    }
+  }
+  return result;
+}
+
 export function deriveMessagesTimelineRows(input: {
   timelineEntries: ReadonlyArray<TimelineEntry>;
   latestTurn?: TimelineLatestTurn | null;
@@ -685,7 +803,8 @@ export function deriveMessagesTimelineRows(input: {
       !entryBelongsToActiveTurn(entry, index) ||
       entry.kind !== "work" ||
       entry.entry.agentSpawn !== undefined ||
-      entry.entry.tone === "error"
+      entry.entry.tone === "error" ||
+      workEntryRendersImagePreview(entry.entry)
     ) {
       break;
     }
@@ -788,7 +907,11 @@ export function deriveMessagesTimelineRows(input: {
     }
 
     if (timelineEntry.kind === "work") {
-      if (timelineEntry.entry.agentSpawn !== undefined || timelineEntry.entry.tone === "error") {
+      if (
+        timelineEntry.entry.agentSpawn !== undefined ||
+        timelineEntry.entry.tone === "error" ||
+        workEntryRendersImagePreview(timelineEntry.entry)
+      ) {
         nextRows.push({
           kind: "work",
           id: timelineEntry.id,
@@ -807,6 +930,7 @@ export function deriveMessagesTimelineRows(input: {
           nextEntry.kind !== "work" ||
           nextEntry.entry.agentSpawn !== undefined ||
           nextEntry.entry.tone === "error" ||
+          workEntryRendersImagePreview(nextEntry.entry) ||
           activeWorkEntryIds.has(nextEntry.id) ||
           collapsedEntryIds.has(nextEntry.id) ||
           foldsByAnchorEntryId.has(nextEntry.id)
@@ -844,10 +968,42 @@ export function deriveMessagesTimelineRows(input: {
               expandedWorkGroupRow(groupId, timelineEntry.createdAt, visibleGroupedEntries),
             );
           }
+        } else if (
+          visibleGroupedEntries.length === 1 &&
+          workLogEntryIsToolLike(visibleGroupedEntries[0]!)
+        ) {
+          const singleEntry = visibleGroupedEntries[0]!;
+          nextRows.push({
+            kind: "work",
+            id: timelineEntry.id,
+            createdAt: timelineEntry.createdAt,
+            groupedEntries: visibleGroupedEntries,
+            isExpandedToolGroup: false,
+            displayLabel:
+              toolGroupAction(singleEntry) === "edit"
+                ? summarizeToolGroup(visibleGroupedEntries)
+                : singleToolCallLabel(singleEntry),
+          });
         } else {
           const groupId = workGroupId(timelineEntry.id, timelineEntry.entry);
           const expanded = input.expandedWorkGroupIds?.has(groupId) ?? false;
           const summaryKind = toolGroupSummaryKind(visibleGroupedEntries);
+          const primarySourceEntry = visibleGroupedEntries.find(
+            (entry) => entry.toolSource !== undefined,
+          );
+          const primarySourceKey = primarySourceEntry?.toolSource?.key;
+          const primarySourceIcon = primarySourceKey
+            ? (visibleGroupedEntries.find(
+                (entry) =>
+                  entry.toolSource?.key === primarySourceKey && entry.toolIcon !== undefined,
+              )?.toolIcon ?? primarySourceEntry?.toolSource?.icon)
+            : undefined;
+          const groupToolSurface =
+            primarySourceEntry?.toolSurface ??
+            visibleGroupedEntries.findLast((entry) => entry.toolSurface !== undefined)?.toolSurface;
+          const groupToolIcon =
+            primarySourceIcon ??
+            visibleGroupedEntries.findLast((entry) => entry.toolIcon !== undefined)?.toolIcon;
           const latestToolEntry = visibleGroupedEntries.findLast(workLogEntryIsToolLike);
           const singleEntry =
             visibleGroupedEntries.length === 1 ? (visibleGroupedEntries[0] ?? null) : null;
@@ -862,6 +1018,7 @@ export function deriveMessagesTimelineRows(input: {
             kind: "work-toggle",
             id: `work-toggle:${timelineEntry.id}`,
             createdAt: timelineEntry.createdAt,
+            turnId: timelineEntry.entry.turnId ?? null,
             groupId,
             hiddenCount: visibleGroupedEntries.length,
             expanded,
@@ -871,6 +1028,8 @@ export function deriveMessagesTimelineRows(input: {
                 ? singleEntry.label
                 : summarizeToolGroup(visibleGroupedEntries),
             summaryKind,
+            ...(groupToolSurface ? { toolSurface: groupToolSurface } : {}),
+            ...(groupToolIcon ? { toolIcon: groupToolIcon } : {}),
             ...(summaryToolIcon ? { summaryToolIcon } : {}),
             hasFailure:
               latestToolEntry !== undefined &&
@@ -944,7 +1103,7 @@ export function deriveMessagesTimelineRows(input: {
     });
   }
 
-  return nextRows;
+  return attachTrailingToolGroupsToAssistant(nextRows);
 }
 
 export function computeStableMessagesTimelineRows(
@@ -976,6 +1135,16 @@ function isRowUnchanged(a: MessagesTimelineRow, b: MessagesTimelineRow): boolean
     case "thinking":
       return a.createdAt === (b as typeof a).createdAt;
 
+    case "assistant-meta": {
+      const bm = b as typeof a;
+      return (
+        a.createdAt === bm.createdAt &&
+        a.message === bm.message &&
+        a.showAssistantCopyButton === bm.showAssistantCopyButton &&
+        a.assistantCopyStreaming === bm.assistantCopyStreaming
+      );
+    }
+
     case "turn-fold": {
       const bf = b as typeof a;
       return a.createdAt === bf.createdAt && a.label === bf.label && a.expanded === bf.expanded;
@@ -988,6 +1157,7 @@ function isRowUnchanged(a: MessagesTimelineRow, b: MessagesTimelineRow): boolean
       const bw = b as typeof a;
       return (
         a.isExpandedToolGroup === bw.isExpandedToolGroup &&
+        a.displayLabel === bw.displayLabel &&
         Equal.equals(a.groupedEntries, bw.groupedEntries)
       );
     }
@@ -1008,11 +1178,14 @@ function isRowUnchanged(a: MessagesTimelineRow, b: MessagesTimelineRow): boolean
       const bw = b as typeof a;
       return (
         a.createdAt === bw.createdAt &&
+        a.turnId === bw.turnId &&
         a.groupId === bw.groupId &&
         a.hiddenCount === bw.hiddenCount &&
         a.expanded === bw.expanded &&
         a.summary === bw.summary &&
         a.summaryKind === bw.summaryKind &&
+        a.toolSurface === bw.toolSurface &&
+        Equal.equals(a.toolIcon, bw.toolIcon) &&
         a.hasFailure === bw.hasFailure
       );
     }
diff --git a/apps/web/src/components/chat/MessagesTimeline.test.tsx b/apps/web/src/components/chat/MessagesTimeline.test.tsx
index d4f80108dd08..0fe0c5e1e8df 100644
--- a/apps/web/src/components/chat/MessagesTimeline.test.tsx
+++ b/apps/web/src/components/chat/MessagesTimeline.test.tsx
@@ -3,7 +3,7 @@ import { codexFeedbackMessage } from "@t3tools/client-runtime/state/threads";
 import { createRef, type ReactNode, type Ref } from "react";
 import { renderToStaticMarkup } from "react-dom/server";
 import { beforeAll, describe, expect, it, vi } from "vite-plus/test";
-import type { LegendListRef } from "@legendapp/list/react";
+import type { LegendListRef, MaintainScrollAtEndOptions } from "@legendapp/list/react";
 
 vi.mock("@legendapp/list/react", async () => {
   const legendListTestId = "legend-list";
@@ -16,23 +16,34 @@ vi.mock("@legendapp/list/react", async () => {
     ListFooterComponent?: ReactNode;
     anchoredEndSpace?: {
       anchorIndex: number;
+      anchorMaxSize?: number;
+      anchorOffset?: number;
+      onReady?: (info: { anchorIndex: number }) => void;
     };
-    maintainScrollAtEnd?:
+    contentInsetEndAdjustment?: number;
+    className?: string;
+    maintainScrollAtEnd?: boolean | MaintainScrollAtEndOptions;
+    maintainVisibleContentPosition?:
       | boolean
       | {
-          animated?: boolean;
-          on?: {
-            dataChange?: boolean;
-            itemLayout?: boolean;
-            layout?: boolean;
-          };
+          data?: boolean;
+          size?: boolean;
+          shouldRestorePosition?: (item: { id: string }) => boolean;
         };
     ref?: Ref<LegendListRef>;
   }) => {
+    if (props.anchoredEndSpace) {
+      props.anchoredEndSpace.onReady?.({ anchorIndex: props.anchoredEndSpace.anchorIndex });
+    }
     return (
       <div
         data-testid={legendListTestId}
         data-anchor-index={props.anchoredEndSpace?.anchorIndex}
+        data-anchor-max-size={props.anchoredEndSpace?.anchorMaxSize}
+        data-anchor-offset={props.anchoredEndSpace?.anchorOffset}
+        data-anchor-on-ready={Boolean(props.anchoredEndSpace?.onReady)}
+        data-content-inset-end={props.contentInsetEndAdjustment}
+        data-class-name={props.className}
         data-maintain-scroll-at-end={props.maintainScrollAtEnd ? "enabled" : undefined}
         data-maintain-scroll-at-end-animated={
           typeof props.maintainScrollAtEnd === "object"
@@ -44,6 +55,11 @@ vi.mock("@legendapp/list/react", async () => {
             ? props.maintainScrollAtEnd.on?.dataChange
             : undefined
         }
+        data-maintain-scroll-at-end-footer-layout={
+          typeof props.maintainScrollAtEnd === "object"
+            ? props.maintainScrollAtEnd.on?.footerLayout
+            : undefined
+        }
         data-maintain-scroll-at-end-item-layout={
           typeof props.maintainScrollAtEnd === "object"
             ? props.maintainScrollAtEnd.on?.itemLayout
@@ -54,6 +70,26 @@ vi.mock("@legendapp/list/react", async () => {
             ? props.maintainScrollAtEnd.on?.layout
             : undefined
         }
+        data-maintain-visible-content-position={
+          typeof props.maintainVisibleContentPosition === "object"
+            ? "object"
+            : props.maintainVisibleContentPosition
+        }
+        data-maintain-visible-content-position-data={
+          typeof props.maintainVisibleContentPosition === "object"
+            ? props.maintainVisibleContentPosition.data
+            : undefined
+        }
+        data-maintain-visible-content-position-size={
+          typeof props.maintainVisibleContentPosition === "object"
+            ? props.maintainVisibleContentPosition.size
+            : undefined
+        }
+        data-maintain-visible-content-position-restore={
+          typeof props.maintainVisibleContentPosition === "object"
+            ? Boolean(props.maintainVisibleContentPosition.shouldRestorePosition)
+            : undefined
+        }
       >
         {props.ListHeaderComponent}
         {props.data.map((item) => (
@@ -147,7 +183,6 @@ function buildProps() {
     revertTurnCountByUserMessageId: new Map(),
     onRevertUserMessage: () => {},
     isRevertingCheckpoint: false,
-    openingVideoAttachmentId: null,
     onImageExpand: () => {},
     activeThreadEnvironmentId: ACTIVE_THREAD_ENVIRONMENT_ID,
     markdownCwd: undefined,
@@ -465,7 +500,7 @@ describe("MessagesTimeline", () => {
     expect(markup).not.toContain('alt="report.pdf"');
   });
 
-  it("renders video attachments as play buttons", () => {
+  it("renders video attachments with the shared video player", () => {
     const entry = {
       ...buildUserTimelineEntry("Watch the demo."),
       message: {
@@ -477,6 +512,7 @@ describe("MessagesTimeline", () => {
             name: "demo.mp4",
             mimeType: "video/mp4",
             sizeBytes: 42,
+            previewUrl: "https://environment.test/api/assets/demo.mp4",
           },
         ],
       },
@@ -485,22 +521,37 @@ describe("MessagesTimeline", () => {
     const markup = renderToStaticMarkup(
       <MessagesTimeline {...buildProps()} timelineEntries={[entry]} />,
     );
-    const busyMarkup = renderToStaticMarkup(
-      <MessagesTimeline
-        {...buildProps()}
-        timelineEntries={[entry]}
-        openingVideoAttachmentId="attachment-demo-mp4"
-      />,
+
+    expect(markup).toContain("<video");
+    expect(markup).toContain('aria-label="demo.mp4"');
+    expect(markup).toContain('controls=""');
+    expect(markup).not.toContain("Expand demo.mp4");
+  });
+
+  it("shows the filename while an optimistic video is unavailable", () => {
+    const entry = {
+      ...buildUserTimelineEntry("Uploading the demo."),
+      message: {
+        ...buildUserTimelineEntry("Uploading the demo.").message,
+        attachments: [
+          {
+            type: "file" as const,
+            id: "optimistic-demo-mp4",
+            name: "pending-demo.mp4",
+            mimeType: "video/mp4",
+            sizeBytes: 42,
+            downloadable: false,
+          },
+        ],
+      },
+    };
+
+    const markup = renderToStaticMarkup(
+      <MessagesTimeline {...buildProps()} timelineEntries={[entry]} />,
     );
 
-    expect(markup).toContain('aria-label="Play demo.mp4"');
-    expect(markup).toContain("min-h-[72px]");
-    expect(markup).toContain(">demo.mp4</span>");
-    expect(markup).not.toContain('aria-label="Download demo.mp4"');
-    expect(busyMarkup).toContain('aria-busy="true"');
-    expect(busyMarkup).toContain('aria-disabled="true"');
-    expect(busyMarkup).not.toContain('disabled=""');
-    expect(busyMarkup).toContain(">Loading…</span>");
+    expect(markup).not.toContain("<video");
+    expect(markup).toContain(">pending-demo.mp4</div>");
   });
   it("renders an ordinary file download button without creating its URL in advance", () => {
     const entry = {
@@ -739,6 +790,7 @@ describe("MessagesTimeline", () => {
     expect(markup).toContain('data-maintain-scroll-at-end="enabled"');
     expect(markup).toContain('data-maintain-scroll-at-end-animated="false"');
     expect(markup).toContain('data-maintain-scroll-at-end-data-change="true"');
+    expect(markup).toContain('data-maintain-scroll-at-end-footer-layout="false"');
     expect(markup).toContain('data-maintain-scroll-at-end-item-layout="true"');
     expect(markup).toContain('data-maintain-scroll-at-end-layout="true"');
     expect(markup).toContain('data-user-message-collapsed="true"');
@@ -1091,6 +1143,62 @@ describe("MessagesTimeline", () => {
     expect(markup).toContain("tool call failed");
   });
 
+  it("renders trailing tool calls as part of the terminal assistant block", () => {
+    const turnId = TurnId.make("turn-trailing-tools");
+    const assistantMessageId = MessageId.make("assistant-trailing-tools");
+    const markup = renderToStaticMarkup(
+      <MessagesTimeline
+        {...buildProps()}
+        latestTurn={{
+          turnId,
+          state: "error",
+          startedAt: "2026-03-17T19:12:20.000Z",
+          completedAt: "2026-03-17T19:12:30.000Z",
+        }}
+        timelineEntries={[
+          {
+            id: "assistant-entry",
+            kind: "message",
+            createdAt: MESSAGE_CREATED_AT,
+            message: {
+              id: assistantMessageId,
+              role: "assistant",
+              text: "I’ll search for it now.",
+              turnId,
+              createdAt: MESSAGE_CREATED_AT,
+              updatedAt: "2026-03-17T19:12:29.000Z",
+              streaming: false,
+            },
+          },
+          {
+            id: "trailing-work-entry",
+            kind: "work",
+            createdAt: "2026-03-17T19:12:30.000Z",
+            entry: {
+              id: "trailing-work",
+              createdAt: "2026-03-17T19:12:30.000Z",
+              turnId,
+              label: "Ran command",
+              tone: "tool",
+              itemType: "command_execution",
+              toolLifecycleStatus: "completed",
+            },
+          },
+        ]}
+      />,
+    );
+
+    const messageIndex = markup.indexOf('data-timeline-row-id="assistant-entry"');
+    const toolIndex = markup.indexOf('data-timeline-row-id="trailing-work-entry"');
+    const metaIndex = markup.indexOf(
+      'data-timeline-row-id="assistant-meta:assistant-trailing-tools"',
+    );
+    expect(messageIndex).toBeGreaterThanOrEqual(0);
+    expect(toolIndex).toBeGreaterThan(messageIndex);
+    expect(metaIndex).toBeGreaterThan(toolIndex);
+    expect(markup.match(/I’ll search for it now\./gu)).toHaveLength(1);
+  });
+
   it("keeps mixed work logs neutral after a later tool call succeeds", () => {
     const markup = renderToStaticMarkup(
       <MessagesTimeline
@@ -1259,7 +1367,7 @@ describe("MessagesTimeline", () => {
     expect(markup).toContain('data-timeline-row-id="live-activity-row"');
   });
 
-  it("keeps the completed command in the shared activity row with a past-tense label", () => {
+  it("keeps the completed command in the shared activity row with a present-tense label", () => {
     const turnId = TurnId.make("turn-live");
     const markup = renderToStaticMarkup(
       <MessagesTimeline
@@ -1294,10 +1402,10 @@ describe("MessagesTimeline", () => {
       />,
     );
 
-    expect(markup).toContain("Ran pnpm");
+    expect(markup).toContain("Running pnpm");
     expect(markup).toContain("lucide-terminal");
     expect(markup).toContain("live-activity-focus");
-    expect(markup).not.toContain("Running pnpm");
+    expect(markup).not.toContain("Ran pnpm");
     expect(markup).not.toContain("Thinking");
     expect(markup).not.toContain('data-timeline-row-kind="thinking"');
   });
diff --git a/apps/web/src/components/chat/MessagesTimeline.tsx b/apps/web/src/components/chat/MessagesTimeline.tsx
index 2c5535f21047..b5635ef63df8 100644
--- a/apps/web/src/components/chat/MessagesTimeline.tsx
+++ b/apps/web/src/components/chat/MessagesTimeline.tsx
@@ -4,6 +4,7 @@ import {
   type MessageId,
   type ScopedThreadRef,
   type ServerProviderSkill,
+  type ToolActivityIcon,
   type TurnId,
 } from "@t3tools/contracts";
 import { parseScopedThreadKey } from "@t3tools/client-runtime/environment";
@@ -20,6 +21,8 @@ import {
   formatSubagentTokenCount,
 } from "@t3tools/client-runtime/state/subagentRuntime";
 import { resolveChatListAnchoredEndSpace } from "@t3tools/shared/chatList";
+import { toolActivityFaviconUrl } from "@t3tools/shared/favicon";
+import { getProjectFaviconCacheKey } from "@t3tools/shared/projectFavicon";
 import {
   createContext,
   Fragment,
@@ -27,6 +30,7 @@ import {
   use,
   useCallback,
   useEffect,
+  useId,
   useLayoutEffect,
   useMemo,
   useRef,
@@ -35,7 +39,11 @@ import {
   type MouseEvent,
   type ReactNode,
 } from "react";
-import { LegendList, type LegendListRef } from "@legendapp/list/react";
+import {
+  LegendList,
+  type LegendListRef,
+  type MaintainScrollAtEndOptions,
+} from "@legendapp/list/react";
 import { FileDiff } from "@pierre/diffs/react";
 import {
   deriveTimelineEntries,
@@ -47,6 +55,7 @@ import {
   type ChatAttachment,
   type ChatFileAttachment,
   type ChatImageAttachment,
+  type ChatMessage,
   isBrowserPreviewAttachment,
   isFileAttachment,
   isImageAttachment,
@@ -86,15 +95,18 @@ import {
   ZapIcon,
 } from "lucide-react";
 import { Button } from "../ui/button";
+import { useAssetUrlRefresh, useAssetUrlState } from "../../assets/assetUrls";
+import { MediaVideoPlayer } from "../media/MediaVideoPlayer";
 import { getVirtualizedScrollFadeClassName } from "../ui/scroll-area";
-import { buildExpandedImagePreview, ExpandedImagePreview } from "./ExpandedImagePreview";
+import {
+  buildAttachmentVideoAsset,
+  buildExpandedImagePreview,
+  ExpandedImagePreview,
+} from "./ExpandedImagePreview";
 import { ProposedPlanCard } from "./ProposedPlanCard";
 import { ChangedFilesCard } from "./ChangedFilesTree";
 import { shouldAutoExpandChangedFiles } from "./changedFilesPresentation";
-import {
-  CHAT_TIMELINE_ANCHOR_OFFSET,
-  keepTimelineEndVisibleAfterOverlayGrowth,
-} from "./timelineScrollAnchoring";
+import { CHAT_TIMELINE_ANCHOR_OFFSET } from "./timelineScrollAnchoring";
 import { MessageCopyButton } from "./MessageCopyButton";
 import { PierreEntryIcon } from "./PierreEntryIcon";
 import { AssistantSelectionToolbar } from "./AssistantSelectionToolbar";
@@ -147,7 +159,6 @@ import { cn } from "~/lib/utils";
 import { useUiStateStore } from "~/uiStateStore";
 import { type TimestampFormat } from "@t3tools/contracts/settings";
 import { formatChatTimestampTooltip, formatDayAwareTimestamp } from "../../timestampFormat";
-
 import {
   buildInlineTerminalContextText,
   formatInlineTerminalContextLabel,
@@ -250,16 +261,27 @@ function TimelineLoadEarlierHeader({
     </div>
   );
 }
-const TIMELINE_LIST_FOOTER = <div className="h-3 sm:h-4" />;
+function TimelineListFooter({ composerInset }: { readonly composerInset: number }) {
+  return (
+    <div aria-hidden>
+      <div style={{ height: composerInset }} />
+      <div className="h-3 sm:h-4" />
+    </div>
+  );
+}
 const EMPTY_TIMELINE_SKILLS: ReadonlyArray<Pick<ServerProviderSkill, "name" | "displayName">> = [];
 const TIMELINE_MAINTAIN_SCROLL_AT_END = {
   animated: false,
   on: {
     dataChange: true,
+    // Composer inset changes must not move already-visible messages. New
+    // rows and row growth still keep live-follow pinned through the other
+    // triggers below.
+    footerLayout: false,
     itemLayout: true,
     layout: true,
   },
-} as const;
+} as const satisfies MaintainScrollAtEndOptions;
 
 // ---------------------------------------------------------------------------
 // Props (public API)
@@ -291,7 +313,7 @@ interface MessagesTimelineProps {
   onImageExpand: (preview: ExpandedImagePreview) => void;
   onFileOpen?: (attachment: ChatFileAttachment) => void;
   onFileDownload?: (attachment: ChatFileAttachment) => void;
-  openingVideoAttachmentId: string | null;
+  openingVideoAttachmentId?: string | null;
   activeThreadEnvironmentId: EnvironmentId;
   markdownCwd: string | undefined;
   resolvedTheme: "light" | "dark";
@@ -343,7 +365,7 @@ export const MessagesTimeline = memo(function MessagesTimeline({
   onImageExpand,
   onFileOpen = NOOP_OPEN_ATTACHMENT,
   onFileDownload = NOOP_OPEN_ATTACHMENT,
-  openingVideoAttachmentId,
+  openingVideoAttachmentId = null,
   activeThreadEnvironmentId,
   markdownCwd,
   resolvedTheme,
@@ -378,8 +400,6 @@ export const MessagesTimeline = memo(function MessagesTimeline({
   const disclosureAnchorKeyRef = useRef<string | null>(null);
   const disclosureSettleFrameRef = useRef<number | null>(null);
   const disclosureSettleSecondFrameRef = useRef<number | null>(null);
-  const previousContentInsetEndAdjustmentRef = useRef(contentInsetEndAdjustment);
-
   useEffect(() => {
     return () => {
       if (disclosureSettleFrameRef.current !== null) {
@@ -530,15 +550,6 @@ export const MessagesTimeline = memo(function MessagesTimeline({
     onExpandTurn: expandCitedTurn,
     onManualNavigation,
   });
-  useLayoutEffect(() => {
-    keepTimelineEndVisibleAfterOverlayGrowth({
-      timeline: listRef.current,
-      previousOverlayHeight: previousContentInsetEndAdjustmentRef.current,
-      overlayHeight: contentInsetEndAdjustment,
-      followingEnd: liveFollowEnabled && anchorMessageId === null && !citationPositioning,
-    });
-    previousContentInsetEndAdjustmentRef.current = contentInsetEndAdjustment;
-  }, [anchorMessageId, citationPositioning, contentInsetEndAdjustment, listRef, liveFollowEnabled]);
   const [minimapHasPersistentGutter, setMinimapHasPersistentGutter] = useState(false);
   const [minimapHitStripWidth, setMinimapHitStripWidth] = useState(0);
   const handleAnchorReady = useCallback(
@@ -558,6 +569,10 @@ export const MessagesTimeline = memo(function MessagesTimeline({
     );
     return config ? { ...config, onReady: handleAnchorReady } : undefined;
   }, [anchorMessageId, handleAnchorReady, rows]);
+  const timelineListFooter = useMemo(
+    () => <TimelineListFooter composerInset={anchoredEndSpace ? 0 : contentInsetEndAdjustment} />,
+    [anchoredEndSpace, contentInsetEndAdjustment],
+  );
 
   const handleScroll = useCallback(() => {
     const state = listRef.current?.getState?.();
@@ -725,6 +740,7 @@ export const MessagesTimeline = memo(function MessagesTimeline({
           <LegendList<MessagesTimelineRow>
             ref={listRef}
             data={rows}
+            extraData={rows.length}
             keyExtractor={keyExtractor}
             getItemType={getItemType}
             renderItem={renderItem}
@@ -735,7 +751,7 @@ export const MessagesTimeline = memo(function MessagesTimeline({
             {...(citationAlwaysRender ? { alwaysRender: citationAlwaysRender } : {})}
             onLoad={onCitationListLoad}
             {...(anchoredEndSpace ? { anchoredEndSpace } : {})}
-            contentInsetEndAdjustment={contentInsetEndAdjustment}
+            contentInsetEndAdjustment={anchoredEndSpace ? contentInsetEndAdjustment : 0}
             maintainScrollAtEnd={
               citationPositioning ||
               anchoredEndSpace ||
@@ -747,6 +763,7 @@ export const MessagesTimeline = memo(function MessagesTimeline({
             maintainVisibleContentPosition={
               citationPositioning ? false : maintainVisibleContentPosition
             }
+            maintainScrollAtEndThreshold={1}
             onScroll={handleScroll}
             className={cn(
               "scrollbar-gutter-both h-full min-h-0 overflow-x-hidden overscroll-y-contain px-3 [overflow-anchor:none] sm:px-5",
@@ -765,7 +782,7 @@ export const MessagesTimeline = memo(function MessagesTimeline({
                 TIMELINE_LIST_HEADER
               )
             }
-            ListFooterComponent={TIMELINE_LIST_FOOTER}
+            ListFooterComponent={timelineListFooter}
           />
           <TimelineMinimap
             items={minimapItems}
@@ -1101,11 +1118,16 @@ const TimelineRowContent = memo(function TimelineRowContent({ row }: { row: Time
                   row.kind === "thinking"
                 ? "pb-2"
                 : "pb-4",
-        row.kind === "message" && row.message.role === "assistant" ? "group/assistant" : null,
+        (row.kind === "message" && row.message.role === "assistant") ||
+          row.kind === "assistant-meta"
+          ? "group/assistant"
+          : null,
       )}
       data-timeline-row-id={row.id}
       data-timeline-row-kind={row.kind}
-      data-message-id={row.kind === "message" ? row.message.id : undefined}
+      data-message-id={
+        row.kind === "message" || row.kind === "assistant-meta" ? row.message.id : undefined
+      }
       data-message-role={row.kind === "message" ? row.message.role : undefined}
     >
       {row.kind === "work" ? (
@@ -1113,6 +1135,7 @@ const TimelineRowContent = memo(function TimelineRowContent({ row }: { row: Time
           anchorKey={row.id}
           groupedEntries={row.groupedEntries}
           isExpandedToolGroup={row.isExpandedToolGroup}
+          displayLabel={row.displayLabel}
         />
       ) : null}
       {row.kind === "work-live" ? <LiveWorkEntryTimelineRow row={row} /> : null}
@@ -1122,6 +1145,7 @@ const TimelineRowContent = memo(function TimelineRowContent({ row }: { row: Time
       {row.kind === "message" && row.message.role === "assistant" ? (
         <AssistantTimelineRow row={row} />
       ) : null}
+      {row.kind === "assistant-meta" ? <AssistantMetaTimelineRow row={row} /> : null}
       {row.kind === "proposed-plan" ? <ProposedPlanTimelineRow row={row} /> : null}
       {row.kind === "working" ? <WorkingTimelineRow row={row} /> : null}
       {row.kind === "thinking" ? <ThinkingTimelineRow /> : null}
@@ -1129,6 +1153,45 @@ const TimelineRowContent = memo(function TimelineRowContent({ row }: { row: Time
   );
 });
 
+function UserVideoAttachment({ file }: { readonly file: ChatFileAttachment }) {
+  const ctx = use(TimelineRowCtx);
+  const asset = useMemo(
+    () =>
+      file.downloadable === false
+        ? null
+        : buildAttachmentVideoAsset(ctx.activeThreadEnvironmentId, file),
+    [ctx.activeThreadEnvironmentId, file.downloadable, file.id, file.mimeType, file.name],
+  );
+  const resource = asset?.resource ?? null;
+  const assetUrl = useAssetUrlState(ctx.activeThreadEnvironmentId, resource);
+  const refreshAssetUrl = useAssetUrlRefresh(ctx.activeThreadEnvironmentId, resource);
+  const src = assetUrl._tag === "Success" ? assetUrl.url : (file.previewUrl ?? null);
+
+  if (asset === null && src === null) {
+    return (
+      <div className="flex aspect-[4/3] w-full items-center justify-center rounded-lg border border-border/80 bg-black px-2 py-3 text-center text-[11px] text-white/70">
+        {file.name}
+      </div>
+    );
+  }
+
+  return (
+    <MediaVideoPlayer
+      src={src}
+      sourceFailed={
+        file.previewUrl === undefined && resource !== null && assetUrl._tag === "Failure"
+      }
+      label={file.name}
+      preload="visible"
+      className="block aspect-[4/3] w-full"
+      videoClassName="aspect-auto size-full rounded-lg border border-border/80"
+      stateClassName="aspect-auto min-h-full rounded-lg border border-border/80 bg-black text-white"
+      onRetry={asset ? refreshAssetUrl : undefined}
+      actionsSource={asset ? { kind: "video", name: file.name, src, asset } : undefined}
+    />
+  );
+}
+
 function UserTimelineRow({ row }: { row: Extract<TimelineRow, { kind: "message" }> }) {
   const ctx = use(TimelineRowCtx);
   // The attachment union has an open member, so guards (not literal type
@@ -1167,12 +1230,12 @@ function UserTimelineRow({ row }: { row: Extract<TimelineRow, { kind: "message"
             {regularImages.map((image) => (
               <div
                 key={image.id}
-                className="overflow-hidden rounded-lg border border-border/80 bg-background/70"
+                className="aspect-[4/3] overflow-hidden rounded-lg border border-border/80 bg-background/70"
               >
                 {image.previewUrl ? (
                   <button
                     type="button"
-                    className="h-full w-full cursor-zoom-in"
+                    className="block h-full w-full cursor-zoom-in"
                     aria-label={`Preview ${image.name}`}
                     onClick={() => {
                       const preview = buildExpandedImagePreview(regularImages, image.id);
@@ -1183,7 +1246,7 @@ function UserTimelineRow({ row }: { row: Extract<TimelineRow, { kind: "message"
                     <img
                       src={image.previewUrl}
                       alt={image.name}
-                      className="block h-auto max-h-[220px] w-full object-cover"
+                      className="block size-full object-cover"
                     />
                   </button>
                 ) : (
@@ -1193,35 +1256,9 @@ function UserTimelineRow({ row }: { row: Extract<TimelineRow, { kind: "message"
                 )}
               </div>
             ))}
-            {userVideos.map((file) => {
-              const isOpening = ctx.openingVideoAttachmentId === file.id;
-              return (
-                <div
-                  key={file.id}
-                  className="overflow-hidden rounded-lg border border-border/80 bg-black"
-                >
-                  <button
-                    type="button"
-                    disabled={file.downloadable === false}
-                    className="flex min-h-[72px] w-full cursor-zoom-in flex-col items-center justify-center gap-1 px-2 py-2 text-white disabled:cursor-default disabled:opacity-50 aria-disabled:cursor-default aria-disabled:opacity-50"
-                    aria-busy={isOpening || undefined}
-                    aria-disabled={isOpening || undefined}
-                    aria-label={`${isOpening ? "Loading" : "Play"} ${file.name}`}
-                    onClick={() => {
-                      if (isOpening) return;
-                      ctx.onFileOpen(file);
-                    }}
-                  >
-                    {isOpening ? (
-                      <span className="text-[11px]">Loading…</span>
-                    ) : (
-                      <PlayIcon className="size-8 fill-current" />
-                    )}
-                    <span className="max-w-full truncate text-[11px]">{file.name}</span>
-                  </button>
-                </div>
-              );
-            })}
+            {userVideos.map((file) => (
+              <UserVideoAttachment key={file.id} file={file} />
+            ))}
           </div>
         )}
         {previewAnnotations.map((annotation, index) => (
@@ -1434,21 +1471,12 @@ function AssistantTimelineRow({ row }: { row: Extract<TimelineRow, { kind: "mess
           onOpenTurnDiff={ctx.onOpenTurnDiff}
         />
         {row.showAssistantMeta ? (
-          <div className="mt-1.5 flex items-center gap-2 text-xs tabular-nums opacity-0 transition-opacity duration-200 focus-within:opacity-100 group-hover/assistant:opacity-100">
-            <AssistantCopyButton row={row} />
-            {!row.message.streaming && (
-              <Tooltip>
-                <TooltipTrigger
-                  render={<p className="text-muted-foreground text-xs tabular-nums" />}
-                >
-                  {formatDayAwareTimestamp(row.message.updatedAt, ctx.timestampFormat)}
-                </TooltipTrigger>
-                <TooltipPopup>
-                  {formatChatTimestampTooltip(row.message.updatedAt, ctx.timestampFormat)}
-                </TooltipPopup>
-              </Tooltip>
-            )}
-          </div>
+          <AssistantMessageMeta
+            className="mt-1.5"
+            message={row.message}
+            showCopyButton={row.showAssistantCopyButton}
+            copyStreaming={row.assistantCopyStreaming}
+          />
         ) : null}
       </div>
     </>
@@ -1549,11 +1577,81 @@ function MessageFileAttachments(props: { attachments: ReadonlyArray<ChatFileAtta
   );
 }
 
-function AssistantCopyButton({ row }: { row: Extract<TimelineRow, { kind: "message" }> }) {
+function AssistantMetaTimelineRow({
+  row,
+}: {
+  row: Extract<TimelineRow, { kind: "assistant-meta" }>;
+}) {
+  return (
+    <div className="px-1">
+      <AssistantMessageMeta
+        className="mt-0.5"
+        message={row.message}
+        showCopyButton={row.showAssistantCopyButton}
+        copyStreaming={row.assistantCopyStreaming}
+        alwaysVisible
+      />
+    </div>
+  );
+}
+
+function AssistantMessageMeta({
+  className,
+  message,
+  showCopyButton,
+  copyStreaming,
+  alwaysVisible = false,
+}: {
+  className?: string;
+  message: ChatMessage;
+  showCopyButton: boolean;
+  copyStreaming: boolean;
+  alwaysVisible?: boolean;
+}) {
+  const ctx = use(TimelineRowCtx);
+
+  return (
+    <div
+      className={cn(
+        "flex items-center gap-2 text-xs tabular-nums transition-opacity duration-200",
+        alwaysVisible
+          ? "opacity-100"
+          : "opacity-0 focus-within:opacity-100 group-hover/assistant:opacity-100",
+        className,
+      )}
+    >
+      <AssistantCopyButton
+        message={message}
+        showCopyButton={showCopyButton}
+        streaming={copyStreaming}
+      />
+      {!message.streaming && (
+        <Tooltip>
+          <TooltipTrigger render={<p className="text-muted-foreground text-xs tabular-nums" />}>
+            {formatDayAwareTimestamp(message.updatedAt, ctx.timestampFormat)}
+          </TooltipTrigger>
+          <TooltipPopup>
+            {formatChatTimestampTooltip(message.updatedAt, ctx.timestampFormat)}
+          </TooltipPopup>
+        </Tooltip>
+      )}
+    </div>
+  );
+}
+
+function AssistantCopyButton({
+  message,
+  showCopyButton,
+  streaming,
+}: {
+  message: ChatMessage;
+  showCopyButton: boolean;
+  streaming: boolean;
+}) {
   const assistantCopyState = resolveAssistantMessageCopyState({
-    text: row.message.text ?? null,
-    showCopyButton: row.showAssistantCopyButton,
-    streaming: row.assistantCopyStreaming,
+    text: message.text ?? null,
+    showCopyButton,
+    streaming,
   });
 
   if (!assistantCopyState.visible) {
@@ -1658,10 +1756,12 @@ const WorkGroupSection = memo(function WorkGroupSection({
   anchorKey,
   groupedEntries,
   isExpandedToolGroup,
+  displayLabel,
 }: {
   anchorKey: string;
   groupedEntries: Extract<MessagesTimelineRow, { kind: "work" }>["groupedEntries"];
   isExpandedToolGroup: boolean;
+  displayLabel?: string | undefined;
 }) {
   const { workspaceRoot, routeThreadKey } = use(TimelineRowCtx);
   const nonEmptyEntries = useMemo(
@@ -1690,6 +1790,7 @@ const WorkGroupSection = memo(function WorkGroupSection({
             workEntry={workEntry}
             workspaceRoot={workspaceRoot}
             isExpandedToolGroupEntry={false}
+            displayLabel={displayLabel}
           />
         ))}
       </div>
@@ -1852,10 +1953,12 @@ function ActivityShimmerOverlay({ children }: { children: ReactNode }) {
 function LiveActivityRow({
   label,
   iconName,
+  toolIcon,
   failed = false,
 }: {
   label: string;
   iconName?: WorkEntryIconName;
+  toolIcon?: ToolActivityIcon | undefined;
   failed?: boolean;
 }) {
   return (
@@ -1863,11 +1966,18 @@ function LiveActivityRow({
       <LiveActivityContent
         label={label}
         iconName={iconName}
+        toolIcon={toolIcon}
         failed={failed}
         announceFailure={failed}
       />
       <ActivityShimmerOverlay>
-        <LiveActivityContent label={label} iconName={iconName} failed={failed} highlighted />
+        <LiveActivityContent
+          label={label}
+          iconName={iconName}
+          toolIcon={toolIcon}
+          failed={failed}
+          highlighted
+        />
       </ActivityShimmerOverlay>
     </div>
   );
@@ -1876,17 +1986,20 @@ function LiveActivityRow({
 function LiveActivityContent({
   label,
   iconName,
+  toolIcon,
   failed = false,
   announceFailure = false,
   highlighted = false,
 }: {
   label: string;
   iconName: WorkEntryIconName | undefined;
+  toolIcon?: ToolActivityIcon | undefined;
   failed?: boolean;
   announceFailure?: boolean;
   highlighted?: boolean;
 }) {
-  const isSpecialToolIcon = iconName === "browser" || iconName === "t3-code";
+  const isSpecialToolIcon =
+    iconName === "browser" || iconName === "computer" || iconName === "t3-code";
   const resolvedIconName = failed && !isSpecialToolIcon ? "circle-alert" : iconName;
 
   return (
@@ -1906,9 +2019,11 @@ function LiveActivityContent({
           role={announceFailure ? "img" : undefined}
           aria-label={announceFailure ? "Tool call failed" : undefined}
         >
-          <WorkEntryIcon
-            name={resolvedIconName}
-            className={cn("block size-4 shrink-0 stroke-[1.8]", !highlighted && "opacity-70")}
+          <ToolActivityIconView
+            icon={failed && !isSpecialToolIcon ? undefined : toolIcon}
+            fallbackName={resolvedIconName}
+            className="block size-4 shrink-0 stroke-[1.8]"
+            muted={!highlighted}
           />
         </span>
       ) : null}
@@ -1932,12 +2047,18 @@ function LiveWorkEntryTimelineRow({ row }: { row: Extract<TimelineRow, { kind: "
       onClick={() => ctx.onToggleWorkGroup(row.groupId, row.id)}
     >
       {row.active ? (
-        <LiveActivityRow label={label} iconName={workEntryIconName(row.entry)} failed={failed} />
+        <LiveActivityRow
+          label={label}
+          iconName={workEntryIconName(row.entry)}
+          toolIcon={row.entry.toolIcon ?? row.entry.toolSource?.icon}
+          failed={failed}
+        />
       ) : (
         <div className="min-h-6 w-fit max-w-full min-w-0 overflow-hidden rounded-md text-sm leading-relaxed">
           <LiveActivityContent
             label={label}
             iconName={workEntryIconName(row.entry)}
+            toolIcon={row.entry.toolIcon ?? row.entry.toolSource?.icon}
             failed={failed}
             announceFailure={failed}
           />
@@ -1992,9 +2113,13 @@ function WorkGroupToggleTimelineRow({
       onClick={() => ctx.onToggleWorkGroup(row.groupId, row.id)}
     >
       <span className="flex size-6 shrink-0 items-center justify-center text-icon-muted">
-        <WorkEntryIcon
-          name={row.summaryToolIcon ?? toolGroupSummaryIconName(row.summaryKind)}
-          className="size-4 shrink-0 stroke-[1.8] opacity-70"
+        <ToolActivityIconView
+          icon={row.toolIcon}
+          fallbackName={
+            row.summaryToolIcon ?? row.toolSurface ?? toolGroupSummaryIconName(row.summaryKind)
+          }
+          className="size-4 shrink-0 stroke-[1.8]"
+          muted
         />
       </span>
       <span className="min-w-0 flex-1 truncate text-secondary-label">{row.summary}</span>
@@ -2529,6 +2654,7 @@ type WorkEntryIconName =
   | "browser"
   | "check"
   | "circle-alert"
+  | "computer"
   | "eye"
   | "globe"
   | "hammer"
@@ -2541,6 +2667,203 @@ type WorkEntryIconName =
   | "x"
   | "zap";
 
+function BrowserAppIcon({ className }: { className: string }) {
+  return (
+    <svg
+      viewBox="0 0 24 24"
+      fill="none"
+      stroke="currentColor"
+      strokeWidth="1.9"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+      className={className}
+      aria-hidden
+    >
+      <path d="M8.5 19H7.2C4.4 19 3 17.5 3 14.6V7.4C3 4.5 4.5 3 7.4 3h8.2C18.5 3 20 4.5 20 7.4v2.4" />
+      <circle cx="7.4" cy="7.2" r="0.75" fill="currentColor" stroke="none" />
+      <path d="M11.2 7.2h4.3" />
+      <path d="m12.4 11.4 7.5 2.6-3.4 1.6-1.5 3.6z" fill="currentColor" stroke="none" />
+    </svg>
+  );
+}
+
+function ComputerUseAppIcon({ className }: { className: string }) {
+  const gradientId = `${useId().replaceAll(":", "")}-computer-use-app-gradient`;
+  return (
+    <svg viewBox="0 0 24 24" className={className} aria-hidden>
+      <defs>
+        <linearGradient id={gradientId} x1="2" y1="2" x2="22" y2="22">
+          <stop offset="0" stopColor="#00dff0" />
+          <stop offset="0.42" stopColor="#3b9cff" />
+          <stop offset="0.72" stopColor="#b044f5" />
+          <stop offset="1" stopColor="#ff78b6" />
+        </linearGradient>
+      </defs>
+      <rect x="1" y="1" width="22" height="22" rx="5" fill={`url(#${gradientId})`} />
+      <path
+        d="m7.2 6.2 10.5 4.1-4.2 2.1-2 4.7z"
+        fill="white"
+        stroke="#315cff"
+        strokeWidth="1.1"
+        strokeLinejoin="round"
+      />
+    </svg>
+  );
+}
+
+function ToolActivityIconView(props: {
+  icon: ToolActivityIcon | undefined;
+  fallbackName: WorkEntryIconName;
+  className: string;
+  muted: boolean;
+}) {
+  const { resolvedTheme } = use(TimelineRowCtx);
+  const fallbackClassName = cn(props.className, props.muted && "opacity-70 light:brightness-[.6]");
+  if (!props.icon) {
+    return <WorkEntryIcon name={props.fallbackName} className={fallbackClassName} />;
+  }
+  if (props.icon._tag === "website") {
+    const src = toolActivityFaviconUrl(props.icon, resolvedTheme, 32);
+    return src ? (
+      <ToolActivityImageIcon
+        key={src}
+        cacheKey={src}
+        src={src}
+        fallbackName={props.fallbackName}
+        className={props.className}
+        muted={props.muted}
+      />
+    ) : (
+      <WorkEntryIcon name={props.fallbackName} className={fallbackClassName} />
+    );
+  }
+  if (props.icon._tag === "themed-logo") {
+    const src =
+      resolvedTheme === "dark"
+        ? (props.icon.logoUrlDark ?? props.icon.logoUrl)
+        : props.icon.logoUrl;
+    return (
+      <ToolActivityImageIcon
+        key={src}
+        cacheKey={src}
+        src={src}
+        fallbackName={props.fallbackName}
+        className={props.className}
+        muted={props.muted}
+      />
+    );
+  }
+  return (
+    <NativeAppToolActivityIcon
+      app={props.icon.app}
+      fallbackName={props.fallbackName}
+      className={props.className}
+      muted={props.muted}
+    />
+  );
+}
+
+function NativeAppToolActivityIcon(props: {
+  app: Extract<ToolActivityIcon, { readonly _tag: "native-app" }>["app"];
+  fallbackName: WorkEntryIconName;
+  className: string;
+  muted: boolean;
+}) {
+  const { activeThreadEnvironmentId } = use(TimelineRowCtx);
+  const asset = useAssetUrlState(activeThreadEnvironmentId, {
+    _tag: "native-app-icon",
+    app: props.app,
+  });
+  if (asset._tag !== "Success") {
+    return (
+      <WorkEntryIcon
+        name={props.fallbackName}
+        className={cn(props.className, props.muted && "opacity-70 light:brightness-[.6]")}
+      />
+    );
+  }
+  const cacheKey = getProjectFaviconCacheKey(
+    activeThreadEnvironmentId,
+    JSON.stringify(props.app),
+    asset.url,
+  );
+  return (
+    <ToolActivityImageIcon
+      key={cacheKey}
+      cacheKey={cacheKey}
+      src={asset.url}
+      fallbackName={props.fallbackName}
+      className={props.className}
+      muted={props.muted}
+    />
+  );
+}
+
+const loadedToolActivityIconSrcs = new Map<string, string>();
+
+function ToolActivityImageIcon(props: {
+  cacheKey: string;
+  src: string;
+  fallbackName: WorkEntryIconName;
+  className: string;
+  muted: boolean;
+}) {
+  const [displayedSrc, setDisplayedSrc] = useState<string | null>(
+    () => loadedToolActivityIconSrcs.get(props.cacheKey) ?? null,
+  );
+  const isLoading = displayedSrc !== props.src;
+  const handleLoadError = (failedSrc: string) => {
+    if (loadedToolActivityIconSrcs.get(props.cacheKey) === failedSrc) {
+      loadedToolActivityIconSrcs.delete(props.cacheKey);
+    }
+    setDisplayedSrc((currentSrc) => (currentSrc === failedSrc ? null : currentSrc));
+  };
+  return (
+    <>
+      {displayedSrc === null ? (
+        <WorkEntryIcon
+          name={props.fallbackName}
+          className={cn(props.className, props.muted && "opacity-70 light:brightness-[.6]")}
+        />
+      ) : null}
+      {displayedSrc ? (
+        <span
+          className={cn(
+            props.className,
+            "inline-block overflow-hidden rounded-[3px] bg-background",
+            props.muted && "opacity-70",
+          )}
+        >
+          <img
+            src={displayedSrc}
+            alt=""
+            aria-hidden
+            decoding="async"
+            referrerPolicy="no-referrer"
+            className={cn("block size-full object-contain", props.muted && "light:brightness-[.6]")}
+            onError={() => handleLoadError(displayedSrc)}
+          />
+        </span>
+      ) : null}
+      {isLoading ? (
+        <img
+          src={props.src}
+          alt=""
+          aria-hidden
+          decoding="async"
+          referrerPolicy="no-referrer"
+          className="hidden"
+          onLoad={() => {
+            loadedToolActivityIconSrcs.set(props.cacheKey, props.src);
+            setDisplayedSrc(props.src);
+          }}
+          onError={() => handleLoadError(props.src)}
+        />
+      ) : null}
+    </>
+  );
+}
+
 function WorkEntryIcon({ name, className }: { name: WorkEntryIconName; className: string }) {
   switch (name) {
     case "bot":
@@ -2548,7 +2871,9 @@ function WorkEntryIcon({ name, className }: { name: WorkEntryIconName; className
     case "brain":
       return <BrainIcon className={className} aria-hidden />;
     case "browser":
-      return <GlobeIcon className={className} aria-hidden />;
+      return <BrowserAppIcon className={className} />;
+    case "computer":
+      return <ComputerUseAppIcon className={className} />;
     case "t3-code":
       return <T3Wordmark className={className} aria-hidden />;
     case "check":
@@ -2654,6 +2979,7 @@ function workEntryIconName(workEntry: TimelineWorkEntry): WorkEntryIconName {
   ) {
     return "message-circle";
   }
+  if (workEntry.toolSurface) return workEntry.toolSurface;
   const toolPresentation = resolveWorkEntryToolPresentation(workEntry);
   if (toolPresentation) return toolPresentation.icon;
   const action = toolGroupAction(workEntry);
@@ -2776,8 +3102,9 @@ const SimpleWorkEntryRow = memo(function SimpleWorkEntryRow(props: {
   workEntry: TimelineWorkEntry;
   workspaceRoot: string | undefined;
   isExpandedToolGroupEntry: boolean;
+  displayLabel?: string | undefined;
 }) {
-  const { workEntry, workspaceRoot, isExpandedToolGroupEntry } = props;
+  const { workEntry, workspaceRoot, isExpandedToolGroupEntry, displayLabel } = props;
   // Before any hooks: spawn CTA rows render their own component.
   if (workEntry.agentSpawn) {
     return <AgentSpawnCtaRow workEntry={workEntry} />;
@@ -2787,6 +3114,7 @@ const SimpleWorkEntryRow = memo(function SimpleWorkEntryRow(props: {
       workEntry={workEntry}
       workspaceRoot={workspaceRoot}
       isExpandedToolGroupEntry={isExpandedToolGroupEntry}
+      displayLabel={displayLabel}
     />
   );
 });
@@ -2795,8 +3123,9 @@ const PlainWorkEntryRow = memo(function PlainWorkEntryRow(props: {
   workEntry: TimelineWorkEntry;
   workspaceRoot: string | undefined;
   isExpandedToolGroupEntry: boolean;
+  displayLabel?: string | undefined;
 }) {
-  const { workEntry, workspaceRoot, isExpandedToolGroupEntry } = props;
+  const { workEntry, workspaceRoot, isExpandedToolGroupEntry, displayLabel } = props;
   const { threadRef, onImageExpand } = use(TimelineRowCtx);
   const groupView = use(WorkGroupViewCtx);
   const [expanded, setExpanded] = useState(
@@ -2815,11 +3144,12 @@ const PlainWorkEntryRow = memo(function PlainWorkEntryRow(props: {
   const showWarningIndicator = workEntry.sourceActivityKind === "runtime.warning";
   const showFailedIndicator = workEntryDisplayIndicatesToolFailure(workEntry);
   const toolPresentation = resolveWorkEntryToolPresentation(workEntry);
+  const hasSpecialToolIcon = toolPresentation !== null || workEntry.toolSurface !== undefined;
   const entryIconName =
-    showWarningIndicator || (showFailedIndicator && !toolPresentation)
+    showWarningIndicator || (showFailedIndicator && !hasSpecialToolIcon)
       ? "circle-alert"
       : workEntryIconName(workEntry);
-  const previewText = workEntryDisplayLabel(workEntry, workspaceRoot);
+  const previewText = displayLabel ?? workEntryDisplayLabel(workEntry, workspaceRoot);
   const displayText =
     !toolPresentation && expanded && workEntry.command?.trim() ? "Command" : previewText;
   const canExpand =
@@ -2896,9 +3226,15 @@ const PlainWorkEntryRow = memo(function PlainWorkEntryRow(props: {
           role={showFailedIndicator ? "img" : undefined}
           aria-label={showFailedIndicator ? "Tool call failed" : undefined}
         >
-          <WorkEntryIcon
-            name={entryIconName}
-            className="block size-4 shrink-0 stroke-[1.8] opacity-70"
+          <ToolActivityIconView
+            icon={
+              showWarningIndicator || (showFailedIndicator && !hasSpecialToolIcon)
+                ? undefined
+                : (workEntry.toolIcon ?? workEntry.toolSource?.icon)
+            }
+            fallbackName={entryIconName}
+            className="block size-4 shrink-0 stroke-[1.8]"
+            muted
           />
         </span>
         <div className="flex min-w-0 flex-1 items-center gap-1.5">
@@ -2907,7 +3243,7 @@ const PlainWorkEntryRow = memo(function PlainWorkEntryRow(props: {
               <span className={cn("min-w-0 flex-1 truncate", headingClass)}>{displayText}</span>
             </p>
           </div>
-          {showFailedIndicator && toolPresentation ? (
+          {showFailedIndicator && hasSpecialToolIcon ? (
             <XIcon aria-hidden className="size-3 shrink-0 text-icon-muted" />
           ) : null}
           <span
@@ -2926,25 +3262,29 @@ const PlainWorkEntryRow = memo(function PlainWorkEntryRow(props: {
           </span>
         </div>
       </div>
+      {viewedImage && threadRef ? (
+        <div
+          className="mt-1 ms-7 cursor-default"
+          onClick={stopRowToggle}
+          onPointerDown={stopRowToggle}
+        >
+          <ChatMarkdownAssetImage
+            environmentId={threadRef.environmentId}
+            resource={viewedImage.resource}
+            alt={viewedImage.alt}
+            srcFragment={viewedImage.srcFragment}
+            workspaceRoot={workspaceRoot}
+            style={{ maxHeight: "16rem" }}
+            onImageExpand={onImageExpand}
+          />
+        </div>
+      ) : null}
       {expanded && canExpand && expandedBody ? (
         <div
           className="mt-1 ms-7 cursor-default border-s border-border/45 ps-3 pt-0.5"
           onClick={stopRowToggle}
           onPointerDown={stopRowToggle}
         >
-          {viewedImage && threadRef ? (
-            <div className="mb-1.5">
-              <ChatMarkdownAssetImage
-                environmentId={threadRef.environmentId}
-                resource={viewedImage.resource}
-                alt={viewedImage.alt}
-                srcFragment={viewedImage.srcFragment}
-                workspaceRoot={workspaceRoot}
-                style={{ maxHeight: "16rem" }}
-                onImageExpand={onImageExpand}
-              />
-            </div>
-          ) : null}
           <pre className={toolCallExpandedBodyClassName}>{expandedBody}</pre>
         </div>
       ) : null}
diff --git a/apps/web/src/components/chat/PanelLayoutControls.test.tsx b/apps/web/src/components/chat/PanelLayoutControls.test.tsx
deleted file mode 100644
index 51ae1a73ad0f..000000000000
--- a/apps/web/src/components/chat/PanelLayoutControls.test.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { renderToStaticMarkup } from "react-dom/server";
-import { describe, expect, it } from "vite-plus/test";
-
-import { PanelLayoutControls } from "./PanelLayoutControls";
-
-describe("PanelLayoutControls", () => {
-  it("keeps unavailable panel tooltip triggers interactive", () => {
-    const markup = renderToStaticMarkup(
-      <PanelLayoutControls
-        showTerminalControl
-        terminalAvailable={false}
-        terminalOpen={false}
-        terminalShortcutLabel={null}
-        rightPanelAvailable={false}
-        rightPanelOpen={false}
-        rightPanelShortcutLabel={null}
-        liveAgentCount={0}
-        onToggleTerminal={() => {}}
-        onToggleRightPanel={() => {}}
-      />,
-    );
-
-    expect(markup.match(/data-slot="tooltip-trigger"/g)).toHaveLength(2);
-    expect(markup.match(/data-slot="tooltip-trigger"[^>]*><button[^>]*disabled=""/g)).toHaveLength(
-      2,
-    );
-  });
-});
diff --git a/apps/web/src/components/chat/ProviderModelPicker.test.tsx b/apps/web/src/components/chat/ProviderModelPicker.test.tsx
index 5d5bf94ce631..769ffae3d091 100644
--- a/apps/web/src/components/chat/ProviderModelPicker.test.tsx
+++ b/apps/web/src/components/chat/ProviderModelPicker.test.tsx
@@ -99,4 +99,24 @@ describe("ProviderModelPicker", () => {
     expect(markup).toContain("Fallback model");
     expect(markup).not.toContain(">missing-model<");
   });
+
+  it("keeps instance initials visible in the resting trigger", () => {
+    const activeEntry = providerEntry("codex_personal", "codex");
+    const markup = renderToStaticMarkup(
+      <ProviderModelPicker
+        activeInstanceId={activeEntry.instanceId}
+        model="gpt-5"
+        lockedProvider={null}
+        instanceEntries={[providerEntry("codex", "codex"), activeEntry]}
+        modelOptionsByInstance={new Map()}
+        size="xs"
+        onInstanceModelChange={() => {}}
+      />,
+    );
+
+    expect(markup).toContain(">CP</span>");
+    expect(markup).toContain("size-4");
+    expect(markup).toContain("h-3");
+    expect(markup).toContain("text-[7px]");
+  });
 });
diff --git a/apps/web/src/components/chat/ProviderModelPicker.tsx b/apps/web/src/components/chat/ProviderModelPicker.tsx
index db55edcf8835..9e3f167efbc7 100644
--- a/apps/web/src/components/chat/ProviderModelPicker.tsx
+++ b/apps/web/src/components/chat/ProviderModelPicker.tsx
@@ -18,7 +18,12 @@ import {
   getTriggerDisplayModelName,
 } from "./providerIconUtils";
 import { shouldShowInstanceBadge, type ProviderInstanceEntry } from "../../providerInstances";
-import { ComposerControl, ComposerControlChevron } from "./ComposerControl";
+import {
+  ComposerControl,
+  ComposerControlChevron,
+  type ComposerControlSize,
+} from "./ComposerControl";
+import { composerFloatingLayerProps } from "./composerEventScope";
 
 export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
   /**
@@ -34,7 +39,10 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
   keybindings?: ResolvedKeybindingsConfig;
   modelOptionsByInstance: ReadonlyMap<ProviderInstanceId, ReadonlyArray<ModelEsque>>;
   activeProviderIconClassName?: string;
+  instanceIndicatorBackground?: string;
+  size?: ComposerControlSize;
   compact?: boolean;
+  isComposerOwned?: boolean;
   disabled?: boolean;
   terminalOpen?: boolean;
   open?: boolean;
@@ -47,6 +55,7 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
 }) {
   const [uncontrolledIsMenuOpen, setUncontrolledIsMenuOpen] = useState(false);
   const isMenuOpen = props.open ?? uncontrolledIsMenuOpen;
+  const size = props.size ?? "sm";
 
   // Resolve the active instance entry by exact routing key. The composer
   // resolves fallbacks before rendering this component; if the selected
@@ -148,6 +157,7 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
           <ComposerControl
             aria-label={props.triggerAriaLabel}
             variant={props.triggerVariant ?? "ghost"}
+            size={size}
             data-chat-provider-model-picker="true"
             className={cn(
               "min-w-0 justify-between whitespace-nowrap",
@@ -158,7 +168,9 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
           />
         }
       >
-        <span className="flex min-w-0 flex-1 items-center gap-1.5">
+        <span
+          className={cn("flex min-w-0 flex-1 items-center", size === "xs" ? "gap-1" : "gap-1.5")}
+        >
           {activeEntry ? (
             <ProviderInstanceIcon
               driverKind={activeEntry.driverKind}
@@ -167,15 +179,22 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
               showBadge={showInstanceBadge}
               className="size-4"
               iconClassName={cn("size-4", props.activeProviderIconClassName)}
-              indicatorBackground="var(--contrast-input)"
+              indicatorBackground={props.instanceIndicatorBackground ?? "var(--contrast-input)"}
               badgeClassName={cn(
-                "right-[-0.125rem] bottom-[-0.125rem] h-3 min-w-3",
-                "px-0.5 text-[7px]",
+                "right-[-0.125rem] bottom-[-0.125rem] h-3 min-w-3 px-0.5 text-[7px]",
+                size === "xs" && "shadow-none",
               )}
             />
           ) : null}
           <Tooltip>
-            <TooltipTrigger render={<span className="min-w-0 flex-1 overflow-hidden truncate" />}>
+            <TooltipTrigger
+              render={
+                <span
+                  className="min-w-0 flex-1 overflow-hidden truncate"
+                  data-chat-provider-model-picker-label="true"
+                />
+              }
+            >
               {triggerTitle}
             </TooltipTrigger>
             <TooltipPopup side="top">{triggerLabel}</TooltipPopup>
@@ -187,13 +206,14 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
           ) : null}
         </span>
         <span aria-hidden="true" className="flex items-center">
-          <ComposerControlChevron />
+          <ComposerControlChevron size={size} />
         </span>
       </PopoverTrigger>
       <PopoverPopup
+        {...(props.isComposerOwned ? composerFloatingLayerProps : {})}
         align="start"
         className="before:hidden [--viewport-inline-padding:0]"
-        viewportClassName="!overflow-hidden rounded-[calc(var(--radius-lg)-1px)] p-0 [clip-path:inset(0_round_calc(var(--radius-lg)-1px))]"
+        viewportClassName="overflow-hidden! rounded-[calc(var(--radius-lg)-1px)] p-0 [clip-path:inset(0_round_calc(var(--radius-lg)-1px))]"
       >
         <ModelPickerContent
           activeInstanceId={activeInstanceId}
diff --git a/apps/web/src/components/chat/TraitsPicker.tsx b/apps/web/src/components/chat/TraitsPicker.tsx
index 6f122deb7fa2..e21d3dd0f373 100644
--- a/apps/web/src/components/chat/TraitsPicker.tsx
+++ b/apps/web/src/components/chat/TraitsPicker.tsx
@@ -32,7 +32,13 @@ import { useComposerDraftStore, DraftId } from "../../composerDraftStore";
 import { getProviderModelCapabilities } from "../../providerModels";
 import { cn } from "~/lib/utils";
 import { Badge } from "../ui/badge";
-import { ComposerControl, ComposerControlChevron, ComposerControlIcon } from "./ComposerControl";
+import {
+  ComposerControl,
+  ComposerControlChevron,
+  ComposerControlIcon,
+  type ComposerControlSize,
+} from "./ComposerControl";
+import { composerFloatingLayerProps } from "./composerEventScope";
 
 type ProviderOptions = ReadonlyArray<ProviderOptionSelection>;
 
@@ -274,6 +280,7 @@ export interface TraitsMenuContentProps {
   planModeEnabled: boolean;
   triggerVariant?: VariantProps<typeof buttonVariants>["variant"];
   triggerClassName?: string;
+  isComposerOwned?: boolean;
 }
 
 export const TraitsMenuContent = memo(function TraitsMenuContentImpl({
@@ -540,8 +547,13 @@ export const TraitsPicker = memo(function TraitsPicker({
   planModeEnabled,
   triggerVariant,
   triggerClassName,
+  isComposerOwned,
+  size = "sm",
   ...persistence
-}: TraitsMenuContentProps & TraitsPersistence) {
+}: TraitsMenuContentProps &
+  TraitsPersistence & {
+    size?: ComposerControlSize;
+  }) {
   const [isMenuOpen, setIsMenuOpen] = useState(false);
   const { descriptors, primarySelectDescriptor, ultrathinkPromptControlled } =
     getTraitsSectionVisibility({
@@ -577,6 +589,7 @@ export const TraitsPicker = memo(function TraitsPicker({
     <>
       <ComposerControlIcon
         icon={ZapIcon}
+        size={size}
         className={cn(
           "fill-current opacity-80",
           provider === "claudeAgent" ? "text-[#d97757]" : "text-foreground",
@@ -599,6 +612,7 @@ export const TraitsPicker = memo(function TraitsPicker({
         render={
           <ComposerControl
             variant={triggerVariant ?? "ghost"}
+            size={size}
             className={cn(
               isCodexStyle
                 ? "min-w-0 max-w-40 shrink justify-start overflow-hidden whitespace-nowrap sm:max-w-48"
@@ -609,20 +623,25 @@ export const TraitsPicker = memo(function TraitsPicker({
         }
       >
         {isCodexStyle ? (
-          <span className="flex min-w-0 w-full items-center gap-1.5 overflow-hidden">
+          <span
+            className={cn(
+              "flex min-w-0 w-full items-center overflow-hidden",
+              size === "xs" ? "gap-1" : "gap-1.5",
+            )}
+          >
             {fastModeIcon}
             <span className="min-w-0 truncate">{triggerLabel}</span>
-            <ComposerControlChevron />
+            <ComposerControlChevron size={size} />
           </span>
         ) : (
           <>
             {fastModeIcon}
             <span>{triggerLabel}</span>
-            <ComposerControlChevron />
+            <ComposerControlChevron size={size} />
           </>
         )}
       </MenuTrigger>
-      <MenuPopup align="start">
+      <MenuPopup align="start" {...(isComposerOwned ? composerFloatingLayerProps : {})}>
         <TraitsMenuContent
           provider={provider}
           {...(instanceId ? { instanceId } : {})}
diff --git a/apps/web/src/components/chat/composerEventScope.test.ts b/apps/web/src/components/chat/composerEventScope.test.ts
new file mode 100644
index 000000000000..7ca1e396960d
--- /dev/null
+++ b/apps/web/src/components/chat/composerEventScope.test.ts
@@ -0,0 +1,61 @@
+import { afterEach, describe, expect, it, vi } from "vite-plus/test";
+
+import {
+  isInsideComposerFloatingLayer,
+  isInsideRestingComposerControlScope,
+} from "./composerEventScope";
+
+class FakeElement {
+  constructor(private readonly matchingSelector: string | null) {}
+
+  closest(selector: string): FakeElement | null {
+    return this.matchingSelector !== null &&
+      selector.split(",").some((candidate) => candidate === this.matchingSelector)
+      ? this
+      : null;
+  }
+}
+
+afterEach(() => {
+  vi.unstubAllGlobals();
+});
+
+describe("composer event scopes", () => {
+  it("recognizes events from the portaled resting controls", () => {
+    vi.stubGlobal("Element", FakeElement);
+
+    const target = new FakeElement('[data-chat-composer-resting-controls="true"]');
+    expect(isInsideRestingComposerControlScope(target as unknown as EventTarget)).toBe(true);
+  });
+
+  it("keeps resting image previews focused without expanding their subtree", () => {
+    vi.stubGlobal("Element", FakeElement);
+
+    const target = new FakeElement('[data-chat-composer-resting-images="true"]');
+    expect(isInsideRestingComposerControlScope(target as unknown as EventTarget)).toBe(true);
+  });
+
+  it("includes composer-owned floating layers in the resting control scope", () => {
+    vi.stubGlobal("Element", FakeElement);
+
+    const target = new FakeElement('[data-chat-composer-floating-layer="true"]');
+    expect(isInsideComposerFloatingLayer(target as unknown as EventTarget)).toBe(true);
+    expect(isInsideRestingComposerControlScope(target as unknown as EventTarget)).toBe(true);
+  });
+
+  it("leaves unrelated floating layers outside the composer scope", () => {
+    vi.stubGlobal("Element", FakeElement);
+
+    const target = new FakeElement('[data-slot="popover-popup"]');
+    expect(isInsideComposerFloatingLayer(target as unknown as EventTarget)).toBe(false);
+    expect(isInsideRestingComposerControlScope(target as unknown as EventTarget)).toBe(false);
+  });
+
+  it("leaves ordinary composer targets outside the portaled control scope", () => {
+    vi.stubGlobal("Element", FakeElement);
+
+    const target = new FakeElement(null);
+    expect(isInsideRestingComposerControlScope(target as unknown as EventTarget)).toBe(false);
+    expect(isInsideRestingComposerControlScope(null)).toBe(false);
+  });
+});
diff --git a/apps/web/src/components/chat/composerEventScope.ts b/apps/web/src/components/chat/composerEventScope.ts
new file mode 100644
index 000000000000..2275fdd21a2e
--- /dev/null
+++ b/apps/web/src/components/chat/composerEventScope.ts
@@ -0,0 +1,21 @@
+const COMPOSER_FLOATING_LAYER_SELECTOR = [
+  '[data-composer-drawer-layer="true"]',
+  '[data-chat-composer-floating-layer="true"]',
+].join(",");
+
+export const composerFloatingLayerProps = {
+  "data-chat-composer-floating-layer": "true",
+} as const;
+
+export function isInsideComposerFloatingLayer(target: EventTarget | null): boolean {
+  return target instanceof Element && target.closest(COMPOSER_FLOATING_LAYER_SELECTOR) !== null;
+}
+
+export function isInsideRestingComposerControlScope(target: EventTarget | null): boolean {
+  return (
+    target instanceof Element &&
+    (target.closest('[data-chat-composer-resting-controls="true"]') !== null ||
+      target.closest('[data-chat-composer-resting-images="true"]') !== null ||
+      isInsideComposerFloatingLayer(target))
+  );
+}
diff --git a/apps/web/src/components/chat/composerProviderState.tsx b/apps/web/src/components/chat/composerProviderState.tsx
index 5da27505391d..9a3675885083 100644
--- a/apps/web/src/components/chat/composerProviderState.tsx
+++ b/apps/web/src/components/chat/composerProviderState.tsx
@@ -12,10 +12,13 @@ import {
   isClaudeUltrathinkPrompt,
   normalizeModelSlug,
 } from "@t3tools/shared/model";
+import type { VariantProps } from "class-variance-authority";
 import type { ReactNode } from "react";
 
+import type { buttonVariants } from "../ui/button";
 import type { DraftId } from "../../composerDraftStore";
 import { getProviderModelCapabilities } from "../../providerModels";
+import type { ComposerControlSize } from "./ComposerControl";
 import { shouldRenderTraitsControls, TraitsMenuContent, TraitsPicker } from "./TraitsPicker";
 
 export type ComposerProviderStateInput = {
@@ -49,6 +52,10 @@ type TraitsRenderInput = {
   prompt: string;
   onPromptChange: (prompt: string) => void;
   planModeEnabled: boolean;
+  size?: ComposerControlSize;
+  triggerVariant?: VariantProps<typeof buttonVariants>["variant"];
+  triggerClassName?: string;
+  isComposerOwned?: boolean;
 };
 
 export function getComposerPromptInjectionState(prompt: string): ComposerPromptInjectionState {
@@ -123,6 +130,10 @@ function renderTraitsControl(
     prompt,
     onPromptChange,
     planModeEnabled,
+    size,
+    triggerVariant,
+    triggerClassName,
+    isComposerOwned,
   } = input;
   const hasTarget = threadRef !== undefined || draftId !== undefined;
   if (
@@ -150,6 +161,10 @@ function renderTraitsControl(
       prompt={prompt}
       onPromptChange={onPromptChange}
       planModeEnabled={planModeEnabled}
+      {...(size !== undefined ? { size } : {})}
+      {...(triggerVariant !== undefined ? { triggerVariant } : {})}
+      {...(triggerClassName !== undefined ? { triggerClassName } : {})}
+      {...(isComposerOwned ? { isComposerOwned } : {})}
     />
   );
 }
diff --git a/apps/web/src/components/chat/composerScrollGesture.test.ts b/apps/web/src/components/chat/composerScrollGesture.test.ts
new file mode 100644
index 000000000000..ae87f6ca8cc7
--- /dev/null
+++ b/apps/web/src/components/chat/composerScrollGesture.test.ts
@@ -0,0 +1,94 @@
+import { describe, expect, it } from "vite-plus/test";
+
+import {
+  createComposerScrollGestureState,
+  recordComposerScrollGestureEvent,
+  resetComposerScrollGesture,
+  suppressActiveComposerScrollGesture,
+} from "./composerScrollGesture";
+
+const RESET_MS = 120;
+const THRESHOLD_PX = 24;
+
+function record(
+  state: ReturnType<typeof createComposerScrollGestureState>,
+  now: number,
+  options: Partial<{
+    deltaPx: number;
+    collapseEligible: boolean;
+    canScrollInGestureDirection: boolean;
+    scrollsTowardLogicalEnd: boolean;
+  }> = {},
+) {
+  return recordComposerScrollGestureEvent(state, {
+    now,
+    deltaPx: options.deltaPx ?? 30,
+    collapseThresholdPx: THRESHOLD_PX,
+    collapseEligible: options.collapseEligible ?? true,
+    canScrollInGestureDirection: options.canScrollInGestureDirection ?? true,
+    scrollsTowardLogicalEnd: options.scrollsTowardLogicalEnd ?? false,
+  });
+}
+
+describe("composer scroll gesture", () => {
+  it("lets an editor change win over the rest of the active gesture", () => {
+    const state = createComposerScrollGestureState();
+
+    expect(record(state, 0)).toBe(true);
+    suppressActiveComposerScrollGesture(state, 20, RESET_MS);
+
+    expect(record(state, 40)).toBe(false);
+    expect(record(state, 80)).toBe(false);
+    expect(record(state, 160)).toBe(false);
+  });
+
+  it("preserves suppression while collapse is temporarily ineligible", () => {
+    const state = createComposerScrollGestureState();
+
+    record(state, 0);
+    suppressActiveComposerScrollGesture(state, 20, RESET_MS);
+
+    expect(record(state, 40, { collapseEligible: false })).toBe(false);
+    expect(record(state, 80, { collapseEligible: true })).toBe(false);
+  });
+
+  it("keeps a boundary momentum tail in the same suppressed gesture", () => {
+    const state = createComposerScrollGestureState();
+
+    record(state, 0);
+    suppressActiveComposerScrollGesture(state, 20, RESET_MS);
+
+    expect(record(state, 80, { canScrollInGestureDirection: false })).toBe(false);
+    expect(state.lastEventAt).toBe(80);
+    expect(record(state, 160)).toBe(false);
+  });
+
+  it("does not carry gesture state into a new thread after reset", () => {
+    const state = createComposerScrollGestureState();
+
+    record(state, 0);
+    suppressActiveComposerScrollGesture(state, 20, RESET_MS);
+    record(state, 80);
+    resetComposerScrollGesture(state);
+
+    expect(record(state, 240)).toBe(true);
+  });
+
+  it("accumulates small deltas only while collapse remains eligible and scrollable", () => {
+    const state = createComposerScrollGestureState();
+
+    expect(record(state, 0, { deltaPx: 10 })).toBe(false);
+    expect(record(state, 20, { deltaPx: 10 })).toBe(false);
+    expect(record(state, 40, { deltaPx: 4 })).toBe(true);
+    expect(record(state, 60, { deltaPx: 10, collapseEligible: false })).toBe(false);
+    expect(record(state, 80, { deltaPx: 14 })).toBe(false);
+  });
+
+  it("does not collapse while scrolling down through composer footer space", () => {
+    const state = createComposerScrollGestureState();
+
+    expect(record(state, 0, { deltaPx: 20 })).toBe(false);
+    expect(record(state, 20, { scrollsTowardLogicalEnd: true })).toBe(false);
+    expect(record(state, 40, { deltaPx: 10 })).toBe(false);
+  });
+});
diff --git a/apps/web/src/components/chat/composerScrollGesture.ts b/apps/web/src/components/chat/composerScrollGesture.ts
new file mode 100644
index 000000000000..3c76985dea22
--- /dev/null
+++ b/apps/web/src/components/chat/composerScrollGesture.ts
@@ -0,0 +1,60 @@
+export type ComposerScrollGestureState = {
+  accumulatedDeltaPx: number;
+  collapseSuppressed: boolean;
+  lastEventAt: number;
+};
+
+export function createComposerScrollGestureState(): ComposerScrollGestureState {
+  return {
+    accumulatedDeltaPx: 0,
+    collapseSuppressed: false,
+    lastEventAt: Number.NEGATIVE_INFINITY,
+  };
+}
+
+export function resetComposerScrollGesture(state: ComposerScrollGestureState): void {
+  state.accumulatedDeltaPx = 0;
+  state.collapseSuppressed = false;
+  state.lastEventAt = Number.NEGATIVE_INFINITY;
+}
+
+export function suppressActiveComposerScrollGesture(
+  state: ComposerScrollGestureState,
+  now: number,
+  gestureResetMs: number,
+): void {
+  if (now - state.lastEventAt <= gestureResetMs) {
+    state.collapseSuppressed = true;
+  }
+}
+
+export function recordComposerScrollGestureEvent(
+  state: ComposerScrollGestureState,
+  input: {
+    now: number;
+    deltaPx: number;
+    collapseThresholdPx: number;
+    collapseEligible: boolean;
+    canScrollInGestureDirection: boolean;
+    scrollsTowardLogicalEnd: boolean;
+  },
+): boolean {
+  state.lastEventAt = input.now;
+  if (
+    state.collapseSuppressed ||
+    !input.collapseEligible ||
+    !input.canScrollInGestureDirection ||
+    input.scrollsTowardLogicalEnd
+  ) {
+    state.accumulatedDeltaPx = 0;
+    return false;
+  }
+
+  state.accumulatedDeltaPx += input.deltaPx;
+  if (state.accumulatedDeltaPx < input.collapseThresholdPx) {
+    return false;
+  }
+
+  state.accumulatedDeltaPx = 0;
+  return true;
+}
diff --git a/apps/web/src/components/chat/pageScrollController.test.ts b/apps/web/src/components/chat/pageScrollController.test.ts
new file mode 100644
index 000000000000..9fe399f50d3e
--- /dev/null
+++ b/apps/web/src/components/chat/pageScrollController.test.ts
@@ -0,0 +1,279 @@
+import { describe, expect, test } from "vite-plus/test";
+
+import {
+  createPageScrollController,
+  getTimelinePageScrollKey,
+  getPageScrollDistancePx,
+  getPageScrollMultiplier,
+  getPageScrollVelocityPxPerMs,
+  PAGE_SCROLL_ACCELERATION_MS,
+  PAGE_SCROLL_ANIMATION_MS,
+  PAGE_SCROLL_MAX_MULTIPLIER,
+} from "./pageScrollController";
+
+class TestClock {
+  private currentTime = 0;
+  private nextHandle = 1;
+  private animationFrames = new Map<number, FrameRequestCallback>();
+  private timeouts = new Map<number, { at: number; callback: () => void }>();
+
+  readonly env = {
+    now: () => this.currentTime,
+    requestAnimationFrame: (callback: FrameRequestCallback) => {
+      const handle = this.nextHandle;
+      this.nextHandle += 1;
+      this.animationFrames.set(handle, callback);
+      return handle;
+    },
+    cancelAnimationFrame: (handle: number) => {
+      this.animationFrames.delete(handle);
+    },
+    setTimeout: (callback: () => void, delay: number) => {
+      const handle = this.nextHandle;
+      this.nextHandle += 1;
+      this.timeouts.set(handle, { at: this.currentTime + delay, callback });
+      return handle;
+    },
+    clearTimeout: (handle: number) => {
+      this.timeouts.delete(handle);
+    },
+  };
+
+  advanceBy(ms: number, frameMs = 16) {
+    const target = this.currentTime + ms;
+
+    while (this.currentTime < target) {
+      this.currentTime = Math.min(target, this.currentTime + frameMs);
+      this.flushTimeouts();
+      this.flushAnimationFrames();
+    }
+  }
+
+  private flushTimeouts() {
+    let hasDueTimeouts = true;
+    while (hasDueTimeouts) {
+      hasDueTimeouts = false;
+
+      for (const [handle, timeout] of this.timeouts) {
+        if (timeout.at > this.currentTime) {
+          continue;
+        }
+
+        this.timeouts.delete(handle);
+        timeout.callback();
+        hasDueTimeouts = true;
+      }
+    }
+  }
+
+  private flushAnimationFrames() {
+    if (this.animationFrames.size === 0) {
+      return;
+    }
+
+    const frames = [...this.animationFrames.values()];
+    this.animationFrames.clear();
+
+    for (const callback of frames) {
+      callback(this.currentTime);
+    }
+  }
+}
+
+describe("page scroll helpers", () => {
+  const composerPageScrollEvent = (
+    overrides: Partial<Parameters<typeof getTimelinePageScrollKey>[0]> = {},
+  ) => ({
+    altKey: false,
+    clientHeight: 200,
+    ctrlKey: false,
+    defaultPrevented: false,
+    isComposing: false,
+    key: "PageDown",
+    keyCode: 34,
+    metaKey: false,
+    scrollHeight: 200,
+    scrollTop: 0,
+    shiftKey: false,
+    ...overrides,
+  });
+
+  test("leaves page keys to IME composition", () => {
+    expect(getTimelinePageScrollKey(composerPageScrollEvent({ isComposing: true }))).toBeNull();
+    expect(getTimelinePageScrollKey(composerPageScrollEvent({ keyCode: 229 }))).toBeNull();
+  });
+
+  test("leaves page keys to an overflowing composer until it reaches the boundary", () => {
+    expect(
+      getTimelinePageScrollKey(composerPageScrollEvent({ scrollHeight: 600, scrollTop: 0 })),
+    ).toBeNull();
+    expect(
+      getTimelinePageScrollKey(
+        composerPageScrollEvent({
+          key: "PageUp",
+          keyCode: 33,
+          scrollHeight: 600,
+          scrollTop: 400,
+        }),
+      ),
+    ).toBeNull();
+
+    expect(
+      getTimelinePageScrollKey(
+        composerPageScrollEvent({
+          key: "PageUp",
+          keyCode: 33,
+          scrollHeight: 600,
+          scrollTop: 0,
+        }),
+      ),
+    ).toBe("PageUp");
+    expect(
+      getTimelinePageScrollKey(composerPageScrollEvent({ scrollHeight: 600, scrollTop: 400 })),
+    ).toBe("PageDown");
+  });
+
+  test("hands off page keys within a fractional pixel of the composer boundary", () => {
+    expect(
+      getTimelinePageScrollKey(
+        composerPageScrollEvent({
+          key: "PageUp",
+          keyCode: 33,
+          scrollHeight: 600,
+          scrollTop: 0.5,
+        }),
+      ),
+    ).toBe("PageUp");
+    expect(
+      getTimelinePageScrollKey(composerPageScrollEvent({ scrollHeight: 600, scrollTop: 399.5 })),
+    ).toBe("PageDown");
+  });
+
+  test("ramps multiplier over time and caps at the max velocity", () => {
+    expect(getPageScrollMultiplier(0)).toBe(1);
+    expect(getPageScrollMultiplier(PAGE_SCROLL_ACCELERATION_MS / 2)).toBeCloseTo(1.5);
+    expect(getPageScrollMultiplier(PAGE_SCROLL_ACCELERATION_MS * 5)).toBe(
+      PAGE_SCROLL_MAX_MULTIPLIER,
+    );
+  });
+
+  test("derives the hold velocity from page size and acceleration", () => {
+    expect(
+      getPageScrollVelocityPxPerMs({
+        holdElapsedMs: 0,
+        pageScrollDistancePx: 600,
+      }),
+    ).toBeCloseTo(4);
+    expect(
+      getPageScrollVelocityPxPerMs({
+        holdElapsedMs: PAGE_SCROLL_ACCELERATION_MS * 5,
+        pageScrollDistancePx: 600,
+      }),
+    ).toBeCloseTo(8);
+  });
+});
+
+describe("createPageScrollController", () => {
+  test("keeps a single page scroll when the key is tapped", () => {
+    const clock = new TestClock();
+    const container = {
+      clientHeight: 600,
+      scrollHeight: 1_800,
+      scrollTop: 0,
+      getBoundingClientRect: () => ({ height: 600 }),
+    };
+    const controller = createPageScrollController({
+      getContainer: () => container,
+      getScrollPaddingBottomPx: () => 24,
+      env: clock.env,
+    });
+
+    controller.handleKeyDown("PageDown");
+    controller.handleKeyUp("PageDown");
+    clock.advanceBy(PAGE_SCROLL_ANIMATION_MS);
+
+    expect(container.scrollTop).toBeCloseTo(
+      getPageScrollDistancePx({
+        containerHeightPx: 600,
+        scrollPaddingBottomPx: 24,
+      }),
+      5,
+    );
+  });
+
+  test("continues scrolling on hold without repeated keydown events and stops on keyup", () => {
+    const clock = new TestClock();
+    const container = {
+      clientHeight: 600,
+      scrollHeight: 4_000,
+      scrollTop: 0,
+      getBoundingClientRect: () => ({ height: 600 }),
+    };
+    const controller = createPageScrollController({
+      getContainer: () => container,
+      getScrollPaddingBottomPx: () => 24,
+      env: clock.env,
+    });
+    controller.handleKeyDown("PageDown");
+    clock.advanceBy(PAGE_SCROLL_ANIMATION_MS + 50);
+
+    const afterHoldStarts = container.scrollTop;
+    clock.advanceBy(200);
+
+    expect(container.scrollTop).toBeGreaterThan(afterHoldStarts);
+
+    const stoppedAt = container.scrollTop;
+    controller.handleKeyUp("PageDown");
+    clock.advanceBy(250);
+
+    expect(container.scrollTop).toBe(stoppedAt);
+  });
+
+  test("notifies once when a page scroll starts", () => {
+    const clock = new TestClock();
+    const started: string[] = [];
+    const controller = createPageScrollController({
+      getContainer: () => ({
+        clientHeight: 600,
+        scrollHeight: 1_800,
+        scrollTop: 600,
+        getBoundingClientRect: () => ({ height: 600 }),
+      }),
+      getScrollPaddingBottomPx: () => 24,
+      onScrollStart: (key) => started.push(key),
+      env: clock.env,
+    });
+
+    controller.handleKeyDown("PageUp");
+    controller.handleKeyDown("PageUp");
+
+    expect(started).toEqual(["PageUp"]);
+  });
+
+  test("does not start a page scroll at the timeline boundary", () => {
+    const clock = new TestClock();
+    const started: string[] = [];
+    const container = {
+      clientHeight: 600,
+      scrollHeight: 1_800,
+      scrollTop: 0.5,
+      getBoundingClientRect: () => ({ height: 600 }),
+    };
+    const controller = createPageScrollController({
+      getContainer: () => container,
+      getScrollPaddingBottomPx: () => 24,
+      onScrollStart: (key) => started.push(key),
+      env: clock.env,
+    });
+
+    controller.handleKeyDown("PageUp");
+    clock.advanceBy(PAGE_SCROLL_ANIMATION_MS * 2);
+
+    container.scrollTop = container.scrollHeight - container.clientHeight - 0.5;
+    controller.handleKeyDown("PageDown");
+    clock.advanceBy(PAGE_SCROLL_ANIMATION_MS * 2);
+
+    expect(started).toEqual([]);
+    expect(container.scrollTop).toBe(1_199.5);
+  });
+});
diff --git a/apps/web/src/components/chat/pageScrollController.ts b/apps/web/src/components/chat/pageScrollController.ts
new file mode 100644
index 000000000000..4c3999b1efc1
--- /dev/null
+++ b/apps/web/src/components/chat/pageScrollController.ts
@@ -0,0 +1,307 @@
+export const PAGE_SCROLL_ANIMATION_MS = 150;
+export const PAGE_SCROLL_ACCELERATION_MS = 400;
+export const PAGE_SCROLL_MAX_MULTIPLIER = 2;
+
+const PAGE_SCROLL_ALIGNMENT_OFFSET_PX = 36;
+const PAGE_SCROLL_BOUNDARY_EPSILON_PX = 1;
+const PAGE_SCROLL_HOLD_DELAY_MS = PAGE_SCROLL_ANIMATION_MS;
+
+export type PageScrollKey = "PageUp" | "PageDown";
+
+type PageScrollMetrics = {
+  clientHeight: number;
+  scrollHeight: number;
+  scrollTop: number;
+};
+
+function canScrollInDirection(
+  { clientHeight, scrollHeight, scrollTop }: PageScrollMetrics,
+  key: PageScrollKey,
+): boolean {
+  const maxScrollTop = Math.max(0, scrollHeight - clientHeight);
+  const clampedScrollTop = Math.min(maxScrollTop, Math.max(0, scrollTop));
+  return key === "PageUp"
+    ? clampedScrollTop > PAGE_SCROLL_BOUNDARY_EPSILON_PX
+    : clampedScrollTop < maxScrollTop - PAGE_SCROLL_BOUNDARY_EPSILON_PX;
+}
+
+export function getTimelinePageScrollKey({
+  altKey,
+  clientHeight,
+  ctrlKey,
+  defaultPrevented,
+  isComposing,
+  key,
+  keyCode,
+  metaKey,
+  scrollHeight,
+  scrollTop,
+  shiftKey,
+}: {
+  altKey: boolean;
+  clientHeight: number;
+  ctrlKey: boolean;
+  defaultPrevented: boolean;
+  isComposing: boolean;
+  key: string;
+  keyCode: number;
+  metaKey: boolean;
+  scrollHeight: number;
+  scrollTop: number;
+  shiftKey: boolean;
+}): PageScrollKey | null {
+  if (key !== "PageUp" && key !== "PageDown") {
+    return null;
+  }
+  if (
+    defaultPrevented ||
+    isComposing ||
+    keyCode === 229 ||
+    altKey ||
+    ctrlKey ||
+    metaKey ||
+    shiftKey
+  ) {
+    return null;
+  }
+
+  const editorCanScroll = canScrollInDirection({ clientHeight, scrollHeight, scrollTop }, key);
+  return editorCanScroll ? null : key;
+}
+
+type PageScrollContainer = PageScrollMetrics & {
+  getBoundingClientRect: () => {
+    height: number;
+  };
+};
+
+type PageScrollEnv = {
+  now: () => number;
+  requestAnimationFrame: (callback: FrameRequestCallback) => number;
+  cancelAnimationFrame: (handle: number) => void;
+  setTimeout: (callback: () => void, delay: number) => number;
+  clearTimeout: (handle: number) => void;
+};
+
+function getDefaultEnv(): PageScrollEnv {
+  return {
+    now: () => performance.now(),
+    requestAnimationFrame: (callback) => window.requestAnimationFrame(callback),
+    cancelAnimationFrame: (handle) => window.cancelAnimationFrame(handle),
+    setTimeout: (callback, delay) => window.setTimeout(callback, delay),
+    clearTimeout: (handle) => window.clearTimeout(handle),
+  };
+}
+
+export function getPageScrollMultiplier(holdElapsedMs: number): number {
+  const progress = Math.max(0, holdElapsedMs) / PAGE_SCROLL_ACCELERATION_MS;
+  return 1 + Math.min(progress, 1) * (PAGE_SCROLL_MAX_MULTIPLIER - 1);
+}
+
+export function getPageScrollVelocityPxPerMs({
+  holdElapsedMs,
+  pageScrollDistancePx,
+}: {
+  holdElapsedMs: number;
+  pageScrollDistancePx: number;
+}): number {
+  return (pageScrollDistancePx * getPageScrollMultiplier(holdElapsedMs)) / PAGE_SCROLL_ANIMATION_MS;
+}
+
+export function getPageScrollDistancePx({
+  containerHeightPx,
+  scrollPaddingBottomPx,
+}: {
+  containerHeightPx: number;
+  scrollPaddingBottomPx: number;
+}): number {
+  return Math.max(0, containerHeightPx - PAGE_SCROLL_ALIGNMENT_OFFSET_PX - scrollPaddingBottomPx);
+}
+
+function getDirection(key: PageScrollKey): -1 | 1 {
+  return key === "PageUp" ? -1 : 1;
+}
+
+function easeInOut(progress: number): number {
+  const ax = 3 * 0.42 - 3 * 0.58 + 1;
+  const bx = 3 * (0.58 - 2 * 0.42);
+  const cx = 3 * 0.42;
+  const ay = -2;
+  const by = 3;
+  const x = (value: number) => ((ax * value + bx) * value + cx) * value;
+  const y = (value: number) => (ay * value + by) * value * value;
+
+  let value = progress;
+  for (let index = 0; index < 5; index += 1) {
+    const delta = x(value) - progress;
+    const derivative = (3 * ax * value + 2 * bx) * value + cx;
+    if (Math.abs(delta) < 1e-4 || derivative === 0) {
+      break;
+    }
+    value -= delta / derivative;
+    value = Math.min(1, Math.max(0, value));
+  }
+
+  return y(value);
+}
+
+export function createPageScrollController({
+  getContainer,
+  getScrollPaddingBottomPx,
+  onScrollStart,
+  env = getDefaultEnv(),
+}: {
+  getContainer: () => PageScrollContainer | null;
+  getScrollPaddingBottomPx: () => number;
+  onScrollStart?: (key: PageScrollKey) => void;
+  env?: PageScrollEnv;
+}) {
+  const state = {
+    activeKey: null as PageScrollKey | null,
+    discreteAnimationFrame: 0,
+    holdDelayTimeout: 0,
+    holdAnimationFrame: 0,
+    holdStartTime: 0,
+    lastFrameTime: 0,
+    holdActive: false,
+  };
+
+  const readPageScrollDistance = (container: PageScrollContainer) =>
+    getPageScrollDistancePx({
+      containerHeightPx: container.getBoundingClientRect().height,
+      scrollPaddingBottomPx: getScrollPaddingBottomPx(),
+    });
+
+  const cancelDiscreteAnimation = () => {
+    if (state.discreteAnimationFrame === 0) {
+      return;
+    }
+
+    env.cancelAnimationFrame(state.discreteAnimationFrame);
+    state.discreteAnimationFrame = 0;
+  };
+
+  const stop = ({
+    cancelDiscreteAnimation: shouldCancelDiscreteAnimation,
+  }: {
+    cancelDiscreteAnimation: boolean;
+  }) => {
+    if (state.holdDelayTimeout !== 0) {
+      env.clearTimeout(state.holdDelayTimeout);
+      state.holdDelayTimeout = 0;
+    }
+
+    if (state.holdAnimationFrame !== 0) {
+      env.cancelAnimationFrame(state.holdAnimationFrame);
+      state.holdAnimationFrame = 0;
+    }
+
+    if (shouldCancelDiscreteAnimation) {
+      cancelDiscreteAnimation();
+    }
+
+    state.activeKey = null;
+    state.holdStartTime = 0;
+    state.lastFrameTime = 0;
+    state.holdActive = false;
+  };
+
+  const smoothScrollBy = (container: PageScrollContainer, deltaY: number) => {
+    cancelDiscreteAnimation();
+
+    const startScrollTop = container.scrollTop;
+    const startTime = env.now();
+
+    const step = (now: number) => {
+      const progress = Math.min(1, (now - startTime) / PAGE_SCROLL_ANIMATION_MS);
+      container.scrollTop = startScrollTop + deltaY * easeInOut(progress);
+
+      if (progress < 1) {
+        state.discreteAnimationFrame = env.requestAnimationFrame(step);
+        return;
+      }
+
+      state.discreteAnimationFrame = 0;
+    };
+
+    state.discreteAnimationFrame = env.requestAnimationFrame(step);
+  };
+
+  const startHoldScroll = (key: PageScrollKey, container: PageScrollContainer) => {
+    cancelDiscreteAnimation();
+    state.holdActive = true;
+    state.holdStartTime = env.now();
+    state.lastFrameTime = state.holdStartTime;
+
+    const step = (now: number) => {
+      if (state.activeKey !== key) {
+        state.holdAnimationFrame = 0;
+        return;
+      }
+
+      const deltaMs = now - state.lastFrameTime;
+      state.lastFrameTime = now;
+
+      const velocityPxPerMs = getPageScrollVelocityPxPerMs({
+        holdElapsedMs: now - state.holdStartTime,
+        pageScrollDistancePx: readPageScrollDistance(container),
+      });
+      const previousScrollTop = container.scrollTop;
+      container.scrollTop = previousScrollTop + velocityPxPerMs * deltaMs * getDirection(key);
+
+      if (deltaMs > 0 && container.scrollTop === previousScrollTop) {
+        stop({ cancelDiscreteAnimation: true });
+        return;
+      }
+
+      state.holdAnimationFrame = env.requestAnimationFrame(step);
+    };
+
+    state.holdAnimationFrame = env.requestAnimationFrame(step);
+  };
+
+  return {
+    handleKeyDown(key: PageScrollKey) {
+      const container = getContainer();
+      if (!container) {
+        return;
+      }
+
+      if (!canScrollInDirection(container, key)) {
+        return;
+      }
+
+      if (state.activeKey === key) {
+        return;
+      }
+
+      stop({ cancelDiscreteAnimation: true });
+      state.activeKey = key;
+      onScrollStart?.(key);
+
+      smoothScrollBy(container, readPageScrollDistance(container) * getDirection(key));
+
+      state.holdDelayTimeout = env.setTimeout(() => {
+        state.holdDelayTimeout = 0;
+        if (state.activeKey !== key) {
+          return;
+        }
+
+        startHoldScroll(key, container);
+      }, PAGE_SCROLL_HOLD_DELAY_MS);
+    },
+    handleKeyUp(key: string) {
+      if (state.activeKey !== key) {
+        return;
+      }
+
+      stop({ cancelDiscreteAnimation: state.holdActive });
+    },
+    releaseActiveKey() {
+      stop({ cancelDiscreteAnimation: state.holdActive });
+    },
+    dispose() {
+      stop({ cancelDiscreteAnimation: true });
+    },
+  };
+}
diff --git a/apps/web/src/components/chat/restingComposerControlsMeasurement.ts b/apps/web/src/components/chat/restingComposerControlsMeasurement.ts
new file mode 100644
index 000000000000..3bd4242d457c
--- /dev/null
+++ b/apps/web/src/components/chat/restingComposerControlsMeasurement.ts
@@ -0,0 +1,77 @@
+import type { RestingComposerControlsMeasurement } from "../composerFooterLayout";
+
+function elementOuterWidth(element: HTMLElement): number {
+  const width = element.getBoundingClientRect().width;
+  if (width === 0) return 0;
+  const style = getComputedStyle(element);
+  return (
+    width +
+    (Number.parseFloat(style.marginInlineStart) || 0) +
+    (Number.parseFloat(style.marginInlineEnd) || 0)
+  );
+}
+
+function elementInlineMarginWidth(element: HTMLElement): number {
+  const style = getComputedStyle(element);
+  return (
+    (Number.parseFloat(style.marginInlineStart) || 0) +
+    (Number.parseFloat(style.marginInlineEnd) || 0)
+  );
+}
+
+function providerModelPickerNaturalWidth(picker: HTMLElement): number {
+  const renderedWidth = picker.getBoundingClientRect().width;
+  if (renderedWidth === 0) return 0;
+  const style = getComputedStyle(picker);
+  const label = picker.querySelector<HTMLElement>('[data-chat-provider-model-picker-label="true"]');
+  const hiddenLabelWidth = label ? Math.max(0, label.scrollWidth - label.clientWidth) : 0;
+  const maxWidth = Number.parseFloat(style.maxWidth);
+  const naturalWidth = Math.min(
+    renderedWidth + hiddenLabelWidth,
+    Number.isFinite(maxWidth) ? maxWidth : Number.POSITIVE_INFINITY,
+  );
+  return naturalWidth + elementInlineMarginWidth(picker);
+}
+
+function providerModelPickerMinimumWidth(picker: HTMLElement): number {
+  const minWidth = Number.parseFloat(getComputedStyle(picker).minWidth) || 0;
+  return minWidth + elementInlineMarginWidth(picker);
+}
+
+/**
+ * Read the natural widths of the resting composer controls from the DOM.
+ *
+ * Both the composer (deciding which blocks move into overflow) and the
+ * context strip (deciding whether its labels may expand) read the same
+ * numbers, so neither decision depends on what the other one hid last render.
+ *
+ * Hidden blocks and the unused overflow trigger stay mounted out of flow at
+ * full size. The picker is the one flexible item: its intended width is
+ * recovered from the truncated label.
+ */
+export function measureRestingComposerControls(
+  controls: HTMLElement,
+): RestingComposerControlsMeasurement | null {
+  const gap = Number.parseFloat(getComputedStyle(controls).columnGap) || 0;
+  const picker = controls.querySelector<HTMLElement>("[data-chat-provider-model-picker]");
+  const leadingControl =
+    picker ?? controls.querySelector<HTMLElement>('[data-chat-provider-unavailable="true"]');
+  if (!leadingControl) return null;
+  // Separators are display:none on phone widths; a hidden one takes no gap.
+  const separator = controls.querySelector<HTMLElement>("[data-resting-controls-separator]");
+  const separatorWidth = separator ? elementOuterWidth(separator) : 0;
+  const overflow = controls.querySelector<HTMLElement>("[data-resting-controls-overflow]");
+  const separatorAndGapWidth = separatorWidth > 0 ? separatorWidth + gap : 0;
+  const blocks = Array.from(controls.querySelectorAll<HTMLElement>("[data-resting-block]"));
+  return {
+    gap,
+    naturalFixedWidth:
+      (picker ? providerModelPickerNaturalWidth(picker) : elementOuterWidth(leadingControl)) +
+      separatorAndGapWidth,
+    minimumFixedWidth:
+      (picker ? providerModelPickerMinimumWidth(picker) : elementOuterWidth(leadingControl)) +
+      separatorAndGapWidth,
+    blockWidths: blocks.map(elementOuterWidth),
+    overflowWidth: overflow ? elementOuterWidth(overflow) : 0,
+  };
+}
diff --git a/apps/web/src/components/chat/timelineScrollAnchoring.test.tsx b/apps/web/src/components/chat/timelineScrollAnchoring.test.tsx
index 50453c55cb17..1bf82c47a614 100644
--- a/apps/web/src/components/chat/timelineScrollAnchoring.test.tsx
+++ b/apps/web/src/components/chat/timelineScrollAnchoring.test.tsx
@@ -1,9 +1,5 @@
-import { describe, expect, it, vi } from "vite-plus/test";
-import {
-  getAnchoredTurnMetrics,
-  getRowBottom,
-  keepTimelineEndVisibleAfterOverlayGrowth,
-} from "./timelineScrollAnchoring";
+import { describe, expect, it } from "vite-plus/test";
+import { getAnchoredTurnMetrics, getRowBottom } from "./timelineScrollAnchoring";
 
 function buildState({
   positions,
@@ -26,33 +22,6 @@ function buildState({
 }
 
 describe("timeline scroll anchoring", () => {
-  it("keeps the live edge visible when the composer overlay grows", () => {
-    const scrollToEnd = vi.fn();
-
-    keepTimelineEndVisibleAfterOverlayGrowth({
-      timeline: { scrollToEnd },
-      previousOverlayHeight: 120,
-      overlayHeight: 180,
-      followingEnd: true,
-    });
-
-    expect(scrollToEnd).toHaveBeenCalledOnce();
-    expect(scrollToEnd).toHaveBeenCalledWith({ animated: false });
-  });
-
-  it("leaves the scroll position alone while the user reads history", () => {
-    const scrollToEnd = vi.fn();
-
-    keepTimelineEndVisibleAfterOverlayGrowth({
-      timeline: { scrollToEnd },
-      previousOverlayHeight: 120,
-      overlayHeight: 180,
-      followingEnd: false,
-    });
-
-    expect(scrollToEnd).not.toHaveBeenCalled();
-  });
-
   it("measures row bottoms from LegendList row position and size", () => {
     const state = buildState({
       positions: [0, 120],
diff --git a/apps/web/src/components/chat/timelineScrollAnchoring.ts b/apps/web/src/components/chat/timelineScrollAnchoring.ts
index 505efef29d21..4b011e235900 100644
--- a/apps/web/src/components/chat/timelineScrollAnchoring.ts
+++ b/apps/web/src/components/chat/timelineScrollAnchoring.ts
@@ -22,22 +22,6 @@ export interface AnchoredTurnMetrics {
   readonly scrollDeltaToRevealEnd: number;
 }
 
-export function keepTimelineEndVisibleAfterOverlayGrowth({
-  timeline,
-  previousOverlayHeight,
-  overlayHeight,
-  followingEnd,
-}: {
-  readonly timeline: { scrollToEnd: (options: { animated: boolean }) => unknown } | null;
-  readonly previousOverlayHeight: number;
-  readonly overlayHeight: number;
-  readonly followingEnd: boolean;
-}): void {
-  if (timeline && followingEnd && overlayHeight > previousOverlayHeight) {
-    void timeline.scrollToEnd({ animated: false });
-  }
-}
-
 export function getRowBottom(state: TimelineListMeasurementState, index: number): number | null {
   const top = state.positionAtIndex(index);
   const height = state.sizeAtIndex(index);
diff --git a/apps/web/src/components/composerFooterLayout.test.ts b/apps/web/src/components/composerFooterLayout.test.ts
index 92e054df52dc..926816508ec5 100644
--- a/apps/web/src/components/composerFooterLayout.test.ts
+++ b/apps/web/src/components/composerFooterLayout.test.ts
@@ -1,12 +1,35 @@
 import { describe, expect, it } from "vite-plus/test";
 
+import { resolveContextStripLabelsCompact } from "./BranchToolbar.logic";
 import {
   COMPOSER_FOOTER_COMPACT_BREAKPOINT_PX,
   COMPOSER_FOOTER_WIDE_ACTIONS_COMPACT_BREAKPOINT_PX,
+  getRestingComposerImagePreviewCounts,
+  resolveRestingComposerControlsLayout,
+  resolveRestingComposerControlsNaturalWidth,
+  shouldAnimateComposerRestingTransition,
   shouldUseCompactComposerPrimaryActions,
   shouldUseCompactComposerFooter,
+  shouldUseRestingComposerLayout,
 } from "./composerFooterLayout";
 
+describe("getRestingComposerImagePreviewCounts", () => {
+  it("shows at most three thumbnails and counts the remainder", () => {
+    expect(getRestingComposerImagePreviewCounts(0)).toEqual({
+      visibleCount: 0,
+      overflowCount: 0,
+    });
+    expect(getRestingComposerImagePreviewCounts(3)).toEqual({
+      visibleCount: 3,
+      overflowCount: 0,
+    });
+    expect(getRestingComposerImagePreviewCounts(7)).toEqual({
+      visibleCount: 3,
+      overflowCount: 4,
+    });
+  });
+});
+
 describe("shouldUseCompactComposerFooter", () => {
   it("stays expanded without a measured width", () => {
     expect(shouldUseCompactComposerFooter(null)).toBe(false);
@@ -50,3 +73,207 @@ describe("shouldUseCompactComposerPrimaryActions", () => {
     ).toBe(false);
   });
 });
+
+describe("shouldUseRestingComposerLayout", () => {
+  const resting = {
+    isExistingThread: true,
+    isMobileViewport: false,
+    isFocused: false,
+    hasExpandedChrome: false,
+  };
+
+  it("uses the resting layout for an unfocused desktop composer", () => {
+    expect(shouldUseRestingComposerLayout(resting)).toBe(true);
+  });
+
+  it("keeps new-thread composers expanded", () => {
+    expect(shouldUseRestingComposerLayout({ ...resting, isExistingThread: false })).toBe(false);
+  });
+
+  it("leaves responsive mobile on its existing collapse path", () => {
+    expect(shouldUseRestingComposerLayout({ ...resting, isMobileViewport: true })).toBe(false);
+  });
+
+  it("expands when focus is anywhere in the composer", () => {
+    expect(shouldUseRestingComposerLayout({ ...resting, isFocused: true })).toBe(false);
+  });
+
+  it("keeps drawers and composer-owned menus expanded", () => {
+    expect(shouldUseRestingComposerLayout({ ...resting, hasExpandedChrome: true })).toBe(false);
+  });
+});
+
+describe("shouldAnimateComposerRestingTransition", () => {
+  it("does not animate layout measurements that settle during initial mount", () => {
+    expect(
+      shouldAnimateComposerRestingTransition({
+        hasCompletedInitialLayout: false,
+        stateChanged: true,
+        hasInterruptedAnimation: false,
+      }),
+    ).toBe(false);
+  });
+
+  it("animates later resting-state changes and interrupted transitions", () => {
+    expect(
+      shouldAnimateComposerRestingTransition({
+        hasCompletedInitialLayout: true,
+        stateChanged: true,
+        hasInterruptedAnimation: false,
+      }),
+    ).toBe(true);
+    expect(
+      shouldAnimateComposerRestingTransition({
+        hasCompletedInitialLayout: true,
+        stateChanged: false,
+        hasInterruptedAnimation: true,
+      }),
+    ).toBe(true);
+  });
+});
+
+describe("resolveRestingComposerControlsLayout", () => {
+  // Picker 140 natural / 96 minimum, plus a 9px separator. Traits 60,
+  // mode 140, overflow 24, gap 4.
+  const base = {
+    gap: 4,
+    naturalFixedWidth: 149,
+    minimumFixedWidth: 105,
+    blockWidths: [60, 140],
+    overflowWidth: 24,
+  };
+
+  it("shows everything when the host has room", () => {
+    // 149 + 60 + 140 + 4 * 2 = 357
+    expect(resolveRestingComposerControlsLayout({ ...base, hostWidth: 357 })).toEqual({
+      hiddenCount: 0,
+      visible: true,
+    });
+  });
+
+  it("moves trailing blocks into the overflow menu until the rest fits", () => {
+    // 149 + 60 + 24 + 4 * 2 = 241
+    expect(resolveRestingComposerControlsLayout({ ...base, hostWidth: 356 })).toEqual({
+      hiddenCount: 1,
+      visible: true,
+    });
+    expect(resolveRestingComposerControlsLayout({ ...base, hostWidth: 241 })).toEqual({
+      hiddenCount: 1,
+      visible: true,
+    });
+    // 149 + 24 + 4 = 177
+    expect(resolveRestingComposerControlsLayout({ ...base, hostWidth: 240 })).toEqual({
+      hiddenCount: 2,
+      visible: true,
+    });
+  });
+
+  it("shrinks the picker after moving every trailing block into overflow", () => {
+    expect(resolveRestingComposerControlsLayout({ ...base, hostWidth: 176 })).toEqual({
+      hiddenCount: 2,
+      visible: true,
+    });
+    // 105 + 24 + 4 = 133
+    expect(resolveRestingComposerControlsLayout({ ...base, hostWidth: 133 })).toEqual({
+      hiddenCount: 2,
+      visible: true,
+    });
+  });
+
+  it("hides the whole cluster below the picker's minimum readable width", () => {
+    expect(resolveRestingComposerControlsLayout({ ...base, hostWidth: 132 })).toEqual({
+      hiddenCount: 2,
+      visible: false,
+    });
+    expect(resolveRestingComposerControlsLayout({ ...base, hostWidth: 0 })).toEqual({
+      hiddenCount: 2,
+      visible: false,
+    });
+  });
+
+  it("uses the same thresholds while shrinking and growing", () => {
+    expect(resolveRestingComposerControlsLayout({ ...base, hostWidth: 240 })).toEqual({
+      hiddenCount: 2,
+      visible: true,
+    });
+    expect(resolveRestingComposerControlsLayout({ ...base, hostWidth: 241 })).toEqual({
+      hiddenCount: 1,
+      visible: true,
+    });
+  });
+
+  it("supports a single leading control without overflow blocks", () => {
+    expect(
+      resolveRestingComposerControlsLayout({
+        ...base,
+        naturalFixedWidth: 140,
+        minimumFixedWidth: 140,
+        blockWidths: [],
+        overflowWidth: 0,
+        hostWidth: 139,
+      }),
+    ).toEqual({ hiddenCount: 0, visible: false });
+  });
+});
+
+describe("context strip labels and resting composer controls", () => {
+  // Widths captured from a desktop renderer that crashed with React error
+  // 185. The strip is 724px wide. Its expanded labels need 327px, and the
+  // rest of its chrome needs 125px. The composer controls sit in the host
+  // that takes whatever is left.
+  const stripWidth = 724;
+  const labelWidth = 327;
+  const chromeWidth = 125;
+  const measurement = {
+    gap: 4,
+    naturalFixedWidth: 96.3828125 + 5 + 4,
+    minimumFixedWidth: 52 + 5 + 4,
+    blockWidths: [130.6953125, 119.671875],
+    overflowWidth: 28,
+  };
+  const naturalWidth = resolveRestingComposerControlsNaturalWidth(measurement);
+
+  function hostWidth(compact: boolean): number {
+    return stripWidth - chromeWidth - (compact ? 0 : labelWidth);
+  }
+
+  it("keeps the labels compact when the full controls only fit beside compact labels", () => {
+    // Compact labels leave 599px, so the composer shows every block.
+    const layout = resolveRestingComposerControlsLayout({
+      ...measurement,
+      hostWidth: hostWidth(true),
+    });
+    expect(layout).toEqual({ hiddenCount: 0, visible: true });
+
+    // The strip reserves the natural controls width, so expanding the
+    // labels is off the table: 125 + 327 + 364 > 724.
+    const compact = resolveContextStripLabelsCompact({
+      compact: true,
+      neededWidth: chromeWidth + labelWidth + naturalWidth,
+      availableWidth: stripWidth,
+    });
+    expect(compact).toBe(true);
+
+    // The next pass sees the same inputs and lands on the same answer.
+    expect(
+      resolveRestingComposerControlsLayout({ ...measurement, hostWidth: hostWidth(compact) }),
+    ).toEqual(layout);
+  });
+
+  it("does not settle when the strip only reserves the visible controls", () => {
+    // Regression guard for the alternating layout. Reserving only the
+    // controls left visible after two blocks moved into overflow makes the
+    // strip expand its labels, which shrinks the host below what the full
+    // controls need, which hides the blocks again.
+    const hiddenControlsWidth = 137;
+    const expands = !resolveContextStripLabelsCompact({
+      compact: true,
+      neededWidth: chromeWidth + labelWidth + hiddenControlsWidth,
+      availableWidth: stripWidth,
+    });
+    expect(expands).toBe(true);
+    expect(
+      resolveRestingComposerControlsLayout({ ...measurement, hostWidth: hostWidth(false) }),
+    ).toEqual({ hiddenCount: 2, visible: true });
+  });
+});
diff --git a/apps/web/src/components/composerFooterLayout.ts b/apps/web/src/components/composerFooterLayout.ts
index 5e0b3a8ea379..2ab3b36a1b90 100644
--- a/apps/web/src/components/composerFooterLayout.ts
+++ b/apps/web/src/components/composerFooterLayout.ts
@@ -1,5 +1,17 @@
 export const COMPOSER_FOOTER_COMPACT_BREAKPOINT_PX = 620;
 export const COMPOSER_FOOTER_WIDE_ACTIONS_COMPACT_BREAKPOINT_PX = 780;
+export const RESTING_COMPOSER_IMAGE_THUMBNAIL_LIMIT = 3;
+
+export function getRestingComposerImagePreviewCounts(imageCount: number): {
+  visibleCount: number;
+  overflowCount: number;
+} {
+  const visibleCount = Math.min(imageCount, RESTING_COMPOSER_IMAGE_THUMBNAIL_LIMIT);
+  return {
+    visibleCount,
+    overflowCount: Math.max(0, imageCount - visibleCount),
+  };
+}
 
 export function shouldUseCompactComposerFooter(
   width: number | null,
@@ -11,6 +23,36 @@ export function shouldUseCompactComposerFooter(
   return width !== null && width < breakpoint;
 }
 
+export function shouldUseRestingComposerLayout(input: {
+  isExistingThread: boolean;
+  isMobileViewport: boolean;
+  isFocused: boolean;
+  hasExpandedChrome: boolean;
+}): boolean {
+  // Passive draft content is deliberately absent here. Resting only clamps
+  // the prompt row and overlays its actions; non-image attachment and context
+  // rows keep their natural height above it while image previews move inline.
+  // Banners and the tasks badge dock above the surface, so they are absent
+  // too. Whether the context strip can host the relocated controls is
+  // deliberately absent here: resting reclaims vertical space at every
+  // desktop width, and where the strip is missing or too narrow the controls
+  // simply return when the composer is focused.
+  return (
+    input.isExistingThread &&
+    !input.isMobileViewport &&
+    !input.isFocused &&
+    !input.hasExpandedChrome
+  );
+}
+
+export function shouldAnimateComposerRestingTransition(input: {
+  hasCompletedInitialLayout: boolean;
+  stateChanged: boolean;
+  hasInterruptedAnimation: boolean;
+}): boolean {
+  return input.hasCompletedInitialLayout && (input.stateChanged || input.hasInterruptedAnimation);
+}
+
 export function shouldUseCompactComposerPrimaryActions(
   width: number | null,
   options?: { hasWideActions?: boolean },
@@ -20,3 +62,64 @@ export function shouldUseCompactComposerPrimaryActions(
   }
   return width !== null && width < COMPOSER_FOOTER_WIDE_ACTIONS_COMPACT_BREAKPOINT_PX;
 }
+
+export interface RestingComposerControlsMeasurement {
+  gap: number;
+  naturalFixedWidth: number;
+  minimumFixedWidth: number;
+  blockWidths: readonly number[];
+  overflowWidth: number;
+}
+
+function restingComposerControlsWidth(
+  input: RestingComposerControlsMeasurement,
+  hiddenCount: number,
+  fixedWidth = input.naturalFixedWidth,
+): number {
+  const { blockWidths, gap } = input;
+  const visibleCount = blockWidths.length - hiddenCount;
+  return (
+    fixedWidth +
+    blockWidths.slice(0, visibleCount).reduce((sum, width) => sum + width, 0) +
+    (hiddenCount > 0 ? input.overflowWidth : 0) +
+    gap * (visibleCount + (hiddenCount > 0 ? 1 : 0))
+  );
+}
+
+/**
+ * The width the resting controls take with nothing moved into overflow.
+ *
+ * The context strip reserves this much for the composer before deciding
+ * whether its own labels may expand. Judging against the currently visible
+ * controls instead lets the strip expand into space the composer just gave
+ * up, which shrinks the host, hides the controls again, and repeats.
+ */
+export function resolveRestingComposerControlsNaturalWidth(
+  input: RestingComposerControlsMeasurement,
+): number {
+  return restingComposerControlsWidth(input, 0);
+}
+
+/**
+ * Decide how many trailing resting control blocks move into the overflow
+ * menu, and whether the cluster can show at all, from natural widths.
+ *
+ * Trailing blocks hide before the model picker shrinks. Once they are all in
+ * the overflow menu, the picker may contract to its minimum readable width;
+ * below that the whole cluster hides rather than clipping.
+ */
+export function resolveRestingComposerControlsLayout(
+  input: RestingComposerControlsMeasurement & { hostWidth: number },
+): { hiddenCount: number; visible: boolean } {
+  const { blockWidths, hostWidth } = input;
+  let hiddenCount = 0;
+  while (
+    hiddenCount < blockWidths.length &&
+    restingComposerControlsWidth(input, hiddenCount) > hostWidth
+  ) {
+    hiddenCount += 1;
+  }
+  const visible =
+    restingComposerControlsWidth(input, hiddenCount, input.minimumFixedWidth) <= hostWidth;
+  return { hiddenCount, visible };
+}
diff --git a/apps/web/src/components/composerSelection.test.ts b/apps/web/src/components/composerSelection.test.ts
new file mode 100644
index 000000000000..1d53b43b1f7d
--- /dev/null
+++ b/apps/web/src/components/composerSelection.test.ts
@@ -0,0 +1,27 @@
+import { describe, expect, it } from "vite-plus/test";
+
+import { didComposerSelectionChangeVisibly } from "./composerSelection";
+
+describe("didComposerSelectionChangeVisibly", () => {
+  it("ignores selection-neutral editor updates", () => {
+    expect(didComposerSelectionChangeVisibly({ start: 3, end: 3 }, null)).toBe(false);
+    expect(didComposerSelectionChangeVisibly({ start: 3, end: 3 }, { start: 3, end: 3 })).toBe(
+      false,
+    );
+  });
+
+  it("detects entering and extending a visible range selection", () => {
+    expect(didComposerSelectionChangeVisibly({ start: 3, end: 3 }, { start: 0, end: 3 })).toBe(
+      true,
+    );
+    expect(didComposerSelectionChangeVisibly({ start: 1, end: 3 }, { start: 0, end: 3 })).toBe(
+      true,
+    );
+  });
+
+  it("does not repeatedly report the same visible selection", () => {
+    expect(didComposerSelectionChangeVisibly({ start: 0, end: 3 }, { start: 0, end: 3 })).toBe(
+      false,
+    );
+  });
+});
diff --git a/apps/web/src/components/composerSelection.ts b/apps/web/src/components/composerSelection.ts
new file mode 100644
index 000000000000..642153f0151c
--- /dev/null
+++ b/apps/web/src/components/composerSelection.ts
@@ -0,0 +1,15 @@
+export type ComposerSelectionRange = {
+  start: number;
+  end: number;
+};
+
+export function didComposerSelectionChangeVisibly(
+  previous: ComposerSelectionRange,
+  next: ComposerSelectionRange | null,
+): boolean {
+  return (
+    next !== null &&
+    next.start !== next.end &&
+    (next.start !== previous.start || next.end !== previous.end)
+  );
+}
diff --git a/apps/web/src/components/diffs/DiffFileTree.tsx b/apps/web/src/components/diffs/DiffFileTree.tsx
new file mode 100644
index 000000000000..3715b62ca15a
--- /dev/null
+++ b/apps/web/src/components/diffs/DiffFileTree.tsx
@@ -0,0 +1,186 @@
+import type { GitStatusEntry } from "@pierre/trees";
+import { FileTree, useFileTree, useFileTreeSelector } from "@pierre/trees/react";
+import { ChevronsDownUpIcon, ChevronsUpDownIcon } from "lucide-react";
+import { useEffect, useMemo, useRef, type ReactNode } from "react";
+
+import { useTheme } from "~/hooks/useTheme";
+import { cn } from "~/lib/utils";
+import { T3_PIERRE_ICONS } from "~/pierre-icons";
+import { PIERRE_TREE_UNSAFE_CSS, pierreTreeStyle } from "~/pierre-tree-theme";
+
+import { areAllDirectoriesExpanded, setAllDirectoriesExpanded } from "../files/fileTreeExpansion";
+import { Button } from "../ui/button";
+import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
+import {
+  buildDiffFileTreeUpdates,
+  collectDirectoryPaths,
+  type DiffFileTreeEntry,
+} from "./diffFileTree.logic";
+
+export type { DiffFileTreeEntry } from "./diffFileTree.logic";
+
+interface DiffFileTreeProps {
+  readonly entries: ReadonlyArray<DiffFileTreeEntry>;
+  /** Called with the file's path when the reader picks a file row. */
+  readonly onSelectFile: (path: string) => void;
+  /**
+   * The file the diff is currently showing, kept selected in the tree. Bump `revealRequestId` to
+   * scroll the tree to the same path again.
+   */
+  readonly selectedPath?: string | null;
+  readonly revealRequestId?: number;
+  readonly ariaLabel: string;
+  /** Right-aligned content in the header row, after the file count. */
+  readonly headerAccessory?: ReactNode;
+  /** Rendered under the tree, for a host that still has files to fetch. */
+  readonly footer?: ReactNode;
+  readonly className?: string;
+}
+
+/**
+ * A directory tree of the files in a diff. Every directory starts open: a diff is a short list
+ * compared to a workspace, and the reader came for the files, not the folders.
+ */
+export function DiffFileTree({
+  entries,
+  onSelectFile,
+  selectedPath = null,
+  revealRequestId = 0,
+  ariaLabel,
+  headerAccessory,
+  footer,
+  className,
+}: DiffFileTreeProps) {
+  const { resolvedTheme } = useTheme();
+  const paths = useMemo(() => entries.map((entry) => entry.path), [entries]);
+  const directoryPaths = useMemo(() => collectDirectoryPaths(paths), [paths]);
+  const gitStatus = useMemo<ReadonlyArray<GitStatusEntry>>(
+    () => entries.map((entry) => ({ path: entry.path, status: entry.status })),
+    [entries],
+  );
+  const filePathsRef = useRef<ReadonlySet<string>>(new Set(paths));
+  const onSelectFileRef = useRef(onSelectFile);
+  // Selection driven by `selectedPath` below is an echo of a file already on screen, not a
+  // request to scroll to it again.
+  const syncingSelectionRef = useRef(false);
+  const handledRevealRef = useRef<{ path: string; revealRequestId: number } | null>(null);
+  const mountedPathsRef = useRef<ReadonlyArray<string> | null>(null);
+
+  useEffect(() => {
+    filePathsRef.current = new Set(paths);
+    onSelectFileRef.current = onSelectFile;
+  }, [onSelectFile, paths]);
+
+  const { model } = useFileTree({
+    density: "compact",
+    flattenEmptyDirectories: true,
+    initialExpansion: "open",
+    icons: T3_PIERRE_ICONS,
+    onSelectionChange: (selectedPaths) => {
+      if (syncingSelectionRef.current) return;
+      const path = selectedPaths.at(-1)?.replace(/\/$/, "");
+      if (path && filePathsRef.current.has(path)) onSelectFileRef.current(path);
+    },
+    paths: [],
+    search: false,
+    unsafeCSS: PIERRE_TREE_UNSAFE_CSS,
+  });
+  const allDirectoriesExpanded = useFileTreeSelector(model, (currentModel) =>
+    areAllDirectoriesExpanded(currentModel, directoryPaths),
+  );
+
+  useEffect(() => {
+    const mountedPaths = mountedPathsRef.current;
+    if (mountedPaths === paths) return;
+    mountedPathsRef.current = paths;
+    if (mountedPaths === null) {
+      model.resetPaths(paths);
+    } else {
+      const updates = buildDiffFileTreeUpdates(mountedPaths, paths);
+      if (updates.length > 0) model.batch(updates);
+    }
+    model.setGitStatus(gitStatus);
+  }, [gitStatus, model, paths]);
+
+  useEffect(() => {
+    if (selectedPath === null) {
+      handledRevealRef.current = null;
+      return;
+    }
+    // A path list that changes under an already-revealed file (a refresh, a later slice) must
+    // not pull the tree back to it over whatever the reader has picked since.
+    const item = model.getItem(selectedPath);
+    if (item === null || item.isDirectory()) {
+      // A file that left the diff has to be revealed again when it comes back.
+      handledRevealRef.current = null;
+      return;
+    }
+    const handled = handledRevealRef.current;
+    if (handled?.path === selectedPath && handled.revealRequestId === revealRequestId) return;
+    handledRevealRef.current = { path: selectedPath, revealRequestId };
+    syncingSelectionRef.current = true;
+    for (const path of model.getSelectedPaths()) {
+      if (path !== selectedPath) model.getItem(path)?.deselect();
+    }
+    let ancestor = "";
+    for (const segment of selectedPath.split("/").slice(0, -1)) {
+      ancestor += `${segment}/`;
+      const directory = model.getItem(ancestor);
+      if (directory !== null && "expand" in directory) directory.expand();
+    }
+    item.select();
+    model.scrollToPath(selectedPath, { offset: "nearest" });
+    queueMicrotask(() => {
+      syncingSelectionRef.current = false;
+    });
+    // `paths` is a dependency so a file that arrives after it was asked for is still revealed.
+  }, [model, paths, revealRequestId, selectedPath]);
+
+  return (
+    <div className={cn("flex min-h-0 flex-1 flex-col bg-background", className)}>
+      <div
+        className="flex h-10 min-h-10 shrink-0 items-center gap-1 border-b border-border/60 bg-background px-2 text-xs text-muted-foreground in-data-[preview-panel-mode=inline]:mb-3 in-data-[preview-panel-mode=inline]:h-7 in-data-[preview-panel-mode=inline]:min-h-7 in-data-[preview-panel-mode=inline]:border-b-transparent"
+        data-surface-subheader
+      >
+        <span className="px-1 font-medium text-foreground">Files</span>
+        <span className="ml-auto tabular-nums">{entries.length}</span>
+        {headerAccessory}
+        {directoryPaths.length > 0 ? (
+          <Tooltip>
+            <TooltipTrigger
+              render={
+                <Button
+                  type="button"
+                  size="icon-xs"
+                  variant="ghost"
+                  aria-label={
+                    allDirectoriesExpanded ? "Collapse all folders" : "Expand all folders"
+                  }
+                  onClick={() =>
+                    setAllDirectoriesExpanded(model, directoryPaths, !allDirectoriesExpanded)
+                  }
+                />
+              }
+            >
+              {allDirectoriesExpanded ? (
+                <ChevronsDownUpIcon className="size-3.5" />
+              ) : (
+                <ChevronsUpDownIcon className="size-3.5" />
+              )}
+            </TooltipTrigger>
+            <TooltipPopup>
+              {allDirectoriesExpanded ? "Collapse all folders" : "Expand all folders"}
+            </TooltipPopup>
+          </Tooltip>
+        ) : null}
+      </div>
+      <FileTree
+        model={model}
+        aria-label={ariaLabel}
+        className="min-h-0 flex-1 overflow-hidden"
+        style={pierreTreeStyle(resolvedTheme)}
+      />
+      {footer}
+    </div>
+  );
+}
diff --git a/apps/web/src/components/diffs/diffFileTree.logic.test.ts b/apps/web/src/components/diffs/diffFileTree.logic.test.ts
new file mode 100644
index 000000000000..d8e24968dcea
--- /dev/null
+++ b/apps/web/src/components/diffs/diffFileTree.logic.test.ts
@@ -0,0 +1,69 @@
+import type { FileDiffMetadata } from "@pierre/diffs";
+import { describe, expect, it } from "vite-plus/test";
+
+import {
+  buildDiffFileTreeUpdates,
+  collectDirectoryPaths,
+  diffFileTreeEntries,
+} from "./diffFileTree.logic";
+
+function file(type: FileDiffMetadata["type"], name: string, prevName = name): FileDiffMetadata {
+  return { type, name: `b/${name}`, prevName: `a/${prevName}` } as FileDiffMetadata;
+}
+
+describe("diffFileTreeEntries", () => {
+  it("maps each change type to its git status under the file's current path", () => {
+    expect(
+      diffFileTreeEntries([
+        file("new", "src/a.ts"),
+        file("deleted", "src/b.ts"),
+        file("rename-pure", "src/c.ts", "src/old-c.ts"),
+        file("rename-changed", "src/d.ts", "src/old-d.ts"),
+        file("change", "README.md"),
+      ]),
+    ).toEqual([
+      { path: "src/a.ts", status: "added" },
+      { path: "src/b.ts", status: "deleted" },
+      { path: "src/c.ts", status: "renamed" },
+      { path: "src/d.ts", status: "renamed" },
+      { path: "README.md", status: "modified" },
+    ]);
+  });
+});
+
+describe("collectDirectoryPaths", () => {
+  it("lists every ancestor once, parents first, with Pierre's trailing slash", () => {
+    expect(collectDirectoryPaths(["apps/web/src/a.ts", "apps/web/b.ts", "README.md"])).toEqual([
+      "apps/",
+      "apps/web/",
+      "apps/web/src/",
+    ]);
+  });
+});
+
+describe("buildDiffFileTreeUpdates", () => {
+  it("adds a new file's directories before the file", () => {
+    expect(buildDiffFileTreeUpdates(["README.md"], ["README.md", "src/lib/a.ts"])).toEqual([
+      { type: "add", path: "src/" },
+      { type: "add", path: "src/lib/" },
+      { type: "add", path: "src/lib/a.ts" },
+    ]);
+  });
+
+  it("removes files before their now-empty directories, deepest first", () => {
+    expect(buildDiffFileTreeUpdates(["src/lib/a.ts", "src/b.ts"], ["src/b.ts"])).toEqual([
+      { type: "remove", path: "src/lib/a.ts" },
+      { type: "remove", path: "src/lib/", recursive: true },
+    ]);
+  });
+
+  it("keeps a directory that still holds a file", () => {
+    expect(buildDiffFileTreeUpdates(["src/a.ts", "src/b.ts"], ["src/b.ts"])).toEqual([
+      { type: "remove", path: "src/a.ts" },
+    ]);
+  });
+
+  it("produces nothing when the paths are unchanged", () => {
+    expect(buildDiffFileTreeUpdates(["src/a.ts"], ["src/a.ts"])).toEqual([]);
+  });
+});
diff --git a/apps/web/src/components/diffs/diffFileTree.logic.ts b/apps/web/src/components/diffs/diffFileTree.logic.ts
new file mode 100644
index 000000000000..4535ece8b143
--- /dev/null
+++ b/apps/web/src/components/diffs/diffFileTree.logic.ts
@@ -0,0 +1,93 @@
+import type { FileDiffMetadata } from "@pierre/diffs";
+import type { FileTreeBatchOperation, GitStatus } from "@pierre/trees";
+
+import { resolveFileDiffPath } from "~/lib/diffRendering";
+
+/** One changed file as the tree shows it: its current path and how it changed. */
+export interface DiffFileTreeEntry {
+  readonly path: string;
+  readonly status: GitStatus;
+}
+
+function toGitStatus(file: FileDiffMetadata): GitStatus {
+  switch (file.type) {
+    case "new":
+      return "added";
+    case "deleted":
+      return "deleted";
+    case "rename-pure":
+    case "rename-changed":
+      return "renamed";
+    case "change":
+      return "modified";
+  }
+}
+
+/** Maps parsed diff files to tree entries, keeping the diff's own order. */
+export function diffFileTreeEntries(
+  files: ReadonlyArray<FileDiffMetadata>,
+): ReadonlyArray<DiffFileTreeEntry> {
+  return files.map((file) => ({ path: resolveFileDiffPath(file), status: toGitStatus(file) }));
+}
+
+/**
+ * Every directory on the way to each file, registered with the trailing slash Pierre uses for
+ * directory ids. Parents come before children so the tree can add them in order.
+ */
+export function collectDirectoryPaths(paths: ReadonlyArray<string>): ReadonlyArray<string> {
+  const directories = new Set<string>();
+  for (const path of paths) {
+    const segments = path.split("/");
+    let directory = "";
+    for (const segment of segments.slice(0, -1)) {
+      directory += `${segment}/`;
+      directories.add(directory);
+    }
+  }
+  return [...directories];
+}
+
+function pathDepth(path: string): number {
+  return path.split("/").filter(Boolean).length;
+}
+
+/**
+ * The adds and removes that turn one set of file paths into another, so a diff that changes
+ * under the reader (a new slice, a refresh after an agent edit) keeps the directories they
+ * have already opened or closed instead of rebuilding the tree from scratch.
+ *
+ * Directories are removed only once no file needs them; a directory that gains its first file
+ * is added before that file.
+ */
+export function buildDiffFileTreeUpdates(
+  previousPaths: ReadonlyArray<string>,
+  nextPaths: ReadonlyArray<string>,
+): FileTreeBatchOperation[] {
+  const previousDirectories = new Set(collectDirectoryPaths(previousPaths));
+  const nextDirectories = new Set(collectDirectoryPaths(nextPaths));
+  const previous = new Set(previousPaths);
+  const next = new Set(nextPaths);
+  const updates: FileTreeBatchOperation[] = [];
+
+  for (const path of previousPaths) {
+    if (!next.has(path)) updates.push({ type: "remove", path });
+  }
+  // Deepest first: a directory can only go once everything under it has.
+  const removedDirectories = [...previousDirectories]
+    .filter((directory) => !nextDirectories.has(directory))
+    .toSorted((left, right) => pathDepth(right) - pathDepth(left));
+  for (const directory of removedDirectories) {
+    updates.push({ type: "remove", path: directory, recursive: true });
+  }
+
+  // Shallowest first: a file's directory has to exist before the file does.
+  const addedDirectories = [...nextDirectories]
+    .filter((directory) => !previousDirectories.has(directory))
+    .toSorted((left, right) => pathDepth(left) - pathDepth(right));
+  for (const directory of addedDirectories) updates.push({ type: "add", path: directory });
+  for (const path of nextPaths) {
+    if (!previous.has(path)) updates.push({ type: "add", path });
+  }
+
+  return updates;
+}
diff --git a/apps/web/src/components/files/FileBrowserPanel.tsx b/apps/web/src/components/files/FileBrowserPanel.tsx
index 5e4ce19335a1..dc3cfcef0137 100644
--- a/apps/web/src/components/files/FileBrowserPanel.tsx
+++ b/apps/web/src/components/files/FileBrowserPanel.tsx
@@ -19,6 +19,7 @@ import { useWorkspaceMutationRefresh } from "~/hooks/useWorkspaceMutationRefresh
 import { cn } from "~/lib/utils";
 import { readLocalApi } from "~/localApi";
 import { T3_PIERRE_ICONS } from "~/pierre-icons";
+import { PIERRE_TREE_UNSAFE_CSS, pierreTreeStyle } from "~/pierre-tree-theme";
 
 import { createFileTreeDragMentionController } from "./fileTreeDragMention";
 import { areAllDirectoriesExpanded, setAllDirectoriesExpanded } from "./fileTreeExpansion";
@@ -38,18 +39,6 @@ interface FileBrowserPanelProps {
   workspaceMutationId: string | null;
 }
 
-const TREE_UNSAFE_CSS = `
-  :host {
-    --trees-bg-override: transparent;
-    --trees-selected-bg-override: color-mix(in srgb, currentColor 12%, transparent);
-    --trees-hover-bg-override: color-mix(in srgb, currentColor 7%, transparent);
-    --trees-border-color-override: color-mix(in srgb, currentColor 14%, transparent);
-    --trees-font-family-override: var(--font-sans);
-    --trees-font-size-override: 12px;
-  }
-  button[data-type='item'] { border-radius: 5px; }
-`;
-
 function treePath(entry: ProjectEntry): string {
   return entry.kind === "directory" ? `${entry.path}/` : entry.path;
 }
@@ -255,7 +244,7 @@ export default function FileBrowserPanel({
     },
     paths: [],
     search: false,
-    unsafeCSS: TREE_UNSAFE_CSS,
+    unsafeCSS: PIERRE_TREE_UNSAFE_CSS,
   });
   const search = useFileTreeSearch(model);
   const allDirectoriesExpanded = useFileTreeSelector(model, (currentModel) =>
@@ -429,10 +418,7 @@ export default function FileBrowserPanel({
           model={model}
           aria-label={`${projectName} files`}
           className="min-h-0 flex-1 overflow-hidden"
-          style={{
-            colorScheme: resolvedTheme,
-            ["--trees-fg-override" as string]: "var(--contrast-foreground)",
-          }}
+          style={pierreTreeStyle(resolvedTheme)}
         />
       )}
     </div>
diff --git a/apps/web/src/components/media/MediaActions.tsx b/apps/web/src/components/media/MediaActions.tsx
index a67cadbca5a1..cf79c81b9f60 100644
--- a/apps/web/src/components/media/MediaActions.tsx
+++ b/apps/web/src/components/media/MediaActions.tsx
@@ -1,3 +1,4 @@
+import type { MediaActionId } from "@t3tools/client-runtime/media-actions";
 import {
   mediaReferenceFileName,
   type MediaReference,
@@ -68,8 +69,6 @@ export function useMediaActions(source: MediaActionSource) {
   return { save, copyImage };
 }
 
-type MediaAction = "copy-full" | "copy-relative" | "copy-url" | "save" | "copy-image" | "open-file";
-
 /** Adds source-aware actions and a tooltip to the existing media element without a layout wrapper. */
 export function MediaActions({
   source,
@@ -82,8 +81,6 @@ export function MediaActions({
   const [tooltipOpen, setTooltipOpen] = useState(false);
   const menuOpen = useRef(false);
   const reference = source.reference;
-  const hasActions =
-    source.kind === "image" || reference !== undefined || source.onOpenFile !== undefined;
   const tooltip = reference?.kind === "file" ? reference.path : (reference?.url ?? source.name);
 
   const showMenu = async (position: { x: number; y: number }) => {
@@ -94,28 +91,37 @@ export function MediaActions({
     let failureTitle = "Could not open media menu";
     let progressToast: ReturnType<typeof toastManager.add> | undefined;
     try {
-      const items: ContextMenuItem<MediaAction>[] = [];
+      const noun = source.kind === "image" ? "image" : "video";
+      const unavailable = source.src === null && source.asset === undefined;
+      const canCopyImage =
+        typeof navigator !== "undefined" &&
+        Boolean(navigator.clipboard?.write) &&
+        typeof ClipboardItem !== "undefined";
+      const items: ContextMenuItem<MediaActionId>[] = [];
       if (reference?.kind === "file") {
-        items.push({ id: "copy-full", label: "Copy full path" });
+        items.push({ id: "copy-full-path", label: "Copy full path" });
         if (reference.relativePath)
-          items.push({ id: "copy-relative", label: "Copy relative path" });
+          items.push({ id: "copy-relative-path", label: "Copy relative path" });
       } else if (reference?.kind === "url") {
         items.push({ id: "copy-url", label: "Copy URL" });
       }
+      if (source.onOpenFile) items.push({ id: "open-file", label: "Open in file viewer" });
+      items.push({ id: "save", label: `Save ${noun}`, disabled: unavailable });
       if (source.kind === "image") {
-        const unavailable = source.src === null && source.asset === undefined;
-        items.push({ id: "save", label: "Save image", disabled: unavailable });
-        items.push({ id: "copy-image", label: "Copy image", disabled: unavailable });
+        items.push({
+          id: "copy-image",
+          label: "Copy image",
+          disabled: unavailable || !canCopyImage,
+        });
       }
-      if (source.onOpenFile) items.push({ id: "open-file", label: "Open in file viewer" });
 
       const action = await api.contextMenu.show(items, position);
       if (!action) return;
       failureTitle = `Could not ${items.find((item) => item.id === action)?.label.toLowerCase() ?? "complete media action"}`;
       const text =
-        action === "copy-full" && reference?.kind === "file"
+        action === "copy-full-path" && reference?.kind === "file"
           ? reference.path
-          : action === "copy-relative" && reference?.kind === "file"
+          : action === "copy-relative-path" && reference?.kind === "file"
             ? reference.relativePath
             : action === "copy-url" && reference?.kind === "url"
               ? reference.url
@@ -131,7 +137,7 @@ export function MediaActions({
       } else if (action === "save" || action === "copy-image") {
         progressToast = toastManager.add({
           type: "loading",
-          title: action === "save" ? "Preparing image download…" : "Copying image…",
+          title: action === "save" ? `Preparing ${noun} download…` : "Copying image…",
         });
         await (action === "save" ? save() : copyImage());
         toastManager.update(progressToast, {
@@ -158,7 +164,7 @@ export function MediaActions({
         render={children}
         tabIndex={0}
         onContextMenu={(event) => {
-          if (!hasActions || event.defaultPrevented) return;
+          if (event.defaultPrevented) return;
           event.preventDefault();
           event.stopPropagation();
           const bounds = event.currentTarget.getBoundingClientRect();
@@ -170,7 +176,6 @@ export function MediaActions({
         }}
         onKeyDown={(event) => {
           if (
-            !hasActions ||
             event.defaultPrevented ||
             !(event.key === "ContextMenu" || (event.shiftKey && event.key === "F10"))
           )
diff --git a/apps/web/src/components/media/MediaVideoPlayer.tsx b/apps/web/src/components/media/MediaVideoPlayer.tsx
index 8f2d75680c14..f436beeb3855 100644
--- a/apps/web/src/components/media/MediaVideoPlayer.tsx
+++ b/apps/web/src/components/media/MediaVideoPlayer.tsx
@@ -1,4 +1,4 @@
-import { Maximize2Icon, RotateCwIcon, TriangleAlertIcon } from "lucide-react";
+import { RotateCwIcon, TriangleAlertIcon } from "lucide-react";
 import { useCallback, useEffect, useRef, useState, type CSSProperties } from "react";
 
 import { cn } from "../../lib/utils";
@@ -14,11 +14,13 @@ interface MediaVideoPlayerProps {
   readonly originalUrl?: string | undefined;
   readonly revision?: string | null | undefined;
   readonly preload?: "visible" | "metadata" | undefined;
+  readonly autoPlay?: boolean | undefined;
   readonly className?: string | undefined;
   readonly videoClassName?: string | undefined;
+  /** Styles the loading and failure panels, which otherwise assume an inline light surface. */
+  readonly stateClassName?: string | undefined;
   readonly style?: CSSProperties | undefined;
   readonly copyMarkdown?: string | undefined;
-  readonly onExpand?: ((src: string) => void) | undefined;
   readonly onRetry?: (() => Promise<void>) | undefined;
   readonly actionsSource?: MediaActionSource | undefined;
 }
@@ -31,11 +33,12 @@ export function MediaVideoPlayer({
   originalUrl,
   revision = null,
   preload = "visible",
+  autoPlay = false,
   className,
   videoClassName,
+  stateClassName,
   style,
   copyMarkdown,
-  onExpand,
   onRetry,
   actionsSource,
 }: MediaVideoPlayerProps) {
@@ -114,23 +117,6 @@ export function MediaVideoPlayer({
     }
   };
 
-  const expandButton =
-    onExpand && src !== null ? (
-      <Button
-        type="button"
-        variant="secondary"
-        size="icon-xs"
-        className={failed ? undefined : "absolute right-2 top-2"}
-        aria-label={`Expand ${label || "video"}`}
-        onClick={() => {
-          videoRef.current?.pause();
-          onExpand(latestSrc ?? src);
-        }}
-      >
-        <Maximize2Icon />
-      </Button>
-    ) : null;
-
   const player = (
     <span
       className={cn("relative inline-block align-middle", className)}
@@ -140,7 +126,10 @@ export function MediaVideoPlayer({
       {failed ? (
         <span
           role="alert"
-          className="flex min-h-28 flex-col items-center justify-center gap-3 rounded-lg border border-border/40 bg-muted/40 p-4 text-center text-sm text-muted-foreground"
+          className={cn(
+            "flex min-h-28 flex-col items-center justify-center gap-3 rounded-lg border border-border/40 bg-muted/40 p-4 text-center text-sm text-muted-foreground",
+            stateClassName,
+          )}
         >
           <span className="inline-flex items-center gap-1.5">
             <TriangleAlertIcon aria-hidden className="size-3.5 shrink-0" />
@@ -159,7 +148,6 @@ export function MediaVideoPlayer({
               </Button>
             ) : null}
             <OpenMediaLink originalUrl={originalUrl} src={latestSrc ?? src} fileName={label} />
-            {expandButton}
           </span>
         </span>
       ) : src !== null ? (
@@ -168,6 +156,7 @@ export function MediaVideoPlayer({
           ref={videoRef}
           src={src}
           aria-label={label || "Video preview"}
+          autoPlay={autoPlay}
           controls
           playsInline
           preload={preload === "metadata" || preloadedSrc === src ? "metadata" : "none"}
@@ -186,11 +175,10 @@ export function MediaVideoPlayer({
         <span
           role="status"
           aria-label="Loading video"
-          className="block aspect-video w-full rounded-lg bg-muted/60"
+          className={cn("block aspect-video w-full rounded-lg bg-muted/60", stateClassName)}
           style={style}
         />
       )}
-      {!failed && expandButton}
     </span>
   );
   return actionsSource ? <MediaActions source={actionsSource}>{player}</MediaActions> : player;
diff --git a/apps/web/src/components/preview/PreviewChromeRow.test.tsx b/apps/web/src/components/preview/PreviewChromeRow.test.tsx
deleted file mode 100644
index 143d38e67a27..000000000000
--- a/apps/web/src/components/preview/PreviewChromeRow.test.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { renderToStaticMarkup } from "react-dom/server";
-import { describe, expect, it, vi } from "vite-plus/test";
-
-import { PreviewChromeRow } from "./PreviewChromeRow";
-
-describe("PreviewChromeRow", () => {
-  it("shows the complete URL while the address bar is not focused", () => {
-    const markup = renderToStaticMarkup(
-      <PreviewChromeRow
-        url="https://example.com/dashboard?mode=edit&tab=1#notes"
-        loading={false}
-        canGoBack={false}
-        canGoForward={false}
-        refreshDisabled={false}
-        onBack={vi.fn()}
-        onForward={vi.fn()}
-        onRefresh={vi.fn()}
-        onSubmit={vi.fn()}
-      />,
-    );
-
-    expect(markup).toContain('value="https://example.com/dashboard?mode=edit&amp;tab=1#notes"');
-  });
-});
diff --git a/apps/web/src/components/preview/openTerminalLinkInPreview.test.ts b/apps/web/src/components/preview/openTerminalLinkInPreview.test.ts
index 9a5656d76a1c..46dd33f7beb4 100644
--- a/apps/web/src/components/preview/openTerminalLinkInPreview.test.ts
+++ b/apps/web/src/components/preview/openTerminalLinkInPreview.test.ts
@@ -1,11 +1,10 @@
-import type { LocalApi, PreviewSessionSnapshot, ScopedThreadRef } from "@t3tools/contracts";
+import type { PreviewSessionSnapshot, ScopedThreadRef } from "@t3tools/contracts";
 import * as Cause from "effect/Cause";
 import { AsyncResult } from "effect/unstable/reactivity";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vite-plus/test";
 
 import {
   openTerminalLinkInPreview,
-  TerminalLinkContextMenuShowError,
   TerminalLinkPreviewOpenError,
 } from "./openTerminalLinkInPreview";
 
@@ -30,6 +29,15 @@ vi.mock("~/browser/browserDefaults", () => ({
   browserDefaultOpenProfileId: (defaults: { profileId: string }) => defaults.profileId,
 }));
 
+const linkTargetMocks = vi.hoisted(() => ({
+  preference: vi.fn<() => "system" | "app">(),
+}));
+
+vi.mock("~/browser/browserLinkTarget", () => ({
+  resolveBrowserLinkTargetPreference: async () => linkTargetMocks.preference(),
+  isWebUrl: (url: string) => /^https?:/u.test(url),
+}));
+
 const hydratedDefaults = {
   viewport: { _tag: "fixed", width: 1280, height: 720 } as const,
   profileId: "work",
@@ -50,7 +58,9 @@ const snapshot: PreviewSessionSnapshot = {
 };
 
 beforeEach(() => {
+  browserDefaultsMocks.resolve.mockReset();
   browserDefaultsMocks.resolve.mockResolvedValue(hydratedDefaults);
+  linkTargetMocks.preference.mockReturnValue("app");
 });
 
 afterEach(() => {
@@ -58,6 +68,37 @@ afterEach(() => {
 });
 
 describe("openTerminalLinkInPreview", () => {
+  it("opens in the system browser while that is the configured target", async () => {
+    linkTargetMocks.preference.mockReturnValue("system");
+    const fallbackToBrowser = vi.fn();
+    const openPreview = vi.fn(async () => AsyncResult.success(snapshot));
+
+    await openTerminalLinkInPreview({
+      url: "http://localhost:3000/",
+      threadRef,
+      openPreview,
+      fallbackToBrowser,
+    });
+
+    expect(fallbackToBrowser).toHaveBeenCalledOnce();
+    expect(openPreview).not.toHaveBeenCalled();
+  });
+
+  it("opens public URLs in-app too, not only local servers", async () => {
+    const fallbackToBrowser = vi.fn();
+    const openPreview = vi.fn(async () => AsyncResult.success(snapshot));
+
+    await openTerminalLinkInPreview({
+      url: "https://example.com/docs",
+      threadRef,
+      openPreview,
+      fallbackToBrowser,
+    });
+
+    expect(openPreview).toHaveBeenCalledOnce();
+    expect(fallbackToBrowser).not.toHaveBeenCalled();
+  });
+
   it("waits for hydrated viewport and profile defaults before opening", async () => {
     let hydrate: ((defaults: typeof hydratedDefaults) => void) | undefined;
     browserDefaultsMocks.resolve.mockImplementationOnce(
@@ -70,14 +111,8 @@ describe("openTerminalLinkInPreview", () => {
 
     const opening = openTerminalLinkInPreview({
       url: "http://localhost:3000/",
-      position: { x: 12, y: 34 },
       threadRef,
       openPreview,
-      localApi: {
-        contextMenu: {
-          show: vi.fn(async () => "open-in-preview"),
-        },
-      } as unknown as LocalApi,
       fallbackToBrowser: vi.fn(),
     });
 
@@ -97,42 +132,6 @@ describe("openTerminalLinkInPreview", () => {
     });
   });
 
-  it("preserves context-menu failures with terminal link context before falling back", async () => {
-    const cause = new Error("menu unavailable");
-    const fallbackToBrowser = vi.fn();
-    const openPreview = vi.fn(async () => AsyncResult.success(snapshot));
-    const reportError = vi.spyOn(console, "error").mockImplementation(() => undefined);
-
-    await openTerminalLinkInPreview({
-      url: "http://localhost:3000/path?token=secret",
-      position: { x: 12, y: 34 },
-      threadRef,
-      openPreview,
-      localApi: {
-        contextMenu: {
-          show: vi.fn(async () => {
-            throw cause;
-          }),
-        },
-      } as unknown as LocalApi,
-      fallbackToBrowser,
-    });
-
-    expect(fallbackToBrowser).toHaveBeenCalledOnce();
-    expect(openPreview).not.toHaveBeenCalled();
-    expect(reportError).toHaveBeenCalledOnce();
-    const error = reportError.mock.calls[0]?.[0];
-    expect(error).toBeInstanceOf(TerminalLinkContextMenuShowError);
-    expect(error).toMatchObject({
-      environmentId: "local",
-      threadId: "thread-1",
-      targetOrigin: "http://localhost:3000",
-      cause,
-    });
-    expect(error.message).not.toContain("menu unavailable");
-    expect(error.targetOrigin).not.toContain("secret");
-  });
-
   it("preserves the complete preview failure cause before falling back", async () => {
     const rpcError = new Error("preview unavailable");
     const cause = Cause.combine(Cause.fail(rpcError), Cause.die("preview defect"));
@@ -141,14 +140,8 @@ describe("openTerminalLinkInPreview", () => {
 
     await openTerminalLinkInPreview({
       url: "http://127.0.0.1:5173/",
-      position: { x: 12, y: 34 },
       threadRef,
       openPreview: async () => AsyncResult.failure(cause),
-      localApi: {
-        contextMenu: {
-          show: vi.fn(async () => "open-in-preview"),
-        },
-      } as unknown as LocalApi,
       fallbackToBrowser,
     });
 
@@ -171,14 +164,8 @@ describe("openTerminalLinkInPreview", () => {
 
     await openTerminalLinkInPreview({
       url: "http://localhost:5173/",
-      position: { x: 12, y: 34 },
       threadRef,
       openPreview: async () => AsyncResult.failure(Cause.interrupt()),
-      localApi: {
-        contextMenu: {
-          show: vi.fn(async () => "open-in-preview"),
-        },
-      } as unknown as LocalApi,
       fallbackToBrowser,
     });
 
diff --git a/apps/web/src/components/preview/openTerminalLinkInPreview.ts b/apps/web/src/components/preview/openTerminalLinkInPreview.ts
index f5725fc2acfa..4a48403c7e54 100644
--- a/apps/web/src/components/preview/openTerminalLinkInPreview.ts
+++ b/apps/web/src/components/preview/openTerminalLinkInPreview.ts
@@ -1,6 +1,5 @@
-import type { LocalApi, ScopedThreadRef } from "@t3tools/contracts";
+import type { ScopedThreadRef } from "@t3tools/contracts";
 import { isAtomCommandInterrupted } from "@t3tools/client-runtime/state/runtime";
-import { isPreviewableUrl } from "@t3tools/shared/preview";
 import * as Schema from "effect/Schema";
 
 import {
@@ -8,6 +7,7 @@ import {
   browserDefaultOpenViewport,
   resolveBrowserDefaults,
 } from "~/browser/browserDefaults";
+import { isWebUrl, resolveBrowserLinkTargetPreference } from "~/browser/browserLinkTarget";
 import type { OpenPreviewMutation } from "~/browser/openFileInPreview";
 import { recordVisitForThread } from "~/browserHistoryStore";
 import { applyPreviewServerSnapshot, isPreviewSupportedInRuntime } from "~/previewStateStore";
@@ -20,15 +20,6 @@ const terminalLinkErrorContext = {
   cause: Schema.Defect(),
 };
 
-export class TerminalLinkContextMenuShowError extends Schema.TaggedErrorClass<TerminalLinkContextMenuShowError>()(
-  "TerminalLinkContextMenuShowError",
-  terminalLinkErrorContext,
-) {
-  override get message(): string {
-    return `Failed to show the context menu for terminal link ${this.targetOrigin}.`;
-  }
-}
-
 export class TerminalLinkPreviewOpenError extends Schema.TaggedErrorClass<TerminalLinkPreviewOpenError>()(
   "TerminalLinkPreviewOpenError",
   terminalLinkErrorContext,
@@ -40,20 +31,26 @@ export class TerminalLinkPreviewOpenError extends Schema.TaggedErrorClass<Termin
 
 interface OpenTerminalLinkInPreviewInput<E> {
   readonly url: string;
-  readonly position: { x: number; y: number };
   readonly threadRef: ScopedThreadRef;
   readonly openPreview: OpenPreviewMutation<E>;
-  readonly localApi: LocalApi;
   readonly fallbackToBrowser: () => void;
 }
 
+/**
+ * Opens a terminal hyperlink where the "Open links in" setting says. Terminal
+ * links are activated with the platform modifier already held, so unlike chat
+ * links the modifier cannot double as the system-browser override; the setting
+ * alone decides, and the system browser is the fallback whenever the in-app
+ * one cannot take the URL.
+ */
 export async function openTerminalLinkInPreview<E>(
   input: OpenTerminalLinkInPreviewInput<E>,
 ): Promise<void> {
   const supportsPreview =
-    isPreviewableUrl(input.url) &&
+    isWebUrl(input.url) &&
     isPreviewSupportedInRuntime() &&
-    input.threadRef.threadId.length > 0;
+    input.threadRef.threadId.length > 0 &&
+    (await resolveBrowserLinkTargetPreference()) === "app";
 
   if (!supportsPreview) {
     input.fallbackToBrowser();
@@ -66,59 +63,32 @@ export async function openTerminalLinkInPreview<E>(
     targetOrigin: new URL(input.url).origin,
   };
 
-  let choice: "open-in-preview" | "open-in-browser" | null;
-  try {
-    choice = await input.localApi.contextMenu.show(
-      [
-        { id: "open-in-preview", label: "Open in preview" },
-        { id: "open-in-browser", label: "Open in browser" },
-      ],
-      input.position,
-    );
-  } catch (cause) {
+  const defaults = await resolveBrowserDefaults();
+  const result = await input.openPreview({
+    environmentId: input.threadRef.environmentId,
+    input: {
+      threadId: input.threadRef.threadId,
+      url: input.url,
+      // Same reason as `openUrlInPreview`: this path handles its own result
+      // mapping, so the configured defaults are applied explicitly.
+      viewport: browserDefaultOpenViewport(defaults),
+      profileId: browserDefaultOpenProfileId(defaults),
+    },
+  });
+  if (result._tag === "Failure") {
+    if (isAtomCommandInterrupted(result)) {
+      return;
+    }
     console.error(
-      new TerminalLinkContextMenuShowError({
+      new TerminalLinkPreviewOpenError({
         ...errorContext,
-        cause,
+        cause: result.cause,
       }),
     );
     input.fallbackToBrowser();
     return;
   }
-
-  if (choice === "open-in-preview") {
-    const defaults = await resolveBrowserDefaults();
-    const result = await input.openPreview({
-      environmentId: input.threadRef.environmentId,
-      input: {
-        threadId: input.threadRef.threadId,
-        url: input.url,
-        // Same reason as `openUrlInPreview`: this path handles its own result
-        // mapping, so the configured defaults are applied explicitly.
-        viewport: browserDefaultOpenViewport(defaults),
-        profileId: browserDefaultOpenProfileId(defaults),
-      },
-    });
-    if (result._tag === "Failure") {
-      if (isAtomCommandInterrupted(result)) {
-        return;
-      }
-      console.error(
-        new TerminalLinkPreviewOpenError({
-          ...errorContext,
-          cause: result.cause,
-        }),
-      );
-      input.fallbackToBrowser();
-      return;
-    }
-    recordVisitForThread(input.threadRef, input.url);
-    applyPreviewServerSnapshot(input.threadRef, result.value);
-    useRightPanelStore.getState().openBrowser(input.threadRef, result.value.tabId);
-    return;
-  }
-
-  if (choice === "open-in-browser") {
-    input.fallbackToBrowser();
-  }
+  recordVisitForThread(input.threadRef, input.url);
+  applyPreviewServerSnapshot(input.threadRef, result.value);
+  useRightPanelStore.getState().openBrowser(input.threadRef, result.value.tabId);
 }
diff --git a/apps/web/src/components/pullRequest/PullRequestCandidatePicker.tsx b/apps/web/src/components/pullRequest/PullRequestCandidatePicker.tsx
new file mode 100644
index 000000000000..b42061628d1e
--- /dev/null
+++ b/apps/web/src/components/pullRequest/PullRequestCandidatePicker.tsx
@@ -0,0 +1,136 @@
+/**
+ * The menu shell the reviewer and label pickers share: an icon trigger, a search box, and a
+ * scrolling body that says when the list is loading, could not be read, is empty, or is not all
+ * of it. The rows and the words are the caller's; the frame is the same either way.
+ */
+import type { ReactNode } from "react";
+
+import { Button } from "../ui/button";
+import { Input } from "../ui/input";
+import { Menu, MenuItem, MenuPopup, MenuTrigger } from "../ui/menu";
+import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
+import { PullRequestPeopleGhost } from "./PullRequestGhosts";
+
+export function PullRequestCandidatePicker<T>({
+  icon,
+  label,
+  allowed,
+  disabledReason,
+  open,
+  onOpenChange,
+  query,
+  onQueryChange,
+  searchLabel,
+  isPending,
+  error,
+  candidates,
+  emptyLabel,
+  noMatchLabel,
+  errorLabel,
+  truncated,
+  truncatedLabel,
+  candidateKey,
+  disabled,
+  onSelect,
+  children,
+}: {
+  icon: ReactNode;
+  /** The trigger's accessible name; the button carries an icon alone. */
+  label: string;
+  /** False where the host would refuse this account's change. Disabled with the reason rather
+   * than hidden: a control that vanishes teaches nobody why. */
+  allowed: boolean;
+  disabledReason: string;
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+  query: string;
+  onQueryChange: (query: string) => void;
+  searchLabel: string;
+  isPending: boolean;
+  error: string | null;
+  /** Already narrowed by the query; the shell only decides which state to show. */
+  candidates: ReadonlyArray<T>;
+  emptyLabel: string;
+  noMatchLabel: string;
+  /** Leads the host's own message, which follows it in the same sentence. */
+  errorLabel: string;
+  /** The host has more than the read asked for, so a name missing here may still be askable. */
+  truncated: boolean;
+  truncatedLabel: string;
+  candidateKey: (candidate: T) => string;
+  /** Every row locks while one change is in flight, so a second press cannot race the first. */
+  disabled: boolean;
+  onSelect: (candidate: T) => void;
+  children: (candidate: T) => ReactNode;
+}) {
+  if (!allowed) {
+    return (
+      <Tooltip>
+        <TooltipTrigger
+          render={
+            <Button size="icon-xs" variant="ghost" disabled aria-label={label}>
+              {icon}
+            </Button>
+          }
+        />
+        <TooltipPopup side="bottom">{disabledReason}</TooltipPopup>
+      </Tooltip>
+    );
+  }
+
+  return (
+    <Menu open={open} onOpenChange={onOpenChange}>
+      <MenuTrigger
+        render={
+          <Button size="icon-xs" variant="ghost" aria-label={label}>
+            {icon}
+          </Button>
+        }
+      />
+      <MenuPopup align="start" side="bottom" className="w-72 p-0">
+        <div className="border-b border-border/60 p-2">
+          <Input
+            autoFocus
+            value={query}
+            onChange={(event) => onQueryChange(event.currentTarget.value)}
+            placeholder={searchLabel}
+            aria-label={searchLabel}
+            size="compact"
+          />
+        </div>
+        <div className="max-h-72 overflow-y-auto p-1">
+          {isPending ? (
+            <PullRequestPeopleGhost rows={4} />
+          ) : error !== null ? (
+            <p className="p-2 text-xs text-muted-foreground">
+              {errorLabel} {error}
+            </p>
+          ) : candidates.length === 0 ? (
+            <p className="p-2 text-xs text-muted-foreground">
+              {query.length > 0 ? noMatchLabel : emptyLabel}
+            </p>
+          ) : (
+            candidates.map((candidate) => (
+              // Stays open on press: a change is confirmed by the row's own check turning over,
+              // and a second label or reviewer is usually wanted right after the first.
+              <MenuItem
+                key={candidateKey(candidate)}
+                closeOnClick={false}
+                disabled={disabled}
+                onClick={() => onSelect(candidate)}
+                className="min-h-0 py-1.5 text-xs sm:min-h-0 sm:text-xs"
+              >
+                {children(candidate)}
+              </MenuItem>
+            ))
+          )}
+          {truncated ? (
+            // Typing filters what arrived; it does not ask the host again, so this says what the
+            // list is rather than offering a search that would find nothing further.
+            <p className="px-2 py-1.5 text-xs text-muted-foreground">{truncatedLabel}</p>
+          ) : null}
+        </div>
+      </MenuPopup>
+    </Menu>
+  );
+}
diff --git a/apps/web/src/components/pullRequest/PullRequestChecksPopover.tsx b/apps/web/src/components/pullRequest/PullRequestChecksPopover.tsx
index 300d3e3062e4..20100339ecbb 100644
--- a/apps/web/src/components/pullRequest/PullRequestChecksPopover.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestChecksPopover.tsx
@@ -3,15 +3,17 @@ import type {
   PullRequestCheck,
   PullRequestChecksState,
   PullRequestRef,
+  ScopedThreadRef,
 } from "@t3tools/contracts";
 
-import { readLocalApi } from "~/localApi";
+import { useOpenLink } from "~/browser/useOpenLink";
 import { cn } from "~/lib/utils";
 import { pullRequestEnvironment } from "~/state/pullRequests";
 import { useEnvironmentQuery } from "~/state/query";
 
 import { Popover, PopoverPopup, PopoverTrigger } from "../ui/popover";
 import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
+import { toastManager } from "../ui/toast";
 import {
   PullRequestCheckStatusIcon,
   pullRequestCheckStatusLabel,
@@ -27,9 +29,11 @@ import {
 function LazyChecksBody({
   environmentId,
   reference,
+  threadRef,
 }: {
   environmentId: EnvironmentId;
   reference: PullRequestRef;
+  threadRef: ScopedThreadRef | null;
 }) {
   const detailQuery = useEnvironmentQuery(
     pullRequestEnvironment.detail({ environmentId, input: reference }),
@@ -44,10 +48,17 @@ function LazyChecksBody({
       </p>
     );
   }
-  return <ChecksBody checks={detailQuery.data.checks} />;
+  return <ChecksBody checks={detailQuery.data.checks} threadRef={threadRef} />;
 }
 
-function ChecksBody({ checks }: { checks: ReadonlyArray<PullRequestCheck> }) {
+function ChecksBody({
+  checks,
+  threadRef,
+}: {
+  checks: ReadonlyArray<PullRequestCheck>;
+  threadRef: ScopedThreadRef | null;
+}) {
+  const openLink = useOpenLink(threadRef);
   if (checks.length === 0) {
     return <p className="text-muted-foreground text-xs">No checks reported</p>;
   }
@@ -71,7 +82,13 @@ function ChecksBody({ checks }: { checks: ReadonlyArray<PullRequestCheck> }) {
             <button
               type="button"
               className="shrink-0 text-primary hover:underline"
-              onClick={() => void readLocalApi()?.shell.openExternal(check.url ?? "")}
+              onClick={() => {
+                if (!check.url) return;
+                void openLink(check.url).catch((error: unknown) => {
+                  console.error(error);
+                  toastManager.add({ type: "error", title: "Unable to open check details" });
+                });
+              }}
             >
               Details
             </button>
@@ -94,6 +111,7 @@ export function PullRequestChecksPopover({
   checks,
   environmentId,
   reference,
+  threadRef = null,
   className,
 }: {
   checksState: PullRequestChecksState;
@@ -101,6 +119,8 @@ export function PullRequestChecksPopover({
   checks?: ReadonlyArray<PullRequestCheck>;
   environmentId?: EnvironmentId;
   reference?: PullRequestRef;
+  /** Thread the popover sits beside; a listing row has none. */
+  threadRef?: ScopedThreadRef | null;
   className?: string;
 }) {
   const presentation = pullRequestChecksStatePresentation(checksState);
@@ -129,9 +149,13 @@ export function PullRequestChecksPopover({
         <p className="mb-2 font-medium text-sm">{presentation.label}</p>
         {summary === null ? null : <p className="mb-2 text-muted-foreground text-xs">{summary}</p>}
         {checks !== undefined ? (
-          <ChecksBody checks={checks} />
+          <ChecksBody checks={checks} threadRef={threadRef} />
         ) : environmentId !== undefined && reference !== undefined ? (
-          <LazyChecksBody environmentId={environmentId} reference={reference} />
+          <LazyChecksBody
+            environmentId={environmentId}
+            reference={reference}
+            threadRef={threadRef}
+          />
         ) : null}
       </PopoverPopup>
     </Popover>
diff --git a/apps/web/src/components/pullRequest/PullRequestCodeTab.tsx b/apps/web/src/components/pullRequest/PullRequestCodeTab.tsx
index d9f1e7af716d..cc9bf0f61887 100644
--- a/apps/web/src/components/pullRequest/PullRequestCodeTab.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestCodeTab.tsx
@@ -1,5 +1,5 @@
 import type { CodeViewItem, DiffLineAnnotation, SelectedLineRange } from "@pierre/diffs";
-import type { CodeViewDiffItem } from "@pierre/diffs/react";
+import type { CodeViewDiffItem, CodeViewHandle } from "@pierre/diffs/react";
 import type {
   EnvironmentId,
   PullRequestDetailView,
@@ -16,6 +16,7 @@ import {
   ChevronsDownUpIcon,
   ChevronsUpDownIcon,
   Columns2Icon,
+  FolderTreeIcon,
   MessageSquareIcon,
   MessageSquareOffIcon,
   Rows3Icon,
@@ -24,9 +25,11 @@ import {
   XIcon,
 } from "lucide-react";
 import { useAtomRefresh } from "@effect/atom-react";
+import * as Schema from "effect/Schema";
 import { useCallback, useEffect, useMemo, useRef, useState, type ReactNode } from "react";
 
-import { useClientSettings } from "~/hooks/useSettings";
+import { useLocalStorage } from "~/hooks/useLocalStorage";
+import { useClientSettings, useUpdateClientSettings } from "~/hooks/useSettings";
 import { useTheme } from "~/hooks/useTheme";
 import { areAllDiffFilesCollapsed } from "~/lib/diffCollapse";
 import { pullRequestFindingKey, type PullRequestFinding } from "./pullRequestDetail.logic";
@@ -57,6 +60,8 @@ import { useAtomCommand } from "~/state/use-atom-command";
 import { DiffPanelLoadingState } from "../DiffPanelShell";
 import { DiffWorkerPoolProvider } from "../DiffWorkerPoolProvider";
 import { DiffCommentAnnotation } from "../diffs/DiffCommentAnnotation";
+import { DiffFileTree } from "../diffs/DiffFileTree";
+import { diffFileTreeEntries } from "../diffs/diffFileTree.logic";
 import { StyledDiffCodeView } from "../diffs/StyledDiffCodeView";
 import { Button } from "../ui/button";
 import { Collapsible, CollapsiblePanel, CollapsibleTrigger } from "../ui/collapsible";
@@ -97,6 +102,8 @@ type ReviewAnnotation = DiffLineAnnotation<ReviewAnnotationGroup>;
 /** Commits per press of "Show more" in the scope menu. */
 const COMMIT_PAGE_SIZE = 10;
 
+const PULL_REQUEST_FILE_TREE_STORAGE_KEY = "t3code.pullRequestFileTreeOpen";
+
 /** One answer from the host: a whole number of files, and where the next one carries on. */
 interface DiffSlice {
   /** What was asked for, null being the first slice. Identifies the slice among the loaded ones. */
@@ -217,8 +224,14 @@ export function PullRequestCodeTab({
   const [visibleCommitCount, setVisibleCommitCount] = useState(COMMIT_PAGE_SIZE);
   /** Set once the reader has asked for every file at once, until they pick a file apart again. */
   const [foldOverride, setFoldOverride] = useState<DiffFoldOverride>(null);
-  const [diffRenderMode, setDiffRenderMode] = useState<"stacked" | "split">("stacked");
+  const diffLayout = settings.diffLayout;
+  const updateClientSettings = useUpdateClientSettings();
   const [wordWrap, setWordWrap] = useState(settings.wordWrap);
+  const [fileTreeOpen, setFileTreeOpen] = useLocalStorage(
+    PULL_REQUEST_FILE_TREE_STORAGE_KEY,
+    false,
+    Schema.Boolean,
+  );
   const [selectedLines, setSelectedLines] = useState<{
     id: string;
     range: SelectedLineRange;
@@ -237,6 +250,7 @@ export function PullRequestCodeTab({
     readonly slices: ReadonlyArray<DiffSlice>;
   }>({ key: "", cursor: null, slices: NO_SLICES });
   const parseCache = useRef(new Map<string, RenderablePatch>());
+  const viewerRef = useRef<CodeViewHandle<ReviewAnnotationGroup> | null>(null);
 
   const referenceKey = pullRequestReviewKey(reference);
   const commit = selectedCommitOid;
@@ -543,34 +557,35 @@ export function PullRequestCodeTab({
     [items],
   );
   const allFilesCollapsed = areAllDiffFilesCollapsed(fileKeys, collapsedFileKeys);
+  const fileTreeEntries = useMemo(() => diffFileTreeEntries(files), [files]);
+
+  // A failed slice must not be asked for again on its own. The files already loaded keep the
+  // sentinel on screen, so re-arming it after a failure would request the same slice forever.
+  const canLoadNextSlice =
+    nextCursor !== null &&
+    nextCursor !== cursor &&
+    !diffQuery.isPending &&
+    diffQuery.error === null;
+  const loadNextSlice = useCallback(() => {
+    if (nextCursor === null) return;
+    setSliceState((previous) => ({ ...previous, cursor: nextCursor }));
+  }, [nextCursor]);
 
   // The sentinel is held as state rather than a ref because the viewer mounts its own footer:
   // an effect reading a ref could run before that node exists and would never arm the observer.
   const [sentinel, setSentinel] = useState<HTMLDivElement | null>(null);
   useEffect(() => {
-    // A failed slice must stop the observer. The files already loaded keep the sentinel on
-    // screen, so re-arming it after a failure would ask for the same slice again, forever.
-    if (
-      sentinel === null ||
-      nextCursor === null ||
-      nextCursor === cursor ||
-      diffQuery.isPending ||
-      diffQuery.error !== null
-    ) {
-      return;
-    }
+    if (sentinel === null || !canLoadNextSlice) return;
     const observer = new IntersectionObserver(
       (observed) => {
-        if (observed.some((entry) => entry.isIntersecting)) {
-          setSliceState((previous) => ({ ...previous, cursor: nextCursor }));
-        }
+        if (observed.some((entry) => entry.isIntersecting)) loadNextSlice();
       },
       // Start the next slice slightly before the sentinel is on screen.
       { rootMargin: "240px" },
     );
     observer.observe(sentinel);
     return () => observer.disconnect();
-  }, [cursor, diffQuery.error, diffQuery.isPending, nextCursor, sentinel]);
+  }, [canLoadNextSlice, loadNextSlice, sentinel]);
 
   // A stable identity: the viewer's SlotPortals memoizes each file's header/annotation portal on
   // these render props, so a fresh function here would recreate every visible file's portal on
@@ -588,6 +603,23 @@ export function PullRequestCodeTab({
     [],
   );
 
+  // Held as state so the scroll runs after a folded file has been drawn open; scrolling in the
+  // same tick would land on the folded header's position.
+  const [treeReveal, setTreeReveal] = useState<{ fileKey: string; id: number } | null>(null);
+  useEffect(() => {
+    if (treeReveal === null) return;
+    viewerRef.current?.scrollTo({ type: "item", id: treeReveal.fileKey, align: "start" });
+  }, [treeReveal]);
+  const revealFile = useCallback(
+    (path: string) => {
+      const item = items.find((candidate) => resolveFileDiffPath(candidate.fileDiff) === path);
+      if (item === undefined) return;
+      if (item.collapsed === true) toggleFile(item.id);
+      setTreeReveal((current) => ({ fileKey: item.id, id: (current?.id ?? 0) + 1 }));
+    },
+    [items, toggleFile],
+  );
+
   const toggleAllFiles = () => {
     // Held as an override of the default rather than as the file keys on screen: a diff that is
     // still paging would otherwise bring its next slice in folded, moments after the reader
@@ -740,7 +772,7 @@ export function PullRequestCodeTab({
 
   const diffViewOptions = useMemo(
     () => ({
-      diffStyle: diffRenderMode === "split" ? ("split" as const) : ("unified" as const),
+      diffStyle: diffLayout === "split" ? ("split" as const) : ("unified" as const),
       lineDiffType: "none" as const,
       overflow: wordWrap ? ("wrap" as const) : ("scroll" as const),
       theme: resolveDiffThemeName(resolvedTheme),
@@ -757,15 +789,7 @@ export function PullRequestCodeTab({
       onGutterUtilityClick: beginComment,
       onLineSelectionEnd: beginComment,
     }),
-    [
-      diffRenderMode,
-      wordWrap,
-      resolvedTheme,
-      loadDiffFiles,
-      canCommentOnLines,
-      draft,
-      beginComment,
-    ],
+    [diffLayout, wordWrap, resolvedTheme, loadDiffFiles, canCommentOnLines, draft, beginComment],
   );
 
   const runThreadCommand = useCallback(
@@ -1122,11 +1146,11 @@ export function PullRequestCodeTab({
         <ToggleGroup
           className="shrink-0 gap-1"
           size="sm"
-          value={[diffRenderMode]}
+          value={[diffLayout]}
           onValueChange={(value) => {
             const next = value[0];
             if (next === "stacked" || next === "split") {
-              setDiffRenderMode(next);
+              updateClientSettings({ diffLayout: next });
             }
           }}
         >
@@ -1157,6 +1181,26 @@ export function PullRequestCodeTab({
             {wordWrap ? "Disable line wrapping" : "Enable line wrapping"}
           </TooltipPopup>
         </Tooltip>
+        {fileKeys.length > 0 ? (
+          <Tooltip>
+            <TooltipTrigger
+              render={
+                <Toggle
+                  aria-label={fileTreeOpen ? "Hide file tree" : "Show file tree"}
+                  variant="ghost"
+                  size="sm"
+                  pressed={fileTreeOpen}
+                  onPressedChange={(pressed) => setFileTreeOpen(Boolean(pressed))}
+                />
+              }
+            >
+              <FolderTreeIcon className="size-3.5" />
+            </TooltipTrigger>
+            <TooltipPopup side="top">
+              {fileTreeOpen ? "Hide file tree" : "Show file tree"}
+            </TooltipPopup>
+          </Tooltip>
+        ) : null}
       </div>
     </div>
   );
@@ -1312,58 +1356,94 @@ export function PullRequestCodeTab({
             </CollapsiblePanel>
           </Collapsible>
         ) : null}
-        {/* Relative wrapper so the review overlay floats over the diff rather than pushing it
+        <div className="flex min-h-0 flex-1 overflow-hidden">
+          {/* Relative wrapper so the review overlay floats over the diff rather than pushing it
             up; the viewer inside still owns its own scrolling. */}
-        <div
-          className="relative min-h-0 flex-1"
-          // The chevron answers this too, but the whole header row is the target a reader
-          // actually aims for. The header lives in the viewer's shadow tree, so the capture
-          // listener walks `composedPath` — the only way to see through the shadow boundary.
-          onClickCapture={(event) => {
-            const composedPath = event.nativeEvent.composedPath?.() ?? [];
-            for (const node of composedPath) {
-              if (!(node instanceof HTMLElement)) continue;
-              // A control inside the header — the collapse chevron — handles itself, and
-              // this capture listener fires before its own click does. Leave it alone or
-              // the two toggles cancel out.
-              if (node instanceof HTMLButtonElement || node instanceof HTMLAnchorElement) {
-                return;
-              }
-              if (node.hasAttribute("data-diffs-header")) {
-                const filePath = node.querySelector("[data-title]")?.textContent?.trim();
-                if (filePath === undefined || filePath === "") return;
-                const item = items.find(
-                  (candidate) => resolveFileDiffPath(candidate.fileDiff) === filePath,
-                );
-                if (item !== undefined) toggleFile(item.id);
-                return;
+          <div
+            className="relative min-h-0 min-w-0 flex-1"
+            // The chevron answers this too, but the whole header row is the target a reader
+            // actually aims for. The header lives in the viewer's shadow tree, so the capture
+            // listener walks `composedPath` — the only way to see through the shadow boundary.
+            onClickCapture={(event) => {
+              const composedPath = event.nativeEvent.composedPath?.() ?? [];
+              for (const node of composedPath) {
+                if (!(node instanceof HTMLElement)) continue;
+                // A control inside the header — the collapse chevron — handles itself, and
+                // this capture listener fires before its own click does. Leave it alone or
+                // the two toggles cancel out.
+                if (node instanceof HTMLButtonElement || node instanceof HTMLAnchorElement) {
+                  return;
+                }
+                if (node.hasAttribute("data-diffs-header")) {
+                  const filePath = node.querySelector("[data-title]")?.textContent?.trim();
+                  if (filePath === undefined || filePath === "") return;
+                  const item = items.find(
+                    (candidate) => resolveFileDiffPath(candidate.fileDiff) === filePath,
+                  );
+                  if (item !== undefined) toggleFile(item.id);
+                  return;
+                }
               }
-            }
-          }}
-        >
-          {/* The viewer virtualizes against the element it is told is scrolling and places its
+            }}
+          >
+            {/* The viewer virtualizes against the element it is told is scrolling and places its
               rows absolutely, so it has to own that element — the thread diff panel hands it the
               same one. Scrolling from a parent instead leaves it painting over its neighbours. */}
-          <StyledDiffCodeView<ReviewAnnotationGroup>
-            // Keep scrollbar space stable so file metadata and line numbers do not shift as a
-            // diff crosses the overflow boundary. The viewer is itself focusable for keyboard
-            // interaction, but its native host outline clips and competes with the focus
-            // indicators on its actual controls.
-            className="h-full overflow-auto [scrollbar-gutter:stable]"
-            items={items}
-            selectedLines={selectedLines}
-            onSelectedLinesChange={setSelectedLines}
-            options={diffViewOptions}
-            // The viewer owns the scroll container, so the sentinel that asks for the next slice
-            // has to live inside it — at the end of the files, where reaching it means the reader
-            // is running out of diff.
-            renderCodeViewFooter={renderCodeViewFooter}
-            renderHeaderPrefix={renderHeaderPrefix}
-            renderHeaderMetadata={renderHeaderMetadata}
-            renderAnnotation={renderAnnotation}
-            unsafeCSSExtra={REPLACE_FILE_COUNTS_CSS}
-          />
-          {reviewOverlay}
+            <StyledDiffCodeView<ReviewAnnotationGroup>
+              // Keep scrollbar space stable so file metadata and line numbers do not shift as a
+              // diff crosses the overflow boundary. The viewer is itself focusable for keyboard
+              // interaction, but its native host outline clips and competes with the focus
+              // indicators on its actual controls.
+              className="h-full overflow-auto [scrollbar-gutter:stable]"
+              viewerRef={viewerRef}
+              items={items}
+              selectedLines={selectedLines}
+              onSelectedLinesChange={setSelectedLines}
+              options={diffViewOptions}
+              // The viewer owns the scroll container, so the sentinel that asks for the next slice
+              // has to live inside it — at the end of the files, where reaching it means the reader
+              // is running out of diff.
+              renderCodeViewFooter={renderCodeViewFooter}
+              renderHeaderPrefix={renderHeaderPrefix}
+              renderHeaderMetadata={renderHeaderMetadata}
+              renderAnnotation={renderAnnotation}
+              unsafeCSSExtra={REPLACE_FILE_COUNTS_CSS}
+            />
+            {reviewOverlay}
+          </div>
+          {fileTreeOpen ? (
+            <aside className="flex w-[min(20rem,40%)] min-w-48 shrink-0 border-l border-border/60">
+              <DiffFileTree
+                ariaLabel={`Pull request #${detail.number} files`}
+                entries={fileTreeEntries}
+                onSelectFile={revealFile}
+                // The tree lists only what has arrived; a footer says so while the diff is still
+                // paging, and lets the reader pull the rest in without scrolling for it.
+                footer={
+                  nextCursor === null ? null : (
+                    <div className="shrink-0 border-t border-border/60 p-2">
+                      <Button
+                        type="button"
+                        size="xs"
+                        variant="outline"
+                        className="w-full"
+                        disabled={diffQuery.isPending}
+                        onClick={
+                          diffQuery.error !== null ? () => diffQuery.refresh() : loadNextSlice
+                        }
+                      >
+                        {diffQuery.error !== null
+                          ? "Retry"
+                          : diffQuery.isPending
+                            ? "Loading more files..."
+                            : "Load more files"}
+                      </Button>
+                    </div>
+                  )
+                }
+              />
+            </aside>
+          ) : null}
         </div>
         {unstructured}
       </div>
diff --git a/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx b/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx
index a109b1614382..59aa1333896b 100644
--- a/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx
@@ -1,13 +1,14 @@
 import { scopedThreadKey, scopeProjectRef } from "@t3tools/client-runtime/environment";
 import { squashAtomCommandFailure } from "@t3tools/client-runtime/state/runtime";
-import type {
-  EnvironmentId,
-  PullRequestAction,
-  PullRequestMergeMethod,
-  PullRequestUpdateMethod,
-  PullRequestRef,
-  PullRequestState,
-  ScopedThreadRef,
+import {
+  type EnvironmentId,
+  type PullRequestAction,
+  type PullRequestMergeMethod,
+  type PullRequestUpdateMethod,
+  type PullRequestRef,
+  type PullRequestState,
+  resolveEnvironmentMachineKind,
+  type ScopedThreadRef,
 } from "@t3tools/contracts";
 import {
   ArrowDownUpIcon,
@@ -36,7 +37,6 @@ import {
   PlayIcon,
   RefreshCwIcon,
   RotateCcwIcon,
-  ServerIcon,
   TriangleAlertIcon,
 } from "lucide-react";
 import {
@@ -63,7 +63,7 @@ import { useProjects } from "~/state/entities";
 import { useEnvironments } from "~/state/environments";
 import { useEnvironmentQuery } from "~/state/query";
 import { useLiveRefresh } from "~/hooks/useLiveRefresh";
-import { pullRequestEnvironment } from "~/state/pullRequests";
+import { pullRequestEnvironment, useSharedPullRequestSummary } from "~/state/pullRequests";
 import { useAtomCommand } from "~/state/use-atom-command";
 import { vcsEnvironment } from "~/state/vcs";
 import { formatRelativeTimeLabel } from "~/timestampFormat";
@@ -77,6 +77,7 @@ import {
   AlertDialogPopup,
   AlertDialogTitle,
 } from "../ui/alert-dialog";
+import { EnvironmentMachineIcon } from "../EnvironmentMachineIcon";
 import { Badge } from "../ui/badge";
 import { Button } from "../ui/button";
 import { Input } from "../ui/input";
@@ -120,10 +121,13 @@ import {
   pullRequestFindingKey,
   pullRequestHandoffLabels,
   readableFailure,
+  readPullRequestDetailSnapshot,
+  resolveDisplayedPullRequestDetail,
   resolvePullRequestPrimaryControl,
   resolveBaseFreshness,
   type PullRequestFinding,
   shouldRefreshPullRequestActivity,
+  writePullRequestDetailSnapshot,
 } from "./pullRequestDetail.logic";
 import { canEditPullRequestChangeRequest } from "./pullRequestEditing.logic";
 import {
@@ -269,7 +273,10 @@ function ActOnEnvironmentPicker({
             {/* The radio item lays its children out as one block, so the icon and the label
                 need their own row to share a line. */}
             <span className="flex min-w-0 items-center gap-2">
-              <ServerIcon className="size-3.5 shrink-0" />
+              <EnvironmentMachineIcon
+                kind={environment.machine ?? "server"}
+                className="size-3.5 shrink-0"
+              />
               <span className="truncate">{environment.label}</span>
             </span>
           </MenuRadioItem>
@@ -438,6 +445,7 @@ function PullRequestBaseFreshnessWarning({
 
 export function PullRequestDetailPanel({
   environmentId,
+  threadRef = null,
   reference,
   refreshToken: forcedRefreshToken = 0,
   onActed,
@@ -447,6 +455,13 @@ export function PullRequestDetailPanel({
   composerDraftTarget,
 }: {
   environmentId: EnvironmentId;
+  /**
+   * The thread this panel sits beside, if any. Links that are not the pull
+   * request itself (check details, host permalinks) can open in that thread's
+   * in-app browser when the user has asked for it; the page has no thread, so
+   * there they always go to the system browser.
+   */
+  threadRef?: ScopedThreadRef | null;
   reference: PullRequestRef;
   /**
    * Bumped by whatever holds the panel when a reader asks for everything on screen to be read
@@ -461,14 +476,8 @@ export function PullRequestDetailPanel({
   onActed?: () => void;
   /** Page-owned detail columns use this to clear the selected pull request. */
   onClose?: () => void;
-  /** Keeps surrounding thread state in step with refreshed host state. */
-  onStateChange?: (status: {
-    projectId: string;
-    repository: string;
-    number: number;
-    state: PullRequestState;
-    isDraft: boolean;
-  }) => void;
+  /** Keeps surrounding inferred thread state in step with refreshed host state. */
+  onStateChange?: (status: { repository: string; number: number; state: PullRequestState }) => void;
   /**
    * Beside a thread, the checkout affordance disappears: the panel is showing that thread's
    * own pull request, so the branch is already under the reader's feet — and checking it out
@@ -558,7 +567,52 @@ export function PullRequestDetailPanel({
   const activityQuery = useEnvironmentQuery(
     pullRequestEnvironment.activity({ environmentId, input: reference }),
   );
-  const coreDetail = detailQuery.data;
+  const [cachedDetail, setCachedDetail] = useState(() =>
+    readPullRequestDetailSnapshot(
+      typeof window === "undefined" ? undefined : window.localStorage,
+      environmentId,
+      reference,
+    ),
+  );
+  useEffect(() => {
+    setCachedDetail(
+      readPullRequestDetailSnapshot(
+        typeof window === "undefined" ? undefined : window.localStorage,
+        environmentId,
+        reference,
+      ),
+    );
+  }, [environmentId, pullRequestKey, reference.projectId, reference.repository, reference.number]);
+  useEffect(() => {
+    if (detailQuery.data === null) return;
+    writePullRequestDetailSnapshot(
+      typeof window === "undefined" ? undefined : window.localStorage,
+      environmentId,
+      reference,
+      detailQuery.data,
+    );
+    setCachedDetail(detailQuery.data);
+  }, [
+    detailQuery.data,
+    environmentId,
+    pullRequestKey,
+    reference.projectId,
+    reference.repository,
+    reference.number,
+  ]);
+  const resolvedCoreDetail = resolveDisplayedPullRequestDetail({
+    live: detailQuery.data,
+    cached: cachedDetail,
+    reference,
+  });
+  const sharedSummary = useSharedPullRequestSummary(environmentId, reference, resolvedCoreDetail);
+  const coreDetail = useMemo(
+    () =>
+      resolvedCoreDetail === null || sharedSummary === null || sharedSummary === resolvedCoreDetail
+        ? resolvedCoreDetail
+        : { ...resolvedCoreDetail, ...sharedSummary },
+    [resolvedCoreDetail, sharedSummary],
+  );
   const activity = activityQuery.data;
   const detail = useMemo(
     () =>
@@ -622,16 +676,14 @@ export function PullRequestDetailPanel({
     }
     activityRevision.current = next;
   }, [activityQuery.refresh, coreDetail, pullRequestKey]);
-  useEffect(() => {
-    if (!detail) return;
+  useLayoutEffect(() => {
+    if (!resolvedCoreDetail) return;
     onStateChange?.({
-      projectId: detail.projectId,
-      repository: detail.repository,
-      number: detail.number,
-      state: detail.state,
-      isDraft: detail.isDraft,
+      repository: resolvedCoreDetail.repository,
+      number: resolvedCoreDetail.number,
+      state: resolvedCoreDetail.state,
     });
-  }, [detail, onStateChange]);
+  }, [onStateChange, resolvedCoreDetail]);
   // Core detail is cheap enough to re-read while this stays open. Activity is heavier, so the
   // revision effect above reads it only after this same pull request reports a change. Keyed by
   // the pull request rather than by the panel, because this one panel shows a different pull
@@ -689,7 +741,11 @@ export function PullRequestDetailPanel({
         ? resolvePickableEnvironments(
             { environmentId, projectId: reference.projectId },
             projects,
-            environments,
+            environments.map((environment) => ({
+              environmentId: environment.environmentId,
+              label: environment.label,
+              machine: resolveEnvironmentMachineKind(environment.serverConfig),
+            })),
           )
         : [],
     [context, environmentId, environments, projects, reference.projectId],
@@ -1240,14 +1296,16 @@ export function PullRequestDetailPanel({
         ).length
       : 0;
 
+  // A reopen already has last time's title, author, and counts. Keep them on screen
+  // and let the live read replace fields — especially the diff counts — in place.
   if (detailQuery.isPending && !detail) {
     return <PullRequestDetailGhost />;
   }
 
   return (
     <div className="flex h-full min-h-0 w-full flex-col bg-background">
-      <div className="grid shrink-0 grid-cols-[minmax(0,1fr)_auto] items-start gap-x-2 border-b border-border/60">
-        <div className="ml-4 grid h-7 min-w-0 items-center">
+      <div className="@container/pr-header grid min-w-0 shrink-0 grid-cols-[minmax(0,1fr)_auto] items-start gap-x-2 border-b border-border/60">
+        <div className="ml-4 grid h-7 min-w-0 items-center overflow-hidden">
           <div
             aria-hidden={condensed}
             inert={condensed}
@@ -1352,7 +1410,7 @@ export function PullRequestDetailPanel({
             ) : null}
           </div>
         </div>
-        <div className="mr-4 flex h-7 min-w-0 flex-nowrap items-center justify-end gap-1">
+        <div className="mr-4 flex h-7 shrink-0 items-center justify-end gap-1">
           {detail ? (
             <>
               {/* Checking a pull request out is the reason to open one here at all, so it is a
@@ -1365,9 +1423,17 @@ export function PullRequestDetailPanel({
                   <MenuTrigger
                     disabled={handoff !== null}
                     render={
-                      <Button size="xs" variant="outline">
+                      <Button
+                        size="xs"
+                        variant="outline"
+                        aria-label={
+                          handoff?.startsWith("checkout") ? "Checking out..." : "Check out"
+                        }
+                      >
                         <GitBranchIcon aria-hidden className="size-3.5" />
-                        {handoff?.startsWith("checkout") ? "Checking out..." : "Check out"}
+                        <span className="@max-[35rem]/pr-header:hidden">
+                          {handoff?.startsWith("checkout") ? "Checking out..." : "Check out"}
+                        </span>
                         <ChevronDownIcon aria-hidden className="size-3.5 text-muted-foreground" />
                       </Button>
                     }
@@ -1403,17 +1469,39 @@ export function PullRequestDetailPanel({
                 </Menu>
               ) : null}
               {workflowApprovalsRequired > 0 && can("approve-workflows") ? (
-                <Button
-                  size="xs"
-                  variant="warning-outline"
-                  disabled={actionPending}
-                  onClick={() => setConfirmation({ open: true, action: "approve-workflows" })}
-                >
-                  <PlayIcon className="size-3.5" />
-                  {pendingAction === "approve-workflows"
-                    ? "Approving..."
-                    : "Approve workflows to run"}
-                </Button>
+                <Tooltip>
+                  <TooltipTrigger
+                    render={
+                      <span className="inline-flex shrink-0">
+                        <Button
+                          size="xs"
+                          variant="warning-outline"
+                          disabled={actionPending}
+                          onClick={() =>
+                            setConfirmation({ open: true, action: "approve-workflows" })
+                          }
+                          aria-label={
+                            pendingAction === "approve-workflows"
+                              ? "Approving..."
+                              : "Approve workflows to run"
+                          }
+                        >
+                          <PlayIcon aria-hidden className="size-3.5" />
+                          <span className="@max-[40rem]/pr-header:hidden">
+                            {pendingAction === "approve-workflows"
+                              ? "Approving..."
+                              : "Approve workflows to run"}
+                          </span>
+                        </Button>
+                      </span>
+                    }
+                  />
+                  <TooltipPopup side="top">
+                    {pendingAction === "approve-workflows"
+                      ? "Approving..."
+                      : "Approve workflows to run"}
+                  </TooltipPopup>
+                </Tooltip>
               ) : null}
               {/* Said where the Merge button is, because it is the answer to why nobody has
                   pressed it: the merge is already asked for, and the host is holding it. */}
@@ -1421,62 +1509,150 @@ export function PullRequestDetailPanel({
                 <Tooltip>
                   <TooltipTrigger
                     render={
-                      <Badge size="control" variant="info">
+                      <Badge
+                        size="control"
+                        variant="info"
+                        role="img"
+                        aria-label={armedAutoMergeLabel}
+                      >
                         <GitMergeIcon aria-hidden className="size-3.5" />
-                        {armedAutoMergeLabel}
+                        <span className="@max-[30rem]/pr-header:hidden">{armedAutoMergeLabel}</span>
                       </Badge>
                     }
                   />
                   <TooltipPopup side="top">
-                    The host will merge this on its own once its requirements are met
+                    {armedAutoMergeLabel}: the host will merge this on its own once its requirements
+                    are met
                   </TooltipPopup>
                 </Tooltip>
               ) : null}
               {primaryAction === "resolve" ? (
-                <Button
-                  size="xs"
-                  variant="destructive-outline"
-                  disabled={handoff !== null}
-                  onClick={startResolveConflicts}
-                >
-                  <TriangleAlertIcon className="size-3.5" />
-                  {handoff === "conflicts" ? "Preparing..." : "Resolve conflicts"}
-                </Button>
+                <Tooltip>
+                  <TooltipTrigger
+                    render={
+                      <span className="inline-flex shrink-0">
+                        <Button
+                          size="xs"
+                          variant="destructive-outline"
+                          disabled={handoff !== null}
+                          onClick={startResolveConflicts}
+                          aria-label={
+                            handoff === "conflicts" ? "Preparing..." : "Resolve conflicts"
+                          }
+                        >
+                          <TriangleAlertIcon aria-hidden className="size-3.5" />
+                          <span className="@max-[30rem]/pr-header:hidden">
+                            {handoff === "conflicts" ? "Preparing..." : "Resolve conflicts"}
+                          </span>
+                        </Button>
+                      </span>
+                    }
+                  />
+                  <TooltipPopup side="top">
+                    {handoff === "conflicts" ? "Preparing..." : "Resolve conflicts"}
+                  </TooltipPopup>
+                </Tooltip>
               ) : primaryAction === "ready" ? (
-                <Button size="xs" disabled={actionPending} onClick={() => void perform("ready")}>
-                  Ready for review
-                </Button>
+                <Tooltip>
+                  <TooltipTrigger
+                    render={
+                      <span className="inline-flex shrink-0">
+                        <Button
+                          size="xs"
+                          disabled={actionPending}
+                          onClick={() => void perform("ready")}
+                          aria-label="Ready for review"
+                        >
+                          <GitPullRequestIcon
+                            aria-hidden
+                            className="hidden size-3.5 @max-[30rem]/pr-header:inline"
+                          />
+                          <span className="@max-[30rem]/pr-header:hidden">Ready for review</span>
+                        </Button>
+                      </span>
+                    }
+                  />
+                  <TooltipPopup side="top">Ready for review</TooltipPopup>
+                </Tooltip>
               ) : primaryAction === "enable-auto-merge" ? (
-                <Button
-                  size="xs"
-                  disabled={actionPending}
-                  onClick={() => setConfirmation({ open: true, action: "enable-auto-merge" })}
-                >
-                  <GitMergeIcon className="size-3.5" />
-                  {pendingAction === "enable-auto-merge" ? "Enabling..." : pendingAutoMergeLabel}
-                </Button>
+                <Tooltip>
+                  <TooltipTrigger
+                    render={
+                      <span className="inline-flex shrink-0">
+                        <Button
+                          size="xs"
+                          disabled={actionPending}
+                          onClick={() =>
+                            setConfirmation({ open: true, action: "enable-auto-merge" })
+                          }
+                          aria-label={
+                            pendingAction === "enable-auto-merge"
+                              ? "Enabling..."
+                              : pendingAutoMergeLabel
+                          }
+                        >
+                          <GitMergeIcon aria-hidden className="size-3.5" />
+                          <span className="@max-[30rem]/pr-header:hidden">
+                            {pendingAction === "enable-auto-merge"
+                              ? "Enabling..."
+                              : pendingAutoMergeLabel}
+                          </span>
+                        </Button>
+                      </span>
+                    }
+                  />
+                  <TooltipPopup side="top">
+                    {pendingAction === "enable-auto-merge" ? "Enabling..." : pendingAutoMergeLabel}
+                  </TooltipPopup>
+                </Tooltip>
               ) : primaryAction === "auto-merge-armed" ? (
                 <Tooltip>
                   <TooltipTrigger
                     render={
-                      <Badge size="control" variant="info">
-                        <GitMergeIcon className="size-3.5" />
-                        {armedAutoMergeLabel}
+                      <Badge
+                        size="control"
+                        variant="info"
+                        role="img"
+                        aria-label={armedAutoMergeLabel}
+                      >
+                        <GitMergeIcon aria-hidden className="size-3.5" />
+                        <span className="@max-[30rem]/pr-header:hidden">{armedAutoMergeLabel}</span>
                       </Badge>
                     }
                   />
                   <TooltipPopup side="top">
-                    The host will merge this on its own once its requirements are met
+                    {armedAutoMergeLabel}: the host will merge this on its own once its requirements
+                    are met
                   </TooltipPopup>
                 </Tooltip>
               ) : primaryAction === "merge" ? (
-                <Button
-                  size="xs"
-                  disabled={actionPending}
-                  onClick={() => setConfirmation({ open: true, action: "merge" })}
-                >
-                  {pendingAction === "merge" ? "Merging..." : selectedMergeMethodLabel}
-                </Button>
+                <Tooltip>
+                  <TooltipTrigger
+                    render={
+                      <span className="inline-flex shrink-0">
+                        <Button
+                          size="xs"
+                          disabled={actionPending}
+                          onClick={() => setConfirmation({ open: true, action: "merge" })}
+                          aria-label={
+                            pendingAction === "merge" ? "Merging..." : selectedMergeMethodLabel
+                          }
+                        >
+                          <GitMergeIcon
+                            aria-hidden
+                            className="hidden size-3.5 @max-[30rem]/pr-header:inline"
+                          />
+                          <span className="@max-[30rem]/pr-header:hidden">
+                            {pendingAction === "merge" ? "Merging..." : selectedMergeMethodLabel}
+                          </span>
+                        </Button>
+                      </span>
+                    }
+                  />
+                  <TooltipPopup side="top">
+                    {pendingAction === "merge" ? "Merging..." : selectedMergeMethodLabel}
+                  </TooltipPopup>
+                </Tooltip>
               ) : (primaryAction === "merged" || primaryAction === "closed") &&
                 statePresentation !== null ? (
                 <Badge size="control" variant="outline" className={statePresentation.toneClassName}>
@@ -1807,10 +1983,17 @@ export function PullRequestDetailPanel({
             {detail ? (
               <div className="col-span-2 mt-1 min-w-0 px-4 pb-4">
                 {titleDraft === null ? (
-                  <div className="group flex min-w-0 items-start gap-1">
-                    <h1 className="min-w-0 flex-1 text-base font-semibold leading-snug">
-                      {detail.title}
-                    </h1>
+                  <div className="group flex min-w-0 items-center gap-1">
+                    <Tooltip>
+                      <TooltipTrigger
+                        render={
+                          <h1 className="min-w-0 flex-1 truncate text-base font-semibold leading-snug">
+                            {detail.title}
+                          </h1>
+                        }
+                      />
+                      <TooltipPopup side="top">{detail.title}</TooltipPopup>
+                    </Tooltip>
                     {canEditPullRequestChangeRequest(detail) ? (
                       <Button
                         size="icon-xs"
@@ -1977,7 +2160,11 @@ export function PullRequestDetailPanel({
                 aria-label={checksSummary ? `Checks: ${checksSummary}` : "Checks"}
               >
                 {checksState !== null ? (
-                  <PullRequestChecksPopover checks={detail.checks} checksState={checksState} />
+                  <PullRequestChecksPopover
+                    checks={detail.checks}
+                    checksState={checksState}
+                    threadRef={threadRef}
+                  />
                 ) : (
                   <CircleDotIcon aria-hidden className="size-3.5" />
                 )}
@@ -2101,6 +2288,7 @@ export function PullRequestDetailPanel({
               <div className={cn("absolute inset-0", tab !== "summary" && "invisible")}>
                 <PullRequestSummaryTab
                   environmentId={environmentId}
+                  threadRef={threadRef}
                   reference={reference}
                   detail={detail}
                   activityPending={activityPending}
@@ -2128,6 +2316,7 @@ export function PullRequestDetailPanel({
                   <PullRequestTimelineTab
                     detail={detail}
                     environmentId={environmentId}
+                    threadRef={threadRef}
                     reference={reference}
                     order={timelineOrder}
                     onOpenCommit={openCommit}
diff --git a/apps/web/src/components/pullRequest/PullRequestLabelPicker.tsx b/apps/web/src/components/pullRequest/PullRequestLabelPicker.tsx
new file mode 100644
index 000000000000..f1e5fc6a1da4
--- /dev/null
+++ b/apps/web/src/components/pullRequest/PullRequestLabelPicker.tsx
@@ -0,0 +1,132 @@
+/**
+ * Putting a label on, and taking one off, from the row that says which it already wears.
+ *
+ * The repository's labels are read only once this menu opens, for the reason the reviewer menu
+ * reads its people then: they are worth a request when somebody wants them and worth nothing on
+ * every pull request they merely open.
+ */
+import type { EnvironmentId, PullRequestLabelCandidate, PullRequestRef } from "@t3tools/contracts";
+import { CheckIcon, TagIcon } from "lucide-react";
+import { useMemo, useState } from "react";
+
+import { pullRequestEnvironment } from "~/state/pullRequests";
+import { useEnvironmentQuery } from "~/state/query";
+import { useAtomCommand } from "~/state/use-atom-command";
+import { squashAtomCommandFailure } from "@t3tools/client-runtime/state/runtime";
+
+import { toastManager } from "../ui/toast";
+import { PullRequestCandidatePicker } from "./PullRequestCandidatePicker";
+import { readableFailure } from "./pullRequestDetail.logic";
+import { pullRequestLabelColor } from "./pullRequestList.logic";
+
+/** Narrows only what arrived: the host is asked once, when the menu opens. */
+function matches(candidate: PullRequestLabelCandidate, query: string): boolean {
+  if (query.length === 0) return true;
+  const needle = query.toLowerCase();
+  return (
+    candidate.name.toLowerCase().includes(needle) ||
+    (candidate.description ?? "").toLowerCase().includes(needle)
+  );
+}
+
+export function PullRequestLabelPicker({
+  environmentId,
+  reference,
+  allowed,
+  onChanged,
+}: {
+  environmentId: EnvironmentId;
+  reference: PullRequestRef;
+  /** False where the host would refuse this account's change. Disabled with the reason rather
+   * than hidden, like the reviewer control beside it. */
+  allowed: boolean;
+  /** The detail carries the labels, so it is re-read once the host has taken the change. */
+  onChanged: () => void;
+}) {
+  const [open, setOpen] = useState(false);
+  const [query, setQuery] = useState("");
+  const [pending, setPending] = useState<string | null>(null);
+
+  // Mounted with the menu closed, so nothing is asked of the host until it opens.
+  const candidatesQuery = useEnvironmentQuery(
+    open ? pullRequestEnvironment.labelCandidates({ environmentId, input: reference }) : null,
+  );
+  const setLabels = useAtomCommand(pullRequestEnvironment.setLabels, { reportFailure: false });
+
+  const candidates = useMemo(
+    () => (candidatesQuery.data?.candidates ?? []).filter((entry) => matches(entry, query)),
+    [candidatesQuery.data, query],
+  );
+
+  const toggle = async (candidate: PullRequestLabelCandidate) => {
+    if (pending !== null) return;
+    setPending(candidate.name);
+    const result = await setLabels({
+      environmentId,
+      input: { ...reference, labels: [candidate.name], applied: !candidate.isApplied },
+    });
+    setPending(null);
+    if (result._tag === "Failure") {
+      toastManager.add({
+        type: "error",
+        title: candidate.isApplied
+          ? `Could not take ${candidate.name} off`
+          : `Could not put ${candidate.name} on`,
+        description: readableFailure(
+          squashAtomCommandFailure(result),
+          "The host refused it. Check that you have triage access on this repository.",
+        ),
+      });
+      return;
+    }
+    onChanged();
+    candidatesQuery.refresh();
+  };
+
+  return (
+    <PullRequestCandidatePicker
+      icon={<TagIcon className="size-3.5" />}
+      label="Change labels"
+      allowed={allowed}
+      disabledReason="Changing labels needs triage access on this repository"
+      open={open}
+      onOpenChange={setOpen}
+      query={query}
+      onQueryChange={setQuery}
+      searchLabel="Search labels"
+      isPending={candidatesQuery.isPending}
+      error={candidatesQuery.error}
+      candidates={candidates}
+      emptyLabel="This repository has no labels."
+      noMatchLabel="No label matches that."
+      errorLabel="The labels could not be read."
+      truncated={candidatesQuery.data?.truncated === true}
+      truncatedLabel="This repository has more labels than are listed here. Apply the rest on the host."
+      candidateKey={(candidate) => candidate.name}
+      disabled={pending !== null}
+      onSelect={(candidate) => void toggle(candidate)}
+    >
+      {(candidate) => {
+        const dot = pullRequestLabelColor(candidate.color);
+        return (
+          <>
+            <span
+              aria-hidden
+              className="size-2 shrink-0 rounded-full bg-muted-foreground"
+              {...(dot ? { style: { backgroundColor: dot } } : {})}
+            />
+            <span className="min-w-0 flex-1 truncate">
+              {candidate.name}
+              {candidate.description ? (
+                <span className="text-muted-foreground"> · {candidate.description}</span>
+              ) : null}
+            </span>
+            {candidate.isApplied ? (
+              <CheckIcon aria-label="Applied" className="size-3.5 shrink-0" />
+            ) : null}
+          </>
+        );
+      }}
+    </PullRequestCandidatePicker>
+  );
+}
diff --git a/apps/web/src/components/pullRequest/PullRequestListFilters.tsx b/apps/web/src/components/pullRequest/PullRequestListFilters.tsx
index d550decff894..473aadcffbf7 100644
--- a/apps/web/src/components/pullRequest/PullRequestListFilters.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestListFilters.tsx
@@ -2,6 +2,7 @@ import type {
   EnvironmentId,
   ProjectId,
   PullRequestInvolvement,
+  ProjectIconOverride,
   PullRequestListFilters,
   PullRequestListState,
   SourceControlProviderKind,
@@ -58,6 +59,8 @@ export interface PullRequestFilterOption<Value extends string> {
   readonly favicon?: {
     readonly environmentId: EnvironmentId;
     readonly cwd: string;
+    readonly faviconPath?: string | null;
+    readonly projectIcon?: ProjectIconOverride | null;
   };
   /** Why it cannot be chosen, carried onto the item as its title. */
   readonly unavailable?: string | undefined;
@@ -72,6 +75,9 @@ export function PullRequestFilterOptionIcon<Value extends string>({
     <ProjectFavicon
       environmentId={option.favicon.environmentId}
       cwd={option.favicon.cwd}
+      projectName={option.label}
+      faviconPath={option.favicon.faviconPath}
+      projectIcon={option.favicon.projectIcon}
       fallbackIcon={FolderGit2Icon}
       className="size-3.5"
     />
@@ -450,6 +456,8 @@ export function PullRequestFiltersMenu({
     readonly environmentId: EnvironmentId;
     readonly title: string;
     readonly workspaceRoot: string;
+    readonly faviconPath?: string | null;
+    readonly projectIcon?: ProjectIconOverride | null;
   }>;
   projectId: ProjectId | undefined;
   /**
@@ -505,7 +513,12 @@ export function PullRequestFiltersMenu({
         value: pullRequestProjectKey(project),
         label: project.title,
         Icon: FolderGit2Icon,
-        favicon: { environmentId: project.environmentId, cwd: project.workspaceRoot },
+        favicon: {
+          environmentId: project.environmentId,
+          cwd: project.workspaceRoot,
+          faviconPath: project.faviconPath ?? null,
+          projectIcon: project.projectIcon ?? null,
+        },
         ...(unavailable.has(pullRequestProjectKey(project))
           ? { unavailable: unavailable.get(pullRequestProjectKey(project)) }
           : {}),
diff --git a/apps/web/src/components/pullRequest/PullRequestMarkdown.tsx b/apps/web/src/components/pullRequest/PullRequestMarkdown.tsx
index 020bafbd1292..5e9db1347ce7 100644
--- a/apps/web/src/components/pullRequest/PullRequestMarkdown.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestMarkdown.tsx
@@ -1,5 +1,5 @@
 import { ExternalLinkIcon, PaperclipIcon, PlayIcon } from "lucide-react";
-import type { EnvironmentId } from "@t3tools/contracts";
+import type { EnvironmentId, ScopedThreadRef } from "@t3tools/contracts";
 import { createContext, useContext, useMemo } from "react";
 import type { Options as ReactMarkdownOptions } from "react-markdown";
 
@@ -21,11 +21,14 @@ export function PullRequestMarkdown({
   text,
   cwd,
   environmentId,
+  threadRef,
   className,
 }: {
   text: string;
   cwd: string;
   environmentId: EnvironmentId;
+  /** Thread the body is shown beside, so its links can open in that thread's in-app browser. */
+  threadRef?: ScopedThreadRef | null;
   className?: string;
 }) {
   const segments = splitPullRequestBody(text);
@@ -43,6 +46,7 @@ export function PullRequestMarkdown({
               key={segment.id}
               text={segment.text}
               cwd={cwd}
+              threadRef={threadRef ?? undefined}
               environmentId={environmentId}
               extraRemarkPlugins={extraRemarkPlugins}
             />
diff --git a/apps/web/src/components/pullRequest/PullRequestMarkdownEditor.tsx b/apps/web/src/components/pullRequest/PullRequestMarkdownEditor.tsx
index d5d2ee0a4757..5fbffdd08d3d 100644
--- a/apps/web/src/components/pullRequest/PullRequestMarkdownEditor.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestMarkdownEditor.tsx
@@ -1,5 +1,5 @@
 import { useState } from "react";
-import type { EnvironmentId } from "@t3tools/contracts";
+import type { EnvironmentId, ScopedThreadRef } from "@t3tools/contracts";
 
 import { cn } from "~/lib/utils";
 
@@ -19,6 +19,7 @@ export function PullRequestMarkdownEditor({
   value,
   cwd,
   environmentId,
+  threadRef = null,
   placeholder,
   label,
   saving,
@@ -30,6 +31,8 @@ export function PullRequestMarkdownEditor({
   readonly value: string;
   readonly cwd: string;
   readonly environmentId: EnvironmentId;
+  /** Thread the editor sits beside, so links in its preview follow the link target setting. */
+  readonly threadRef?: ScopedThreadRef | null;
   readonly placeholder?: string | undefined;
   readonly label: string;
   readonly saving: boolean;
@@ -84,7 +87,12 @@ export function PullRequestMarkdownEditor({
           {empty ? (
             <p className="text-xs text-muted-foreground">Nothing to preview.</p>
           ) : (
-            <PullRequestMarkdown text={draft} cwd={cwd} environmentId={environmentId} />
+            <PullRequestMarkdown
+              text={draft}
+              cwd={cwd}
+              environmentId={environmentId}
+              threadRef={threadRef}
+            />
           )}
         </div>
       ) : (
diff --git a/apps/web/src/components/pullRequest/PullRequestReviewerPicker.tsx b/apps/web/src/components/pullRequest/PullRequestReviewerPicker.tsx
index 8330c87a9294..a4da0d99514d 100644
--- a/apps/web/src/components/pullRequest/PullRequestReviewerPicker.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestReviewerPicker.tsx
@@ -18,12 +18,8 @@ import { useEnvironmentQuery } from "~/state/query";
 import { useAtomCommand } from "~/state/use-atom-command";
 import { squashAtomCommandFailure } from "@t3tools/client-runtime/state/runtime";
 
-import { Button } from "../ui/button";
-import { Input } from "../ui/input";
-import { Menu, MenuPopup, MenuTrigger } from "../ui/menu";
-import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
 import { toastManager } from "../ui/toast";
-import { PullRequestPeopleGhost } from "./PullRequestGhosts";
+import { PullRequestCandidatePicker } from "./PullRequestCandidatePicker";
 import { PullRequestActorLabel } from "./pullRequestPresentation";
 import { readableFailure } from "./pullRequestDetail.logic";
 
@@ -104,85 +100,40 @@ export function PullRequestReviewerPicker({
     candidatesQuery.refresh();
   };
 
-  if (!allowed) {
-    return (
-      <Tooltip>
-        <TooltipTrigger
-          render={
-            <Button size="icon-xs" variant="ghost" disabled aria-label="Request a review">
-              <UserPlusIcon className="size-3.5" />
-            </Button>
-          }
-        />
-        <TooltipPopup side="bottom">
-          Asking someone to review needs write access on this repository
-        </TooltipPopup>
-      </Tooltip>
-    );
-  }
-
   return (
-    <Menu open={open} onOpenChange={setOpen}>
-      <MenuTrigger
-        render={
-          <Button size="icon-xs" variant="ghost" aria-label="Request a review">
-            <UserPlusIcon className="size-3.5" />
-          </Button>
-        }
-      />
-      <MenuPopup align="start" side="bottom" className="w-72 p-0">
-        <div className="border-b border-border/60 p-2">
-          <Input
-            autoFocus
-            value={query}
-            onChange={(event) => setQuery(event.currentTarget.value)}
-            placeholder="Search people with access"
-            aria-label="Search people with access"
-            size="compact"
-          />
-        </div>
-        <div className="max-h-72 overflow-y-auto p-1">
-          {candidatesQuery.isPending ? (
-            <PullRequestPeopleGhost rows={4} />
-          ) : candidatesQuery.error !== null ? (
-            <p className="p-2 text-xs text-muted-foreground">
-              The people with access could not be read. {candidatesQuery.error}
-            </p>
-          ) : candidates.length === 0 ? (
-            <p className="p-2 text-xs text-muted-foreground">
-              {query.length > 0
-                ? "Nobody with access matches that."
-                : "Nobody else has access to this repository."}
-            </p>
-          ) : (
-            candidates.map((candidate) => (
-              <button
-                key={`${candidate.kind}:${candidate.id}`}
-                type="button"
-                disabled={pending !== null}
-                onClick={() => void toggle(candidate)}
-                className="flex w-full items-center gap-2 rounded-md px-2 py-1.5 text-left text-xs hover:bg-accent/60 disabled:opacity-60"
-              >
-                <PullRequestActorLabel actor={candidate} className="min-w-0 flex-1 truncate" />
-                {candidate.kind === "team" ? (
-                  <span className="shrink-0 text-muted-foreground">team</span>
-                ) : null}
-                {candidate.isRequested ? (
-                  <CheckIcon aria-label="Already asked" className="size-3.5 shrink-0" />
-                ) : null}
-              </button>
-            ))
-          )}
-          {candidatesQuery.data?.truncated ? (
-            // Typing filters what arrived; it does not ask the host again, so this says what the
-            // list is rather than offering a search that would find nothing further.
-            <p className="px-2 py-1.5 text-xs text-muted-foreground">
-              This repository has more people with access than are listed here. Ask for the rest on
-              the host.
-            </p>
+    <PullRequestCandidatePicker
+      icon={<UserPlusIcon className="size-3.5" />}
+      label="Request a review"
+      allowed={allowed}
+      disabledReason="Asking someone to review needs write access on this repository"
+      open={open}
+      onOpenChange={setOpen}
+      query={query}
+      onQueryChange={setQuery}
+      searchLabel="Search people with access"
+      isPending={candidatesQuery.isPending}
+      error={candidatesQuery.error}
+      candidates={candidates}
+      emptyLabel="Nobody else has access to this repository."
+      noMatchLabel="Nobody with access matches that."
+      errorLabel="The people with access could not be read."
+      truncated={candidatesQuery.data?.truncated === true}
+      truncatedLabel="This repository has more people with access than are listed here. Ask for the rest on the host."
+      candidateKey={(candidate) => `${candidate.kind}:${candidate.id}`}
+      disabled={pending !== null}
+      onSelect={(candidate) => void toggle(candidate)}
+    >
+      {(candidate) => (
+        <>
+          <PullRequestActorLabel actor={candidate} className="min-w-0 flex-1 truncate" />
+          {candidate.kind === "team" ? (
+            <span className="shrink-0 text-muted-foreground">team</span>
+          ) : null}
+          {candidate.isRequested ? (
+            <CheckIcon aria-label="Already asked" className="size-3.5 shrink-0" />
           ) : null}
-        </div>
-      </MenuPopup>
-    </Menu>
+        </>
+      )}
+    </PullRequestCandidatePicker>
   );
 }
diff --git a/apps/web/src/components/pullRequest/PullRequestRow.tsx b/apps/web/src/components/pullRequest/PullRequestRow.tsx
index 2284144d7fd1..6ee686a9de7e 100644
--- a/apps/web/src/components/pullRequest/PullRequestRow.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestRow.tsx
@@ -16,19 +16,46 @@ import {
   PullRequestStateGlyph,
 } from "./pullRequestPresentation";
 
+/**
+ * Each slot past the first only appears once the meta line is wide enough to hold it, so a
+ * narrow row shows one label and a "+N" while a wide one spreads out up to three. The "+N"
+ * rides on whichever pill is the last visible one, and is hidden as soon as the next slot shows.
+ */
+const LABEL_SLOTS = [
+  { pill: "", overflow: "@xl/pr-row-meta:hidden" },
+  { pill: "hidden @xl/pr-row-meta:inline-flex", overflow: "@3xl/pr-row-meta:hidden" },
+  { pill: "hidden @3xl/pr-row-meta:inline-flex", overflow: "" },
+] as const;
+
 function PullRequestRowLabels({ labels }: { labels: EnvironmentPullRequestEntry["labels"] }) {
-  const label = labels[0];
-  if (!label) return null;
-  const dot = pullRequestLabelColor(label.color);
+  if (labels.length === 0) return null;
   return (
-    <span className="inline-flex max-w-40 min-w-0 items-center gap-1 rounded-full border border-border/70 bg-muted/40 py-0 pl-1 pr-1.5 text-[10px] leading-3.5 text-muted-foreground">
-      <span
-        aria-hidden
-        className="size-2 shrink-0 rounded-full bg-muted-foreground"
-        {...(dot ? { style: { backgroundColor: dot } } : {})}
-      />
-      <span className="truncate">{label.name}</span>
-      {labels.length > 1 ? <span className="shrink-0">+{labels.length - 1}</span> : null}
+    <span className="flex min-w-0 items-center gap-1">
+      {LABEL_SLOTS.map((slot, index) => {
+        const label = labels[index];
+        if (!label) return null;
+        const dot = pullRequestLabelColor(label.color);
+        const remaining = labels.length - index - 1;
+        return (
+          <span
+            key={label.name}
+            className={cn(
+              "inline-flex max-w-40 min-w-0 items-center gap-1 rounded-full border border-border/70 bg-muted/40 py-0 pl-1 pr-1.5 text-[10px] leading-3.5 text-muted-foreground",
+              slot.pill,
+            )}
+          >
+            <span
+              aria-hidden
+              className="size-2 shrink-0 rounded-full bg-muted-foreground"
+              {...(dot ? { style: { backgroundColor: dot } } : {})}
+            />
+            <span className="truncate">{label.name}</span>
+            {remaining > 0 ? (
+              <span className={cn("shrink-0", slot.overflow)}>+{remaining}</span>
+            ) : null}
+          </span>
+        );
+      })}
     </span>
   );
 }
diff --git a/apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx b/apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx
index 5a3144dadce9..b06630f3bd04 100644
--- a/apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx
@@ -4,6 +4,7 @@ import type {
   PullRequestComment,
   PullRequestDetailView,
   PullRequestRef,
+  ScopedThreadRef,
 } from "@t3tools/contracts";
 import {
   ArrowDownUpIcon,
@@ -23,7 +24,7 @@ import { useRef, useState, type ReactNode } from "react";
 import { useAtomCommand } from "~/state/use-atom-command";
 import { pullRequestEnvironment } from "~/state/pullRequests";
 import { cn } from "~/lib/utils";
-import { readLocalApi } from "~/localApi";
+import { useOpenLink } from "~/browser/useOpenLink";
 import { formatRelativeTimeLabel } from "~/timestampFormat";
 
 import { Button } from "../ui/button";
@@ -41,6 +42,7 @@ import {
   pullRequestReviewOutcomeRingClassName,
   pullRequestReviewOutcomeStaleLabel,
 } from "./pullRequestPresentation";
+import { PullRequestLabelPicker } from "./PullRequestLabelPicker";
 import { PullRequestReviewerPicker } from "./PullRequestReviewerPicker";
 import { PullRequestActivityUnavailableState } from "./PullRequestActivityUnavailableState";
 import {
@@ -92,6 +94,7 @@ function reviewStateLabel(state: string): string {
 interface CommentEditing {
   readonly cwd: string;
   readonly environmentId: EnvironmentId;
+  readonly threadRef: ScopedThreadRef | null;
   readonly canEdit: (comment: PullRequestComment) => boolean;
   readonly editingId: string | null;
   readonly saving: boolean;
@@ -119,6 +122,7 @@ function CommentBody({
         value={comment.body}
         cwd={editing.cwd}
         environmentId={editing.environmentId}
+        threadRef={editing.threadRef}
         label="Edit comment"
         saving={editing.saving}
         onSave={(body) => editing.onSave(comment, body)}
@@ -133,6 +137,7 @@ function CommentBody({
         text={comment.body}
         cwd={editing.cwd}
         environmentId={editing.environmentId}
+        threadRef={editing.threadRef}
       />
       {editing.canEdit(comment) ? (
         <Button
@@ -422,6 +427,7 @@ const COMMENT_PAGE = 30;
 
 export function PullRequestSummaryTab({
   environmentId,
+  threadRef,
   reference,
   detail,
   activityPending,
@@ -435,6 +441,7 @@ export function PullRequestSummaryTab({
   onRefresh,
 }: {
   environmentId: EnvironmentId;
+  threadRef: ScopedThreadRef | null;
   reference: PullRequestRef;
   detail: PullRequestDetailView;
   activityPending: boolean;
@@ -461,6 +468,18 @@ export function PullRequestSummaryTab({
   const hiddenCommentCount = detail.comments.length - recentComments.length;
   const [commentOrder, setCommentOrder] = useState<"newest" | "oldest">("newest");
   const visibleComments = orderPullRequestComments(recentComments, commentOrder);
+  const showOldestCommentsButton =
+    hiddenCommentCount > 0 ? (
+      <Button
+        size="sm"
+        variant="outline"
+        className="w-full"
+        onClick={() => setShown({ url: detail.url, count: shownComments + COMMENT_PAGE })}
+      >
+        Show {Math.min(hiddenCommentCount, COMMENT_PAGE)} oldest{" "}
+        {hiddenCommentCount === 1 ? "comment" : "comments"}
+      </Button>
+    ) : null;
   // Read from the whole conversation, not the window shown below it: a verdict older than the
   // last thirty comments still stands.
   const reviewOutcomes = latestPullRequestReviewOutcomes(detail.comments, detail.commits);
@@ -507,8 +526,12 @@ export function PullRequestSummaryTab({
     ),
   );
 
+  const openLink = useOpenLink(threadRef);
   const openCheck = (url: string) => {
-    void readLocalApi()?.shell.openExternal(url);
+    void openLink(url).catch((error: unknown) => {
+      console.error(error);
+      toastManager.add({ type: "error", title: "Unable to open check details" });
+    });
   };
 
   const update = useAtomCommand(pullRequestEnvironment.update, { reportFailure: false });
@@ -546,6 +569,7 @@ export function PullRequestSummaryTab({
   const commentEditing: CommentEditing = {
     cwd: detail.workspaceRoot,
     environmentId,
+    threadRef,
     canEdit: (comment) => canEditPullRequestComment(detail, comment),
     editingId: editingCommentId,
     saving: commentSaving,
@@ -664,25 +688,39 @@ export function PullRequestSummaryTab({
               ) : null}
             </span>
           </MetaRow>
-          {detail.labels.length > 0 ? (
+          {/* The row is shown empty only where a label could be put on it from here; on a host
+              with none to offer, an empty row is a row about nothing. */}
+          {detail.labels.length > 0 || detail.capabilities.labels === true ? (
             <MetaRow icon={<TagIcon className="size-3.5" />} label="Labels">
               <span className="flex min-w-0 flex-wrap items-center gap-1">
-                {detail.labels.map((label) => {
-                  const dot = pullRequestLabelColor(label.color);
-                  return (
-                    <span
-                      key={label.name}
-                      className="inline-flex max-w-48 items-center gap-1.5 rounded-full border border-border/70 bg-muted/40 py-0.5 pl-1.5 pr-2 text-xs"
-                    >
+                {detail.labels.length === 0 ? (
+                  <span className="text-muted-foreground">None</span>
+                ) : (
+                  detail.labels.map((label) => {
+                    const dot = pullRequestLabelColor(label.color);
+                    return (
                       <span
-                        aria-hidden
-                        className="size-2 shrink-0 rounded-full bg-muted-foreground"
-                        {...(dot ? { style: { backgroundColor: dot } } : {})}
-                      />
-                      <span className="truncate">{label.name}</span>
-                    </span>
-                  );
-                })}
+                        key={label.name}
+                        className="inline-flex max-w-48 items-center gap-1.5 rounded-full border border-border/70 bg-muted/40 py-0.5 pl-1.5 pr-2 text-xs"
+                      >
+                        <span
+                          aria-hidden
+                          className="size-2 shrink-0 rounded-full bg-muted-foreground"
+                          {...(dot ? { style: { backgroundColor: dot } } : {})}
+                        />
+                        <span className="truncate">{label.name}</span>
+                      </span>
+                    );
+                  })
+                )}
+                {detail.capabilities.labels === true ? (
+                  <PullRequestLabelPicker
+                    environmentId={environmentId}
+                    reference={reference}
+                    allowed={detail.viewerPermissions.labels !== false}
+                    onChanged={onRefresh}
+                  />
+                ) : null}
               </span>
             </MetaRow>
           ) : null}
@@ -707,6 +745,7 @@ export function PullRequestSummaryTab({
               value={detail.body}
               cwd={detail.workspaceRoot}
               environmentId={environmentId}
+              threadRef={threadRef}
               label="Pull request description"
               placeholder="Describe this pull request"
               saving={bodySaving}
@@ -720,6 +759,7 @@ export function PullRequestSummaryTab({
                 text={detail.body.trim().length > 0 ? detail.body : "_No description provided._"}
                 cwd={detail.workspaceRoot}
                 environmentId={environmentId}
+                threadRef={threadRef}
               />
               {canEditPullRequestChangeRequest(detail) ? (
                 <Button
@@ -836,22 +876,7 @@ export function PullRequestSummaryTab({
               <p className="py-2 text-xs text-muted-foreground">No comments yet.</p>
             ) : (
               <div className="space-y-3">
-                {hiddenCommentCount > 0 ? (
-                  // Hundreds of comments are hundreds of markdown renders, and the ones worth
-                  // opening a pull request for are the recent ones. The rest are one press away and
-                  // stay rendered once asked for.
-                  <Button
-                    size="sm"
-                    variant="outline"
-                    className="w-full"
-                    onClick={() =>
-                      setShown({ url: detail.url, count: shownComments + COMMENT_PAGE })
-                    }
-                  >
-                    Show {Math.min(hiddenCommentCount, COMMENT_PAGE)} earlier{" "}
-                    {hiddenCommentCount === 1 ? "comment" : "comments"}
-                  </Button>
-                ) : null}
+                {commentOrder === "oldest" ? showOldestCommentsButton : null}
                 {visibleComments.map((comment) => {
                   const thread = threadByCommentId.get(comment.id);
                   const body = visibleBody(comment.body);
@@ -963,6 +988,7 @@ export function PullRequestSummaryTab({
                     </article>
                   );
                 })}
+                {commentOrder === "newest" ? showOldestCommentsButton : null}
               </div>
             )}
           </>
diff --git a/apps/web/src/components/pullRequest/PullRequestTimelineTab.tsx b/apps/web/src/components/pullRequest/PullRequestTimelineTab.tsx
index c3c8185ab102..946f3cdbc54f 100644
--- a/apps/web/src/components/pullRequest/PullRequestTimelineTab.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestTimelineTab.tsx
@@ -4,6 +4,7 @@ import type {
   PullRequestComment,
   PullRequestDetailView,
   PullRequestRef,
+  ScopedThreadRef,
 } from "@t3tools/contracts";
 import {
   ChevronDownIcon,
@@ -55,6 +56,8 @@ import {
 interface ReactionSurface {
   readonly canReact: boolean;
   readonly environmentId: EnvironmentId;
+  /** Thread the timeline is shown beside, so body links can open in its in-app browser. */
+  readonly threadRef: ScopedThreadRef | null;
   readonly reference: PullRequestRef;
   readonly onRefresh: () => void;
 }
@@ -64,16 +67,23 @@ function TimelineBody({
   markdown,
   cwd,
   environmentId,
+  threadRef,
 }: {
   body: string;
   markdown: boolean;
   cwd: string;
   environmentId: EnvironmentId;
+  threadRef: ScopedThreadRef | null;
 }) {
   return (
     <div className="mt-3">
       {markdown ? (
-        <PullRequestMarkdown text={body} cwd={cwd} environmentId={environmentId} />
+        <PullRequestMarkdown
+          text={body}
+          cwd={cwd}
+          environmentId={environmentId}
+          threadRef={threadRef}
+        />
       ) : (
         <p className="whitespace-pre-wrap text-xs text-muted-foreground">{body}</p>
       )}
@@ -246,6 +256,7 @@ function ConversationCard({
             value={editable.body}
             cwd={cwd}
             environmentId={reactions.environmentId}
+            threadRef={reactions.threadRef}
             label="Edit comment"
             saving={saving}
             onSave={(body) => void save(body)}
@@ -259,6 +270,7 @@ function ConversationCard({
             markdown={event.markdown}
             cwd={cwd}
             environmentId={reactions.environmentId}
+            threadRef={reactions.threadRef}
           />
         </div>
       ) : null}
@@ -526,6 +538,7 @@ function ReviewVerdictEvent({
               markdown={event.markdown}
               cwd={cwd}
               environmentId={reactions.environmentId}
+              threadRef={reactions.threadRef}
             />
           ) : null}
         </div>
@@ -538,6 +551,7 @@ function ReviewVerdictEvent({
 export function PullRequestTimelineTab({
   detail,
   environmentId,
+  threadRef = null,
   reference,
   order,
   onOpenCommit,
@@ -545,6 +559,7 @@ export function PullRequestTimelineTab({
 }: {
   detail: PullRequestDetailView;
   environmentId: EnvironmentId;
+  threadRef?: ScopedThreadRef | null;
   reference: PullRequestRef;
   order: "newest" | "oldest";
   onOpenCommit: (oid: string) => void;
@@ -555,6 +570,7 @@ export function PullRequestTimelineTab({
   const reactions: ReactionSurface = {
     canReact: detail.capabilities.reactions === true,
     environmentId,
+    threadRef,
     reference,
     onRefresh,
   };
diff --git a/apps/web/src/components/pullRequest/pullRequestDetail.logic.test.ts b/apps/web/src/components/pullRequest/pullRequestDetail.logic.test.ts
index 348cbd477891..c51429ff6d83 100644
--- a/apps/web/src/components/pullRequest/pullRequestDetail.logic.test.ts
+++ b/apps/web/src/components/pullRequest/pullRequestDetail.logic.test.ts
@@ -2,6 +2,7 @@ import {
   PullRequestAction,
   type PullRequestCheck,
   type PullRequestComment,
+  type PullRequestDetail,
   type PullRequestDetailView,
   type PullRequestReviewThread,
 } from "@t3tools/contracts";
@@ -31,12 +32,15 @@ import {
   pullRequestHandoffLabels,
   pullRequestReviewOutcome,
   readableFailure,
+  readPullRequestDetailSnapshot,
+  resolveDisplayedPullRequestDetail,
   resolvePullRequestPrimaryControl,
   shouldRefreshPullRequestActivity,
   resolveBaseFreshness,
   buildPullRequestTimeline,
   describePullRequestState,
   editPullRequestThreadComment,
+  writePullRequestDetailSnapshot,
 } from "./pullRequestDetail.logic";
 import type { ReviewCommentContext } from "~/reviewCommentContext";
 
@@ -1317,3 +1321,103 @@ describe("which actions need the host read again after they run", () => {
     }
   });
 });
+
+describe("cached pull request detail", () => {
+  const reference = { projectId: "project-1", repository: "acme/web", number: 7 };
+  const detail = (overrides: Partial<PullRequestDetail> = {}): PullRequestDetail =>
+    ({
+      provider: "github",
+      capabilities: {
+        diff: true,
+        comment: true,
+        actions: ["merge"],
+        mergeMethods: ["merge"],
+        search: true,
+        review: {
+          inlineComment: true,
+          reply: true,
+          resolve: true,
+          verdicts: ["comment", "approve", "request-changes"],
+        },
+        reviewers: { request: true, listCandidates: true },
+      },
+      viewerPermissions: {
+        actions: ["merge"],
+        comment: true,
+        resolve: true,
+        verdicts: ["comment", "approve", "request-changes"],
+        requestReviewers: true,
+      },
+      projectId: "project-1",
+      projectTitle: "web",
+      workspaceRoot: "/repo",
+      repository: "acme/web",
+      number: 7,
+      title: "Cache the title",
+      body: "who made it",
+      url: "https://github.com/acme/web/pull/7",
+      author: { login: "octocat", name: null, avatarUrl: "https://avatars.example/octocat" },
+      state: "open",
+      isDraft: false,
+      mergeability: "mergeable",
+      additions: 12,
+      deletions: 3,
+      changedFiles: 2,
+      headBranch: "feat/cache",
+      baseBranch: "main",
+      createdAt: "2026-07-01T00:00:00.000Z",
+      updatedAt: "2026-07-02T00:00:00.000Z",
+      mergedAt: null,
+      closedAt: null,
+      reviewers: [],
+      labels: [],
+      checks: [],
+      mergeCapabilities: { merge: true, squash: true, rebase: true },
+      ...overrides,
+    }) as PullRequestDetail;
+
+  const makeStorage = () => {
+    const held = new Map<string, string>();
+    return {
+      getItem: (key: string) => held.get(key) ?? null,
+      setItem: (key: string, value: string) => void held.set(key, value),
+    };
+  };
+
+  it("hydrates the last title, author, and counts so a reopen does not ghost the tab", () => {
+    const storage = makeStorage();
+    writePullRequestDetailSnapshot(storage, "env-1", reference, detail());
+    const snapshot = readPullRequestDetailSnapshot(storage, "env-1", reference);
+    expect(snapshot?.title).toBe("Cache the title");
+    expect(snapshot?.author?.login).toBe("octocat");
+    expect(snapshot?.additions).toBe(12);
+    expect(snapshot?.deletions).toBe(3);
+  });
+
+  it("keeps a cached tab painted while the live read replaces the counts", () => {
+    const cached = detail();
+    const live = detail({ additions: 40, deletions: 9, title: "Cache the title" });
+    expect(resolveDisplayedPullRequestDetail({ live, cached, reference })?.additions).toBe(40);
+    expect(resolveDisplayedPullRequestDetail({ live: null, cached, reference })?.additions).toBe(
+      12,
+    );
+  });
+
+  it("does not paint another change request's snapshot", () => {
+    expect(
+      resolveDisplayedPullRequestDetail({
+        live: null,
+        cached: detail({ number: 8 }),
+        reference,
+      }),
+    ).toBeNull();
+    expect(readPullRequestDetailSnapshot(makeStorage(), "env-2", reference)).toBeNull();
+  });
+
+  it("shrugs off corrupt storage and no storage at all", () => {
+    const storage = makeStorage();
+    storage.setItem("t3.pullRequests.detail:env-1:project-1:acme/web#7", "{not json");
+    expect(readPullRequestDetailSnapshot(storage, "env-1", reference)).toBeNull();
+    expect(readPullRequestDetailSnapshot(undefined, "env-1", reference)).toBeNull();
+  });
+});
diff --git a/apps/web/src/components/pullRequest/pullRequestDetail.logic.ts b/apps/web/src/components/pullRequest/pullRequestDetail.logic.ts
index 755bcdf52441..cffe33f8d83d 100644
--- a/apps/web/src/components/pullRequest/pullRequestDetail.logic.ts
+++ b/apps/web/src/components/pullRequest/pullRequestDetail.logic.ts
@@ -1,19 +1,22 @@
-import type {
-  PullRequestAction,
-  PullRequestActor,
-  PullRequestBaseComparison,
-  PullRequestCheck,
-  PullRequestChecksState,
-  PullRequestComment,
-  PullRequestCommit,
-  PullRequestDetailView,
-  PullRequestMergeability,
-  PullRequestReaction,
-  PullRequestReviewThread,
-  PullRequestState,
-  PullRequestUpdateMethod,
-  SourceControlProviderKind,
-  VcsRef,
+import * as Schema from "effect/Schema";
+
+import {
+  PullRequestDetail,
+  type PullRequestAction,
+  type PullRequestActor,
+  type PullRequestBaseComparison,
+  type PullRequestCheck,
+  type PullRequestChecksState,
+  type PullRequestComment,
+  type PullRequestCommit,
+  type PullRequestDetailView,
+  type PullRequestMergeability,
+  type PullRequestReaction,
+  type PullRequestReviewThread,
+  type PullRequestState,
+  type PullRequestUpdateMethod,
+  type SourceControlProviderKind,
+  type VcsRef,
 } from "@t3tools/contracts";
 
 import { inferReviewCommentFenceLanguage, type ReviewCommentContext } from "~/reviewCommentContext";
@@ -1009,3 +1012,75 @@ const ACTION_NEEDS_HOST_REFRESH: Record<PullRequestAction, boolean> = {
 export function pullRequestActionNeedsHostRefresh(action: PullRequestAction): boolean {
   return ACTION_NEEDS_HOST_REFRESH[action];
 }
+
+type SnapshotStorage = Pick<Storage, "getItem" | "setItem">;
+
+export interface PullRequestDetailSnapshotRef {
+  readonly projectId: string;
+  readonly repository: string;
+  readonly number: number;
+}
+
+const pullRequestDetailSnapshotKey = (
+  environmentId: string,
+  reference: PullRequestDetailSnapshotRef,
+) =>
+  `t3.pullRequests.detail:${environmentId}:${reference.projectId}:${reference.repository}#${reference.number}`;
+
+const decodeDetailSnapshot = Schema.decodeUnknownOption(PullRequestDetail);
+
+/**
+ * The last detail answered for this change request, brought back across a reload. The registry
+ * the queries live in is recreated with the renderer, so without this a reopen cold-starts
+ * into a full-tab ghost even though the title, author, and the rest barely moved. Hydrated,
+ * the chrome stays and the live read replaces fields in place — line counts included.
+ */
+export function readPullRequestDetailSnapshot(
+  storage: SnapshotStorage | undefined,
+  environmentId: string,
+  reference: PullRequestDetailSnapshotRef,
+): PullRequestDetail | null {
+  try {
+    const raw = storage?.getItem(pullRequestDetailSnapshotKey(environmentId, reference));
+    if (!raw) return null;
+    const decoded = decodeDetailSnapshot(JSON.parse(raw));
+    return decoded._tag === "Some" ? decoded.value : null;
+  } catch {
+    return null;
+  }
+}
+
+export function writePullRequestDetailSnapshot(
+  storage: SnapshotStorage | undefined,
+  environmentId: string,
+  reference: PullRequestDetailSnapshotRef,
+  detail: PullRequestDetail,
+): void {
+  try {
+    storage?.setItem(
+      pullRequestDetailSnapshotKey(environmentId, reference),
+      JSON.stringify(detail),
+    );
+  } catch {
+    // Quota or a private-mode store: the next open waits on the live read, which is the
+    // cold start this snapshot exists to avoid, not a failure of its own.
+  }
+}
+
+/** Live host state wins; a snapshot is only the same change request, never a neighbour's. */
+export function resolveDisplayedPullRequestDetail(input: {
+  readonly live: PullRequestDetail | null;
+  readonly cached: PullRequestDetail | null;
+  readonly reference: PullRequestDetailSnapshotRef;
+}): PullRequestDetail | null {
+  if (input.live !== null) return input.live;
+  if (
+    input.cached !== null &&
+    input.cached.projectId === input.reference.projectId &&
+    input.cached.repository.toLowerCase() === input.reference.repository.toLowerCase() &&
+    input.cached.number === input.reference.number
+  ) {
+    return input.cached;
+  }
+  return null;
+}
diff --git a/apps/web/src/components/pullRequest/pullRequestProjectAssignment.logic.ts b/apps/web/src/components/pullRequest/pullRequestProjectAssignment.logic.ts
index aea26286f866..d52b72ca395c 100644
--- a/apps/web/src/components/pullRequest/pullRequestProjectAssignment.logic.ts
+++ b/apps/web/src/components/pullRequest/pullRequestProjectAssignment.logic.ts
@@ -1,4 +1,4 @@
-import type { EnvironmentId, ProjectId } from "@t3tools/contracts";
+import type { EnvironmentId, EnvironmentMachineKind, ProjectId } from "@t3tools/contracts";
 
 /** The little of a project this needs: who holds it, and which repository it is a copy of. */
 export interface AssignableProject {
@@ -69,6 +69,7 @@ export interface PickableEnvironment {
   readonly projectId: ProjectId;
   readonly workspaceRoot: string;
   readonly label: string;
+  readonly machine?: EnvironmentMachineKind;
 }
 
 /**
@@ -85,17 +86,21 @@ export interface PickableEnvironment {
 export function resolvePickableEnvironments(
   current: { readonly environmentId: EnvironmentId; readonly projectId: ProjectId },
   projects: ReadonlyArray<AssignableProject & { readonly workspaceRoot: string }>,
-  environments: ReadonlyArray<{ readonly environmentId: EnvironmentId; readonly label: string }>,
+  environments: ReadonlyArray<{
+    readonly environmentId: EnvironmentId;
+    readonly label: string;
+    readonly machine?: EnvironmentMachineKind;
+  }>,
 ): ReadonlyArray<PickableEnvironment> {
   const own = projects.find(
     (project) =>
       project.environmentId === current.environmentId && project.id === current.projectId,
   );
   const key = own === undefined ? undefined : repositoryKey(own);
-  const ownLabel = environments.find(
+  const ownEnvironment = environments.find(
     (environment) => environment.environmentId === current.environmentId,
-  )?.label;
-  if (own === undefined || !key || ownLabel === undefined) return [];
+  );
+  if (own === undefined || !key || ownEnvironment === undefined) return [];
   const others = environments.flatMap((environment) => {
     if (environment.environmentId === current.environmentId) return [];
     // One entry per server, whichever copy comes first: a server holding two worktrees of the
@@ -112,6 +117,7 @@ export function resolvePickableEnvironments(
             projectId: copy.id,
             workspaceRoot: copy.workspaceRoot,
             label: environment.label,
+            ...(environment.machine === undefined ? {} : { machine: environment.machine }),
           },
         ];
   });
@@ -123,7 +129,8 @@ export function resolvePickableEnvironments(
       environmentId: current.environmentId,
       projectId: own.id,
       workspaceRoot: own.workspaceRoot,
-      label: ownLabel,
+      label: ownEnvironment.label,
+      ...(ownEnvironment.machine === undefined ? {} : { machine: ownEnvironment.machine }),
     },
     ...others,
   ];
diff --git a/apps/web/src/components/settings/ConnectionsSettings.tsx b/apps/web/src/components/settings/ConnectionsSettings.tsx
index 4c7439482cbe..68f80dc712dc 100644
--- a/apps/web/src/components/settings/ConnectionsSettings.tsx
+++ b/apps/web/src/components/settings/ConnectionsSettings.tsx
@@ -1,12 +1,16 @@
-import {
-  ChevronsLeftRightEllipsisIcon,
-  PlusIcon,
-  QrCodeIcon,
-  RefreshCwIcon,
-  TerminalIcon,
-} from "lucide-react";
+import { ChevronsLeftRightEllipsisIcon, PlusIcon, QrCodeIcon, TerminalIcon } from "lucide-react";
 import { useAtomValue } from "@effect/atom-react";
-import { type ReactNode, memo, useCallback, useId, useMemo, useState } from "react";
+import {
+  type KeyboardEvent,
+  type ReactNode,
+  memo,
+  useCallback,
+  useEffect,
+  useId,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
 import {
   AuthAccessReadScope,
   AuthAccessWriteScope,
@@ -27,6 +31,7 @@ import {
   type DesktopServerExposureState,
   type DesktopWslState,
   type EnvironmentId,
+  resolveEnvironmentMachineKind,
 } from "@t3tools/contracts";
 import { connectionStatusText } from "@t3tools/client-runtime/connection";
 import {
@@ -53,7 +58,17 @@ import {
   useRelativeTimeTick,
 } from "./settingsLayout";
 import { searchableSetting } from "./settingsSearch";
+import { EnvironmentIconPicker } from "./EnvironmentIconPicker";
 import { Input } from "../ui/input";
+import { CommandShortcut } from "../ui/command";
+import {
+  Autocomplete,
+  AutocompleteEmpty,
+  AutocompleteInput,
+  AutocompleteItem,
+  AutocompleteList,
+  AutocompletePopup,
+} from "../ui/autocomplete";
 import { Checkbox } from "../ui/checkbox";
 import {
   Dialog,
@@ -86,6 +101,7 @@ import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
 import { Button } from "../ui/button";
 import { Empty, EmptyDescription, EmptyHeader, EmptyMedia, EmptyTitle } from "../ui/empty";
 import { AnimatedHeight } from "../AnimatedHeight";
+import { EnvironmentMachineIcon } from "../EnvironmentMachineIcon";
 import { Textarea } from "../ui/textarea";
 import { getPairingTokenFromUrl, setPairingTokenOnUrl } from "../../pairingUrl";
 import { readHostedPairingRequest } from "../../hostedPairing";
@@ -120,7 +136,7 @@ import {
   desktopNetworkAccessStateAtom,
   refreshDesktopNetworkAccessState,
 } from "~/state/desktopNetworkAccess";
-import { desktopSshHostsStateAtom } from "~/state/desktopSshHosts";
+import { desktopSshHostsStateAtom, filterDiscoveredSshHosts } from "~/state/desktopSshHosts";
 import { desktopWslStateAtom, refreshDesktopWslState } from "~/state/desktopWslState";
 import {
   type EnvironmentPresentation,
@@ -128,11 +144,17 @@ import {
   usePrimaryEnvironment,
 } from "~/state/environments";
 import { useAtomCommand } from "../../state/use-atom-command";
-import { serverEnvironment } from "~/state/server";
+import { primaryServerKeybindingsAtom, serverEnvironment } from "~/state/server";
 import { ConnectionStatusDot } from "../ConnectionStatusDot";
 import { ServerUpdateAction, ServerUpdateProgress } from "../ServerUpdateAction";
 import { CloudEnvironmentConnectRows } from "../cloud/CloudEnvironmentConnectList";
 import { ITEM_ROW_CLASSNAME, ITEM_ROW_INNER_CLASSNAME } from "./itemRows";
+import {
+  resolveShortcutCommand,
+  shortcutLabelForCommand,
+  threadJumpCommandForIndex,
+  threadJumpIndexFromCommand,
+} from "../../keybindings";
 
 const DEFAULT_TAILSCALE_SERVE_PORT = 443;
 const EMPTY_ADVERTISED_ENDPOINTS: ReadonlyArray<AdvertisedEndpoint> = [];
@@ -1438,6 +1460,11 @@ function SavedBackendListRow({
                   : null
               }
             />
+            <EnvironmentMachineIcon
+              aria-hidden
+              kind={resolveEnvironmentMachineKind(environment.serverConfig)}
+              className="size-3.5 shrink-0 text-muted-foreground"
+            />
             <h3 className="min-w-0 truncate text-sm font-medium text-foreground">
               {environment.label}
             </h3>
@@ -1445,6 +1472,15 @@ function SavedBackendListRow({
           {metadataBits.length > 0 ? (
             <p className="truncate text-xs text-muted-foreground">{metadataBits.join(" · ")}</p>
           ) : null}
+          {isConnected ? (
+            <div className="pt-1">
+              <EnvironmentIconPicker
+                environmentId={environmentId}
+                serverConfig={environment.serverConfig}
+                size="xs"
+              />
+            </div>
+          ) : null}
           {serverUpdateState.status !== "idle" ? (
             <div className="max-w-md">
               <ServerUpdateProgress state={serverUpdateState} />
@@ -1544,46 +1580,6 @@ function SavedBackendListRow({
   );
 }
 
-interface DesktopSshHostRowProps {
-  target: DesktopDiscoveredSshHost;
-  connectingHostAlias: string | null;
-  onConnect: (target: DesktopDiscoveredSshHost) => void;
-}
-
-const DesktopSshHostRow = memo(function DesktopSshHostRow({
-  target,
-  connectingHostAlias,
-  onConnect,
-}: DesktopSshHostRowProps) {
-  const address = formatDesktopSshTarget(target);
-  const showAddress = address !== target.alias;
-  const buttonLabel = connectingHostAlias === target.alias ? "Adding…" : "Add environment";
-
-  return (
-    <div className="rounded-xl px-3 py-3 sm:px-4">
-      <div className={ITEM_ROW_INNER_CLASSNAME}>
-        <div className="min-w-0 flex-1">
-          <h3 className="truncate text-sm font-medium text-foreground">{target.alias}</h3>
-          {showAddress ? <p className="truncate text-xs text-muted-foreground">{address}</p> : null}
-        </div>
-        <div className="flex w-full shrink-0 items-center gap-2 sm:w-auto sm:justify-end">
-          <Button
-            size="xs"
-            variant="outline"
-            disabled={connectingHostAlias === target.alias}
-            onClick={() => onConnect(target)}
-          >
-            {connectingHostAlias === target.alias ? (
-              <RefreshCwIcon className="size-3 animate-spin" />
-            ) : null}
-            {buttonLabel}
-          </Button>
-        </div>
-      </div>
-    </div>
-  );
-});
-
 function CloudLinkSwitch({
   checked,
   disabled,
@@ -1752,6 +1748,7 @@ function CloudRemoteEnvironmentRows({
 
 export function ConnectionsSettings() {
   const desktopBridge = window.desktopBridge;
+  const keybindings = useAtomValue(primaryServerKeybindingsAtom);
   const { environments } = useEnvironments();
   const primaryEnvironment = usePrimaryEnvironment();
   const connectPairing = useAtomCommand(connectPairingAtom, { reportFailure: false });
@@ -1775,24 +1772,6 @@ export function ConnectionsSettings() {
         .toSorted((left, right) => left.label.localeCompare(right.label)),
     [environments],
   );
-  const savedDesktopSshEnvironmentsByAlias = useMemo(
-    () =>
-      savedEnvironments.reduce<Record<string, EnvironmentPresentation>>(
-        (accumulator, environment) => {
-          const profile = environment.entry.profile;
-          if (
-            environment.entry.target._tag === "SshConnectionTarget" &&
-            Option.isSome(profile) &&
-            profile.value._tag === "SshConnectionProfile"
-          ) {
-            accumulator[profile.value.target.alias] = environment;
-          }
-          return accumulator;
-        },
-        {},
-      ),
-    [savedEnvironments],
-  );
   const savedDesktopSshEnvironmentKeys = useMemo(() => {
     const keys = new Set<string>();
     for (const environment of savedEnvironments) {
@@ -1810,9 +1789,6 @@ export function ConnectionsSettings() {
     }
     return keys;
   }, [savedEnvironments]);
-  const [sshConnectionError, setSshConnectionError] = useState<string | null>(null);
-  const [connectingSshHostAlias, setConnectingSshHostAlias] = useState<string | null>(null);
-
   const [desktopServerExposureMutationError, setDesktopServerExposureMutationError] = useState<
     string | null
   >(null);
@@ -1833,6 +1809,9 @@ export function ConnectionsSettings() {
   const [savedBackendSshHost, setSavedBackendSshHost] = useState("");
   const [savedBackendSshUsername, setSavedBackendSshUsername] = useState("");
   const [savedBackendSshPort, setSavedBackendSshPort] = useState("");
+  const [sshHostSuggestionsOpen, setSshHostSuggestionsOpen] = useState(false);
+  // Tracks the arrow-key/hover highlight so Enter selects it instead of submitting the typed text.
+  const highlightedSshHostRef = useRef<DesktopDiscoveredSshHost | undefined>(undefined);
   const [savedBackendError, setSavedBackendError] = useState<string | null>(null);
   const [isAddingSavedBackend, setIsAddingSavedBackend] = useState(false);
   const [removingSavedEnvironmentId, setRemovingSavedEnvironmentId] =
@@ -1898,11 +1877,17 @@ export function ConnectionsSettings() {
   const desktopNetworkAccess = useEnvironmentQuery(
     canManageLocalBackend && desktopBridge ? desktopNetworkAccessStateAtom : null,
   );
+  const isSshDiscoveryActive =
+    desktopBridge !== undefined && addBackendDialogOpen && savedBackendMode === "ssh";
   const desktopSshHosts = useEnvironmentQuery(
-    desktopBridge && addBackendDialogOpen && savedBackendMode === "ssh"
-      ? desktopSshHostsStateAtom
-      : null,
+    isSshDiscoveryActive ? desktopSshHostsStateAtom : null,
   );
+  // The discovery atom is kept alive across dialog opens, so re-read SSH config
+  // each time the SSH tab is shown; stale hosts stay visible while it refreshes.
+  const refreshDesktopSshHosts = desktopSshHosts.refresh;
+  useEffect(() => {
+    if (isSshDiscoveryActive) refreshDesktopSshHosts();
+  }, [isSshDiscoveryActive, refreshDesktopSshHosts]);
   const desktopWsl = useEnvironmentQuery(
     canManageLocalBackend && desktopBridge ? desktopWslStateAtom : null,
   );
@@ -1921,10 +1906,15 @@ export function ConnectionsSettings() {
       }),
     [discoveredSshHosts, savedDesktopSshEnvironmentKeys],
   );
-  const hasLoadedDiscoveredSshHosts =
-    desktopSshHosts.data !== null || desktopSshHosts.error !== null;
-  const isLoadingDiscoveredSshHosts = desktopSshHosts.isPending;
-  const discoveredSshHostsError = sshConnectionError ?? desktopSshHosts.error;
+  const filteredDiscoveredSshHosts = useMemo(
+    () => filterDiscoveredSshHosts(unsavedDiscoveredSshHosts, savedBackendSshHost),
+    [savedBackendSshHost, unsavedDiscoveredSshHosts],
+  );
+  const isLoadingDiscoveredSshHosts = desktopSshHosts.isPending && desktopSshHosts.data === null;
+  const discoveredSshHostsError = desktopSshHosts.error;
+  const hasSshHostSuggestionContent =
+    desktopBridge !== undefined &&
+    (isLoadingDiscoveredSshHosts || unsavedDiscoveredSshHosts.length > 0);
   const desktopServerExposureState = desktopNetworkAccess.data?.serverExposureState ?? null;
   const desktopAdvertisedEndpoints =
     desktopNetworkAccess.data?.advertisedEndpoints ?? EMPTY_ADVERTISED_ENDPOINTS;
@@ -2148,23 +2138,11 @@ export function ConnectionsSettings() {
     }
   }, []);
 
-  const handleAddSavedBackend = useCallback(async () => {
-    if (savedBackendMode === "ssh") {
+  // Shared by manual SSH submission and discovered-host selection.
+  const connectSavedBackendSshTarget = useCallback(
+    async (target: DesktopSshEnvironmentTarget) => {
       setIsAddingSavedBackend(true);
       setSavedBackendError(null);
-      let target: DesktopSshEnvironmentTarget;
-      try {
-        target = parseManualDesktopSshTarget({
-          host: savedBackendSshHost,
-          username: savedBackendSshUsername,
-          port: savedBackendSshPort,
-        });
-      } catch (error) {
-        setSavedBackendError(formatDesktopSshConnectionError(error));
-        setIsAddingSavedBackend(false);
-        return;
-      }
-
       const result = await connectSshEnvironment({ target, label: "" });
       if (result._tag === "Failure") {
         if (!isAtomCommandInterrupted(result)) {
@@ -2186,6 +2164,25 @@ export function ConnectionsSettings() {
         description: `${target.alias} is ready over an SSH-managed tunnel.`,
       });
       setIsAddingSavedBackend(false);
+    },
+    [connectSshEnvironment],
+  );
+
+  const handleAddSavedBackend = useCallback(async () => {
+    if (savedBackendMode === "ssh") {
+      let target: DesktopSshEnvironmentTarget;
+      try {
+        target = parseManualDesktopSshTarget({
+          host: savedBackendSshHost,
+          username: savedBackendSshUsername,
+          port: savedBackendSshPort,
+        });
+      } catch (error) {
+        setSavedBackendError(formatDesktopSshConnectionError(error));
+        return;
+      }
+
+      await connectSavedBackendSshTarget(target);
       return;
     }
 
@@ -2243,7 +2240,7 @@ export function ConnectionsSettings() {
     setIsAddingSavedBackend(false);
   }, [
     connectPairing,
-    connectSshEnvironment,
+    connectSavedBackendSshTarget,
     savedBackendHost,
     savedBackendMode,
     savedBackendPairingCode,
@@ -2252,6 +2249,92 @@ export function ConnectionsSettings() {
     savedBackendSshUsername,
   ]);
 
+  const handleSavedBackendSshFieldKeyDown = useCallback(
+    (event: KeyboardEvent<HTMLInputElement>) => {
+      if (event.nativeEvent.isComposing || event.keyCode === 229) return;
+      if (event.key === "Enter" && savedBackendSshHost.trim().length > 0) {
+        event.preventDefault();
+        void handleAddSavedBackend();
+      }
+    },
+    [handleAddSavedBackend, savedBackendSshHost],
+  );
+
+  // Resolves a picked alias before connecting it through the manual SSH flow.
+  const handleSelectSshHostSuggestion = useCallback(
+    async (target: DesktopDiscoveredSshHost) => {
+      if (isAddingSavedBackend || !desktopBridge) return;
+
+      setIsAddingSavedBackend(true);
+      setSavedBackendError(null);
+      setSavedBackendSshHost(target.alias);
+      let resolved: DesktopSshEnvironmentTarget;
+      try {
+        resolved = await desktopBridge.resolveSshHost(target.alias);
+      } catch (error) {
+        setSavedBackendError(formatDesktopSshConnectionError(error));
+        setIsAddingSavedBackend(false);
+        return;
+      }
+      setSavedBackendSshUsername(resolved.username ?? "");
+      setSavedBackendSshPort(resolved.port === null ? "" : String(resolved.port));
+      await connectSavedBackendSshTarget(resolved);
+    },
+    [connectSavedBackendSshTarget, desktopBridge, isAddingSavedBackend],
+  );
+
+  const handleSavedBackendSshHostKeyDown = useCallback(
+    (event: KeyboardEvent<HTMLInputElement>) => {
+      if (event.nativeEvent.isComposing || event.keyCode === 229) return;
+
+      // The popup only renders when there is content, so an "open" flag alone is not enough.
+      const isSshHostPopupVisible = sshHostSuggestionsOpen && hasSshHostSuggestionContent;
+      if (isSshHostPopupVisible) {
+        const command = resolveShortcutCommand(event, keybindings, {
+          platform: navigator.platform,
+          context: { modelPickerOpen: false },
+        });
+        const index = threadJumpIndexFromCommand(command ?? "");
+        const target = index === null ? undefined : filteredDiscoveredSshHosts[index];
+        if (target) {
+          event.preventDefault();
+          event.stopPropagation();
+          setSshHostSuggestionsOpen(false);
+          void handleSelectSshHostSuggestion(target);
+          return;
+        }
+
+        if (event.key === "Escape") {
+          event.preventDefault();
+          event.stopPropagation();
+          return;
+        }
+      }
+
+      // A highlighted row means Enter belongs to the autocomplete, which selects it.
+      const hasHighlightedSshHost =
+        isSshHostPopupVisible && highlightedSshHostRef.current !== undefined;
+      if (
+        !event.defaultPrevented &&
+        !hasHighlightedSshHost &&
+        event.key === "Enter" &&
+        savedBackendSshHost.trim().length > 0
+      ) {
+        event.preventDefault();
+        void handleAddSavedBackend();
+      }
+    },
+    [
+      filteredDiscoveredSshHosts,
+      handleAddSavedBackend,
+      handleSelectSshHostSuggestion,
+      hasSshHostSuggestionContent,
+      keybindings,
+      savedBackendSshHost,
+      sshHostSuggestionsOpen,
+    ],
+  );
+
   const handleConnectSavedBackend = useCallback(
     async (environmentId: EnvironmentId) => {
       setSavedBackendError(null);
@@ -2294,46 +2377,6 @@ export function ConnectionsSettings() {
     [removeEnvironment],
   );
 
-  const handleConnectSshHost = useCallback(
-    async (target: DesktopSshEnvironmentTarget, label?: string) => {
-      setConnectingSshHostAlias(target.alias);
-      if (savedBackendMode === "ssh") {
-        setSavedBackendError(null);
-      } else {
-        setSshConnectionError(null);
-      }
-      const result = await connectSshEnvironment({
-        target,
-        ...(label === undefined ? {} : { label }),
-      });
-      setConnectingSshHostAlias(null);
-      if (result._tag === "Success") {
-        setSavedBackendSshHost("");
-        setSavedBackendSshUsername("");
-        setSavedBackendSshPort("");
-        setAddBackendDialogOpen(false);
-        toastManager.add({
-          type: "success",
-          title: savedDesktopSshEnvironmentsByAlias[target.alias]
-            ? "Environment reconnected"
-            : "Environment connected",
-          description: `${label?.trim() || target.alias} is ready over an SSH-managed tunnel.`,
-        });
-        return;
-      }
-      if (!isAtomCommandInterrupted(result)) {
-        const error = squashAtomCommandFailure(result);
-        const message = formatDesktopSshConnectionError(error);
-        if (savedBackendMode === "ssh") {
-          setSavedBackendError(message);
-        } else {
-          setSshConnectionError(message);
-        }
-      }
-    },
-    [connectSshEnvironment, savedBackendMode, savedDesktopSshEnvironmentsByAlias],
-  );
-
   const visibleDesktopPairingLinks = desktopPairingLinks;
   const tailscaleHttpsEndpoint = useMemo(
     () => desktopAdvertisedEndpoints.find(isTailscaleHttpsEndpoint) ?? null,
@@ -2479,24 +2522,90 @@ export function ConnectionsSettings() {
   const renderSshFields = () => (
     <div className="space-y-4">
       <div className="space-y-3">
-        <label className="block">
-          <span className="mb-1.5 block text-xs font-medium text-foreground">
+        <div className="block">
+          <label
+            htmlFor="saved-backend-ssh-host"
+            className="mb-1.5 block text-xs font-medium text-foreground"
+          >
             SSH host or alias
-          </span>
-          <Input
+          </label>
+          <Autocomplete
+            items={filteredDiscoveredSshHosts}
+            itemToStringValue={(target) => target.alias}
+            mode="none"
+            openOnInputClick
+            open={sshHostSuggestionsOpen}
+            onOpenChange={setSshHostSuggestionsOpen}
+            onItemHighlighted={(target) => {
+              highlightedSshHostRef.current = target;
+            }}
             value={savedBackendSshHost}
-            onChange={(event) => setSavedBackendSshHost(event.target.value)}
-            placeholder="Search hosts or type devbox"
-            disabled={isAddingSavedBackend}
-            spellCheck={false}
-          />
-        </label>
+            onValueChange={(value, eventDetails) => {
+              setSavedBackendSshHost(value);
+              if (eventDetails.reason !== "item-press") return;
+
+              const target = filteredDiscoveredSshHosts.find((host) => host.alias === value);
+              if (target) void handleSelectSshHostSuggestion(target);
+            }}
+          >
+            <AutocompleteInput
+              id="saved-backend-ssh-host"
+              onKeyDown={handleSavedBackendSshHostKeyDown}
+              placeholder="Search hosts or type devbox"
+              disabled={isAddingSavedBackend}
+              spellCheck={false}
+            />
+            {hasSshHostSuggestionContent ? (
+              <AutocompletePopup>
+                {isLoadingDiscoveredSshHosts ? (
+                  <div className="px-3 py-2 text-xs text-muted-foreground">Loading hosts…</div>
+                ) : filteredDiscoveredSshHosts.length > 0 ? (
+                  <AutocompleteList className="max-h-72">
+                    {filteredDiscoveredSshHosts.map((target, index) => {
+                      const address = formatDesktopSshTarget(target);
+                      const shortcutCommand = index < 9 ? threadJumpCommandForIndex(index) : null;
+                      const shortcutLabel = shortcutCommand
+                        ? shortcutLabelForCommand(keybindings, shortcutCommand, navigator.platform)
+                        : null;
+                      return (
+                        <AutocompleteItem
+                          key={`${target.alias}:${target.hostname}:${target.port ?? ""}`}
+                          value={target}
+                          className="h-8 min-h-8 gap-2 whitespace-nowrap"
+                        >
+                          <span className="min-w-0 truncate text-sm font-medium">
+                            {target.alias}
+                          </span>
+                          {address !== target.alias ? (
+                            <span className="min-w-0 flex-1 truncate text-xs text-muted-foreground">
+                              {address}
+                            </span>
+                          ) : (
+                            <span className="flex-1" />
+                          )}
+                          {shortcutLabel ? (
+                            <CommandShortcut className="shrink-0">{shortcutLabel}</CommandShortcut>
+                          ) : null}
+                        </AutocompleteItem>
+                      );
+                    })}
+                  </AutocompleteList>
+                ) : (
+                  <AutocompleteEmpty className="break-all px-3 py-2 text-xs">
+                    No hosts match "{savedBackendSshHost.trim()}".
+                  </AutocompleteEmpty>
+                )}
+              </AutocompletePopup>
+            ) : null}
+          </Autocomplete>
+        </div>
         <div className="grid gap-3 sm:grid-cols-[minmax(0,1fr)_7rem]">
           <label className="block">
             <span className="mb-1.5 block text-xs font-medium text-foreground">Username</span>
             <Input
               value={savedBackendSshUsername}
               onChange={(event) => setSavedBackendSshUsername(event.target.value)}
+              onKeyDown={handleSavedBackendSshFieldKeyDown}
               placeholder="root"
               disabled={isAddingSavedBackend}
               spellCheck={false}
@@ -2507,6 +2616,7 @@ export function ConnectionsSettings() {
             <Input
               value={savedBackendSshPort}
               onChange={(event) => setSavedBackendSshPort(event.target.value)}
+              onKeyDown={handleSavedBackendSshFieldKeyDown}
               placeholder="22"
               inputMode="numeric"
               disabled={isAddingSavedBackend}
@@ -2529,46 +2639,6 @@ export function ConnectionsSettings() {
           {isAddingSavedBackend ? "Adding…" : "Add environment"}
         </Button>
       </div>
-      <div className="overflow-hidden rounded-lg border border-border/60">
-        <div className="flex items-center justify-between gap-3 border-b border-border/60 bg-muted/30 px-3 py-2">
-          <div className="min-w-0">
-            <p className="text-xs font-medium text-foreground">Suggested hosts</p>
-            <p className="text-[11px] text-muted-foreground">From SSH config and known hosts</p>
-          </div>
-          <Button
-            size="xs"
-            variant="ghost"
-            disabled={isLoadingDiscoveredSshHosts}
-            onClick={desktopSshHosts.refresh}
-          >
-            {isLoadingDiscoveredSshHosts ? (
-              <RefreshCwIcon className="size-3 animate-spin" />
-            ) : (
-              <RefreshCwIcon className="size-3" />
-            )}
-            Refresh
-          </Button>
-        </div>
-        <ScrollArea scrollFade className="max-h-56">
-          <div>
-            {unsavedDiscoveredSshHosts.map((target) => (
-              <DesktopSshHostRow
-                key={`${target.alias}:${target.hostname}:${target.port ?? ""}`}
-                target={target}
-                connectingHostAlias={connectingSshHostAlias}
-                onConnect={(nextTarget) => void handleConnectSshHost(nextTarget)}
-              />
-            ))}
-            {hasLoadedDiscoveredSshHosts &&
-            !isLoadingDiscoveredSshHosts &&
-            unsavedDiscoveredSshHosts.length === 0 ? (
-              <div className={ITEM_ROW_CLASSNAME}>
-                <p className="text-xs text-muted-foreground">No new SSH hosts were discovered.</p>
-              </div>
-            ) : null}
-          </div>
-        </ScrollArea>
-      </div>
     </div>
   );
   const renderNetworkAccessToggle = () => (
@@ -3070,6 +3140,18 @@ export function ConnectionsSettings() {
                 }
               />
             ) : null}
+            {primaryEnvironmentId !== null ? (
+              <SettingsRow
+                {...searchableSetting("environment-icon")}
+                description="The machine other devices see this environment as. Automatic uses what the server detected."
+                control={
+                  <EnvironmentIconPicker
+                    environmentId={primaryEnvironmentId}
+                    serverConfig={primaryServerConfig}
+                  />
+                }
+              />
+            ) : null}
             {desktopBridge ? (
               <>
                 {renderNetworkAccessRow()}
diff --git a/apps/web/src/components/settings/EnvironmentIconPicker.test.ts b/apps/web/src/components/settings/EnvironmentIconPicker.test.ts
new file mode 100644
index 000000000000..429b853ddaec
--- /dev/null
+++ b/apps/web/src/components/settings/EnvironmentIconPicker.test.ts
@@ -0,0 +1,41 @@
+import type { ServerConfig } from "@t3tools/contracts";
+import { describe, expect, it } from "vite-plus/test";
+
+import { resolveEnvironmentIconPickerLock } from "./EnvironmentIconPicker";
+
+const config = (environmentIcon: boolean | undefined) =>
+  ({
+    environment: { capabilities: environmentIcon === undefined ? {} : { environmentIcon } },
+  }) as unknown as ServerConfig;
+
+describe("resolveEnvironmentIconPickerLock", () => {
+  it("locks until the environment is connected", () => {
+    expect(
+      resolveEnvironmentIconPickerLock({ serverConfig: null, operateAccess: "granted" }),
+    ).toMatch(/Connect/);
+  });
+
+  it("locks on servers that predate the setting, before looking at permissions", () => {
+    expect(
+      resolveEnvironmentIconPickerLock({
+        serverConfig: config(undefined),
+        operateAccess: "denied",
+      }),
+    ).toMatch(/too old/);
+  });
+
+  it("locks when the session cannot operate the environment", () => {
+    expect(
+      resolveEnvironmentIconPickerLock({ serverConfig: config(true), operateAccess: "denied" }),
+    ).toMatch(/cannot change/);
+  });
+
+  it("stays open while access is still resolving so a slow session does not flicker", () => {
+    expect(
+      resolveEnvironmentIconPickerLock({ serverConfig: config(true), operateAccess: "pending" }),
+    ).toBeNull();
+    expect(
+      resolveEnvironmentIconPickerLock({ serverConfig: config(true), operateAccess: "granted" }),
+    ).toBeNull();
+  });
+});
diff --git a/apps/web/src/components/settings/EnvironmentIconPicker.tsx b/apps/web/src/components/settings/EnvironmentIconPicker.tsx
new file mode 100644
index 000000000000..f990aa5a2441
--- /dev/null
+++ b/apps/web/src/components/settings/EnvironmentIconPicker.tsx
@@ -0,0 +1,161 @@
+import {
+  ENVIRONMENT_MACHINE_KINDS,
+  isEnvironmentMachineKind,
+  resolveEnvironmentMachineKind,
+  type EnvironmentId,
+  type ServerConfig,
+} from "@t3tools/contracts";
+import { useCallback } from "react";
+
+import { isElectron } from "../../env";
+import { usePrimarySessionState } from "../../environments/primary";
+import { useUpdateEnvironmentSettings } from "../../hooks/useSettings";
+import { usePrimaryEnvironmentId } from "../../state/environments";
+import { useEnvironmentSessionState } from "../../state/session";
+import { ENVIRONMENT_MACHINE_KIND_LABELS, EnvironmentMachineIcon } from "../EnvironmentMachineIcon";
+import { Select, SelectItem, SelectPopup, SelectTrigger, SelectValue } from "../ui/select";
+import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
+import {
+  resolvePrimaryOperateAccess,
+  resolveRemoteOperateAccess,
+} from "./ProviderSettingsPanel.logic";
+
+const AUTOMATIC_VALUE = "automatic";
+
+/**
+ * Why the picker is inert, in the order the user can do something about it.
+ * Null means it can be changed.
+ */
+export function resolveEnvironmentIconPickerLock(input: {
+  readonly serverConfig: ServerConfig | null;
+  readonly operateAccess: "granted" | "denied" | "pending";
+}): string | null {
+  if (input.serverConfig === null) {
+    return "Connect to this environment to change its icon.";
+  }
+  if (input.serverConfig.environment.capabilities.environmentIcon !== true) {
+    return "This environment's server is too old to keep an icon. Update it to choose one.";
+  }
+  if (input.operateAccess === "denied") {
+    return "Your session on this environment cannot change its settings.";
+  }
+  return null;
+}
+
+// Same split the provider settings use: the desktop app owns its primary
+// server outright, a browser session on the primary checks its cookie
+// session's scopes, and a remote checks the scopes its own server reports.
+function useEnvironmentOperateAccess(environmentId: EnvironmentId) {
+  const isPrimary = usePrimaryEnvironmentId() === environmentId;
+  const primarySession = usePrimarySessionState();
+  const remoteSession = useEnvironmentSessionState(environmentId);
+  if (isPrimary) {
+    return isElectron
+      ? "granted"
+      : resolvePrimaryOperateAccess({
+          isPrimary: true,
+          hasDesktopBridge: false,
+          session: primarySession.data,
+          isPending: primarySession.isPending,
+          hasError: primarySession.error !== null,
+        });
+  }
+  return resolveRemoteOperateAccess({
+    session: remoteSession.data,
+    isPending: remoteSession.isPending,
+    hasError: remoteSession.hasError,
+  });
+}
+
+/**
+ * Picks the machine glyph an environment wears everywhere it is listed.
+ * "Automatic" clears the override so the server's own detection shows
+ * through; the label says what that currently resolves to so the user can
+ * tell whether detection got it right before overriding. The control stays
+ * visible while locked so the current icon still reads, the same way
+ * server-scoped rows go inert instead of disappearing.
+ */
+export function EnvironmentIconPicker({
+  environmentId,
+  serverConfig,
+  size = "sm",
+}: {
+  readonly environmentId: EnvironmentId;
+  readonly serverConfig: ServerConfig | null;
+  readonly size?: "xs" | "sm";
+}) {
+  const updateSettings = useUpdateEnvironmentSettings(environmentId);
+  const operateAccess = useEnvironmentOperateAccess(environmentId);
+  const lock = resolveEnvironmentIconPickerLock({ serverConfig, operateAccess });
+  const override = serverConfig?.settings.environmentIcon ?? null;
+  const detected = serverConfig?.environment.platform.machine ?? null;
+  const resolved = resolveEnvironmentMachineKind(serverConfig);
+  const value = override ?? AUTOMATIC_VALUE;
+  const automaticLabel =
+    detected === null ? "Automatic" : `Automatic (${ENVIRONMENT_MACHINE_KIND_LABELS[detected]})`;
+
+  const handleValueChange = useCallback(
+    (next: string | null) => {
+      if (next === null) return;
+      if (next === AUTOMATIC_VALUE) {
+        updateSettings({ environmentIcon: null });
+      } else if (isEnvironmentMachineKind(next)) {
+        updateSettings({ environmentIcon: next });
+      }
+    },
+    [updateSettings],
+  );
+
+  const select = (
+    <Select value={value} onValueChange={handleValueChange} disabled={lock !== null}>
+      <SelectTrigger size={size} className="w-full sm:w-52" aria-label="Environment icon">
+        <SelectValue>
+          <span className="flex min-w-0 items-center gap-2">
+            <EnvironmentMachineIcon kind={resolved} className="size-3.5 shrink-0" />
+            <span className="truncate">
+              {override === null ? automaticLabel : ENVIRONMENT_MACHINE_KIND_LABELS[override]}
+            </span>
+          </span>
+        </SelectValue>
+      </SelectTrigger>
+      <SelectPopup align="end" alignItemWithTrigger={false}>
+        <SelectItem hideIndicator value={AUTOMATIC_VALUE}>
+          <span className="flex min-w-0 items-center gap-2">
+            <EnvironmentMachineIcon kind={detected ?? "server"} className="size-3.5 shrink-0" />
+            <span className="truncate">{automaticLabel}</span>
+          </span>
+        </SelectItem>
+        {ENVIRONMENT_MACHINE_KINDS.map((kind) => (
+          <SelectItem hideIndicator key={kind} value={kind}>
+            <span className="flex min-w-0 items-center gap-2">
+              <EnvironmentMachineIcon kind={kind} className="size-3.5 shrink-0" />
+              <span className="truncate">{ENVIRONMENT_MACHINE_KIND_LABELS[kind]}</span>
+            </span>
+          </SelectItem>
+        ))}
+      </SelectPopup>
+    </Select>
+  );
+
+  if (lock === null) {
+    return select;
+  }
+  return (
+    <Tooltip>
+      <TooltipTrigger
+        render={
+          // Focusable so keyboard users can still reach the explanation.
+          <span
+            tabIndex={0}
+            className="flex w-full items-center rounded-md outline-none focus-visible:ring-2 focus-visible:ring-ring sm:w-auto"
+          />
+        }
+      >
+        <span className="flex w-full items-center sm:w-auto">{select}</span>
+      </TooltipTrigger>
+      <TooltipPopup side="top" className="max-w-72">
+        {lock}
+      </TooltipPopup>
+    </Tooltip>
+  );
+}
diff --git a/apps/web/src/components/settings/IntegrationsSettings.tsx b/apps/web/src/components/settings/IntegrationsSettings.tsx
index 62a17b9368e6..803e694c061d 100644
--- a/apps/web/src/components/settings/IntegrationsSettings.tsx
+++ b/apps/web/src/components/settings/IntegrationsSettings.tsx
@@ -8,12 +8,14 @@
  */
 import {
   BROWSER_PROFILE_MAX_COUNT,
+  type BrowserLinkTarget,
   type BrowserProfile,
   type EnvironmentId,
   BROWSER_PROFILE_NAME_MAX_LENGTH,
   BROWSER_RECORDING_FRAME_RATES,
   DEFAULT_BROWSER_AUTO_SHOW_FLOATING_PREVIEW,
   DEFAULT_BROWSER_PROFILE_ID,
+  DEFAULT_BROWSER_LINK_TARGET,
   DEFAULT_BROWSER_RECORDING_FRAME_RATE,
   DEFAULT_BROWSER_VIEWPORT,
   DEFAULT_PREVIEW_APPEARANCE,
@@ -465,6 +467,53 @@ function BrowserRecordingFrameRateSetting({ disabled }: { readonly disabled: boo
   );
 }
 
+const LINK_TARGET_LABELS: Readonly<Record<BrowserLinkTarget, string>> = {
+  system: "Your default browser",
+  app: "T3 Code",
+};
+
+function BrowserLinkTargetSetting({ disabled }: { readonly disabled: boolean }) {
+  const linkTarget = useClientSettings((settings) => settings.browserLinkTarget);
+  const updateSettings = useUpdatePrimarySettings();
+
+  return (
+    <SettingsRow
+      {...searchableSetting("browser-link-target")}
+      description="Where links in the chat and terminal open. Hold ⌘ or Ctrl while clicking a chat link to open it in your default browser either way."
+      resetAction={
+        !disabled && linkTarget !== DEFAULT_BROWSER_LINK_TARGET ? (
+          <SettingResetButton
+            label="link target"
+            onClick={() => updateSettings({ browserLinkTarget: DEFAULT_BROWSER_LINK_TARGET })}
+          />
+        ) : null
+      }
+      control={
+        <Select
+          disabled={disabled}
+          value={linkTarget}
+          onValueChange={(value) => {
+            if (value === "system" || value === "app") {
+              updateSettings({ browserLinkTarget: value });
+            }
+          }}
+        >
+          <SelectTrigger size="sm" className="w-full sm:w-40" aria-label="Open links in">
+            <SelectValue>{LINK_TARGET_LABELS[linkTarget]}</SelectValue>
+          </SelectTrigger>
+          <SelectPopup align="end" alignItemWithTrigger={false}>
+            {(Object.keys(LINK_TARGET_LABELS) as ReadonlyArray<BrowserLinkTarget>).map((target) => (
+              <SelectItem hideIndicator key={target} value={target}>
+                {LINK_TARGET_LABELS[target]}
+              </SelectItem>
+            ))}
+          </SelectPopup>
+        </Select>
+      }
+    />
+  );
+}
+
 function AgentBrowserAccessSetting() {
   const settings = usePrimarySettings();
   const updateSettings = useUpdatePrimarySettings();
@@ -868,6 +917,7 @@ export function IntegrationsSettingsPanel() {
       <BrowserZoomSetting disabled={previewDefaultsDisabled} />
       <BrowserAppearanceSetting disabled={previewDefaultsDisabled} />
       <BrowserRecordingFrameRateSetting disabled={previewDefaultsDisabled} />
+      <BrowserLinkTargetSetting disabled={previewDefaultsDisabled} />
       <BrowserAutoShowFloatingPreviewSetting disabled={previewDefaultsDisabled} />
     </>
   );
diff --git a/apps/web/src/components/settings/ProjectIconPickerDialog.test.tsx b/apps/web/src/components/settings/ProjectIconPickerDialog.test.tsx
new file mode 100644
index 000000000000..9098b359d1ea
--- /dev/null
+++ b/apps/web/src/components/settings/ProjectIconPickerDialog.test.tsx
@@ -0,0 +1,51 @@
+import type { ReactNode } from "react";
+import { renderToStaticMarkup } from "react-dom/server";
+import { describe, expect, it, vi } from "vite-plus/test";
+
+vi.mock("../ui/button", () => ({
+  Button: ({ children }: { readonly children?: ReactNode }) => <button>{children}</button>,
+}));
+
+vi.mock("../ui/dialog", () => {
+  const Container = ({ children }: { readonly children?: ReactNode }) => <div>{children}</div>;
+  return {
+    Dialog: Container,
+    DialogDescription: Container,
+    DialogFooter: Container,
+    DialogHeader: Container,
+    DialogPanel: Container,
+    DialogPopup: Container,
+    DialogTitle: Container,
+  };
+});
+
+vi.mock("../ui/input", () => ({ Input: () => <input /> }));
+vi.mock("../ui/scroll-area", () => ({
+  ScrollArea: ({ children }: { readonly children?: ReactNode }) => <div>{children}</div>,
+}));
+vi.mock("../ui/toggle-group", () => ({
+  Toggle: ({ children, value }: { readonly children?: ReactNode; readonly value: string }) => (
+    <button data-value={value}>{children}</button>
+  ),
+  ToggleGroup: ({
+    children,
+    value,
+  }: {
+    readonly children?: ReactNode;
+    readonly value: readonly string[];
+  }) => <div data-current={value.join(",")}>{children}</div>,
+}));
+
+import { ProjectIconPickerDialog } from "./ProjectIconPickerDialog";
+
+describe("ProjectIconPickerDialog", () => {
+  it("shows emoji first and selects it for an automatic project", () => {
+    const markup = renderToStaticMarkup(
+      <ProjectIconPickerDialog current={null} open onOpenChange={() => {}} onSelect={() => {}} />,
+    );
+
+    expect(markup).toContain('data-current="emoji"');
+    expect(markup.indexOf(">Emoji<")).toBeLessThan(markup.indexOf(">Icons<"));
+    expect(markup).toContain("Or paste any emoji");
+  });
+});
diff --git a/apps/web/src/components/settings/ProjectIconPickerDialog.tsx b/apps/web/src/components/settings/ProjectIconPickerDialog.tsx
new file mode 100644
index 000000000000..4ecdb0f653c5
--- /dev/null
+++ b/apps/web/src/components/settings/ProjectIconPickerDialog.tsx
@@ -0,0 +1,205 @@
+import type { ProjectIconColor, ProjectIconOverride } from "@t3tools/contracts";
+import { DynamicIcon, type IconName } from "lucide-react/dynamic";
+import { useEffect, useMemo, useRef, useState } from "react";
+import {
+  filterProjectIconNames,
+  firstEmoji,
+  PROJECT_EMOJIS,
+  PROJECT_ICON_COLORS,
+  projectIconColorClassName,
+} from "../../projectIconOptions";
+import { cn } from "~/lib/utils";
+import { Button } from "../ui/button";
+import {
+  Dialog,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogPanel,
+  DialogPopup,
+  DialogTitle,
+} from "../ui/dialog";
+import { Input } from "../ui/input";
+import { ScrollArea } from "../ui/scroll-area";
+import { Toggle, ToggleGroup } from "../ui/toggle-group";
+
+const DEFAULT_ICON: IconName = "folder-code";
+const DEFAULT_COLOR: ProjectIconColor = "blue";
+
+function iconLabel(name: string): string {
+  return name
+    .split("-")
+    .map((part) => part.charAt(0).toUpperCase() + part.slice(1))
+    .join(" ");
+}
+
+export function ProjectIconPickerDialog({
+  current,
+  open,
+  onOpenChange,
+  onSelect,
+}: {
+  readonly current: ProjectIconOverride | null;
+  readonly open: boolean;
+  readonly onOpenChange: (open: boolean) => void;
+  readonly onSelect: (icon: ProjectIconOverride) => void;
+}) {
+  const [mode, setMode] = useState<"lucide" | "emoji">(
+    current?.kind === "lucide" ? "lucide" : "emoji",
+  );
+  const [iconName, setIconName] = useState<IconName>(
+    current?.kind === "lucide" ? (current.name as IconName) : DEFAULT_ICON,
+  );
+  const [color, setColor] = useState<ProjectIconColor>(
+    current?.kind === "lucide" ? current.color : DEFAULT_COLOR,
+  );
+  const [emoji, setEmoji] = useState(current?.kind === "emoji" ? current.emoji : "💻");
+  const [query, setQuery] = useState("");
+  const [customEmoji, setCustomEmoji] = useState("");
+  const previousOpenRef = useRef(false);
+
+  useEffect(() => {
+    if (open && !previousOpenRef.current) {
+      setMode(current?.kind === "lucide" ? "lucide" : "emoji");
+      setIconName(current?.kind === "lucide" ? (current.name as IconName) : DEFAULT_ICON);
+      setColor(current?.kind === "lucide" ? current.color : DEFAULT_COLOR);
+      setEmoji(current?.kind === "emoji" ? current.emoji : "💻");
+      setQuery("");
+      setCustomEmoji("");
+    }
+    previousOpenRef.current = open;
+  }, [current, open]);
+
+  const icons = useMemo(() => filterProjectIconNames(query), [query]);
+  const selectedColorClassName = projectIconColorClassName(color);
+  const save = () => {
+    onSelect(
+      mode === "lucide" ? { kind: "lucide", name: iconName, color } : { kind: "emoji", emoji },
+    );
+    onOpenChange(false);
+  };
+
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogPopup className="w-full sm:w-[32rem]">
+        <DialogHeader>
+          <DialogTitle>Choose project icon</DialogTitle>
+          <DialogDescription>Pick an emoji, or choose any Lucide icon and color.</DialogDescription>
+        </DialogHeader>
+        <DialogPanel className="flex min-h-0 flex-col gap-4">
+          <ToggleGroup
+            aria-label="Icon type"
+            variant="segmented"
+            value={[mode]}
+            onValueChange={(next) => {
+              const value = next[0];
+              if (value === "lucide" || value === "emoji") setMode(value);
+            }}
+          >
+            <Toggle value="emoji">Emoji</Toggle>
+            <Toggle value="lucide">Icons</Toggle>
+          </ToggleGroup>
+
+          {mode === "lucide" ? (
+            <>
+              <div>
+                <div className="mb-2 text-xs font-medium text-muted-foreground">Color</div>
+                <div className="flex flex-wrap gap-1.5" role="group" aria-label="Icon color">
+                  {PROJECT_ICON_COLORS.map((option) => (
+                    <button
+                      key={option.value}
+                      type="button"
+                      aria-label={option.label}
+                      aria-pressed={color === option.value}
+                      className={cn(
+                        "flex size-6 items-center justify-center rounded-full border border-transparent outline-none focus-visible:ring-2 focus-visible:ring-ring",
+                        color === option.value && "border-foreground/64",
+                      )}
+                      onClick={() => setColor(option.value)}
+                    >
+                      <span className={cn("size-4 rounded-full", option.swatchClassName)} />
+                    </button>
+                  ))}
+                </div>
+              </div>
+              <Input
+                type="search"
+                value={query}
+                aria-label="Search Lucide icons"
+                placeholder="Search all Lucide icons"
+                onChange={(event) => setQuery(event.currentTarget.value)}
+              />
+              <ScrollArea scrollFade className="max-h-64">
+                <div className="grid grid-cols-8 gap-1 p-0.5 sm:grid-cols-10">
+                  {icons.map((name) => (
+                    <button
+                      key={name}
+                      type="button"
+                      aria-label={iconLabel(name)}
+                      aria-pressed={iconName === name}
+                      className={cn(
+                        "flex aspect-square items-center justify-center rounded-md border border-transparent outline-none hover:bg-accent focus-visible:ring-2 focus-visible:ring-ring",
+                        iconName === name && "border-border bg-accent",
+                        selectedColorClassName,
+                      )}
+                      onClick={() => setIconName(name)}
+                    >
+                      <DynamicIcon name={name} className="size-5" />
+                    </button>
+                  ))}
+                </div>
+              </ScrollArea>
+              {icons.length === 0 ? (
+                <p className="py-8 text-center text-sm text-muted-foreground">No icons found.</p>
+              ) : null}
+            </>
+          ) : (
+            <>
+              <ScrollArea scrollFade className="max-h-64">
+                <div className="grid grid-cols-8 gap-1 p-0.5 sm:grid-cols-10">
+                  {PROJECT_EMOJIS.map((option) => (
+                    <button
+                      key={option.emoji}
+                      type="button"
+                      aria-label={option.label}
+                      aria-pressed={emoji === option.emoji}
+                      className={cn(
+                        "flex aspect-square items-center justify-center rounded-md border border-transparent text-xl outline-none hover:bg-accent focus-visible:ring-2 focus-visible:ring-ring",
+                        emoji === option.emoji && "border-border bg-accent",
+                      )}
+                      onClick={() => setEmoji(option.emoji)}
+                    >
+                      {option.emoji}
+                    </button>
+                  ))}
+                </div>
+              </ScrollArea>
+              <div>
+                <div className="mb-2 text-xs font-medium text-muted-foreground">
+                  Or paste any emoji
+                </div>
+                <Input
+                  value={customEmoji}
+                  aria-label="Custom emoji"
+                  placeholder="Paste an emoji"
+                  onChange={(event) => {
+                    const value = event.currentTarget.value;
+                    setCustomEmoji(value);
+                    const nextEmoji = firstEmoji(value);
+                    if (nextEmoji) setEmoji(nextEmoji);
+                  }}
+                />
+              </div>
+            </>
+          )}
+        </DialogPanel>
+        <DialogFooter>
+          <Button variant="outline" onClick={() => onOpenChange(false)}>
+            Cancel
+          </Button>
+          <Button onClick={save}>Save icon</Button>
+        </DialogFooter>
+      </DialogPopup>
+    </Dialog>
+  );
+}
diff --git a/apps/web/src/components/settings/ProjectSettingsPanel.tsx b/apps/web/src/components/settings/ProjectSettingsPanel.tsx
index 913e529c4b42..891e219eb598 100644
--- a/apps/web/src/components/settings/ProjectSettingsPanel.tsx
+++ b/apps/web/src/components/settings/ProjectSettingsPanel.tsx
@@ -15,6 +15,7 @@ import {
 import type {
   ContextMenuItem,
   ModelSelection,
+  ProjectIconOverride,
   ProviderDriverKind,
   SidebarProjectGroupingMode,
   T3ProjectFileScript,
@@ -27,6 +28,8 @@ import { useCanGoBack, useNavigate } from "@tanstack/react-router";
 import * as Cause from "effect/Cause";
 import { ChevronDownIcon, CopyIcon, PlusIcon, SettingsIcon, Trash2Icon } from "lucide-react";
 import {
+  lazy,
+  Suspense,
   useCallback,
   useEffect,
   useMemo,
@@ -118,6 +121,12 @@ import {
 } from "./ProjectFaviconPickerDialog";
 import { projectGroupTitleNeedsUpdate } from "./ProjectSettingsPanel.logic";
 
+const ProjectIconPickerDialog = lazy(() =>
+  import("./ProjectIconPickerDialog").then((module) => ({
+    default: module.ProjectIconPickerDialog,
+  })),
+);
+
 export const PROJECT_GROUPING_MODE_LABELS: Record<SidebarProjectGroupingMode, string> = {
   repository: "Group by repository",
   repository_path: "Group by repository path",
@@ -335,6 +344,7 @@ function ProjectDetail({ group }: { group: SidebarProjectSnapshot }) {
   });
 
   const faviconPath = representative.faviconPath ?? null;
+  const projectIcon = representative.projectIcon ?? null;
   const pickProjectFavicon =
     typeof window !== "undefined" &&
     group.memberProjects.every(
@@ -375,6 +385,7 @@ function ProjectDetail({ group }: { group: SidebarProjectSnapshot }) {
         defaultThreadEnvMode: ThreadEnvMode | null;
         autoPull: boolean;
         faviconPath: string | null;
+        projectIcon: ProjectIconOverride | null;
       }>,
       failureTitle: string,
     ): Promise<AtomCommandResult<void, unknown>> => {
@@ -474,17 +485,18 @@ function ProjectDetail({ group }: { group: SidebarProjectSnapshot }) {
     [updateAllMembers],
   );
 
-  // ----- favicon -----
+  // ----- project icon -----
   const [faviconPickerOpen, setFaviconPickerOpen] = useState(false);
+  const [iconPickerOpen, setIconPickerOpen] = useState(false);
   const [isSavingFavicon, setIsSavingFavicon] = useState(false);
   const savingFaviconRef = useRef(false);
-  const setFaviconPath = useCallback(
-    async (faviconPath: string | null) => {
+  const setProjectIcon = useCallback(
+    async (input: { faviconPath: string | null; projectIcon: ProjectIconOverride | null }) => {
       if (savingFaviconRef.current) return;
       savingFaviconRef.current = true;
       setIsSavingFavicon(true);
       try {
-        await updateAllMembers({ faviconPath }, "Failed to update project icon");
+        await updateAllMembers(input, "Failed to update project icon");
       } finally {
         savingFaviconRef.current = false;
         setIsSavingFavicon(false);
@@ -824,13 +836,19 @@ function ProjectDetail({ group }: { group: SidebarProjectSnapshot }) {
           />
           <SettingsRow
             title="Project icon"
-            description={faviconPath ?? "Automatic"}
+            description={
+              projectIcon?.kind === "lucide"
+                ? `${projectIcon.name} · ${projectIcon.color}`
+                : projectIcon?.kind === "emoji"
+                  ? projectIcon.emoji
+                  : (faviconPath ?? "Automatic")
+            }
             resetAction={
-              faviconPath !== null ? (
+              faviconPath !== null || projectIcon !== null ? (
                 <SettingResetButton
                   label="project icon"
                   disabled={isSavingFavicon}
-                  onClick={() => void setFaviconPath(null)}
+                  onClick={() => void setProjectIcon({ faviconPath: null, projectIcon: null })}
                 />
               ) : null
             }
@@ -839,9 +857,21 @@ function ProjectDetail({ group }: { group: SidebarProjectSnapshot }) {
                 <ProjectFavicon
                   environmentId={representative.environmentId}
                   cwd={representative.workspaceRoot}
+                  projectName={group.displayName}
                   faviconPath={faviconPath}
+                  projectIcon={projectIcon}
                   className="size-6"
                 />
+                <Button
+                  size="sm"
+                  variant="outline"
+                  type="button"
+                  aria-label="Choose a project icon"
+                  disabled={isSavingFavicon}
+                  onClick={() => setIconPickerOpen(true)}
+                >
+                  Choose icon
+                </Button>
                 <Button
                   size="sm"
                   variant="outline"
@@ -1239,10 +1269,20 @@ function ProjectDetail({ group }: { group: SidebarProjectSnapshot }) {
         {...(pickProjectFavicon
           ? { onPickExternal: () => pickProjectFavicon(representative.workspaceRoot) }
           : {})}
-        onSelect={(path) => void setFaviconPath(path)}
+        onSelect={(path) => void setProjectIcon({ faviconPath: path, projectIcon: null })}
         open={faviconPickerOpen}
         projectName={group.displayName}
       />
+      {iconPickerOpen ? (
+        <Suspense fallback={null}>
+          <ProjectIconPickerDialog
+            current={projectIcon}
+            open
+            onOpenChange={setIconPickerOpen}
+            onSelect={(icon) => void setProjectIcon({ faviconPath: null, projectIcon: icon })}
+          />
+        </Suspense>
+      ) : null}
     </>
   );
 }
diff --git a/apps/web/src/components/settings/ProviderSettingsPanel.tsx b/apps/web/src/components/settings/ProviderSettingsPanel.tsx
index fa59187fa062..2e525b7ded51 100644
--- a/apps/web/src/components/settings/ProviderSettingsPanel.tsx
+++ b/apps/web/src/components/settings/ProviderSettingsPanel.tsx
@@ -12,6 +12,7 @@ import {
   ProviderDriverKind,
   type ProviderInstanceConfig,
   type ProviderInstanceId,
+  resolveEnvironmentMachineKind,
   resolveProviderInstanceEnabled,
 } from "@t3tools/contracts";
 import { DEFAULT_UNIFIED_SETTINGS } from "@t3tools/contracts/settings";
@@ -23,22 +24,14 @@ import * as Arr from "effect/Array";
 import * as Duration from "effect/Duration";
 import * as Equal from "effect/Equal";
 import * as Result from "effect/Result";
-import {
-  ChevronDownIcon,
-  CloudIcon,
-  LaptopIcon,
-  LoaderIcon,
-  MonitorIcon,
-  PlusIcon,
-  RefreshCwIcon,
-  TerminalIcon,
-} from "lucide-react";
+import { ChevronDownIcon, LoaderIcon, PlusIcon, RefreshCwIcon } from "lucide-react";
 import { useCallback, useEffect, useMemo, useRef, useState, type ReactNode } from "react";
 
 import { isDesktopLocalConnectionTarget } from "../../connection/desktopLocal";
 import { isElectron } from "../../env";
 import { usePrimarySessionState } from "../../environments/primary";
 import { useEnvironmentSettings, useUpdateEnvironmentSettings } from "../../hooks/useSettings";
+import { EnvironmentMachineIcon } from "../EnvironmentMachineIcon";
 import { cn } from "../../lib/utils";
 import { resolveAppModelSelectionState } from "../../modelSelection";
 import {
@@ -152,14 +145,6 @@ function ProviderLastChecked({ lastCheckedAt }: { lastCheckedAt: string | null }
   );
 }
 
-function providerEnvironmentIcon(environment: EnvironmentPresentation) {
-  if (environment.entry.target._tag === "PrimaryConnectionTarget") return MonitorIcon;
-  if (environment.entry.target._tag === "RelayConnectionTarget") return CloudIcon;
-  if (environment.entry.target._tag === "SshConnectionTarget") return TerminalIcon;
-  if (isDesktopLocalConnectionTarget(environment.entry.target)) return LaptopIcon;
-  return CloudIcon;
-}
-
 function providerEnvironmentDetail(environment: EnvironmentPresentation): string {
   if (environment.entry.target._tag === "PrimaryConnectionTarget") return "Primary device";
   if (environment.relayManaged) return "T3 Connect";
@@ -259,7 +244,7 @@ function ProviderSettingsPanelContent() {
           className="flex h-full w-max min-w-full border-b border-border/70 px-1"
         >
           {options.map((environment) => {
-            const Icon = providerEnvironmentIcon(environment);
+            const machine = resolveEnvironmentMachineKind(environment.serverConfig);
             const selected = environment.environmentId === effectiveEnvironmentId;
             const detail = providerEnvironmentDetail(environment);
             const statusText = connectionStatusText(environment.connection);
@@ -273,7 +258,11 @@ function ProviderSettingsPanelContent() {
                       className={cn(providerSettingsTabClassName(selected), "gap-2 text-left")}
                       onClick={() => setSelectedEnvironmentId(environment.environmentId)}
                     >
-                      <Icon className="size-3.5 shrink-0" aria-hidden />
+                      <EnvironmentMachineIcon
+                        kind={machine}
+                        className="size-3.5 shrink-0"
+                        aria-hidden
+                      />
                       <span className="max-w-40 truncate">{environment.label}</span>
                       {environment.connection.phase !== "connected" ? (
                         <ConnectionStatusDot
diff --git a/apps/web/src/components/settings/SettingsPanels.logic.test.ts b/apps/web/src/components/settings/SettingsPanels.logic.test.ts
index 490d248595f9..b99c69ee331f 100644
--- a/apps/web/src/components/settings/SettingsPanels.logic.test.ts
+++ b/apps/web/src/components/settings/SettingsPanels.logic.test.ts
@@ -269,6 +269,7 @@ describe("getChangedBrowserSettingLabels", () => {
         browserDefaultZoomFactor: 1.5,
         browserDefaultAppearance: "dark",
         browserRecordingFrameRate: 60,
+        browserLinkTarget: "app",
         browserAutoShowFloatingPreview: !DEFAULT_UNIFIED_SETTINGS.browserAutoShowFloatingPreview,
       }),
     ).toEqual([
@@ -276,6 +277,7 @@ describe("getChangedBrowserSettingLabels", () => {
       "Browser zoom",
       "Browser appearance",
       "Recording frame rate",
+      "Open links in",
       "Floating preview",
     ]);
   });
diff --git a/apps/web/src/components/settings/SettingsPanels.logic.ts b/apps/web/src/components/settings/SettingsPanels.logic.ts
index 331391dbc464..3ac6bbaa0017 100644
--- a/apps/web/src/components/settings/SettingsPanels.logic.ts
+++ b/apps/web/src/components/settings/SettingsPanels.logic.ts
@@ -115,6 +115,7 @@ export type BrowserDefaultSettings = Pick<
   | "browserDefaultZoomFactor"
   | "browserDefaultAppearance"
   | "browserRecordingFrameRate"
+  | "browserLinkTarget"
   | "browserAutoShowFloatingPreview"
 >;
 
@@ -155,6 +156,9 @@ export function getChangedBrowserSettingLabels(settings: BrowserDefaultSettings)
     ...(settings.browserRecordingFrameRate !== DEFAULT_UNIFIED_SETTINGS.browserRecordingFrameRate
       ? ["Recording frame rate"]
       : []),
+    ...(settings.browserLinkTarget !== DEFAULT_UNIFIED_SETTINGS.browserLinkTarget
+      ? ["Open links in"]
+      : []),
     ...(settings.browserAutoShowFloatingPreview !==
     DEFAULT_UNIFIED_SETTINGS.browserAutoShowFloatingPreview
       ? ["Floating preview"]
diff --git a/apps/web/src/components/settings/SettingsPanels.tsx b/apps/web/src/components/settings/SettingsPanels.tsx
index e30704e93daa..c01d33a6074b 100644
--- a/apps/web/src/components/settings/SettingsPanels.tsx
+++ b/apps/web/src/components/settings/SettingsPanels.tsx
@@ -20,6 +20,7 @@ import {
   DEFAULT_ENVIRONMENT_IDENTIFICATION_MODE,
   DEFAULT_SIDEBAR_ARTWORK_OVERRIDE,
   DEFAULT_UNIFIED_SETTINGS,
+  type DiffLayout,
   type EnvironmentIdentificationMode,
   MAX_APPEARANCE_CONTRAST,
   MAX_CODE_FONT_SIZE,
@@ -169,6 +170,11 @@ const TIMESTAMP_FORMAT_LABELS = {
   "24-hour": "24-hour",
 } as const;
 
+const DIFF_LAYOUT_LABELS: Record<DiffLayout, string> = {
+  stacked: "Stacked",
+  split: "Split",
+};
+
 const QUIT_CONFIRMATION_MODE_LABELS: Record<QuitConfirmationMode, string> = {
   direct: "Direct",
   hold: "Hold",
@@ -528,6 +534,7 @@ export function useSettingsRestore(onRestored?: () => void) {
       ...(settings.diffIgnoreWhitespace !== DEFAULT_UNIFIED_SETTINGS.diffIgnoreWhitespace
         ? ["Diff whitespace changes"]
         : []),
+      ...(settings.diffLayout !== DEFAULT_UNIFIED_SETTINGS.diffLayout ? ["Diff layout"] : []),
       ...(settings.proactivePanelsEnabled !== DEFAULT_UNIFIED_SETTINGS.proactivePanelsEnabled
         ? ["Proactive panels"]
         : []),
@@ -583,6 +590,7 @@ export function useSettingsRestore(onRestored?: () => void) {
       settings.browserDefaultZoomFactor,
       settings.browserDefaultAppearance,
       settings.browserRecordingFrameRate,
+      settings.browserLinkTarget,
       settings.browserAutoShowFloatingPreview,
       settings.appearanceContrast,
       settings.enableAgentBrowserAccess,
@@ -594,6 +602,7 @@ export function useSettingsRestore(onRestored?: () => void) {
       settings.defaultThreadEnvMode,
       settings.newWorktreesStartFromOrigin,
       settings.diffIgnoreWhitespace,
+      settings.diffLayout,
       settings.proactivePanelsEnabled,
       settings.environmentIdentificationMode,
       settings.sidebarArtworkOverride,
@@ -691,6 +700,7 @@ export function useSettingsRestore(onRestored?: () => void) {
       timestampFormat: DEFAULT_UNIFIED_SETTINGS.timestampFormat,
       wordWrap: DEFAULT_UNIFIED_SETTINGS.wordWrap,
       diffIgnoreWhitespace: DEFAULT_UNIFIED_SETTINGS.diffIgnoreWhitespace,
+      diffLayout: DEFAULT_UNIFIED_SETTINGS.diffLayout,
       proactivePanelsEnabled: DEFAULT_UNIFIED_SETTINGS.proactivePanelsEnabled,
       showSkillsInSlashMenu: DEFAULT_UNIFIED_SETTINGS.showSkillsInSlashMenu,
       contextWindowMeterEnabled: DEFAULT_UNIFIED_SETTINGS.contextWindowMeterEnabled,
@@ -729,6 +739,7 @@ export function useSettingsRestore(onRestored?: () => void) {
       browserDefaultZoomFactor: DEFAULT_UNIFIED_SETTINGS.browserDefaultZoomFactor,
       browserDefaultAppearance: DEFAULT_UNIFIED_SETTINGS.browserDefaultAppearance,
       browserRecordingFrameRate: DEFAULT_UNIFIED_SETTINGS.browserRecordingFrameRate,
+      browserLinkTarget: DEFAULT_UNIFIED_SETTINGS.browserLinkTarget,
       browserAutoShowFloatingPreview: DEFAULT_UNIFIED_SETTINGS.browserAutoShowFloatingPreview,
       // Re-granted like any other default. The confirmation dialog lists it by
       // name, so a user restoring defaults is told the agent regains access
@@ -2237,6 +2248,41 @@ export function GeneralSettingsPanel() {
           }
         />
 
+        <SettingsRow
+          {...searchableSetting("diff-layout")}
+          description="Show diffs stacked or side by side. The toggle in the diff toolbar changes this too."
+          resetAction={
+            settings.diffLayout !== DEFAULT_UNIFIED_SETTINGS.diffLayout ? (
+              <SettingResetButton
+                label="diff layout"
+                onClick={() => updateSettings({ diffLayout: DEFAULT_UNIFIED_SETTINGS.diffLayout })}
+              />
+            ) : null
+          }
+          control={
+            <Select
+              value={settings.diffLayout}
+              onValueChange={(value) => {
+                if (value === "stacked" || value === "split") {
+                  updateSettings({ diffLayout: value });
+                }
+              }}
+            >
+              <SelectTrigger size="sm" className="w-full sm:w-40" aria-label="Diff layout">
+                <SelectValue>{DIFF_LAYOUT_LABELS[settings.diffLayout]}</SelectValue>
+              </SelectTrigger>
+              <SelectPopup align="end" alignItemWithTrigger={false}>
+                <SelectItem hideIndicator value="stacked">
+                  {DIFF_LAYOUT_LABELS.stacked}
+                </SelectItem>
+                <SelectItem hideIndicator value="split">
+                  {DIFF_LAYOUT_LABELS.split}
+                </SelectItem>
+              </SelectPopup>
+            </Select>
+          }
+        />
+
         <SettingsRow
           {...searchableSetting("proactive-panels")}
           description="Automatically open the linked pull request when it appears and the turn diff when agent work finishes."
@@ -2790,6 +2836,7 @@ export function ArchivedThreadsPanel() {
                 name: project.title,
                 cwd: project.workspaceRoot,
                 faviconPath: project.faviconPath,
+                projectIcon: project.projectIcon,
               },
             ] as const,
         ),
@@ -2915,7 +2962,9 @@ export function ArchivedThreadsPanel() {
               <ProjectFavicon
                 environmentId={project.environmentId}
                 cwd={project.cwd}
+                projectName={project.name}
                 faviconPath={project.faviconPath}
+                projectIcon={project.projectIcon}
               />
             }
           >
diff --git a/apps/web/src/components/settings/ThemeSearchSection.tsx b/apps/web/src/components/settings/ThemeSearchSection.tsx
index 14919e09ba22..b270bf7b8e4d 100644
--- a/apps/web/src/components/settings/ThemeSearchSection.tsx
+++ b/apps/web/src/components/settings/ThemeSearchSection.tsx
@@ -204,13 +204,12 @@ export function ThemeSearchSection({
       return;
     }
     void runSearch(debouncedQuery);
-    // `installingId` and `sortBy` are deliberately not dependencies: the
-    // guards above read the current values from the fresh render closure. An
-    // install finishing reruns the search only when the query or sort changed
-    // while it was in flight (checked via lastSearchKeyRef, recorded only
-    // once a search succeeds), so the install error the user needs to see is
-    // preserved across that rerun.
-    // eslint-disable-next-line react-hooks/exhaustive-deps
+    // `sortBy` is deliberately not a direct dependency: the guards above read
+    // the current value from the fresh render closure. An install finishing
+    // reruns the search only when the query or sort changed while it was in
+    // flight (checked via lastSearchKeyRef, recorded only once a search
+    // succeeds), so the install error the user needs to see is preserved
+    // across that rerun.
   }, [open, query, debouncedQuery, installingId, runSearch]);
 
   const handleSortChange = useCallback((value: OpenVsxThemeSort | null) => {
diff --git a/apps/web/src/components/settings/settingsSearch.test.ts b/apps/web/src/components/settings/settingsSearch.test.ts
index d672c044559a..1db8cbfb81e2 100644
--- a/apps/web/src/components/settings/settingsSearch.test.ts
+++ b/apps/web/src/components/settings/settingsSearch.test.ts
@@ -207,4 +207,12 @@ describe("searchSettings", () => {
     });
     expect(result).not.toHaveProperty("targetId");
   });
+
+  it("routes where links open to integrations", () => {
+    expect(searchSettings("open links in")[0]).toMatchObject({
+      id: "browser-link-target",
+      to: "/settings/integrations",
+    });
+    expect(searchSettings("external links")[0]).toMatchObject({ id: "browser-link-target" });
+  });
 });
diff --git a/apps/web/src/components/settings/settingsSearch.ts b/apps/web/src/components/settings/settingsSearch.ts
index e48bb971ec94..69ce8e5e99db 100644
--- a/apps/web/src/components/settings/settingsSearch.ts
+++ b/apps/web/src/components/settings/settingsSearch.ts
@@ -185,6 +185,12 @@ export const SETTINGS_SEARCH_ITEMS = [
     to: "/settings/general",
     searchTerms: ["diff ignore spaces edits default"],
   },
+  {
+    id: "diff-layout",
+    title: "Diff layout",
+    to: "/settings/general",
+    searchTerms: ["stacked split side by side unified inline view"],
+  },
   {
     id: "proactive-panels",
     title: "Proactive panels",
@@ -359,6 +365,12 @@ export const SETTINGS_SEARCH_ITEMS = [
     title: "Browser recording frame rate",
     to: "/settings/integrations",
   },
+  {
+    id: "browser-link-target",
+    title: "Open links in",
+    to: "/settings/integrations",
+    searchTerms: ["links default browser in-app browser external open"],
+  },
   {
     id: "browser-auto-show-floating-preview",
     title: "Auto-show floating preview",
@@ -407,6 +419,14 @@ export const SETTINGS_SEARCH_ITEMS = [
     ],
     primaryOnly: true,
   },
+  {
+    id: "environment-icon",
+    title: "Environment icon",
+    to: "/settings/connections",
+    targetId: "connections-environment",
+    searchTerms: ["machine glyph sidebar mac mini studio laptop desktop server cloud vm"],
+    localBackendManagementOnly: true,
+  },
   {
     id: "network-access",
     title: "Network access",
diff --git a/apps/web/src/components/sidebar/SidebarChrome.tsx b/apps/web/src/components/sidebar/SidebarChrome.tsx
index f0b08b9a2061..2c47e1348eb4 100644
--- a/apps/web/src/components/sidebar/SidebarChrome.tsx
+++ b/apps/web/src/components/sidebar/SidebarChrome.tsx
@@ -91,7 +91,7 @@ function SidebarBrand({ onBackdrop }: { onBackdrop: boolean }) {
       <T3Wordmark aria-label="T3" className="h-2.5 w-auto shrink-0" />
       <span
         className={cn(
-          "-translate-y-px truncate text-sm font-medium tracking-tight",
+          "truncate text-sm font-medium tracking-tight",
           onBackdrop ? "text-white/70" : "text-muted-foreground",
         )}
       >
diff --git a/apps/web/src/components/ui/badge.tsx b/apps/web/src/components/ui/badge.tsx
index 67ae978f59a5..32275cc41616 100644
--- a/apps/web/src/components/ui/badge.tsx
+++ b/apps/web/src/components/ui/badge.tsx
@@ -20,7 +20,9 @@ const badgeVariants = cva(
         default:
           "h-5.5 min-w-5.5 px-[calc(--spacing(1)-1px)] text-sm sm:h-4.5 sm:min-w-4.5 sm:text-xs",
         lg: "h-6.5 min-w-6.5 px-[calc(--spacing(1.5)-1px)] text-base sm:h-5.5 sm:min-w-5.5 sm:text-sm",
-        sm: "h-5 min-w-5 rounded-[.25rem] px-[calc(--spacing(1)-1px)] text-xs sm:h-4 sm:min-w-4 sm:text-[.625rem]",
+        // leading-none: with the inherited fractional leading the rounded font metrics
+        // leave the label sitting high in the fixed-height box, worse under renderer zoom.
+        sm: "h-5 min-w-5 rounded-[.25rem] px-[calc(--spacing(1)-1px)] text-xs leading-none sm:h-4 sm:min-w-4 sm:text-[.625rem]",
       },
       variant: {
         default: "bg-primary text-primary-foreground [button&,a&]:hover:bg-primary/90",
diff --git a/apps/web/src/components/ui/button.tsx b/apps/web/src/components/ui/button.tsx
index 257aaa051f8f..726b436f1bb4 100644
--- a/apps/web/src/components/ui/button.tsx
+++ b/apps/web/src/components/ui/button.tsx
@@ -8,7 +8,7 @@ import type * as React from "react";
 import { cn } from "~/lib/utils";
 
 const buttonVariants = cva(
-  "[--control-icon-color:currentColor] [&_svg]:-mx-0.5 relative inline-flex shrink-0 cursor-pointer items-center justify-center gap-2 whitespace-nowrap rounded-[var(--control-radius)] border font-medium text-base outline-none transition-shadow before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--control-radius)-1px)] pointer-coarse:after:absolute pointer-coarse:after:size-full pointer-coarse:after:min-h-11 pointer-coarse:after:min-w-11 focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background disabled:pointer-events-none disabled:opacity-64 sm:text-sm [&_svg:not([class*='text-'])]:text-[var(--control-icon-color)] [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+  "[--control-icon-color:currentColor] [&_svg]:-mx-0.5 relative inline-flex shrink-0 cursor-pointer items-center justify-center gap-2 whitespace-nowrap rounded-[var(--control-radius)] border font-medium text-base outline-none transition-[box-shadow,scale] active:scale-[0.97] before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--control-radius)-1px)] pointer-coarse:after:absolute pointer-coarse:after:size-full pointer-coarse:after:min-h-11 pointer-coarse:after:min-w-11 focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background disabled:pointer-events-none disabled:opacity-64 sm:text-sm [&_svg:not([class*='text-'])]:text-[var(--control-icon-color)] [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
   {
     defaultVariants: {
       size: "default",
diff --git a/apps/web/src/components/ui/command.test.tsx b/apps/web/src/components/ui/command.test.tsx
deleted file mode 100644
index bd03b2712d37..000000000000
--- a/apps/web/src/components/ui/command.test.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import { renderToStaticMarkup } from "react-dom/server";
-import { describe, expect, it } from "vite-plus/test";
-
-import { Command, CommandFooter, CommandInput } from "./command";
-
-describe("command compact geometry", () => {
-  it("keeps shell selectors on the wrapper and direct-input padding on AutocompleteInput", () => {
-    const html = renderToStaticMarkup(
-      <Command>
-        <CommandInput placeholder="Search commands" />
-      </Command>,
-    );
-    const shellClass = html.match(/class="([^"]*px-\[var\(--command-shell-inset\)[^"]*)"/)?.[1];
-    const inputClass = html.match(/class="([^"]*has-focus-visible:ring-0[^"]*)"/)?.[1];
-
-    expect(shellClass).toContain(
-      "[&amp;_[data-slot=autocomplete-start-addon]]:ps-[calc(var(--command-shell-inset)+0.0625rem)]",
-    );
-    expect(shellClass).not.toContain("sm:*:data-[slot=autocomplete-input]");
-    expect(inputClass).toContain(
-      "sm:*:data-[slot=autocomplete-input]:ps-[calc(var(--command-shell-inset)+1.5rem)]!",
-    );
-  });
-
-  it("uses the semantic footer inset without changing compact vertical padding", () => {
-    const html = renderToStaticMarkup(<CommandFooter>Shortcuts</CommandFooter>);
-
-    expect(html).toContain("px-[var(--command-content-inset)]");
-    expect(html).toContain("py-2.5");
-  });
-});
diff --git a/apps/web/src/diffPanelStore.test.ts b/apps/web/src/diffPanelStore.test.ts
index 7e7c95921f05..f1d774f9cbfc 100644
--- a/apps/web/src/diffPanelStore.test.ts
+++ b/apps/web/src/diffPanelStore.test.ts
@@ -11,30 +11,9 @@ describe("diffPanelStore", () => {
     useDiffPanelStore.setState({
       byThreadKey: {},
       branchBaseRefByThreadKey: {},
-      diffRenderMode: "stacked",
     }),
   );
 
-  it("keeps the selected render mode in panel and persisted state", async () => {
-    useDiffPanelStore.getState().setDiffRenderMode("split");
-
-    expect(useDiffPanelStore.getState().diffRenderMode).toBe("split");
-    expect(
-      useDiffPanelStore.persist.getOptions().partialize?.(useDiffPanelStore.getState()),
-    ).toMatchObject({ diffRenderMode: "split" });
-
-    const { name, storage } = useDiffPanelStore.persist.getOptions();
-    if (!name) throw new Error("Expected diff panel persistence to have a storage name");
-    const persisted = await storage?.getItem(name);
-    expect(persisted?.state).toMatchObject({ diffRenderMode: "split" });
-
-    useDiffPanelStore.setState({ diffRenderMode: "stacked" });
-    if (persisted) await storage?.setItem(name, persisted);
-    await useDiffPanelStore.persist.rehydrate();
-
-    expect(useDiffPanelStore.getState().diffRenderMode).toBe("split");
-  });
-
   it("defaults each thread to branch changes when the working tree is clean", () => {
     expect(
       selectThreadDiffPanelSelection(useDiffPanelStore.getState().byThreadKey, THREAD_REF),
diff --git a/apps/web/src/diffPanelStore.ts b/apps/web/src/diffPanelStore.ts
index ebb560a23832..56b5ad23fecc 100644
--- a/apps/web/src/diffPanelStore.ts
+++ b/apps/web/src/diffPanelStore.ts
@@ -10,16 +10,12 @@ export type DiffPanelSelection =
   | { kind: "unstaged" }
   | { kind: "turn"; turnId: TurnId; filePath: string | null; revealRequestId: number };
 
-export type DiffRenderMode = "stacked" | "split";
-
 const DEFAULT_SELECTION: DiffPanelSelection = { kind: "branch", baseRef: null };
 const DEFAULT_WORKING_TREE_SELECTION: DiffPanelSelection = { kind: "unstaged" };
 
 interface DiffPanelStoreState {
   byThreadKey: Record<string, DiffPanelSelection>;
   branchBaseRefByThreadKey: Record<string, string | null>;
-  diffRenderMode: DiffRenderMode;
-  setDiffRenderMode: (mode: DiffRenderMode) => void;
   selectGitScope: (ref: ScopedThreadRef, scope: "branch" | "unstaged") => void;
   selectBranchBaseRef: (ref: ScopedThreadRef, baseRef: string | null) => void;
   selectTurn: (ref: ScopedThreadRef, turnId: TurnId, filePath?: string) => void;
@@ -37,8 +33,6 @@ export const useDiffPanelStore = create<DiffPanelStoreState>()(
     (set) => ({
       byThreadKey: {},
       branchBaseRefByThreadKey: {},
-      diffRenderMode: "stacked",
-      setDiffRenderMode: (diffRenderMode) => set({ diffRenderMode }),
       selectGitScope: (ref, scope) =>
         set((state) => {
           const threadKey = scopedThreadKey(ref);
@@ -132,7 +126,6 @@ export const useDiffPanelStore = create<DiffPanelStoreState>()(
       partialize: (state) => ({
         byThreadKey: state.byThreadKey,
         branchBaseRefByThreadKey: state.branchBaseRefByThreadKey,
-        diffRenderMode: state.diffRenderMode,
       }),
     },
   ),
diff --git a/apps/web/src/filePathDisplay.ts b/apps/web/src/filePathDisplay.ts
index 5a6e2a02e100..fc197a4092b5 100644
--- a/apps/web/src/filePathDisplay.ts
+++ b/apps/web/src/filePathDisplay.ts
@@ -1,22 +1,18 @@
-import { splitPathAndPosition } from "./terminal-links";
+import {
+  fileBasename,
+  formatFilePathPosition,
+  splitFilePathPosition,
+  stripSlashPrefixedWindowsDrive,
+} from "@t3tools/client-runtime/markdown-links";
 
 function normalizePathSeparators(path: string): string {
   return path.replaceAll("\\", "/");
 }
 
-function canonicalizeWindowsDrivePath(path: string): string {
-  return /^\/[A-Za-z]:\//.test(path) ? path.slice(1) : path;
-}
-
 function trimTrailingPathSeparators(path: string): string {
   return path.replace(/[\\/]+$/, "");
 }
 
-function basenameOfPath(path: string): string {
-  const separatorIndex = Math.max(path.lastIndexOf("/"), path.lastIndexOf("\\"));
-  return separatorIndex >= 0 ? path.slice(separatorIndex + 1) : path;
-}
-
 function stripRelativePrefixes(path: string): string {
   return path.replace(/^\.\/+/, "").replace(/^\/+/, "");
 }
@@ -25,15 +21,15 @@ export function formatWorkspaceRelativePath(
   pathWithPosition: string,
   workspaceRoot: string | undefined,
 ): string {
-  const { path, line, column } = splitPathAndPosition(pathWithPosition);
-  const normalizedPath = canonicalizeWindowsDrivePath(normalizePathSeparators(path));
+  const position = splitFilePathPosition(pathWithPosition);
+  const normalizedPath = stripSlashPrefixedWindowsDrive(normalizePathSeparators(position.path));
 
   let displayPath = normalizedPath;
   if (workspaceRoot) {
-    const normalizedWorkspaceRoot = canonicalizeWindowsDrivePath(
+    const normalizedWorkspaceRoot = stripSlashPrefixedWindowsDrive(
       normalizePathSeparators(trimTrailingPathSeparators(workspaceRoot)),
     );
-    const workspaceLabel = basenameOfPath(normalizedWorkspaceRoot);
+    const workspaceLabel = fileBasename(normalizedWorkspaceRoot);
     const pathForCompare = normalizedPath.toLowerCase();
     const workspaceForCompare = normalizedWorkspaceRoot.toLowerCase();
     const workspaceWithSeparator = `${workspaceForCompare}/`;
@@ -52,6 +48,5 @@ export function formatWorkspaceRelativePath(
     }
   }
 
-  if (!line) return displayPath;
-  return `${displayPath}:${line}${column ? `:${column}` : ""}`;
+  return formatFilePathPosition({ ...position, path: displayPath });
 }
diff --git a/apps/web/src/hooks/useTheme.ts b/apps/web/src/hooks/useTheme.ts
index e729335f96ba..726a03dac7b8 100644
--- a/apps/web/src/hooks/useTheme.ts
+++ b/apps/web/src/hooks/useTheme.ts
@@ -356,8 +356,7 @@ function applyTheme(theme: Theme, { suppressTransitions = false, preservePreview
   syncDesktopTheme(theme, followSystem, appearanceMode);
   if (suppressTransitions) {
     // Force a reflow so the no-transitions class takes effect before removal
-    // oxlint-disable-next-line no-unused-expressions
-    document.documentElement.offsetHeight;
+    void document.documentElement.offsetHeight;
     requestAnimationFrame(() => {
       document.documentElement.classList.remove("no-transitions");
     });
diff --git a/apps/web/src/keybindings.test.ts b/apps/web/src/keybindings.test.ts
index 6055fd05ce33..56c13cf7d27b 100644
--- a/apps/web/src/keybindings.test.ts
+++ b/apps/web/src/keybindings.test.ts
@@ -109,6 +109,11 @@ const DEFAULT_BINDINGS = compile([
     command: "terminal.close",
     whenAst: whenIdentifier("terminalFocus"),
   },
+  {
+    shortcut: modShortcut("w"),
+    command: "rightPanel.close",
+    whenAst: whenNot(whenIdentifier("terminalFocus")),
+  },
   {
     shortcut: modShortcut("d"),
     command: "diff.toggle",
@@ -762,6 +767,24 @@ describe("resolveShortcutCommand", () => {
     );
   });
 
+  it("routes mod+w to the terminal while focused and to the right panel otherwise", () => {
+    const closeEvent = event({ key: "w", metaKey: true });
+    assert.strictEqual(
+      resolveShortcutCommand(closeEvent, DEFAULT_BINDINGS, {
+        platform: "MacIntel",
+        context: { terminalFocus: true },
+      }),
+      "terminal.close",
+    );
+    assert.strictEqual(
+      resolveShortcutCommand(closeEvent, DEFAULT_BINDINGS, {
+        platform: "MacIntel",
+        context: { terminalFocus: false },
+      }),
+      "rightPanel.close",
+    );
+  });
+
   it("resolves a custom right panel maximize binding", () => {
     const keybindings = compile([
       {
diff --git a/apps/web/src/lib/attachmentUploadQueue.ts b/apps/web/src/lib/attachmentUploadQueue.ts
index b2556bb4c41e..79c1092f94d0 100644
--- a/apps/web/src/lib/attachmentUploadQueue.ts
+++ b/apps/web/src/lib/attachmentUploadQueue.ts
@@ -333,7 +333,7 @@ async function runUpload(job: UploadJob): Promise<void> {
 }
 
 function pumpUploads(): void {
-  for (let index = 0; index < queue.length; ) {
+  for (let index = 0; index < queue.length;) {
     const job = queue[index]!;
     const active = activeUploadsByEnvironment.get(job.environmentId) ?? 0;
     if (active >= MAX_UPLOADS_PER_ENVIRONMENT) {
diff --git a/apps/web/src/lib/openPullRequestLink.ts b/apps/web/src/lib/openPullRequestLink.ts
index 810956c52794..785305fcd282 100644
--- a/apps/web/src/lib/openPullRequestLink.ts
+++ b/apps/web/src/lib/openPullRequestLink.ts
@@ -11,8 +11,8 @@ import { type MouseEvent, useCallback } from "react";
 
 import { pullRequestHostOf, type SourceControlProviderKind } from "@t3tools/contracts";
 
+import { useOpenLink } from "../browser/useOpenLink";
 import { stackedThreadToast, toastManager } from "../components/ui/toast";
-import { readLocalApi } from "../localApi";
 import { useRightPanelStore } from "../rightPanelStore";
 import type { EnvironmentProject } from "@t3tools/client-runtime/state/shell";
 
@@ -328,6 +328,7 @@ export function useOpenChangeRequestLink(
 
 export function useOpenPrLink(threadRef?: ScopedThreadRef) {
   const openChangeRequest = useOpenChangeRequestLink(threadRef);
+  const openLink = useOpenLink(threadRef);
   return useCallback(
     (event: MouseEvent<HTMLElement>, prUrl: string, targetThreadRef?: ScopedThreadRef) => {
       event.stopPropagation();
@@ -342,16 +343,9 @@ export function useOpenPrLink(threadRef?: ScopedThreadRef) {
       event.preventDefault();
       if (!openInBrowser && openChangeRequest(event, prUrl, targetThreadRef)) return true;
 
-      const api = readLocalApi();
-      if (!api) {
-        toastManager.add({
-          type: "error",
-          title: "Link opening is unavailable.",
-        });
-        return false;
-      }
-
-      void openPullRequestLink(api.shell, prUrl).catch((error) => {
+      // No project to show it in, so it is an ordinary link and follows the
+      // "Open links in" setting; the modifier still forces the system browser.
+      void openLink(prUrl, { event, threadRef: targetThreadRef }).catch((error: unknown) => {
         console.error(error);
         toastManager.add(
           stackedThreadToast({
@@ -363,6 +357,6 @@ export function useOpenPrLink(threadRef?: ScopedThreadRef) {
       });
       return false;
     },
-    [openChangeRequest],
+    [openChangeRequest, openLink],
   );
 }
diff --git a/apps/web/src/markdown-links.test.ts b/apps/web/src/markdown-links.test.ts
index 3b3bad7b25e3..e3b1cc5b2249 100644
--- a/apps/web/src/markdown-links.test.ts
+++ b/apps/web/src/markdown-links.test.ts
@@ -270,8 +270,15 @@ describe("resolveMarkdownFileLinkTarget", () => {
     ).toBe("D:/Programme/t3code/apps/web/src/components/ChatMarkdown.tsx:1");
   });
 
-  it("does not treat app routes as file links", () => {
+  it("does not treat app routes as file links, even with a line anchor", () => {
     expect(resolveMarkdownFileLinkTarget("/chat/settings")).toBeNull();
+    expect(resolveMarkdownFileLinkTarget("/chat/settings#L3", "/repo")).toBeNull();
+  });
+
+  it("decodes an encoded drive colon in a file uri before dropping its slash", () => {
+    expect(resolveMarkdownFileLinkTarget("file:///c%3A/Users/x/shot.png")).toBe(
+      "c:/Users/x/shot.png",
+    );
   });
 });
 
diff --git a/apps/web/src/markdown-links.ts b/apps/web/src/markdown-links.ts
index d55c9e1cd16c..8ed59eb8775b 100644
--- a/apps/web/src/markdown-links.ts
+++ b/apps/web/src/markdown-links.ts
@@ -1,53 +1,21 @@
 import {
+  fileBasename,
+  formatFilePathPosition,
   inlineCodeFilePathCandidate,
-  isConventionalFilePosition,
+  isRelativeFilePath,
+  normalizeMarkdownLinkDestination,
+  parseFileUrlHref,
+  parseMarkdownFileLink,
+  safeDecodeURIComponent,
+  splitFilePathPosition,
+  workspaceRelativeFilePath,
 } from "@t3tools/client-runtime/markdown-links";
 
 import { formatWorkspaceRelativePath } from "./filePathDisplay";
-import {
-  isTerminalLinkActivation,
-  resolvePathLinkTarget,
-  splitPathAndPosition,
-} from "./terminal-links";
+import { isTerminalLinkActivation, resolvePathLinkTarget } from "./terminal-links";
+
+export { normalizeMarkdownLinkDestination };
 
-const WINDOWS_DRIVE_PATH_PATTERN = /^[A-Za-z]:[\\/]/;
-const WINDOWS_UNC_PATH_PATTERN = /^\\\\/;
-const EXTERNAL_SCHEME_PATTERN = /^([A-Za-z][A-Za-z0-9+.-]*):(.*)$/;
-const RELATIVE_PATH_PREFIX_PATTERN = /^(~\/|\.{1,2}\/)/;
-const RELATIVE_FILE_PATH_PATTERN =
-  /^(?:[A-Za-z0-9._-]+(?: +[A-Za-z0-9._-]+)*\/)+[A-Za-z0-9._-]+(?: +[A-Za-z0-9._-]+)*(?::\d+){0,2}$/;
-const RELATIVE_FILE_NAME_PATTERN =
-  /^[A-Za-z0-9._-]+(?: +[A-Za-z0-9._-]+)*\.[A-Za-z0-9_-]+(?::\d+){0,2}$/;
-const POSITION_SUFFIX_PATTERN = /:\d+(?::\d+)?$/;
-const POSITION_ONLY_PATTERN = /^\d+(?::\d+)?$/;
-// Standard OS and dev-container roots; deliberately excludes app-route-ish
-// prefixes like /app/ or /chat/ so SPA routes never read as files.
-const POSIX_FILE_ROOT_PREFIXES = [
-  "/Users/",
-  "/home/",
-  "/tmp/",
-  "/var/",
-  "/etc/",
-  "/opt/",
-  "/mnt/",
-  "/Volumes/",
-  "/private/",
-  "/root/",
-  "/usr/",
-  "/bin/",
-  "/sbin/",
-  "/lib/",
-  "/lib64/",
-  "/srv/",
-  "/dev/",
-  "/proc/",
-  "/sys/",
-  "/run/",
-  "/boot/",
-  "/media/",
-  "/workspace/",
-  "/workspaces/",
-] as const;
 const MARKDOWN_LINK_HREF_PATTERN =
   /\[[^\]]*]\(\s*(?:<([^>\n]+)>|([^\s)]+))(?:\s+["'][^"']*["'])?\s*\)/g;
 
@@ -81,112 +49,14 @@ export function shouldOpenMarkdownFileLinkInBrowserByDefault(path: string): bool
   return /\.pdf$/i.test(path.split(/[?#]/, 1)[0] ?? "");
 }
 
-function safeDecode(value: string): string {
-  try {
-    return decodeURIComponent(value);
-  } catch {
-    return value;
-  }
-}
-
 export function isWindowsDrivePathHref(href: string): boolean {
-  return WINDOWS_DRIVE_PATH_PATTERN.test(safeDecode(href));
-}
-
-function unwrapMarkdownLinkDestination(value: string): string {
-  return value.startsWith("<") && value.endsWith(">") ? value.slice(1, -1) : value;
-}
-
-export function normalizeMarkdownLinkDestination(value: string): string {
-  return unwrapMarkdownLinkDestination(value.trim());
-}
-
-function stripSearchAndHash(value: string): { path: string; hash: string } {
-  const hashIndex = value.indexOf("#");
-  const pathWithSearch = hashIndex >= 0 ? value.slice(0, hashIndex) : value;
-  const rawHash = hashIndex >= 0 ? value.slice(hashIndex) : "";
-  const queryIndex = pathWithSearch.indexOf("?");
-  const path = queryIndex >= 0 ? pathWithSearch.slice(0, queryIndex) : pathWithSearch;
-  return { path, hash: rawHash };
-}
-
-function normalizeWindowsDrivePath(path: string): string {
-  return /^\/[A-Za-z]:[\\/]/.test(path) ? path.slice(1) : path;
-}
-
-function parseFileUrlHref(
-  href: string,
-  options?: { readonly decodePath?: boolean },
-): { path: string; hash: string } | null {
-  try {
-    const parsed = new URL(href);
-    if (parsed.protocol.toLowerCase() !== "file:") return null;
-
-    const uncHostname = parsed.hostname.toLowerCase() === "localhost" ? "" : parsed.hostname;
-    const rawPath = uncHostname
-      ? `\\\\${uncHostname}${parsed.pathname.replaceAll("/", "\\")}`
-      : parsed.pathname;
-    if (rawPath.length === 0) return null;
-
-    // Browser URL parser encodes "C:/foo" as "/C:/foo" for file URLs.
-    const normalizedPath = normalizeWindowsDrivePath(rawPath);
-
-    return {
-      path: options?.decodePath === false ? normalizedPath : safeDecode(normalizedPath),
-      hash: parsed.hash,
-    };
-  } catch {
-    return null;
-  }
+  return /^[A-Za-z]:[\\/]/.test(safeDecodeURIComponent(href));
 }
 
 export function rewriteMarkdownFileUriHref(href: string | undefined): string | null {
   if (!href) return null;
-  const normalizedHref = normalizeMarkdownLinkDestination(href);
-  const target = parseFileUrlHref(normalizedHref, { decodePath: false });
-  if (!target) return null;
-  return `${target.path}${target.hash}`;
-}
-
-function looksLikePosixFilesystemPath(path: string): boolean {
-  if (!path.startsWith("/")) return false;
-  if (POSIX_FILE_ROOT_PREFIXES.some((prefix) => path.startsWith(prefix))) return true;
-  if (POSITION_SUFFIX_PATTERN.test(path)) return true;
-  const basename = path.slice(path.lastIndexOf("/") + 1);
-  return /\.[A-Za-z0-9_-]+$/.test(basename);
-}
-
-function appendLineColumnFromHash(path: string, hash: string): string {
-  if (!hash || POSITION_SUFFIX_PATTERN.test(path)) return path;
-  const match = hash.match(/^#L(\d+)(?:C(\d+))?$/i);
-  if (!match?.[1]) return path;
-  const line = match[1];
-  const column = match[2];
-  return `${path}:${line}${column ? `:${column}` : ""}`;
-}
-
-function isLikelyPathCandidate(path: string): boolean {
-  if (WINDOWS_DRIVE_PATH_PATTERN.test(path) || WINDOWS_UNC_PATH_PATTERN.test(path)) return true;
-  if (RELATIVE_PATH_PREFIX_PATTERN.test(path)) return true;
-  if (path.startsWith("/")) return looksLikePosixFilesystemPath(path);
-  return RELATIVE_FILE_PATH_PATTERN.test(path) || RELATIVE_FILE_NAME_PATTERN.test(path);
-}
-
-function isRelativePath(path: string): boolean {
-  return (
-    RELATIVE_PATH_PREFIX_PATTERN.test(path) ||
-    (!path.startsWith("/") &&
-      !WINDOWS_DRIVE_PATH_PATTERN.test(path) &&
-      !WINDOWS_UNC_PATH_PATTERN.test(path))
-  );
-}
-
-function hasExternalScheme(path: string): boolean {
-  const match = path.match(EXTERNAL_SCHEME_PATTERN);
-  if (!match) return false;
-  const rest = match[2] ?? "";
-  if (rest.startsWith("//")) return true;
-  return !POSITION_ONLY_PATTERN.test(rest);
+  const target = parseFileUrlHref(normalizeMarkdownLinkDestination(href));
+  return target ? `${target.path}${target.hash}` : null;
 }
 
 /**
@@ -200,34 +70,11 @@ export function resolveMarkdownFileLinkTarget(
   baseDir: string | undefined = cwd,
 ): string | null {
   if (!href) return null;
-  const rawHref = normalizeMarkdownLinkDestination(href);
-  if (rawHref.length === 0 || rawHref.startsWith("#") || rawHref.startsWith("//")) return null;
-
-  const fileUrlTarget = rawHref.toLowerCase().startsWith("file:")
-    ? parseFileUrlHref(rawHref)
-    : null;
-  const source = fileUrlTarget ?? stripSearchAndHash(rawHref);
-  const decodedPath = normalizeWindowsDrivePath(
-    fileUrlTarget ? source.path.trim() : safeDecode(source.path.trim()),
-  );
-  const decodedHash = safeDecode(source.hash.trim());
-
-  if (decodedPath.length === 0) return null;
-  if (
-    !WINDOWS_DRIVE_PATH_PATTERN.test(decodedPath) &&
-    !WINDOWS_UNC_PATH_PATTERN.test(decodedPath) &&
-    hasExternalScheme(decodedPath)
-  ) {
-    return null;
-  }
-
-  if (!isLikelyPathCandidate(decodedPath)) return null;
-
-  const pathWithPosition = appendLineColumnFromHash(decodedPath, decodedHash);
-  if (!isRelativePath(pathWithPosition)) {
-    return pathWithPosition;
-  }
+  const target = parseMarkdownFileLink(href);
+  if (!target) return null;
 
+  const pathWithPosition = formatFilePathPosition(target);
+  if (!isRelativeFilePath(pathWithPosition)) return pathWithPosition;
   if (!baseDir) return null;
   return resolvePathLinkTarget(pathWithPosition, baseDir);
 }
@@ -246,38 +93,7 @@ export function resolveInlineCodeFileLinkMeta(
   const candidate = inlineCodeFilePathCandidate(codeText);
   if (candidate === null) return null;
 
-  const resolved = resolveMarkdownFileLinkMeta(candidate, cwd, baseDir);
-  if (resolved) return resolved;
-
-  // `Makefile:12` — conventional extensionless names fail the generic
-  // markdown-link candidate patterns, but here the :line suffix already
-  // marked the span as a file reference.
-  if (baseDir && isConventionalFilePosition(candidate)) {
-    return buildFileLinkMetaFromTarget(resolvePathLinkTarget(candidate, baseDir), cwd);
-  }
-  return null;
-}
-
-function basenameOfPath(path: string): string {
-  // A trailing separator is a valid way to write a directory, so trim it before
-  // taking the final segment. Without this the segment reads as empty and the
-  // chip renders with no label at all.
-  const trimmed = path.replace(/[/\\]+$/, "") || path;
-  const separatorIndex = Math.max(trimmed.lastIndexOf("/"), trimmed.lastIndexOf("\\"));
-  return separatorIndex >= 0 ? trimmed.slice(separatorIndex + 1) : trimmed;
-}
-
-function workspaceRelativePath(path: string, workspaceRoot: string | undefined): string | null {
-  if (!workspaceRoot) return null;
-  const normalizedPath = normalizeWindowsDrivePath(path.replaceAll("\\", "/"));
-  const normalizedRoot = normalizeWindowsDrivePath(workspaceRoot.replaceAll("\\", "/")).replace(
-    /\/+$/,
-    "",
-  );
-  const pathForCompare = normalizedPath.toLowerCase();
-  const rootForCompare = normalizedRoot.toLowerCase();
-  if (!pathForCompare.startsWith(`${rootForCompare}/`)) return null;
-  return normalizedPath.slice(normalizedRoot.length + 1);
+  return resolveMarkdownFileLinkMeta(candidate, cwd, baseDir);
 }
 
 export function resolveMarkdownFileLinkMeta(
@@ -291,19 +107,14 @@ export function resolveMarkdownFileLinkMeta(
 }
 
 function buildFileLinkMetaFromTarget(targetPath: string, cwd?: string): MarkdownFileLinkMeta {
-  const { path, line, column } = splitPathAndPosition(targetPath);
-  const parsedLine = line ? Number.parseInt(line, 10) : Number.NaN;
-  const parsedColumn = column ? Number.parseInt(column, 10) : Number.NaN;
-  const lineNumber = Number.isFinite(parsedLine) ? parsedLine : undefined;
-  const columnNumber = Number.isFinite(parsedColumn) ? parsedColumn : undefined;
-
+  const { path, line, column } = splitFilePathPosition(targetPath);
   return {
     filePath: path,
     targetPath,
     displayPath: formatWorkspaceRelativePath(targetPath, cwd),
-    workspaceRelativePath: workspaceRelativePath(path, cwd),
-    basename: basenameOfPath(path),
-    ...(lineNumber !== undefined ? { line: lineNumber } : {}),
-    ...(columnNumber !== undefined ? { column: columnNumber } : {}),
+    workspaceRelativePath: workspaceRelativeFilePath(path, cwd),
+    basename: fileBasename(path),
+    ...(line !== undefined ? { line } : {}),
+    ...(column !== undefined ? { column } : {}),
   };
 }
diff --git a/apps/web/src/pierre-tree-theme.ts b/apps/web/src/pierre-tree-theme.ts
new file mode 100644
index 000000000000..1c7bd7f2d53b
--- /dev/null
+++ b/apps/web/src/pierre-tree-theme.ts
@@ -0,0 +1,22 @@
+import type { CSSProperties } from "react";
+
+/** Shadow-root overrides that make a Pierre file tree read as part of the app chrome. */
+export const PIERRE_TREE_UNSAFE_CSS = `
+  :host {
+    --trees-bg-override: transparent;
+    --trees-selected-bg-override: color-mix(in srgb, currentColor 12%, transparent);
+    --trees-hover-bg-override: color-mix(in srgb, currentColor 7%, transparent);
+    --trees-border-color-override: color-mix(in srgb, currentColor 14%, transparent);
+    --trees-font-family-override: var(--font-sans);
+    --trees-font-size-override: 12px;
+  }
+  button[data-type='item'] { border-radius: 5px; }
+`;
+
+/** Host styles that keep a Pierre tree on the active color scheme and foreground. */
+export function pierreTreeStyle(colorScheme: "light" | "dark"): CSSProperties {
+  return {
+    colorScheme,
+    ["--trees-fg-override" as string]: "var(--contrast-foreground)",
+  };
+}
diff --git a/apps/web/src/projectIconColors.ts b/apps/web/src/projectIconColors.ts
new file mode 100644
index 000000000000..0cf071b4debe
--- /dev/null
+++ b/apps/web/src/projectIconColors.ts
@@ -0,0 +1,125 @@
+import type { ProjectIconColor } from "@t3tools/contracts";
+
+export const PROJECT_ICON_COLORS: ReadonlyArray<{
+  readonly value: ProjectIconColor;
+  readonly label: string;
+  readonly className: string;
+  readonly swatchClassName: string;
+}> = [
+  {
+    value: "gray",
+    label: "Gray",
+    className: "text-gray-600 dark:text-gray-400",
+    swatchClassName: "bg-gray-500",
+  },
+  {
+    value: "red",
+    label: "Red",
+    className: "text-red-600 dark:text-red-400",
+    swatchClassName: "bg-red-500",
+  },
+  {
+    value: "orange",
+    label: "Orange",
+    className: "text-orange-600 dark:text-orange-400",
+    swatchClassName: "bg-orange-500",
+  },
+  {
+    value: "amber",
+    label: "Amber",
+    className: "text-amber-600 dark:text-amber-400",
+    swatchClassName: "bg-amber-500",
+  },
+  {
+    value: "yellow",
+    label: "Yellow",
+    className: "text-yellow-600 dark:text-yellow-400",
+    swatchClassName: "bg-yellow-500",
+  },
+  {
+    value: "lime",
+    label: "Lime",
+    className: "text-lime-600 dark:text-lime-400",
+    swatchClassName: "bg-lime-500",
+  },
+  {
+    value: "green",
+    label: "Green",
+    className: "text-green-600 dark:text-green-400",
+    swatchClassName: "bg-green-500",
+  },
+  {
+    value: "emerald",
+    label: "Emerald",
+    className: "text-emerald-600 dark:text-emerald-400",
+    swatchClassName: "bg-emerald-500",
+  },
+  {
+    value: "teal",
+    label: "Teal",
+    className: "text-teal-600 dark:text-teal-400",
+    swatchClassName: "bg-teal-500",
+  },
+  {
+    value: "cyan",
+    label: "Cyan",
+    className: "text-cyan-600 dark:text-cyan-400",
+    swatchClassName: "bg-cyan-500",
+  },
+  {
+    value: "sky",
+    label: "Sky",
+    className: "text-sky-600 dark:text-sky-400",
+    swatchClassName: "bg-sky-500",
+  },
+  {
+    value: "blue",
+    label: "Blue",
+    className: "text-blue-600 dark:text-blue-400",
+    swatchClassName: "bg-blue-500",
+  },
+  {
+    value: "indigo",
+    label: "Indigo",
+    className: "text-indigo-600 dark:text-indigo-400",
+    swatchClassName: "bg-indigo-500",
+  },
+  {
+    value: "violet",
+    label: "Violet",
+    className: "text-violet-600 dark:text-violet-400",
+    swatchClassName: "bg-violet-500",
+  },
+  {
+    value: "purple",
+    label: "Purple",
+    className: "text-purple-600 dark:text-purple-400",
+    swatchClassName: "bg-purple-500",
+  },
+  {
+    value: "fuchsia",
+    label: "Fuchsia",
+    className: "text-fuchsia-600 dark:text-fuchsia-400",
+    swatchClassName: "bg-fuchsia-500",
+  },
+  {
+    value: "pink",
+    label: "Pink",
+    className: "text-pink-600 dark:text-pink-400",
+    swatchClassName: "bg-pink-500",
+  },
+  {
+    value: "rose",
+    label: "Rose",
+    className: "text-rose-600 dark:text-rose-400",
+    swatchClassName: "bg-rose-500",
+  },
+];
+
+const PROJECT_ICON_COLOR_CLASSES = Object.fromEntries(
+  PROJECT_ICON_COLORS.map(({ value, className }) => [value, className]),
+) as Record<ProjectIconColor, string>;
+
+export function projectIconColorClassName(color: ProjectIconColor): string {
+  return PROJECT_ICON_COLOR_CLASSES[color];
+}
diff --git a/apps/web/src/projectIconModel.test.ts b/apps/web/src/projectIconModel.test.ts
new file mode 100644
index 000000000000..a2d6842d9695
--- /dev/null
+++ b/apps/web/src/projectIconModel.test.ts
@@ -0,0 +1,37 @@
+import { describe, expect, it } from "vite-plus/test";
+import { PROJECT_ICON_NAMES, selectProjectIcon } from "./projectIconModel";
+
+describe("selectProjectIcon", () => {
+  it.each([
+    ["customer-api", "server"],
+    ["AnalyticsDatabase", "database"],
+    ["ios-client", "mobile"],
+    ["terraform-infra", "cloud"],
+    ["developer-docs", "book"],
+    ["shop-frontend", "shopping"],
+    ["agent-runtime", "ai"],
+    ["video-studio", "video"],
+  ] as const)("classifies %s as %s", (projectName, expectedIcon) => {
+    expect(selectProjectIcon(projectName, `/workspace/${projectName}`).icon).toBe(expectedIcon);
+  });
+
+  it("uses the workspace directory when the project name is blank", () => {
+    expect(selectProjectIcon("", "C:\\work\\mobile-app").icon).toBe("mobile");
+  });
+
+  it("uses emoji for automatic project icons", () => {
+    expect(selectProjectIcon("agent-runtime", "/workspace/agent-runtime")).toEqual({
+      kind: "emoji",
+      icon: "ai",
+      emoji: "🤖",
+    });
+  });
+
+  it("gives unknown names a stable generic icon", () => {
+    const icon = selectProjectIcon("mercury", "/workspace/mercury");
+
+    expect(icon.kind).toBe("emoji");
+    expect(PROJECT_ICON_NAMES).toContain(icon.icon);
+    expect(selectProjectIcon("mercury", "/elsewhere/mercury")).toEqual(icon);
+  });
+});
diff --git a/apps/web/src/projectIconModel.ts b/apps/web/src/projectIconModel.ts
new file mode 100644
index 000000000000..6f32e6381010
--- /dev/null
+++ b/apps/web/src/projectIconModel.ts
@@ -0,0 +1,221 @@
+export const PROJECT_ICON_NAMES = [
+  "ai",
+  "book",
+  "cloud",
+  "database",
+  "desktop",
+  "game",
+  "image",
+  "mobile",
+  "music",
+  "package",
+  "security",
+  "server",
+  "shopping",
+  "terminal",
+  "test",
+  "video",
+  "web",
+  "code",
+  "braces",
+  "circuit",
+  "folder-code",
+  "layers",
+] as const;
+
+export type ProjectIconName = (typeof PROJECT_ICON_NAMES)[number];
+
+export type ProjectIconSelection =
+  | { readonly kind: "lucide"; readonly icon: ProjectIconName }
+  | { readonly kind: "emoji"; readonly icon: ProjectIconName; readonly emoji: string };
+
+interface ProjectIconClass {
+  readonly icon: ProjectIconName;
+  readonly terms: ReadonlyArray<string>;
+}
+
+const PROJECT_ICON_MODEL: ReadonlyArray<ProjectIconClass> = [
+  { icon: "ai", terms: ["ai", "agent", "bot", "gpt", "llm", "ml", "model", "neural"] },
+  {
+    icon: "mobile",
+    terms: ["android", "expo", "ios", "mobile", "native", "reactnative", "swift"],
+  },
+  {
+    icon: "desktop",
+    terms: ["desktop", "electron", "linux", "mac", "macos", "tauri", "windows"],
+  },
+  {
+    icon: "book",
+    terms: ["book", "docs", "documentation", "guide", "handbook", "manual", "wiki"],
+  },
+  {
+    icon: "security",
+    terms: ["auth", "identity", "oauth", "security", "sso", "vault"],
+  },
+  {
+    icon: "database",
+    terms: [
+      "analytics",
+      "data",
+      "database",
+      "db",
+      "mongo",
+      "mysql",
+      "postgres",
+      "redis",
+      "sql",
+      "storage",
+    ],
+  },
+  {
+    icon: "cloud",
+    terms: [
+      "aws",
+      "azure",
+      "cloud",
+      "deploy",
+      "devops",
+      "docker",
+      "gcp",
+      "infra",
+      "kubernetes",
+      "terraform",
+    ],
+  },
+  {
+    icon: "server",
+    terms: ["api", "backend", "gateway", "server", "service", "worker"],
+  },
+  {
+    icon: "terminal",
+    terms: ["automation", "bash", "cli", "command", "script", "shell", "terminal"],
+  },
+  {
+    icon: "package",
+    terms: ["component", "kit", "lib", "library", "package", "plugin", "sdk", "toolkit"],
+  },
+  {
+    icon: "test",
+    terms: ["benchmark", "e2e", "fixture", "spec", "test", "testing"],
+  },
+  {
+    icon: "shopping",
+    terms: ["cart", "commerce", "market", "shop", "store"],
+  },
+  { icon: "game", terms: ["game", "gaming", "play"] },
+  { icon: "music", terms: ["audio", "music", "podcast", "radio", "sound"] },
+  { icon: "video", terms: ["film", "movie", "stream", "video"] },
+  { icon: "image", terms: ["camera", "gallery", "image", "photo", "picture"] },
+  {
+    icon: "web",
+    terms: [
+      "browser",
+      "frontend",
+      "nextjs",
+      "react",
+      "site",
+      "svelte",
+      "ui",
+      "vue",
+      "web",
+      "website",
+    ],
+  },
+];
+
+const GENERIC_PROJECT_ICONS: ReadonlyArray<ProjectIconName> = [
+  "code",
+  "braces",
+  "circuit",
+  "folder-code",
+  "layers",
+];
+
+const PROJECT_ICON_EMOJIS: Record<ProjectIconName, string> = {
+  ai: "🤖",
+  book: "📚",
+  braces: "🧩",
+  circuit: "⚡",
+  cloud: "☁️",
+  code: "💻",
+  database: "🗄️",
+  desktop: "🖥️",
+  "folder-code": "🛠️",
+  game: "🎮",
+  image: "🖼️",
+  layers: "✨",
+  mobile: "📱",
+  music: "🎵",
+  package: "📦",
+  security: "🔒",
+  server: "⚙️",
+  shopping: "🛍️",
+  terminal: "⌨️",
+  test: "🧪",
+  video: "🎬",
+  web: "🌐",
+};
+
+const projectIconCache = new Map<string, ProjectIconSelection>();
+
+function projectNameTokens(value: string): ReadonlyArray<string> {
+  return value
+    .replace(/([a-z\d])([A-Z])/g, "$1 $2")
+    .toLowerCase()
+    .split(/[^a-z\d]+/)
+    .filter(Boolean);
+}
+
+function termScore(token: string, term: string): number {
+  if (token === term) return 3;
+  if (term.length >= 4 && (token.startsWith(term) || token.endsWith(term))) return 1;
+  return 0;
+}
+
+function stableIndex(value: string, length: number): number {
+  let hash = 2_166_136_261;
+  for (let index = 0; index < value.length; index += 1) {
+    hash ^= value.charCodeAt(index);
+    hash = Math.imul(hash, 16_777_619);
+  }
+  return (hash >>> 0) % length;
+}
+
+export function selectProjectIcon(
+  projectName: string,
+  workspaceRoot: string,
+): ProjectIconSelection {
+  const name = projectName.trim() || workspaceRoot.split(/[\\/]+/).findLast(Boolean) || "project";
+  const cacheKey = name.toLowerCase();
+  const cachedIcon = projectIconCache.get(cacheKey);
+  if (cachedIcon) return cachedIcon;
+
+  const tokens = projectNameTokens(name);
+  let bestIcon: ProjectIconName | null = null;
+  let bestScore = 0;
+
+  for (const projectClass of PROJECT_ICON_MODEL) {
+    let score = 0;
+    for (const token of tokens) {
+      let tokenScore = 0;
+      for (const term of projectClass.terms) {
+        tokenScore = Math.max(tokenScore, termScore(token, term));
+      }
+      score += tokenScore;
+    }
+    if (score > bestScore) {
+      bestIcon = projectClass.icon;
+      bestScore = score;
+    }
+  }
+
+  const iconName =
+    bestIcon ?? GENERIC_PROJECT_ICONS[stableIndex(cacheKey, GENERIC_PROJECT_ICONS.length)]!;
+  const icon: ProjectIconSelection = {
+    kind: "emoji",
+    icon: iconName,
+    emoji: PROJECT_ICON_EMOJIS[iconName],
+  };
+  projectIconCache.set(cacheKey, icon);
+  return icon;
+}
diff --git a/apps/web/src/projectIconOptions.test.ts b/apps/web/src/projectIconOptions.test.ts
new file mode 100644
index 000000000000..15f6f738e410
--- /dev/null
+++ b/apps/web/src/projectIconOptions.test.ts
@@ -0,0 +1,24 @@
+import { describe, expect, it } from "vite-plus/test";
+import {
+  filterProjectIconNames,
+  firstEmoji,
+  projectIconColorClassName,
+} from "./projectIconOptions";
+
+describe("projectIconOptions", () => {
+  it("searches across the full Lucide set", () => {
+    expect(filterProjectIconNames("alarm clock")).toContain("alarm-clock");
+    expect(filterProjectIconNames("alarm  \tclock")).toContain("alarm-clock");
+  });
+
+  it("extracts one complete emoji grapheme", () => {
+    expect(firstEmoji("  👩🏽‍💻 hello")).toBe("👩🏽‍💻");
+    expect(firstEmoji("🇺🇸 project")).toBe("🇺🇸");
+    expect(firstEmoji("1️⃣ project")).toBe("1️⃣");
+    expect(firstEmoji("plain text")).toBeNull();
+  });
+
+  it("maps persisted colors to theme-aware classes", () => {
+    expect(projectIconColorClassName("violet")).toBe("text-violet-600 dark:text-violet-400");
+  });
+});
diff --git a/apps/web/src/projectIconOptions.ts b/apps/web/src/projectIconOptions.ts
new file mode 100644
index 000000000000..9f2fc6c028be
--- /dev/null
+++ b/apps/web/src/projectIconOptions.ts
@@ -0,0 +1,81 @@
+import { iconNames, type IconName } from "lucide-react/dynamic";
+export { PROJECT_ICON_COLORS, projectIconColorClassName } from "./projectIconColors";
+
+export const POPULAR_PROJECT_ICONS = [
+  "folder-code",
+  "code-2",
+  "terminal",
+  "globe-2",
+  "server",
+  "database",
+  "bot",
+  "sparkles",
+  "smartphone",
+  "monitor",
+  "cloud-cog",
+  "package",
+  "book-open",
+  "flask-conical",
+  "shield-check",
+  "rocket",
+  "gamepad-2",
+  "music",
+  "image",
+  "shopping-bag",
+  "git-branch",
+  "workflow",
+  "wrench",
+  "layers-3",
+] as const satisfies ReadonlyArray<IconName>;
+
+export const PROJECT_EMOJIS: ReadonlyArray<{ readonly emoji: string; readonly label: string }> = [
+  { emoji: "💻", label: "Computer" },
+  { emoji: "🛠️", label: "Tools" },
+  { emoji: "🚀", label: "Rocket" },
+  { emoji: "🤖", label: "Robot" },
+  { emoji: "✨", label: "Sparkles" },
+  { emoji: "⚡", label: "Lightning" },
+  { emoji: "🌐", label: "Web" },
+  { emoji: "📱", label: "Mobile" },
+  { emoji: "🖥️", label: "Desktop" },
+  { emoji: "⌨️", label: "Keyboard" },
+  { emoji: "⚙️", label: "Gear" },
+  { emoji: "🗄️", label: "Database" },
+  { emoji: "☁️", label: "Cloud" },
+  { emoji: "📦", label: "Package" },
+  { emoji: "📚", label: "Books" },
+  { emoji: "🧪", label: "Test tube" },
+  { emoji: "🔒", label: "Lock" },
+  { emoji: "🎮", label: "Game" },
+  { emoji: "🎵", label: "Music" },
+  { emoji: "🎬", label: "Movie" },
+  { emoji: "🖼️", label: "Picture" },
+  { emoji: "🛍️", label: "Shopping" },
+  { emoji: "🔥", label: "Fire" },
+  { emoji: "💡", label: "Idea" },
+  { emoji: "🧩", label: "Puzzle" },
+  { emoji: "📊", label: "Chart" },
+  { emoji: "🧠", label: "Brain" },
+  { emoji: "🦄", label: "Unicorn" },
+  { emoji: "🐙", label: "Octopus" },
+  { emoji: "🌱", label: "Seedling" },
+];
+
+export function filterProjectIconNames(query: string): ReadonlyArray<IconName> {
+  const normalized = query.trim().toLowerCase().replaceAll(/\s+/g, "-");
+  if (!normalized) return POPULAR_PROJECT_ICONS;
+  return iconNames.filter((name) => name.includes(normalized)).slice(0, 60);
+}
+
+export function firstEmoji(value: string): string | null {
+  const trimmed = value.trim();
+  if (!trimmed) return null;
+  const segments = new Intl.Segmenter(undefined, { granularity: "grapheme" }).segment(trimmed);
+  const segment = segments[Symbol.iterator]().next().value?.segment;
+  const isFlag = /^\p{Regional_Indicator}{2}$/u.test(segment ?? "");
+  const isKeycap = /^[#*0-9]\uFE0F?\u20E3$/u.test(segment ?? "");
+  if (!segment || (!/\p{Extended_Pictographic}/u.test(segment) && !isFlag && !isKeycap)) {
+    return null;
+  }
+  return segment;
+}
diff --git a/apps/web/src/routes/_chat.pull-requests.tsx b/apps/web/src/routes/_chat.pull-requests.tsx
index 525d5d058d71..09701423fae0 100644
--- a/apps/web/src/routes/_chat.pull-requests.tsx
+++ b/apps/web/src/routes/_chat.pull-requests.tsx
@@ -1,5 +1,5 @@
 import { scopeThreadRef } from "@t3tools/client-runtime/environment";
-import { pullRequestHostOf, ThreadId } from "@t3tools/contracts";
+import { pullRequestHostOf, resolveEnvironmentMachineKind, ThreadId } from "@t3tools/contracts";
 import type {
   EnvironmentId,
   ProjectId,
@@ -11,6 +11,7 @@ import type {
   PullRequestListState,
   SourceControlProviderKind,
 } from "@t3tools/contracts";
+import { useAtomValue } from "@effect/atom-react";
 import { createFileRoute, useNavigate } from "@tanstack/react-router";
 import {
   ArrowDownUpIcon,
@@ -19,8 +20,6 @@ import {
   ChevronDownIcon,
   ClockIcon,
   EyeIcon,
-  MonitorIcon,
-  ServerIcon,
   GitMergeIcon,
   GitPullRequestClosedIcon,
   GitPullRequestIcon,
@@ -36,6 +35,7 @@ import {
 import {
   useCallback,
   useEffect,
+  useEffectEvent,
   useMemo,
   useRef,
   useState,
@@ -86,6 +86,7 @@ import {
   writePullRequestListPreferences,
 } from "../components/pullRequest/pullRequestListPreferences";
 import { assignProjectsToEnvironments } from "../components/pullRequest/pullRequestProjectAssignment.logic";
+import { environmentMachineIcon } from "../components/EnvironmentMachineIcon";
 import { PullRequestDetailPanel } from "../components/pullRequest/PullRequestDetailPanel";
 import {
   PullRequestFiltersMenu,
@@ -108,7 +109,10 @@ import {
 } from "../components/WorkspaceBreadcrumb";
 import { WorkspacePageContainer } from "../components/WorkspacePageContainer";
 import { WorkspacePageHeader } from "../components/WorkspacePageHeader";
+import { isCommandPaletteOpen } from "../commandPaletteBus";
 import { isElectron } from "../env";
+import { resolveShortcutCommand } from "../keybindings";
+import { isTerminalFocused } from "../lib/terminalFocus";
 import { PanelLayoutControls } from "../components/chat/PanelLayoutControls";
 import { Button } from "../components/ui/button";
 import { Menu, MenuPopup, MenuRadioGroup, MenuRadioItem, MenuTrigger } from "../components/ui/menu";
@@ -136,6 +140,7 @@ import {
 } from "../state/pullRequests";
 import { useAtomCommand } from "../state/use-atom-command";
 import { cn } from "~/lib/utils";
+import { primaryServerKeybindingsAtom } from "~/state/server";
 import { getSourceControlPresentationForKind } from "~/sourceControlPresentation";
 
 export interface PullRequestsSearch extends PullRequestListPreferences {
@@ -286,6 +291,7 @@ function PullRequestsRouteView() {
   const statsPolicy: PullRequestStatsPolicy =
     sort === "ready" || sort === "largest" || sort === "smallest" ? "eager" : "visible";
   const navigate = useNavigate({ from: Route.fullPath });
+  const keybindings = useAtomValue(primaryServerKeybindingsAtom);
   const { environments } = useEnvironments();
   // Every connected environment that has said it can list pull requests. Sorted, so the query
   // keys, the scope key and the stored snapshot all read the same whichever order the
@@ -363,6 +369,8 @@ function PullRequestsRouteView() {
             ? `${project.title} · ${environmentLabels.get(project.environmentId) ?? project.environmentId}`
             : project.title,
         workspaceRoot: project.workspaceRoot,
+        faviconPath: project.faviconPath ?? null,
+        projectIcon: project.projectIcon ?? null,
       }))
       .toSorted((left, right) => left.title.localeCompare(right.title));
   }, [environmentLabels, projects]);
@@ -1736,14 +1744,14 @@ function PullRequestsRouteView() {
       };
     }),
   ];
-  // The same shape the host pills take, so the two groups read as one control. A local
-  // connection wears the screen it is on; every other server wears a server.
+  // The same shape the host pills take, so the two groups read as one control. Each server
+  // wears the machine it runs on.
   const serverMenuOptions: ReadonlyArray<PullRequestFilterOption<string>> = [
     { value: "", label: "All servers", Icon: LayersIcon },
     ...capableEnvironments.map((environment) => ({
       value: environment.environmentId,
       label: environment.label,
-      Icon: environment.displayUrl === null ? MonitorIcon : ServerIcon,
+      Icon: environmentMachineIcon(resolveEnvironmentMachineKind(environment.serverConfig)),
     })),
   ];
   const sortMenu = (
@@ -1887,6 +1895,26 @@ function PullRequestsRouteView() {
     selectSurfaceInUrl(null);
   };
 
+  // This page has no ChatView, so the shared panel handles `rightPanel.close`
+  // itself. With nothing open the event falls through to its native meaning.
+  const closeActiveSurfaceFromShortcut = useEffectEvent((event: KeyboardEvent) => {
+    if (activePullRequestSurface === null) return;
+    event.preventDefault();
+    event.stopPropagation();
+    if (!event.repeat) closeSurface(activePullRequestSurface);
+  });
+  useEffect(() => {
+    const onKeyDown = (event: KeyboardEvent) => {
+      if (event.defaultPrevented || isCommandPaletteOpen()) return;
+      const command = resolveShortcutCommand(event, keybindings, {
+        context: { terminalFocus: isTerminalFocused() },
+      });
+      if (command === "rightPanel.close") closeActiveSurfaceFromShortcut(event);
+    };
+    window.addEventListener("keydown", onKeyDown);
+    return () => window.removeEventListener("keydown", onKeyDown);
+  }, [keybindings]);
+
   return (
     <SidebarInset className="h-dvh min-h-0 overflow-hidden overscroll-y-none bg-background text-foreground">
       <div className="relative flex min-h-0 flex-1">
@@ -2295,7 +2323,7 @@ function PullRequestsColumn({
         {/* The top padding is the shared fade band's height, the same pairing the
             settings page makes: at rest the controls sit fully below the mask, and only
             content actually passing under the chrome fades. */}
-        <WorkspacePageContainer className="gap-4">
+        <WorkspacePageContainer width="expanded" className="gap-4">
           <div className="flex flex-col gap-3">
             <div ref={inFlowSearchRef} className="flex items-center gap-2">
               {searchInput}
diff --git a/apps/web/src/rpc/requestLatencyState.test.ts b/apps/web/src/rpc/requestLatencyState.test.ts
index 68433035fd18..1cfae8a6f92c 100644
--- a/apps/web/src/rpc/requestLatencyState.test.ts
+++ b/apps/web/src/rpc/requestLatencyState.test.ts
@@ -59,6 +59,13 @@ describe("requestLatencyState", () => {
     expect(getSlowRpcAckRequests()).toEqual([]);
   });
 
+  it("ignores usage summary requests", () => {
+    trackRpcRequestSent("1", WS_METHODS.serverGetUsageSummary);
+    vi.advanceTimersByTime(SLOW_RPC_ACK_THRESHOLD_MS * 2);
+
+    expect(getSlowRpcAckRequests()).toEqual([]);
+  });
+
   it.each(Object.values(WS_METHODS).filter((method) => method.startsWith("pullRequests.")))(
     "ignores pull request workspace request %s",
     (method) => {
diff --git a/apps/web/src/rpc/requestLatencyState.ts b/apps/web/src/rpc/requestLatencyState.ts
index 358836c1ba2a..bdf3d33a7882 100644
--- a/apps/web/src/rpc/requestLatencyState.ts
+++ b/apps/web/src/rpc/requestLatencyState.ts
@@ -28,7 +28,10 @@ interface PendingRpcAckRequest {
 }
 
 const pendingRpcAckRequests = new Map<string, PendingRpcAckRequest>();
-const untrackedRpcAckMethods = new Set<string>([WS_METHODS.previewAutomationConnect]);
+const untrackedRpcAckMethods = new Set<string>([
+  WS_METHODS.previewAutomationConnect,
+  WS_METHODS.serverGetUsageSummary,
+]);
 const longRunningRpcAckMethods = new Set<string>([
   WS_METHODS.serverUpdateProvider,
   WS_METHODS.serverRefreshProviders,
diff --git a/apps/web/src/session-logic.test.ts b/apps/web/src/session-logic.test.ts
index 713457658e93..73dfcb197f9d 100644
--- a/apps/web/src/session-logic.test.ts
+++ b/apps/web/src/session-logic.test.ts
@@ -1241,6 +1241,13 @@ describe("deriveWorkLogEntries", () => {
         payload: {
           itemType: "mcp_tool_call",
           title: "t3-code · preview_status",
+          toolSurface: "browser",
+          toolIcon: { _tag: "website", pageUrl: "https://example.com/checkout" },
+          toolSource: {
+            key: "browser-use:browser",
+            name: "Browser",
+            kind: "browser",
+          },
           data: { item },
         },
       }),
@@ -1248,6 +1255,16 @@ describe("deriveWorkLogEntries", () => {
 
     const [entry] = deriveWorkLogEntries(activities);
     expect(entry?.toolTitle).toBe("t3-code · preview_status");
+    expect(entry?.toolSurface).toBe("browser");
+    expect(entry?.toolIcon).toEqual({
+      _tag: "website",
+      pageUrl: "https://example.com/checkout",
+    });
+    expect(entry?.toolSource).toEqual({
+      key: "browser-use:browser",
+      name: "Browser",
+      kind: "browser",
+    });
     expect(entry?.toolData).toEqual(item);
   });
 
@@ -1297,6 +1314,7 @@ describe("deriveWorkLogEntries", () => {
         payload: {
           itemType: "mcp_tool_call",
           toolCallId: "call-1",
+          toolSurface: "browser",
           data: { item },
         },
       }),
@@ -1307,6 +1325,7 @@ describe("deriveWorkLogEntries", () => {
         payload: {
           itemType: "mcp_tool_call",
           toolCallId: "call-1",
+          toolIcon: { _tag: "website", pageUrl: "https://example.com/result" },
         },
       }),
     ];
@@ -1314,6 +1333,11 @@ describe("deriveWorkLogEntries", () => {
     const [entry] = deriveWorkLogEntries(activities);
     expect(entry?.toolData).toEqual(item);
     expect(entry?.toolCallId).toBe("call-1");
+    expect(entry?.toolSurface).toBe("browser");
+    expect(entry?.toolIcon).toEqual({
+      _tag: "website",
+      pageUrl: "https://example.com/result",
+    });
     expect(resolveWorkEntryToolPresentation(entry!)?.displayName).toBe(
       "Took a snapshot of the preview page",
     );
diff --git a/apps/web/src/session-logic.ts b/apps/web/src/session-logic.ts
index 8d31b3f89416..cf3a862de3c7 100644
--- a/apps/web/src/session-logic.ts
+++ b/apps/web/src/session-logic.ts
@@ -7,6 +7,7 @@ import {
   extractCommandOutputText,
   isWorktreeSetupActivity,
 } from "@t3tools/client-runtime/work-log/presentation";
+import { extractToolActivityPresentation } from "@t3tools/client-runtime/work-log/tool-presentation";
 import {
   ApprovalRequestId,
   isToolLifecycleItemType,
@@ -108,6 +109,9 @@ export interface WorkLogEntry {
   changedFiles?: ReadonlyArray<string>;
   tone: "thinking" | "tool" | "info" | "error";
   toolTitle?: string;
+  toolSurface?: import("@t3tools/contracts").ToolActivitySurface;
+  toolIcon?: import("@t3tools/contracts").ToolActivityIcon;
+  toolSource?: import("@t3tools/contracts").ToolActivitySource;
   toolData?: unknown;
   itemType?: ToolLifecycleItemType;
   requestKind?: PendingApproval["requestKind"];
@@ -915,6 +919,7 @@ function toDerivedWorkLogEntry(activity: OrchestrationThreadActivity): DerivedWo
   const commandPreview = extractToolCommand(payload);
   const changedFiles = extractChangedFiles(payload);
   const title = extractToolTitle(payload);
+  const toolPresentation = extractToolActivityPresentation(payload);
   const isTaskActivity =
     activity.kind === "task.started" ||
     activity.kind === "task.progress" ||
@@ -974,6 +979,15 @@ function toDerivedWorkLogEntry(activity: OrchestrationThreadActivity): DerivedWo
   if (title) {
     entry.toolTitle = title;
   }
+  if (toolPresentation.toolSurface) {
+    entry.toolSurface = toolPresentation.toolSurface;
+  }
+  if (toolPresentation.toolIcon) {
+    entry.toolIcon = toolPresentation.toolIcon;
+  }
+  if (toolPresentation.toolSource) {
+    entry.toolSource = toolPresentation.toolSource;
+  }
   if (itemType === "mcp_tool_call") {
     const data = asRecord(payload?.data);
     const toolData = typeof data?.toolName === "string" ? (data.item ?? data) : data?.item;
@@ -1196,6 +1210,9 @@ function mergeDerivedWorkLogEntries(
   const command = next.command ?? previous.command;
   const rawCommand = next.rawCommand ?? previous.rawCommand;
   const toolTitle = next.toolTitle ?? previous.toolTitle;
+  const toolSurface = next.toolSurface ?? previous.toolSurface;
+  const toolIcon = next.toolIcon ?? previous.toolIcon;
+  const toolSource = next.toolSource ?? previous.toolSource;
   const itemType = next.itemType ?? previous.itemType;
   const requestKind = next.requestKind ?? previous.requestKind;
   const collapseKey = next[workLogCollapseKey] ?? previous[workLogCollapseKey];
@@ -1211,6 +1228,9 @@ function mergeDerivedWorkLogEntries(
     ...(rawCommand ? { rawCommand } : {}),
     ...(changedFiles.length > 0 ? { changedFiles } : {}),
     ...(toolTitle ? { toolTitle } : {}),
+    ...(toolSurface ? { toolSurface } : {}),
+    ...(toolIcon ? { toolIcon } : {}),
+    ...(toolSource ? { toolSource } : {}),
     ...(itemType ? { itemType } : {}),
     ...(requestKind ? { requestKind } : {}),
     ...(collapseKey ? { [workLogCollapseKey]: collapseKey } : {}),
diff --git a/apps/web/src/state/desktopSshHosts.test.ts b/apps/web/src/state/desktopSshHosts.test.ts
index 83eda60158c2..39958ac6e475 100644
--- a/apps/web/src/state/desktopSshHosts.test.ts
+++ b/apps/web/src/state/desktopSshHosts.test.ts
@@ -4,7 +4,7 @@ import { AtomRegistry } from "effect/unstable/reactivity";
 import * as AsyncResult from "effect/unstable/reactivity/AsyncResult";
 import { describe, expect, it, vi } from "vite-plus/test";
 
-import { createDesktopSshHostsStateAtom } from "./desktopSshHosts";
+import { createDesktopSshHostsStateAtom, filterDiscoveredSshHosts } from "./desktopSshHosts";
 
 const hosts: ReadonlyArray<DesktopDiscoveredSshHost> = [
   {
@@ -16,6 +16,86 @@ const hosts: ReadonlyArray<DesktopDiscoveredSshHost> = [
   },
 ];
 
+describe("filterDiscoveredSshHosts", () => {
+  const suggestions: ReadonlyArray<DesktopDiscoveredSshHost> = [
+    {
+      alias: "grape",
+      hostname: "grape",
+      port: null,
+      source: "known-hosts",
+      username: null,
+    },
+    {
+      alias: "Pinot",
+      hostname: "Pinot",
+      port: null,
+      source: "ssh-config",
+      username: null,
+    },
+    {
+      alias: "preprod",
+      hostname: "preprod",
+      port: 2222,
+      source: "ssh-config",
+      username: "deploy",
+    },
+    {
+      alias: "prod-z",
+      hostname: "prod-z",
+      port: null,
+      source: "ssh-config",
+      username: null,
+    },
+    {
+      alias: "prod-a",
+      hostname: "prod-a",
+      port: null,
+      source: "ssh-config",
+      username: null,
+    },
+    {
+      alias: "prod-m",
+      hostname: "prod-m",
+      port: null,
+      source: "ssh-config",
+      username: null,
+    },
+  ];
+
+  it.each(["", "  "])("returns every host for an empty query %j", (query) => {
+    expect(filterDiscoveredSshHosts(suggestions, query)).toEqual(suggestions);
+  });
+
+  it("trims the query", () => {
+    expect(filterDiscoveredSshHosts(suggestions, "  pi ")).toEqual([suggestions[1]]);
+  });
+
+  it("ranks alias prefix matches before substring matches", () => {
+    expect(filterDiscoveredSshHosts(suggestions, "prod")).toEqual([
+      suggestions[3],
+      suggestions[4],
+      suggestions[5],
+      suggestions[2],
+    ]);
+  });
+
+  it("preserves the original order within a match tier", () => {
+    expect(filterDiscoveredSshHosts(suggestions, "prod").slice(0, 3)).toEqual([
+      suggestions[3],
+      suggestions[4],
+      suggestions[5],
+    ]);
+  });
+
+  it("matches case-insensitively", () => {
+    expect(filterDiscoveredSshHosts(suggestions, "PINOT")).toEqual([suggestions[1]]);
+  });
+
+  it("returns an empty array when no hosts match", () => {
+    expect(filterDiscoveredSshHosts(suggestions, "merlot")).toEqual([]);
+  });
+});
+
 describe("desktopSshHostsState", () => {
   it("retains discovered hosts when the settings screen remounts", async () => {
     const discoverSshHosts = vi.fn(async () => hosts);
diff --git a/apps/web/src/state/desktopSshHosts.ts b/apps/web/src/state/desktopSshHosts.ts
index 8e4022cbecf8..027ce867684f 100644
--- a/apps/web/src/state/desktopSshHosts.ts
+++ b/apps/web/src/state/desktopSshHosts.ts
@@ -5,6 +5,28 @@ import { Atom } from "effect/unstable/reactivity";
 
 type DesktopSshDiscoveryBridge = Pick<DesktopBridge, "discoverSshHosts">;
 
+/** Filters and ranks SSH host suggestions as the user types in the host field. */
+export function filterDiscoveredSshHosts(
+  hosts: ReadonlyArray<DesktopDiscoveredSshHost>,
+  query: string,
+): ReadonlyArray<DesktopDiscoveredSshHost> {
+  const normalizedQuery = query.trim().toLowerCase();
+  if (normalizedQuery.length === 0) return hosts;
+
+  const prefixMatches: Array<DesktopDiscoveredSshHost> = [];
+  const substringMatches: Array<DesktopDiscoveredSshHost> = [];
+  for (const host of hosts) {
+    const alias = host.alias.toLowerCase();
+    if (alias.startsWith(normalizedQuery)) {
+      prefixMatches.push(host);
+    } else if (alias.includes(normalizedQuery)) {
+      substringMatches.push(host);
+    }
+  }
+
+  return [...prefixMatches, ...substringMatches];
+}
+
 class DesktopSshDiscoveryUnavailableError extends Schema.TaggedErrorClass<DesktopSshDiscoveryUnavailableError>()(
   "DesktopSshDiscoveryUnavailableError",
   {},
diff --git a/apps/web/src/state/pullRequests.ts b/apps/web/src/state/pullRequests.ts
index 601b6efa3dcc..bde8b4c2d9cf 100644
--- a/apps/web/src/state/pullRequests.ts
+++ b/apps/web/src/state/pullRequests.ts
@@ -7,10 +7,12 @@ import type {
   EnvironmentId,
   PullRequestListInput,
   PullRequestListStatsInput,
+  PullRequestRef,
+  PullRequestSummary,
 } from "@t3tools/contracts";
 import * as Option from "effect/Option";
 import { AsyncResult, Atom } from "effect/unstable/reactivity";
-import { useCallback, useMemo } from "react";
+import { useCallback, useLayoutEffect, useMemo } from "react";
 
 import { connectionAtomRuntime } from "../connection/runtime";
 import { appAtomRegistry } from "../rpc/atomRegistry";
@@ -25,6 +27,50 @@ export const pullRequestEnvironment = createPullRequestEnvironmentAtoms(connecti
 export const linkedPullRequestDetailAtom =
   createLinkedPullRequestSummaryAtomFamily(connectionAtomRuntime);
 
+const observedPullRequestSummaryAtom = Atom.family((key: string) =>
+  Atom.make<PullRequestSummary | null>(null).pipe(
+    Atom.setIdleTTL(5 * 60_000),
+    Atom.withLabel(`web-pull-requests:observed-summary:${key}`),
+  ),
+);
+
+export function newestPullRequestSummary(
+  current: PullRequestSummary | null,
+  observed: PullRequestSummary | null,
+): PullRequestSummary | null {
+  if (current === null) return observed;
+  if (observed === null) return current;
+  if (current.state === "merged") return current;
+  if (observed.state === "merged") return observed;
+  return Date.parse(observed.updatedAt) >= Date.parse(current.updatedAt) ? observed : current;
+}
+
+export function useSharedPullRequestSummary(
+  environmentId: EnvironmentId | null,
+  reference: PullRequestRef | null,
+  current: PullRequestSummary | null,
+): PullRequestSummary | null {
+  const key =
+    environmentId === null || reference === null
+      ? "none"
+      : JSON.stringify([
+          environmentId,
+          reference.projectId,
+          reference.repository.toLowerCase(),
+          reference.number,
+        ]);
+  const atom = observedPullRequestSummaryAtom(key);
+  const observed = useAtomValue(atom);
+  useLayoutEffect(() => {
+    if (environmentId === null || current === null) return;
+    appAtomRegistry.modify(atom, (previous) => {
+      const next = newestPullRequestSummary(previous, current);
+      return next === previous ? [false, previous] : [true, next];
+    });
+  }, [atom, current, environmentId]);
+  return newestPullRequestSummary(current, observed);
+}
+
 export interface EnvironmentQueryTarget<Input> {
   readonly environmentId: EnvironmentId;
   readonly input: Input;
diff --git a/apps/web/src/terminal-links.ts b/apps/web/src/terminal-links.ts
index be4258ba6b0f..204d0a742a05 100644
--- a/apps/web/src/terminal-links.ts
+++ b/apps/web/src/terminal-links.ts
@@ -1,3 +1,8 @@
+import {
+  formatFilePathPosition,
+  splitFilePathPosition,
+} from "@t3tools/client-runtime/markdown-links";
+
 import { isMacPlatform } from "./lib/utils";
 
 export type TerminalLinkKind = "url" | "path";
@@ -137,35 +142,6 @@ function inferHomeFromCwd(cwd: string): string | undefined {
   return undefined;
 }
 
-export function splitPathAndPosition(value: string): {
-  path: string;
-  line: string | undefined;
-  column: string | undefined;
-} {
-  let path = value;
-  let column: string | undefined;
-  let line: string | undefined;
-
-  const columnMatch = path.match(/:(\d+)$/);
-  if (!columnMatch?.[1]) {
-    return { path, line: undefined, column: undefined };
-  }
-
-  column = columnMatch[1];
-  path = path.slice(0, -columnMatch[0].length);
-
-  const lineMatch = path.match(/:(\d+)$/);
-  if (lineMatch?.[1]) {
-    line = lineMatch[1];
-    path = path.slice(0, -lineMatch[0].length);
-  } else {
-    line = column;
-    column = undefined;
-  }
-
-  return { path, line, column };
-}
-
 export function extractTerminalLinks(line: string): TerminalLinkMatch[] {
   const urlMatches = collectMatches(line, "url", URL_PATTERN, []);
   const pathMatches = collectMatches(line, "path", FILE_PATH_PATTERN, urlMatches);
@@ -271,7 +247,8 @@ export function isTerminalLinkActivation(
 }
 
 export function resolvePathLinkTarget(rawPath: string, cwd: string): string {
-  const { path, line, column } = splitPathAndPosition(rawPath);
+  const position = splitFilePathPosition(rawPath);
+  const { path } = position;
 
   let resolvedPath = path;
   if (path.startsWith("~/")) {
@@ -285,6 +262,5 @@ export function resolvePathLinkTarget(rawPath: string, cwd: string): string {
     resolvedPath = joinPath(cwd, path, separator);
   }
 
-  if (!line) return resolvedPath;
-  return `${resolvedPath}:${line}${column ? `:${column}` : ""}`;
+  return formatFilePathPosition({ ...position, path: resolvedPath });
 }
diff --git a/apps/web/vite.config.ts b/apps/web/vite.config.ts
index 1e6d84ebfadc..a8b4dbcfe50e 100644
--- a/apps/web/vite.config.ts
+++ b/apps/web/vite.config.ts
@@ -265,6 +265,11 @@ export default defineConfig(() => {
           }
         : {}),
     },
+    // @tailwindcss/vite only emits a CSS sourcemap when devSourcemap is on; without it
+    // rolldown flags the transform as SOURCEMAP_BROKEN on every sourcemapped build.
+    css: {
+      devSourcemap: buildSourcemap !== false,
+    },
     build: {
       outDir: "dist",
       emptyOutDir: true,
diff --git a/docs/internals/mobile-navigation.md b/docs/internals/mobile-navigation.md
index 61b97ab6a86f..12b0040d4bd2 100644
--- a/docs/internals/mobile-navigation.md
+++ b/docs/internals/mobile-navigation.md
@@ -86,10 +86,15 @@ composer thumbnails, and workspace image previews. The workspace PDF web preview
 Open PDF action for the native viewer. Android retains its image viewer and uses the
 system chooser for PDFs. Saving images on iOS uses the add-only photo-library permission.
 
-Received videos open directly from their signed asset URL. AVKit handles buffering;
-the client does not download the entire file or show a separate opening overlay before
-presentation. The URL is captured once per preview so credential refresh does not
-restart playback. Saving or sharing still downloads the original file.
+Every full-screen video preview on iOS is AVKit, playing directly from the signed asset
+URL: sent attachments, composer drafts, and file links that point at a video. Inline
+markdown embeds and the workspace file screen play in place with the Expo Video player.
+AVKit handles buffering; the client does not download the entire file or show a separate
+opening overlay before presentation.
+The URL is captured once per preview so credential refresh does not restart playback.
+Media actions (copy path, open in file viewer, save or share) belong to the surface that
+opened the video, a long-press on the thumbnail, so the player carries no
+menu. AVKit has no retry; a failure alerts and closes, re-mints the URL in the background, and the next open plays from the fresh one.
 
 The native presentation promise completes after dismissal. Local draft previews
 hold their file lease until that promise settles. The iOS preview component requests
@@ -97,8 +102,10 @@ native dismissal when its source screen unmounts. Playback pauses in the backgro
 AVPlayer activates audio as playback starts. The presenter pauses and releases
 its own player on close, then restores the previous audio-session configuration
 if no other component changed it during playback. It does not deactivate the
-shared session, which may still serve another player or recorder. Android retains
-its React Native modal and Expo Video player.
+shared session, which may still serve another player or recorder. Android plays every
+video, attachments included, in its React Native modal with the Expo Video player.
+Composer drafts play and share from their local file; other videos stream from the
+signed URL and download only for save or share.
 
 `shareFileFromSource` uses the same source registration to anchor UIKit's activity
 controller. Its promise completes when the native share flow finishes, keeping
diff --git a/docs/internals/remote.md b/docs/internals/remote.md
index 65416a19e967..d27a0741c2ad 100644
--- a/docs/internals/remote.md
+++ b/docs/internals/remote.md
@@ -224,6 +224,22 @@ right action without making the transport responsible for process management. Th
 supervisor owns the resulting disconnect and reconnect like any other involuntary close. See
 [server-updates.md](./server-updates.md).
 
+## Machine identity
+
+Every environment is drawn with one of a fixed set of machine glyphs (`EnvironmentMachineKind` in
+contracts: server, cloud, desktop, laptop, mac-mini, mac-studio). Two inputs feed it, and the
+precedence lives in one helper, `resolveEnvironmentMachineKind`, so web and mobile cannot drift:
+
+1. `settings.environmentIcon`, a nullable server setting the user picks in Settings → Connections.
+   It is server state rather than client state so every device connecting to that server agrees.
+2. `environment.platform.machine`, detected once at startup by [ServerEnvironmentMachine.ts][machine]
+   (IOKit product name / `hw.model` on macOS, `/sys/class/dmi/id` on Linux with virtualization
+   markers mapped to "cloud"). Absent when there is no signal, so older servers, Windows hosts, and
+   containers decode without it.
+3. A generic server otherwise.
+
+Clients treat the field like any other capability: absent means "use the fallback", never "wait".
+
 ## Future work
 
 These remain unbuilt and are listed to keep the model honest:
@@ -237,3 +253,4 @@ These remain unbuilt and are listed to keep the model honest:
 [authremote]: ../../packages/client-runtime/src/authorization/remote.ts
 [sshenv]: ../../apps/desktop/src/ssh/DesktopSshEnvironment.ts
 [sshtunnel]: ../../packages/ssh/src/tunnel.ts
+[machine]: ../../apps/server/src/environment/ServerEnvironmentMachine.ts
diff --git a/docs/user/composer.md b/docs/user/composer.md
index 13b4527ad261..9ef7f883765b 100644
--- a/docs/user/composer.md
+++ b/docs/user/composer.md
@@ -37,12 +37,12 @@ download button beside it to save a copy. Other attached files download when sel
 Select a video attachment before or after sending to play it. Web and desktop use the browser's
 built-in controls. On mobile, videos open in a full-screen player with native playback controls.
 Supported videos show a thumbnail in the conversation and composer.
-On web, desktop, and iOS, received videos stream from their environment as they play. Supported formats and codecs
-depend on the browser or device; you can save an unsupported video to open it in another app.
+Received videos stream from their environment as they play on every platform. Supported formats and
+codecs depend on the browser or device; you can save an unsupported video to open it in another app.
 
 On iOS, the system player zooms from the attachment. Swipe down or tap Close to return to the
-conversation or draft. Touch and hold the attachment, then choose **Save or share video** to open
-the system share options. On Android, use **Save or share video** inside the preview.
+conversation or draft. Touch and hold a video thumbnail, then choose **Save or share** to open
+the system share options. On Android, the same menu is also available inside the preview.
 
 On web and desktop, if you reload before a file finishes uploading, the draft keeps the file's name
 and shows **Attach again** next to it. Attach the file again or remove it, then send.
@@ -51,6 +51,18 @@ On web and desktop, HEIC and HEIF photos are automatically converted to JPEG whe
 the composer or paste them into a message. On iOS, selecting them from **Photo Library** also
 converts them to JPEG. The 10 MB image limit applies to the converted photo.
 
+On web and desktop, an existing thread settles its composer into a single-line resting state when
+the composer loses focus. At wider sizes, scrolling the conversation also rests a focused composer,
+except when scrolling toward the end while already there. When the thread-context strip has room,
+the model and mode controls stay available beside the thread context; otherwise they return when the
+composer is focused. Focus the composer or start typing to expand it again. New-thread layouts keep
+the full composer.
+
+At phone-sized web or desktop window widths, existing threads animate between their compact and
+expanded layouts. Up to three image attachments remain visible in either resting layout, followed
+by a count when more are attached. At wider sizes, videos, files, and other draft context remain
+visible at their natural height; the phone-sized compact row reveals those details when expanded.
+
 On mobile, the model picker shows each OpenCode model's upstream provider, such as Anthropic,
 GitHub Copilot, or OpenCode Zen, beneath its name. Search by that provider name to narrow the list
 when starting a thread or changing an existing thread's model.
@@ -97,20 +109,20 @@ open a media preview.
 Videos opened from the file explorer or a file-viewer tab also play inside T3 Code. They
 stream from the environment as needed, rather than downloading the entire video before playback.
 Paths in inline code, such as `/tmp/recording.mp4`, work the same way. Image embeds stay inline;
-video embeds show a player with controls and an option to expand. Visible video previews load
+video embeds show a player with the browser's controls, full screen included. Visible video previews load
 an initial frame when supported, but stay paused until you press Play. Video file references use
 a filmstrip icon.
 
 On web and desktop, hover over a preview to see its full file path or original URL. Right-click
-to copy that reference, save an image, or copy an image to the clipboard. Use the video player's
-built-in controls to download videos. If the player cannot decode a video, its error message
+to copy that reference, save the image or video, or copy an image to the clipboard. The video
+player's built-in controls can download a video too. If the player cannot decode a video, its error message
 offers a link to open the source in the browser. Workspace media also offers **Copy relative
 path** and **Open in file viewer**. These actions are available in expanded previews too.
 
-On mobile, touch and hold an inline image or use a preview's **Media actions** menu to see its
-source, copy the path or URL, or choose **Save or share**. Workspace media can open in the file
-viewer from the same menu. Saving downloads a copy only when you request it; it does not change
-how the video buffers during playback. On iOS, touch and hold a file reference in a message to
+On mobile, touch and hold an inline image or a video thumbnail to see its source,
+copy the path or URL, or choose **Save or share**. Workspace files can open in the file viewer
+from the same menu. Saving downloads a copy only when you request it; it does not change how
+the video buffers during playback. On iOS, touch and hold a file reference in a message to
 copy its full or relative path or open it in the file viewer.
 
 Use Markdown image syntax to embed either kind of media:
diff --git a/docs/user/keybindings.md b/docs/user/keybindings.md
index 4668ec640927..fe97eedadbca 100644
--- a/docs/user/keybindings.md
+++ b/docs/user/keybindings.md
@@ -52,6 +52,12 @@ successful pick; its hover glow and badge preview the element and color family t
 `rightPanel.toggleMaximized` maximizes or restores the open right panel. It has no default shortcut,
 so add one in **Settings** → **Keybindings** if you want to use it.
 
+`rightPanel.close` closes the active right panel tab and defaults to `mod+w`. Press it again to close
+the next tab. With the terminal focused, `mod+w` closes the terminal instead, and with nothing left
+to close it closes the desktop window as before. Browsers reserve `mod+w` for closing their own tab
+and never pass it to the page, so in a browser rebind this command (and `terminal.close`) to a
+shortcut the browser leaves alone, such as `alt+w`.
+
 `thread.copyReference` copies the active thread's pull request link, or its thread ID when no pull
 request is available. Its default shortcut is `mod+shift+c`, and it does not replace terminal copy
 while the terminal has focus.
diff --git a/docs/user/project-settings.md b/docs/user/project-settings.md
index 4460701edce2..047f8baf5466 100644
--- a/docs/user/project-settings.md
+++ b/docs/user/project-settings.md
@@ -1,14 +1,19 @@
 # Customize a project icon
 
 T3 Code selects a project icon automatically. It checks `t3.json`, common favicon and app icon
-paths, and icon links in project HTML files.
+paths, and icon links in project HTML files. If it does not find an image, it chooses a built-in
+emoji from the project name.
 
-To choose a different icon:
+To choose a different icon or emoji:
 
 1. Open **Settings** and select **Projects**.
 2. Select the project.
-3. Under **Appearance**, select **Choose a project file**.
-4. Search for an image file and select it.
+3. Next to **Project icon**, select **Choose icon**.
+4. Search the full Lucide icon set and choose a color, or switch to **Emoji** and choose or paste
+   an emoji.
+
+To use an image from the project instead, select **Choose file**, search for an image, and select
+it.
 
 T3 Code supports SVG, PNG, ICO, JPEG, GIF, AVIF, and WebP files. The selected path applies to
 each checkout in the project group and appears on your connected clients.
diff --git a/docs/user/providers-codex.md b/docs/user/providers-codex.md
index c4ce91e333bc..29b2bcffedf9 100644
--- a/docs/user/providers-codex.md
+++ b/docs/user/providers-codex.md
@@ -40,6 +40,17 @@ The web and desktop Agents panel shows each sub-agent's model and reasoning effo
 reports them. If Codex does not report either value, T3 Code leaves it out instead of using the
 parent agent's settings.
 
+## Browser and computer activity
+
+Browser and Computer Use calls show their user-facing task title when Codex provides one. Expanded
+activity groups show an icon for every call. Website calls use the active page's favicon when it is
+available, and desktop app calls use the app's native icon on macOS when available. Other hosts use
+a generic fallback glyph.
+
+Collapsed activity groups are summarized by source, such as `Used Chrome integration`, instead of
+showing the underlying tool name. Website favicons and native app icons keep their original colors;
+integrations that provide separate light and dark logos use the logo for the current appearance.
+
 ## Approve access to other apps
 
 When a Codex tool needs access to an app such as Safari, T3 Code shows the app name and asks for
diff --git a/docs/user/source-control.md b/docs/user/source-control.md
index 1573a151ce56..937cf91c9037 100644
--- a/docs/user/source-control.md
+++ b/docs/user/source-control.md
@@ -56,6 +56,9 @@ T3 Code works with the platforms your team already uses:
   brought in from the base branch
 - While working in a thread, open linked reviews in the same compact right-panel tabs without
   leaving the conversation
+- Show a file tree next to a review's **Code** tab, or a thread's **Diff** panel, to browse the
+  changed files as folders and jump straight to any of them. The toolbar toggle remembers your
+  choice.
 - Enable **Settings → General → Proactive panels** to open a newly linked review automatically and
   switch to the completed turn's diff when agent work finishes
 - Open the review directly in your browser with one click
@@ -73,6 +76,8 @@ T3 Code works with the platforms your team already uses:
 - Rewrite your own comments the same way, wherever they are shown
 - Works on GitHub, GitLab, and Bitbucket. Azure DevOps takes a new title and description; its
   comments stay read-only here, as they already were
+- On GitHub, put a label on a pull request or take one off from the **Labels** row of the review.
+  Changing labels needs triage access or better on the repository
 
 ### Know Your Setup at a Glance
 
diff --git a/docs/user/thread-sidebar.md b/docs/user/thread-sidebar.md
index 2a940606bf5b..3bbdc6888fdd 100644
--- a/docs/user/thread-sidebar.md
+++ b/docs/user/thread-sidebar.md
@@ -53,6 +53,23 @@ The main sidebar, right panel, and terminal drawer open and close immediately by
 The duration can be set up to 400 ms. Clicking the preview replays all three panel transitions; at
 0 ms, it snaps between the same open and closed states.
 
+## Environment icons
+
+When you are connected to more than one environment, every thread that lives somewhere other than
+the machine you are on wears a small icon for that machine at the end of its row: a server, a cloud
+VM, a desktop, a laptop, a Mac mini, or a Mac Studio. In the hosted web app and the mobile app,
+where every environment is remote, each row wears its machine so you can tell them apart at a
+glance. The same icon appears wherever an environment is named: the thread tooltip, the command
+palette, the "Run on" picker, the pull request server filter, the provider settings device tabs,
+and the environment lists under **Settings → Connections**. On mobile it appears in the thread
+lists, the archive, the new-task environment picker, and the Environments and storage settings.
+
+Servers pick the icon themselves from the hardware they run on. A Mac reports its model, a Linux
+machine reports its chassis type and whether it is a virtual machine, and anything without a usable
+signal shows a generic server. To override it, open **Settings → Connections** and choose an icon
+for that environment; **Automatic** goes back to what the server detected. The choice is stored on
+that server, so every device that connects to it sees the same icon.
+
 ## Environment artwork
 
 Dev and Nightly environments can identify themselves with artwork at the top of the sidebar and in
diff --git a/docs/user/tool-activity.md b/docs/user/tool-activity.md
index 67a3049016e3..4394e3fc66cb 100644
--- a/docs/user/tool-activity.md
+++ b/docs/user/tool-activity.md
@@ -8,7 +8,10 @@ indicate more calls above or below. Short groups use only the space they need.
 Collapsing and reopening a group preserves your reading position and any open call details.
 
 Recognized T3 tools use descriptive labels in both the running summary and individual rows.
-Labels follow the call's state, such as "Clicking" while running and "Clicked" after success.
+The latest live activity stays in the present tense while the turn continues, such as
+"Running vp" or "Clicking in the preview browser", even after that call has completed.
+Expanded rows follow the call's own state, such as "Clicked" after success.
+When a call has not reported a state yet, the label stays in the present tense.
 Failed, declined, and stopped calls say what happened without implying success.
 Preview browser actions use a globe icon. Other T3 tools keep the T3 mark.
 Group summaries count browser actions separately, such as "Used browser 18 times" or
diff --git a/oxlint-plugin-t3code/rules/no-global-process-runtime.ts b/oxlint-plugin-t3code/rules/no-global-process-runtime.ts
index e364d29040f2..f122d16db29a 100644
--- a/oxlint-plugin-t3code/rules/no-global-process-runtime.ts
+++ b/oxlint-plugin-t3code/rules/no-global-process-runtime.ts
@@ -4,23 +4,8 @@ import * as Option from "effect/Option";
 import { getPropertyName, isIdentifier, unwrapExpression } from "../utils.ts";
 
 const RUNTIME_PROPERTIES = new Set(["platform", "arch"]);
-const HOST_PROCESS_REFERENCE_FILE = "packages/shared/src/hostProcess.ts";
 const NODE_OS_MODULES = new Set(["node:os", "os"]);
 
-const normalizePath = (path: string) => path.replaceAll("\\", "/");
-
-const toRepoPath = (filename: string, cwd: string) => {
-  const normalizedFilename = normalizePath(filename);
-  const normalizedCwd = normalizePath(cwd).replace(/\/+$/u, "");
-  const prefix = `${normalizedCwd}/`;
-  return normalizedFilename.startsWith(prefix)
-    ? normalizedFilename.slice(prefix.length)
-    : normalizedFilename;
-};
-
-const isHostProcessReferenceFile = (filename: string, cwd: string) =>
-  toRepoPath(filename, cwd) === HOST_PROCESS_REFERENCE_FILE;
-
 const isGlobalProcessObject = (node: unknown): boolean => {
   const expression = unwrapExpression(node);
   if (isIdentifier(expression, "process")) return true;
@@ -48,7 +33,7 @@ export default defineRule({
     type: "problem",
     docs: {
       description:
-        "Disallow direct host runtime platform/architecture reads outside the shared host process references.",
+        "Disallow direct host runtime platform/architecture reads; the shared host process references are exempted in the lint config.",
     },
   },
   createOnce(context) {
@@ -117,8 +102,6 @@ export default defineRule({
       before: resetBindings,
       ImportDeclaration: trackImportDeclaration,
       MemberExpression(node) {
-        if (isHostProcessReferenceFile(context.filename, context.cwd)) return;
-
         const property = getPropertyName(node.property);
         if (Option.isNone(property) || !RUNTIME_PROPERTIES.has(property.value)) return;
         if (!isGlobalProcessObject(node.object)) return;
@@ -129,8 +112,6 @@ export default defineRule({
         });
       },
       CallExpression(node) {
-        if (isHostProcessReferenceFile(context.filename, context.cwd)) return;
-
         const property = getNodeOsRuntimeCall(node.callee);
         if (Option.isNone(property)) return;
 
diff --git a/oxlint-plugin-t3code/rules/no-manual-effect-runtime-in-tests.test.ts b/oxlint-plugin-t3code/rules/no-manual-effect-runtime-in-tests.test.ts
index bd8c97f5fa49..6864699a54c7 100644
--- a/oxlint-plugin-t3code/rules/no-manual-effect-runtime-in-tests.test.ts
+++ b/oxlint-plugin-t3code/rules/no-manual-effect-runtime-in-tests.test.ts
@@ -71,3 +71,34 @@ productionRule.valid(
     export const main = () => Effect.runPromise(Effect.void);
   `,
 );
+
+const legacyRule = createOxlintRuleHarness("t3code/no-manual-effect-runtime-in-tests", {
+  filename: "legacy.test.ts",
+  ruleOptions: [{ maxOccurrences: 2 }],
+});
+
+describe("t3code/no-manual-effect-runtime-in-tests with maxOccurrences", () => {
+  legacyRule.valid(
+    "allows occurrences up to the ceiling",
+    `
+      import * as Effect from "effect/Effect";
+
+      test("first", () => Effect.runSync(Effect.void));
+      test("second", () => Effect.runSync(Effect.void));
+    `,
+  );
+
+  legacyRule.invalid(
+    "reports occurrences beyond the ceiling",
+    `
+      import * as Effect from "effect/Effect";
+
+      test("first", () => Effect.runSync(Effect.void));
+      test("second", () => Effect.runSync(Effect.void));
+      test("third", () => Effect.runSync(Effect.void));
+    `,
+    (output) => {
+      assert.equal(output.match(/no-manual-effect-runtime-in-tests/g)?.length, 1);
+    },
+  );
+});
diff --git a/oxlint-plugin-t3code/rules/no-manual-effect-runtime-in-tests.ts b/oxlint-plugin-t3code/rules/no-manual-effect-runtime-in-tests.ts
index cbe97922f52a..ae90cb2f29bd 100644
--- a/oxlint-plugin-t3code/rules/no-manual-effect-runtime-in-tests.ts
+++ b/oxlint-plugin-t3code/rules/no-manual-effect-runtime-in-tests.ts
@@ -19,48 +19,17 @@ const EFFECT_RUNTIME_METHODS = new Set([
   "runSyncWith",
 ]);
 
-// Existing manual runners are tracked as debt. The rule permits no net-new
-// occurrences in these files, while unlisted test files must have zero.
-const LEGACY_BASELINE = new Map<string, number>([
-  ["apps/mobile/src/features/agent-awareness/liveActivityPreferences.test.ts", 1],
-  ["apps/mobile/src/features/agent-awareness/remoteRegistration.test.ts", 2],
-  ["apps/mobile/src/state/use-remote-environment-registry.test.ts", 2],
-  ["apps/server/src/orchestration/commandInvariants.test.ts", 6],
-  // Fork: includes Droid checkpoint-revert and consecutive-revert coverage.
-  ["apps/server/src/orchestration/Layers/CheckpointReactor.test.ts", 46],
-  ["apps/server/src/orchestration/Layers/OrchestrationEngine.test.ts", 5],
-  ["apps/server/src/orchestration/Layers/OrchestrationReactor.test.ts", 4],
-  ["apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts", 70],
-  ["apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.test.ts", 31],
-  ["apps/server/src/orchestration/Layers/ThreadDeletionReactor.test.ts", 2],
-  ["apps/server/src/orchestration/projector.test.ts", 20],
-  ["apps/server/src/project/Layers/ProjectSetupScriptRunner.test.ts", 4],
-  ["apps/server/src/provider/acp/CursorAcpSupport.test.ts", 1],
-  ["apps/server/src/provider/Layers/ClaudeAdapter.test.ts", 2],
-  ["apps/server/src/provider/Layers/CodexAdapter.test.ts", 1],
-  ["apps/server/src/provider/Layers/CodexSessionRuntime.test.ts", 5],
-  ["apps/server/src/provider/Layers/CursorAdapter.test.ts", 1],
-  ["apps/server/src/provider/Layers/CursorProvider.test.ts", 4],
-  // Fork driver test suites carried over from the Bun-era harness.
-  ["apps/server/src/provider/Layers/DroidProvider.test.ts", 2],
-  ["apps/server/src/textGeneration/CursorTextGeneration.test.ts", 1],
-  ["apps/server/src/provider/Layers/ProviderService.test.ts", 2],
-  ["apps/server/src/provider/Layers/ProviderSessionReaper.test.ts", 21],
-  ["apps/server/src/relay/AgentAwarenessRelay.test.ts", 4],
-  ["apps/server/src/server.test.ts", 1],
-  ["apps/web/src/cloud/dpop.test.ts", 2],
-  ["apps/web/src/environments/runtime/service.addSavedEnvironment.test.ts", 1],
-  ["oxlint-plugin-t3code/rules/no-manual-effect-runtime-in-tests.test.ts", 7],
-  ["packages/client-runtime/src/relay/managedRelayState.test.ts", 1],
-  ["packages/client-runtime/src/wsTransport.test.ts", 2],
-]);
-
-const baselineFor = (filename: string): number => {
-  const normalized = filename.replaceAll("\\", "/");
-  for (const [suffix, count] of LEGACY_BASELINE) {
-    if (normalized.endsWith(suffix)) return count;
-  }
-  return 0;
+// Existing manual runners are tracked as debt through the `maxOccurrences`
+// option, set per file in the lint config. The rule permits no net-new
+// occurrences in those files, while every other test file must have zero.
+const readMaxOccurrences = (options: ReadonlyArray<unknown>): number => {
+  const [first] = options;
+  return typeof first === "object" &&
+    first !== null &&
+    "maxOccurrences" in first &&
+    typeof first.maxOccurrences === "number"
+    ? first.maxOccurrences
+    : 0;
 };
 
 const manualRunnerName = (callee: unknown): Option.Option<string> => {
@@ -91,11 +60,26 @@ export default defineRule({
       description:
         "Disallow manually creating or running Effect runtimes in tests; use @effect/vitest.",
     },
+    schema: [
+      {
+        type: "object",
+        properties: {
+          maxOccurrences: {
+            type: "integer",
+            minimum: 0,
+            description:
+              "Legacy debt ceiling for this file: occurrences beyond this count are reported.",
+          },
+        },
+        additionalProperties: false,
+      },
+    ],
+    defaultOptions: [{ maxOccurrences: 0 }],
   },
   create(context) {
     if (!TEST_FILE_PATTERN.test(context.filename)) return {};
 
-    const allowedCount = baselineFor(context.filename);
+    const allowedCount = readMaxOccurrences(context.options);
     let occurrenceCount = 0;
 
     return {
diff --git a/oxlint-plugin-t3code/rules/no-mobile-uniwind-theme-escape-hatches.test.ts b/oxlint-plugin-t3code/rules/no-mobile-uniwind-theme-escape-hatches.test.ts
index 67500e747098..9ba9fce14bfe 100644
--- a/oxlint-plugin-t3code/rules/no-mobile-uniwind-theme-escape-hatches.test.ts
+++ b/oxlint-plugin-t3code/rules/no-mobile-uniwind-theme-escape-hatches.test.ts
@@ -7,15 +7,11 @@ const guardedMobileFile = createOxlintRuleHarness("t3code/no-mobile-uniwind-them
 });
 const reviewedInteropFile = createOxlintRuleHarness(
   "t3code/no-mobile-uniwind-theme-escape-hatches",
-  { filename: "apps/mobile/src/features/home/HomeHeader.tsx" },
+  {
+    filename: "apps/mobile/src/features/home/HomeHeader.tsx",
+    ruleOptions: [{ allowUniwindTheme: true }],
+  },
 );
-const gitOverlayInteropFile = createOxlintRuleHarness(
-  "t3code/no-mobile-uniwind-theme-escape-hatches",
-  { filename: "apps/mobile/src/features/threads/GitActionProgressOverlay.tsx" },
-);
-const webFile = createOxlintRuleHarness("t3code/no-mobile-uniwind-theme-escape-hatches", {
-  filename: "apps/web/src/ThemeSurface.tsx",
-});
 
 describe("t3code/no-mobile-uniwind-theme-escape-hatches", () => {
   guardedMobileFile.valid(
@@ -93,18 +89,9 @@ describe("t3code/no-mobile-uniwind-theme-escape-hatches", () => {
     `,
   );
 
-  gitOverlayInteropFile.valid(
-    "allows the native liquid-glass theme boundary",
-    `
-      import { useUniwindTheme } from "../../lib/useUniwindTheme";
-
-      export const tint = useUniwindTheme()["--color-glass-surface"];
-    `,
-  );
-
-  webFile.valid(
-    "does not impose the mobile custom-theme policy on web code",
-    `const surface = <div className="bg-white dark:bg-black" />;`,
+  reviewedInteropFile.invalid(
+    "still reports appearance variants in reviewed interop boundaries",
+    `const surface = <View className="bg-white dark:bg-black" />;`,
   );
 
   guardedMobileFile.invalid(
diff --git a/oxlint-plugin-t3code/rules/no-mobile-uniwind-theme-escape-hatches.ts b/oxlint-plugin-t3code/rules/no-mobile-uniwind-theme-escape-hatches.ts
index 5e6a7111e816..f524709c36ef 100644
--- a/oxlint-plugin-t3code/rules/no-mobile-uniwind-theme-escape-hatches.ts
+++ b/oxlint-plugin-t3code/rules/no-mobile-uniwind-theme-escape-hatches.ts
@@ -3,44 +3,9 @@ import * as Option from "effect/Option";
 
 import { getPropertyName, unwrapExpression } from "../utils.ts";
 
-const MOBILE_SOURCE_MARKER = "/apps/mobile/src/";
 const APPEARANCE_VARIANT_PATTERN = /\b(?:dark|light):(?=\S)/u;
 const APPEARANCE_VARIANT_MESSAGE =
   "dark:/light: utilities do not follow registered custom themes; use an adaptive semantic token.";
-const THEME_INTEROP_ALLOWLIST = new Set([
-  "features/archive/ArchivedThreadsScreen.tsx",
-  "features/connection/ConnectionsNewRouteScreen.tsx",
-  "features/files/FileMarkdownPreview.tsx",
-  "features/files/SourceFileSurface.tsx",
-  "features/files/ThreadFilesRouteScreen.tsx",
-  "features/files/thread-file-navigator-pane.tsx",
-  "features/home/HomeHeader.tsx",
-  "features/review/ReviewSheet.tsx",
-  "features/review/useNativeReviewDiffBridge.ts",
-  "features/settings/SettingsEnvironmentsRouteScreen.tsx",
-  "features/settings/appearance/components/AppearancePreviews.tsx",
-  "features/settings/appearance/components/FontSizeSliderRow.tsx",
-  "features/threads/GitActionProgressOverlay.tsx",
-  "features/threads/NewTaskContextPickerScreens.tsx",
-  "features/threads/NewTaskDraftScreen.tsx",
-  "features/threads/ThreadComposer.tsx",
-  "features/threads/ThreadFeed.tsx",
-  "features/threads/ThreadSettingsSheet.tsx",
-  "features/threads/git/GitOverviewSheet.tsx",
-  "features/threads/thread-list-items.tsx",
-  "features/threads/thread-list-v2-items.tsx",
-  "lib/useMobileNavigationTheme.ts",
-  "native/T3ComposerEditor.ios.tsx",
-  "native/T3ComposerEditor.native.tsx",
-]);
-
-const mobileSourcePath = (filename: string): string | undefined => {
-  const normalized = `/${filename.replaceAll("\\", "/")}`;
-  const markerIndex = normalized.lastIndexOf(MOBILE_SOURCE_MARKER);
-  return markerIndex === -1
-    ? undefined
-    : normalized.slice(markerIndex + MOBILE_SOURCE_MARKER.length);
-};
 
 const literalStringValue = (node: unknown): Option.Option<string> => {
   if (typeof node !== "object" || node === null) return Option.none();
@@ -54,18 +19,40 @@ const reportsAppearanceVariant = (value: string) => APPEARANCE_VARIANT_PATTERN.t
 const importsModule = (source: string, modulePath: string): boolean =>
   source.replace(/\.[cm]?[jt]sx?$/u, "").endsWith(modulePath);
 
+const readAllowUniwindTheme = (options: ReadonlyArray<unknown>): boolean => {
+  const [first] = options;
+  return (
+    typeof first === "object" &&
+    first !== null &&
+    "allowUniwindTheme" in first &&
+    first.allowUniwindTheme === true
+  );
+};
+
 export default defineRule({
   meta: {
     type: "problem",
     docs: {
       description:
-        "Keep mobile theme styling on semantic Uniwind classes and reviewed native interop boundaries.",
+        "Keep mobile theme styling on semantic Uniwind classes. Scope the rule to mobile sources and exempt reviewed native interop boundaries in the lint config.",
     },
+    schema: [
+      {
+        type: "object",
+        properties: {
+          allowUniwindTheme: {
+            type: "boolean",
+            description:
+              "Permit useUniwindTheme in a reviewed native/third-party interop boundary that cannot consume a className.",
+          },
+        },
+        additionalProperties: false,
+      },
+    ],
+    defaultOptions: [{ allowUniwindTheme: false }],
   },
   create(context) {
-    const sourcePath = mobileSourcePath(context.filename);
-    if (sourcePath === undefined) return {};
-
+    const allowUniwindTheme = readAllowUniwindTheme(context.options);
     const uniwindNamespaces = new Set<Variable>();
 
     const resolveVariable = (node: unknown): Variable | undefined => {
@@ -131,13 +118,13 @@ export default defineRule({
 
           if (
             !isTypeOnly &&
-            importsModule(source.value, "/useUniwindTheme") &&
-            !THEME_INTEROP_ALLOWLIST.has(sourcePath)
+            !allowUniwindTheme &&
+            importsModule(source.value, "/useUniwindTheme")
           ) {
             context.report({
               node: specifier,
               message:
-                "Use className for theme styling, or review and add this native/third-party interop boundary to the lint allowlist.",
+                "Use className for theme styling, or review this native/third-party interop boundary and enable allowUniwindTheme for it in the lint config.",
             });
           }
         }
diff --git a/oxlint-plugin-t3code/test/utils.ts b/oxlint-plugin-t3code/test/utils.ts
index 704c3436ce13..dc80ea3451f4 100644
--- a/oxlint-plugin-t3code/test/utils.ts
+++ b/oxlint-plugin-t3code/test/utils.ts
@@ -61,6 +61,8 @@ interface RuleHarness {
 
 interface RuleHarnessOptions {
   readonly filename?: string;
+  /** Rule options, as they would appear after the severity in the lint config. */
+  readonly ruleOptions?: ReadonlyArray<unknown>;
 }
 
 const collectStreamAsString = <E>(stream: Stream.Stream<Uint8Array, E>): Effect.Effect<string, E> =>
@@ -111,7 +113,7 @@ export const createOxlintRuleHarness = (
       configPath,
       yield* encodeOxlintConfig({
         jsPlugins: [{ name: "t3code", specifier: pluginPath }],
-        rules: { [ruleName]: "error" },
+        rules: { [ruleName]: ["error", ...(options.ruleOptions ?? [])] },
       }),
     );
     yield* fs.makeDirectory(path.dirname(sourcePath), { recursive: true });
diff --git a/packages/client-runtime/package.json b/packages/client-runtime/package.json
index f9cc9777213a..bbfde11174f0 100644
--- a/packages/client-runtime/package.json
+++ b/packages/client-runtime/package.json
@@ -27,6 +27,14 @@
       "types": "./src/mediaReference.ts",
       "default": "./src/mediaReference.ts"
     },
+    "./media-source": {
+      "types": "./src/mediaSource.ts",
+      "default": "./src/mediaSource.ts"
+    },
+    "./media-actions": {
+      "types": "./src/mediaActions.ts",
+      "default": "./src/mediaActions.ts"
+    },
     "./codex-file-citations": {
       "types": "./src/codexFileCitations.ts",
       "default": "./src/codexFileCitations.ts"
@@ -195,6 +203,10 @@
       "types": "./src/work-log/presentation.ts",
       "default": "./src/work-log/presentation.ts"
     },
+    "./work-log/tool-presentation": {
+      "types": "./src/work-log/toolPresentation.ts",
+      "default": "./src/work-log/toolPresentation.ts"
+    },
     "./work-log/command-label": {
       "types": "./src/work-log/commandLabel.ts",
       "default": "./src/work-log/commandLabel.ts"
diff --git a/packages/client-runtime/src/connection/supervisor.ts b/packages/client-runtime/src/connection/supervisor.ts
index a2dafa3ca65b..6766d28f88bc 100644
--- a/packages/client-runtime/src/connection/supervisor.ts
+++ b/packages/client-runtime/src/connection/supervisor.ts
@@ -317,12 +317,10 @@ export const make = Effect.fn("EnvironmentSupervisor.make")(function* (
         }),
       });
       const lease = yield* effect.pipe(
-        Effect.mapError(
-          (error): TracedAttemptFailure => ({
-            error,
-            attemptSpan: Option.some(attemptSpan),
-          }),
-        ),
+        Effect.mapError((error): TracedAttemptFailure => ({
+          error,
+          attemptSpan: Option.some(attemptSpan),
+        })),
       );
       return { attemptSpan: Option.some(attemptSpan), lease };
     }).pipe(Effect.withSpan("relay.connection.attempt", { root: true }));
@@ -358,12 +356,10 @@ export const make = Effect.fn("EnvironmentSupervisor.make")(function* (
         attemptSpan: Option.none<Tracer.Span>(),
         lease,
       })),
-      Effect.mapError(
-        (error): TracedAttemptFailure => ({
-          error,
-          attemptSpan: Option.none(),
-        }),
-      ),
+      Effect.mapError((error): TracedAttemptFailure => ({
+        error,
+        attemptSpan: Option.none(),
+      })),
     );
   });
 
@@ -514,20 +510,16 @@ export const make = Effect.fn("EnvironmentSupervisor.make")(function* (
       exitUnlessInterrupted(
         establishTracedConnection(attempt, generation, lastFailure, pendingRetry),
       ).pipe(
-        Effect.map(
-          (exit): EstablishmentEvent => ({
-            _tag: "Completed",
-            exit,
-          }),
-        ),
+        Effect.map((exit): EstablishmentEvent => ({
+          _tag: "Completed",
+          exit,
+        })),
       ),
       waitForEstablishmentInterrupt().pipe(
-        Effect.map(
-          (resetRetry): EstablishmentEvent => ({
-            _tag: "Interrupted",
-            resetRetry,
-          }),
-        ),
+        Effect.map((resetRetry): EstablishmentEvent => ({
+          _tag: "Interrupted",
+          resetRetry,
+        })),
       ),
       Effect.sleep(CONNECTION_ESTABLISHMENT_TIMEOUT).pipe(
         Effect.as<EstablishmentEvent>({ _tag: "TimedOut" }),
@@ -602,20 +594,16 @@ export const make = Effect.fn("EnvironmentSupervisor.make")(function* (
 
     const connectedExit = yield* Effect.raceAllFirst([
       active.lease.session.closed.pipe(
-        Effect.mapError(
-          (error): TracedAttemptFailure => ({
-            error,
-            attemptSpan: active.attemptSpan,
-          }),
-        ),
+        Effect.mapError((error): TracedAttemptFailure => ({
+          error,
+          attemptSpan: active.attemptSpan,
+        })),
       ),
       monitorConnectedLease(active.lease).pipe(
-        Effect.mapError(
-          (error): TracedAttemptFailure => ({
-            error,
-            attemptSpan: active.attemptSpan,
-          }),
-        ),
+        Effect.mapError((error): TracedAttemptFailure => ({
+          error,
+          attemptSpan: active.attemptSpan,
+        })),
       ),
       waitForAuthorizationRefresh(active.lease.prepared),
     ]).pipe(exitUnlessInterrupted);
diff --git a/packages/client-runtime/src/markdownImages.ts b/packages/client-runtime/src/markdownImages.ts
index 6f6fa31dbffa..f4092674c5ae 100644
--- a/packages/client-runtime/src/markdownImages.ts
+++ b/packages/client-runtime/src/markdownImages.ts
@@ -1,66 +1,27 @@
+import { isWindowsAbsolutePath } from "@t3tools/shared/path";
+
+import {
+  normalizeMarkdownLinkDestination,
+  parseFileUrlHref,
+  safeDecodeURIComponent,
+  splitMarkdownLinkSearchAndHash,
+  stripSlashPrefixedWindowsDrive,
+} from "./markdownLinks.ts";
+
 const DIRECT_IMAGE_SOURCE_PATTERN = /^(?:https?:|data:|blob:|\/\/)/i;
 const URI_SCHEME_PATTERN = /^[A-Za-z][A-Za-z0-9+.-]*:/;
-const WINDOWS_DRIVE_PATH_PATTERN = /^[A-Za-z]:[\\/]/;
 
 export type MarkdownImageSource =
   | { readonly _tag: "Direct"; readonly uri: string }
   | { readonly _tag: "WorkspaceFile"; readonly path: string }
   | { readonly _tag: "Blocked" };
 
-function safeDecode(value: string): string {
-  try {
-    return decodeURIComponent(value);
-  } catch {
-    return value;
-  }
-}
-
-function normalizeSource(value: string): string {
-  const trimmed = value.trim();
-  return trimmed.startsWith("<") && trimmed.endsWith(">") ? trimmed.slice(1, -1) : trimmed;
-}
-
 export function markdownImageSourceFragment(source: string): string {
-  const normalizedSource = normalizeSource(source);
-  const hashIndex = normalizedSource.indexOf("#");
-  return hashIndex >= 0 ? normalizedSource.slice(hashIndex) : "";
-}
-
-function normalizeWindowsDrivePath(value: string): string {
-  return /^\/[A-Za-z]:[\\/]/.test(value) ? value.slice(1) : value;
-}
-
-function parseFileUrl(value: string): string | null {
-  try {
-    const parsed = new URL(value);
-    if (parsed.protocol.toLowerCase() !== "file:") return null;
-
-    if (parsed.hostname.length > 0 && parsed.hostname.toLowerCase() !== "localhost") {
-      const pathname = safeDecode(parsed.pathname).replaceAll("/", "\\");
-      return `\\\\${safeDecode(parsed.hostname)}${pathname}`;
-    }
-
-    const pathname = safeDecode(parsed.pathname);
-    if (pathname.length === 0) return null;
-    return normalizeWindowsDrivePath(pathname);
-  } catch {
-    return null;
-  }
-}
-
-function stripSearchAndHash(value: string): string {
-  const searchIndex = value.indexOf("?");
-  const hashIndex = value.indexOf("#");
-  const end = [searchIndex, hashIndex]
-    .filter((index) => index >= 0)
-    .reduce((lowest, index) => Math.min(lowest, index), value.length);
-  return value.slice(0, end);
+  return splitMarkdownLinkSearchAndHash(normalizeMarkdownLinkDestination(source)).hash;
 }
 
 function joinWorkspacePath(workspaceRoot: string, relativePath: string): string {
-  const windows =
-    WINDOWS_DRIVE_PATH_PATTERN.test(workspaceRoot) || workspaceRoot.startsWith("\\\\");
-  const separator = windows ? "\\" : "/";
+  const separator = isWindowsAbsolutePath(workspaceRoot) ? "\\" : "/";
   const root = workspaceRoot.replace(/[\\/]+$/, "");
   const path = relativePath.replace(/[\\/]/g, separator).replace(/^[\\/]+/, "");
   return `${root}${separator}${path}`;
@@ -77,7 +38,7 @@ export function classifyMarkdownImageSource(
 ): MarkdownImageSource {
   if (value === null || value === undefined) return { _tag: "Blocked" };
 
-  const source = normalizeSource(value);
+  const source = normalizeMarkdownLinkDestination(value);
   if (source.length === 0 || source.startsWith("#") || source.startsWith("?")) {
     return { _tag: "Blocked" };
   }
@@ -86,13 +47,20 @@ export function classifyMarkdownImageSource(
   }
 
   if (/^file:/i.test(source)) {
-    const path = parseFileUrl(source);
-    return path === null ? { _tag: "Blocked" } : { _tag: "WorkspaceFile", path };
+    const target = parseFileUrlHref(source);
+    return target === null
+      ? { _tag: "Blocked" }
+      : {
+          _tag: "WorkspaceFile",
+          path: stripSlashPrefixedWindowsDrive(safeDecodeURIComponent(target.path)),
+        };
   }
 
-  const path = normalizeWindowsDrivePath(safeDecode(stripSearchAndHash(source)));
+  const path = stripSlashPrefixedWindowsDrive(
+    safeDecodeURIComponent(splitMarkdownLinkSearchAndHash(source).path),
+  );
   if (path.length === 0) return { _tag: "Blocked" };
-  if (path.startsWith("/") || WINDOWS_DRIVE_PATH_PATTERN.test(path) || path.startsWith("\\\\")) {
+  if (path.startsWith("/") || isWindowsAbsolutePath(path)) {
     return { _tag: "WorkspaceFile", path };
   }
   if (URI_SCHEME_PATTERN.test(path) || path.startsWith("~/") || path.startsWith("~\\")) {
diff --git a/packages/client-runtime/src/markdownLinks.test.ts b/packages/client-runtime/src/markdownLinks.test.ts
index 5763fc5b6ff4..cf8f9ae2d16e 100644
--- a/packages/client-runtime/src/markdownLinks.test.ts
+++ b/packages/client-runtime/src/markdownLinks.test.ts
@@ -1,6 +1,14 @@
 import { describe, expect, it } from "vite-plus/test";
 
-import { inlineCodeFilePathCandidate, isConventionalFilePosition } from "./markdownLinks.js";
+import {
+  fileBasename,
+  inlineCodeFilePathCandidate,
+  isConventionalFilePosition,
+  parseFileUrlHref,
+  parseMarkdownFileLink,
+  splitFilePathPosition,
+  workspaceRelativeFilePath,
+} from "./markdownLinks.ts";
 
 describe("inlineCodeFilePathCandidate", () => {
   it.each([
@@ -28,3 +36,135 @@ describe("isConventionalFilePosition", () => {
     expect(isConventionalFilePosition("port:3000")).toBe(false);
   });
 });
+
+describe("parseFileUrlHref", () => {
+  it.each([
+    ["file:///Users/julius/project/src/main.ts#L42", "/Users/julius/project/src/main.ts", "#L42"],
+    [
+      "file:///D:/Programme/t3code/OpenInPicker.tsx#L69",
+      "D:/Programme/t3code/OpenInPicker.tsx",
+      "#L69",
+    ],
+    ["file://server/share/workspace-image.svg", "\\\\server\\share\\workspace-image.svg", ""],
+    ["file://localhost/home/me/notes.md", "/home/me/notes.md", ""],
+  ])("parses %s", (href, path, hash) => {
+    expect(parseFileUrlHref(href)).toEqual({ path, hash });
+  });
+
+  it("keeps percent-encoding so the caller decodes once", () => {
+    expect(parseFileUrlHref("file:///Users/julius/project/file%2520name.md")?.path).toBe(
+      "/Users/julius/project/file%2520name.md",
+    );
+    expect(parseFileUrlHref("file:///c%3A/Users/x/shot.png")?.path).toBe("/c%3A/Users/x/shot.png");
+  });
+
+  it.each(["https://example.com/a.ts", "file://%", "/Users/julius/a.ts"])("rejects %s", (href) => {
+    expect(parseFileUrlHref(href)).toBeNull();
+  });
+});
+
+describe("splitFilePathPosition", () => {
+  it.each([
+    ["src/main.ts", "", { path: "src/main.ts" }],
+    ["src/main.ts:12", "", { path: "src/main.ts", line: 12 }],
+    ["src/main.ts:12:5", "", { path: "src/main.ts", line: 12, column: 5 }],
+    ["src/main.ts", "#L18C2", { path: "src/main.ts", line: 18, column: 2 }],
+    ["src/main.ts:3", "#L18C2", { path: "src/main.ts", line: 3 }],
+    ["src/main.ts:0", "", { path: "src/main.ts" }],
+    ["src/main.ts", "#section", { path: "src/main.ts" }],
+  ])("splits %s%s", (path, hash, expected) => {
+    expect(splitFilePathPosition(path, hash)).toEqual(expected);
+  });
+});
+
+describe("parseMarkdownFileLink", () => {
+  // Both clients consume this table, so a path the web app recognizes is one
+  // the mobile app recognizes too.
+  it.each([
+    ["/Users/julius/project/AGENTS.md", "/Users/julius/project/AGENTS.md"],
+    ["/home/me/notes.md", "/home/me/notes.md"],
+    ["/usr/local/bin/tool", "/usr/local/bin/tool"],
+    ["/workspace/Makefile", "/workspace/Makefile"],
+    ["/tmp/favicons/", "/tmp/favicons/"],
+    ["C:\\Users\\mike\\project\\src\\main.ts", "C:\\Users\\mike\\project\\src\\main.ts"],
+    ["C:%5Crepo%5Cimage.png", "C:\\repo\\image.png"],
+    ["\\\\server\\share\\image.png", "\\\\server\\share\\image.png"],
+    ["/D:/Programme/t3code/OpenInPicker.tsx", "D:/Programme/t3code/OpenInPicker.tsx"],
+    ["</D:/Programme/t3code/ChatMarkdown.tsx:1>", "D:/Programme/t3code/ChatMarkdown.tsx"],
+    ["file:///Users/julius/project/file%2520name.md", "/Users/julius/project/file%20name.md"],
+    ["file://server/share/workspace-image.svg", "\\\\server\\share\\workspace-image.svg"],
+    ["file://localhost/home/me/notes.md", "/home/me/notes.md"],
+    ["apps/mobile/src/index.ts:10", "apps/mobile/src/index.ts"],
+    ["docs/My%20Folder/checklist.xml", "docs/My Folder/checklist.xml"],
+    ["Updated%20cutover%20checklist.md", "Updated cutover checklist.md"],
+    ["./scripts/deploy", "./scripts/deploy"],
+    ["~/notes/today.md", "~/notes/today.md"],
+    ["AGENTS.md", "AGENTS.md"],
+    ["script.ts:10", "script.ts"],
+    ["/tmp/clip%23one.mp4#t=2", "/tmp/clip#one.mp4"],
+  ])("recognizes %s as a file", (href, path) => {
+    expect(parseMarkdownFileLink(href)?.path).toBe(path);
+  });
+
+  it.each([
+    "",
+    "#anchor",
+    "//cdn.example.com/clip.mp4",
+    "https://example.com/docs",
+    "mailto:someone@example.com",
+    "javascript:alert(1)",
+    "/chat/settings",
+    "/chat/settings#L3",
+    "/app#L1",
+    "readme",
+    "TODO:12",
+  ])("does not treat %s as a file", (href) => {
+    expect(parseMarkdownFileLink(href)).toBeNull();
+  });
+
+  it("accepts conventional extensionless names with or without a position", () => {
+    expect(parseMarkdownFileLink("Makefile")).toEqual({ path: "Makefile" });
+    expect(parseMarkdownFileLink("Dockerfile:8")).toEqual({ path: "Dockerfile", line: 8 });
+    expect(parseMarkdownFileLink("/srv/app/Makefile")).toEqual({ path: "/srv/app/Makefile" });
+  });
+
+  it("reads positions from suffixes and line anchors", () => {
+    expect(parseMarkdownFileLink("/Users/julius/project/src/main.ts#L42C7")).toEqual({
+      path: "/Users/julius/project/src/main.ts",
+      line: 42,
+      column: 7,
+    });
+    expect(parseMarkdownFileLink("file://server/share/src/main.ts#L42C7")).toMatchObject({
+      path: "\\\\server\\share\\src\\main.ts",
+      line: 42,
+      column: 7,
+    });
+  });
+});
+
+describe("fileBasename", () => {
+  it.each([
+    ["/tmp/favicons/", "favicons"],
+    ["C:\\Users\\kelchm\\.claude\\", ".claude"],
+    ["/tmp/", "tmp"],
+    ["AGENTS.md", "AGENTS.md"],
+    ["/", "/"],
+  ])("labels %s as %s", (path, basename) => {
+    expect(fileBasename(path)).toBe(basename);
+  });
+});
+
+describe("workspaceRelativeFilePath", () => {
+  it.each([
+    ["/repo/project/src/main.ts", "/repo/project", "src/main.ts"],
+    ["/repo/project/src/main.ts", "/repo/project/", "src/main.ts"],
+    ["C:\\Users\\mike\\t3code\\apps\\web\\a.ts", "C:/Users/mike/t3code", "apps/web/a.ts"],
+    ["/C:/Users/mike/t3code/apps/web/a.ts", "C:/Users/mike/t3code", "apps/web/a.ts"],
+    ["/Repo/Project/src/main.ts", "/repo/project", "src/main.ts"],
+    ["/tmp/report.ts", "/repo/project", null],
+    ["/repo/project-two/a.ts", "/repo/project", null],
+    ["/repo/project/a.ts", undefined, null],
+  ])("relates %s to %s", (path, workspaceRoot, relativePath) => {
+    expect(workspaceRelativeFilePath(path, workspaceRoot)).toBe(relativePath);
+  });
+});
diff --git a/packages/client-runtime/src/markdownLinks.ts b/packages/client-runtime/src/markdownLinks.ts
index 73048357e616..81cce1fd7eee 100644
--- a/packages/client-runtime/src/markdownLinks.ts
+++ b/packages/client-runtime/src/markdownLinks.ts
@@ -1,12 +1,49 @@
-const WINDOWS_DRIVE_PATH_PATTERN = /^[A-Za-z]:[\\/]/;
-const WINDOWS_UNC_PATH_PATTERN = /^\\\\/;
+import { isWindowsAbsolutePath } from "@t3tools/shared/path";
+
+const SLASH_PREFIXED_WINDOWS_DRIVE_PATTERN = /^\/[A-Za-z]:[\\/]/;
 const RELATIVE_PATH_PREFIX_PATTERN = /^(~\/|\.{1,2}\/)/;
+const RELATIVE_FILE_PATH_PATTERN =
+  /^(?:[A-Za-z0-9._-]+(?: +[A-Za-z0-9._-]+)*\/)+[A-Za-z0-9._-]+(?: +[A-Za-z0-9._-]+)*(?::\d+){0,2}$/;
+const RELATIVE_FILE_NAME_PATTERN =
+  /^[A-Za-z0-9._-]+(?: +[A-Za-z0-9._-]+)*\.[A-Za-z0-9_-]+(?::\d+){0,2}$/;
+const EXTERNAL_SCHEME_PATTERN = /^([A-Za-z][A-Za-z0-9+.-]*):(.*)$/;
 const POSITION_SUFFIX_PATTERN = /:\d+(?::\d+)?$/;
+const POSITION_SUFFIX_CAPTURE_PATTERN = /:(\d+)(?::(\d+))?$/;
+const POSITION_HASH_PATTERN = /^#L(\d+)(?:C(\d+))?$/i;
+const POSITION_ONLY_PATTERN = /^\d+(?::\d+)?$/;
 const INLINE_CODE_DISQUALIFIER_PATTERN = /[\s`]/;
 const PATH_SEPARATOR_PATTERN = /[\\/]/;
 const FILE_EXTENSION_PATTERN = /\.[A-Za-z0-9_-]+$/;
 const NUMERIC_DOTTED_PATTERN = /^\d+(?:\.\d+)+$/;
 const BARE_EXTENSIONLESS_POSITION_PATTERN = /^[A-Za-z0-9_-]+(?::\d+){1,2}$/;
+// Standard OS and dev-container roots; deliberately excludes app-route-ish
+// prefixes like /app/ or /chat/ so SPA routes never read as files.
+const POSIX_FILE_ROOT_PREFIXES = [
+  "/Users/",
+  "/home/",
+  "/tmp/",
+  "/var/",
+  "/etc/",
+  "/opt/",
+  "/mnt/",
+  "/Volumes/",
+  "/private/",
+  "/root/",
+  "/usr/",
+  "/bin/",
+  "/sbin/",
+  "/lib/",
+  "/lib64/",
+  "/srv/",
+  "/dev/",
+  "/proc/",
+  "/sys/",
+  "/run/",
+  "/boot/",
+  "/media/",
+  "/workspace/",
+  "/workspaces/",
+] as const;
 // `Name:digits` also matches `error:1`, `port:3000`, and `TODO:12`.
 const EXTENSIONLESS_FILE_NAMES = new Set([
   "Makefile",
@@ -131,18 +168,14 @@ export function inlineCodeFilePathCandidate(codeText: string): string | null {
   const trimmed = codeText.trim();
   if (trimmed.length === 0 || INLINE_CODE_DISQUALIFIER_PATTERN.test(trimmed)) return null;
 
-  const candidate =
-    WINDOWS_DRIVE_PATH_PATTERN.test(trimmed) || WINDOWS_UNC_PATH_PATTERN.test(trimmed)
-      ? trimmed
-      : trimmed.replaceAll("\\", "/");
+  const candidate = isWindowsAbsolutePath(trimmed) ? trimmed : trimmed.replaceAll("\\", "/");
   const hasPosition = POSITION_SUFFIX_PATTERN.test(candidate);
   if (!hasPosition && !PATH_SEPARATOR_PATTERN.test(candidate)) return null;
 
   const hasExplicitPathShape =
     RELATIVE_PATH_PREFIX_PATTERN.test(candidate) ||
     candidate.startsWith("/") ||
-    WINDOWS_DRIVE_PATH_PATTERN.test(candidate) ||
-    WINDOWS_UNC_PATH_PATTERN.test(candidate);
+    isWindowsAbsolutePath(candidate);
   if (!hasExplicitPathShape) {
     const withoutPosition = candidate.replace(POSITION_SUFFIX_PATTERN, "");
     const firstSegment = withoutPosition.split("/")[0] ?? withoutPosition;
@@ -156,3 +189,159 @@ export function inlineCodeFilePathCandidate(codeText: string): string | null {
   }
   return candidate;
 }
+
+export function safeDecodeURIComponent(value: string): string {
+  try {
+    return decodeURIComponent(value);
+  } catch {
+    return value;
+  }
+}
+
+export function normalizeMarkdownLinkDestination(value: string): string {
+  const trimmed = value.trim();
+  return trimmed.startsWith("<") && trimmed.endsWith(">") ? trimmed.slice(1, -1) : trimmed;
+}
+
+/** Browser URL parsers write `C:/foo` as `/C:/foo` for file URLs. */
+export function stripSlashPrefixedWindowsDrive(path: string): string {
+  return SLASH_PREFIXED_WINDOWS_DRIVE_PATTERN.test(path) ? path.slice(1) : path;
+}
+
+export function splitMarkdownLinkSearchAndHash(value: string): {
+  readonly path: string;
+  readonly hash: string;
+} {
+  const hashIndex = value.indexOf("#");
+  const pathWithSearch = hashIndex >= 0 ? value.slice(0, hashIndex) : value;
+  const hash = hashIndex >= 0 ? value.slice(hashIndex) : "";
+  const queryIndex = pathWithSearch.indexOf("?");
+  return {
+    path: queryIndex >= 0 ? pathWithSearch.slice(0, queryIndex) : pathWithSearch,
+    hash,
+  };
+}
+
+/**
+ * Turns a `file:` URL into a host path, still percent-encoded so callers that
+ * decode every destination in one place do not decode file URLs twice. A
+ * non-localhost authority becomes a UNC share.
+ */
+export function parseFileUrlHref(
+  href: string,
+): { readonly path: string; readonly hash: string } | null {
+  try {
+    const parsed = new URL(href);
+    if (parsed.protocol.toLowerCase() !== "file:") return null;
+
+    const uncHostname = parsed.hostname.toLowerCase() === "localhost" ? "" : parsed.hostname;
+    const path = uncHostname
+      ? `\\\\${uncHostname}${parsed.pathname.replaceAll("/", "\\")}`
+      : parsed.pathname;
+    if (path.length === 0) return null;
+    return { path: stripSlashPrefixedWindowsDrive(path), hash: parsed.hash };
+  } catch {
+    return null;
+  }
+}
+
+export interface FilePathPosition {
+  readonly path: string;
+  readonly line?: number;
+  readonly column?: number;
+}
+
+export function splitFilePathPosition(path: string, hash = ""): FilePathPosition {
+  const suffixMatch = path.match(POSITION_SUFFIX_CAPTURE_PATTERN);
+  const match = suffixMatch ?? hash.match(POSITION_HASH_PATTERN);
+  if (!match?.[1]) return { path };
+
+  const line = Number.parseInt(match[1], 10);
+  const column = match[2] === undefined ? undefined : Number.parseInt(match[2], 10);
+  return {
+    path: suffixMatch ? path.slice(0, -suffixMatch[0].length) : path,
+    ...(line > 0 ? { line } : {}),
+    ...(column !== undefined && column > 0 ? { column } : {}),
+  };
+}
+
+export function formatFilePathPosition(position: FilePathPosition): string {
+  if (!position.line) return position.path;
+  return `${position.path}:${position.line}${position.column ? `:${position.column}` : ""}`;
+}
+
+export function isRelativeFilePath(path: string): boolean {
+  return (
+    RELATIVE_PATH_PREFIX_PATTERN.test(path) ||
+    (!path.startsWith("/") && !isWindowsAbsolutePath(path))
+  );
+}
+
+function looksLikePosixFilesystemPath(path: string): boolean {
+  if (!path.startsWith("/")) return false;
+  if (POSIX_FILE_ROOT_PREFIXES.some((prefix) => path.startsWith(prefix))) return true;
+  if (POSITION_SUFFIX_PATTERN.test(path)) return true;
+  const basename = path.slice(path.lastIndexOf("/") + 1);
+  return EXTENSIONLESS_FILE_NAMES.has(basename) || FILE_EXTENSION_PATTERN.test(basename);
+}
+
+/**
+ * Decides whether a decoded link destination is a file path rather than a route
+ * or prose. Only a `:line` suffix the author wrote counts as evidence; a `#L`
+ * anchor never turns `/chat/settings` into a file.
+ */
+function looksLikeFilePath(path: string, authoredPath: string): boolean {
+  if (isWindowsAbsolutePath(path) || RELATIVE_PATH_PREFIX_PATTERN.test(path)) return true;
+  if (path.startsWith("/")) return looksLikePosixFilesystemPath(authoredPath);
+  if (EXTENSIONLESS_FILE_NAMES.has(path)) return true;
+  return RELATIVE_FILE_PATH_PATTERN.test(authoredPath) || RELATIVE_FILE_NAME_PATTERN.test(path);
+}
+
+function hasExternalScheme(path: string): boolean {
+  if (isWindowsAbsolutePath(path)) return false;
+  const match = path.match(EXTERNAL_SCHEME_PATTERN);
+  if (!match) return false;
+  const rest = match[2] ?? "";
+  if (rest.startsWith("//")) return true;
+  return !POSITION_ONLY_PATTERN.test(rest);
+}
+
+export function parseMarkdownFileLink(href: string): FilePathPosition | null {
+  const normalized = normalizeMarkdownLinkDestination(href);
+  if (normalized.length === 0 || normalized.startsWith("#") || normalized.startsWith("//")) {
+    return null;
+  }
+
+  const source =
+    (normalized.toLowerCase().startsWith("file:") ? parseFileUrlHref(normalized) : null) ??
+    splitMarkdownLinkSearchAndHash(normalized);
+  // A percent-encoded drive colon (`/c%3A/`) only becomes strippable once decoded.
+  const path = stripSlashPrefixedWindowsDrive(safeDecodeURIComponent(source.path.trim()));
+  const hash = safeDecodeURIComponent(source.hash.trim());
+  if (path.length === 0 || hasExternalScheme(path)) return null;
+
+  const position = splitFilePathPosition(path, hash);
+  return looksLikeFilePath(position.path, path) ? position : null;
+}
+
+export function fileBasename(path: string): string {
+  // A trailing separator is a valid way to write a directory. Trim it before
+  // taking the final segment so the label is never empty.
+  const trimmed = path.replace(/[/\\]+$/, "");
+  if (trimmed.length === 0) return path;
+  const separatorIndex = Math.max(trimmed.lastIndexOf("/"), trimmed.lastIndexOf("\\"));
+  return separatorIndex >= 0 ? trimmed.slice(separatorIndex + 1) : trimmed;
+}
+
+export function workspaceRelativeFilePath(
+  path: string,
+  workspaceRoot: string | null | undefined,
+): string | null {
+  if (!workspaceRoot) return null;
+  const normalizedPath = stripSlashPrefixedWindowsDrive(path.replaceAll("\\", "/"));
+  const normalizedRoot = stripSlashPrefixedWindowsDrive(
+    workspaceRoot.replaceAll("\\", "/"),
+  ).replace(/\/+$/, "");
+  if (!normalizedPath.toLowerCase().startsWith(`${normalizedRoot.toLowerCase()}/`)) return null;
+  return normalizedPath.slice(normalizedRoot.length + 1);
+}
diff --git a/packages/client-runtime/src/mediaActions.ts b/packages/client-runtime/src/mediaActions.ts
new file mode 100644
index 000000000000..e0256dff93fe
--- /dev/null
+++ b/packages/client-runtime/src/mediaActions.ts
@@ -0,0 +1,8 @@
+/** Menu action ids shared by every client so labels and handlers line up across surfaces. */
+export type MediaActionId =
+  | "copy-full-path"
+  | "copy-relative-path"
+  | "copy-url"
+  | "open-file"
+  | "save"
+  | "copy-image";
diff --git a/packages/client-runtime/src/mediaReference.ts b/packages/client-runtime/src/mediaReference.ts
index dcb93e6bc57e..f44ec90cd879 100644
--- a/packages/client-runtime/src/mediaReference.ts
+++ b/packages/client-runtime/src/mediaReference.ts
@@ -1,5 +1,7 @@
 import { isWindowsAbsolutePath } from "@t3tools/shared/path";
 
+import { safeDecodeURIComponent } from "./markdownLinks.ts";
+
 /** The authored media location, never the temporary URL used to load its bytes. */
 export type MediaReference =
   | {
@@ -86,10 +88,5 @@ export function mediaReferenceFileName(reference: MediaReference): string | unde
   } catch {
     return undefined;
   }
-  if (!basename) return undefined;
-  try {
-    return decodeURIComponent(basename);
-  } catch {
-    return basename;
-  }
+  return basename ? safeDecodeURIComponent(basename) : undefined;
 }
diff --git a/packages/client-runtime/src/mediaSource.test.ts b/packages/client-runtime/src/mediaSource.test.ts
new file mode 100644
index 000000000000..9db7c5fee428
--- /dev/null
+++ b/packages/client-runtime/src/mediaSource.test.ts
@@ -0,0 +1,141 @@
+import { ThreadId } from "@t3tools/contracts";
+import { describe, expect, it } from "vite-plus/test";
+
+import { resolveMediaSource } from "./mediaSource.ts";
+
+const threadId = ThreadId.make("thread-1");
+const attachmentId =
+  "11111111-1111-4111-8111-111111111111-22222222-2222-4222-8222-222222222222-mp4";
+
+describe("resolveMediaSource", () => {
+  describe("direct URLs", () => {
+    it("keeps the authored URL and decodes the display name once", () => {
+      const href = "https://cdn.example.com/clip%20one%2520%2Emp4?signature=a%2fb#t=2";
+      expect(resolveMediaSource(href, { threadId })).toEqual({
+        kind: "video",
+        mimeType: "video/mp4",
+        name: "clip one%20.mp4",
+        reference: { kind: "url", url: href },
+        srcFragment: "#t=2",
+        access: "direct",
+        uri: href,
+      });
+    });
+
+    it("keeps protocol-relative URLs as authored; clients add the scheme", () => {
+      const href = "//cdn.example.com/clip.mp4?sig=1#t=2";
+      expect(resolveMediaSource(href, { threadId })).toMatchObject({
+        access: "direct",
+        uri: href,
+        reference: { kind: "url", url: href },
+      });
+    });
+
+    it("accepts extensionless image embeds only when asked", () => {
+      const href = "https://cdn.example.com/render?id=42";
+      expect(resolveMediaSource(href, { threadId })).toBeNull();
+      expect(resolveMediaSource(href, { threadId, imageEmbed: true })).toMatchObject({
+        kind: "image",
+        mimeType: "image/*",
+        name: "render",
+      });
+    });
+
+    it.each(["data:image/png;base64,AAAA", "blob:https://app.t3.codes/id"])(
+      "loads %s directly",
+      (href) => {
+        expect(resolveMediaSource(href, { threadId, imageEmbed: true })).toMatchObject({
+          access: "direct",
+          uri: href,
+        });
+      },
+    );
+  });
+
+  describe("host paths", () => {
+    // POSIX, Windows, UNC, and file URLs must all reach the same media-file resource.
+    it.each([
+      ["/tmp/frame%23one.png:12", "/tmp/frame#one.png"],
+      ["/tmp/frame%3Fone.png:12:3", "/tmp/frame?one.png"],
+      ["/tmp/frame%2523one.png:12", "/tmp/frame%23one.png"],
+      ["C:\\Users\\demo\\frame.png", "C:\\Users\\demo\\frame.png"],
+      ["/C:/Users/demo/frame.png", "C:/Users/demo/frame.png"],
+      ["file:///C:/Users/demo/frame.png", "C:/Users/demo/frame.png"],
+      ["file://server/share/frame.png", "\\\\server\\share\\frame.png"],
+      ["\\\\server\\share\\frame.png", "\\\\server\\share\\frame.png"],
+    ])("resolves %s through the environment", (href, path) => {
+      expect(resolveMediaSource(href, { threadId, workspaceRoot: "/repo" })).toEqual({
+        kind: "image",
+        mimeType: "image/png",
+        name: path.split(/[\\/]/).at(-1),
+        reference: { kind: "file", path },
+        srcFragment: "",
+        access: "environment",
+        resource: { _tag: "media-file", threadId, path },
+      });
+    });
+
+    it("joins relative paths to the workspace and records the relative reference", () => {
+      expect(
+        resolveMediaSource("screens/logo.svg?v=2#mark", { threadId, workspaceRoot: "/repo" }),
+      ).toEqual({
+        kind: "image",
+        mimeType: "image/svg+xml",
+        name: "logo.svg",
+        reference: {
+          kind: "file",
+          path: "/repo/screens/logo.svg",
+          relativePath: "screens/logo.svg",
+        },
+        srcFragment: "#mark",
+        access: "environment",
+        resource: { _tag: "media-file", threadId, path: "/repo/screens/logo.svg" },
+      });
+    });
+
+    it("prefers a caller-resolved path over classifying the source", () => {
+      expect(
+        resolveMediaSource("logo.svg", {
+          threadId,
+          workspaceRoot: "/repo",
+          resolvedFilePath: "/repo/docs/logo.svg",
+        }),
+      ).toMatchObject({
+        access: "environment",
+        resource: { _tag: "media-file", path: "/repo/docs/logo.svg" },
+        reference: { relativePath: "docs/logo.svg" },
+      });
+    });
+
+    it("separates a playback fragment from literal filename characters", () => {
+      expect(resolveMediaSource("/tmp/clip%23one.mp4#t=2", { threadId })).toMatchObject({
+        kind: "video",
+        srcFragment: "#t=2",
+        resource: { path: "/tmp/clip#one.mp4" },
+      });
+    });
+
+    it("cannot be loaded without a thread to mint through", () => {
+      expect(resolveMediaSource("/tmp/clip.mp4", { threadId: undefined })).toMatchObject({
+        kind: "video",
+        access: "unavailable",
+      });
+    });
+
+    it.each(["notes.txt", "/repo/README", "/repo/archive.zip"])(
+      "returns null for the non-media path %s",
+      (href) => {
+        expect(resolveMediaSource(href, { threadId, workspaceRoot: "/repo" })).toBeNull();
+      },
+    );
+  });
+
+  it("serves T3 attachment files in place like any other host path", () => {
+    const path = `/home/demo/.t3/userdata/attachments/${attachmentId}.mp4`;
+    expect(resolveMediaSource(path, { threadId, workspaceRoot: "/repo" })).toMatchObject({
+      kind: "video",
+      access: "environment",
+      resource: { _tag: "media-file", threadId, path },
+    });
+  });
+});
diff --git a/packages/client-runtime/src/mediaSource.ts b/packages/client-runtime/src/mediaSource.ts
new file mode 100644
index 000000000000..6c285e21ba99
--- /dev/null
+++ b/packages/client-runtime/src/mediaSource.ts
@@ -0,0 +1,104 @@
+import type { AssetResource, ThreadId } from "@t3tools/contracts";
+import { mediaMimeType, mediaMimeTypeFromExtension } from "@t3tools/shared/filePreview";
+
+import {
+  classifyMarkdownImageSource,
+  markdownImageSourceFragment,
+  type MarkdownImageSource,
+} from "./markdownImages.ts";
+import {
+  fileBasename,
+  splitFilePathPosition,
+  splitMarkdownLinkSearchAndHash,
+} from "./markdownLinks.ts";
+import {
+  mediaFileReference,
+  mediaReferenceFileName,
+  mediaUrlReference,
+  type MediaReference,
+} from "./mediaReference.ts";
+
+export type MediaSourceResource = Extract<AssetResource, { readonly _tag: "media-file" }>;
+
+/** What a piece of authored media is and how its bytes can be reached. */
+export type ResolvedMediaSource = {
+  readonly kind: "image" | "video";
+  readonly mimeType: string;
+  readonly name: string;
+  readonly reference?: MediaReference;
+  readonly srcFragment: string;
+} & (
+  | {
+      readonly access: "direct";
+      readonly uri: string;
+    }
+  | {
+      readonly access: "environment";
+      readonly resource: MediaSourceResource;
+    }
+  | {
+      readonly access: "unavailable";
+    }
+);
+
+export interface ResolveMediaSourceInput {
+  readonly threadId: ThreadId | undefined;
+  readonly workspaceRoot?: string | null | undefined;
+  readonly resolvedFilePath?: string | undefined;
+  /** Image syntax can target an endpoint without a recognizable extension. */
+  readonly imageEmbed?: boolean | undefined;
+}
+
+function classify(source: string, input: ResolveMediaSourceInput): MarkdownImageSource {
+  return input.resolvedFilePath === undefined
+    ? classifyMarkdownImageSource(source, input.workspaceRoot)
+    : { _tag: "WorkspaceFile", path: input.resolvedFilePath };
+}
+
+export function resolveMediaSource(
+  source: string,
+  input: ResolveMediaSourceInput,
+): ResolvedMediaSource | null {
+  const classified = classify(source, input);
+  if (classified._tag === "Blocked") return null;
+
+  const path =
+    classified._tag === "Direct"
+      ? splitMarkdownLinkSearchAndHash(classified.uri).path
+      : splitFilePathPosition(classified.path).path;
+  // Local paths have already been decoded. Do not interpret literal #, ?, or % characters again.
+  const basename = fileBasename(path);
+  const extensionIndex = basename.lastIndexOf(".");
+  const detectedMimeType =
+    classified._tag === "Direct"
+      ? mediaMimeType(classified.uri)
+      : extensionIndex < 0
+        ? null
+        : mediaMimeTypeFromExtension(basename.slice(extensionIndex));
+  const mimeType = detectedMimeType ?? (input.imageEmbed ? "image/*" : null);
+  if (mimeType === null) return null;
+  const kind = mimeType.startsWith("video/") ? "video" : "image";
+
+  const reference =
+    classified._tag === "Direct"
+      ? mediaUrlReference(classified.uri)
+      : mediaFileReference(path, input.workspaceRoot);
+  const name = (reference && mediaReferenceFileName(reference)) || basename || kind;
+  const common = {
+    kind,
+    mimeType,
+    name,
+    ...(reference ? { reference } : {}),
+    srcFragment: markdownImageSourceFragment(source),
+  } as const;
+
+  if (classified._tag === "Direct") {
+    return { ...common, access: "direct", uri: classified.uri };
+  }
+  if (input.threadId === undefined) return { ...common, access: "unavailable" };
+  return {
+    ...common,
+    access: "environment",
+    resource: { _tag: "media-file", threadId: input.threadId, path },
+  };
+}
diff --git a/packages/client-runtime/src/relay/managedRelayState.test.ts b/packages/client-runtime/src/relay/managedRelayState.test.ts
index 0588da342066..8c93ec136d60 100644
--- a/packages/client-runtime/src/relay/managedRelayState.test.ts
+++ b/packages/client-runtime/src/relay/managedRelayState.test.ts
@@ -243,30 +243,38 @@ describe("createManagedRelayQueryManager", () => {
     }),
   );
 
-  it("emits credential changes only when the managed relay account changes", async () => {
-    setManagedRelaySession(registry, {
-      accountId: "account-1",
-      readClerkToken: () => Promise.resolve("first-token"),
-    });
-    const changes = Effect.runPromise(
-      managedRelayAccountChanges(registry).pipe(Stream.take(2), Stream.runCollect),
-    );
-    await vi.waitFor(() => {
-      expect(registry.getNodes().get(managedRelaySessionAtom)?.listeners.size).toBeGreaterThan(0);
-    });
+  it.effect("emits credential changes only when the managed relay account changes", () =>
+    Effect.gen(function* () {
+      setManagedRelaySession(registry, {
+        accountId: "account-1",
+        readClerkToken: () => Promise.resolve("first-token"),
+      });
+      const changes = yield* managedRelayAccountChanges(registry).pipe(
+        Stream.take(2),
+        Stream.runCollect,
+        Effect.forkChild,
+      );
+      yield* Effect.promise(() =>
+        vi.waitFor(() => {
+          expect(registry.getNodes().get(managedRelaySessionAtom)?.listeners.size).toBeGreaterThan(
+            0,
+          );
+        }),
+      );
 
-    setManagedRelaySession(registry, {
-      accountId: "account-1",
-      readClerkToken: () => Promise.resolve("refreshed-token"),
-    });
-    setManagedRelaySession(registry, {
-      accountId: "account-2",
-      readClerkToken: () => Promise.resolve("second-token"),
-    });
-    setManagedRelaySession(registry, null);
+      setManagedRelaySession(registry, {
+        accountId: "account-1",
+        readClerkToken: () => Promise.resolve("refreshed-token"),
+      });
+      setManagedRelaySession(registry, {
+        accountId: "account-2",
+        readClerkToken: () => Promise.resolve("second-token"),
+      });
+      setManagedRelaySession(registry, null);
 
-    expect(Array.from(await changes)).toEqual(["account-2", null]);
-  });
+      expect(Array.from(yield* Fiber.join(changes))).toEqual(["account-2", null]);
+    }),
+  );
 
   it("shares one Clerk token read across concurrent relay list and status queries", async () => {
     const secondEnvironment = {
diff --git a/packages/client-runtime/src/rpc/session.test.ts b/packages/client-runtime/src/rpc/session.test.ts
index aedd85c5de47..f7e945197021 100644
--- a/packages/client-runtime/src/rpc/session.test.ts
+++ b/packages/client-runtime/src/rpc/session.test.ts
@@ -607,14 +607,11 @@ describe("RpcSessionFactory", () => {
             payload: { themes: [] },
           },
         ];
-        const settingsEvents = Array.from(
-          { length: 65 },
-          (): ServerConfigStreamEventType => ({
-            version: 1,
-            type: "settingsUpdated",
-            payload: { settings: DEFAULT_SERVER_SETTINGS },
-          }),
-        );
+        const settingsEvents = Array.from({ length: 65 }, (): ServerConfigStreamEventType => ({
+          version: 1,
+          type: "settingsUpdated",
+          payload: { settings: DEFAULT_SERVER_SETTINGS },
+        }));
         const allEvents = [...themeEvents, ...settingsEvents];
         const observedByFastSubscriber = yield* Queue.unbounded<ServerConfigStreamEventType>();
         yield* session.subscribeServerConfig({ environmentThemes: true }).pipe(
diff --git a/packages/client-runtime/src/state/assets.ts b/packages/client-runtime/src/state/assets.ts
index e407f5d0028f..f2f82def3dd7 100644
--- a/packages/client-runtime/src/state/assets.ts
+++ b/packages/client-runtime/src/state/assets.ts
@@ -1,6 +1,11 @@
-import { AssetResource, EnvironmentId, WS_METHODS } from "@t3tools/contracts";
+import {
+  type AssetCreateUrlResult,
+  AssetResource,
+  EnvironmentId,
+  WS_METHODS,
+} from "@t3tools/contracts";
 import * as Schema from "effect/Schema";
-import { Atom } from "effect/unstable/reactivity";
+import { AsyncResult, Atom } from "effect/unstable/reactivity";
 
 import type { EnvironmentRegistry } from "../connection/registry.ts";
 import { createEnvironmentRpcQueryAtomFamily } from "./runtime.ts";
@@ -43,6 +48,35 @@ export function resolveAssetUrl(httpBaseUrl: string, relativeUrl: string): strin
   }
 }
 
+export const EMPTY_ASSET_URL_ATOM = Atom.make(AsyncResult.initial<never, never>(false)).pipe(
+  Atom.withLabel("asset-url:empty"),
+);
+
+export type AssetUrlState =
+  | { readonly _tag: "Loading" }
+  | { readonly _tag: "Failure" }
+  | {
+      readonly _tag: "Success";
+      readonly url: string;
+      /** The host path the server chose to serve, when it differs from what was asked for. */
+      readonly sourcePath?: string;
+    };
+
+export function assetUrlStateFromResult(
+  result: AsyncResult.AsyncResult<AssetCreateUrlResult, unknown>,
+  httpBaseUrl: string | null,
+): AssetUrlState {
+  if (result._tag === "Failure") return { _tag: "Failure" };
+  if (httpBaseUrl === null || result._tag !== "Success") return { _tag: "Loading" };
+  const url = resolveAssetUrl(httpBaseUrl, result.value.relativeUrl);
+  if (url === null) return { _tag: "Failure" };
+  return {
+    _tag: "Success",
+    url,
+    ...(result.value.sourcePath !== undefined ? { sourcePath: result.value.sourcePath } : {}),
+  };
+}
+
 export function createAssetEnvironmentAtoms<R, E>(
   runtime: Atom.AtomRuntime<EnvironmentRegistry | R, E>,
 ) {
diff --git a/packages/client-runtime/src/state/pullRequests.ts b/packages/client-runtime/src/state/pullRequests.ts
index d52a040ce837..58be7b1c7a41 100644
--- a/packages/client-runtime/src/state/pullRequests.ts
+++ b/packages/client-runtime/src/state/pullRequests.ts
@@ -216,6 +216,18 @@ export function createPullRequestEnvironmentAtoms<R, E>(
       scheduler: commandScheduler,
       concurrency: serialPerEnvironment,
     }),
+    /** Read when the label menu opens, and kept for a minute, like the reviewer candidates. */
+    labelCandidates: createEnvironmentRpcQueryAtomFamily(runtime, {
+      label: "environment-data:pull-requests:label-candidates",
+      tag: WS_METHODS.pullRequestsLabelCandidates,
+      staleTimeMs: 60_000,
+    }),
+    setLabels: createEnvironmentRpcCommand(runtime, {
+      label: "environment-data:pull-requests:set-labels",
+      tag: WS_METHODS.pullRequestsSetLabels,
+      scheduler: commandScheduler,
+      concurrency: serialPerEnvironment,
+    }),
     setThreadResolution: createEnvironmentRpcCommand(runtime, {
       label: "environment-data:pull-requests:set-thread-resolution",
       tag: WS_METHODS.pullRequestsSetThreadResolution,
diff --git a/packages/client-runtime/src/work-log/presentation.test.ts b/packages/client-runtime/src/work-log/presentation.test.ts
index be590287a304..cc5b1c910539 100644
--- a/packages/client-runtime/src/work-log/presentation.test.ts
+++ b/packages/client-runtime/src/work-log/presentation.test.ts
@@ -14,6 +14,41 @@ import {
   workEntryViewedImagePath,
 } from "./presentation.js";
 
+describe("summarizeToolGroup", () => {
+  it("deduplicates named sources ahead of ordinary actions", () => {
+    const source = { key: "browser-use:chrome", name: "Chrome", kind: "integration" as const };
+    expect(
+      summarizeToolGroup([
+        { label: "Open page", tone: "tool", toolSource: source },
+        { label: "Inspect page", tone: "tool", toolSource: source },
+        {
+          label: "Ran command",
+          tone: "tool",
+          itemType: "command_execution",
+          command: "git status",
+        },
+      ]),
+    ).toBe("Used Chrome integration and ran 1 command");
+  });
+
+  it("omits the integration suffix for special browser and computer sources", () => {
+    expect(
+      summarizeToolGroup([
+        {
+          label: "Inspect page",
+          tone: "tool",
+          toolSource: { key: "browser-use", name: "Browser", kind: "browser" },
+        },
+        {
+          label: "Click",
+          tone: "tool",
+          toolSource: { key: "computer-use", name: "Computer Use", kind: "computer" },
+        },
+      ]),
+    ).toBe("Used Browser and Computer Use");
+  });
+});
+
 describe("resolveWorkEntryToolPresentation", () => {
   it.each([
     "mcp__t3-code__preview_click",
@@ -25,7 +60,7 @@ describe("resolveWorkEntryToolPresentation", () => {
     "preview_click",
   ])("recognizes browser tool names across providers: %s", (label) => {
     expect(resolveWorkEntryToolPresentation({ label })).toEqual({
-      displayName: "Click in the preview browser",
+      displayName: "Clicking in the preview browser",
       icon: "browser",
     });
   });
@@ -37,7 +72,7 @@ describe("resolveWorkEntryToolPresentation", () => {
         toolTitle: "Inspect the current page",
         toolData: { server: "t3-code", tool: "preview_snapshot", result: { title: "Example" } },
       }),
-    ).toEqual({ displayName: "Take a snapshot of the preview page", icon: "browser" });
+    ).toEqual({ displayName: "Taking a snapshot of the preview page", icon: "browser" });
   });
 
   it.each([
@@ -46,7 +81,7 @@ describe("resolveWorkEntryToolPresentation", () => {
     ["failed", "Failed to click in the preview browser"],
     ["declined", "Declined to click in the preview browser"],
     ["stopped", "Stopped clicking in the preview browser"],
-    ["unknown", "Click in the preview browser"],
+    ["unknown", "Clicking in the preview browser"],
   ])("describes the tool's own %s state", (toolLifecycleStatus, displayName) => {
     expect(
       resolveWorkEntryToolPresentation({
@@ -115,7 +150,7 @@ describe("resolveWorkEntryToolPresentation", () => {
         label: "mcp__t3_code__task_status",
         toolTitle: "Check the child task",
       }),
-    ).toEqual({ displayName: "Get delegated task status", icon: "t3-code" });
+    ).toEqual({ displayName: "Getting delegated task status", icon: "t3-code" });
   });
 
   it("does not brand unknown tools or another server's matching tool name", () => {
@@ -353,17 +388,11 @@ describe("toolGroupAction", () => {
 describe("resolveViewedImageAsset", () => {
   const threadId = ThreadId.make("thread-1");
 
-  it("loads t3 attachment paths as attachments", () => {
-    const attachmentId =
-      "11111111-1111-4111-8111-111111111111-22222222-2222-4222-8222-222222222222";
-    expect(
-      resolveViewedImageAsset(`/Users/demo/.t3/dev/attachments/${attachmentId}.png`, {
-        threadId,
-        workspaceRoot: "/workspace",
-      }),
-    ).toEqual({
-      resource: { _tag: "attachment", attachmentId },
-      alt: `${attachmentId}.png`,
+  it("serves t3 attachment paths in place like any other host path", () => {
+    const path = "/Users/demo/.t3/dev/attachments/11111111-1111-4111-8111-111111111111.png";
+    expect(resolveViewedImageAsset(path, { threadId, workspaceRoot: "/workspace" })).toEqual({
+      resource: { _tag: "media-file", threadId, path },
+      alt: "11111111-1111-4111-8111-111111111111.png",
       srcFragment: "",
     });
   });
diff --git a/packages/client-runtime/src/work-log/presentation.ts b/packages/client-runtime/src/work-log/presentation.ts
index 4b9a20cf0406..e27a2d318fef 100644
--- a/packages/client-runtime/src/work-log/presentation.ts
+++ b/packages/client-runtime/src/work-log/presentation.ts
@@ -2,12 +2,11 @@ import {
   isToolLifecycleItemType,
   type AssetResource,
   type ThreadId,
+  type ToolActivitySource,
   type ToolLifecycleItemType,
 } from "@t3tools/contracts";
-import {
-  classifyMarkdownImageSource,
-  markdownImageSourceFragment,
-} from "@t3tools/client-runtime/markdown-images";
+import { classifyMarkdownImageSource } from "@t3tools/client-runtime/markdown-images";
+import { resolveMediaSource } from "@t3tools/client-runtime/media-source";
 import { isWorkspaceImagePreviewPath } from "@t3tools/shared/filePreview";
 
 export function isWorktreeSetupActivity(kind: string): boolean {
@@ -30,6 +29,7 @@ export interface WorkLogPresentationEntry {
   readonly toolLifecycleStatus?: string;
   readonly sourceActivityKind?: string;
   readonly taskId?: string;
+  readonly toolSource?: ToolActivitySource;
 }
 
 export type ToolGroupAction =
@@ -115,7 +115,7 @@ function resolveT3McpToolPresentation(value: string | undefined, status: string
             ? `Declined to ${action.toLowerCase()}`
             : status === "stopped"
               ? `Stopped ${running.toLowerCase()}`
-              : action;
+              : running;
 
   return {
     displayName: `${verb} ${detail}`,
@@ -123,6 +123,13 @@ function resolveT3McpToolPresentation(value: string | undefined, status: string
   };
 }
 
+/** Latest live activity stays present-tense unless the call itself failed, declined, or stopped. */
+export function liveActivityToolStatus(status: string | undefined, presentTense: boolean) {
+  if (status === "failed" || status === "declined" || status === "stopped") return status;
+  if (presentTense || status === "inProgress") return "inProgress";
+  return "completed";
+}
+
 /** Resolves tool identity before choosing labels or icons in either client. */
 export function resolveWorkEntryToolPresentation(
   entry: Pick<WorkLogPresentationEntry, "label" | "toolTitle" | "toolData" | "toolLifecycleStatus">,
@@ -350,15 +357,11 @@ export function workEntryViewedImagePath(entry: WorkLogPresentationEntry): strin
 }
 
 export interface ViewedImageAsset {
-  readonly resource: Extract<AssetResource, { readonly _tag: "attachment" | "media-file" }>;
+  readonly resource: Extract<AssetResource, { readonly _tag: "media-file" }>;
   readonly alt: string;
   readonly srcFragment: string;
 }
 
-const ABSOLUTE_IMAGE_SOURCE_PATTERN = /^(?:file:|[\\/]|[a-z]:[\\/])/i;
-const T3_ATTACHMENT_IMAGE_PATH_PATTERN =
-  /(?:^|[\\/])(?:dev|userdata)[\\/]attachments[\\/]([a-z0-9_-]{1,128})\.[a-z0-9]{1,10}$/i;
-
 export function resolveViewedImageAsset(
   source: string,
   input: {
@@ -366,24 +369,22 @@ export function resolveViewedImageAsset(
     readonly workspaceRoot?: string | null | undefined;
   },
 ): ViewedImageAsset | null {
+  // A relative path with no known workspace still names a media-file relative
+  // to the thread's workspace, so classify against "." and drop the prefix.
   const imageSource = classifyMarkdownImageSource(source, input.workspaceRoot ?? ".");
   if (imageSource._tag !== "WorkspaceFile") return null;
-
-  const path =
+  const resolvedFilePath =
     input.workspaceRoot == null && imageSource.path.startsWith("./")
       ? imageSource.path.slice(2)
       : imageSource.path;
-  const attachmentId = ABSOLUTE_IMAGE_SOURCE_PATTERN.test(source)
-    ? (T3_ATTACHMENT_IMAGE_PATH_PATTERN.exec(path)?.[1] ?? null)
-    : null;
 
-  return {
-    resource: attachmentId
-      ? { _tag: "attachment", attachmentId }
-      : { _tag: "media-file", threadId: input.threadId, path },
-    alt: path.split(/[\\/]/).at(-1) ?? "image",
-    srcFragment: markdownImageSourceFragment(source),
-  };
+  const media = resolveMediaSource(source, {
+    threadId: input.threadId,
+    workspaceRoot: input.workspaceRoot,
+    resolvedFilePath,
+  });
+  if (media === null || media.access !== "environment") return null;
+  return { resource: media.resource, alt: media.name, srcFragment: media.srcFragment };
 }
 
 function toolGroupActionCount(
@@ -427,8 +428,13 @@ function toolGroupActionLabel(action: ToolGroupAction, count: number): string {
 
 export function summarizeToolGroup(entries: ReadonlyArray<WorkLogPresentationEntry>): string {
   const summaryEntries = omitSupersededLifecycleMarkers(entries, (entry) => entry);
+  const sources = new Map<string, ToolActivitySource>();
   const groupedEntries = new Map<ToolGroupAction, WorkLogPresentationEntry[]>();
   for (const entry of summaryEntries) {
+    if (entry.toolSource) {
+      sources.set(entry.toolSource.key, entry.toolSource);
+      continue;
+    }
     const action = toolGroupAction(entry);
     const group = groupedEntries.get(action);
     if (group) group.push(entry);
@@ -437,6 +443,20 @@ export function summarizeToolGroup(entries: ReadonlyArray<WorkLogPresentationEnt
   const labels = [...groupedEntries].map(([action, actionEntries]) =>
     toolGroupActionLabel(action, toolGroupActionCount(action, actionEntries)),
   );
+  if (sources.size > 0) {
+    const sourceValues = [...sources.values()];
+    const sourceNames = sourceValues.map((source) => source.name);
+    const formattedNames =
+      sourceNames.length < 2
+        ? sourceNames[0]!
+        : sourceNames.length === 2
+          ? sourceNames.join(" and ")
+          : `${sourceNames.slice(0, -1).join(", ")}, and ${sourceNames.at(-1)}`;
+    const allIntegrations = sourceValues.every((source) => source.kind === "integration");
+    labels.unshift(
+      `Used ${formattedNames}${allIntegrations ? ` ${sources.size === 1 ? "integration" : "integrations"}` : ""}`,
+    );
+  }
   const sentenceLabels = labels.map((label, index) =>
     index === 0 ? label : label.charAt(0).toLowerCase() + label.slice(1),
   );
diff --git a/packages/client-runtime/src/work-log/toolPresentation.test.ts b/packages/client-runtime/src/work-log/toolPresentation.test.ts
new file mode 100644
index 000000000000..fe88f15769c5
--- /dev/null
+++ b/packages/client-runtime/src/work-log/toolPresentation.test.ts
@@ -0,0 +1,95 @@
+import { describe, expect, it } from "@effect/vitest";
+
+import { extractToolActivityPresentation } from "./toolPresentation.ts";
+
+describe("extractToolActivityPresentation", () => {
+  it("reads provider-neutral presentation fields", () => {
+    expect(
+      extractToolActivityPresentation({
+        toolSurface: "browser",
+        toolIcon: {
+          _tag: "website",
+          pageUrl: "https://example.com/docs",
+          faviconUrl: "https://example.com/favicon.png",
+          faviconUrlDark: "https://example.com/favicon-dark.png",
+        },
+        toolSource: {
+          key: "integration:example",
+          name: "Example",
+          kind: "integration",
+          icon: {
+            _tag: "themed-logo",
+            logoUrl: "https://example.com/logo-light.png",
+            logoUrlDark: "https://example.com/logo-dark.png",
+          },
+        },
+      }),
+    ).toEqual({
+      toolSurface: "browser",
+      toolIcon: {
+        _tag: "website",
+        pageUrl: "https://example.com/docs",
+        faviconUrl: "https://example.com/favicon.png",
+        faviconUrlDark: "https://example.com/favicon-dark.png",
+      },
+      toolSource: {
+        key: "integration:example",
+        name: "Example",
+        kind: "integration",
+        icon: {
+          _tag: "themed-logo",
+          logoUrl: "https://example.com/logo-light.png",
+          logoUrlDark: "https://example.com/logo-dark.png",
+        },
+      },
+    });
+  });
+
+  it("reads provider-neutral native app icons", () => {
+    expect(
+      extractToolActivityPresentation({
+        toolSurface: "computer",
+        toolIcon: {
+          _tag: "native-app",
+          app: { _tag: "app-id", appId: "com.example.Editor" },
+        },
+        toolSource: {
+          key: "native-app:com.example.editor",
+          name: "Editor",
+          kind: "computer",
+        },
+      }),
+    ).toEqual({
+      toolSurface: "computer",
+      toolIcon: {
+        _tag: "native-app",
+        app: { _tag: "app-id", appId: "com.example.Editor" },
+      },
+      toolSource: {
+        key: "native-app:com.example.editor",
+        name: "Editor",
+        kind: "computer",
+      },
+    });
+  });
+
+  it("does not infer presentation from provider-specific payload data", () => {
+    expect(
+      extractToolActivityPresentation({
+        data: {
+          item: {
+            arguments: { code: 'await sky.click({ app: "Finder" })' },
+            result: {
+              _meta: {
+                "codex/toolSurface": {
+                  kind: "computerUse",
+                  app: { kind: "displayName", displayName: "Finder" },
+                },
+              },
+            },
+          },
+        },
+      }),
+    ).toEqual({});
+  });
+});
diff --git a/packages/client-runtime/src/work-log/toolPresentation.ts b/packages/client-runtime/src/work-log/toolPresentation.ts
new file mode 100644
index 000000000000..9b007bf81c33
--- /dev/null
+++ b/packages/client-runtime/src/work-log/toolPresentation.ts
@@ -0,0 +1,123 @@
+import type {
+  ToolActivityIcon,
+  ToolActivityNativeAppReference,
+  ToolActivitySource,
+  ToolActivitySurface,
+} from "@t3tools/contracts";
+
+export interface ExtractedToolActivityPresentation {
+  readonly toolSurface?: ToolActivitySurface;
+  readonly toolIcon?: ToolActivityIcon;
+  readonly toolSource?: ToolActivitySource;
+}
+
+function asRecord(value: unknown): Record<string, unknown> | undefined {
+  return value !== null && typeof value === "object" && !Array.isArray(value)
+    ? (value as Record<string, unknown>)
+    : undefined;
+}
+
+function trimmedString(value: unknown, maxLength: number): string | undefined {
+  if (typeof value !== "string") return undefined;
+  const trimmed = value.trim();
+  return trimmed && trimmed.length <= maxLength ? trimmed : undefined;
+}
+
+function imageUrl(value: unknown): string | undefined {
+  const raw = trimmedString(value, 4096);
+  if (!raw) return undefined;
+  try {
+    const url = new URL(raw);
+    return url.protocol === "http:" || url.protocol === "https:" || url.protocol === "data:"
+      ? url.href
+      : undefined;
+  } catch {
+    return undefined;
+  }
+}
+
+function pageUrl(value: unknown): string | undefined {
+  const raw = trimmedString(value, 4096);
+  if (!raw) return undefined;
+  try {
+    const url = new URL(raw);
+    return url.protocol === "http:" || url.protocol === "https:" ? url.href : undefined;
+  } catch {
+    return undefined;
+  }
+}
+
+function nativeAppReference(value: unknown): ToolActivityNativeAppReference | undefined {
+  const app = asRecord(value);
+  const appId = trimmedString(app?.appId, 512);
+  if (app?._tag === "app-id" && appId && /^[A-Za-z0-9._-]+$/u.test(appId)) {
+    return { _tag: "app-id", appId };
+  }
+  const displayName = trimmedString(app?.displayName, 160);
+  if (app?._tag === "display-name" && displayName) {
+    return { _tag: "display-name", displayName };
+  }
+  return undefined;
+}
+
+function activityIcon(value: unknown): ToolActivityIcon | undefined {
+  const icon = asRecord(value);
+  if (icon?._tag === "website") {
+    const resolvedPageUrl = pageUrl(icon.pageUrl);
+    const faviconUrl = imageUrl(icon.faviconUrl);
+    const faviconUrlDark = imageUrl(icon.faviconUrlDark);
+    if (resolvedPageUrl) {
+      return {
+        _tag: "website",
+        pageUrl: resolvedPageUrl,
+        ...(faviconUrl ? { faviconUrl } : {}),
+        ...(faviconUrlDark ? { faviconUrlDark } : {}),
+      };
+    }
+  }
+  if (icon?._tag === "native-app") {
+    const app = nativeAppReference(icon.app);
+    if (app) return { _tag: "native-app", app };
+  }
+  if (icon?._tag === "themed-logo") {
+    const logoUrl = imageUrl(icon.logoUrl);
+    const logoUrlDark = imageUrl(icon.logoUrlDark);
+    if (logoUrl) {
+      return {
+        _tag: "themed-logo",
+        logoUrl,
+        ...(logoUrlDark ? { logoUrlDark } : {}),
+      };
+    }
+  }
+  return undefined;
+}
+
+function activitySource(value: unknown): ToolActivitySource | undefined {
+  const source = asRecord(value);
+  const key = trimmedString(source?.key, 512);
+  const name = trimmedString(source?.name, 160);
+  const kind = source?.kind;
+  if (!key || !name || (kind !== "browser" && kind !== "computer" && kind !== "integration")) {
+    return undefined;
+  }
+  const icon = activityIcon(source?.icon);
+  return { key, name, kind, ...(icon ? { icon } : {}) };
+}
+
+export function extractToolActivityPresentation(
+  payloadValue: unknown,
+): ExtractedToolActivityPresentation {
+  const payload = asRecord(payloadValue);
+  const toolSurface =
+    payload?.toolSurface === "browser" || payload?.toolSurface === "computer"
+      ? payload.toolSurface
+      : undefined;
+  const toolIcon = activityIcon(payload?.toolIcon);
+  const toolSource = activitySource(payload?.toolSource);
+  return {
+    ...(toolSurface ? { toolSurface } : {}),
+    ...(toolIcon ? { toolIcon } : {}),
+    ...(toolSource ? { toolSource } : {}),
+  };
+}
diff --git a/packages/contracts/src/assets.ts b/packages/contracts/src/assets.ts
index 9859a8594a65..5b003374edf3 100644
--- a/packages/contracts/src/assets.ts
+++ b/packages/contracts/src/assets.ts
@@ -7,6 +7,7 @@ import {
   PROVIDER_SEND_TURN_SUPPORTED_IMAGE_MIME_TYPES,
   ProjectFaviconPath,
 } from "./orchestration.ts";
+import { ToolActivityNativeAppReference } from "./providerRuntime.ts";
 
 const ASSET_PATH_MAX_LENGTH = 1024;
 
@@ -40,6 +41,9 @@ export const AssetResource = Schema.Union([
     // project projection before it issues the signed URL.
     path: Schema.optional(ProjectFaviconPath),
   }),
+  Schema.TaggedStruct("native-app-icon", {
+    app: ToolActivityNativeAppReference,
+  }),
 ]);
 export type AssetResource = typeof AssetResource.Type;
 
diff --git a/packages/contracts/src/baseSchemas.ts b/packages/contracts/src/baseSchemas.ts
index afa9e979b72d..e55e0af7ca02 100644
--- a/packages/contracts/src/baseSchemas.ts
+++ b/packages/contracts/src/baseSchemas.ts
@@ -43,6 +43,45 @@ export type IsoDateTime = typeof IsoDateTime.Type;
  * rejecting the payload would take down the connection over data the client
  * couldn't act on anyway. Encoding is the plain array encoding.
  */
+/**
+ * Same idea for one optional value whose literal set grows over time: a
+ * member this build does not know decodes as absent rather than failing the
+ * enclosing struct. Encoding is the plain encoding.
+ */
+export const ForwardCompatibleOptional = <Value extends Schema.Top>(value: Value) => {
+  const decodeValue = Schema.decodeUnknownOption(value as never);
+  return Schema.optionalKey(
+    Schema.Unknown.pipe(
+      Schema.decodeTo(
+        Schema.UndefinedOr(value),
+        SchemaTransformation.transform<Value["Encoded"] | undefined, unknown>({
+          decode: (raw) =>
+            Option.isSome(decodeValue(raw)) ? (raw as Value["Encoded"]) : undefined,
+          encode: (raw) => raw,
+        }),
+      ),
+    ),
+  );
+};
+
+/**
+ * The nullable form, for a persisted setting whose literal set grows over
+ * time: a member this build does not know (or a missing key) decodes as null
+ * rather than failing the enclosing struct. Encoding is the plain encoding.
+ */
+export const ForwardCompatibleNullable = <Value extends Schema.Top>(value: Value) => {
+  const decodeValue = Schema.decodeUnknownOption(value as never);
+  return Schema.Unknown.pipe(
+    Schema.decodeTo(
+      Schema.NullOr(value),
+      SchemaTransformation.transform<Value["Encoded"] | null, unknown>({
+        decode: (raw) => (Option.isSome(decodeValue(raw)) ? (raw as Value["Encoded"]) : null),
+        encode: (raw) => raw,
+      }),
+    ),
+  );
+};
+
 export const ForwardCompatibleArray = <Element extends Schema.Top>(element: Element) => {
   const decodeElement = Schema.decodeUnknownOption(element as never);
   return Schema.Array(Schema.Unknown).pipe(
diff --git a/packages/contracts/src/environment.ts b/packages/contracts/src/environment.ts
index 3b1d1f4ed78a..f890049f9531 100644
--- a/packages/contracts/src/environment.ts
+++ b/packages/contracts/src/environment.ts
@@ -1,7 +1,13 @@
 import * as Effect from "effect/Effect";
 import * as Schema from "effect/Schema";
 
-import { EnvironmentId, ProjectId, ThreadId, TrimmedNonEmptyString } from "./baseSchemas.ts";
+import {
+  EnvironmentId,
+  ForwardCompatibleOptional,
+  ProjectId,
+  ThreadId,
+  TrimmedNonEmptyString,
+} from "./baseSchemas.ts";
 
 export const ExecutionEnvironmentPlatformOs = Schema.Literals([
   "darwin",
@@ -14,9 +20,30 @@ export type ExecutionEnvironmentPlatformOs = typeof ExecutionEnvironmentPlatform
 export const ExecutionEnvironmentPlatformArch = Schema.Literals(["arm64", "x64", "other"]);
 export type ExecutionEnvironmentPlatformArch = typeof ExecutionEnvironmentPlatformArch.Type;
 
+/**
+ * The curated set of machine shapes an environment can wear as its icon.
+ * Servers detect one from the hardware they run on (`platform.machine`), and
+ * the `environmentIcon` server setting lets a user pick one instead.
+ */
+export const ENVIRONMENT_MACHINE_KINDS = [
+  "server",
+  "cloud",
+  "desktop",
+  "laptop",
+  "mac-mini",
+  "mac-studio",
+] as const;
+export const EnvironmentMachineKind = Schema.Literals(ENVIRONMENT_MACHINE_KINDS);
+export type EnvironmentMachineKind = typeof EnvironmentMachineKind.Type;
+export const isEnvironmentMachineKind = Schema.is(EnvironmentMachineKind);
+
 export const ExecutionEnvironmentPlatform = Schema.Struct({
   os: ExecutionEnvironmentPlatformOs,
   arch: ExecutionEnvironmentPlatformArch,
+  /** Hardware shape detected at startup. Absent when the host gives no usable
+      signal (containers, Windows, unknown DMI), on servers that predate it, or
+      when a newer server names a kind this build cannot draw. */
+  machine: ForwardCompatibleOptional(EnvironmentMachineKind),
 });
 
 /**
@@ -105,6 +132,10 @@ export const ExecutionEnvironmentCapabilities = Schema.Struct({
       this is false — no update would ever repaint it. Absent on older
       servers, which may still publish, so only an explicit false skips. */
   agentActivityPublishing: Schema.optionalKey(Schema.Boolean),
+  /** Server detects `platform.machine` and persists the `environmentIcon`
+      setting. Older servers drop the key on write, so clients show the
+      picker inert rather than offering a choice that would never stick. */
+  environmentIcon: Schema.optionalKey(Schema.Boolean),
   /** The desktop app supervising this server can be driven over RPC:
       server.updateServer runs its check -> download -> relaunch. Absent on
       desktop servers whose app predates the remote trigger, where clients
diff --git a/packages/contracts/src/ipc.ts b/packages/contracts/src/ipc.ts
index 056bd00692df..e52d99074699 100644
--- a/packages/contracts/src/ipc.ts
+++ b/packages/contracts/src/ipc.ts
@@ -1066,6 +1066,8 @@ export interface DesktopBridge {
   setConnectionCatalog?: (catalog: string) => Promise<boolean>;
   clearConnectionCatalog?: () => Promise<void>;
   discoverSshHosts: () => Promise<readonly DesktopDiscoveredSshHost[]>;
+  /** Resolves a suggested SSH alias before populating the connection form. */
+  resolveSshHost: (alias: string) => Promise<DesktopSshEnvironmentTarget>;
   ensureSshEnvironment: (
     target: DesktopSshEnvironmentTarget,
     options?: { issuePairingToken?: boolean },
diff --git a/packages/contracts/src/keybindings.ts b/packages/contracts/src/keybindings.ts
index fe3549d079a7..71b2547e532c 100644
--- a/packages/contracts/src/keybindings.ts
+++ b/packages/contracts/src/keybindings.ts
@@ -59,6 +59,7 @@ export const STATIC_KEYBINDING_COMMANDS = [
   "terminal.close",
   "rightPanel.toggle",
   "rightPanel.toggleMaximized",
+  "rightPanel.close",
   "diff.toggle",
   "preview.toggle",
   "preview.refresh",
diff --git a/packages/contracts/src/orchestration.test.ts b/packages/contracts/src/orchestration.test.ts
index 4ae91d27c184..d7e33ebb713b 100644
--- a/packages/contracts/src/orchestration.test.ts
+++ b/packages/contracts/src/orchestration.test.ts
@@ -1105,6 +1105,36 @@ it.effect("project favicon overrides accept only supported image files", () =>
   }),
 );
 
+it.effect("project icon overrides accept Lucide icons, colors, and emoji", () =>
+  Effect.gen(function* () {
+    const lucide = yield* decodeOrchestrationCommand({
+      type: "project.meta.update",
+      commandId: "cmd-project-lucide-icon",
+      projectId: "project-1",
+      projectIcon: { kind: "lucide", name: "alarm-clock", color: "violet" },
+    });
+    assert.strictEqual(lucide.type, "project.meta.update");
+
+    const emoji = yield* decodeOrchestrationCommand({
+      type: "project.meta.update",
+      commandId: "cmd-project-emoji-icon",
+      projectId: "project-1",
+      projectIcon: { kind: "emoji", emoji: "👩🏽‍💻" },
+    });
+    assert.strictEqual(emoji.type, "project.meta.update");
+
+    const invalid = yield* Effect.exit(
+      decodeOrchestrationCommand({
+        type: "project.meta.update",
+        commandId: "cmd-project-invalid-icon",
+        projectId: "project-1",
+        projectIcon: { kind: "lucide", name: "Alarm Clock", color: "ultraviolet" },
+      }),
+    );
+    assert.strictEqual(invalid._tag, "Failure");
+  }),
+);
+
 it("isProviderSendTurnSupportedImageMimeType accepts raster formats and rejects svg", () => {
   assert.strictEqual(isProviderSendTurnSupportedImageMimeType("image/png"), true);
   assert.strictEqual(isProviderSendTurnSupportedImageMimeType("IMAGE/JPEG"), true);
diff --git a/packages/contracts/src/orchestration.ts b/packages/contracts/src/orchestration.ts
index de78bd62c0d5..0c0344f1834b 100644
--- a/packages/contracts/src/orchestration.ts
+++ b/packages/contracts/src/orchestration.ts
@@ -298,6 +298,48 @@ export const ProjectFaviconPath = TrimmedNonEmptyString.check(
 );
 export type ProjectFaviconPath = typeof ProjectFaviconPath.Type;
 
+export const ProjectIconColor = Schema.Literals([
+  "gray",
+  "red",
+  "orange",
+  "amber",
+  "yellow",
+  "lime",
+  "green",
+  "emerald",
+  "teal",
+  "cyan",
+  "sky",
+  "blue",
+  "indigo",
+  "violet",
+  "purple",
+  "fuchsia",
+  "pink",
+  "rose",
+]);
+export type ProjectIconColor = typeof ProjectIconColor.Type;
+
+const ProjectLucideIconName = TrimmedNonEmptyString.check(
+  Schema.isMaxLength(64),
+  Schema.isPattern(/^[a-z0-9]+(?:-[a-z0-9]+)*$/),
+);
+
+const ProjectEmoji = TrimmedNonEmptyString.check(Schema.isMaxLength(32));
+
+export const ProjectIconOverride = Schema.Union([
+  Schema.Struct({
+    kind: Schema.Literal("lucide"),
+    name: ProjectLucideIconName,
+    color: ProjectIconColor,
+  }),
+  Schema.Struct({
+    kind: Schema.Literal("emoji"),
+    emoji: ProjectEmoji,
+  }),
+]);
+export type ProjectIconOverride = typeof ProjectIconOverride.Type;
+
 export const OrchestrationProject = Schema.Struct({
   id: ProjectId,
   title: TrimmedNonEmptyString,
@@ -312,6 +354,7 @@ export const OrchestrationProject = Schema.Struct({
   autoPull: Schema.optional(Schema.Boolean),
   // Optional on the wire so cached snapshots from older servers still decode.
   faviconPath: Schema.optional(Schema.NullOr(ProjectFaviconPath)),
+  projectIcon: Schema.optional(Schema.NullOr(ProjectIconOverride)),
   scripts: Schema.Array(ProjectScript),
   createdAt: IsoDateTime,
   updatedAt: IsoDateTime,
@@ -532,6 +575,7 @@ export const OrchestrationProjectShell = Schema.Struct({
   autoPull: Schema.optional(Schema.Boolean),
   // Optional on the wire so cached snapshots from older servers still decode.
   faviconPath: Schema.optional(Schema.NullOr(ProjectFaviconPath)),
+  projectIcon: Schema.optional(Schema.NullOr(ProjectIconOverride)),
   scripts: Schema.Array(ProjectScript),
   createdAt: IsoDateTime,
   updatedAt: IsoDateTime,
@@ -754,6 +798,7 @@ const ProjectMetaUpdateCommand = Schema.Struct({
   defaultThreadEnvMode: Schema.optional(Schema.NullOr(ThreadEnvMode)),
   autoPull: Schema.optional(Schema.Boolean),
   faviconPath: Schema.optional(Schema.NullOr(ProjectFaviconPath)),
+  projectIcon: Schema.optional(Schema.NullOr(ProjectIconOverride)),
   scripts: Schema.optional(Schema.Array(ProjectScript)),
 });
 
@@ -1228,6 +1273,7 @@ export const ProjectCreatedPayload = Schema.Struct({
   defaultModelSelection: Schema.NullOr(ModelSelection),
   // Optional so persisted events from older servers still decode.
   faviconPath: Schema.optional(Schema.NullOr(ProjectFaviconPath)),
+  projectIcon: Schema.optional(Schema.NullOr(ProjectIconOverride)),
   scripts: Schema.Array(ProjectScript),
   createdAt: IsoDateTime,
   updatedAt: IsoDateTime,
@@ -1242,6 +1288,7 @@ export const ProjectMetaUpdatedPayload = Schema.Struct({
   defaultThreadEnvMode: Schema.optional(Schema.NullOr(ThreadEnvMode)),
   autoPull: Schema.optional(Schema.Boolean),
   faviconPath: Schema.optional(Schema.NullOr(ProjectFaviconPath)),
+  projectIcon: Schema.optional(Schema.NullOr(ProjectIconOverride)),
   scripts: Schema.optional(Schema.Array(ProjectScript)),
   updatedAt: IsoDateTime,
 });
diff --git a/packages/contracts/src/providerRuntime.ts b/packages/contracts/src/providerRuntime.ts
index 06342d9619d1..03650db49484 100644
--- a/packages/contracts/src/providerRuntime.ts
+++ b/packages/contracts/src/providerRuntime.ts
@@ -424,11 +424,54 @@ const TurnDiffUpdatedPayload = Schema.Struct({
 });
 export type TurnDiffUpdatedPayload = typeof TurnDiffUpdatedPayload.Type;
 
+export const ToolActivitySurface = Schema.Literals(["browser", "computer"]);
+export type ToolActivitySurface = typeof ToolActivitySurface.Type;
+
+export const ToolActivityNativeAppReference = Schema.Union([
+  Schema.TaggedStruct("app-id", {
+    appId: TrimmedNonEmptyStringSchema.check(
+      Schema.isMaxLength(512),
+      Schema.isPattern(/^[A-Za-z0-9._-]+$/u),
+    ),
+  }),
+  Schema.TaggedStruct("display-name", {
+    displayName: TrimmedNonEmptyStringSchema.check(Schema.isMaxLength(160)),
+  }),
+]);
+export type ToolActivityNativeAppReference = typeof ToolActivityNativeAppReference.Type;
+
+export const ToolActivityIcon = Schema.Union([
+  Schema.TaggedStruct("website", {
+    pageUrl: TrimmedNonEmptyStringSchema.check(Schema.isMaxLength(4096)),
+    faviconUrl: Schema.optional(TrimmedNonEmptyStringSchema.check(Schema.isMaxLength(4096))),
+    faviconUrlDark: Schema.optional(TrimmedNonEmptyStringSchema.check(Schema.isMaxLength(4096))),
+  }),
+  Schema.TaggedStruct("native-app", {
+    app: ToolActivityNativeAppReference,
+  }),
+  Schema.TaggedStruct("themed-logo", {
+    logoUrl: TrimmedNonEmptyStringSchema.check(Schema.isMaxLength(4096)),
+    logoUrlDark: Schema.optional(TrimmedNonEmptyStringSchema.check(Schema.isMaxLength(4096))),
+  }),
+]);
+export type ToolActivityIcon = typeof ToolActivityIcon.Type;
+
+export const ToolActivitySource = Schema.Struct({
+  key: TrimmedNonEmptyStringSchema.check(Schema.isMaxLength(512)),
+  name: TrimmedNonEmptyStringSchema.check(Schema.isMaxLength(160)),
+  kind: Schema.Literals(["browser", "computer", "integration"]),
+  icon: Schema.optional(ToolActivityIcon),
+});
+export type ToolActivitySource = typeof ToolActivitySource.Type;
+
 export const ItemLifecyclePayload = Schema.Struct({
   itemType: CanonicalItemType,
   status: Schema.optional(RuntimeItemStatus),
   title: Schema.optional(TrimmedNonEmptyStringSchema),
   detail: Schema.optional(TrimmedNonEmptyStringSchema),
+  toolSurface: Schema.optional(ToolActivitySurface),
+  toolIcon: Schema.optional(ToolActivityIcon),
+  toolSource: Schema.optional(ToolActivitySource),
   data: Schema.optional(Schema.Unknown),
   /**
    * Owning agent when this item ran inside a subagent (resolved from the
diff --git a/packages/contracts/src/pullRequest.ts b/packages/contracts/src/pullRequest.ts
index 9cf7dbfd6681..04c9d53cf777 100644
--- a/packages/contracts/src/pullRequest.ts
+++ b/packages/contracts/src/pullRequest.ts
@@ -291,6 +291,21 @@ export const PullRequestReviewerCandidateList = Schema.Struct({
 });
 export type PullRequestReviewerCandidateList = typeof PullRequestReviewerCandidateList.Type;
 
+/** A label the repository defines, with whether this change request already wears it. */
+export const PullRequestLabelCandidate = Schema.Struct({
+  ...PullRequestLabel.fields,
+  description: Schema.NullOr(Schema.String),
+  isApplied: Schema.Boolean,
+});
+export type PullRequestLabelCandidate = typeof PullRequestLabelCandidate.Type;
+
+export const PullRequestLabelCandidateList = Schema.Struct({
+  candidates: Schema.Array(PullRequestLabelCandidate),
+  /** The repository defines more labels than the read asked for; the list is not all of them. */
+  truncated: Schema.Boolean,
+});
+export type PullRequestLabelCandidateList = typeof PullRequestLabelCandidateList.Type;
+
 export const PullRequestCommit = Schema.Struct({
   oid: TrimmedNonEmptyString,
   messageHeadline: Schema.String,
@@ -397,6 +412,12 @@ export const PullRequestCapabilities = Schema.Struct({
    * what every server before this one was.
    */
   edit: Schema.optional(PullRequestEditCapabilities),
+  /**
+   * The repository's labels can be listed, and one put on a change request or taken off it.
+   * Optional for the same reason `edit` is: a server that says nothing about labels has no way
+   * to change them, which is what every server before this field was.
+   */
+  labels: Schema.optional(Schema.Boolean),
 });
 export type PullRequestCapabilities = typeof PullRequestCapabilities.Type;
 
@@ -426,6 +447,12 @@ export const PullRequestViewerPermissions = Schema.Struct({
    * Absent or empty means they may not, which is also what a host with no such action says.
    */
   updateMethods: Schema.optional(Schema.Array(PullRequestUpdateMethod)),
+  /**
+   * This viewer may put a label on the change request, and take one off. Absent is granted, like
+   * every permission here; the capability beside it is what decides whether a label can be
+   * changed on this host at all.
+   */
+  labels: Schema.optional(Schema.Boolean),
 });
 export type PullRequestViewerPermissions = typeof PullRequestViewerPermissions.Type;
 
@@ -998,6 +1025,18 @@ export const PullRequestReviewerRequestInput = Schema.Struct({
 });
 export type PullRequestReviewerRequestInput = typeof PullRequestReviewerRequestInput.Type;
 
+/**
+ * Putting a label on and taking it off are one operation with `applied` turned around, which is
+ * what pressing the same row in the menu twice is. Named by the label's own name, which is how
+ * GitHub addresses one.
+ */
+export const PullRequestLabelChangeInput = Schema.Struct({
+  ...PullRequestRef.fields,
+  labels: Schema.Array(TrimmedNonEmptyString).check(Schema.isMinLength(1), Schema.isMaxLength(25)),
+  applied: Schema.Boolean,
+});
+export type PullRequestLabelChangeInput = typeof PullRequestLabelChangeInput.Type;
+
 export const PullRequestUnavailableReason = Schema.Literals([
   "cli-missing",
   "cli-unauthenticated",
diff --git a/packages/contracts/src/rpc.ts b/packages/contracts/src/rpc.ts
index f8c0023c002b..c01598e25279 100644
--- a/packages/contracts/src/rpc.ts
+++ b/packages/contracts/src/rpc.ts
@@ -100,6 +100,8 @@ import {
   PullRequestSummary,
   PullRequestReviewerCandidateList,
   PullRequestReviewerRequestInput,
+  PullRequestLabelCandidateList,
+  PullRequestLabelChangeInput,
   PullRequestSubmitReviewInput,
   PullRequestThreadCommentsInput,
   PullRequestThreadCommentsResult,
@@ -341,6 +343,8 @@ export const WS_METHODS = {
   pullRequestsInvalidate: "pullRequests.invalidate",
   pullRequestsReviewerCandidates: "pullRequests.reviewerCandidates",
   pullRequestsRequestReviewers: "pullRequests.requestReviewers",
+  pullRequestsLabelCandidates: "pullRequests.labelCandidates",
+  pullRequestsSetLabels: "pullRequests.setLabels",
 
   // Source control methods
   sourceControlLookupRepository: "sourceControl.lookupRepository",
@@ -694,6 +698,19 @@ export const WsPullRequestsRequestReviewersRpc = Rpc.make(WS_METHODS.pullRequest
   error: PullRequestRpcError,
 });
 
+/** Read when the label menu opens, for the same reason the reviewer candidates are. */
+export const WsPullRequestsLabelCandidatesRpc = Rpc.make(WS_METHODS.pullRequestsLabelCandidates, {
+  payload: PullRequestRef,
+  success: PullRequestLabelCandidateList,
+  error: PullRequestRpcError,
+});
+
+export const WsPullRequestsSetLabelsRpc = Rpc.make(WS_METHODS.pullRequestsSetLabels, {
+  payload: PullRequestLabelChangeInput,
+  success: Schema.Void,
+  error: PullRequestRpcError,
+});
+
 export const WsSourceControlLookupRepositoryRpc = Rpc.make(
   WS_METHODS.sourceControlLookupRepository,
   {
@@ -1157,6 +1174,8 @@ export const WsRpcGroup = RpcGroup.make(
   WsPullRequestsInvalidateRpc,
   WsPullRequestsReviewerCandidatesRpc,
   WsPullRequestsRequestReviewersRpc,
+  WsPullRequestsLabelCandidatesRpc,
+  WsPullRequestsSetLabelsRpc,
   WsSourceControlLookupRepositoryRpc,
   WsSourceControlCloneRepositoryRpc,
   WsSourceControlPublishRepositoryRpc,
diff --git a/packages/contracts/src/server.test.ts b/packages/contracts/src/server.test.ts
index 23e4a43bf5c4..47f4145207cc 100644
--- a/packages/contracts/src/server.test.ts
+++ b/packages/contracts/src/server.test.ts
@@ -1,12 +1,15 @@
 import * as Schema from "effect/Schema";
 import { describe, expect, it } from "vite-plus/test";
 
+import { ExecutionEnvironmentDescriptor } from "./environment.ts";
 import {
+  resolveEnvironmentMachineKind,
   ServerConfig,
   ServerProvider,
   ServerProviders,
   ServerUpsertKeybindingResult,
 } from "./server.ts";
+import { ServerSettings } from "./settings.ts";
 
 const decodeServerProvider = Schema.decodeUnknownSync(ServerProvider);
 const decodeServerProviders = Schema.decodeUnknownSync(ServerProviders);
@@ -155,3 +158,53 @@ describe("server config forward compatibility", () => {
     expect(parsed).toEqual([decodedBase]);
   });
 });
+
+describe("resolveEnvironmentMachineKind", () => {
+  const decodeDescriptor = Schema.decodeUnknownSync(ExecutionEnvironmentDescriptor);
+  const decodeSettings = Schema.decodeUnknownSync(ServerSettings);
+  const descriptor = (platform: Record<string, unknown>) =>
+    decodeDescriptor({
+      environmentId: "env-1",
+      label: "Box",
+      platform: { os: "linux", arch: "x64", ...platform },
+      serverVersion: "1.0.0",
+      capabilities: {},
+    });
+
+  it("prefers the user's pick over what the server detected", () => {
+    expect(
+      resolveEnvironmentMachineKind({
+        environment: descriptor({ machine: "mac-mini" }),
+        settings: decodeSettings({ environmentIcon: "laptop" }),
+      }),
+    ).toBe("laptop");
+  });
+
+  it("uses detection when nothing is picked", () => {
+    expect(
+      resolveEnvironmentMachineKind({
+        environment: descriptor({ machine: "mac-mini" }),
+        settings: decodeSettings({}),
+      }),
+    ).toBe("mac-mini");
+  });
+
+  it("falls back to a server for older servers and before connect", () => {
+    expect(
+      resolveEnvironmentMachineKind({
+        environment: descriptor({}),
+        settings: decodeSettings({}),
+      }),
+    ).toBe("server");
+    expect(resolveEnvironmentMachineKind(null)).toBe("server");
+  });
+
+  it("drops a machine kind this build does not know instead of failing the descriptor", () => {
+    const parsed = descriptor({ machine: "toaster" });
+
+    expect(parsed.platform.machine).toBeUndefined();
+    expect(
+      resolveEnvironmentMachineKind({ environment: parsed, settings: decodeSettings({}) }),
+    ).toBe("server");
+  });
+});
diff --git a/packages/contracts/src/server.ts b/packages/contracts/src/server.ts
index b05369145efe..e21540852253 100644
--- a/packages/contracts/src/server.ts
+++ b/packages/contracts/src/server.ts
@@ -1,6 +1,10 @@
 import * as Effect from "effect/Effect";
 import * as Schema from "effect/Schema";
-import { ExecutionEnvironmentDescriptor, ServerSelfUpdateMethod } from "./environment.ts";
+import {
+  type EnvironmentMachineKind,
+  ExecutionEnvironmentDescriptor,
+  ServerSelfUpdateMethod,
+} from "./environment.ts";
 import { ServerAuthDescriptor } from "./auth.ts";
 import {
   ForwardCompatibleArray,
@@ -572,6 +576,18 @@ export const ServerConfig = Schema.Struct({
 });
 export type ServerConfig = typeof ServerConfig.Type;
 
+/**
+ * The machine an environment should be drawn as: the user's pick, else what
+ * the server detected, else a generic server. A null config (not connected
+ * yet, or an older server) resolves to the same generic so rows never
+ * flicker between glyphs.
+ */
+export function resolveEnvironmentMachineKind(
+  config: Pick<ServerConfig, "environment" | "settings"> | null,
+): EnvironmentMachineKind {
+  return config?.settings.environmentIcon ?? config?.environment.platform.machine ?? "server";
+}
+
 const ServerUpsertKeybindingReplaceTarget = Schema.Struct({
   key: KeybindingValue,
   command: KeybindingCommand,
diff --git a/packages/contracts/src/settings.test.ts b/packages/contracts/src/settings.test.ts
index f1448b74ac2e..7f53129dbded 100644
--- a/packages/contracts/src/settings.test.ts
+++ b/packages/contracts/src/settings.test.ts
@@ -605,3 +605,22 @@ describe("ServerSettingsPatch string normalization", () => {
     expect(encoded.providers?.codex?.launchArgs).toBe("--strict-config");
   });
 });
+
+describe("ServerSettings environment icon", () => {
+  it("defaults to null", () => {
+    expect(decodeServerSettings({}).environmentIcon).toBeNull();
+  });
+
+  it("keeps a kind this build knows", () => {
+    expect(decodeServerSettings({ environmentIcon: "mac-mini" }).environmentIcon).toBe("mac-mini");
+  });
+
+  it("decodes a kind from a newer server as null instead of failing the snapshot", () => {
+    expect(decodeServerSettings({ environmentIcon: "toaster" }).environmentIcon).toBeNull();
+  });
+
+  it("round-trips through encode", () => {
+    const settings = decodeServerSettings({ environmentIcon: "laptop" });
+    expect(encodeServerSettings(settings).environmentIcon).toBe("laptop");
+  });
+});
diff --git a/packages/contracts/src/settings.ts b/packages/contracts/src/settings.ts
index 88a52b701c59..0780e7eb2866 100644
--- a/packages/contracts/src/settings.ts
+++ b/packages/contracts/src/settings.ts
@@ -2,8 +2,8 @@ import * as Effect from "effect/Effect";
 import * as Duration from "effect/Duration";
 import * as Schema from "effect/Schema";
 import * as SchemaTransformation from "effect/SchemaTransformation";
-import { TrimmedNonEmptyString, TrimmedString } from "./baseSchemas.ts";
-import { ThreadEnvMode } from "./environment.ts";
+import { ForwardCompatibleNullable, TrimmedNonEmptyString, TrimmedString } from "./baseSchemas.ts";
+import { EnvironmentMachineKind, ThreadEnvMode } from "./environment.ts";
 import {
   DEFAULT_TEXT_GENERATION_MODEL,
   DEFAULT_TEXT_GENERATION_REASONING_EFFORT,
@@ -31,6 +31,10 @@ export const TimestampFormat = Schema.Literals(["locale", "12-hour", "24-hour"])
 export type TimestampFormat = typeof TimestampFormat.Type;
 export const DEFAULT_TIMESTAMP_FORMAT: TimestampFormat = "locale";
 
+export const DiffLayout = Schema.Literals(["stacked", "split"]);
+export type DiffLayout = typeof DiffLayout.Type;
+export const DEFAULT_DIFF_LAYOUT: DiffLayout = "stacked";
+
 export const SidebarProjectSortOrder = Schema.Literals(["updated_at", "created_at", "manual"]);
 export type SidebarProjectSortOrder = typeof SidebarProjectSortOrder.Type;
 export const DEFAULT_SIDEBAR_PROJECT_SORT_ORDER: SidebarProjectSortOrder = "updated_at";
@@ -187,6 +191,14 @@ export const BROWSER_RECORDING_FRAME_RATES = [30, 60] as const;
 export const BrowserRecordingFrameRate = Schema.Literals(BROWSER_RECORDING_FRAME_RATES);
 export type BrowserRecordingFrameRate = typeof BrowserRecordingFrameRate.Type;
 export const DEFAULT_BROWSER_RECORDING_FRAME_RATE: BrowserRecordingFrameRate = 30;
+/**
+ * Where a clicked link goes: the OS default browser, or a tab in the in-app
+ * browser beside the thread. "system" is the default because that is what
+ * every link did before the setting existed.
+ */
+export const BrowserLinkTarget = Schema.Literals(["system", "app"]);
+export type BrowserLinkTarget = typeof BrowserLinkTarget.Type;
+export const DEFAULT_BROWSER_LINK_TARGET: BrowserLinkTarget = "system";
 
 export const ClientSettingsSchema = Schema.Struct({
   appearanceContrast: AppearanceContrast.pipe(
@@ -209,6 +221,13 @@ export const ClientSettingsSchema = Schema.Struct({
   browserRecordingFrameRate: BrowserRecordingFrameRate.pipe(
     Schema.withDecodingDefault(Effect.succeed(DEFAULT_BROWSER_RECORDING_FRAME_RATE)),
   ),
+  /**
+   * Where links clicked in a thread (chat markdown, terminal output) open.
+   * Only the desktop app has an in-app browser, so other clients ignore "app".
+   */
+  browserLinkTarget: BrowserLinkTarget.pipe(
+    Schema.withDecodingDefault(Effect.succeed(DEFAULT_BROWSER_LINK_TARGET)),
+  ),
   /**
    * Whether an agent opening a preview pops the floating mini player into
    * view. Only applies when the agent didn't ask either way — an explicit
@@ -245,6 +264,7 @@ export const ClientSettingsSchema = Schema.Struct({
     Schema.withDecodingDefault(Effect.succeed([])),
   ),
   diffIgnoreWhitespace: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
+  diffLayout: DiffLayout.pipe(Schema.withDecodingDefault(Effect.succeed(DEFAULT_DIFF_LAYOUT))),
   environmentIdentificationMode: EnvironmentIdentificationMode.pipe(
     Schema.withDecodingDefault(Effect.succeed(DEFAULT_ENVIRONMENT_IDENTIFICATION_MODE)),
   ),
@@ -1005,6 +1025,16 @@ export const ServerSettings = Schema.Struct({
   defaultThemeSetAt: Schema.String.check(Schema.isMaxLength(64)).pipe(
     Schema.withDecodingDefault(Effect.succeed("")),
   ),
+  /**
+   * The icon clients draw for this environment. Null means "use what the
+   * server detected" (`environment.platform.machine`), falling back to a
+   * generic server. Lives on the server, not the client, so every device
+   * sees the same machine. A kind picked on a newer server decodes as null
+   * here rather than failing the whole settings snapshot for an older client.
+   */
+  environmentIcon: ForwardCompatibleNullable(EnvironmentMachineKind).pipe(
+    Schema.withDecodingDefault(Effect.succeed(null)),
+  ),
   defaultThreadEnvMode: ThreadEnvMode.pipe(
     Schema.withDecodingDefault(Effect.succeed("local" as const satisfies ThreadEnvMode)),
   ),
@@ -1244,6 +1274,7 @@ export const ServerSettingsPatch = Schema.Struct({
   automaticGitFetchInterval: Schema.optionalKey(Schema.DurationFromMillis),
   providerHealthRefreshInterval: Schema.optionalKey(Schema.DurationFromMillis),
   backgroundActivityProfile: Schema.optionalKey(BackgroundActivityProfile),
+  environmentIcon: Schema.optionalKey(Schema.NullOr(EnvironmentMachineKind)),
   defaultThreadEnvMode: Schema.optionalKey(ThreadEnvMode),
   newWorktreesStartFromOrigin: Schema.optionalKey(Schema.Boolean),
   addProjectBaseDirectory: Schema.optionalKey(TrimmedString),
@@ -1295,6 +1326,7 @@ export const ClientSettingsPatch = Schema.Struct({
   browserDefaultZoomFactor: Schema.optionalKey(PreviewZoomFactor),
   browserDefaultAppearance: Schema.optionalKey(PreviewAppearancePreference),
   browserRecordingFrameRate: Schema.optionalKey(BrowserRecordingFrameRate),
+  browserLinkTarget: Schema.optionalKey(BrowserLinkTarget),
   browserAutoShowFloatingPreview: Schema.optionalKey(Schema.Boolean),
   browserProfiles: Schema.optionalKey(Schema.Array(BrowserProfile)),
   browserDefaultProfileId: Schema.optionalKey(BrowserProfileId),
@@ -1304,6 +1336,7 @@ export const ClientSettingsPatch = Schema.Struct({
   confirmThreadUnpin: Schema.optionalKey(Schema.Boolean),
   continueThreadsAfterServerUpdate: Schema.optionalKey(Schema.Boolean),
   diffIgnoreWhitespace: Schema.optionalKey(Schema.Boolean),
+  diffLayout: Schema.optionalKey(DiffLayout),
   environmentIdentificationMode: Schema.optionalKey(EnvironmentIdentificationMode),
   sidebarArtworkOverride: Schema.optionalKey(SidebarArtworkOverride),
   glassOpacity: Schema.optionalKey(GlassOpacity),
diff --git a/packages/effect-codex-app-server/src/_generated/schema.gen.ts b/packages/effect-codex-app-server/src/_generated/schema.gen.ts
index 34df10eb03b2..a26c98f44e6c 100644
--- a/packages/effect-codex-app-server/src/_generated/schema.gen.ts
+++ b/packages/effect-codex-app-server/src/_generated/schema.gen.ts
@@ -3831,7 +3831,10 @@ export type V2ConfigWriteResponse__WriteStatus = "ok" | "okOverridden";
 export const V2ConfigWriteResponse__WriteStatus = Schema.Literals(["ok", "okOverridden"]);
 
 export type V2ConsumeAccountRateLimitResetCreditResponse__ConsumeAccountRateLimitResetCreditOutcome =
-  "reset" | "nothingToReset" | "noCredit" | "alreadyRedeemed";
+  | "reset"
+  | "nothingToReset"
+  | "noCredit"
+  | "alreadyRedeemed";
 export const V2ConsumeAccountRateLimitResetCreditResponse__ConsumeAccountRateLimitResetCreditOutcome =
   Schema.Literals(["reset", "nothingToReset", "noCredit", "alreadyRedeemed"]);
 
@@ -3960,16 +3963,16 @@ export const V2ExternalAgentConfigDetectResponse__SubagentMigration = Schema.Str
 });
 
 export type V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigMigrationItemType =
-    | "AGENTS_MD"
-    | "CONFIG"
-    | "SKILLS"
-    | "PLUGINS"
-    | "MCP_SERVER_CONFIG"
-    | "SUBAGENTS"
-    | "HOOKS"
-    | "COMMANDS"
-    | "MEMORY"
-    | "SESSIONS";
+  | "AGENTS_MD"
+  | "CONFIG"
+  | "SKILLS"
+  | "PLUGINS"
+  | "MCP_SERVER_CONFIG"
+  | "SUBAGENTS"
+  | "HOOKS"
+  | "COMMANDS"
+  | "MEMORY"
+  | "SESSIONS";
 export const V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigMigrationItemType =
   Schema.Literals([
     "AGENTS_MD",
@@ -3985,16 +3988,16 @@ export const V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConf
   ]);
 
 export type V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigMigrationItemType =
-    | "AGENTS_MD"
-    | "CONFIG"
-    | "SKILLS"
-    | "PLUGINS"
-    | "MCP_SERVER_CONFIG"
-    | "SUBAGENTS"
-    | "HOOKS"
-    | "COMMANDS"
-    | "MEMORY"
-    | "SESSIONS";
+  | "AGENTS_MD"
+  | "CONFIG"
+  | "SKILLS"
+  | "PLUGINS"
+  | "MCP_SERVER_CONFIG"
+  | "SUBAGENTS"
+  | "HOOKS"
+  | "COMMANDS"
+  | "MEMORY"
+  | "SESSIONS";
 export const V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigMigrationItemType =
   Schema.Literals([
     "AGENTS_MD",
diff --git a/packages/shared/package.json b/packages/shared/package.json
index 9160e9f67de9..86197c80b1a4 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -83,6 +83,10 @@
       "types": "./src/toolActivity.ts",
       "import": "./src/toolActivity.ts"
     },
+    "./favicon": {
+      "types": "./src/favicon.ts",
+      "import": "./src/favicon.ts"
+    },
     "./Struct": {
       "types": "./src/Struct.ts",
       "import": "./src/Struct.ts"
diff --git a/packages/shared/src/favicon.test.ts b/packages/shared/src/favicon.test.ts
new file mode 100644
index 000000000000..c29727544efa
--- /dev/null
+++ b/packages/shared/src/favicon.test.ts
@@ -0,0 +1,48 @@
+import { describe, expect, it } from "@effect/vitest";
+
+import { explicitFaviconUrl, faviconUrlForPage, toolActivityFaviconUrl } from "./favicon.ts";
+
+describe("faviconUrlForPage", () => {
+  it("uses the page origin instead of a third-party favicon service", () => {
+    expect(faviconUrlForPage("https://example.com/docs/page?q=1")).toBe(
+      "https://example.com/favicon.ico",
+    );
+    expect(faviconUrlForPage("http://localhost:5173/app")).toBe(
+      "http://localhost:5173/favicon.ico",
+    );
+  });
+
+  it("selects site-owned light and dark variants without filtering full-color icons", () => {
+    expect(toolActivityFaviconUrl({ pageUrl: "https://github.com/openai/codex" }, "light")).toBe(
+      "https://github.githubassets.com/favicons/favicon.svg",
+    );
+    expect(toolActivityFaviconUrl({ pageUrl: "https://github.com/openai/codex" }, "dark")).toBe(
+      "https://github.githubassets.com/favicons/favicon-dark.svg",
+    );
+
+    const fullColorIcon = {
+      pageUrl: "https://example.com/docs",
+      faviconUrl: "https://cdn.example.com/full-color.png",
+    };
+    expect(toolActivityFaviconUrl(fullColorIcon, "light")).toBe(fullColorIcon.faviconUrl);
+    expect(toolActivityFaviconUrl(fullColorIcon, "dark")).toBe(fullColorIcon.faviconUrl);
+  });
+
+  it("prefers a provider-supplied dark favicon", () => {
+    expect(
+      toolActivityFaviconUrl(
+        {
+          pageUrl: "https://example.com/docs",
+          faviconUrl: "https://example.com/light.svg",
+          faviconUrlDark: "https://example.com/dark.svg",
+        },
+        "dark",
+      ),
+    ).toBe("https://example.com/dark.svg");
+  });
+
+  it("accepts provider-supplied image URLs but rejects extension URLs", () => {
+    expect(explicitFaviconUrl("https://example.com/icon.png")).toBe("https://example.com/icon.png");
+    expect(explicitFaviconUrl("chrome-extension://example/_favicon/")).toBeNull();
+  });
+});
diff --git a/packages/shared/src/favicon.ts b/packages/shared/src/favicon.ts
new file mode 100644
index 000000000000..88bf46a985bc
--- /dev/null
+++ b/packages/shared/src/favicon.ts
@@ -0,0 +1,81 @@
+/**
+ * Mirrors Codex's generic Browser Use fallback: ask the page origin for its
+ * conventional favicon and let the image element fall back to a browser glyph.
+ * Chrome-backed tools can pass their tab's explicit favicon URL separately.
+ */
+export function faviconUrlForPage(rawUrl: string | null | undefined, _size = 32): string | null {
+  if (!rawUrl || rawUrl.length > 4096) return null;
+  try {
+    const pageUrl = new URL(rawUrl);
+    if (pageUrl.protocol !== "http:" && pageUrl.protocol !== "https:") return null;
+    return new URL("/favicon.ico", pageUrl.origin).href;
+  } catch {
+    return null;
+  }
+}
+
+const THEMED_FAVICON_BY_HOSTNAME: Readonly<
+  Record<string, Readonly<{ light: string; dark: string }>>
+> = {
+  "github.com": {
+    light: "https://github.githubassets.com/favicons/favicon.svg",
+    dark: "https://github.githubassets.com/favicons/favicon-dark.svg",
+  },
+};
+
+function themedFaviconUrlForPage(
+  rawUrl: string | null | undefined,
+  appearance: "light" | "dark",
+): string | null {
+  if (!rawUrl || rawUrl.length > 4096) return null;
+  try {
+    const pageUrl = new URL(rawUrl);
+    if (pageUrl.protocol !== "http:" && pageUrl.protocol !== "https:") return null;
+    return THEMED_FAVICON_BY_HOSTNAME[pageUrl.hostname.toLowerCase()]?.[appearance] ?? null;
+  } catch {
+    return null;
+  }
+}
+
+/** Accepts image URLs supplied by a trusted provider event. */
+export function explicitFaviconUrl(rawUrl: string | null | undefined): string | null {
+  if (!rawUrl || rawUrl.length > 4096) return null;
+  try {
+    const url = new URL(rawUrl);
+    return url.protocol === "http:" || url.protocol === "https:" || url.protocol === "data:"
+      ? url.href
+      : null;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Chooses a website icon for the app's resolved theme. Provider-supplied
+ * variants mirror Codex's Chrome-selected favicon path. A small site-owned
+ * fallback table covers websites whose conventional favicon is illegible in
+ * one appearance without recoloring full-color icons.
+ */
+export function toolActivityFaviconUrl(
+  icon: {
+    readonly pageUrl: string;
+    readonly faviconUrl?: string | undefined;
+    readonly faviconUrlDark?: string | undefined;
+  },
+  appearance: "light" | "dark",
+  size = 32,
+): string | null {
+  if (appearance === "dark") {
+    return (
+      explicitFaviconUrl(icon.faviconUrlDark) ??
+      themedFaviconUrlForPage(icon.pageUrl, "dark") ??
+      explicitFaviconUrl(icon.faviconUrl) ??
+      faviconUrlForPage(icon.pageUrl, size)
+    );
+  }
+  return (
+    explicitFaviconUrl(icon.faviconUrl) ??
+    themedFaviconUrlForPage(icon.pageUrl, "light") ??
+    faviconUrlForPage(icon.pageUrl, size)
+  );
+}
diff --git a/packages/shared/src/keybindings.ts b/packages/shared/src/keybindings.ts
index 939e88b7f0b6..1107873c8285 100644
--- a/packages/shared/src/keybindings.ts
+++ b/packages/shared/src/keybindings.ts
@@ -26,6 +26,7 @@ export const DEFAULT_KEYBINDINGS: ReadonlyArray<KeybindingRule> = [
   { key: "mod+shift+d", command: "terminal.splitVertical", when: "terminalFocus" },
   { key: "mod+n", command: "terminal.new", when: "terminalFocus" },
   { key: "mod+w", command: "terminal.close", when: "terminalFocus" },
+  { key: "mod+w", command: "rightPanel.close", when: "!terminalFocus" },
   { key: "mod+d", command: "diff.toggle", when: "!terminalFocus" },
   { key: "mod+shift+j", command: "preview.toggle" },
   { key: "mod+r", command: "preview.refresh", when: "previewFocus" },
diff --git a/packages/shared/src/qrCode.ts b/packages/shared/src/qrCode.ts
index 490e11fa04f1..273224a9a058 100644
--- a/packages/shared/src/qrCode.ts
+++ b/packages/shared/src/qrCode.ts
@@ -778,7 +778,7 @@ export class QrSegment {
     if (!QrSegment.isNumeric(digits))
       throw new RangeError("String contains non-numeric characters");
     let bb: Array<bit> = [];
-    for (let i = 0; i < digits.length; ) {
+    for (let i = 0; i < digits.length;) {
       // Consume up to 3 digits per iteration
       const n: int = Math.min(digits.length - i, 3);
       appendBits(parseInt(digits.substring(i, i + n), 10), n * 3 + 1, bb);
diff --git a/patches/uniwind@1.11.0.patch b/patches/uniwind@1.11.0.patch
index 6a5f4698bab5..abf0b7b10746 100644
--- a/patches/uniwind@1.11.0.patch
+++ b/patches/uniwind@1.11.0.patch
@@ -1,5 +1,161 @@
+diff --git a/dist/common/bundler/css-processor/processor.js b/dist/common/bundler/css-processor/processor.js
+index 7dd369fa3197dbd622832c89ac3854c401e55c3e..ab3ea1a9520907321f9c21c2a3a859262fe5075b 100644
+--- a/dist/common/bundler/css-processor/processor.js
++++ b/dist/common/bundler/css-processor/processor.js
+@@ -105,6 +105,64 @@ class ProcessorBuilder {
+       style.importantProperties.push(declaration.property);
+     }
+   }
++  readSelectorVariants(tokens) {
++    const variants = {
++      rtl: null,
++      theme: null,
++      active: null,
++      focus: null,
++      disabled: null,
++      dataAttributes: null
++    };
++    tokens.forEach((token) => {
++      if (token.type === "pseudo-class" && token.kind === "where") {
++        token.selectors.forEach((compound) => {
++          compound.forEach((inner) => {
++            if (inner.type === "class" && this.bundlerConfig.themes.includes(inner.name)) {
++              variants.theme = inner.name;
++            }
++            if (inner.type === "pseudo-class" && inner.kind === "dir") {
++              variants.rtl = inner.direction === "rtl";
++            }
++          });
++        });
++      }
++      if (token.type === "pseudo-class" && token.kind === "active") {
++        variants.active = true;
++      }
++      if (token.type === "pseudo-class" && token.kind === "focus") {
++        variants.focus = true;
++      }
++      if (token.type === "pseudo-class" && token.kind === "disabled") {
++        variants.disabled = true;
++      }
++      if (token.type === "attribute" && token.operation === null && token.name.startsWith("data-")) {
++        variants.dataAttributes ??= {};
++        variants.dataAttributes[token.name] = `"true"`;
++      }
++      if (token.type === "attribute" && token.operation?.operator === "equal" && token.name.startsWith("data-")) {
++        variants.dataAttributes ??= {};
++        variants.dataAttributes[token.name] = `"${token.operation.value}"`;
++      }
++    });
++    const hasVariants = Object.values(variants).some(_utils.isDefined);
++    return { variants, hasVariants };
++  }
++  withSelectorVariants(variants, run) {
++    this.declarationConfig.rtl ??= variants.rtl;
++    this.declarationConfig.theme ??= variants.theme;
++    this.declarationConfig.active ??= variants.active;
++    this.declarationConfig.focus ??= variants.focus;
++    this.declarationConfig.disabled ??= variants.disabled;
++    this.declarationConfig.dataAttributes ??= variants.dataAttributes;
++    run();
++    this.declarationConfig.rtl = null;
++    this.declarationConfig.theme = null;
++    this.declarationConfig.active = null;
++    this.declarationConfig.focus = null;
++    this.declarationConfig.disabled = null;
++    this.declarationConfig.dataAttributes = null;
++  }
+   parseRuleRec(rule) {
+     if (this.declarationConfig.className !== null) {
+       const lastStyle = this.stylesheets[this.declarationConfig.className]?.at(-1);
+@@ -120,64 +178,30 @@ class ProcessorBuilder {
+           this.declarationConfig.className = newClassName;
+           this.stylesheets[newClassName] ??= [];
+           this.stylesheets[newClassName].push({});
+-          rule.value.declarations?.declarations?.forEach(declaration => this.addDeclaration(declaration));
+-          rule.value.declarations?.importantDeclarations?.forEach(declaration => this.addDeclaration(declaration, true));
+-          rule.value.rules?.forEach(rule2 => this.parseRuleRec(rule2));
+-          return;
+-        }
+-        let rtl = null;
+-        let theme = null;
+-        let active = null;
+-        let focus = null;
+-        let disabled = null;
+-        let dataAttributes = null;
+-        selector.forEach(selector2 => {
+-          if (selector2.type === "pseudo-class" && selector2.kind === "where") {
+-            selector2.selectors.forEach(selector3 => {
+-              selector3.forEach(selector4 => {
+-                if (selector4.type === "class" && this.bundlerConfig.themes.includes(selector4.name)) {
+-                  theme = selector4.name;
+-                }
+-                if (selector4.type === "pseudo-class" && selector4.kind === "dir") {
+-                  rtl = selector4.direction === "rtl";
+-                }
+-              });
+-            });
+-          }
+-          if (selector2.type === "pseudo-class" && selector2.kind === "active") {
+-            active = true;
++          const trailing = selector.slice(1);
++          const { variants, hasVariants } = this.readSelectorVariants(trailing);
++          if (trailing.length > 0 && !hasVariants) {
++            return;
+           }
+-          if (selector2.type === "pseudo-class" && selector2.kind === "focus") {
+-            focus = true;
+-          }
+-          if (selector2.type === "pseudo-class" && selector2.kind === "disabled") {
+-            disabled = true;
+-          }
+-          if (selector2.type === "attribute" && selector2.operation === null && selector2.name.startsWith("data-")) {
+-            dataAttributes ??= {};
+-            dataAttributes[selector2.name] = `"true"`;
+-          }
+-          if (selector2.type === "attribute" && selector2.operation?.operator === "equal" && selector2.name.startsWith("data-")) {
+-            dataAttributes ??= {};
+-            dataAttributes[selector2.name] = `"${selector2.operation.value}"`;
++          const parseClassRule = () => {
++            rule.value.declarations?.declarations?.forEach(declaration => this.addDeclaration(declaration));
++            rule.value.declarations?.importantDeclarations?.forEach(declaration => this.addDeclaration(declaration, true));
++            rule.value.rules?.forEach(rule2 => this.parseRuleRec(rule2));
++          };
++          if (hasVariants) {
++            this.withSelectorVariants(variants, parseClassRule);
++          } else {
++            parseClassRule();
+           }
+-        });
+-        if ([rtl, theme, active, focus, disabled, dataAttributes].some(_utils.isDefined)) {
+-          this.declarationConfig.rtl ??= rtl;
+-          this.declarationConfig.theme ??= theme;
+-          this.declarationConfig.active ??= active;
+-          this.declarationConfig.focus ??= focus;
+-          this.declarationConfig.disabled ??= disabled;
+-          this.declarationConfig.dataAttributes ??= dataAttributes;
+-          rule.value.declarations?.declarations?.forEach(declaration => this.addDeclaration(declaration));
+-          rule.value.declarations?.importantDeclarations?.forEach(declaration => this.addDeclaration(declaration, true));
+-          rule.value.rules?.forEach(rule2 => this.parseRuleRec(rule2));
+-          this.declarationConfig.rtl = null;
+-          this.declarationConfig.theme = null;
+-          this.declarationConfig.active = null;
+-          this.declarationConfig.focus = null;
+-          this.declarationConfig.disabled = null;
+-          this.declarationConfig.dataAttributes = null;
++          return;
++        }
++        const { variants, hasVariants } = this.readSelectorVariants(selector);
++        if (hasVariants) {
++          this.withSelectorVariants(variants, () => {
++            rule.value.declarations?.declarations?.forEach(declaration => this.addDeclaration(declaration));
++            rule.value.declarations?.importantDeclarations?.forEach(declaration => this.addDeclaration(declaration, true));
++            rule.value.rules?.forEach(rule2 => this.parseRuleRec(rule2));
++          });
+           return;
+         }
+         selector.forEach(selectorToken => {
 diff --git a/dist/metro/transformer.cjs b/dist/metro/transformer.cjs
-index d57ca81..fd8693c 100644
+index d57ca8161f411f0dc7df827132586e428cafdf1b..3650a353b0db269ad4fc51b70a7158885c992e36 100644
 --- a/dist/metro/transformer.cjs
 +++ b/dist/metro/transformer.cjs
 @@ -7,6 +7,7 @@ const culori = require('culori');
@@ -10,7 +166,159 @@ index d57ca81..fd8693c 100644
  
  function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
  
-@@ -1753,10 +1754,11 @@ const transform = async (config$1, projectRoot, filePath, data, options) => {
+@@ -1537,6 +1538,64 @@ class ProcessorBuilder {
+       style.importantProperties.push(declaration.property);
+     }
+   }
++  readSelectorVariants(tokens) {
++    const variants = {
++      rtl: null,
++      theme: null,
++      active: null,
++      focus: null,
++      disabled: null,
++      dataAttributes: null
++    };
++    tokens.forEach((token) => {
++      if (token.type === "pseudo-class" && token.kind === "where") {
++        token.selectors.forEach((compound) => {
++          compound.forEach((inner) => {
++            if (inner.type === "class" && this.bundlerConfig.themes.includes(inner.name)) {
++              variants.theme = inner.name;
++            }
++            if (inner.type === "pseudo-class" && inner.kind === "dir") {
++              variants.rtl = inner.direction === "rtl";
++            }
++          });
++        });
++      }
++      if (token.type === "pseudo-class" && token.kind === "active") {
++        variants.active = true;
++      }
++      if (token.type === "pseudo-class" && token.kind === "focus") {
++        variants.focus = true;
++      }
++      if (token.type === "pseudo-class" && token.kind === "disabled") {
++        variants.disabled = true;
++      }
++      if (token.type === "attribute" && token.operation === null && token.name.startsWith("data-")) {
++        variants.dataAttributes ??= {};
++        variants.dataAttributes[token.name] = `"true"`;
++      }
++      if (token.type === "attribute" && token.operation?.operator === "equal" && token.name.startsWith("data-")) {
++        variants.dataAttributes ??= {};
++        variants.dataAttributes[token.name] = `"${token.operation.value}"`;
++      }
++    });
++    const hasVariants = Object.values(variants).some(config.isDefined);
++    return { variants, hasVariants };
++  }
++  withSelectorVariants(variants, run) {
++    this.declarationConfig.rtl ??= variants.rtl;
++    this.declarationConfig.theme ??= variants.theme;
++    this.declarationConfig.active ??= variants.active;
++    this.declarationConfig.focus ??= variants.focus;
++    this.declarationConfig.disabled ??= variants.disabled;
++    this.declarationConfig.dataAttributes ??= variants.dataAttributes;
++    run();
++    this.declarationConfig.rtl = null;
++    this.declarationConfig.theme = null;
++    this.declarationConfig.active = null;
++    this.declarationConfig.focus = null;
++    this.declarationConfig.disabled = null;
++    this.declarationConfig.dataAttributes = null;
++  }
+   parseRuleRec(rule) {
+     if (this.declarationConfig.className !== null) {
+       const lastStyle = this.stylesheets[this.declarationConfig.className]?.at(-1);
+@@ -1552,64 +1611,30 @@ class ProcessorBuilder {
+           this.declarationConfig.className = newClassName;
+           this.stylesheets[newClassName] ??= [];
+           this.stylesheets[newClassName].push({});
+-          rule.value.declarations?.declarations?.forEach((declaration) => this.addDeclaration(declaration));
+-          rule.value.declarations?.importantDeclarations?.forEach((declaration) => this.addDeclaration(declaration, true));
+-          rule.value.rules?.forEach((rule2) => this.parseRuleRec(rule2));
+-          return;
+-        }
+-        let rtl = null;
+-        let theme = null;
+-        let active = null;
+-        let focus = null;
+-        let disabled = null;
+-        let dataAttributes = null;
+-        selector.forEach((selector2) => {
+-          if (selector2.type === "pseudo-class" && selector2.kind === "where") {
+-            selector2.selectors.forEach((selector3) => {
+-              selector3.forEach((selector4) => {
+-                if (selector4.type === "class" && this.bundlerConfig.themes.includes(selector4.name)) {
+-                  theme = selector4.name;
+-                }
+-                if (selector4.type === "pseudo-class" && selector4.kind === "dir") {
+-                  rtl = selector4.direction === "rtl";
+-                }
+-              });
+-            });
+-          }
+-          if (selector2.type === "pseudo-class" && selector2.kind === "active") {
+-            active = true;
+-          }
+-          if (selector2.type === "pseudo-class" && selector2.kind === "focus") {
+-            focus = true;
++          const trailing = selector.slice(1);
++          const { variants, hasVariants } = this.readSelectorVariants(trailing);
++          if (trailing.length > 0 && !hasVariants) {
++            return;
+           }
+-          if (selector2.type === "pseudo-class" && selector2.kind === "disabled") {
+-            disabled = true;
+-          }
+-          if (selector2.type === "attribute" && selector2.operation === null && selector2.name.startsWith("data-")) {
+-            dataAttributes ??= {};
+-            dataAttributes[selector2.name] = `"true"`;
+-          }
+-          if (selector2.type === "attribute" && selector2.operation?.operator === "equal" && selector2.name.startsWith("data-")) {
+-            dataAttributes ??= {};
+-            dataAttributes[selector2.name] = `"${selector2.operation.value}"`;
++          const parseClassRule = () => {
++            rule.value.declarations?.declarations?.forEach((declaration) => this.addDeclaration(declaration));
++            rule.value.declarations?.importantDeclarations?.forEach((declaration) => this.addDeclaration(declaration, true));
++            rule.value.rules?.forEach((rule2) => this.parseRuleRec(rule2));
++          };
++          if (hasVariants) {
++            this.withSelectorVariants(variants, parseClassRule);
++          } else {
++            parseClassRule();
+           }
+-        });
+-        if ([rtl, theme, active, focus, disabled, dataAttributes].some(config.isDefined)) {
+-          this.declarationConfig.rtl ??= rtl;
+-          this.declarationConfig.theme ??= theme;
+-          this.declarationConfig.active ??= active;
+-          this.declarationConfig.focus ??= focus;
+-          this.declarationConfig.disabled ??= disabled;
+-          this.declarationConfig.dataAttributes ??= dataAttributes;
+-          rule.value.declarations?.declarations?.forEach((declaration) => this.addDeclaration(declaration));
+-          rule.value.declarations?.importantDeclarations?.forEach((declaration) => this.addDeclaration(declaration, true));
+-          rule.value.rules?.forEach((rule2) => this.parseRuleRec(rule2));
+-          this.declarationConfig.rtl = null;
+-          this.declarationConfig.theme = null;
+-          this.declarationConfig.active = null;
+-          this.declarationConfig.focus = null;
+-          this.declarationConfig.disabled = null;
+-          this.declarationConfig.dataAttributes = null;
++          return;
++        }
++        const { variants, hasVariants } = this.readSelectorVariants(selector);
++        if (hasVariants) {
++          this.withSelectorVariants(variants, () => {
++            rule.value.declarations?.declarations?.forEach((declaration) => this.addDeclaration(declaration));
++            rule.value.declarations?.importantDeclarations?.forEach((declaration) => this.addDeclaration(declaration, true));
++            rule.value.rules?.forEach((rule2) => this.parseRuleRec(rule2));
++          });
+           return;
+         }
+         selector.forEach((selectorToken) => {
+@@ -1753,10 +1778,11 @@ const transform = async (config$1, projectRoot, filePath, data, options) => {
    await bundlerConfig.generateArtifacts(cssArtifactPath);
    const virtualCode = await compileCSS(bundlerConfig);
    const isWeb = bundlerConfig.platform === config.Platform.Web;
@@ -24,7 +332,7 @@ index d57ca81..fd8693c 100644
      "utf-8"
    );
 diff --git a/dist/metro/transformer.mjs b/dist/metro/transformer.mjs
-index d3e7475..bf63587 100644
+index d3e7475f8f0aaba510b318657dc8374e6c6097cb..6ff8cffc4bb703521b6d86f0ac14be054ba5b9ce 100644
 --- a/dist/metro/transformer.mjs
 +++ b/dist/metro/transformer.mjs
 @@ -5,6 +5,7 @@ import { converter, parse, formatHex, formatHex8 } from 'culori';
@@ -35,7 +343,159 @@ index d3e7475..bf63587 100644
  
  const toCamelCase = (str) => str.replace(/-([a-z])/g, (_, letter) => letter.toUpperCase());
  const pipe = (data) => ((...fns) => fns.reduce((acc, fn) => fn(acc), data));
-@@ -1746,10 +1747,11 @@ const transform = async (config, projectRoot, filePath, data, options) => {
+@@ -1530,6 +1531,64 @@ class ProcessorBuilder {
+       style.importantProperties.push(declaration.property);
+     }
+   }
++  readSelectorVariants(tokens) {
++    const variants = {
++      rtl: null,
++      theme: null,
++      active: null,
++      focus: null,
++      disabled: null,
++      dataAttributes: null
++    };
++    tokens.forEach((token) => {
++      if (token.type === "pseudo-class" && token.kind === "where") {
++        token.selectors.forEach((compound) => {
++          compound.forEach((inner) => {
++            if (inner.type === "class" && this.bundlerConfig.themes.includes(inner.name)) {
++              variants.theme = inner.name;
++            }
++            if (inner.type === "pseudo-class" && inner.kind === "dir") {
++              variants.rtl = inner.direction === "rtl";
++            }
++          });
++        });
++      }
++      if (token.type === "pseudo-class" && token.kind === "active") {
++        variants.active = true;
++      }
++      if (token.type === "pseudo-class" && token.kind === "focus") {
++        variants.focus = true;
++      }
++      if (token.type === "pseudo-class" && token.kind === "disabled") {
++        variants.disabled = true;
++      }
++      if (token.type === "attribute" && token.operation === null && token.name.startsWith("data-")) {
++        variants.dataAttributes ??= {};
++        variants.dataAttributes[token.name] = `"true"`;
++      }
++      if (token.type === "attribute" && token.operation?.operator === "equal" && token.name.startsWith("data-")) {
++        variants.dataAttributes ??= {};
++        variants.dataAttributes[token.name] = `"${token.operation.value}"`;
++      }
++    });
++    const hasVariants = Object.values(variants).some(isDefined);
++    return { variants, hasVariants };
++  }
++  withSelectorVariants(variants, run) {
++    this.declarationConfig.rtl ??= variants.rtl;
++    this.declarationConfig.theme ??= variants.theme;
++    this.declarationConfig.active ??= variants.active;
++    this.declarationConfig.focus ??= variants.focus;
++    this.declarationConfig.disabled ??= variants.disabled;
++    this.declarationConfig.dataAttributes ??= variants.dataAttributes;
++    run();
++    this.declarationConfig.rtl = null;
++    this.declarationConfig.theme = null;
++    this.declarationConfig.active = null;
++    this.declarationConfig.focus = null;
++    this.declarationConfig.disabled = null;
++    this.declarationConfig.dataAttributes = null;
++  }
+   parseRuleRec(rule) {
+     if (this.declarationConfig.className !== null) {
+       const lastStyle = this.stylesheets[this.declarationConfig.className]?.at(-1);
+@@ -1545,64 +1604,30 @@ class ProcessorBuilder {
+           this.declarationConfig.className = newClassName;
+           this.stylesheets[newClassName] ??= [];
+           this.stylesheets[newClassName].push({});
+-          rule.value.declarations?.declarations?.forEach((declaration) => this.addDeclaration(declaration));
+-          rule.value.declarations?.importantDeclarations?.forEach((declaration) => this.addDeclaration(declaration, true));
+-          rule.value.rules?.forEach((rule2) => this.parseRuleRec(rule2));
+-          return;
+-        }
+-        let rtl = null;
+-        let theme = null;
+-        let active = null;
+-        let focus = null;
+-        let disabled = null;
+-        let dataAttributes = null;
+-        selector.forEach((selector2) => {
+-          if (selector2.type === "pseudo-class" && selector2.kind === "where") {
+-            selector2.selectors.forEach((selector3) => {
+-              selector3.forEach((selector4) => {
+-                if (selector4.type === "class" && this.bundlerConfig.themes.includes(selector4.name)) {
+-                  theme = selector4.name;
+-                }
+-                if (selector4.type === "pseudo-class" && selector4.kind === "dir") {
+-                  rtl = selector4.direction === "rtl";
+-                }
+-              });
+-            });
+-          }
+-          if (selector2.type === "pseudo-class" && selector2.kind === "active") {
+-            active = true;
+-          }
+-          if (selector2.type === "pseudo-class" && selector2.kind === "focus") {
+-            focus = true;
++          const trailing = selector.slice(1);
++          const { variants, hasVariants } = this.readSelectorVariants(trailing);
++          if (trailing.length > 0 && !hasVariants) {
++            return;
+           }
+-          if (selector2.type === "pseudo-class" && selector2.kind === "disabled") {
+-            disabled = true;
+-          }
+-          if (selector2.type === "attribute" && selector2.operation === null && selector2.name.startsWith("data-")) {
+-            dataAttributes ??= {};
+-            dataAttributes[selector2.name] = `"true"`;
+-          }
+-          if (selector2.type === "attribute" && selector2.operation?.operator === "equal" && selector2.name.startsWith("data-")) {
+-            dataAttributes ??= {};
+-            dataAttributes[selector2.name] = `"${selector2.operation.value}"`;
++          const parseClassRule = () => {
++            rule.value.declarations?.declarations?.forEach((declaration) => this.addDeclaration(declaration));
++            rule.value.declarations?.importantDeclarations?.forEach((declaration) => this.addDeclaration(declaration, true));
++            rule.value.rules?.forEach((rule2) => this.parseRuleRec(rule2));
++          };
++          if (hasVariants) {
++            this.withSelectorVariants(variants, parseClassRule);
++          } else {
++            parseClassRule();
+           }
+-        });
+-        if ([rtl, theme, active, focus, disabled, dataAttributes].some(isDefined)) {
+-          this.declarationConfig.rtl ??= rtl;
+-          this.declarationConfig.theme ??= theme;
+-          this.declarationConfig.active ??= active;
+-          this.declarationConfig.focus ??= focus;
+-          this.declarationConfig.disabled ??= disabled;
+-          this.declarationConfig.dataAttributes ??= dataAttributes;
+-          rule.value.declarations?.declarations?.forEach((declaration) => this.addDeclaration(declaration));
+-          rule.value.declarations?.importantDeclarations?.forEach((declaration) => this.addDeclaration(declaration, true));
+-          rule.value.rules?.forEach((rule2) => this.parseRuleRec(rule2));
+-          this.declarationConfig.rtl = null;
+-          this.declarationConfig.theme = null;
+-          this.declarationConfig.active = null;
+-          this.declarationConfig.focus = null;
+-          this.declarationConfig.disabled = null;
+-          this.declarationConfig.dataAttributes = null;
++          return;
++        }
++        const { variants, hasVariants } = this.readSelectorVariants(selector);
++        if (hasVariants) {
++          this.withSelectorVariants(variants, () => {
++            rule.value.declarations?.declarations?.forEach((declaration) => this.addDeclaration(declaration));
++            rule.value.declarations?.importantDeclarations?.forEach((declaration) => this.addDeclaration(declaration, true));
++            rule.value.rules?.forEach((rule2) => this.parseRuleRec(rule2));
++          });
+           return;
+         }
+         selector.forEach((selectorToken) => {
+@@ -1746,10 +1771,11 @@ const transform = async (config, projectRoot, filePath, data, options) => {
    await bundlerConfig.generateArtifacts(cssArtifactPath);
    const virtualCode = await compileCSS(bundlerConfig);
    const isWeb = bundlerConfig.platform === Platform.Web;
@@ -48,8 +508,164 @@ index d3e7475..bf63587 100644
      ].join(""),
      "utf-8"
    );
+diff --git a/dist/module/bundler/css-processor/processor.js b/dist/module/bundler/css-processor/processor.js
+index 58c96b6ab642c2b724d1868d0d48b77bad33be6f..70b759b04913a0e9028c936827b4578d628b4728 100644
+--- a/dist/module/bundler/css-processor/processor.js
++++ b/dist/module/bundler/css-processor/processor.js
+@@ -99,6 +99,64 @@ export class ProcessorBuilder {
+       style.importantProperties.push(declaration.property);
+     }
+   }
++  readSelectorVariants(tokens) {
++    const variants = {
++      rtl: null,
++      theme: null,
++      active: null,
++      focus: null,
++      disabled: null,
++      dataAttributes: null
++    };
++    tokens.forEach((token) => {
++      if (token.type === "pseudo-class" && token.kind === "where") {
++        token.selectors.forEach((compound) => {
++          compound.forEach((inner) => {
++            if (inner.type === "class" && this.bundlerConfig.themes.includes(inner.name)) {
++              variants.theme = inner.name;
++            }
++            if (inner.type === "pseudo-class" && inner.kind === "dir") {
++              variants.rtl = inner.direction === "rtl";
++            }
++          });
++        });
++      }
++      if (token.type === "pseudo-class" && token.kind === "active") {
++        variants.active = true;
++      }
++      if (token.type === "pseudo-class" && token.kind === "focus") {
++        variants.focus = true;
++      }
++      if (token.type === "pseudo-class" && token.kind === "disabled") {
++        variants.disabled = true;
++      }
++      if (token.type === "attribute" && token.operation === null && token.name.startsWith("data-")) {
++        variants.dataAttributes ??= {};
++        variants.dataAttributes[token.name] = `"true"`;
++      }
++      if (token.type === "attribute" && token.operation?.operator === "equal" && token.name.startsWith("data-")) {
++        variants.dataAttributes ??= {};
++        variants.dataAttributes[token.name] = `"${token.operation.value}"`;
++      }
++    });
++    const hasVariants = Object.values(variants).some(isDefined);
++    return { variants, hasVariants };
++  }
++  withSelectorVariants(variants, run) {
++    this.declarationConfig.rtl ??= variants.rtl;
++    this.declarationConfig.theme ??= variants.theme;
++    this.declarationConfig.active ??= variants.active;
++    this.declarationConfig.focus ??= variants.focus;
++    this.declarationConfig.disabled ??= variants.disabled;
++    this.declarationConfig.dataAttributes ??= variants.dataAttributes;
++    run();
++    this.declarationConfig.rtl = null;
++    this.declarationConfig.theme = null;
++    this.declarationConfig.active = null;
++    this.declarationConfig.focus = null;
++    this.declarationConfig.disabled = null;
++    this.declarationConfig.dataAttributes = null;
++  }
+   parseRuleRec(rule) {
+     if (this.declarationConfig.className !== null) {
+       const lastStyle = this.stylesheets[this.declarationConfig.className]?.at(-1);
+@@ -114,64 +172,30 @@ export class ProcessorBuilder {
+           this.declarationConfig.className = newClassName;
+           this.stylesheets[newClassName] ??= [];
+           this.stylesheets[newClassName].push({});
+-          rule.value.declarations?.declarations?.forEach((declaration) => this.addDeclaration(declaration));
+-          rule.value.declarations?.importantDeclarations?.forEach((declaration) => this.addDeclaration(declaration, true));
+-          rule.value.rules?.forEach((rule2) => this.parseRuleRec(rule2));
+-          return;
+-        }
+-        let rtl = null;
+-        let theme = null;
+-        let active = null;
+-        let focus = null;
+-        let disabled = null;
+-        let dataAttributes = null;
+-        selector.forEach((selector2) => {
+-          if (selector2.type === "pseudo-class" && selector2.kind === "where") {
+-            selector2.selectors.forEach((selector3) => {
+-              selector3.forEach((selector4) => {
+-                if (selector4.type === "class" && this.bundlerConfig.themes.includes(selector4.name)) {
+-                  theme = selector4.name;
+-                }
+-                if (selector4.type === "pseudo-class" && selector4.kind === "dir") {
+-                  rtl = selector4.direction === "rtl";
+-                }
+-              });
+-            });
+-          }
+-          if (selector2.type === "pseudo-class" && selector2.kind === "active") {
+-            active = true;
++          const trailing = selector.slice(1);
++          const { variants, hasVariants } = this.readSelectorVariants(trailing);
++          if (trailing.length > 0 && !hasVariants) {
++            return;
+           }
+-          if (selector2.type === "pseudo-class" && selector2.kind === "focus") {
+-            focus = true;
+-          }
+-          if (selector2.type === "pseudo-class" && selector2.kind === "disabled") {
+-            disabled = true;
+-          }
+-          if (selector2.type === "attribute" && selector2.operation === null && selector2.name.startsWith("data-")) {
+-            dataAttributes ??= {};
+-            dataAttributes[selector2.name] = `"true"`;
+-          }
+-          if (selector2.type === "attribute" && selector2.operation?.operator === "equal" && selector2.name.startsWith("data-")) {
+-            dataAttributes ??= {};
+-            dataAttributes[selector2.name] = `"${selector2.operation.value}"`;
++          const parseClassRule = () => {
++            rule.value.declarations?.declarations?.forEach((declaration) => this.addDeclaration(declaration));
++            rule.value.declarations?.importantDeclarations?.forEach((declaration) => this.addDeclaration(declaration, true));
++            rule.value.rules?.forEach((rule2) => this.parseRuleRec(rule2));
++          };
++          if (hasVariants) {
++            this.withSelectorVariants(variants, parseClassRule);
++          } else {
++            parseClassRule();
+           }
+-        });
+-        if ([rtl, theme, active, focus, disabled, dataAttributes].some(isDefined)) {
+-          this.declarationConfig.rtl ??= rtl;
+-          this.declarationConfig.theme ??= theme;
+-          this.declarationConfig.active ??= active;
+-          this.declarationConfig.focus ??= focus;
+-          this.declarationConfig.disabled ??= disabled;
+-          this.declarationConfig.dataAttributes ??= dataAttributes;
+-          rule.value.declarations?.declarations?.forEach((declaration) => this.addDeclaration(declaration));
+-          rule.value.declarations?.importantDeclarations?.forEach((declaration) => this.addDeclaration(declaration, true));
+-          rule.value.rules?.forEach((rule2) => this.parseRuleRec(rule2));
+-          this.declarationConfig.rtl = null;
+-          this.declarationConfig.theme = null;
+-          this.declarationConfig.active = null;
+-          this.declarationConfig.focus = null;
+-          this.declarationConfig.disabled = null;
+-          this.declarationConfig.dataAttributes = null;
++          return;
++        }
++        const { variants, hasVariants } = this.readSelectorVariants(selector);
++        if (hasVariants) {
++          this.withSelectorVariants(variants, () => {
++            rule.value.declarations?.declarations?.forEach((declaration) => this.addDeclaration(declaration));
++            rule.value.declarations?.importantDeclarations?.forEach((declaration) => this.addDeclaration(declaration, true));
++            rule.value.rules?.forEach((rule2) => this.parseRuleRec(rule2));
++          });
+           return;
+         }
+         selector.forEach((selectorToken) => {
 diff --git a/src/bundler/adapters/metro/transformer.ts b/src/bundler/adapters/metro/transformer.ts
-index 08059b0..05c0515 100644
+index 08059b0fb2394effd2553086216d8933a53fad84..05c051595bfffd313f1d731fcedc1e991af720e1 100644
 --- a/src/bundler/adapters/metro/transformer.ts
 +++ b/src/bundler/adapters/metro/transformer.ts
 @@ -5,6 +5,7 @@ import { Platform } from '@/common/consts'
@@ -82,8 +698,195 @@ index 08059b0..05c0515 100644
              ].join(''),
          'utf-8',
      )
+diff --git a/src/bundler/css-processor/processor.ts b/src/bundler/css-processor/processor.ts
+index c8b3bb86e2a50c16ebc3f0404f4d9ac050aba61d..b5e185469733aca4289b7b07bc76dbfcd8fd5788 100644
+--- a/src/bundler/css-processor/processor.ts
++++ b/src/bundler/css-processor/processor.ts
+@@ -123,6 +123,77 @@ export class ProcessorBuilder {
+         }
+     }
+ 
++    private readSelectorVariants(tokens: ReadonlyArray<any>) {
++        const variants = {
++            rtl: null as boolean | null,
++            theme: null as string | null,
++            active: null as boolean | null,
++            focus: null as boolean | null,
++            disabled: null as boolean | null,
++            dataAttributes: null as Record<string, string> | null,
++        }
++
++        tokens.forEach(token => {
++            if (token.type === 'pseudo-class' && token.kind === 'where') {
++                token.selectors.forEach((compound: Array<any>) => {
++                    compound.forEach(inner => {
++                        if (inner.type === 'class' && this.bundlerConfig.themes.includes(inner.name)) {
++                            variants.theme = inner.name
++                        }
++
++                        if (inner.type === 'pseudo-class' && inner.kind === 'dir') {
++                            variants.rtl = inner.direction === 'rtl'
++                        }
++                    })
++                })
++            }
++
++            if (token.type === 'pseudo-class' && token.kind === 'active') {
++                variants.active = true
++            }
++
++            if (token.type === 'pseudo-class' && token.kind === 'focus') {
++                variants.focus = true
++            }
++
++            if (token.type === 'pseudo-class' && token.kind === 'disabled') {
++                variants.disabled = true
++            }
++
++            // data-x
++            if (token.type === 'attribute' && token.operation === null && token.name.startsWith('data-')) {
++                variants.dataAttributes ??= {}
++                variants.dataAttributes[token.name] = `"true"`
++            }
++
++            // data-x=
++            if (token.type === 'attribute' && token.operation?.operator === 'equal' && token.name.startsWith('data-')) {
++                variants.dataAttributes ??= {}
++                variants.dataAttributes[token.name] = `"${token.operation.value}"`
++            }
++        })
++
++        return { variants, hasVariants: Object.values(variants).some(isDefined) }
++    }
++
++    private withSelectorVariants(variants: ReturnType<ProcessorBuilder['readSelectorVariants']>['variants'], run: () => void) {
++        this.declarationConfig.rtl ??= variants.rtl
++        this.declarationConfig.theme ??= variants.theme
++        this.declarationConfig.active ??= variants.active
++        this.declarationConfig.focus ??= variants.focus
++        this.declarationConfig.disabled ??= variants.disabled
++        this.declarationConfig.dataAttributes ??= variants.dataAttributes
++
++        run()
++
++        this.declarationConfig.rtl = null
++        this.declarationConfig.theme = null
++        this.declarationConfig.active = null
++        this.declarationConfig.focus = null
++        this.declarationConfig.disabled = null
++        this.declarationConfig.dataAttributes = null
++    }
++
+     private parseRuleRec(rule: Rule<Declaration, MediaQuery>) {
+         if (this.declarationConfig.className !== null) {
+             const lastStyle = this.stylesheets[this.declarationConfig.className]?.at(-1)
+@@ -142,78 +213,41 @@ export class ProcessorBuilder {
+                     this.stylesheets[newClassName] ??= []
+                     this.stylesheets[newClassName].push({})
+ 
+-                    rule.value.declarations?.declarations?.forEach(declaration => this.addDeclaration(declaration))
+-                    rule.value.declarations?.importantDeclarations?.forEach(declaration => this.addDeclaration(declaration, true))
+-                    rule.value.rules?.forEach(rule => this.parseRuleRec(rule))
++                    // Tailwind >= 4.3.3 emits `.active\:x:active {}` instead of
++                    // nesting `&:active` under the class, so the variant tokens
++                    // sit right after the class token. A compound the runtime
++                    // cannot express (e.g. `[aria-disabled="true"]`) used to be
++                    // an empty nested rule and must not become unconditional.
++                    const trailing = selector.slice(1)
++                    const { variants, hasVariants } = this.readSelectorVariants(trailing)
+ 
+-                    return
+-                }
+-
+-                let rtl = null as boolean | null
+-                let theme = null as string | null
+-                let active = null as boolean | null
+-                let focus = null as boolean | null
+-                let disabled = null as boolean | null
+-                let dataAttributes = null as Record<string, string> | null
+-
+-                selector.forEach(selector => {
+-                    if (selector.type === 'pseudo-class' && selector.kind === 'where') {
+-                        selector.selectors.forEach(selector => {
+-                            selector.forEach(selector => {
+-                                if (selector.type === 'class' && this.bundlerConfig.themes.includes(selector.name)) {
+-                                    theme = selector.name
+-                                }
+-
+-                                if (selector.type === 'pseudo-class' && selector.kind === 'dir') {
+-                                    rtl = selector.direction === 'rtl'
+-                                }
+-                            })
+-                        })
++                    if (trailing.length > 0 && !hasVariants) {
++                        return
+                     }
+ 
+-                    if (selector.type === 'pseudo-class' && selector.kind === 'active') {
+-                        active = true
+-                    }
+-
+-                    if (selector.type === 'pseudo-class' && selector.kind === 'focus') {
+-                        focus = true
++                    const parseClassRule = () => {
++                        rule.value.declarations?.declarations?.forEach(declaration => this.addDeclaration(declaration))
++                        rule.value.declarations?.importantDeclarations?.forEach(declaration => this.addDeclaration(declaration, true))
++                        rule.value.rules?.forEach(rule => this.parseRuleRec(rule))
+                     }
+ 
+-                    if (selector.type === 'pseudo-class' && selector.kind === 'disabled') {
+-                        disabled = true
++                    if (hasVariants) {
++                        this.withSelectorVariants(variants, parseClassRule)
++                    } else {
++                        parseClassRule()
+                     }
+ 
+-                    // data-x
+-                    if (selector.type === 'attribute' && selector.operation === null && selector.name.startsWith('data-')) {
+-                        dataAttributes ??= {}
+-                        dataAttributes[selector.name] = `"true"`
+-                    }
++                    return
++                }
+ 
+-                    // data-x=
+-                    if (selector.type === 'attribute' && selector.operation?.operator === 'equal' && selector.name.startsWith('data-')) {
+-                        dataAttributes ??= {}
+-                        dataAttributes[selector.name] = `"${selector.operation.value}"`
+-                    }
+-                })
++                const { variants, hasVariants } = this.readSelectorVariants(selector)
+ 
+-                if ([rtl, theme, active, focus, disabled, dataAttributes].some(isDefined)) {
+-                    this.declarationConfig.rtl ??= rtl
+-                    this.declarationConfig.theme ??= theme
+-                    this.declarationConfig.active ??= active
+-                    this.declarationConfig.focus ??= focus
+-                    this.declarationConfig.disabled ??= disabled
+-                    this.declarationConfig.dataAttributes ??= dataAttributes
+-
+-                    rule.value.declarations?.declarations?.forEach(declaration => this.addDeclaration(declaration))
+-                    rule.value.declarations?.importantDeclarations?.forEach(declaration => this.addDeclaration(declaration, true))
+-                    rule.value.rules?.forEach(rule => this.parseRuleRec(rule))
+-
+-                    this.declarationConfig.rtl = null
+-                    this.declarationConfig.theme = null
+-                    this.declarationConfig.active = null
+-                    this.declarationConfig.focus = null
+-                    this.declarationConfig.disabled = null
+-                    this.declarationConfig.dataAttributes = null
++                if (hasVariants) {
++                    this.withSelectorVariants(variants, () => {
++                        rule.value.declarations?.declarations?.forEach(declaration => this.addDeclaration(declaration))
++                        rule.value.declarations?.importantDeclarations?.forEach(declaration => this.addDeclaration(declaration, true))
++                        rule.value.rules?.forEach(rule => this.parseRuleRec(rule))
++                    })
+ 
+                     return
+                 }
 diff --git a/src/core/config/config.native.ts b/src/core/config/config.native.ts
-index 5e0832b..01aed1b 100644
+index 5e0832b5913df6f02604020d7ff5caf3b6a8d912..01aed1be25ca928f3a802996f41cb6b841aaed86 100644
 --- a/src/core/config/config.native.ts
 +++ b/src/core/config/config.native.ts
 @@ -8,6 +8,8 @@ import type { CSSVariables, GenerateStyleSheetsCallback, ThemeName } from '../ty
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f7a1b8a861dd..0f0b53db9647 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -34,8 +34,8 @@ catalogs:
       specifier: ~6.0.3
       version: 6.0.3
     vite-plus:
-      specifier: 0.2.2
-      version: 0.2.2
+      specifier: 0.3.0
+      version: 0.3.0
 
 overrides:
   '@anthropic-ai/claude-agent-sdk>@anthropic-ai/claude-agent-sdk-darwin-arm64': '-'
@@ -71,12 +71,17 @@ overrides:
   '@expo/metro-config': 57.0.12
   expo-constants: 57.0.16
   '@pierre/diffs>@shikijs/transformers': ^4.2.0
+  '@tailwindcss/node': 4.3.3
+  '@tailwindcss/oxide': 4.3.3
+  '@tailwindcss/vite': 4.3.3
   '@types/node': 24.12.4
   effect: 4.0.0-beta.103
   expo-router: 57.0.17
   expo-sharing>@expo/config-plugins: 57.0.9
   expo-sharing>@expo/config-types: 57.0.2
-  vite: npm:@voidzero-dev/vite-plus-core@0.2.2
+  lightningcss: 1.33.0
+  tailwindcss: 4.3.3
+  vite: npm:@voidzero-dev/vite-plus-core@0.3.0
   yaml: ^2.9.0
 
 packageExtensionsChecksum: sha256-k/dT9NFDl5hihRPaoFKeY11hzyutMFs5psfZLFiKJic=
@@ -98,7 +103,7 @@ patchedDependencies:
   react-native-keyboard-controller@1.21.13: 6e4339347bc5bb3c9ea67d85ff5c814058b211c5750f247aba59d07869a2e787
   react-native-nitro-modules@0.35.9: 825622aae63a8fb5b904f3c77908a0e216261d727ea171709f2c0b6088422675
   react-native-screens@4.26.2: 149bef30a66351ea9b26b42f87b78c539cb52b880f2387bb323ec80dcac84006
-  uniwind@1.11.0: 329a77525509623d763b738152dbd00ab392cdcdd9fb6ed2b4a20e086e437196
+  uniwind@1.11.0: 17d92be2eec71bb6396b402e8d034968e54b28746876d7977cb3139655f42b90
 
 importers:
 
@@ -121,7 +126,7 @@ importers:
         version: 7.0.0-dev.20260604.1
       vite-plus:
         specifier: 'catalog:'
-        version: 0.2.2(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 0.3.0(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   apps/desktop:
     dependencies:
@@ -187,11 +192,11 @@ importers:
         specifier: 26.15.6
         version: 26.15.6(dmg-builder@26.15.6)
       tailwindcss:
-        specifier: ^4.0.0
-        version: 4.3.0
+        specifier: 4.3.3
+        version: 4.3.3
       vite-plus:
         specifier: 'catalog:'
-        version: 0.2.2(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 0.3.0(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   apps/marketing:
     dependencies:
@@ -447,7 +452,7 @@ importers:
         version: 3.6.0
       uniwind:
         specifier: 1.11.0
-        version: 1.11.0(patch_hash=329a77525509623d763b738152dbd00ab392cdcdd9fb6ed2b4a20e086e437196)(@expo/metro-config@57.0.12(patch_hash=96f1a75347e6ea02dc4b7034ace815d8ee39e18b8166ebfb573d9e58328f0dc2)(bufferutil@4.1.0)(expo@57.0.18)(typescript@6.0.3)(utf-8-validate@6.0.6))(metro-cache@0.84.5)(metro-transform-worker@0.84.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(metro@0.84.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(tailwindcss@4.3.0)
+        version: 1.11.0(patch_hash=17d92be2eec71bb6396b402e8d034968e54b28746876d7977cb3139655f42b90)(@expo/metro-config@57.0.12(patch_hash=96f1a75347e6ea02dc4b7034ace815d8ee39e18b8166ebfb573d9e58328f0dc2)(bufferutil@4.1.0)(expo@57.0.18)(typescript@6.0.3)(utf-8-validate@6.0.6))(metro-cache@0.84.5)(metro-transform-worker@0.84.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(metro@0.84.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(tailwindcss@4.3.3)
     devDependencies:
       '@effect/vitest':
         specifier: 4.0.0-beta.103
@@ -462,8 +467,8 @@ importers:
         specifier: ~57.0.9
         version: 57.0.9(@babel/core@7.29.7)(@babel/runtime@7.29.7)(expo-widgets@57.0.15)(expo@57.0.18)(react-refresh@0.14.2)
       tailwindcss:
-        specifier: ^4.0.0
-        version: 4.3.0
+        specifier: 4.3.3
+        version: 4.3.3
       typescript:
         specifier: 'catalog:'
         version: 6.0.3
@@ -475,7 +480,7 @@ importers:
         version: 0.3.170(@anthropic-ai/sdk@0.93.0(zod@4.4.3))(@modelcontextprotocol/sdk@1.29.0(zod@4.4.3))(zod@4.4.3)
       '@cursor/sdk':
         specifier: ^1.0.13
-        version: 1.0.26
+        version: 1.0.30
       '@effect/platform-bun':
         specifier: 4.0.0-beta.103
         version: 4.0.0-beta.103(bufferutil@4.1.0)(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6))(utf-8-validate@6.0.6)
@@ -545,7 +550,7 @@ importers:
         version: link:../../packages/effect-codex-app-server
       vite-plus:
         specifier: 'catalog:'
-        version: 0.2.2(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 0.3.0(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   apps/web:
     dependencies:
@@ -608,7 +613,7 @@ importers:
         version: 0.19.4(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@tanstack/react-query':
         specifier: ^5.90.0
-        version: 5.101.4(react@19.2.6)
+        version: 5.102.8(react@19.2.6)
       '@tanstack/react-router':
         specifier: ^1.160.2
         version: 1.170.10(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
@@ -678,13 +683,13 @@ importers:
         version: 4.0.0-beta.103(patch_hash=a16b1e870d8c29e4a98b17cc4c638a4ff471753d8ca3487f78a22b759caf951b)(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6))
       '@rolldown/plugin-babel':
         specifier: ^0.2.0
-        version: 0.2.3(@babel/core@7.29.7)(@babel/plugin-transform-runtime@7.29.7(@babel/core@7.29.7))(@babel/runtime@7.29.7)(@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(rolldown@1.1.5)
+        version: 0.2.3(@babel/core@7.29.7)(@babel/plugin-transform-runtime@7.29.7(@babel/core@7.29.7))(@babel/runtime@7.29.7)(@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(rolldown@1.1.5)
       '@tailwindcss/vite':
-        specifier: ^4.0.0
-        version: 4.3.0(@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))
+        specifier: 4.3.3
+        version: 4.3.3(@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))
       '@tanstack/router-plugin':
         specifier: ^1.161.0
-        version: 1.168.13(@tanstack/react-router@1.170.10(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))
+        version: 1.168.13(@tanstack/react-router@1.170.10(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))
       '@types/babel__core':
         specifier: ^7.20.5
         version: 7.20.5
@@ -705,7 +710,7 @@ importers:
         version: 0.3.0
       '@vitejs/plugin-react':
         specifier: ^6.0.0
-        version: 6.0.2(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7)(@babel/plugin-transform-runtime@7.29.7(@babel/core@7.29.7))(@babel/runtime@7.29.7)(@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(rolldown@1.1.5))(@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(babel-plugin-react-compiler@1.0.0)
+        version: 6.0.2(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7)(@babel/plugin-transform-runtime@7.29.7(@babel/core@7.29.7))(@babel/runtime@7.29.7)(@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(rolldown@1.1.5))(@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(babel-plugin-react-compiler@1.0.0)
       babel-plugin-react-compiler:
         specifier: 1.0.0
         version: 1.0.0
@@ -713,14 +718,14 @@ importers:
         specifier: ^1.8.1
         version: 1.8.1
       tailwindcss:
-        specifier: ^4.0.0
-        version: 4.3.0
+        specifier: 4.3.3
+        version: 4.3.3
       vite:
-        specifier: npm:@voidzero-dev/vite-plus-core@0.2.2
-        version: '@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
+        specifier: npm:@voidzero-dev/vite-plus-core@0.3.0
+        version: '@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
       vite-plus:
         specifier: 'catalog:'
-        version: 0.2.2(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 0.3.0(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   infra/relay:
     dependencies:
@@ -747,7 +752,7 @@ importers:
         version: link:../../packages/shared
       alchemy:
         specifier: 2.0.0-beta.65
-        version: 2.0.0-beta.65(00c448ade6580e73d10ccfe1b32cee97)
+        version: 2.0.0-beta.65(2233d007cbd93ff91712c637e233494f)
       drizzle-orm:
         specifier: 1.0.0-rc.4
         version: 1.0.0-rc.4(@cloudflare/workers-types@4.20260604.1)(@effect/sql-d1@4.0.0-beta.101(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6)))(@effect/sql-pg@4.0.0-beta.103(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6)))(@effect/sql-sqlite-bun@4.0.0-beta.103(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6)))(@libsql/client@0.17.3(bufferutil@4.1.0)(utf-8-validate@6.0.6))(bun-types@1.3.14)(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6))(expo-sqlite@57.0.2(expo@57.0.18)(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.6)(utf-8-validate@6.0.6))(react@19.2.6))(mysql2@3.22.4(@types/node@24.12.4))(pg@8.21.0)(zod@4.4.3)
@@ -771,11 +776,11 @@ importers:
         specifier: 1.0.0-rc.4
         version: 1.0.0-rc.4
       vite:
-        specifier: npm:@voidzero-dev/vite-plus-core@0.2.2
-        version: '@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
+        specifier: npm:@voidzero-dev/vite-plus-core@0.3.0
+        version: '@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
       vite-plus:
         specifier: 'catalog:'
-        version: 0.2.2(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 0.3.0(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   oxlint-plugin-t3code:
     dependencies:
@@ -794,7 +799,7 @@ importers:
         version: 4.0.0-beta.103(patch_hash=a16b1e870d8c29e4a98b17cc4c638a4ff471753d8ca3487f78a22b759caf951b)(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6))
       vite-plus:
         specifier: 'catalog:'
-        version: 0.2.2(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 0.3.0(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/client-runtime:
     dependencies:
@@ -831,7 +836,7 @@ importers:
         version: 2.0.2
       vite-plus:
         specifier: 'catalog:'
-        version: 0.2.2(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 0.3.0(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/contracts:
     dependencies:
@@ -844,7 +849,7 @@ importers:
         version: 4.0.0-beta.103(patch_hash=a16b1e870d8c29e4a98b17cc4c638a4ff471753d8ca3487f78a22b759caf951b)(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6))
       vite-plus:
         specifier: 'catalog:'
-        version: 0.2.2(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 0.3.0(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/effect-acp:
     dependencies:
@@ -866,7 +871,7 @@ importers:
         version: 24.12.4
       vite-plus:
         specifier: 'catalog:'
-        version: 0.2.2(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 0.3.0(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/effect-codex-app-server:
     dependencies:
@@ -888,7 +893,7 @@ importers:
         version: 24.12.4
       vite-plus:
         specifier: 'catalog:'
-        version: 0.2.2(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 0.3.0(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/shared:
     dependencies:
@@ -922,7 +927,7 @@ importers:
         version: 24.12.4
       vite-plus:
         specifier: 'catalog:'
-        version: 0.2.2(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 0.3.0(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/ssh:
     dependencies:
@@ -947,7 +952,7 @@ importers:
         version: 24.12.4
       vite-plus:
         specifier: 'catalog:'
-        version: 0.2.2(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 0.3.0(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/tailscale:
     dependencies:
@@ -966,7 +971,7 @@ importers:
         version: 24.12.4
       vite-plus:
         specifier: 'catalog:'
-        version: 0.2.2(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 0.3.0(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   scripts:
     dependencies:
@@ -1003,7 +1008,7 @@ importers:
         version: 6.0.5
       vite-plus:
         specifier: 'catalog:'
-        version: 0.2.2(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 0.3.0(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
 packages:
 
@@ -1894,38 +1899,38 @@ packages:
     peerDependencies:
       '@bufbuild/protobuf': ^1.10.0
 
-  '@cursor/sdk-darwin-arm64@1.0.26':
-    resolution: {integrity: sha512-PPWtq/8ax4w3/5vh45lMbFpwnXsyvYMl3eR9uW4C2SXScgrtE2V2LfhEU66f1zAt9RKHi2BTTjkuZEnxKJEz+Q==}
+  '@cursor/sdk-darwin-arm64@1.0.30':
+    resolution: {integrity: sha512-O0w2fLd6jxrvAUOJGsKBs8VSi5OojqqEOMFBzHTHS82wU/DX3ZlizK3czzCXxDKs3l8j/BVQwVCxP9jMFcf41Q==}
     cpu: [arm64]
     os: [darwin]
     hasBin: true
 
-  '@cursor/sdk-darwin-x64@1.0.26':
-    resolution: {integrity: sha512-3WJGk1SV0tYTAQY2+PWSzNui6jGp9F7sLUm257EI3bhc7g6h6xCzrLY7wIpD03IEaNdM7emcgVySEN1D0QWsHg==}
+  '@cursor/sdk-darwin-x64@1.0.30':
+    resolution: {integrity: sha512-TdjreV7V6gtSKbUaXDarfE1735PES6uzLgLxp42E5kT6EXpjQhKsifdsYOMdsO/RBw166kya/XxG24L/FUfEHA==}
     cpu: [x64]
     os: [darwin]
     hasBin: true
 
-  '@cursor/sdk-linux-arm64@1.0.26':
-    resolution: {integrity: sha512-DF+zZTn4mszX5q9J3rj9xk7rDu8/JEMfpdDA/UBp3CyaeLo1sPfB/vyoe4GUo1F3I1ZRAgUO8KdBizoHxfBEeQ==}
+  '@cursor/sdk-linux-arm64@1.0.30':
+    resolution: {integrity: sha512-1+bsmri6vJ2YuqL/SQ6QSx/ymu2eBzjGgT1bTgN47tCzxDgNOKacXtghpx4zdHM5AmOtT+aLXVVxXjStXmNtcA==}
     cpu: [arm64]
     os: [linux]
     hasBin: true
 
-  '@cursor/sdk-linux-x64@1.0.26':
-    resolution: {integrity: sha512-NnBvOzgGFXJpKygIdk6XzAcstBSdLjtKZyzLg2jLM0d7KkEDs3br94XsyNAvbVqnWhT18KPwHzrgP62ZEHEFxg==}
+  '@cursor/sdk-linux-x64@1.0.30':
+    resolution: {integrity: sha512-5TRAM1xNwVr0Lox2ay5U5h+VY1OeqJLgnS28da7mx+ZkmeAU+hzuUFq2/lcIqoJrp2qBRdUH5WzI44JNtjBKmg==}
     cpu: [x64]
     os: [linux]
     hasBin: true
 
-  '@cursor/sdk-win32-x64@1.0.26':
-    resolution: {integrity: sha512-C2PyFwmQNJH9qlqYF+Zhpdyh50500cNm2ortmrtzjqgGSFQ+t4WvzMKqSc/UadCT0oNGWFGyiyMnUpO3sLa0nA==}
+  '@cursor/sdk-win32-x64@1.0.30':
+    resolution: {integrity: sha512-kVjpWmLTFLL131TQm3ytz1HbAeyjBRAHMtr6vyLtbBMuLBb0la5igvt58Xi8mXwekymWXim1+rZj7ZYUO3K1rw==}
     cpu: [x64]
     os: [win32]
     hasBin: true
 
-  '@cursor/sdk@1.0.26':
-    resolution: {integrity: sha512-dU3WpJwrxv8yoMjs0DxBgZr5btAJEO+NrvFutl08b6l2+jcuemfFWUlSPBQ2xZAH7zIZun+sqfHvjT5NxW8woQ==}
+  '@cursor/sdk@1.0.30':
+    resolution: {integrity: sha512-s3gIXfTD3w8ys+KFE81JjjoiJcynkHsf/JCDyXrnbliIac3dkT59hwYZII3XhsT1DlXIfqg+YzSMru6w1CkZow==}
     engines: {node: '>=22.13'}
 
   '@distilled.cloud/aws@0.30.2':
@@ -3412,289 +3417,289 @@ packages:
   '@oslojs/encoding@1.1.0':
     resolution: {integrity: sha512-70wQhgYmndg4GCPxPPxPGevRKqTIJ2Nh4OkiMWmDAVYsTQ+Ta7Sq+rPevXyXGdzr30/qZBnyOalCszoMxlyldQ==}
 
-  '@oxc-project/runtime@0.138.0':
-    resolution: {integrity: sha512-yHhoXsN8tYxgdJCdD91PbySNjEEaBX/tH2OQRDXJpsQv5b184oC4/qVbU7qlblvfil/JP15Lh2HW7+HN5DS90Q==}
+  '@oxc-project/runtime@0.146.0':
+    resolution: {integrity: sha512-lbXHIpZ1MmK6zuw5txlMdIZ2waLVUIU5Gnm3sEuwJOiqDfQfbtjeHscatmeBoxbv8+If9LFM6PGh/3DcDWYIYw==}
     engines: {node: ^20.19.0 || >=22.12.0}
 
   '@oxc-project/types@0.127.0':
     resolution: {integrity: sha512-aIYXQBo4lCbO4z0R3FHeucQHpF46l2LbMdxRvqvuRuW2OxdnSkcng5B8+K12spgLDj93rtN3+J2Vac/TIO+ciQ==}
 
-  '@oxc-project/types@0.138.0':
-    resolution: {integrity: sha512-1a7ZKmrRTCoN1XMZ4L0PyyqrMnrNlLyPuOkdSX2MZg7IiIGRUyurNhAm73ptDOraoBcIordsIGKNPKUzy3ZmfA==}
-
   '@oxc-project/types@0.139.0':
     resolution: {integrity: sha512-r9gHphtCs+1M7J0pw6Sn/hh/Wpa/iQrOOkrNAlVLF/gHq+/CJmHIWKKUUhdWjcD6CIa8idarspCsASiXCXvFUw==}
 
-  '@oxfmt/binding-android-arm-eabi@0.57.0':
-    resolution: {integrity: sha512-qVBsEO+KugOsCmUHcO8iqNnqc65p7PCKpCs8M66mPZ+Ri+CWbcpoQOEJBg2OTu03+0qu++NK1jj6IzvQVs0Sig==}
+  '@oxc-project/types@0.146.0':
+    resolution: {integrity: sha512-XC0QsnnhVe7sLIWmYmdPw7x5P0h4W8vUU3Nv1ySgWXtvCz8NizoAEpGXA0sOYoJQV2Rl13LgURAHQ5cI5ILCSA==}
+
+  '@oxfmt/binding-android-arm-eabi@0.64.0':
+    resolution: {integrity: sha512-o6uzh/jTOQeAY5TdkAeXdqv7MBRcPxiRA08zrcBtkKj5cSu/FMu0Hl7Q6Fi1KCKyCWZ6lJVjBzdsJvsKltUsGQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [android]
 
-  '@oxfmt/binding-android-arm64@0.57.0':
-    resolution: {integrity: sha512-mp6PibWbao3aizijcheOeHQaYEhcUAt8pwLniYbtLfHxL/psFF0BykAwCj+s3c6qIpa8yN8keZICWrqtZ70w8g==}
+  '@oxfmt/binding-android-arm64@0.64.0':
+    resolution: {integrity: sha512-jRGSUeeP7p3Gynw2YaCVtjBIA6ZxY6bEB/ES5i54OhqmRTyuVg7ZgstEtzgq6GOAJd+2QZ5pvf+bFfmW5Mp9cw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [android]
 
-  '@oxfmt/binding-darwin-arm64@0.57.0':
-    resolution: {integrity: sha512-T+0stuCBqmUVY+aMIvrgXhzGhHO3sD5tNiiEcYqgSdPsnukskQqn2u5qOVD0sv1l7RLdFS5Z/f5Wi9Ktyjr3Eg==}
+  '@oxfmt/binding-darwin-arm64@0.64.0':
+    resolution: {integrity: sha512-JINwtU2lW7nOFSqi+H2qplipNUqah9Gc1jgGmB82kTD4UnZrZIVxCJ9qEmFiKfjNq27gYLFhrUb0to86aCwMjw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [darwin]
 
-  '@oxfmt/binding-darwin-x64@0.57.0':
-    resolution: {integrity: sha512-O+3JbqWs/mCI2oi4xfhRO2IVPFJNDDEBV8Odo+ZpmsUOeKJfjXoNH7nDmBEQcDgK7NfjDIyE7kRgYSZcTLDO0A==}
+  '@oxfmt/binding-darwin-x64@0.64.0':
+    resolution: {integrity: sha512-gCmuswrgrOSajV4HCRFkVCGIruPq8bjYuPYgSE2WQB3mD6XrdyZ3JMSRZCkQ8zCxOyGWriBo6QoZ5nmMHQ1BfA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [darwin]
 
-  '@oxfmt/binding-freebsd-x64@0.57.0':
-    resolution: {integrity: sha512-pxwhxVC+JkLX9twOQ/8C/vbuOQcMZyKIDmiRDZfO7yITuVcIdZCiLRqqf4QOxb2+8FWrRXzQpm+1DBKcMpHSSQ==}
+  '@oxfmt/binding-freebsd-x64@0.64.0':
+    resolution: {integrity: sha512-Ab8g7a38pT0MMImjh7anRSTve6buWBIlcXIFBYa5xl4s6UxEgKSc2xOOhbGtLwvXnEi2PsEDGoJh3oUU7xkehQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [freebsd]
 
-  '@oxfmt/binding-linux-arm-gnueabihf@0.57.0':
-    resolution: {integrity: sha512-pxBU4zH2imB/MDBfth2rOMeVxXUMjRQLCazagwLARIFH3hVlxZJBlM4nSnHXaIHJK4/qezoFCIORN6AY8Mra4A==}
+  '@oxfmt/binding-linux-arm-gnueabihf@0.64.0':
+    resolution: {integrity: sha512-BgvS3CoQ+Xy2deoZqEN8JVKabcCZi2RxA3yant8G9OAv9KuPJ9TCjHkqigzdHUVwErZxEP5d2bzLIEyKYyBDLg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@oxfmt/binding-linux-arm-musleabihf@0.57.0':
-    resolution: {integrity: sha512-JAprOzt8tycYou36ZgEw14DlRHTiN8qdtKANdV3VZIRIvTI/lh/cX13c9pJ/EnDk2GT3FASH7KvCgQ2AufAifQ==}
+  '@oxfmt/binding-linux-arm-musleabihf@0.64.0':
+    resolution: {integrity: sha512-QXpNxwoMj0YvnceCNZadNSden3bIcnvjn/sDp/rwZhRoZoZYGpHvtPyhGsdJz9uvT9GkaMW7SsLddurU56dt8w==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@oxfmt/binding-linux-arm64-gnu@0.57.0':
-    resolution: {integrity: sha512-ajtjaxSaj9xl4BW7REt+Cef/ttzbAq00Bq4z7JUDZEfgFXdwSjH8K9bF+IcIJzZB9lKqMfQ4eHuSFOvvlvtqOg==}
+  '@oxfmt/binding-linux-arm64-gnu@0.64.0':
+    resolution: {integrity: sha512-BBgH3I1ppDsI5pZ4Pdhw0ceYxwVCfbU/bZEBCeZ6caRS9x0ZabErxubP7riGUn11PXZBhe8DYdjkDKP1FlVQ5w==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@oxfmt/binding-linux-arm64-musl@0.57.0':
-    resolution: {integrity: sha512-p4Y/+RYk9Bk5WO+zHSUXAClRmZ2fbJCejMuCAsU2HhyME4jqf6Ftt/mJYEwIah1wGCBDYOB7wEGV1x5bCEZ6hA==}
+  '@oxfmt/binding-linux-arm64-musl@0.64.0':
+    resolution: {integrity: sha512-v19HSjC/BGXdt26qEvKZtwAHgGmQ2Agcap2kQP+KIqoRZqivVzYth3ui2dJA1i+6/fjpjga85lIOaJJjQ/bOOw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@oxfmt/binding-linux-ppc64-gnu@0.57.0':
-    resolution: {integrity: sha512-By6tRALAZsno0F4zedmtG+wdMvJiJmJoXM4d3+A9zHE4HRXLqXITwRH8mgrlcXc5yJM2g2W3riRPwTYdgemZLQ==}
+  '@oxfmt/binding-linux-ppc64-gnu@0.64.0':
+    resolution: {integrity: sha512-PElLnOo4xFTBZrxPhgTIj0eHqZXwEBQoNWtb7facUV170T0B0FRET0iNbb3LUeLWTybkUW+vsdyv4ihOdyXGyw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
-  '@oxfmt/binding-linux-riscv64-gnu@0.57.0':
-    resolution: {integrity: sha512-skYeG+RgvyzspqVEBsEprL90OYYZfoVNqB3HcCNR6QDJyXKOzfDRT3zncnHmUaFluIlBHuY23mU1b5WGgR98hA==}
+  '@oxfmt/binding-linux-riscv64-gnu@0.64.0':
+    resolution: {integrity: sha512-Qzsg15n4F5CH+MorcRW4MkAEMiLzXmeG+DiDSbP/bBTqCmWOH3K9DHryNrve+JHlV0txS+B6Z9P5Xz+cmWeL+g==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
 
-  '@oxfmt/binding-linux-riscv64-musl@0.57.0':
-    resolution: {integrity: sha512-FFgACrZOXAXUh5KQh2mt1CDOVOZmn+QzHP71wM9QobNwyQvoFfyAeefVUltW83g3sm7LTiH3yfFqLLVUpA5ZFQ==}
+  '@oxfmt/binding-linux-riscv64-musl@0.64.0':
+    resolution: {integrity: sha512-/GZ358wnQ/Ez4UVnCcZIi56JkY0sOdZ+B108pqXKqZz3jLS59F4KEAB1Qv3fRlObrFEk+3L2vUQ/xoPx+3vjXw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
     libc: [musl]
 
-  '@oxfmt/binding-linux-s390x-gnu@0.57.0':
-    resolution: {integrity: sha512-Nm/BAOfQeFiiKd502mZn/GAVKJwtd0RdCg17G3Wz/WSOIQmDi3+7/SZH4BHn1Ye5KvTVH3ua8WvfwLLycNIuvA==}
+  '@oxfmt/binding-linux-s390x-gnu@0.64.0':
+    resolution: {integrity: sha512-/C9We3DXegowfLXtVCYHeNiU9azwCDr5cQkEtCVlc74vyn+lLQSPApJ1CZmxAduqeq/Oi3gQ+IVptyhCaTMtkQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
 
-  '@oxfmt/binding-linux-x64-gnu@0.57.0':
-    resolution: {integrity: sha512-BiSy5Ku3mQqyxS6YIqAJgd403wEUWvI7kerfzPxc2l/txZVmZM0pSj7oDM+4bGBExowxOi7o73jEam1W0EDTZg==}
+  '@oxfmt/binding-linux-x64-gnu@0.64.0':
+    resolution: {integrity: sha512-91KM2CeRWscIEHlj1NsW2WSnzGeq1Ehq+39bfDowTdkn+fcvK/x4Y1RcyqT7glyBjZio0ldkeCG6Usj3v7ASog==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@oxfmt/binding-linux-x64-musl@0.57.0':
-    resolution: {integrity: sha512-BCRkJiotz5s9afLYD2LuMvzAoDYx9H17E/YbDyu4xK7l4zHDPeny9ErSXL//i/nJyaOwRk08x4b8cgJC00+JDg==}
+  '@oxfmt/binding-linux-x64-musl@0.64.0':
+    resolution: {integrity: sha512-gw7uEk9I+7zoT1EYLra1eWArIzNcz8e3jkv+Noo2+o2T7wPvsNSQbfoa4DSfZlvn1i6mJ05RiZ4/omaXPDNhQg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@oxfmt/binding-openharmony-arm64@0.57.0':
-    resolution: {integrity: sha512-4Oaxe1qrGgXfpCJ1C/ERJ2iCtV2rN1R79ga9fsfyVHfSQRu/hVW780u2KDqZWFZ/iGTHODJji0JemxqFZ63eIQ==}
+  '@oxfmt/binding-openharmony-arm64@0.64.0':
+    resolution: {integrity: sha512-HYHFf616FHSPSO07c09mjmXBfQ73wIVM3m0txOiooa5XZkGoxFd6B14PVj0LB0DXIqJ6wAO/dDR/NX/5UUaqnw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [openharmony]
 
-  '@oxfmt/binding-win32-arm64-msvc@0.57.0':
-    resolution: {integrity: sha512-MYLAsDnhdNsSGheLYhWgbk0vfIrlS84iQYun/y21fX6u0jj8iBtYtbpZMdiqYeuf8U12eVPUjVY2xE2NrCfJ0g==}
+  '@oxfmt/binding-win32-arm64-msvc@0.64.0':
+    resolution: {integrity: sha512-uQjFp081IZSWD6VAofX2iO2z01awAdHmfC+NrieWIPKrT2hZKQDyq/U18M7ifC0sm0Wz8aHY/p6+FDYIzs/CrQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [win32]
 
-  '@oxfmt/binding-win32-ia32-msvc@0.57.0':
-    resolution: {integrity: sha512-PBwdzZALJY/jcCx2E6is0yu+cuVXeySTDmwuseD+9j0mHqlRNxwlKgsyRTBed/woPeqfVfuXfWjoq4Cx2Zt3Eg==}
+  '@oxfmt/binding-win32-ia32-msvc@0.64.0':
+    resolution: {integrity: sha512-lNM6byTAQ881jugzFu8juJTbNRgsUTlswMA6pJmwi1XDvmIqnnb49lcUAs5gz94fCJLrVN+/X3s3jOKqx23WIQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ia32]
     os: [win32]
 
-  '@oxfmt/binding-win32-x64-msvc@0.57.0':
-    resolution: {integrity: sha512-bQJdH9i4RRfw55jm7+8/xS7GzHLLTbHx4huhrrDxQJaJtbSDbsyOnODvP1ftT7EG0KFKAYO2S+q6AcioXODx8w==}
+  '@oxfmt/binding-win32-x64-msvc@0.64.0':
+    resolution: {integrity: sha512-BtmbtL/QjMtF1a6C3CqoDluH2IfB6fJt62E+B9RFfUPtFk4Iz9PFS6+y/SzzOvSxc7aUk2Kphwg7Dh8lMbwu6g==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [win32]
 
-  '@oxlint-tsgolint/darwin-arm64@0.24.0':
-    resolution: {integrity: sha512-C2uMmwK5Bc4ri4ysZ6sA8Rcu+A5zBQTp6ml2u0CLLbRZp4kMFPV3yWk8B5DK9Aw7y9bbjogIm75tUwGLFzlsYQ==}
+  '@oxlint-tsgolint/darwin-arm64@7.0.2001':
+    resolution: {integrity: sha512-CUJEdbSZ54+Xy9OXqOhWLTKZKV0BBiV7C2i/ygyVmXtkUNXx5YCzN8DpSSshTAKktoL7S+tnQ/ftFG/i7X896w==}
     cpu: [arm64]
     os: [darwin]
 
-  '@oxlint-tsgolint/darwin-x64@0.24.0':
-    resolution: {integrity: sha512-Wgvt/1lRbDxmoNqWQKKcL+UIiqLmdJ+EWLpQa1qzoNVAfNB0PJpa82/8dH1twT/3rSs4zrP5TXPWl4juB71WuQ==}
+  '@oxlint-tsgolint/darwin-x64@7.0.2001':
+    resolution: {integrity: sha512-pXfBb5BqONCcgrXQNUZWXgiYmRSWJzd97S8i41VVOh6ut0tyo+cJ5FKFpczDHxiVNfj/3e7c9B4MtztNdpIVCw==}
     cpu: [x64]
     os: [darwin]
 
-  '@oxlint-tsgolint/linux-arm64@0.24.0':
-    resolution: {integrity: sha512-PB1rxII7KV83+ASY4sSkXtqvpij6ME66+QCRL49uksi/ofs2Rf/UVboYr095n0Rkbl2wgvlsHGl6DHC361jQUQ==}
+  '@oxlint-tsgolint/linux-arm64@7.0.2001':
+    resolution: {integrity: sha512-roP7zujb/QDPzDwEKsFFpzNHHy91/Y7oX9vQXk78ekyZtcQj1QXDIMH33gjDdHBfRl4K9pZ36xhRgrP4Zr+R8A==}
     cpu: [arm64]
     os: [linux]
 
-  '@oxlint-tsgolint/linux-x64@0.24.0':
-    resolution: {integrity: sha512-xcz3CxKmjTQLREtE/UShh+ruWmm9nAb7UM9zKcD65BStiuYgOakAKkPHl4YS5DztpVcDrE0+HqbOolTlRKYWmw==}
+  '@oxlint-tsgolint/linux-x64@7.0.2001':
+    resolution: {integrity: sha512-UDezNqdECVmngu2TPnjaS1YoAmcTaBoI5lV9vk3VahBxoi+I5r9k3iJTT7qZoYWOXTD/7T7bNcwRgrocR6BscQ==}
     cpu: [x64]
     os: [linux]
 
-  '@oxlint-tsgolint/win32-arm64@0.24.0':
-    resolution: {integrity: sha512-A2i6ZGBec3i20S7RaxkgHc6r3HYtD5Mn7j/mb22NkTz14u0JuudvTu6JggAnbGMcv8+dBKQI//EasxSPJLD8pw==}
+  '@oxlint-tsgolint/win32-arm64@7.0.2001':
+    resolution: {integrity: sha512-uJZhqB6pdXLuN+AD1F5082byyQti/NPmJA77GtcFlmT2HzRelqbNls3SaIqxpjdFgvSBF9g0yOKGBkGFg7kX8Q==}
     cpu: [arm64]
     os: [win32]
 
-  '@oxlint-tsgolint/win32-x64@0.24.0':
-    resolution: {integrity: sha512-0ZbGd9qRB6zs82moekaKdEvncRANq49EAwfNX62JpTS46feXUhKAuoyVDvZMj6Rywejylrmmu79Wo6faYCo4Ew==}
+  '@oxlint-tsgolint/win32-x64@7.0.2001':
+    resolution: {integrity: sha512-FkDRm8hx9OwzGQqyWG1tO5QrTLRApff9DzSgpz9QZau37BR8d1VYKOxMLGf6shPZntJFoTwIIJYT68VndYDCog==}
     cpu: [x64]
     os: [win32]
 
-  '@oxlint/binding-android-arm-eabi@1.72.0':
-    resolution: {integrity: sha512-zhCmvn+1Mj3UchAc/90i99S0t7jJUsHmFVSPg4UWrjO8b8eaSGwscgO6QAUtvHBstkjQwBttQNswEnAF1mIQdA==}
+  '@oxlint/binding-android-arm-eabi@1.79.0':
+    resolution: {integrity: sha512-TebFaaMklO/RXzTv7PucaCq9l3X6D1gA+C8H6K4njtjFOV+zWE9MKLpulcJZN9bzytbUbQIY0mZuz12nQ5Kv4Q==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [android]
 
-  '@oxlint/binding-android-arm64@1.72.0':
-    resolution: {integrity: sha512-mtH+aY/ozv1eZoCUC2owjFAtyNBKHpJHygKeEu9zXXnQGW1Q2/qOpvx+I+Lf23+TvTz66F4iiXUbl2cGvoLPCQ==}
+  '@oxlint/binding-android-arm64@1.79.0':
+    resolution: {integrity: sha512-KqqnOtAVgNsPPF0YSodkFZA1O80jcKoCZCTu3bgsszxA+MrMP9TLzfXitKjEj1FmrPprKDMdRDMmY3weESO9sg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [android]
 
-  '@oxlint/binding-darwin-arm64@1.72.0':
-    resolution: {integrity: sha512-EvnajNPDtfknB3ZieeOOyDTwJn9QXDiwfnF4ZDQqART6RG6hjY4WigQcZdGoK2dkB3e1vrmEzN9aYbQCUkh/gQ==}
+  '@oxlint/binding-darwin-arm64@1.79.0':
+    resolution: {integrity: sha512-BVC2nsMzqQzRDPc5RhixkZ+m1p7iH4bxRRvqkbwDXX0PlQKm1BPy8J8cRjnAFafOq2QzI+BfO3vE8w2GZ3CBag==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [darwin]
 
-  '@oxlint/binding-darwin-x64@1.72.0':
-    resolution: {integrity: sha512-ZkCdEa/G80A7vEHfeCDz/+L3m33DE73v32mDKhgOIgz8Uwf0DFcK7+uu6qC+7LEhmz5fpOe1osWKyjSNMydFIQ==}
+  '@oxlint/binding-darwin-x64@1.79.0':
+    resolution: {integrity: sha512-p6Lm+snmhGuLKL1+CpCV8L6ijkE/qJzK2H2jG9+eKJT0n31RbY4FLsdhexekgP3bLpw4Kgde+9DZuDZQ4yIInA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [darwin]
 
-  '@oxlint/binding-freebsd-x64@1.72.0':
-    resolution: {integrity: sha512-NroXv2vh+sxVY1uya/rM5pjhx1hm8BzlYpx9q67QP0Xhw5MH2bf5GJylpvLEC+781p1Xli/317EoV9AlGwViag==}
+  '@oxlint/binding-freebsd-x64@1.79.0':
+    resolution: {integrity: sha512-qDMm0dXZnoHyRqSL4N4xUq82T4sqK5cbKSjvd/dF/YbMUXc2R1wEPf+vmA5S0qUmi0nwXfNbjXBtZaIqzQLIMg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [freebsd]
 
-  '@oxlint/binding-linux-arm-gnueabihf@1.72.0':
-    resolution: {integrity: sha512-0NDywYgfj279Ou/BcQuCYSj7NJwBfmWn5qc5uGO/Ny7fUWmXyIpvawqX/8acQlWG6IXelJsJhj+JAy6sjsKj0A==}
+  '@oxlint/binding-linux-arm-gnueabihf@1.79.0':
+    resolution: {integrity: sha512-2od7s0nuKPzqyUZAWk9KkCyGg7eI9dwFPZg+20lB15fKFkVZ0c9ZFxqPfiBAyDTlTkh9stPI0t+JlPCqMbItVA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@oxlint/binding-linux-arm-musleabihf@1.72.0':
-    resolution: {integrity: sha512-4vpXB06h65Ezsy4hRyrGjGrfa1SkVPii09yaajiYhmVpgsFiLD+KNxIx/BNAY+XiO+i1yqp9HHdwqM8VTqa5XQ==}
+  '@oxlint/binding-linux-arm-musleabihf@1.79.0':
+    resolution: {integrity: sha512-ZOQUjkzDnvlhSE3+tWC3YXx94MMl+sYMlwH+u1+YGApGHOJP/YAc8ZBRFOXZ6eOBmxtXAWuS/fBcdZr8qqNO1A==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@oxlint/binding-linux-arm64-gnu@1.72.0':
-    resolution: {integrity: sha512-immaN4g2ZGFiOkKrvRX9LvzZdd2GkQM5wR+UyzYyUuyhUTXGQ4HKUJH18xp4G8OfhCVaVAJfKZxwE1r8+4hhaQ==}
+  '@oxlint/binding-linux-arm64-gnu@1.79.0':
+    resolution: {integrity: sha512-lu158FR4nGqGeRS3BQvtG85wRgU/Fy4MD5Cxp1hzJXizGiLo6u2742wJSCDKh8cFcZntvX7fcxlq4mMmfryH1g==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@oxlint/binding-linux-arm64-musl@1.72.0':
-    resolution: {integrity: sha512-JGHS9Mnr7iWyyLDxgCv1MhzVpAckgptg00F2gnxt/GD7lQ2SW1BRcxHqhSTaSdDpjWRrBkBxMMh4+Hn3aVtExg==}
+  '@oxlint/binding-linux-arm64-musl@1.79.0':
+    resolution: {integrity: sha512-mbpKQeE2aflTjddaHK7MP8KP/OFbUM++lt5M635ENM8IyIdK0jm2t9pb+2v9mVVIvhF6TqA4l7F79Pll1mi+uw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@oxlint/binding-linux-ppc64-gnu@1.72.0':
-    resolution: {integrity: sha512-AOYgBZqxNshrg83P9v0RYv+m8s10Cqkj4/PxXFDhcS3k7FqsIG5+CxErshZCIN7G8iy4Y+VGfAsuEdar8AcbBg==}
+  '@oxlint/binding-linux-ppc64-gnu@1.79.0':
+    resolution: {integrity: sha512-WpGNua7gaxaHnpSDeog2ji8IDHn/QLPl9LPzwkR/FvVv58vT5BcXjRXnU+wbu3N75cpeha8CdC7ho/U2OIsB4g==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
-  '@oxlint/binding-linux-riscv64-gnu@1.72.0':
-    resolution: {integrity: sha512-QMybPS5ij3/vrKG67mqzHwW++91sYxK/PPUVi6SBtNCEzW4niS52fVBdXbQ6nou0wWbUPEpx8Sl/ZjtgE3clXA==}
+  '@oxlint/binding-linux-riscv64-gnu@1.79.0':
+    resolution: {integrity: sha512-tK1E93A5LVzISg4ngpKJnfTs7EqtIUceGI7MQ4GyDjJiLi8wPCkEyKlj2xkyKWZ1yzkDJyLHTBJ5/iFWRdnJvg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
 
-  '@oxlint/binding-linux-riscv64-musl@1.72.0':
-    resolution: {integrity: sha512-gOc3W7JV0PXRpIL7stUlLe3Wa9Gp0Kdlup87IT3gHDvPKck2xNgMIl/Gs2lldYY2lyXZDC4rWi3hmoLUobkgbQ==}
+  '@oxlint/binding-linux-riscv64-musl@1.79.0':
+    resolution: {integrity: sha512-qhQvUIrngXivA2A9pQ+xPCychztn/5qUv7yS3gDwXv3w7Rag+eTeeXWmRyx+t7XsW5x6LuY/8AsTq36UgFIblg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
     libc: [musl]
 
-  '@oxlint/binding-linux-s390x-gnu@1.72.0':
-    resolution: {integrity: sha512-rpGxph+FjjHcYI5q6uxB3Az+tnfmEnDbSA8+PK9ZE/VzyUAkvBOMeuY7ZQMhu5mpZH7YQDsTdW6Cx4kV/msc6w==}
+  '@oxlint/binding-linux-s390x-gnu@1.79.0':
+    resolution: {integrity: sha512-sv6AaVgU/eE6u+6WFiQVDcPPwTxP6IJMSB9k701W2r/r6Tx465e8vPvVyRxquNH4Vy6KwRNu90mVbxXJN8+5gg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
 
-  '@oxlint/binding-linux-x64-gnu@1.72.0':
-    resolution: {integrity: sha512-WND+uhf/Ko13SLqQMWQUgsZuLvYYEvL0ZKgg0tgGYfLqxG7l8Ju123fHDMJyYSDl5E3bUbpFUuii/OvMreFQzw==}
+  '@oxlint/binding-linux-x64-gnu@1.79.0':
+    resolution: {integrity: sha512-iFZL02deziHslb3jEX9KdqlAkYoo4fGyotchKDzdfK1f5mxlIBeiQeHhvK3iFpuEJSB4ma/qeFn9oxPiwnhUPQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@oxlint/binding-linux-x64-musl@1.72.0':
-    resolution: {integrity: sha512-SrpbrUL70nG9vh6zP4/oKHWgLuHquwsr7MW9XOn0olBVgh10Uqr8qscKhQoBGEn6olK/IUpn5GSKcdQ5AjUhGA==}
+  '@oxlint/binding-linux-x64-musl@1.79.0':
+    resolution: {integrity: sha512-3DtZR2raqObnh7wXZoFYFd0Fw7skBvcb3f7A+/lkEiDuh8hrE6vv9b/62Qxao1a9/OeHLw/FcXlXzgsW9wTRFg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@oxlint/binding-openharmony-arm64@1.72.0':
-    resolution: {integrity: sha512-qkrsEn6NmgFKr7U/QnezQMb+q/vzAy0Dd9Y95gQGQTyjzDLN+HRZMuM5u70iyH4nBLCfKBzhjMsYCehKay2jyg==}
+  '@oxlint/binding-openharmony-arm64@1.79.0':
+    resolution: {integrity: sha512-Oatt4GuA1WJkqzk2ozx4HrWROOi7opV3AKDw/U8qDIqeTqzsjn5K2x3REJMNjU3/KU/Bkq96Zi3CknaiDTaC/Q==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [openharmony]
 
-  '@oxlint/binding-win32-arm64-msvc@1.72.0':
-    resolution: {integrity: sha512-LWR6ZlFZph+KPjXv8opgZsXRDCdrdQe8VL8Cg9zxCoBS73h6znzZpydVgmdnwj8mB9AuSM5jxEgDJDpQkjboeg==}
+  '@oxlint/binding-win32-arm64-msvc@1.79.0':
+    resolution: {integrity: sha512-NAgZr9Qp8nIA9rpo0JEvwiabTF/2UVqBNnupBG9X4kxXcQoScJUTi+qHhvabb9s/thgj5wQ4XcIaJvb+ZMgoKw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [win32]
 
-  '@oxlint/binding-win32-ia32-msvc@1.72.0':
-    resolution: {integrity: sha512-yt6HEh7IsHvtjRWtmeZRX134eaXKHq5Gnqlf1xBJdJl1JtdoRUEJw3nAxpZoUDS860cX/foKbztO441anVBtVQ==}
+  '@oxlint/binding-win32-ia32-msvc@1.79.0':
+    resolution: {integrity: sha512-+KyXjIvcpaXmWW/j9NNY5yWjrIVxaX18VyIheQy3jwc2GSYgpCr7MGI/HxIGQ/shAL5IWEKbhsqoMpAO5Stiog==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ia32]
     os: [win32]
 
-  '@oxlint/binding-win32-x64-msvc@1.72.0':
-    resolution: {integrity: sha512-b2eKFD2hX7tIwmo/cyH6TDq8vzWRZ2qNHrzoGntUTmq0h3zQh/uX3eTSHCwI8OB/ADQfJCRelLItK8BsxuucDA==}
+  '@oxlint/binding-win32-x64-msvc@1.79.0':
+    resolution: {integrity: sha512-mEelcCMMBS57sIXh2veGMNy+pQwuGtcMxHxGIZWQ5Ba9pJ5jCCUFOZB9E2JhBaxGsURe+WGe0zJp4RVre52gpQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [win32]
@@ -3703,6 +3708,10 @@ packages:
     resolution: {integrity: sha512-titLmukUt/h8ho7Svlf0xSBjoy2ccZKrXjpXpZCj+v6V4CJccC2KyP45BLSCMx8YIpifMyiDyUptM4+5sruKbQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
+  '@oxlint/plugins@1.79.0':
+    resolution: {integrity: sha512-S0uyoxakDINJ4DPgqxGlEEvrdSMeQb7Z2lKVjxoY2gwsbZbfg2Xr8Klfeo5ZeraHmmdBCELFUHkSe6KEmBpMvg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
   '@peculiar/asn1-schema@2.8.0':
     resolution: {integrity: sha512-7YT0U/ze0tF2QOBbE15gKZwy5tvgGyLRiRHLzhlbOpf7BT032oBSd0haZqXn5W6l26WLlu3dyxzjM+2638/z2Q==}
 
@@ -4571,142 +4580,69 @@ packages:
   '@tabler/icons@3.44.0':
     resolution: {integrity: sha512-Wn0AOZG9sg0L+bjfMqq4eNhC6pQjIrk94LvvWYNYkY8KH8wC3YILRzQlrnVJc4FUeMxH/AK97QsYCX35H3LndA==}
 
-  '@tailwindcss/node@4.3.0':
-    resolution: {integrity: sha512-aFb4gUhFOgdh9AXo4IzBEOzBkkAxm9VigwDJnMIYv3lcfXCJVesNfbEaBl4BNgVRyid92AmdviqwBUBRKSeY3g==}
-
-  '@tailwindcss/node@4.3.2':
-    resolution: {integrity: sha512-yWP/sqEcBLaD8JuA6zNwxoYKr75qxTioYwlRwekj5Jr/I5GXnoJfjetH/psLUIv74cYTH2lBUEzBkinthoYcBg==}
-
-  '@tailwindcss/oxide-android-arm64@4.3.0':
-    resolution: {integrity: sha512-TJPiq67tKlLuObP6RkwvVGDoxCMBVtDgKkLfa/uyj7/FyxvQwHS+UOnVrXXgbEsfUaMgiVvC4KbJnRr26ho4Ng==}
-    engines: {node: '>= 20'}
-    cpu: [arm64]
-    os: [android]
+  '@tailwindcss/node@4.3.3':
+    resolution: {integrity: sha512-/T8IKEsf9VTU6tLjgC7+sv2mOPtQxzE2jMw7u4Tt40Tx+QSZxpzh95/H6cMKoja9XuW7iMdLJYBB0o9G1CaAgg==}
 
-  '@tailwindcss/oxide-android-arm64@4.3.2':
-    resolution: {integrity: sha512-WHxqIuHpvZ5VtdX6GTl1Ik/Vp2YuN42Et+0CdeaVd/frQ9jAvGmvR8vLT+jk3e8/Q3x8kECB9+R17pgpp2BulA==}
+  '@tailwindcss/oxide-android-arm64@4.3.3':
+    resolution: {integrity: sha512-Y85A2gmPSkl5Ve5qR86GL4HT509cFqQh1aes9p3sSkyTPwt0Pppf3GkwGe4JPACcRYjgJIEhQgM6dBClnr0NYw==}
     engines: {node: '>= 20'}
     cpu: [arm64]
     os: [android]
 
-  '@tailwindcss/oxide-darwin-arm64@4.3.0':
-    resolution: {integrity: sha512-oMN/WZRb+SO37BmUElEgeEWuU8E/HXRkiODxJxLe1UTHVXLrdVSgfaJV7pSlhRGMSOiXLuxTIjfsF3wYvz8cgQ==}
-    engines: {node: '>= 20'}
-    cpu: [arm64]
-    os: [darwin]
-
-  '@tailwindcss/oxide-darwin-arm64@4.3.2':
-    resolution: {integrity: sha512-GZypeUY/IDJW3877KeM+O67vbXr3MBnbtEL4aYhNErv/JWZhye2vGSWWG9tB6iiqR2MqRNkY8IOUy4NdSZV26w==}
+  '@tailwindcss/oxide-darwin-arm64@4.3.3':
+    resolution: {integrity: sha512-BiaWatpBcERQFDlOjRDpIVXuFK5PJez5SA4JMg6VYZdBYU+qKfV/vqjcIs+IYmtitf1xYQZTwXvU/8y4lfZUGw==}
     engines: {node: '>= 20'}
     cpu: [arm64]
     os: [darwin]
 
-  '@tailwindcss/oxide-darwin-x64@4.3.0':
-    resolution: {integrity: sha512-N6CUmu4a6bKVADfw77p+iw6Yd9Q3OBhe0veaDX+QazfuVYlQsHfDgxBrsjQ/IW+zywL8mTrNd0SdJT/zgtvMdA==}
-    engines: {node: '>= 20'}
-    cpu: [x64]
-    os: [darwin]
-
-  '@tailwindcss/oxide-darwin-x64@4.3.2':
-    resolution: {integrity: sha512-UIIzmefR6KO1sDU7MzRqAxC8iBpft/VhkGjTjnhoS6k7Z3rQ9wEgA1ODSiyH/tcSYssulNm4Ci3hOeK1jH7ccQ==}
+  '@tailwindcss/oxide-darwin-x64@4.3.3':
+    resolution: {integrity: sha512-fAeUqfV5ndhxRwai8cXGzdLvul9utWOmeTkv69unv4ZXixjn61Z+p9lCWdwOwA3TYboG3BwdVuN/RDjhBRl0mw==}
     engines: {node: '>= 20'}
     cpu: [x64]
     os: [darwin]
 
-  '@tailwindcss/oxide-freebsd-x64@4.3.0':
-    resolution: {integrity: sha512-zDL5hBkQdH5C6MpqbK3gQAgP80tsMwSI26vjOzjJtNCMUo0lFgOItzHKBIupOZNQxt3ouPH7RPhvNhiTfCe5CQ==}
-    engines: {node: '>= 20'}
-    cpu: [x64]
-    os: [freebsd]
-
-  '@tailwindcss/oxide-freebsd-x64@4.3.2':
-    resolution: {integrity: sha512-GN+uAmcI6DNspnCDwtOAZrTz6oukJnp337qZvxqCGLd3BHBzJpO0ZbTLRvJNdztOeAmTzewewGIMPb0tk2R4WA==}
+  '@tailwindcss/oxide-freebsd-x64@4.3.3':
+    resolution: {integrity: sha512-iyf5bV6+wnAlflVeEy7R25dupxTNECZN5QMI0qNT6eT+EgaGdZcKhGkr5SdoaWiLJ3spLqIY9VCeSGrwmtg4kw==}
     engines: {node: '>= 20'}
     cpu: [x64]
     os: [freebsd]
 
-  '@tailwindcss/oxide-linux-arm-gnueabihf@4.3.0':
-    resolution: {integrity: sha512-R06HdNi7A7OEoMsf6d4tjZ71RCWnZQPHj2mnotSFURjNLdBC+cIgXQ7l81CqeoiQftjf6OOblxXMInMgN2VzMA==}
+  '@tailwindcss/oxide-linux-arm-gnueabihf@4.3.3':
+    resolution: {integrity: sha512-aAYUprJAJQWWbRrPvtjdroZ56Md+JM8pMiopS6xGEwDfLhqj+2ver2p4nU4Mb3CRqcMmNBjo8KkUgcxhkzVQGQ==}
     engines: {node: '>= 20'}
     cpu: [arm]
     os: [linux]
 
-  '@tailwindcss/oxide-linux-arm-gnueabihf@4.3.2':
-    resolution: {integrity: sha512-4ABn7qSbdHRwTiDiuWNegCyb5+2FJ4vKIKc3DmKrvAFw7MU1Lm11dIkTPwUaFdTzc7IsOpDbqBrlh0x6y36U/w==}
-    engines: {node: '>= 20'}
-    cpu: [arm]
-    os: [linux]
-
-  '@tailwindcss/oxide-linux-arm64-gnu@4.3.0':
-    resolution: {integrity: sha512-qTJHELX8jetjhRQHCLilkVLmybpzNQAtaI/gaoVoidn/ufbNDbAo8KlK2J+yPoc8wQxvDxCmh/5lr8nC1+lTbg==}
-    engines: {node: '>= 20'}
-    cpu: [arm64]
-    os: [linux]
-    libc: [glibc]
-
-  '@tailwindcss/oxide-linux-arm64-gnu@4.3.2':
-    resolution: {integrity: sha512-wDgEIGwoM8w8pufh9LVt1PahDgNdKXrLC2qfAnV3vAmococ9RWbxeAw4pxPttd/TsJfwjyLf90Dg1y9y8I6Emw==}
+  '@tailwindcss/oxide-linux-arm64-gnu@4.3.3':
+    resolution: {integrity: sha512-nDxldcEENOxZRzC2uu9jrutZdAAQtb+8WWDCSnWL1zvBk1+FN+x6MtDViPB5AJMfttVCUhehGWus3XBPgatM/w==}
     engines: {node: '>= 20'}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@tailwindcss/oxide-linux-arm64-musl@4.3.0':
-    resolution: {integrity: sha512-Z6sukiQsngnWO+l39X4pPbiWT81IC+PLKF+PHxIlyZbGNb9MODfYlXEVlFvej5BOZInWX01kVyzeLvHsXhfczQ==}
-    engines: {node: '>= 20'}
-    cpu: [arm64]
-    os: [linux]
-    libc: [musl]
-
-  '@tailwindcss/oxide-linux-arm64-musl@4.3.2':
-    resolution: {integrity: sha512-J5Nuk0uZQIiMTJj3LEx4sAA9tMFUoXQZFv1J6An+QGYe53HKRJuFDi0rpq/tuouCZeAbOBY3kQ6g8qeD4TUjtA==}
+  '@tailwindcss/oxide-linux-arm64-musl@4.3.3':
+    resolution: {integrity: sha512-Md44bD6veX/PC5iyF8cDVnw4HBIANZepRZZ7a8DQOvkfo5WUBwcp6iAuCUz23u+4SUkhJlD3eL7hNdW8ezd/kA==}
     engines: {node: '>= 20'}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@tailwindcss/oxide-linux-x64-gnu@4.3.0':
-    resolution: {integrity: sha512-DRNdQRpSGzRGfARVuVkxvM8Q12nh19l4BF/G7zGA1oe+9wcC6saFBHTISrpIcKzhiXtSrlSrluCfvMuledoCTQ==}
+  '@tailwindcss/oxide-linux-x64-gnu@4.3.3':
+    resolution: {integrity: sha512-tx7us1muwOKAKWao2v/GaafFeQboE6aj88vC6ziN2NCGcRm8gWUhwjzg+YdVB1e4boAtdtma4L43onunI6NS4w==}
     engines: {node: '>= 20'}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@tailwindcss/oxide-linux-x64-gnu@4.3.2':
-    resolution: {integrity: sha512-kqCZpSKOBEJO4mz7OqWoofBZeXTAwaVGPj0ErAj7CojmhKpWVWVOnrt9dE8odoIraZq4oj3ausM37kXi+Tow8w==}
-    engines: {node: '>= 20'}
-    cpu: [x64]
-    os: [linux]
-    libc: [glibc]
-
-  '@tailwindcss/oxide-linux-x64-musl@4.3.0':
-    resolution: {integrity: sha512-Z0IADbDo8bh6I7h2IQMx601AdXBLfFpEdUotft86evd/8ZPflZe9COPO8Q1vw+pfLWIUo9zN/JGZvwuAJqduqg==}
-    engines: {node: '>= 20'}
-    cpu: [x64]
-    os: [linux]
-    libc: [musl]
-
-  '@tailwindcss/oxide-linux-x64-musl@4.3.2':
-    resolution: {integrity: sha512-cixpqbh2toJDmkuCRI68nXA8ZxNmdK9Y+9v5h3MC3ZQKy/0BO8AWzlkWyRM7JAFSGBlfig4YVTPsK6MVgqz1uw==}
+  '@tailwindcss/oxide-linux-x64-musl@4.3.3':
+    resolution: {integrity: sha512-SJxX60smvHgasZoBy11dX6YRjXJFovwWBoedhbQPOBzgFWBHGB+TVPWB9BxzR7TTxU8FQZAI2AyiNCMzFm8Img==}
     engines: {node: '>= 20'}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@tailwindcss/oxide-wasm32-wasi@4.3.0':
-    resolution: {integrity: sha512-HNZGOUxEmElksYR7S6sC5jTeNGpobAsy9u7Gu0AskJ8/20FR9GqebUyB+HBcU/ax6BHuiuJi+Oda4B+YX6H1yA==}
-    engines: {node: '>=14.0.0'}
-    cpu: [wasm32]
-    bundledDependencies:
-      - '@napi-rs/wasm-runtime'
-      - '@emnapi/core'
-      - '@emnapi/runtime'
-      - '@tybys/wasm-util'
-      - '@emnapi/wasi-threads'
-      - tslib
-
-  '@tailwindcss/oxide-wasm32-wasi@4.3.2':
-    resolution: {integrity: sha512-4ec2Z/LOmRsAgU23CS4xeJfcJlmRg94A/XrbGRCF1gyU/zdDfRLYDVsS+ynSZCmGNxQ1jQriQOKMQeQxBA3Isw==}
+  '@tailwindcss/oxide-wasm32-wasi@4.3.3':
+    resolution: {integrity: sha512-jx1+rPhY/5Ympkktd656HBWEBLxP7dH06losBLjjf5vgCODXvi9KhtftWcMIwTFIDqBr7cRnQkdLnAG+IOlGvQ==}
     engines: {node: '>=14.0.0'}
     cpu: [wasm32]
     bundledDependencies:
@@ -4717,40 +4653,24 @@ packages:
       - '@emnapi/wasi-threads'
       - tslib
 
-  '@tailwindcss/oxide-win32-arm64-msvc@4.3.0':
-    resolution: {integrity: sha512-Pe+RPVTi1T+qymuuRpcdvwSVZjnll/f7n8gBxMMh3xLTctMDKqpdfGimbMyioqtLhUYZxdJ9wGNhV7MKHvgZsQ==}
+  '@tailwindcss/oxide-win32-arm64-msvc@4.3.3':
+    resolution: {integrity: sha512-3rc292Ca2ceK6Ulcc/bAVnTs/3nDtoPhyEKlgPv+yQJQi/JS/AMJlqzxvlDacL1nekbrcf6bTqp/jV4qgnPxNQ==}
     engines: {node: '>= 20'}
     cpu: [arm64]
     os: [win32]
 
-  '@tailwindcss/oxide-win32-arm64-msvc@4.3.2':
-    resolution: {integrity: sha512-Zyr/M0+XcYZu3bZrUytc7TXvrk0ftWfl8gN2MwekNDzhqhKRUucMPSeOzM0o0wH5AWOU49BsKRrfKxI2atCPMQ==}
-    engines: {node: '>= 20'}
-    cpu: [arm64]
-    os: [win32]
-
-  '@tailwindcss/oxide-win32-x64-msvc@4.3.0':
-    resolution: {integrity: sha512-Mvrf2kXW/yeW/OTezZlCGOirXRcUuLIBx/5Y12BaPM7wJoryG6dfS/NJL8aBPqtTEx/Vm4T4vKzFUcKDT+TKUA==}
-    engines: {node: '>= 20'}
-    cpu: [x64]
-    os: [win32]
-
-  '@tailwindcss/oxide-win32-x64-msvc@4.3.2':
-    resolution: {integrity: sha512-QI9BO7KlNZsp2GuO0jwAAj5jCDABOKXRkCk2XuKTSaNEFSdfzqswYVTtCHBNKHLsqyjFyFkqlDiwkNbTYSssMQ==}
+  '@tailwindcss/oxide-win32-x64-msvc@4.3.3':
+    resolution: {integrity: sha512-yJ0pwIVc/nYeGoV02WtsN8KYyLQv7kyI2wDnkezyJlGGjkd4QLwDGAwl47YpPJeuI0M0ObaXGSPjvWDPeTPggw==}
     engines: {node: '>= 20'}
     cpu: [x64]
     os: [win32]
 
-  '@tailwindcss/oxide@4.3.0':
-    resolution: {integrity: sha512-F7HZGBeN9I0/AuuJS5PwcD8xayx5ri5GhjYUDBEVYUkexyA/giwbDNjRVrxSezE3T250OU2K/wp/ltWx3UOefg==}
+  '@tailwindcss/oxide@4.3.3':
+    resolution: {integrity: sha512-krXjAikiaFSPaK/FkAQT5UTx3VormQaiZ5hBFlJZ9UFQGB/rwg1MZIhHAG9smMQRTdyJxP6Qt5MwMtdyU5FWrA==}
     engines: {node: '>= 20'}
 
-  '@tailwindcss/oxide@4.3.2':
-    resolution: {integrity: sha512-z8ZgnzX8gdNoWLBLqBPoh/sjnxkwvf9ZuWjnO0l0yIzbLa5/9S+eC5QxGZKRobVHIC3/1BoMWjHblqWjcgFgag==}
-    engines: {node: '>= 20'}
-
-  '@tailwindcss/vite@4.3.0':
-    resolution: {integrity: sha512-t6J3OrB5Fc0ExuhohouH0fWUGMYL6PTLhW+E7zIk/pdbnJARZDCwjBznFnkh5ynRnIRSI4YjtTH0t6USjJISrw==}
+  '@tailwindcss/vite@4.3.3':
+    resolution: {integrity: sha512-yYU8cogLeSh/ms2jh8Fj7jaba/EWa7Ja6GoUqYZaraEuCI5YS6ms6ObZgjjedm+jm6XZjdNRWBpPP6Z86oOxcw==}
     peerDependencies:
       vite: ^5.2.0 || ^6 || ^7 || ^8
 
@@ -4767,8 +4687,11 @@ packages:
     resolution: {integrity: sha512-qhCRSFei0hokQr3xYcQXqxsRD/LKlgHCxHXtKHrQoImp4x2Zu6tUOpUGVH4y2qexIrzSu3aibQBNNfC3Eay6Mg==}
     engines: {node: '>=18'}
 
-  '@tanstack/query-core@5.101.4':
-    resolution: {integrity: sha512-gNwcvOJcRbLWPOLG/2OBm+zM+Yv+MKsXKEOWC57USuZDEsI71hEErQsiEGx5wX9rzWWkfwM0fVSPoiIFSsxfiw==}
+  '@tanstack/query-core@5.100.14':
+    resolution: {integrity: sha512-5X41dGpxgeaHISCRW2oYwcSycZeULZzAunaudXT9ov1KOTj9xwt0CH6hbwqP1/z74ZWF7rYFnDpyYH07XFcZew==}
+
+  '@tanstack/query-core@5.102.8':
+    resolution: {integrity: sha512-ZNjkJ33CqvPNec/6lZBnHqLc3EVGPZ9ySLhYahU9TcuRFdmwXewuj0c4hwSWcGHqEUwcSrKeZ+oGcvPBqXcQcg==}
 
   '@tanstack/react-pacer@0.19.4':
     resolution: {integrity: sha512-coj8ULAuR0qFpjAKD44gTgRuZyjxU6Xu+IX5MwwYvr4e61OtZcJshaExoOBKpCGde0Edb12jDnzzj2Im13Qm9Q==}
@@ -4777,8 +4700,8 @@ packages:
       react: '>=16.8'
       react-dom: '>=16.8'
 
-  '@tanstack/react-query@5.101.4':
-    resolution: {integrity: sha512-yRg2pfOCxIs4ZJW3XYYHU/WgtD04FHSnfHlpRT7h7pR77hwkdRG4wxbKe4aq6P0RvXUTBSQpQeadS1SUYUe+KA==}
+  '@tanstack/react-query@5.102.8':
+    resolution: {integrity: sha512-TYBea4OuXWD7MhaSHq069TWbFe7rcwWN6kzT7JF0OKi1K6c1gTv2IzD6A6ExJsCMozdkqBWeuIUZmu4KQg0O5A==}
     peerDependencies:
       react: ^18 || ^19
 
@@ -5082,21 +5005,21 @@ packages:
       babel-plugin-react-compiler:
         optional: true
 
-  '@vitest/browser-preview@4.1.9':
-    resolution: {integrity: sha512-a4/OrkMDb/WUnE4OOB/4FJbK3rYVO7YykqtUgcTKG4p2a0R3XcjPVu7SLRHFBs2+NIYhv5yxp1Lz3dbdGBjIow==}
+  '@vitest/browser-preview@4.1.11':
+    resolution: {integrity: sha512-iPKSE6Ibayey6HFgK1V1/aHgyhx7HSRk1YMi+lnBZGmlIiNV5Uc7xRkD9Su8RDylTxDECK23t7kTHdRKoqSYDQ==}
     peerDependencies:
-      vitest: 4.1.9
+      vitest: 4.1.11
 
-  '@vitest/browser@4.1.9':
-    resolution: {integrity: sha512-j1BKtWmPcqpMhmx/L9EPLgAJpCb0zKfwoWLmqBbxaogCXHjOwHFSEoHCBfnGtx93xKQwilZ26m+UOsHqHMkRNg==}
+  '@vitest/browser@4.1.11':
+    resolution: {integrity: sha512-bwMovvAeuTFOK5kIFevw4VEf+1gVEICv4SYK4k3knJOxl6b1zEWud8mYKD73e1B0odAn174h1MofURy2TPWf3w==}
     peerDependencies:
-      vitest: 4.1.9
+      vitest: 4.1.11
 
-  '@vitest/expect@4.1.9':
-    resolution: {integrity: sha512-vl/rYsUKcBr3SnQn166+XR5ZQcgMx3DQhFWdfli/cWpLnLUmbxZvyrJZotLFUryib+LtArYMSTJ5RbQ57ZqrlA==}
+  '@vitest/expect@4.1.11':
+    resolution: {integrity: sha512-VX2x5vNJXET47KAFzwERI+KRMtTTCSWTfSMKsW7JsUsXV4psq++e3DvZpuTDOpHcxytiDs6p2nhVb2tVDiiUYw==}
 
-  '@vitest/mocker@4.1.9':
-    resolution: {integrity: sha512-EVkXzBjrPGM+cK8/ANWgBrkUCfJfb38/EfTSO8h7pWvKkyPkpWxvR7BkD2MyItMF62C97zAEoqdpUixwR/e+Rw==}
+  '@vitest/mocker@4.1.11':
+    resolution: {integrity: sha512-2XJVD55d1o5AZous5CCGKS74g/riOj9odEt2bQpCVZeblHyHdnMeFl4jl0XjU21stf4mbjUkew2eXQZt65g5CQ==}
     peerDependencies:
       msw: ^2.4.9
       vite: ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -5106,28 +5029,28 @@ packages:
       vite:
         optional: true
 
-  '@vitest/pretty-format@4.1.9':
-    resolution: {integrity: sha512-s0iufns3iIFitdgm+YR7g1whCAaGtXz459VS9/PqyKDEEFgYIhsHOQmXgIgDuYCt7DeQmiZT0Qe2OA2p4ZPu5A==}
+  '@vitest/pretty-format@4.1.11':
+    resolution: {integrity: sha512-yiZzPbGTS9Sr/JpFl8zHrcIkAofNbFV6k21vIgQN/cY/oxZeXhJv5sc/MBJ5jFKWmWs+oJHw0UXLZjmf931+Vw==}
 
-  '@vitest/runner@4.1.9':
-    resolution: {integrity: sha512-KXLMDtc7oe70+3mJfGrPUWPesswH+3sTxAMAMl8DG7I8IUQT4XW718dY5ID3vPUcmlu27CcKfY4P3h3I29SLJg==}
+  '@vitest/runner@4.1.11':
+    resolution: {integrity: sha512-LztvUgdwMNJMIkj3hQnnxiC2Xy1zNxq928W/xhjCLaNCzqTZOudjwbQf6v9IntZGPw132i2Lq2rgTRZHD3JHNw==}
 
-  '@vitest/snapshot@4.1.9':
-    resolution: {integrity: sha512-Jc7RKGNBo8Z28WYIm0Niej4xdSPByRf6mU58VpHQkd6Zh05rlnA+twjbK5HyeIGHxrzsc3mJgS43uM0CZKzaIA==}
+  '@vitest/snapshot@4.1.11':
+    resolution: {integrity: sha512-pN7ikn1ON7h8ee4gIAp4AzyK+zBtJPzVbqOgu5LCEh4VaJVbPQcgYQYJIMGQPXVeJJq1fnfazis7a5pFNPahog==}
 
-  '@vitest/spy@4.1.9':
-    resolution: {integrity: sha512-fHpsS6mIi+PiEW+vcRVOMkX1oSaPKne3VOclSFICPcGOmfKgXPU5iAah+wcNcj2xPrCCmfq99IDGf+EojhhvhA==}
+  '@vitest/spy@4.1.11':
+    resolution: {integrity: sha512-apNa/prQy2qCeywhnixOHPRCgGNhvg7T4Dapfl1GahLp/R+uhBm5cPyFoNVyqsNd2h1nJxL6BqqdIjiABL60YA==}
 
-  '@vitest/utils@4.1.9':
-    resolution: {integrity: sha512-A51o8ymO5PpqlWNnBP9ZHPXDIpuMtTLlGSjN7la4US+LJzoUMyhwjA5QXlm39JexgwHKW4Xjs8Z2d3dLCXOeuA==}
+  '@vitest/utils@4.1.11':
+    resolution: {integrity: sha512-zTCVGpyFsGWBhllOyKlTw/vnr6D9qxsfSDyfbyZmTyjHw5N/VuvzHpHoQjm2ZJzn4RJgx5w4r7V0er69CmLgPQ==}
 
-  '@voidzero-dev/vite-plus-core@0.2.2':
-    resolution: {integrity: sha512-yAbKexF3npOGjg1N5EtXxun+7vdM/0x6QE5jucO/dv0LFhCAIzSN3UvLVCeamJt/Bz3jt7DLqQHEgXXrjy8drA==}
+  '@voidzero-dev/vite-plus-core@0.3.0':
+    resolution: {integrity: sha512-aOqoqIWaF+Q/geDU48pC2rVFEVSvLV1GGj/NdvhUiBhCZntoFNbwI+hjUeG8BMaPG67sOV6ey+/sgkdmGmKqaw==}
     engines: {node: ^20.19.0 || ^22.18.0 || >=24.11.0}
     peerDependencies:
       '@arethetypeswrong/core': ^0.18.1
       '@types/node': 24.12.4
-      '@vitejs/devtools': ^0.3.0
+      '@vitejs/devtools': ^0.4.0 || ^0.5.0
       esbuild: ^0.27.0 || ^0.28.0
       jiti: '>=1.21.0'
       less: ^4.0.0
@@ -5138,7 +5061,7 @@ packages:
       sugarss: ^5.0.0
       terser: ^5.16.0
       tsx: ^4.8.1
-      typescript: ^5.0.0 || ^6.0.0
+      typescript: ^5.0.0 || ^6.0.0 || ^7.0.0
       unplugin-unused: ^0.5.0
       unrun: '*'
       yaml: ^2.9.0
@@ -5178,54 +5101,54 @@ packages:
       yaml:
         optional: true
 
-  '@voidzero-dev/vite-plus-darwin-arm64@0.2.2':
-    resolution: {integrity: sha512-Wy0Shx3Waa2cQZGSrPm0cpO1Y5oNyKyC1jarv12bBcgV+4uoEBKX+ep2Nh7zwjfd8Ja4QMiePE7wciOSXxu8oQ==}
+  '@voidzero-dev/vite-plus-darwin-arm64@0.3.0':
+    resolution: {integrity: sha512-9ADr1egZ8T4tJOqrpQLhoDl95Y74R95+bsvjmin0gy1C0eQVhpmcNnBfb07KFNhJioJp9MMO7F7Dx4fQL5SKsw==}
     engines: {node: '>=20.0.0'}
     cpu: [arm64]
     os: [darwin]
 
-  '@voidzero-dev/vite-plus-darwin-x64@0.2.2':
-    resolution: {integrity: sha512-09xcW67OvsQItVPzmF8UckI+glM3DzyQO3A98deNQ4QtUF7Mt+4/cYKKcLKg2ExRWWXGNDnVG/j7/hiLjZzynw==}
+  '@voidzero-dev/vite-plus-darwin-x64@0.3.0':
+    resolution: {integrity: sha512-GegasVCwNeDOkNyvhLOuwU1+T2JkjY/Tq+SOvwphUpVcqQ6OOAUq9LlpoXviO2QL/Kq2NbMYjiAfPKVSTLUFQw==}
     engines: {node: '>=20.0.0'}
     cpu: [x64]
     os: [darwin]
 
-  '@voidzero-dev/vite-plus-linux-arm64-gnu@0.2.2':
-    resolution: {integrity: sha512-bR6287UFNwulMiQRhbtXF8GYs9a8EjvefXf+Glm7AzbePUXnamW9cwYIj2j4Dgoje0yC4gA52UePEFjXZnJcjA==}
+  '@voidzero-dev/vite-plus-linux-arm64-gnu@0.3.0':
+    resolution: {integrity: sha512-nYI3KNYXkXjRPsSdR4Lr7J2xMxfR1+TplWlG/dV37qVXWAjbyHpoAlbULjZBAVJMyXRNlcADhBrEwXe4g6s48A==}
     engines: {node: '>=20.0.0'}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@voidzero-dev/vite-plus-linux-arm64-musl@0.2.2':
-    resolution: {integrity: sha512-YGtvTHT7qP4c5pZmM4kLL78/d8hj2NS150R92cR2SVOW/l9Ilq5R5WrEiMA4k5Ea3B++IJWZT5MRFI0tW9qlcg==}
+  '@voidzero-dev/vite-plus-linux-arm64-musl@0.3.0':
+    resolution: {integrity: sha512-HRlVA3AOcuGXmOdHhQ+Zv5XAaKbYF9si5rRHoOsKl0UyBo4txA3OoJfmP0WjanfLUNmu85JyO2dO1ptL4C6wgg==}
     engines: {node: '>=20.0.0'}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@voidzero-dev/vite-plus-linux-x64-gnu@0.2.2':
-    resolution: {integrity: sha512-FvaMI/vsy4PVM+Qd73K+KM8blfCAfaoZaGaGWNrrlMryhyPThXPnHoB1AQcrKbEAWb+z2fc4zLS4sH+8uI65fw==}
+  '@voidzero-dev/vite-plus-linux-x64-gnu@0.3.0':
+    resolution: {integrity: sha512-9A+dFScPfwcrzF/rRR0zH8++2hOf6xtFmN/5LyzyfUywtw9MILXcC72IMcOeL6QRJwKUMsudi1rFeDE59azNvw==}
     engines: {node: '>=20.0.0'}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@voidzero-dev/vite-plus-linux-x64-musl@0.2.2':
-    resolution: {integrity: sha512-ZsMochHqXqxj2sGTJNJzz3vabppbe4BFgZAjJfsnVzkwR7jv6c5p1BM71LFWxP4qd5LL0TJT7lbeRhALlI44RQ==}
+  '@voidzero-dev/vite-plus-linux-x64-musl@0.3.0':
+    resolution: {integrity: sha512-KfIV3qaPdaOOE8JQMRHRE34FtZocl9O86XLTP6JMjDUlcx8FPgf8/fz/HFqJ8g232vM+JsgLI/YTVeXP8LkTKw==}
     engines: {node: '>=20.0.0'}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@voidzero-dev/vite-plus-win32-arm64-msvc@0.2.2':
-    resolution: {integrity: sha512-noBNyJufux0cf18eDpQLOQUZ1Kybfx9zlr+yQ6gAnxMEsQXSvYqZgWymfRDesBE3G/0XB5bg+AUtWijp3TwVcw==}
+  '@voidzero-dev/vite-plus-win32-arm64-msvc@0.3.0':
+    resolution: {integrity: sha512-KRhdy5K13AYx9KBfCVHRrK7zSZU+bMW9CL6gTai+UkJgAmDJi1kjdSNboZOjO8mrzUnTCrELgMI2tnstcxSTuA==}
     engines: {node: '>=20.0.0'}
     cpu: [arm64]
     os: [win32]
 
-  '@voidzero-dev/vite-plus-win32-x64-msvc@0.2.2':
-    resolution: {integrity: sha512-+VUui1OIaFX0tqdUAXjmoKVlujEtWVdcsFDw2Jff+D6b4LUTQaOMAaaic8nNdfZL6wEjweRREQLZi/icZAXtNQ==}
+  '@voidzero-dev/vite-plus-win32-x64-msvc@0.3.0':
+    resolution: {integrity: sha512-7+G+GxGmxdpQO0zjiGnkZFXKGqm0CrVduebRsJd6ccuOuxCQYPxLcoHq4WOaGrh56SrAGS7XjhnQCrXRkzKUVQ==}
     engines: {node: '>=20.0.0'}
     cpu: [x64]
     os: [win32]
@@ -5266,6 +5189,131 @@ packages:
     engines: {node: '>=14.6'}
     deprecated: this version has critical issues, please update to the latest version
 
+  '@yuku-codegen/binding-darwin-arm64@0.5.48':
+    resolution: {integrity: sha512-yo96Oef12WzqnphInfz/eexVse3+kWgfGS5g2S3rFS3dcGn1ENW9xLFDZUP9rh+yP76DOq38wBoFi1+I9+6qBg==}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@yuku-codegen/binding-darwin-x64@0.5.48':
+    resolution: {integrity: sha512-aRCTw0EZC4bVosmw//0OMYP5tGWFE0Cu5yUBFkUbhXx/iBzvORcJ2xPNlOp/vtCCo9Ys4vp8b0DigJV6uOVb2g==}
+    cpu: [x64]
+    os: [darwin]
+
+  '@yuku-codegen/binding-freebsd-x64@0.5.48':
+    resolution: {integrity: sha512-CA0AQAEApDkbw51PdLWMtKPJ41/7rvXsS3SJs+phG7fHJI+MuFzWuLbkucZfZoEOiDscmcsfYIdgL8BsfuyKKQ==}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@yuku-codegen/binding-linux-arm-gnu@0.5.48':
+    resolution: {integrity: sha512-DuSQlk8bH4gpmW3/00P0NLagAcMv8jOxjT40cQmxKRkktr+SUOALCfkT89tdDq3qtY95NR2GXOZ7AjNh7KKqCw==}
+    cpu: [arm]
+    os: [linux]
+    libc: [glibc]
+
+  '@yuku-codegen/binding-linux-arm-musl@0.5.48':
+    resolution: {integrity: sha512-bxj4Ee+wlaJcWJwft2ReJXWw5sfl1qavDz6+dlRdU1xfTEtjPSNiAWhiCHnJR0R4Ygd57DnzSQmAVGvFv6RcGw==}
+    cpu: [arm]
+    os: [linux]
+    libc: [musl]
+
+  '@yuku-codegen/binding-linux-arm64-gnu@0.5.48':
+    resolution: {integrity: sha512-mk5JVWh+0JOe5ue8k17kbYX8uGBoKt3ZqoCyxNh4nYAAcX7+X1tFUiU7jbjctu4vHeejCBFSTdQ021+V31cUCQ==}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@yuku-codegen/binding-linux-arm64-musl@0.5.48':
+    resolution: {integrity: sha512-4q3vkrNghbllyxOm2KesFLxCPKHF7r3JyQ7BWZccY1j2Y05yKoIFhoWCqIuQ2W/dpte9RI0+OVfwyxnrKg6fkA==}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@yuku-codegen/binding-linux-x64-gnu@0.5.48':
+    resolution: {integrity: sha512-csd4M1EVrGaohM8acM6gq1zpUA/Rwe2ulUMBKUcwQXm/k6n7cq1A++qdew78SOVb4do3JH1WE+WFwoGQAcWc1w==}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@yuku-codegen/binding-linux-x64-musl@0.5.48':
+    resolution: {integrity: sha512-KcDuEOT+GFoVKdvAWOv1v9iYjwnmvMZlO+j1Rw+5PYdeFLGWGzv/DD11y4SAAdwXIFcil4T0hibeIaF82WStMg==}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@yuku-codegen/binding-win32-arm64@0.5.48':
+    resolution: {integrity: sha512-HI8qNrI8dWM5BuqIMKsqornRvTNFrE6sm5zToIJ9YIa9zt5+29P7fJ7Nr39EVf6dAWSb6q7JSpScJnRsQ+FgZA==}
+    cpu: [arm64]
+    os: [win32]
+
+  '@yuku-codegen/binding-win32-x64@0.5.48':
+    resolution: {integrity: sha512-X5YWJLO6EfBZpeBqO0AYESnUizbpFDWArcvVD61w0PEWQ3CaFRLnbQXs+kpM4ZZfGMfIE22zfA08QSY67q7TNQ==}
+    cpu: [x64]
+    os: [win32]
+
+  '@yuku-parser/binding-darwin-arm64@0.5.48':
+    resolution: {integrity: sha512-If8mb7HH3vqghJ2NNZ8SuHfhsnjVzOxJpB8xcNOXS5WjYrs2mUhHIh5KOIvK13hDOzh0htGeGK3A6MsiEqE7HQ==}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@yuku-parser/binding-darwin-x64@0.5.48':
+    resolution: {integrity: sha512-EimvPXfspzxf1K11eB6tCW5oiQEXB8g84T2wP1TwzQagdDKo33bkmmVF0B32vTIpXnk/Ifu5IB61izZ1MylljA==}
+    cpu: [x64]
+    os: [darwin]
+
+  '@yuku-parser/binding-freebsd-x64@0.5.48':
+    resolution: {integrity: sha512-0GcUMrumLHheThY9r5Tp46gaZYzn0irWPS1Zba6WY+vVQfhUtzGiWgXxI6tuXX0N32kEaaEVRpkKctvo6Kx3aQ==}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@yuku-parser/binding-linux-arm-gnu@0.5.48':
+    resolution: {integrity: sha512-8S5T5wjCC73dmmpQeZ49aYsSunIUM3D4Fc6rdK96c+Ayg/p3FmeSPF3xuLZHejcTmqJIIvnbfPlUF+rB6DITjQ==}
+    cpu: [arm]
+    os: [linux]
+    libc: [glibc]
+
+  '@yuku-parser/binding-linux-arm-musl@0.5.48':
+    resolution: {integrity: sha512-tTmbxvnUHcK2/crS9547vk2SMmsajH1yqJ8ltXhIuHJgqR1v+d9n9KT+kSayo/5CS76LegeYxhMFjEivBH2hFA==}
+    cpu: [arm]
+    os: [linux]
+    libc: [musl]
+
+  '@yuku-parser/binding-linux-arm64-gnu@0.5.48':
+    resolution: {integrity: sha512-KGYCBMqI2zfwyhgq5tpPVNe7jpUeYTBm8DhjdS+zqWNumde/PEC170QE5RHxcOAlsirIDeIUk0jqx+r/axoFSw==}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@yuku-parser/binding-linux-arm64-musl@0.5.48':
+    resolution: {integrity: sha512-2wTSMsCSXLTc2lZUjMAuU5X4cje55u205WJqfV5NWNF6j9pW/tXyxr15dJeekj8ziLqBXzIsj4DbRh4sY/WcjA==}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@yuku-parser/binding-linux-x64-gnu@0.5.48':
+    resolution: {integrity: sha512-d/6v9UnGglVu1WC2JQyv/5aWSi5fXZeGSlidCfmHp4+N65N1GDKUnFtys5MK5eAPeAjTgSHGGtOc/yCcKTlv3A==}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@yuku-parser/binding-linux-x64-musl@0.5.48':
+    resolution: {integrity: sha512-gX19gw6u4ApPy7SYMPKfFlEkrtj6WlORvrTKK3sBQqjyV+8+mUAkQgxXNjHw4RnOiAmVYg7TOlZcg8d+Qqod9A==}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@yuku-parser/binding-win32-arm64@0.5.48':
+    resolution: {integrity: sha512-w6cQQLbqj3Jcom5Q7ifm103NUOQ9d+Cb4VU5lkrZDjMnwVJ9Hzzg1vCQR7miJuF44vhCXldbme5UryE3giEKlA==}
+    cpu: [arm64]
+    os: [win32]
+
+  '@yuku-parser/binding-win32-x64@0.5.48':
+    resolution: {integrity: sha512-4gO0HmG7fzFxrw1rs0dUdnnaY9YgennjETqDWrTSp7x9fmTUOAoN4VsMfP7YyliQeG1WJJHc55O+rOhmsLppow==}
+    cpu: [x64]
+    os: [win32]
+
+  '@yuku-toolchain/types@0.5.43':
+    resolution: {integrity: sha512-kSpvPntnXw5+lYjO71ffBEnQ5ycQ74KGIYknh0TS4xeyCuBkOqxyJumxZkMhLBBUCLjDAbx2+Icnr3Zh4ftjpQ==}
+
   '@yuuang/ffi-rs-android-arm64@1.3.2':
     resolution: {integrity: sha512-eDYLT0kVBkp7e2BwdRDmt6N1rkeDPUHDefk3ZX0/nok+GLsqfy1WBoSL3Yg7HVXN1EyW8OBVc2uK8Zq8HbmaSA==}
     engines: {node: '>= 12'}
@@ -6467,12 +6515,8 @@ packages:
   end-of-stream@1.4.5:
     resolution: {integrity: sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==}
 
-  enhanced-resolve@5.21.6:
-    resolution: {integrity: sha512-aNnGCvbJ/RIyWo1IuhNdVjnNF+EjH9wpzpNHt+ci/m9He9LJvUN8wrCcXjp9cWsGNAuvSpVFTx/vraAFQ8qGjQ==}
-    engines: {node: '>=10.13.0'}
-
-  enhanced-resolve@5.22.1:
-    resolution: {integrity: sha512-6QEuw3zoX1SJQc7b87aBXke/no+mG2bTBgw29gWMQonLmpEkWoCAVkl+M49e48AZlWzxiDzDZzYdp6kobcyLww==}
+  enhanced-resolve@5.24.5:
+    resolution: {integrity: sha512-L1l8TNvomm6UVW5B253AGxQagSQr+vGwhMlrrfRS2qmhx46AMpMVJKQYLvWYbysTMY8VoicOvzHzoHMbyzB+4A==}
     engines: {node: '>=10.13.0'}
 
   entities@4.5.0:
@@ -7664,146 +7708,78 @@ packages:
   lighthouse-logger@1.4.2:
     resolution: {integrity: sha512-gPWxznF6TKmUHrOQjlVo2UbaL2EJ71mb2CCeRs/2qBpi4L/g4LUVc9+3lKQ6DTUZwJswfM7ainGrLO1+fOqa2g==}
 
-  lightningcss-android-arm64@1.32.0:
-    resolution: {integrity: sha512-YK7/ClTt4kAK0vo6w3X+Pnm0D2cf2vPHbhOXdoNti1Ga0al1P4TBZhwjATvjNwLEBCnKvjJc2jQgHXH0NEwlAg==}
+  lightningcss-android-arm64@1.33.0:
+    resolution: {integrity: sha512-gEpRTalKdosp4Bb8qWtc2iOgE5SeIHlpS1up9bFq2wAyYhl1UdTObYiHe98zEM9SQvSoqQZ1IQD0JNpg3Ml5pg==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [android]
 
-  lightningcss-darwin-arm64@1.30.1:
-    resolution: {integrity: sha512-c8JK7hyE65X1MHMN+Viq9n11RRC7hgin3HhYKhrMyaXflk5GVplZ60IxyoVtzILeKr+xAJwg6zK6sjTBJ0FKYQ==}
+  lightningcss-darwin-arm64@1.33.0:
+    resolution: {integrity: sha512-Sciaz8eenNTKn9b3t7+xr0ipTp9YxKQY4npwQ3mrRuL0BAVHBLyZxofhaKBAVtzmtRZ/zTyo0/to4B1uWG/Djg==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [darwin]
 
-  lightningcss-darwin-arm64@1.32.0:
-    resolution: {integrity: sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ==}
-    engines: {node: '>= 12.0.0'}
-    cpu: [arm64]
-    os: [darwin]
-
-  lightningcss-darwin-x64@1.30.1:
-    resolution: {integrity: sha512-k1EvjakfumAQoTfcXUcHQZhSpLlkAuEkdMBsI/ivWw9hL+7FtilQc0Cy3hrx0AAQrVtQAbMI7YjCgYgvn37PzA==}
+  lightningcss-darwin-x64@1.33.0:
+    resolution: {integrity: sha512-Z5UPAxzrjlWNNyGy6i65cJzzvgJ5D3T6wMvs+gWpY9d7qRhANrxqAp6LhxIgZhWEw18RfJTGcRxjuLIBr+m8XQ==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [darwin]
 
-  lightningcss-darwin-x64@1.32.0:
-    resolution: {integrity: sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w==}
-    engines: {node: '>= 12.0.0'}
-    cpu: [x64]
-    os: [darwin]
-
-  lightningcss-freebsd-x64@1.30.1:
-    resolution: {integrity: sha512-kmW6UGCGg2PcyUE59K5r0kWfKPAVy4SltVeut+umLCFoJ53RdCUWxcRDzO1eTaxf/7Q2H7LTquFHPL5R+Gjyig==}
-    engines: {node: '>= 12.0.0'}
-    cpu: [x64]
-    os: [freebsd]
-
-  lightningcss-freebsd-x64@1.32.0:
-    resolution: {integrity: sha512-JCTigedEksZk3tHTTthnMdVfGf61Fky8Ji2E4YjUTEQX14xiy/lTzXnu1vwiZe3bYe0q+SpsSH/CTeDXK6WHig==}
+  lightningcss-freebsd-x64@1.33.0:
+    resolution: {integrity: sha512-QQM/Ti/hQajJwCY+RiWuCZ9sdtI/XQk7nDK5vC8kkdwixezOlDgvDx7+RT+QjK6FcFT4MpsuoBnHIo/O3StRRg==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [freebsd]
 
-  lightningcss-linux-arm-gnueabihf@1.30.1:
-    resolution: {integrity: sha512-MjxUShl1v8pit+6D/zSPq9S9dQ2NPFSQwGvxBCYaBYLPlCWuPh9/t1MRS8iUaR8i+a6w7aps+B4N0S1TYP/R+Q==}
-    engines: {node: '>= 12.0.0'}
-    cpu: [arm]
-    os: [linux]
-
-  lightningcss-linux-arm-gnueabihf@1.32.0:
-    resolution: {integrity: sha512-x6rnnpRa2GL0zQOkt6rts3YDPzduLpWvwAF6EMhXFVZXD4tPrBkEFqzGowzCsIWsPjqSK+tyNEODUBXeeVHSkw==}
+  lightningcss-linux-arm-gnueabihf@1.33.0:
+    resolution: {integrity: sha512-N7FVBe6iS24MlM6R/4RBTxGhQheZGs7tiQ9U32UtF75NzP5Q7xWPRqLBCKxlRQRk3rY1jCIPLzx7WzOhuUIRLQ==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm]
     os: [linux]
 
-  lightningcss-linux-arm64-gnu@1.30.1:
-    resolution: {integrity: sha512-gB72maP8rmrKsnKYy8XUuXi/4OctJiuQjcuqWNlJQ6jZiWqtPvqFziskH3hnajfvKB27ynbVCucKSm2rkQp4Bw==}
-    engines: {node: '>= 12.0.0'}
-    cpu: [arm64]
-    os: [linux]
-    libc: [glibc]
-
-  lightningcss-linux-arm64-gnu@1.32.0:
-    resolution: {integrity: sha512-0nnMyoyOLRJXfbMOilaSRcLH3Jw5z9HDNGfT/gwCPgaDjnx0i8w7vBzFLFR1f6CMLKF8gVbebmkUN3fa/kQJpQ==}
+  lightningcss-linux-arm64-gnu@1.33.0:
+    resolution: {integrity: sha512-j2v/itmy4HlNxlc6voKXYgBqNi0Ng2LShg4z7GufpEgs05P+2suBVyi9I6YHq5uoVFx9ETin3eCEhLVyXGQnKg==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  lightningcss-linux-arm64-musl@1.30.1:
-    resolution: {integrity: sha512-jmUQVx4331m6LIX+0wUhBbmMX7TCfjF5FoOH6SD1CttzuYlGNVpA7QnrmLxrsub43ClTINfGSYyHe2HWeLl5CQ==}
+  lightningcss-linux-arm64-musl@1.33.0:
+    resolution: {integrity: sha512-yiO5ROMuYQgXbC60yjZU5CYSFZGKXL0HFATXt9mHJn1+zW55oCtMI9NfcVhYLMFDL7gV7oBPon/EmMMGg2OvtQ==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  lightningcss-linux-arm64-musl@1.32.0:
-    resolution: {integrity: sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==}
-    engines: {node: '>= 12.0.0'}
-    cpu: [arm64]
-    os: [linux]
-    libc: [musl]
-
-  lightningcss-linux-x64-gnu@1.30.1:
-    resolution: {integrity: sha512-piWx3z4wN8J8z3+O5kO74+yr6ze/dKmPnI7vLqfSqI8bccaTGY5xiSGVIJBDd5K5BHlvVLpUB3S2YCfelyJ1bw==}
-    engines: {node: '>= 12.0.0'}
-    cpu: [x64]
-    os: [linux]
-    libc: [glibc]
-
-  lightningcss-linux-x64-gnu@1.32.0:
-    resolution: {integrity: sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==}
+  lightningcss-linux-x64-gnu@1.33.0:
+    resolution: {integrity: sha512-ar+Ju7LmcN0Jo4FpL4hpFybwNG9/3A/Br5KW2n2jyODg3MEZXaDYADdemoNS+BDNfMgKvylJLj4S5tyRActuAg==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  lightningcss-linux-x64-musl@1.30.1:
-    resolution: {integrity: sha512-rRomAK7eIkL+tHY0YPxbc5Dra2gXlI63HL+v1Pdi1a3sC+tJTcFrHX+E86sulgAXeI7rSzDYhPSeHHjqFhqfeQ==}
+  lightningcss-linux-x64-musl@1.33.0:
+    resolution: {integrity: sha512-RYiYbkokw0trfKqqzfF55lginwEPrD3OJDfTuJzFs1MK6iFnDenaz1fqLLtX4ITG3OktJQXOeTaw1awrBAlZPw==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  lightningcss-linux-x64-musl@1.32.0:
-    resolution: {integrity: sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==}
-    engines: {node: '>= 12.0.0'}
-    cpu: [x64]
-    os: [linux]
-    libc: [musl]
-
-  lightningcss-win32-arm64-msvc@1.30.1:
-    resolution: {integrity: sha512-mSL4rqPi4iXq5YVqzSsJgMVFENoa4nGTT/GjO2c0Yl9OuQfPsIfncvLrEW6RbbB24WtZ3xP/2CCmI3tNkNV4oA==}
-    engines: {node: '>= 12.0.0'}
-    cpu: [arm64]
-    os: [win32]
-
-  lightningcss-win32-arm64-msvc@1.32.0:
-    resolution: {integrity: sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==}
+  lightningcss-win32-arm64-msvc@1.33.0:
+    resolution: {integrity: sha512-1K+MPfLSFVpphzpdbfkhlWk6wBrTObBzS2T6db10PNOZgR9GoVsAWzwNyuhUYYbTp23j+4RrncfujZ4uAzXvwA==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [win32]
 
-  lightningcss-win32-x64-msvc@1.30.1:
-    resolution: {integrity: sha512-PVqXh48wh4T53F/1CCu8PIPCxLzWyCnn/9T5W1Jpmdy5h9Cwd+0YQS6/LwhHXSafuc61/xg9Lv5OrCby6a++jg==}
-    engines: {node: '>= 12.0.0'}
-    cpu: [x64]
-    os: [win32]
-
-  lightningcss-win32-x64-msvc@1.32.0:
-    resolution: {integrity: sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q==}
+  lightningcss-win32-x64-msvc@1.33.0:
+    resolution: {integrity: sha512-OlEICDx/Xl0FqSp4bry8zFnCvGpig3Gl4gCquvYwHuqJKEC1+n9NgDniFvqHGmMv1ZkqDJrDqKKSykTDX+ehuA==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [win32]
 
-  lightningcss@1.30.1:
-    resolution: {integrity: sha512-xi6IyHML+c9+Q3W0S4fCQJOym42pyurFiJUHEcEyHS0CeKzia4yZDEsLlqOFykxOdHpNy0NmvVO31vcSqAxJCg==}
-    engines: {node: '>= 12.0.0'}
-
-  lightningcss@1.32.0:
-    resolution: {integrity: sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==}
+  lightningcss@1.33.0:
+    resolution: {integrity: sha512-WkUDrojuJs0xkgGf2udWxa3yGBRxPtxUkB79i6aCZLRgc7PM8fZe9TosfPDcvEpQZbuFASnHYmRLBLUbmLOIIA==}
     engines: {node: '>= 12.0.0'}
 
   locate-path@3.0.0:
@@ -8565,8 +8541,8 @@ packages:
   outvariant@1.4.3:
     resolution: {integrity: sha512-+Sl2UErvtsoajRDKCE5/dBz4DIvHXQQnAxtQTF04OJxY0+DyZXSo5P5Bb7XYWOh81syohlYL24hbDwxedPUJCA==}
 
-  oxfmt@0.57.0:
-    resolution: {integrity: sha512-ZB7Bi+rGDSqmVIo9jwcLyFgjxXvQhDdU+jx+ZrVy6VRiVXK2+CHc4hO3J4dUQjHe7V0ymHB+MDuv5z+NhK07HA==}
+  oxfmt@0.64.0:
+    resolution: {integrity: sha512-XZ4GFBN/PLbXKq+0zrgpQfPKYuJlUuj+nzZJY7UpIbFMNyefNLCdN9EwViycNqnYcv0wrn0jXcQLlqJp8RCKBg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
     peerDependencies:
@@ -8578,16 +8554,16 @@ packages:
       vite-plus:
         optional: true
 
-  oxlint-tsgolint@0.24.0:
-    resolution: {integrity: sha512-giCk5sEvG02d5tzPmFMX3hem8ndzEEu1xvGYS5OwNfO2WGl6ZVxt5LjE0yiMDoz94INI7XkXwgFAQiydPvVHDw==}
+  oxlint-tsgolint@7.0.2001:
+    resolution: {integrity: sha512-KjK/XLcXr1DSyonKhsuFqJRiuKqcyG9j3LJ8nkOsrLzGvodBPqzHOKauy10asLMDI0sUpvb+1sxlzff3udZvfg==}
     hasBin: true
 
-  oxlint@1.72.0:
-    resolution: {integrity: sha512-1rhdZIP/EvoI91ABIwNU5Q8+bWf8mjrS5UzIOZld4d4bXxJvtlUhlQvaoTogIGin/qdErMOrwaIJvCSIAKTLhA==}
+  oxlint@1.79.0:
+    resolution: {integrity: sha512-hVJ9hq9m2unPS+Of4eJJgCPdIeCC+3DHEUX3tkmrPJr3OK2hz7PhXwgC+ZP71ZcYu8cCDEtQrqLxWNvxBppBVg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
     peerDependencies:
-      oxlint-tsgolint: '>=0.22.1'
+      oxlint-tsgolint: '>=7.0.2001'
       vite-plus: '*'
     peerDependenciesMeta:
       oxlint-tsgolint:
@@ -9733,11 +9709,8 @@ packages:
   tailwind-merge@3.6.0:
     resolution: {integrity: sha512-uxL7qAVQriqRQPAyK3pj66VqskWqoZ37PW94jwOTwNfq/z9oyu1V+eqrZqtR2+fCiXdYOZe/Modt8GtvqNzu+w==}
 
-  tailwindcss@4.3.0:
-    resolution: {integrity: sha512-y6nxMGB1nMW9R6k96e5gdIFzcfL/gTJRNaqGes1YvkLnPVXzWgbqFF2yLC0T8G774n24cx3Pe8XrKoniCOAH+Q==}
-
-  tailwindcss@4.3.2:
-    resolution: {integrity: sha512-WtctNNSH8A9jlMIqxzuYumOHU5uGZyRv0Q5svQl+oEPy5w84YpBxdb7MdqyiSPQge5jTJ6zFQLq0PFygdccSBA==}
+  tailwindcss@4.3.3:
+    resolution: {integrity: sha512-gOhV3P7ufE62QDGg1zVaTgCR+EtPv92k2nIhVcVKcLmxT1sUBsQGhnZj175j+MqRt4zLF7ic+sCYjfhxMxj7YQ==}
 
   tapable@2.3.3:
     resolution: {integrity: sha512-uxc/zpqFg6x7C8vOE7lh6Lbda8eEL9zmVm/PLeTPBRhh1xCgdWaQ+J1CUieGpIfm2HdtsUpRv+HshiasBMcc6A==}
@@ -10008,7 +9981,7 @@ packages:
       metro-transform-worker: '*'
       react: '>=19.0.0'
       react-native: '>=0.81.0'
-      tailwindcss: '>=4'
+      tailwindcss: 4.3.3
     peerDependenciesMeta:
       '@expo/metro-config':
         optional: true
@@ -10190,13 +10163,13 @@ packages:
   vfile@6.0.3:
     resolution: {integrity: sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==}
 
-  vite-plus@0.2.2:
-    resolution: {integrity: sha512-bXO3O0F2/uxtvX9Ck0o67stTErH/Zh0GEcCMd9pAh22tTHABCNTDPrRMWVo733e7Ux3h0Y7HanJ7neOV/nid4g==}
+  vite-plus@0.3.0:
+    resolution: {integrity: sha512-GNWbWuWD37frCSFrz6MLzUo62bTv5IOJozHEgZYOkxsLkuQtTwm4TowzpfoGrSsfwhAAtfPd/sK1Y0+v1SwhZA==}
     engines: {node: ^20.19.0 || ^22.18.0 || >=24.11.0}
     hasBin: true
     peerDependencies:
-      '@vitest/browser-playwright': 4.1.9
-      '@vitest/browser-webdriverio': 4.1.9
+      '@vitest/browser-playwright': 4.1.11
+      '@vitest/browser-webdriverio': 4.1.11
     peerDependenciesMeta:
       '@vitest/browser-playwright':
         optional: true
@@ -10211,20 +10184,20 @@ packages:
       vite:
         optional: true
 
-  vitest@4.1.9:
-    resolution: {integrity: sha512-nE3/LEyc0z87uHYLZebqCUOaJr2hdtuPp7BQ4BosVFnfltxgAvMG08NyrSGlPpOUWvR27c5flSmYFTNr78L9GQ==}
+  vitest@4.1.11:
+    resolution: {integrity: sha512-fhACrNXUidIbGSBr5FlbuBkO7VWC1ZyLl0DO4CU2DrQoAPxX84Ysxs+HeGQpii5lZWV1Q4gBZTTu49mF+A6Edw==}
     engines: {node: ^20.0.0 || ^22.0.0 || >=24.0.0}
     hasBin: true
     peerDependencies:
       '@edge-runtime/vm': '*'
       '@opentelemetry/api': ^1.9.0
       '@types/node': 24.12.4
-      '@vitest/browser-playwright': 4.1.9
-      '@vitest/browser-preview': 4.1.9
-      '@vitest/browser-webdriverio': 4.1.9
-      '@vitest/coverage-istanbul': 4.1.9
-      '@vitest/coverage-v8': 4.1.9
-      '@vitest/ui': 4.1.9
+      '@vitest/browser-playwright': 4.1.11
+      '@vitest/browser-preview': 4.1.11
+      '@vitest/browser-webdriverio': 4.1.11
+      '@vitest/coverage-istanbul': 4.1.11
+      '@vitest/coverage-v8': 4.1.11
+      '@vitest/ui': 4.1.11
       happy-dom: '*'
       jsdom: '*'
       vite: ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -10546,6 +10519,12 @@ packages:
   yoga-layout@3.2.1:
     resolution: {integrity: sha512-0LPOt3AxKqMdFBZA3HBAt/t/8vIKq7VaQYbuA8WxCgung+p9TVyKRYdpvCb80HcdTN2NkbIKbhNwKUfm3tQywQ==}
 
+  yuku-codegen@0.5.48:
+    resolution: {integrity: sha512-p7HxD5Xl4jzDzqMrGePAOeSHmRY4g58h4HuGq15weQFPxuPWd/W6e7nqp/+Lea6JfpOdBwJOAyXFqIZ/J9Zfnw==}
+
+  yuku-parser@0.5.48:
+    resolution: {integrity: sha512-OWBfhrpgK9+/4+IXG9oT8Bao4AhViQA7vdyNNH7EUg8dQYgwa70XtIBWTpCEme1P1ECyoDNYkn0wT63f8XRcVA==}
+
   zod-to-json-schema@3.25.2:
     resolution: {integrity: sha512-O/PgfnpT1xKSDeQYSCfRI5Gy3hPf91mKVDuYLUHZJMiDFptvP41MSnWofm8dnCm0256ZNfZIM7DSzuSMAFnjHA==}
     peerDependencies:
@@ -11562,7 +11541,7 @@ snapshots:
       '@clerk/shared': 4.30.1(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
       '@stripe/stripe-js': 5.6.0
       '@swc/helpers': 0.5.21
-      '@tanstack/query-core': 5.101.4
+      '@tanstack/query-core': 5.100.14
       '@zxcvbn-ts/core': 3.0.4
       '@zxcvbn-ts/language-common': 3.0.4
       alien-signals: 2.0.6
@@ -11579,7 +11558,7 @@ snapshots:
       '@clerk/shared': 4.30.1(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@stripe/stripe-js': 5.6.0
       '@swc/helpers': 0.5.21
-      '@tanstack/query-core': 5.101.4
+      '@tanstack/query-core': 5.100.14
       '@zxcvbn-ts/core': 3.0.4
       '@zxcvbn-ts/language-common': 3.0.4
       alien-signals: 2.0.6
@@ -11662,7 +11641,7 @@ snapshots:
 
   '@clerk/shared@4.30.1(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
     dependencies:
-      '@tanstack/query-core': 5.101.4
+      '@tanstack/query-core': 5.100.14
       dequal: 2.0.3
       glob-to-regexp: 0.4.1
       js-cookie: 3.0.7
@@ -11672,7 +11651,7 @@ snapshots:
 
   '@clerk/shared@4.30.1(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
-      '@tanstack/query-core': 5.101.4
+      '@tanstack/query-core': 5.100.14
       dequal: 2.0.3
       glob-to-regexp: 0.4.1
       js-cookie: 3.0.7
@@ -11720,22 +11699,22 @@ snapshots:
     dependencies:
       '@bufbuild/protobuf': 1.10.0
 
-  '@cursor/sdk-darwin-arm64@1.0.26':
+  '@cursor/sdk-darwin-arm64@1.0.30':
     optional: true
 
-  '@cursor/sdk-darwin-x64@1.0.26':
+  '@cursor/sdk-darwin-x64@1.0.30':
     optional: true
 
-  '@cursor/sdk-linux-arm64@1.0.26':
+  '@cursor/sdk-linux-arm64@1.0.30':
     optional: true
 
-  '@cursor/sdk-linux-x64@1.0.26':
+  '@cursor/sdk-linux-x64@1.0.30':
     optional: true
 
-  '@cursor/sdk-win32-x64@1.0.26':
+  '@cursor/sdk-win32-x64@1.0.30':
     optional: true
 
-  '@cursor/sdk@1.0.26':
+  '@cursor/sdk@1.0.30':
     dependencies:
       '@bufbuild/protobuf': 1.10.0
       '@connectrpc/connect': 1.7.0(@bufbuild/protobuf@1.10.0)
@@ -11744,11 +11723,11 @@ snapshots:
       '@statsig/js-client': 3.31.0
       zod: 3.25.76
     optionalDependencies:
-      '@cursor/sdk-darwin-arm64': 1.0.26
-      '@cursor/sdk-darwin-x64': 1.0.26
-      '@cursor/sdk-linux-arm64': 1.0.26
-      '@cursor/sdk-linux-x64': 1.0.26
-      '@cursor/sdk-win32-x64': 1.0.26
+      '@cursor/sdk-darwin-arm64': 1.0.30
+      '@cursor/sdk-darwin-x64': 1.0.30
+      '@cursor/sdk-linux-arm64': 1.0.30
+      '@cursor/sdk-linux-x64': 1.0.30
+      '@cursor/sdk-win32-x64': 1.0.30
 
   '@distilled.cloud/aws@0.30.2(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6))':
     dependencies:
@@ -11769,14 +11748,14 @@ snapshots:
       '@distilled.cloud/core': 0.30.2(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6))
       effect: 4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6)
 
-  '@distilled.cloud/cloudflare-rolldown-plugin@0.13.10(@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(rolldown@1.1.5)(workerd@1.20260704.1)':
+  '@distilled.cloud/cloudflare-rolldown-plugin@0.13.10(@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(rolldown@1.1.5)(workerd@1.20260704.1)':
     dependencies:
       '@cloudflare/unenv-preset': 2.16.1(unenv@2.0.0-rc.24)(workerd@1.20260704.1)
       magic-string: 0.30.21
       unenv: 2.0.0-rc.24
     optionalDependencies:
       rolldown: 1.1.5
-      vite: '@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
+      vite: '@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
     transitivePeerDependencies:
       - workerd
 
@@ -11790,13 +11769,13 @@ snapshots:
       '@effect/platform-bun': 4.0.0-beta.103(bufferutil@4.1.0)(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6))(utf-8-validate@6.0.6)
       '@effect/platform-node': 4.0.0-beta.103(bufferutil@4.1.0)(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6))(ioredis@5.11.0)(utf-8-validate@6.0.6)
 
-  '@distilled.cloud/cloudflare-vite-plugin@0.13.10(f97c3167f1a1990dddb83bff73e575e5)':
+  '@distilled.cloud/cloudflare-vite-plugin@0.13.10(86e3ed6000e5955518fd9c0dea8322a9)':
     dependencies:
       '@distilled.cloud/cloudflare': 0.30.2(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6))
-      '@distilled.cloud/cloudflare-rolldown-plugin': 0.13.10(@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(rolldown@1.1.5)(workerd@1.20260704.1)
+      '@distilled.cloud/cloudflare-rolldown-plugin': 0.13.10(@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(rolldown@1.1.5)(workerd@1.20260704.1)
       '@distilled.cloud/cloudflare-runtime': 0.13.10(@distilled.cloud/cloudflare@0.30.2(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6)))(@effect/platform-bun@4.0.0-beta.103(bufferutil@4.1.0)(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6))(utf-8-validate@6.0.6))(@effect/platform-node@4.0.0-beta.103(bufferutil@4.1.0)(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6))(ioredis@5.11.0)(utf-8-validate@6.0.6))(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6))
       effect: 4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6)
-      vite: '@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
+      vite: '@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
     optionalDependencies:
       '@effect/platform-bun': 4.0.0-beta.103(bufferutil@4.1.0)(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6))(utf-8-validate@6.0.6)
       '@effect/platform-node': 4.0.0-beta.103(bufferutil@4.1.0)(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6))(ioredis@5.11.0)(utf-8-validate@6.0.6)
@@ -12629,7 +12608,7 @@ snapshots:
       glob: 13.0.6
       hermes-parser: 0.36.1
       jsc-safe-url: 0.2.4
-      lightningcss: 1.32.0
+      lightningcss: 1.33.0
       picomatch: 4.0.4
       postcss: 8.5.15
       resolve-from: 5.0.0
@@ -13564,149 +13543,151 @@ snapshots:
 
   '@oslojs/encoding@1.1.0': {}
 
-  '@oxc-project/runtime@0.138.0': {}
+  '@oxc-project/runtime@0.146.0': {}
 
   '@oxc-project/types@0.127.0':
     optional: true
 
-  '@oxc-project/types@0.138.0': {}
-
   '@oxc-project/types@0.139.0': {}
 
-  '@oxfmt/binding-android-arm-eabi@0.57.0':
+  '@oxc-project/types@0.146.0': {}
+
+  '@oxfmt/binding-android-arm-eabi@0.64.0':
     optional: true
 
-  '@oxfmt/binding-android-arm64@0.57.0':
+  '@oxfmt/binding-android-arm64@0.64.0':
     optional: true
 
-  '@oxfmt/binding-darwin-arm64@0.57.0':
+  '@oxfmt/binding-darwin-arm64@0.64.0':
     optional: true
 
-  '@oxfmt/binding-darwin-x64@0.57.0':
+  '@oxfmt/binding-darwin-x64@0.64.0':
     optional: true
 
-  '@oxfmt/binding-freebsd-x64@0.57.0':
+  '@oxfmt/binding-freebsd-x64@0.64.0':
     optional: true
 
-  '@oxfmt/binding-linux-arm-gnueabihf@0.57.0':
+  '@oxfmt/binding-linux-arm-gnueabihf@0.64.0':
     optional: true
 
-  '@oxfmt/binding-linux-arm-musleabihf@0.57.0':
+  '@oxfmt/binding-linux-arm-musleabihf@0.64.0':
     optional: true
 
-  '@oxfmt/binding-linux-arm64-gnu@0.57.0':
+  '@oxfmt/binding-linux-arm64-gnu@0.64.0':
     optional: true
 
-  '@oxfmt/binding-linux-arm64-musl@0.57.0':
+  '@oxfmt/binding-linux-arm64-musl@0.64.0':
     optional: true
 
-  '@oxfmt/binding-linux-ppc64-gnu@0.57.0':
+  '@oxfmt/binding-linux-ppc64-gnu@0.64.0':
     optional: true
 
-  '@oxfmt/binding-linux-riscv64-gnu@0.57.0':
+  '@oxfmt/binding-linux-riscv64-gnu@0.64.0':
     optional: true
 
-  '@oxfmt/binding-linux-riscv64-musl@0.57.0':
+  '@oxfmt/binding-linux-riscv64-musl@0.64.0':
     optional: true
 
-  '@oxfmt/binding-linux-s390x-gnu@0.57.0':
+  '@oxfmt/binding-linux-s390x-gnu@0.64.0':
     optional: true
 
-  '@oxfmt/binding-linux-x64-gnu@0.57.0':
+  '@oxfmt/binding-linux-x64-gnu@0.64.0':
     optional: true
 
-  '@oxfmt/binding-linux-x64-musl@0.57.0':
+  '@oxfmt/binding-linux-x64-musl@0.64.0':
     optional: true
 
-  '@oxfmt/binding-openharmony-arm64@0.57.0':
+  '@oxfmt/binding-openharmony-arm64@0.64.0':
     optional: true
 
-  '@oxfmt/binding-win32-arm64-msvc@0.57.0':
+  '@oxfmt/binding-win32-arm64-msvc@0.64.0':
     optional: true
 
-  '@oxfmt/binding-win32-ia32-msvc@0.57.0':
+  '@oxfmt/binding-win32-ia32-msvc@0.64.0':
     optional: true
 
-  '@oxfmt/binding-win32-x64-msvc@0.57.0':
+  '@oxfmt/binding-win32-x64-msvc@0.64.0':
     optional: true
 
-  '@oxlint-tsgolint/darwin-arm64@0.24.0':
+  '@oxlint-tsgolint/darwin-arm64@7.0.2001':
     optional: true
 
-  '@oxlint-tsgolint/darwin-x64@0.24.0':
+  '@oxlint-tsgolint/darwin-x64@7.0.2001':
     optional: true
 
-  '@oxlint-tsgolint/linux-arm64@0.24.0':
+  '@oxlint-tsgolint/linux-arm64@7.0.2001':
     optional: true
 
-  '@oxlint-tsgolint/linux-x64@0.24.0':
+  '@oxlint-tsgolint/linux-x64@7.0.2001':
     optional: true
 
-  '@oxlint-tsgolint/win32-arm64@0.24.0':
+  '@oxlint-tsgolint/win32-arm64@7.0.2001':
     optional: true
 
-  '@oxlint-tsgolint/win32-x64@0.24.0':
+  '@oxlint-tsgolint/win32-x64@7.0.2001':
     optional: true
 
-  '@oxlint/binding-android-arm-eabi@1.72.0':
+  '@oxlint/binding-android-arm-eabi@1.79.0':
     optional: true
 
-  '@oxlint/binding-android-arm64@1.72.0':
+  '@oxlint/binding-android-arm64@1.79.0':
     optional: true
 
-  '@oxlint/binding-darwin-arm64@1.72.0':
+  '@oxlint/binding-darwin-arm64@1.79.0':
     optional: true
 
-  '@oxlint/binding-darwin-x64@1.72.0':
+  '@oxlint/binding-darwin-x64@1.79.0':
     optional: true
 
-  '@oxlint/binding-freebsd-x64@1.72.0':
+  '@oxlint/binding-freebsd-x64@1.79.0':
     optional: true
 
-  '@oxlint/binding-linux-arm-gnueabihf@1.72.0':
+  '@oxlint/binding-linux-arm-gnueabihf@1.79.0':
     optional: true
 
-  '@oxlint/binding-linux-arm-musleabihf@1.72.0':
+  '@oxlint/binding-linux-arm-musleabihf@1.79.0':
     optional: true
 
-  '@oxlint/binding-linux-arm64-gnu@1.72.0':
+  '@oxlint/binding-linux-arm64-gnu@1.79.0':
     optional: true
 
-  '@oxlint/binding-linux-arm64-musl@1.72.0':
+  '@oxlint/binding-linux-arm64-musl@1.79.0':
     optional: true
 
-  '@oxlint/binding-linux-ppc64-gnu@1.72.0':
+  '@oxlint/binding-linux-ppc64-gnu@1.79.0':
     optional: true
 
-  '@oxlint/binding-linux-riscv64-gnu@1.72.0':
+  '@oxlint/binding-linux-riscv64-gnu@1.79.0':
     optional: true
 
-  '@oxlint/binding-linux-riscv64-musl@1.72.0':
+  '@oxlint/binding-linux-riscv64-musl@1.79.0':
     optional: true
 
-  '@oxlint/binding-linux-s390x-gnu@1.72.0':
+  '@oxlint/binding-linux-s390x-gnu@1.79.0':
     optional: true
 
-  '@oxlint/binding-linux-x64-gnu@1.72.0':
+  '@oxlint/binding-linux-x64-gnu@1.79.0':
     optional: true
 
-  '@oxlint/binding-linux-x64-musl@1.72.0':
+  '@oxlint/binding-linux-x64-musl@1.79.0':
     optional: true
 
-  '@oxlint/binding-openharmony-arm64@1.72.0':
+  '@oxlint/binding-openharmony-arm64@1.79.0':
     optional: true
 
-  '@oxlint/binding-win32-arm64-msvc@1.72.0':
+  '@oxlint/binding-win32-arm64-msvc@1.79.0':
     optional: true
 
-  '@oxlint/binding-win32-ia32-msvc@1.72.0':
+  '@oxlint/binding-win32-ia32-msvc@1.79.0':
     optional: true
 
-  '@oxlint/binding-win32-x64-msvc@1.72.0':
+  '@oxlint/binding-win32-x64-msvc@1.79.0':
     optional: true
 
   '@oxlint/plugins@1.68.0': {}
 
+  '@oxlint/plugins@1.79.0': {}
+
   '@peculiar/asn1-schema@2.8.0':
     dependencies:
       '@peculiar/utils': 2.0.3
@@ -14265,7 +14246,7 @@ snapshots:
   '@rolldown/binding-win32-x64-msvc@1.1.5':
     optional: true
 
-  '@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7)(@babel/plugin-transform-runtime@7.29.7(@babel/core@7.29.7))(@babel/runtime@7.29.7)(@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(rolldown@1.1.5)':
+  '@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7)(@babel/plugin-transform-runtime@7.29.7(@babel/core@7.29.7))(@babel/runtime@7.29.7)(@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(rolldown@1.1.5)':
     dependencies:
       '@babel/core': 7.29.7
       picomatch: 4.0.4
@@ -14273,7 +14254,7 @@ snapshots:
     optionalDependencies:
       '@babel/plugin-transform-runtime': 7.29.7(@babel/core@7.29.7)
       '@babel/runtime': 7.29.7
-      vite: '@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
+      vite: '@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
 
   '@rolldown/pluginutils@1.0.0-rc.17':
     optional: true
@@ -14529,134 +14510,73 @@ snapshots:
 
   '@tabler/icons@3.44.0': {}
 
-  '@tailwindcss/node@4.3.0':
-    dependencies:
-      '@jridgewell/remapping': 2.3.5
-      enhanced-resolve: 5.22.1
-      jiti: 2.7.0
-      lightningcss: 1.32.0
-      magic-string: 0.30.21
-      source-map-js: 1.2.1
-      tailwindcss: 4.3.0
-
-  '@tailwindcss/node@4.3.2':
+  '@tailwindcss/node@4.3.3':
     dependencies:
       '@jridgewell/remapping': 2.3.5
-      enhanced-resolve: 5.21.6
+      enhanced-resolve: 5.24.5
       jiti: 2.7.0
-      lightningcss: 1.32.0
+      lightningcss: 1.33.0
       magic-string: 0.30.21
       source-map-js: 1.2.1
-      tailwindcss: 4.3.2
-
-  '@tailwindcss/oxide-android-arm64@4.3.0':
-    optional: true
-
-  '@tailwindcss/oxide-android-arm64@4.3.2':
-    optional: true
-
-  '@tailwindcss/oxide-darwin-arm64@4.3.0':
-    optional: true
+      tailwindcss: 4.3.3
 
-  '@tailwindcss/oxide-darwin-arm64@4.3.2':
+  '@tailwindcss/oxide-android-arm64@4.3.3':
     optional: true
 
-  '@tailwindcss/oxide-darwin-x64@4.3.0':
+  '@tailwindcss/oxide-darwin-arm64@4.3.3':
     optional: true
 
-  '@tailwindcss/oxide-darwin-x64@4.3.2':
+  '@tailwindcss/oxide-darwin-x64@4.3.3':
     optional: true
 
-  '@tailwindcss/oxide-freebsd-x64@4.3.0':
+  '@tailwindcss/oxide-freebsd-x64@4.3.3':
     optional: true
 
-  '@tailwindcss/oxide-freebsd-x64@4.3.2':
+  '@tailwindcss/oxide-linux-arm-gnueabihf@4.3.3':
     optional: true
 
-  '@tailwindcss/oxide-linux-arm-gnueabihf@4.3.0':
+  '@tailwindcss/oxide-linux-arm64-gnu@4.3.3':
     optional: true
 
-  '@tailwindcss/oxide-linux-arm-gnueabihf@4.3.2':
+  '@tailwindcss/oxide-linux-arm64-musl@4.3.3':
     optional: true
 
-  '@tailwindcss/oxide-linux-arm64-gnu@4.3.0':
+  '@tailwindcss/oxide-linux-x64-gnu@4.3.3':
     optional: true
 
-  '@tailwindcss/oxide-linux-arm64-gnu@4.3.2':
+  '@tailwindcss/oxide-linux-x64-musl@4.3.3':
     optional: true
 
-  '@tailwindcss/oxide-linux-arm64-musl@4.3.0':
+  '@tailwindcss/oxide-wasm32-wasi@4.3.3':
     optional: true
 
-  '@tailwindcss/oxide-linux-arm64-musl@4.3.2':
+  '@tailwindcss/oxide-win32-arm64-msvc@4.3.3':
     optional: true
 
-  '@tailwindcss/oxide-linux-x64-gnu@4.3.0':
+  '@tailwindcss/oxide-win32-x64-msvc@4.3.3':
     optional: true
 
-  '@tailwindcss/oxide-linux-x64-gnu@4.3.2':
-    optional: true
-
-  '@tailwindcss/oxide-linux-x64-musl@4.3.0':
-    optional: true
-
-  '@tailwindcss/oxide-linux-x64-musl@4.3.2':
-    optional: true
-
-  '@tailwindcss/oxide-wasm32-wasi@4.3.0':
-    optional: true
-
-  '@tailwindcss/oxide-wasm32-wasi@4.3.2':
-    optional: true
-
-  '@tailwindcss/oxide-win32-arm64-msvc@4.3.0':
-    optional: true
-
-  '@tailwindcss/oxide-win32-arm64-msvc@4.3.2':
-    optional: true
-
-  '@tailwindcss/oxide-win32-x64-msvc@4.3.0':
-    optional: true
-
-  '@tailwindcss/oxide-win32-x64-msvc@4.3.2':
-    optional: true
-
-  '@tailwindcss/oxide@4.3.0':
-    optionalDependencies:
-      '@tailwindcss/oxide-android-arm64': 4.3.0
-      '@tailwindcss/oxide-darwin-arm64': 4.3.0
-      '@tailwindcss/oxide-darwin-x64': 4.3.0
-      '@tailwindcss/oxide-freebsd-x64': 4.3.0
-      '@tailwindcss/oxide-linux-arm-gnueabihf': 4.3.0
-      '@tailwindcss/oxide-linux-arm64-gnu': 4.3.0
-      '@tailwindcss/oxide-linux-arm64-musl': 4.3.0
-      '@tailwindcss/oxide-linux-x64-gnu': 4.3.0
-      '@tailwindcss/oxide-linux-x64-musl': 4.3.0
-      '@tailwindcss/oxide-wasm32-wasi': 4.3.0
-      '@tailwindcss/oxide-win32-arm64-msvc': 4.3.0
-      '@tailwindcss/oxide-win32-x64-msvc': 4.3.0
-
-  '@tailwindcss/oxide@4.3.2':
+  '@tailwindcss/oxide@4.3.3':
     optionalDependencies:
-      '@tailwindcss/oxide-android-arm64': 4.3.2
-      '@tailwindcss/oxide-darwin-arm64': 4.3.2
-      '@tailwindcss/oxide-darwin-x64': 4.3.2
-      '@tailwindcss/oxide-freebsd-x64': 4.3.2
-      '@tailwindcss/oxide-linux-arm-gnueabihf': 4.3.2
-      '@tailwindcss/oxide-linux-arm64-gnu': 4.3.2
-      '@tailwindcss/oxide-linux-arm64-musl': 4.3.2
-      '@tailwindcss/oxide-linux-x64-gnu': 4.3.2
-      '@tailwindcss/oxide-linux-x64-musl': 4.3.2
-      '@tailwindcss/oxide-wasm32-wasi': 4.3.2
-      '@tailwindcss/oxide-win32-arm64-msvc': 4.3.2
-      '@tailwindcss/oxide-win32-x64-msvc': 4.3.2
-
-  '@tailwindcss/vite@4.3.0(@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))':
-    dependencies:
-      '@tailwindcss/node': 4.3.0
-      '@tailwindcss/oxide': 4.3.0
-      tailwindcss: 4.3.0
-      vite: '@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
+      '@tailwindcss/oxide-android-arm64': 4.3.3
+      '@tailwindcss/oxide-darwin-arm64': 4.3.3
+      '@tailwindcss/oxide-darwin-x64': 4.3.3
+      '@tailwindcss/oxide-freebsd-x64': 4.3.3
+      '@tailwindcss/oxide-linux-arm-gnueabihf': 4.3.3
+      '@tailwindcss/oxide-linux-arm64-gnu': 4.3.3
+      '@tailwindcss/oxide-linux-arm64-musl': 4.3.3
+      '@tailwindcss/oxide-linux-x64-gnu': 4.3.3
+      '@tailwindcss/oxide-linux-x64-musl': 4.3.3
+      '@tailwindcss/oxide-wasm32-wasi': 4.3.3
+      '@tailwindcss/oxide-win32-arm64-msvc': 4.3.3
+      '@tailwindcss/oxide-win32-x64-msvc': 4.3.3
+
+  '@tailwindcss/vite@4.3.3(@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))':
+    dependencies:
+      '@tailwindcss/node': 4.3.3
+      '@tailwindcss/oxide': 4.3.3
+      tailwindcss: 4.3.3
+      vite: '@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
 
   '@tanstack/devtools-event-client@0.4.3': {}
 
@@ -14667,7 +14587,9 @@ snapshots:
       '@tanstack/devtools-event-client': 0.4.3
       '@tanstack/store': 0.8.1
 
-  '@tanstack/query-core@5.101.4': {}
+  '@tanstack/query-core@5.100.14': {}
+
+  '@tanstack/query-core@5.102.8': {}
 
   '@tanstack/react-pacer@0.19.4(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
@@ -14676,9 +14598,9 @@ snapshots:
       react: 19.2.6
       react-dom: 19.2.6(react@19.2.6)
 
-  '@tanstack/react-query@5.101.4(react@19.2.6)':
+  '@tanstack/react-query@5.102.8(react@19.2.6)':
     dependencies:
-      '@tanstack/query-core': 5.101.4
+      '@tanstack/query-core': 5.102.8
       react: 19.2.6
 
   '@tanstack/react-router@1.170.10(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
@@ -14724,7 +14646,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@tanstack/router-plugin@1.168.13(@tanstack/react-router@1.170.10(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))':
+  '@tanstack/router-plugin@1.168.13(@tanstack/react-router@1.170.10(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))':
     dependencies:
       '@babel/core': 7.29.7
       '@babel/plugin-syntax-jsx': 7.29.7(@babel/core@7.29.7)
@@ -14741,7 +14663,7 @@ snapshots:
       zod: 4.4.3
     optionalDependencies:
       '@tanstack/react-router': 1.170.10(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
-      vite: '@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
+      vite: '@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
     transitivePeerDependencies:
       - supports-color
 
@@ -15015,36 +14937,36 @@ snapshots:
     optionalDependencies:
       ajv: 6.15.0
 
-  '@vitejs/plugin-react@6.0.2(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7)(@babel/plugin-transform-runtime@7.29.7(@babel/core@7.29.7))(@babel/runtime@7.29.7)(@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(rolldown@1.1.5))(@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(babel-plugin-react-compiler@1.0.0)':
+  '@vitejs/plugin-react@6.0.2(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7)(@babel/plugin-transform-runtime@7.29.7(@babel/core@7.29.7))(@babel/runtime@7.29.7)(@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(rolldown@1.1.5))(@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(babel-plugin-react-compiler@1.0.0)':
     dependencies:
       '@rolldown/pluginutils': 1.0.1
-      vite: '@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
+      vite: '@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
     optionalDependencies:
-      '@rolldown/plugin-babel': 0.2.3(@babel/core@7.29.7)(@babel/plugin-transform-runtime@7.29.7(@babel/core@7.29.7))(@babel/runtime@7.29.7)(@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(rolldown@1.1.5)
+      '@rolldown/plugin-babel': 0.2.3(@babel/core@7.29.7)(@babel/plugin-transform-runtime@7.29.7(@babel/core@7.29.7))(@babel/runtime@7.29.7)(@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(rolldown@1.1.5)
       babel-plugin-react-compiler: 1.0.0
 
-  '@vitest/browser-preview@4.1.9(@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(bufferutil@4.1.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(utf-8-validate@6.0.6)(vitest@4.1.9)':
+  '@vitest/browser-preview@4.1.11(@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(bufferutil@4.1.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(utf-8-validate@6.0.6)(vitest@4.1.11)':
     dependencies:
       '@testing-library/dom': 10.4.1
       '@testing-library/user-event': 14.6.1(@testing-library/dom@10.4.1)
-      '@vitest/browser': 4.1.9(@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(bufferutil@4.1.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(utf-8-validate@6.0.6)(vitest@4.1.9)
-      vitest: 4.1.9(@types/node@24.12.4)(@vitest/browser-preview@4.1.9)(@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))
+      '@vitest/browser': 4.1.11(@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(bufferutil@4.1.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(utf-8-validate@6.0.6)(vitest@4.1.11)
+      vitest: 4.1.11(@types/node@24.12.4)(@vitest/browser-preview@4.1.11)(@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))
     transitivePeerDependencies:
       - bufferutil
       - msw
       - utf-8-validate
       - vite
 
-  '@vitest/browser@4.1.9(@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(bufferutil@4.1.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(utf-8-validate@6.0.6)(vitest@4.1.9)':
+  '@vitest/browser@4.1.11(@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(bufferutil@4.1.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(utf-8-validate@6.0.6)(vitest@4.1.11)':
     dependencies:
       '@blazediff/core': 1.9.1
-      '@vitest/mocker': 4.1.9(@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))
-      '@vitest/utils': 4.1.9
+      '@vitest/mocker': 4.1.11(@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))
+      '@vitest/utils': 4.1.11
       magic-string: 0.30.21
       pngjs: 7.0.0
       sirv: 3.0.2
       tinyrainbow: 3.1.0
-      vitest: 4.1.9(@types/node@24.12.4)(@vitest/browser-preview@4.1.9)(@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))
+      vitest: 4.1.11(@types/node@24.12.4)(@vitest/browser-preview@4.1.11)(@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))
       ws: 8.21.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)
     transitivePeerDependencies:
       - bufferutil
@@ -15052,56 +14974,66 @@ snapshots:
       - utf-8-validate
       - vite
 
-  '@vitest/expect@4.1.9':
+  '@vitest/expect@4.1.11':
     dependencies:
       '@standard-schema/spec': 1.1.0
       '@types/chai': 5.2.3
-      '@vitest/spy': 4.1.9
-      '@vitest/utils': 4.1.9
+      '@vitest/spy': 4.1.11
+      '@vitest/utils': 4.1.11
       chai: 6.2.2
       tinyrainbow: 3.1.0
 
-  '@vitest/mocker@4.1.9(@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))':
+  '@vitest/mocker@4.1.11(@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))':
     dependencies:
-      '@vitest/spy': 4.1.9
+      '@vitest/spy': 4.1.11
       estree-walker: 3.0.3
       magic-string: 0.30.21
     optionalDependencies:
       msw: 2.12.11(@types/node@24.12.4)(typescript@6.0.3)
-      vite: '@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
+      vite: '@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
 
-  '@vitest/pretty-format@4.1.9':
+  '@vitest/pretty-format@4.1.11':
     dependencies:
       tinyrainbow: 3.1.0
 
-  '@vitest/runner@4.1.9':
+  '@vitest/runner@4.1.11':
     dependencies:
-      '@vitest/utils': 4.1.9
+      '@vitest/utils': 4.1.11
       pathe: 2.0.3
 
-  '@vitest/snapshot@4.1.9':
+  '@vitest/snapshot@4.1.11':
     dependencies:
-      '@vitest/pretty-format': 4.1.9
-      '@vitest/utils': 4.1.9
+      '@vitest/pretty-format': 4.1.11
+      '@vitest/utils': 4.1.11
       magic-string: 0.30.21
       pathe: 2.0.3
 
-  '@vitest/spy@4.1.9': {}
+  '@vitest/spy@4.1.11': {}
 
-  '@vitest/utils@4.1.9':
+  '@vitest/utils@4.1.11':
     dependencies:
-      '@vitest/pretty-format': 4.1.9
+      '@vitest/pretty-format': 4.1.11
       convert-source-map: 2.0.0
       tinyrainbow: 3.1.0
 
-  '@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)':
+  '@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)':
     dependencies:
-      '@oxc-project/runtime': 0.138.0
-      '@oxc-project/types': 0.138.0
-      lightningcss: 1.32.0
+      '@oxc-project/runtime': 0.146.0
+      '@oxc-project/types': 0.146.0
+      lightningcss: 1.33.0
       postcss: 8.5.15
+      yuku-codegen: 0.5.48
+      yuku-parser: 0.5.48
     optionalDependencies:
       '@types/node': 24.12.4
+      '@voidzero-dev/vite-plus-darwin-arm64': 0.3.0
+      '@voidzero-dev/vite-plus-darwin-x64': 0.3.0
+      '@voidzero-dev/vite-plus-linux-arm64-gnu': 0.3.0
+      '@voidzero-dev/vite-plus-linux-arm64-musl': 0.3.0
+      '@voidzero-dev/vite-plus-linux-x64-gnu': 0.3.0
+      '@voidzero-dev/vite-plus-linux-x64-musl': 0.3.0
+      '@voidzero-dev/vite-plus-win32-arm64-msvc': 0.3.0
+      '@voidzero-dev/vite-plus-win32-x64-msvc': 0.3.0
       esbuild: 0.28.1
       fsevents: 2.3.3
       jiti: 2.7.0
@@ -15110,28 +15042,28 @@ snapshots:
       unrun: 0.2.39
       yaml: 2.9.0
 
-  '@voidzero-dev/vite-plus-darwin-arm64@0.2.2':
+  '@voidzero-dev/vite-plus-darwin-arm64@0.3.0':
     optional: true
 
-  '@voidzero-dev/vite-plus-darwin-x64@0.2.2':
+  '@voidzero-dev/vite-plus-darwin-x64@0.3.0':
     optional: true
 
-  '@voidzero-dev/vite-plus-linux-arm64-gnu@0.2.2':
+  '@voidzero-dev/vite-plus-linux-arm64-gnu@0.3.0':
     optional: true
 
-  '@voidzero-dev/vite-plus-linux-arm64-musl@0.2.2':
+  '@voidzero-dev/vite-plus-linux-arm64-musl@0.3.0':
     optional: true
 
-  '@voidzero-dev/vite-plus-linux-x64-gnu@0.2.2':
+  '@voidzero-dev/vite-plus-linux-x64-gnu@0.3.0':
     optional: true
 
-  '@voidzero-dev/vite-plus-linux-x64-musl@0.2.2':
+  '@voidzero-dev/vite-plus-linux-x64-musl@0.3.0':
     optional: true
 
-  '@voidzero-dev/vite-plus-win32-arm64-msvc@0.2.2':
+  '@voidzero-dev/vite-plus-win32-arm64-msvc@0.3.0':
     optional: true
 
-  '@voidzero-dev/vite-plus-win32-x64-msvc@0.2.2':
+  '@voidzero-dev/vite-plus-win32-x64-msvc@0.3.0':
     optional: true
 
   '@volar/kit@2.4.28(typescript@6.0.3)':
@@ -15188,6 +15120,74 @@ snapshots:
 
   '@xmldom/xmldom@0.9.10': {}
 
+  '@yuku-codegen/binding-darwin-arm64@0.5.48':
+    optional: true
+
+  '@yuku-codegen/binding-darwin-x64@0.5.48':
+    optional: true
+
+  '@yuku-codegen/binding-freebsd-x64@0.5.48':
+    optional: true
+
+  '@yuku-codegen/binding-linux-arm-gnu@0.5.48':
+    optional: true
+
+  '@yuku-codegen/binding-linux-arm-musl@0.5.48':
+    optional: true
+
+  '@yuku-codegen/binding-linux-arm64-gnu@0.5.48':
+    optional: true
+
+  '@yuku-codegen/binding-linux-arm64-musl@0.5.48':
+    optional: true
+
+  '@yuku-codegen/binding-linux-x64-gnu@0.5.48':
+    optional: true
+
+  '@yuku-codegen/binding-linux-x64-musl@0.5.48':
+    optional: true
+
+  '@yuku-codegen/binding-win32-arm64@0.5.48':
+    optional: true
+
+  '@yuku-codegen/binding-win32-x64@0.5.48':
+    optional: true
+
+  '@yuku-parser/binding-darwin-arm64@0.5.48':
+    optional: true
+
+  '@yuku-parser/binding-darwin-x64@0.5.48':
+    optional: true
+
+  '@yuku-parser/binding-freebsd-x64@0.5.48':
+    optional: true
+
+  '@yuku-parser/binding-linux-arm-gnu@0.5.48':
+    optional: true
+
+  '@yuku-parser/binding-linux-arm-musl@0.5.48':
+    optional: true
+
+  '@yuku-parser/binding-linux-arm64-gnu@0.5.48':
+    optional: true
+
+  '@yuku-parser/binding-linux-arm64-musl@0.5.48':
+    optional: true
+
+  '@yuku-parser/binding-linux-x64-gnu@0.5.48':
+    optional: true
+
+  '@yuku-parser/binding-linux-x64-musl@0.5.48':
+    optional: true
+
+  '@yuku-parser/binding-win32-arm64@0.5.48':
+    optional: true
+
+  '@yuku-parser/binding-win32-x64@0.5.48':
+    optional: true
+
+  '@yuku-toolchain/types@0.5.43': {}
+
   '@yuuang/ffi-rs-android-arm64@1.3.2':
     optional: true
 
@@ -15290,7 +15290,7 @@ snapshots:
       json-schema-traverse: 1.0.0
       require-from-string: 2.0.2
 
-  alchemy@2.0.0-beta.65(00c448ade6580e73d10ccfe1b32cee97):
+  alchemy@2.0.0-beta.65(2233d007cbd93ff91712c637e233494f):
     dependencies:
       '@alchemy.run/node-utils': 0.0.5
       '@aws-sdk/credential-providers': 3.1062.0
@@ -15298,9 +15298,9 @@ snapshots:
       '@distilled.cloud/aws': 0.30.2(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6))
       '@distilled.cloud/axiom': 0.30.2(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6))
       '@distilled.cloud/cloudflare': 0.30.2(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6))
-      '@distilled.cloud/cloudflare-rolldown-plugin': 0.13.10(@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(rolldown@1.1.5)(workerd@1.20260704.1)
+      '@distilled.cloud/cloudflare-rolldown-plugin': 0.13.10(@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(rolldown@1.1.5)(workerd@1.20260704.1)
       '@distilled.cloud/cloudflare-runtime': 0.13.10(@distilled.cloud/cloudflare@0.30.2(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6)))(@effect/platform-bun@4.0.0-beta.103(bufferutil@4.1.0)(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6))(utf-8-validate@6.0.6))(@effect/platform-node@4.0.0-beta.103(bufferutil@4.1.0)(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6))(ioredis@5.11.0)(utf-8-validate@6.0.6))(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6))
-      '@distilled.cloud/cloudflare-vite-plugin': 0.13.10(f97c3167f1a1990dddb83bff73e575e5)
+      '@distilled.cloud/cloudflare-vite-plugin': 0.13.10(86e3ed6000e5955518fd9c0dea8322a9)
       '@distilled.cloud/core': 0.30.2(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6))
       '@distilled.cloud/neon': 0.30.2(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6))
       '@distilled.cloud/planetscale': 0.30.2(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6))
@@ -15336,7 +15336,7 @@ snapshots:
       '@effect/sql-pg': 4.0.0-beta.103(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6))
       drizzle-kit: 1.0.0-rc.4
       drizzle-orm: 1.0.0-rc.4(@cloudflare/workers-types@4.20260604.1)(@effect/sql-d1@4.0.0-beta.101(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6)))(@effect/sql-pg@4.0.0-beta.103(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6)))(@effect/sql-sqlite-bun@4.0.0-beta.103(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6)))(@libsql/client@0.17.3(bufferutil@4.1.0)(utf-8-validate@6.0.6))(bun-types@1.3.14)(effect@4.0.0-beta.103(patch_hash=af36b7948b6f9c56623074662b51dade5699880c1a7c71245de73e13c3185fb6))(expo-sqlite@57.0.2(expo@57.0.18)(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.6)(utf-8-validate@6.0.6))(react@19.2.6))(mysql2@3.22.4(@types/node@24.12.4))(pg@8.21.0)(zod@4.4.3)
-      vite: '@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
+      vite: '@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
       ws: 8.21.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)
     transitivePeerDependencies:
       - '@mongodb-js/zstd'
@@ -15524,8 +15524,8 @@ snapshots:
       unist-util-visit: 5.1.0
       unstorage: 1.17.5(aws4fetch@1.0.20)(idb-keyval@6.2.1)(ioredis@5.11.0)
       vfile: 6.0.3
-      vite: '@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
-      vitefu: 1.1.3(@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))
+      vite: '@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
+      vitefu: 1.1.3(@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))
       xxhash-wasm: 1.1.0
       yargs-parser: 22.0.0
       zod: 4.4.3
@@ -16440,12 +16440,7 @@ snapshots:
     dependencies:
       once: 1.4.0
 
-  enhanced-resolve@5.21.6:
-    dependencies:
-      graceful-fs: 4.2.11
-      tapable: 2.3.3
-
-  enhanced-resolve@5.22.1:
+  enhanced-resolve@5.24.5:
     dependencies:
       graceful-fs: 4.2.11
       tapable: 2.3.3
@@ -17959,99 +17954,54 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  lightningcss-android-arm64@1.32.0:
-    optional: true
-
-  lightningcss-darwin-arm64@1.30.1:
-    optional: true
-
-  lightningcss-darwin-arm64@1.32.0:
+  lightningcss-android-arm64@1.33.0:
     optional: true
 
-  lightningcss-darwin-x64@1.30.1:
+  lightningcss-darwin-arm64@1.33.0:
     optional: true
 
-  lightningcss-darwin-x64@1.32.0:
+  lightningcss-darwin-x64@1.33.0:
     optional: true
 
-  lightningcss-freebsd-x64@1.30.1:
+  lightningcss-freebsd-x64@1.33.0:
     optional: true
 
-  lightningcss-freebsd-x64@1.32.0:
+  lightningcss-linux-arm-gnueabihf@1.33.0:
     optional: true
 
-  lightningcss-linux-arm-gnueabihf@1.30.1:
+  lightningcss-linux-arm64-gnu@1.33.0:
     optional: true
 
-  lightningcss-linux-arm-gnueabihf@1.32.0:
+  lightningcss-linux-arm64-musl@1.33.0:
     optional: true
 
-  lightningcss-linux-arm64-gnu@1.30.1:
+  lightningcss-linux-x64-gnu@1.33.0:
     optional: true
 
-  lightningcss-linux-arm64-gnu@1.32.0:
+  lightningcss-linux-x64-musl@1.33.0:
     optional: true
 
-  lightningcss-linux-arm64-musl@1.30.1:
+  lightningcss-win32-arm64-msvc@1.33.0:
     optional: true
 
-  lightningcss-linux-arm64-musl@1.32.0:
+  lightningcss-win32-x64-msvc@1.33.0:
     optional: true
 
-  lightningcss-linux-x64-gnu@1.30.1:
-    optional: true
-
-  lightningcss-linux-x64-gnu@1.32.0:
-    optional: true
-
-  lightningcss-linux-x64-musl@1.30.1:
-    optional: true
-
-  lightningcss-linux-x64-musl@1.32.0:
-    optional: true
-
-  lightningcss-win32-arm64-msvc@1.30.1:
-    optional: true
-
-  lightningcss-win32-arm64-msvc@1.32.0:
-    optional: true
-
-  lightningcss-win32-x64-msvc@1.30.1:
-    optional: true
-
-  lightningcss-win32-x64-msvc@1.32.0:
-    optional: true
-
-  lightningcss@1.30.1:
+  lightningcss@1.33.0:
     dependencies:
       detect-libc: 2.1.2
     optionalDependencies:
-      lightningcss-darwin-arm64: 1.30.1
-      lightningcss-darwin-x64: 1.30.1
-      lightningcss-freebsd-x64: 1.30.1
-      lightningcss-linux-arm-gnueabihf: 1.30.1
-      lightningcss-linux-arm64-gnu: 1.30.1
-      lightningcss-linux-arm64-musl: 1.30.1
-      lightningcss-linux-x64-gnu: 1.30.1
-      lightningcss-linux-x64-musl: 1.30.1
-      lightningcss-win32-arm64-msvc: 1.30.1
-      lightningcss-win32-x64-msvc: 1.30.1
-
-  lightningcss@1.32.0:
-    dependencies:
-      detect-libc: 2.1.2
-    optionalDependencies:
-      lightningcss-android-arm64: 1.32.0
-      lightningcss-darwin-arm64: 1.32.0
-      lightningcss-darwin-x64: 1.32.0
-      lightningcss-freebsd-x64: 1.32.0
-      lightningcss-linux-arm-gnueabihf: 1.32.0
-      lightningcss-linux-arm64-gnu: 1.32.0
-      lightningcss-linux-arm64-musl: 1.32.0
-      lightningcss-linux-x64-gnu: 1.32.0
-      lightningcss-linux-x64-musl: 1.32.0
-      lightningcss-win32-arm64-msvc: 1.32.0
-      lightningcss-win32-x64-msvc: 1.32.0
+      lightningcss-android-arm64: 1.33.0
+      lightningcss-darwin-arm64: 1.33.0
+      lightningcss-darwin-x64: 1.33.0
+      lightningcss-freebsd-x64: 1.33.0
+      lightningcss-linux-arm-gnueabihf: 1.33.0
+      lightningcss-linux-arm64-gnu: 1.33.0
+      lightningcss-linux-arm64-musl: 1.33.0
+      lightningcss-linux-x64-gnu: 1.33.0
+      lightningcss-linux-x64-musl: 1.33.0
+      lightningcss-win32-arm64-msvc: 1.33.0
+      lightningcss-win32-x64-msvc: 1.33.0
 
   locate-path@3.0.0:
     dependencies:
@@ -19240,63 +19190,63 @@ snapshots:
   outvariant@1.4.3:
     optional: true
 
-  oxfmt@0.57.0(vite-plus@0.2.2(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)):
+  oxfmt@0.64.0(vite-plus@0.3.0(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)):
     dependencies:
       tinypool: 2.1.0
     optionalDependencies:
-      '@oxfmt/binding-android-arm-eabi': 0.57.0
-      '@oxfmt/binding-android-arm64': 0.57.0
-      '@oxfmt/binding-darwin-arm64': 0.57.0
-      '@oxfmt/binding-darwin-x64': 0.57.0
-      '@oxfmt/binding-freebsd-x64': 0.57.0
-      '@oxfmt/binding-linux-arm-gnueabihf': 0.57.0
-      '@oxfmt/binding-linux-arm-musleabihf': 0.57.0
-      '@oxfmt/binding-linux-arm64-gnu': 0.57.0
-      '@oxfmt/binding-linux-arm64-musl': 0.57.0
-      '@oxfmt/binding-linux-ppc64-gnu': 0.57.0
-      '@oxfmt/binding-linux-riscv64-gnu': 0.57.0
-      '@oxfmt/binding-linux-riscv64-musl': 0.57.0
-      '@oxfmt/binding-linux-s390x-gnu': 0.57.0
-      '@oxfmt/binding-linux-x64-gnu': 0.57.0
-      '@oxfmt/binding-linux-x64-musl': 0.57.0
-      '@oxfmt/binding-openharmony-arm64': 0.57.0
-      '@oxfmt/binding-win32-arm64-msvc': 0.57.0
-      '@oxfmt/binding-win32-ia32-msvc': 0.57.0
-      '@oxfmt/binding-win32-x64-msvc': 0.57.0
-      vite-plus: 0.2.2(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
-
-  oxlint-tsgolint@0.24.0:
+      '@oxfmt/binding-android-arm-eabi': 0.64.0
+      '@oxfmt/binding-android-arm64': 0.64.0
+      '@oxfmt/binding-darwin-arm64': 0.64.0
+      '@oxfmt/binding-darwin-x64': 0.64.0
+      '@oxfmt/binding-freebsd-x64': 0.64.0
+      '@oxfmt/binding-linux-arm-gnueabihf': 0.64.0
+      '@oxfmt/binding-linux-arm-musleabihf': 0.64.0
+      '@oxfmt/binding-linux-arm64-gnu': 0.64.0
+      '@oxfmt/binding-linux-arm64-musl': 0.64.0
+      '@oxfmt/binding-linux-ppc64-gnu': 0.64.0
+      '@oxfmt/binding-linux-riscv64-gnu': 0.64.0
+      '@oxfmt/binding-linux-riscv64-musl': 0.64.0
+      '@oxfmt/binding-linux-s390x-gnu': 0.64.0
+      '@oxfmt/binding-linux-x64-gnu': 0.64.0
+      '@oxfmt/binding-linux-x64-musl': 0.64.0
+      '@oxfmt/binding-openharmony-arm64': 0.64.0
+      '@oxfmt/binding-win32-arm64-msvc': 0.64.0
+      '@oxfmt/binding-win32-ia32-msvc': 0.64.0
+      '@oxfmt/binding-win32-x64-msvc': 0.64.0
+      vite-plus: 0.3.0(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+
+  oxlint-tsgolint@7.0.2001:
     optionalDependencies:
-      '@oxlint-tsgolint/darwin-arm64': 0.24.0
-      '@oxlint-tsgolint/darwin-x64': 0.24.0
-      '@oxlint-tsgolint/linux-arm64': 0.24.0
-      '@oxlint-tsgolint/linux-x64': 0.24.0
-      '@oxlint-tsgolint/win32-arm64': 0.24.0
-      '@oxlint-tsgolint/win32-x64': 0.24.0
-
-  oxlint@1.72.0(oxlint-tsgolint@0.24.0)(vite-plus@0.2.2(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)):
+      '@oxlint-tsgolint/darwin-arm64': 7.0.2001
+      '@oxlint-tsgolint/darwin-x64': 7.0.2001
+      '@oxlint-tsgolint/linux-arm64': 7.0.2001
+      '@oxlint-tsgolint/linux-x64': 7.0.2001
+      '@oxlint-tsgolint/win32-arm64': 7.0.2001
+      '@oxlint-tsgolint/win32-x64': 7.0.2001
+
+  oxlint@1.79.0(oxlint-tsgolint@7.0.2001)(vite-plus@0.3.0(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)):
     optionalDependencies:
-      '@oxlint/binding-android-arm-eabi': 1.72.0
-      '@oxlint/binding-android-arm64': 1.72.0
-      '@oxlint/binding-darwin-arm64': 1.72.0
-      '@oxlint/binding-darwin-x64': 1.72.0
-      '@oxlint/binding-freebsd-x64': 1.72.0
-      '@oxlint/binding-linux-arm-gnueabihf': 1.72.0
-      '@oxlint/binding-linux-arm-musleabihf': 1.72.0
-      '@oxlint/binding-linux-arm64-gnu': 1.72.0
-      '@oxlint/binding-linux-arm64-musl': 1.72.0
-      '@oxlint/binding-linux-ppc64-gnu': 1.72.0
-      '@oxlint/binding-linux-riscv64-gnu': 1.72.0
-      '@oxlint/binding-linux-riscv64-musl': 1.72.0
-      '@oxlint/binding-linux-s390x-gnu': 1.72.0
-      '@oxlint/binding-linux-x64-gnu': 1.72.0
-      '@oxlint/binding-linux-x64-musl': 1.72.0
-      '@oxlint/binding-openharmony-arm64': 1.72.0
-      '@oxlint/binding-win32-arm64-msvc': 1.72.0
-      '@oxlint/binding-win32-ia32-msvc': 1.72.0
-      '@oxlint/binding-win32-x64-msvc': 1.72.0
-      oxlint-tsgolint: 0.24.0
-      vite-plus: 0.2.2(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+      '@oxlint/binding-android-arm-eabi': 1.79.0
+      '@oxlint/binding-android-arm64': 1.79.0
+      '@oxlint/binding-darwin-arm64': 1.79.0
+      '@oxlint/binding-darwin-x64': 1.79.0
+      '@oxlint/binding-freebsd-x64': 1.79.0
+      '@oxlint/binding-linux-arm-gnueabihf': 1.79.0
+      '@oxlint/binding-linux-arm-musleabihf': 1.79.0
+      '@oxlint/binding-linux-arm64-gnu': 1.79.0
+      '@oxlint/binding-linux-arm64-musl': 1.79.0
+      '@oxlint/binding-linux-ppc64-gnu': 1.79.0
+      '@oxlint/binding-linux-riscv64-gnu': 1.79.0
+      '@oxlint/binding-linux-riscv64-musl': 1.79.0
+      '@oxlint/binding-linux-s390x-gnu': 1.79.0
+      '@oxlint/binding-linux-x64-gnu': 1.79.0
+      '@oxlint/binding-linux-x64-musl': 1.79.0
+      '@oxlint/binding-openharmony-arm64': 1.79.0
+      '@oxlint/binding-win32-arm64-msvc': 1.79.0
+      '@oxlint/binding-win32-ia32-msvc': 1.79.0
+      '@oxlint/binding-win32-x64-msvc': 1.79.0
+      oxlint-tsgolint: 7.0.2001
+      vite-plus: 0.3.0(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   p-cancelable@2.1.1: {}
 
@@ -20724,9 +20674,7 @@ snapshots:
 
   tailwind-merge@3.6.0: {}
 
-  tailwindcss@4.3.0: {}
-
-  tailwindcss@4.3.2: {}
+  tailwindcss@4.3.3: {}
 
   tapable@2.3.3: {}
 
@@ -20970,17 +20918,17 @@ snapshots:
 
   universalify@2.0.1: {}
 
-  uniwind@1.11.0(patch_hash=329a77525509623d763b738152dbd00ab392cdcdd9fb6ed2b4a20e086e437196)(@expo/metro-config@57.0.12(patch_hash=96f1a75347e6ea02dc4b7034ace815d8ee39e18b8166ebfb573d9e58328f0dc2)(bufferutil@4.1.0)(expo@57.0.18)(typescript@6.0.3)(utf-8-validate@6.0.6))(metro-cache@0.84.5)(metro-transform-worker@0.84.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(metro@0.84.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(tailwindcss@4.3.0):
+  uniwind@1.11.0(patch_hash=17d92be2eec71bb6396b402e8d034968e54b28746876d7977cb3139655f42b90)(@expo/metro-config@57.0.12(patch_hash=96f1a75347e6ea02dc4b7034ace815d8ee39e18b8166ebfb573d9e58328f0dc2)(bufferutil@4.1.0)(expo@57.0.18)(typescript@6.0.3)(utf-8-validate@6.0.6))(metro-cache@0.84.5)(metro-transform-worker@0.84.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(metro@0.84.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(tailwindcss@4.3.3):
     dependencies:
-      '@tailwindcss/node': 4.3.2
-      '@tailwindcss/oxide': 4.3.2
+      '@tailwindcss/node': 4.3.3
+      '@tailwindcss/oxide': 4.3.3
       culori: 4.0.2
-      lightningcss: 1.30.1
+      lightningcss: 1.33.0
       metro: 0.84.5(bufferutil@4.1.0)(utf-8-validate@6.0.6)
       metro-cache: 0.84.5
       react: 19.2.3
       react-native: 0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
-      tailwindcss: 4.3.0
+      tailwindcss: 4.3.3
     optionalDependencies:
       '@expo/metro-config': 57.0.12(patch_hash=96f1a75347e6ea02dc4b7034ace815d8ee39e18b8166ebfb573d9e58328f0dc2)(bufferutil@4.1.0)(expo@57.0.18)(typescript@6.0.3)(utf-8-validate@6.0.6)
       metro-transform-worker: 0.84.5(bufferutil@4.1.0)(utf-8-validate@6.0.6)
@@ -21107,34 +21055,34 @@ snapshots:
       '@types/unist': 3.0.3
       vfile-message: 4.0.3
 
-  vite-plus@0.2.2(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0):
-    dependencies:
-      '@oxc-project/types': 0.138.0
-      '@oxlint/plugins': 1.68.0
-      '@vitest/browser': 4.1.9(@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(bufferutil@4.1.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(utf-8-validate@6.0.6)(vitest@4.1.9)
-      '@vitest/browser-preview': 4.1.9(@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(bufferutil@4.1.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(utf-8-validate@6.0.6)(vitest@4.1.9)
-      '@vitest/expect': 4.1.9
-      '@vitest/mocker': 4.1.9(@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))
-      '@vitest/pretty-format': 4.1.9
-      '@vitest/runner': 4.1.9
-      '@vitest/snapshot': 4.1.9
-      '@vitest/spy': 4.1.9
-      '@vitest/utils': 4.1.9
-      '@voidzero-dev/vite-plus-core': 0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)
-      oxfmt: 0.57.0(vite-plus@0.2.2(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0))
-      oxlint: 1.72.0(oxlint-tsgolint@0.24.0)(vite-plus@0.2.2(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0))
-      oxlint-tsgolint: 0.24.0
-      vite: '@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
-      vitest: 4.1.9(@types/node@24.12.4)(@vitest/browser-preview@4.1.9)(@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))
+  vite-plus@0.3.0(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0):
+    dependencies:
+      '@oxc-project/types': 0.146.0
+      '@oxlint/plugins': 1.79.0
+      '@vitest/browser': 4.1.11(@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(bufferutil@4.1.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(utf-8-validate@6.0.6)(vitest@4.1.11)
+      '@vitest/browser-preview': 4.1.11(@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(bufferutil@4.1.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(utf-8-validate@6.0.6)(vitest@4.1.11)
+      '@vitest/expect': 4.1.11
+      '@vitest/mocker': 4.1.11(@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))
+      '@vitest/pretty-format': 4.1.11
+      '@vitest/runner': 4.1.11
+      '@vitest/snapshot': 4.1.11
+      '@vitest/spy': 4.1.11
+      '@vitest/utils': 4.1.11
+      '@voidzero-dev/vite-plus-core': 0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)
+      oxfmt: 0.64.0(vite-plus@0.3.0(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0))
+      oxlint: 1.79.0(oxlint-tsgolint@7.0.2001)(vite-plus@0.3.0(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.1)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0))
+      oxlint-tsgolint: 7.0.2001
+      vite: '@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
+      vitest: 4.1.11(@types/node@24.12.4)(@vitest/browser-preview@4.1.11)(@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))
     optionalDependencies:
-      '@voidzero-dev/vite-plus-darwin-arm64': 0.2.2
-      '@voidzero-dev/vite-plus-darwin-x64': 0.2.2
-      '@voidzero-dev/vite-plus-linux-arm64-gnu': 0.2.2
-      '@voidzero-dev/vite-plus-linux-arm64-musl': 0.2.2
-      '@voidzero-dev/vite-plus-linux-x64-gnu': 0.2.2
-      '@voidzero-dev/vite-plus-linux-x64-musl': 0.2.2
-      '@voidzero-dev/vite-plus-win32-arm64-msvc': 0.2.2
-      '@voidzero-dev/vite-plus-win32-x64-msvc': 0.2.2
+      '@voidzero-dev/vite-plus-darwin-arm64': 0.3.0
+      '@voidzero-dev/vite-plus-darwin-x64': 0.3.0
+      '@voidzero-dev/vite-plus-linux-arm64-gnu': 0.3.0
+      '@voidzero-dev/vite-plus-linux-arm64-musl': 0.3.0
+      '@voidzero-dev/vite-plus-linux-x64-gnu': 0.3.0
+      '@voidzero-dev/vite-plus-linux-x64-musl': 0.3.0
+      '@voidzero-dev/vite-plus-win32-arm64-msvc': 0.3.0
+      '@voidzero-dev/vite-plus-win32-x64-msvc': 0.3.0
     transitivePeerDependencies:
       - '@arethetypeswrong/core'
       - '@edge-runtime/vm'
@@ -21165,19 +21113,19 @@ snapshots:
       - utf-8-validate
       - yaml
 
-  vitefu@1.1.3(@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)):
+  vitefu@1.1.3(@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)):
     optionalDependencies:
-      vite: '@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
+      vite: '@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
 
-  vitest@4.1.9(@types/node@24.12.4)(@vitest/browser-preview@4.1.9)(@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3)):
+  vitest@4.1.11(@types/node@24.12.4)(@vitest/browser-preview@4.1.11)(@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3)):
     dependencies:
-      '@vitest/expect': 4.1.9
-      '@vitest/mocker': 4.1.9(@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))
-      '@vitest/pretty-format': 4.1.9
-      '@vitest/runner': 4.1.9
-      '@vitest/snapshot': 4.1.9
-      '@vitest/spy': 4.1.9
-      '@vitest/utils': 4.1.9
+      '@vitest/expect': 4.1.11
+      '@vitest/mocker': 4.1.11(@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))
+      '@vitest/pretty-format': 4.1.11
+      '@vitest/runner': 4.1.11
+      '@vitest/snapshot': 4.1.11
+      '@vitest/spy': 4.1.11
+      '@vitest/utils': 4.1.11
       es-module-lexer: 2.1.0
       expect-type: 1.4.0
       magic-string: 0.30.21
@@ -21189,11 +21137,11 @@ snapshots:
       tinyexec: 1.2.4
       tinyglobby: 0.2.17
       tinyrainbow: 3.1.0
-      vite: '@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
+      vite: '@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
       why-is-node-running: 2.3.0
     optionalDependencies:
       '@types/node': 24.12.4
-      '@vitest/browser-preview': 4.1.9(@voidzero-dev/vite-plus-core@0.2.2(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(bufferutil@4.1.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(utf-8-validate@6.0.6)(vitest@4.1.9)
+      '@vitest/browser-preview': 4.1.11(@voidzero-dev/vite-plus-core@0.3.0(@types/node@24.12.4)(esbuild@0.28.1)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(bufferutil@4.1.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(utf-8-validate@6.0.6)(vitest@4.1.11)
     transitivePeerDependencies:
       - msw
 
@@ -21473,6 +21421,38 @@ snapshots:
 
   yoga-layout@3.2.1: {}
 
+  yuku-codegen@0.5.48:
+    dependencies:
+      '@yuku-toolchain/types': 0.5.43
+    optionalDependencies:
+      '@yuku-codegen/binding-darwin-arm64': 0.5.48
+      '@yuku-codegen/binding-darwin-x64': 0.5.48
+      '@yuku-codegen/binding-freebsd-x64': 0.5.48
+      '@yuku-codegen/binding-linux-arm-gnu': 0.5.48
+      '@yuku-codegen/binding-linux-arm-musl': 0.5.48
+      '@yuku-codegen/binding-linux-arm64-gnu': 0.5.48
+      '@yuku-codegen/binding-linux-arm64-musl': 0.5.48
+      '@yuku-codegen/binding-linux-x64-gnu': 0.5.48
+      '@yuku-codegen/binding-linux-x64-musl': 0.5.48
+      '@yuku-codegen/binding-win32-arm64': 0.5.48
+      '@yuku-codegen/binding-win32-x64': 0.5.48
+
+  yuku-parser@0.5.48:
+    dependencies:
+      '@yuku-toolchain/types': 0.5.43
+    optionalDependencies:
+      '@yuku-parser/binding-darwin-arm64': 0.5.48
+      '@yuku-parser/binding-darwin-x64': 0.5.48
+      '@yuku-parser/binding-freebsd-x64': 0.5.48
+      '@yuku-parser/binding-linux-arm-gnu': 0.5.48
+      '@yuku-parser/binding-linux-arm-musl': 0.5.48
+      '@yuku-parser/binding-linux-arm64-gnu': 0.5.48
+      '@yuku-parser/binding-linux-arm64-musl': 0.5.48
+      '@yuku-parser/binding-linux-x64-gnu': 0.5.48
+      '@yuku-parser/binding-linux-x64-musl': 0.5.48
+      '@yuku-parser/binding-win32-arm64': 0.5.48
+      '@yuku-parser/binding-win32-x64': 0.5.48
+
   zod-to-json-schema@3.25.2(zod@3.25.76):
     dependencies:
       zod: 3.25.76
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index ff38222efb12..7d2f9f998617 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -43,13 +43,18 @@ catalog:
   "@noble/curves": 1.9.1
   "@noble/hashes": 1.8.0
   "@pierre/diffs": 1.3.0-beta.10
+  "@tailwindcss/node": 4.3.3
+  "@tailwindcss/oxide": 4.3.3
+  "@tailwindcss/vite": 4.3.3
   "@types/node": 24.12.4
   "@typescript/native-preview": 7.0.0-dev.20260604.1
   effect: 4.0.0-beta.103
   jose: 6.2.2
+  lightningcss: 1.33.0
+  tailwindcss: 4.3.3
   typescript: ~6.0.3
-  vite: npm:@voidzero-dev/vite-plus-core@0.2.2
-  vite-plus: 0.2.2
+  vite: npm:@voidzero-dev/vite-plus-core@0.3.0
+  vite-plus: 0.3.0
   yaml: ^2.9.0
 
 minimumReleaseAgeExclude:
@@ -121,11 +126,18 @@ overrides:
   "@expo/metro-config": 57.0.12
   expo-constants: 57.0.16
   "@pierre/diffs>@shikijs/transformers": ^4.2.0
+  # Keep one copy of these native-binary packages. lightningcss ships 11 platform binaries per
+  # version, and the workspaces' tailwindcss ^4 ranges drift into two 4.3.x copies of the family.
+  "@tailwindcss/node": "catalog:"
+  "@tailwindcss/oxide": "catalog:"
+  "@tailwindcss/vite": "catalog:"
   "@types/node": "catalog:"
   effect: "catalog:"
   expo-router: 57.0.17
   "expo-sharing>@expo/config-plugins": 57.0.9
   "expo-sharing>@expo/config-types": 57.0.2
+  lightningcss: "catalog:"
+  tailwindcss: "catalog:"
   vite: "catalog:"
   yaml: "catalog:"
 
diff --git a/scripts/build-desktop-artifact.test.ts b/scripts/build-desktop-artifact.test.ts
index 1b2a3a6943ee..720f026d78bc 100644
--- a/scripts/build-desktop-artifact.test.ts
+++ b/scripts/build-desktop-artifact.test.ts
@@ -1,4 +1,3 @@
-// @effect-diagnostics nodeBuiltinImport:off - packaged-archive fixtures compute the sidecar digest with the same Node primitive as the builder.
 import * as NodeCrypto from "node:crypto";
 
 import * as NodeServices from "@effect/platform-node/NodeServices";
diff --git a/scripts/lib/dev-share.test.ts b/scripts/lib/dev-share.test.ts
index b2dfba3585eb..2b133e456c46 100644
--- a/scripts/lib/dev-share.test.ts
+++ b/scripts/lib/dev-share.test.ts
@@ -27,11 +27,16 @@ const encode = (value: string) => Stream.make(new TextEncoder().encode(value));
  * test set the outcome of the `off` (pre-clear) and `serve` calls separately —
  * they are the same subcommand and are told apart by the trailing `off`.
  */
-const spawnerLayer = (input: { readonly off?: CallResult; readonly serve?: CallResult }) =>
+const spawnerLayer = (input: {
+  readonly off?: CallResult;
+  readonly serve?: CallResult;
+  readonly calls?: Array<ReadonlyArray<string>>;
+}) =>
   Layer.succeed(
     ChildProcessSpawner.ChildProcessSpawner,
     ChildProcessSpawner.make((command) => {
       const args = "args" in command ? (command.args as ReadonlyArray<string>) : [];
+      input.calls?.push(args);
       const result: CallResult = args.includes("status")
         ? { exitCode: 0 }
         : args.includes("off")
@@ -102,6 +107,20 @@ describe("shareDevServer", () => {
     }),
   );
 
+  // Vite binds `localhost`, which modern Node resolves to `::1` first, so a
+  // 127.0.0.1 target would proxy to a loopback nothing listens on.
+  it.effect("proxies to the localhost name Vite binds, not 127.0.0.1", () =>
+    Effect.gen(function* () {
+      const calls: Array<ReadonlyArray<string>> = [];
+      yield* shareDevServer({ webPort: 5788 }).pipe(
+        Effect.provide(spawnerLayer({ off: { exitCode: 0 }, calls })),
+      );
+
+      const serveCall = calls.find((args) => args.includes("--bg"));
+      assert.deepEqual(serveCall, ["serve", "--bg", "--https=5788", "http://localhost:5788"]);
+    }),
+  );
+
   // The stale-mapping clear runs before serve, so a failure here leaves the
   // port serving nothing. Saying only "serve failed" would let an operator
   // assume their previous mapping survived.
diff --git a/scripts/lib/dev-share.ts b/scripts/lib/dev-share.ts
index 0f843b3ba91e..e3fb884eb836 100644
--- a/scripts/lib/dev-share.ts
+++ b/scripts/lib/dev-share.ts
@@ -195,7 +195,17 @@ export const shareDevServer = Effect.fn("devShare.shareDevServer")(function* (in
     });
   }
 
-  yield* ensureTailscaleServe({ localPort: input.webPort, servePort: input.webPort }).pipe(
+  // Proxy to the hostname Vite binds rather than the package default of
+  // 127.0.0.1. Vite listens on `localhost`, which Node 17+ resolves to `::1`
+  // first, so it only binds the IPv6 loopback and a 127.0.0.1 target has
+  // nothing behind it (tailscale answers 502). Passing `localhost` lets the
+  // tailscale proxy resolve it the same way Node did. Not a literal `[::1]`:
+  // tailscale rejects that form.
+  yield* ensureTailscaleServe({
+    localPort: input.webPort,
+    servePort: input.webPort,
+    localHost: "localhost",
+  }).pipe(
     Effect.mapError((error) => {
       const explanation = explainCommandFailure(error);
       return new DevServeFailedError({
diff --git a/vite.config.ts b/vite.config.ts
index 332538bd88f8..d6bdd264035e 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -28,7 +28,6 @@ export default defineConfig({
   },
   fmt: {
     ignorePatterns: [
-      ".reference",
       ".repos/**",
       ".alchemy",
       "dist",
@@ -122,11 +121,88 @@ export default defineConfig({
       "t3code/no-global-process-runtime": "error",
       "t3code/no-inline-schema-compile": "warn",
       "t3code/no-manual-effect-runtime-in-tests": "error",
-      "t3code/no-mobile-uniwind-theme-escape-hatches": "error",
       "t3code/no-native-title-tooltip": "error",
       "t3code/namespace-node-imports": "error",
     },
+    overrides: [
+      {
+        // The one place that reads the host platform to seed the injected references.
+        files: ["packages/shared/src/hostProcess.ts"],
+        rules: { "t3code/no-global-process-runtime": "off" },
+      },
+      {
+        files: ["apps/mobile/src/**"],
+        rules: { "t3code/no-mobile-uniwind-theme-escape-hatches": "error" },
+      },
+      {
+        // Reviewed native and third-party interop boundaries that cannot consume a className.
+        files: [
+          "apps/mobile/src/features/archive/ArchivedThreadsScreen.tsx",
+          "apps/mobile/src/features/connection/ConnectionsNewRouteScreen.tsx",
+          "apps/mobile/src/features/files/FileMarkdownPreview.tsx",
+          "apps/mobile/src/features/files/SourceFileSurface.tsx",
+          "apps/mobile/src/features/files/ThreadFilesRouteScreen.tsx",
+          "apps/mobile/src/features/files/thread-file-navigator-pane.tsx",
+          "apps/mobile/src/features/home/HomeHeader.tsx",
+          "apps/mobile/src/features/review/ReviewSheet.tsx",
+          "apps/mobile/src/features/review/useNativeReviewDiffBridge.ts",
+          "apps/mobile/src/features/settings/SettingsEnvironmentsRouteScreen.tsx",
+          "apps/mobile/src/features/settings/appearance/components/AppearancePreviews.tsx",
+          "apps/mobile/src/features/threads/GitActionProgressOverlay.tsx",
+          "apps/mobile/src/features/threads/NewTaskDraftScreen.tsx",
+          "apps/mobile/src/features/threads/ThreadComposer.tsx",
+          "apps/mobile/src/features/threads/ThreadFeed.tsx",
+          "apps/mobile/src/features/threads/ThreadSettingsSheet.tsx",
+          "apps/mobile/src/features/threads/git/GitOverviewSheet.tsx",
+          "apps/mobile/src/features/threads/thread-list-items.tsx",
+          "apps/mobile/src/features/threads/thread-list-v2-items.tsx",
+          "apps/mobile/src/lib/useMobileNavigationTheme.ts",
+          "apps/mobile/src/native/T3ComposerEditor.ios.tsx",
+          "apps/mobile/src/native/T3ComposerEditor.native.tsx",
+        ],
+        rules: {
+          "t3code/no-mobile-uniwind-theme-escape-hatches": ["error", { allowUniwindTheme: true }],
+        },
+      },
+      // Legacy manual Effect runners tracked as debt: no net-new occurrences.
+      // Lower a ceiling when you migrate a file, and delete its entry at zero.
+      ...Object.entries({
+        "apps/mobile/src/features/agent-awareness/liveActivityPreferences.test.ts": 1,
+        "apps/mobile/src/features/agent-awareness/remoteRegistration.test.ts": 2,
+        "apps/mobile/src/state/use-remote-environment-registry.test.ts": 2,
+        "apps/server/src/orchestration/Layers/CheckpointReactor.test.ts": 46,
+        "apps/server/src/orchestration/Layers/OrchestrationEngine.test.ts": 5,
+        "apps/server/src/orchestration/Layers/OrchestrationReactor.test.ts": 4,
+        "apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts": 70,
+        "apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.test.ts": 31,
+        "apps/server/src/orchestration/Layers/ThreadDeletionReactor.test.ts": 2,
+        "apps/server/src/orchestration/commandInvariants.test.ts": 6,
+        "apps/server/src/orchestration/projector.test.ts": 20,
+        "apps/server/src/project/Layers/ProjectSetupScriptRunner.test.ts": 4,
+        "apps/server/src/provider/Layers/ClaudeAdapter.test.ts": 2,
+        "apps/server/src/provider/Layers/CodexAdapter.test.ts": 1,
+        "apps/server/src/provider/Layers/CodexSessionRuntime.test.ts": 5,
+        "apps/server/src/provider/Layers/CursorAdapter.test.ts": 1,
+        "apps/server/src/provider/Layers/CursorProvider.test.ts": 4,
+        "apps/server/src/provider/Layers/DroidProvider.test.ts": 2,
+        "apps/server/src/provider/Layers/ProviderService.test.ts": 2,
+        "apps/server/src/provider/Layers/ProviderSessionReaper.test.ts": 21,
+        "apps/server/src/provider/acp/CursorAcpSupport.test.ts": 1,
+        "apps/server/src/relay/AgentAwarenessRelay.test.ts": 4,
+        "apps/server/src/server.test.ts": 1,
+        "apps/server/src/textGeneration/CursorTextGeneration.test.ts": 1,
+        "apps/web/src/cloud/dpop.test.ts": 2,
+        "apps/web/src/environments/runtime/service.addSavedEnvironment.test.ts": 1,
+        "oxlint-plugin-t3code/rules/no-manual-effect-runtime-in-tests.test.ts": 7,
+        "packages/client-runtime/src/relay/managedRelayState.test.ts": 1,
+        "packages/client-runtime/src/wsTransport.test.ts": 2,
+      }).map(([file, maxOccurrences]) => {
+        const rule: ["error", { maxOccurrences: number }] = ["error", { maxOccurrences }];
+        return { files: [file], rules: { "t3code/no-manual-effect-runtime-in-tests": rule } };
+      }),
+    ],
     options: {
+      reportUnusedDisableDirectives: "error",
       // Revisit once Oxlint's tsgolint path can integrate with @effect/tsgo diagnostics.
       typeAware: false,
       typeCheck: false,