From 2c0ac2467437b30953a95e00f419143488bcfcc7 Mon Sep 17 00:00:00 2001 From: Tyler <109685178+tlongwell-block@users.noreply.github.com> Date: Mon, 3 Aug 2026 07:36:13 -0400 Subject: [PATCH 01/27] fix(desktop): stop the create-agent provider config probe from erasing keystrokes (#4411) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## What Fixes the create-agent dialog's "Run on" provider config fields eating keystrokes — reported by Tyler in buzz-remote-agents (channel `29414326`, thread `db76677a`): the Kubernetes **Kubeconfig context** field would not accept typing. ## Why it happened (the Typewriter Eraser, shipped in #4289) `WhereToRunSection`'s probe `useEffect` depended on the whole `draft`: 1. every keystroke changed the draft → effect re-fired → provider binary re-probed; 2. each probe result is a fresh object written into the draft → the effect re-triggered **itself**, respawning the provider binary in a loop for as long as the dialog sat on a provider; 3. every probe resolution reset `providerConfig` to schema defaults — erasing whatever was typed. A field with no schema default (`context`) snapped back to empty, i.e. "won't let me type". Unrelated to how many kubeconfig contexts you have. ## Fix - **Probe once per provider selection**, keyed on the provider's stable `binaryPath` — not the draft, not the provider object (a `useBackendProvidersQuery` refresh must not reprobe an unchanged selection). - **Latest-state resolution** via `React.useEffectEvent` + a new pure `applyProbeResult` helper: schema defaults merge **beneath** the current `providerConfig`, so a probe landing after the user typed can never clobber in-flight input (per Wren's pre-patch red-team: changing deps alone leaves a stale closure). Existing `cancelled` cleanup keeps provider-switch/unmount safe; selection reset (`emptyWhereToRunDraft`) and the fail-closed probe-error path are unchanged. ## Tests - **Unit** (`whereToRunIntent.test.mjs`): `applyProbeResult` merge semantics — defaults under typed values, user-cleared fields stay cleared, schema-less results, unrelated fields preserved. - **E2E** (new `where-to-run-config.spec.ts`, added to the smoke project, **red-first verified**: all 3 fail against the unfixed component): - typing into a defaultless provider field sticks, and `probe_backend_provider` fires exactly once per selection; - the config form is gated on probe resolution (slow probe: no half-rendered form, defaults prefill once); - provider → local → provider re-probes and resets cleanly. - Mock bridge gains `backendProviders` / `backendProviderProbeResult` / `backendProviderProbeDelayMs` seams (defaults preserve prior behavior). ## Verification at 8eb7680 - `pnpm check` + `tsc` clean, `pnpm test` 3926/3926; - new spec 3/3 green (and 3/3 red on the unfixed component); - pre-push lefthook: desktop-test, desktop-check, desktop-tauri-checks, rust-tests, mobile-test all green. --------- Signed-off-by: npub1qyvc0c5kl4gqv2fd97fsk46tu378sqgy35vc83rvgfwne90sel7s0ed67d <011987e296fd5006292d2f930b574be47c7801048d1983c46c425d3c95f0cffd@buzz.block.builderlab.xyz> Co-authored-by: npub1qyvc0c5kl4gqv2fd97fsk46tu378sqgy35vc83rvgfwne90sel7s0ed67d <011987e296fd5006292d2f930b574be47c7801048d1983c46c425d3c95f0cffd@buzz.block.builderlab.xyz> --- desktop/playwright.config.ts | 1 + .../features/agents/ui/WhereToRunSection.tsx | 49 +++--- .../agents/ui/whereToRunIntent.test.mjs | 70 ++++++++ .../features/agents/ui/whereToRunIntent.ts | 29 ++++ desktop/src/testing/e2eBridge.ts | 24 ++- desktop/tests/e2e/where-to-run-config.spec.ts | 154 ++++++++++++++++++ desktop/tests/helpers/bridge.ts | 19 +++ 7 files changed, 323 insertions(+), 23 deletions(-) create mode 100644 desktop/tests/e2e/where-to-run-config.spec.ts diff --git a/desktop/playwright.config.ts b/desktop/playwright.config.ts index 7ce7f48389..773c2e6bf5 100644 --- a/desktop/playwright.config.ts +++ b/desktop/playwright.config.ts @@ -132,6 +132,7 @@ export default defineConfig({ "**/harness-management.spec.ts", "**/harness-catalog-screenshots.spec.ts", "**/inline-custom-harness.spec.ts", + "**/where-to-run-config.spec.ts", "**/huddle-transcription.spec.ts", ], use: { diff --git a/desktop/src/features/agents/ui/WhereToRunSection.tsx b/desktop/src/features/agents/ui/WhereToRunSection.tsx index f068eceec8..ee9ec37132 100644 --- a/desktop/src/features/agents/ui/WhereToRunSection.tsx +++ b/desktop/src/features/agents/ui/WhereToRunSection.tsx @@ -5,7 +5,11 @@ import { useBackendProvidersQuery } from "@/features/agents/hooks"; import { probeBackendProvider } from "@/shared/api/tauri"; import { ProviderConfigFields } from "./ProviderConfigFields"; -import { emptyWhereToRunDraft, type WhereToRunDraft } from "./whereToRunIntent"; +import { + applyProbeResult, + emptyWhereToRunDraft, + type WhereToRunDraft, +} from "./whereToRunIntent"; /** Optional remote-backend selector. Buzz shared compute is an LLM provider, not a run destination. */ export function WhereToRunSection({ @@ -26,32 +30,37 @@ export function WhereToRunSection({ [backendProviders, draft.runOn], ); + // Latest-state seam for probe resolution: an Effect Event always sees the + // draft as it is *now*. Without this, the probe promise closes over the + // draft from probe start, and anything typed while the probe was in flight + // gets thrown away when it resolves (a second, subtler Typewriter Eraser). + const applyProbe = React.useEffectEvent( + (result: Awaited>) => { + onDraftChange(applyProbeResult(draft, result)); + }, + ); + + // Probe once per provider *selection*, keyed on the provider's stable + // path — never on the draft. Depending on the draft made every keystroke + // refire the probe, and each resolution reset providerConfig to schema + // defaults, which erased what the user was typing (the Typewriter Eraser) + // and spawned the provider binary in a loop for as long as the dialog was + // open. Keying on the path (not the provider object) also keeps a + // providers-query refresh from reprobing an unchanged selection. + const selectedBinaryPath = isProviderMode + ? (selectedBackendProvider?.binaryPath ?? null) + : null; React.useEffect(() => { - if (!isProviderMode || !selectedBackendProvider) { + if (!selectedBinaryPath) { setProbeError(null); return; } let cancelled = false; setProbeError(null); - void probeBackendProvider(selectedBackendProvider.binaryPath) + void probeBackendProvider(selectedBinaryPath) .then((result) => { if (cancelled) return; - const defaults: Record = {}; - const properties = - (result.config_schema as Record | undefined) - ?.properties ?? {}; - for (const [key, property] of Object.entries(properties) as [ - string, - Record, - ][]) { - if (property.default != null) - defaults[key] = String(property.default); - } - onDraftChange({ - ...draft, - probedProvider: result, - providerConfig: defaults, - }); + applyProbe(result); }) .catch((error: unknown) => { if (!cancelled) { @@ -61,7 +70,7 @@ export function WhereToRunSection({ return () => { cancelled = true; }; - }, [draft, isProviderMode, onDraftChange, selectedBackendProvider]); + }, [selectedBinaryPath]); if (backendProviders.length === 0) return null; diff --git a/desktop/src/features/agents/ui/whereToRunIntent.test.mjs b/desktop/src/features/agents/ui/whereToRunIntent.test.mjs index 500e9019f2..262d55d998 100644 --- a/desktop/src/features/agents/ui/whereToRunIntent.test.mjs +++ b/desktop/src/features/agents/ui/whereToRunIntent.test.mjs @@ -2,6 +2,7 @@ import assert from "node:assert/strict"; import test from "node:test"; import { + applyProbeResult, canSubmitWhereToRun, emptyWhereToRunDraft, providerConfigComplete, @@ -59,3 +60,72 @@ test("provider draft resolves with coerced config values", () => { config: { region: "us", size: 3 }, }); }); + +// ── applyProbeResult: probe resolution must merge, not overwrite ───────────── +// +// Pins the seam that fixed the "Typewriter Eraser" (agent-create dialog's +// provider config fields losing keystrokes): a probe resolution prefills +// schema defaults *beneath* the user's in-flight config, never over it. The +// effect in WhereToRunSection keys probing on the provider's binary path, so +// the only probe writes that reach providerConfig are the ones pinned here. + +const probeWithDefaults = { + ok: true, + config_schema: { + properties: { + context: { type: "string", title: "Kubeconfig context" }, + namespace: { type: "string", default: "buzz-agents-x1y2z3" }, + inactivity_seconds: { type: "number", default: 1800 }, + }, + required: ["namespace"], + }, +}; + +const unprobedDraft = { + ...emptyWhereToRunDraft, + runOn: "kubernetes", +}; + +test("probe resolution prefills schema defaults on a fresh draft", () => { + const next = applyProbeResult(unprobedDraft, probeWithDefaults); + assert.equal(next.probedProvider, probeWithDefaults); + assert.deepEqual(next.providerConfig, { + namespace: "buzz-agents-x1y2z3", + inactivity_seconds: "1800", + }); +}); + +test("probe resolution keeps user-typed values over schema defaults", () => { + const typed = { + ...unprobedDraft, + providerConfig: { context: "prod-us-west", namespace: "my-ns" }, + }; + const next = applyProbeResult(typed, probeWithDefaults); + assert.deepEqual(next.providerConfig, { + context: "prod-us-west", + namespace: "my-ns", + inactivity_seconds: "1800", + }); +}); + +test("probe resolution keeps a user-cleared field cleared", () => { + // "" is a deliberate user state — coerceConfigValues drops empty numerics + // and required-gating treats "" as incomplete; the probe must not undo it. + const cleared = { ...unprobedDraft, providerConfig: { namespace: "" } }; + const next = applyProbeResult(cleared, probeWithDefaults); + assert.equal(next.providerConfig.namespace, ""); +}); + +test("a schema-less probe result records the probe without touching config", () => { + const typed = { ...unprobedDraft, providerConfig: { context: "abc" } }; + const next = applyProbeResult(typed, { ok: true }); + assert.deepEqual(next.providerConfig, { context: "abc" }); + assert.deepEqual(next.probedProvider, { ok: true }); +}); + +test("probe resolution preserves unrelated draft fields", () => { + assert.equal( + applyProbeResult(unprobedDraft, probeWithDefaults).runOn, + "kubernetes", + ); +}); diff --git a/desktop/src/features/agents/ui/whereToRunIntent.ts b/desktop/src/features/agents/ui/whereToRunIntent.ts index fcb3e82b7e..9aa9248e75 100644 --- a/desktop/src/features/agents/ui/whereToRunIntent.ts +++ b/desktop/src/features/agents/ui/whereToRunIntent.ts @@ -15,6 +15,35 @@ export const emptyWhereToRunDraft: WhereToRunDraft = { probedProvider: null, }; +/** + * Fold a completed probe into the draft the user has *now* — not the draft + * that existed when the probe started. Schema defaults prefill only the keys + * the user has not touched: anything already in `providerConfig` (typed while + * the probe was in flight) wins over the default. Overwriting instead of + * merging is the "Typewriter Eraser" bug — every probe resolution silently + * erased in-flight keystrokes. + */ +export function applyProbeResult( + current: WhereToRunDraft, + result: BackendProviderProbeResult, +): WhereToRunDraft { + const defaults: Record = {}; + const properties = + (result.config_schema as Record | undefined)?.properties ?? + {}; + for (const [key, property] of Object.entries(properties) as [ + string, + Record, + ][]) { + if (property.default != null) defaults[key] = String(property.default); + } + return { + ...current, + probedProvider: result, + providerConfig: { ...defaults, ...current.providerConfig }, + }; +} + export function providerConfigComplete(draft: WhereToRunDraft): boolean { if (draft.runOn === "local") return true; if (!draft.probedProvider) return false; diff --git a/desktop/src/testing/e2eBridge.ts b/desktop/src/testing/e2eBridge.ts index 355ccea9fc..f17faa218b 100644 --- a/desktop/src/testing/e2eBridge.ts +++ b/desktop/src/testing/e2eBridge.ts @@ -507,6 +507,11 @@ type E2eConfig = { * returning a catalog. */ discoverAgentModelsError?: string; + // Backend provider mocks for the create-agent "Run on" section. See + // tests/helpers/bridge.ts:MockBridgeOptions for semantics. + backendProviders?: Array<{ id: string; binaryPath: string }>; + backendProviderProbeResult?: Record; + backendProviderProbeDelayMs?: number; }; relayHttpUrl?: string; relayWsUrl?: string; @@ -11064,9 +11069,22 @@ export function maybeInstallE2eTauriMocks() { activeConfig, ); case "discover_backend_providers": - return []; - case "probe_backend_provider": - return { ok: false, error: "mock: no providers available" }; + return activeConfig?.mock?.backendProviders ?? []; + case "probe_backend_provider": { + const probeDelayMs = + activeConfig?.mock?.backendProviderProbeDelayMs ?? 0; + if (probeDelayMs > 0) { + await new Promise((resolve) => + window.setTimeout(resolve, probeDelayMs), + ); + } + return ( + activeConfig?.mock?.backendProviderProbeResult ?? { + ok: false, + error: "mock: no providers available", + } + ); + } case "discover_managed_agent_prereqs": return handleDiscoverManagedAgentPrereqs( payload as Parameters[0], diff --git a/desktop/tests/e2e/where-to-run-config.spec.ts b/desktop/tests/e2e/where-to-run-config.spec.ts new file mode 100644 index 0000000000..869e9b2138 --- /dev/null +++ b/desktop/tests/e2e/where-to-run-config.spec.ts @@ -0,0 +1,154 @@ +/** + * E2E spec for the create-agent "Run on" provider config fields. + * + * Pins the fix for the "Typewriter Eraser": WhereToRunSection's probe effect + * used to depend on the whole draft, so every keystroke re-probed the + * provider and every probe resolution reset providerConfig to schema + * defaults — typing into a defaultless field (the k8s "Kubeconfig context") + * looked completely dead, and the provider binary respawned in a loop. + * + * Covers: + * - typing into a defaultless provider field sticks, and the provider is + * probed exactly once for the selection (not once per keystroke) + * - the config form is gated on probe resolution (no half-rendered form), + * and defaults prefill exactly once when a slow probe lands + * - switching provider → local → provider re-probes and resets cleanly + * + * The stale-closure merge on probe resolution (defaults beneath in-flight + * typing) is unreachable through this UI because the fields render only + * after the probe resolves; it is pinned at the unit level in + * whereToRunIntent.test.mjs (applyProbeResult). + */ +import { expect, test } from "@playwright/test"; + +import { installMockBridge } from "../helpers/bridge"; + +type Page = import("@playwright/test").Page; + +const PROVIDER = { + id: "kubernetes", + binaryPath: "/mock/buzz-backend-kubernetes", +}; + +const PROBE_RESULT = { + ok: true, + name: "kubernetes", + version: "0.0.0-mock", + config_schema: { + type: "object", + properties: { + context: { + type: "string", + title: "Kubeconfig context", + description: "Context from your kubeconfig.", + }, + namespace: { + type: "string", + title: "Namespace", + default: "buzz-agents-mock01", + }, + }, + required: ["namespace"], + }, +}; + +async function probeInvocations(page: Page): Promise { + return page.evaluate( + () => + ( + window as Window & { __BUZZ_E2E_COMMANDS__?: string[] } + ).__BUZZ_E2E_COMMANDS__?.filter( + (command) => command === "probe_backend_provider", + ).length ?? 0, + ); +} + +/** Open the create-agent dialog and select the mocked provider in "Run on". */ +async function openCreateDialogOnProvider(page: Page) { + await page.goto("/", { waitUntil: "domcontentloaded" }); + await page.getByTestId("open-agents-view").click(); + await page.getByTestId("new-agent-card").click(); + await page.getByRole("menuitem", { name: "Create agent" }).click(); + const dialog = page.getByTestId("persona-dialog"); + await expect(dialog).toBeVisible({ timeout: 10_000 }); + await dialog.locator("#agent-run-on").selectOption(PROVIDER.id); + return dialog; +} + +test("typing into a defaultless provider field sticks and probes only once", async ({ + page, +}) => { + await installMockBridge(page, { + backendProviders: [PROVIDER], + backendProviderProbeResult: PROBE_RESULT, + }); + const dialog = await openCreateDialogOnProvider(page); + + const contextField = dialog.locator("#provider-cfg-context"); + await expect(contextField).toBeVisible({ timeout: 10_000 }); + // Defaults prefilled from the schema; context has none. + await expect(dialog.locator("#provider-cfg-namespace")).toHaveValue( + "buzz-agents-mock01", + ); + await expect(contextField).toHaveValue(""); + + await contextField.pressSequentially("prod-us-west", { delay: 20 }); + await expect(contextField).toHaveValue("prod-us-west"); + + // One selection, one probe — keystrokes must not refire it. + expect(await probeInvocations(page)).toBe(1); +}); + +test("config fields render only after a slow probe resolves, with defaults", async ({ + page, +}) => { + // The fields are gated on the probe result (draft.probedProvider), which is + // what makes mid-flight typing unreachable through the UI — the stale-probe + // merge seam (applyProbeResult) is pinned at the unit level instead. This + // spec holds the gate: no half-rendered form before the probe lands, and + // defaults appear exactly once when it does. + await installMockBridge(page, { + backendProviders: [PROVIDER], + backendProviderProbeResult: PROBE_RESULT, + backendProviderProbeDelayMs: 1_000, + }); + const dialog = await openCreateDialogOnProvider(page); + + // Pre-resolution: the security warning is up, the form is not. + await expect(dialog.getByText("will receive your agent")).toBeVisible(); + await expect(dialog.locator("#provider-cfg-context")).toHaveCount(0); + + // Post-resolution: fields render with schema defaults prefilled. + await expect(dialog.locator("#provider-cfg-context")).toBeVisible({ + timeout: 10_000, + }); + await expect(dialog.locator("#provider-cfg-namespace")).toHaveValue( + "buzz-agents-mock01", + ); + expect(await probeInvocations(page)).toBe(1); +}); + +test("provider → local → provider re-probes and resets the config", async ({ + page, +}) => { + await installMockBridge(page, { + backendProviders: [PROVIDER], + backendProviderProbeResult: PROBE_RESULT, + }); + const dialog = await openCreateDialogOnProvider(page); + + const contextField = dialog.locator("#provider-cfg-context"); + await expect(contextField).toBeVisible({ timeout: 10_000 }); + await contextField.fill("stale-value"); + + await dialog.locator("#agent-run-on").selectOption("local"); + await expect(contextField).toHaveCount(0); + + await dialog.locator("#agent-run-on").selectOption(PROVIDER.id); + await expect(dialog.locator("#provider-cfg-context")).toBeVisible({ + timeout: 10_000, + }); + // Fresh selection = fresh draft: the stale value must not leak back. + await expect(dialog.locator("#provider-cfg-context")).toHaveValue(""); + expect(await probeInvocations(page)).toBe(2); +}); diff --git a/desktop/tests/helpers/bridge.ts b/desktop/tests/helpers/bridge.ts index 8a9ab2be11..345e1ee4d7 100644 --- a/desktop/tests/helpers/bridge.ts +++ b/desktop/tests/helpers/bridge.ts @@ -524,6 +524,25 @@ type MockBridgeOptions = { * returning a catalog. Exercises the discovery-failure UI path. */ discoverAgentModelsError?: string; + /** + * Providers returned by `discover_backend_providers`. Defaults to `[]` + * (the "Run on" section stays hidden). Setting this renders the remote + * backend selector in the create-agent dialog. + */ + backendProviders?: Array<{ id: string; binaryPath: string }>; + /** + * Result returned by `probe_backend_provider`. Defaults to + * `{ ok: false, error: "mock: no providers available" }`. + */ + backendProviderProbeResult?: Record; + /** + * Delay (ms) applied to `probe_backend_provider` so a spec can assert the + * pre-resolution state (config fields stay probe-gated until the result + * lands). Typing while a probe is in flight is unreachable through the UI + * for the same reason; that merge path is pinned at the unit level + * (`applyProbeResult` in whereToRunIntent.test.mjs). + */ + backendProviderProbeDelayMs?: number; }; type BridgeOptions = { From 83a285f1b1a0be862d55781fad9c75ec8813886d Mon Sep 17 00:00:00 2001 From: Tyler <109685178+tlongwell-block@users.noreply.github.com> Date: Mon, 3 Aug 2026 10:14:01 -0400 Subject: [PATCH 02/27] ci(linux): enable mesh-llm feature in Linux release and canary builds (#4524) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Summary Official Linux desktop packages (`.deb` / AppImage) are built without `--features mesh-llm`, so they ship the `mesh_llm_stubs` backend and Settings → Compute always fails with `mesh-llm feature not enabled`. This PR adds the feature flag to the two Linux build commands: - `release.yml` → `release-linux` job - `linux-canary.yml` → canary build That's the whole diff — 2 lines. Fixes #3788 (Linux); see also #3841 (dup with UI-gating PR #3914) and the Windows twin #2836/#3223. ## Why no native prebuild step (unlike the macOS job) The macOS job carries Metal llama prebuild/cache steps from #798. Linux doesn't need an equivalent: - `mesh-llm-host-runtime` is compiled with `dynamic-native-runtime` and installs the recommended runtime on first use (verified by sha256 checksum over HTTPS; upstream's signature verification path is not yet implemented — default policy is `RequireChecksum`, per `mesh-llm-runtime-install/src/lib.rs`) (`desktop/src-tauri/src/mesh_llm/mod.rs` — `initialize_mesh_native_runtime`), so release builds work on clean machines without bundling llama.cpp. - Upstream publishes Linux x86_64/aarch64 runtime bundles for the pinned `v0.74.0` line, and `scripts/ensure-mesh-native-runtime.sh` already maps `meshllm-native-runtime-linux-x86_64-cpu` / `linux-aarch64-cpu` for local/e2e use. - The unmerged branch `micn/mesh-node-download` (`96f29417a`) treats even the macOS prebuild steps as removable dead weight for the same reason. ## Background The omission is historical drift, not a decision: Linux packaging predates the mesh feature flag (#693), mesh became opt-in for build-cost/reliability reasons (#823, #1183), and #1221 re-enabled it for releases by editing only the macOS build line. `release-linux` and the later `linux-canary` copy were never revisited. The mesh shutdown hard-exit/relaunch path is gated `all(mesh-llm, target_os = "macos")` because ggml/Metal destructors abort on macOS; ordinary mesh shutdown (`shutdown_mesh_runtime`) is cross-platform, so Linux falls through to the generic path. ## Validation - [x] `./bin/cargo check --manifest-path desktop/src-tauri/Cargo.toml --features mesh-llm` green at base `2c0ac2467` (feature graph compiles at the pinned v0.74.0 line) - [ ] Linux canary run with this change: AppImage/.deb build succeeds and binary contains real `mesh_llm` symbols (not `mesh_llm_stubs`) - [ ] Installed package: cold-start → Settings → Compute → runtime download → serve → clean shutdown The last two need a Linux run/host. **Note (from review):** `linux-canary.yml` is `workflow_dispatch`-only and its `Require main` step rejects non-main refs, so the canary cannot run on this branch pre-merge — and `.github/workflows/**` matches no ci.yml paths-filter, so this PR's own CI does not exercise the changed lines. Validation sequencing is therefore merge → dispatch linux-canary on main → live-package pass, with a trivial 2-line revert as the escape hatch. Signed-off-by: npub1qyvc0c5kl4gqv2fd97fsk46tu378sqgy35vc83rvgfwne90sel7s0ed67d <011987e296fd5006292d2f930b574be47c7801048d1983c46c425d3c95f0cffd@buzz.block.builderlab.xyz> Co-authored-by: npub1qyvc0c5kl4gqv2fd97fsk46tu378sqgy35vc83rvgfwne90sel7s0ed67d <011987e296fd5006292d2f930b574be47c7801048d1983c46c425d3c95f0cffd@buzz.block.builderlab.xyz> --- .github/workflows/linux-canary.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux-canary.yml b/.github/workflows/linux-canary.yml index 1664878770..e1625f4ec8 100644 --- a/.github/workflows/linux-canary.yml +++ b/.github/workflows/linux-canary.yml @@ -170,7 +170,7 @@ jobs: ./scripts/bundle-sidecars.sh - name: Build Linux Tauri app - run: cd desktop && pnpm tauri build --ci --bundles deb,appimage --config src-tauri/tauri.canary.conf.json + run: cd desktop && pnpm tauri build --ci --bundles deb,appimage --features mesh-llm --config src-tauri/tauri.canary.conf.json env: CMAKE_POLICY_VERSION_MINIMUM: "3.5" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 02011ad386..9da067b74e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -573,7 +573,7 @@ jobs: BUZZ_UPDATER_ENDPOINT: https://github.com/block/buzz/releases/download/buzz-desktop-latest/latest.json - name: Build Linux Tauri app - run: cd desktop && pnpm tauri build --verbose --ci --bundles deb,appimage --config src-tauri/tauri.release.conf.json + run: cd desktop && pnpm tauri build --verbose --ci --bundles deb,appimage --features mesh-llm --config src-tauri/tauri.release.conf.json env: BUZZ_UPDATER_PUBLIC_KEY: ${{ secrets.BUZZ_UPDATER_PUBLIC_KEY || secrets.SPROUT_UPDATER_PUBLIC_KEY }} BUZZ_UPDATER_ENDPOINT: https://github.com/block/buzz/releases/download/buzz-desktop-latest/latest.json From 857e63c4ddfb76f95ab40bb691e00544413f6b81 Mon Sep 17 00:00:00 2001 From: klopez4212 Date: Mon, 3 Aug 2026 15:30:23 +0100 Subject: [PATCH 03/27] Polish mobile composer and messaging UI (#3918) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Summary - Refine the mobile composer with compact and expanded states, shared footer fades, haptics, reliable keyboard dismissal, and full-width camera and photo surfaces. - Standardize popovers, filters, and section menus with consistent type, strokes, radii, spacing, icons, and destructive styling. - Align message presentation with desktop through consistent system rows, typing and loading feedback, emoji placement, and predictable photo viewing. ## Validation - `just mobile-check` - `just mobile-test` — 1,037 passed, 1 skipped - Tested on Pixel 10 and a connected iPhone ## Snapshots
Compact composer Attachment menu Recent photos
--------- Signed-off-by: kenny lopez --- mobile/ios/Runner/InlinePhotoPicker.swift | 11 - .../ios/Runner/NativeAttachmentPopover.swift | 89 ++-- .../NativeAttachmentPopoverCoordinator.swift | 68 ++- mobile/ios/RunnerTests/RunnerTests.swift | 35 +- .../lib/features/activity/activity_page.dart | 16 +- .../activity_page/header_actions.dart | 16 - .../activity/activity_page/lists.dart | 4 +- .../activity/activity_page/status_views.dart | 7 +- .../channels/channel_detail_page.dart | 259 ++++++---- .../channel_detail_page/message_list.dart | 71 ++- .../channel_detail_page/system_rows.dart | 22 +- .../channels/channel_typing_indicator.dart | 66 ++- .../channels/channels_page/sections.dart | 66 ++- mobile/lib/features/channels/compose_bar.dart | 126 ++--- .../channels/compose_bar/attachments.dart | 97 ++-- .../channels/compose_bar/camera_preview.dart | 4 +- .../features/channels/compose_bar/dock.dart | 144 ++++++ .../compose_bar/formatting_toolbar.dart | 4 +- .../channels/compose_bar/helpers.dart | 41 ++ .../compose_bar/ios_photo_picker.dart | 9 +- .../features/channels/compose_bar/layout.dart | 32 +- .../compose_bar/photo_gallery_picker.dart | 18 +- .../channels/compose_bar/send_button.dart | 4 +- .../channels/compose_bar/suggestions.dart | 154 +++--- .../channels/composer_dock_size_reporter.dart | 50 ++ .../lib/features/channels/emoji_picker.dart | 4 +- .../channels/emoji_picker/emoji_grid.dart | 5 +- .../features/channels/message_actions.dart | 3 +- .../lib/features/channels/reaction_row.dart | 3 +- .../features/channels/thread_detail_page.dart | 469 ++++++++++++------ .../lib/shared/emoji/native_emoji_glyph.dart | 22 + mobile/lib/shared/theme/app_theme.dart | 20 +- .../lib/shared/theme/message_typography.dart | 10 +- .../shared/widgets/anchored_popover_menu.dart | 32 +- .../lib/shared/widgets/filter_chip_bar.dart | 18 +- .../widgets/keyboard_dismiss_on_drag.dart | 15 +- .../widgets/mobile_tab_footer_backdrop.dart | 32 +- .../features/activity/activity_page_test.dart | 44 +- .../channels/channel_detail_page_test.dart | 346 ++++++++++++- .../features/channels/channels_page_test.dart | 74 +++ .../features/channels/compose_bar_test.dart | 362 ++++++++++++++ .../shared/emoji/native_emoji_glyph_test.dart | 37 ++ mobile/test/shared/theme/app_theme_test.dart | 17 + .../shared/theme/message_typography_test.dart | 7 + .../shared/widgets/filter_chip_bar_test.dart | 52 +- .../keyboard_dismiss_on_drag_test.dart | 23 +- .../mobile_tab_footer_backdrop_test.dart | 22 + 47 files changed, 2376 insertions(+), 654 deletions(-) create mode 100644 mobile/lib/features/channels/compose_bar/dock.dart create mode 100644 mobile/lib/features/channels/composer_dock_size_reporter.dart create mode 100644 mobile/lib/shared/emoji/native_emoji_glyph.dart create mode 100644 mobile/test/shared/emoji/native_emoji_glyph_test.dart diff --git a/mobile/ios/Runner/InlinePhotoPicker.swift b/mobile/ios/Runner/InlinePhotoPicker.swift index 05a576323f..4126734779 100644 --- a/mobile/ios/Runner/InlinePhotoPicker.swift +++ b/mobile/ios/Runner/InlinePhotoPicker.swift @@ -3,14 +3,6 @@ import PhotosUI import UIKit import UniformTypeIdentifiers -enum EmbeddedPhotoPickerLayout { - static func applyPreferredScale(_ zoomIn: () -> Void) { - UIView.performWithoutAnimation { - zoomIn() - } - } -} - final class InlinePhotoPickerFactory: NSObject, FlutterPlatformViewFactory { private let messenger: FlutterBinaryMessenger private weak var parentViewController: UIViewController? @@ -130,9 +122,6 @@ final class InlinePhotoPickerPlatformView: NSObject, FlutterPlatformView { } pickerViewController = picker containerView.layoutIfNeeded() - EmbeddedPhotoPickerLayout.applyPreferredScale { - picker.zoomIn() - } } private func exportPickerResult(_ result: PHPickerResult) async throws -> String { diff --git a/mobile/ios/Runner/NativeAttachmentPopover.swift b/mobile/ios/Runner/NativeAttachmentPopover.swift index f2f6c01df8..cc29de9cb3 100644 --- a/mobile/ios/Runner/NativeAttachmentPopover.swift +++ b/mobile/ios/Runner/NativeAttachmentPopover.swift @@ -17,8 +17,6 @@ final class NativeAttachmentPopoverViewController: case camera } - private typealias ContentPreparation = (@escaping () -> Void) -> Void - private let channel: FlutterMethodChannel private let expandedWidth: CGFloat private let maximumMenuHeight: CGFloat @@ -85,17 +83,29 @@ final class NativeAttachmentPopoverViewController: override func viewDidLoad() { super.viewDidLoad() view.backgroundColor = .clear - view.layer.cornerRadius = 22 + view.layer.cornerRadius = NativeAttachmentPopoverStyle.cornerRadius view.layer.cornerCurve = .continuous - view.clipsToBounds = true + view.layer.borderColor = UIColor.black.withAlphaComponent(0.04).cgColor + view.layer.borderWidth = NativeAttachmentPopoverStyle.borderWidth + view.layer.shadowColor = UIColor.black.cgColor + view.layer.shadowOpacity = NativeAttachmentPopoverStyle.shadowOpacity + view.layer.shadowRadius = NativeAttachmentPopoverStyle.shadowRadius + view.layer.shadowOffset = NativeAttachmentPopoverStyle.shadowOffset + view.clipsToBounds = false let glassEffect = UIGlassEffect(style: .regular) glassEffect.isInteractive = true let glassView = UIVisualEffectView(effect: glassEffect) glassView.translatesAutoresizingMaskIntoConstraints = false + glassView.layer.cornerRadius = NativeAttachmentPopoverStyle.cornerRadius + glassView.layer.cornerCurve = .continuous + glassView.clipsToBounds = true view.addSubview(glassView) contentHost.translatesAutoresizingMaskIntoConstraints = false + contentHost.layer.cornerRadius = NativeAttachmentPopoverStyle.cornerRadius + contentHost.layer.cornerCurve = .continuous + contentHost.clipsToBounds = true view.addSubview(contentHost) NSLayoutConstraint.activate([ glassView.leadingAnchor.constraint(equalTo: view.leadingAnchor), @@ -114,6 +124,11 @@ final class NativeAttachmentPopoverViewController: override func viewDidLayoutSubviews() { super.viewDidLayoutSubviews() + view.layer.shadowPath = + UIBezierPath( + roundedRect: view.bounds, + cornerRadius: NativeAttachmentPopoverStyle.cornerRadius + ).cgPath cameraPreviewLayer?.frame = cameraPreviewView?.bounds ?? .zero } @@ -198,21 +213,21 @@ final class NativeAttachmentPopoverViewController: makeNativeAttachmentMenuButton( title: "Camera", symbol: "camera", - action: UIAction { [weak self] _ in self?.showCamera() } + action: { [weak self] in self?.showCamera() } ) ) stack.addArrangedSubview( makeNativeAttachmentMenuButton( title: "Photos", symbol: "photo.on.rectangle.angled", - action: UIAction { [weak self] _ in self?.showPhotos() } + action: { [weak self] in self?.showPhotos() } ) ) stack.addArrangedSubview( makeNativeAttachmentMenuButton( title: "Video", symbol: "video", - action: UIAction { [weak self] _ in + action: { [weak self] in self?.finish(method: "pickVideo") } ) @@ -221,7 +236,7 @@ final class NativeAttachmentPopoverViewController: makeNativeAttachmentMenuButton( title: "Files", symbol: "doc", - action: UIAction { [weak self] _ in + action: { [weak self] in self?.finish(method: "pickFiles") } ) @@ -280,14 +295,14 @@ final class NativeAttachmentPopoverViewController: title: nil, symbol: "chevron.left", accessibilityLabel: "Back to attachment options", - action: UIAction { [weak self] _ in self?.showMenu() } + action: { [weak self] in self?.showMenu() } ) let actionButton = makeGlassControl( title: "All Photos", symbol: nil, accessibilityLabel: "All Photos", prominent: true, - action: UIAction { [weak self] _ in self?.performPhotoAction() } + action: { [weak self] in self?.performPhotoAction() } ) photoActionButton = actionButton addBottomControls( @@ -296,27 +311,7 @@ final class NativeAttachmentPopoverViewController: trailing: actionButton ) - transition( - to: .photos, - content: container, - preparation: { [weak picker] reveal in - guard let picker else { - reveal() - return - } - // PHPicker ignores scale changes while its remote grid is still - // adapting to the compact menu bounds. Give it one main-loop turn at - // the final popover size, apply the scale offscreen, then reveal it. - DispatchQueue.main.async { - picker.view.layoutIfNeeded() - EmbeddedPhotoPickerLayout.applyPreferredScale { - picker.zoomIn() - picker.view.layoutIfNeeded() - } - DispatchQueue.main.async(execute: reveal) - } - } - ) + transition(to: .photos, content: container) } private func showCamera() { @@ -353,7 +348,7 @@ final class NativeAttachmentPopoverViewController: title: nil, symbol: "chevron.left", accessibilityLabel: "Back to attachment options", - action: UIAction { [weak self] _ in self?.showMenu() } + action: { [weak self] in self?.showMenu() } ) let captureButton = makeCameraCaptureButton() cameraCaptureButton = captureButton @@ -415,7 +410,6 @@ final class NativeAttachmentPopoverViewController: private func transition( to nextSurface: Surface, content nextView: UIView, - preparation: ContentPreparation? = nil, completion: (() -> Void)? = nil ) { let previousView = visibleContentView @@ -485,11 +479,7 @@ final class NativeAttachmentPopoverViewController: } } - if let preparation { - preparation(reveal) - } else { - reveal() - } + reveal() } } @@ -498,7 +488,7 @@ final class NativeAttachmentPopoverViewController: symbol: String?, accessibilityLabel: String, prominent: Bool = false, - action: UIAction + action: @escaping () -> Void ) -> UIButton { var configuration = prominent @@ -513,20 +503,37 @@ final class NativeAttachmentPopoverViewController: } configuration.imagePadding = 8 configuration.baseForegroundColor = .white + configuration.titleTextAttributesTransformer = + UIConfigurationTextAttributesTransformer { attributes in + var interAttributes = attributes + interAttributes.font = NativeAttachmentMenuTypography.font( + forTextStyle: .body + ) + return interAttributes + } configuration.contentInsets = NSDirectionalEdgeInsets( top: 11, leading: 15, bottom: 11, trailing: 15 ) - let button = UIButton(configuration: configuration, primaryAction: action) + let button = UIButton( + configuration: configuration, + primaryAction: UIAction { _ in + UISelectionFeedbackGenerator().selectionChanged() + action() + } + ) button.accessibilityLabel = accessibilityLabel return button } private func makeCameraCaptureButton() -> UIButton { let button = UIButton( - primaryAction: UIAction { [weak self] _ in self?.capturePhoto() } + primaryAction: UIAction { [weak self] _ in + UISelectionFeedbackGenerator().selectionChanged() + self?.capturePhoto() + } ) button.accessibilityLabel = "Take photo" button.translatesAutoresizingMaskIntoConstraints = false diff --git a/mobile/ios/Runner/NativeAttachmentPopoverCoordinator.swift b/mobile/ios/Runner/NativeAttachmentPopoverCoordinator.swift index 73559d7c2b..f59db1f84c 100644 --- a/mobile/ios/Runner/NativeAttachmentPopoverCoordinator.swift +++ b/mobile/ios/Runner/NativeAttachmentPopoverCoordinator.swift @@ -1,3 +1,4 @@ +import CoreText import Flutter import UIKit @@ -276,7 +277,7 @@ enum NativeAttachmentMenuLayout { static func itemHeight( compatibleWith traitCollection: UITraitCollection ) -> CGFloat { - let labelHeight = UIFont.preferredFont( + let labelHeight = NativeAttachmentMenuTypography.font( forTextStyle: labelTextStyle, compatibleWith: traitCollection ).lineHeight @@ -313,12 +314,71 @@ enum NativeAttachmentMenuLayout { } } +enum NativeAttachmentMenuTypography { + static let interPostScriptName = "InterVariable" + + private static let registeredInter: Bool = { + let fontURL = Bundle.main.bundleURL + .appendingPathComponent("Frameworks") + .appendingPathComponent("App.framework") + .appendingPathComponent("flutter_assets") + .appendingPathComponent("assets") + .appendingPathComponent("fonts") + .appendingPathComponent("InterVariable.ttf") + guard FileManager.default.fileExists(atPath: fontURL.path) else { + return false + } + return CTFontManagerRegisterFontsForURL( + fontURL as CFURL, + .process, + nil + ) + }() + + static func font( + forTextStyle textStyle: UIFont.TextStyle, + compatibleWith traitCollection: UITraitCollection? = nil + ) -> UIFont { + _ = registeredInter + let scaledPointSize = UIFontMetrics(forTextStyle: textStyle).scaledValue( + for: 20, + compatibleWith: traitCollection + ) + let preferredFont = UIFont.preferredFont( + forTextStyle: textStyle, + compatibleWith: traitCollection + ) + guard + let interFont = UIFont( + name: interPostScriptName, + size: scaledPointSize + ) + else { + return preferredFont + } + return interFont + } +} + +enum NativeAttachmentPopoverStyle { + static let cornerRadius: CGFloat = 20 + static let shadowOpacity: Float = 0.18 + static let shadowRadius: CGFloat = 12 + static let shadowOffset = CGSize(width: 0, height: 6) + static let borderWidth: CGFloat = 1 +} + func makeNativeAttachmentMenuButton( title: String, symbol: String, - action: UIAction + action: @escaping () -> Void ) -> UIButton { - let button = UIButton(primaryAction: action) + let button = UIButton( + primaryAction: UIAction { _ in + UISelectionFeedbackGenerator().selectionChanged() + action() + } + ) button.accessibilityLabel = title let symbolConfiguration = UIImage.SymbolConfiguration( @@ -338,7 +398,7 @@ func makeNativeAttachmentMenuButton( let titleLabel = UILabel() titleLabel.text = title titleLabel.textColor = .label - titleLabel.font = .preferredFont( + titleLabel.font = NativeAttachmentMenuTypography.font( forTextStyle: NativeAttachmentMenuLayout.labelTextStyle ) titleLabel.adjustsFontForContentSizeCategory = true diff --git a/mobile/ios/RunnerTests/RunnerTests.swift b/mobile/ios/RunnerTests/RunnerTests.swift index c5333cfdf2..8374ca77b6 100644 --- a/mobile/ios/RunnerTests/RunnerTests.swift +++ b/mobile/ios/RunnerTests/RunnerTests.swift @@ -127,19 +127,6 @@ class RunnerTests: XCTestCase { ) } - func testEmbeddedPhotoPickerAppliesOneZoomInStepWithoutAnimation() { - var zoomInCalls = 0 - var animationsWereEnabled = true - - EmbeddedPhotoPickerLayout.applyPreferredScale { - zoomInCalls += 1 - animationsWereEnabled = UIView.areAnimationsEnabled - } - - XCTAssertEqual(zoomInCalls, 1) - XCTAssertFalse(animationsWereEnabled) - } - func testNativeAttachmentMenuUsesRoomyRowsAndInsets() { let traits = UITraitCollection(preferredContentSizeCategory: .large) let size = NativeAttachmentMenuLayout.size(compatibleWith: traits) @@ -155,6 +142,28 @@ class RunnerTests: XCTestCase { XCTAssertEqual(NativeAttachmentMenuLayout.labelTextStyle, .title3) } + func testNativeAttachmentMenuUsesInterAndSharedPopoverChrome() { + let font = NativeAttachmentMenuTypography.font( + forTextStyle: NativeAttachmentMenuLayout.labelTextStyle + ) + var didSelect = false + let button = makeNativeAttachmentMenuButton( + title: "Photos", + symbol: "photo", + action: { didSelect = true } + ) + let titleLabel = button.subviews.compactMap { $0 as? UILabel }.first + + XCTAssertTrue(font.fontName.hasPrefix("Inter")) + XCTAssertTrue(titleLabel?.font.fontName.hasPrefix("Inter") == true) + XCTAssertEqual(NativeAttachmentPopoverStyle.cornerRadius, 20) + XCTAssertEqual(NativeAttachmentPopoverStyle.borderWidth, 1) + XCTAssertEqual(NativeAttachmentPopoverStyle.shadowOpacity, 0.18) + + button.sendActions(for: .primaryActionTriggered) + XCTAssertTrue(didSelect) + } + func testNativeAttachmentMenuGrowsAndScrollsForAccessibilityText() { let traits = UITraitCollection( preferredContentSizeCategory: .accessibilityExtraExtraExtraLarge diff --git a/mobile/lib/features/activity/activity_page.dart b/mobile/lib/features/activity/activity_page.dart index aecef6329c..5b4cebfa97 100644 --- a/mobile/lib/features/activity/activity_page.dart +++ b/mobile/lib/features/activity/activity_page.dart @@ -37,6 +37,18 @@ part 'activity_page/inbox_row.dart'; part 'activity_page/lists.dart'; part 'activity_page/status_views.dart'; +EdgeInsets _activityScrollPadding( + BuildContext context, { + double horizontal = 0, + double top = Grid.xxs, + double bottom = Grid.xxs, +}) => EdgeInsets.fromLTRB( + horizontal, + top, + horizontal, + MediaQuery.paddingOf(context).bottom + bottom, +); + /// Conversation-oriented Activity inbox. /// /// Matches desktop's Home inbox item design and semantics (see @@ -264,7 +276,7 @@ class ActivityPage extends HookConsumerWidget { body = RefreshIndicator( onRefresh: refresh, child: ListView.builder( - padding: const EdgeInsets.symmetric(vertical: Grid.xxs), + padding: _activityScrollPadding(context), itemCount: visibleItems.length, itemBuilder: (context, index) { final item = visibleItems[index]; @@ -318,7 +330,9 @@ class ActivityPage extends HookConsumerWidget { ], ), body: SafeArea( + key: const ValueKey('activity-content-safe-area'), top: false, + bottom: false, child: Padding( padding: EdgeInsets.only( top: frostedAppBarHeight(context, titleStyle: headerTitleStyle), diff --git a/mobile/lib/features/activity/activity_page/header_actions.dart b/mobile/lib/features/activity/activity_page/header_actions.dart index 56592e2e69..39bb29e7a3 100644 --- a/mobile/lib/features/activity/activity_page/header_actions.dart +++ b/mobile/lib/features/activity/activity_page/header_actions.dart @@ -39,15 +39,6 @@ class _FilterMenuButton extends StatelessWidget { alignment: AnchoredPopoverAlignment.start, offset: const Offset(0, Grid.half), menuPadding: const EdgeInsets.symmetric(vertical: Grid.half), - color: context.colors.surface.withValues(alpha: 0.98), - elevation: 8, - shadowColor: context.colors.shadow.withValues(alpha: 0.18), - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(Radii.card), - side: BorderSide( - color: context.colors.outlineVariant.withValues(alpha: 0.45), - ), - ), surfaceKey: const ValueKey('activity-filter-popover'), items: [ for (final entry in _filterLabels.entries) @@ -183,13 +174,6 @@ class _InboxOptionsButton extends StatelessWidget { context: buttonContext, width: 216, alignment: AnchoredPopoverAlignment.end, - color: context.colors.surface, - elevation: 4, - shadowColor: context.colors.shadow.withValues(alpha: 0.18), - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(Radii.md), - side: BorderSide(color: context.colors.outline), - ), surfaceKey: const ValueKey('activity-options-popover'), items: [ PopupMenuItem( diff --git a/mobile/lib/features/activity/activity_page/lists.dart b/mobile/lib/features/activity/activity_page/lists.dart index 37311c9287..9df193fe96 100644 --- a/mobile/lib/features/activity/activity_page/lists.dart +++ b/mobile/lib/features/activity/activity_page/lists.dart @@ -36,7 +36,7 @@ class _RemindersList extends ConsumerWidget { return RefreshIndicator( onRefresh: onRefresh, child: ListView.builder( - padding: const EdgeInsets.symmetric(vertical: Grid.xxs), + padding: _activityScrollPadding(context), itemCount: reminders.length, itemBuilder: (context, index) { final reminder = reminders[index]; @@ -97,7 +97,7 @@ class _DraftsList extends StatelessWidget { } return ListView.builder( - padding: const EdgeInsets.symmetric(vertical: Grid.xxs), + padding: _activityScrollPadding(context), itemCount: drafts.length, itemBuilder: (context, index) { final draft = drafts[index]; diff --git a/mobile/lib/features/activity/activity_page/status_views.dart b/mobile/lib/features/activity/activity_page/status_views.dart index 11115d9dc8..442634849c 100644 --- a/mobile/lib/features/activity/activity_page/status_views.dart +++ b/mobile/lib/features/activity/activity_page/status_views.dart @@ -6,7 +6,12 @@ class _LoadingSkeleton extends StatelessWidget { @override Widget build(BuildContext context) { return ListView.separated( - padding: const EdgeInsets.all(Grid.gutter), + padding: _activityScrollPadding( + context, + horizontal: Grid.gutter, + top: Grid.gutter, + bottom: Grid.gutter, + ), itemCount: 8, separatorBuilder: (_, _) => const SizedBox(height: Grid.xs), itemBuilder: (context, _) => Row( diff --git a/mobile/lib/features/channels/channel_detail_page.dart b/mobile/lib/features/channels/channel_detail_page.dart index a24b6c07ee..f1efb1557f 100644 --- a/mobile/lib/features/channels/channel_detail_page.dart +++ b/mobile/lib/features/channels/channel_detail_page.dart @@ -1,5 +1,6 @@ import 'dart:async'; import 'dart:math' show min; +import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart' show ScrollDirection; @@ -32,6 +33,7 @@ import 'channel_typing_provider.dart'; import 'channel_typing_indicator.dart'; import 'channels_provider.dart'; import 'compose_bar.dart'; +import 'composer_dock_size_reporter.dart'; import 'date_formatters.dart'; import 'day_divider.dart'; import 'dm_channel_labels.dart'; @@ -125,6 +127,7 @@ class ChannelDetailPage extends HookConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { + final composerDockHeight = useState(0.0); final detailsAsync = ref.watch(channelDetailsProvider(channel.id)); final channelsAsync = ref.watch(channelsProvider); final messagesState = ref.watch(channelMessagesProvider(channel.id)); @@ -156,6 +159,10 @@ class ChannelDetailPage extends HookConsumerWidget { channel; final resolvedChannel = detailsAsync.whenData(baseChannel.mergeDetails).value ?? baseChannel; + final showsComposer = + !resolvedChannel.isForum && + resolvedChannel.isMember && + !resolvedChannel.isArchived; final messagesNotifier = ref.read( channelMessagesProvider(channel.id).notifier, ); @@ -293,122 +300,162 @@ class ChannelDetailPage extends HookConsumerWidget { ), ], ), - body: Column( + body: Stack( + fit: StackFit.expand, children: [ - Expanded( - child: resolvedChannel.isForum - ? Stack( - fit: StackFit.expand, - children: [ - ForumPostsView( - channel: resolvedChannel, - currentPubkey: currentPubkey, - ), - if (showConnectionSkeleton.value) - Positioned( - top: - frostedAppBarHeight( - context, - titleContentHeight: appBarTitleContentHeight, - ) + - Grid.xs, - left: Grid.gutter, - right: Grid.gutter, - child: _ForumConnectionSkeleton( - status: sessionStatus, - ), - ), - ], - ) - : SkeletonReveal( - loading: - showInitialConnectionSkeleton || - showConnectionSkeleton.value || - messagesState.isLoading, - shimmerEnabled: sessionStatus != SessionStatus.disconnected, - skeleton: _MessageTimelineSkeleton( - appBarTitleContentHeight: appBarTitleContentHeight, - status: sessionStatus, - ), - content: messagesState.when( - loading: SizedBox.shrink, - error: (e, _) => Padding( - padding: EdgeInsets.only( - top: frostedAppBarHeight( - context, - titleContentHeight: appBarTitleContentHeight, + Column( + children: [ + Expanded( + child: resolvedChannel.isForum + ? Stack( + fit: StackFit.expand, + children: [ + ForumPostsView( + channel: resolvedChannel, + currentPubkey: currentPubkey, ), + if (showConnectionSkeleton.value) + Positioned( + top: + frostedAppBarHeight( + context, + titleContentHeight: + appBarTitleContentHeight, + ) + + Grid.xs, + left: Grid.gutter, + right: Grid.gutter, + child: _ForumConnectionSkeleton( + status: sessionStatus, + ), + ), + ], + ) + : SkeletonReveal( + loading: + showInitialConnectionSkeleton || + showConnectionSkeleton.value || + messagesState.isLoading, + shimmerEnabled: + sessionStatus != SessionStatus.disconnected, + skeleton: _MessageTimelineSkeleton( + appBarTitleContentHeight: appBarTitleContentHeight, + status: sessionStatus, ), - child: Center( - child: Text( - 'Failed to load messages', - style: context.textTheme.bodyMedium?.copyWith( - color: context.colors.error, + content: messagesState.when( + loading: SizedBox.shrink, + error: (e, _) => Padding( + padding: EdgeInsets.only( + top: frostedAppBarHeight( + context, + titleContentHeight: appBarTitleContentHeight, + ), + ), + child: Center( + child: Text( + 'Failed to load messages', + style: context.textTheme.bodyMedium?.copyWith( + color: context.colors.error, + ), + ), ), ), + data: (events) { + final messages = formatTimeline( + events, + currentPubkey: currentPubkey, + ); + final summaries = ref + .read( + channelMessagesProvider(channel.id).notifier, + ) + .threadSummaries; + final entries = buildMainTimelineEntries( + messages, + relaySummaries: summaries, + ); + return _MessageList( + entries: entries, + allMessages: messages, + initialMessageId: initialMessageId, + initialThreadRootId: initialThreadRootId, + channelId: channel.id, + currentPubkey: currentPubkey, + isMember: resolvedChannel.isMember, + isArchived: resolvedChannel.isArchived, + appBarTitleContentHeight: + appBarTitleContentHeight, + composerBottomInset: showsComposer + ? composerDockHeight.value + : 0, + ); + }, ), ), - data: (events) { - final messages = formatTimeline( - events, - currentPubkey: currentPubkey, - ); - final summaries = ref - .read(channelMessagesProvider(channel.id).notifier) - .threadSummaries; - final entries = buildMainTimelineEntries( - messages, - relaySummaries: summaries, - ); - return _MessageList( - entries: entries, - allMessages: messages, - initialMessageId: initialMessageId, - initialThreadRootId: initialThreadRootId, - channelId: channel.id, - currentPubkey: currentPubkey, - isMember: resolvedChannel.isMember, - isArchived: resolvedChannel.isArchived, - appBarTitleContentHeight: appBarTitleContentHeight, - ); - }, - ), - ), + ), + if (!resolvedChannel.isForum && + (!resolvedChannel.isMember || + resolvedChannel.isArchived)) ...[ + AnimatedSize( + duration: MediaQuery.disableAnimationsOf(context) + ? Duration.zero + : const Duration(milliseconds: 180), + curve: Curves.easeOutCubic, + alignment: Alignment.bottomCenter, + child: typingEntries.isEmpty + ? const SizedBox.shrink() + : ChannelTypingIndicator(entries: typingEntries), + ), + if (!resolvedChannel.isDm) + _ReadOnlyNotice(channel: resolvedChannel), + ], + ], ), - if (!resolvedChannel.isForum) - AnimatedSize( - duration: MediaQuery.disableAnimationsOf(context) - ? Duration.zero - : const Duration(milliseconds: 180), - curve: Curves.easeOutCubic, + if (showsComposer) + Align( alignment: Alignment.bottomCenter, - child: typingEntries.isEmpty - ? const SizedBox.shrink() - : ChannelTypingIndicator(entries: typingEntries), + child: ComposerDockSizeReporter( + key: const ValueKey('channel-composer-dock'), + onHeightChanged: (height) { + if ((composerDockHeight.value - height).abs() < 0.5) return; + composerDockHeight.value = height; + }, + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + AnimatedSize( + duration: MediaQuery.disableAnimationsOf(context) + ? Duration.zero + : const Duration(milliseconds: 180), + curve: Curves.easeOutCubic, + alignment: Alignment.bottomCenter, + child: typingEntries.isEmpty + ? const SizedBox.shrink() + : ChannelTypingIndicator(entries: typingEntries), + ), + ComposeBar( + channelId: channel.id, + channelName: resolvedChannel.isDm + ? '' + : resolvedChannel.name, + onSend: + ( + content, + mentionPubkeys, { + mediaTags = const >[], + }) => ref + .read(sendMessageProvider) + .call( + channelId: channel.id, + content: content, + mentionPubkeys: mentionPubkeys, + mediaTags: mediaTags, + ), + ), + ], + ), + ), ), - if (!resolvedChannel.isForum && - resolvedChannel.isMember && - !resolvedChannel.isArchived) - ComposeBar( - channelId: channel.id, - channelName: resolvedChannel.isDm ? '' : resolvedChannel.name, - onSend: - ( - content, - mentionPubkeys, { - mediaTags = const >[], - }) => ref - .read(sendMessageProvider) - .call( - channelId: channel.id, - content: content, - mentionPubkeys: mentionPubkeys, - mediaTags: mediaTags, - ), - ) - else if (!resolvedChannel.isDm && - (!resolvedChannel.isMember || resolvedChannel.isArchived)) - _ReadOnlyNotice(channel: resolvedChannel), ], ), ); diff --git a/mobile/lib/features/channels/channel_detail_page/message_list.dart b/mobile/lib/features/channels/channel_detail_page/message_list.dart index eacba5856e..ac73a5076e 100644 --- a/mobile/lib/features/channels/channel_detail_page/message_list.dart +++ b/mobile/lib/features/channels/channel_detail_page/message_list.dart @@ -10,6 +10,7 @@ class _MessageList extends HookConsumerWidget { final bool isMember; final bool isArchived; final double appBarTitleContentHeight; + final double composerBottomInset; const _MessageList({ required this.entries, @@ -21,6 +22,7 @@ class _MessageList extends HookConsumerWidget { required this.isMember, required this.isArchived, required this.appBarTitleContentHeight, + required this.composerBottomInset, }); @override @@ -259,7 +261,7 @@ class _MessageList extends HookConsumerWidget { context, titleContentHeight: appBarTitleContentHeight, ), - bottom: 0, + bottom: composerBottomInset, ), itemCount: displayEntries.length + (isLoadingOlder.value ? 1 : 0), itemBuilder: (context, index) { @@ -356,25 +358,76 @@ class _MessageList extends HookConsumerWidget { Positioned( left: 0, right: 0, - bottom: Grid.xs, + bottom: composerBottomInset + Grid.xs, child: Center( - child: FilledButton.icon( + child: _JumpToLatestButton( key: const ValueKey('channel-jump-to-latest'), onPressed: scrollToLatest, - style: FilledButton.styleFrom( - backgroundColor: context.colors.primaryContainer, - foregroundColor: context.colors.onPrimaryContainer, + ), + ), + ), + ], + ); + } +} + +class _JumpToLatestButton extends StatelessWidget { + final VoidCallback onPressed; + + const _JumpToLatestButton({required this.onPressed, super.key}); + + @override + Widget build(BuildContext context) { + final borderRadius = BorderRadius.circular(Radii.full); + return Semantics( + button: true, + child: ClipRRect( + borderRadius: borderRadius, + child: BackdropFilter( + filter: ImageFilter.blur(sigmaX: 20, sigmaY: 20), + child: Container( + key: const ValueKey('channel-jump-to-latest-surface'), + decoration: BoxDecoration( + color: context.colors.surface.withValues(alpha: 0.5), + borderRadius: borderRadius, + border: Border.all( + color: Colors.black.withValues(alpha: 0.04), + width: 1, + ), + ), + child: Material( + type: MaterialType.transparency, + child: InkWell( + onTap: onPressed, + borderRadius: borderRadius, + child: Padding( padding: const EdgeInsets.symmetric( horizontal: Grid.gutter, vertical: Grid.xxs, ), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Icon( + LucideIcons.arrowDown, + size: 16, + color: context.colors.onSurface, + ), + const SizedBox(width: Grid.half), + Text( + 'Latest', + style: context.textTheme.labelLarge?.copyWith( + color: context.colors.onSurface, + ), + ), + ], + ), ), - icon: const Icon(LucideIcons.arrowDown, size: 16), - label: const Text('Latest'), ), ), ), - ], + ), + ), ); } } diff --git a/mobile/lib/features/channels/channel_detail_page/system_rows.dart b/mobile/lib/features/channels/channel_detail_page/system_rows.dart index 0372690e1e..e22a31684e 100644 --- a/mobile/lib/features/channels/channel_detail_page/system_rows.dart +++ b/mobile/lib/features/channels/channel_detail_page/system_rows.dart @@ -27,12 +27,18 @@ class _SystemMessageRow extends ConsumerWidget { final userCache = ref.watch(userCacheProvider); final sourceMessages = groupedMessages ?? [message]; final groupedMembership = _membershipDisplayEvent(sourceMessages); - final channelCreator = systemEvent.type == SystemEventType.channelCreated - ? systemEvent.actorPubkey?.trim() - : null; + final messageStyleAction = switch (systemEvent.type) { + SystemEventType.channelCreated => 'created this channel', + SystemEventType.huddleStarted => 'started a huddle', + SystemEventType.huddleEnded => 'ended the huddle', + _ => null, + }; + final messageStyleActor = messageStyleAction == null + ? null + : systemEvent.actorPubkey?.trim(); final usesMessageStyleLayout = groupedMembership != null || - (channelCreator != null && channelCreator.isNotEmpty); + (messageStyleActor != null && messageStyleActor.isNotEmpty); String resolveLabel(String? pubkey) { if (pubkey == null) return 'Someone'; @@ -102,13 +108,15 @@ class _SystemMessageRow extends ConsumerWidget { resolveLabel: resolveLabel, userCache: userCache, ) - else if (channelCreator != null && channelCreator.isNotEmpty) + else if (messageStyleActor != null && + messageStyleActor.isNotEmpty && + messageStyleAction != null) _MessageStyleSystemMessageContent( - displayPubkey: channelCreator, + displayPubkey: messageStyleActor, createdAt: message.createdAt, resolveLabel: resolveLabel, userCache: userCache, - actionSpans: const [TextSpan(text: 'created this channel')], + actionSpans: [TextSpan(text: messageStyleAction)], ) else Row( diff --git a/mobile/lib/features/channels/channel_typing_indicator.dart b/mobile/lib/features/channels/channel_typing_indicator.dart index d021b9e287..0543f13b06 100644 --- a/mobile/lib/features/channels/channel_typing_indicator.dart +++ b/mobile/lib/features/channels/channel_typing_indicator.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import '../../shared/theme/theme.dart'; @@ -72,13 +73,11 @@ class ChannelTypingIndicator extends ConsumerWidget { ), const SizedBox(width: Grid.xxs), Flexible( - child: Text( + child: _TypingTextShimmer( text, style: context.textTheme.labelSmall?.copyWith( - color: context.colors.primary, - fontStyle: FontStyle.italic, + color: context.colors.onSurfaceVariant, ), - overflow: TextOverflow.ellipsis, ), ), ], @@ -87,3 +86,62 @@ class ChannelTypingIndicator extends ConsumerWidget { ); } } + +class _TypingTextShimmer extends HookWidget { + final String text; + final TextStyle? style; + + const _TypingTextShimmer(this.text, {this.style}); + + @override + Widget build(BuildContext context) { + final animation = useAnimationController( + duration: const Duration(milliseconds: 2600), + ); + final reducedMotion = MediaQuery.disableAnimationsOf(context); + final baseColor = style?.color ?? context.colors.onSurfaceVariant; + final highlightColor = + Color.lerp(context.colors.surface, baseColor, 0.4) ?? baseColor; + + useEffect(() { + if (reducedMotion) { + animation + ..stop() + ..value = 0; + } else { + animation.repeat(); + } + return animation.stop; + }, [animation, reducedMotion]); + + final label = Text(text, style: style, overflow: TextOverflow.ellipsis); + if (reducedMotion) return label; + + return RepaintBoundary( + child: AnimatedBuilder( + animation: animation, + child: label, + builder: (context, child) { + final center = 1.5 - (animation.value * 3); + return ShaderMask( + key: const ValueKey('channel-typing-shimmer'), + blendMode: BlendMode.srcIn, + shaderCallback: (bounds) => LinearGradient( + begin: Alignment(center - 1, 0), + end: Alignment(center + 1, 0), + colors: [ + baseColor, + baseColor, + highlightColor, + baseColor, + baseColor, + ], + stops: const [0, 0.34, 0.5, 0.66, 1], + ).createShader(bounds), + child: child, + ); + }, + ), + ); + } +} diff --git a/mobile/lib/features/channels/channels_page/sections.dart b/mobile/lib/features/channels/channels_page/sections.dart index f9fe5453d7..febe16e996 100644 --- a/mobile/lib/features/channels/channels_page/sections.dart +++ b/mobile/lib/features/channels/channels_page/sections.dart @@ -1,5 +1,7 @@ part of '../channels_page.dart'; +const _sectionMenuItemPadding = EdgeInsets.fromLTRB(Grid.xs, 0, Grid.twelve, 0); + class _CustomChannelSection extends StatelessWidget { final ChannelSection section; final List channels; @@ -178,32 +180,42 @@ class _CustomSectionHeader extends ConsumerWidget { context: buttonContext, width: 216, alignment: AnchoredPopoverAlignment.end, - color: context.colors.surface, - elevation: 4, - shadowColor: context.colors.shadow.withValues(alpha: 0.18), - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(Radii.md), - side: BorderSide(color: context.colors.outline), - ), surfaceKey: ValueKey('section-popover-${section.id}'), items: [ const PopupMenuItem( value: 'rename', - child: Text('Rename'), + padding: _sectionMenuItemPadding, + child: _SectionMenuItemContent( + icon: LucideIcons.pencil, + label: 'Rename section', + ), ), PopupMenuItem( value: 'move_up', enabled: !isFirst, - child: const Text('Move Up'), + padding: _sectionMenuItemPadding, + child: const _SectionMenuItemContent( + icon: LucideIcons.arrowUp, + label: 'Move up', + ), ), PopupMenuItem( value: 'move_down', enabled: !isLast, - child: const Text('Move Down'), + padding: _sectionMenuItemPadding, + child: const _SectionMenuItemContent( + icon: LucideIcons.arrowDown, + label: 'Move down', + ), ), - const PopupMenuItem( + PopupMenuItem( value: 'delete', - child: Text('Delete'), + padding: _sectionMenuItemPadding, + child: _SectionMenuItemContent( + icon: LucideIcons.trash2, + label: 'Delete section', + color: context.colors.error, + ), ), ], ); @@ -229,6 +241,36 @@ class _CustomSectionHeader extends ConsumerWidget { } } +class _SectionMenuItemContent extends StatelessWidget { + final IconData icon; + final String label; + final Color? color; + + const _SectionMenuItemContent({ + required this.icon, + required this.label, + this.color, + }); + + @override + Widget build(BuildContext context) { + return Row( + children: [ + Icon(icon, size: 16, color: color), + const SizedBox(width: Grid.xxs), + Flexible( + child: Text( + label, + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: color == null ? null : TextStyle(color: color), + ), + ), + ], + ); + } +} + CustomEmoji? _resolveCustomEmoji(String icon, List palette) { if (!icon.startsWith(':') || !icon.endsWith(':')) return null; final shortcode = normalizeShortcode(icon); diff --git a/mobile/lib/features/channels/compose_bar.dart b/mobile/lib/features/channels/compose_bar.dart index 7560f998f3..fe0d5cf5d4 100644 --- a/mobile/lib/features/channels/compose_bar.dart +++ b/mobile/lib/features/channels/compose_bar.dart @@ -1,6 +1,7 @@ import 'dart:async'; import 'dart:collection'; import 'dart:math' as math; +import 'dart:ui' show FlutterView; import 'package:camera/camera.dart' as camera; import 'package:flutter/foundation.dart'; @@ -19,8 +20,10 @@ import '../../shared/mentions/agent_identity_provider.dart'; import '../../shared/relay/relay.dart'; import '../../shared/theme/theme.dart'; import '../../shared/widgets/avatar_image.dart'; +import '../../shared/widgets/anchored_popover_menu.dart'; import '../../shared/widgets/buzz_loading_indicator.dart'; import '../../shared/widgets/keyboard_dismiss_on_drag.dart'; +import '../../shared/widgets/mobile_tab_footer_backdrop.dart'; import '../profile/user_cache_provider.dart'; import '../profile/user_profile.dart'; import '../../shared/custom_emoji/custom_emoji.dart'; @@ -48,6 +51,7 @@ part 'compose_bar/ios_attachment_popover.dart'; part 'compose_bar/camera_preview.dart'; part 'compose_bar/send_button.dart'; part 'compose_bar/layout.dart'; +part 'compose_bar/dock.dart'; const _maxConcurrentImageUploads = 3; @@ -84,6 +88,7 @@ class ComposeBar extends HookConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { final controller = useMemoized(_MarkdownEditingController.new); + useListenable(controller); useEffect(() => controller.dispose, [controller]); // Restore and persist unsent text as a local draft so the Activity @@ -126,7 +131,13 @@ class ComposeBar extends HookConsumerWidget { return () => controller.removeListener(persistDraft); }, [controller, draftKey, draftIdentity]); final focusNode = useFocusNode(); + useEffect( + () => + () => _dismissComposerKeyboard(focusNode), + [focusNode], + ); final isComposerExpanded = useState(false); + final isEmojiPickerOpen = useState(false); final attachmentSurface = useState(_AttachmentSurface.closed); final iosAttachmentPopover = useMemoized( _IOSAttachmentPopoverController.new, @@ -144,6 +155,7 @@ class ComposeBar extends HookConsumerWidget { final clipboardHasImage = useState(false); final hasAttachments = attachments.value.isNotEmpty; final hasPendingUploads = uploadingCount.value > 0; + final canSend = controller.text.trim().isNotEmpty || hasAttachments; final customEmoji = ref.watch(customEmojiListProvider); final reducedMotion = MediaQuery.disableAnimationsOf(context); final composerExpansionController = useAnimationController( @@ -155,6 +167,42 @@ class ComposeBar extends HookConsumerWidget { .clamp(0.0, 1.0) .toDouble(); + void collapseComposer() { + if (!isComposerExpanded.value) return; + showFormatting.value = false; + isComposerExpanded.value = false; + } + + // A focus loss covers deliberate dismiss gestures. The metrics observer + // also catches the system back/swipe dismissal path, where the platform can + // hide the keyboard while Flutter keeps the TextField focused. + useEffect(() { + void collapseWhenUnfocused() { + if (!focusNode.hasFocus && !isEmojiPickerOpen.value) { + collapseComposer(); + } + } + + focusNode.addListener(collapseWhenUnfocused); + return () => focusNode.removeListener(collapseWhenUnfocused); + }, [focusNode]); + + final appView = View.of(context); + useEffect(() { + final observer = _ComposerKeyboardMetricsObserver( + view: appView, + onKeyboardHidden: () { + collapseComposer(); + // Android Back and iOS dismissal gestures can hide the keyboard + // without changing Flutter focus. Clear it as well so reopening the + // compact capsule establishes a new text-input connection. + focusNode.unfocus(); + }, + ); + WidgetsBinding.instance.addObserver(observer); + return () => WidgetsBinding.instance.removeObserver(observer); + }, [appView, focusNode]); + final resolvedHint = hintText ?? (channelName.isNotEmpty ? 'Message #$channelName' : 'Message\u2026'); @@ -167,8 +215,8 @@ class ComposeBar extends HookConsumerWidget { composerExpansionController.animateWith( SpringSimulation( SpringDescription.withDurationAndBounce( - duration: const Duration(milliseconds: 280), - bounce: 0.16, + duration: const Duration(milliseconds: 220), + bounce: 0.08, ), composerExpansionController.value, target, @@ -887,64 +935,16 @@ class ComposeBar extends HookConsumerWidget { // Suggestions and attachments live in the overlay so showing them cannot // reflow the composer. Both stay anchored just above the capsule. - return Padding( - padding: EdgeInsets.only( - left: Grid.twelve, - right: Grid.twelve, - bottom: MediaQuery.viewPaddingOf(context).bottom + Grid.xxs, - ), - child: OverlayPortal.overlayChildLayoutBuilder( + final composerWidthFactor = 0.85 + 0.15 * composerExpansionProgress; + return _ComposerDockFrame( + widthFactor: composerWidthFactor, + child: _ComposerOverlayPortal( controller: suggestionOverlayController, - overlayChildBuilder: (context, layoutInfo) { - final composerOrigin = MatrixUtils.transformPoint( - layoutInfo.childPaintTransform, - Offset.zero, - ); - return ValueListenableBuilder<_AttachmentSurface>( - valueListenable: attachmentSurface, - builder: (context, surface, _) { - final surfaceDuration = reducedMotion - ? Duration.zero - : Duration( - milliseconds: - surface == _AttachmentSurface.camera || - surface == _AttachmentSurface.photos - ? 320 - : 250, - ); - final expandedSurfaceCoversComposer = - surface == _AttachmentSurface.camera || - surface == _AttachmentSurface.photos; - final overlayAnchorY = - composerOrigin.dy + - (expandedSurfaceCoversComposer - ? layoutInfo.childSize.height + Grid.twelve - : 0); - return AnimatedPositioned( - duration: surfaceDuration, - curve: - surface == _AttachmentSurface.camera || - surface == _AttachmentSurface.photos - ? const Cubic(0.34, 1.25, 0.64, 1) - : const Cubic(0.22, 1, 0.36, 1), - left: composerOrigin.dx, - bottom: layoutInfo.overlaySize.height - overlayAnchorY, - width: layoutInfo.childSize.width, - child: ClipRect( - child: Padding( - padding: const EdgeInsets.only(bottom: Grid.xxs), - child: surface == _AttachmentSurface.closed - ? _SuggestionPanelMotion( - duration: surfaceDuration, - alignment: Alignment.bottomLeft, - child: buildOverlayPanel(surface), - ) - : buildOverlayPanel(surface), - ), - ), - ); - }, - ); + attachmentSurface: attachmentSurface, + reducedMotion: reducedMotion, + buildOverlayPanel: buildOverlayPanel, + onDismissAttachmentSurface: () { + attachmentSurface.value = _AttachmentSurface.closed; }, child: _ComposeBarLayout( attachments: attachments.value, @@ -977,12 +977,18 @@ class ComposeBar extends HookConsumerWidget { }, onEmoji: () { attachmentSurface.value = _AttachmentSurface.closed; - showEmojiPicker(context: context, onSelect: insertEmoji); + isEmojiPickerOpen.value = true; + _showComposerEmojiPicker(context, insertEmoji, () { + if (!context.mounted) return; + isEmojiPickerOpen.value = false; + focusNode.requestFocus(); + }); }, onOpenFormatting: () { attachmentSurface.value = _AttachmentSurface.closed; showFormatting.value = true; }, + canSend: canSend, hasPendingUploads: hasPendingUploads, isSending: isSending.value, ), diff --git a/mobile/lib/features/channels/compose_bar/attachments.dart b/mobile/lib/features/channels/compose_bar/attachments.dart index 7c53ae1098..eee4d222ac 100644 --- a/mobile/lib/features/channels/compose_bar/attachments.dart +++ b/mobile/lib/features/channels/compose_bar/attachments.dart @@ -177,7 +177,7 @@ class _AttachmentSurfacePanel extends HookWidget { final height = menuLayout.height + ((expandedHeight - menuLayout.height) * sizeProgress); - final baseColor = context.colors.surfaceContainerHighest; + final baseColor = appPopoverColor(context); final expandedColor = visibleExpandedSurface == _AttachmentSurface.camera ? Colors.black @@ -189,57 +189,51 @@ class _AttachmentSurfacePanel extends HookWidget { child: SizedBox( width: width, height: height, - child: DecoratedBox( - decoration: BoxDecoration( - color: Color.lerp(baseColor, expandedColor, sizeProgress), - borderRadius: BorderRadius.circular(Radii.dialog), - border: Border.all( - color: Colors.black.withValues(alpha: 0.04), - width: 1, - ), - ), - child: ClipRRect( - borderRadius: BorderRadius.circular(Radii.dialog), - child: Material( - type: MaterialType.transparency, - child: Stack( - clipBehavior: Clip.hardEdge, - children: [ - Positioned( - left: 0, - top: 0, - width: _attachmentMenuWidth, - height: menuLayout.height, - child: IgnorePointer( - ignoring: surface != _AttachmentSurface.menu, - child: Opacity( - opacity: menuOpacity, - child: _AttachmentMenu( - layout: menuLayout, - onCamera: onCamera, - onPhotos: onPhotos, - onVideo: onVideo, - onFiles: onFiles, - ), - ), + child: Material( + key: const ValueKey('attachment-surface-popover'), + type: MaterialType.card, + color: Color.lerp(baseColor, expandedColor, sizeProgress), + surfaceTintColor: Colors.transparent, + elevation: appPopoverElevation, + shadowColor: appPopoverShadowColor(context), + shape: appPopoverShape(context), + clipBehavior: Clip.antiAlias, + child: Stack( + clipBehavior: Clip.hardEdge, + children: [ + Positioned( + left: 0, + top: 0, + width: _attachmentMenuWidth, + height: menuLayout.height, + child: IgnorePointer( + ignoring: surface != _AttachmentSurface.menu, + child: Opacity( + opacity: menuOpacity, + child: _AttachmentMenu( + layout: menuLayout, + onCamera: onCamera, + onPhotos: onPhotos, + onVideo: onVideo, + onFiles: onFiles, ), ), - Positioned( - left: 0, - top: 0, - width: expandedWidth, - height: expandedHeight, - child: IgnorePointer( - ignoring: !isExpanded, - child: Opacity( - opacity: expandedOpacity, - child: expandedContent, - ), - ), + ), + ), + Positioned( + left: 0, + top: 0, + width: expandedWidth, + height: expandedHeight, + child: IgnorePointer( + ignoring: !isExpanded, + child: Opacity( + opacity: expandedOpacity, + child: expandedContent, ), - ], + ), ), - ), + ], ), ), ), @@ -308,7 +302,7 @@ class _AttachmentTrigger extends StatelessWidget { _AttachmentSurface.camera || _AttachmentSurface.photos => 'Back to attachment options', }, - onPressed: () => onTap(context), + onPressed: () => _runComposerAction(() => onTap(context)), padding: EdgeInsets.zero, visualDensity: VisualDensity.compact, icon: AnimatedRotation( @@ -417,7 +411,7 @@ class _AttachmentMenuItem extends StatelessWidget { child: Tooltip( message: label, child: InkWell( - onTap: onTap, + onTap: () => _runComposerAction(onTap), child: Padding( padding: const EdgeInsets.symmetric(horizontal: Grid.xxs), child: Row( @@ -617,7 +611,8 @@ class _AttachmentStrip extends StatelessWidget { width: 24, height: 24, child: IconButton( - onPressed: () => onRemove(attachment.url), + onPressed: () => + _runComposerAction(() => onRemove(attachment.url)), tooltip: 'Remove attachment', visualDensity: VisualDensity.compact, style: IconButton.styleFrom( diff --git a/mobile/lib/features/channels/compose_bar/camera_preview.dart b/mobile/lib/features/channels/compose_bar/camera_preview.dart index e51c2d16aa..1a06534d6e 100644 --- a/mobile/lib/features/channels/compose_bar/camera_preview.dart +++ b/mobile/lib/features/channels/compose_bar/camera_preview.dart @@ -252,7 +252,7 @@ class _CameraCaptureButton extends StatelessWidget { button: true, label: 'Take photo', child: GestureDetector( - onTap: isPressed ? null : onTap, + onTap: isPressed ? null : () => _runComposerAction(onTap), child: AnimatedScale( scale: isPressed ? 0.92 : 1, duration: duration, @@ -290,7 +290,7 @@ class _CameraCloseButton extends StatelessWidget { return SizedBox.square( dimension: emphasized ? _cameraBackSize : 36, child: IconButton( - onPressed: onTap, + onPressed: () => _runComposerAction(onTap), tooltip: 'Back to attachment options', padding: EdgeInsets.zero, style: IconButton.styleFrom( diff --git a/mobile/lib/features/channels/compose_bar/dock.dart b/mobile/lib/features/channels/compose_bar/dock.dart new file mode 100644 index 0000000000..f19fe19e46 --- /dev/null +++ b/mobile/lib/features/channels/compose_bar/dock.dart @@ -0,0 +1,144 @@ +part of '../compose_bar.dart'; + +class _ComposerDockFrame extends StatelessWidget { + final double widthFactor; + final Widget child; + + const _ComposerDockFrame({required this.widthFactor, required this.child}); + + @override + Widget build(BuildContext context) { + final backdropHeight = mobileTabFooterBackdropHeight(context); + return Stack( + clipBehavior: Clip.none, + children: [ + Positioned( + key: const ValueKey('composer-footer-gradient'), + left: 0, + right: 0, + bottom: 0, + height: backdropHeight, + child: IgnorePointer( + child: MobileTabFooterBackdrop(height: backdropHeight), + ), + ), + Padding( + padding: EdgeInsets.only( + left: Grid.twelve, + right: Grid.twelve, + bottom: MediaQuery.viewPaddingOf(context).bottom + Grid.xxs, + ), + child: Align( + alignment: Alignment.bottomCenter, + child: FractionallySizedBox( + key: const ValueKey('composer-width-transition'), + widthFactor: widthFactor, + child: child, + ), + ), + ), + ], + ); + } +} + +class _ComposerOverlayPortal extends StatelessWidget { + final OverlayPortalController controller; + final ValueListenable<_AttachmentSurface> attachmentSurface; + final bool reducedMotion; + final Widget Function(_AttachmentSurface surface) buildOverlayPanel; + final VoidCallback onDismissAttachmentSurface; + final Widget child; + + const _ComposerOverlayPortal({ + required this.controller, + required this.attachmentSurface, + required this.reducedMotion, + required this.buildOverlayPanel, + required this.onDismissAttachmentSurface, + required this.child, + }); + + @override + Widget build(BuildContext context) { + return OverlayPortal.overlayChildLayoutBuilder( + controller: controller, + overlayChildBuilder: (context, layoutInfo) { + final composerOrigin = MatrixUtils.transformPoint( + layoutInfo.childPaintTransform, + Offset.zero, + ); + return ValueListenableBuilder<_AttachmentSurface>( + valueListenable: attachmentSurface, + builder: (context, surface, _) { + final surfaceDuration = reducedMotion + ? Duration.zero + : Duration( + milliseconds: + surface == _AttachmentSurface.camera || + surface == _AttachmentSurface.photos + ? 320 + : 250, + ); + final expandedSurfaceCoversComposer = + surface == _AttachmentSurface.camera || + surface == _AttachmentSurface.photos; + final surfaceLeft = expandedSurfaceCoversComposer + ? Grid.twelve + : composerOrigin.dx; + final surfaceWidth = expandedSurfaceCoversComposer + ? layoutInfo.overlaySize.width - (Grid.twelve * 2) + : layoutInfo.childSize.width; + final overlayAnchorY = + composerOrigin.dy + + (expandedSurfaceCoversComposer + ? layoutInfo.childSize.height + Grid.twelve + : 0); + return Stack( + children: [ + if (surface != _AttachmentSurface.closed) + Positioned( + left: 0, + top: 0, + right: 0, + height: composerOrigin.dy, + child: ExcludeSemantics( + child: GestureDetector( + key: const ValueKey('attachment-dismiss-barrier'), + behavior: HitTestBehavior.opaque, + onTap: onDismissAttachmentSurface, + ), + ), + ), + AnimatedPositioned( + duration: surfaceDuration, + curve: + surface == _AttachmentSurface.camera || + surface == _AttachmentSurface.photos + ? const Cubic(0.34, 1.25, 0.64, 1) + : const Cubic(0.22, 1, 0.36, 1), + left: surfaceLeft, + bottom: layoutInfo.overlaySize.height - overlayAnchorY, + width: surfaceWidth, + child: ClipRect( + child: Padding( + padding: const EdgeInsets.only(bottom: Grid.xxs), + child: surface == _AttachmentSurface.closed + ? _SuggestionPanelMotion( + duration: surfaceDuration, + alignment: Alignment.bottomLeft, + child: buildOverlayPanel(surface), + ) + : buildOverlayPanel(surface), + ), + ), + ), + ], + ); + }, + ); + }, + child: child, + ); + } +} diff --git a/mobile/lib/features/channels/compose_bar/formatting_toolbar.dart b/mobile/lib/features/channels/compose_bar/formatting_toolbar.dart index c9089a99cb..c6dc65a8fa 100644 --- a/mobile/lib/features/channels/compose_bar/formatting_toolbar.dart +++ b/mobile/lib/features/channels/compose_bar/formatting_toolbar.dart @@ -58,7 +58,7 @@ class _FormatButton extends StatelessWidget { message: tooltip, child: InkWell( borderRadius: BorderRadius.circular(Radii.sm), - onTap: onTap, + onTap: () => _runComposerAction(onTap), child: Padding( padding: const EdgeInsets.all(Grid.xxs), child: Icon(icon, size: 18, color: context.colors.primary), @@ -80,7 +80,7 @@ class _ComposeAction extends StatelessWidget { width: 36, height: 36, child: IconButton( - onPressed: onTap, + onPressed: () => _runComposerAction(onTap), icon: Icon(icon, size: 20, color: context.colors.onSurfaceVariant), padding: EdgeInsets.zero, visualDensity: VisualDensity.compact, diff --git a/mobile/lib/features/channels/compose_bar/helpers.dart b/mobile/lib/features/channels/compose_bar/helpers.dart index 145d28fb44..c09815538a 100644 --- a/mobile/lib/features/channels/compose_bar/helpers.dart +++ b/mobile/lib/features/channels/compose_bar/helpers.dart @@ -1,6 +1,47 @@ part of '../compose_bar.dart'; const _typingThrottleMs = 3000; + +class _ComposerKeyboardMetricsObserver with WidgetsBindingObserver { + final FlutterView view; + final VoidCallback onKeyboardHidden; + bool _wasVisible; + + _ComposerKeyboardMetricsObserver({ + required this.view, + required this.onKeyboardHidden, + }) : _wasVisible = view.viewInsets.bottom > 0; + + @override + void didChangeMetrics() { + final isVisible = view.viewInsets.bottom > 0; + if (_wasVisible && !isVisible) onKeyboardHidden(); + _wasVisible = isVisible; + } +} + +void _runComposerAction(VoidCallback action) { + unawaited(HapticFeedback.selectionClick()); + action(); +} + +void _showComposerEmojiPicker( + BuildContext context, + ValueChanged onSelect, + VoidCallback onDismiss, +) { + showEmojiPicker( + context: context, + onSelect: (emoji) => _runComposerAction(() => onSelect(emoji)), + onDismiss: onDismiss, + ); +} + +void _dismissComposerKeyboard(FocusNode focusNode) { + focusNode.unfocus(); + unawaited(SystemChannels.textInput.invokeMethod('TextInput.hide')); +} + const _pastedImageMimeTypes = [ 'image/jpeg', 'image/jpg', diff --git a/mobile/lib/features/channels/compose_bar/ios_photo_picker.dart b/mobile/lib/features/channels/compose_bar/ios_photo_picker.dart index 039b5160a3..ade2bec94e 100644 --- a/mobile/lib/features/channels/compose_bar/ios_photo_picker.dart +++ b/mobile/lib/features/channels/compose_bar/ios_photo_picker.dart @@ -146,7 +146,9 @@ class _IOSInlinePhotoPicker extends HookWidget { ), child: IconButton( key: const ValueKey('ios-inline-photo-picker-back'), - onPressed: isProcessing.value ? null : onBack, + onPressed: isProcessing.value + ? null + : () => _runComposerAction(onBack), tooltip: 'Back to attachment options', icon: const Icon( LucideIcons.chevronLeft, @@ -164,11 +166,12 @@ class _IOSInlinePhotoPicker extends HookWidget { child: FilledButton( key: const ValueKey('ios-inline-photo-picker-select'), onPressed: canSelect - ? submitSelection + ? () => + _runComposerAction(() => unawaited(submitSelection())) : selectedCount.value == 0 && !isPreparingSelection.value && !isProcessing.value - ? openAllPhotos + ? () => _runComposerAction(() => unawaited(openAllPhotos())) : null, style: FilledButton.styleFrom( backgroundColor: Colors.black.withValues(alpha: 0.76), diff --git a/mobile/lib/features/channels/compose_bar/layout.dart b/mobile/lib/features/channels/compose_bar/layout.dart index 31b930e36d..e0adb9621c 100644 --- a/mobile/lib/features/channels/compose_bar/layout.dart +++ b/mobile/lib/features/channels/compose_bar/layout.dart @@ -25,6 +25,7 @@ class _ComposeBarLayout extends StatelessWidget { final VoidCallback onChannel; final VoidCallback onEmoji; final VoidCallback onOpenFormatting; + final bool canSend; final bool hasPendingUploads; final bool isSending; @@ -53,6 +54,7 @@ class _ComposeBarLayout extends StatelessWidget { required this.onChannel, required this.onEmoji, required this.onOpenFormatting, + required this.canSend, required this.hasPendingUploads, required this.isSending, }); @@ -63,10 +65,17 @@ class _ComposeBarLayout extends StatelessWidget { } Widget _buildBar(BuildContext context) { + final trimmedDraft = controller.text.trim(); + final collapsedText = trimmedDraft.isEmpty + ? resolvedHint + : trimmedDraft.replaceAll(RegExp(r'\s+'), ' '); + final composerRadius = + Radii.dialog + Grid.quarter * (1 - expansionProgress); return Container( + key: const ValueKey('composer-surface'), decoration: BoxDecoration( color: context.colors.surfaceContainerHighest, - borderRadius: BorderRadius.circular(Radii.dialog), + borderRadius: BorderRadius.circular(composerRadius), border: Border.all( color: Colors.black.withValues(alpha: 0.04), width: 1, @@ -142,7 +151,7 @@ class _ComposeBarLayout extends StatelessWidget { label: resolvedHint, child: GestureDetector( behavior: HitTestBehavior.opaque, - onTap: onExpand, + onTap: () => _runComposerAction(onExpand), child: Padding( padding: const EdgeInsets.symmetric( vertical: Grid.half, @@ -150,9 +159,13 @@ class _ComposeBarLayout extends StatelessWidget { child: Align( alignment: Alignment.centerLeft, child: Text( - resolvedHint, + collapsedText, + maxLines: 1, + overflow: TextOverflow.ellipsis, style: context.textTheme.bodyLarge?.copyWith( - color: context.colors.onSurfaceVariant, + color: trimmedDraft.isEmpty + ? context.colors.onSurfaceVariant + : context.colors.onSurface, ), ), ), @@ -160,6 +173,12 @@ class _ComposeBarLayout extends StatelessWidget { ), ), ), + const SizedBox(width: Grid.xxs), + _SendButton( + isDisabled: !canSend || hasPendingUploads, + isSending: isSending, + onTap: onSend, + ), ], ), ClipRect( @@ -167,7 +186,7 @@ class _ComposeBarLayout extends StatelessWidget { alignment: Alignment.topCenter, heightFactor: expansionValue, child: IgnorePointer( - ignoring: expansionValue < 0.98, + ignoring: !isExpanded, child: Opacity( opacity: expansionProgress, child: Transform.translate( @@ -225,7 +244,8 @@ class _ComposeBarLayout extends StatelessWidget { ), const Spacer(), _SendButton( - isDisabled: hasPendingUploads, + isDisabled: + !canSend || hasPendingUploads, isSending: isSending, onTap: onSend, ), diff --git a/mobile/lib/features/channels/compose_bar/photo_gallery_picker.dart b/mobile/lib/features/channels/compose_bar/photo_gallery_picker.dart index 8b19b74aa2..5985874065 100644 --- a/mobile/lib/features/channels/compose_bar/photo_gallery_picker.dart +++ b/mobile/lib/features/channels/compose_bar/photo_gallery_picker.dart @@ -136,7 +136,7 @@ class _RecentPhotoGalleryPicker extends HookConsumerWidget { photo: photo, selectionIndex: selectionIndex, reducedMotion: reducedMotion, - onTap: () => togglePhoto(photo), + onTap: () => _runComposerAction(() => togglePhoto(photo)), ); }, ); @@ -154,7 +154,9 @@ class _RecentPhotoGalleryPicker extends HookConsumerWidget { children: [ IconButton( key: const ValueKey('photo-gallery-back'), - onPressed: isResolving.value ? null : onBack, + onPressed: isResolving.value + ? null + : () => _runComposerAction(onBack), tooltip: 'Back to attachment options', visualDensity: VisualDensity.compact, icon: const Icon(LucideIcons.arrowLeft, size: 20), @@ -212,7 +214,11 @@ class _RecentPhotoGalleryPicker extends HookConsumerWidget { child: selectedCount == 0 ? OutlinedButton.icon( key: const ValueKey('photo-gallery-action'), - onPressed: isResolving.value ? null : choosePhotos, + onPressed: isResolving.value + ? null + : () => _runComposerAction( + () => unawaited(choosePhotos()), + ), icon: isResolving.value ? BuzzLoadingIndicator( size: 22, @@ -224,7 +230,11 @@ class _RecentPhotoGalleryPicker extends HookConsumerWidget { ) : FilledButton.icon( key: const ValueKey('photo-gallery-action'), - onPressed: isResolving.value ? null : choosePhotos, + onPressed: isResolving.value + ? null + : () => _runComposerAction( + () => unawaited(choosePhotos()), + ), icon: isResolving.value ? const BuzzLoadingIndicator( size: 22, diff --git a/mobile/lib/features/channels/compose_bar/send_button.dart b/mobile/lib/features/channels/compose_bar/send_button.dart index 54060ae948..bbe9d2aaca 100644 --- a/mobile/lib/features/channels/compose_bar/send_button.dart +++ b/mobile/lib/features/channels/compose_bar/send_button.dart @@ -17,7 +17,9 @@ class _SendButton extends StatelessWidget { width: 36, height: 36, child: IconButton( - onPressed: (isSending || isDisabled) ? null : onTap, + onPressed: (isSending || isDisabled) + ? null + : () => _runComposerAction(onTap), style: IconButton.styleFrom( backgroundColor: context.colors.primary, disabledBackgroundColor: context.colors.primary.withValues( diff --git a/mobile/lib/features/channels/compose_bar/suggestions.dart b/mobile/lib/features/channels/compose_bar/suggestions.dart index ed97284d46..7b8e7c175b 100644 --- a/mobile/lib/features/channels/compose_bar/suggestions.dart +++ b/mobile/lib/features/channels/compose_bar/suggestions.dart @@ -111,54 +111,55 @@ class _MentionSuggestions extends StatelessWidget { @override Widget build(BuildContext context) { - return Container( - constraints: const BoxConstraints(maxHeight: 240), + return Material( + key: const ValueKey('mention-suggestions-popover'), + type: MaterialType.card, + color: appPopoverColor(context), + surfaceTintColor: Colors.transparent, + elevation: appPopoverElevation, + shadowColor: appPopoverShadowColor(context), + shape: appPopoverShape(context), clipBehavior: Clip.hardEdge, - decoration: BoxDecoration( - color: context.colors.surfaceContainerHighest, - borderRadius: BorderRadius.circular(Radii.dialog), - border: Border.all( - color: Colors.black.withValues(alpha: 0.04), - width: 1, - ), - ), - child: ListView.separated( - shrinkWrap: true, - padding: const EdgeInsets.symmetric(vertical: Grid.xxs), - itemCount: suggestions.length, - separatorBuilder: (_, _) => const SizedBox.shrink(), - itemBuilder: (context, index) { - final candidate = suggestions[index]; - final name = candidate.label; - final avatarUrl = - candidate.avatarUrl ?? userCache[candidate.pubkey]?.avatarUrl; + child: ConstrainedBox( + constraints: const BoxConstraints(maxHeight: 240), + child: ListView.separated( + shrinkWrap: true, + padding: const EdgeInsets.symmetric(vertical: Grid.xxs), + itemCount: suggestions.length, + separatorBuilder: (_, _) => const SizedBox.shrink(), + itemBuilder: (context, index) { + final candidate = suggestions[index]; + final name = candidate.label; + final avatarUrl = + candidate.avatarUrl ?? userCache[candidate.pubkey]?.avatarUrl; - return ListTile( - dense: true, - visualDensity: VisualDensity.compact, - leading: AvatarImage( - imageUrl: avatarUrl, - radius: 18, - backgroundColor: context.colors.primaryContainer, - fallback: Text( - name[0].toUpperCase(), - style: context.textTheme.labelMedium?.copyWith( - color: context.colors.onPrimaryContainer, - fontWeight: FontWeight.w600, + return ListTile( + dense: true, + visualDensity: VisualDensity.compact, + leading: AvatarImage( + imageUrl: avatarUrl, + radius: 18, + backgroundColor: context.colors.primaryContainer, + fallback: Text( + name[0].toUpperCase(), + style: context.textTheme.labelMedium?.copyWith( + color: context.colors.onPrimaryContainer, + fontWeight: FontWeight.w600, + ), ), ), - ), - title: Text(name, style: context.textTheme.titleSmall), - subtitle: _MentionSuggestionInfo.build( - context, - candidate: candidate, - currentPubkey: currentPubkey, - isDmChannel: isDmChannel, - userCache: userCache, - ), - onTap: () => onSelect(candidate), - ); - }, + title: Text(name, style: context.textTheme.titleSmall), + subtitle: _MentionSuggestionInfo.build( + context, + candidate: candidate, + currentPubkey: currentPubkey, + isDmChannel: isDmChannel, + userCache: userCache, + ), + onTap: () => _runComposerAction(() => onSelect(candidate)), + ); + }, + ), ), ); } @@ -261,40 +262,41 @@ class _ChannelSuggestions extends StatelessWidget { @override Widget build(BuildContext context) { - return Container( - constraints: const BoxConstraints(maxHeight: 240), + return Material( + key: const ValueKey('channel-suggestions-popover'), + type: MaterialType.card, + color: appPopoverColor(context), + surfaceTintColor: Colors.transparent, + elevation: appPopoverElevation, + shadowColor: appPopoverShadowColor(context), + shape: appPopoverShape(context), clipBehavior: Clip.hardEdge, - decoration: BoxDecoration( - color: context.colors.surfaceContainerHighest, - borderRadius: BorderRadius.circular(Radii.dialog), - border: Border.all( - color: Colors.black.withValues(alpha: 0.04), - width: 1, - ), - ), - child: ListView.separated( - shrinkWrap: true, - padding: const EdgeInsets.symmetric(vertical: Grid.xxs), - itemCount: suggestions.length, - separatorBuilder: (_, _) => const SizedBox.shrink(), - itemBuilder: (context, index) { - final channel = suggestions[index]; - return ListTile( - dense: true, - visualDensity: VisualDensity.compact, - horizontalTitleGap: 0, - leading: SizedBox.square( - dimension: 36, - child: Icon( - LucideIcons.hash, - size: 20, - color: context.colors.onSurfaceVariant, + child: ConstrainedBox( + constraints: const BoxConstraints(maxHeight: 240), + child: ListView.separated( + shrinkWrap: true, + padding: const EdgeInsets.symmetric(vertical: Grid.xxs), + itemCount: suggestions.length, + separatorBuilder: (_, _) => const SizedBox.shrink(), + itemBuilder: (context, index) { + final channel = suggestions[index]; + return ListTile( + dense: true, + visualDensity: VisualDensity.compact, + horizontalTitleGap: 0, + leading: SizedBox.square( + dimension: 36, + child: Icon( + LucideIcons.hash, + size: 20, + color: context.colors.onSurfaceVariant, + ), ), - ), - title: Text(channel.name, style: context.textTheme.bodyLarge), - onTap: () => onSelect(channel), - ); - }, + title: Text(channel.name, style: context.textTheme.bodyLarge), + onTap: () => _runComposerAction(() => onSelect(channel)), + ); + }, + ), ), ); } diff --git a/mobile/lib/features/channels/composer_dock_size_reporter.dart b/mobile/lib/features/channels/composer_dock_size_reporter.dart new file mode 100644 index 0000000000..38730729b3 --- /dev/null +++ b/mobile/lib/features/channels/composer_dock_size_reporter.dart @@ -0,0 +1,50 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_hooks/flutter_hooks.dart'; + +/// Reports the laid-out height of a floating composer dock. +/// +/// Message timelines use that height as scroll padding while still painting +/// beneath the dock, which lets the dock's fade reveal real timeline content. +class ComposerDockSizeReporter extends HookWidget { + final ValueChanged onHeightChanged; + final Widget child; + + const ComposerDockSizeReporter({ + super.key, + required this.onHeightChanged, + required this.child, + }); + + @override + Widget build(BuildContext context) { + final sizeKey = useMemoized(GlobalKey.new); + final lastHeight = useRef(null); + + void reportHeight() { + WidgetsBinding.instance.addPostFrameCallback((_) { + final renderObject = sizeKey.currentContext?.findRenderObject(); + if (renderObject is! RenderBox || !renderObject.hasSize) return; + final height = renderObject.size.height; + final previous = lastHeight.value; + if (previous != null && (previous - height).abs() < 0.5) return; + lastHeight.value = height; + onHeightChanged(height); + }); + } + + useEffect(() { + reportHeight(); + return null; + }, const []); + + return NotificationListener( + onNotification: (_) { + reportHeight(); + return true; + }, + child: SizeChangedLayoutNotifier( + child: KeyedSubtree(key: sizeKey, child: child), + ), + ); + } +} diff --git a/mobile/lib/features/channels/emoji_picker.dart b/mobile/lib/features/channels/emoji_picker.dart index 10292cfa28..e3cd0f8eab 100644 --- a/mobile/lib/features/channels/emoji_picker.dart +++ b/mobile/lib/features/channels/emoji_picker.dart @@ -9,6 +9,7 @@ import '../../shared/custom_emoji/custom_emoji_render.dart'; import '../../shared/emoji/emoji_data.dart'; import '../../shared/emoji/emoji_data_provider.dart'; import '../../shared/emoji/emoji_search.dart'; +import '../../shared/emoji/native_emoji_glyph.dart'; import '../../shared/theme/theme.dart'; import 'recent_emoji_provider.dart'; @@ -30,6 +31,7 @@ const _sheetHeightFactor = 0.62; void showEmojiPicker({ required BuildContext context, required void Function(String emoji) onSelect, + VoidCallback? onDismiss, }) { showModalBottomSheet( context: context, @@ -42,7 +44,7 @@ void showEmojiPicker({ onSelect(emoji); }, ), - ); + ).whenComplete(onDismiss ?? () {}); } class EmojiPickerSheet extends HookConsumerWidget { diff --git a/mobile/lib/features/channels/emoji_picker/emoji_grid.dart b/mobile/lib/features/channels/emoji_picker/emoji_grid.dart index 2ebe631edd..354a31e44c 100644 --- a/mobile/lib/features/channels/emoji_picker/emoji_grid.dart +++ b/mobile/lib/features/channels/emoji_picker/emoji_grid.dart @@ -99,10 +99,7 @@ class _EmojiTile extends StatelessWidget { button: true, label: entry.name, child: Center( - child: Text( - entry.native, - style: const TextStyle(fontSize: _emojiGlyphSize), - ), + child: NativeEmojiGlyph(emoji: entry.native, size: _emojiGlyphSize), ), ), ); diff --git a/mobile/lib/features/channels/message_actions.dart b/mobile/lib/features/channels/message_actions.dart index 519d25898c..df04800022 100644 --- a/mobile/lib/features/channels/message_actions.dart +++ b/mobile/lib/features/channels/message_actions.dart @@ -17,6 +17,7 @@ import '../../shared/theme/theme.dart'; import '../../shared/custom_emoji/custom_emoji.dart'; import '../../shared/custom_emoji/custom_emoji_provider.dart'; import '../../shared/custom_emoji/custom_emoji_render.dart'; +import '../../shared/emoji/native_emoji_glyph.dart'; import '../../shared/widgets/sheet_divider.dart'; import '../../shared/reminders/remind_me_later_sheet.dart'; import '../../shared/reminders/reminder_service.dart'; @@ -689,7 +690,7 @@ class _QuickReactionGlyph extends StatelessWidget { ); } } - return Text(value, style: const TextStyle(fontSize: 24)); + return NativeEmojiGlyph(emoji: value, size: 24); } } diff --git a/mobile/lib/features/channels/reaction_row.dart b/mobile/lib/features/channels/reaction_row.dart index a9511c587d..9d01b5c8e7 100644 --- a/mobile/lib/features/channels/reaction_row.dart +++ b/mobile/lib/features/channels/reaction_row.dart @@ -8,6 +8,7 @@ import '../../shared/widgets/avatar_image.dart'; import '../../shared/custom_emoji/custom_emoji_render.dart'; import '../../shared/emoji/emoji_burst.dart'; import '../../shared/emoji/emoji_data_provider.dart'; +import '../../shared/emoji/native_emoji_glyph.dart'; import '../../shared/emoji/positive_emoji.dart'; import '../profile/user_cache_provider.dart'; import '../profile/user_profile.dart'; @@ -303,7 +304,7 @@ class _ReactionEmoji extends StatelessWidget { Widget build(BuildContext context) { final emojiUrl = reaction.emojiUrl; if (emojiUrl == null || emojiUrl.isEmpty) { - return Text(reaction.emoji, style: TextStyle(fontSize: size)); + return NativeEmojiGlyph(emoji: reaction.emoji, size: size); } final shortcode = reaction.emoji.substring(1, reaction.emoji.length - 1); return CustomEmojiImage(shortcode: shortcode, url: emojiUrl, size: size); diff --git a/mobile/lib/features/channels/thread_detail_page.dart b/mobile/lib/features/channels/thread_detail_page.dart index 810861aa00..53be4488b2 100644 --- a/mobile/lib/features/channels/thread_detail_page.dart +++ b/mobile/lib/features/channels/thread_detail_page.dart @@ -20,6 +20,7 @@ import 'channel_typing_indicator.dart'; import 'thread_replies_provider.dart'; import 'channels_provider.dart'; import 'compose_bar.dart'; +import 'composer_dock_size_reporter.dart'; import 'date_formatters.dart'; import 'day_divider.dart'; import '../profile/user_profile_sheet.dart'; @@ -58,6 +59,7 @@ class ThreadDetailPage extends HookConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { + final composerDockHeight = useState(0.0); // Relay thread queries are keyed by the outermost root, even when this // page displays a nested branch. Query that root, then select this head's // direct children from the returned subtree below. @@ -113,11 +115,35 @@ class ThreadDetailPage extends HookConsumerWidget { final itemScrollController = useMemoized(ItemScrollController.new); final itemPositionsListener = useMemoized(ItemPositionsListener.create); final didJumpToInitialMessage = useRef(false); + final followsThreadTail = useRef(false); + final pendingTailAlignment = useRef(null); + final tailRealignmentQueued = useRef(false); // Item 0 is the thread head; reply `i` lives at `i + 1`. const headIndex = 0; int indexForReply(int chronologicalIndex) => chronologicalIndex + 1; + bool threadTailIsVisible() { + final lastIndex = replies.isEmpty + ? headIndex + : indexForReply(replies.length - 1); + return itemPositionsListener.itemPositions.value.any( + (position) => + position.index == lastIndex && position.itemTrailingEdge <= 1.001, + ); + } + + useEffect(() { + void onPositionsChanged() { + if (threadTailIsVisible()) followsThreadTail.value = true; + } + + itemPositionsListener.itemPositions.addListener(onPositionsChanged); + return () => itemPositionsListener.itemPositions.removeListener( + onPositionsChanged, + ); + }, [itemPositionsListener, replies.length]); + useEffect(() { final messageId = initialMessageId; // Wait for the authoritative thread query before consuming the one-shot @@ -134,6 +160,11 @@ class ThreadDetailPage extends HookConsumerWidget { if (targetIndex == null || didJumpToInitialMessage.value) return null; WidgetsBinding.instance.addPostFrameCallback((_) { if (!context.mounted || !itemScrollController.isAttached) return; + // The provisional route snapshot can make the linked reply look like + // the tail. This authoritative deep-link jump intentionally leaves + // the user at an older item, so it must opt out of follow-tail first. + followsThreadTail.value = false; + pendingTailAlignment.value = null; itemScrollController.jumpTo(index: targetIndex, alignment: 0.35); didJumpToInitialMessage.value = true; }); @@ -227,6 +258,74 @@ class ThreadDetailPage extends HookConsumerWidget { // itself a root message its rootId is null, so fall back to its own id. final effectiveRootId = threadHead.rootId ?? threadHead.id; + void updateComposerDockHeight(double height) { + final previousHeight = composerDockHeight.value; + final heightDelta = height - previousHeight; + if (heightDelta.abs() < 0.5) return; + + final shouldFollowTail = followsThreadTail.value || threadTailIsVisible(); + if (shouldFollowTail) followsThreadTail.value = true; + composerDockHeight.value = height; + if (heightDelta <= 0 || !shouldFollowTail) { + pendingTailAlignment.value = null; + return; + } + final lastIndex = replies.isEmpty + ? headIndex + : indexForReply(replies.length - 1); + final lastPosition = itemPositionsListener.itemPositions.value + .where((position) => position.index == lastIndex) + .firstOrNull; + if (lastPosition == null) return; + final targetAlignment = + (pendingTailAlignment.value ?? lastPosition.itemLeadingEdge) - + (heightDelta / MediaQuery.sizeOf(context).height); + pendingTailAlignment.value = targetAlignment; + + WidgetsBinding.instance.addPostFrameCallback((_) { + if (!context.mounted || !itemScrollController.isAttached) return; + itemScrollController.jumpTo( + index: lastIndex, + alignment: targetAlignment, + ); + }); + } + + // Composer size changes and keyboard metrics changes are independent: + // the dock grows first, then the Scaffold's viewport shrinks once the + // keyboard appears. Re-align after that latter layout pass too, but only + // while the user was already following the thread tail. + void realignThreadTailAfterMetricsChange() { + final shouldFollowTail = followsThreadTail.value || threadTailIsVisible(); + if (!shouldFollowTail || tailRealignmentQueued.value) return; + followsThreadTail.value = true; + tailRealignmentQueued.value = true; + WidgetsBinding.instance.addPostFrameCallback((_) { + tailRealignmentQueued.value = false; + if (!context.mounted || + !itemScrollController.isAttached || + !followsThreadTail.value) { + return; + } + final lastIndex = replies.isEmpty + ? headIndex + : indexForReply(replies.length - 1); + itemScrollController.scrollTo( + index: lastIndex, + duration: const Duration(milliseconds: 220), + curve: Curves.easeOutCubic, + ); + }); + } + + useEffect(() { + final observer = _ThreadTailMetricsObserver( + onMetricsChanged: realignThreadTailAfterMetricsChange, + ); + WidgetsBinding.instance.addObserver(observer); + return () => WidgetsBinding.instance.removeObserver(observer); + }, [itemScrollController, replies.length]); + // Channel names for message content rendering. final channelsAsync = ref.watch(channelsProvider); final channelNamesMap = {}; @@ -241,176 +340,213 @@ class ThreadDetailPage extends HookConsumerWidget { title: Text('Thread'), titleStyle: channelTitleTextStyle, ), - body: Column( + body: Stack( + fit: StackFit.expand, children: [ - Expanded( - child: KeyboardDismissOnDrag( - child: ScrollablePositionedList.builder( - key: const ValueKey('thread-message-list'), - itemScrollController: itemScrollController, - itemPositionsListener: itemPositionsListener, - // Top-anchored, head first, replies flowing down — matching - // desktop's thread panel. The old reversed list bottom-anchored - // the content, which jammed the head against the composer - // whenever a thread had only a handful of replies. - padding: EdgeInsets.only( - left: Grid.gutter, - right: Grid.gutter, - top: frostedAppBarHeight(context), - bottom: Grid.xs, - ), - itemCount: replies.length + 1, // +1 for thread head - itemBuilder: (context, index) { - if (index == headIndex) { - if (liveDeletionHidesHead) { - return const Padding( - key: ValueKey('thread-message-deleted'), - padding: EdgeInsets.only(bottom: Grid.xs), - child: Text('This message was deleted'), - ); - } - return Padding( - key: ValueKey('thread-message-group-${liveHead.id}'), - padding: const EdgeInsets.only(bottom: Grid.xs), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - DayDivider( - label: formatDayHeading(liveHead.createdAt), - ), - _ThreadMessage( - message: liveHead, - channelNames: channelNamesMap, - channelId: channelId, - currentPubkey: currentPubkey, - showAuthor: true, - isHighlighted: liveHead.id == initialMessageId, - allMessages: allMsgs, - isMember: isMember, - isArchived: isArchived, - isThreadHead: true, - ), - Padding( - padding: const EdgeInsets.symmetric( - vertical: Grid.xxs, - ), - child: Row( - children: [ - Text( - '${replies.length} ${replies.length == 1 ? 'reply' : 'replies'}', - style: context.textTheme.labelMedium - ?.copyWith( - color: context.colors.onSurfaceVariant, - fontWeight: FontWeight.w600, - ), + Column( + children: [ + Expanded( + child: KeyboardDismissOnDrag( + onUserScrollStart: () { + followsThreadTail.value = false; + pendingTailAlignment.value = null; + }, + child: ScrollablePositionedList.builder( + key: const ValueKey('thread-message-list'), + itemScrollController: itemScrollController, + itemPositionsListener: itemPositionsListener, + // Top-anchored, head first, replies flowing down — matching + // desktop's thread panel. The old reversed list bottom-anchored + // the content, which jammed the head against the composer + // whenever a thread had only a handful of replies. + padding: EdgeInsets.only( + left: Grid.gutter, + right: Grid.gutter, + top: frostedAppBarHeight(context), + bottom: Grid.xs + composerDockHeight.value, + ), + itemCount: replies.length + 1, // +1 for thread head + itemBuilder: (context, index) { + if (index == headIndex) { + if (liveDeletionHidesHead) { + return const Padding( + key: ValueKey('thread-message-deleted'), + padding: EdgeInsets.only(bottom: Grid.xs), + child: Text('This message was deleted'), + ); + } + return Padding( + key: ValueKey('thread-message-group-${liveHead.id}'), + padding: const EdgeInsets.only(bottom: Grid.xs), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + DayDivider( + label: formatDayHeading(liveHead.createdAt), + ), + _ThreadMessage( + message: liveHead, + channelNames: channelNamesMap, + channelId: channelId, + currentPubkey: currentPubkey, + showAuthor: true, + isHighlighted: liveHead.id == initialMessageId, + allMessages: allMsgs, + isMember: isMember, + isArchived: isArchived, + isThreadHead: true, + ), + Padding( + padding: const EdgeInsets.symmetric( + vertical: Grid.xxs, ), - const SizedBox(width: Grid.xxs), - Expanded( - child: Divider( - color: context.colors.outlineVariant, - ), + child: Row( + children: [ + Text( + '${replies.length} ${replies.length == 1 ? 'reply' : 'replies'}', + style: context.textTheme.labelMedium + ?.copyWith( + color: + context.colors.onSurfaceVariant, + fontWeight: FontWeight.w600, + ), + ), + const SizedBox(width: Grid.xxs), + Expanded( + child: Divider( + color: context.colors.outlineVariant, + ), + ), + ], ), - ], - ), + ), + ], ), - ], - ), - ); - } - - // Chronological list: index 1 = oldest reply. - final chronIdx = index - 1; - final reply = replies[chronIdx]; - final prevReply = chronIdx > 0 ? replies[chronIdx - 1] : null; - final previousMessage = prevReply ?? liveHead; - final showDayDivider = !isSameDay( - previousMessage.createdAt, - reply.createdAt, - ); - final showAuthor = - prevReply == null || - showDayDivider || - prevReply.pubkey.toLowerCase() != - reply.pubkey.toLowerCase() || - (reply.createdAt - prevReply.createdAt) > 300; - - // Check if this reply itself has children (nested thread). - final nestedChildren = childrenByParent[reply.id]; - final nestedSummary = - nestedChildren != null && nestedChildren.isNotEmpty - ? _buildNestedSummary(reply.id, nestedChildren) - : null; - - return Padding( - key: ValueKey('thread-message-group-${reply.id}'), - // Tail spacing comes from the list's own bottom padding now - // that the list runs top-down; the reversed list used to - // need it here because item 0 sat against the composer. - padding: EdgeInsets.zero, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - if (showDayDivider) - DayDivider(label: formatDayHeading(reply.createdAt)), - _ThreadMessage( - message: reply, - channelNames: channelNamesMap, - channelId: channelId, - currentPubkey: currentPubkey, - showAuthor: showAuthor, - isHighlighted: reply.id == initialMessageId, - allMessages: allMsgs, - isMember: isMember, - isArchived: isArchived, + ); + } + + // Chronological list: index 1 = oldest reply. + final chronIdx = index - 1; + final reply = replies[chronIdx]; + final prevReply = chronIdx > 0 + ? replies[chronIdx - 1] + : null; + final previousMessage = prevReply ?? liveHead; + final showDayDivider = !isSameDay( + previousMessage.createdAt, + reply.createdAt, + ); + final showAuthor = + prevReply == null || + showDayDivider || + prevReply.pubkey.toLowerCase() != + reply.pubkey.toLowerCase() || + (reply.createdAt - prevReply.createdAt) > 300; + + // Check if this reply itself has children (nested thread). + final nestedChildren = childrenByParent[reply.id]; + final nestedSummary = + nestedChildren != null && nestedChildren.isNotEmpty + ? _buildNestedSummary(reply.id, nestedChildren) + : null; + + return Padding( + key: ValueKey('thread-message-group-${reply.id}'), + // Tail spacing comes from the list's own bottom padding now + // that the list runs top-down; the reversed list used to + // need it here because item 0 sat against the composer. + padding: EdgeInsets.zero, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if (showDayDivider) + DayDivider( + label: formatDayHeading(reply.createdAt), + ), + _ThreadMessage( + message: reply, + channelNames: channelNamesMap, + channelId: channelId, + currentPubkey: currentPubkey, + showAuthor: showAuthor, + isHighlighted: reply.id == initialMessageId, + allMessages: allMsgs, + isMember: isMember, + isArchived: isArchived, + ), + if (nestedSummary != null) + _NestedThreadSummaryRow( + summary: nestedSummary, + replyMessage: reply, + allMessages: allMsgs, + channelId: channelId, + currentPubkey: currentPubkey, + isMember: isMember, + isArchived: isArchived, + ), + ], ), - if (nestedSummary != null) - _NestedThreadSummaryRow( - summary: nestedSummary, - replyMessage: reply, - allMessages: allMsgs, - channelId: channelId, - currentPubkey: currentPubkey, - isMember: isMember, - isArchived: isArchived, - ), - ], - ), - ); - }, + ); + }, + ), + ), ), - ), - ), - AnimatedSize( - duration: MediaQuery.disableAnimationsOf(context) - ? Duration.zero - : const Duration(milliseconds: 180), - curve: Curves.easeOutCubic, - alignment: Alignment.bottomCenter, - child: threadTyping.isEmpty - ? const SizedBox.shrink() - : ChannelTypingIndicator(entries: threadTyping), + if (!isMember || isArchived) + AnimatedSize( + duration: MediaQuery.disableAnimationsOf(context) + ? Duration.zero + : const Duration(milliseconds: 180), + curve: Curves.easeOutCubic, + alignment: Alignment.bottomCenter, + child: threadTyping.isEmpty + ? const SizedBox.shrink() + : ChannelTypingIndicator(entries: threadTyping), + ), + ], ), if (isMember && !isArchived) - ComposeBar( - channelId: channelId, - hintText: 'Reply in thread\u2026', - threadHeadId: threadHead.id, - rootId: effectiveRootId, - onSend: - ( - content, - mentionPubkeys, { - mediaTags = const >[], - }) => ref - .read(sendMessageProvider) - .call( - channelId: channelId, - content: content, - mentionPubkeys: mentionPubkeys, - parentEventId: threadHead.id, - rootEventId: effectiveRootId, - mediaTags: mediaTags, - ), + Align( + alignment: Alignment.bottomCenter, + child: ComposerDockSizeReporter( + key: const ValueKey('thread-composer-dock'), + onHeightChanged: updateComposerDockHeight, + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + AnimatedSize( + duration: MediaQuery.disableAnimationsOf(context) + ? Duration.zero + : const Duration(milliseconds: 180), + curve: Curves.easeOutCubic, + alignment: Alignment.bottomCenter, + child: threadTyping.isEmpty + ? const SizedBox.shrink() + : ChannelTypingIndicator(entries: threadTyping), + ), + ComposeBar( + channelId: channelId, + hintText: 'Reply in thread\u2026', + threadHeadId: threadHead.id, + rootId: effectiveRootId, + onSend: + ( + content, + mentionPubkeys, { + mediaTags = const >[], + }) => ref + .read(sendMessageProvider) + .call( + channelId: channelId, + content: content, + mentionPubkeys: mentionPubkeys, + parentEventId: threadHead.id, + rootEventId: effectiveRootId, + mediaTags: mediaTags, + ), + ), + ], + ), + ), ), ], ), @@ -566,6 +702,15 @@ class _NestedThreadSummaryRow extends ConsumerWidget { } } +class _ThreadTailMetricsObserver with WidgetsBindingObserver { + final VoidCallback onMetricsChanged; + + _ThreadTailMetricsObserver({required this.onMetricsChanged}); + + @override + void didChangeMetrics() => onMetricsChanged(); +} + class _ThreadMessage extends ConsumerWidget { final TimelineMessage message; final Map channelNames; diff --git a/mobile/lib/shared/emoji/native_emoji_glyph.dart b/mobile/lib/shared/emoji/native_emoji_glyph.dart new file mode 100644 index 0000000000..7831c1b32b --- /dev/null +++ b/mobile/lib/shared/emoji/native_emoji_glyph.dart @@ -0,0 +1,22 @@ +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; + +/// A standalone system emoji whose visual centre matches its surrounding UI. +/// +/// Apple's emoji glyphs sit slightly low inside Flutter's text box. Keep the +/// layout box unchanged and lift only the painted glyph on iOS; Android's +/// system emoji metrics are already visually centred. +class NativeEmojiGlyph extends StatelessWidget { + final String emoji; + final double size; + + const NativeEmojiGlyph({super.key, required this.emoji, required this.size}); + + @override + Widget build(BuildContext context) { + final glyph = Text(emoji, style: TextStyle(fontSize: size)); + if (defaultTargetPlatform != TargetPlatform.iOS) return glyph; + + return Transform.translate(offset: const Offset(0, -1), child: glyph); + } +} diff --git a/mobile/lib/shared/theme/app_theme.dart b/mobile/lib/shared/theme/app_theme.dart index f8000d79e2..1407357062 100644 --- a/mobile/lib/shared/theme/app_theme.dart +++ b/mobile/lib/shared/theme/app_theme.dart @@ -16,6 +16,7 @@ class Radii { static const double md = 8.0; static const double sm = 6.0; static const double card = 12.0; // grouped settings cards + static const double popover = 20.0; static const double dialog = 24.0; // desktop uses rounded-3xl for dialogs /// Fully rounds pills, circles, and other capsule shapes. @@ -277,13 +278,22 @@ class AppTheme { labelPadding: EdgeInsets.zero, ), - // Popups/menus: desktop uses rounded-md (8px) + // Popups/menus share the elevated 20px mobile popover treatment. popupMenuTheme: PopupMenuThemeData( - color: scheme.surface, - elevation: 4, + color: scheme.surface.withValues(alpha: 0.98), + elevation: 8, + shadowColor: scheme.shadow.withValues(alpha: 0.18), + surfaceTintColor: Colors.transparent, + textStyle: textTheme.labelLarge?.copyWith(color: scheme.onSurface), + labelTextStyle: WidgetStatePropertyAll( + textTheme.labelLarge?.copyWith(color: scheme.onSurface), + ), shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(Radii.md), - side: BorderSide(color: scheme.outline), + borderRadius: BorderRadius.circular(Radii.popover), + side: BorderSide( + color: Colors.black.withValues(alpha: 0.04), + width: 1, + ), ), ), diff --git a/mobile/lib/shared/theme/message_typography.dart b/mobile/lib/shared/theme/message_typography.dart index 1073626390..5a5d2c2c6e 100644 --- a/mobile/lib/shared/theme/message_typography.dart +++ b/mobile/lib/shared/theme/message_typography.dart @@ -88,8 +88,14 @@ const contentListBodyTextStyle = TextStyle( /// Timestamps in compact content lists. const contentListTimestampTextStyle = messageMetadataTextStyle; -/// Filter chip labels use the compact 15sp type ramp. -const filterChipTextStyle = messageMetadataTextStyle; +/// Filter chip labels use a tighter 15sp Inter treatment. +const filterChipTextStyle = TextStyle( + fontFamily: _fontFamily, + fontSize: 15, + fontWeight: FontWeight.w400, + height: 1, + letterSpacing: 0, +); /// Search fields use the primary 15sp body treatment. const searchInputTextStyle = messageBodyTextStyle; diff --git a/mobile/lib/shared/widgets/anchored_popover_menu.dart b/mobile/lib/shared/widgets/anchored_popover_menu.dart index 46b50b6b00..7188e021f9 100644 --- a/mobile/lib/shared/widgets/anchored_popover_menu.dart +++ b/mobile/lib/shared/widgets/anchored_popover_menu.dart @@ -9,6 +9,24 @@ const _popoverEnterDuration = Duration(milliseconds: 150); const _popoverExitDuration = Duration(milliseconds: 110); const _popoverStartScale = 0.96; +/// Elevation shared by anchored menus and composer popover surfaces. +const appPopoverElevation = 8.0; + +/// Returns the translucent surface color shared by app popovers. +Color appPopoverColor(BuildContext context) => + context.colors.surface.withValues(alpha: 0.98); + +/// Returns the shadow color shared by app popovers. +Color appPopoverShadowColor(BuildContext context) => + context.colors.shadow.withValues(alpha: 0.18); + +/// Returns the 20px shape and composer-matching hairline shared by popovers. +RoundedRectangleBorder appPopoverShape(BuildContext context) => + RoundedRectangleBorder( + borderRadius: BorderRadius.circular(Radii.popover), + side: BorderSide(color: Colors.black.withValues(alpha: 0.04), width: 1), + ); + /// The horizontal edge a popover aligns to on its triggering control. enum AnchoredPopoverAlignment { /// Aligns the popover's leading edge with the trigger's leading edge. @@ -25,10 +43,10 @@ Future showAnchoredPopover({ required List> items, required double width, required AnchoredPopoverAlignment alignment, - required Color color, - required ShapeBorder shape, - required double elevation, - required Color shadowColor, + Color? color, + ShapeBorder? shape, + double elevation = appPopoverElevation, + Color? shadowColor, Offset offset = Offset.zero, EdgeInsetsGeometry menuPadding = EdgeInsets.zero, Clip clipBehavior = Clip.antiAlias, @@ -56,10 +74,10 @@ Future showAnchoredPopover({ width: width, alignment: alignment, offset: offset, - color: color, - shape: shape, + color: color ?? appPopoverColor(context), + shape: shape ?? appPopoverShape(context), elevation: elevation, - shadowColor: shadowColor, + shadowColor: shadowColor ?? appPopoverShadowColor(context), menuPadding: menuPadding, clipBehavior: clipBehavior, surfaceKey: surfaceKey, diff --git a/mobile/lib/shared/widgets/filter_chip_bar.dart b/mobile/lib/shared/widgets/filter_chip_bar.dart index 1fe55712a5..628267c167 100644 --- a/mobile/lib/shared/widgets/filter_chip_bar.dart +++ b/mobile/lib/shared/widgets/filter_chip_bar.dart @@ -129,15 +129,23 @@ class FilterChipBar extends StatelessWidget { textAlign: fillWidth ? TextAlign.center : TextAlign.start, style: labelStyle, ); + final centeredLabel = Align( + alignment: Alignment.center, + widthFactor: fillWidth ? null : 1, + heightFactor: 1, + child: label, + ); final chip = FilterChip( selected: isSelected, showCheckmark: false, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(Radii.lg), + ), + side: BorderSide.none, label: fillWidth - ? SizedBox( - width: double.infinity, - child: Center(child: label), - ) - : label, + ? SizedBox(width: double.infinity, child: centeredLabel) + : centeredLabel, + labelPadding: EdgeInsets.zero, onSelected: (_) => onSelected(item.id), padding: EdgeInsets.symmetric( horizontal: fillWidth ? Grid.quarter : Grid.twelve, diff --git a/mobile/lib/shared/widgets/keyboard_dismiss_on_drag.dart b/mobile/lib/shared/widgets/keyboard_dismiss_on_drag.dart index f562b9f83a..93371bdd0b 100644 --- a/mobile/lib/shared/widgets/keyboard_dismiss_on_drag.dart +++ b/mobile/lib/shared/widgets/keyboard_dismiss_on_drag.dart @@ -27,8 +27,13 @@ const keyboardDismissDragThreshold = 48.0; /// `WindowInsetsAnimationController`). class KeyboardDismissOnDrag extends HookWidget { final Widget child; + final VoidCallback? onUserScrollStart; - const KeyboardDismissOnDrag({super.key, required this.child}); + const KeyboardDismissOnDrag({ + super.key, + this.onUserScrollStart, + required this.child, + }); @override Widget build(BuildContext context) { @@ -37,8 +42,12 @@ class KeyboardDismissOnDrag extends HookWidget { final downwardTravel = useRef(0.0); bool handle(ScrollNotification notification) { - if (notification is ScrollStartNotification || - notification is ScrollEndNotification) { + if (notification is ScrollStartNotification) { + if (notification.dragDetails != null) onUserScrollStart?.call(); + downwardTravel.value = 0; + return false; + } + if (notification is ScrollEndNotification) { downwardTravel.value = 0; return false; } diff --git a/mobile/lib/shared/widgets/mobile_tab_footer_backdrop.dart b/mobile/lib/shared/widgets/mobile_tab_footer_backdrop.dart index 687880acb1..d972b8184f 100644 --- a/mobile/lib/shared/widgets/mobile_tab_footer_backdrop.dart +++ b/mobile/lib/shared/widgets/mobile_tab_footer_backdrop.dart @@ -16,6 +16,27 @@ double mobileTabFooterBackdropHeight(BuildContext context) => Grid.xl + Grid.gutter; +/// Builds the shared transparent-to-surface footer fade. +/// +/// Kept separate from [MobileTabFooterBackdrop] so floating controls such as +/// the channel composer can paint the exact same fade behind their own content. +LinearGradient mobileTabFooterBackdropGradient( + BuildContext context, { + List stops = const [0, 0.5, 1], + List opacities = const [0, 0.75, 1], +}) { + assert(stops.length == opacities.length); + final surface = context.colors.surface; + return LinearGradient( + begin: Alignment.topCenter, + end: Alignment.bottomCenter, + stops: stops, + colors: [ + for (final opacity in opacities) surface.withValues(alpha: opacity), + ], + ); +} + /// Shared fade behind the floating mobile tab bar. class MobileTabFooterBackdrop extends StatelessWidget { /// Vertical extent of the backdrop in logical pixels. @@ -39,20 +60,15 @@ class MobileTabFooterBackdrop extends StatelessWidget { @override Widget build(BuildContext context) { - final surface = context.colors.surface; return SizedBox( height: height, width: double.infinity, child: DecoratedBox( decoration: BoxDecoration( - gradient: LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, + gradient: mobileTabFooterBackdropGradient( + context, stops: stops, - colors: [ - for (final opacity in opacities) - surface.withValues(alpha: opacity), - ], + opacities: opacities, ), ), ), diff --git a/mobile/test/features/activity/activity_page_test.dart b/mobile/test/features/activity/activity_page_test.dart index a0293455f2..aecb3303fc 100644 --- a/mobile/test/features/activity/activity_page_test.dart +++ b/mobile/test/features/activity/activity_page_test.dart @@ -13,6 +13,7 @@ import 'package:buzz/features/channels/read_state/read_state_provider.dart'; import 'package:buzz/features/profile/user_cache_provider.dart'; import 'package:buzz/features/profile/user_profile.dart'; import 'package:buzz/shared/theme/theme.dart'; +import 'package:buzz/shared/widgets/anchored_popover_menu.dart'; import 'package:buzz/shared/widgets/frosted_app_bar.dart'; import 'package:buzz/shared/widgets/avatar_image.dart'; import 'package:flutter/material.dart'; @@ -111,6 +112,7 @@ void main() { Map readContexts = const {}, List? channels, TextScaler? textScaler, + EdgeInsets mediaPadding = EdgeInsets.zero, }) async { SharedPreferences.setMockInitialValues({}); final prefs = await SharedPreferences.getInstance(); @@ -133,12 +135,12 @@ void main() { ], child: MaterialApp( theme: AppTheme.light(), - builder: textScaler == null - ? null - : (context, child) => MediaQuery( - data: MediaQuery.of(context).copyWith(textScaler: textScaler), - child: child!, - ), + builder: (context, child) => MediaQuery( + data: MediaQuery.of( + context, + ).copyWith(textScaler: textScaler, padding: mediaPadding), + child: child!, + ), home: const ActivityPage(), ), ); @@ -182,16 +184,22 @@ void main() { expect(find.byTooltip('Back'), findsNothing); }); - testWidgets('keeps bottom clearance for the floating tab bar', ( + testWidgets('keeps footer clearance inside the scrollable content', ( tester, ) async { - await tester.pumpWidget(await buildTestable()); + await tester.pumpWidget( + await buildTestable(mediaPadding: const EdgeInsets.only(bottom: 88)), + ); await tester.pumpAndSettle(); - final safeAreas = tester.widgetList(find.byType(SafeArea)); - expect(safeAreas, hasLength(1)); - expect(safeAreas.single.top, isFalse); - expect(safeAreas.single.bottom, isTrue); + final safeArea = tester.widget( + find.byKey(const ValueKey('activity-content-safe-area')), + ); + expect(safeArea.top, isFalse); + expect(safeArea.bottom, isFalse); + + final list = tester.widget(find.byType(ListView)); + expect(list.padding, const EdgeInsets.fromLTRB(0, Grid.xxs, 0, 96)); }); testWidgets('shows error view with retry button', (tester) async { @@ -253,7 +261,13 @@ void main() { final material = tester.widget(surface); final shape = material.shape! as RoundedRectangleBorder; - expect(shape.borderRadius, BorderRadius.circular(Radii.card)); + expect(shape.borderRadius, BorderRadius.circular(Radii.popover)); + expect(shape.side.color, Colors.black.withValues(alpha: 0.04)); + expect(material.elevation, appPopoverElevation); + expect( + material.shadowColor, + appPopoverShadowColor(tester.element(surface)), + ); expect(material.surfaceTintColor, Colors.transparent); expect(material.clipBehavior, Clip.antiAlias); @@ -275,7 +289,11 @@ void main() { final optionsSurface = find.byKey( const ValueKey('activity-options-popover'), ); + final optionsMaterial = tester.widget(optionsSurface); + final optionsShape = optionsMaterial.shape! as RoundedRectangleBorder; expect(tester.getSize(optionsSurface).width, 216); + expect(optionsShape.borderRadius, BorderRadius.circular(Radii.popover)); + expect(optionsMaterial.elevation, appPopoverElevation); expect( tester .widget( diff --git a/mobile/test/features/channels/channel_detail_page_test.dart b/mobile/test/features/channels/channel_detail_page_test.dart index f95c6fefed..51c06d0283 100644 --- a/mobile/test/features/channels/channel_detail_page_test.dart +++ b/mobile/test/features/channels/channel_detail_page_test.dart @@ -85,6 +85,25 @@ NostrEvent _systemMsg({ sig: '', ); +NostrEvent _huddleMsg({ + required String id, + required int kind, + String pubkey = 'alice', + int createdAt = 1000, +}) => NostrEvent( + id: id, + pubkey: pubkey, + createdAt: createdAt, + kind: kind, + tags: [ + ['h', _channelId], + ], + content: jsonEncode({ + 'ephemeral_channel_id': '8d764100-fd8f-44cf-9c98-6d8fbd739b8c', + }), + sig: '', +); + NostrEvent _reaction({ required String id, required String targetId, @@ -158,6 +177,7 @@ Widget _buildTestable({ Map> threadReplies = const {}, Map>> pendingThreadReplies = const {}, TextScaler textScaler = TextScaler.noScaling, + bool disableAnimations = false, RelaySessionNotifier? relaySessionNotifier, }) { final resolvedChannel = channel ?? _testChannel; @@ -216,7 +236,10 @@ Widget _buildTestable({ child: MaterialApp( theme: AppTheme.light(), builder: (context, child) => MediaQuery( - data: MediaQuery.of(context).copyWith(textScaler: textScaler), + data: MediaQuery.of(context).copyWith( + textScaler: textScaler, + disableAnimations: disableAnimations, + ), child: child!, ), navigatorObservers: navigatorObservers, @@ -729,6 +752,53 @@ void main() { ); }); + testWidgets('clears the composer inset when membership is revoked', ( + tester, + ) async { + final channelsNotifier = _FakeChannelsNotifier([_testChannel]); + await tester.pumpWidget( + _buildTestable( + messages: [ + _textMsg( + id: 'msg1', + pubkey: 'alice', + content: 'Hello', + createdAt: 1000, + ), + ], + channelsNotifier: channelsNotifier, + ), + ); + await tester.pumpAndSettle(); + + final messageListFinder = find.byKey( + const ValueKey('channel-message-list'), + ); + expect( + tester + .widget(messageListFinder) + .padding! + .bottom, + greaterThan(0), + ); + expect( + find.byKey(const ValueKey('channel-composer-dock')), + findsOneWidget, + ); + + channelsNotifier.setChannels([_testChannel.copyWith(isMember: false)]); + await tester.pumpAndSettle(); + + expect(find.byKey(const ValueKey('channel-composer-dock')), findsNothing); + expect( + tester + .widget(messageListFinder) + .padding! + .bottom, + 0, + ); + }); + testWidgets('updates detail page state after joining a channel', ( tester, ) async { @@ -886,7 +956,15 @@ void main() { final messageList = tester.widget( find.byKey(const ValueKey('channel-message-list')), ); - expect(messageList.padding!.bottom, 0); + final composerDock = find.byKey(const ValueKey('channel-composer-dock')); + final composerDockHeight = tester.getSize(composerDock).height; + expect(messageList.padding!.bottom, composerDockHeight); + expect( + tester + .getBottomLeft(find.byKey(const ValueKey('channel-message-list'))) + .dy, + greaterThan(tester.getTopLeft(composerDock).dy), + ); final newestMessageGroup = tester.widget( find.byKey(const ValueKey('channel-message-group-msg2')), ); @@ -1115,6 +1193,26 @@ void main() { find.byKey(const ValueKey('channel-jump-to-latest')), findsOneWidget, ); + final latestSurface = tester.widget( + find.byKey(const ValueKey('channel-jump-to-latest-surface')), + ); + final latestDecoration = latestSurface.decoration! as BoxDecoration; + expect(latestDecoration.borderRadius, BorderRadius.circular(Radii.full)); + expect( + latestDecoration.color, + AppTheme.light().colorScheme.surface.withValues(alpha: 0.5), + ); + expect( + (latestDecoration.border! as Border).top.color, + Colors.black.withValues(alpha: 0.04), + ); + expect( + find.descendant( + of: find.byKey(const ValueKey('channel-jump-to-latest')), + matching: find.byType(BackdropFilter), + ), + findsOneWidget, + ); messagesNotifier.setMessages([ ...initialMessages, @@ -1446,6 +1544,31 @@ void main() { ); }); + testWidgets('renders a huddle event like a regular message row', ( + tester, + ) async { + await tester.pumpWidget( + _buildTestable( + messages: [_huddleMsg(id: 'huddle-1', kind: EventKind.huddleStarted)], + users: { + 'alice': const UserProfile(pubkey: 'alice', displayName: 'Alice'), + }, + ), + ); + await tester.pumpAndSettle(); + + expect(find.text('Alice'), findsOneWidget); + expect(findRichText('started a huddle'), findsOneWidget); + expect( + tester.getSize(find.byType(CircleAvatar)), + const Size.square(messageAvatarSize), + ); + expect( + find.byKey(const ValueKey('system-message-timestamp-alice')), + findsOneWidget, + ); + }); + testWidgets('renders member_joined (self-join) system event', ( tester, ) async { @@ -2011,7 +2134,8 @@ void main() { }, ), ); - await tester.pumpAndSettle(); + await tester.pump(); + await tester.pump(const Duration(milliseconds: 200)); expect(find.text('Alice is typing…'), findsOneWidget); @@ -2030,7 +2154,15 @@ void main() { expect(decoration.border, isA()); expect( tester.widget(find.text('Alice is typing…')).style?.color, - AppTheme.light().colorScheme.primary, + AppTheme.light().colorScheme.onSurfaceVariant, + ); + expect( + tester.widget(find.text('Alice is typing…')).style?.fontStyle, + isNot(FontStyle.italic), + ); + expect( + find.byKey(const ValueKey('channel-typing-shimmer')), + findsOneWidget, ); expect(tester.widget(find.byType(SmallAvatar)).size, 24); }); @@ -2055,7 +2187,8 @@ void main() { }, ), ); - await tester.pumpAndSettle(); + await tester.pump(); + await tester.pump(const Duration(milliseconds: 200)); expect(find.text('Alice and Bob are typing…'), findsOneWidget); }); @@ -2085,10 +2218,39 @@ void main() { }, ), ); - await tester.pumpAndSettle(); + await tester.pump(); + await tester.pump(const Duration(milliseconds: 200)); expect(find.text('Alice and 2 others are typing…'), findsOneWidget); }); + + testWidgets('keeps typing text static when motion is reduced', ( + tester, + ) async { + await tester.pumpWidget( + _buildTestable( + messages: [], + typing: [ + TypingEntry( + pubkey: 'alice', + expiresAtMs: DateTime.now().millisecondsSinceEpoch + 8000, + ), + ], + users: { + 'alice': const UserProfile(pubkey: 'alice', displayName: 'Alice'), + }, + disableAnimations: true, + ), + ); + await tester.pump(); + await tester.pump(); + + expect(find.text('Alice is typing…'), findsOneWidget); + expect( + find.byKey(const ValueKey('channel-typing-shimmer')), + findsNothing, + ); + }); }); group('Compose bar', () { @@ -2099,7 +2261,7 @@ void main() { await tester.pumpAndSettle(); expect(find.byType(TextField), findsNothing); - expect(find.byIcon(LucideIcons.arrowUp).hitTestable(), findsNothing); + expect(find.byIcon(LucideIcons.arrowUp).hitTestable(), findsOneWidget); await tester.tap(find.text('Message #general')); await tester.pumpAndSettle(); @@ -2480,7 +2642,10 @@ void main() { find.byKey(const ValueKey('thread-message-list')), ); expect(threadList.reverse, isFalse); - expect(threadList.padding!.bottom, Grid.xs); + final threadComposerDockHeight = tester + .getSize(find.byKey(const ValueKey('thread-composer-dock'))) + .height; + expect(threadList.padding!.bottom, Grid.xs + threadComposerDockHeight); final newestThreadGroup = tester.widget( find.byKey(const ValueKey('thread-message-group-reply-next-day')), ); @@ -2507,6 +2672,96 @@ void main() { expect(oldestReplyY, lessThan(newestReplyY)); }); + testWidgets('thread keeps its tail above a growing composer dock', ( + tester, + ) async { + tester.view.physicalSize = const Size(400, 800); + tester.view.devicePixelRatio = 1; + addTearDown(tester.view.resetPhysicalSize); + addTearDown(tester.view.resetDevicePixelRatio); + + final rootEvent = _textMsg( + id: 'thread-root', + pubkey: 'alice', + content: 'Thread root', + createdAt: 1000, + ); + final replies = [ + for (var i = 0; i < 20; i++) + _textMsg( + id: 'reply-$i', + pubkey: 'bob', + content: 'Reply $i', + createdAt: 1100 + i, + extraTags: const [ + ['e', 'thread-root', '', 'reply'], + ], + ), + ]; + + await tester.pumpWidget( + _buildTestable( + messages: [rootEvent], + threadReplies: {'thread-root': replies}, + users: const { + 'alice': UserProfile(pubkey: 'alice', displayName: 'Alice'), + 'bob': UserProfile(pubkey: 'bob', displayName: 'Bob'), + }, + ), + ); + await tester.pumpAndSettle(); + + final threadHead = formatTimeline([rootEvent]).single; + Navigator.of(tester.element(find.byType(ChannelDetailPage))).push( + MaterialPageRoute( + builder: (_) => ThreadDetailPage( + threadHead: threadHead, + allMessages: [threadHead], + channelId: _channelId, + currentPubkey: 'self', + isMember: true, + isArchived: false, + initialMessageId: 'reply-19', + ), + ), + ); + await tester.pumpAndSettle(); + + final dock = find.byKey(const ValueKey('thread-composer-dock')); + final latestReply = find.byKey( + const ValueKey('thread-message-group-reply-19'), + ); + final composerSurface = find.byKey(const ValueKey('composer-surface')); + final compactDockHeight = tester.getSize(dock).height; + expect(latestReply, findsOneWidget); + expect( + tester.getBottomLeft(latestReply).dy, + lessThanOrEqualTo(tester.getTopLeft(composerSurface).dy), + ); + + await tester.tap(find.text('Reply in thread…').hitTestable()); + await tester.pumpAndSettle(); + + expect(tester.getSize(dock).height, greaterThan(compactDockHeight)); + expect(latestReply, findsOneWidget); + expect( + tester.getBottomLeft(latestReply).dy, + lessThanOrEqualTo(tester.getTopLeft(composerSurface).dy), + ); + + // The dock size change above is separate from the later Scaffold + // viewport resize caused by the keyboard. Keep following the tail after + // that metrics change too. + tester.view.viewInsets = const FakeViewPadding(bottom: 300); + addTearDown(tester.view.reset); + await tester.pumpAndSettle(); + + expect( + tester.getBottomLeft(latestReply).dy, + lessThanOrEqualTo(tester.getTopLeft(composerSurface).dy), + ); + }); + testWidgets( 'initial thread hydration keeps the head visible instead of following the tail', (tester) async { @@ -2575,6 +2830,81 @@ void main() { }, ); + testWidgets( + 'deep-linking an older reply does not resume tail following on keyboard resize', + (tester) async { + tester.view.physicalSize = const Size(400, 800); + tester.view.devicePixelRatio = 1; + addTearDown(tester.view.resetPhysicalSize); + addTearDown(tester.view.resetDevicePixelRatio); + addTearDown(tester.view.reset); + + final rootEvent = _textMsg( + id: 'thread-root', + pubkey: 'alice', + content: 'Thread root', + createdAt: 1000, + ); + final replies = [ + for (var i = 0; i < 30; i++) + _textMsg( + id: 'reply-$i', + pubkey: 'bob', + content: 'Reply $i', + createdAt: 1100 + i, + extraTags: const [ + ['e', 'thread-root', '', 'reply'], + ], + ), + ]; + final completer = Completer>(); + + await tester.pumpWidget( + _buildTestable( + messages: [rootEvent], + pendingThreadReplies: {'thread-root': completer.future}, + users: const { + 'alice': UserProfile(pubkey: 'alice', displayName: 'Alice'), + 'bob': UserProfile(pubkey: 'bob', displayName: 'Bob'), + }, + ), + ); + await tester.pumpAndSettle(); + + final threadHead = formatTimeline([rootEvent]).single; + final provisionalTarget = formatTimeline([replies[5]]).single; + Navigator.of(tester.element(find.byType(ChannelDetailPage))).push( + MaterialPageRoute( + builder: (_) => ThreadDetailPage( + threadHead: threadHead, + allMessages: [threadHead, provisionalTarget], + channelId: _channelId, + currentPubkey: 'self', + isMember: true, + isArchived: false, + initialMessageId: 'reply-5', + ), + ), + ); + await tester.pumpAndSettle(); + + completer.complete(replies); + await tester.pumpAndSettle(); + + final target = find.byKey( + const ValueKey('thread-message-group-reply-5'), + ); + expect(target, findsOneWidget); + + await tester.tap(find.text('Reply in thread…').hitTestable()); + await tester.pumpAndSettle(); + tester.view.viewInsets = const FakeViewPadding(bottom: 300); + await tester.pumpAndSettle(); + + expect(target, findsOneWidget); + }, + ); + testWidgets('a reaction landing while the thread is open shows up there', ( tester, ) async { diff --git a/mobile/test/features/channels/channels_page_test.dart b/mobile/test/features/channels/channels_page_test.dart index 991db3b5cd..56032a5dbf 100644 --- a/mobile/test/features/channels/channels_page_test.dart +++ b/mobile/test/features/channels/channels_page_test.dart @@ -200,6 +200,80 @@ void main() { expect(tester.takeException(), isNull); }); + testWidgets('section menu matches desktop labels, icons, and inset', ( + tester, + ) async { + await tester.pumpWidget( + buildTestable( + overrides: [ + channelsProvider.overrideWith(() => _FakeNotifier(testChannels)), + channelSectionsProvider.overrideWith( + () => _FakeChannelSectionsNotifier( + const ChannelSectionStore( + sections: [ + ChannelSection(id: 'section-1', name: 'Design', order: 0), + ], + ), + ), + ), + ], + ), + ); + await tester.pumpAndSettle(); + + await tester.tap(find.byKey(const Key('section-menu-section-1'))); + await tester.pumpAndSettle(); + + final popover = find.byKey(const Key('section-popover-section-1')); + expect(popover, findsOneWidget); + for (final label in [ + 'Rename section', + 'Move up', + 'Move down', + 'Delete section', + ]) { + expect( + find.descendant(of: popover, matching: find.text(label)), + findsOne, + ); + } + for (final icon in [ + LucideIcons.pencil, + LucideIcons.arrowUp, + LucideIcons.arrowDown, + LucideIcons.trash2, + ]) { + expect( + find.descendant(of: popover, matching: find.byIcon(icon)), + findsOne, + ); + } + + final menuItems = tester.widgetList>( + find.descendant( + of: popover, + matching: find.byWidgetPredicate( + (widget) => widget is PopupMenuItem, + ), + ), + ); + expect(menuItems, hasLength(4)); + for (final item in menuItems) { + expect( + item.padding, + const EdgeInsets.fromLTRB(Grid.xs, 0, Grid.twelve, 0), + ); + } + + final error = Theme.of(tester.element(popover)).colorScheme.error; + final deleteText = tester.widget(find.text('Delete section')); + final deleteIcon = tester.widget( + find.descendant(of: popover, matching: find.byIcon(LucideIcons.trash2)), + ); + expect(deleteText.style?.color, error); + expect(deleteIcon.color, error); + }); + testWidgets('aligns the top, section, row, and skeleton label columns', ( tester, ) async { diff --git a/mobile/test/features/channels/compose_bar_test.dart b/mobile/test/features/channels/compose_bar_test.dart index 919d4039eb..7dd2c2b608 100644 --- a/mobile/test/features/channels/compose_bar_test.dart +++ b/mobile/test/features/channels/compose_bar_test.dart @@ -23,6 +23,8 @@ import 'package:buzz/shared/custom_emoji/custom_emoji_provider.dart'; import 'package:buzz/shared/mentions/agent_identity_provider.dart'; import 'package:buzz/shared/relay/relay.dart'; import 'package:buzz/shared/theme/theme.dart'; +import 'package:buzz/shared/widgets/anchored_popover_menu.dart'; +import 'package:buzz/shared/widgets/mobile_tab_footer_backdrop.dart'; import 'package:shared_preferences/shared_preferences.dart'; final _pngBytes = Uint8List.fromList([ @@ -392,6 +394,152 @@ void main() { }); group('ComposeBar', () { + testWidgets('starts compact and grows to the full-width composer', ( + tester, + ) async { + await tester.pumpWidget( + _buildComposeBar( + uploadService: _testUploadService(nostr.Keys.generate().nsec), + onSend: + ( + content, + mentionPubkeys, { + mediaTags = const >[], + }) async {}, + ), + ); + + expect(find.byType(TextField), findsNothing); + expect(find.byTooltip('Add attachment').hitTestable(), findsOneWidget); + expect(find.byIcon(LucideIcons.arrowUp).hitTestable(), findsOneWidget); + expect(find.byKey(const ValueKey('composer-footer-gradient')), findsOne); + final composerBackdrop = find.descendant( + of: find.byKey(const ValueKey('composer-footer-gradient')), + matching: find.byType(MobileTabFooterBackdrop), + ); + expect(composerBackdrop, findsOneWidget); + expect( + tester.getSize(composerBackdrop).height, + mobileTabFooterBackdropHeight(tester.element(composerBackdrop)), + ); + final compactDecoration = + tester + .widget( + find.byKey(const ValueKey('composer-surface')), + ) + .decoration + as BoxDecoration; + expect( + compactDecoration.borderRadius, + BorderRadius.circular(Radii.dialog + Grid.quarter), + ); + final compactWidth = tester + .getSize(find.byKey(const ValueKey('composer-width-transition'))) + .width; + + await _expandComposer(tester); + + final expandedWidth = tester + .getSize(find.byKey(const ValueKey('composer-width-transition'))) + .width; + final expandedDecoration = + tester + .widget( + find.byKey(const ValueKey('composer-surface')), + ) + .decoration + as BoxDecoration; + expect(compactWidth, closeTo(expandedWidth * 0.85, 0.5)); + expect( + expandedDecoration.borderRadius, + BorderRadius.circular(Radii.dialog), + ); + expect(find.byType(TextField), findsOneWidget); + expect(find.byIcon(LucideIcons.atSign), findsOneWidget); + expect(find.byIcon(LucideIcons.hash), findsOneWidget); + expect(find.byIcon(LucideIcons.smilePlus), findsOneWidget); + expect(find.byIcon(LucideIcons.aLargeSmall), findsOneWidget); + }); + + testWidgets('returns to the compact capsule when the keyboard drops', ( + tester, + ) async { + await tester.pumpWidget( + _buildComposeBar( + uploadService: _testUploadService(nostr.Keys.generate().nsec), + onSend: + ( + content, + mentionPubkeys, { + mediaTags = const >[], + }) async {}, + ), + ); + await _expandComposer(tester); + final focusNode = tester + .widget(find.byType(TextField)) + .focusNode!; + expect(focusNode.hasFocus, isTrue); + tester.view.viewInsets = const FakeViewPadding(bottom: 300); + addTearDown(tester.view.reset); + await tester.pump(); + + tester.view.viewInsets = FakeViewPadding.zero; + await tester.pumpAndSettle(); + + expect(find.byType(TextField), findsNothing); + expect(focusNode.hasFocus, isFalse); + final compactDecoration = + tester + .widget( + find.byKey(const ValueKey('composer-surface')), + ) + .decoration + as BoxDecoration; + expect( + compactDecoration.borderRadius, + BorderRadius.circular(Radii.dialog + Grid.quarter), + ); + + await tester.tap(find.text('Message\u2026')); + await tester.pumpAndSettle(); + expect(find.byType(TextField), findsOneWidget); + expect( + tester.widget(find.byType(TextField)).focusNode!.hasFocus, + isTrue, + ); + }); + + testWidgets('attachment control responds while the composer is expanding', ( + tester, + ) async { + final previousPlatform = debugDefaultTargetPlatformOverride; + debugDefaultTargetPlatformOverride = TargetPlatform.android; + try { + await tester.pumpWidget( + _buildComposeBar( + uploadService: _testUploadService(nostr.Keys.generate().nsec), + onSend: + ( + content, + mentionPubkeys, { + mediaTags = const >[], + }) async {}, + ), + ); + + await tester.tap(find.text('Message\u2026')); + await tester.pump(); + await tester.pump(const Duration(milliseconds: 80)); + await tester.tap(find.byTooltip('Add attachment').hitTestable()); + await tester.pumpAndSettle(); + + expect(find.byKey(const ValueKey('attachment-menu')), findsOneWidget); + } finally { + debugDefaultTargetPlatformOverride = previousPlatform; + } + }); + testWidgets('mounted composer does not carry draft text across an in-place ' 'identity switch', (tester) async { final keysA = nostr.Keys.generate(); @@ -492,6 +640,94 @@ void main() { expect(textField.controller!.text, 'hello :meow:world'); expect(textField.controller!.selection.baseOffset, 12); + expect(find.byType(TextField), findsOneWidget); + expect(textField.focusNode!.hasFocus, isTrue); + }); + + testWidgets('composer controls use selection haptics', (tester) async { + final hapticCalls = []; + TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger + .setMockMethodCallHandler(SystemChannels.platform, (call) async { + if (call.method == 'HapticFeedback.vibrate') { + hapticCalls.add(call); + } + return null; + }); + addTearDown( + () => TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger + .setMockMethodCallHandler(SystemChannels.platform, null), + ); + + await tester.pumpWidget( + _buildComposeBar( + uploadService: _testUploadService(nostr.Keys.generate().nsec), + onSend: + ( + content, + mentionPubkeys, { + mediaTags = const >[], + }) async {}, + ), + ); + await _expandComposer(tester); + hapticCalls.clear(); + + await tester.tap(find.byIcon(LucideIcons.atSign)); + tester.widget(find.byType(TextField)).controller!.clear(); + await tester.pump(); + await tester.tap(find.byIcon(LucideIcons.hash)); + await tester.pump(); + await tester.tap(find.byIcon(LucideIcons.aLargeSmall)); + await tester.pumpAndSettle(); + await tester.tap(find.byIcon(LucideIcons.bold)); + await tester.pump(); + await tester.tap(find.byTooltip('Close formatting')); + await tester.pumpAndSettle(); + await tester.tap(find.byTooltip('Add attachment')); + await tester.pumpAndSettle(); + + expect(hapticCalls, hasLength(6)); + expect( + hapticCalls.every( + (call) => call.arguments == 'HapticFeedbackType.selectionClick', + ), + isTrue, + ); + }); + + testWidgets('composer suggestions use the shared popover treatment', ( + tester, + ) async { + await tester.pumpWidget( + _buildComposeBar( + uploadService: _testUploadService(nostr.Keys.generate().nsec), + channels: [_makeChannel(name: 'general', channelType: 'stream')], + onSend: + ( + content, + mentionPubkeys, { + mediaTags = const >[], + }) async {}, + ), + ); + await _expandComposer(tester); + await tester.tap(find.byIcon(LucideIcons.hash)); + await tester.pumpAndSettle(); + + final surface = find.byKey(const ValueKey('channel-suggestions-popover')); + final material = tester.widget(surface); + final shape = material.shape! as RoundedRectangleBorder; + expect(shape.borderRadius, BorderRadius.circular(Radii.popover)); + expect(shape.side.color, Colors.black.withValues(alpha: 0.04)); + expect(material.elevation, appPopoverElevation); + expect( + material.shadowColor, + appPopoverShadowColor(tester.element(surface)), + ); + expect( + tester.widget(find.text('general')).style?.fontFamily, + 'Inter', + ); }); testWidgets('native All Photos picker failures show an error', ( @@ -595,6 +831,60 @@ void main() { } }); + testWidgets('leaving a focused composer dismisses the native keyboard', ( + tester, + ) async { + final previousPlatform = debugDefaultTargetPlatformOverride; + debugDefaultTargetPlatformOverride = TargetPlatform.iOS; + var dismissCalls = 0; + _setMockNativeAttachmentPopoverHandler((call) async { + switch (call.method) { + case 'isSupported': + case 'present': + return true; + case 'dismiss': + dismissCalls += 1; + return null; + } + return null; + }); + + try { + await tester.pumpWidget( + _buildComposeBar( + uploadService: _testUploadService(nostr.Keys.generate().nsec), + onSend: + ( + content, + mentionPubkeys, { + mediaTags = const >[], + }) async {}, + ), + ); + + await _expandComposer(tester); + final focusNode = tester + .widget(find.byType(TextField)) + .focusNode!; + expect(focusNode.hasFocus, isTrue); + + await tester.tap(find.byTooltip('Add attachment').hitTestable()); + await tester.pumpAndSettle(); + expect(focusNode.hasFocus, isTrue); + + await tester.pumpWidget(const SizedBox.shrink()); + await tester.pumpAndSettle(); + + expect(focusNode.hasFocus, isFalse); + expect(dismissCalls, 1); + } finally { + await _sendNativeAttachmentPopoverCall(tester, 'dismissed'); + await tester.pumpWidget(const SizedBox.shrink()); + _setMockNativeAttachmentPopoverHandler(null); + debugDefaultTargetPlatformOverride = previousPlatform; + } + }); + testWidgets( 'unsupported iOS attachment popover unfocuses before fallback menu', (tester) async { @@ -1191,6 +1481,10 @@ void main() { ), ); + final compactComposerWidth = tester + .getSize(find.byKey(const ValueKey('composer-width-transition'))) + .width; + await _openAttachmentMenu(tester); await tester.tap(find.text('Photos')); await tester.pumpAndSettle(); @@ -1201,6 +1495,12 @@ void main() { ); expect(find.byTooltip('Back to attachment options'), findsWidgets); expect(find.text('All photos'), findsOneWidget); + expect( + tester + .getSize(find.byKey(const ValueKey('attachment-surface-popover'))) + .width, + closeTo(compactComposerWidth / 0.85, 0.5), + ); await tester.tap(find.byKey(const ValueKey('recent-photo-two'))); await tester.pumpAndSettle(); @@ -1265,12 +1565,22 @@ void main() { await _openAttachmentMenu(tester); final menu = find.byKey(const ValueKey('attachment-menu')); + final surface = find.byKey(const ValueKey('attachment-surface-popover')); final rows = [ for (final label in ['camera', 'photos', 'video', 'files']) find.byKey(ValueKey('attachment-menu-item-$label')), ]; final menuRect = tester.getRect(menu); + final material = tester.widget(surface); + final shape = material.shape! as RoundedRectangleBorder; + expect(shape.borderRadius, BorderRadius.circular(Radii.popover)); + expect(shape.side.color, Colors.black.withValues(alpha: 0.04)); + expect(material.elevation, appPopoverElevation); + expect( + material.shadowColor, + appPopoverShadowColor(tester.element(surface)), + ); expect(menuRect.size, const Size(216, 264)); for (final row in rows) { expect(tester.getSize(row).height, 52); @@ -1280,6 +1590,7 @@ void main() { for (final label in ['Camera', 'Photos', 'Video', 'Files']) { final text = tester.widget(find.text(label)); expect(text.style?.fontSize, 20); + expect(text.style?.fontFamily, 'Inter'); } final icons = [ for (final label in ['camera', 'photos', 'video', 'files']) @@ -1319,6 +1630,48 @@ void main() { } }); + testWidgets('tapping outside dismisses the Android attachment menu', ( + tester, + ) async { + final previousPlatform = debugDefaultTargetPlatformOverride; + debugDefaultTargetPlatformOverride = TargetPlatform.android; + try { + await tester.pumpWidget( + _buildComposeBar( + uploadService: _testUploadService(nostr.Keys.generate().nsec), + onSend: + ( + content, + mentionPubkeys, { + mediaTags = const >[], + }) async {}, + ), + ); + + await _openAttachmentMenu(tester); + expect(find.byKey(const ValueKey('attachment-menu')), findsOneWidget); + expect( + find.byKey(const ValueKey('attachment-dismiss-barrier')), + findsOneWidget, + ); + + await tester.tapAt(const Offset(24, 24)); + await tester.pumpAndSettle(); + + expect(find.byKey(const ValueKey('attachment-menu')), findsNothing); + expect( + find.byKey(const ValueKey('attachment-dismiss-barrier')), + findsNothing, + ); + expect( + find.byKey(const ValueKey('attachment-trigger-closed')).hitTestable(), + findsOneWidget, + ); + } finally { + debugDefaultTargetPlatformOverride = previousPlatform; + } + }); + testWidgets( 'attachment menu grows rows and scrolls for accessibility text', (tester) async { @@ -1376,6 +1729,9 @@ void main() { }) async {}, ), ); + final compactComposerWidth = tester + .getSize(find.byKey(const ValueKey('composer-width-transition'))) + .width; await _openAttachmentMenu(tester); await tester.tap(find.text('Camera')); @@ -1397,6 +1753,12 @@ void main() { find.byKey(const ValueKey('camera-initialization-ready')), findsOneWidget, ); + expect( + tester + .getSize(find.byKey(const ValueKey('attachment-surface-popover'))) + .width, + closeTo(compactComposerWidth / 0.85, 0.5), + ); } finally { debugDefaultTargetPlatformOverride = previousPlatform; } diff --git a/mobile/test/shared/emoji/native_emoji_glyph_test.dart b/mobile/test/shared/emoji/native_emoji_glyph_test.dart new file mode 100644 index 0000000000..435423905f --- /dev/null +++ b/mobile/test/shared/emoji/native_emoji_glyph_test.dart @@ -0,0 +1,37 @@ +import 'package:buzz/shared/emoji/native_emoji_glyph.dart'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; + +void main() { + testWidgets('lifts the glyph one logical pixel on iOS', (tester) async { + debugDefaultTargetPlatformOverride = TargetPlatform.iOS; + try { + await tester.pumpWidget( + const MaterialApp( + home: Center(child: NativeEmojiGlyph(emoji: '🔥', size: 24)), + ), + ); + + final transform = tester.widget(find.byType(Transform)); + expect(transform.transform.getTranslation().y, -1); + } finally { + debugDefaultTargetPlatformOverride = null; + } + }); + + testWidgets('keeps the glyph unshifted on Android', (tester) async { + debugDefaultTargetPlatformOverride = TargetPlatform.android; + try { + await tester.pumpWidget( + const MaterialApp( + home: Center(child: NativeEmojiGlyph(emoji: '🔥', size: 24)), + ), + ); + + expect(find.byType(Transform), findsNothing); + } finally { + debugDefaultTargetPlatformOverride = null; + } + }); +} diff --git a/mobile/test/shared/theme/app_theme_test.dart b/mobile/test/shared/theme/app_theme_test.dart index 6231befc69..f038c6d974 100644 --- a/mobile/test/shared/theme/app_theme_test.dart +++ b/mobile/test/shared/theme/app_theme_test.dart @@ -7,4 +7,21 @@ void main() { expect(AppTheme.light().splashFactory, NoSplash.splashFactory); expect(AppTheme.dark().splashFactory, NoSplash.splashFactory); }); + + test('uses Inter and the shared elevated popover treatment', () { + final theme = AppTheme.light(); + final popupTheme = theme.popupMenuTheme; + final shape = popupTheme.shape! as RoundedRectangleBorder; + final side = shape.side; + + expect(popupTheme.textStyle?.fontFamily, 'Inter'); + expect(popupTheme.elevation, 8); + expect( + popupTheme.shadowColor, + theme.colorScheme.shadow.withValues(alpha: 0.18), + ); + expect(shape.borderRadius, BorderRadius.circular(Radii.popover)); + expect(side.color, Colors.black.withValues(alpha: 0.04)); + expect(side.width, 1); + }); } diff --git a/mobile/test/shared/theme/message_typography_test.dart b/mobile/test/shared/theme/message_typography_test.dart index 169bcc0200..c5bec55556 100644 --- a/mobile/test/shared/theme/message_typography_test.dart +++ b/mobile/test/shared/theme/message_typography_test.dart @@ -130,6 +130,13 @@ void main() { lineHeight: 17, letterSpacing: 0, ); + expectStyle( + filterChipTextStyle, + fontSize: 15, + fontWeight: FontWeight.w400, + lineHeight: 15, + letterSpacing: 0, + ); }); test('message and activity avatars use their surface sizes', () { diff --git a/mobile/test/shared/widgets/filter_chip_bar_test.dart b/mobile/test/shared/widgets/filter_chip_bar_test.dart index 6f651624b6..72040e5d86 100644 --- a/mobile/test/shared/widgets/filter_chip_bar_test.dart +++ b/mobile/test/shared/widgets/filter_chip_bar_test.dart @@ -39,10 +39,57 @@ void main() { final unselectedLabel = tester.widget(find.text('Following')); expect(selectedLabel.style?.fontSize, filterChipTextStyle.fontSize); expect(selectedLabel.style?.height, filterChipTextStyle.height); + expect(selectedLabel.style?.fontFamily, 'Inter'); expect(selectedLabel.style?.fontWeight, FontWeight.w500); expect(unselectedLabel.style?.fontSize, filterChipTextStyle.fontSize); expect(unselectedLabel.style?.height, filterChipTextStyle.height); expect(unselectedLabel.style?.fontWeight, FontWeight.w400); + final chip = tester.widget( + find.widgetWithText(FilterChip, 'Everyone'), + ); + final shape = chip.shape! as RoundedRectangleBorder; + expect(shape.borderRadius, BorderRadius.circular(Radii.lg)); + expect(chip.labelPadding, EdgeInsets.zero); + }); + + testWidgets('search labels are vertically centered in their chips', ( + tester, + ) async { + await tester.pumpWidget( + MaterialApp( + theme: AppTheme.light(), + home: Scaffold( + body: SizedBox( + width: 390, + child: FilterChipBar( + expandItems: true, + visualDensity: const VisualDensity(horizontal: -2), + chipVerticalPadding: Grid.xxs, + barVerticalPadding: Grid.twelve, + selected: 0, + onSelected: (_) {}, + items: const [ + FilterChipItem(id: 0, label: 'All'), + FilterChipItem(id: 1, label: 'Messages'), + FilterChipItem(id: 2, label: 'Channels'), + FilterChipItem(id: 3, label: 'People'), + ], + ), + ), + ), + ), + ); + await tester.pumpAndSettle(); + + for (final label in ['All', 'Messages', 'Channels', 'People']) { + final text = find.text(label); + final chip = find.ancestor(of: text, matching: find.byType(RawChip)); + expect(chip, findsOneWidget); + expect( + tester.getCenter(text).dy, + closeTo(tester.getCenter(chip).dy, 0.01), + ); + } }); testWidgets('expanded chips preserve large accessible text scaling', ( @@ -81,7 +128,10 @@ void main() { ), findsNothing, ); - expect(tester.getSize(find.text('Messages')).height, greaterThan(32)); + expect( + tester.getSize(find.text('Messages')).height, + greaterThanOrEqualTo(30), + ); expect(tester.takeException(), isNull); }); } diff --git a/mobile/test/shared/widgets/keyboard_dismiss_on_drag_test.dart b/mobile/test/shared/widgets/keyboard_dismiss_on_drag_test.dart index ae03f55c16..19424b7c82 100644 --- a/mobile/test/shared/widgets/keyboard_dismiss_on_drag_test.dart +++ b/mobile/test/shared/widgets/keyboard_dismiss_on_drag_test.dart @@ -4,7 +4,10 @@ import 'package:flutter_test/flutter_test.dart'; /// A focused field inside a `Scaffold` body, which is the only arrangement /// either message list ever runs in. -Widget _testable({required FocusNode focusNode}) { +Widget _testable({ + required FocusNode focusNode, + VoidCallback? onUserScrollStart, +}) { return MaterialApp( home: Scaffold( body: Column( @@ -12,6 +15,7 @@ Widget _testable({required FocusNode focusNode}) { TextField(focusNode: focusNode), Expanded( child: KeyboardDismissOnDrag( + onUserScrollStart: onUserScrollStart, child: ListView( children: [ for (var i = 0; i < 40; i++) @@ -104,6 +108,23 @@ void main() { expect(focusNode.hasFocus, isTrue); }); + testWidgets('reports a user-started scroll', (tester) async { + final focusNode = FocusNode(); + addTearDown(focusNode.dispose); + var userScrollStarts = 0; + await tester.pumpWidget( + _testable( + focusNode: focusNode, + onUserScrollStart: () => userScrollStarts += 1, + ), + ); + + await tester.drag(find.text('row 3'), const Offset(0, -100)); + await tester.pumpAndSettle(); + + expect(userScrollStarts, 1); + }); + testWidgets('an upward drag never dismisses, however far it goes', ( tester, ) async { diff --git a/mobile/test/shared/widgets/mobile_tab_footer_backdrop_test.dart b/mobile/test/shared/widgets/mobile_tab_footer_backdrop_test.dart index 9e54177d61..e13d17a65e 100644 --- a/mobile/test/shared/widgets/mobile_tab_footer_backdrop_test.dart +++ b/mobile/test/shared/widgets/mobile_tab_footer_backdrop_test.dart @@ -3,6 +3,28 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { + testWidgets('shared gradient fades from transparent to the page surface', ( + tester, + ) async { + LinearGradient? gradient; + + await tester.pumpWidget( + MaterialApp( + home: Builder( + builder: (context) { + gradient = mobileTabFooterBackdropGradient(context); + return const SizedBox(); + }, + ), + ), + ); + + expect(gradient?.stops, [0, 0.5, 1]); + expect(gradient?.colors.first.a, 0); + expect(gradient?.colors[1].a, 0.75); + expect(gradient?.colors.last.a, 1); + }); + testWidgets('uses the logical bottom safe-area inset', (tester) async { double? height; From be95a8a986d02319b27e8fb57aefe59e33a1eb13 Mon Sep 17 00:00:00 2001 From: Will Pfleger Date: Mon, 3 Aug 2026 11:04:49 -0400 Subject: [PATCH 04/27] fix(config-bridge): add harness-definition env tier and fix equal-value model override (#3580) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All seven normalized config fields resolve through sanitized `InheritedConfigTiers` passed wholesale to `read_config_surface`. The reader's precedence tiers now match spawn's Layer 2b exactly — including harness-definition env — and the equal-value model-override regression is fixed. ## Changes **`config_bridge/types.rs`** — add `InheritedConfigTiers`: persona env, global env, harness definition env, structured model/provider/prompt for both tiers. Add `HarnessDefault` `ConfigOrigin` variant for harness-definition env values. **`commands/agent_config.rs`** — `build_inherited_tiers` now resolves the harness definition env using the same lookup path as spawn (`record.runtime` → `persona.runtime` → empty string) and applies `sanitize_inherited_env` to it. `resolve_config_surface` is unchanged in shape — tiers passed to the reader now include `definition_env`. **`config_bridge/reader.rs`** — `env_candidates` extended to 4-element return (record, persona, global, definition). All five field builders that use env candidates now include the definition-env slot below global env and above the structured block, matching spawn Layer 2b. Magic `configured[..6]` slice replaced with `configured[..configured.len()-1]` (named split: all non-file candidates). Equal-value model-override arm falls through to the normal resolve path instead of early-returning `RuntimeOverride`, so the panel shows the baseline origin (e.g. `BuzzExplicit`) rather than a spurious "Live override" label for a no-op switch. **`config_bridge/reader_tests_ext.rs`** — three new Layer 2b tests: definition env beats structured persona model, global env beats definition env, reserved-key-absent fallthrough. **`commands/agent_config_tests.rs`** — `genuine_explicit_live_switch_to_same_model_yields_clean_field` updated to assert `origin == BuzzExplicit` (not `RuntimeOverride`); wrapped in `with_no_goose_config` for hermeticity. New `reserved_key_in_definition_env_shaped_map_is_stripped_by_sanitize` test pins the shared sanitization contract. **`AgentConfigPanel.tsx` / `types.ts`** — `HarnessDefault` origin variant wired end-to-end: TS union type and provenance sentence ("Inherited from harness definition"). --------- Signed-off-by: Will Pfleger Co-authored-by: npub1mn7jgtj4w2pd0g0zeuhxsa6jy6p0rewxz4kujt98my82ahfmp72sxjexk7 --- .../src-tauri/src/commands/agent_config.rs | 765 +++--------------- .../src/commands/agent_config_tests.rs | 651 +++++++++++++++ .../managed_agents/config_bridge/reader.rs | 479 ++++++----- .../config_bridge/reader_tests.rs | 497 ++++++++---- .../config_bridge/reader_tests_ext.rs | 258 ++++++ .../src/managed_agents/config_bridge/types.rs | 48 +- .../src-tauri/src/managed_agents/runtime.rs | 3 +- .../src/managed_agents/runtime/metadata.rs | 26 - .../features/agents/ui/AgentConfigPanel.tsx | 2 + desktop/src/shared/api/types.ts | 4 +- 10 files changed, 1675 insertions(+), 1058 deletions(-) create mode 100644 desktop/src-tauri/src/commands/agent_config_tests.rs create mode 100644 desktop/src-tauri/src/managed_agents/config_bridge/reader_tests_ext.rs diff --git a/desktop/src-tauri/src/commands/agent_config.rs b/desktop/src-tauri/src/commands/agent_config.rs index 5a26f0f645..7aded79599 100644 --- a/desktop/src-tauri/src/commands/agent_config.rs +++ b/desktop/src-tauri/src/commands/agent_config.rs @@ -8,14 +8,14 @@ use crate::{ read_goose_file_config, reader::read_config_surface, types::{ - AcpConfigOptionEntry, AcpConfigOptionValue, AcpModelEntry, ConfigOrigin, - NormalizedField, RuntimeConfigSurface, SessionConfigCache, + AcpConfigOptionEntry, AcpConfigOptionValue, AcpModelEntry, InheritedConfigTiers, + RuntimeConfigSurface, SessionConfigCache, }, }, - current_instance_id, known_acp_runtime, load_managed_agents, load_personas, - resolve_effective_prompt_model_provider, save_managed_agents, sync_managed_agent_processes, + current_instance_id, is_reserved_env_key, is_well_formed_env_key, known_acp_runtime, + load_managed_agents, load_personas, save_managed_agents, sync_managed_agent_processes, AgentDefinition, GlobalAgentConfig, KnownAcpRuntime, ManagedAgentRecord, - ManagedAgentRuntimeKey, + ManagedAgentRuntimeKey, MAX_ENV_VALUE_BYTES, }, }; @@ -36,28 +36,86 @@ pub struct RuntimeFileConfigSubset { pub satisfied_env_keys: Vec, } -/// Resolve the config surface with persona and global default values applied. -/// -/// Linked instances are definition-authoritative: the record's own -/// system_prompt/model/provider are cleared before applying, so a stale -/// materialized snapshot can never shadow the persona's current values or a -/// blank-definition fallthrough to global defaults (mirrors -/// `effective_config::resolve_linked`). Definition-less instances keep their -/// own explicit values. -/// -/// The pipeline: resolve the linked persona's prompt/model/provider, inject -/// each into the record only where the record lacks its own value, let -/// `read_config_surface` tag those injected fields `BuzzExplicit`, then re-tag -/// exactly the injected fields to `PersonaDefault`. +/// Sanitize a raw env map from an inherited tier (persona or global) with the +/// same rules `merged_user_env` applies at spawn time: reserved keys, malformed +/// keys, NUL-byte values, and oversize values are stripped silently. +fn sanitize_inherited_env( + raw: &std::collections::BTreeMap, +) -> std::collections::BTreeMap { + raw.iter() + .filter(|(k, v)| { + !is_reserved_env_key(k) + && is_well_formed_env_key(k) + && !v.contains('\0') + && v.len() <= MAX_ENV_VALUE_BYTES + }) + .map(|(k, v)| (k.clone(), v.clone())) + .collect() +} + +/// Normalize a structured field value: blank/whitespace-only collapses to +/// `None`, matching `effective_config`'s `non_blank` helper. +fn non_blank(v: Option<&str>) -> Option { + v.filter(|s| !s.trim().is_empty()).map(str::to_owned) +} + +/// Build a sanitized `InheritedConfigTiers` snapshot at the command boundary. /// -/// Global defaults fill in when neither the record nor the linked persona -/// provides a value. They are re-tagged to `GlobalDefault` so the UI can -/// display "inherited from global defaults". +/// Persona env, global env, and harness definition env are sanitized with +/// spawn-equivalent rules. Structured fields are normalized (blank → None). +/// A missing persona (orphaned link) yields empty persona tiers — the panel +/// still renders from record/global while spawn independently refuses. +fn build_inherited_tiers( + record_persona_id: Option<&str>, + record_runtime: Option<&str>, + personas: &[AgentDefinition], + global: &GlobalAgentConfig, +) -> InheritedConfigTiers { + let persona = record_persona_id.and_then(|pid| personas.iter().find(|p| p.id == pid)); + + let persona_env = persona + .map(|p| sanitize_inherited_env(&p.env_vars)) + .unwrap_or_default(); + let global_env = sanitize_inherited_env(&global.env_vars); + + // Definition env: same resolution as spawn (record.runtime → persona.runtime → ""). + // Reserved keys stripped; no malformed-key / NUL / oversize check needed because + // harness definitions are local admin-authored JSON, not user-provided data — but + // we apply `sanitize_inherited_env` for defense-in-depth (same rules as the other tiers). + let definition_env = { + let runtime_id = record_runtime + .or_else(|| persona.and_then(|p| p.runtime.as_deref())) + .unwrap_or(""); + crate::managed_agents::custom_harnesses::lookup_loaded_harness_by_id(runtime_id) + .map(|def| sanitize_inherited_env(&def.env)) + .unwrap_or_default() + }; + + let persona_model = persona.and_then(|p| non_blank(p.model.as_deref())); + let persona_provider = persona.and_then(|p| non_blank(p.provider.as_deref())); + let persona_prompt = persona.and_then(|p| non_blank(Some(&p.system_prompt))); + let global_model = non_blank(global.model.as_deref()); + let global_provider = non_blank(global.provider.as_deref()); + + InheritedConfigTiers { + persona_env, + global_env, + definition_env, + persona_model, + persona_provider, + persona_prompt, + global_model, + global_provider, + } +} + +/// Resolve the config surface with inherited persona and global tiers applied. /// -/// The re-tag is triple-gated — a field is re-tagged only when (a) the record -/// did not already have it (`!had_*`), (b) the surface produced the field, and -/// (c) the reader tagged it `BuzzExplicit`. A value the user set explicitly in -/// Buzz keeps `had_* == true` and is never re-tagged. +/// Persona-linked instances have their system_prompt/model/provider cleared +/// first (definition-authoritative): stale materialized snapshots can never +/// shadow live persona values. The reader then resolves each field through its +/// full candidate list (record env > ACP > persona env > global env > structured +/// persona/global > config file) via `resolve_with_override`. fn resolve_config_surface( mut record: ManagedAgentRecord, personas: &[AgentDefinition], @@ -65,146 +123,23 @@ fn resolve_config_surface( session_cache: Option<&SessionConfigCache>, global: &GlobalAgentConfig, ) -> RuntimeConfigSurface { - // Linked instances are definition-authoritative (mirrors - // `effective_config::resolve_linked`): the record's own - // system_prompt/model/provider fields are, at best, a stale materialized - // snapshot from the last `apply_persona_snapshot` — never a legitimate - // live override, since `update_managed_agent` blocks writing these three - // fields for linked instances. Clear them before computing `had_*` below - // so a stale byte can never masquerade as BuzzExplicit and suppress - // definition/global injection. Env var overrides (set via the advanced - // env-vars editor) are untouched — those remain a legitimate - // per-instance override regardless of link status. + // Linked instances are definition-authoritative: clear stale materialized + // model/provider/prompt so they can never masquerade as BuzzExplicit and + // shadow definition values. Env var overrides are untouched. if record.persona_id.is_some() { record.system_prompt = None; record.model = None; record.provider = None; } - let had_prompt = - record.system_prompt.is_some() || record.env_vars.contains_key("BUZZ_ACP_SYSTEM_PROMPT"); - let had_model = record.model.is_some(); - - let provider_env_key = runtime_meta.and_then(|m| m.provider_env_var).unwrap_or(""); - let had_provider = record.env_vars.contains_key(provider_env_key); - - let (persona_prompt, persona_model, persona_provider) = resolve_effective_prompt_model_provider( + let tiers = build_inherited_tiers( record.persona_id.as_deref(), + record.runtime.as_deref(), personas, - record.system_prompt.clone(), - record.model.clone(), - record.provider.clone(), - ); - - // Build the baseline the reader overrides a live model against, paired with - // its true origin so the secondary is tagged correctly. Two sources: - // - persona-linked, no explicit record model: the persona model is the - // baseline (PersonaDefault). - // - genuine-explicit (record had its own model) that live-switched: the - // record's own model is the baseline (BuzzExplicit). Gated behind - // `model_overridden` so a persona edited mid-life (override flag false) - // never synthesizes a baseline and false-positives an override. - // An explicit pick with no live switch has no baseline to override. - let model_overridden = session_cache.is_some_and(|c| c.model_overridden); - let baseline = if had_model { - if model_overridden { - record - .model - .clone() - .map(|m| (m, ConfigOrigin::BuzzExplicit)) - } else { - None - } - } else { - // Prefer persona as baseline, fall back to global when persona has none - // and the model was overridden mid-session (global-default agent). - persona_model - .clone() - .map(|m| (m, ConfigOrigin::PersonaDefault)) - .or_else(|| { - if model_overridden { - global - .model - .clone() - .map(|m| (m, ConfigOrigin::GlobalDefault)) - } else { - None - } - }) - }; - - // Inject resolved persona values into the record where absent. - if !had_prompt { - if let Some(p) = persona_prompt { - record - .env_vars - .insert("BUZZ_ACP_SYSTEM_PROMPT".to_string(), p); - } - } - if !had_model { - record.model = persona_model.clone(); - } - if !had_provider && !provider_env_key.is_empty() { - if let Some(prov) = persona_provider { - record.env_vars.insert(provider_env_key.to_string(), prov); - } - } - - // Inject global defaults where neither the record nor the persona had a value. - // Track injection so we can re-tag to GlobalDefault after the reader. - let inject_global_model = !had_model && record.model.is_none(); - let inject_global_provider = !had_provider - && !provider_env_key.is_empty() - && !record.env_vars.contains_key(provider_env_key); - - if inject_global_model { - record.model = global.model.clone(); - } - if inject_global_provider { - if let Some(ref gprov) = global.provider { - record - .env_vars - .insert(provider_env_key.to_string(), gprov.clone()); - } - } - - let mut surface = read_config_surface( - &record, - runtime_meta, - session_cache, - baseline.as_ref().map(|(m, o)| (m.as_str(), o.clone())), + global, ); - // Re-tag persona-sourced fields from BuzzExplicit to PersonaDefault. - if !had_prompt { - retag_persona_default(&mut surface.normalized.system_prompt); - } - if !had_model && !inject_global_model { - retag_persona_default(&mut surface.normalized.model); - } - if !had_provider && !provider_env_key.is_empty() && !inject_global_provider { - retag_persona_default(&mut surface.normalized.provider); - } - - // Re-tag global-sourced fields from BuzzExplicit to GlobalDefault. - if inject_global_model { - retag_global_default(&mut surface.normalized.model); - } - if inject_global_provider { - retag_global_default(&mut surface.normalized.provider); - } - - surface -} - -/// Re-tag a field's origin from `BuzzExplicit` to `PersonaDefault`, leaving any -/// other origin untouched. No-op when the field is absent. -fn retag_persona_default(field: &mut Option) { - if let Some(field) = field { - if field.origin == ConfigOrigin::BuzzExplicit { - field.origin = ConfigOrigin::PersonaDefault; - } - } + read_config_surface(&record, runtime_meta, session_cache, &tiers) } /// Get the file-layer config for a runtime — used by the Create/Edit/Persona @@ -327,16 +262,6 @@ pub fn get_baked_build_env() -> Vec { .collect() } -/// Re-tag a field's origin from `BuzzExplicit` to `GlobalDefault`, leaving any -/// other origin untouched. No-op when the field is absent. -fn retag_global_default(field: &mut Option) { - if let Some(field) = field { - if field.origin == ConfigOrigin::BuzzExplicit { - field.origin = ConfigOrigin::GlobalDefault; - } - } -} - /// Get the full config surface for a managed agent. /// /// Returns normalized + advanced config from all available tiers. @@ -601,511 +526,5 @@ fn parse_models(raw: Option<&serde_json::Value>) -> (Vec, Option< } #[cfg(test)] -mod tests { - use super::*; - use crate::managed_agents::{BackendKind, RespondTo}; - - fn goose_runtime() -> &'static KnownAcpRuntime { - &KnownAcpRuntime { - id: "goose", - label: "Goose", - commands: &["goose"], - aliases: &[], - avatar_url: "", - mcp_command: None, - mcp_hooks: false, - underlying_cli: None, - cli_install_commands: &[], - cli_install_commands_windows: &[], - adapter_install_commands: &[], - cli_install_instructions_url: "", - adapter_install_instructions_url: "", - cli_install_hint: "", - adapter_install_hint: "", - skill_dir: None, - supports_acp_model_switching: false, - model_env_var: Some("GOOSE_MODEL"), - provider_env_var: Some("GOOSE_PROVIDER"), - provider_locked: false, - default_env: &[], - config_file_path: Some("~/.config/goose/config.yaml"), - config_file_format: Some("yaml"), - supports_acp_native_config: true, - thinking_env_var: Some("GOOSE_THINKING_EFFORT"), - max_tokens_env_var: Some("GOOSE_MAX_TOKENS"), - context_limit_env_var: Some("GOOSE_CONTEXT_LIMIT"), - required_normalized_fields: &["model", "provider"], - login_hint: None, - auth_probe_args: None, - } - } - - fn agent_record() -> ManagedAgentRecord { - ManagedAgentRecord { - pubkey: "agent".to_string(), - name: "Agent".to_string(), - persona_id: Some("persona-1".to_string()), - private_key_nsec: "".to_string(), - auth_tag: None, - relay_url: "ws://localhost:3000".to_string(), - avatar_url: None, - acp_command: "buzz-acp".to_string(), - agent_command: "goose".to_string(), - agent_args: vec![], - mcp_command: "".to_string(), - turn_timeout_seconds: 300, - idle_timeout_seconds: None, - max_turn_duration_seconds: None, - parallelism: 1, - system_prompt: None, - model: None, - env_vars: Default::default(), - start_on_app_launch: false, - auto_restart_on_config_change: true, - runtime_pid: None, - backend: BackendKind::Local, - backend_agent_id: None, - provider_binary_path: None, - team_id: None, - persona_team_dir: None, - persona_name_in_team: None, - created_at: "".to_string(), - updated_at: "".to_string(), - last_started_at: None, - last_stopped_at: None, - last_exit_code: None, - last_error: None, - last_error_code: None, - respond_to: RespondTo::OwnerOnly, - respond_to_allowlist: vec![], - display_name: None, - slug: None, - runtime: None, - name_pool: Vec::new(), - is_builtin: false, - is_active: true, - shared: false, - source_team: None, - source_team_persona_slug: None, - catalog_source: None, - definition_respond_to: None, - definition_respond_to_allowlist: Vec::new(), - definition_parallelism: None, - relay_mesh: None, - agent_command_override: None, - persona_source_version: None, - provider: None, - } - } - - fn persona_with_model(model: &str) -> AgentDefinition { - AgentDefinition { - id: "persona-1".to_string(), - display_name: "Persona".to_string(), - avatar_url: None, - system_prompt: "You are a persona.".to_string(), - runtime: None, - model: Some(model.to_string()), - provider: None, - name_pool: Vec::new(), - is_builtin: false, - is_active: true, - shared: false, - source_team: None, - source_team_persona_slug: None, - catalog_source: None, - env_vars: Default::default(), - respond_to: None, - respond_to_allowlist: Vec::new(), - parallelism: None, - created_at: "".to_string(), - updated_at: "".to_string(), - } - } - - /// A post-spawn session cache whose live model is `current_model` and whose - /// `model_overridden` flag records whether a `SwitchModel` control signal set - /// it (the live-switch signal). - fn session_cache(current_model: &str, model_overridden: bool) -> SessionConfigCache { - SessionConfigCache { - config_options: vec![], - available_modes: vec![], - available_models: vec![], - current_model: Some(current_model.to_string()), - model_overridden, - goose_native_config: None, - captured_at: "".to_string(), - } - } - - /// Definition-authoritative: a stale materialized `record.model` on a - /// linked instance must never outrank (or even be consulted against) the - /// linked persona's model. `update_managed_agent` already blocks writing - /// model/provider/prompt for linked instances, so a non-`None` value here - /// can only be leftover snapshot bytes from before a persona edit — the - /// panel must report the persona's current model, tagged `PersonaDefault`, - /// not the stale byte as `BuzzExplicit`. - #[test] - fn linked_stale_record_model_never_outranks_persona_model() { - let mut record = agent_record(); - record.model = Some("stale-explicit-model".to_string()); - let personas = vec![persona_with_model("persona-model")]; - - let surface = resolve_config_surface( - record, - &personas, - Some(goose_runtime()), - None, - &Default::default(), - ); - - let model = surface.normalized.model.as_ref().expect("model resolved"); - assert_eq!(model.value.as_deref(), Some("persona-model")); - assert_eq!(model.origin, ConfigOrigin::PersonaDefault); - } - - /// Definition-authoritative, blank-definition case: a linked instance - /// whose persona has no model of its own must fall through to the global - /// default, tagged `GlobalDefault` — mirroring - /// `effective_config::resolve_linked`'s `None => global` arm. A stale - /// materialized record model must not shadow this fallthrough either. - #[test] - fn linked_blank_definition_model_falls_through_to_global_default() { - let mut record = agent_record(); - record.model = Some("stale-explicit-model".to_string()); - let mut persona = persona_with_model("unused"); - persona.model = None; - let personas = vec![persona]; - let global = crate::managed_agents::GlobalAgentConfig { - model: Some("global-model".to_string()), - ..Default::default() - }; - - let surface = - resolve_config_surface(record, &personas, Some(goose_runtime()), None, &global); - - let model = surface.normalized.model.as_ref().expect("model resolved"); - assert_eq!(model.value.as_deref(), Some("global-model")); - assert_eq!(model.origin, ConfigOrigin::GlobalDefault); - } - - /// A definition-less (no `persona_id`) instance's own explicit model IS - /// authoritative — the stale-record clearing above is scoped to linked - /// instances only. - #[test] - fn definition_less_explicit_record_model_keeps_buzz_explicit_origin() { - let mut record = agent_record(); - record.persona_id = None; - record.model = Some("explicit-model".to_string()); - let personas = vec![persona_with_model("persona-model")]; - - let surface = resolve_config_surface( - record, - &personas, - Some(goose_runtime()), - None, - &Default::default(), - ); - - let model = surface.normalized.model.as_ref().expect("model resolved"); - assert_eq!(model.value.as_deref(), Some("explicit-model")); - assert_eq!(model.origin, ConfigOrigin::BuzzExplicit); - } - - /// Part A — pending-pick: a genuine-explicit pick X with a divergent live - /// model Y but `model_overridden == false` (the live switch is not yet - /// applied — a restart is pending) must keep X as the primary and must NOT - /// surface Y as an override row. The live `acp_model` does not win. This - /// FAILS against a let-live-acp-win variant (one that dropped the - /// `model_overridden` gate), so it is not vacuous. - #[test] - fn pending_pick_keeps_explicit_x_and_does_not_surface_live_y() { - let mut record = agent_record(); - record.persona_id = None; - record.model = Some("model-x".to_string()); - let personas: Vec = vec![]; - let cache = session_cache("model-y", false); - - let surface = resolve_config_surface( - record, - &personas, - Some(goose_runtime()), - Some(&cache), - &Default::default(), - ); - let model = surface.normalized.model.expect("model resolved"); - - assert_eq!(model.value.as_deref(), Some("model-x")); - assert_eq!(model.origin, ConfigOrigin::BuzzExplicit); - assert_ne!(model.origin, ConfigOrigin::RuntimeOverride); - assert_ne!(model.overridden_value.as_deref(), Some("model-y")); - } - - /// W2 — genuine-explicit live switch: record.model = X, no persona, - /// `model_overridden == true`, live model = Y. The live Y must render as the - /// primary with a `RuntimeOverride` origin and X as the secondary tagged - /// `BuzzExplicit` (its true source — NOT `PersonaDefault`). FAILS against the - /// shipped no-persona early-return, which left X as primary and Y struck. - #[test] - fn genuine_explicit_live_switch_renders_y_over_x_buzz_explicit_secondary() { - let mut record = agent_record(); - record.persona_id = None; - record.model = Some("model-x".to_string()); - let personas: Vec = vec![]; - let cache = session_cache("model-y", true); - - let surface = resolve_config_surface( - record, - &personas, - Some(goose_runtime()), - Some(&cache), - &Default::default(), - ); - let model = surface.normalized.model.expect("model resolved"); - - assert_eq!(model.value.as_deref(), Some("model-y")); - assert_eq!(model.origin, ConfigOrigin::RuntimeOverride); - assert_eq!(model.overridden_value.as_deref(), Some("model-x")); - assert_eq!(model.overridden_origin, Some(ConfigOrigin::BuzzExplicit)); - } - - /// Y==X collision: a genuine-explicit agent live-switches to the SAME value - /// it already had. There is no real divergence, so the field must be a clean - /// single value with NO secondary row. FAILS against a naive `return base` - /// that would leak the `AcpConfigOption` row `build_model_field` populates. - #[test] - fn genuine_explicit_live_switch_to_same_model_yields_clean_field() { - let mut record = agent_record(); - record.persona_id = None; - record.model = Some("model-x".to_string()); - let personas: Vec = vec![]; - let cache = session_cache("model-x", true); - - let surface = resolve_config_surface( - record, - &personas, - Some(goose_runtime()), - Some(&cache), - &Default::default(), - ); - let model = surface.normalized.model.expect("model resolved"); - - assert_eq!(model.value.as_deref(), Some("model-x")); - assert_eq!(model.overridden_value, None); - assert_eq!(model.overridden_origin, None); - } - - /// Persona parity (regression): a persona-linked agent with no explicit - /// record model that live-switches still renders the persona model as the - /// secondary tagged `PersonaDefault` — the typed-baseline change must NOT - /// regress the persona arm to a different origin. - #[test] - fn persona_linked_live_switch_keeps_persona_default_secondary() { - let record = agent_record(); - let personas = vec![persona_with_model("persona-model")]; - let cache = session_cache("model-y", true); - - let surface = resolve_config_surface( - record, - &personas, - Some(goose_runtime()), - Some(&cache), - &Default::default(), - ); - let model = surface.normalized.model.expect("model resolved"); - - assert_eq!(model.value.as_deref(), Some("model-y")); - assert_eq!(model.origin, ConfigOrigin::RuntimeOverride); - assert_eq!(model.overridden_value.as_deref(), Some("persona-model")); - assert_eq!(model.overridden_origin, Some(ConfigOrigin::PersonaDefault)); - } - - /// Fix 2 regression: a global-default-only agent (no record model, no - /// persona model, but global has a model) that live-switches mid-session - /// must render the global model as the secondary tagged `GlobalDefault`. - /// Before the fix, `baseline` was `None` in the `!had_model` arm when - /// persona has no model, so `read_config_surface` had no secondary to - /// surface. Fails against pre-fix code where the baseline arm returned - /// `None` when `!had_model && persona_model.is_none() && model_overridden`. - #[test] - fn global_default_live_switch_renders_global_model_as_secondary_global_default() { - // Record has no model, no persona, global provides the model. - let mut record = agent_record(); - record.persona_id = None; - // record.model = None (set by agent_record()) - let personas: Vec = vec![]; - let cache = session_cache("model-y", true); - let global = crate::managed_agents::GlobalAgentConfig { - model: Some("global-model".to_string()), - ..Default::default() - }; - - let surface = resolve_config_surface( - record, - &personas, - Some(goose_runtime()), - Some(&cache), - &global, - ); - let model = surface.normalized.model.expect("model resolved"); - - // Live model wins as primary. - assert_eq!(model.value.as_deref(), Some("model-y")); - assert_eq!(model.origin, ConfigOrigin::RuntimeOverride); - // Global model surfaces as secondary, tagged GlobalDefault. - assert_eq!( - model.overridden_value.as_deref(), - Some("global-model"), - "global model must be the override baseline secondary" - ); - assert_eq!( - model.overridden_origin, - Some(ConfigOrigin::GlobalDefault), - "override baseline origin must be GlobalDefault, not PersonaDefault or BuzzExplicit" - ); - } - - // ── get_baked_build_env / is_secret_key tests ────────────────────────── - - /// Build a `BakedEnvEntry` vec from a synthetic map, mirroring what - /// `get_baked_build_env()` does. Used to test masking without relying on - /// compile-time `option_env!` vars (OSS builds have empty `baked_build_env`). - fn baked_env_from_map(map: &[(&str, &str)]) -> Vec { - map.iter() - .filter(|(_, v)| !v.is_empty()) - .map(|(k, v)| { - let masked = !super::is_safe_to_reveal(k); - BakedEnvEntry { - key: k.to_string(), - value: if masked { - "\u{2022}\u{2022}\u{2022}\u{2022}\u{2022}\u{2022}".to_string() - } else { - v.to_string() - }, - masked, - } - }) - .collect() - } - - #[test] - fn baked_env_non_secret_key_shows_real_value() { - let entries = baked_env_from_map(&[("BUZZ_AGENT_PROVIDER", "databricks_v2")]); - assert_eq!(entries.len(), 1); - assert_eq!(entries[0].key, "BUZZ_AGENT_PROVIDER"); - assert_eq!(entries[0].value, "databricks_v2"); - assert!(!entries[0].masked); - } - - #[test] - fn baked_env_api_key_is_masked() { - let entries = baked_env_from_map(&[("ANTHROPIC_API_KEY", "sk-secret")]); - assert_eq!(entries.len(), 1); - assert_eq!(entries[0].value, "••••••"); - assert!(entries[0].masked); - } - - #[test] - fn baked_env_token_key_is_masked() { - let entries = baked_env_from_map(&[("GITHUB_TOKEN", "ghp_secret")]); - assert_eq!(entries.len(), 1); - assert!(entries[0].masked); - } - - #[test] - fn baked_env_secret_key_is_masked() { - let entries = baked_env_from_map(&[("MY_DB_SECRET", "s3cr3t")]); - assert_eq!(entries.len(), 1); - assert!(entries[0].masked); - } - - #[test] - fn baked_env_password_key_is_masked() { - let entries = baked_env_from_map(&[("DB_PASSWORD", "hunter2")]); - assert_eq!(entries.len(), 1); - assert!(entries[0].masked); - } - - #[test] - fn baked_env_empty_value_filtered_out() { - let entries = baked_env_from_map(&[("BUZZ_AGENT_PROVIDER", "")]); - assert!(entries.is_empty()); - } - - #[test] - fn baked_env_mixed_keys_correct_masking() { - let entries = baked_env_from_map(&[ - ("BUZZ_AGENT_PROVIDER", "databricks_v2"), - ("BUZZ_AGENT_MODEL", "goose-claude-opus-4-8"), - ("DATABRICKS_HOST", "https://example.com"), - ("DATABRICKS_TOKEN", "dapi-secret"), - ]); - assert_eq!(entries.len(), 4); - - let provider = entries - .iter() - .find(|e| e.key == "BUZZ_AGENT_PROVIDER") - .unwrap(); - assert_eq!(provider.value, "databricks_v2"); - assert!(!provider.masked); - - let model = entries - .iter() - .find(|e| e.key == "BUZZ_AGENT_MODEL") - .unwrap(); - assert_eq!(model.value, "goose-claude-opus-4-8"); - assert!(!model.masked); - - let host = entries.iter().find(|e| e.key == "DATABRICKS_HOST").unwrap(); - assert_eq!(host.value, "https://example.com"); - assert!(!host.masked); - - let token = entries - .iter() - .find(|e| e.key == "DATABRICKS_TOKEN") - .unwrap(); - assert_eq!(token.value, "••••••"); - assert!(token.masked); - } - - #[test] - fn baked_env_thinking_effort_is_unmasked() { - // BUZZ_AGENT_THINKING_EFFORT is a non-secret enum — must not be masked. - let entries = baked_env_from_map(&[("BUZZ_AGENT_THINKING_EFFORT", "medium")]); - assert_eq!(entries.len(), 1); - let effort = entries - .iter() - .find(|e| e.key == "BUZZ_AGENT_THINKING_EFFORT") - .unwrap(); - assert_eq!(effort.value, "medium"); - assert!(!effort.masked); - } - - #[test] - fn baked_env_allowlist_is_case_insensitive() { - // Known-safe keys — case-insensitive match must allow them. - assert!(super::is_safe_to_reveal("buzz_agent_provider")); - assert!(super::is_safe_to_reveal("BUZZ_AGENT_PROVIDER")); - assert!(super::is_safe_to_reveal("buzz_agent_model")); - assert!(super::is_safe_to_reveal("BUZZ_AGENT_MODEL")); - assert!(super::is_safe_to_reveal("buzz_agent_thinking_effort")); - assert!(super::is_safe_to_reveal("BUZZ_AGENT_THINKING_EFFORT")); - assert!(super::is_safe_to_reveal("databricks_host")); - assert!(super::is_safe_to_reveal("DATABRICKS_HOST")); - assert!(super::is_safe_to_reveal("databricks_model")); - assert!(super::is_safe_to_reveal("DATABRICKS_MODEL")); - // Keys NOT in the allowlist — masked regardless of naming pattern. - assert!(!super::is_safe_to_reveal("my_api_key")); - assert!(!super::is_safe_to_reveal("GITHUB_TOKEN")); - assert!(!super::is_safe_to_reveal("DB_SECRET")); - assert!(!super::is_safe_to_reveal("DB_PASSWORD")); - // Bare names that old heuristic (contains("_TOKEN") etc.) would have missed. - assert!(!super::is_safe_to_reveal("APIKEY")); - assert!(!super::is_safe_to_reveal("TOKEN")); - assert!(!super::is_safe_to_reveal("SECRET")); - assert!(!super::is_safe_to_reveal("PASSWORD")); - assert!(!super::is_safe_to_reveal("PRIVATE_KEY")); - // Unknown key → masked by default. - assert!(!super::is_safe_to_reveal("SOME_UNKNOWN_KEY")); - } -} +#[path = "agent_config_tests.rs"] +mod tests; diff --git a/desktop/src-tauri/src/commands/agent_config_tests.rs b/desktop/src-tauri/src/commands/agent_config_tests.rs new file mode 100644 index 0000000000..f3667cff45 --- /dev/null +++ b/desktop/src-tauri/src/commands/agent_config_tests.rs @@ -0,0 +1,651 @@ +//! Unit tests for `commands/agent_config.rs` (split to keep `agent_config.rs` +//! under the 1000-line file-size ratchet). +//! +//! Included via `#[path = "agent_config_tests.rs"] mod tests;` at the bottom of +//! `agent_config.rs`, so `use super::*` gives access to all items in that module. + +use super::*; +use crate::managed_agents::config_bridge::types::ConfigOrigin; +use crate::managed_agents::{BackendKind, RespondTo}; + +use std::sync::Mutex; + +static GOOSE_PATH_ROOT_LOCK: Mutex<()> = Mutex::new(()); + +/// Run a test body with GOOSE_PATH_ROOT set to a non-existent path so that the +/// goose config file read returns `None`. Restores the prior value on exit. +fn with_no_goose_config(body: impl FnOnce() -> T) -> T { + let _guard = GOOSE_PATH_ROOT_LOCK + .lock() + .unwrap_or_else(|err| err.into_inner()); + let prior = std::env::var_os("GOOSE_PATH_ROOT"); + std::env::set_var("GOOSE_PATH_ROOT", "/nonexistent-buzz-test-path"); + let output = body(); + match prior { + Some(value) => std::env::set_var("GOOSE_PATH_ROOT", value), + None => std::env::remove_var("GOOSE_PATH_ROOT"), + } + output +} + +fn goose_runtime() -> &'static KnownAcpRuntime { + &KnownAcpRuntime { + id: "goose", + label: "Goose", + commands: &["goose"], + aliases: &[], + avatar_url: "", + mcp_command: None, + mcp_hooks: false, + underlying_cli: None, + cli_install_commands: &[], + cli_install_commands_windows: &[], + adapter_install_commands: &[], + cli_install_instructions_url: "", + adapter_install_instructions_url: "", + cli_install_hint: "", + adapter_install_hint: "", + skill_dir: None, + supports_acp_model_switching: false, + model_env_var: Some("GOOSE_MODEL"), + provider_env_var: Some("GOOSE_PROVIDER"), + provider_locked: false, + default_env: &[], + config_file_path: Some("~/.config/goose/config.yaml"), + config_file_format: Some("yaml"), + supports_acp_native_config: true, + thinking_env_var: Some("GOOSE_THINKING_EFFORT"), + max_tokens_env_var: Some("GOOSE_MAX_TOKENS"), + context_limit_env_var: Some("GOOSE_CONTEXT_LIMIT"), + required_normalized_fields: &["model", "provider"], + login_hint: None, + auth_probe_args: None, + } +} + +fn agent_record() -> ManagedAgentRecord { + ManagedAgentRecord { + pubkey: "agent".to_string(), + name: "Agent".to_string(), + persona_id: Some("persona-1".to_string()), + private_key_nsec: "".to_string(), + auth_tag: None, + relay_url: "ws://localhost:3000".to_string(), + avatar_url: None, + acp_command: "buzz-acp".to_string(), + agent_command: "goose".to_string(), + agent_args: vec![], + mcp_command: "".to_string(), + turn_timeout_seconds: 300, + idle_timeout_seconds: None, + max_turn_duration_seconds: None, + parallelism: 1, + system_prompt: None, + model: None, + env_vars: Default::default(), + start_on_app_launch: false, + auto_restart_on_config_change: true, + runtime_pid: None, + backend: BackendKind::Local, + backend_agent_id: None, + provider_binary_path: None, + team_id: None, + persona_team_dir: None, + persona_name_in_team: None, + created_at: "".to_string(), + updated_at: "".to_string(), + last_started_at: None, + last_stopped_at: None, + last_exit_code: None, + last_error: None, + last_error_code: None, + respond_to: RespondTo::OwnerOnly, + respond_to_allowlist: vec![], + display_name: None, + slug: None, + runtime: None, + name_pool: Vec::new(), + is_builtin: false, + is_active: true, + shared: false, + source_team: None, + source_team_persona_slug: None, + catalog_source: None, + definition_respond_to: None, + definition_respond_to_allowlist: Vec::new(), + definition_parallelism: None, + relay_mesh: None, + agent_command_override: None, + persona_source_version: None, + provider: None, + } +} + +fn persona_with_model(model: &str) -> AgentDefinition { + AgentDefinition { + id: "persona-1".to_string(), + display_name: "Persona".to_string(), + avatar_url: None, + system_prompt: "You are a persona.".to_string(), + runtime: None, + model: Some(model.to_string()), + provider: None, + name_pool: Vec::new(), + is_builtin: false, + is_active: true, + shared: false, + source_team: None, + source_team_persona_slug: None, + catalog_source: None, + env_vars: Default::default(), + respond_to: None, + respond_to_allowlist: Vec::new(), + parallelism: None, + created_at: "".to_string(), + updated_at: "".to_string(), + } +} + +/// A post-spawn session cache whose live model is `current_model` and whose +/// `model_overridden` flag records whether a `SwitchModel` control signal set +/// it (the live-switch signal). +fn session_cache(current_model: &str, model_overridden: bool) -> SessionConfigCache { + SessionConfigCache { + config_options: vec![], + available_modes: vec![], + available_models: vec![], + current_model: Some(current_model.to_string()), + model_overridden, + goose_native_config: None, + captured_at: "".to_string(), + } +} + +/// Definition-authoritative: a stale materialized `record.model` on a +/// linked instance must never outrank (or even be consulted against) the +/// linked persona's model. `update_managed_agent` already blocks writing +/// model/provider/prompt for linked instances, so a non-`None` value here +/// can only be leftover snapshot bytes from before a persona edit — the +/// panel must report the persona's current model, tagged `PersonaDefault`, +/// not the stale byte as `BuzzExplicit`. +#[test] +fn linked_stale_record_model_never_outranks_persona_model() { + let mut record = agent_record(); + record.model = Some("stale-explicit-model".to_string()); + let personas = vec![persona_with_model("persona-model")]; + + let surface = resolve_config_surface( + record, + &personas, + Some(goose_runtime()), + None, + &Default::default(), + ); + + let model = surface.normalized.model.as_ref().expect("model resolved"); + assert_eq!(model.value.as_deref(), Some("persona-model")); + assert_eq!(model.origin, ConfigOrigin::PersonaDefault); +} + +/// Definition-authoritative, blank-definition case: a linked instance +/// whose persona has no model of its own must fall through to the global +/// default, tagged `GlobalDefault` — mirroring +/// `effective_config::resolve_linked`'s `None => global` arm. A stale +/// materialized record model must not shadow this fallthrough either. +#[test] +fn linked_blank_definition_model_falls_through_to_global_default() { + let mut record = agent_record(); + record.model = Some("stale-explicit-model".to_string()); + let mut persona = persona_with_model("unused"); + persona.model = None; + let personas = vec![persona]; + let global = crate::managed_agents::GlobalAgentConfig { + model: Some("global-model".to_string()), + ..Default::default() + }; + + let surface = resolve_config_surface(record, &personas, Some(goose_runtime()), None, &global); + + let model = surface.normalized.model.as_ref().expect("model resolved"); + assert_eq!(model.value.as_deref(), Some("global-model")); + assert_eq!(model.origin, ConfigOrigin::GlobalDefault); +} + +/// A definition-less (no `persona_id`) instance's own explicit model IS +/// authoritative — the stale-record clearing above is scoped to linked +/// instances only. +#[test] +fn definition_less_explicit_record_model_keeps_buzz_explicit_origin() { + let mut record = agent_record(); + record.persona_id = None; + record.model = Some("explicit-model".to_string()); + let personas = vec![persona_with_model("persona-model")]; + + let surface = resolve_config_surface( + record, + &personas, + Some(goose_runtime()), + None, + &Default::default(), + ); + + let model = surface.normalized.model.as_ref().expect("model resolved"); + assert_eq!(model.value.as_deref(), Some("explicit-model")); + assert_eq!(model.origin, ConfigOrigin::BuzzExplicit); +} + +/// Part A — pending-pick: a genuine-explicit pick X with a divergent live +/// model Y but `model_overridden == false` (the live switch is not yet +/// applied — a restart is pending) must keep X as the primary and must NOT +/// surface Y as an override row. The live `acp_model` does not win. This +/// FAILS against a let-live-acp-win variant (one that dropped the +/// `model_overridden` gate), so it is not vacuous. +#[test] +fn pending_pick_keeps_explicit_x_and_does_not_surface_live_y() { + let mut record = agent_record(); + record.persona_id = None; + record.model = Some("model-x".to_string()); + let personas: Vec = vec![]; + let cache = session_cache("model-y", false); + + let surface = resolve_config_surface( + record, + &personas, + Some(goose_runtime()), + Some(&cache), + &Default::default(), + ); + let model = surface.normalized.model.expect("model resolved"); + + assert_eq!(model.value.as_deref(), Some("model-x")); + assert_eq!(model.origin, ConfigOrigin::BuzzExplicit); + assert_ne!(model.origin, ConfigOrigin::RuntimeOverride); + assert_ne!(model.overridden_value.as_deref(), Some("model-y")); +} + +/// W2 — genuine-explicit live switch: record.model = X, no persona, +/// `model_overridden == true`, live model = Y. The live Y must render as the +/// primary with a `RuntimeOverride` origin and X as the secondary tagged +/// `BuzzExplicit` (its true source — NOT `PersonaDefault`). FAILS against the +/// shipped no-persona early-return, which left X as primary and Y struck. +#[test] +fn genuine_explicit_live_switch_renders_y_over_x_buzz_explicit_secondary() { + let mut record = agent_record(); + record.persona_id = None; + record.model = Some("model-x".to_string()); + let personas: Vec = vec![]; + let cache = session_cache("model-y", true); + + let surface = resolve_config_surface( + record, + &personas, + Some(goose_runtime()), + Some(&cache), + &Default::default(), + ); + let model = surface.normalized.model.expect("model resolved"); + + assert_eq!(model.value.as_deref(), Some("model-y")); + assert_eq!(model.origin, ConfigOrigin::RuntimeOverride); + assert_eq!(model.overridden_value.as_deref(), Some("model-x")); + assert_eq!(model.overridden_origin, Some(ConfigOrigin::BuzzExplicit)); +} + +/// Y==X collision: a genuine-explicit agent live-switches to the SAME value +/// it already had. There is no real divergence, so the field must be a clean +/// single value with NO secondary row and origin matching the baseline (not +/// RuntimeOverride). FAILS against a naive `return base` that would leak the +/// `AcpConfigOption` row `build_model_field` populates, and against the +/// prior implementation that stamped `RuntimeOverride` on the equal-value arm. +/// +/// `with_no_goose_config` suppresses the goose config file read so that the +/// fall-through to normal resolution cannot pick up a local `~/.config/goose/config.yaml` +/// model as a spurious secondary — the test is about tier precedence, not the +/// local developer's goose install. +#[test] +fn genuine_explicit_live_switch_to_same_model_yields_clean_field() { + let mut record = agent_record(); + record.persona_id = None; + record.model = Some("model-x".to_string()); + let personas: Vec = vec![]; + let cache = session_cache("model-x", true); + + let surface = with_no_goose_config(|| { + resolve_config_surface( + record, + &personas, + Some(goose_runtime()), + Some(&cache), + &Default::default(), + ) + }); + let model = surface.normalized.model.expect("model resolved"); + + assert_eq!(model.value.as_deref(), Some("model-x")); + // Equal-value switch must NOT stamp RuntimeOverride — baseline origin wins. + assert_eq!(model.origin, ConfigOrigin::BuzzExplicit); + assert_ne!(model.origin, ConfigOrigin::RuntimeOverride); + assert_eq!(model.overridden_value, None); + assert_eq!(model.overridden_origin, None); +} + +/// Persona parity (regression): a persona-linked agent with no explicit +/// record model that live-switches still renders the persona model as the +/// secondary tagged `PersonaDefault` — the typed-baseline change must NOT +/// regress the persona arm to a different origin. +#[test] +fn persona_linked_live_switch_keeps_persona_default_secondary() { + let record = agent_record(); + let personas = vec![persona_with_model("persona-model")]; + let cache = session_cache("model-y", true); + + let surface = resolve_config_surface( + record, + &personas, + Some(goose_runtime()), + Some(&cache), + &Default::default(), + ); + let model = surface.normalized.model.expect("model resolved"); + + assert_eq!(model.value.as_deref(), Some("model-y")); + assert_eq!(model.origin, ConfigOrigin::RuntimeOverride); + assert_eq!(model.overridden_value.as_deref(), Some("persona-model")); + assert_eq!(model.overridden_origin, Some(ConfigOrigin::PersonaDefault)); +} + +/// Fix 2 regression: a global-default-only agent (no record model, no +/// persona model, but global has a model) that live-switches mid-session +/// must render the global model as the secondary tagged `GlobalDefault`. +/// Before the fix, `baseline` was `None` in the `!had_model` arm when +/// persona has no model, so `read_config_surface` had no secondary to +/// surface. Fails against pre-fix code where the baseline arm returned +/// `None` when `!had_model && persona_model.is_none() && model_overridden`. +#[test] +fn global_default_live_switch_renders_global_model_as_secondary_global_default() { + // Record has no model, no persona, global provides the model. + let mut record = agent_record(); + record.persona_id = None; + // record.model = None (set by agent_record()) + let personas: Vec = vec![]; + let cache = session_cache("model-y", true); + let global = crate::managed_agents::GlobalAgentConfig { + model: Some("global-model".to_string()), + ..Default::default() + }; + + let surface = resolve_config_surface( + record, + &personas, + Some(goose_runtime()), + Some(&cache), + &global, + ); + let model = surface.normalized.model.expect("model resolved"); + + // Live model wins as primary. + assert_eq!(model.value.as_deref(), Some("model-y")); + assert_eq!(model.origin, ConfigOrigin::RuntimeOverride); + // Global model surfaces as secondary, tagged GlobalDefault. + assert_eq!( + model.overridden_value.as_deref(), + Some("global-model"), + "global model must be the override baseline secondary" + ); + assert_eq!( + model.overridden_origin, + Some(ConfigOrigin::GlobalDefault), + "override baseline origin must be GlobalDefault, not PersonaDefault or BuzzExplicit" + ); +} + +// ── Snapshot constructor tests (build_inherited_tiers) ────────────────────── +// +// These test the sanitized snapshot constructor — the command-boundary +// function that builds InheritedConfigTiers from raw persona/global data. + +/// Orphaned persona link: a record whose persona_id references a non-existent +/// persona should produce empty persona tiers (not a panic), and the panel +/// still renders from the record and global tiers. +#[test] +fn orphaned_persona_link_yields_empty_persona_tiers() { + let mut record = agent_record(); + record.persona_id = Some("missing-persona".to_string()); + // No personas in the list — dangling link. + let personas: Vec = vec![]; + let global = crate::managed_agents::GlobalAgentConfig { + model: Some("global-model".to_string()), + ..Default::default() + }; + + let tiers = build_inherited_tiers(record.persona_id.as_deref(), None, &personas, &global); + + // Persona tier is empty — the orphan yields no persona inheritance. + assert!(tiers.persona_env.is_empty()); + assert!(tiers.persona_model.is_none()); + assert!(tiers.persona_provider.is_none()); + assert!(tiers.persona_prompt.is_none()); + // Global tiers are unaffected. + assert_eq!(tiers.global_model.as_deref(), Some("global-model")); +} + +/// Reserved key in persona env is stripped by sanitization — it must never +/// reach the reader or the display surface. +#[test] +fn reserved_key_in_inherited_persona_env_is_stripped() { + let mut persona = persona_with_model("model"); + // BUZZ_PRIVATE_KEY is a reserved key — must be stripped. + persona + .env_vars + .insert("BUZZ_PRIVATE_KEY".to_string(), "nsec-secret".to_string()); + // A safe key — must survive. + persona + .env_vars + .insert("GOOSE_MODEL".to_string(), "persona-model".to_string()); + let personas = vec![persona]; + let global = crate::managed_agents::GlobalAgentConfig::default(); + + let tiers = build_inherited_tiers(Some("persona-1"), None, &personas, &global); + + assert!( + !tiers.persona_env.contains_key("BUZZ_PRIVATE_KEY"), + "reserved key must be stripped from persona env tier" + ); + assert!( + tiers.persona_env.contains_key("GOOSE_MODEL"), + "safe key must survive sanitization" + ); +} + +/// `sanitize_inherited_env` strips reserved keys from a definition-env-shaped +/// map. This pins the shared sanitization contract for definition_env — the +/// same function is applied to all three env tiers (persona, global, definition) +/// at the command boundary. +#[test] +fn reserved_key_in_definition_env_shaped_map_is_stripped_by_sanitize() { + // Exercise sanitize_inherited_env directly with a definition-env-shaped map. + let mut raw = std::collections::BTreeMap::new(); + raw.insert("BUZZ_PRIVATE_KEY".to_string(), "nsec-secret".to_string()); + raw.insert("GOOSE_MODEL".to_string(), "harness-model".to_string()); + + let sanitized = sanitize_inherited_env(&raw); + + assert!( + !sanitized.contains_key("BUZZ_PRIVATE_KEY"), + "reserved key must be stripped by sanitize_inherited_env" + ); + assert!( + sanitized.contains_key("GOOSE_MODEL"), + "safe key must survive sanitize_inherited_env" + ); +} + +/// Malformed key in global env is stripped by sanitization — keys must be +/// POSIX-shaped (`[A-Za-z_][A-Za-z0-9_]*`). +#[test] +fn malformed_key_in_inherited_global_env_is_stripped() { + let mut global = crate::managed_agents::GlobalAgentConfig::default(); + // Key with an `=` — would bypass env-var security if passed to spawn. + global + .env_vars + .insert("BAD=KEY".to_string(), "value".to_string()); + // A valid key — must survive. + global + .env_vars + .insert("GOOSE_PROVIDER".to_string(), "anthropic".to_string()); + + let tiers = build_inherited_tiers(None, None, &[], &global); + + assert!( + !tiers.global_env.contains_key("BAD=KEY"), + "malformed key must be stripped from global env tier" + ); + assert!( + tiers.global_env.contains_key("GOOSE_PROVIDER"), + "valid key must survive sanitization" + ); +} + +// ── get_baked_build_env / is_secret_key tests ────────────────────────── + +/// Build a `BakedEnvEntry` vec from a synthetic map, mirroring what +/// `get_baked_build_env()` does. Used to test masking without relying on +/// compile-time `option_env!` vars (OSS builds have empty `baked_build_env`). +fn baked_env_from_map(map: &[(&str, &str)]) -> Vec { + map.iter() + .filter(|(_, v)| !v.is_empty()) + .map(|(k, v)| { + let masked = !super::is_safe_to_reveal(k); + BakedEnvEntry { + key: k.to_string(), + value: if masked { + "\u{2022}\u{2022}\u{2022}\u{2022}\u{2022}\u{2022}".to_string() + } else { + v.to_string() + }, + masked, + } + }) + .collect() +} + +#[test] +fn baked_env_non_secret_key_shows_real_value() { + let entries = baked_env_from_map(&[("BUZZ_AGENT_PROVIDER", "databricks_v2")]); + assert_eq!(entries.len(), 1); + assert_eq!(entries[0].key, "BUZZ_AGENT_PROVIDER"); + assert_eq!(entries[0].value, "databricks_v2"); + assert!(!entries[0].masked); +} + +#[test] +fn baked_env_api_key_is_masked() { + let entries = baked_env_from_map(&[("ANTHROPIC_API_KEY", "sk-secret")]); + assert_eq!(entries.len(), 1); + assert_eq!(entries[0].value, "••••••"); + assert!(entries[0].masked); +} + +#[test] +fn baked_env_token_key_is_masked() { + let entries = baked_env_from_map(&[("GITHUB_TOKEN", "ghp_secret")]); + assert_eq!(entries.len(), 1); + assert!(entries[0].masked); +} + +#[test] +fn baked_env_secret_key_is_masked() { + let entries = baked_env_from_map(&[("MY_DB_SECRET", "s3cr3t")]); + assert_eq!(entries.len(), 1); + assert!(entries[0].masked); +} + +#[test] +fn baked_env_password_key_is_masked() { + let entries = baked_env_from_map(&[("DB_PASSWORD", "hunter2")]); + assert_eq!(entries.len(), 1); + assert!(entries[0].masked); +} + +#[test] +fn baked_env_empty_value_filtered_out() { + let entries = baked_env_from_map(&[("BUZZ_AGENT_PROVIDER", "")]); + assert!(entries.is_empty()); +} + +#[test] +fn baked_env_mixed_keys_correct_masking() { + let entries = baked_env_from_map(&[ + ("BUZZ_AGENT_PROVIDER", "databricks_v2"), + ("BUZZ_AGENT_MODEL", "goose-claude-opus-4-8"), + ("DATABRICKS_HOST", "https://example.com"), + ("DATABRICKS_TOKEN", "dapi-secret"), + ]); + assert_eq!(entries.len(), 4); + + let provider = entries + .iter() + .find(|e| e.key == "BUZZ_AGENT_PROVIDER") + .unwrap(); + assert_eq!(provider.value, "databricks_v2"); + assert!(!provider.masked); + + let model = entries + .iter() + .find(|e| e.key == "BUZZ_AGENT_MODEL") + .unwrap(); + assert_eq!(model.value, "goose-claude-opus-4-8"); + assert!(!model.masked); + + let host = entries.iter().find(|e| e.key == "DATABRICKS_HOST").unwrap(); + assert_eq!(host.value, "https://example.com"); + assert!(!host.masked); + + let token = entries + .iter() + .find(|e| e.key == "DATABRICKS_TOKEN") + .unwrap(); + assert_eq!(token.value, "••••••"); + assert!(token.masked); +} + +#[test] +fn baked_env_thinking_effort_is_unmasked() { + // BUZZ_AGENT_THINKING_EFFORT is a non-secret enum — must not be masked. + let entries = baked_env_from_map(&[("BUZZ_AGENT_THINKING_EFFORT", "medium")]); + assert_eq!(entries.len(), 1); + let effort = entries + .iter() + .find(|e| e.key == "BUZZ_AGENT_THINKING_EFFORT") + .unwrap(); + assert_eq!(effort.value, "medium"); + assert!(!effort.masked); +} + +#[test] +fn baked_env_allowlist_is_case_insensitive() { + // Known-safe keys — case-insensitive match must allow them. + assert!(super::is_safe_to_reveal("buzz_agent_provider")); + assert!(super::is_safe_to_reveal("BUZZ_AGENT_PROVIDER")); + assert!(super::is_safe_to_reveal("buzz_agent_model")); + assert!(super::is_safe_to_reveal("BUZZ_AGENT_MODEL")); + assert!(super::is_safe_to_reveal("buzz_agent_thinking_effort")); + assert!(super::is_safe_to_reveal("BUZZ_AGENT_THINKING_EFFORT")); + assert!(super::is_safe_to_reveal("databricks_host")); + assert!(super::is_safe_to_reveal("DATABRICKS_HOST")); + assert!(super::is_safe_to_reveal("databricks_model")); + assert!(super::is_safe_to_reveal("DATABRICKS_MODEL")); + // Keys NOT in the allowlist — masked regardless of naming pattern. + assert!(!super::is_safe_to_reveal("my_api_key")); + assert!(!super::is_safe_to_reveal("GITHUB_TOKEN")); + assert!(!super::is_safe_to_reveal("DB_SECRET")); + assert!(!super::is_safe_to_reveal("DB_PASSWORD")); + // Bare names that old heuristic (contains("_TOKEN") etc.) would have missed. + assert!(!super::is_safe_to_reveal("APIKEY")); + assert!(!super::is_safe_to_reveal("TOKEN")); + assert!(!super::is_safe_to_reveal("SECRET")); + assert!(!super::is_safe_to_reveal("PASSWORD")); + assert!(!super::is_safe_to_reveal("PRIVATE_KEY")); + // Unknown key → masked by default. + assert!(!super::is_safe_to_reveal("SOME_UNKNOWN_KEY")); +} diff --git a/desktop/src-tauri/src/managed_agents/config_bridge/reader.rs b/desktop/src-tauri/src/managed_agents/config_bridge/reader.rs index 372d2cfde1..c51f325cf3 100644 --- a/desktop/src-tauri/src/managed_agents/config_bridge/reader.rs +++ b/desktop/src-tauri/src/managed_agents/config_bridge/reader.rs @@ -3,15 +3,17 @@ use crate::managed_agents::types::ManagedAgentRecord; use super::types::*; -/// Build the full config surface for an agent, merging all four tiers. +/// Build the full config surface for an agent, merging all tiers. /// -/// Pre-spawn (no session cache): tiers 2a (env vars / record) and 2b (config files). -/// Post-spawn (session cache present): adds tiers 1a (ACP native) and 1b (ACP configOptions). +/// Inherited values flow through `tiers` — a sanitized snapshot of the +/// persona and global tiers assembled at the command boundary. Each field +/// builder constructs its own candidate list and resolves via +/// `resolve_with_override`. pub(crate) fn read_config_surface( record: &ManagedAgentRecord, runtime_meta: Option<&KnownAcpRuntime>, session_cache: Option<&SessionConfigCache>, - baseline: Option<(&str, ConfigOrigin)>, + tiers: &InheritedConfigTiers, ) -> RuntimeConfigSurface { let is_pre_spawn = session_cache.is_none(); @@ -27,14 +29,7 @@ pub(crate) fn read_config_surface( }) .unwrap_or_else(|| (RuntimeFileConfig::default(), false)); - // Tier 2a: record-level values (Buzz-explicit). - let record_model = record.model.clone(); - let record_provider = record - .env_vars - .get(runtime_meta.and_then(|m| m.provider_env_var).unwrap_or("")) - .cloned() - .or_else(|| record.provider.clone()); // structured provider field as fallback - + // Runtime-specific env var keys. let supports_acp_model = runtime_meta.is_some_and(|m| m.supports_acp_model_switching); let model_env_var = runtime_meta.and_then(|m| m.model_env_var); let provider_env_var = runtime_meta.and_then(|m| m.provider_env_var); @@ -48,10 +43,6 @@ pub(crate) fn read_config_surface( let context_limit_env_var = runtime_meta.and_then(|m| m.context_limit_env_var); // Tier 1b: ACP configOptions from session cache. - // For unstable/switchable agents, current_model comes from the `models` - // field. For stable agents that only report model via configOptions - // (category="model", current_value), fall back to find_config_option_value - // so their current model is surfaced in the panel. let acp_model = session_cache.and_then(|c| { c.current_model .clone() @@ -59,61 +50,53 @@ pub(crate) fn read_config_surface( }); let acp_mode = session_cache.and_then(|c| find_config_option_value(c, "mode")); let acp_effort = session_cache.and_then(|c| find_config_option_value(c, "effort")); - let record_effort = thinking_env_var - .and_then(|k| record.env_vars.get(k)) - .cloned(); let model_overridden = session_cache.is_some_and(|c| c.model_overridden); let normalized = NormalizedConfig { - model: Some(apply_runtime_override( - build_model_field( - &record_model, - &file_config.model, - &acp_model, - model_env_var, - supports_acp_model, - is_pre_spawn, - session_cache, - required_fields.contains(&"model"), - ), - acp_model.as_deref(), - baseline, + model: Some(build_model_field( + record, + &file_config.model, + &acp_model, + model_env_var, + supports_acp_model, + is_pre_spawn, + session_cache, + required_fields.contains(&"model"), model_overridden, + tiers, )), provider: build_provider_field( - &record_provider, + record, &file_config.provider, provider_env_var, provider_locked, required_fields.contains(&"provider"), + tiers, ), mode: build_mode_field(&file_config.mode, &acp_mode, is_pre_spawn, session_cache), thinking_effort: build_thinking_field( - &record_effort, + record, &file_config.thinking_effort, &acp_effort, thinking_env_var, is_pre_spawn, session_cache, + tiers, ), max_output_tokens: build_numeric_env_field( max_tokens_env_var, - &record.env_vars, + record, &file_config.max_output_tokens, + tiers, ), context_limit: build_numeric_env_field( context_limit_env_var, - &record.env_vars, + record, &file_config.context_limit, + tiers, ), - system_prompt: build_system_prompt_field( - &record - .system_prompt - .clone() - .or_else(|| record.env_vars.get("BUZZ_ACP_SYSTEM_PROMPT").cloned()), - &file_config.system_prompt, - ), + system_prompt: build_system_prompt_field(record, &file_config.system_prompt, tiers), }; // Advanced fields from config file extras. @@ -130,7 +113,7 @@ pub(crate) fn read_config_surface( }) .collect(); - // Collect the env var keys already covered by normalized fields so we don't double-surface them. + // Collect the env var keys already covered by normalized fields. let normalized_env_keys: Vec<&str> = [ model_env_var, provider_env_var, @@ -144,15 +127,13 @@ pub(crate) fn read_config_surface( .collect(); // Tier 2a: remaining env vars not covered by normalized fields. - // Env var wins over config file for the same key (tier 2a > 2b), so skip - // keys already present in file_config.extra. let mut advanced = advanced; for (k, v) in &record.env_vars { if normalized_env_keys.contains(&k.as_str()) { continue; } if file_config.extra.contains_key(k) { - continue; // config file already surfaced this key + continue; } advanced.push(ConfigField { key: k.clone(), @@ -178,8 +159,6 @@ pub(crate) fn read_config_surface( { ConfigTierStatus::Available } else { - // Post-spawn without native config data is also Pending — it arrives - // asynchronously after the session/new response. ConfigTierStatus::Pending } } else { @@ -226,9 +205,27 @@ fn mcp_config_file_path_for_runtime(runtime: &KnownAcpRuntime) -> Option } } +/// Extract an env-backed candidate value for `env_key` from each tier in +/// spawn precedence: record env > persona env > global env > definition env. +/// Returns `[record, persona, global, definition]` — `None` when key is absent. +fn env_candidates<'a>( + env_key: &str, + record_env: &'a std::collections::BTreeMap, + persona_env: &'a std::collections::BTreeMap, + global_env: &'a std::collections::BTreeMap, + definition_env: &'a std::collections::BTreeMap, +) -> [Option<&'a str>; 4] { + [ + record_env.get(env_key).map(String::as_str), + persona_env.get(env_key).map(String::as_str), + global_env.get(env_key).map(String::as_str), + definition_env.get(env_key).map(String::as_str), + ] +} + #[allow(clippy::too_many_arguments)] fn build_model_field( - record_model: &Option, + record: &ManagedAgentRecord, file_model: &Option, acp_model: &Option, model_env_var: Option<&str>, @@ -236,30 +233,109 @@ fn build_model_field( is_pre_spawn: bool, session_cache: Option<&SessionConfigCache>, is_required: bool, + model_overridden: bool, + tiers: &InheritedConfigTiers, ) -> NormalizedField { - // Precedence: Buzz-explicit > ACP current > config file - let (value, origin) = if let Some(ref m) = record_model { - (Some(m.clone()), ConfigOrigin::BuzzExplicit) - } else if let Some(ref m) = acp_model { - (Some(m.clone()), ConfigOrigin::AcpConfigOption) - } else if let Some(ref m) = file_model { - (Some(m.clone()), ConfigOrigin::ConfigFile) - } else { - // No value from any tier. EnvVar is the sentinel origin for "no value - // resolved" — there is no dedicated None-origin variant. The panel - // renders this as an empty/absent field. - (None, ConfigOrigin::EnvVar) - }; + let [rec_env, pers_env, glob_env, def_env] = model_env_var + .map(|k| { + env_candidates( + k, + &record.env_vars, + &tiers.persona_env, + &tiers.global_env, + &tiers.definition_env, + ) + }) + .unwrap_or([None, None, None, None]); + + // Structured record model (definition-less only; linked cleared upstream). + let struct_record = record.model.as_deref(); + let struct_persona = tiers.persona_model.as_deref(); + let struct_global = tiers.global_model.as_deref(); + + // Configured candidates in spawn order: record env > persona env > global env > + // definition env > struct record > struct persona > struct global > file. + // The file entry is always last; everything before it is a "configured" candidate + // that gates whether ACP participates as a fallback (see any_configured below). + let configured: &[(Option<&str>, ConfigOrigin)] = &[ + (rec_env, ConfigOrigin::BuzzExplicit), + (pers_env, ConfigOrigin::PersonaDefault), + (glob_env, ConfigOrigin::GlobalDefault), + (def_env, ConfigOrigin::HarnessDefault), + (struct_record, ConfigOrigin::BuzzExplicit), + (struct_persona, ConfigOrigin::PersonaDefault), + (struct_global, ConfigOrigin::GlobalDefault), + (file_model.as_deref(), ConfigOrigin::ConfigFile), + ]; + // "Configured" = any non-file candidate. The file entry is always last, so + // slicing to len()-1 is equivalent to the old magic `[..6]` and stays correct + // if the array ever grows again. + let any_configured = configured[..configured.len() - 1] + .iter() + .any(|(v, _)| v.is_some()); + + // When model_overridden is true and ACP is present, ACP is the live winner. + // The top configured candidate becomes the secondary (the overridden baseline). + // Equal-value case: ACP == baseline → fall through to normal resolution so + // the field carries the correct baseline origin rather than RuntimeOverride. + if model_overridden { + if let Some(acp) = acp_model.as_deref() { + let baseline = configured.iter().find(|(v, _)| v.is_some()); + match baseline { + Some((Some(baseline_value), _)) if acp == *baseline_value => { + // Equal-value switch: no real divergence. + // Fall through to the normal resolve path below — it will + // return the same value with its true baseline origin, with + // no secondary row. + } + Some((Some(baseline_value), baseline_origin)) => { + return NormalizedField { + value: Some(acp.to_string()), + origin: ConfigOrigin::RuntimeOverride, + write_via: model_write_mechanism( + is_pre_spawn, + supports_acp_model, + session_cache, + model_env_var, + ), + overridden_value: Some(baseline_value.to_string()), + overridden_origin: Some(baseline_origin.clone()), + is_required, + }; + } + _ => { + // No configured baseline — ACP is the only source. + return NormalizedField { + value: Some(acp.to_string()), + origin: ConfigOrigin::RuntimeOverride, + write_via: model_write_mechanism( + is_pre_spawn, + supports_acp_model, + session_cache, + model_env_var, + ), + overridden_value: None, + overridden_origin: None, + is_required, + }; + } + } + } + } - // The secondary expresses ONLY the static record-vs-file precedence: a - // Buzz-explicit model shadowing a config-file model. The live-session - // override (acp vs record/persona) is exclusively `apply_runtime_override`'s - // job, gated on `model_overridden`. Surfacing `acp_model` here would leak an - // override row even when no live switch has been applied. - let (overridden_value, overridden_origin) = if record_model.is_some() && file_model.is_some() { - (file_model.clone(), Some(ConfigOrigin::ConfigFile)) + let (value, origin, overridden_value, overridden_origin) = if !any_configured { + // No configured candidate: ACP participates as AcpConfigOption fallback. + let full: &[(Option<&str>, ConfigOrigin)] = &[ + (acp_model.as_deref(), ConfigOrigin::AcpConfigOption), + (file_model.as_deref(), ConfigOrigin::ConfigFile), + ]; + resolve_with_override(full).unwrap_or((None, ConfigOrigin::EnvVar, None, None)) } else { - (None, None) + // ACP excluded: a configured value is pending and wins over live ACP. + match resolve_with_override(configured) { + Some(r) => r, + None => (None, ConfigOrigin::EnvVar, None, None), + } }; let write_via = model_write_mechanism( @@ -280,7 +356,6 @@ fn build_model_field( } /// Resolve how the model field is written back to the runtime. -/// Prefer ACP `set_config_option`/`set_model` post-spawn, else env-var respawn. fn model_write_mechanism( is_pre_spawn: bool, supports_acp_model: bool, @@ -301,67 +376,13 @@ fn model_write_mechanism( } } -/// Re-key the model field as a live runtime override when the harness signals -/// that a `SwitchModel` control signal set the model (Phase 3c). -/// -/// The override-active signal is `model_overridden` from the -/// `session_config_captured` payload — NOT `acp_model != persona_model`, which -/// would false-positive when a persona model is edited mid-life while the -/// session is stale on the old model. -/// -/// `baseline` is the value the live model overrides, paired with its true -/// origin — `(persona_model, PersonaDefault)` for a persona-linked agent, or -/// `(record_model, BuzzExplicit)` for a genuine-explicit agent that live- -/// switched. It is `Some` only when there is such a baseline to override -/// against; otherwise the field passes through unchanged. Carrying the origin -/// in the pair (rather than hardcoding it) lets the secondary be tagged by its -/// real source instead of always reading `PersonaDefault`. -/// -/// The `acp == baseline_value` short-circuit keeps a live pick of the baseline -/// model itself from rendering a no-op "override of X with X". It yields a -/// CLEAN single-value field — `overridden_value`/`overridden_origin` cleared — -/// rather than passing `base` through, because `build_model_field` already -/// populates `base`'s secondary with an `AcpConfigOption` row for the -/// record-model-plus-live-session case; returning `base` would leak that -/// spurious row. The override preserves the base field's write mechanism — only -/// the displayed value, origin, and secondary change. -fn apply_runtime_override( - base: NormalizedField, - acp_model: Option<&str>, - baseline: Option<(&str, ConfigOrigin)>, - model_overridden: bool, -) -> NormalizedField { - if !model_overridden { - return base; - } - let (Some(acp), Some((baseline_value, baseline_origin))) = (acp_model, baseline) else { - return base; - }; - if acp == baseline_value { - // Live pick equals the baseline — no real divergence. Strip any - // secondary `build_model_field` may have produced so the panel shows a - // single clean value rather than "X overridden by X". - return NormalizedField { - overridden_value: None, - overridden_origin: None, - ..base - }; - } - NormalizedField { - value: Some(acp.to_string()), - origin: ConfigOrigin::RuntimeOverride, - overridden_value: Some(baseline_value.to_string()), - overridden_origin: Some(baseline_origin), - ..base - } -} - fn build_provider_field( - record_provider: &Option, + record: &ManagedAgentRecord, file_provider: &Option, provider_env_var: Option<&str>, provider_locked: bool, is_required: bool, + tiers: &InheritedConfigTiers, ) -> Option { if provider_locked { return Some(NormalizedField { @@ -374,15 +395,43 @@ fn build_provider_field( }); } - let tiers: &[(Option<&str>, ConfigOrigin)] = &[ - (record_provider.as_deref(), ConfigOrigin::BuzzExplicit), + let [rec_env, pers_env, glob_env, def_env] = provider_env_var + .map(|k| { + env_candidates( + k, + &record.env_vars, + &tiers.persona_env, + &tiers.global_env, + &tiers.definition_env, + ) + }) + .unwrap_or([None, None, None, None]); + + let struct_record = record.provider.as_deref(); + + let tiers_list: &[(Option<&str>, ConfigOrigin)] = &[ + (rec_env, ConfigOrigin::BuzzExplicit), + (pers_env, ConfigOrigin::PersonaDefault), + (glob_env, ConfigOrigin::GlobalDefault), + (def_env, ConfigOrigin::HarnessDefault), + (struct_record, ConfigOrigin::BuzzExplicit), + ( + tiers.persona_provider.as_deref(), + ConfigOrigin::PersonaDefault, + ), + ( + tiers.global_provider.as_deref(), + ConfigOrigin::GlobalDefault, + ), (file_provider.as_deref(), ConfigOrigin::ConfigFile), ]; - let (value, origin, overridden_value, overridden_origin) = match resolve_with_override(tiers) { - Some(resolved) => resolved, - None if is_required => (None, ConfigOrigin::EnvVar, None, None), - None => return None, - }; + + let (value, origin, overridden_value, overridden_origin) = + match resolve_with_override(tiers_list) { + Some(resolved) => resolved, + None if is_required => (None, ConfigOrigin::EnvVar, None, None), + None => return None, + }; let write_via = if let Some(env_key) = provider_env_var { ConfigWriteMechanism::RespawnWithEnvVar { @@ -432,20 +481,38 @@ fn build_mode_field( }) } +#[allow(clippy::too_many_arguments)] fn build_thinking_field( - record_effort: &Option, + record: &ManagedAgentRecord, file_effort: &Option, acp_effort: &Option, thinking_env_var: Option<&str>, is_pre_spawn: bool, session_cache: Option<&SessionConfigCache>, + tiers: &InheritedConfigTiers, ) -> Option { - let tiers: &[(Option<&str>, ConfigOrigin)] = &[ - (record_effort.as_deref(), ConfigOrigin::BuzzExplicit), + // Tier ordering: record env > ACP > persona env > global env > definition env > config file. + let [rec_env, pers_env, glob_env, def_env] = thinking_env_var + .map(|k| { + env_candidates( + k, + &record.env_vars, + &tiers.persona_env, + &tiers.global_env, + &tiers.definition_env, + ) + }) + .unwrap_or([None, None, None, None]); + + let tiers_list: &[(Option<&str>, ConfigOrigin)] = &[ + (rec_env, ConfigOrigin::BuzzExplicit), (acp_effort.as_deref(), ConfigOrigin::AcpConfigOption), + (pers_env, ConfigOrigin::PersonaDefault), + (glob_env, ConfigOrigin::GlobalDefault), + (def_env, ConfigOrigin::HarnessDefault), (file_effort.as_deref(), ConfigOrigin::ConfigFile), ]; - let (value, origin, overridden_value, overridden_origin) = resolve_with_override(tiers)?; + let (value, origin, overridden_value, overridden_origin) = resolve_with_override(tiers_list)?; let write_via = if !is_pre_spawn && has_config_option(session_cache, "effort") { ConfigWriteMechanism::AcpSetConfigOption { @@ -469,67 +536,105 @@ fn build_thinking_field( }) } -/// Numeric fields (max_output_tokens, context_limit) — env-var tier wins over -/// config-file tier. When an env var key is given and present in the record's -/// env_vars map the field is BuzzExplicit + RespawnWithEnvVar; otherwise if the -/// config file supplied a value it is ConfigFile + ReadOnly; otherwise None. +/// Numeric fields (max_output_tokens, context_limit). +/// Tier ordering: record env > persona env > global env > config file. fn build_numeric_env_field( env_var: Option<&'static str>, - record_env: &std::collections::BTreeMap, + record: &ManagedAgentRecord, file_value: &Option, + tiers: &InheritedConfigTiers, ) -> Option { - if let Some(key) = env_var { - if let Some(v) = record_env.get(key) { - return Some(NormalizedField { - value: Some(v.clone()), - origin: ConfigOrigin::BuzzExplicit, - write_via: ConfigWriteMechanism::RespawnWithEnvVar { - env_key: key.to_string(), - }, - overridden_value: file_value.clone(), - overridden_origin: file_value.as_ref().map(|_| ConfigOrigin::ConfigFile), - is_required: false, - }); + let [rec_env, pers_env, glob_env, def_env] = env_var + .map(|k| { + env_candidates( + k, + &record.env_vars, + &tiers.persona_env, + &tiers.global_env, + &tiers.definition_env, + ) + }) + .unwrap_or([None, None, None, None]); + + let tiers_list: &[(Option<&str>, ConfigOrigin)] = &[ + (rec_env, ConfigOrigin::BuzzExplicit), + (pers_env, ConfigOrigin::PersonaDefault), + (glob_env, ConfigOrigin::GlobalDefault), + (def_env, ConfigOrigin::HarnessDefault), + (file_value.as_deref(), ConfigOrigin::ConfigFile), + ]; + + let (value, origin, overridden_value, overridden_origin) = resolve_with_override(tiers_list)?; + + let write_via = if let Some(key) = env_var { + ConfigWriteMechanism::RespawnWithEnvVar { + env_key: key.to_string(), } - } - file_value.as_ref().map(|v| NormalizedField { - value: Some(v.clone()), - origin: ConfigOrigin::ConfigFile, - write_via: ConfigWriteMechanism::ReadOnly, - overridden_value: None, - overridden_origin: None, + } else { + ConfigWriteMechanism::ReadOnly + }; + + Some(NormalizedField { + value, + origin, + write_via, + overridden_value, + overridden_origin, is_required: false, }) } -/// Record/env prompt wins (BuzzExplicit, respawnable); a config-file prompt it -/// shadows is reported as the overridden secondary. A config-file-only prompt -/// — no record/env value to shadow it — is surfaced directly (read-only) -/// instead of being dropped: a prompt that drives the agent should always be -/// visible somewhere in the panel. +/// System prompt field. +/// +/// Tier ordering per v3 plan: record env > persona env > global env > +/// struct record > struct persona > config file. +/// +/// Env tiers sit above structured per spawn contract: `descriptor.env` is +/// written last (after the structured prompt), so env wins on collision. +/// `GlobalAgentConfig` has no structured system_prompt, so the global tier +/// is env-only. `BUZZ_ACP_SYSTEM_PROMPT` is not reserved and is therefore +/// a real global env tier. fn build_system_prompt_field( - record_prompt: &Option, + record: &ManagedAgentRecord, file_prompt: &Option, + tiers: &InheritedConfigTiers, ) -> Option { - if let Some(v) = record_prompt { - return Some(NormalizedField { - value: Some(v.clone()), - origin: ConfigOrigin::BuzzExplicit, - write_via: ConfigWriteMechanism::RespawnWithEnvVar { - env_key: "BUZZ_ACP_SYSTEM_PROMPT".to_string(), - }, - overridden_value: file_prompt.clone(), - overridden_origin: file_prompt.as_ref().map(|_| ConfigOrigin::ConfigFile), - is_required: false, - }); - } + const PROMPT_ENV_KEY: &str = "BUZZ_ACP_SYSTEM_PROMPT"; + + let [rec_env, pers_env, glob_env, def_env] = env_candidates( + PROMPT_ENV_KEY, + &record.env_vars, + &tiers.persona_env, + &tiers.global_env, + &tiers.definition_env, + ); + + // Structured record prompt (definition-less only; linked cleared upstream). + let struct_record = record.system_prompt.as_deref(); + + let tiers_list: &[(Option<&str>, ConfigOrigin)] = &[ + (rec_env, ConfigOrigin::BuzzExplicit), // record env + (pers_env, ConfigOrigin::PersonaDefault), // persona env + (glob_env, ConfigOrigin::GlobalDefault), // global env + (def_env, ConfigOrigin::HarnessDefault), // definition env + (struct_record, ConfigOrigin::BuzzExplicit), // struct record + ( + tiers.persona_prompt.as_deref(), + ConfigOrigin::PersonaDefault, + ), // struct persona + (file_prompt.as_deref(), ConfigOrigin::ConfigFile), + ]; - file_prompt.as_ref().map(|v| NormalizedField { - value: Some(v.clone()), - origin: ConfigOrigin::ConfigFile, - write_via: ConfigWriteMechanism::ReadOnly, - overridden_value: None, - overridden_origin: None, + let (value, origin, overridden_value, overridden_origin) = resolve_with_override(tiers_list)?; + + Some(NormalizedField { + value, + origin, + write_via: ConfigWriteMechanism::RespawnWithEnvVar { + env_key: PROMPT_ENV_KEY.to_string(), + }, + overridden_value, + overridden_origin, is_required: false, }) } diff --git a/desktop/src-tauri/src/managed_agents/config_bridge/reader_tests.rs b/desktop/src-tauri/src/managed_agents/config_bridge/reader_tests.rs index 4ee4ec79c3..153db1bbd8 100644 --- a/desktop/src-tauri/src/managed_agents/config_bridge/reader_tests.rs +++ b/desktop/src-tauri/src/managed_agents/config_bridge/reader_tests.rs @@ -120,11 +120,53 @@ fn test_record() -> ManagedAgentRecord { } } +/// Default empty tiers: no persona or global inheritance. +fn no_tiers() -> InheritedConfigTiers { + InheritedConfigTiers::default() +} + +/// Tiers with only global env set (for AC-1 style tests). +fn global_env_tiers(key: &str, val: &str) -> InheritedConfigTiers { + let mut global_env = BTreeMap::new(); + global_env.insert(key.to_string(), val.to_string()); + InheritedConfigTiers { + global_env, + ..Default::default() + } +} + +/// Tiers with only persona env set. +fn persona_env_tiers(key: &str, val: &str) -> InheritedConfigTiers { + let mut persona_env = BTreeMap::new(); + persona_env.insert(key.to_string(), val.to_string()); + InheritedConfigTiers { + persona_env, + ..Default::default() + } +} + +/// Tiers with both persona and global env set for the same key. +fn persona_and_global_env_tiers( + key: &str, + persona_val: &str, + global_val: &str, +) -> InheritedConfigTiers { + let mut persona_env = BTreeMap::new(); + persona_env.insert(key.to_string(), persona_val.to_string()); + let mut global_env = BTreeMap::new(); + global_env.insert(key.to_string(), global_val.to_string()); + InheritedConfigTiers { + persona_env, + global_env, + ..Default::default() + } +} + #[test] fn pre_spawn_surface_reports_pending_acp_tiers() { let record = test_record(); let runtime = test_runtime(); - let surface = read_config_surface(&record, Some(runtime), None, None); + let surface = read_config_surface(&record, Some(runtime), None, &no_tiers()); assert!(surface.is_pre_spawn); assert_eq!(surface.sources.acp_native, ConfigTierStatus::Pending); @@ -140,7 +182,7 @@ fn surface_reports_mcp_specific_config_path() { let record = test_record(); let runtime = test_runtime(); let surface = with_goose_path_root(None, || { - read_config_surface(&record, Some(runtime), None, None) + read_config_surface(&record, Some(runtime), None, &no_tiers()) }); let path = surface @@ -159,7 +201,7 @@ fn goose_mcp_config_path_follows_path_root_override() { let record = test_record(); let runtime = test_runtime(); let surface = with_goose_path_root(Some("/tmp/buzz-goose-root"), || { - read_config_surface(&record, Some(runtime), None, None) + read_config_surface(&record, Some(runtime), None, &no_tiers()) }); let expected_path = Path::new("/tmp/buzz-goose-root") @@ -183,7 +225,7 @@ fn claude_surface_uses_mcp_config_path_not_settings_path() { config_file_path: Some("~/.claude/settings.json"), ..*test_runtime() }; - let surface = read_config_surface(&record, Some(runtime), None, None); + let surface = read_config_surface(&record, Some(runtime), None, &no_tiers()); assert!(surface .sources @@ -203,7 +245,7 @@ fn record_model_overrides_file_model() { record.model = Some("explicit-model".to_string()); let runtime = test_runtime(); - let surface = read_config_surface(&record, Some(runtime), None, None); + let surface = read_config_surface(&record, Some(runtime), None, &no_tiers()); let model = surface.normalized.model.unwrap(); assert_eq!(model.value.as_deref(), Some("explicit-model")); assert_eq!(model.origin, ConfigOrigin::BuzzExplicit); @@ -216,7 +258,7 @@ fn provider_locked_shows_locked() { provider_locked: true, ..*test_runtime() }; - let surface = read_config_surface(&record, Some(runtime), None, None); + let surface = read_config_surface(&record, Some(runtime), None, &no_tiers()); let provider = surface.normalized.provider.unwrap(); assert_eq!(provider.value.as_deref(), Some("Anthropic (locked)")); assert_eq!(provider.origin, ConfigOrigin::HarnessConstraint); @@ -242,7 +284,7 @@ fn post_spawn_with_model_config_option_uses_acp() { captured_at: "".to_string(), }; - let surface = read_config_surface(&record, Some(runtime), Some(&cache), None); + let surface = read_config_surface(&record, Some(runtime), Some(&cache), &no_tiers()); assert!(!surface.is_pre_spawn); let model = surface.normalized.model.unwrap(); assert_eq!(model.value.as_deref(), Some("claude-opus-4")); @@ -266,53 +308,86 @@ fn acp_model_overrides_file_model_with_override_tracking() { captured_at: "".to_string(), }; - let surface = read_config_surface(&record, Some(runtime), Some(&cache), None); + let surface = read_config_surface(&record, Some(runtime), Some(&cache), &no_tiers()); let model = surface.normalized.model.unwrap(); assert_eq!(model.value.as_deref(), Some("acp-model")); assert_eq!(model.origin, ConfigOrigin::AcpConfigOption); - // The goose config file might have a model too — since we can't control - // the actual file in a unit test, just verify the override fields are populated - // when we manually construct the scenario via build_model_field. } -// ── Persona resolution integration tests ──────────────────────────── +// ── Persona / global tier integration tests ────────────────────────────────── // -// These simulate the call-site pattern in agent_config.rs: -// 1. Inject persona-resolved values into the record (as if absent) -// 2. Call read_config_surface (reader tags them BuzzExplicit) -// 3. Re-tag injected fields to PersonaDefault -// -// This exercises the same logic path as get_agent_config_surface without -// requiring Tauri AppHandle/State infrastructure. +// These exercise the tiers-based candidate resolution for model, provider, and +// system_prompt via `InheritedConfigTiers` — replacing the old inject+retag +// simulation tests. #[test] -fn persona_model_injection_produces_persona_default_origin() { - let mut record = test_record(); - // Simulate: record has no model, persona provides one. - // The call-site injects it before calling the reader. - record.model = Some("persona-model".to_string()); +fn persona_model_tier_produces_persona_default_origin() { + let record = test_record(); // no record.model let runtime = test_runtime(); + let tiers = InheritedConfigTiers { + persona_model: Some("persona-model".to_string()), + ..Default::default() + }; - let mut surface = read_config_surface(&record, Some(runtime), None, None); + let surface = read_config_surface(&record, Some(runtime), None, &tiers); - // Reader sees injected model as BuzzExplicit. - let model = surface.normalized.model.as_ref().unwrap(); + let model = surface.normalized.model.unwrap(); assert_eq!(model.value.as_deref(), Some("persona-model")); - assert_eq!(model.origin, ConfigOrigin::BuzzExplicit); + assert_eq!(model.origin, ConfigOrigin::PersonaDefault); +} - // Call-site re-tags (simulating had_model == false). - if let Some(ref mut field) = surface.normalized.model { - if field.origin == ConfigOrigin::BuzzExplicit { - field.origin = ConfigOrigin::PersonaDefault; - } - } +#[test] +fn global_model_tier_produces_global_default_origin() { + let record = test_record(); + let runtime = test_runtime(); + let tiers = InheritedConfigTiers { + global_model: Some("global-model".to_string()), + ..Default::default() + }; + + let surface = read_config_surface(&record, Some(runtime), None, &tiers); let model = surface.normalized.model.unwrap(); - assert_eq!(model.value.as_deref(), Some("persona-model")); - assert_eq!(model.origin, ConfigOrigin::PersonaDefault); + assert_eq!(model.value.as_deref(), Some("global-model")); + assert_eq!(model.origin, ConfigOrigin::GlobalDefault); +} + +#[test] +fn persona_provider_tier_produces_persona_default_origin() { + let record = test_record(); + let runtime = test_runtime(); + let tiers = InheritedConfigTiers { + persona_provider: Some("anthropic".to_string()), + ..Default::default() + }; + + let surface = read_config_surface(&record, Some(runtime), None, &tiers); + + let provider = surface.normalized.provider.unwrap(); + assert_eq!(provider.value.as_deref(), Some("anthropic")); + assert_eq!(provider.origin, ConfigOrigin::PersonaDefault); +} + +#[test] +fn persona_prompt_tier_produces_persona_default_origin() { + let record = test_record(); + let runtime = test_runtime(); + let tiers = InheritedConfigTiers { + persona_prompt: Some("You are a helpful assistant.".to_string()), + ..Default::default() + }; + + let surface = read_config_surface(&record, Some(runtime), None, &tiers); + + let prompt = surface.normalized.system_prompt.unwrap(); + assert_eq!( + prompt.value.as_deref(), + Some("You are a helpful assistant.") + ); + assert_eq!(prompt.origin, ConfigOrigin::PersonaDefault); } -// ── Runtime override (Phase 3c) ────────────────────────────────────── +// ── Runtime override (model_overridden gate) ────────────────────────────────── // // A live ModelPicker switch is signalled by `model_overridden: true` in the // `session_config_captured` payload. The reader keys the override-active @@ -321,7 +396,7 @@ fn persona_model_injection_produces_persona_default_origin() { #[test] fn runtime_override_wins_display_when_model_overridden_is_true() { - // Persona-linked agent (record.model == None); persona == "persona-model". + // Persona-linked agent (record.model == None); persona model via tiers. // A live switch pushed "live-model" to the session and set model_overridden. let record = test_record(); let runtime = test_runtime(); @@ -334,29 +409,27 @@ fn runtime_override_wins_display_when_model_overridden_is_true() { goose_native_config: None, captured_at: "".to_string(), }; + let tiers = InheritedConfigTiers { + persona_model: Some("persona-model".to_string()), + ..Default::default() + }; - let surface = read_config_surface( - &record, - Some(runtime), - Some(&cache), - Some(("persona-model", ConfigOrigin::PersonaDefault)), - ); + let surface = read_config_surface(&record, Some(runtime), Some(&cache), &tiers); let model = surface.normalized.model.unwrap(); // Override wins the display value with a runtime-override origin. assert_eq!(model.value.as_deref(), Some("live-model")); assert_eq!(model.origin, ConfigOrigin::RuntimeOverride); - // Persona is the secondary value (not struck through — the UI keys off - // the RuntimeOverride origin to suppress strikethrough). + // Persona is the secondary value. assert_eq!(model.overridden_value.as_deref(), Some("persona-model")); assert_eq!(model.overridden_origin, Some(ConfigOrigin::PersonaDefault)); } #[test] fn no_runtime_override_when_model_overridden_is_false() { - // At spawn the session's current_model == persona model (BUZZ_ACP_MODEL - // is set to the persona model) and model_overridden is false. No override; - // the field falls through to normal precedence. + // At spawn the session's current_model == persona model and + // model_overridden is false. No override; field falls through to normal + // precedence. let record = test_record(); let runtime = test_runtime(); let cache = SessionConfigCache { @@ -368,17 +441,15 @@ fn no_runtime_override_when_model_overridden_is_false() { goose_native_config: None, captured_at: "".to_string(), }; + let tiers = InheritedConfigTiers { + persona_model: Some("persona-model".to_string()), + ..Default::default() + }; - let surface = read_config_surface( - &record, - Some(runtime), - Some(&cache), - Some(("persona-model", ConfigOrigin::PersonaDefault)), - ); + let surface = read_config_surface(&record, Some(runtime), Some(&cache), &tiers); let model = surface.normalized.model.unwrap(); - // model_overridden is false => the override branch is not taken: origin - // is the normal precedence result, never RuntimeOverride. + // model_overridden is false => the override branch is not taken. assert_ne!(model.origin, ConfigOrigin::RuntimeOverride); assert_eq!(model.value.as_deref(), Some("persona-model")); assert_ne!(model.overridden_origin, Some(ConfigOrigin::PersonaDefault)); @@ -402,106 +473,51 @@ fn no_false_positive_override_when_persona_edited_mid_life() { goose_native_config: None, captured_at: "".to_string(), }; + let tiers = InheritedConfigTiers { + persona_model: Some("new-persona-model".to_string()), + ..Default::default() + }; - let surface = read_config_surface( - &record, - Some(runtime), - Some(&cache), - Some(("new-persona-model", ConfigOrigin::PersonaDefault)), - ); + let surface = read_config_surface(&record, Some(runtime), Some(&cache), &tiers); let model = surface.normalized.model.unwrap(); // model_overridden is false => no RuntimeOverride, even though // acp_model != persona_model. The old divergence-based signal would - // have false-positived here. The persona is never surfaced as the - // overridden secondary (that marker is exclusive to a real override). + // have false-positived here. assert_ne!(model.origin, ConfigOrigin::RuntimeOverride); assert_ne!(model.overridden_origin, Some(ConfigOrigin::PersonaDefault)); } -#[test] -fn persona_provider_injection_produces_persona_default_origin() { - let mut record = test_record(); - // Simulate: record has no provider env var, persona provides one. - // The call-site injects it as GOOSE_PROVIDER before calling the reader. - record - .env_vars - .insert("GOOSE_PROVIDER".to_string(), "anthropic".to_string()); - let runtime = test_runtime(); - - let mut surface = read_config_surface(&record, Some(runtime), None, None); - - // Reader sees injected provider as BuzzExplicit. - let provider = surface.normalized.provider.as_ref().unwrap(); - assert_eq!(provider.value.as_deref(), Some("anthropic")); - assert_eq!(provider.origin, ConfigOrigin::BuzzExplicit); - - // Call-site re-tags (simulating had_provider == false). - if let Some(ref mut field) = surface.normalized.provider { - if field.origin == ConfigOrigin::BuzzExplicit { - field.origin = ConfigOrigin::PersonaDefault; - } - } - - let provider = surface.normalized.provider.unwrap(); - assert_eq!(provider.value.as_deref(), Some("anthropic")); - assert_eq!(provider.origin, ConfigOrigin::PersonaDefault); -} - -#[test] -fn persona_system_prompt_injection_produces_persona_default_origin() { - let mut record = test_record(); - // Simulate: record has no system_prompt, persona provides one via env var. - // The call-site injects it as BUZZ_ACP_SYSTEM_PROMPT before calling the reader. - record.env_vars.insert( - "BUZZ_ACP_SYSTEM_PROMPT".to_string(), - "You are a helpful assistant.".to_string(), - ); - let runtime = test_runtime(); - - let mut surface = read_config_surface(&record, Some(runtime), None, None); - - // Reader sees injected prompt as BuzzExplicit. - let prompt = surface.normalized.system_prompt.as_ref().unwrap(); - assert_eq!( - prompt.value.as_deref(), - Some("You are a helpful assistant.") - ); - assert_eq!(prompt.origin, ConfigOrigin::BuzzExplicit); - - // Call-site re-tags (simulating had_prompt == false). - if let Some(ref mut field) = surface.normalized.system_prompt { - if field.origin == ConfigOrigin::BuzzExplicit { - field.origin = ConfigOrigin::PersonaDefault; - } - } - - let prompt = surface.normalized.system_prompt.unwrap(); - assert_eq!( - prompt.value.as_deref(), - Some("You are a helpful assistant.") - ); - assert_eq!(prompt.origin, ConfigOrigin::PersonaDefault); -} +// ── system_prompt builder unit tests ───────────────────────────────────────── #[test] -fn config_file_only_system_prompt_surfaces_as_read_only_config_file_field() { - // Record/env has no prompt; the config file does. It must NOT be - // dropped — it should surface with ConfigFile origin, read-only. - let field = build_system_prompt_field(&None, &Some("File-driven prompt.".to_string())).unwrap(); +fn config_file_only_system_prompt_surfaces_as_config_file_origin() { + // Record/env has no prompt; the config file does. Must surface with + // ConfigFile origin. Write mechanism is always RespawnWithEnvVar for + // system_prompt — the UI writes back via BUZZ_ACP_SYSTEM_PROMPT. + let record = test_record(); + let field = build_system_prompt_field( + &record, + &Some("File-driven prompt.".to_string()), + &no_tiers(), + ) + .unwrap(); assert_eq!(field.value.as_deref(), Some("File-driven prompt.")); assert_eq!(field.origin, ConfigOrigin::ConfigFile); - assert!(matches!(field.write_via, ConfigWriteMechanism::ReadOnly)); + assert!(matches!( + field.write_via, + ConfigWriteMechanism::RespawnWithEnvVar { ref env_key } + if env_key == "BUZZ_ACP_SYSTEM_PROMPT" + )); assert!(field.overridden_value.is_none()); } #[test] fn record_system_prompt_shadows_config_file_prompt_as_secondary() { - let field = build_system_prompt_field( - &Some("Record prompt.".to_string()), - &Some("File prompt.".to_string()), - ) - .unwrap(); + let mut record = test_record(); + record.system_prompt = Some("Record prompt.".to_string()); + let field = + build_system_prompt_field(&record, &Some("File prompt.".to_string()), &no_tiers()).unwrap(); assert_eq!(field.value.as_deref(), Some("Record prompt.")); assert_eq!(field.origin, ConfigOrigin::BuzzExplicit); assert_eq!(field.overridden_value.as_deref(), Some("File prompt.")); @@ -510,19 +526,19 @@ fn record_system_prompt_shadows_config_file_prompt_as_secondary() { #[test] fn no_system_prompt_from_any_tier_yields_none() { - assert!(build_system_prompt_field(&None, &None).is_none()); + let record = test_record(); + assert!(build_system_prompt_field(&record, &None, &no_tiers()).is_none()); } #[test] fn explicit_record_model_not_retagged_when_already_present() { let mut record = test_record(); - // Record already has its own model — persona resolution should NOT re-tag. + // Record already has its own model — origin stays BuzzExplicit. record.model = Some("explicit-model".to_string()); let runtime = test_runtime(); - let surface = read_config_surface(&record, Some(runtime), None, None); + let surface = read_config_surface(&record, Some(runtime), None, &no_tiers()); - // had_model == true, so no re-tagging occurs. Origin stays BuzzExplicit. let model = surface.normalized.model.unwrap(); assert_eq!(model.value.as_deref(), Some("explicit-model")); assert_eq!(model.origin, ConfigOrigin::BuzzExplicit); @@ -544,7 +560,7 @@ fn extra_env_vars_appear_in_advanced_as_buzz_explicit() { .insert("SPROUT_ACP_MEMORY".to_string(), "mem-value".to_string()); let runtime = test_runtime(); - let surface = read_config_surface(&record, Some(runtime), None, None); + let surface = read_config_surface(&record, Some(runtime), None, &no_tiers()); let advanced_keys: Vec<&str> = surface.advanced.iter().map(|f| f.key.as_str()).collect(); assert!( @@ -575,21 +591,15 @@ fn extra_env_vars_appear_in_advanced_as_buzz_explicit() { #[test] fn extra_env_var_skipped_when_already_in_file_config_extra() { - // If a key is in both record.env_vars and file_config.extra, the config - // file entry wins (it was already added to advanced). The env var must - // not produce a second entry. - // - // We can't inject into file_config.extra directly in a unit test (it - // comes from disk), so we verify the dedup logic via the normalized-key - // path: GOOSE_THINKING_EFFORT is a normalized key and must not appear - // in advanced even if set in env_vars. + // If a key is normalized, it must not appear in advanced even if set + // in env_vars. let mut record = test_record(); record .env_vars .insert("GOOSE_THINKING_EFFORT".to_string(), "high".to_string()); let runtime = test_runtime(); - let surface = read_config_surface(&record, Some(runtime), None, None); + let surface = read_config_surface(&record, Some(runtime), None, &no_tiers()); let advanced_keys: Vec<&str> = surface.advanced.iter().map(|f| f.key.as_str()).collect(); assert!( @@ -598,7 +608,7 @@ fn extra_env_var_skipped_when_already_in_file_config_extra() { ); } -// ── buzz-agent normalized env-var field tests ─────────────────────────────── +// ── buzz-agent normalized env-var field tests ───────────────────────────────── // // buzz-agent uses env vars (not a config file) for max_output_tokens and // context_limit. build_numeric_env_field must surface these as BuzzExplicit @@ -649,7 +659,7 @@ fn buzz_agent_max_output_tokens_from_env_is_buzz_explicit() { ); let runtime = buzz_agent_runtime(); - let surface = read_config_surface(&record, Some(runtime), None, None); + let surface = read_config_surface(&record, Some(runtime), None, &no_tiers()); let field = surface.normalized.max_output_tokens.unwrap(); assert_eq!(field.value.as_deref(), Some("8192")); @@ -670,7 +680,7 @@ fn buzz_agent_context_limit_from_env_is_buzz_explicit() { ); let runtime = buzz_agent_runtime(); - let surface = read_config_surface(&record, Some(runtime), None, None); + let surface = read_config_surface(&record, Some(runtime), None, &no_tiers()); let field = surface.normalized.context_limit.unwrap(); assert_eq!(field.value.as_deref(), Some("100000")); @@ -688,7 +698,7 @@ fn buzz_agent_max_tokens_absent_when_no_env_var_or_file() { let record = test_record(); let runtime = buzz_agent_runtime(); - let surface = read_config_surface(&record, Some(runtime), None, None); + let surface = read_config_surface(&record, Some(runtime), None, &no_tiers()); assert!( surface.normalized.max_output_tokens.is_none(), @@ -713,7 +723,7 @@ fn buzz_agent_max_tokens_env_var_not_double_surfaced_in_advanced() { ); let runtime = buzz_agent_runtime(); - let surface = read_config_surface(&record, Some(runtime), None, None); + let surface = read_config_surface(&record, Some(runtime), None, &no_tiers()); let advanced_keys: Vec<&str> = surface.advanced.iter().map(|f| f.key.as_str()).collect(); assert!( @@ -734,7 +744,7 @@ fn buzz_agent_thinking_effort_from_env_is_buzz_explicit() { .insert("BUZZ_AGENT_THINKING_EFFORT".to_string(), "high".to_string()); let runtime = buzz_agent_runtime(); - let surface = read_config_surface(&record, Some(runtime), None, None); + let surface = read_config_surface(&record, Some(runtime), None, &no_tiers()); let field = surface.normalized.thinking_effort.unwrap(); assert_eq!(field.value.as_deref(), Some("high")); @@ -755,7 +765,7 @@ fn buzz_agent_thinking_effort_env_var_not_double_surfaced_in_advanced() { ); let runtime = buzz_agent_runtime(); - let surface = read_config_surface(&record, Some(runtime), None, None); + let surface = read_config_surface(&record, Some(runtime), None, &no_tiers()); let advanced_keys: Vec<&str> = surface.advanced.iter().map(|f| f.key.as_str()).collect(); assert!( @@ -764,10 +774,20 @@ fn buzz_agent_thinking_effort_env_var_not_double_surfaced_in_advanced() { ); } +// ── provider builder unit tests ─────────────────────────────────────────────── + #[test] fn missing_required_provider_still_returns_dropdown_field() { - let provider = build_provider_field(&None, &None, Some("GOOSE_PROVIDER"), false, true) - .expect("required provider field should be surfaced even when empty"); + let record = test_record(); + let provider = build_provider_field( + &record, + &None, + Some("GOOSE_PROVIDER"), + false, + true, + &no_tiers(), + ) + .expect("required provider field should be surfaced even when empty"); assert_eq!(provider.value, None); assert_eq!(provider.origin, ConfigOrigin::EnvVar); @@ -776,5 +796,156 @@ fn missing_required_provider_still_returns_dropdown_field() { #[test] fn missing_optional_provider_stays_hidden() { - assert!(build_provider_field(&None, &None, Some("GOOSE_PROVIDER"), false, false).is_none()); + let record = test_record(); + assert!(build_provider_field( + &record, + &None, + Some("GOOSE_PROVIDER"), + false, + false, + &no_tiers() + ) + .is_none()); +} + +// ── thinking_effort persona/global tier tests (AC-1..5) ────────────────────── +// +// The plan's acceptance criteria for effort tier resolution. +// Tier ordering: record env > ACP > persona env > global env > config file. + +fn buzz_agent_rt() -> &'static KnownAcpRuntime { + crate::managed_agents::discovery::known_acp_runtime_exact("buzz-agent") + .expect("buzz-agent must be in catalog") +} + +/// AC-1: no record effort, global env has effort → GlobalDefault. +/// Real-world case: global-agent-config has BUZZ_AGENT_THINKING_EFFORT=high, +/// per-agent record has no env_vars → effort must surface with GlobalDefault origin. +#[test] +fn global_effort_surfaces_as_global_default_when_record_has_none() { + let record = test_record(); + let runtime = buzz_agent_rt(); + let tiers = global_env_tiers("BUZZ_AGENT_THINKING_EFFORT", "high"); + + let surface = read_config_surface(&record, Some(runtime), None, &tiers); + + let effort = surface + .normalized + .thinking_effort + .expect("effort must surface from global tier"); + assert_eq!(effort.value.as_deref(), Some("high")); + assert_eq!(effort.origin, ConfigOrigin::GlobalDefault); +} + +/// AC-2: persona env has effort, global also has effort → PersonaDefault wins, shadows global. +#[test] +fn persona_effort_shadows_global_and_tags_persona_default() { + let record = test_record(); + let runtime = buzz_agent_rt(); + let tiers = persona_and_global_env_tiers("BUZZ_AGENT_THINKING_EFFORT", "medium", "high"); + + let surface = read_config_surface(&record, Some(runtime), None, &tiers); + + let effort = surface + .normalized + .thinking_effort + .expect("effort must surface from persona tier"); + assert_eq!(effort.value.as_deref(), Some("medium")); + assert_eq!(effort.origin, ConfigOrigin::PersonaDefault); + // global is the overridden baseline + assert_eq!(effort.overridden_value.as_deref(), Some("high")); + assert_eq!(effort.overridden_origin, Some(ConfigOrigin::GlobalDefault)); } + +/// AC-3: record-level effort wins over persona and global, stays BuzzExplicit. +#[test] +fn record_effort_outranks_persona_and_global_keeps_buzz_explicit() { + let mut record = test_record(); + record.env_vars.insert( + "BUZZ_AGENT_THINKING_EFFORT".to_string(), + "xhigh".to_string(), + ); + let runtime = buzz_agent_rt(); + let tiers = persona_and_global_env_tiers("BUZZ_AGENT_THINKING_EFFORT", "medium", "high"); + + let surface = read_config_surface(&record, Some(runtime), None, &tiers); + + let effort = surface + .normalized + .thinking_effort + .expect("effort must surface from record tier"); + assert_eq!(effort.value.as_deref(), Some("xhigh")); + assert_eq!(effort.origin, ConfigOrigin::BuzzExplicit); +} + +/// AC-4: no effort from any tier → thinking_effort field is absent. +#[test] +fn no_effort_anywhere_yields_no_thinking_effort_field() { + let record = test_record(); + let runtime = buzz_agent_rt(); + + let surface = read_config_surface(&record, Some(runtime), None, &no_tiers()); + + assert!( + surface.normalized.thinking_effort.is_none(), + "thinking_effort must be None when no tier has a value" + ); +} + +/// AC-5 (conflicting-ACP): inherited effort set (global=high) + live ACP effort=low +/// → ACP wins as primary (AcpConfigOption), global is the overridden secondary. +#[test] +fn acp_effort_wins_over_inherited_global_effort_as_secondary() { + let record = test_record(); + let runtime = buzz_agent_rt(); + let cache = SessionConfigCache { + config_options: vec![AcpConfigOptionEntry { + config_id: "effort".to_string(), + category: Some("effort".to_string()), + display_name: Some("Effort".to_string()), + current_value: Some("low".to_string()), + options: vec![], + }], + available_modes: vec![], + available_models: vec![], + current_model: None, + model_overridden: false, + goose_native_config: None, + captured_at: "".to_string(), + }; + let tiers = global_env_tiers("BUZZ_AGENT_THINKING_EFFORT", "high"); + + let surface = read_config_surface(&record, Some(runtime), Some(&cache), &tiers); + + let effort = surface + .normalized + .thinking_effort + .expect("effort must surface from ACP tier"); + // Live ACP value wins. + assert_eq!(effort.value.as_deref(), Some("low")); + assert_eq!(effort.origin, ConfigOrigin::AcpConfigOption); + // Global is surfaced as the overridden baseline. + assert_eq!(effort.overridden_value.as_deref(), Some("high")); + assert_eq!(effort.overridden_origin, Some(ConfigOrigin::GlobalDefault)); +} + +// ── Numerics inheritance tests ──────────────────────────────────────────────── +// +// max_output_tokens and context_limit gain persona/global tiers. + +#[test] +fn numeric_max_tokens_inherits_from_global_env() { + let record = test_record(); + let runtime = buzz_agent_runtime(); + let tiers = global_env_tiers("BUZZ_AGENT_MAX_OUTPUT_TOKENS", "16384"); + + let surface = read_config_surface(&record, Some(runtime), None, &tiers); + + let field = surface.normalized.max_output_tokens.unwrap(); + assert_eq!(field.value.as_deref(), Some("16384")); + assert_eq!(field.origin, ConfigOrigin::GlobalDefault); +} + +// ── Extended tests (split file to respect line-count ratchet) ──────────────── +#[path = "reader_tests_ext.rs"] +mod ext; diff --git a/desktop/src-tauri/src/managed_agents/config_bridge/reader_tests_ext.rs b/desktop/src-tauri/src/managed_agents/config_bridge/reader_tests_ext.rs new file mode 100644 index 0000000000..8613124f25 --- /dev/null +++ b/desktop/src-tauri/src/managed_agents/config_bridge/reader_tests_ext.rs @@ -0,0 +1,258 @@ +//! Additional tests for `config_bridge/reader.rs` — split out to keep +//! `reader_tests.rs` under the 1000-line file-size ratchet. +//! +//! Included as `mod ext` inside `reader_tests.rs`, so `use super::*` gives +//! access to all helpers and types from that module. + +use super::*; + +// ── Numerics inheritance tests ──────────────────────────────────────────────── +// +// max_output_tokens and context_limit gain persona/global tiers. + +#[test] +fn numeric_context_limit_inherits_from_persona_env() { + let record = test_record(); + let runtime = buzz_agent_runtime(); + let tiers = persona_env_tiers("BUZZ_AGENT_MAX_CONTEXT_TOKENS", "200000"); + + let surface = read_config_surface(&record, Some(runtime), None, &tiers); + + let field = surface.normalized.context_limit.unwrap(); + assert_eq!(field.value.as_deref(), Some("200000")); + assert_eq!(field.origin, ConfigOrigin::PersonaDefault); +} + +#[test] +fn record_max_tokens_overrides_global_env_with_secondary() { + let mut record = test_record(); + record.env_vars.insert( + "BUZZ_AGENT_MAX_OUTPUT_TOKENS".to_string(), + "8192".to_string(), + ); + let runtime = buzz_agent_runtime(); + let tiers = global_env_tiers("BUZZ_AGENT_MAX_OUTPUT_TOKENS", "16384"); + + let surface = read_config_surface(&record, Some(runtime), None, &tiers); + + let field = surface.normalized.max_output_tokens.unwrap(); + assert_eq!(field.value.as_deref(), Some("8192")); + assert_eq!(field.origin, ConfigOrigin::BuzzExplicit); + // Global value is the overridden secondary. + assert_eq!(field.overridden_value.as_deref(), Some("16384")); + assert_eq!(field.overridden_origin, Some(ConfigOrigin::GlobalDefault)); +} + +// ── Env-vs-structured collision tests (plan v3, Phase 2) ───────────────────── + +/// Collision test 1: persona structured prompt + global env BUZZ_ACP_SYSTEM_PROMPT +/// → global env wins (env block sits entirely above structured). +#[test] +fn global_env_prompt_wins_over_persona_structured_prompt() { + let record = test_record(); + let runtime = test_runtime(); + let tiers = InheritedConfigTiers { + global_env: { + let mut m = BTreeMap::new(); + m.insert( + "BUZZ_ACP_SYSTEM_PROMPT".to_string(), + "global-env-prompt".to_string(), + ); + m + }, + persona_prompt: Some("persona-structured-prompt".to_string()), + ..Default::default() + }; + + let surface = read_config_surface(&record, Some(runtime), None, &tiers); + + let prompt = surface.normalized.system_prompt.unwrap(); + assert_eq!(prompt.value.as_deref(), Some("global-env-prompt")); + assert_eq!(prompt.origin, ConfigOrigin::GlobalDefault); +} + +/// Collision test 2: structured persona/record model + higher user-env value at +/// the runtime's model key → env value wins. +#[test] +fn persona_env_model_wins_over_persona_structured_model() { + let record = test_record(); // no record.model + let runtime = test_runtime(); // GOOSE_MODEL + let tiers = InheritedConfigTiers { + persona_env: { + let mut m = BTreeMap::new(); + m.insert("GOOSE_MODEL".to_string(), "env-model".to_string()); + m + }, + persona_model: Some("struct-persona-model".to_string()), + ..Default::default() + }; + + let surface = read_config_surface(&record, Some(runtime), None, &tiers); + + let model = surface.normalized.model.unwrap(); + // persona env outranks persona struct because env candidates precede struct + assert_eq!(model.value.as_deref(), Some("env-model")); + assert_eq!(model.origin, ConfigOrigin::PersonaDefault); +} + +/// Collision test 3: no env representation → structured persona/record/global +/// fallback and provenance remain intact. +#[test] +fn structured_fallback_intact_when_no_env_representation() { + let record = test_record(); // no record.model, no env vars + let runtime = test_runtime(); + let tiers = InheritedConfigTiers { + persona_model: Some("struct-persona-model".to_string()), + ..Default::default() + }; + + let surface = read_config_surface(&record, Some(runtime), None, &tiers); + + let model = surface.normalized.model.unwrap(); + assert_eq!(model.value.as_deref(), Some("struct-persona-model")); + assert_eq!(model.origin, ConfigOrigin::PersonaDefault); +} + +// ── Post-sanitization fallthrough test ─────────────────────────────────────── +// +// Sanitization itself happens at the command boundary in `build_inherited_tiers` +// (a value with a NUL byte or an oversize value is dropped from the tier) and is +// pinned by the tests in `commands/agent_config_tests.rs`. The reader only ever +// sees the sanitized result, so what it must guarantee is the downstream half: +// a key stripped from one tier falls through to the next. + +/// A key absent from the global env tier — the shape the reader sees after the +/// command boundary strips an invalid value — falls through to the persona tier. +#[test] +fn post_sanitization_empty_global_env_falls_through_to_persona_tier() { + let record = test_record(); + let runtime = buzz_agent_rt(); + // No global env (stripped); persona provides the valid fallback. + let tiers = persona_env_tiers("BUZZ_AGENT_THINKING_EFFORT", "medium"); + + let surface = read_config_surface(&record, Some(runtime), None, &tiers); + + // Persona value surfaces instead of the stripped global value. + let effort = surface.normalized.thinking_effort.unwrap(); + assert_eq!(effort.value.as_deref(), Some("medium")); + assert_eq!(effort.origin, ConfigOrigin::PersonaDefault); +} + +// ── Pass-3 prompt collision test ───────────────────────────────────────────── +// +// From Thufir's pass-3 verdict MINOR clarification (promoted to required): +// definition-less record with both structured and env prompt — env wins. + +/// Pass-3 clarification: record.system_prompt = A + record env +/// BUZZ_ACP_SYSTEM_PROMPT = B → B wins as BuzzExplicit. +/// The env block sits above the struct block per v3 candidate-preparation +/// contract; current reader semantics (struct before env) would be wrong. +#[test] +fn record_env_prompt_wins_over_record_struct_prompt_as_buzz_explicit() { + let mut record = test_record(); + record.system_prompt = Some("struct-prompt-A".to_string()); + record.env_vars.insert( + "BUZZ_ACP_SYSTEM_PROMPT".to_string(), + "env-prompt-B".to_string(), + ); + let runtime = test_runtime(); + + let surface = read_config_surface(&record, Some(runtime), None, &no_tiers()); + + let prompt = surface.normalized.system_prompt.unwrap(); + assert_eq!(prompt.value.as_deref(), Some("env-prompt-B")); + assert_eq!(prompt.origin, ConfigOrigin::BuzzExplicit); + // Struct prompt is the secondary. + assert_eq!(prompt.overridden_value.as_deref(), Some("struct-prompt-A")); + assert_eq!(prompt.overridden_origin, Some(ConfigOrigin::BuzzExplicit)); +} + +// ── Definition env tier tests (Layer 2b) ───────────────────────────────────── +// +// The harness definition's `env` block sits below global env and above +// structured values in spawn's precedence (Layer 2b). These tests exercise +// the reader's mapping of that tier to `HarnessDefault` origin. + +/// Definition env wins over structured persona model when no user-env or +/// global-env candidate is present. +#[test] +fn definition_env_beats_structured_persona_model() { + let record = test_record(); // no record.model, no record.env_vars + let runtime = test_runtime(); // model_env_var = "GOOSE_MODEL" + let tiers = InheritedConfigTiers { + definition_env: { + let mut m = BTreeMap::new(); + m.insert("GOOSE_MODEL".to_string(), "harness-model".to_string()); + m + }, + persona_model: Some("persona-struct-model".to_string()), + ..Default::default() + }; + + let surface = read_config_surface(&record, Some(runtime), None, &tiers); + + let model = surface.normalized.model.unwrap(); + assert_eq!(model.value.as_deref(), Some("harness-model")); + assert_eq!(model.origin, ConfigOrigin::HarnessDefault); + // Structured persona model is the overridden secondary. + assert_eq!( + model.overridden_value.as_deref(), + Some("persona-struct-model") + ); + assert_eq!(model.overridden_origin, Some(ConfigOrigin::PersonaDefault)); +} + +/// Global env beats definition env — user-settable tiers always win over the +/// harness author's defaults. +#[test] +fn global_env_beats_definition_env() { + let record = test_record(); + let runtime = test_runtime(); // model_env_var = "GOOSE_MODEL" + let tiers = InheritedConfigTiers { + global_env: { + let mut m = BTreeMap::new(); + m.insert("GOOSE_MODEL".to_string(), "global-model".to_string()); + m + }, + definition_env: { + let mut m = BTreeMap::new(); + m.insert("GOOSE_MODEL".to_string(), "harness-model".to_string()); + m + }, + ..Default::default() + }; + + let surface = read_config_surface(&record, Some(runtime), None, &tiers); + + let model = surface.normalized.model.unwrap(); + assert_eq!(model.value.as_deref(), Some("global-model")); + assert_eq!(model.origin, ConfigOrigin::GlobalDefault); + // Harness default is the overridden secondary. + assert_eq!(model.overridden_value.as_deref(), Some("harness-model")); + assert_eq!(model.overridden_origin, Some(ConfigOrigin::HarnessDefault)); +} + +/// A reserved key in the definition env is stripped by sanitization and must +/// not reach the reader. This test exercises the reader's contract (a key +/// absent from the tier falls through) — sanitization itself is pinned in +/// the `agent_config_tests.rs` constructor tests. +#[test] +fn reserved_key_absent_from_definition_env_falls_through() { + let record = test_record(); + let runtime = test_runtime(); // model_env_var = "GOOSE_MODEL" + // definition_env contains only an unrelated key — the env map here is what + // the command boundary would produce after stripping a reserved key; the + // reader must fall through to the next tier (persona structured model). + let tiers = InheritedConfigTiers { + definition_env: BTreeMap::new(), // stripped — nothing survives + persona_model: Some("persona-struct-model".to_string()), + ..Default::default() + }; + + let surface = read_config_surface(&record, Some(runtime), None, &tiers); + + let model = surface.normalized.model.unwrap(); + // Falls through to persona structured model. + assert_eq!(model.value.as_deref(), Some("persona-struct-model")); + assert_eq!(model.origin, ConfigOrigin::PersonaDefault); +} diff --git a/desktop/src-tauri/src/managed_agents/config_bridge/types.rs b/desktop/src-tauri/src/managed_agents/config_bridge/types.rs index 15ccb718e7..6ca2592538 100644 --- a/desktop/src-tauri/src/managed_agents/config_bridge/types.rs +++ b/desktop/src-tauri/src/managed_agents/config_bridge/types.rs @@ -2,6 +2,41 @@ use std::collections::BTreeMap; use serde::{Deserialize, Serialize}; +/// Sanitized inherited config tiers passed to the reader. +/// +/// Built at the `agent_config` command boundary with spawn-equivalent +/// sanitization: reserved, malformed, NUL-value, and oversize-value env keys +/// are stripped (matching `merged_user_env`). Structured fields are +/// normalized: blank/whitespace-only values collapse to `None`. +/// +/// Orphaned persona links (persona_id references a missing persona) produce +/// an empty persona env tier and `None` for all structured persona fields — +/// the panel still renders from record/global. This diverges deliberately from +/// spawn's `OrphanedInstance` refusal, which is a spawn-safety property the +/// display surface does not need to enforce. +#[derive(Debug, Clone, Default)] +pub struct InheritedConfigTiers { + /// Sanitized env vars from the linked persona definition. + pub persona_env: BTreeMap, + /// Sanitized env vars from the global agent config. + pub global_env: BTreeMap, + /// Sanitized env vars from the resolved harness definition (`HarnessDefinition::env`). + /// Sits below global env and above structured values, matching spawn Layer 2b. + /// Empty for preset harnesses (all shipped presets have `env: {}`); only + /// user-authored custom harness JSONs with a non-empty `env` block contribute here. + pub definition_env: BTreeMap, + /// Structured model from the linked persona (non-blank only). + pub persona_model: Option, + /// Structured provider from the linked persona (non-blank only). + pub persona_provider: Option, + /// Structured system_prompt from the linked persona (non-blank only). + pub persona_prompt: Option, + /// Structured model from global config (non-blank only). + pub global_model: Option, + /// Structured provider from global config (non-blank only). + pub global_provider: Option, +} + /// Where a config value came from — determines precedence and UI annotations. #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] #[serde(rename_all = "camelCase")] @@ -17,14 +52,12 @@ pub enum ConfigOrigin { /// Read from harness config file on disk (tier 2b, lowest precedence). ConfigFile, /// Value inherited from persona defaults. - /// Populated by the `get_agent_config_surface` call site: persona values are - /// resolved before calling the reader, then the surface is post-processed to - /// re-tag injected fields from `BuzzExplicit` to `PersonaDefault`. + /// Populated when a persona's env var or structured field wins for this + /// field in the reader's candidate resolution. PersonaDefault, /// Value inherited from global agent configuration defaults. /// The lowest user-settable layer — active when neither the agent record nor - /// the linked persona specifies a value. Re-tagged from `BuzzExplicit` by the - /// `resolve_config_surface` call site, analogously to `PersonaDefault`. + /// the linked persona specifies a value. GlobalDefault, /// Live runtime model override applied via the ModelPicker (Phase 3). /// The ACP session's current model diverges from the persona model because @@ -35,6 +68,11 @@ pub enum ConfigOrigin { /// env var. E.g. Claude Code only supports Anthropic as a provider; the /// "locked" display is synthesized by the config bridge, not read from disk. HarnessConstraint, + /// Value comes from a custom harness definition's `env` block. + /// Sits below global env and above structured persona/global values, + /// matching spawn Layer 2b. Only reachable for user-authored custom harness + /// JSONs with a non-empty `env` block; preset harnesses always have empty env. + HarnessDefault, } /// How a config field can be written back to the runtime. diff --git a/desktop/src-tauri/src/managed_agents/runtime.rs b/desktop/src-tauri/src/managed_agents/runtime.rs index 37927961ed..3173126b90 100644 --- a/desktop/src-tauri/src/managed_agents/runtime.rs +++ b/desktop/src-tauri/src/managed_agents/runtime.rs @@ -22,8 +22,7 @@ pub(crate) use path::should_use_inherited; mod metadata; pub(crate) use metadata::{ - resolve_effective_prompt_model_provider, resolve_session_title, runtime_metadata_env_vars, - SESSION_TITLE_ENV_VAR, + resolve_session_title, runtime_metadata_env_vars, SESSION_TITLE_ENV_VAR, }; mod stop; diff --git a/desktop/src-tauri/src/managed_agents/runtime/metadata.rs b/desktop/src-tauri/src/managed_agents/runtime/metadata.rs index 288ce06b0a..96ac73e347 100644 --- a/desktop/src-tauri/src/managed_agents/runtime/metadata.rs +++ b/desktop/src-tauri/src/managed_agents/runtime/metadata.rs @@ -57,32 +57,6 @@ pub(crate) fn resolve_session_title(display_name: Option<&str>, name: &str) -> O .find(|value| !value.is_empty()) } -/// Resolve effective prompt/model/provider using definition-authoritative -/// semantics for linked instances. -/// -/// Used by `agent_config.rs` to inject persona defaults into the config surface -/// before running the reader. -pub(crate) fn resolve_effective_prompt_model_provider( - persona_id: Option<&str>, - personas: &[crate::managed_agents::types::AgentDefinition], - record_prompt: Option, - record_model: Option, - record_provider: Option, -) -> (Option, Option, Option) { - match persona_id.and_then(|pid| personas.iter().find(|p| p.id == pid)) { - Some(p) => { - fn non_blank(v: Option<&str>) -> Option { - v.filter(|s| !s.trim().is_empty()).map(str::to_owned) - } - let prompt = non_blank(Some(&p.system_prompt)); - let model = non_blank(p.model.as_deref()); - let provider = non_blank(p.provider.as_deref()); - (prompt, model, provider) - } - None => (record_prompt, record_model, record_provider), - } -} - #[cfg(test)] mod tests { use super::resolve_session_title; diff --git a/desktop/src/features/agents/ui/AgentConfigPanel.tsx b/desktop/src/features/agents/ui/AgentConfigPanel.tsx index 3236b4d808..67c544257c 100644 --- a/desktop/src/features/agents/ui/AgentConfigPanel.tsx +++ b/desktop/src/features/agents/ui/AgentConfigPanel.tsx @@ -137,6 +137,8 @@ function provenanceSentence( return "From ACP session"; case "globalDefault": return "Inherited from global defaults"; + case "harnessDefault": + return "Inherited from harness definition"; } } diff --git a/desktop/src/shared/api/types.ts b/desktop/src/shared/api/types.ts index 3f07e9ad9a..d0e8ee0047 100644 --- a/desktop/src/shared/api/types.ts +++ b/desktop/src/shared/api/types.ts @@ -602,7 +602,6 @@ export type AgentModelInfo = { }; // ── Config bridge types ────────────────────────────────────────────────────── - export type ConfigOrigin = | "buzzExplicit" | "acpNativeRead" @@ -612,7 +611,8 @@ export type ConfigOrigin = | "personaDefault" | "globalDefault" | "runtimeOverride" - | "harnessConstraint"; + | "harnessConstraint" + | "harnessDefault"; export type ConfigWriteMechanism = | { type: "respawnWithEnvVar"; envKey: string } From f810a2f49e213d25119f2aa75b5b577655119b74 Mon Sep 17 00:00:00 2001 From: Will Pfleger Date: Mon, 3 Aug 2026 11:12:09 -0400 Subject: [PATCH 05/27] fix(desktop): make OpenAI key re-enterable after first save in card mint dialog (#4140) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes a write-once dead-end in the card mint dialog where a user with an expired OpenAI key had no way to replace it. **Source-aware key status (Rust + TypeScript).** `card_mint_key_status` returns a layer discriminant (`"none" | "global" | "persona" | "agent" | "process"`) instead of a boolean. A pure `resolve_key_layer()` helper in `card.rs` owns the classification logic; `card_mint_key_status` delegates to it, so the production path is under direct test with no duplicate logic. **Mint form always reachable.** The key panel replaces the mint form only for `none` (first-time setup) or when the user explicitly opens the edit panel (`editingKey`). Keys from agent/persona/process layers show an inline provenance row on the mint form with a "Why?" affordance; clicking it shows the read-only redirect in a panel with a Cancel button that returns to the mint form — never a terminal state. **Precise auth-error matching.** The 401 handling in `cardMintStore.ts` matches `startsWith("Card mint failed (HTTP 401 ")` plus the specific `Incorrect API key` text, so avatar-fetch 401 errors pass through unchanged. **Tri-state key status row.** "Using your saved OpenAI key · Update" renders only when `keyLayer === "global"` (confirmed writable key). Query pending or errored hides the row without asserting key existence. **Real tests.** Panel visibility derivations live in `cardMintKeyUtils.ts`, which `AgentCardMintDialog.tsx` imports directly. Tests cover all layers including the mint-reachability invariant (Mint reachable for every resolved layer; only `none` gates setup). - `card.rs` — new `resolve_key_layer()` pure helper; `card_mint_key_status` delegates to it; 999 lines (under the 1000-line ratchet) - `card/tests.rs` — precedence test calls `resolve_key_layer()` directly (no test-local closure); adds process-layer and blank-value cases - `tauriPersonas.ts` — `CardMintKeyLayer` type; updated `cardMintKeyStatus` signature - `cardMintKeyUtils.ts` — `showKeyPanel`, `showReadOnlyRow`, `showCancelButton`, `keyPanelTitle`, and helpers; component imports all of them - `AgentCardMintDialog.tsx` — inline provenance rows for all key sources; key panel only for setup/edit; no unused variables - `cardMintStore.ts` — precise 401 prefix matching - `e2eBridge.ts` — `card_mint_key_status` stub returns `"global"` (not boolean) - Tests: 3959 JS passing, 2089 Rust passing, `tsc --noEmit` clean Related: [block/buzz#4406](https://github.com/block/buzz/pull/4406) --------- Signed-off-by: Will Pfleger Co-authored-by: npub1ng3jzsaqxdhrfq22dg85j3lpr0zsh3jp7g2h9jyxl59wraayapnsu6kvfg <9a232143a0336e34814a6a0f4947e11bc50bc641f21572c886fd0ae1f7a4e867@buzz.block.builderlab.xyz> --- .../src-tauri/src/commands/personas/card.rs | 43 ++- .../src/commands/personas/card/tests.rs | 75 +++++ .../features/agents/cardMintStore.test.mjs | 49 ++++ desktop/src/features/agents/cardMintStore.ts | 9 + .../agents/ui/AgentCardMintDialog.test.mjs | 257 ++++++++++++++++++ .../agents/ui/AgentCardMintDialog.tsx | 193 +++++++++---- .../features/agents/ui/cardMintKeyUtils.ts | 75 +++++ desktop/src/shared/api/tauriPersonas.ts | 29 +- desktop/src/testing/e2eBridge.ts | 5 +- 9 files changed, 674 insertions(+), 61 deletions(-) create mode 100644 desktop/src/features/agents/ui/AgentCardMintDialog.test.mjs create mode 100644 desktop/src/features/agents/ui/cardMintKeyUtils.ts diff --git a/desktop/src-tauri/src/commands/personas/card.rs b/desktop/src-tauri/src/commands/personas/card.rs index c516db1736..29a5c35e6a 100644 --- a/desktop/src-tauri/src/commands/personas/card.rs +++ b/desktop/src-tauri/src/commands/personas/card.rs @@ -283,6 +283,35 @@ pub(crate) fn resolve_env_from_layers( process_value.filter(|k| !k.trim().is_empty()) } +/// Pure classification: same four env inputs as `resolve_env_from_layers`, +/// returns which layer supplies `OPENAI_API_KEY` (agent > persona > global > +/// process > none). +pub(crate) fn resolve_key_layer( + global_env: &std::collections::BTreeMap, + persona_env: &std::collections::BTreeMap, + record_env: &std::collections::BTreeMap, + process_value: Option, +) -> &'static str { + let key = "OPENAI_API_KEY"; + let nonempty = |m: &std::collections::BTreeMap| { + m.get(key).is_some_and(|v| !v.trim().is_empty()) + }; + if nonempty(record_env) { + return "agent"; + } + if nonempty(persona_env) { + return "persona"; + } + if nonempty(global_env) { + return "global"; + } + let proc = process_value.as_deref().unwrap_or(""); + if !proc.trim().is_empty() { + return "process"; + } + "none" +} + /// The Responses endpoint to post mints to. `OPENAI_BASE_URL` (same env /// layering as the key) overrides the default host, supporting endpoints and /// proxies that speak the OpenAI Responses shape with Bearer auth. Azure @@ -450,16 +479,15 @@ pub fn card_mint_save_openai_key( save_global_agent_config(&app, &config) } -/// Report whether an OpenAI key would resolve for a card mint of agent `id`, -/// using exactly the same env layering as `mint_agent_card`. Lets the mint -/// dialog offer inline key setup BEFORE the user commits to a mint, instead -/// of failing after the fact. Never returns the key itself. +/// Report which env layer resolves the OpenAI key for a card mint of agent +/// `id` — same layering as `mint_agent_card`. Delegates to `resolve_key_layer` +/// for the classification; see that helper for the return-value contract. #[tauri::command] pub fn card_mint_key_status( id: String, app: AppHandle, state: State<'_, AppState>, -) -> Result { +) -> Result { let _store_guard = state .managed_agents_store_lock .lock() @@ -478,14 +506,13 @@ pub fn card_mint_key_status( .map(|p| p.env_vars.clone()) .unwrap_or_default(); - Ok(resolve_env_from_layers( - "OPENAI_API_KEY", + Ok(resolve_key_layer( &global.env_vars, &persona_env, &record.env_vars, std::env::var("OPENAI_API_KEY").ok(), ) - .is_some()) + .to_string()) } /// Mint a trading card for the agent identified by `id` (instance pubkey, diff --git a/desktop/src-tauri/src/commands/personas/card/tests.rs b/desktop/src-tauri/src/commands/personas/card/tests.rs index ca69c43866..407ab44974 100644 --- a/desktop/src-tauri/src/commands/personas/card/tests.rs +++ b/desktop/src-tauri/src/commands/personas/card/tests.rs @@ -71,6 +71,81 @@ fn key_resolution_layering_record_wins() { assert!(resolve_env_from_layers("OPENAI_API_KEY", &global, &persona, &record, None).is_none()); } +/// Prove that `resolve_key_layer` classifies layers in the same precedence +/// order that `mint_agent_card`/`resolve_env_from_layers` uses, so the dialog +/// update path is only offered when writing global will actually win. +#[test] +fn key_status_layer_matches_mint_resolution_priority() { + let key = "OPENAI_API_KEY"; + let mut global = BTreeMap::new(); + let mut persona = BTreeMap::new(); + let mut record = BTreeMap::new(); + + // No key anywhere → "none" + assert_eq!(resolve_key_layer(&global, &persona, &record, None), "none"); + + // Only global → "global" (the only writable layer) + global.insert(key.to_string(), "sk-global".to_string()); + assert_eq!( + resolve_key_layer(&global, &persona, &record, None), + "global" + ); + // mint resolution also picks global when record and persona are empty + assert_eq!( + resolve_env_from_layers(key, &global, &persona, &record, None).as_deref(), + Some("sk-global") + ); + + // Persona overrides global → status must report "persona", NOT "global" + persona.insert(key.to_string(), "sk-persona".to_string()); + assert_eq!( + resolve_key_layer(&global, &persona, &record, None), + "persona" + ); + // mint would use the persona key + assert_eq!( + resolve_env_from_layers(key, &global, &persona, &record, None).as_deref(), + Some("sk-persona") + ); + // Writing to global would NOT change what mint resolves — status correctly + // returns "persona" so the dialog shows a read-only redirect instead. + let mut global_updated = global.clone(); + global_updated.insert(key.to_string(), "sk-new-global".to_string()); + assert_eq!( + resolve_env_from_layers(key, &global_updated, &persona, &record, None).as_deref(), + Some("sk-persona"), + "writing global must not change resolution when persona key exists" + ); + + // Agent record overrides both → status must report "agent" + record.insert(key.to_string(), "sk-agent".to_string()); + assert_eq!(resolve_key_layer(&global, &persona, &record, None), "agent"); + assert_eq!( + resolve_env_from_layers(key, &global, &persona, &record, None).as_deref(), + Some("sk-agent") + ); + + // Process env is last resort (only when all map layers are empty) + let empty = BTreeMap::new(); + assert_eq!( + resolve_key_layer(&empty, &empty, &empty, Some("sk-process".to_string())), + "process" + ); + + // Blank values are skipped — process wins over a whitespace global + let mut blank_global = BTreeMap::new(); + blank_global.insert(key.to_string(), " ".to_string()); + assert_eq!( + resolve_key_layer( + &blank_global, + &empty, + &empty, + Some("sk-process".to_string()) + ), + "process" + ); +} + #[test] fn key_resolution_skips_blank_values() { let mut record = BTreeMap::new(); diff --git a/desktop/src/features/agents/cardMintStore.test.mjs b/desktop/src/features/agents/cardMintStore.test.mjs index eb9c0f07b0..6c2f4522ab 100644 --- a/desktop/src/features/agents/cardMintStore.test.mjs +++ b/desktop/src/features/agents/cardMintStore.test.mjs @@ -96,6 +96,55 @@ describe("cardMintStore", () => { assert.equal(getCardMintJobs()[0].error, "No OPENAI_API_KEY found."); }); + it("replaces a 401 HTTP error with an actionable update-key message", async () => { + await runCardMintJob(INPUT, () => + Promise.reject( + new Error( + "Card mint failed (HTTP 401 Unauthorized): Incorrect API key provided: sk-proj-***", + ), + ), + ); + const { error } = getCardMintJobs()[0]; + assert.ok( + error?.includes("invalid or expired"), + `expected 'invalid or expired' in: ${error}`, + ); + assert.ok( + error?.includes("Update API key"), + `expected 'Update API key' in: ${error}`, + ); + }); + + it("replaces an 'Incorrect API key' error without an HTTP status code", async () => { + await runCardMintJob(INPUT, () => + Promise.reject(new Error("Incorrect API key provided: sk-proj-***")), + ); + const { error } = getCardMintJobs()[0]; + assert.ok( + error?.includes("invalid or expired"), + `expected 'invalid or expired' in: ${error}`, + ); + }); + + it("does not apply the 401 branch to generic non-auth errors", async () => { + await runCardMintJob(INPUT, () => + Promise.reject(new Error("Connection timeout")), + ); + assert.equal(getCardMintJobs()[0].error, "Connection timeout"); + }); + + it("does not rewrite avatar fetch 401 as an API key error", async () => { + // Avatar fetch failures have a different error prefix — rewriting them + // would send the user down a path that cannot fix the avatar failure. + const avatarError = "Avatar fetch failed: HTTP 401 Unauthorized"; + await runCardMintJob(INPUT, () => Promise.reject(new Error(avatarError))); + assert.equal( + getCardMintJobs()[0].error, + avatarError, + "avatar 401 must pass through unchanged", + ); + }); + it("viewMintedCardJob moves a done job into the viewer and clears the chip", async () => { await runCardMintJob(INPUT, () => Promise.resolve(CARD)); const jobId = getCardMintJobs()[0].jobId; diff --git a/desktop/src/features/agents/cardMintStore.ts b/desktop/src/features/agents/cardMintStore.ts index 0e4746d445..c38bf393cc 100644 --- a/desktop/src/features/agents/cardMintStore.ts +++ b/desktop/src/features/agents/cardMintStore.ts @@ -123,6 +123,15 @@ export async function runCardMintJob( // removed between dialog-open and mint. The dialog's key-setup panel is // long gone — surface a plain instruction instead of the wire prefix. message = message.slice(NO_OPENAI_KEY_PREFIX.length).trim(); + } else if ( + message.startsWith("Card mint failed (HTTP 401 ") || + message.includes("Incorrect API key") + ) { + // The saved OpenAI key is invalid or expired. Only match the OpenAI-call + // envelope prefix and the specific Incorrect-API-key message to avoid + // rewriting unrelated 401s (e.g. "Avatar fetch failed: HTTP 401 …"). + message = + 'The OpenAI API key is invalid or expired. Open the mint dialog and use "Update API key" to replace it.'; } updateJob(jobId, { phase: "error", error: message }); toast.error(`Minting ${input.agentName}'s card failed`, { diff --git a/desktop/src/features/agents/ui/AgentCardMintDialog.test.mjs b/desktop/src/features/agents/ui/AgentCardMintDialog.test.mjs new file mode 100644 index 0000000000..ff3efaec92 --- /dev/null +++ b/desktop/src/features/agents/ui/AgentCardMintDialog.test.mjs @@ -0,0 +1,257 @@ +import assert from "node:assert/strict"; +import { describe, it } from "node:test"; + +// Tests for the key-panel visibility derivations that AgentCardMintDialog +// imports from cardMintKeyUtils. These tests exercise the exact production +// module — changes to any exported function will cause failures here. + +import { + isReadOnlyLayer, + isWritableLayer, + keyPanelTitle, + showCancelButton, + showKeyPanel, + showKeyStatusRow, + showReadOnlyRow, +} from "./cardMintKeyUtils.ts"; + +describe("cardMintKeyUtils — key panel derivations", () => { + // ── isWritableLayer ──────────────────────────────────────────────────────── + + it("isWritableLayer_none_true", () => { + assert.equal(isWritableLayer("none"), true); + }); + + it("isWritableLayer_global_true", () => { + assert.equal(isWritableLayer("global"), true); + }); + + it("isWritableLayer_agent_false", () => { + assert.equal(isWritableLayer("agent"), false); + }); + + it("isWritableLayer_persona_false", () => { + assert.equal(isWritableLayer("persona"), false); + }); + + it("isWritableLayer_process_false", () => { + assert.equal(isWritableLayer("process"), false); + }); + + it("isWritableLayer_undefined_false", () => { + // Unknown (pending/error) — don't offer a write path + assert.equal(isWritableLayer(undefined), false); + }); + + // ── isReadOnlyLayer ──────────────────────────────────────────────────────── + + it("isReadOnlyLayer_agent_true", () => { + assert.equal(isReadOnlyLayer("agent"), true); + }); + + it("isReadOnlyLayer_persona_true", () => { + assert.equal(isReadOnlyLayer("persona"), true); + }); + + it("isReadOnlyLayer_process_true", () => { + assert.equal(isReadOnlyLayer("process"), true); + }); + + it("isReadOnlyLayer_global_false", () => { + assert.equal(isReadOnlyLayer("global"), false); + }); + + it("isReadOnlyLayer_none_false", () => { + assert.equal(isReadOnlyLayer("none"), false); + }); + + it("isReadOnlyLayer_undefined_false", () => { + assert.equal(isReadOnlyLayer(undefined), false); + }); + + // ── showKeyPanel ─────────────────────────────────────────────────────────── + // Key panel replaces the mint form ONLY for first-time setup (none) or + // user-initiated editing (editingKey). Read-only layers do NOT replace the + // mint form — they show an inline status row instead. + + it("showKeyPanel_none_notEditing_shows", () => { + // First-time user: key not set → show setup panel + assert.equal(showKeyPanel("none", false), true); + }); + + it("showKeyPanel_global_notEditing_hides", () => { + // Normal state: key in global defaults, not editing → show mint form + assert.equal(showKeyPanel("global", false), false); + }); + + it("showKeyPanel_global_editing_shows", () => { + // User clicked Update → show the update panel + assert.equal(showKeyPanel("global", true), true); + }); + + it("showKeyPanel_agent_notEditing_hides", () => { + // Read-only layer: mint form stays visible; inline row shown instead + assert.equal(showKeyPanel("agent", false), false); + }); + + it("showKeyPanel_persona_notEditing_hides", () => { + assert.equal(showKeyPanel("persona", false), false); + }); + + it("showKeyPanel_process_notEditing_hides", () => { + assert.equal(showKeyPanel("process", false), false); + }); + + it("showKeyPanel_agent_editing_shows", () => { + // User clicked Why? on a read-only row → show the redirect panel + assert.equal(showKeyPanel("agent", true), true); + }); + + it("showKeyPanel_persona_editing_shows", () => { + assert.equal(showKeyPanel("persona", true), true); + }); + + it("showKeyPanel_process_editing_shows", () => { + assert.equal(showKeyPanel("process", true), true); + }); + + it("showKeyPanel_undefined_notEditing_hides", () => { + // Query pending/error → show mint form (fail-open, no panel claim) + assert.equal(showKeyPanel(undefined, false), false); + }); + + // ── showCancelButton ─────────────────────────────────────────────────────── + + it("showCancelButton_global_editing_shows", () => { + // Update mode for a global key: Cancel returns to the mint form + assert.equal(showCancelButton("global", true), true); + }); + + it("showCancelButton_none_editing_hides", () => { + // First-time setup: no cancel (no mint form to return to) + assert.equal(showCancelButton("none", true), false); + }); + + it("showCancelButton_global_notEditing_hides", () => { + assert.equal(showCancelButton("global", false), false); + }); + + it("showCancelButton_agent_editing_shows", () => { + // Read-only layer + user clicked Why?: Cancel returns to the mint form + assert.equal(showCancelButton("agent", true), true); + }); + + it("showCancelButton_persona_editing_shows", () => { + assert.equal(showCancelButton("persona", true), true); + }); + + it("showCancelButton_process_editing_shows", () => { + assert.equal(showCancelButton("process", true), true); + }); + + // ── showKeyStatusRow ─────────────────────────────────────────────────────── + + it("showKeyStatusRow_global_notEditing_shows", () => { + // Confirmed writable key: show "Using your saved OpenAI key · Update" + assert.equal(showKeyStatusRow("global", false), true); + }); + + it("showKeyStatusRow_global_editing_hides", () => { + // In update panel: status row is redundant while editing + assert.equal(showKeyStatusRow("global", true), false); + }); + + it("showKeyStatusRow_none_notEditing_hides", () => { + // No key: show setup panel, not status row + assert.equal(showKeyStatusRow("none", false), false); + }); + + it("showKeyStatusRow_agent_notEditing_hides", () => { + // Read-only layer: use showReadOnlyRow instead + assert.equal(showKeyStatusRow("agent", false), false); + }); + + it("showKeyStatusRow_undefined_notEditing_hides", () => { + // Query pending/error: do not assert key existence + assert.equal(showKeyStatusRow(undefined, false), false); + }); + + // ── showReadOnlyRow ──────────────────────────────────────────────────────── + // Inline provenance row on the mint form for keys the dialog cannot update. + + it("showReadOnlyRow_agent_notEditing_shows", () => { + assert.equal(showReadOnlyRow("agent", false), true); + }); + + it("showReadOnlyRow_persona_notEditing_shows", () => { + assert.equal(showReadOnlyRow("persona", false), true); + }); + + it("showReadOnlyRow_process_notEditing_shows", () => { + assert.equal(showReadOnlyRow("process", false), true); + }); + + it("showReadOnlyRow_agent_editing_hides", () => { + // User clicked Why? → redirect panel shown; row hidden + assert.equal(showReadOnlyRow("agent", true), false); + }); + + it("showReadOnlyRow_global_notEditing_hides", () => { + // Global key uses showKeyStatusRow instead + assert.equal(showReadOnlyRow("global", false), false); + }); + + it("showReadOnlyRow_none_hides", () => { + assert.equal(showReadOnlyRow("none", false), false); + }); + + it("showReadOnlyRow_undefined_hides", () => { + assert.equal(showReadOnlyRow(undefined, false), false); + }); + + // ── Mint-reachability invariant ──────────────────────────────────────────── + // The mint form (and Mint button) must be reachable whenever a key resolves. + // showKeyPanel returns true only for setup (none) or user-initiated edit. + + it("mintReachable_global_noEdit", () => { + assert.equal(showKeyPanel("global", false), false); + }); + + it("mintReachable_agent_noEdit", () => { + assert.equal(showKeyPanel("agent", false), false); + }); + + it("mintReachable_persona_noEdit", () => { + assert.equal(showKeyPanel("persona", false), false); + }); + + it("mintReachable_process_noEdit", () => { + assert.equal(showKeyPanel("process", false), false); + }); + + it("mintBlocked_none_noEdit", () => { + // Only when no key is set at all does the panel gate minting + assert.equal(showKeyPanel("none", false), true); + }); + + // ── keyPanelTitle ────────────────────────────────────────────────────────── + + it("keyPanelTitle_none_firstTimeSetup", () => { + assert.equal( + keyPanelTitle("none", false), + "One-time setup: OpenAI API key", + ); + }); + + it("keyPanelTitle_global_editing_update", () => { + assert.equal(keyPanelTitle("global", true), "Update OpenAI API key"); + }); + + it("keyPanelTitle_agent_readOnly", () => { + assert.equal(keyPanelTitle("agent", false), "OpenAI API key"); + }); + + it("keyPanelTitle_persona_readOnly", () => { + assert.equal(keyPanelTitle("persona", true), "OpenAI API key"); + }); +}); diff --git a/desktop/src/features/agents/ui/AgentCardMintDialog.tsx b/desktop/src/features/agents/ui/AgentCardMintDialog.tsx index 219de4aefa..b2bffc00df 100644 --- a/desktop/src/features/agents/ui/AgentCardMintDialog.tsx +++ b/desktop/src/features/agents/ui/AgentCardMintDialog.tsx @@ -20,6 +20,7 @@ import { globalAgentConfigQueryKey } from "@/features/agents/useGlobalAgentConfi import { cardMintKeyStatus, cardMintSaveOpenaiKey, + type CardMintKeyLayer, type SnapshotMemoryLevel, } from "@/shared/api/tauriPersonas"; import { Button } from "@/shared/ui/button"; @@ -34,6 +35,14 @@ import { Input } from "@/shared/ui/input"; import { Switch } from "@/shared/ui/switch"; import { Textarea } from "@/shared/ui/textarea"; import { SnapshotOptionMenu } from "./SnapshotOptionMenu"; +import { + isReadOnlyLayer, + keyPanelTitle, + showCancelButton, + showKeyPanel, + showKeyStatusRow, + showReadOnlyRow, +} from "./cardMintKeyUtils"; const OPENAI_KEYS_URL = "https://platform.openai.com/api-keys"; @@ -121,6 +130,7 @@ export function AgentCardMintDialog({ const [memoryLevel, setMemoryLevel] = React.useState("none"); const [keyDraft, setKeyDraft] = React.useState(""); + const [editingKey, setEditingKey] = React.useState(false); const queryClient = useQueryClient(); @@ -130,14 +140,16 @@ export function AgentCardMintDialog({ // (owner, agent) pair, so the plaintext warning would be false there. const showMemoryWarning = memoryLevel !== "none" && !effectiveLock; - // Whether a key already resolves through the agent's env layering. While - // unknown (loading/error) we show the normal mint form — the mint itself - // still fails cleanly if no key exists. + // Whether a key already resolves through the agent's env layering, and from + // which layer. While unknown (loading/error) we treat as if no verified key + // exists — mint still works fail-open, but we don't assert a key is present. const keyStatusQuery = useQuery({ queryKey: ["cardMintKeyStatus", agentId], queryFn: () => cardMintKeyStatus(agentId), }); - const needsKey = keyStatusQuery.data === false; + const keyLayer: CardMintKeyLayer | undefined = keyStatusQuery.data; + // True when the key resolves from a layer this dialog cannot update. + const keyIsReadOnly = isReadOnlyLayer(keyLayer); // Save the pasted key into the global Agent Defaults env — the same single // source of truth every agent inherits. Narrow Rust seam: validated @@ -146,13 +158,19 @@ export function AgentCardMintDialog({ const saveKeyMutation = useMutation({ mutationFn: (key: string) => cardMintSaveOpenaiKey(key), onSuccess: () => { - queryClient.setQueryData(["cardMintKeyStatus", agentId], true); + // The key now lives in global defaults — update the cached layer so the + // status row shows correctly without waiting for a refetch. + queryClient.setQueryData( + ["cardMintKeyStatus", agentId], + "global", + ); // The Agent Defaults editor caches the whole config — refetch it so a // later-opened settings view shows the key we just wrote. void queryClient.invalidateQueries({ queryKey: globalAgentConfigQueryKey, }); setKeyDraft(""); + setEditingKey(false); toast.success( "API key saved to your agent defaults. Running agents pick it up on their next restart.", ); @@ -188,7 +206,7 @@ export function AgentCardMintDialog({ - {needsKey ? ( + {showKeyPanel(keyLayer, editingKey) ? (
- One-time setup: OpenAI API key + {keyPanelTitle(keyLayer, editingKey)} -

- Minting a card costs money — it generates the art and card text - through the OpenAI API with your key (typically well under a - dollar per mint, billed by OpenAI). The key is saved to your - agent defaults, so you only do this once. -

- - setKeyDraft(e.target.value)} - placeholder="sk-…" - type="password" - value={keyDraft} - /> + {keyIsReadOnly ? ( + // Key resolves from a layer the dialog cannot write to — show + // a read-only redirect instead of an input that would be + // shadowed by the higher-priority layer. +

+ {keyLayer === "agent" + ? "This agent's OpenAI key is set in its own agent settings — update it there." + : keyLayer === "persona" + ? "This agent's OpenAI key comes from its linked persona settings — update it there." + : "This agent's OpenAI key is set in the process environment — update it in your shell or launch config."} +

+ ) : ( + <> +

+ Minting a card costs money — it generates the art and card + text through the OpenAI API with your key (typically well + under a dollar per mint, billed by OpenAI). The key is saved + as OPENAI_API_KEY in your + agent defaults env — that's the row to update in Settings if + you ever need to change it there. +

+ + setKeyDraft(e.target.value)} + placeholder="sk-…" + type="password" + value={keyDraft} + /> + + )}
-
- +
+ {showCancelButton(keyLayer, editingKey) ? ( + + ) : null} + {!keyIsReadOnly ? ( + + ) : null}
) : ( @@ -324,6 +379,50 @@ export function AgentCardMintDialog({ onCheckedChange={setLockCard} /> + {showKeyStatusRow(keyLayer, editingKey) ? ( +
+ + Using your saved OpenAI key + · + +
+ ) : null} + {showReadOnlyRow(keyLayer, editingKey) ? ( +
+ + + {keyLayer === "agent" + ? "OpenAI key from agent settings" + : keyLayer === "persona" + ? "OpenAI key from persona settings" + : "OpenAI key from environment"} + + · + +
+ ) : null}

{ - return invokeTauri("card_mint_key_status", { id }); +export async function cardMintKeyStatus(id: string): Promise { + return invokeTauri("card_mint_key_status", { id }); } /** diff --git a/desktop/src/testing/e2eBridge.ts b/desktop/src/testing/e2eBridge.ts index f17faa218b..037274176e 100644 --- a/desktop/src/testing/e2eBridge.ts +++ b/desktop/src/testing/e2eBridge.ts @@ -11852,8 +11852,9 @@ export function maybeInstallE2eTauriMocks() { // command was invoked via `__BUZZ_E2E_COMMANDS__`, not the dialog. return true; case "card_mint_key_status": - // Cards: pretend a key is configured so the mint form renders. - return true; + // Cards: pretend a key is configured in global defaults so the mint + // form renders and the key-status row is shown. + return "global"; case "list_agent_cards": // Cards archive starts empty in E2E; specs exercising the gallery // can extend this with a seeded config knob when needed. From 5e0efb0bb95182f588390b55cc5affa09114c87e Mon Sep 17 00:00:00 2001 From: Will Pfleger Date: Mon, 3 Aug 2026 11:12:34 -0400 Subject: [PATCH 06/27] fix(desktop): disambiguate provider API key labels and annotate mint key (#4406) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Two different credentials were presented under the same name throughout the app. The top-level credential field for non-Anthropic providers (OpenAI, OpenAI-compatible, OpenRouter) was labeled "OpenAI API Key" via a hardcoded binary ternary repeated in three dialogs. The card-minting key (`OPENAI_API_KEY`) and the runtime credential (`OPENAI_COMPAT_API_KEY`) have independent endpoint namespaces and consumers (`OPENAI_COMPAT_BASE_URL`/`OPENAI_COMPAT_API_KEY` for runtime, `OPENAI_BASE_URL`/`OPENAI_API_KEY` for minting) and must remain separate — either may require a different credential. This PR makes them impossible to confuse in the UI. ## Changes **Provider-accurate labels from the credential table.** `PROVIDER_CREDENTIAL_CONFIG` entries now carry an `apiKeyLabel` paired with `secretEnvVar` as a discriminated union (both present or neither — a future provider cannot ship a secret field with no label). `getProviderApiKeyLabel(providerId)` is the single source of truth. The three hardcoded ternaries in `AgentConfigFields`, `AgentInstanceEditDialog`, and `AgentDefinitionDialog` are replaced by this helper. Labels: `openai` → "OpenAI Runtime API Key", `openai-compat` → "OpenAI-compatible Runtime API Key", `openrouter` → "OpenRouter API Key" (was incorrectly "OpenAI API Key"), `anthropic` → "Anthropic API Key" (unchanged). **Field names its backing env var.** `PersonaProviderApiKeyField` renders the env var name as a monospace hint beneath the label with `aria-describedby` wiring. All three call sites pass their `secretEnvVar`. A user who sees `OPENAI_API_KEY` in the mint dialog can now confirm at a glance that the credential field shows `OPENAI_COMPAT_API_KEY` — a different key. **Signpost visible at the decision point.** `CARD_MINT_KEY_ANNOTATIONS` is exported from `agentConfigOptions.tsx` (single source) and passed as `keyAnnotations` to all three generic env editors: both `EnvVarsEditor` branches in Agent Defaults, `EditAgentAdvancedFields`, and `PersonaAdvancedFields`. `CardMintKeyCue` — a new small component — renders an always-visible muted cue beneath the Advanced toggle when `OPENAI_API_KEY` is present in global env (Advanced is collapsed by default, so the per-row annotation is invisible until the cue guides the user to open it). **Model discovery error copy.** The `OPENAI_COMPAT_API_KEY required` message now reads "Enter an OpenAI runtime API key (OPENAI_COMPAT_API_KEY) to load OpenAI models." — naming the env var explicitly so it cannot be confused with the mint key. ## Tests - `getProviderApiKeyLabel` helper: pinned correct label per provider including the new distinct labels for `openai` and `openai-compat` - `PersonaProviderApiKeyField` render: semantic label present; env-var hint rendered when `envVarName` provided; `aria-describedby` wired to hint id; hint and describedby absent when prop omitted - `EnvVarsEditor` render: annotation appears exactly once on the matching row; absent for non-matching rows - `personaModelDiscoveryStatus`: pinned new copy naming `OPENAI_COMPAT_API_KEY` explicitly - Playwright: stale `"OpenAI API Key"` selectors updated; new `card-mint-key-cue-visible-and-annotation-in-advanced` test covers Will's exact path (databricks_v2 global provider + saved `OPENAI_API_KEY` → cue visible before opening Advanced → annotation present after opening) ## File sizes (post-format) | File | Lines | |------|-------| | `AgentConfigFields.tsx` | 994 (≤ 996) | | `AgentInstanceEditDialog.tsx` | 1228 (≤ 1228) | | `AgentDefinitionDialog.tsx` | 1045 (≤ 1047) | Related: [#4140](https://github.com/block/buzz/pull/4140) --------- Signed-off-by: Will Pfleger Co-authored-by: npub1ng3jzsaqxdhrfq22dg85j3lpr0zsh3jp7g2h9jyxl59wraayapnsu6kvfg <9a232143a0336e34814a6a0f4947e11bc50bc641f21572c886fd0ae1f7a4e867@buzz.block.builderlab.xyz> --- .../features/agents/ui/AgentConfigFields.tsx | 22 ++- .../agents/ui/AgentDefinitionDialog.tsx | 8 +- .../agents/ui/AgentInstanceEditDialog.tsx | 12 +- .../src/features/agents/ui/CardMintKeyCue.tsx | 29 +++ .../agents/ui/EditAgentAdvancedFields.tsx | 2 + .../features/agents/ui/EnvVarsEditor.test.mjs | 94 ++++++++++ .../src/features/agents/ui/EnvVarsEditor.tsx | 25 +++ .../agents/ui/PersonaAdvancedFields.tsx | 2 + .../ui/PersonaProviderApiKeyField.test.mjs | 170 ++++++++++++++++++ .../agents/ui/PersonaProviderApiKeyField.tsx | 20 ++- .../agents/ui/agentConfigOptions.test.mjs | 48 +++++ .../features/agents/ui/agentConfigOptions.tsx | 62 +++++-- .../ui/personaModelDiscoveryStatus.test.mjs | 3 +- .../agents/ui/personaModelDiscoveryStatus.ts | 3 +- .../global-agent-config-screenshots.spec.ts | 40 +++++ desktop/tests/e2e/persona-env-vars.spec.ts | 4 +- 16 files changed, 505 insertions(+), 39 deletions(-) create mode 100644 desktop/src/features/agents/ui/CardMintKeyCue.tsx create mode 100644 desktop/src/features/agents/ui/PersonaProviderApiKeyField.test.mjs diff --git a/desktop/src/features/agents/ui/AgentConfigFields.tsx b/desktop/src/features/agents/ui/AgentConfigFields.tsx index 1bd8af8976..ce3d252203 100644 --- a/desktop/src/features/agents/ui/AgentConfigFields.tsx +++ b/desktop/src/features/agents/ui/AgentConfigFields.tsx @@ -32,9 +32,11 @@ import { import { AUTO_PROVIDER_DROPDOWN_VALUE, BLOCK_BUILD_HIDDEN_PROVIDER_IDS, + CARD_MINT_KEY_ANNOTATIONS, CUSTOM_PROVIDER_DROPDOWN_VALUE, getPersonaProviderOptions, getProviderApiKeyEnvVar, + getProviderApiKeyLabel, runtimeSupportsLlmProviderSelection, } from "@/features/agents/ui/agentConfigOptions"; import { @@ -54,6 +56,7 @@ import { } from "@/features/agents/ui/buzzAgentModelTuningFields"; import { SettingsOptionGroup } from "@/features/settings/ui/SettingsOptionGroup"; import { AdvancedRequiredBadge } from "./AdvancedRequiredBadge"; +import { CardMintKeyCue } from "./CardMintKeyCue"; import { getGlobalAgentCredentialState } from "./globalAgentCredentialState"; export const EMPTY_GLOBAL_CONFIG: GlobalAgentConfig = { @@ -74,7 +77,6 @@ const PROGRESSIVE_FIELDS_TRANSITION = { duration: 0.22, ease: [0.23, 1, 0.32, 1], } as const; - type AgentConfigDisclosure = | "full" | "onboarding-essential" @@ -85,13 +87,9 @@ type AgentConfigDisclosure = // - auto-select a valid model when the provider changes // - keep the model select usable during discovery // - preserve credential env vars across provider switches (the abandoned -// provider's key stays in env_vars — visible/deletable under Advanced — -// so flipping back never loses a typed key; spawned agents may therefore -// see credentials for providers they don't use) +// provider's key stays in env_vars — visible/deletable under Advanced) // - require a provider before model/effort are editable (no saveable -// invalid state — design principle #4). Note: legacy configs saved with -// a model but no provider are cleared by the pre-existing orphan-model -// effect on next edit — deliberate data healing, documented in PR. +// invalid state — design principle #4) const autoSelectModelOnProviderChange = true; const disableModelSelectDuringDiscovery = false; const preserveCredentialEnvVarsOnProviderChange = true; @@ -747,6 +745,7 @@ export function AgentConfigFields({

onConfigChange({ ...config, @@ -869,6 +864,7 @@ export function AgentConfigFields({ {showAdvancedFields ? (
+
); })} @@ -596,6 +613,14 @@ export function EnvVarsEditor({

); })()} + {row.key.length > 0 && keyAnnotations?.[row.key] ? ( +

+ {keyAnnotations[row.key]} +

+ ) : null}
); })} diff --git a/desktop/src/features/agents/ui/PersonaAdvancedFields.tsx b/desktop/src/features/agents/ui/PersonaAdvancedFields.tsx index 99cf3e97a8..01485dd9eb 100644 --- a/desktop/src/features/agents/ui/PersonaAdvancedFields.tsx +++ b/desktop/src/features/agents/ui/PersonaAdvancedFields.tsx @@ -6,6 +6,7 @@ import type { PersonaBehaviorDraft } from "./personaBehaviorDraft"; import { isBuzzAgentRuntime } from "./buzzAgentConfig"; import { BuzzAgentModelTuningFields } from "./buzzAgentModelTuningFields"; import { + CARD_MINT_KEY_ANNOTATIONS, PERSONA_FIELD_CONTROL_CLASS, PERSONA_FIELD_SHELL_CLASS, PERSONA_LABEL_OPTIONAL_CLASS, @@ -142,6 +143,7 @@ export function PersonaAdvancedFields({ disabled={disabled} fileSatisfiedKeys={fileSatisfiedEnvKeys} hiddenKeys={hiddenEnvKeys} + keyAnnotations={CARD_MINT_KEY_ANNOTATIONS} onChange={onEnvVarsChange} requiredKeys={requiredEnvKeys} value={envVars} diff --git a/desktop/src/features/agents/ui/PersonaProviderApiKeyField.test.mjs b/desktop/src/features/agents/ui/PersonaProviderApiKeyField.test.mjs new file mode 100644 index 0000000000..62a6ff416c --- /dev/null +++ b/desktop/src/features/agents/ui/PersonaProviderApiKeyField.test.mjs @@ -0,0 +1,170 @@ +/** + * Behavioral tests for PersonaProviderApiKeyField. + * + * Tests the rendering invariants that matter for the disambiguation story: + * - semantic label is present in the rendered output + * - envVarName hint is rendered when the prop is present + * - hint id is wired to the input via aria-describedby + * - hint is absent when envVarName is omitted + * - two simultaneous instances produce unique IDs (no duplicate-ID collision + * in the nested AgentInstanceEditDialog + AgentDefaultsDialog path) + */ + +import assert from "node:assert/strict"; +import { test } from "node:test"; + +import React from "react"; +import { renderToStaticMarkup } from "react-dom/server"; + +import { PersonaProviderApiKeyField } from "./PersonaProviderApiKeyField.tsx"; + +function makeProps(overrides = {}) { + return { + disabled: false, + isInherited: false, + inheritedLabel: "Set in global defaults", + isRequired: false, + label: "OpenAI Runtime API Key", + onValueChange: () => {}, + value: "", + ...overrides, + }; +} + +/** Extract the value of the first attribute matching `name="..."` in html. */ +function extractAttr(html, attrName) { + const re = new RegExp(`${attrName}="([^"]+)"`); + const m = re.exec(html); + return m ? m[1] : null; +} + +/** Extract ALL values of an attribute from html, in document order. */ +function extractAllAttrs(html, attrName) { + const re = new RegExp(`${attrName}="([^"]+)"`, "g"); + return Array.from(html.matchAll(re), (m) => m[1]); +} + +test("PersonaProviderApiKeyField_renders_semantic_label", () => { + const html = renderToStaticMarkup( + React.createElement(PersonaProviderApiKeyField, makeProps()), + ); + assert.ok( + html.includes("OpenAI Runtime API Key"), + "semantic label must appear in rendered output", + ); +}); + +test("PersonaProviderApiKeyField_renders_env_var_hint_when_envVarName_present", () => { + const html = renderToStaticMarkup( + React.createElement( + PersonaProviderApiKeyField, + makeProps({ envVarName: "OPENAI_COMPAT_API_KEY" }), + ), + ); + assert.ok( + html.includes("OPENAI_COMPAT_API_KEY"), + "env-var hint must appear when envVarName is provided", + ); +}); + +test("PersonaProviderApiKeyField_wires_hint_id_via_aria_describedby", () => { + const html = renderToStaticMarkup( + React.createElement( + PersonaProviderApiKeyField, + makeProps({ envVarName: "OPENAI_COMPAT_API_KEY" }), + ), + ); + // Extract the dynamically-generated hint id from the rendered paragraph. + const hintId = extractAttr(html, "id"); + assert.ok(hintId, "hint paragraph must have an id"); + assert.ok( + hintId.startsWith("persona-provider-api-key-hint-"), + `hint id must follow the expected prefix, got: ${hintId}`, + ); + // The input's aria-describedby must point at the same id. + const describedBy = extractAttr(html, "aria-describedby"); + assert.equal( + describedBy, + hintId, + "input aria-describedby must reference the hint's id", + ); +}); + +test("PersonaProviderApiKeyField_omits_hint_when_envVarName_absent", () => { + const html = renderToStaticMarkup( + React.createElement(PersonaProviderApiKeyField, makeProps()), + ); + assert.ok( + !html.includes("aria-describedby"), + "no aria-describedby when envVarName is omitted", + ); + assert.ok( + !html.includes("persona-provider-api-key-hint"), + "hint id must not appear when envVarName is omitted", + ); +}); + +test("PersonaProviderApiKeyField_two_instances_have_unique_ids_and_each_aria_describedby_resolves_to_own_hint", () => { + // Render BOTH instances in a single renderToStaticMarkup call — this + // mirrors the real nested-dialog DOM where AgentInstanceEditDialog's + // credential field and the nested AgentDefaultsDialog's field are + // simultaneously mounted under the same React root. A shared root is what + // makes React.useId() guarantee uniqueness; two separate renderToStaticMarkup + // calls each reset the counter and would produce the same ID. + const combined = renderToStaticMarkup( + React.createElement( + React.Fragment, + null, + React.createElement( + PersonaProviderApiKeyField, + makeProps({ + label: "Anthropic API Key", + envVarName: "ANTHROPIC_API_KEY", + }), + ), + React.createElement( + PersonaProviderApiKeyField, + makeProps({ + label: "OpenAI Runtime API Key", + envVarName: "OPENAI_COMPAT_API_KEY", + }), + ), + ), + ); + + // Two hint paragraph ids must be present and distinct. + const allHintIds = extractAllAttrs(combined, "id").filter((id) => + id.startsWith("persona-provider-api-key-hint-"), + ); + assert.equal(allHintIds.length, 2, "exactly two hint ids must be present"); + const [hintIdA, hintIdB] = allHintIds; + assert.notEqual(hintIdA, hintIdB, "two instances must not share a hint id"); + + // Each input's aria-describedby must match its own hint id (same order). + const allDescribedBy = extractAllAttrs(combined, "aria-describedby"); + assert.equal( + allDescribedBy.length, + 2, + "exactly two aria-describedby attributes must be present", + ); + assert.equal( + allDescribedBy[0], + hintIdA, + "instance A: aria-describedby must reference instance A's own hint", + ); + assert.equal( + allDescribedBy[1], + hintIdB, + "instance B: aria-describedby must reference instance B's own hint", + ); + + // Confirm each instance names its own env var in the rendered output. + assert.ok( + combined.includes("ANTHROPIC_API_KEY"), + "combined output must name ANTHROPIC_API_KEY", + ); + assert.ok( + combined.includes("OPENAI_COMPAT_API_KEY"), + "combined output must name OPENAI_COMPAT_API_KEY", + ); +}); diff --git a/desktop/src/features/agents/ui/PersonaProviderApiKeyField.tsx b/desktop/src/features/agents/ui/PersonaProviderApiKeyField.tsx index 17f9e2e826..2be1f1c28d 100644 --- a/desktop/src/features/agents/ui/PersonaProviderApiKeyField.tsx +++ b/desktop/src/features/agents/ui/PersonaProviderApiKeyField.tsx @@ -25,6 +25,7 @@ import { */ export function PersonaProviderApiKeyField({ disabled, + envVarName, isInherited, inheritedLabel, isRequired, @@ -33,6 +34,13 @@ export function PersonaProviderApiKeyField({ value, }: { disabled: boolean; + /** + * The backing environment variable name, e.g. `OPENAI_COMPAT_API_KEY`. + * Rendered as a monospace hint beneath the label so users can distinguish + * this field from other keys with similar names (e.g. `OPENAI_API_KEY`). + * When present, the input's `aria-describedby` points at the hint element. + */ + envVarName?: string; /** True when the key is satisfied by an inherited layer. */ isInherited: boolean; /** Human-readable source of the inherited value. */ @@ -46,13 +54,22 @@ export function PersonaProviderApiKeyField({ value: string; }) { const [showValue, setShowValue] = React.useState(false); - const inputId = "persona-provider-api-key"; + const uid = React.useId(); + const inputId = `persona-provider-api-key-${uid}`; + const hintId = envVarName + ? `persona-provider-api-key-hint-${uid}` + : undefined; return (
{label} + {envVarName ? ( +

+ {envVarName} +

+ ) : null}
{ + assert.equal(getProviderApiKeyLabel("anthropic"), "Anthropic API Key"); +}); + +test("getProviderApiKeyLabel_openai_returns_openai_runtime_label", () => { + assert.equal(getProviderApiKeyLabel("openai"), "OpenAI Runtime API Key"); +}); + +test("getProviderApiKeyLabel_openai_compat_returns_distinct_label", () => { + // openai and openai-compat must have distinct labels — both use + // OPENAI_COMPAT_API_KEY but carry different semantic identities. + assert.equal( + getProviderApiKeyLabel("openai-compat"), + "OpenAI-compatible Runtime API Key", + ); +}); + +test("getProviderApiKeyLabel_openrouter_returns_openrouter_label", () => { + // Key fix: OpenRouter was mislabeled "OpenAI API Key" before this change. + assert.equal(getProviderApiKeyLabel("openrouter"), "OpenRouter API Key"); +}); + +test("getProviderApiKeyLabel_databricks_returns_null", () => { + // Databricks uses OAuth PKCE — no typed-secret label. + assert.equal(getProviderApiKeyLabel("databricks"), null); +}); + +test("getProviderApiKeyLabel_databricks_v2_returns_null", () => { + assert.equal(getProviderApiKeyLabel("databricks_v2"), null); +}); + +test("getProviderApiKeyLabel_unknown_provider_returns_null", () => { + assert.equal(getProviderApiKeyLabel("some-unknown-provider"), null); +}); + +test("getProviderApiKeyLabel_provider_id_trimmed_and_lowercased", () => { + // Mirrors getProviderApiKeyEnvVar normalisation behaviour. + assert.equal(getProviderApiKeyLabel(" Anthropic "), "Anthropic API Key"); +}); diff --git a/desktop/src/features/agents/ui/agentConfigOptions.tsx b/desktop/src/features/agents/ui/agentConfigOptions.tsx index d51c970f29..38865ca148 100644 --- a/desktop/src/features/agents/ui/agentConfigOptions.tsx +++ b/desktop/src/features/agents/ui/agentConfigOptions.tsx @@ -63,19 +63,30 @@ export type PersonaDropdownOption = { * * `requiredEnvKeys`: keys that must be present in the agent's effective env for * the provider to work (surfaced as amber required rows in EnvVarsEditor). - * `secretEnvVar`: the one env key that holds a user-typed secret (API key). - * Only set for providers where the credential is a plaintext secret the user - * pastes in. Cleared automatically when the user switches away from the - * provider. Databricks uses OAuth PKCE (no typed secret), so it has no - * secretEnvVar. + * `secretEnvVar` + `apiKeyLabel`: paired — either both are present or neither + * is. `secretEnvVar` is the env key holding the user-typed secret; clearing + * it when the user switches providers ensures no orphaned credentials remain. + * Databricks uses OAuth PKCE (no typed secret), so it carries neither field. + * `apiKeyLabel` is the human-readable label shown in the credential field; + * derived by `getProviderApiKeyLabel` — single source of truth for all UI + * surfaces so they never drift. * * Mirrors the Rust `readiness::buzz_agent_requirements` / * `readiness::goose_requirements` logic — keep in sync. */ -export type ProviderCredentialConfig = { - requiredEnvKeys: readonly string[]; - secretEnvVar?: string; -}; +export type ProviderCredentialConfig = + | { + requiredEnvKeys: readonly string[]; + secretEnvVar?: undefined; + apiKeyLabel?: undefined; + } + | { + requiredEnvKeys: readonly string[]; + /** The env key holding the user-typed API secret. */ + secretEnvVar: string; + /** Display label for the credential input field, e.g. "Anthropic API Key". */ + apiKeyLabel: string; + }; /** * Unified provider credential config table. Single source of truth for both @@ -87,20 +98,23 @@ const PROVIDER_CREDENTIAL_CONFIG: Partial< anthropic: { requiredEnvKeys: ["ANTHROPIC_API_KEY"], secretEnvVar: "ANTHROPIC_API_KEY", + apiKeyLabel: "Anthropic API Key", }, openai: { requiredEnvKeys: ["OPENAI_COMPAT_API_KEY"], secretEnvVar: "OPENAI_COMPAT_API_KEY", + apiKeyLabel: "OpenAI Runtime API Key", }, "openai-compat": { requiredEnvKeys: ["OPENAI_COMPAT_API_KEY"], secretEnvVar: "OPENAI_COMPAT_API_KEY", + apiKeyLabel: "OpenAI-compatible Runtime API Key", }, databricks: { // DATABRICKS_TOKEN is NOT required — OAuth PKCE is the normal path. requiredEnvKeys: ["DATABRICKS_HOST"], - // No secretEnvVar: DATABRICKS_HOST is a URL, not a secret credential, and - // is not cleared on provider switch (unlike API keys). + // No secretEnvVar / apiKeyLabel: DATABRICKS_HOST is a URL, not a secret + // credential, and is not cleared on provider switch (unlike API keys). }, databricks_v2: { // DATABRICKS_TOKEN is NOT required — OAuth PKCE is the normal path. @@ -113,6 +127,7 @@ const PROVIDER_CREDENTIAL_CONFIG: Partial< openrouter: { requiredEnvKeys: ["OPENROUTER_API_KEY"], secretEnvVar: "OPENROUTER_API_KEY", + apiKeyLabel: "OpenRouter API Key", }, }; @@ -402,6 +417,31 @@ export function getProviderApiKeyEnvVar(providerId: string): string | null { ); } +/** + * Returns the display label for the provider's API key field, if any. + * Derived from PROVIDER_CREDENTIAL_CONFIG.apiKeyLabel — single source of truth + * for all credential field labels so every surface stays in sync. + * + * Returns null when the provider has no typed-secret credential (e.g., + * Databricks, which uses OAuth PKCE). + */ +export function getProviderApiKeyLabel(providerId: string): string | null { + return ( + PROVIDER_CREDENTIAL_CONFIG[providerId.trim().toLowerCase()]?.apiKeyLabel ?? + null + ); +} + +/** + * Muted contextual hint for the `OPENAI_API_KEY` row in env editors. + * Pass as `keyAnnotations` to every `EnvVarsEditor` that may surface this key + * (Agent Defaults, agent edit dialog, persona definition dialog). Exported + * so the constant is defined once and never duplicated across surfaces. + */ +export const CARD_MINT_KEY_ANNOTATIONS: Readonly> = { + OPENAI_API_KEY: "Used for minting agent trading cards", +}; + export function shouldClearKnownModelForSelectionScope({ model, provider, diff --git a/desktop/src/features/agents/ui/personaModelDiscoveryStatus.test.mjs b/desktop/src/features/agents/ui/personaModelDiscoveryStatus.test.mjs index 23d79aaf7f..548c9ccc0a 100644 --- a/desktop/src/features/agents/ui/personaModelDiscoveryStatus.test.mjs +++ b/desktop/src/features/agents/ui/personaModelDiscoveryStatus.test.mjs @@ -21,7 +21,8 @@ test("model discovery status names missing OpenAI-compatible credentials", () => ); assert.equal(status?.tone, "warning"); - assert.match(status?.message ?? "", /OpenAI API key/); + assert.match(status?.message ?? "", /OpenAI runtime API key/); + assert.match(status?.message ?? "", /OPENAI_COMPAT_API_KEY/); assert.match(status?.message ?? "", /OpenAI models/); }); diff --git a/desktop/src/features/agents/ui/personaModelDiscoveryStatus.ts b/desktop/src/features/agents/ui/personaModelDiscoveryStatus.ts index c6991fdd01..b943f6455c 100644 --- a/desktop/src/features/agents/ui/personaModelDiscoveryStatus.ts +++ b/desktop/src/features/agents/ui/personaModelDiscoveryStatus.ts @@ -110,7 +110,8 @@ export function formatModelDiscoveryErrorStatus( if (message.includes("OPENAI_COMPAT_API_KEY required")) { return { - message: "Enter an OpenAI API key to load OpenAI models.", + message: + "Enter an OpenAI runtime API key (OPENAI_COMPAT_API_KEY) to load OpenAI models.", tone: "warning", }; } diff --git a/desktop/tests/e2e/global-agent-config-screenshots.spec.ts b/desktop/tests/e2e/global-agent-config-screenshots.spec.ts index 7ec1daa236..4c72b72f75 100644 --- a/desktop/tests/e2e/global-agent-config-screenshots.spec.ts +++ b/desktop/tests/e2e/global-agent-config-screenshots.spec.ts @@ -980,4 +980,44 @@ test.describe("global agent config screenshots", () => { path: `${SHOTS}/11-edit-runtime-less-provider-required-save-blocked.png`, }); }); + + // Will's exact stuck path: databricks_v2 global provider + saved global + // OPENAI_API_KEY. The cue must be visible without opening Advanced; once + // Advanced is opened the annotation must appear on the matching row. + test("card-mint-key-cue-visible-and-annotation-in-advanced", async ({ + page, + }) => { + await installMockBridge(page, { + globalAgentConfig: { + provider: "databricks_v2", + model: null, + preferred_runtime: "buzz-agent", + env_vars: { OPENAI_API_KEY: "sk-placeholder" }, + }, + }); + + await openAiDefaultsSettings(page); + + const card = page.getByTestId("settings-global-agent-config"); + + // The cue must be visible without the user opening Advanced. + await expect(card.getByTestId("card-mint-key-cue")).toBeVisible(); + await expect(card.getByTestId("card-mint-key-cue")).toContainText( + "OPENAI_API_KEY", + ); + await expect(card.getByTestId("card-mint-key-cue")).toContainText( + "Advanced → Environment variables", + ); + + // Advanced is collapsed at this point. + const advancedToggle = card.getByTestId("global-agent-advanced-toggle"); + await expect(advancedToggle).toHaveAttribute("aria-expanded", "false"); + + // Open Advanced — the OPENAI_API_KEY row's annotation must be visible. + await advancedToggle.click(); + await expect(advancedToggle).toHaveAttribute("aria-expanded", "true"); + await expect( + card.getByText("Used for minting agent trading cards"), + ).toBeVisible(); + }); }); diff --git a/desktop/tests/e2e/persona-env-vars.spec.ts b/desktop/tests/e2e/persona-env-vars.spec.ts index 1e9b077a82..60a8e888b2 100644 --- a/desktop/tests/e2e/persona-env-vars.spec.ts +++ b/desktop/tests/e2e/persona-env-vars.spec.ts @@ -329,7 +329,7 @@ test("persona model options follow the selected LLM provider", async ({ await selectDropdownOption(page, llmProvider, "OpenAI"); const dialog = page.getByRole("dialog"); - await expect(dialog.getByLabel("OpenAI API Key")).toBeVisible(); + await expect(dialog.getByLabel("OpenAI Runtime API Key")).toBeVisible(); await expect( dialog.getByRole("button", { name: "Advanced", exact: true }), ).toHaveAttribute("aria-expanded", "false"); @@ -343,7 +343,7 @@ test("persona model options follow the selected LLM provider", async ({ await selectDropdownOption(page, llmProvider, "Anthropic"); await expect(dialog.getByLabel("Anthropic API Key")).toBeVisible(); - await expect(dialog.getByLabel("OpenAI API Key")).not.toBeVisible(); + await expect(dialog.getByLabel("OpenAI Runtime API Key")).not.toBeVisible(); await expect(model).toBeVisible(); // Switch back to inherited defaults — per-agent provider, credential, and From f865c0054b0a400657126c9321b4d4cb7d9cc746 Mon Sep 17 00:00:00 2001 From: Tyler <109685178+tlongwell-block@users.noreply.github.com> Date: Mon, 3 Aug 2026 12:08:29 -0400 Subject: [PATCH 07/27] feat(desktop): show saved Run on settings when editing an agent (#4539) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## What When editing an agent, show where it runs. The edit dialog previously showed nothing about the backend; the "Where to run" section only existed in the create flow. This adds a read-only **Run on** section to `AgentInstanceEditDialog`: - **Local agents:** "This computer". - **Provider agents (e.g. Kubernetes):** the provider id plus its saved config rows — context, namespace, image, resources, etc. — with labels humanized from the stored keys and rows in provider-schema order (locators first, request/limit pairs adjacent, alphabetical spillover for unknown providers). - Copy states these are the settings **saved at creation** and that the run location can't be changed afterwards (a new agent is required). ## Design decisions (from thread review with @Wren + @Sami) - **No provider probe on edit.** `info` is executable work, and its schema reflects the plugin *today* (including a freshly generated random namespace default) — not what this agent was deployed with. The stored record is the only honest source. - **Saved settings, not effective settings.** Optional fields a record omits (e.g. `service_account`) are defaulted by the provider at deploy time; we render only what was persisted and never synthesize today's defaults. - **Safe rendering of opaque provider config.** Values render as safe scalars only; arrays/objects degrade to a summary row (React throws on object children — a hand-edited record must not crash the dialog). Falsy-but-present values (`0`, `false`) render honestly. Secret-shaped keys are redacted using the same word-split heuristic as the create-time `validate_provider_config` gate — one definition of "looks like a secret". The gate already blocks such keys on every app write path; display-side redaction is screenshot hygiene and covers hand-edited records. - **`backendAgentId` intentionally excluded:** deploy-time runtime state written on start, not saved creation intent. - **Read-only, no form state.** The backend is immutable post-create (`UpdateManagedAgentRequest` has no backend field), so the section renders straight from `agent.backend` with no reset effect. - `ADVANCED_FIELDS_MOTION_TRANSITION` was duplicated in both agent dialogs; hoisted to `agentConfigOptions` (also keeps the edit dialog inside the file-size ratchet). ## Testing - Unit contract for `summarizeRunOn` (9 tests): scalar honesty incl. `0`/`false`, structured-value fallback, secret redaction fail-safe, preferred ordering with spillover, key humanization. - Playwright spec (4 tests, registered in the smoke project): kubernetes agent with the exact eight-key record a real create flow persisted, local agent, blox agent (`workstation_name`), and redacted secret-shaped keys from a hypothetical future provider. - `pnpm typecheck`, `pnpm check`, full `pnpm test` (3937 pass) green at this head. - Live screenshots posted in the originating Buzz thread. --------- Signed-off-by: Tyler <109685178+tlongwell-block@users.noreply.github.com> Co-authored-by: npub1qyvc0c5kl4gqv2fd97fsk46tu378sqgy35vc83rvgfwne90sel7s0ed67d <011987e296fd5006292d2f930b574be47c7801048d1983c46c425d3c95f0cffd@buzz.block.builderlab.xyz> --- desktop/playwright.config.ts | 1 + .../agents/ui/AgentDefinitionDialog.tsx | 6 +- .../agents/ui/AgentInstanceEditDialog.tsx | 9 +- .../agents/ui/RunOnSummarySection.tsx | 73 ++++++ .../features/agents/ui/agentConfigOptions.tsx | 6 + .../features/agents/ui/runOnSummary.test.mjs | 171 ++++++++++++++ .../src/features/agents/ui/runOnSummary.ts | 156 +++++++++++++ desktop/tests/e2e/edit-agent-run-on.spec.ts | 212 ++++++++++++++++++ 8 files changed, 624 insertions(+), 10 deletions(-) create mode 100644 desktop/src/features/agents/ui/RunOnSummarySection.tsx create mode 100644 desktop/src/features/agents/ui/runOnSummary.test.mjs create mode 100644 desktop/src/features/agents/ui/runOnSummary.ts create mode 100644 desktop/tests/e2e/edit-agent-run-on.spec.ts diff --git a/desktop/playwright.config.ts b/desktop/playwright.config.ts index 773c2e6bf5..8214777780 100644 --- a/desktop/playwright.config.ts +++ b/desktop/playwright.config.ts @@ -126,6 +126,7 @@ export default defineConfig({ "**/agent-provider-dropdowns.spec.ts", "**/agent-lifecycle-feedback.spec.ts", "**/agent-access-warning.spec.ts", + "**/edit-agent-run-on.spec.ts", "**/inbox-live-update.spec.ts", "**/mesh-compute.spec.ts", "**/observer-archive-policy.spec.ts", diff --git a/desktop/src/features/agents/ui/AgentDefinitionDialog.tsx b/desktop/src/features/agents/ui/AgentDefinitionDialog.tsx index 19f35165ca..1916b57069 100644 --- a/desktop/src/features/agents/ui/AgentDefinitionDialog.tsx +++ b/desktop/src/features/agents/ui/AgentDefinitionDialog.tsx @@ -32,6 +32,7 @@ import { personaBehaviorDraftValid, } from "./personaBehaviorDraft"; import { + ADVANCED_FIELDS_MOTION_TRANSITION, AUTO_MODEL_DROPDOWN_VALUE, AUTO_PROVIDER_DROPDOWN_VALUE, BLOCK_BUILD_HIDDEN_PROVIDER_IDS, @@ -118,11 +119,6 @@ export type AgentDefinitionSubmitOptions = { publishCatalogUpdates: boolean; }; -const ADVANCED_FIELDS_MOTION_TRANSITION = { - duration: 0.18, - ease: [0.23, 1, 0.32, 1], -} as const; - export function AgentDefinitionDialog({ open, title, diff --git a/desktop/src/features/agents/ui/AgentInstanceEditDialog.tsx b/desktop/src/features/agents/ui/AgentInstanceEditDialog.tsx index 48cde58aa7..d717d773e8 100644 --- a/desktop/src/features/agents/ui/AgentInstanceEditDialog.tsx +++ b/desktop/src/features/agents/ui/AgentInstanceEditDialog.tsx @@ -26,6 +26,7 @@ import { Input } from "@/shared/ui/input"; import { setManagedAgentAutoRestart } from "@/shared/api/tauriManagedAgents"; import { EditAgentAdvancedFields } from "./EditAgentAdvancedFields"; import { + ADVANCED_FIELDS_MOTION_TRANSITION, AUTO_PROVIDER_DROPDOWN_VALUE, BLOCK_BUILD_HIDDEN_PROVIDER_IDS, CUSTOM_PROVIDER_DROPDOWN_VALUE, @@ -65,6 +66,7 @@ import { AgentCreationPreview } from "./AgentCreationPreview"; import type { EnvVarsValue } from "./EnvVarsEditor"; import { useRequiredCredentialState } from "./useRequiredCredentialState"; import { CreateAgentRespondToField } from "./RespondToField"; +import { RunOnSummarySection } from "./RunOnSummarySection"; import { PersonaDropdownField } from "./PersonaDropdownField"; import { MODEL_DISCOVERY_LOADING_VALUE, @@ -93,11 +95,6 @@ import { usePendingHarnessSelection, } from "./addCustomHarness"; -const ADVANCED_FIELDS_MOTION_TRANSITION = { - duration: 0.18, - ease: [0.23, 1, 0.32, 1], -} as const; - export function AgentInstanceEditDialog({ agent, initialFocus, @@ -949,6 +946,8 @@ export function AgentInstanceEditDialog({ variant="persona" /> + + {/* Provider (runtime) */}
+ ); +} diff --git a/desktop/src/features/agents/ui/agentConfigOptions.tsx b/desktop/src/features/agents/ui/agentConfigOptions.tsx index 38865ca148..5c515a0507 100644 --- a/desktop/src/features/agents/ui/agentConfigOptions.tsx +++ b/desktop/src/features/agents/ui/agentConfigOptions.tsx @@ -30,6 +30,12 @@ export const PERSONA_FIELD_CONTROL_CLASS = export const PERSONA_LABEL_OPTIONAL_CLASS = "ml-1 text-xs font-normal text-muted-foreground/50"; +/** Shared advanced-fields expand/collapse easing for the agent dialogs. */ +export const ADVANCED_FIELDS_MOTION_TRANSITION = { + duration: 0.18, + ease: [0.23, 1, 0.32, 1], +} as const; + export const AUTO_MODEL_DROPDOWN_VALUE = "__auto_model__"; export const CUSTOM_MODEL_DROPDOWN_VALUE = "__custom_model__"; export const AUTO_PROVIDER_DROPDOWN_VALUE = "__auto_provider__"; diff --git a/desktop/src/features/agents/ui/runOnSummary.test.mjs b/desktop/src/features/agents/ui/runOnSummary.test.mjs new file mode 100644 index 0000000000..137ce5481a --- /dev/null +++ b/desktop/src/features/agents/ui/runOnSummary.test.mjs @@ -0,0 +1,171 @@ +import assert from "node:assert/strict"; +import test from "node:test"; + +import { humanizeConfigKey, summarizeRunOn } from "./runOnSummary.ts"; + +test("local backend summarizes to the local location with no rows", () => { + assert.deepEqual(summarizeRunOn({ type: "local" }), { location: "local" }); +}); + +test("provider backend carries the provider id", () => { + const summary = summarizeRunOn({ + type: "provider", + id: "kubernetes", + config: {}, + }); + assert.equal(summary.location, "provider"); + assert.equal(summary.providerId, "kubernetes"); + assert.deepEqual(summary.rows, []); +}); + +test("a saved kubernetes config renders labeled scalar rows", () => { + const summary = summarizeRunOn({ + type: "provider", + id: "kubernetes", + config: { + namespace: "buzz-agents-x7k2mp", + image: "ghcr.io/block/buzz-sprig@sha256:17facfc7", + cpu_request: "1", + inactivity_seconds: 7200, + }, + }); + assert.equal(summary.location, "provider"); + const byKey = Object.fromEntries(summary.rows.map((r) => [r.key, r])); + assert.equal(byKey.namespace.label, "Namespace"); + assert.equal(byKey.namespace.value, "buzz-agents-x7k2mp"); + assert.equal(byKey.cpu_request.label, "CPU request"); + assert.equal(byKey.cpu_request.value, "1"); + assert.equal(byKey.inactivity_seconds.label, "Inactivity seconds"); + assert.equal(byKey.inactivity_seconds.value, "7200"); + assert.equal(byKey.image.value, "ghcr.io/block/buzz-sprig@sha256:17facfc7"); + assert.ok(summary.rows.every((r) => r.redacted === false)); +}); + +test("rows follow the provider-schema preferred order, spillover alphabetical", () => { + const summary = summarizeRunOn({ + type: "provider", + id: "kubernetes", + config: { + // Deliberately shuffled persisted order. + memory_limit: "1Gi", + zeta_extra: "z", + namespace: "n", + cpu_limit: "1", + alpha_extra: "a", + image: "i", + inactivity_seconds: 7200, + cpu_request: "1", + context: "c", + memory_request: "1Gi", + }, + }); + assert.deepEqual( + summary.rows.map((r) => r.key), + [ + "context", + "namespace", + "image", + "cpu_request", + "memory_request", + "cpu_limit", + "memory_limit", + "inactivity_seconds", + "alpha_extra", + "zeta_extra", + ], + ); +}); + +test("null, empty-string, boolean, and number values all display honestly", () => { + const summary = summarizeRunOn({ + type: "provider", + id: "p", + config: { a_null: null, b_empty: "", c_flag: true, d_num: 0, e_off: false }, + }); + const values = Object.fromEntries(summary.rows.map((r) => [r.key, r.value])); + assert.equal(values.a_null, "Not set"); + assert.equal(values.b_empty, "Not set"); + assert.equal(values.c_flag, "true"); + // Falsy-but-present values must never read as missing: coerceConfigValues + // emits real numbers/booleans, so `value || fallback` would lie about 0/false. + assert.equal(values.d_num, "0"); + assert.equal(values.e_off, "false"); +}); + +test("every row value is a string — objects must never reach React children", () => { + // React throws on an object child, taking down the whole edit dialog. + // A hand-edited managed-agents.json with nested config is exactly the + // record the create-time scalar gate never saw. + const summary = summarizeRunOn({ + type: "provider", + id: "p", + config: { + resources: { limits: { cpu: "2" } }, + flag: true, + count: 3, + name: "x", + missing: null, + }, + }); + for (const row of summary.rows) { + assert.equal(typeof row.value, "string", `${row.key} is not a string`); + } +}); + +test("arrays and objects are summarized, never serialized", () => { + const summary = summarizeRunOn({ + type: "provider", + id: "p", + config: { + tolerations: [{ key: "gpu" }, { key: "spot" }], + node_selector: { disktype: "ssd" }, + }, + }); + const values = Object.fromEntries(summary.rows.map((r) => [r.key, r.value])); + assert.equal(values.tolerations, "List (2 items)"); + assert.equal(values.node_selector, "Structured value"); + // The nested content must not leak through. + assert.ok(!JSON.stringify(values).includes("ssd")); +}); + +test("secret-shaped keys are redacted, fail-safe for unknown providers", () => { + const summary = summarizeRunOn({ + type: "provider", + id: "future-provider", + config: { + api_token: "abc123", + registry_password: "hunter2", + clientSecret: "s3cr3t", + authHeader: "Bearer xyz", + privateKey: "nsec1...", + namespace: "safe-to-show", + }, + }); + const byKey = Object.fromEntries(summary.rows.map((r) => [r.key, r])); + for (const key of [ + "api_token", + "registry_password", + "clientSecret", + "authHeader", + "privateKey", + ]) { + assert.equal(byKey[key].redacted, true, `${key} must be redacted`); + assert.equal(byKey[key].value, "••••••••"); + } + assert.equal(byKey.namespace.redacted, false); + assert.equal(byKey.namespace.value, "safe-to-show"); + // Raw secret bytes must be absent from the whole summary. + const dump = JSON.stringify(summary); + for (const secret of ["abc123", "hunter2", "s3cr3t", "Bearer xyz", "nsec1"]) { + assert.ok(!dump.includes(secret), `${secret} leaked`); + } +}); + +test("humanizeConfigKey handles snake_case, camelCase, and acronyms", () => { + assert.equal(humanizeConfigKey("cpu_request"), "CPU request"); + assert.equal(humanizeConfigKey("memory_limit"), "Memory limit"); + assert.equal(humanizeConfigKey("serviceAccount"), "Service account"); + assert.equal(humanizeConfigKey("image"), "Image"); + assert.equal(humanizeConfigKey("api_url"), "API URL"); + assert.equal(humanizeConfigKey(""), ""); +}); diff --git a/desktop/src/features/agents/ui/runOnSummary.ts b/desktop/src/features/agents/ui/runOnSummary.ts new file mode 100644 index 0000000000..f37155481a --- /dev/null +++ b/desktop/src/features/agents/ui/runOnSummary.ts @@ -0,0 +1,156 @@ +import type { ManagedAgentBackend } from "@/shared/api/types"; + +/** + * A single saved provider-config row, ready to render. + * + * `value` is always a display string: scalars are stringified, `null` becomes + * an explicit "Not set", and anything non-scalar (array/object) is summarized + * rather than dumped — a generic "render every value" helper must not become + * a disclosure surface for config shapes we have never seen. + */ +export type RunOnConfigRow = { + key: string; + label: string; + value: string; + /** True when the key looks secret-shaped and the value was replaced. */ + redacted: boolean; +}; + +export type RunOnSummary = + | { location: "local" } + | { location: "provider"; providerId: string; rows: RunOnConfigRow[] }; + +/** + * Words that mark a key's value as unrenderable, checked against the same + * word-split the create-time gate uses (`validate_provider_config`, + * src-tauri managed_agents/backend.rs) so there is one definition of + * "looks like a secret", not two that drift. That gate already rejects + * secret-shaped keys on the only non-test write path to `agent.backend` — + * this display-side redaction is screenshot hygiene, not the missing + * credential fix: a value that is fine in `managed-agents.json` on the + * owner's own disk is not fine in a dialog that gets screenshotted into a + * channel or PR body, and hand-edited records never met the gate at all. + * The first five words mirror the Rust list; the rest are display-only + * extras (redacting more than create rejects fails safe). + */ +const SECRET_WORDS = new Set([ + "secret", + "password", + "token", + "key", + "credential", + "passphrase", + "auth", + "nsec", +]); + +const REDACTED_PLACEHOLDER = "••••••••"; + +/** Acronyms that read wrong in sentence case ("Cpu request"). */ +const LABEL_ACRONYMS = new Set(["cpu", "id", "url", "api"]); + +/** + * Split a config key into lowercase words on `_`, `-`, `.`, and camelCase + * boundaries, keeping acronym runs together ("APIKey" → ["api", "key"]). + * Mirrors `split_config_key` in managed_agents/backend.rs — one split feeds + * both labels and redaction, and word matching (not substring) is what + * keeps "keyboard" from being treated as a key. + */ +function splitConfigKey(key: string): string[] { + return key + .replace(/([a-z0-9])([A-Z])/g, "$1 $2") + .replace(/([A-Z]+)([A-Z][a-z])/g, "$1 $2") + .split(/[_\s.-]+/) + .filter((word) => word.length > 0) + .map((word) => word.toLowerCase()); +} + +/** + * Humanize a stored config key: `cpu_request` → "CPU request". Labels come + * from the saved keys, not a live provider probe — probing during edit is + * executable work whose schema (titles, generated defaults) reflects the + * plugin *today*, not what this agent was deployed with. See PR #4411 for + * why dialogs must not re-probe as a side effect. + */ +export function humanizeConfigKey(key: string): string { + const words = splitConfigKey(key); + if (words.length === 0) return key; + return words + .map((word, index) => { + if (LABEL_ACRONYMS.has(word)) return word.toUpperCase(); + if (index === 0) return word.charAt(0).toUpperCase() + word.slice(1); + return word; + }) + .join(" "); +} + +function displayValue(value: unknown): string { + if (value === null || value === undefined) return "Not set"; + if (typeof value === "string") return value.length > 0 ? value : "Not set"; + if (typeof value === "number" || typeof value === "boolean") + return String(value); + // Arrays/objects: summarize, never serialize. A nested structure could + // carry values its own keys would have redacted. + return Array.isArray(value) + ? `List (${value.length} items)` + : "Structured value"; +} + +/** + * Preferred display order, traced from the Kubernetes provider schema + * (crates/buzz-backend-kubernetes/src/config.rs): locate the deployment + * first (context → namespace), then what runs (image), then the + * request/limit pairs kept adjacent, then lifecycle/identity. Keys not + * listed here (other providers, future fields) spill over alphabetically + * after the known ones, so ordering stays deterministic for every record. + */ +const PREFERRED_KEY_ORDER = [ + "context", + "namespace", + "image", + "cpu_request", + "memory_request", + "cpu_limit", + "memory_limit", + "inactivity_seconds", + "service_account", +]; + +function compareKeys(a: string, b: string): number { + const ia = PREFERRED_KEY_ORDER.indexOf(a); + const ib = PREFERRED_KEY_ORDER.indexOf(b); + if (ia !== -1 && ib !== -1) return ia - ib; + if (ia !== -1) return -1; + if (ib !== -1) return 1; + return a.localeCompare(b); +} + +/** + * Project a `ManagedAgentBackend` into renderable rows. These are the + * *saved* settings — the config recorded when the agent was created — not + * the provider's effective settings: optional fields a record omits are + * defaulted by the provider at deploy time, and synthesizing today's plugin + * defaults here could show values that drifted from what actually deployed. + * (`backendAgentId` is deliberately not shown: it is deploy-time runtime + * state written on start, not saved creation intent, and this section's + * contract is the latter.) Rows follow the preferred key order with + * alphabetical spillover, so rendering is deterministic regardless of the + * JSON key order a given record happened to persist. + */ +export function summarizeRunOn(backend: ManagedAgentBackend): RunOnSummary { + if (backend.type === "local") return { location: "local" }; + const rows = Object.entries(backend.config ?? {}) + .sort(([a], [b]) => compareKeys(a, b)) + .map(([key, value]): RunOnConfigRow => { + const redacted = splitConfigKey(key).some((word) => + SECRET_WORDS.has(word), + ); + return { + key, + label: humanizeConfigKey(key), + value: redacted ? REDACTED_PLACEHOLDER : displayValue(value), + redacted, + }; + }); + return { location: "provider", providerId: backend.id, rows }; +} diff --git a/desktop/tests/e2e/edit-agent-run-on.spec.ts b/desktop/tests/e2e/edit-agent-run-on.spec.ts new file mode 100644 index 0000000000..569c735eec --- /dev/null +++ b/desktop/tests/e2e/edit-agent-run-on.spec.ts @@ -0,0 +1,212 @@ +import { expect, test } from "@playwright/test"; + +import { waitForAnimations } from "../helpers/animations"; +import { installMockBridge, TEST_IDENTITIES } from "../helpers/bridge"; + +const SHOTS = "test-results/edit-agent-run-on"; + +/** + * The exact persisted shape of a real kubernetes agent created through the + * app ("Loni" in managed-agents.json, traced by Sami in review): eight keys, + * `inactivity_seconds` a JSON number, everything else strings, and the + * optional `service_account` ABSENT — no schema default means the create + * flow never seeds it, so honest fixtures omit it too. + */ +const KUBERNETES_CONFIG = { + context: "docker-desktop", + cpu_limit: "1", + cpu_request: "1", + image: + "ghcr.io/block/buzz-sprig:sha-6530b58@sha256:17facfc7608d8ddb33bc056c9aaba1098f4ef6abe5655702fbfd7584d1f74d76", + inactivity_seconds: 7200, + memory_limit: "1Gi", + memory_request: "1Gi", + namespace: "buzz-agents-gfq7aq", +}; + +async function openEditDialog( + page: import("@playwright/test").Page, + agentName: string, +) { + await page.goto("/"); + await page.getByTestId("open-agents-view").click(); + await page + .getByRole("button", { name: `${agentName} agent profile` }) + .click(); + await page.getByTestId("user-profile-edit-agent").click(); + await expect(page.getByTestId("edit-agent-dialog")).toBeVisible(); +} + +test("editing a kubernetes agent shows its saved run-on settings", async ({ + page, +}) => { + const agent = TEST_IDENTITIES.charlie; + await installMockBridge(page, { + managedAgents: [ + { + pubkey: agent.pubkey, + name: "Remote Helper", + status: "running", + channelNames: ["general"], + respondTo: "owner-only", + backend: { + type: "provider", + id: "kubernetes", + config: KUBERNETES_CONFIG, + }, + }, + ], + }); + await openEditDialog(page, "Remote Helper"); + + const runOn = page.getByTestId("edit-agent-run-on"); + await expect(runOn).toBeVisible(); + await expect(runOn.getByTestId("edit-agent-run-on-location")).toHaveText( + "kubernetes", + ); + + // Every saved field renders as a labeled row with its stored value. + await expect(runOn.getByTestId("edit-agent-run-on-namespace")).toContainText( + "buzz-agents-gfq7aq", + ); + await expect(runOn.getByTestId("edit-agent-run-on-context")).toContainText( + "docker-desktop", + ); + await expect(runOn.getByTestId("edit-agent-run-on-image")).toContainText( + "ghcr.io/block/buzz-sprig", + ); + await expect( + runOn.getByTestId("edit-agent-run-on-cpu_request"), + ).toContainText("CPU request"); + await expect( + runOn.getByTestId("edit-agent-run-on-inactivity_seconds"), + ).toContainText("7200"); + // Real records omit the optional service_account (no schema default): the + // section must show only what was saved, never synthesize a row for it. + await expect( + runOn.getByTestId("edit-agent-run-on-service_account"), + ).toHaveCount(0); + + // The section explains immutability instead of pretending to be a form. + await expect(runOn).toContainText("can't be changed afterwards"); + + await runOn.scrollIntoViewIfNeeded(); + await waitForAnimations(page); + await page + .getByTestId("edit-agent-dialog") + .screenshot({ path: `${SHOTS}/kubernetes-run-on.png` }); +}); + +test("editing a local agent names this computer, with no config rows", async ({ + page, +}) => { + const agent = TEST_IDENTITIES.tyler; + await installMockBridge(page, { + managedAgents: [ + { + pubkey: agent.pubkey, + name: "Local Helper", + status: "stopped", + channelNames: ["general"], + respondTo: "owner-only", + backend: { type: "local" }, + }, + ], + }); + await openEditDialog(page, "Local Helper"); + + const runOn = page.getByTestId("edit-agent-run-on"); + await expect(runOn.getByTestId("edit-agent-run-on-location")).toHaveText( + "This computer", + ); + await expect(runOn.getByTestId("edit-agent-run-on-namespace")).toHaveCount(0); + + await runOn.scrollIntoViewIfNeeded(); + await waitForAnimations(page); + await page + .getByTestId("edit-agent-dialog") + .screenshot({ path: `${SHOTS}/local-run-on.png` }); +}); + +test("a blox agent's single saved field renders with a humanized label", async ({ + page, +}) => { + // The other real provider shape on developer machines: blox records + // persist exactly one key, exercising provider-generic humanization. + const agent = TEST_IDENTITIES.bob; + await installMockBridge(page, { + managedAgents: [ + { + pubkey: agent.pubkey, + name: "Blox Helper", + status: "running", + channelNames: ["general"], + respondTo: "owner-only", + backend: { + type: "provider", + id: "blox", + config: { workstation_name: "tlongwell-sprout-home" }, + }, + }, + ], + }); + await openEditDialog(page, "Blox Helper"); + + const runOn = page.getByTestId("edit-agent-run-on"); + await expect(runOn.getByTestId("edit-agent-run-on-location")).toHaveText( + "blox", + ); + const row = runOn.getByTestId("edit-agent-run-on-workstation_name"); + await expect(row).toContainText("Workstation name"); + await expect(row).toContainText("tlongwell-sprout-home"); + + await runOn.scrollIntoViewIfNeeded(); + await waitForAnimations(page); + await page + .getByTestId("edit-agent-dialog") + .screenshot({ path: `${SHOTS}/blox-run-on.png` }); +}); + +test("secret-shaped keys from an untrusted provider render redacted", async ({ + page, +}) => { + const agent = TEST_IDENTITIES.charlie; + await installMockBridge(page, { + managedAgents: [ + { + pubkey: agent.pubkey, + name: "Future Provider Agent", + status: "running", + channelNames: ["general"], + respondTo: "owner-only", + backend: { + type: "provider", + id: "some-future-provider", + config: { + endpoint: "https://provider.example", + api_token: "tok-do-not-show", + }, + }, + }, + ], + }); + await openEditDialog(page, "Future Provider Agent"); + + const runOn = page.getByTestId("edit-agent-run-on"); + await expect(runOn.getByTestId("edit-agent-run-on-endpoint")).toContainText( + "https://provider.example", + ); + const tokenRow = runOn.getByTestId("edit-agent-run-on-api_token"); + await expect(tokenRow).toContainText("••••••••"); + await expect(tokenRow).not.toContainText("tok-do-not-show"); + // The raw secret must not appear anywhere in the dialog. + await expect(page.getByTestId("edit-agent-dialog")).not.toContainText( + "tok-do-not-show", + ); + + await runOn.scrollIntoViewIfNeeded(); + await waitForAnimations(page); + await page + .getByTestId("edit-agent-dialog") + .screenshot({ path: `${SHOTS}/redacted-run-on.png` }); +}); From b0c6d6f744e63ac88a1738f0e995680c163e1d13 Mon Sep 17 00:00:00 2001 From: klopez4212 Date: Mon, 3 Aug 2026 17:26:06 +0100 Subject: [PATCH 08/27] Add channel activity hover menu (#3935) ## Summary - show relevant unread threads and active agents when hovering a channel - keep channel-level unread emphasis separate from thread activity dots - make activity rows navigate to the thread and remove demo-only data ## Test plan - `just ci` (all stages passed except the final duplicate native check, which ran out of disk after its earlier clippy pass) - `cd desktop && pnpm exec playwright test tests/e2e/channel-activity-popover.spec.ts --project=smoke` --------- Signed-off-by: kenny lopez --- desktop/playwright.config.ts | 1 + desktop/src/app/AppShell.helpers.test.mjs | 45 +- desktop/src/app/AppShell.helpers.ts | 35 + desktop/src/app/AppShell.tsx | 102 +-- desktop/src/app/AppShellContext.tsx | 41 +- .../app/useChannelActivityProjection.test.mjs | 30 + .../src/app/useChannelActivityProjection.ts | 145 ++++ .../channels/forcedUnreadStore.test.mjs | 55 ++ .../features/channels/forcedUnreadStore.ts | 137 ++- .../features/channels/ui/ChannelScreen.tsx | 22 +- .../ui/useChannelOpenReadState.test.mjs | 25 + .../channels/ui/useChannelOpenReadState.ts | 45 + .../channels/ui/useChannelUnreadState.ts | 27 +- .../features/channels/unreadChannelCounts.ts | 13 + .../channels/unreadReadMarker.test.mjs | 25 + .../channels/useChannelPaneHandlers.ts | 14 +- .../features/channels/useUnreadChannels.ts | 140 +-- .../communities/communityUnreadObserver.ts | 5 +- desktop/src/features/home/ui/HomeView.tsx | 12 + .../home/useHomeInboxReadState.test.mjs | 42 + .../features/home/useHomeInboxReadState.ts | 65 +- .../lib/useActiveWorkingChannelsById.ts | 14 +- .../sidebar/ui/ChannelActivityPopover.tsx | 448 ++++++++++ .../sidebar/ui/ChannelContextMenu.tsx | 32 +- .../features/sidebar/ui/SidebarSection.tsx | 54 +- .../src/shared/styles/globals/scrollbars.css | 21 + desktop/tests/e2e/badge.spec.ts | 85 +- .../e2e/channel-activity-popover.spec.ts | 795 ++++++++++++++++++ desktop/tests/e2e/channel-mute.spec.ts | 10 +- desktop/tests/e2e/thread-unread.spec.ts | 21 +- desktop/tests/e2e/unread-pill.spec.ts | 9 +- 31 files changed, 2304 insertions(+), 211 deletions(-) create mode 100644 desktop/src/app/useChannelActivityProjection.test.mjs create mode 100644 desktop/src/app/useChannelActivityProjection.ts create mode 100644 desktop/src/features/channels/forcedUnreadStore.test.mjs create mode 100644 desktop/src/features/channels/ui/useChannelOpenReadState.test.mjs create mode 100644 desktop/src/features/channels/ui/useChannelOpenReadState.ts create mode 100644 desktop/src/features/sidebar/ui/ChannelActivityPopover.tsx create mode 100644 desktop/tests/e2e/channel-activity-popover.spec.ts diff --git a/desktop/playwright.config.ts b/desktop/playwright.config.ts index 8214777780..796fdede1e 100644 --- a/desktop/playwright.config.ts +++ b/desktop/playwright.config.ts @@ -41,6 +41,7 @@ export default defineConfig({ "**/channel-mute.spec.ts", "**/channel-star.spec.ts", "**/channel-controls.spec.ts", + "**/channel-activity-popover.spec.ts", "**/active-turn-resilience.spec.ts", "**/profile-active-turn.spec.ts", "**/config-bridge-screenshots.spec.ts", diff --git a/desktop/src/app/AppShell.helpers.test.mjs b/desktop/src/app/AppShell.helpers.test.mjs index 73505d1798..fa06232923 100644 --- a/desktop/src/app/AppShell.helpers.test.mjs +++ b/desktop/src/app/AppShell.helpers.test.mjs @@ -1,7 +1,10 @@ import assert from "node:assert/strict"; import test from "node:test"; -import { shouldBounceForChannelNotification } from "./AppShell.helpers.ts"; +import { + markAllReadSources, + shouldBounceForChannelNotification, +} from "./AppShell.helpers.ts"; test("shouldBounceForChannelNotification_allowsTopLevelChannelMessages", () => { assert.equal(shouldBounceForChannelNotification([["h", "channel"]]), true); @@ -27,3 +30,43 @@ test("shouldBounceForChannelNotification_allowsBroadcastReplies", () => { true, ); }); + +test("markAllReadSources clears Inbox overrides and active thread activity", () => { + const calls = []; + + markAllReadSources({ + activeChannelId: "active-channel", + channelActivityItems: [ + { channelId: "another-channel", createdAt: 100 }, + { channelId: "active-channel", createdAt: 200 }, + { channelId: "active-channel", createdAt: 300 }, + ], + unreadFeedItemIds: new Set(["first-inbox-item", "second-inbox-item"]), + undoUnreadFeedItem: (itemId) => calls.push(`inbox:${itemId}`), + markAllChannelReadMarkers: () => calls.push("channels"), + markActiveChannelRead: (channelId, createdAt) => + calls.push(`active:${channelId}:${createdAt}`), + }); + + assert.deepEqual(calls, [ + "inbox:first-inbox-item", + "inbox:second-inbox-item", + "channels", + "active:active-channel:300", + ]); +}); + +test("markAllReadSources skips the active marker without projected activity", () => { + const calls = []; + + markAllReadSources({ + activeChannelId: "active-channel", + channelActivityItems: [], + unreadFeedItemIds: new Set(), + undoUnreadFeedItem: () => calls.push("inbox"), + markAllChannelReadMarkers: () => calls.push("channels"), + markActiveChannelRead: () => calls.push("active"), + }); + + assert.deepEqual(calls, ["channels"]); +}); diff --git a/desktop/src/app/AppShell.helpers.ts b/desktop/src/app/AppShell.helpers.ts index b0ce894931..dd6b9195e8 100644 --- a/desktop/src/app/AppShell.helpers.ts +++ b/desktop/src/app/AppShell.helpers.ts @@ -86,6 +86,41 @@ export function shouldBounceForChannelNotification(tags: string[][]): boolean { return !isThreadReply(tags); } +export function markAllReadSources({ + activeChannelId, + channelActivityItems, + markAllChannelReadMarkers, + markActiveChannelRead, + undoUnreadFeedItem, + unreadFeedItemIds, +}: { + activeChannelId: string | null; + channelActivityItems: ReadonlyArray<{ + channelId: string | null; + createdAt: number; + }>; + markAllChannelReadMarkers: () => void; + markActiveChannelRead: (channelId: string, createdAt: number) => void; + undoUnreadFeedItem: (itemId: string) => void; + unreadFeedItemIds: ReadonlySet; +}) { + for (const itemId of unreadFeedItemIds) { + undoUnreadFeedItem(itemId); + } + markAllChannelReadMarkers(); + + if (!activeChannelId) return; + + let latestActivityAt: number | null = null; + for (const item of channelActivityItems) { + if (item.channelId !== activeChannelId) continue; + latestActivityAt = Math.max(latestActivityAt ?? 0, item.createdAt); + } + if (latestActivityAt !== null) { + markActiveChannelRead(activeChannelId, latestActivityAt); + } +} + export function toSearchHit( target: DesktopNotificationTarget, ): SearchHit | null { diff --git a/desktop/src/app/AppShell.tsx b/desktop/src/app/AppShell.tsx index 4eb0a42bbe..46e06b2f9f 100644 --- a/desktop/src/app/AppShell.tsx +++ b/desktop/src/app/AppShell.tsx @@ -1,7 +1,7 @@ import * as React from "react"; import { useQueryClient } from "@tanstack/react-query"; import { Outlet, useLocation } from "@tanstack/react-router"; -import { deriveShellRoute } from "@/app/AppShell.helpers"; +import { deriveShellRoute, markAllReadSources } from "@/app/AppShell.helpers"; import { AppShellProvider } from "@/app/AppShellContext"; import * as BuzzTheme from "@/app/BuzzThemeSurfaces"; import { AppShellOverlays } from "@/app/AppShellOverlays"; @@ -15,7 +15,7 @@ import { useMarkAsReadShortcuts } from "@/app/useMarkAsReadShortcuts"; import { useSettingsShortcuts } from "@/app/useSettingsShortcuts"; import { useAppShellDesktopNotifications } from "@/app/useAppShellDesktopNotifications"; import { useAppShellLifecycleEffects } from "@/app/useAppShellLifecycleEffects"; -import { useThreadActivityFeedItems } from "@/app/useThreadActivityFeedItems"; +import { useChannelActivityProjection } from "@/app/useChannelActivityProjection"; import { useTauriWindowDrag } from "@/app/useTauriWindowDrag"; import { useWebviewZoomShortcuts } from "@/app/useWebviewZoomShortcuts"; import { @@ -26,7 +26,6 @@ import { useOpenDmMutation, } from "@/features/channels/hooks"; import { useUnreadChannels } from "@/features/channels/useUnreadChannels"; -import { msgContextKey } from "@/features/channels/readState/readStateFormat"; import { useMembershipNotifications } from "@/features/channels/useMembershipNotifications"; import { useFeedItemState } from "@/features/home/useFeedItemState"; import { useThreadFollows } from "@/features/messages/lib/useThreadFollows"; @@ -324,10 +323,12 @@ export function AppShell() { } = useThreadFollows(identityQuery.data?.pubkey); const { - markAllChannelsRead, + markAllChannelsRead: markAllChannelReadMarkers, markChannelRead, markChannelUnread, + clearChannelUnreadSource, unreadChannelIds, + topLevelUnreadChannelIds, unreadChannelCounts, highPriorityUnreadChannelIds, unreadChannelNotificationCount, @@ -338,6 +339,7 @@ export function AppShell() { participatedRootIds, authoredRootIds, mentionedRootIds, + recordThreadInteraction, threadActivityItems, mutedRootIds, muteThread, @@ -356,55 +358,45 @@ export function AppShell() { followedRootIds, }); - const getThreadReadAt = React.useCallback( - (rootId: string, channelId?: string | null) => { - const threadReadAt = getOwnReadAt(`thread:${rootId}`); - if (!channelId) { - return threadReadAt; - } - - const channelReadAt = getChannelReadAt(channelId); - if (threadReadAt === null) { - return channelReadAt; - } - if (channelReadAt === null) { - return threadReadAt; - } - return Math.max(threadReadAt, channelReadAt); - }, - [getChannelReadAt, getOwnReadAt], - ); - - const markThreadRead = React.useCallback( - (rootId: string, timestamp: number) => { - markChannelRead( - `thread:${rootId}`, - new Date(timestamp * 1_000).toISOString(), - ); - }, - [markChannelRead], - ); - - // Per-message read frontier (LP4 v3): effective(msg:) folds through the - // channel, so a channel-read clears messages older than the top-level frontier. - const getMessageReadAt = React.useCallback( - (messageId: string) => getChannelReadAt(msgContextKey(messageId)), - [getChannelReadAt], - ); - const markMessageRead = React.useCallback( - (messageId: string, timestamp: number) => - markChannelRead( - msgContextKey(messageId), - new Date(timestamp * 1_000).toISOString(), - ), - [markChannelRead], - ); - const threadActivityFeedItems = useThreadActivityFeedItems( + const { + getThreadReadAt, + markThreadRead, + getMessageReadAt, + getChannelActivityItemReadAt, + markMessageRead, + threadActivityFeedItems, + locallyUnreadFeedItems, + unreadThreadFeedItems, + unreadThreadChannelIds, + } = useChannelActivityProjection({ + channels, + feed: homeFeedQuery.data?.feed, + unreadFeedItemIds: feedItemState.unreadSet, + getChannelReadAt, + getOwnReadAt, + markChannelRead, + readStateVersion, threadActivityItems, mutedRootIds, - channels, - ); - + }); + const markAllChannelsRead = React.useCallback(() => { + markAllReadSources({ + activeChannelId: activeChannel?.id ?? null, + channelActivityItems: unreadThreadFeedItems, + markAllChannelReadMarkers, + markActiveChannelRead: (channelId, createdAt) => + markChannelRead(channelId, new Date(createdAt * 1_000).toISOString()), + undoUnreadFeedItem: feedItemState.undoUnread, + unreadFeedItemIds: feedItemState.unreadSet, + }); + }, [ + activeChannel?.id, + feedItemState.undoUnread, + feedItemState.unreadSet, + markAllChannelReadMarkers, + markChannelRead, + unreadThreadFeedItems, + ]); // Badge count consumes the shared NIP-RS read-state from useUnreadChannels. const { homeBadgeCount, homeBadgeCountExcludingHighPriority } = useHomeFeedNotificationState( @@ -709,6 +701,7 @@ export function AppShell() { markAllChannelsRead, markChannelRead, markChannelUnread, + clearChannelUnreadSource, openBrowseChannels: handleOpenBrowseChannels, openCreateChannel: handleOpenCreateChannel, openChannelManagement: (channelId?: string) => { @@ -721,6 +714,7 @@ export function AppShell() { getThreadReadAt, markThreadRead, getMessageReadAt, + getChannelActivityItemReadAt, markMessageRead, readStateVersion, setContextParentResolver, @@ -728,9 +722,15 @@ export function AppShell() { unfollowThread: handleUnfollowThread, isFollowingThread, isNotifiedForThread, + recordThreadInteraction, isThreadMuted: (rootId) => mutedRootIds.has(rootId), threadActivityItems, threadActivityFeedItems, + locallyUnreadFeedItems, + unreadThreadFeedItems, + unreadThreadChannelIds, + topLevelUnreadChannelIds, + hasSidebarUnreadProjections: true, feedItemState, onOpenSettings: handleOpenSettings, }} diff --git a/desktop/src/app/AppShellContext.tsx b/desktop/src/app/AppShellContext.tsx index 4a64de0cb2..b909436178 100644 --- a/desktop/src/app/AppShellContext.tsx +++ b/desktop/src/app/AppShellContext.tsx @@ -1,4 +1,5 @@ import * as React from "react"; +import type { ForcedUnreadSource } from "@/features/channels/forcedUnreadStore"; import type { ContextParentResolver } from "@/features/channels/readState/readStateManager"; import type { ThreadActivityItem } from "@/features/channels/useUnreadChannels"; import type { FeedItemState } from "@/features/home/useFeedItemState"; @@ -12,9 +13,16 @@ type AppShellContextValue = { markChannelRead: ( channelId: string, readAt: string | null | undefined, - options?: { topLevelOnly?: boolean }, + options?: { + preserveForcedUnread?: boolean; + topLevelOnly?: boolean; + }, + ) => void; + markChannelUnread: (channelId: string, source?: ForcedUnreadSource) => void; + clearChannelUnreadSource: ( + channelId: string, + source: ForcedUnreadSource, ) => void; - markChannelUnread: (channelId: string) => void; openBrowseChannels: () => void; openCreateChannel: () => void; openChannelManagement: (channelId?: string) => void; @@ -31,6 +39,11 @@ type AppShellContextValue = { // read. Uses `msg:` context keys folded through the active channel by the // parent resolver (LP4 v3 per-message badge model). getMessageReadAt: (messageId: string) => number | null; + // Read frontier for a channel-activity item, scoped to that item's own + // message and channel rather than the currently mounted channel resolver. + getChannelActivityItemReadAt: ( + item: Pick, + ) => number | null; // Advance a single message's read marker to the given unix-seconds timestamp. markMessageRead: (messageId: string, timestamp: number) => void; // Bump-counter that invalidates whenever the read marker changes. Include @@ -43,9 +56,25 @@ type AppShellContextValue = { unfollowThread: (rootId: string) => void; isFollowingThread: (rootId: string) => boolean; isNotifiedForThread: (rootId: string) => boolean; + recordThreadInteraction: (rootId: string) => void; isThreadMuted: (rootId: string) => boolean; threadActivityItems: ThreadActivityItem[]; threadActivityFeedItems: FeedItem[]; + // Home-feed items explicitly reopened from Inbox. Kept separate from live + // thread activity so older rows can be projected into channel hover cards + // without duplicating the Home feed itself. + locallyUnreadFeedItems: FeedItem[]; + // Thread rows that remain unread until their own message/thread marker is + // advanced. Unlike the broad channel unread set, this includes the active + // channel so simply landing in it does not hide the wayfinding signal. + unreadThreadFeedItems: FeedItem[]; + unreadThreadChannelIds: ReadonlySet; + // Ordinary unread channel-level activity. Sidebar rows use this for text + // emphasis only; thread activity owns the dot. + topLevelUnreadChannelIds: ReadonlySet; + // Lets isolated component tests retain the legacy hasUnread fallback while + // the mounted shell uses the split projections above. + hasSidebarUnreadProjections: boolean; feedItemState: FeedItemState; // Open the Settings panel at the given section. Available on all surfaces // that render under AppShell (channel, home, projects, pulse, agents). @@ -57,6 +86,7 @@ const AppShellContext = React.createContext({ markAllChannelsRead: () => {}, markChannelRead: () => {}, markChannelUnread: () => {}, + clearChannelUnreadSource: () => {}, openBrowseChannels: () => {}, openCreateChannel: () => {}, openChannelManagement: () => {}, @@ -64,6 +94,7 @@ const AppShellContext = React.createContext({ getThreadReadAt: () => null, markThreadRead: () => {}, getMessageReadAt: () => null, + getChannelActivityItemReadAt: () => null, markMessageRead: () => {}, readStateVersion: 0, setContextParentResolver: () => {}, @@ -71,9 +102,15 @@ const AppShellContext = React.createContext({ unfollowThread: () => {}, isFollowingThread: () => false, isNotifiedForThread: () => false, + recordThreadInteraction: () => {}, isThreadMuted: () => false, threadActivityItems: [], threadActivityFeedItems: [], + locallyUnreadFeedItems: [], + unreadThreadFeedItems: [], + unreadThreadChannelIds: EMPTY_SET, + topLevelUnreadChannelIds: EMPTY_SET, + hasSidebarUnreadProjections: false, feedItemState: { doneSet: EMPTY_SET, markDone: () => {}, diff --git a/desktop/src/app/useChannelActivityProjection.test.mjs b/desktop/src/app/useChannelActivityProjection.test.mjs new file mode 100644 index 0000000000..6b54f32246 --- /dev/null +++ b/desktop/src/app/useChannelActivityProjection.test.mjs @@ -0,0 +1,30 @@ +import assert from "node:assert/strict"; +import test from "node:test"; + +import { resolveChannelActivityFeedItemReadAt } from "./useChannelActivityProjection.ts"; + +test("channel activity read state folds the item's own message and channel markers", () => { + const markers = new Map([ + ["msg:reply-general", 100], + ["general", 200], + ["random", 500], + ]); + + assert.equal( + resolveChannelActivityFeedItemReadAt( + { id: "reply-general", channelId: "general" }, + (contextId) => markers.get(contextId) ?? null, + ), + 200, + ); +}); + +test("channel activity read state honors a channel marker without a message marker", () => { + assert.equal( + resolveChannelActivityFeedItemReadAt( + { id: "reply-general", channelId: "general" }, + (contextId) => (contextId === "general" ? 300 : null), + ), + 300, + ); +}); diff --git a/desktop/src/app/useChannelActivityProjection.ts b/desktop/src/app/useChannelActivityProjection.ts new file mode 100644 index 0000000000..b1961318ce --- /dev/null +++ b/desktop/src/app/useChannelActivityProjection.ts @@ -0,0 +1,145 @@ +import * as React from "react"; + +import { useThreadActivityFeedItems } from "@/app/useThreadActivityFeedItems"; +import { + maxReadAt, + msgContextKey, +} from "@/features/channels/readState/readStateFormat"; +import type { ThreadActivityItem } from "@/features/channels/useUnreadChannels"; +import { isThreadReply } from "@/features/messages/lib/threading"; +import type { Channel, FeedItem, HomeFeed } from "@/shared/api/types"; + +type ReadTimestamp = (contextKey: string) => number | null; +type MarkChannelRead = ( + contextKey: string, + readAt: string | null | undefined, + options?: { topLevelOnly?: boolean }, +) => void; + +type UseChannelActivityProjectionOptions = { + channels: Channel[]; + feed: HomeFeed | undefined; + unreadFeedItemIds: ReadonlySet; + getChannelReadAt: ReadTimestamp; + getOwnReadAt: ReadTimestamp; + markChannelRead: MarkChannelRead; + readStateVersion: number; + threadActivityItems: ThreadActivityItem[]; + mutedRootIds: ReadonlySet; +}; + +export function resolveChannelActivityFeedItemReadAt( + item: Pick, + getOwnReadAt: ReadTimestamp, +): number | null { + return maxReadAt( + getOwnReadAt(msgContextKey(item.id)), + item.channelId ? getOwnReadAt(item.channelId) : null, + ); +} + +export function useChannelActivityProjection({ + channels, + feed, + unreadFeedItemIds, + getChannelReadAt, + getOwnReadAt, + markChannelRead, + readStateVersion, + threadActivityItems, + mutedRootIds, +}: UseChannelActivityProjectionOptions) { + const getThreadReadAt = React.useCallback( + (rootId: string, channelId?: string | null) => { + const threadReadAt = getOwnReadAt(`thread:${rootId}`); + if (!channelId) return threadReadAt; + + const channelReadAt = getChannelReadAt(channelId); + if (threadReadAt === null) return channelReadAt; + if (channelReadAt === null) return threadReadAt; + return Math.max(threadReadAt, channelReadAt); + }, + [getChannelReadAt, getOwnReadAt], + ); + const markThreadRead = React.useCallback( + (rootId: string, timestamp: number) => + markChannelRead( + `thread:${rootId}`, + new Date(timestamp * 1_000).toISOString(), + ), + [markChannelRead], + ); + const getMessageReadAt = React.useCallback( + (messageId: string) => getChannelReadAt(msgContextKey(messageId)), + [getChannelReadAt], + ); + const getChannelActivityItemReadAt = React.useCallback( + (item: Pick) => + resolveChannelActivityFeedItemReadAt(item, getOwnReadAt), + [getOwnReadAt], + ); + const markMessageRead = React.useCallback( + (messageId: string, timestamp: number) => + markChannelRead( + msgContextKey(messageId), + new Date(timestamp * 1_000).toISOString(), + ), + [markChannelRead], + ); + const threadActivityFeedItems = useThreadActivityFeedItems( + threadActivityItems, + mutedRootIds, + channels, + ); + const locallyUnreadFeedItems = React.useMemo(() => { + if (!feed || unreadFeedItemIds.size === 0) return []; + return [ + ...feed.mentions, + ...feed.needsAction, + ...feed.activity, + ...feed.agentActivity, + ].filter((item) => unreadFeedItemIds.has(item.id)); + }, [feed, unreadFeedItemIds]); + const unreadThreadFeedItems = React.useMemo(() => { + void readStateVersion; + const candidatesById = new Map( + threadActivityFeedItems.map((item) => [item.id, item]), + ); + for (const item of locallyUnreadFeedItems) + candidatesById.set(item.id, item); + + return [...candidatesById.values()].filter( + (item) => + isThreadReply(item.tags) && + (unreadFeedItemIds.has(item.id) || + item.createdAt > (getChannelActivityItemReadAt(item) ?? 0)), + ); + }, [ + getChannelActivityItemReadAt, + locallyUnreadFeedItems, + readStateVersion, + threadActivityFeedItems, + unreadFeedItemIds, + ]); + const unreadThreadChannelIds = React.useMemo( + () => + new Set( + unreadThreadFeedItems.flatMap((item) => + item.channelId ? [item.channelId] : [], + ), + ) as ReadonlySet, + [unreadThreadFeedItems], + ); + + return { + getThreadReadAt, + markThreadRead, + getMessageReadAt, + getChannelActivityItemReadAt, + markMessageRead, + threadActivityFeedItems, + locallyUnreadFeedItems, + unreadThreadFeedItems, + unreadThreadChannelIds, + }; +} diff --git a/desktop/src/features/channels/forcedUnreadStore.test.mjs b/desktop/src/features/channels/forcedUnreadStore.test.mjs new file mode 100644 index 0000000000..cea1c3babe --- /dev/null +++ b/desktop/src/features/channels/forcedUnreadStore.test.mjs @@ -0,0 +1,55 @@ +import assert from "node:assert/strict"; +import test from "node:test"; + +import { + addForcedUnreadSource, + forcedUnreadMarker, + removeForcedUnreadSource, +} from "./forcedUnreadStore.ts"; + +test("adding an Inbox owner preserves an existing manual force", () => { + const entry = addForcedUnreadSource(null, 120, "inbox"); + + assert.deepEqual(entry, { + markerAtWhenForced: null, + sources: ["manual", "inbox"], + }); +}); + +test("clearing Inbox ownership leaves a manual force intact", () => { + const entry = { + markerAtWhenForced: 120, + sources: ["manual", "inbox"], + }; + + assert.deepEqual(removeForcedUnreadSource(entry, "inbox"), { + markerAtWhenForced: 120, + sources: ["manual"], + }); +}); + +test("clearing manual ownership leaves an Inbox force intact", () => { + const entry = { + markerAtWhenForced: 120, + sources: ["manual", "inbox"], + }; + + assert.deepEqual(removeForcedUnreadSource(entry, "manual"), { + markerAtWhenForced: 120, + sources: ["inbox"], + }); +}); + +test("clearing the only force owner removes the entry", () => { + const entry = { + markerAtWhenForced: 120, + sources: ["inbox"], + }; + + assert.equal(removeForcedUnreadSource(entry, "inbox"), undefined); +}); + +test("legacy persisted entries retain their read-marker baseline", () => { + assert.equal(forcedUnreadMarker(120), 120); + assert.equal(forcedUnreadMarker(null), null); +}); diff --git a/desktop/src/features/channels/forcedUnreadStore.ts b/desktop/src/features/channels/forcedUnreadStore.ts index c6a6fd0758..c4c25dcecb 100644 --- a/desktop/src/features/channels/forcedUnreadStore.ts +++ b/desktop/src/features/channels/forcedUnreadStore.ts @@ -1,14 +1,17 @@ +import * as React from "react"; + /** - * Per-pubkey localStorage record store for channels manually marked unread via - * right-click → "mark unread". Keyed by channelId (not thread-root). Persisted - * so the sidebar badge survives reload and the rail observer can read it for - * inactive communities. + * Per-pubkey localStorage record store for channels forced unread by manual or + * Inbox actions. Keyed by channelId (not thread-root). Persisted so the sidebar + * badge survives reload and the rail observer can read it for inactive + * communities. * * Each entry stores the channel's own NIP-RS read marker (unix seconds) at the - * moment mark-unread was invoked, or null if no marker existed yet. The rail - * observer gates the forced-unread OR on this baseline: if the observed synced - * read marker has since advanced past markerAtWhenForced, the cross-device read - * wins and the dot is not lit. + * moment the first force was added, or null if no marker existed yet, plus the + * sources that currently own the force. The rail observer gates the + * forced-unread OR on this baseline: if the observed synced read marker has + * since advanced past markerAtWhenForced, the cross-device read wins and the + * dot is not lit. * * On identity change, the in-memory map is swapped to the current pubkey's * persisted data. Old pubkey data is NOT wiped from localStorage. @@ -17,8 +20,58 @@ * a retrograde "unread" state. localStorage is best-effort (per-device). */ -/** channelId → NIP-RS read marker (unix seconds) at force-time, or null */ -export type ForcedUnreadMap = Record; +export type ForcedUnreadSource = "inbox" | "manual"; +export type ForcedUnreadEntry = + | number + | null + | { + markerAtWhenForced: number | null; + sources: ForcedUnreadSource[]; + }; +/** channelId → forced-unread entry. Numbers/null are the legacy v1 shape. */ +export type ForcedUnreadMap = Record; + +function entrySources(entry: ForcedUnreadEntry): ForcedUnreadSource[] { + return typeof entry === "object" && entry !== null + ? entry.sources + : ["manual"]; +} + +export function forcedUnreadMarker(entry: ForcedUnreadEntry): number | null { + return typeof entry === "object" && entry !== null + ? entry.markerAtWhenForced + : entry; +} + +export function addForcedUnreadSource( + entry: ForcedUnreadEntry | undefined, + markerAtWhenForced: number | null, + source: ForcedUnreadSource, +): ForcedUnreadEntry { + if (entry !== undefined && entrySources(entry).includes(source)) return entry; + return { + markerAtWhenForced: + entry === undefined ? markerAtWhenForced : forcedUnreadMarker(entry), + sources: [ + ...new Set([...(entry === undefined ? [] : entrySources(entry)), source]), + ], + }; +} + +export function removeForcedUnreadSource( + entry: ForcedUnreadEntry, + source: ForcedUnreadSource, +): ForcedUnreadEntry | undefined { + const sources = entrySources(entry); + if (!sources.includes(source)) return entry; + const remainingSources = sources.filter((candidate) => candidate !== source); + return remainingSources.length > 0 + ? { + markerAtWhenForced: forcedUnreadMarker(entry), + sources: remainingSources, + } + : undefined; +} const STORAGE_PREFIX = "buzz-forced-unread.v1"; const storageKey = (pubkey: string) => `${STORAGE_PREFIX}:${pubkey}`; @@ -37,8 +90,27 @@ export const forcedUnreadStore = { return {}; const result: ForcedUnreadMap = {}; for (const [k, v] of Object.entries(parsed)) { - if (typeof k === "string" && (v === null || typeof v === "number")) { - result[k] = v as number | null; + if (typeof k !== "string") continue; + if (v === null || typeof v === "number") { + result[k] = v; + continue; + } + if ( + typeof v === "object" && + v !== null && + "markerAtWhenForced" in v && + (v.markerAtWhenForced === null || + typeof v.markerAtWhenForced === "number") && + "sources" in v && + Array.isArray(v.sources) + ) { + const sources = v.sources.filter( + (source: unknown): source is ForcedUnreadSource => + source === "inbox" || source === "manual", + ); + if (sources.length > 0) { + result[k] = { markerAtWhenForced: v.markerAtWhenForced, sources }; + } } } return result; @@ -54,3 +126,44 @@ export const forcedUnreadStore = { } }, }; + +export function useForcedUnreadActions( + forcedUnreadRef: React.MutableRefObject, + getOwnTimestamp: (channelId: string) => number | null, + pubkey: string | undefined, + onChange: () => void, +) { + const persist = React.useCallback(() => { + if (pubkey) forcedUnreadStore.write(pubkey, forcedUnreadRef.current); + onChange(); + }, [forcedUnreadRef, onChange, pubkey]); + const markChannelUnread = React.useCallback( + (channelId: string, source: ForcedUnreadSource = "manual") => { + const current = Object.hasOwn(forcedUnreadRef.current, channelId) + ? forcedUnreadRef.current[channelId] + : undefined; + const next = addForcedUnreadSource( + current, + getOwnTimestamp(channelId), + source, + ); + if (next === current) return; + forcedUnreadRef.current[channelId] = next; + persist(); + }, + [forcedUnreadRef, getOwnTimestamp, persist], + ); + const clearChannelUnreadSource = React.useCallback( + (channelId: string, source: ForcedUnreadSource) => { + if (!Object.hasOwn(forcedUnreadRef.current, channelId)) return; + const current = forcedUnreadRef.current[channelId]; + const next = removeForcedUnreadSource(current, source); + if (next === current) return; + if (next === undefined) delete forcedUnreadRef.current[channelId]; + else forcedUnreadRef.current[channelId] = next; + persist(); + }, + [forcedUnreadRef, persist], + ); + return { clearChannelUnreadSource, markChannelUnread }; +} diff --git a/desktop/src/features/channels/ui/ChannelScreen.tsx b/desktop/src/features/channels/ui/ChannelScreen.tsx index b4d33b4776..3e3b6c9c8f 100644 --- a/desktop/src/features/channels/ui/ChannelScreen.tsx +++ b/desktop/src/features/channels/ui/ChannelScreen.tsx @@ -80,6 +80,7 @@ import { useMessageProfiles } from "./useMessageProfiles"; import { useChannelPanelHistoryState } from "./useChannelPanelHistoryState"; import { useChannelProfilePanel } from "./useChannelProfilePanel"; import { useChannelRouteTarget } from "./useChannelRouteTarget"; +import { useChannelOpenReadState } from "./useChannelOpenReadState"; import { useChannelUnreadState } from "./useChannelUnreadState"; import type { ChannelScreenProps } from "./ChannelScreen.types"; const HEADER_ACTIONS_COMPACT_BREAKPOINT_PX = 760, @@ -99,7 +100,7 @@ export function ChannelScreen({ const { goHome } = useAppNavigation(); const { activeCommunity } = useCommunities(); const { - markChannelRead, + clearChannelUnreadSource, markChannelUnread, getChannelReadAt, getMessageReadAt, @@ -112,6 +113,7 @@ export function ChannelScreen({ unfollowThread, isFollowingThread, isNotifiedForThread, + recordThreadInteraction, isThreadMuted, readStateVersion, } = useAppShell(); @@ -207,12 +209,11 @@ export function ChannelScreen({ const activeReadAt = latestActiveMessage ? new Date(latestActiveMessage.created_at * 1_000).toISOString() : null; - React.useEffect(() => { - if (!activeChannelId || activeChannel?.isMember === false) { - return; - } - markChannelRead(activeChannelId, activeReadAt, { topLevelOnly: true }); - }, [activeChannel?.isMember, activeChannelId, activeReadAt, markChannelRead]); + useChannelOpenReadState( + activeChannelId, + activeChannel?.isMember, + activeReadAt, + ); React.useEffect(() => { if (!activeChannelId) { setContextParentResolver(null); @@ -262,7 +263,6 @@ export function ChannelScreen({ resolvedMessages, threadReplyEvents, ); - const messageEventProfilePubkeys = useMessageEventProfilePubkeys( resolvedMessages, threadReplyEvents, @@ -472,6 +472,7 @@ export function ChannelScreen({ threadReplyTargetId, expandedThreadReplyIds, openThreadMessages: threadPanelData.visibleReplies, + clearChannelUnreadSource, getChannelReadAt, getMessageReadAt, markChannelUnread, @@ -484,8 +485,7 @@ export function ChannelScreen({ timelineMessages.find((message) => message.id === editTargetId) ?? null, [editTargetId, timelineMessages], ); - // Event id awaiting the empty-edit "Delete message?" confirmation (non-null - // while the dialog is open); see handleEditSave. + // Event id awaiting the empty-edit deletion confirmation. const [emptyDeleteId, setEmptyDeleteId] = React.useState(null); const { handleCancelEdit, @@ -508,6 +508,7 @@ export function ChannelScreen({ getFirstReplyIdForMessage, getReplyDescendantIdsForMessage, markRevealedRepliesRead, + recordThreadInteraction, openThreadHeadId: effectiveOpenThreadHeadId, onOptimisticOpenThreadHeadIdChange: setOptimisticOpenThreadHeadId, onRequestEmptyEditDelete: setEmptyDeleteId, @@ -688,7 +689,6 @@ export function ChannelScreen({ threadReplyTargetId, threadReplyTargetMessage, }); - const hasAuxiliaryPanel = Boolean( effectiveOpenThreadHeadId || openAgentSessionPubkey || diff --git a/desktop/src/features/channels/ui/useChannelOpenReadState.test.mjs b/desktop/src/features/channels/ui/useChannelOpenReadState.test.mjs new file mode 100644 index 0000000000..4f54d8b309 --- /dev/null +++ b/desktop/src/features/channels/ui/useChannelOpenReadState.test.mjs @@ -0,0 +1,25 @@ +import assert from "node:assert/strict"; +import test from "node:test"; + +import { getTopLevelInboxUnreadOverrideIds } from "./useChannelOpenReadState.ts"; + +test("opening a channel clears only its top-level Inbox overrides", () => { + assert.deepEqual( + getTopLevelInboxUnreadOverrideIds( + [ + { id: "top-level", channelId: "general", tags: [] }, + { + id: "thread-reply", + channelId: "general", + tags: [ + ["e", "root", "", "root"], + ["e", "parent", "", "reply"], + ], + }, + { id: "other-channel", channelId: "random", tags: [] }, + ], + "general", + ), + ["top-level"], + ); +}); diff --git a/desktop/src/features/channels/ui/useChannelOpenReadState.ts b/desktop/src/features/channels/ui/useChannelOpenReadState.ts new file mode 100644 index 0000000000..ff927c00bb --- /dev/null +++ b/desktop/src/features/channels/ui/useChannelOpenReadState.ts @@ -0,0 +1,45 @@ +import * as React from "react"; + +import { useAppShell } from "@/app/AppShellContext"; +import { isThreadReply } from "@/features/messages/lib/threading"; +import type { FeedItem } from "@/shared/api/types"; + +/** + * Inbox overrides for top-level rows are consumed by opening the channel. + * Thread-reply overrides intentionally remain until their thread is read. + */ +export function getTopLevelInboxUnreadOverrideIds( + items: FeedItem[], + channelId: string, +): string[] { + return items.flatMap((item) => + item.channelId === channelId && !isThreadReply(item.tags) ? [item.id] : [], + ); +} + +export function useChannelOpenReadState( + activeChannelId: string | null, + isChannelMember: boolean | undefined, + activeReadAt: string | null, +) { + const { feedItemState, locallyUnreadFeedItems, markChannelRead } = + useAppShell(); + + React.useEffect(() => { + if (!activeChannelId || isChannelMember === false) return; + for (const itemId of getTopLevelInboxUnreadOverrideIds( + locallyUnreadFeedItems, + activeChannelId, + )) { + feedItemState.undoUnread(itemId); + } + markChannelRead(activeChannelId, activeReadAt, { topLevelOnly: true }); + }, [ + activeChannelId, + activeReadAt, + feedItemState.undoUnread, + isChannelMember, + locallyUnreadFeedItems, + markChannelRead, + ]); +} diff --git a/desktop/src/features/channels/ui/useChannelUnreadState.ts b/desktop/src/features/channels/ui/useChannelUnreadState.ts index dc24023555..884aa02d8e 100644 --- a/desktop/src/features/channels/ui/useChannelUnreadState.ts +++ b/desktop/src/features/channels/ui/useChannelUnreadState.ts @@ -1,5 +1,6 @@ import * as React from "react"; +import type { ForcedUnreadSource } from "@/features/channels/forcedUnreadStore"; import { buildCreatedAtByMessageId, buildDirectReplyIdsByParentId, @@ -36,6 +37,10 @@ type UseChannelUnreadStateOptions = { openThreadMessages?: MainTimelineEntry[]; getChannelReadAt: (channelId: string) => number | null; getMessageReadAt: (messageId: string) => number | null; + clearChannelUnreadSource: ( + channelId: string, + source: ForcedUnreadSource, + ) => void; markChannelUnread: (channelId: string) => void; markMessageRead: (messageId: string, timestamp: number) => void; isThreadMuted: (rootId: string) => boolean; @@ -64,6 +69,7 @@ export function useChannelUnreadState({ openThreadMessages, getChannelReadAt, getMessageReadAt, + clearChannelUnreadSource, markChannelUnread, markMessageRead, isThreadMuted, @@ -452,16 +458,26 @@ export function useChannelUnreadState({ const createdAt = createdAtByMessageId.get(id); if (createdAt !== undefined) markMessageRead(id, createdAt); } + if (activeChannelId && forcedUnreadMsgRef.current.size === 0) { + clearChannelUnreadSource(activeChannelId, "manual"); + } forceUnreadRender(); }, - [createdAtByMessageId, getReplyDescendantIdsForMessage, markMessageRead], + [ + activeChannelId, + clearChannelUnreadSource, + createdAtByMessageId, + getReplyDescendantIdsForMessage, + markMessageRead, + ], ); // Mark a message and its whole subtree UNREAD (LP4 v3 menu action). Markers // are monotonic and cannot move backward, so this writes NO marker: it adds // the ids to the session-local forced-unread overlay the badge predicates OR - // in. Cleared on channel-leave; does not survive reload (symmetric with the - // shipped channel mark-unread). + // in. It also forces the channel-level unread projection so leaving the + // channel restores its bold sidebar emphasis. The per-message overlay is + // cleared on channel-leave; the channel-level force survives until reopen. const handleMarkMessageUnread = React.useCallback( (messageId: string) => { for (const id of [ @@ -470,9 +486,12 @@ export function useChannelUnreadState({ ]) { forcedUnreadMsgRef.current.add(id); } + if (activeChannelId) { + markChannelUnread(activeChannelId); + } forceUnreadRender(); }, - [getReplyDescendantIdsForMessage], + [activeChannelId, getReplyDescendantIdsForMessage, markChannelUnread], ); return { diff --git a/desktop/src/features/channels/unreadChannelCounts.ts b/desktop/src/features/channels/unreadChannelCounts.ts index cb33c62975..aae9c5096e 100644 --- a/desktop/src/features/channels/unreadChannelCounts.ts +++ b/desktop/src/features/channels/unreadChannelCounts.ts @@ -78,6 +78,19 @@ export function countUnreadObservedEvents( return count; } +export function hasUnreadTopLevelObservedEvent( + eventsById: ReadonlyMap | undefined, + getReadAt: (event: ObservedUnreadEvent) => number | null, +): boolean { + if (!eventsById) return false; + for (const event of eventsById.values()) { + if (event.rootId !== null) continue; + const readAt = getReadAt(event); + if (readAt === null || event.createdAt > readAt) return true; + } + return false; +} + export function countUnreadBadgeObservedEvents( eventsById: ReadonlyMap | undefined, getReadAt: (event: ObservedUnreadEvent) => number | null, diff --git a/desktop/src/features/channels/unreadReadMarker.test.mjs b/desktop/src/features/channels/unreadReadMarker.test.mjs index 6ea0916413..660d4f5c61 100644 --- a/desktop/src/features/channels/unreadReadMarker.test.mjs +++ b/desktop/src/features/channels/unreadReadMarker.test.mjs @@ -7,6 +7,7 @@ import { countUnreadBadgeObservedEvents, countUnreadHighPriorityObservedEvents, countUnreadObservedEvents, + hasUnreadTopLevelObservedEvent, observedUnreadEventReadAt, recordObservedUnreadEvent, } from "./unreadChannelCounts.ts"; @@ -368,6 +369,30 @@ test("countUnreadObservedEvents_topLevelUsesChannelMarker", () => { assert.equal(countUnreadObservedEvents(events, readAtFor(300, new Map())), 1); }); +test("hasUnreadTopLevelObservedEvent_ignoresUnreadThreadReplies", () => { + const events = new Map([ + ["top-old", observed("top-old", 250)], + ["thread-new", observed("thread-new", 500, "root-1")], + ]); + + assert.equal( + hasUnreadTopLevelObservedEvent(events, readAtFor(300, new Map())), + false, + ); +}); + +test("hasUnreadTopLevelObservedEvent_detectsUnreadTopLevelMessage", () => { + const events = new Map([ + ["top-new", observed("top-new", 350)], + ["thread-new", observed("thread-new", 500, "root-1")], + ]); + + assert.equal( + hasUnreadTopLevelObservedEvent(events, readAtFor(300, new Map())), + true, + ); +}); + test("countUnreadBadgeObservedEvents_skipsBoldOnlyGeneralChannelItems", () => { const events = new Map([ ["plain", observed("plain", 500, null, false, false)], diff --git a/desktop/src/features/channels/useChannelPaneHandlers.ts b/desktop/src/features/channels/useChannelPaneHandlers.ts index 53170257a4..a619f595f9 100644 --- a/desktop/src/features/channels/useChannelPaneHandlers.ts +++ b/desktop/src/features/channels/useChannelPaneHandlers.ts @@ -7,6 +7,7 @@ import type { useToggleReactionMutation, } from "@/features/messages/hooks"; import { resolveThreadReplyTarget } from "@/features/messages/hooks"; +import type { TimelineMessage } from "@/features/messages/types"; /** * Stable callback references for ChannelPane so that keystroke-driven @@ -24,6 +25,7 @@ export function useChannelPaneHandlers({ getFirstReplyIdForMessage, getReplyDescendantIdsForMessage, markRevealedRepliesRead, + recordThreadInteraction, onOptimisticOpenThreadHeadIdChange, onRequestEmptyEditDelete, openThreadHeadId, @@ -43,6 +45,7 @@ export function useChannelPaneHandlers({ getFirstReplyIdForMessage: (messageId: string) => string | null; getReplyDescendantIdsForMessage: (messageId: string) => string[]; markRevealedRepliesRead: (messageId: string) => void; + recordThreadInteraction: (rootId: string) => void; onOptimisticOpenThreadHeadIdChange: React.Dispatch< React.SetStateAction >; @@ -344,14 +347,21 @@ export function useChannelPaneHandlers({ ); const handleToggleReaction = React.useCallback( - async (message: { id: string }, emoji: string, remove: boolean) => { + async ( + message: Pick, + emoji: string, + remove: boolean, + ) => { await toggleMutateRef.current({ emoji, eventId: message.id, remove, }); + if (!remove) { + recordThreadInteraction(message.rootId ?? message.id); + } }, - [], + [recordThreadInteraction], ); return { diff --git a/desktop/src/features/channels/useUnreadChannels.ts b/desktop/src/features/channels/useUnreadChannels.ts index a2376f9b7b..256077d64c 100644 --- a/desktop/src/features/channels/useUnreadChannels.ts +++ b/desktop/src/features/channels/useUnreadChannels.ts @@ -9,8 +9,8 @@ import { countUnreadBadgeObservedEvents, countUnreadHighPriorityObservedEvents, countUnreadObservedEvents, + hasUnreadTopLevelObservedEvent, makeObservedUnreadEvent, - mapsEqual, observedUnreadEventReadAt, recordObservedUnreadEvent, type ObservedUnreadEvent, @@ -20,6 +20,7 @@ import { makeRootIdStore } from "@/features/channels/unreadRootIdStore"; import { forcedUnreadStore, type ForcedUnreadMap, + useForcedUnreadActions, } from "@/features/channels/forcedUnreadStore"; import { getThreadReference, @@ -33,6 +34,7 @@ import { import type { RelayClient } from "@/shared/api/relayClientSession"; import type { Channel, RelayEvent } from "@/shared/api/types"; import { CHANNEL_MESSAGE_EVENT_KINDS } from "@/shared/constants/kinds"; +import { useStableMap, useStableSet } from "@/shared/hooks/useStableReference"; import { normalizeRelayUrl } from "@/features/profile/lib/selfProfileStorage"; import { DM_NOTIFIABLE_EVENT_KINDS } from "./isDmNotifiableKind"; import { @@ -125,14 +127,6 @@ export function resolveObservedUnreadRootId(tags: string[][]): string | null { return isBroadcastReply(tags) ? null : getThreadReference(tags).rootId; } -function setsEqual(a: ReadonlySet, b: ReadonlySet): boolean { - if (a.size !== b.size) return false; - for (const item of a) { - if (!b.has(item)) return false; - } - return true; -} - export function useUnreadChannels( channels: Channel[], activeChannel: Channel | null, @@ -310,9 +304,18 @@ export function useUnreadChannels( ( channelId: string, readAt: string | null | undefined, - { topLevelOnly = false }: { topLevelOnly?: boolean } = {}, + { + preserveForcedUnread = false, + topLevelOnly = false, + }: { + preserveForcedUnread?: boolean; + topLevelOnly?: boolean; + } = {}, ) => { - if (Object.hasOwn(forcedUnreadRef.current, channelId)) { + if ( + !preserveForcedUnread && + Object.hasOwn(forcedUnreadRef.current, channelId) + ) { delete forcedUnreadRef.current[channelId]; if (pubkey) { forcedUnreadStore.write(pubkey, forcedUnreadRef.current); @@ -342,22 +345,13 @@ export function useUnreadChannels( [markContextRead, pubkey], ); - // Manually mark a channel unread (e.g., right-click → "mark unread"). Persists - // the current NIP-RS read marker as baseline to localStorage so the rail - // observer can detect when a cross-device read has since covered the force. - // NIP-RS markers are monotonic, so we do not publish a lower timestamp. - const markChannelUnread = React.useCallback( - (channelId: string) => { - if (!Object.hasOwn(forcedUnreadRef.current, channelId)) { - forcedUnreadRef.current[channelId] = getOwnTimestamp(channelId); - if (pubkey) { - forcedUnreadStore.write(pubkey, forcedUnreadRef.current); - } - bumpLatestVersion(); - } - }, - [getOwnTimestamp, pubkey], - ); + const { clearChannelUnreadSource, markChannelUnread } = + useForcedUnreadActions( + forcedUnreadRef, + getOwnTimestamp, + pubkey, + bumpLatestVersion, + ); // Record the thread root of an EXTERNAL message that @-mentioned the user. // Keyed on the thread root so the badge gate trips for a mention recipient @@ -477,6 +471,22 @@ export function useUnreadChannels( [normalizedPubkey], ); + const recordThreadInteraction = React.useCallback( + (rootId: string) => { + const normalizedRootId = rootId.trim(); + if (!normalizedRootId) return; + const target = participatedRootIdsRef.current; + const sizeBefore = target.size; + target.add(normalizedRootId); + if (target.size === sizeBefore) return; + if (normalizedPubkey !== null) { + participationStore.write(normalizedPubkey, target); + } + bumpMembershipVersion(); + }, + [normalizedPubkey], + ); + const handleThreadReplyNotification = React.useCallback( (channelId: string, event: RelayEvent) => { // Guard: don't merge into a ref whose scope has drifted from the current @@ -830,6 +840,7 @@ export function useUnreadChannels( if (!isReadStateReady) { return { unreadChannelIds: new Set(), + topLevelUnreadChannelIds: new Set(), highPriorityUnreadChannelIds: new Set(), unreadChannelCounts: new Map(), unreadChannelNotificationCount: 0, @@ -837,6 +848,7 @@ export function useUnreadChannels( } const unread = new Set(); + const topLevelUnread = new Set(); const highPriority = new Set(); const counts = new Map(); let unreadChannelNotificationCount = 0; @@ -844,15 +856,10 @@ export function useUnreadChannels( for (const channel of channels) { if (channel.id === activeChannelId) continue; - if (Object.hasOwn(forcedUnreadRef.current, channel.id)) { - // Forced-unread is dot tier only — not high-priority. - unread.add(channel.id); - counts.set(channel.id, 1); - unreadChannelNotificationCount += 1; - continue; - } - - if (latestByChannelRef.current.get(channel.id) === undefined) continue; + const isForcedUnread = Object.hasOwn( + forcedUnreadRef.current, + channel.id, + ); const observedEvents = observedUnreadEventsByChannelRef.current.get( channel.id, @@ -866,13 +873,25 @@ export function useUnreadChannels( (messageId) => getOwnTimestamp(`msg:${messageId}`), ); - const unreadCount = countUnreadObservedEvents( - observedEvents, - readAtForObservedEvent, - ); - if (unreadCount === 0) continue; + const unreadCount = + latestByChannelRef.current.get(channel.id) === undefined + ? 0 + : countUnreadObservedEvents(observedEvents, readAtForObservedEvent); + if (unreadCount === 0) { + if (!isForcedUnread) continue; + unread.add(channel.id); + topLevelUnread.add(channel.id); + counts.set(channel.id, 1); + unreadChannelNotificationCount += 1; + continue; + } unread.add(channel.id); + if ( + hasUnreadTopLevelObservedEvent(observedEvents, readAtForObservedEvent) + ) { + topLevelUnread.add(channel.id); + } const badgeCount = countUnreadBadgeObservedEvents( observedEvents, readAtForObservedEvent, @@ -900,6 +919,7 @@ export function useUnreadChannels( return { unreadChannelIds: unread, + topLevelUnreadChannelIds: topLevelUnread, highPriorityUnreadChannelIds: highPriority, unreadChannelCounts: counts, unreadChannelNotificationCount, @@ -914,37 +934,14 @@ export function useUnreadChannels( readStateVersion, ]); - // Stabilize Set references: only replace when contents actually change, - // so downstream memos don't re-run on every render when sets are equal. - const prevUnreadRef = React.useRef>(new Set()); - const prevHighPriorityRef = React.useRef>(new Set()); - const prevUnreadCountsRef = React.useRef>( - new Map(), + const unreadChannelIds = useStableSet(rawUnread.unreadChannelIds); + const topLevelUnreadChannelIds = useStableSet( + rawUnread.topLevelUnreadChannelIds, ); - - const unreadChannelIds = setsEqual( - rawUnread.unreadChannelIds, - prevUnreadRef.current, - ) - ? prevUnreadRef.current - : rawUnread.unreadChannelIds; - prevUnreadRef.current = unreadChannelIds; - - const highPriorityUnreadChannelIds = setsEqual( + const highPriorityUnreadChannelIds = useStableSet( rawUnread.highPriorityUnreadChannelIds, - prevHighPriorityRef.current, - ) - ? prevHighPriorityRef.current - : rawUnread.highPriorityUnreadChannelIds; - prevHighPriorityRef.current = highPriorityUnreadChannelIds; - - const unreadChannelCounts = mapsEqual( - rawUnread.unreadChannelCounts, - prevUnreadCountsRef.current, - ) - ? prevUnreadCountsRef.current - : rawUnread.unreadChannelCounts; - prevUnreadCountsRef.current = unreadChannelCounts; + ); + const unreadChannelCounts = useStableMap(rawUnread.unreadChannelCounts); const unreadChannelNotificationCount = rawUnread.unreadChannelNotificationCount; @@ -992,12 +989,14 @@ export function useUnreadChannels( return { unreadChannelIds, + topLevelUnreadChannelIds, unreadChannelCounts, highPriorityUnreadChannelIds, unreadChannelNotificationCount, markAllChannelsRead, markChannelRead, markChannelUnread, + clearChannelUnreadSource, // Exposed so other surfaces (e.g. Home) can project per-item read state // off the same NIP-RS read marker without instantiating a second // ReadStateManager. readStateVersion is the invalidation signal callers @@ -1009,6 +1008,7 @@ export function useUnreadChannels( participatedRootIds, authoredRootIds, mentionedRootIds, + recordThreadInteraction, threadActivityItems: projectActivityForScope( threadActivityScopeRef.current, currentActivityScope, diff --git a/desktop/src/features/communities/communityUnreadObserver.ts b/desktop/src/features/communities/communityUnreadObserver.ts index 5bc3298413..e729831eac 100644 --- a/desktop/src/features/communities/communityUnreadObserver.ts +++ b/desktop/src/features/communities/communityUnreadObserver.ts @@ -1,5 +1,6 @@ import { makeRootIdStore } from "@/features/channels/unreadRootIdStore"; import { + forcedUnreadMarker, forcedUnreadStore, type ForcedUnreadMap, } from "@/features/channels/forcedUnreadStore"; @@ -238,7 +239,9 @@ export async function fetchCommunityUnread(args: { // runs while the community is active, so the store may not be pruned for // inactive communities). if (!hasUnread && Object.hasOwn(forcedUnreadMap, channel.id)) { - const markerAtWhenForced = forcedUnreadMap[channel.id]; + const markerAtWhenForced = forcedUnreadMarker( + forcedUnreadMap[channel.id], + ); if ( readAt === null || (markerAtWhenForced !== null && readAt <= markerAtWhenForced) diff --git a/desktop/src/features/home/ui/HomeView.tsx b/desktop/src/features/home/ui/HomeView.tsx index 0f7c851643..e415f8d3a8 100644 --- a/desktop/src/features/home/ui/HomeView.tsx +++ b/desktop/src/features/home/ui/HomeView.tsx @@ -234,13 +234,16 @@ export function HomeView({ inboxListWidthPx, } = useResizableInboxListWidth(); const { + clearChannelUnreadSource, getChannelReadAt, getThreadReadAt, getMessageReadAt, feedItemState, markChannelRead, + markChannelUnread, markMessageRead, markThreadRead, + recordThreadInteraction, readStateVersion, } = useAppShell(); const { doneSet, markDone, markUnread, undoDone, undoUnread, unreadSet } = @@ -383,7 +386,9 @@ export function HomeView({ readStateVersion, localDoneSet: doneSet, localUnreadSet: unreadSet, + clearChannelUnreadSource, markChannelRead, + markChannelUnread, markMessageRead, markThreadRead, markDoneLocal: markDone, @@ -861,6 +866,13 @@ export function HomeView({ eventId: message.id, remove, }); + if (!remove) { + recordThreadInteraction( + selectedItem?.conversationId ?? + message.rootId ?? + message.id, + ); + } await threadContext.refreshReactions(); await channelMessagesQuery.refetch(); onRefresh(); diff --git a/desktop/src/features/home/useHomeInboxReadState.test.mjs b/desktop/src/features/home/useHomeInboxReadState.test.mjs index 4af181379a..77caecad0f 100644 --- a/desktop/src/features/home/useHomeInboxReadState.test.mjs +++ b/desktop/src/features/home/useHomeInboxReadState.test.mjs @@ -4,6 +4,7 @@ import test from "node:test"; import { getGroupedChannelReadTimestamp, getGroupedInboxItemIds, + hasRemainingChannelUnreadOverride, hasGroupedUnreadOverride, resolveInboxItemReadAt, } from "./useHomeInboxReadState.ts"; @@ -125,6 +126,47 @@ test("grouped unread override matches any item represented by the row", () => { ); }); +test("remaining channel unread override ignores the row being cleared", () => { + const firstReply = feedItem({ + id: "first-reply", + createdAt: 200, + tags: [ + ["h", CHANNEL_ID], + ["e", "first-root", "", "root"], + ["e", "first-parent", "", "reply"], + ], + }); + const secondReply = feedItem({ + id: "second-reply", + createdAt: 300, + tags: [ + ["h", CHANNEL_ID], + ["e", "second-root", "", "root"], + ["e", "second-parent", "", "reply"], + ], + }); + const items = [inboxItem([firstReply]), inboxItem([secondReply])]; + + assert.equal( + hasRemainingChannelUnreadOverride( + items, + new Set(["first-reply", "second-reply"]), + CHANNEL_ID, + new Set(["first-reply"]), + ), + true, + ); + assert.equal( + hasRemainingChannelUnreadOverride( + items, + new Set(["first-reply"]), + CHANNEL_ID, + new Set(["first-reply"]), + ), + false, + ); +}); + test("thread inbox row without a marker ignores local done fallback", () => { const replyItem = feedItem({ id: "reply-event", diff --git a/desktop/src/features/home/useHomeInboxReadState.ts b/desktop/src/features/home/useHomeInboxReadState.ts index 624e72a0f5..24d536e730 100644 --- a/desktop/src/features/home/useHomeInboxReadState.ts +++ b/desktop/src/features/home/useHomeInboxReadState.ts @@ -1,5 +1,6 @@ import * as React from "react"; +import type { ForcedUnreadSource } from "@/features/channels/forcedUnreadStore"; import type { InboxItem } from "@/features/home/lib/inbox"; import { getThreadReference, @@ -25,6 +26,17 @@ type UseHomeInboxReadStateOptions = { markChannelRead: ( channelId: string, readAt: string | null | undefined, + options?: { + preserveForcedUnread?: boolean; + topLevelOnly?: boolean; + }, + ) => void; + /** Force a channel's unread indicator without rolling back its NIP-RS marker. */ + markChannelUnread: (channelId: string, source?: ForcedUnreadSource) => void; + /** Remove only the named owner of a channel's forced-unread indicator. */ + clearChannelUnreadSource: ( + channelId: string, + source: ForcedUnreadSource, ) => void; /** Advance the thread read marker to the given unix-seconds timestamp. */ markThreadRead: (rootId: string, timestamp: number) => void; @@ -32,7 +44,7 @@ type UseHomeInboxReadStateOptions = { markMessageRead: (messageId: string, timestamp: number) => void; /** Local fallback: mark a non-channel item done. */ markDoneLocal: (id: string) => void; - /** Local inbox row override: mark an item unread without touching the channel. */ + /** Local inbox row override: mark an item unread alongside its channel emphasis. */ markUnreadLocal: (id: string) => void; /** Local fallback: undo a non-channel item done. */ undoDoneLocal: (id: string) => void; @@ -83,6 +95,21 @@ export function hasGroupedUnreadOverride( return getGroupedInboxItemIds(item).some((id) => localUnreadSet.has(id)); } +export function hasRemainingChannelUnreadOverride( + items: InboxItem[], + localUnreadSet: ReadonlySet, + channelId: string, + clearedItemIds: ReadonlySet, +): boolean { + return items.some( + (candidate) => + candidate.item.channelId === channelId && + getGroupedInboxItemIds(candidate).some( + (id) => localUnreadSet.has(id) && !clearedItemIds.has(id), + ), + ); +} + export function resolveInboxItemReadAt( item: InboxItem, options: { @@ -114,8 +141,8 @@ export function resolveInboxItemReadAt( * "Mark as read" on channel-backed items is routed through `markChannelRead`; * thread rows advance the same per-message markers as the channel thread * panel, plus the aggregate `thread:` marker for compatibility. "Mark - * unread" is item-local: it only reopens the specific inbox row and must not - * light up the channel. + * unread" keeps its per-item local override and also restores the source + * channel's forced-unread indicator so channel surfaces agree with Inbox. */ export function useHomeInboxReadState({ items, @@ -126,6 +153,8 @@ export function useHomeInboxReadState({ localDoneSet, localUnreadSet = EMPTY_ITEM_SET, markChannelRead, + markChannelUnread, + clearChannelUnreadSource, markThreadRead, markMessageRead, markDoneLocal, @@ -182,9 +211,22 @@ export function useHomeInboxReadState({ (itemId: string) => { const item = itemById.get(itemId); const localUnreadIds = item ? getGroupedInboxItemIds(item) : [itemId]; + const clearedItemIds = new Set(localUnreadIds); for (const id of localUnreadIds) { undoUnreadLocal(id); } + const channelId = item?.item.channelId ?? null; + if ( + channelId && + !hasRemainingChannelUnreadOverride( + items, + localUnreadSet, + channelId, + clearedItemIds, + ) + ) { + clearChannelUnreadSource(channelId, "inbox"); + } const threadRootId = item ? getInboxThreadRootId(item) : null; if (item && threadRootId) { const markedReplyIds = new Set(); @@ -201,16 +243,17 @@ export function useHomeInboxReadState({ markChannelRead( groupedChannelRead.channelId, new Date(groupedChannelRead.timestamp * 1_000).toISOString(), + { preserveForcedUnread: true, topLevelOnly: true }, ); } return; } - const channelId = item?.item.channelId ?? null; if (item && channelId) { markChannelRead( channelId, new Date(item.latestActivityAt * 1_000).toISOString(), + { preserveForcedUnread: true }, ); return; } @@ -218,6 +261,9 @@ export function useHomeInboxReadState({ }, [ itemById, + items, + clearChannelUnreadSource, + localUnreadSet, markChannelRead, markDoneLocal, markMessageRead, @@ -230,8 +276,17 @@ export function useHomeInboxReadState({ (itemId: string) => { undoDoneLocal(itemId); markUnreadLocal(itemId); + const item = itemById.get(itemId); + const channelId = item?.item.channelId ?? null; + // The Inbox override owns the durable thread dot, while the channel force + // restores timeline-level emphasis after the user leaves the channel. + // Opening the channel clears the bolding but leaves the thread dot until + // the thread itself is opened or marked read. + if (channelId && item) { + markChannelUnread(channelId, "inbox"); + } }, - [markUnreadLocal, undoDoneLocal], + [itemById, markChannelUnread, markUnreadLocal, undoDoneLocal], ); return { effectiveDoneSet, markItemRead, markItemUnread }; diff --git a/desktop/src/features/sidebar/lib/useActiveWorkingChannelsById.ts b/desktop/src/features/sidebar/lib/useActiveWorkingChannelsById.ts index 37a3c86656..9b4c3c7804 100644 --- a/desktop/src/features/sidebar/lib/useActiveWorkingChannelsById.ts +++ b/desktop/src/features/sidebar/lib/useActiveWorkingChannelsById.ts @@ -2,7 +2,10 @@ import * as React from "react"; import type { ActiveChannelTurnSummary } from "@/features/agents/activeAgentTurnsStore"; import { useWorkingChannels } from "@/features/agents/agentWorkingSignal"; -import { useManagedAgentsQuery } from "@/features/agents/hooks"; +import { + useManagedAgentsQuery, + useRelayAgentsQuery, +} from "@/features/agents/hooks"; import { normalizePubkey } from "@/shared/lib/pubkey"; export function resolveActiveWorkingChannelNames( @@ -27,10 +30,15 @@ export function useActiveWorkingChannelsById(): ReadonlyMap< ActiveChannelTurnSummary > { const managedAgentsQuery = useManagedAgentsQuery(); + const relayAgentsQuery = useRelayAgentsQuery(); const managedAgents = React.useMemo( () => managedAgentsQuery.data ?? [], [managedAgentsQuery.data], ); + const namedAgents = React.useMemo( + () => [...(relayAgentsQuery.data ?? []), ...managedAgents], + [managedAgents, relayAgentsQuery.data], + ); // Unified working signal: observer-derived turns primary, bot typing as // fallback — so the sidebar badge appears even for agents whose observer @@ -42,11 +50,11 @@ export function useActiveWorkingChannelsById(): ReadonlyMap< activeWorkingChannels.map((summary) => { const resolvedSummary = resolveActiveWorkingChannelNames( summary, - managedAgents, + namedAgents, ); return [resolvedSummary.channelId, resolvedSummary]; }), ), - [activeWorkingChannels, managedAgents], + [activeWorkingChannels, namedAgents], ); } diff --git a/desktop/src/features/sidebar/ui/ChannelActivityPopover.tsx b/desktop/src/features/sidebar/ui/ChannelActivityPopover.tsx new file mode 100644 index 0000000000..1e50ef72ee --- /dev/null +++ b/desktop/src/features/sidebar/ui/ChannelActivityPopover.tsx @@ -0,0 +1,448 @@ +import * as React from "react"; +import { Clock, Loader2, MailOpen } from "lucide-react"; + +import { useAppShell } from "@/app/AppShellContext"; +import { useAppNavigation } from "@/app/navigation/useAppNavigation"; +import type { ActiveChannelTurnSummary } from "@/features/agents/activeAgentTurnsStore"; +import { formatElapsed } from "@/features/agents/ui/agentSessionUtils"; +import { useOpenAgentActivity } from "@/features/agents/useOpenAgentActivity"; +import { buildInboxItems, type InboxItem } from "@/features/home/lib/inbox"; +import { getGroupedInboxItemIds } from "@/features/home/useHomeInboxReadState"; +import { useUsersBatchQuery } from "@/features/profile/hooks"; +import type { UserProfileLookup } from "@/features/profile/lib/identity"; +import { useRemindLater } from "@/features/reminders/ui/RemindMeLaterProvider"; +import { useIdentityQuery } from "@/shared/api/hooks"; +import type { Channel, FeedItem, HomeFeedResponse } from "@/shared/api/types"; +import { normalizePubkey, truncatePubkey } from "@/shared/lib/pubkey"; +import { useNow } from "@/shared/lib/useNow"; +import { Markdown } from "@/shared/ui/markdown"; +import { Popover, PopoverAnchor, PopoverContent } from "@/shared/ui/popover"; +import { UserAvatar } from "@/shared/ui/UserAvatar"; + +const HOVER_OPEN_DELAY_MS = 250; +const HOVER_CLOSE_DELAY_MS = 180; + +function buildChannelActivityFeed(items: FeedItem[]): HomeFeedResponse { + return { + feed: { + mentions: items.filter((item) => item.category === "mention"), + needsAction: items.filter((item) => item.category === "needs_action"), + activity: items.filter( + (item) => + item.category !== "mention" && + item.category !== "needs_action" && + item.category !== "agent_activity", + ), + agentActivity: items.filter((item) => item.category === "agent_activity"), + }, + meta: { + since: 0, + total: items.length, + generatedAt: 0, + }, + }; +} + +function RowActionButton({ + children, + label, + onClick, +}: { + children: React.ReactNode; + label: string; + onClick: () => void; +}) { + return ( + + ); +} + +function ThreadPreviewRow({ + item, + onMarkRead, + onOpen, + onRemindLater, +}: { + item: InboxItem; + onMarkRead: () => void; + onOpen: () => void; + onRemindLater: () => void; +}) { + return ( +
+
+ ); +} + +function WorkingAgentRow({ + avatarUrl, + elapsed, + name, + onOpen, + pubkey, +}: { + avatarUrl: string | null; + elapsed: string; + name: string; + onOpen: () => void; + pubkey: string; +}) { + return ( + + ); +} + +function WorkingAgentRows({ + activeWorking, + channelId, + onOpen, + profiles, +}: { + activeWorking: ActiveChannelTurnSummary; + channelId: string; + onOpen: (pubkey: string, channelId: string) => void; + profiles?: UserProfileLookup; +}) { + const now = useNow(1000); + const elapsed = formatElapsed(now - activeWorking.anchorAt); + const alignedAgentNames = + activeWorking.agentNames?.length === activeWorking.agentPubkeys.length + ? activeWorking.agentNames + : null; + + return activeWorking.agentPubkeys.map((pubkey, index) => { + const profile = profiles?.[normalizePubkey(pubkey)]; + const name = + profile?.displayName?.trim() || + alignedAgentNames?.[index] || + `Agent ${truncatePubkey(pubkey)}`; + return ( + onOpen(pubkey, channelId)} + pubkey={pubkey} + /> + ); + }); +} + +export function ChannelActivityPopover({ + activeWorking, + channel, + children, +}: { + activeWorking?: ActiveChannelTurnSummary; + channel: Channel; + children: React.ReactNode; +}) { + const [open, setOpen] = React.useState(false); + const hoverTimerRef = React.useRef | null>( + null, + ); + const { + clearChannelUnreadSource, + getChannelActivityItemReadAt, + locallyUnreadFeedItems, + markMessageRead, + markThreadRead, + unreadThreadFeedItems, + feedItemState, + } = useAppShell(); + const { undoUnread } = feedItemState; + const identityQuery = useIdentityQuery(); + const { goChannel } = useAppNavigation(); + const { openAgentActivity } = useOpenAgentActivity(); + const { openReminder } = useRemindLater(); + + const unreadChannelFeedItems = React.useMemo(() => { + return unreadThreadFeedItems.filter( + (item) => item.channelId === channel.id, + ); + }, [channel.id, unreadThreadFeedItems]); + const profilePubkeys = React.useMemo( + () => [ + ...new Set([ + ...unreadChannelFeedItems.map((item) => item.pubkey), + ...(activeWorking?.agentPubkeys ?? []), + ]), + ], + [activeWorking?.agentPubkeys, unreadChannelFeedItems], + ); + const profilesQuery = useUsersBatchQuery(open ? profilePubkeys : [], { + enabled: open, + }); + const profiles = profilesQuery.data?.profiles; + const activityReadAtByMessageId = React.useMemo( + () => + new Map( + unreadChannelFeedItems.map((item) => [ + item.id, + getChannelActivityItemReadAt(item), + ]), + ), + [getChannelActivityItemReadAt, unreadChannelFeedItems], + ); + const activityItems = React.useMemo(() => { + if (!open) return []; + return buildInboxItems({ + channels: [channel], + currentPubkey: identityQuery.data?.pubkey, + feed: buildChannelActivityFeed(unreadChannelFeedItems), + getMessageReadAt: (messageId) => + activityReadAtByMessageId.get(messageId) ?? null, + profiles, + }); + }, [ + channel, + activityReadAtByMessageId, + identityQuery.data?.pubkey, + open, + profiles, + unreadChannelFeedItems, + ]); + const hasContent = + unreadChannelFeedItems.length > 0 || + (activeWorking?.agentPubkeys.length ?? 0) > 0; + + const clearHoverTimer = React.useCallback(() => { + if (hoverTimerRef.current !== null) { + clearTimeout(hoverTimerRef.current); + hoverTimerRef.current = null; + } + }, []); + const openWithDelay = React.useCallback(() => { + if (!hasContent) return; + clearHoverTimer(); + hoverTimerRef.current = setTimeout(() => { + setOpen(true); + }, HOVER_OPEN_DELAY_MS); + }, [clearHoverTimer, hasContent]); + const openImmediately = React.useCallback(() => { + if (!hasContent) return; + clearHoverTimer(); + setOpen(true); + }, [clearHoverTimer, hasContent]); + const closeWithDelay = React.useCallback(() => { + clearHoverTimer(); + hoverTimerRef.current = setTimeout(() => { + setOpen(false); + }, HOVER_CLOSE_DELAY_MS); + }, [clearHoverTimer]); + const keepOpen = React.useCallback(() => { + clearHoverTimer(); + }, [clearHoverTimer]); + + React.useEffect(() => () => clearHoverTimer(), [clearHoverTimer]); + React.useEffect(() => { + if (!hasContent) { + setOpen(false); + } + }, [hasContent]); + + const clearUnreadOverride = React.useCallback( + (item: InboxItem) => { + const clearedItemIds = new Set(getGroupedInboxItemIds(item)); + for (const itemId of clearedItemIds) { + undoUnread(itemId); + } + const channelId = item.item.channelId ?? null; + const hasAnotherChannelOverride = locallyUnreadFeedItems.some( + (feedItem) => + feedItem.channelId === channelId && !clearedItemIds.has(feedItem.id), + ); + if (channelId && !hasAnotherChannelOverride) { + clearChannelUnreadSource(channelId, "inbox"); + } + }, + [clearChannelUnreadSource, locallyUnreadFeedItems, undoUnread], + ); + + const handleMarkRead = React.useCallback( + (item: InboxItem) => { + clearUnreadOverride(item); + for (const reply of item.groupItems) { + markMessageRead(reply.id, reply.createdAt); + } + markThreadRead(item.conversationId, item.latestActivityAt); + }, + [clearUnreadOverride, markMessageRead, markThreadRead], + ); + + if (!hasContent) { + return children; + } + + return ( + + + {/* biome-ignore lint/a11y/noStaticElementInteractions: hover/focus events bubble from the nested channel button while this wrapper supplies the popover anchor box. */} +
setOpen(false)} + onFocus={openImmediately} + onMouseEnter={openWithDelay} + onMouseLeave={closeWithDelay} + > + {children} +
+ + event.preventDefault()} + side="right" + sideOffset={8} + > +
+

+ Channel activity +

+
+ {activeWorking?.agentPubkeys.length ? ( + { + setOpen(false); + openAgentActivity(pubkey, { channelId }); + }} + profiles={profiles} + /> + ) : null} + {activityItems.length > 0 + ? activityItems.map((item) => ( + handleMarkRead(item)} + onOpen={() => { + clearUnreadOverride(item); + setOpen(false); + void goChannel(channel.id, { + messageId: item.id, + threadRootId: item.conversationId, + }); + }} + onRemindLater={() => { + setOpen(false); + openReminder({ + authorPubkey: item.item.pubkey, + channelId: channel.id, + eventId: item.id, + preview: item.preview.slice(0, 100), + }); + }} + /> + )) + : null} +
+
+ + + ); +} diff --git a/desktop/src/features/sidebar/ui/ChannelContextMenu.tsx b/desktop/src/features/sidebar/ui/ChannelContextMenu.tsx index 76cae3ed38..78f3929f19 100644 --- a/desktop/src/features/sidebar/ui/ChannelContextMenu.tsx +++ b/desktop/src/features/sidebar/ui/ChannelContextMenu.tsx @@ -15,6 +15,7 @@ import { TriangleAlert, } from "lucide-react"; +import { useAppShell } from "@/app/AppShellContext"; import { useArchiveChannelMutation, useChannelMembersQuery, @@ -178,6 +179,22 @@ export function ChannelContextMenuItems({ onDeleteChannel?: (channel: Channel) => void; onLeaveChannel?: (channel: Channel) => void; }) { + const { + feedItemState, + hasSidebarUnreadProjections, + locallyUnreadFeedItems, + unreadThreadChannelIds, + } = useAppShell(); + const channelUnreadOverrideIds = locallyUnreadFeedItems.flatMap((item) => + item.channelId === channel.id && feedItemState.unreadSet.has(item.id) + ? [item.id] + : [], + ); + const hasProjectedUnread = + hasUnread || + (channel.channelType !== "dm" && + hasSidebarUnreadProjections && + unreadThreadChannelIds.has(channel.id)); const canLoadOwnerActions = channel.channelType !== "dm" && Boolean(onDeleteChannel); const membersQuery = useChannelMembersQuery(channel.id, canLoadOwnerActions); @@ -204,7 +221,7 @@ export function ChannelContextMenuItems({ canDeleteChannel, ); const showStar = Boolean(onStarChannel && onUnstarChannel); - const showReadToggle = hasUnread + const showReadToggle = hasProjectedUnread ? Boolean(onMarkChannelRead) : Boolean(onMarkChannelUnread); const showMuteToggle = Boolean(onMuteChannel && onUnmuteChannel); @@ -230,12 +247,15 @@ export function ChannelContextMenuItems({ /> ) : null} {showReadToggle ? : null} - {hasUnread && onMarkChannelRead ? ( + {hasProjectedUnread && onMarkChannelRead ? ( - deferMenuAction(() => - onMarkChannelRead(channel.id, channel.lastMessageAt), - ) + deferMenuAction(() => { + for (const itemId of channelUnreadOverrideIds) { + feedItemState.undoUnread(itemId); + } + onMarkChannelRead(channel.id, channel.lastMessageAt); + }) } > @@ -243,7 +263,7 @@ export function ChannelContextMenuItems({ Mark as read - ) : !hasUnread && onMarkChannelUnread ? ( + ) : !hasProjectedUnread && onMarkChannelUnread ? ( deferMenuAction(() => onMarkChannelUnread(channel.id)) diff --git a/desktop/src/features/sidebar/ui/SidebarSection.tsx b/desktop/src/features/sidebar/ui/SidebarSection.tsx index 3e39c60a6d..797e907ba1 100644 --- a/desktop/src/features/sidebar/ui/SidebarSection.tsx +++ b/desktop/src/features/sidebar/ui/SidebarSection.tsx @@ -36,6 +36,8 @@ import { SidebarMenuButton, SidebarMenuItem, } from "@/shared/ui/sidebar"; +import { ChannelActivityPopover } from "@/features/sidebar/ui/ChannelActivityPopover"; +import { useAppShell } from "@/app/AppShellContext"; const SECTION_LABEL_BUTTON_CLASS = "group/section-label flex w-fit max-w-[calc(100%-3rem)] cursor-pointer appearance-none items-center gap-1 text-left transition-colors hover:text-sidebar-foreground focus-visible:text-sidebar-foreground"; @@ -138,7 +140,8 @@ function ChannelWorkingBadge({ return ( ) : null} - {hasUnread && !isActive && channel.channelType !== "dm" ? ( - unreadCount > 0 ? ( - - ) : ( - - ) + {hasThreadUnread ? ( + ) : null} ); + + if (!activeWorking && !hasThreadUnread) { + return button; + } + + return ( + + {button} + + ); } export function SidebarSection({ diff --git a/desktop/src/shared/styles/globals/scrollbars.css b/desktop/src/shared/styles/globals/scrollbars.css index 4614967745..3d6fa15402 100644 --- a/desktop/src/shared/styles/globals/scrollbars.css +++ b/desktop/src/shared/styles/globals/scrollbars.css @@ -33,6 +33,27 @@ ); } +/* Channel activity keeps its chrome outside the scrolling surface. The slim, + * low-contrast thumb belongs only to the activity list beneath the header. */ +.buzz-channel-activity-scrollbar { + scrollbar-gutter: stable; +} + +.buzz-channel-activity-scrollbar::-webkit-scrollbar { + width: 8px; +} + +.buzz-channel-activity-scrollbar::-webkit-scrollbar-track { + background: transparent; +} + +.buzz-channel-activity-scrollbar::-webkit-scrollbar-thumb { + background-clip: content-box; + background-color: hsl(var(--foreground) / 0.15); + border: 2px solid transparent; + border-radius: 999px; +} + /* * Main-content scroll areas that have sticky blurred chrome inside them. * Native overlay scrollbars paint UNDER composited descendants diff --git a/desktop/tests/e2e/badge.spec.ts b/desktop/tests/e2e/badge.spec.ts index 0dfdfb549a..ae40eda61a 100644 --- a/desktop/tests/e2e/badge.spec.ts +++ b/desktop/tests/e2e/badge.spec.ts @@ -105,11 +105,11 @@ test("regular message bolds inactive channel without numeric badge", async ({ "600", ); await expect(page.getByTestId("channel-unread-random")).toHaveCount(0); - await expect(page.getByTestId("channel-unread-dot-random")).toBeVisible(); + await expect(page.getByTestId("channel-unread-dot-random")).toHaveCount(0); await waitForBadgeState(page, withDotOnlyBadge(baselineBadge)); }); -test("numeric badge increments for @mention in inactive channel", async ({ +test("top-level @mention bolds the channel without a row badge", async ({ page, }) => { await page.goto("/"); @@ -134,7 +134,11 @@ test("numeric badge increments for @mention in inactive channel", async ({ }, ); - await expect(page.getByTestId("channel-unread-random")).toBeVisible(); + await expect(page.getByTestId("channel-random")).toHaveCSS( + "font-weight", + "600", + ); + await expect(page.getByTestId("channel-unread-random")).toHaveCount(0); await expect(page.getByTestId("channel-unread-dot-random")).toHaveCount(0); await waitForBadgeState(page, withAdditionalBadgeCount(baselineBadge, 1)); }); @@ -158,7 +162,7 @@ test("numeric badge increments for DM message", async ({ page }) => { await waitForBadgeState(page, withAdditionalBadgeCount(baselineBadge, 1)); }); -test("numeric badge increments for interested thread reply in inactive channel", async ({ +test("interested thread reply shows the channel thread dot", async ({ page, }) => { await page.goto("/"); @@ -190,11 +194,12 @@ test("numeric badge increments for interested thread reply in inactive channel", { parentEventId: rootEventId, pubkey: TEST_IDENTITIES.alice.pubkey }, ); - await expect(page.getByTestId("channel-unread-random")).toBeVisible(); + await expect(page.getByTestId("channel-unread-random")).toHaveCount(0); + await expect(page.getByTestId("channel-unread-dot-random")).toBeVisible(); await waitForBadgeState(page, withAdditionalBadgeCount(baselineBadge, 1)); }); -test("numeric badge increments for broadcast reply in inactive channel", async ({ +test("broadcast reply bolds the channel without a thread dot", async ({ page, }) => { await page.goto("/"); @@ -219,7 +224,12 @@ test("numeric badge increments for broadcast reply in inactive channel", async ( { pubkey: TEST_IDENTITIES.alice.pubkey }, ); - await expect(page.getByTestId("channel-unread-random")).toBeVisible(); + await expect(page.getByTestId("channel-random")).toHaveCSS( + "font-weight", + "600", + ); + await expect(page.getByTestId("channel-unread-random")).toHaveCount(0); + await expect(page.getByTestId("channel-unread-dot-random")).toHaveCount(0); await waitForBadgeState(page, withAdditionalBadgeCount(baselineBadge, 1)); }); @@ -265,9 +275,7 @@ test("mark-as-read via context menu clears channel unread indicator", async ({ await waitForBadgeState(page, baselineBadge); }); -test("mark-as-unread via context menu increments numeric badge", async ({ - page, -}) => { +test("mark-as-unread via context menu bolds the channel", async ({ page }) => { await page.goto("/"); await page.getByTestId("channel-general").click(); await expect(page.getByTestId("chat-title")).toHaveText("general"); @@ -278,10 +286,55 @@ test("mark-as-unread via context menu increments numeric badge", async ({ await page.getByTestId("channel-random").click({ button: "right" }); await page.getByText("Mark unread").click(); - await expect(page.getByTestId("channel-unread-random")).toBeVisible(); + await expect(page.getByTestId("channel-random")).toHaveCSS( + "font-weight", + "600", + ); + await expect(page.getByTestId("channel-unread-random")).toHaveCount(0); + await expect(page.getByTestId("channel-unread-dot-random")).toHaveCount(0); await waitForBadgeState(page, withAdditionalBadgeCount(baselineBadge, 1)); }); +test("marking a message unread bolds its channel after leaving", async ({ + page, +}) => { + await page.goto("/"); + await page.getByTestId("channel-random").click(); + await expect(page.getByTestId("chat-title")).toHaveText("random"); + await waitForMockLiveSubscription(page, "random"); + + const message = await page.evaluate( + ({ pubkey }) => + window.__BUZZ_E2E_EMIT_MOCK_MESSAGE__?.({ + channelName: "random", + content: "Keep this channel message unread", + kind: 40002, + pubkey, + }), + { pubkey: TEST_IDENTITIES.alice.pubkey }, + ); + if (!message) { + throw new Error("Mock message emitter is unavailable"); + } + + const messageRow = page + .getByTestId("message-row") + .filter({ hasText: "Keep this channel message unread" }); + await expect(messageRow).toBeVisible(); + await messageRow.hover(); + await page.getByTestId(`more-actions-${message.id}`).click(); + const toggle = page.getByTestId(`mark-read-toggle-${message.id}`); + await expect(toggle).toHaveText("Mark unread"); + await toggle.click(); + + await page.getByTestId("channel-general").click(); + await expect(page.getByTestId("channel-random")).toHaveCSS( + "font-weight", + "600", + ); + await expect(page.getByTestId("channel-unread-dot-random")).toHaveCount(0); +}); + test("remote read-state rollback is ignored while local mark-unread still increments badge", async ({ page, }) => { @@ -379,11 +432,15 @@ test("remote read-state rollback is ignored while local mark-unread still increm await expect(page.getByTestId("channel-unread-random")).toHaveCount(0); - // Local mark-unread remains an in-session affordance and should still show - // the dot immediately without publishing a lower read timestamp. + // Local mark-unread remains an in-session affordance and should still bold + // the channel immediately without publishing a lower read timestamp. await page.getByTestId("channel-random").click({ button: "right" }); await page.getByText("Mark unread").click(); - await expect(page.getByTestId("channel-unread-random")).toBeVisible(); + await expect(page.getByTestId("channel-random")).toHaveCSS( + "font-weight", + "600", + ); + await expect(page.getByTestId("channel-unread-random")).toHaveCount(0); await waitForBadgeState(page, withAdditionalBadgeCount(baselineBadge, 1)); // Step 3: remote advance clears the local forced-unread dot. diff --git a/desktop/tests/e2e/channel-activity-popover.spec.ts b/desktop/tests/e2e/channel-activity-popover.spec.ts new file mode 100644 index 0000000000..f91f1b41de --- /dev/null +++ b/desktop/tests/e2e/channel-activity-popover.spec.ts @@ -0,0 +1,795 @@ +import { expect, test, type Page } from "@playwright/test"; + +import { waitForAnimations } from "../helpers/animations"; +import { installMockBridge, TEST_IDENTITIES } from "../helpers/bridge"; + +const SELF_PUBKEY = "deadbeef".repeat(8); +const CHANNEL_GENERAL = "9a1657ac-f7aa-5db0-b632-d8bbeb6dfb50"; +const AGENT_PUBKEY = TEST_IDENTITIES.charlie.pubkey; + +type MockMessageEvent = { + id: string; + created_at: number; + pubkey: string; +}; + +type MockInboxFeedItem = { + content: string; + id: string; + tags: string[][]; +}; + +async function waitForMockLiveSubscription(page: Page, channelName: string) { + await expect + .poll(() => + page.evaluate( + (name) => + ( + window as Window & { + __BUZZ_E2E_HAS_MOCK_LIVE_SUBSCRIPTION__?: (input: { + channelName: string; + }) => boolean; + } + ).__BUZZ_E2E_HAS_MOCK_LIVE_SUBSCRIPTION__?.({ + channelName: name, + }) ?? false, + channelName, + ), + ) + .toBe(true); +} + +async function emitMockMessage( + page: Page, + content: string, + options: { + parentEventId?: string; + pubkey: string; + createdAt: number; + mentionPubkeys?: string[]; + }, +): Promise { + const event = await page.evaluate( + ({ body, parentEventId, pubkey, createdAt, mentionPubkeys }) => + ( + window as Window & { + __BUZZ_E2E_EMIT_MOCK_MESSAGE__?: (input: { + channelName: string; + content: string; + parentEventId?: string; + pubkey: string; + createdAt: number; + mentionPubkeys?: string[]; + }) => MockMessageEvent; + } + ).__BUZZ_E2E_EMIT_MOCK_MESSAGE__?.({ + channelName: "general", + content: body, + parentEventId, + pubkey, + createdAt, + mentionPubkeys, + }), + { + body: content, + parentEventId: options.parentEventId, + pubkey: options.pubkey, + createdAt: options.createdAt, + mentionPubkeys: options.mentionPubkeys, + }, + ); + if (!event) { + throw new Error("Mock message emitter is unavailable"); + } + return event; +} + +async function pushMockInboxFeedItems(page: Page, items: MockInboxFeedItem[]) { + await page.waitForFunction( + () => + typeof (window as Window & { __BUZZ_E2E_PUSH_MOCK_FEED_ITEM__?: unknown }) + .__BUZZ_E2E_PUSH_MOCK_FEED_ITEM__ === "function", + ); + await page.evaluate( + ({ channelId, feedItems, senderPubkey }) => { + const pushFeedItem = ( + window as Window & { + __BUZZ_E2E_PUSH_MOCK_FEED_ITEM__?: (item: { + category: "mention"; + channel_id: string; + channel_name: string; + channel_type: "stream"; + content: string; + created_at: number; + id: string; + kind: number; + pubkey: string; + tags: string[][]; + }) => void; + } + ).__BUZZ_E2E_PUSH_MOCK_FEED_ITEM__; + if (!pushFeedItem) { + throw new Error("Mock feed injection helper is unavailable"); + } + const createdAt = Math.floor(Date.now() / 1_000) - 300; + for (const item of feedItems) { + pushFeedItem({ + category: "mention", + channel_id: channelId, + channel_name: "general", + channel_type: "stream", + content: item.content, + created_at: createdAt, + id: item.id, + kind: 9, + pubkey: senderPubkey, + tags: item.tags, + }); + } + }, + { + channelId: CHANNEL_GENERAL, + feedItems: items, + senderPubkey: TEST_IDENTITIES.alice.pubkey, + }, + ); +} + +async function getForcedUnreadSources(page: Page): Promise { + return page.evaluate( + ({ channelId, pubkey }) => { + const raw = window.localStorage.getItem( + `buzz-forced-unread.v1:${pubkey}`, + ); + if (!raw) return []; + const entry = JSON.parse(raw)?.[channelId]; + if (entry === undefined) return []; + return typeof entry === "object" && entry !== null + ? (entry.sources ?? []) + : ["manual"]; + }, + { channelId: CHANNEL_GENERAL, pubkey: SELF_PUBKEY }, + ); +} + +async function seedChannelActivity( + page: Page, + { + extraThreadCount = 0, + includeAgent = true, + }: { extraThreadCount?: number; includeAgent?: boolean } = {}, +) { + await page.goto("/"); + await page.getByTestId("channel-general").click(); + await expect(page.getByTestId("chat-title")).toHaveText("general"); + await waitForMockLiveSubscription(page, "general"); + + const ownRoot = await emitMockMessage( + page, + "How should the handoff work for longer agent tasks?", + { + pubkey: SELF_PUBKEY, + createdAt: Math.floor(Date.now() / 1000) - 20, + }, + ); + const extraRoots = await Promise.all( + Array.from({ length: extraThreadCount }, (_, index) => + emitMockMessage(page, `Overflow preview thread ${index + 1}`, { + pubkey: SELF_PUBKEY, + createdAt: Math.floor(Date.now() / 1000) - 19 + index, + }), + ), + ); + + await page.getByTestId("channel-random").click(); + await expect(page.getByTestId("chat-title")).toHaveText("random"); + + const unreadAt = Math.floor(Date.now() / 1000) + 60; + await emitMockMessage( + page, + "I tightened the empty state and added the direct thread link.", + { + parentEventId: "mock-general-welcome", + pubkey: TEST_IDENTITIES.alice.pubkey, + createdAt: unreadAt, + mentionPubkeys: [SELF_PUBKEY], + }, + ); + await emitMockMessage( + page, + "The updated interaction keeps context visible without opening the channel first.", + { + parentEventId: ownRoot.id, + pubkey: TEST_IDENTITIES.bob.pubkey, + createdAt: unreadAt + 1, + }, + ); + await Promise.all( + extraRoots.map((root, index) => + emitMockMessage( + page, + `A new reply in overflow preview thread ${index + 1}`, + { + parentEventId: root.id, + pubkey: TEST_IDENTITIES.alice.pubkey, + createdAt: unreadAt + 2 + index, + }, + ), + ), + ); + + if (includeAgent) { + await page.waitForFunction( + () => + typeof (window as Window & { __BUZZ_E2E_SEED_ACTIVE_TURNS__?: unknown }) + .__BUZZ_E2E_SEED_ACTIVE_TURNS__ === "function", + ); + await page.evaluate( + ({ agentPubkey, channelId }) => { + ( + window as Window & { + __BUZZ_E2E_SEED_ACTIVE_TURNS__?: (input: { + agentPubkey: string; + channelId: string; + turnId: string; + }) => void; + } + ).__BUZZ_E2E_SEED_ACTIVE_TURNS__?.({ + agentPubkey, + channelId, + turnId: "channel-hover-preview", + }); + }, + { agentPubkey: AGENT_PUBKEY, channelId: CHANNEL_GENERAL }, + ); + } + + await expect(page.getByTestId("channel-unread-dot-general")).toBeVisible(); + if (includeAgent) { + await expect(page.getByTestId("channel-working-general")).toBeVisible(); + } +} + +async function openActivityPopover(page: Page) { + await page.getByTestId("channel-general").hover(); + const popover = page.getByTestId("channel-activity-popover-general"); + await expect(popover).toBeVisible(); + return popover; +} + +test.describe("channel activity hover preview", () => { + test.beforeEach(async ({ page }) => { + await installMockBridge(page, { + managedAgents: [ + { + pubkey: AGENT_PUBKEY, + name: "Charlie", + status: "running", + channelNames: ["general"], + }, + ], + }); + }); + + test("shows unread channel activity and working agents, then opens the selected thread", async ({ + page, + }) => { + await seedChannelActivity(page, { extraThreadCount: 5 }); + const popover = await openActivityPopover(page); + + const heading = popover.getByRole("heading", { + name: "Channel activity", + }); + await expect(heading).toBeVisible(); + await expect(heading).toHaveCSS("backdrop-filter", /blur/); + const activityScroll = popover.getByTestId("channel-activity-scroll"); + await expect(activityScroll).toHaveCSS("overflow-y", "auto"); + await expect(activityScroll.getByRole("heading")).toHaveCount(0); + await expect + .poll(() => + activityScroll.evaluate( + (element) => element.scrollHeight > element.clientHeight, + ), + ) + .toBe(true); + await waitForAnimations(page); + const headingY = (await heading.boundingBox())?.y; + const scrollY = (await activityScroll.boundingBox())?.y; + const headingBottom = await heading.evaluate( + (element) => element.getBoundingClientRect().bottom, + ); + expect(scrollY).toBeGreaterThanOrEqual(headingBottom - 1); + await activityScroll.evaluate((element) => { + element.scrollTop = element.scrollHeight; + }); + await expect + .poll(() => activityScroll.evaluate((element) => element.scrollTop)) + .toBeGreaterThan(0); + const scrolledHeadingY = (await heading.boundingBox())?.y; + expect(headingY).toBeDefined(); + expect(scrolledHeadingY).toBeDefined(); + expect(Math.abs((scrolledHeadingY ?? 0) - (headingY ?? 0))).toBeLessThan( + 0.5, + ); + await activityScroll.evaluate((element) => { + element.scrollTop = 0; + }); + await expect + .poll(() => + activityScroll.evaluate( + (element) => + getComputedStyle(element, "::-webkit-scrollbar-thumb") + .backgroundColor, + ), + ) + .toMatch(/0\.15\)/); + await expect(popover.getByTestId(/^channel-activity-item-/)).toHaveCount(7); + await expect(popover).toContainText( + "I tightened the empty state and added the direct thread link.", + ); + await expect(popover.getByRole("heading")).toHaveCount(1); + await expect( + popover.getByTestId(`channel-activity-agent-${AGENT_PUBKEY}`), + ).toContainText("Charlie"); + await expect( + popover.getByTestId(`channel-activity-agent-${AGENT_PUBKEY}`), + ).toContainText("Working"); + const orderedRows = popover.locator( + '[data-testid^="channel-activity-agent-"], [data-testid^="channel-activity-item-"]', + ); + await expect(orderedRows.first()).toHaveAttribute( + "data-testid", + `channel-activity-agent-${AGENT_PUBKEY}`, + ); + + await waitForAnimations(page); + await page.screenshot({ + clip: { x: 0, y: 80, width: 720, height: 640 }, + path: "test-results/channel-activity-hover/channel-activity-popover.png", + }); + + const targetRow = popover + .getByTestId(/^channel-activity-item-/) + .filter({ hasText: "direct thread link" }); + await targetRow.getByRole("button", { name: /Open thread/ }).click(); + + await expect(page.getByTestId("chat-title")).toHaveText("general"); + const threadPanel = page.getByTestId("message-thread-panel"); + await expect(threadPanel).toBeVisible(); + await expect(threadPanel).toContainText("direct thread link"); + }); + + test("removes the dot and preview after the final activity is read", async ({ + page, + }) => { + await seedChannelActivity(page, { includeAgent: false }); + const popover = await openActivityPopover(page); + await expect(popover.getByTestId(/^channel-activity-item-/)).toHaveCount(2); + + for (let remaining = 1; remaining >= 0; remaining -= 1) { + const row = popover.getByTestId(/^channel-activity-item-/).first(); + await row.hover(); + await row.getByRole("button", { name: "Mark as read" }).click(); + await expect(popover.getByTestId(/^channel-activity-item-/)).toHaveCount( + remaining, + ); + } + + await expect(page.getByTestId("channel-unread-dot-general")).toHaveCount(0); + await expect( + page.getByTestId("channel-activity-popover-general"), + ).toHaveCount(0); + }); + + test("groups multiple unread replies against the previewed channel", async ({ + page, + }) => { + await seedChannelActivity(page, { includeAgent: false }); + await emitMockMessage( + page, + "A second unread reply should stay grouped with this thread.", + { + parentEventId: "mock-general-welcome", + pubkey: TEST_IDENTITIES.bob.pubkey, + createdAt: Math.floor(Date.now() / 1_000) + 120, + mentionPubkeys: [SELF_PUBKEY], + }, + ); + + const popover = await openActivityPopover(page); + const groupedRow = popover + .getByTestId(/^channel-activity-item-/) + .filter({ hasText: "direct thread link" }); + await expect(groupedRow).toContainText("2 unread"); + }); + + test("marks projected thread activity read from the active channel menu", async ({ + page, + }) => { + await seedChannelActivity(page, { includeAgent: false }); + await page.getByTestId("channel-general").click(); + await expect(page.getByTestId("chat-title")).toHaveText("general"); + await expect(page.getByTestId("channel-unread-dot-general")).toBeVisible(); + + await page.getByTestId("channel-general").click({ button: "right" }); + await expect( + page.getByRole("menuitem", { name: "Mark as read" }), + ).toBeVisible(); + await expect( + page.getByRole("menuitem", { name: "Mark unread" }), + ).toHaveCount(0); + await page.getByRole("menuitem", { name: "Mark as read" }).click(); + + await expect(page.getByTestId("channel-unread-dot-general")).toHaveCount(0); + }); + + test("marks projected thread activity read in the active channel with Shift+Escape", async ({ + page, + }) => { + await seedChannelActivity(page, { includeAgent: false }); + await page.getByTestId("channel-general").click(); + await expect(page.getByTestId("chat-title")).toHaveText("general"); + await expect(page.getByTestId("channel-unread-dot-general")).toBeVisible(); + + const shortcutHandled = await page.evaluate(() => { + const event = new KeyboardEvent("keydown", { + bubbles: true, + cancelable: true, + key: "Escape", + shiftKey: true, + }); + window.dispatchEvent(event); + return event.defaultPrevented; + }); + expect(shortcutHandled).toBe(true); + + await expect(page.getByTestId("channel-unread-dot-general")).toHaveCount(0); + await page.getByTestId("channel-general").hover(); + await expect( + page.getByTestId("channel-activity-popover-general"), + ).toHaveCount(0); + }); + + test("supports row actions and opens an agent's scoped activity", async ({ + page, + }) => { + await seedChannelActivity(page); + let popover = await openActivityPopover(page); + const initialRows = popover.getByTestId(/^channel-activity-item-/); + await expect(initialRows).toHaveCount(2); + + const firstRow = initialRows.first(); + await firstRow.hover(); + await firstRow.getByRole("button", { name: "Mark as read" }).click(); + await expect(popover.getByTestId(/^channel-activity-item-/)).toHaveCount(1); + + const remainingRow = popover.getByTestId(/^channel-activity-item-/).first(); + await remainingRow.hover(); + await remainingRow.getByRole("button", { name: "Remind me later" }).click(); + await expect( + page.getByRole("dialog").getByText("Remind me later"), + ).toBeVisible(); + await page.getByRole("button", { name: "Cancel" }).click(); + + popover = await openActivityPopover(page); + await popover.getByTestId(`channel-activity-agent-${AGENT_PUBKEY}`).click(); + + await expect(page.getByTestId("chat-title")).toHaveText("general"); + await expect(page.getByTestId("agent-session-agent-name")).toContainText( + "Charlie", + ); + await expect(page.getByTestId("agent-session-scope-label")).toContainText( + "#general", + ); + }); + + test("keeps multiple Inbox threads visible after opening their channel", async ({ + page, + }) => { + const inboxItemIds = [ + "older-inbox-thread-for-hover", + "second-inbox-thread-for-hover", + ]; + await page.goto("/"); + await page.getByTestId("channel-general").click(); + await expect(page.getByTestId("chat-title")).toHaveText("general"); + await page.getByRole("button", { name: "Inbox", exact: true }).click(); + await expect(page.getByTestId("home-inbox-list")).toBeVisible(); + await pushMockInboxFeedItems( + page, + inboxItemIds.map((id, index) => ({ + content: + index === 0 + ? "Older Inbox thread reopened for hover testing." + : "A second Inbox thread reopened for hover testing.", + id, + tags: [ + ["h", CHANNEL_GENERAL], + [ + "e", + index === 0 + ? "older-inbox-thread-root" + : "second-inbox-thread-root", + "", + "root", + ], + [ + "e", + index === 0 + ? "older-inbox-thread-parent" + : "second-inbox-thread-parent", + "", + "reply", + ], + ["p", TEST_IDENTITIES.tyler.pubkey], + ], + })), + ); + + for (const itemId of inboxItemIds) { + const inboxRow = page.getByTestId(`home-inbox-item-${itemId}`); + await expect(inboxRow).toBeVisible(); + await inboxRow.hover(); + await inboxRow.getByRole("button", { name: "Mark as read" }).click(); + await inboxRow.hover(); + await inboxRow.getByRole("button", { name: "Mark unread" }).click(); + } + + await expect(page.getByTestId("channel-general")).toHaveCSS( + "font-weight", + "600", + ); + for (const [index, itemId] of inboxItemIds.entries()) { + const inboxRow = page.getByTestId(`home-inbox-item-${itemId}`); + await inboxRow.hover(); + await inboxRow.getByRole("button", { name: "Mark as read" }).click(); + if (index === 0) { + await expect(page.getByTestId("channel-general")).toHaveCSS( + "font-weight", + "600", + ); + } + } + await expect(page.getByTestId("channel-general")).not.toHaveCSS( + "font-weight", + "600", + ); + for (const itemId of inboxItemIds) { + const inboxRow = page.getByTestId(`home-inbox-item-${itemId}`); + await inboxRow.hover(); + await inboxRow.getByRole("button", { name: "Mark unread" }).click(); + } + + await expect(page.getByTestId("channel-general")).toHaveCSS( + "font-weight", + "600", + ); + await expect(page.getByTestId("channel-unread-dot-general")).toBeVisible(); + await page.getByTestId("channel-general").click(); + await expect(page.getByTestId("chat-title")).toHaveText("general"); + await expect(page.getByTestId("channel-unread-dot-general")).toBeVisible(); + await page.mouse.move(900, 680); + let popover = await openActivityPopover(page); + await expect(popover.getByTestId(/^channel-activity-item-/)).toHaveCount(2); + await expect(popover).toContainText("Older Inbox thread reopened"); + await expect(popover).toContainText("A second Inbox thread reopened"); + await expect(popover.getByText("Thread", { exact: true })).toHaveCount(2); + + await popover + .getByTestId(/^channel-activity-item-/) + .filter({ hasText: "Older Inbox thread reopened" }) + .getByRole("button", { name: /Open thread/ }) + .click(); + await expect(popover).toBeHidden(); + await page.mouse.move(900, 680); + popover = await openActivityPopover(page); + await expect(popover.getByTestId(/^channel-activity-item-/)).toHaveCount(1); + await expect(popover).not.toContainText("Older Inbox thread reopened"); + await expect(page.getByTestId("channel-unread-dot-general")).toBeVisible(); + await expect(page.getByTestId("channel-general")).toHaveCSS( + "font-weight", + "600", + ); + + await page.mouse.move(900, 680); + await expect(popover).toBeHidden(); + await page.getByRole("button", { name: "Inbox", exact: true }).click(); + const topLevelItemId = "top-level-inbox-item-for-channel-read"; + await pushMockInboxFeedItems(page, [ + { + content: "Top-level Inbox item reopened for channel read testing.", + id: topLevelItemId, + tags: [ + ["h", CHANNEL_GENERAL], + ["p", TEST_IDENTITIES.tyler.pubkey], + ], + }, + ]); + const topLevelInboxRow = page.getByTestId( + `home-inbox-item-${topLevelItemId}`, + ); + await expect(topLevelInboxRow).toBeVisible(); + await topLevelInboxRow.hover(); + await topLevelInboxRow.getByRole("button", { name: "Mark unread" }).click(); + await page.getByTestId("channel-general").click({ button: "right" }); + await page.getByRole("menuitem", { name: "Mark as read" }).click(); + await topLevelInboxRow.hover(); + await expect( + topLevelInboxRow.getByRole("button", { name: "Mark unread" }), + ).toBeVisible(); + await expect(page.getByTestId("channel-unread-dot-general")).toHaveCount(0); + await page.getByTestId("channel-general").hover(); + await expect( + page.getByTestId("channel-activity-popover-general"), + ).toHaveCount(0); + await page.getByTestId("channel-random").click(); + await expect(page.getByTestId("chat-title")).toHaveText("random"); + await expect(page.getByTestId("channel-general")).not.toHaveCSS( + "font-weight", + "600", + ); + }); + + test("reading a grouped Inbox thread preserves an unrelated manual unread", async ({ + page, + }) => { + await page.goto("/"); + await page.getByTestId("channel-general").click(); + await expect(page.getByTestId("chat-title")).toHaveText("general"); + await waitForMockLiveSubscription(page, "general"); + + const manualUnreadMessage = await emitMockMessage( + page, + "Keep this separate timeline message unread.", + { + pubkey: TEST_IDENTITIES.bob.pubkey, + createdAt: Math.floor(Date.now() / 1_000), + }, + ); + const manualUnreadRow = page + .getByTestId("message-row") + .filter({ hasText: "Keep this separate timeline message unread." }); + await manualUnreadRow.hover(); + await page.getByTestId(`more-actions-${manualUnreadMessage.id}`).click(); + await page + .getByTestId(`mark-read-toggle-${manualUnreadMessage.id}`) + .click(); + + await page.getByRole("button", { name: "Inbox", exact: true }).click(); + const groupedRootId = "grouped-inbox-root-preserve-manual"; + const groupedReplyId = "grouped-inbox-reply-preserve-manual"; + await pushMockInboxFeedItems(page, [ + { + content: "Grouped Inbox root for manual unread preservation.", + id: groupedRootId, + tags: [ + ["h", CHANNEL_GENERAL], + ["p", TEST_IDENTITIES.tyler.pubkey], + ], + }, + { + content: "Grouped Inbox reply marked read independently.", + id: groupedReplyId, + tags: [ + ["h", CHANNEL_GENERAL], + ["e", groupedRootId, "", "root"], + ["e", groupedRootId, "", "reply"], + ["p", TEST_IDENTITIES.tyler.pubkey], + ], + }, + ]); + const groupedInboxRow = page.getByTestId( + `home-inbox-item-${groupedReplyId}`, + ); + await expect(groupedInboxRow).toBeVisible(); + await groupedInboxRow.hover(); + await groupedInboxRow.getByRole("button", { name: "Mark as read" }).click(); + + await page.getByTestId("channel-random").click(); + await expect(page.getByTestId("channel-general")).toHaveCSS( + "font-weight", + "600", + ); + }); + + test("preserves Inbox ownership while another top-level row remains unread", async ({ + page, + }) => { + await page.goto("/"); + await page.getByTestId("channel-general").click(); + await expect(page.getByTestId("chat-title")).toHaveText("general"); + await page.getByRole("button", { name: "Inbox", exact: true }).click(); + const topLevelItemIds = [ + "first-top-level-inbox-owner", + "second-top-level-inbox-owner", + ]; + await pushMockInboxFeedItems( + page, + topLevelItemIds.map((id, index) => ({ + content: `Top-level Inbox owner ${index + 1}.`, + id, + tags: [ + ["h", CHANNEL_GENERAL], + ["p", TEST_IDENTITIES.tyler.pubkey], + ], + })), + ); + for (const itemId of topLevelItemIds) { + const inboxRow = page.getByTestId(`home-inbox-item-${itemId}`); + await expect(inboxRow).toBeVisible(); + await inboxRow.hover(); + await inboxRow.getByRole("button", { name: "Mark unread" }).click(); + } + await expect(page.getByTestId("channel-general")).toHaveCSS( + "font-weight", + "600", + ); + await expect.poll(() => getForcedUnreadSources(page)).toEqual(["inbox"]); + + await page.getByRole("button", { name: "Inbox", exact: true }).click(); + for (const [index, itemId] of topLevelItemIds.entries()) { + const inboxRow = page.getByTestId(`home-inbox-item-${itemId}`); + await inboxRow.hover(); + await inboxRow.getByRole("button", { name: "Mark as read" }).click(); + if (index === 0) { + await expect(page.getByTestId("channel-general")).toHaveCSS( + "font-weight", + "600", + ); + await expect + .poll(() => getForcedUnreadSources(page)) + .toEqual(["inbox"]); + } + } + await expect.poll(() => getForcedUnreadSources(page)).toEqual([]); + }); + + test("surfaces future replies after the user reacts to a thread root", async ({ + page, + }) => { + await page.goto("/"); + await page.getByTestId("channel-general").click(); + await expect(page.getByTestId("chat-title")).toHaveText("general"); + await waitForMockLiveSubscription(page, "general"); + + const root = await emitMockMessage( + page, + "Reacting here means I care about future replies.", + { + pubkey: TEST_IDENTITIES.alice.pubkey, + createdAt: Math.floor(Date.now() / 1_000) - 20, + }, + ); + const rootRow = page + .getByTestId("message-row") + .filter({ hasText: "Reacting here means I care" }); + await expect(rootRow).toBeVisible(); + await rootRow.hover(); + const actionBar = page.getByTestId(`message-action-bar-${root.id}`); + await expect(actionBar).toBeVisible(); + await actionBar + .getByRole("button", { name: /^React with / }) + .first() + .click(); + await expect( + rootRow.getByRole("button", { name: /^Toggle .* reaction$/ }), + ).toBeVisible(); + + await page.getByTestId("channel-random").click(); + await emitMockMessage( + page, + "This follow-up appears because the root was reacted to.", + { + parentEventId: root.id, + pubkey: TEST_IDENTITIES.bob.pubkey, + createdAt: Math.floor(Date.now() / 1_000) + 60, + }, + ); + + await expect(page.getByTestId("channel-unread-dot-general")).toBeVisible(); + const popover = await openActivityPopover(page); + await expect(popover).toContainText( + "This follow-up appears because the root was reacted to.", + ); + }); +}); diff --git a/desktop/tests/e2e/channel-mute.spec.ts b/desktop/tests/e2e/channel-mute.spec.ts index a710ca245f..23602f486a 100644 --- a/desktop/tests/e2e/channel-mute.spec.ts +++ b/desktop/tests/e2e/channel-mute.spec.ts @@ -85,7 +85,7 @@ test.describe("channel muting", () => { await expect(engRow.locator("svg.lucide-bell-off")).toHaveCount(1); }); - test("03 — muted channel with @mention shows unread dot", async ({ + test("03 — muted channel with a top-level @mention is emphasized", async ({ page, }) => { await seedMuteState(page, ENGINEERING_CHANNEL_ID); @@ -123,7 +123,13 @@ test.describe("channel muting", () => { }, ); - await expect(page.getByTestId("channel-unread-engineering")).toBeVisible(); + await expect(page.getByTestId("channel-engineering")).toHaveCSS( + "font-weight", + "600", + ); + await expect( + page.getByTestId("channel-unread-dot-engineering"), + ).toHaveCount(0); }); test("04 — context menu shows Unmute channel when muted", async ({ diff --git a/desktop/tests/e2e/thread-unread.spec.ts b/desktop/tests/e2e/thread-unread.spec.ts index 586ca3dd12..f4f45d3319 100644 --- a/desktop/tests/e2e/thread-unread.spec.ts +++ b/desktop/tests/e2e/thread-unread.spec.ts @@ -711,7 +711,7 @@ test.describe("thread unread indicator", () => { await expect(badge).toContainText("3"); }); - // Thread-only replies now also light the channel sidebar badge. Viewing the + // Thread-only replies now also light the channel sidebar dot. Viewing the // channel should leave unopened thread replies unread until the thread is read. test("11-thread-reply-lights-sidebar-badge-after-channel-view", async ({ page, @@ -748,15 +748,15 @@ test.describe("thread unread indicator", () => { await expect(page.getByTestId("chat-title")).toHaveText("general"); // The crux: leave general. The unopened thread reply should still keep a - // numeric channel sidebar badge until the thread itself is read. + // channel sidebar dot until the thread itself is read. await page.getByTestId("channel-random").click(); await expect(page.getByTestId("chat-title")).toHaveText("random"); - await expect(page.getByTestId("channel-unread-general")).toBeVisible(); + await expect(page.getByTestId("channel-unread-dot-general")).toBeVisible(); }); // Regression guard for the all-replies window: when the loaded window holds // ONLY thread replies (the top-level root has scrolled past the history - // limit), thread-only activity should still light the channel sidebar badge. + // limit), thread-only activity should still light the channel sidebar dot. // // The `all-replies` fixture carries a far-future `lastMessageAt` (standing in // for the backend's reply-inclusive MAX) with no top-level message in its @@ -768,8 +768,7 @@ test.describe("thread unread indicator", () => { // Emit ONE reply whose parent root is NOT in the window (orphan parent id), // so the loaded window is all-replies: no top-level message exists for // `latestActiveMessage` to find. The reply mentions the current user so it - // clears the notify gate and creates Inbox activity without lighting the - // channel sidebar dot. + // clears the notify gate and creates Inbox thread activity. await page.getByTestId("channel-general").click(); await expect(page.getByTestId("chat-title")).toHaveText("general"); await waitForMockLiveSubscription(page, "all-replies"); @@ -779,17 +778,21 @@ test.describe("thread unread indicator", () => { mentionPubkeys: [SELF_PUBKEY], createdAt: unreadTimestamp(), }); - await expect(page.getByTestId("channel-unread-all-replies")).toHaveCount(0); + await expect( + page.getByTestId("channel-unread-dot-all-replies"), + ).toBeVisible(); // View all-replies while the reply is unread. await page.getByTestId("channel-all-replies").click(); await expect(page.getByTestId("chat-title")).toHaveText("all-replies"); // The crux: leave the channel. Its unopened thread reply should still keep - // a numeric channel sidebar badge until the thread itself is read. + // a channel sidebar dot until the thread itself is read. await page.getByTestId("channel-general").click(); await expect(page.getByTestId("chat-title")).toHaveText("general"); - await expect(page.getByTestId("channel-unread-all-replies")).toBeVisible(); + await expect( + page.getByTestId("channel-unread-dot-all-replies"), + ).toBeVisible(); }); // Regression guard for BUG-2 (clear-on-read): opening an unread thread marks diff --git a/desktop/tests/e2e/unread-pill.spec.ts b/desktop/tests/e2e/unread-pill.spec.ts index 63f42d12ac..88169d9636 100644 --- a/desktop/tests/e2e/unread-pill.spec.ts +++ b/desktop/tests/e2e/unread-pill.spec.ts @@ -198,9 +198,12 @@ test.describe("unread pill & divider", () => { await page.getByTestId("channel-random").click(); await expect(page.getByTestId("chat-title")).toHaveText("random"); - // The unread indicator only renders on inactive channels, so it appears - // once general is no longer the active channel. - await expect(page.getByTestId("channel-unread-general")).toBeVisible(); + // Forced channel unread uses channel-name emphasis, not the thread dot. + await expect(page.getByTestId("channel-general")).toHaveCSS( + "font-weight", + "600", + ); + await expect(page.getByTestId("channel-unread-dot-general")).toHaveCount(0); await page.getByTestId("channel-general").click(); await expect(page.getByTestId("chat-title")).toHaveText("general"); From 01c80aa9b3eaa569361966877994438ad84a280a Mon Sep 17 00:00:00 2001 From: Taylor Ho Date: Mon, 3 Aug 2026 09:29:40 -0700 Subject: [PATCH 09/27] fix(desktop): save key backups to authorized path (#4022) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Category:** fix **User Impact:** Users can save password-protected identity backups directly to protected macOS folders such as Downloads. **Problem:** Signed macOS builds could not save a portable `.ncryptsec` backup to Downloads because the atomic writer created an unauthorized sibling temporary file. This surfaced as an “Operation not permitted” error after the user completed backup creation. **Solution:** Portable exports now write only to the exact path authorized by the native Save panel, sync and verify the saved bytes, and refuse to truncate an existing backup. Buzz’s app-managed backup retains its atomic writer and durability guarantees.
File changes **desktop/src-tauri/src/commands/export_util.rs** Clarifies that secret exports use a dedicated writer compatible with native Save-panel authorization. **desktop/src-tauri/src/commands/identity.rs** Routes portable NIP-49 exports through the Save-panel-compatible writer while preserving canonical app state. **desktop/src-tauri/src/key_backup.rs** Adds an exclusive-create portable writer with owner-only permissions, disk sync, byte verification, and cleanup on failure. Keeps the existing atomic writer for app-managed backups. **desktop/src-tauri/src/key_backup_tests.rs** Covers portable export permissions, absence of sibling files, and preservation of existing backups.
## Reproduction steps 1. Install a signed macOS build containing this change. 2. Open **Settings → Profile → Private key → Create backup** and complete backup creation. 3. Save a fresh `identity.ncryptsec` file into `~/Downloads` and confirm Buzz reports success. 4. Open and verify the saved backup with its password. 5. Repeat the save using an existing filename and confirm Buzz preserves the existing file and asks for a new filename. ## Verification - Full desktop Tauri suite: 2,049 passed, 14 ignored - Diagnostic suite: 3 passed - Focused backup coverage: 30 passed - Tauri clippy (`--all-targets -D warnings`), Rust formatting, and `git diff --check`: passed - Push hooks: org safety, branch skew, and desktop Tauri checks passed Signed-production Downloads smoke remains required after merge because the signing workflow is restricted to `main`. Signed-off-by: Taylor Ho Co-authored-by: npub1223z34hd7vtwc6qj4s7flsxkj644nlre2nthu7lrrmkumhu3xddsrx9r6w <52a228d6edf316ec6812ac3c9fc0d696ab59fc7954d77e7be31eedcddf91335b@buzz.block.builderlab.xyz> --- desktop/src-tauri/src/commands/export_util.rs | 4 +- desktop/src-tauri/src/commands/identity.rs | 9 +-- desktop/src-tauri/src/key_backup.rs | 59 ++++++++++++++++++- desktop/src-tauri/src/key_backup_tests.rs | 39 ++++++++++++ 4 files changed, 103 insertions(+), 8 deletions(-) diff --git a/desktop/src-tauri/src/commands/export_util.rs b/desktop/src-tauri/src/commands/export_util.rs index ded14679c1..e12cbd19e1 100644 --- a/desktop/src-tauri/src/commands/export_util.rs +++ b/desktop/src-tauri/src/commands/export_util.rs @@ -35,8 +35,8 @@ pub async fn pick_save_path( /// user cancelled the dialog. /// /// NOT for secrets: the write is plain `std::fs::write` (no atomic commit, no -/// 0o600). Secret exports go through `pick_save_path` + -/// `key_backup::write_backup_file`. +/// 0o600). Secret exports go through `pick_save_path` and a dedicated +/// secret-file writer such as `key_backup::write_portable_backup_file`. pub async fn save_bytes_with_dialog( app: &AppHandle, suggested_filename: &str, diff --git a/desktop/src-tauri/src/commands/identity.rs b/desktop/src-tauri/src/commands/identity.rs index 33ecf3cfca..bddf2e725a 100644 --- a/desktop/src-tauri/src/commands/identity.rs +++ b/desktop/src-tauri/src/commands/identity.rs @@ -297,9 +297,10 @@ pub async fn verify_ncryptsec_backup( /// Save a portable copy of an `ncryptsec1…` backup to a user-chosen path. /// /// The input must parse as a structurally valid NIP-49 payload. The dialog is -/// selection-only; the write uses secret-file semantics (atomic + 0o600). -/// Never mutates canonical app state. Returns the chosen path, or `None` when -/// the user cancelled. +/// selection-only; the write uses the exact save-panel-authorized path with +/// owner-only permissions, sync, and reread verification. Existing files are +/// preserved rather than truncated. Never mutates canonical app state. Returns +/// the chosen path, or `None` when the user cancelled. #[tauri::command] pub async fn save_ncryptsec_copy( ncryptsec: String, @@ -324,7 +325,7 @@ pub async fn save_ncryptsec_copy( let dest_for_write = dest.clone(); tokio::task::spawn_blocking(move || { - crate::key_backup::write_backup_file(&dest_for_write, &normalized) + crate::key_backup::write_portable_backup_file(&dest_for_write, &normalized) }) .await .map_err(|e| format!("spawn_blocking failed: {e}"))??; diff --git a/desktop/src-tauri/src/key_backup.rs b/desktop/src-tauri/src/key_backup.rs index f97bf95a67..e8fcc8abe4 100644 --- a/desktop/src-tauri/src/key_backup.rs +++ b/desktop/src-tauri/src/key_backup.rs @@ -133,9 +133,14 @@ pub fn backup_file_path(data_dir: &std::path::Path) -> std::path::PathBuf { data_dir.join(BACKUP_FILE_NAME) } -/// Atomically write `ncryptsec` to `path` with owner-only permissions, then -/// reread and byte-compare. Same crash-safety pattern as +/// Atomically write the app-managed `ncryptsec` backup with owner-only +/// permissions, then reread and byte-compare. Same crash-safety pattern as /// `app_state::save_key_file`. +/// +/// Portable exports selected through a native save panel must use +/// [`write_portable_backup_file`] instead: sandboxed macOS grants access to the +/// selected path, but not to the sibling temporary file this writer needs. +#[allow(dead_code)] // Retained for durable app-managed backups; portable exports must not use it. pub fn write_backup_file(path: &std::path::Path, ncryptsec: &str) -> Result<(), String> { use atomic_write_file::AtomicWriteFile; use std::io::Write; @@ -155,6 +160,56 @@ pub fn write_backup_file(path: &std::path::Path, ncryptsec: &str) -> Result<(), file.commit() .map_err(|e| format!("commit backup file: {e}"))?; + verify_backup_file(path, ncryptsec) +} + +/// Write a user-selected portable backup without creating a sibling file. +/// +/// Native macOS save panels authorize the exact selected path in protected +/// folders such as Downloads, not an atomic writer's hidden sibling. Opening +/// with `create_new` uses only that authorized path and also guarantees an +/// existing backup is never truncated: users must choose a new filename when +/// the destination already exists. After writing, the file is synced and its +/// persisted bytes are reread before success is reported. +pub fn write_portable_backup_file(path: &std::path::Path, ncryptsec: &str) -> Result<(), String> { + use std::io::Write; + + let mut options = std::fs::OpenOptions::new(); + options.write(true).create_new(true); + #[cfg(unix)] + { + use std::os::unix::fs::OpenOptionsExt; + options.mode(0o600); + } + + let mut file = options.open(path).map_err(|error| { + if error.kind() == std::io::ErrorKind::AlreadyExists { + "backup file already exists; choose a new filename so the existing backup stays safe" + .to_string() + } else { + format!("create portable backup file: {error}") + } + })?; + + let write_result = file + .write_all(ncryptsec.as_bytes()) + .map_err(|e| format!("write portable backup file: {e}")) + .and_then(|()| { + file.sync_all() + .map_err(|e| format!("sync portable backup file: {e}")) + }); + drop(file); + + let result = write_result.and_then(|()| verify_backup_file(path, ncryptsec)); + if result.is_err() { + // This function created the destination exclusively, so cleanup cannot + // clobber a backup that existed before the save attempt. + let _ = std::fs::remove_file(path); + } + result +} + +fn verify_backup_file(path: &std::path::Path, ncryptsec: &str) -> Result<(), String> { // Reread and byte-compare: only report success for bytes that are // actually on disk. let on_disk = std::fs::read_to_string(path).map_err(|e| format!("reread backup file: {e}"))?; diff --git a/desktop/src-tauri/src/key_backup_tests.rs b/desktop/src-tauri/src/key_backup_tests.rs index b9713201e1..35b486f78d 100644 --- a/desktop/src-tauri/src/key_backup_tests.rs +++ b/desktop/src-tauri/src/key_backup_tests.rs @@ -160,6 +160,45 @@ fn write_backup_file_overwrites_atomically() { assert_eq!(entries, vec![std::ffi::OsString::from(BACKUP_FILE_NAME)]); } +#[test] +fn write_portable_backup_file_persists_0600_without_a_sibling() { + let dir = tempfile::tempdir().unwrap(); + let path = dir.path().join("portable.ncryptsec"); + write_portable_backup_file(&path, SPEC_NCRYPTSEC).unwrap(); + + assert_eq!(std::fs::read_to_string(&path).unwrap(), SPEC_NCRYPTSEC); + let entries: Vec<_> = std::fs::read_dir(dir.path()) + .unwrap() + .map(|entry| entry.unwrap().file_name()) + .collect(); + assert_eq!( + entries, + vec![std::ffi::OsString::from("portable.ncryptsec")] + ); + + #[cfg(unix)] + { + use std::os::unix::fs::PermissionsExt; + let mode = std::fs::metadata(&path).unwrap().permissions().mode(); + assert_eq!(mode & 0o777, 0o600, "portable backup must be owner-only"); + } +} + +#[test] +fn write_portable_backup_file_preserves_an_existing_backup() { + let dir = tempfile::tempdir().unwrap(); + let path = dir.path().join("portable.ncryptsec"); + std::fs::write(&path, "ncryptsec1existing").unwrap(); + + let error = write_portable_backup_file(&path, SPEC_NCRYPTSEC).unwrap_err(); + + assert!(error.contains("already exists"), "{error}"); + assert_eq!( + std::fs::read_to_string(&path).unwrap(), + "ncryptsec1existing" + ); +} + #[test] fn delete_backup_file_is_idempotent() { let dir = tempfile::tempdir().unwrap(); From c1b88af8d71d1cf6aaca517e92ce9e918cd0e8bd Mon Sep 17 00:00:00 2001 From: Wes Date: Mon, 3 Aug 2026 10:30:15 -0600 Subject: [PATCH 10/27] feat(desktop): improve channel template discovery (#4549) ## Summary - move **Channel templates** from Communities to Personal settings - always expose the template picker in New Channel, using **None** as the no-template value - create a channel template directly from the picker and select it on return - preview the selected template's current visibility, canvas, agents, and teams - order the channel-creation controls as **Type / Visibility / Template** and mark Template **Optional** - cover populated and empty libraries, inline creation, selection, visibility overrides, mixed agent/team inventory, field order, optional labeling, and settings navigation in Playwright ## Validation Validated at desktop-only tip `76442270c88aa1d533ddca5de9f87cd615183919` with a clean worktree: - focused channel-template Playwright: 2/2 passed - Type / Visibility / Template ordering and muted Optional treatment visually inspected in the replacement screenshot - `git diff --check origin/main...HEAD` passed - PR diff contains exactly nine Desktop files and no Mobile files The pre-push hook was bypassed only for the corrected history push because the inherited Mobile test `keeps follow mode off while a tall newest message stays visible` passes in Linux CI but fails on macOS because its offscreen-child mounting assertion is platform-sensitive. No Mobile code or tests are changed by this PR. ## Screenshot ![New Channel with Type, Visibility, and optional Template](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/4549/create-channel-type-visibility-template.png) Originating Buzz channel: `efba7343-e147-48b7-a2aa-15a5f04abc57` --------- Signed-off-by: Wes Co-authored-by: Carl --- .../channels/ui/ChannelTypeSettings.tsx | 6 +- .../ui/ChannelTemplatesSettingsCard.tsx | 7 +- .../features/settings/ui/SettingsPanels.tsx | 2 +- .../src/features/settings/ui/SettingsView.tsx | 3 +- .../sidebar/lib/useCreateChannelForm.ts | 16 +- .../sidebar/ui/CreateChannelFormFields.tsx | 158 +++++++++++------- desktop/src/testing/e2eBridge.ts | 44 +++++ desktop/tests/e2e/channels.spec.ts | 81 ++++++++- desktop/tests/e2e/profile.spec.ts | 7 + 9 files changed, 250 insertions(+), 74 deletions(-) diff --git a/desktop/src/features/channels/ui/ChannelTypeSettings.tsx b/desktop/src/features/channels/ui/ChannelTypeSettings.tsx index 1ff11d2104..6883f4cad1 100644 --- a/desktop/src/features/channels/ui/ChannelTypeSettings.tsx +++ b/desktop/src/features/channels/ui/ChannelTypeSettings.tsx @@ -34,6 +34,7 @@ const CHANNEL_TYPE_RESIZE_TRANSITION = { export function ChannelTypeSettings({ disabled, + label = "Channel type", onOpenChange, onTemporaryChange, onTtlSecondsChange, @@ -43,6 +44,7 @@ export function ChannelTypeSettings({ ttlSeconds, }: { disabled?: boolean; + label?: string; onOpenChange?: (open: boolean) => void; onTemporaryChange: (temporary: boolean) => void; onTtlSecondsChange: (ttlSeconds: number) => void; @@ -77,9 +79,7 @@ export function ChannelTypeSettings({ className="flex items-center justify-between gap-3 px-3 py-3" data-testid={`${testIdPrefix}-channel-type-row`} > - - Channel type - + {label} void; + onCreated?: (template: ChannelTemplate) => void; }) { const isEditing = template !== null; const createMutation = useCreateChannelTemplateMutation(); @@ -388,8 +390,9 @@ function TemplateFormDialog({ }; createMutation.mutate(input, { - onSuccess: () => { + onSuccess: (created) => { toast.success(`Created "${trimmedName}"`); + onCreated?.(created); onOpenChange(false); }, onError: (error) => { diff --git a/desktop/src/features/settings/ui/SettingsPanels.tsx b/desktop/src/features/settings/ui/SettingsPanels.tsx index 5c997efbc4..162150e7c6 100644 --- a/desktop/src/features/settings/ui/SettingsPanels.tsx +++ b/desktop/src/features/settings/ui/SettingsPanels.tsx @@ -189,7 +189,7 @@ export const settingsSections: SettingsSectionDescriptor[] = [ }, { value: "channel-templates", - label: "Templates", + label: "Channel templates", icon: LayoutTemplate, featureGate: "channel-templates", }, diff --git a/desktop/src/features/settings/ui/SettingsView.tsx b/desktop/src/features/settings/ui/SettingsView.tsx index 8613880571..991029dca7 100644 --- a/desktop/src/features/settings/ui/SettingsView.tsx +++ b/desktop/src/features/settings/ui/SettingsView.tsx @@ -62,11 +62,12 @@ const settingsNavGroups: Array<{ "shortcuts", "custom-emoji", "local-archive", + "channel-templates", ], }, { label: "Communities", - sections: ["hosted-communities", "channel-templates", "community-members"], + sections: ["hosted-communities", "community-members"], }, { label: "App", diff --git a/desktop/src/features/sidebar/lib/useCreateChannelForm.ts b/desktop/src/features/sidebar/lib/useCreateChannelForm.ts index b227c0ae32..af03b9e4dd 100644 --- a/desktop/src/features/sidebar/lib/useCreateChannelForm.ts +++ b/desktop/src/features/sidebar/lib/useCreateChannelForm.ts @@ -46,6 +46,7 @@ export type CreateChannelFormState = { errorMessage: string | null; selectedTemplateId: string | null; handleTemplateChange: (templateId: string) => void; + handleTemplateCreated: (template: ChannelTemplate) => void; templates: ChannelTemplate[]; nameInputRef: React.RefObject; isCreating: boolean; @@ -120,6 +121,13 @@ export function useCreateChannelForm({ return () => globalThis.clearTimeout(timerId); }, [active, autoFocusName, initialName]); + const applyTemplate = React.useCallback((template: ChannelTemplate) => { + setSelectedTemplateId(template.id); + setDescription(template.description ?? ""); + if (!visibilityTouchedRef.current) setVisibility(template.visibility); + setErrorMessage(null); + }, []); + const handleTemplateChange = React.useCallback( (templateId: string) => { if (!templateId) { @@ -135,12 +143,9 @@ export function useCreateChannelForm({ ); if (!template) return; - setSelectedTemplateId(templateId); - setDescription(template.description ?? ""); - if (!visibilityTouchedRef.current) setVisibility(template.visibility); - setErrorMessage(null); + applyTemplate(template); }, - [templates], + [applyTemplate, templates], ); const handleSubmit = React.useCallback( @@ -211,6 +216,7 @@ export function useCreateChannelForm({ errorMessage, selectedTemplateId, handleTemplateChange, + handleTemplateCreated: applyTemplate, templates, nameInputRef, isCreating, diff --git a/desktop/src/features/sidebar/ui/CreateChannelFormFields.tsx b/desktop/src/features/sidebar/ui/CreateChannelFormFields.tsx index 5fadf2a10a..01f5af478e 100644 --- a/desktop/src/features/sidebar/ui/CreateChannelFormFields.tsx +++ b/desktop/src/features/sidebar/ui/CreateChannelFormFields.tsx @@ -1,13 +1,16 @@ -import { ChevronDown } from "lucide-react"; +import { ChevronDown, Plus } from "lucide-react"; +import * as React from "react"; -import type { ChannelTemplate } from "@/shared/api/types"; +import { TemplateFormDialog } from "@/features/settings/ui/ChannelTemplatesSettingsCard"; import { cn } from "@/shared/lib/cn"; import { Button } from "@/shared/ui/button"; import { DropdownMenu, DropdownMenuContent, + DropdownMenuItem, DropdownMenuRadioGroup, DropdownMenuRadioItem, + DropdownMenuSeparator, DropdownMenuTrigger, } from "@/shared/ui/dropdown-menu"; import { Input } from "@/shared/ui/input"; @@ -39,9 +42,27 @@ export function CreateChannelFormFields({ form: CreateChannelFormState; }) { const { channelKind, kindLabel, isCreating } = form; + const [isCreateTemplateOpen, setIsCreateTemplateOpen] = React.useState(false); const selectedTemplate = form.templates.find( (template) => template.id === form.selectedTemplateId, ); + const selectedTemplatePersonaCount = + selectedTemplate?.agents.personas.length ?? 0; + const selectedTemplateTeamCount = selectedTemplate?.agents.teams.length ?? 0; + const selectedTemplateSummary = selectedTemplate + ? [ + form.visibility === "private" ? "Private" : "Open", + selectedTemplate.canvasTemplate ? "Canvas included" : null, + selectedTemplatePersonaCount > 0 + ? `${selectedTemplatePersonaCount} ${selectedTemplatePersonaCount === 1 ? "agent" : "agents"}` + : null, + selectedTemplateTeamCount > 0 + ? `${selectedTemplateTeamCount} ${selectedTemplateTeamCount === 1 ? "team" : "teams"}` + : null, + ] + .filter(Boolean) + .join(" · ") + : null; return (
@@ -107,6 +128,7 @@ export function CreateChannelFormFields({ - {form.templates.length > 0 ? ( -
- - Template - Optional - - - - - - event.preventDefault()} - style={{ - minWidth: "var(--radix-dropdown-menu-trigger-width)", - }} - > - - form.handleTemplateChange( - templateId === NO_TEMPLATE_VALUE ? "" : templateId, - ) - } - value={form.selectedTemplateId ?? NO_TEMPLATE_VALUE} - > - - No template - - {form.templates.map((template: ChannelTemplate) => ( - - {template.name} - - ))} - - - -
- ) : null} - +
+ + Template + Optional + + + + + + event.preventDefault()} + style={{ + minWidth: "var(--radix-dropdown-menu-trigger-width)", + }} + > + + form.handleTemplateChange( + templateId === NO_TEMPLATE_VALUE ? "" : templateId, + ) + } + value={form.selectedTemplateId ?? NO_TEMPLATE_VALUE} + > + + None + + {form.templates.map((template) => ( + + {template.name} + + ))} + + + setIsCreateTemplateOpen(true)}> + + Create new channel template… + + + + +
+ {selectedTemplateSummary ? ( +

+ {selectedTemplateSummary} +

+ ) : null} + {form.errorMessage ? (

{form.errorMessage}

) : null} diff --git a/desktop/src/testing/e2eBridge.ts b/desktop/src/testing/e2eBridge.ts index 037274176e..03d37ed72e 100644 --- a/desktop/src/testing/e2eBridge.ts +++ b/desktop/src/testing/e2eBridge.ts @@ -11201,6 +11201,50 @@ export function maybeInstallE2eTauriMocks() { created_at: template.createdAt, updated_at: template.updatedAt, })); + case "create_channel_template": { + const { input } = payload as { + input: { + name: string; + description?: string; + channelType?: "stream" | "forum"; + visibility?: "open" | "private"; + canvasTemplate?: string; + agents?: ChannelTemplate["agents"]; + }; + }; + const timestamp = new Date().toISOString(); + const created: ChannelTemplate = { + id: `template-${Date.now()}`, + name: input.name, + description: input.description ?? null, + channelType: input.channelType ?? "stream", + visibility: input.visibility ?? "open", + canvasTemplate: input.canvasTemplate ?? null, + agents: input.agents ?? { personas: [], teams: [] }, + isBuiltin: false, + createdAt: timestamp, + updatedAt: timestamp, + }; + if (activeConfig) { + activeConfig.mock ??= {}; + activeConfig.mock.channelTemplates = [ + ...(activeConfig.mock.channelTemplates ?? []), + created, + ]; + } + return { + id: created.id, + name: created.name, + description: created.description, + channel_type: created.channelType, + visibility: created.visibility, + canvas_template: created.canvasTemplate, + agents: created.agents, + is_builtin: created.isBuiltin, + created_at: created.createdAt, + updated_at: created.updatedAt, + }; + } case "create_team": return handleCreateTeam( payload as Parameters[0], diff --git a/desktop/tests/e2e/channels.spec.ts b/desktop/tests/e2e/channels.spec.ts index 9da4022420..e9c5b42638 100644 --- a/desktop/tests/e2e/channels.spec.ts +++ b/desktop/tests/e2e/channels.spec.ts @@ -1336,8 +1336,26 @@ test("create channel template selector matches the lifecycle controls", async ({ description: "Coordinate a new project from planning through launch.", channelType: "stream", visibility: "private", - canvasTemplate: null, - agents: { personas: [], teams: [] }, + canvasTemplate: "# {channel.name}\n\nKickoff notes", + agents: { + personas: [ + { + personaId: "planner", + runtime: null, + model: null, + role: null, + backend: null, + }, + ], + teams: [ + { + teamId: "research-team", + runtime: null, + model: null, + backend: null, + }, + ], + }, isBuiltin: false, createdAt: "2026-07-23T00:00:00Z", updatedAt: "2026-07-23T00:00:00Z", @@ -1350,17 +1368,74 @@ test("create channel template selector matches the lifecycle controls", async ({ const templateControl = page.getByTestId("create-channel-template"); await expect(templateControl).toHaveRole("button"); - await expect(templateControl).toHaveText("No template"); + await expect(templateControl).toHaveText("None"); await templateControl.click(); + await expect( + page.getByRole("menuitem", { name: "Create new channel template…" }), + ).toBeVisible(); await page.getByRole("menuitemradio", { name: "Project kickoff" }).click(); await expect(templateControl).toHaveText("Project kickoff"); + await expect(page.getByTestId("create-channel-template-summary")).toHaveText( + "Private · Canvas included · 1 agent · 1 team", + ); await expect(page.getByTestId("create-channel-description")).toHaveValue( "Coordinate a new project from planning through launch.", ); await expect(page.getByTestId("create-channel-permissions")).toContainText( "Private", ); + await page.getByTestId("create-channel-permissions").click(); + await page.getByTestId("create-channel-permissions-option-open").click(); + await expect(page.getByTestId("create-channel-template-summary")).toHaveText( + "Open · Canvas included · 1 agent · 1 team", + ); +}); + +test("create channel exposes templates when the library is empty", async ({ + page, +}) => { + await installMockBridge(page, { channelTemplates: [] }); + await page.goto("/"); + await openCreateChannelDialog(page); + + const typeContainer = page.getByTestId( + "create-channel-channel-type-container", + ); + const visibilityContainer = page.getByTestId( + "create-channel-permissions-container", + ); + const templateContainer = page.getByTestId( + "create-channel-template-container", + ); + await expect(templateContainer).toContainText("TemplateOptional"); + const typeBox = await typeContainer.boundingBox(); + const visibilityBox = await visibilityContainer.boundingBox(); + const templateBox = await templateContainer.boundingBox(); + expect(typeBox).not.toBeNull(); + expect(visibilityBox).not.toBeNull(); + expect(templateBox).not.toBeNull(); + expect(typeBox?.y ?? 0).toBeLessThan(visibilityBox?.y ?? 0); + expect(visibilityBox?.y ?? 0).toBeLessThan(templateBox?.y ?? 0); + + const templateControl = page.getByTestId("create-channel-template"); + await expect(templateControl).toHaveText("None"); + await templateControl.click(); + await page + .getByRole("menuitem", { name: "Create new channel template…" }) + .click(); + + await expect( + page.getByText("Create template", { exact: true }), + ).toBeVisible(); + await page.locator("#template-name").fill("Weekly planning"); + await page.locator("#template-description").fill("Plan the next week."); + await page.getByRole("button", { name: "Create", exact: true }).click(); + + await expect(templateControl).toHaveText("Weekly planning"); + await expect(page.getByTestId("create-channel-description")).toHaveValue( + "Plan the next week.", + ); }); test("create ephemeral stream shows sidebar and header affordances", async ({ diff --git a/desktop/tests/e2e/profile.spec.ts b/desktop/tests/e2e/profile.spec.ts index 3b71ff9dd8..eefdef1fdd 100644 --- a/desktop/tests/e2e/profile.spec.ts +++ b/desktop/tests/e2e/profile.spec.ts @@ -1139,6 +1139,13 @@ test("renders settings in the app shell with a back button", async ({ await expect(page.getByTestId("settings-back-to-app")).toBeVisible(); await expect(page.getByPlaceholder("Search everything")).toHaveCount(0); await expect(page.getByText("Personal", { exact: true })).toBeVisible(); + const personalGroup = page + .getByTestId("settings-nav-channel-templates") + .locator("xpath=ancestor::*[@data-sidebar='group']"); + await expect(personalGroup).toContainText("Personal"); + await expect( + page.getByTestId("settings-nav-channel-templates"), + ).toContainText("Channel templates"); await expect(page.getByTestId("settings-nav-profile")).toHaveAttribute( "aria-pressed", "true", From 80315ac1a68024c40b61f3a062c9cb6bf7d4efb5 Mon Sep 17 00:00:00 2001 From: Will Pfleger Date: Mon, 3 Aug 2026 12:37:44 -0400 Subject: [PATCH 11/27] fix(desktop): harden Windows installs against Defender block and orphaned Node (#4382) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR fixes two Windows-specific install failures: Windows Defender blocking the bare `irm|iex` PowerShell install command, and managed Node shims pointing at a version-bumped (now-absent) Node directory. The Defender block (Trojan:Win32/Commando.A!ml) fires before PowerShell runs and is not clearable via Allow. The Node orphaning means shims in the managed npm prefix resolve but fail at runtime with 'node not recognized' because they reference the deleted old Node path. - Replace all three Windows CLI install commands (Goose, Claude, Codex) with a two-step shape — `Invoke-RestMethod` to a named temp file, then execute — to eliminate the dropper signature; a new `windows_install_command!` macro in `discovery/windows_install.rs` generates all three strings at compile time so the shape cannot drift between runtimes - `$ErrorActionPreference='Stop'` aborts on download failure instead of falling through to a missing-file exit-0; `exit $LASTEXITCODE` propagates the vendor script's own exit code - Add `probe_node(executable, expected_version, timeout)` as a bounded seam: stdout goes to a temp file (not a pipe) so no exit path can block on an inherited handle; the child runs in its own process group on Unix so an unconditional group SIGKILL on every exit path terminates all descendants; on Windows `taskkill /T /F` provides the same tree-wide cleanup; `managed_node_runtime_ready()` is a thin wrapper that resolves the managed Node path and calls the seam - Add `resolve_adapter_path()` in `managed_node.rs`: resolves the candidate first, then calls `should_invalidate_adapter()` — a pure predicate that returns `true` only when the resolved path is under `buzz_managed_npm_bin_dir()` AND the managed Node runtime is orphaned; external adapters outside the managed prefix are always preserved Note: CI cannot reproduce the Defender block (no live Defender ML classifier). Proof of fix is structural — the command shape no longer matches the dropper signature. Canary validation on a real Windows machine with Defender enabled is the definitive check. --------- Signed-off-by: Will Pfleger Co-authored-by: npub1mn7jgtj4w2pd0g0zeuhxsa6jy6p0rewxz4kujt98my82ahfmp72sxjexk7 --- .../src-tauri/src/commands/agent_discovery.rs | 25 +- .../commands/agent_discovery/managed_node.rs | 358 +++++-------- .../agent_discovery/managed_node_tests.rs | 481 ++++++++++++++++++ .../src-tauri/src/managed_agents/discovery.rs | 10 +- .../discovery/windows_install.rs | 225 ++++++++ 5 files changed, 863 insertions(+), 236 deletions(-) create mode 100644 desktop/src-tauri/src/commands/agent_discovery/managed_node_tests.rs create mode 100644 desktop/src-tauri/src/managed_agents/discovery/windows_install.rs diff --git a/desktop/src-tauri/src/commands/agent_discovery.rs b/desktop/src-tauri/src/commands/agent_discovery.rs index cbbf4ce351..4abf53ee91 100644 --- a/desktop/src-tauri/src/commands/agent_discovery.rs +++ b/desktop/src-tauri/src/commands/agent_discovery.rs @@ -333,10 +333,7 @@ fn install_acp_runtime_blocking( // For the codex runtime, "found" is not enough — the resolved binary must also // pass the 1.x version gate. An outdated 0.16.x adapter must be overwritten by // the new npm install so the CODEX_CONFIG spawn contract works correctly. - let adapter_path = runtime - .commands - .iter() - .find_map(|cmd| crate::managed_agents::resolve_command(cmd)); + let adapter_path = resolve_adapter_path(runtime.commands, runtime.adapter_install_commands); let adapter_probe_path = crate::managed_agents::readiness::cli_probe::augmented_path(); if let Some(cmds) = plan_adapter_install( runtime_id, @@ -1020,7 +1017,7 @@ use install_report::InstallReporter; mod managed_node; use managed_node::{ ensure_managed_node_runtime_blocking, managed_node_runtime_supported, managed_npm_command, - npm_eacces_hint, + npm_eacces_hint, resolve_adapter_path, }; #[tauri::command] @@ -1741,7 +1738,7 @@ mod tests { #[test] fn test_powershell_command_argv_exact() { // Catalog format: body wrapped in one outer double-quote pair (Bash-layer serialization). - let body = "irm https://chatgpt.com/codex/install.ps1 | iex"; + let body = "$ErrorActionPreference='Stop'; $installer=Join-Path $env:TEMP 'buzz-install-codex.ps1'; Invoke-RestMethod https://chatgpt.com/codex/install.ps1 -OutFile $installer; & $installer; exit $LASTEXITCODE"; let cmd = super::install_powershell_command(&format!( r#"powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "{body}""# )); @@ -1771,12 +1768,12 @@ mod tests { ); } - /// Claude Code catalog command (discovery.rs:107) must dequote to the bare pipeline. + /// Claude Code catalog command must dequote to the two-step download-then-execute body. #[cfg(windows)] #[test] fn test_powershell_command_claude_catalog_dequoted() { let cmd = super::install_powershell_command( - r#"powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "irm https://claude.ai/install.ps1 | iex""#, + r#"powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "$ErrorActionPreference='Stop'; $installer=Join-Path $env:TEMP 'buzz-install-claude.ps1'; Invoke-RestMethod https://claude.ai/install.ps1 -OutFile $installer; & $installer; exit $LASTEXITCODE""#, ); assert_eq!( cmd.get_args() @@ -1787,22 +1784,22 @@ mod tests { "-ExecutionPolicy", "Bypass", "-Command", - "irm https://claude.ai/install.ps1 | iex", + "$ErrorActionPreference='Stop'; $installer=Join-Path $env:TEMP 'buzz-install-claude.ps1'; Invoke-RestMethod https://claude.ai/install.ps1 -OutFile $installer; & $installer; exit $LASTEXITCODE", ], "Claude catalog command must be dequoted correctly" ); } - /// Goose Windows catalog command (discovery.rs:78) must dequote to a bare pipeline - /// with a literal `$env:` prefix — no backslash before the dollar sign. - /// This proves the `\$` → `$` escape fix: post-#2750 the spawn is native and + /// Goose Windows catalog command must dequote to the two-step download-then-execute body + /// with the `$env:CONFIGURE` prefix intact — no backslash before the dollar sign. + /// This proves the `\$` → `$` contract: post-#2750 the spawn is native and /// PowerShell receives the body verbatim, so a residual `\` would produce /// `\$env:CONFIGURE='false'` which is a malformed statement. #[cfg(windows)] #[test] fn test_powershell_command_goose_catalog_dequoted() { let cmd = super::install_powershell_command( - r#"powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "$env:CONFIGURE='false'; irm https://raw.githubusercontent.com/aaif-goose/goose/main/download_cli.ps1 | iex""#, + r#"powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "$env:CONFIGURE='false'; $ErrorActionPreference='Stop'; $installer=Join-Path $env:TEMP 'buzz-install-goose.ps1'; Invoke-RestMethod https://raw.githubusercontent.com/aaif-goose/goose/main/download_cli.ps1 -OutFile $installer; & $installer; exit $LASTEXITCODE""#, ); assert_eq!( cmd.get_args() @@ -1813,7 +1810,7 @@ mod tests { "-ExecutionPolicy", "Bypass", "-Command", - "$env:CONFIGURE='false'; irm https://raw.githubusercontent.com/aaif-goose/goose/main/download_cli.ps1 | iex", + "$env:CONFIGURE='false'; $ErrorActionPreference='Stop'; $installer=Join-Path $env:TEMP 'buzz-install-goose.ps1'; Invoke-RestMethod https://raw.githubusercontent.com/aaif-goose/goose/main/download_cli.ps1 -OutFile $installer; & $installer; exit $LASTEXITCODE", ], "Goose catalog command must dequote with bare $env: (no backslash before $)" ); diff --git a/desktop/src-tauri/src/commands/agent_discovery/managed_node.rs b/desktop/src-tauri/src/commands/agent_discovery/managed_node.rs index 72108f0291..fbfb068c0e 100644 --- a/desktop/src-tauri/src/commands/agent_discovery/managed_node.rs +++ b/desktop/src-tauri/src/commands/agent_discovery/managed_node.rs @@ -102,25 +102,155 @@ fn managed_node_failed_step(stderr: String) -> InstallStepResult { } } -fn managed_node_runtime_ready() -> bool { +pub(super) fn managed_node_runtime_ready() -> bool { let Some(node) = crate::managed_agents::buzz_managed_node_bin_path() else { return false; }; if !node.is_file() { return false; } - let mut cmd = std::process::Command::new(&node); + probe_node(&node, MANAGED_NODE_VERSION, Duration::from_secs(3)) +} + +/// Run `executable --version` with a bounded deadline and return `true` only +/// when it exits 0 and its trimmed stdout equals `expected_version`. +/// +/// Transport: stdout is redirected to a temp file so no exit path can block on +/// an inherited handle (a descendant retaining a pipe write-end would otherwise +/// prevent EOF indefinitely). +/// +/// Cleanup: the child runs in its own process group on Unix (`process_group(0)`) +/// so an unconditional group SIGKILL on every exit path terminates all +/// descendants. On Windows, `terminate_process` issues `taskkill /T /F` for +/// tree-wide cleanup. SIGKILL to an already-dead group returns ESRCH (no-op). +pub(super) fn probe_node( + executable: &std::path::Path, + expected_version: &str, + timeout: Duration, +) -> bool { + let tmp = match tempfile::NamedTempFile::new() { + Ok(f) => f, + Err(_) => return false, + }; + let out_file = match tmp.reopen() { + Ok(f) => f, + Err(_) => return false, + }; + + let mut cmd = std::process::Command::new(executable); cmd.arg("--version") .stdin(std::process::Stdio::null()) - .stdout(std::process::Stdio::piped()) + .stdout(std::process::Stdio::from(out_file)) .stderr(std::process::Stdio::null()); crate::util::configure_no_window(&mut cmd); - let output = cmd.output(); - output - .ok() - .filter(|output| output.status.success()) - .map(|output| String::from_utf8_lossy(&output.stdout).trim() == MANAGED_NODE_VERSION) - .unwrap_or(false) + #[cfg(unix)] + { + use std::os::unix::process::CommandExt; + cmd.process_group(0); + } + let Ok(mut child) = cmd.spawn() else { + return false; + }; + + let deadline = std::time::Instant::now() + timeout; + let exit_status = loop { + match child.try_wait() { + Ok(Some(status)) => break status, + Ok(None) => { + if std::time::Instant::now() >= deadline { + kill_probe_group(child.id()); + let _ = child.wait(); + return false; + } + std::thread::sleep(Duration::from_millis(50)); + } + Err(_) => { + kill_probe_group(child.id()); + let _ = child.wait(); + return false; + } + } + }; + + // Group-kill unconditionally: SIGKILL to a dead group is ESRCH (no-op). + kill_probe_group(child.id()); + + if !exit_status.success() { + return false; + } + + let mut output = String::new(); + if std::io::Read::read_to_string(&mut tmp.as_file(), &mut output).is_err() { + return false; + } + output.trim() == expected_version +} + +/// Kill the probe's process group/tree unconditionally (no TERM grace — this +/// is a probe, not an agent session). ESRCH on a dead group is fine. +fn kill_probe_group(pid: u32) { + #[cfg(unix)] + unsafe { + libc::kill(-(pid as i32), libc::SIGKILL); + } + #[cfg(windows)] + { + let _ = crate::managed_agents::terminate_process(pid); + } + #[cfg(not(any(unix, windows)))] + { + let _ = pid; + } +} + +/// Returns `true` when the managed Node runtime is absent or no longer executes — +/// meaning any existing npm adapter shims are broken and must be reinstalled. +/// +/// This fires when the pinned Node version changes (e.g. v24.11.0 → v24.18.0): +/// the old dir stays on disk, shims appear installed, but they fail at run time +/// because the Node binary they reference is gone. Treating the adapter as +/// missing forces `ensure_managed_node_runtime_blocking` to re-download Node and +/// npm to reinstall the shims. +pub(super) fn managed_node_orphaned() -> bool { + managed_node_runtime_supported() && !managed_node_runtime_ready() +} + +/// Returns `true` when an adapter at `resolved` should be invalidated. +/// +/// Only a Buzz-managed shim (path under `managed_prefix`) with an orphaned +/// runtime is invalidated; external adapters are always preserved. +pub(super) fn should_invalidate_adapter( + resolved: &std::path::Path, + managed_prefix: &std::path::Path, + orphaned: bool, +) -> bool { + orphaned && resolved.starts_with(managed_prefix) +} + +/// Resolve the adapter binary path, accounting for the Node-orphan case. +/// Resolves first; invalidates only managed-prefix shims when Node is orphaned. +pub(super) fn resolve_adapter_path( + commands: &[&str], + adapter_install_commands: &[&str], +) -> Option { + let resolved = commands + .iter() + .find_map(|cmd| crate::managed_agents::resolve_command(cmd)); + + let needs_managed_npm = adapter_install_commands + .iter() + .any(|cmd| is_npm_global_install(cmd)); + if needs_managed_npm { + if let (Some(ref path), Some(ref managed_bin)) = + (&resolved, crate::managed_agents::buzz_managed_npm_bin_dir()) + { + if should_invalidate_adapter(path, managed_bin, managed_node_orphaned()) { + return None; + } + } + } + + resolved } fn managed_node_install_lock() -> &'static Mutex<()> { @@ -538,211 +668,5 @@ pub(super) fn npm_eacces_hint(stderr: &str, _command: &str) -> Option { // ── end managed npm adapter installs ────────────────────────────────────────── #[cfg(test)] -mod tests { - use super::*; - - #[test] - fn test_npm_eacces_hint_guidance_mentions_buzz_private_dir() { - let hint = npm_eacces_hint("EACCES: permission denied", "npm install -g foo").unwrap(); - assert!( - hint.contains("Buzz's private Node tools directory"), - "hint: {hint}" - ); - } - - #[test] - fn test_rewrite_npm_install_uses_private_prefix() { - assert_eq!( - rewrite_npm_global_install( - "npm install -g @agentclientprotocol/codex-acp", - "'/tmp/Buzz Node'" - ), - "npm install --global --prefix '/tmp/Buzz Node' @agentclientprotocol/codex-acp" - ); - } - - #[test] - fn test_rewrite_npm_i_uses_private_prefix() { - assert_eq!( - rewrite_npm_global_install("npm i -g some-package", "'/tmp/buzz'"), - "npm i --global --prefix '/tmp/buzz' some-package" - ); - } - - #[test] - fn test_rewrite_npm_uninstall_uses_private_prefix() { - assert_eq!( - rewrite_npm_global_install("npm uninstall -g @zed-industries/codex-acp", "'/tmp/buzz'"), - "npm uninstall --global --prefix '/tmp/buzz' @zed-industries/codex-acp" - ); - } - - #[test] - fn test_rewrite_ignores_non_global_command() { - assert_eq!( - rewrite_npm_global_install("npm install foo", "'/tmp/buzz'"), - "npm install foo" - ); - } - - #[test] - fn test_shell_quote_escapes_single_quotes() { - assert_eq!( - shell_quote(std::path::Path::new("/tmp/Buzz's Node")), - "'/tmp/Buzz'\\''s Node'" - ); - } - - // ── zip validation tests ────────────────────────────────────────────────── - - /// Build an in-memory zip archive with the supplied entry names and return - /// a temporary file containing it (zip::ZipArchive requires Seek). - fn make_zip_with_entries(entry_names: &[&str]) -> tempfile::NamedTempFile { - let mut buf: Vec = Vec::new(); - { - let mut writer = zip::ZipWriter::new(std::io::Cursor::new(&mut buf)); - let opts = zip::write::SimpleFileOptions::default(); - for name in entry_names { - writer.start_file(*name, opts).unwrap(); - } - writer.finish().unwrap(); - } - let mut tmp = tempfile::NamedTempFile::new().unwrap(); - std::io::Write::write_all(&mut tmp, &buf).unwrap(); - tmp - } - - #[test] - fn test_validate_zip_accepts_normal_entries() { - let tmp = make_zip_with_entries(&[ - "node-v24.18.0-win-x64/node.exe", - "node-v24.18.0-win-x64/npm.cmd", - "node-v24.18.0-win-x64/npm", - ]); - let file = std::fs::File::open(tmp.path()).unwrap(); - let archive = zip::ZipArchive::new(file).unwrap(); - assert!(validate_managed_node_zip_entries(&archive).is_ok()); - } - - #[test] - fn test_validate_zip_rejects_absolute_path() { - let tmp = make_zip_with_entries(&["/etc/passwd"]); - let file = std::fs::File::open(tmp.path()).unwrap(); - let archive = zip::ZipArchive::new(file).unwrap(); - let err = validate_managed_node_zip_entries(&archive).unwrap_err(); - assert!( - err.contains("absolute path"), - "expected 'absolute path' in: {err}" - ); - } - - #[test] - fn test_validate_zip_rejects_path_traversal() { - let tmp = make_zip_with_entries(&["../../../etc/passwd"]); - let file = std::fs::File::open(tmp.path()).unwrap(); - let archive = zip::ZipArchive::new(file).unwrap(); - let err = validate_managed_node_zip_entries(&archive).unwrap_err(); - assert!( - err.contains("path traversal"), - "expected 'path traversal' in: {err}" - ); - } - - #[test] - fn test_validate_zip_rejects_backslash_rooted() { - // Windows-style absolute path using backslash — must reject on every host. - let tmp = make_zip_with_entries(&["\\Windows\\system32\\evil.dll"]); - let file = std::fs::File::open(tmp.path()).unwrap(); - let archive = zip::ZipArchive::new(file).unwrap(); - let err = validate_managed_node_zip_entries(&archive).unwrap_err(); - assert!( - err.contains("absolute path"), - "expected 'absolute path' in: {err}" - ); - } - - #[test] - fn test_validate_zip_rejects_drive_prefix() { - // Windows drive-letter absolute path — must reject on every host. - let tmp = make_zip_with_entries(&["C:\\evil\\payload.exe"]); - let file = std::fs::File::open(tmp.path()).unwrap(); - let archive = zip::ZipArchive::new(file).unwrap(); - let err = validate_managed_node_zip_entries(&archive).unwrap_err(); - assert!( - err.contains("absolute path"), - "expected 'absolute path' in: {err}" - ); - } - - #[test] - fn test_validate_zip_rejects_backslash_traversal() { - // Path traversal using Windows separator — must reject on every host. - let tmp = make_zip_with_entries(&["node-v24.18.0-win-x64\\..\\..\\evil"]); - let file = std::fs::File::open(tmp.path()).unwrap(); - let archive = zip::ZipArchive::new(file).unwrap(); - let err = validate_managed_node_zip_entries(&archive).unwrap_err(); - assert!( - err.contains("path traversal"), - "expected 'path traversal' in: {err}" - ); - } - - // ── verify_node_tree layout tests ───────────────────────────────────────── - - #[test] - fn test_verify_node_tree_unix_layout_passes() { - let tmp = tempfile::TempDir::new().unwrap(); - let bin = tmp.path().join("bin"); - std::fs::create_dir_all(&bin).unwrap(); - std::fs::write(bin.join("node"), b"").unwrap(); - std::fs::write(bin.join("npm"), b"").unwrap(); - // On non-Windows the unix branch is active — this must pass. - #[cfg(not(windows))] - assert!(verify_node_tree(tmp.path()).is_ok()); - // On Windows the windows branch is active — unix layout must fail. - #[cfg(windows)] - assert!(verify_node_tree(tmp.path()).is_err()); - } - - #[test] - fn test_verify_node_tree_unix_layout_missing_npm_fails() { - let tmp = tempfile::TempDir::new().unwrap(); - let bin = tmp.path().join("bin"); - std::fs::create_dir_all(&bin).unwrap(); - std::fs::write(bin.join("node"), b"").unwrap(); - // npm intentionally absent - #[cfg(not(windows))] - { - let err = verify_node_tree(tmp.path()).unwrap_err(); - assert!(err.contains("bin/npm"), "err: {err}"); - } - } - - #[test] - fn test_verify_node_tree_windows_layout_passes() { - let tmp = tempfile::TempDir::new().unwrap(); - std::fs::write(tmp.path().join("node.exe"), b"").unwrap(); - std::fs::write(tmp.path().join("npm.cmd"), b"").unwrap(); - std::fs::write(tmp.path().join("npm"), b"").unwrap(); - // On Windows the windows branch is active — this must pass. - #[cfg(windows)] - assert!(verify_node_tree(tmp.path()).is_ok()); - // On non-Windows the unix branch is active — windows-layout root files - // don't satisfy bin/node + bin/npm, so this must fail. - #[cfg(not(windows))] - assert!(verify_node_tree(tmp.path()).is_err()); - } - - #[test] - fn test_verify_node_tree_windows_layout_missing_npm_shim_fails() { - let tmp = tempfile::TempDir::new().unwrap(); - std::fs::write(tmp.path().join("node.exe"), b"").unwrap(); - std::fs::write(tmp.path().join("npm.cmd"), b"").unwrap(); - // npm POSIX shim intentionally absent - #[cfg(windows)] - { - let err = verify_node_tree(tmp.path()).unwrap_err(); - assert!(err.contains("npm"), "err: {err}"); - } - } -} +#[path = "managed_node_tests.rs"] +mod tests; diff --git a/desktop/src-tauri/src/commands/agent_discovery/managed_node_tests.rs b/desktop/src-tauri/src/commands/agent_discovery/managed_node_tests.rs new file mode 100644 index 0000000000..a8e1d7f4c8 --- /dev/null +++ b/desktop/src-tauri/src/commands/agent_discovery/managed_node_tests.rs @@ -0,0 +1,481 @@ +use super::*; + +#[test] +fn test_npm_eacces_hint_guidance_mentions_buzz_private_dir() { + let hint = npm_eacces_hint("EACCES: permission denied", "npm install -g foo").unwrap(); + assert!( + hint.contains("Buzz's private Node tools directory"), + "hint: {hint}" + ); +} + +#[test] +fn test_rewrite_npm_install_uses_private_prefix() { + assert_eq!( + rewrite_npm_global_install( + "npm install -g @agentclientprotocol/codex-acp", + "'/tmp/Buzz Node'" + ), + "npm install --global --prefix '/tmp/Buzz Node' @agentclientprotocol/codex-acp" + ); +} + +#[test] +fn test_rewrite_npm_i_uses_private_prefix() { + assert_eq!( + rewrite_npm_global_install("npm i -g some-package", "'/tmp/buzz'"), + "npm i --global --prefix '/tmp/buzz' some-package" + ); +} + +#[test] +fn test_rewrite_npm_uninstall_uses_private_prefix() { + assert_eq!( + rewrite_npm_global_install("npm uninstall -g @zed-industries/codex-acp", "'/tmp/buzz'"), + "npm uninstall --global --prefix '/tmp/buzz' @zed-industries/codex-acp" + ); +} + +#[test] +fn test_rewrite_ignores_non_global_command() { + assert_eq!( + rewrite_npm_global_install("npm install foo", "'/tmp/buzz'"), + "npm install foo" + ); +} + +#[test] +fn test_shell_quote_escapes_single_quotes() { + assert_eq!( + shell_quote(std::path::Path::new("/tmp/Buzz's Node")), + "'/tmp/Buzz'\\''s Node'" + ); +} + +// ── zip validation tests ────────────────────────────────────────────────────── + +/// Build an in-memory zip archive with the supplied entry names and return +/// a temporary file containing it (zip::ZipArchive requires Seek). +fn make_zip_with_entries(entry_names: &[&str]) -> tempfile::NamedTempFile { + let mut buf: Vec = Vec::new(); + { + let mut writer = zip::ZipWriter::new(std::io::Cursor::new(&mut buf)); + let opts = zip::write::SimpleFileOptions::default(); + for name in entry_names { + writer.start_file(*name, opts).unwrap(); + } + writer.finish().unwrap(); + } + let mut tmp = tempfile::NamedTempFile::new().unwrap(); + std::io::Write::write_all(&mut tmp, &buf).unwrap(); + tmp +} + +#[test] +fn test_validate_zip_accepts_normal_entries() { + let tmp = make_zip_with_entries(&[ + "node-v24.18.0-win-x64/node.exe", + "node-v24.18.0-win-x64/npm.cmd", + "node-v24.18.0-win-x64/npm", + ]); + let file = std::fs::File::open(tmp.path()).unwrap(); + let archive = zip::ZipArchive::new(file).unwrap(); + assert!(validate_managed_node_zip_entries(&archive).is_ok()); +} + +#[test] +fn test_validate_zip_rejects_absolute_path() { + let tmp = make_zip_with_entries(&["/etc/passwd"]); + let file = std::fs::File::open(tmp.path()).unwrap(); + let archive = zip::ZipArchive::new(file).unwrap(); + let err = validate_managed_node_zip_entries(&archive).unwrap_err(); + assert!( + err.contains("absolute path"), + "expected 'absolute path' in: {err}" + ); +} + +#[test] +fn test_validate_zip_rejects_path_traversal() { + let tmp = make_zip_with_entries(&["../../../etc/passwd"]); + let file = std::fs::File::open(tmp.path()).unwrap(); + let archive = zip::ZipArchive::new(file).unwrap(); + let err = validate_managed_node_zip_entries(&archive).unwrap_err(); + assert!( + err.contains("path traversal"), + "expected 'path traversal' in: {err}" + ); +} + +#[test] +fn test_validate_zip_rejects_backslash_rooted() { + // Windows-style absolute path using backslash — must reject on every host. + let tmp = make_zip_with_entries(&["\\Windows\\system32\\evil.dll"]); + let file = std::fs::File::open(tmp.path()).unwrap(); + let archive = zip::ZipArchive::new(file).unwrap(); + let err = validate_managed_node_zip_entries(&archive).unwrap_err(); + assert!( + err.contains("absolute path"), + "expected 'absolute path' in: {err}" + ); +} + +#[test] +fn test_validate_zip_rejects_drive_prefix() { + // Windows drive-letter absolute path — must reject on every host. + let tmp = make_zip_with_entries(&["C:\\evil\\payload.exe"]); + let file = std::fs::File::open(tmp.path()).unwrap(); + let archive = zip::ZipArchive::new(file).unwrap(); + let err = validate_managed_node_zip_entries(&archive).unwrap_err(); + assert!( + err.contains("absolute path"), + "expected 'absolute path' in: {err}" + ); +} + +#[test] +fn test_validate_zip_rejects_backslash_traversal() { + // Path traversal using Windows separator — must reject on every host. + let tmp = make_zip_with_entries(&["node-v24.18.0-win-x64\\..\\..\\evil"]); + let file = std::fs::File::open(tmp.path()).unwrap(); + let archive = zip::ZipArchive::new(file).unwrap(); + let err = validate_managed_node_zip_entries(&archive).unwrap_err(); + assert!( + err.contains("path traversal"), + "expected 'path traversal' in: {err}" + ); +} + +// ── verify_node_tree layout tests ───────────────────────────────────────────── + +#[test] +fn test_verify_node_tree_unix_layout_passes() { + let tmp = tempfile::TempDir::new().unwrap(); + let bin = tmp.path().join("bin"); + std::fs::create_dir_all(&bin).unwrap(); + std::fs::write(bin.join("node"), b"").unwrap(); + std::fs::write(bin.join("npm"), b"").unwrap(); + // On non-Windows the unix branch is active — this must pass. + #[cfg(not(windows))] + assert!(verify_node_tree(tmp.path()).is_ok()); + // On Windows the windows branch is active — unix layout must fail. + #[cfg(windows)] + assert!(verify_node_tree(tmp.path()).is_err()); +} + +#[test] +fn test_verify_node_tree_unix_layout_missing_npm_fails() { + let tmp = tempfile::TempDir::new().unwrap(); + let bin = tmp.path().join("bin"); + std::fs::create_dir_all(&bin).unwrap(); + std::fs::write(bin.join("node"), b"").unwrap(); + // npm intentionally absent + #[cfg(not(windows))] + { + let err = verify_node_tree(tmp.path()).unwrap_err(); + assert!(err.contains("bin/npm"), "err: {err}"); + } +} + +#[test] +fn test_verify_node_tree_windows_layout_passes() { + let tmp = tempfile::TempDir::new().unwrap(); + std::fs::write(tmp.path().join("node.exe"), b"").unwrap(); + std::fs::write(tmp.path().join("npm.cmd"), b"").unwrap(); + std::fs::write(tmp.path().join("npm"), b"").unwrap(); + // On Windows the windows branch is active — this must pass. + #[cfg(windows)] + assert!(verify_node_tree(tmp.path()).is_ok()); + // On non-Windows the unix branch is active — windows-layout root files + // don't satisfy bin/node + bin/npm, so this must fail. + #[cfg(not(windows))] + assert!(verify_node_tree(tmp.path()).is_err()); +} + +#[test] +fn test_verify_node_tree_windows_layout_missing_npm_shim_fails() { + let tmp = tempfile::TempDir::new().unwrap(); + std::fs::write(tmp.path().join("node.exe"), b"").unwrap(); + std::fs::write(tmp.path().join("npm.cmd"), b"").unwrap(); + // npm POSIX shim intentionally absent + #[cfg(windows)] + { + let err = verify_node_tree(tmp.path()).unwrap_err(); + assert!(err.contains("npm"), "err: {err}"); + } +} + +// ── should_invalidate_adapter / orphan policy pure unit tests ───────────────── + +#[test] +fn test_should_invalidate_adapter_invalidates_managed_shim_when_orphaned() { + let prefix = std::path::Path::new("/managed/npm/bin"); + let shim = prefix.join("codex-acp"); + assert!( + should_invalidate_adapter(&shim, prefix, true), + "managed shim + orphaned runtime must be invalidated" + ); +} + +#[test] +fn test_should_invalidate_adapter_keeps_external_adapter_when_orphaned() { + let prefix = std::path::Path::new("/managed/npm/bin"); + let external = std::path::Path::new("/usr/local/bin/codex-acp"); + assert!( + !should_invalidate_adapter(external, prefix, true), + "external adapter must not be invalidated even when Node is orphaned" + ); +} + +#[test] +fn test_should_invalidate_adapter_keeps_managed_shim_when_node_healthy() { + let prefix = std::path::Path::new("/managed/npm/bin"); + let shim = prefix.join("codex-acp"); + assert!( + !should_invalidate_adapter(&shim, prefix, false), + "managed shim must not be invalidated when Node is healthy" + ); +} + +#[test] +fn test_resolve_adapter_path_returns_none_when_binary_absent() { + let commands: &[&str] = &["nonexistent-buzz-test-binary-xyz"]; + let adapter_install_commands: &[&str] = &["curl -fsSL https://example.com | bash"]; + assert!( + resolve_adapter_path(commands, adapter_install_commands).is_none(), + "must return None when the command is not on PATH" + ); +} + +// ── probe_node seam regressions ─────────────────────────────────────────────── +// +// All four scenarios drive probe_node() directly — the same +// tempfile/deadline/cleanup/status/version path used by managed_node_runtime_ready. +// Each test CAN fail if production: +// - drops process_group(0) → descendant-holds-stdout assertion (d) fails +// (tempfile transport still returns promptly; +// the sleep survives and kill($!,0) returns 0) +// - skips group-kill on a path → hung-binary test exceeds margin +// - ignores exit_status.success() → nonzero-exit test returns true +// - skips version comparison → wrong-version test returns true +// +// Script files are written into a TempDir (no open write fd at spawn time) +// to avoid ETXTBSY on Linux. + +/// Scenario 1 — descendant holds stdout write-end, direct child exits immediately. +/// +/// The script backgrounds a 60-second sleep (inheriting stdout), records both the +/// script's own PID (`$$`) and the sleep's PID (`$!`) to sidecar files, then exits +/// with the expected version string. Four assertions: +/// (a) bounded return — would hang ~60 s if tempfile transport regressed to pipe; +/// (b) correct result; +/// (c) process group dead after return — catches skipped-cleanup-on-success: if +/// the group-kill is absent but `process_group(0)` is still present, a live +/// member in the group is detectable; +/// (d) descendant PID dead after return — catches dropped `process_group(0)`: if +/// the call is removed the sleep stays in the runner's group (not the probe's), +/// `kill(-pgid,0)` is vacuously ESRCH, but `kill(desc_pid,0)` returns 0 and +/// this assertion fails. This is the canonical mutation for (c). +#[cfg(unix)] +#[test] +fn test_probe_node_descendant_holds_stdout_returns_promptly_and_kills_group() { + use std::os::unix::fs::PermissionsExt; + let tmp_dir = tempfile::TempDir::new().unwrap(); + let script = tmp_dir.path().join("probe.sh"); + let pgid_file = tmp_dir.path().join("pgid"); + let desc_pid_file = tmp_dir.path().join("desc_pid"); + let pgid_file_path = pgid_file.to_str().unwrap().to_owned(); + let desc_pid_file_path = desc_pid_file.to_str().unwrap().to_owned(); + // Line 1 of script: record the script's own PID (= PGID after process_group(0)). + // Line 2: background the sleep and record its PID. + // Line 3: emit the expected version and exit so the direct child exits promptly. + let script_content = format!( + "#!/bin/sh\necho $$ > {pgid_file_path}\n/bin/sleep 60 &\necho $! > {desc_pid_file_path}\necho v24.18.0\nexit 0\n" + ); + std::fs::write(&script, script_content.as_bytes()).unwrap(); + std::fs::set_permissions(&script, std::fs::Permissions::from_mode(0o755)).unwrap(); + + let probe_timeout = std::time::Duration::from_secs(3); + let t = std::time::Instant::now(); + let result = probe_node(&script, "v24.18.0", probe_timeout); + let elapsed = t.elapsed(); + + // Give the group-kill a moment to propagate before checking liveness. + std::thread::sleep(std::time::Duration::from_millis(200)); + + // (a) bounded return — tempfile transport must not hang on the descendant's + // retained pipe write-end. + assert!( + elapsed < probe_timeout + std::time::Duration::from_secs(2), + "probe_node hung — likely descendant retained pipe write-end: elapsed {elapsed:?}" + ); + // (b) correct result + assert!(result, "probe_node must return true for matching version"); + + // (c) process group dead — catches skipped-cleanup: if the group-kill on the + // success path is removed while process_group(0) is still present, the + // sleep remains in the probe's group and kill(-pgid,0) returns 0. + let pgid_str = std::fs::read_to_string(&pgid_file) + .expect("script must have written its PID to the pgid sidecar"); + let pgid: i32 = pgid_str + .trim() + .parse() + .expect("pgid sidecar must contain a numeric PID"); + let group_alive = unsafe { libc::kill(-pgid, 0) } == 0; + assert!( + !group_alive, + "process group {pgid} must be dead after probe_node" + ); + + // (d) descendant PID dead — catches dropped process_group(0): without that + // call the sleep is never in the probe's group, so kill(-pgid,0) is + // vacuously ESRCH while the sleep survives. Asserting the descendant's + // own PID is dead proves the sleep was actually killed. + let desc_pid_str = std::fs::read_to_string(&desc_pid_file) + .expect("script must have written the sleep PID to the desc_pid sidecar"); + let desc_pid: libc::pid_t = desc_pid_str + .trim() + .parse() + .expect("desc_pid sidecar must contain a numeric PID"); + // Pre-assert cleanup: if the descendant is somehow still alive, kill it so + // a failing test does not leave a 60-second sleep in the runner's process group. + let desc_alive = unsafe { libc::kill(desc_pid, 0) } == 0; + if desc_alive { + unsafe { libc::kill(desc_pid, libc::SIGKILL) }; + } + assert!( + !desc_alive, + "descendant PID {desc_pid} must be dead after probe_node — \ + if process_group(0) is dropped, the sleep escapes into the runner's group \ + and is never killed by the group-kill" + ); +} + +/// Scenario 2 — direct hang: probe_node must traverse the real try_wait +/// deadline and return false. Does NOT call kill_probe_group directly. +/// +/// This test FAILS if the deadline loop in probe_node is broken or if the +/// timeout/kill path is not exercised (e.g., missing group-kill exits the +/// loop early via a different mechanism). +#[cfg(unix)] +#[test] +fn test_probe_node_times_out_on_hung_binary() { + use std::os::unix::fs::PermissionsExt; + let tmp_dir = tempfile::TempDir::new().unwrap(); + let script = tmp_dir.path().join("hung.sh"); + std::fs::write(&script, b"#!/bin/sh\n/bin/sleep 30\n").unwrap(); + std::fs::set_permissions(&script, std::fs::Permissions::from_mode(0o755)).unwrap(); + + let probe_timeout = std::time::Duration::from_secs(3); + let t = std::time::Instant::now(); + let result = probe_node(&script, "v24.18.0", probe_timeout); + let elapsed = t.elapsed(); + + assert!(!result, "probe_node must return false for a hung binary"); + // Must have traversed the deadline (not returned early via a bug). + assert!( + elapsed >= probe_timeout, + "probe_node returned before deadline: {elapsed:?} < {probe_timeout:?}" + ); + // Must not hang past the deadline by more than the poll interval + margin. + assert!( + elapsed < probe_timeout + std::time::Duration::from_secs(3), + "probe_node exceeded deadline by too much: {elapsed:?}" + ); +} + +/// Scenario 3 — non-zero exit: probe_node must return false even when stdout +/// contains the expected version string. +/// +/// This test FAILS if probe_node skips or inverts the exit_status.success() check. +#[cfg(unix)] +#[test] +fn test_probe_node_returns_false_on_nonzero_exit() { + use std::os::unix::fs::PermissionsExt; + let tmp_dir = tempfile::TempDir::new().unwrap(); + let script = tmp_dir.path().join("fail.sh"); + // Prints the expected version string but exits non-zero. + std::fs::write(&script, b"#!/bin/sh\necho v24.18.0\nexit 1\n").unwrap(); + std::fs::set_permissions(&script, std::fs::Permissions::from_mode(0o755)).unwrap(); + + let result = probe_node(&script, "v24.18.0", std::time::Duration::from_secs(3)); + assert!( + !result, + "probe_node must return false when the process exits non-zero" + ); +} + +/// Scenario 4 — wrong version output: probe_node must return false when stdout +/// does not match expected_version. +/// +/// This test FAILS if probe_node skips or incorrectly performs the version comparison. +#[cfg(unix)] +#[test] +fn test_probe_node_returns_false_on_wrong_version_output() { + use std::os::unix::fs::PermissionsExt; + let tmp_dir = tempfile::TempDir::new().unwrap(); + let script = tmp_dir.path().join("wrongver.sh"); + std::fs::write(&script, b"#!/bin/sh\necho v99.0.0\nexit 0\n").unwrap(); + std::fs::set_permissions(&script, std::fs::Permissions::from_mode(0o755)).unwrap(); + + let result = probe_node(&script, "v24.18.0", std::time::Duration::from_secs(3)); + assert!( + !result, + "probe_node must return false when stdout version does not match expected" + ); +} + +/// Windows-shaped seam: non-zero exit via .bat file. +/// +/// Drives the same probe_node path on Windows (terminate_process / taskkill /T /F). +/// This test FAILS if probe_node ignores exit_status.success() on Windows. +#[cfg(windows)] +#[test] +fn test_probe_node_windows_returns_false_on_nonzero_exit() { + let tmp_dir = tempfile::TempDir::new().unwrap(); + let bat = tmp_dir.path().join("fail.bat"); + // Prints the expected version but exits non-zero — must still fail. + std::fs::write(&bat, b"@echo off\r\necho v24.18.0\r\nexit /b 1\r\n").unwrap(); + + let result = probe_node(&bat, "v24.18.0", std::time::Duration::from_secs(3)); + assert!( + !result, + "probe_node must return false when the .bat exits non-zero (Windows)" + ); +} + +/// Windows-shaped seam: wrong version output via .bat file. +/// +/// This test FAILS if probe_node skips the version comparison on Windows. +#[cfg(windows)] +#[test] +fn test_probe_node_windows_returns_false_on_wrong_version_output() { + let tmp_dir = tempfile::TempDir::new().unwrap(); + let bat = tmp_dir.path().join("wrongver.bat"); + std::fs::write(&bat, b"@echo off\r\necho v99.0.0\r\nexit /b 0\r\n").unwrap(); + + let result = probe_node(&bat, "v24.18.0", std::time::Duration::from_secs(3)); + assert!( + !result, + "probe_node must return false when stdout version does not match (Windows)" + ); +} + +/// Returns false when the node binary path does not exist (fast path, no spawn). +#[test] +fn test_managed_node_runtime_ready_returns_false_when_binary_absent() { + let Some(node) = crate::managed_agents::buzz_managed_node_bin_path() else { + assert!( + !managed_node_runtime_ready(), + "managed_node_runtime_ready must return false when no path resolves" + ); + return; + }; + if node.is_file() { + return; + } + assert!( + !managed_node_runtime_ready(), + "managed_node_runtime_ready must return false when the binary file does not exist" + ); +} diff --git a/desktop/src-tauri/src/managed_agents/discovery.rs b/desktop/src-tauri/src/managed_agents/discovery.rs index 8d1b8a5013..248625ce93 100644 --- a/desktop/src-tauri/src/managed_agents/discovery.rs +++ b/desktop/src-tauri/src/managed_agents/discovery.rs @@ -9,10 +9,10 @@ use crate::managed_agents::{ AcpAvailabilityStatus, AcpRuntimeCatalogEntry, AuthStatus, CommandAvailabilityInfo, HarnessSource, }; - mod presets; mod runtime_metadata; - +#[macro_use] +mod windows_install; use presets::{preset_catalog_entry, PRESET_HARNESSES}; pub(crate) use presets::{preset_harness_definitions, preset_harness_ids}; pub(crate) use runtime_metadata::KnownAcpRuntime; @@ -85,7 +85,7 @@ const KNOWN_ACP_RUNTIMES: &[KnownAcpRuntime] = &[ cli_install_commands: &["curl -fsSL https://github.com/aaif-goose/goose/releases/download/stable/download_cli.sh | CONFIGURE=false bash"], // Goose's stable release currently publishes only the Unix installer; // its official Windows instructions intentionally point at this main-branch script. - cli_install_commands_windows: &["powershell.exe -NoProfile -ExecutionPolicy Bypass -Command \"$env:CONFIGURE='false'; irm https://raw.githubusercontent.com/aaif-goose/goose/main/download_cli.ps1 | iex\""], + cli_install_commands_windows: &[windows_install_command!("goose", "https://raw.githubusercontent.com/aaif-goose/goose/main/download_cli.ps1", "$env:CONFIGURE='false'; ")], adapter_install_commands: &[], cli_install_instructions_url: "https://goose-docs.ai/docs/getting-started/installation/", adapter_install_instructions_url: "", @@ -117,7 +117,7 @@ const KNOWN_ACP_RUNTIMES: &[KnownAcpRuntime] = &[ mcp_hooks: false, underlying_cli: Some("claude"), cli_install_commands: &["curl -fsSL https://claude.ai/install.sh | bash"], - cli_install_commands_windows: &["powershell.exe -NoProfile -ExecutionPolicy Bypass -Command \"irm https://claude.ai/install.ps1 | iex\""], + cli_install_commands_windows: &[windows_install_command!("claude", "https://claude.ai/install.ps1")], adapter_install_commands: &["npm install -g @agentclientprotocol/claude-agent-acp"], cli_install_instructions_url: "https://code.claude.com/docs/en/getting-started", adapter_install_instructions_url: "https://github.com/agentclientprotocol/claude-agent-acp", @@ -149,7 +149,7 @@ const KNOWN_ACP_RUNTIMES: &[KnownAcpRuntime] = &[ mcp_hooks: false, underlying_cli: Some("codex"), cli_install_commands: &["curl -fsSL https://chatgpt.com/codex/install.sh | sh"], - cli_install_commands_windows: &["powershell.exe -NoProfile -ExecutionPolicy Bypass -Command \"irm https://chatgpt.com/codex/install.ps1 | iex\""], + cli_install_commands_windows: &[windows_install_command!("codex", "https://chatgpt.com/codex/install.ps1")], adapter_install_commands: &["npm install -g @agentclientprotocol/codex-acp"], cli_install_instructions_url: "https://developers.openai.com/codex/cli/", adapter_install_instructions_url: "https://github.com/agentclientprotocol/codex-acp", diff --git a/desktop/src-tauri/src/managed_agents/discovery/windows_install.rs b/desktop/src-tauri/src/managed_agents/discovery/windows_install.rs new file mode 100644 index 0000000000..09e27a62be --- /dev/null +++ b/desktop/src-tauri/src/managed_agents/discovery/windows_install.rs @@ -0,0 +1,225 @@ +//! Defender-safe construction of the Windows PowerShell CLI install commands. +//! +//! # Why the shape matters +//! +//! Windows Defender's ML classifier flags the bare `irm | iex` command +//! line as `Trojan:Win32/Commando.A!ml` — piping a downloaded string straight +//! into `Invoke-Expression` is a textbook dropper signature, so the *command +//! line itself* is scored, independent of what the URL actually serves. The +//! spawn is denied before PowerShell runs, surfacing as +//! `failed to spawn shell: Access is denied. (os error 5)`, and the block is +//! sticky: Defender's "Allow" button does not clear it. +//! +//! [`windows_install_command!`] emits the two-step form instead — download the +//! vendor script to a file, then execute the file — which does not match that +//! signature. All three runtimes use it, not only the one observed failing: +//! Goose and Claude escaped by scoring under the classifier threshold, which is +//! luck rather than design, and the threshold is not ours to depend on. +//! +//! # Why one macro instead of three literals +//! +//! The catalog needs `&'static str`, so the commands must be built at compile +//! time from literals. Emitting them from a single macro means the security +//! shape is defined once and cannot drift between runtimes as URLs change — +//! a per-runtime literal would let one entry silently regress to `iex`. +//! +//! # Exit-code fidelity +//! +//! [#2892](https://github.com/block/buzz/pull/2892) established that an install +//! step must not report success when the download failed. Two pieces preserve +//! that here, and both are load-bearing: +//! +//! - `$ErrorActionPreference='Stop'` makes a failed `Invoke-RestMethod` +//! terminate the whole command. Without it a failed download falls through to +//! `& $installer` on a path that does not exist, and PowerShell exits **0** — +//! the exact masking #2892 removed, in a new dress. `Stop` also prevents +//! executing a *stale* installer left in `$env:TEMP` by an earlier run. +//! - `exit $LASTEXITCODE` propagates the vendor script's own exit code. Without +//! it PowerShell reports its own status and a vendor failure of `3` flattens +//! to `1`, losing the distinction the retry logic reads. +//! +//! Verified against `pwsh` over a local HTTP server: vendor exit 3 surfaces as +//! 3, vendor exit 0 as 0, a 404 and an unresolvable host as non-zero, and a +//! planted stale installer is never executed. The old `irm | iex` shape +//! produces identical codes for all four, so this is not a behavior change. +//! +//! # Quoting contract +//! +//! The emitted body is wrapped in one double-quote pair, which +//! `install_powershell_command` strips before handing the body to PowerShell. +//! The body therefore uses **only single quotes** internally; a double quote +//! would terminate that pair early and truncate the command. + +/// Build the Windows CLI install command for one runtime. +/// +/// `slug` names the downloaded script (`buzz-install-.ps1`) so concurrent +/// installs of different runtimes cannot overwrite each other's file. The +/// optional third argument carries a runtime's env prefix (Goose's +/// `$env:CONFIGURE='false'; `) and must end with `; `. +/// +/// See the module docs for why each fragment is present. +macro_rules! windows_install_command { + ($slug:literal, $url:literal) => { + windows_install_command!($slug, $url, "") + }; + ($slug:literal, $url:literal, $env_prefix:literal) => { + concat!( + "powershell.exe -NoProfile -ExecutionPolicy Bypass -Command \"", + $env_prefix, + "$ErrorActionPreference='Stop'; ", + "$installer=Join-Path $env:TEMP 'buzz-install-", + $slug, + ".ps1'; ", + "Invoke-RestMethod ", + $url, + " -OutFile $installer; ", + "& $installer; ", + "exit $LASTEXITCODE\"", + ) + }; +} + +#[cfg(test)] +mod tests { + use crate::managed_agents::known_acp_runtime_exact; + + /// Every runtime that ships a Windows install command. `cli_install_commands_windows` + /// is read directly rather than through `cli_install_commands_for_os()` so these + /// assertions cover the Windows strings while running on the Linux CI host. + fn windows_install_commands() -> Vec<(&'static str, &'static str)> { + ["goose", "claude", "codex"] + .into_iter() + .flat_map(|id| { + known_acp_runtime_exact(id) + .expect("runtime must exist in the catalog") + .cli_install_commands_windows + .iter() + .map(move |command| (id, *command)) + }) + .collect() + } + + /// The whole point of the change: no runtime may carry the flagged + /// download-and-execute-in-one-line signature. + #[test] + fn test_no_windows_install_command_pipes_a_download_into_iex() { + for (id, command) in windows_install_commands() { + assert!( + !command.contains("| iex"), + "{id}: `irm | iex` is the shape Defender flags as Trojan:Win32/Commando.A!ml; \ + download to a file and execute the file instead. Got: {command}" + ); + assert!( + !command.contains("Invoke-Expression"), + "{id}: Invoke-Expression on downloaded content carries the same signature. \ + Got: {command}" + ); + } + } + + /// All three runtimes must be hardened, not just the one observed failing. + /// Goose and Claude escaped only by scoring under the classifier threshold. + #[test] + fn test_every_windows_install_command_downloads_to_a_file_then_executes_it() { + let commands = windows_install_commands(); + assert_eq!( + commands.len(), + 3, + "expected exactly one Windows install command for each of goose, claude, codex" + ); + for (id, command) in commands { + assert!( + command.contains("-OutFile $installer"), + "{id}: must download the vendor script to a file. Got: {command}" + ); + assert!( + command.contains("& $installer"), + "{id}: must execute the downloaded file. Got: {command}" + ); + assert!( + command.contains(&format!("buzz-install-{id}.ps1")), + "{id}: script name must be runtime-specific so concurrent installs of \ + different runtimes cannot overwrite each other. Got: {command}" + ); + } + } + + /// Guards the #2892 regression: without `Stop`, a failed download falls + /// through to a missing file and PowerShell exits 0, reporting a failed + /// install as a success. Without `exit $LASTEXITCODE`, the vendor's own + /// exit code is replaced by PowerShell's. + #[test] + fn test_every_windows_install_command_preserves_failure_exit_codes() { + for (id, command) in windows_install_commands() { + assert!( + command.contains("$ErrorActionPreference='Stop'"), + "{id}: a failed download must abort instead of running a missing or stale \ + installer and exiting 0 (see #2892). Got: {command}" + ); + assert!( + command.contains("exit $LASTEXITCODE"), + "{id}: the vendor script's exit code must propagate. Got: {command}" + ); + } + } + + /// `install_powershell_command` strips exactly one outer double-quote pair. + /// An inner double quote would close that pair early and truncate the body. + #[test] + fn test_every_windows_install_command_quotes_the_body_exactly_once() { + for (id, command) in windows_install_commands() { + let body = command + .split_once(" -Command ") + .map(|(_, body)| body) + .unwrap_or_else(|| panic!("{id}: command must pass a -Command body: {command}")); + assert!( + body.starts_with('"') && body.ends_with('"'), + "{id}: body must be wrapped in one double-quote pair. Got: {body}" + ); + assert_eq!( + body.matches('"').count(), + 2, + "{id}: body must contain no inner double quotes — one would terminate the \ + outer pair early and truncate the command. Got: {body}" + ); + } + } + + /// Goose's installer reads `CONFIGURE` to stay non-interactive; losing the + /// prefix hangs the install waiting on input that never comes. + #[test] + fn test_goose_windows_install_command_keeps_its_env_prefix() { + let goose = known_acp_runtime_exact("goose").unwrap(); + let command = goose.cli_install_commands_windows[0]; + assert!( + command.contains("$env:CONFIGURE='false'"), + "goose must stay non-interactive. Got: {command}" + ); + assert!( + command.find("$env:CONFIGURE='false'").unwrap() + < command.find("Invoke-RestMethod").unwrap(), + "the env prefix must be set before the installer runs. Got: {command}" + ); + } + + /// The vendor URLs are the payload; pin them so a refactor of the shared + /// shape cannot silently retarget a download. + #[test] + fn test_windows_install_commands_target_the_official_vendor_urls() { + for (id, expected) in [ + ( + "goose", + "https://raw.githubusercontent.com/aaif-goose/goose/main/download_cli.ps1", + ), + ("claude", "https://claude.ai/install.ps1"), + ("codex", "https://chatgpt.com/codex/install.ps1"), + ] { + let runtime = known_acp_runtime_exact(id).unwrap(); + let command = runtime.cli_install_commands_windows[0]; + assert!( + command.contains(&format!("Invoke-RestMethod {expected} -OutFile")), + "{id}: must download from {expected}. Got: {command}" + ); + } + } +} From 09c86c56e52651c017743268fc8ce708bb83b265 Mon Sep 17 00:00:00 2001 From: Atish Patel Date: Mon, 3 Aug 2026 11:42:42 -0500 Subject: [PATCH 12/27] fix: report agent usage per provider round, not once per turn (#4545) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## The bug buzz-agent emitted its `usage_update` notification in exactly one place: after `ctx.run()` returned. Until that moment a turn's token counters lived only in the prompt task's stack frame. **A turn killed mid-flight reported nothing at all** — the provider had already billed every round it completed, and no consumer ever saw any of it. That is not a corner case for anything that ends a turn on a clock. It is the normal case for a long-horizon benchmark run that relaunches its agent between phases. ## How big Measured against a provider's own billing ledger over one run's window: | | provider ledger | what we recorded | |---|---|---| | the relaunched lead seat | $485 / 348M tok | $98.99 / 90.3M tok | | the two seats that were not relaunched | $29.90 / 856M | $25.81 / 765M — reconciles | 97% of that run's usage rows came back all zeros, against 1–4% for comparable runs that never relaunch. In one 450-phase trial exactly 7 phases recorded any usage — and each of those carries 177k–437k input tokens, a whole session's worth landing in the one phase that happened to end gracefully. Worth being precise about what was *not* wrong, since both were plausible and both were checked: - **Not pricing.** The rates were verified against the provider's endpoints API and match what we charge. - **Not a truncation bug.** The usage files were intact and internally consistent. The tokens were never captured in the first place. ## The fix The run loop now emits a session-cumulative `usage_update` after every usage-bearing provider response, so an interrupted turn has reported everything but its single in-flight request. - **Emitting more than once per turn is already part of the contract.** buzz-acp's `UsageTracker` advances its committed baseline only at publish time, and goose behaves the same way — which is why the tracker was written to tolerate it. - **The turn-start session baseline is snapshotted into `RunCtx`** so the mid-turn figure stays *session*-cumulative. A turn-local number would be discarded by a high-water-mark consumer and lose the turn entirely; there is a test for exactly that. - **Snapshot by value, not a session handle.** The loop reports once per round, and taking the sessions lock on each would serialise concurrent sessions behind one another's provider round-trips. Nothing else advances those counters while the turn holds `busy`, so it cannot go stale. - **One shared `wire::usage_update_payload`** for both call sites, so the mid-turn and end-of-turn shapes cannot drift. A drift there would present as tokens silently vanishing, which is the failure this reporting exists to prevent. ## Why not a SIGTERM handler That was the obvious shape and it does not work. At signal time the counters are not sitting anywhere a handler could reach — they are in the turn's stack frame, and the value the handler would need has not been folded into the session yet. Making usage durable *during* the turn is what actually fixes it; once it is, a handler adds nothing beyond the in-flight request, whose cost is unknown until its response lands. ## Tests - `usage_is_reported_after_each_round_not_only_at_turn_end` — two rounds; asserts the **first** notification carries round 1's counts alone, proving it went out before round 2 returned. - `mid_turn_usage_includes_earlier_turns` — a mid-turn report must be session-cumulative, not turn-local. buzz-agent 18/18 on the `fake_llm` suite, 382 unit. `cargo fmt` / `clippy` / `cargo check --workspace --all-targets` clean. ## Scope Agent-side only, against `main`. The matching harness change — settling usage on the timeout path, which was skipped on the reasoning that an incomplete turn has nothing to flush — is **#4553**, against the benchmark branch, since that harness does not exist on `main`. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Signed-off-by: Atish Patel Co-authored-by: Claude Code --- crates/buzz-agent/src/agent.rs | 52 ++++++++++- crates/buzz-agent/src/lib.rs | 46 +++++----- crates/buzz-agent/src/types.rs | 24 ++++++ crates/buzz-agent/src/wire.rs | 42 +++++++++ crates/buzz-agent/tests/fake_llm.rs | 129 ++++++++++++++++++++++++++++ 5 files changed, 269 insertions(+), 24 deletions(-) diff --git a/crates/buzz-agent/src/agent.rs b/crates/buzz-agent/src/agent.rs index 8e14fee195..ff87a33a1a 100644 --- a/crates/buzz-agent/src/agent.rs +++ b/crates/buzz-agent/src/agent.rs @@ -13,8 +13,8 @@ use crate::mcp::McpRegistry; use crate::mcp::ResultBudget; use crate::types::{ - AgentError, ContentBlock, HistoryItem, ProviderStop, StopReason, ToolCall, ToolResult, - ToolResultContent, TurnTotalState, + AgentError, ContentBlock, HistoryItem, ProviderStop, SessionUsageBaseline, StopReason, + ToolCall, ToolResult, ToolResultContent, TurnTotalState, }; use crate::wire::{self, WireSender}; @@ -150,9 +150,40 @@ pub struct RunCtx<'a> { /// Reset to `Unseen` at turn start in `run()`. Callers must not derive a /// total by summing input+output — that is the UI display approximation only. pub turn_total_state: &'a mut TurnTotalState, + /// Session-cumulative counters as they stood when this turn began. Added to + /// the `turn_*` accumulators above to report a cumulative figure mid-turn; + /// the session's own copy is only advanced once, after the turn returns. + pub usage_baseline: SessionUsageBaseline, } impl RunCtx<'_> { + /// Send a session-cumulative `usage_update` reflecting everything observed + /// up to and including the most recent LLM response. + /// + /// The figure is the turn-start baseline plus this turn's running + /// accumulators, which is exactly what `session/prompt` will fold into the + /// session once the turn returns — so a mid-turn notification and the + /// end-of-turn one agree, and a turn that never returns has still reported + /// everything but its final in-flight request. + async fn emit_usage_update(&self) { + let base = self.usage_baseline; + let payload = wire::usage_update_payload( + base.input_tokens + .saturating_add(self.turn_input_tokens.unwrap_or(0)), + base.output_tokens + .saturating_add(self.turn_output_tokens.unwrap_or(0)), + base.cached_input_tokens + .saturating_add(self.turn_cached_input_tokens.unwrap_or(0)), + base.total_state.merge_session(*self.turn_total_state), + self.effective_model, + ); + wire::send( + self.wire, + wire::goose_session_update(self.session_id, payload), + ) + .await; + } + pub async fn run(&mut self, prompt: Vec) -> Result { let user_text = prompt_to_text(prompt)?; if user_text.len() > MAX_PROMPT_BYTES { @@ -299,6 +330,23 @@ impl RunCtx<'_> { // this gate rather than representing absent categories as zero. if response.input_tokens.is_some() || response.output_tokens.is_some() { *self.turn_total_state = self.turn_total_state.fold(response.total_tokens); + // Report what the turn has burned SO FAR, before running the + // next round. A turn is many provider round-trips over many + // minutes, and until this point the only report was the one + // `session/prompt` sends after the turn returns — so a turn + // that was cancelled, timed out, or whose process was killed + // reported nothing at all, and its tokens (already billed) + // existed only in this stack frame. Reporting per round bounds + // the loss to the single request in flight. + // + // Emitting more than one `usage_update` per turn is expected by + // the consumer: buzz-acp's UsageTracker advances its committed + // baseline only when the turn's metric is published, so every + // notification within a turn measures from the same frozen + // baseline and the last one seen is the turn's true total. + // goose behaves the same way, which is why the tracker was + // written to tolerate it. + self.emit_usage_update().await; } if !response.reasoning.is_empty() { diff --git a/crates/buzz-agent/src/lib.rs b/crates/buzz-agent/src/lib.rs index 9a45bf4c98..6cd7b6808f 100644 --- a/crates/buzz-agent/src/lib.rs +++ b/crates/buzz-agent/src/lib.rs @@ -658,6 +658,7 @@ async fn run_prompt(app: Arc, id: Value, params: Value, wire_tx: WireSender effective_model_override, run_id, mut steer_rx, + usage_baseline, ) = match acquire_session(&app, &p.session_id).await { Ok(v) => v, Err(reason) => { @@ -709,6 +710,7 @@ async fn run_prompt(app: Arc, id: Value, params: Value, wire_tx: WireSender turn_output_tokens: &mut turn_output_tokens, turn_cached_input_tokens: &mut turn_cached_input_tokens, turn_total_state: &mut turn_total_state, + usage_baseline, }; let result = ctx.run(p.prompt).await; if let Some(s) = app.sessions.lock().await.get_mut(&sid) { @@ -766,28 +768,16 @@ async fn run_prompt(app: Arc, id: Value, params: Value, wire_tx: WireSender if let Some((accumulated_in, accumulated_out, accumulated_cached, accumulated_total)) = accumulated { - // Build the usage_update payload. `accumulatedTotalTokens` is only - // included when the cumulative is exactly known — never when Unseen - // (no total ever observed) or Unknown (at least one turn lacked a - // total). A goose consumer that doesn't recognise the field ignores it. - let mut update = serde_json::json!({ - "sessionUpdate": "usage_update", - // used: total tokens as a context-usage proxy; - // contextLimit: 0 (buzz-agent has no context limit tracking). - "used": accumulated_in.saturating_add(accumulated_out), - "contextLimit": 0u64, - "accumulatedInputTokens": accumulated_in, - "accumulatedOutputTokens": accumulated_out, - // A subset of accumulatedInputTokens, not an addition to - // it. Extends goose's usage_update shape; a consumer that - // does not know the field ignores it and prices exactly as - // it did before. - "accumulatedCachedInputTokens": accumulated_cached, - "model": effective_model_str, - }); - if let crate::types::TurnTotalState::Exact(total) = accumulated_total { - update["accumulatedTotalTokens"] = serde_json::json!(total); - } + // Same builder the run loop uses for its per-round reports, so the + // final notification is shape-identical to the ones that preceded + // it and a consumer taking the high-water mark lands on this one. + let update = wire::usage_update_payload( + accumulated_in, + accumulated_out, + accumulated_cached, + accumulated_total, + effective_model_str, + ); wire::send(&wire_tx, goose_session_update(&sid, update)).await; } } @@ -821,6 +811,7 @@ async fn acquire_session( Option, String, mpsc::UnboundedReceiver>, + crate::types::SessionUsageBaseline, ), &'static str, > { @@ -857,6 +848,17 @@ async fn acquire_session( effective_model, run_id, steer_rx, + // Snapshot rather than a handle: the run loop reports cumulative usage + // after every LLM round, and taking the sessions lock on each of those + // would serialise concurrent sessions behind one another's provider + // round-trips. Nothing else advances these counters while this turn + // holds `busy`, so the snapshot cannot go stale under it. + crate::types::SessionUsageBaseline { + input_tokens: s.accumulated_input_tokens, + output_tokens: s.accumulated_output_tokens, + cached_input_tokens: s.accumulated_cached_input_tokens, + total_state: s.accumulated_total_state, + }, )) } diff --git a/crates/buzz-agent/src/types.rs b/crates/buzz-agent/src/types.rs index 343a75bf72..e386421981 100644 --- a/crates/buzz-agent/src/types.rs +++ b/crates/buzz-agent/src/types.rs @@ -308,6 +308,30 @@ impl TurnTotalState { } } +/// The session-cumulative usage counters as of the START of a turn. +/// +/// Copied out of the session under the lock when a turn begins and handed to +/// `RunCtx` by value, so the run loop can emit a cumulative `usage_update` +/// after every LLM round without reaching back into `App.sessions` (which it +/// holds no handle to, and which is locked by the turn's own bookkeeping at +/// both ends). +/// +/// This exists so that usage is durable *during* a turn rather than only after +/// it. The counters a turn accrues live in the prompt task's stack frame until +/// the turn returns; a process killed mid-turn takes them with it and the +/// tokens are billed by the provider but recorded nowhere. That is not +/// hypothetical — it silently under-reported a long-horizon benchmark's cost by +/// several-fold, because every phase of a `continue_until_timeout` run is +/// terminated mid-turn by design. +#[derive(Debug, Clone, Copy, Default)] +pub struct SessionUsageBaseline { + pub input_tokens: u64, + pub output_tokens: u64, + /// The cache-served subset of `input_tokens`, not an addition to it. + pub cached_input_tokens: u64, + pub total_state: TurnTotalState, +} + #[derive(Debug, Clone, Copy, PartialEq)] pub enum StopReason { EndTurn, diff --git a/crates/buzz-agent/src/wire.rs b/crates/buzz-agent/src/wire.rs index 7b50e7982a..634fca03af 100644 --- a/crates/buzz-agent/src/wire.rs +++ b/crates/buzz-agent/src/wire.rs @@ -148,6 +148,48 @@ pub fn goose_session_update(sid: &str, update: Value) -> Value { }) } +/// Build the `usage_update` payload for a `_goose/unstable/session/update`. +/// +/// Shared by the two places that report usage — after each LLM round inside a +/// turn, and once more when the turn completes — so the wire shape cannot drift +/// between them. A consumer takes the high-water mark per session, so the +/// mid-turn payloads are supersets of each other and the final one wins; a +/// divergence in field names or units between the two call sites would instead +/// show up as tokens silently vanishing, which is the failure this reporting +/// exists to prevent. +/// +/// All counts are SESSION-cumulative, matching goose, so buzz-acp's +/// `UsageTracker` can compute per-turn deltas symmetrically for both agents. +pub fn usage_update_payload( + accumulated_input_tokens: u64, + accumulated_output_tokens: u64, + accumulated_cached_input_tokens: u64, + accumulated_total: crate::types::TurnTotalState, + model: &str, +) -> Value { + let mut update = json!({ + "sessionUpdate": "usage_update", + // used: total tokens as a context-usage proxy; + // contextLimit: 0 (buzz-agent has no context limit tracking). + "used": accumulated_input_tokens.saturating_add(accumulated_output_tokens), + "contextLimit": 0u64, + "accumulatedInputTokens": accumulated_input_tokens, + "accumulatedOutputTokens": accumulated_output_tokens, + // A subset of accumulatedInputTokens, not an addition to it. Extends + // goose's usage_update shape; a consumer that does not know the field + // ignores it and prices exactly as it did before. + "accumulatedCachedInputTokens": accumulated_cached_input_tokens, + "model": model, + }); + // Only when the cumulative is exactly known — never when Unseen (no total + // ever observed) or Unknown (at least one turn lacked a total). A goose + // consumer that doesn't recognise the field ignores it. + if let Some(total) = accumulated_total.exact_value() { + update["accumulatedTotalTokens"] = json!(total); + } + update +} + /// A `session/update` notification carrying a `update._meta.goose.` field. /// Used to advertise `activeRunId` (so steer-capable clients can target the /// in-flight run) and `queuedSteer` (so they can correlate an accepted steer diff --git a/crates/buzz-agent/tests/fake_llm.rs b/crates/buzz-agent/tests/fake_llm.rs index f782a9d476..ef6f9d2d80 100644 --- a/crates/buzz-agent/tests/fake_llm.rs +++ b/crates/buzz-agent/tests/fake_llm.rs @@ -933,6 +933,135 @@ async fn no_usage_turn_emits_no_usage_notification() { h.shutdown().await; } +/// Usage must be reported after EVERY provider round, not only once the turn +/// returns. +/// +/// A turn is many provider round-trips over many minutes. While the only report +/// was the one `session/prompt` sends after the turn returns, a turn whose +/// process was killed mid-flight reported nothing at all: its counters lived in +/// the prompt task's stack frame, the provider had already billed them, and no +/// consumer ever saw them. That is not a corner case for a long-horizon +/// benchmark — every phase of a `continue_until_timeout` run is terminated +/// mid-turn by design, which under-reported one measured run's cost several-fold. +/// +/// Two rounds with distinct usage. The assertion that matters is the FIRST +/// notification: it must carry round 1's counts alone, proving it was sent +/// before round 2 had returned, so a kill between the rounds would still have +/// left round 1 on the wire. +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn usage_is_reported_after_each_round_not_only_at_turn_end() { + let url = spawn_fake_llm(vec![ + openai_tool_call_with_usage("call_round1", "fake__noop", json!({}), 15, 6), + openai_text_with_usage("done", 20, 8), + ]) + .await; + let mut h = Harness::spawn(&url).await; + let sid = init_session(&mut h).await; + + let p_id = h + .send( + "session/prompt", + json!({"sessionId": sid, "prompt": [{"type":"text","text":"go"}]}), + ) + .await; + + let (frames_before, response) = recv_until_with_drain(&mut h, |v| v["id"] == p_id).await; + assert_eq!( + response["result"]["stopReason"], "end_turn", + "turn must complete with end_turn" + ); + + let usage: Vec<&Value> = frames_before + .iter() + .filter(|v| is_usage_update(v)) + .collect(); + assert!( + usage.len() >= 2, + "expected a usage_update per round (2 rounds), got {}; frames: {frames_before:#?}", + usage.len() + ); + + // Round 1 alone — emitted while round 2 was still outstanding. + assert_eq!( + usage[0]["params"]["update"]["accumulatedInputTokens"], + json!(15u64), + "first notification must carry round 1's input tokens only" + ); + assert_eq!( + usage[0]["params"]["update"]["accumulatedOutputTokens"], + json!(6u64), + "first notification must carry round 1's output tokens only" + ); + + // The last one is the turn total and is what a high-water-mark consumer keeps. + let last = usage[usage.len() - 1]; + assert_eq!( + last["params"]["update"]["accumulatedInputTokens"], + json!(35u64), + "final notification must carry the turn total 15+20=35" + ); + assert_eq!( + last["params"]["update"]["accumulatedOutputTokens"], + json!(14u64), + "final notification must carry the turn total 6+8=14" + ); + + h.shutdown().await; +} + +/// A mid-turn report must be SESSION-cumulative, not turn-local. +/// +/// The baseline handed to the run loop is a snapshot taken when the turn began; +/// if it were dropped, a consumer taking the high-water mark per session would +/// see turn 2's first round (a small number) arrive after turn 1's total and +/// discard it, silently losing turn 2 for any turn that never completed. +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn mid_turn_usage_includes_earlier_turns() { + let url = spawn_fake_llm(vec![ + openai_text_with_usage("turn one", 10, 5), + openai_tool_call_with_usage("call_t2", "fake__noop", json!({}), 20, 8), + openai_text_with_usage("turn two done", 30, 9), + ]) + .await; + let mut h = Harness::spawn(&url).await; + let sid = init_session(&mut h).await; + + let p1 = h + .send( + "session/prompt", + json!({"sessionId": sid, "prompt": [{"type":"text","text":"turn 1"}]}), + ) + .await; + let (_, _) = recv_until_with_drain(&mut h, |v| v["id"] == p1).await; + + let p2 = h + .send( + "session/prompt", + json!({"sessionId": sid, "prompt": [{"type":"text","text":"turn 2"}]}), + ) + .await; + let (frames_before, _) = recv_until_with_drain(&mut h, |v| v["id"] == p2).await; + + let first = frames_before + .iter() + .find(|v| is_usage_update(v)) + .unwrap_or_else(|| { + panic!("expected a usage_update during turn 2; frames: {frames_before:#?}") + }); + assert_eq!( + first["params"]["update"]["accumulatedInputTokens"], + json!(30u64), + "turn 2 round 1 must report 10 (turn 1) + 20 (this round), not 20" + ); + assert_eq!( + first["params"]["update"]["accumulatedOutputTokens"], + json!(13u64), + "turn 2 round 1 must report 5 (turn 1) + 8 (this round), not 8" + ); + + h.shutdown().await; +} + /// When a turn is cancelled AFTER the provider has already returned a response /// (so token counts are observed), buzz-agent must still emit the usage /// notification before the cancelled `session/prompt` response. From 44fa1e8e3af30d561de981a211ff7a79bfa36493 Mon Sep 17 00:00:00 2001 From: Wes Date: Mon, 3 Aug 2026 10:43:10 -0600 Subject: [PATCH 13/27] docs(release): align desktop handoff instructions (#3988) ## Summary - document exact-head trusted approval as the only desktop tagging authorization - explicitly require `desktop_ref=desktop-v` for the internal desktop handoff - replace the stale `squareup/sprout-releases` repository name with `squareup/buzz-releases` ## Audit coverage Compared `block/buzz` release documentation and automation with `squareup/buzz-releases` `main` (`5b09e5c5d71c80a0849a33458f4e45695df515d7`), including its README, agent guide, Buildkite field hint, desktop validator, release validation tests, and protected updater promotion instructions. ## Validation - `bash scripts/test-release-ref-contract.sh` - `git diff --check origin/main...HEAD` Signed-off-by: Wes Co-authored-by: Carl --- AGENTS.md | 4 ++-- RELEASING.md | 25 ++++++++++++++----------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 4f03b312bc..7cd43061b2 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -13,14 +13,14 @@ Buzz spans five repos. This one (`block/buzz`) is the OSS source for the relay, | Repo | Purpose | |------|---------| | [block/buzz](https://github.com/block/buzz) | OSS source — relay, desktop app, mobile app, CLI, agent harness | -| [squareup/sprout-releases](https://github.com/squareup/sprout-releases) | Buildkite pipeline producing Block-signed macOS + iOS builds with `-block` version suffix | +| [squareup/buzz-releases](https://github.com/squareup/buzz-releases) | Buildkite pipelines producing Block-signed macOS + iOS builds with `-block` desktop version suffix | | [squareup/sprout-oss](https://github.com/squareup/sprout-oss) | CI pipeline building the relay Docker image and pushing to internal ECR | | [squareup/block-coder-tf-stacks](https://github.com/squareup/block-coder-tf-stacks) | Terraform + ArgoCD deploying the relay to the staging Kubernetes cluster | | [squareup/sprout-backend-blox](https://github.com/squareup/sprout-backend-blox) | Desktop backend provider script connecting Blox workstation agents to the relay | ``` block/buzz (source) - ├─► sprout-releases (desktop + mobile builds → Artifactory, GitHub, Mobile Releases) + ├─► buzz-releases (desktop + mobile builds → Artifactory, GitHub, Mobile Releases) ├─► sprout-oss (relay Docker image → ECR) │ └─► block-coder-tf-stacks (Helm chart → ArgoCD → staging cluster) └─── sprout-backend-blox (Blox compute provider for Desktop agent launch) diff --git a/RELEASING.md b/RELEASING.md index e729f8b50c..23dacea2ce 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -56,14 +56,15 @@ or mobile GitHub Release. updates the PR. 2. Review the recorded base and candidate SHA, the complete changelog, and CI. The required **Desktop Release Candidate** check validates the exact head. - Authorization is either an approval on that exact head or a permitted Default - ruleset bypass at merge time. Any regeneration changes the head and requires - the checks—and, for the review path, approval—to run again. + A trusted repository member, owner, or collaborator must approve that exact + candidate head. Any regeneration or push changes the head, invalidates the + prior approval, and requires both the checks and approval to run again. 3. **Squash merge** the PR. The protected branch must still be exactly the recorded base; otherwise regenerate the candidate from current `main`. 4. `auto-tag-on-release-pr-merge` verifies the frozen parent, full-tree identity, - required checks, and one of the two authorization paths, then tags the squash - commit as `desktop-v`. + required checks, and trusted approval on the exact candidate head, then tags + the squash commit as `desktop-v`. An admin or ruleset bypass does not + authorize desktop tagging. 5. The tag triggers `release.yml`. It builds and stages Apple Silicon and Intel macOS, Windows, and Linux artifacts; publishes the versioned release only after the complete set succeeds; then updates the rolling updater manifest @@ -184,10 +185,12 @@ Buildkite pipeline accepts only an exact candidate tag. For mobile, trigger the private [Release Mobile pipeline](https://buildkite.com/runway/buzz-mobile-releases) with -an exact RC tag for the platform build being cut. For desktop, use -[Release Desktop](https://buildkite.com/runway/sprout-releases). See the +an exact RC tag for the platform build being cut. For desktop, start +[Release Desktop](https://buildkite.com/runway/sprout-releases) and enter the +exact public source tag as `desktop_ref=desktop-v`; a generic +`v` tag is intentionally rejected. See the [buzz-releases README](https://github.com/squareup/buzz-releases#cutting-a-release) -for the private pipeline contract. +for the rest of the private pipeline contract. --- @@ -269,9 +272,9 @@ actor list. Do not update the branch manually and do not weaken the ruleset. Run `just release-desktop ` again from current `main`; this regenerates the -candidate, reruns CI, and requires a fresh approval when using the review path. -The post-merge verifier refuses to tag a squash whose parent differs from the -recorded candidate base or whose tree differs from the validated PR head. +candidate, reruns CI, and requires a fresh trusted approval on the new exact +head. The post-merge verifier refuses to tag a squash whose parent differs from +the recorded candidate base or whose tree differs from the validated PR head. ### Local `just release-desktop` fails with "must be on main branch" Switch to `main` and pull latest before running the release recipe. From 6de85fe31d781122756aecf954bae7d357a56b9a Mon Sep 17 00:00:00 2001 From: Wes Date: Mon, 3 Aug 2026 10:56:14 -0600 Subject: [PATCH 14/27] test(mobile): assert follow boundary semantics (#4559) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Summary - replace a platform-dependent mounted-`RichText` assertion with the production follow-mode boundary predicate - retain the jump-to-latest assertion as the visible consequence of follow mode remaining off - leave production behavior and desktop PR #4549 unchanged ## Why `ScrollablePositionedList` may keep an offscreen item mounted within cache extent on macOS while Linux does not. Mounting therefore does not establish whether reversed-list item 0 is at the latest boundary. The replacement reads the list's public `itemPositionsNotifier` and applies the same `index == 0 && abs(itemLeadingEdge) < 0.01` contract used by `message_list.dart`. ## Validation At commit `bc88617e61d8e9edf8fea832baa8d918163ee212` on macOS with repo Flutter 3.41.7: - `cd mobile && ../bin/flutter test` — 1088 passed, 1 skipped - `cd mobile && ../bin/flutter analyze` — no issues - pre-push `mobile-test` and `branch-skew` hooks — passed Signed-off-by: Wes Co-authored-by: Carl --- .../channels/channel_detail_page_test.dart | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/mobile/test/features/channels/channel_detail_page_test.dart b/mobile/test/features/channels/channel_detail_page_test.dart index 51c06d0283..7f8d0774c3 100644 --- a/mobile/test/features/channels/channel_detail_page_test.dart +++ b/mobile/test/features/channels/channel_detail_page_test.dart @@ -1294,7 +1294,20 @@ void main() { ]); await tester.pumpAndSettle(); - expect(findRichText('Newest live update'), findsNothing); + // Cache-extent mounting varies by platform, so assert the reversed + // list's semantic boundary rather than whether item 0 is mounted. + final positions = tester + .widget(messageList) + .itemPositionsNotifier! + .itemPositions + .value; + expect( + positions.any( + (position) => + position.index == 0 && position.itemLeadingEdge.abs() < 0.01, + ), + isFalse, + ); expect( find.byKey(const ValueKey('channel-jump-to-latest')), findsOneWidget, From 651f6372754e60e3f936b3397040eb0f1e44c9f3 Mon Sep 17 00:00:00 2001 From: Wes Date: Mon, 3 Aug 2026 11:33:19 -0600 Subject: [PATCH 15/27] chore(release): release Buzz Desktop version 0.5.4 (#4562) ## Buzz Desktop release v0.5.4 - **Frozen main:** `6de85fe31d781122756aecf954bae7d357a56b9a` - **Reviewed candidate:** `5836cb8f0af478ed3ee3bc6464a20fa4cc91303f` - **Previous desktop release:** `desktop-v0.5.3` - **Proposed immutable tag:** `desktop-v0.5.4` This PR must be **squash merged** only after the Desktop Release Candidate check passes. The branch must remain based directly on current `main`; stale base, payload drift, incomplete notes, or an unauthorized merge produce no tag. The checked-in changelog accounts for every non-merge commit in the release range. Publication remains bound to the immutable candidate tag. Signed-off-by: Wes Co-authored-by: Release Automation --- .release/desktop-candidate.json | 10 +++---- CHANGELOG.md | 50 +++++++++++++++++++++++++++++++ desktop/package.json | 2 +- desktop/src-tauri/Cargo.lock | 2 +- desktop/src-tauri/Cargo.toml | 2 +- desktop/src-tauri/tauri.conf.json | 2 +- 6 files changed, 59 insertions(+), 9 deletions(-) diff --git a/.release/desktop-candidate.json b/.release/desktop-candidate.json index 1bf2efb66b..1ba64765ff 100644 --- a/.release/desktop-candidate.json +++ b/.release/desktop-candidate.json @@ -1,8 +1,8 @@ { "schema": 1, - "version": "0.5.3", - "base_sha": "54c8ef30a9bb9c59a4415a8a7ee84c7c5454b48a", - "previous_tag": "v0.5.2", - "tag": "desktop-v0.5.3", - "commit_count": 58 + "version": "0.5.4", + "base_sha": "6de85fe31d781122756aecf954bae7d357a56b9a", + "previous_tag": "desktop-v0.5.3", + "tag": "desktop-v0.5.4", + "commit_count": 40 } diff --git a/CHANGELOG.md b/CHANGELOG.md index 71a4bbd449..e30941a355 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,55 @@ # Changelog +## v0.5.4 + +### Desktop and shared changes + +- fix: report agent usage per provider round, not once per turn ([#4545](https://github.com/block/buzz/pull/4545)) ([`09c86c56e52651c017743268fc8ce708bb83b265`](https://github.com/block/buzz/commit/09c86c56e52651c017743268fc8ce708bb83b265)) +- fix(desktop): harden Windows installs against Defender block and orphaned Node ([#4382](https://github.com/block/buzz/pull/4382)) ([`80315ac1a68024c40b61f3a062c9cb6bf7d4efb5`](https://github.com/block/buzz/commit/80315ac1a68024c40b61f3a062c9cb6bf7d4efb5)) +- feat(desktop): improve channel template discovery ([#4549](https://github.com/block/buzz/pull/4549)) ([`c1b88af8d71d1cf6aaca517e92ce9e918cd0e8bd`](https://github.com/block/buzz/commit/c1b88af8d71d1cf6aaca517e92ce9e918cd0e8bd)) +- fix(desktop): save key backups to authorized path ([#4022](https://github.com/block/buzz/pull/4022)) ([`01c80aa9b3eaa569361966877994438ad84a280a`](https://github.com/block/buzz/commit/01c80aa9b3eaa569361966877994438ad84a280a)) +- Add channel activity hover menu ([#3935](https://github.com/block/buzz/pull/3935)) ([`b0c6d6f744e63ac88a1738f0e995680c163e1d13`](https://github.com/block/buzz/commit/b0c6d6f744e63ac88a1738f0e995680c163e1d13)) +- feat(desktop): show saved Run on settings when editing an agent ([#4539](https://github.com/block/buzz/pull/4539)) ([`f865c0054b0a400657126c9321b4d4cb7d9cc746`](https://github.com/block/buzz/commit/f865c0054b0a400657126c9321b4d4cb7d9cc746)) +- fix(desktop): disambiguate provider API key labels and annotate mint key ([#4406](https://github.com/block/buzz/pull/4406)) ([`5e0efb0bb95182f588390b55cc5affa09114c87e`](https://github.com/block/buzz/commit/5e0efb0bb95182f588390b55cc5affa09114c87e)) +- fix(desktop): make OpenAI key re-enterable after first save in card mint dialog ([#4140](https://github.com/block/buzz/pull/4140)) ([`f810a2f49e213d25119f2aa75b5b577655119b74`](https://github.com/block/buzz/commit/f810a2f49e213d25119f2aa75b5b577655119b74)) +- fix(config-bridge): add harness-definition env tier and fix equal-value model override ([#3580](https://github.com/block/buzz/pull/3580)) ([`be95a8a986d02319b27e8fb57aefe59e33a1eb13`](https://github.com/block/buzz/commit/be95a8a986d02319b27e8fb57aefe59e33a1eb13)) +- fix(desktop): stop the create-agent provider config probe from erasing keystrokes ([#4411](https://github.com/block/buzz/pull/4411)) ([`2c0ac2467437b30953a95e00f419143488bcfcc7`](https://github.com/block/buzz/commit/2c0ac2467437b30953a95e00f419143488bcfcc7)) +- feat(acp): deliver system prompt via _meta.systemPrompt for claude-agent-acp ([#4395](https://github.com/block/buzz/pull/4395)) ([`7ff5fc31895efe6265a379d01637c8ee301872e5`](https://github.com/block/buzz/commit/7ff5fc31895efe6265a379d01637c8ee301872e5)) +- fix(security): bump nostr crates for RUSTSEC-2026-0225..0232 + default sprig image to published digest ([#4392](https://github.com/block/buzz/pull/4392)) ([`318fbf896ec335bc7bcb40edafde0b6ebca53428`](https://github.com/block/buzz/commit/318fbf896ec335bc7bcb40edafde0b6ebca53428)) +- fix(desktop): back/forward via keyboard chords, mouse X1/X2 buttons, and swipe gestures ([#3778](https://github.com/block/buzz/pull/3778)) ([`f86cfc7369d4471f8939ed98be6f597b0a4b0bb2`](https://github.com/block/buzz/commit/f86cfc7369d4471f8939ed98be6f597b0a4b0bb2)) +- feat(k8s): Kubernetes backend plugin + desktop deploy path ([#4289](https://github.com/block/buzz/pull/4289)) ([`6530b58a61d4602d0a371100fedf80c5998b1e34`](https://github.com/block/buzz/commit/6530b58a61d4602d0a371100fedf80c5998b1e34)) +- feat(projects): add buzz projects CLI commands (NIP-MP kind:30621) ([#4020](https://github.com/block/buzz/pull/4020)) ([`b7bb15122e8a2053b545dc2210afc167f6c7a626`](https://github.com/block/buzz/commit/b7bb15122e8a2053b545dc2210afc167f6c7a626)) +- fix(desktop): keep thread-open affordance in archived channels ([#4012](https://github.com/block/buzz/pull/4012)) ([`8e81afa431deecd172f1ad6aab6f022f31cd812c`](https://github.com/block/buzz/commit/8e81afa431deecd172f1ad6aab6f022f31cd812c)) +- fix(desktop): point Oh My Pi preset at omp.sh ([#3516](https://github.com/block/buzz/pull/3516)) ([`3ade48d5030a8f7dbb9d3693f171e5544dcd8df1`](https://github.com/block/buzz/commit/3ade48d5030a8f7dbb9d3693f171e5544dcd8df1)) +- fix(mesh): stop restarting a busy or loading shared-compute node ([#3909](https://github.com/block/buzz/pull/3909)) ([`fa1a5b1a797870724f5c7e7e26931861a60f22cb`](https://github.com/block/buzz/commit/fa1a5b1a797870724f5c7e7e26931861a60f22cb)) +- fix(desktop): preserve first huddle speech ([#3962](https://github.com/block/buzz/pull/3962)) ([`45314fc504113aec7c54ae6520cfe5e1562aae40`](https://github.com/block/buzz/commit/45314fc504113aec7c54ae6520cfe5e1562aae40)) +- feat(desktop): Agent Trading Cards — mintable agent-snapshot card PNGs with optional NIP-44 lock ([#3278](https://github.com/block/buzz/pull/3278)) ([`eb049ddf815d48195e1713afe039d28c950d7933`](https://github.com/block/buzz/commit/eb049ddf815d48195e1713afe039d28c950d7933)) +- feat(relay): accept kind:30621 multi-repo projects at ingest ([#3171](https://github.com/block/buzz/pull/3171)) ([`cb9701cd30fb344bf134585634a09007f3155bfb`](https://github.com/block/buzz/commit/cb9701cd30fb344bf134585634a09007f3155bfb)) + +### Other repository changes + +- test(mobile): assert follow boundary semantics ([#4559](https://github.com/block/buzz/pull/4559)) ([`6de85fe31d781122756aecf954bae7d357a56b9a`](https://github.com/block/buzz/commit/6de85fe31d781122756aecf954bae7d357a56b9a)) +- docs(release): align desktop handoff instructions ([#3988](https://github.com/block/buzz/pull/3988)) ([`44fa1e8e3af30d561de981a211ff7a79bfa36493`](https://github.com/block/buzz/commit/44fa1e8e3af30d561de981a211ff7a79bfa36493)) +- Polish mobile composer and messaging UI ([#3918](https://github.com/block/buzz/pull/3918)) ([`857e63c4ddfb76f95ab40bb691e00544413f6b81`](https://github.com/block/buzz/commit/857e63c4ddfb76f95ab40bb691e00544413f6b81)) +- ci(linux): enable mesh-llm feature in Linux release and canary builds ([#4524](https://github.com/block/buzz/pull/4524)) ([`83a285f1b1a0be862d55781fad9c75ec8813886d`](https://github.com/block/buzz/commit/83a285f1b1a0be862d55781fad9c75ec8813886d)) +- fix(mobile): recover and pace live subscriptions ([#3053](https://github.com/block/buzz/pull/3053)) ([`a5dbdf5e61e4c512acd99c219c79c154ddb57295`](https://github.com/block/buzz/commit/a5dbdf5e61e4c512acd99c219c79c154ddb57295)) +- fix(git): allow deleting the default branch ([#4297](https://github.com/block/buzz/pull/4297)) ([`fc598f5f8d70728d11d0712b9fa8e3acc44ea4c3`](https://github.com/block/buzz/commit/fc598f5f8d70728d11d0712b9fa8e3acc44ea4c3)) +- docs: formal spec for remote agents and their management ([#3748](https://github.com/block/buzz/pull/3748)) ([`28ae6cd2174309529305724e455c7ca082f6fe4b`](https://github.com/block/buzz/commit/28ae6cd2174309529305724e455c7ca082f6fe4b)) +- fix(nip-oa): accept raw Nostr tag form in parse_json_array ([#4203](https://github.com/block/buzz/pull/4203)) ([`89bf03c05df795a3575b7abbe648be898ef13388`](https://github.com/block/buzz/commit/89bf03c05df795a3575b7abbe648be898ef13388)) +- perf(relay): serve relay-membership checks from the read replica ([#4124](https://github.com/block/buzz/pull/4124)) ([`ac4fa13b8e4d947071d57deb6918dcf12bf74961`](https://github.com/block/buzz/commit/ac4fa13b8e4d947071d57deb6918dcf12bf74961)) +- chore(deps): bump nostr-relay-pool for RUSTSEC-2026-0224 ([#4139](https://github.com/block/buzz/pull/4139)) ([`9d6726e5b387310975f5809473ce8372f6fde0dc`](https://github.com/block/buzz/commit/9d6726e5b387310975f5809473ce8372f6fde0dc)) +- docs(nostr): document #h requirement for live reaction subscriptions ([#3487](https://github.com/block/buzz/pull/3487)) ([`756dd7f65d6f2995e9188a0ffe54294057f8ef4f`](https://github.com/block/buzz/commit/756dd7f65d6f2995e9188a0ffe54294057f8ef4f)) +- docs(chart): fix ArgoCD example for native OCI sources (full artifact repoURL + path) ([#3426](https://github.com/block/buzz/pull/3426)) ([`36cf932ff0105a4cf574fc687deb4c1cb01bc0d1`](https://github.com/block/buzz/commit/36cf932ff0105a4cf574fc687deb4c1cb01bc0d1)) +- docs(readme): clarify which release asset to download per platform ([#3481](https://github.com/block/buzz/pull/3481)) ([`8d5afb606763fcaffd3af811be2106e41cc7347d`](https://github.com/block/buzz/commit/8d5afb606763fcaffd3af811be2106e41cc7347d)) +- fix(relay): allow open relays to set their NIP-11 workspace icon (kind:9033) ([#3998](https://github.com/block/buzz/pull/3998)) ([`5765fc74b77224f0207ddd4b41736a5ff18d333d`](https://github.com/block/buzz/commit/5765fc74b77224f0207ddd4b41736a5ff18d333d)) +- docs: note that addressable channel events scope by d, not h ([#4103](https://github.com/block/buzz/pull/4103)) ([`3d7712cc36e8da563cb1c121fc58bfc505d38496`](https://github.com/block/buzz/commit/3d7712cc36e8da563cb1c121fc58bfc505d38496)) +- docs: fix stale kind count, quick-start numbering, and empty Further Reading ([#2613](https://github.com/block/buzz/pull/2613)) ([`909a3b2c318b2ec477a3438a998a3b611f5b6d6a`](https://github.com/block/buzz/commit/909a3b2c318b2ec477a3438a998a3b611f5b6d6a)) +- docs: add one-click Railway deploy for a hosted relay ([#2733](https://github.com/block/buzz/pull/2733)) ([`19d57b0d46baa55814ac737041a36d0b405c9f64`](https://github.com/block/buzz/commit/19d57b0d46baa55814ac737041a36d0b405c9f64)) +- fix(buzz-acp): thread cache-read tokens into NIP-AM kind:44200 events ([#3999](https://github.com/block/buzz/pull/3999)) ([`b1b283cd4c7f926e12eeee8ae1f38c7471922b16`](https://github.com/block/buzz/commit/b1b283cd4c7f926e12eeee8ae1f38c7471922b16)) +- fix(release): preserve main in desktop PR body ([#3979](https://github.com/block/buzz/pull/3979)) ([`e5e5bac2a932b2b2e4eb6b559d5545a992c21b96`](https://github.com/block/buzz/commit/e5e5bac2a932b2b2e4eb6b559d5545a992c21b96)) + +[Compare desktop-v0.5.3...desktop-v0.5.4](https://github.com/block/buzz/compare/desktop-v0.5.3...desktop-v0.5.4) + ## v0.5.3 ### Desktop and shared changes diff --git a/desktop/package.json b/desktop/package.json index e8145f5468..d0b99c53f6 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -1,7 +1,7 @@ { "name": "buzz", "private": true, - "version": "0.5.3", + "version": "0.5.4", "type": "module", "scripts": { "dev": "vite", diff --git a/desktop/src-tauri/Cargo.lock b/desktop/src-tauri/Cargo.lock index 9feecbee01..365c8f712e 100644 --- a/desktop/src-tauri/Cargo.lock +++ b/desktop/src-tauri/Cargo.lock @@ -1036,7 +1036,7 @@ dependencies = [ [[package]] name = "buzz-desktop" -version = "0.5.3" +version = "0.5.4" dependencies = [ "anyhow", "arboard", diff --git a/desktop/src-tauri/Cargo.toml b/desktop/src-tauri/Cargo.toml index fd58f27878..bf3a4ffe96 100644 --- a/desktop/src-tauri/Cargo.toml +++ b/desktop/src-tauri/Cargo.toml @@ -2,7 +2,7 @@ [package] name = "buzz-desktop" -version = "0.5.3" +version = "0.5.4" description = "Buzz desktop app" authors = ["you"] edition = "2021" diff --git a/desktop/src-tauri/tauri.conf.json b/desktop/src-tauri/tauri.conf.json index 93326b9968..4bda55fd09 100644 --- a/desktop/src-tauri/tauri.conf.json +++ b/desktop/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "Buzz", - "version": "0.5.3", + "version": "0.5.4", "identifier": "xyz.block.buzz.app", "build": { "beforeDevCommand": { From ce56e34411d2940e70a6c0de653ffae36d334701 Mon Sep 17 00:00:00 2001 From: Tom Brow Date: Mon, 3 Aug 2026 12:28:50 -0700 Subject: [PATCH 16/27] fix(mobile): recover stale relay sessions (#4372) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### Summary Fixes [this issue](buzz://message?channel=e62570dd-33ad-42c5-b92b-75f2689f9694&id=b726c366abfe62429ee3cdcd34d0c0fb98c33c3ea053480585bed71745412b56): > I often don’t see my bot responses until after I post. they’re usually time stamped correctly so I think it’s just a refresh issue? ### What changed? Buzz Mobile now reconnects relay sessions after the app has remained backgrounded beyond the existing 5-second grace period, even when the session still reports a stale `connected` state. This makes resume recovery independent of whether iOS runs the grace timer before or after delivering `resumed`. Reconnection is now based on elapsed background time rather than a direct socket-health probe. - If the app was backgrounded for at least the 5-second grace period, the socket is presumed dead and the session reconnects regardless of reported status. - If it was backgrounded for less than that, a reported `connected` status is still trusted. In the sub-5-second window the socket is either genuinely alive, which is the common case for a momentary background, or it is dead and the client ping detects it within the two-interval worst case described below. That is now a degraded-latency path, not a silent-forever path. The mobile relay socket now uses `IOWebSocketChannel.connect` with a 30-second `pingInterval`. An unanswered ping closes the Dart socket through the existing disconnect and reconnect path. Detection takes up to two ping intervals, so about 60 seconds worst case, not 30. One interval of idleness elapses and a ping is sent, then a second interval elapses with no pong and the socket closes. Any inbound pong restarts the first stage, so the clock measures idleness rather than running on a fixed cadence. ### Why? Buzz iOS can sometimes stop showing new bot or agent responses after a phone has been locked for 5 to 10 minutes. When the user later posts a message, the missing responses can appear all at once. iOS may suspend Buzz before the short delayed cleanup that would normally close its connection has a chance to run. Before this change, Buzz trusted the resulting stale healthy status on resume and skipped reconnecting, so the missing responses stayed hidden until a later post exposed the dead connection. A state-machine test with a stubbed connection reproduced this reported pattern and showed that it matches this failure mode: the failed post triggered a reconnect that fetched the missing messages. The same test also checked the other candidate explanation, the bug tracked in [#3053](https://github.com/block/buzz/pull/3053), where the relay has closed the app's subscription. That state does not produce the pattern. Posting succeeds and the user's own message appears, but nothing looks for the missed messages, so they stay hidden. The test confirmed that the missed messages were still available to fetch in that state, so the missing step was a trigger to fetch them. This was not an end-to-end reproduction on an iOS device or a live relay. The new resume check covers the normal lock and unlock path. If the app was backgrounded for less than the 5-second grace period, it still trusts a connection marked as healthy. A dead connection in that window is instead detected by the ping check, which can take up to about 60 seconds but prevents the app from remaining silently stuck. The ping only runs while iOS is running the app, so it does not detect a connection that died during suspension; the resume check owns the lock and unlock path. A pre-existing path also runs the same resume handling when network connectivity returns while the app is already in the foreground. Because the app was not backgrounded, this change does not alter that path, which still trusts a connection marked as healthy and relies on the slower ping check. Recovery from a subscription that the relay explicitly closes remains in [#3053](https://github.com/block/buzz/pull/3053), and the two changes overlap in one file. Changes to how missed messages are backfilled or replayed are out of scope. ### How is it tested? Full mobile suite at base and head. Both runs have the same known macOS-host-only failure in `ChannelDetailPage keeps follow mode off while a tall newest message stays visible` at line 1053: - Base: 1,021 passed, 1 skipped, 1 failed - Head: 1,025 passed, 1 skipped, 1 failed Added tests: - [`relay_session_test.dart`](https://github.com/block/buzz/tree/main/mobile/test/shared/relay/relay_session_test.dart): long-background resume reconnect and within-grace control - [`relay_socket_liveness_test.dart`](https://github.com/block/buzz/tree/main/mobile/test/shared/relay/relay_socket_liveness_test.dart): silent-peer disconnect and idle-but-healthy control Mutation checks confirm that removing elapsed-background resume recovery fails with one socket instead of two, and removing `pingInterval` leaves the silent peer connected. Restored production code passes both mutations' regression tests and the healthy idle control. Signed-off-by: Tom Brow Co-authored-by: npub1tquskdu6yc4h8l7xxtceculxw600grekeq0xg2ukqfrwl7vrzg3quz3gmp <58390b379a262b73ffc632f19c73e6769ef40f36c81e642b960246eff9831222@buzz.block.builderlab.xyz> --- mobile/lib/shared/relay/relay_session.dart | 21 +++- mobile/lib/shared/relay/relay_socket.dart | 12 +- mobile/pubspec.lock | 2 +- mobile/pubspec.yaml | 1 + .../test/shared/relay/relay_session_test.dart | 119 +++++++++++++++++- .../relay/relay_socket_liveness_test.dart | 111 ++++++++++++++++ 6 files changed, 259 insertions(+), 7 deletions(-) create mode 100644 mobile/test/shared/relay/relay_socket_liveness_test.dart diff --git a/mobile/lib/shared/relay/relay_session.dart b/mobile/lib/shared/relay/relay_session.dart index 877bd15e82..1c5c305b4c 100644 --- a/mobile/lib/shared/relay/relay_session.dart +++ b/mobile/lib/shared/relay/relay_session.dart @@ -89,17 +89,20 @@ class RelaySessionNotifier extends Notifier { RelaySessionNotifier({ http.Client? httpClient, RelaySocketFactory socketFactory = RelaySocket.new, + DateTime Function()? now, RelayRateLimitGate? rateLimitGate, RelayTimerFactory retryTimerFactory = Timer.new, Future Function(Duration) replayDelay = Future.delayed, }) : _httpClient = httpClient, _socketFactory = socketFactory, + _now = now ?? DateTime.now, _rateLimitGate = rateLimitGate ?? RelayRateLimitGate(), _retryTimerFactory = retryTimerFactory, _replayDelay = replayDelay; final http.Client? _httpClient; final RelaySocketFactory _socketFactory; + final DateTime Function() _now; final RelayRateLimitGate _rateLimitGate; final RelayTimerFactory _retryTimerFactory; final Future Function(Duration) _replayDelay; @@ -111,6 +114,7 @@ class RelaySessionNotifier extends Notifier { static const _replayBatchSize = 8; static const _replayInterBatchDelay = Duration(milliseconds: 50); static const _maxRecentDeliveryKeys = 5000; + static const _backgroundGraceDuration = Duration(seconds: 5); RelaySocket? _socket; final Map _historySubscriptions = {}; @@ -122,6 +126,7 @@ class RelaySessionNotifier extends Notifier { Timer? _reconnectTimer; Timer? _flushTimer; Timer? _backgroundGraceTimer; + DateTime? _backgroundedAt; int _reconnectDelayMs = _baseReconnectDelayMs; int _subIdCounter = 0; bool _disposed = false; @@ -394,8 +399,9 @@ class RelaySessionNotifier extends Notifier { /// Called by the app lifecycle provider when the app goes to background. void onAppPaused() { + _backgroundedAt = _now(); _backgroundGraceTimer?.cancel(); - _backgroundGraceTimer = Timer(const Duration(seconds: 5), _pauseNow); + _backgroundGraceTimer = Timer(_backgroundGraceDuration, _pauseNow); } void _pauseNow() { @@ -411,12 +417,18 @@ class RelaySessionNotifier extends Notifier { /// Called by the app lifecycle provider when the app returns to foreground. void onAppResumed() { _paused = false; + final backgroundedAt = _backgroundedAt; + _backgroundedAt = null; _backgroundGraceTimer?.cancel(); _backgroundGraceTimer = null; - // If still connected, nothing to do — the socket survived the background - // grace window. - if (state.status == SessionStatus.connected) return; + final backgroundedLongEnoughToRequireReconnect = + backgroundedAt != null && + _now().difference(backgroundedAt) >= _backgroundGraceDuration; + if (!backgroundedLongEnoughToRequireReconnect && + state.status == SessionStatus.connected) { + return; + } // Cancel any in-flight reconnect backoff timer so we reconnect immediately // instead of waiting for the (possibly large) exponential delay. @@ -908,6 +920,7 @@ class RelaySessionNotifier extends Notifier { _reconnectTimer?.cancel(); _flushTimer?.cancel(); _backgroundGraceTimer?.cancel(); + _backgroundedAt = null; _cancelAllClosedRetries(); _rateLimitGate.reset(); _visibleChannelsByOwner.clear(); diff --git a/mobile/lib/shared/relay/relay_socket.dart b/mobile/lib/shared/relay/relay_socket.dart index 267b030391..5b23279e81 100644 --- a/mobile/lib/shared/relay/relay_socket.dart +++ b/mobile/lib/shared/relay/relay_socket.dart @@ -3,6 +3,7 @@ import 'dart:convert'; import 'package:flutter/foundation.dart'; import 'package:nostr/nostr.dart' as nostr; +import 'package:web_socket_channel/io.dart'; import 'package:web_socket_channel/web_socket_channel.dart'; import 'nostr_models.dart'; @@ -30,6 +31,12 @@ Exception classifyRelayAuthFailure(String message) { } class RelaySocket { + /// Interval for sending a ping and awaiting its pong before disconnecting. + static const pingInterval = Duration(seconds: 30); + + @visibleForTesting + static Duration debugPingInterval = pingInterval; + final String _wsUrl; final String? _nsec; final void Function(List message) _onMessage; @@ -63,7 +70,10 @@ class RelaySocket { _state = SocketState.connecting; try { - _channel = WebSocketChannel.connect(Uri.parse(_wsUrl)); + _channel = IOWebSocketChannel.connect( + Uri.parse(_wsUrl), + pingInterval: debugPingInterval, + ); await _channel!.ready; } catch (e) { _state = SocketState.disconnected; diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock index 05ccc2ea0f..6287e4c86c 100644 --- a/mobile/pubspec.lock +++ b/mobile/pubspec.lock @@ -274,7 +274,7 @@ packages: source: hosted version: "0.3.5+2" crypto: - dependency: transitive + dependency: "direct dev" description: name: crypto sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml index 42b7935582..41d2a0aeb8 100644 --- a/mobile/pubspec.yaml +++ b/mobile/pubspec.yaml @@ -47,6 +47,7 @@ dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^6.0.0 + crypto: ^3.0.7 custom_lint: ^0.8.0 riverpod_lint: ^3.1.0 mocktail: ^1.0.4 diff --git a/mobile/test/shared/relay/relay_session_test.dart b/mobile/test/shared/relay/relay_session_test.dart index b97df0849d..826e234400 100644 --- a/mobile/test/shared/relay/relay_session_test.dart +++ b/mobile/test/shared/relay/relay_session_test.dart @@ -432,6 +432,120 @@ void main() { expect(session.state.status, SessionStatus.disconnected); }); + test( + 'resume reconnects a stale connected session after a long pause', + () async { + final sockets = <_ControlledRelaySocket>[]; + final keychain = nostr.Keys.generate(); + var now = DateTime(2026, 8, 2, 12); + final session = RelaySessionNotifier( + now: () => now, + socketFactory: + ({ + required wsUrl, + required nsec, + required onMessage, + required onConnected, + required onDisconnected, + }) { + final socket = _ControlledRelaySocket( + wsUrl: wsUrl, + nsec: nsec, + onMessage: onMessage, + onConnected: onConnected, + onDisconnected: onDisconnected, + ); + sockets.add(socket); + return socket; + }, + ); + final container = ProviderContainer( + overrides: [ + relaySessionProvider.overrideWith(() => session), + relayConfigProvider.overrideWith( + () => _FakeRelayConfigNotifier( + baseUrl: 'https://relay.example', + nsec: keychain.nsec, + ), + ), + authProvider.overrideWith(() => _AuthenticatedAuthNotifier()), + ], + ); + addTearDown(container.dispose); + await container.read(authProvider.future); + final subscription = container.listen(relaySessionProvider, (_, _) {}); + addTearDown(subscription.close); + await Future.delayed(Duration.zero); + sockets.single.connectSuccessfully(); + + session.onAppPaused(); + now = now.add(const Duration(minutes: 5)); + session.onAppResumed(); + await Future.delayed(Duration.zero); + + expect(sockets, hasLength(2)); + expect(sockets.first.disposeCalls, 1); + expect(session.state.status, SessionStatus.reconnecting); + }, + ); + + test( + 'resume keeps a connected session within the background grace period', + () async { + final sockets = <_ControlledRelaySocket>[]; + final keychain = nostr.Keys.generate(); + var now = DateTime(2026, 8, 2, 12); + final session = RelaySessionNotifier( + now: () => now, + socketFactory: + ({ + required wsUrl, + required nsec, + required onMessage, + required onConnected, + required onDisconnected, + }) { + final socket = _ControlledRelaySocket( + wsUrl: wsUrl, + nsec: nsec, + onMessage: onMessage, + onConnected: onConnected, + onDisconnected: onDisconnected, + ); + sockets.add(socket); + return socket; + }, + ); + final container = ProviderContainer( + overrides: [ + relaySessionProvider.overrideWith(() => session), + relayConfigProvider.overrideWith( + () => _FakeRelayConfigNotifier( + baseUrl: 'https://relay.example', + nsec: keychain.nsec, + ), + ), + authProvider.overrideWith(() => _AuthenticatedAuthNotifier()), + ], + ); + addTearDown(container.dispose); + await container.read(authProvider.future); + final subscription = container.listen(relaySessionProvider, (_, _) {}); + addTearDown(subscription.close); + await Future.delayed(Duration.zero); + sockets.single.connectSuccessfully(); + + session.onAppPaused(); + now = now.add(const Duration(seconds: 4)); + session.onAppResumed(); + await Future.delayed(Duration.zero); + + expect(sockets, hasLength(1)); + expect(sockets.single.disposeCalls, 0); + expect(session.state.status, SessionStatus.connected); + }, + ); + test('delivers the same live event to each matching subscription', () async { final session = RelaySessionNotifier(); final firstEvents = []; @@ -1143,6 +1257,7 @@ class _AuthenticatedAuthNotifier extends AuthNotifier { class _ControlledRelaySocket extends RelaySocket { final void Function() _connected; final void Function(Object? error) _disconnected; + int disposeCalls = 0; _ControlledRelaySocket({ required super.wsUrl, @@ -1157,7 +1272,9 @@ class _ControlledRelaySocket extends RelaySocket { Future connect() async {} @override - void dispose() {} + void dispose() { + disposeCalls++; + } void connectSuccessfully() => _connected(); diff --git a/mobile/test/shared/relay/relay_socket_liveness_test.dart b/mobile/test/shared/relay/relay_socket_liveness_test.dart new file mode 100644 index 0000000000..835ebc2b61 --- /dev/null +++ b/mobile/test/shared/relay/relay_socket_liveness_test.dart @@ -0,0 +1,111 @@ +import 'dart:async'; +import 'dart:convert'; +import 'dart:io'; + +import 'package:buzz/shared/relay/relay_socket.dart'; +import 'package:crypto/crypto.dart'; +import 'package:flutter_test/flutter_test.dart'; + +/// A server that completes the WS handshake then never speaks again: no pongs, +/// no close frame. Only a client-side ping timeout can notice. +Future _silentAfterHandshakeServer() async { + final server = await ServerSocket.bind(InternetAddress.loopbackIPv4, 0); + server.listen((client) { + client.listen( + (data) { + final match = RegExp( + r'Sec-WebSocket-Key: (.*)\r\n', + caseSensitive: false, + ).firstMatch(String.fromCharCodes(data)); + if (match == null) return; + final accept = base64.encode( + sha1 + .convert( + utf8.encode( + '${match.group(1)!.trim()}258EAFA5-E914-47DA-95CA-C5AB0DC85B11', + ), + ) + .bytes, + ); + client.write( + 'HTTP/1.1 101 Switching Protocols\r\n' + 'Upgrade: websocket\r\nConnection: Upgrade\r\n' + 'Sec-WebSocket-Accept: $accept\r\n\r\n', + ); + }, + onError: (_) {}, + onDone: () {}, + ); + }); + return server; +} + +void main() { + const testPingInterval = Duration(milliseconds: 150); + + setUp(() { + RelaySocket.debugPingInterval = testPingInterval; + }); + + tearDown(() { + RelaySocket.debugPingInterval = RelaySocket.pingInterval; + }); + + test('detects a peer that stops answering pings', () async { + final server = await _silentAfterHandshakeServer(); + + final disconnected = Completer(); + final socket = RelaySocket( + wsUrl: 'ws://127.0.0.1:${server.port}', + nsec: null, + onMessage: (_) {}, + onConnected: () {}, + onDisconnected: (error) { + if (!disconnected.isCompleted) disconnected.complete(error); + }, + ); + unawaited(socket.connect()); + + var detected = true; + try { + await disconnected.future.timeout(testPingInterval * 4); + } on TimeoutException { + detected = false; + } + + expect( + detected, + isTrue, + reason: + 'RelaySocket must surface an unanswered ping through onDisconnected', + ); + + socket.dispose(); + await server.close(); + }); + + test('keeps an idle but healthy peer connected', () async { + final server = await HttpServer.bind(InternetAddress.loopbackIPv4, 0); + server.transform(WebSocketTransformer()).listen((ws) { + // A healthy relay answers pings without sending application data. + ws.listen((_) {}, onError: (_) {}, onDone: () {}); + }); + + var tornDown = false; + final socket = RelaySocket( + wsUrl: 'ws://127.0.0.1:${server.port}', + nsec: null, + onMessage: (_) {}, + onConnected: () {}, + onDisconnected: (_) => tornDown = true, + ); + unawaited(socket.connect()); + + await Future.delayed(testPingInterval * 4); + + expect(tornDown, isFalse); + + await socket.disconnect(); + await server.close(force: true); + }); +} From e1f6da7c42b0cac6f307023f0479e1e2c3a6d1c0 Mon Sep 17 00:00:00 2001 From: Wes Date: Mon, 3 Aug 2026 14:03:26 -0600 Subject: [PATCH 17/27] ci: add guarded desktop release cache prewarm (#4575) ## Summary Gate 1 only for desktop release caching: - replaces canary `rust-cache` use with explicit exact-key `actions/cache/restore` + `save` - computes keys after `cargo update --workspace`, including platform, target, Rust toolchain, Cargo manifests/locks, profile/features, and native-toolchain inputs - normalizes only the desktop package version so a trusted `main` canary can warm an otherwise identical release tag - excludes Tauri bundle directories, so installers and signed artifacts are never cached - adds a restore-only `cache-proof-*` tag workflow that fails unless tag scope sees the exact default-branch cache - adds contract tests that enforce no release-workflow cache change in Gate 1 `release.yml` is intentionally unchanged. A cache miss remains the current cold canary build; the release path cannot be affected by merging this PR. ## Validation - `scripts/test-desktop-release-cache-key.sh` - `scripts/test-desktop-release-cache-workflow.sh` - `scripts/test-release-ref-contract.sh` - Ruby YAML parse of all four changed workflows - `git diff --check` - pre-push `branch-skew` ## Post-merge proof plan 1. Run each canary cold on trusted `main`, recording cache size/save time and fresh artifact inventory. 2. Run each canary warm, requiring the exact-key hit and recording restore/build time. 3. Create a disposable `cache-proof-*` tag at that same trusted `main` SHA and dispatch **Desktop release cache tag-scope proof** from the tag. 4. Do not begin Gate 2 or modify `release.yml` unless the exact tag-scope restore succeeds and cache transfer economics are favorable. --------- Signed-off-by: Wes Co-authored-by: Carl --- .../workflows/desktop-release-cache-proof.yml | 164 ++++++++++++++++++ .github/workflows/linux-canary.yml | 66 +++++-- .github/workflows/macos-intel-canary.yml | 126 ++++++++++++++ .github/workflows/signed-macos-canary.yml | 60 +++++-- .github/workflows/windows-canary.yml | 68 ++++++-- scripts/desktop-native-toolchain-id.sh | 34 ++++ scripts/desktop-release-cache-key.py | 85 +++++++++ scripts/test-desktop-release-cache-key.sh | 29 ++++ .../test-desktop-release-cache-workflow.sh | 77 ++++++++ scripts/test-release-ref-contract.sh | 2 + 10 files changed, 672 insertions(+), 39 deletions(-) create mode 100644 .github/workflows/desktop-release-cache-proof.yml create mode 100644 .github/workflows/macos-intel-canary.yml create mode 100755 scripts/desktop-native-toolchain-id.sh create mode 100755 scripts/desktop-release-cache-key.py create mode 100755 scripts/test-desktop-release-cache-key.sh create mode 100755 scripts/test-desktop-release-cache-workflow.sh diff --git a/.github/workflows/desktop-release-cache-proof.yml b/.github/workflows/desktop-release-cache-proof.yml new file mode 100644 index 0000000000..cf9c8e7827 --- /dev/null +++ b/.github/workflows/desktop-release-cache-proof.yml @@ -0,0 +1,164 @@ +name: Desktop release cache tag-scope proof + +# Dispatch from a cache-proof-* tag at the same trusted-main SHA warmed by all +# four canaries. Every job restores only and requires an exact cache hit. +on: + workflow_dispatch: + +permissions: + contents: read + +jobs: + macos: + name: Prove macOS ${{ matrix.target }} cache visibility + if: github.repository == 'block/buzz' + runs-on: macos-latest + timeout-minutes: 15 + strategy: + fail-fast: false + matrix: + include: + - target: aarch64-apple-darwin + features: mesh-llm + - target: x86_64-apple-darwin + features: default + steps: + - name: Require cache proof tag + run: '[[ "$GITHUB_REF" == refs/tags/cache-proof-* ]] || { echo "::error::Expected cache-proof-* tag; got $GITHUB_REF"; exit 1; }' + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + with: + persist-credentials: false + - uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1 + - name: Patch proof dependency graph + run: | + cd desktop && node scripts/set-version-from-tag.mjs "0.0.0-cache-proof" + cd src-tauri && cargo update --workspace + - name: Resolve native toolchain identity + id: native_toolchain + run: echo "id=$(scripts/desktop-native-toolchain-id.sh macos)" >> "$GITHUB_OUTPUT" + - name: Compute exact release cache key + id: rust_cache_key + env: + CACHE_TARGET: ${{ matrix.target }} + CACHE_FEATURES: ${{ matrix.features }} + NATIVE_TOOLCHAIN_ID: ${{ steps.native_toolchain.outputs.id }} + run: | + KEY=$(scripts/desktop-release-cache-key.py --platform "$RUNNER_OS" --target "$CACHE_TARGET" --features "$CACHE_FEATURES" --native-inputs "$NATIVE_TOOLCHAIN_ID") + echo "key=$KEY" >> "$GITHUB_OUTPUT" + - name: Restore exact default-branch cache from tag + id: rust_cache + uses: actions/cache/restore@caa296126883cff596d87d8935842f9db880ef25 # v5 + with: + path: | + ~/.cargo/registry + ~/.cargo/git + target + desktop/src-tauri/target + !desktop/src-tauri/target/**/release/bundle + key: ${{ steps.rust_cache_key.outputs.key }} + - name: Require exact cache hit + env: + CACHE_HIT: ${{ steps.rust_cache.outputs.cache-hit }} + CACHE_KEY: ${{ steps.rust_cache.outputs.cache-primary-key }} + EXPECTED_KEY: ${{ steps.rust_cache_key.outputs.key }} + run: '[[ "$CACHE_HIT" == true && "$CACHE_KEY" == "$EXPECTED_KEY" ]] || { echo "::error::Exact tag cache miss (hit=$CACHE_HIT restored=$CACHE_KEY expected=$EXPECTED_KEY)"; exit 1; }' + + linux: + name: Prove Linux cache visibility + if: github.repository == 'block/buzz' + runs-on: ubuntu-latest + container: ubuntu:24.04@sha256:4fbb8e6a8395de5a7550b33509421a2bafbc0aab6c06ba2cef9ebffbc7092d90 + timeout-minutes: 15 + defaults: + run: + shell: bash + steps: + - name: Require cache proof tag and install release native tools + run: | + [[ "$GITHUB_REF" == refs/tags/cache-proof-* ]] || { echo "::error::Expected cache-proof-* tag; got $GITHUB_REF"; exit 1; } + apt-get update + apt-get install -y --no-install-recommends build-essential ca-certificates curl git libasound2-dev libayatana-appindicator3-dev libgtk-3-dev librsvg2-dev libssl-dev libwebkit2gtk-4.1-dev libxdo-dev patchelf pkg-config + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + with: + persist-credentials: false + - run: git config --global --add safe.directory "$GITHUB_WORKSPACE" + - uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1 + - name: Patch proof dependency graph + run: | + cd desktop && node scripts/set-version-from-tag.mjs "0.0.0-cache-proof" + cd src-tauri && cargo update --workspace + - name: Resolve native toolchain identity + id: native_toolchain + run: echo "id=$(scripts/desktop-native-toolchain-id.sh linux)" >> "$GITHUB_OUTPUT" + - name: Compute exact release cache key + id: rust_cache_key + env: + NATIVE_TOOLCHAIN_ID: ${{ steps.native_toolchain.outputs.id }} + run: | + KEY=$(scripts/desktop-release-cache-key.py --platform "$RUNNER_OS" --target x86_64-unknown-linux-gnu --features mesh-llm --native-inputs "$NATIVE_TOOLCHAIN_ID") + echo "key=$KEY" >> "$GITHUB_OUTPUT" + - name: Restore exact default-branch cache from tag + id: rust_cache + uses: actions/cache/restore@caa296126883cff596d87d8935842f9db880ef25 # v5 + with: + path: | + ~/.cargo/registry + ~/.cargo/git + target + desktop/src-tauri/target + !desktop/src-tauri/target/**/release/bundle + key: ${{ steps.rust_cache_key.outputs.key }} + - name: Require exact cache hit + env: + CACHE_HIT: ${{ steps.rust_cache.outputs.cache-hit }} + CACHE_KEY: ${{ steps.rust_cache.outputs.cache-primary-key }} + EXPECTED_KEY: ${{ steps.rust_cache_key.outputs.key }} + run: '[[ "$CACHE_HIT" == true && "$CACHE_KEY" == "$EXPECTED_KEY" ]] || { echo "::error::Exact tag cache miss (hit=$CACHE_HIT restored=$CACHE_KEY expected=$EXPECTED_KEY)"; exit 1; }' + + windows: + name: Prove Windows cache visibility + if: github.repository == 'block/buzz' + runs-on: windows-latest + timeout-minutes: 15 + steps: + - name: Require cache proof tag + shell: bash + run: '[[ "$GITHUB_REF" == refs/tags/cache-proof-* ]] || { echo "::error::Expected cache-proof-* tag; got $GITHUB_REF"; exit 1; }' + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + with: + persist-credentials: false + - name: Patch proof dependency graph + shell: bash + run: | + cd desktop && node scripts/set-version-from-tag.mjs "0.0.0-cache-proof" + cd src-tauri && cargo update --workspace + - name: Resolve native toolchain identity + id: native_toolchain + shell: bash + run: echo "id=$(scripts/desktop-native-toolchain-id.sh windows)" >> "$GITHUB_OUTPUT" + - name: Compute exact release cache key + id: rust_cache_key + shell: bash + env: + NATIVE_TOOLCHAIN_ID: ${{ steps.native_toolchain.outputs.id }} + run: | + KEY=$(scripts/desktop-release-cache-key.py --platform "$RUNNER_OS" --target x86_64-pc-windows-msvc --features default --native-inputs "$NATIVE_TOOLCHAIN_ID") + echo "key=$KEY" >> "$GITHUB_OUTPUT" + - name: Restore exact default-branch cache from tag + id: rust_cache + uses: actions/cache/restore@caa296126883cff596d87d8935842f9db880ef25 # v5 + with: + path: | + ~/.cargo/registry + ~/.cargo/git + target + desktop/src-tauri/target + !desktop/src-tauri/target/**/release/bundle + key: ${{ steps.rust_cache_key.outputs.key }} + - name: Require exact cache hit + shell: bash + env: + CACHE_HIT: ${{ steps.rust_cache.outputs.cache-hit }} + CACHE_KEY: ${{ steps.rust_cache.outputs.cache-primary-key }} + EXPECTED_KEY: ${{ steps.rust_cache_key.outputs.key }} + run: '[[ "$CACHE_HIT" == true && "$CACHE_KEY" == "$EXPECTED_KEY" ]] || { echo "::error::Exact tag cache miss (hit=$CACHE_HIT restored=$CACHE_KEY expected=$EXPECTED_KEY)"; exit 1; }' diff --git a/.github/workflows/linux-canary.yml b/.github/workflows/linux-canary.yml index e1625f4ec8..d8b10032b2 100644 --- a/.github/workflows/linux-canary.yml +++ b/.github/workflows/linux-canary.yml @@ -7,8 +7,8 @@ name: Linux Canary # Design notes vs. signed-macos-canary.yml: # - fix-appimage.sh is run without signing env vars; the script detects # their absence and skips re-signing, repacking only (documented inline). -# - mold linker added (rui314/setup-mold) to reduce link time, matching -# the Linux Rust CI jobs in ci.yml. +# - Build tools match release.yml; cache keys derive the concrete linker and +# native library identity rather than assuming the moving runner image. # - pnpm store restore/save pattern mirrors ci.yml:149-196. on: workflow_dispatch: @@ -83,18 +83,6 @@ jobs: - uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1 - - uses: rui314/setup-mold@9c9c13bf4c3f1adef0cc596abc155580bcb04444 # v1 - - # Rust cache covering both the workspace sidecar build and the Tauri - # crate build. shared-key scoped to linux-canary-release so canary runs - # warm each other without colliding with CI's debug-profile keys. - - uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2 - with: - workspaces: | - . - desktop/src-tauri - shared-key: linux-canary-release - - name: Install appimagetool run: | case "$(uname -m)" in @@ -154,6 +142,38 @@ jobs: cd desktop && node scripts/set-version-from-tag.mjs "$VERSION" cd src-tauri && cargo update --workspace + - name: Resolve native toolchain identity + id: native_toolchain + run: echo "id=$(scripts/desktop-native-toolchain-id.sh linux)" >> "$GITHUB_OUTPUT" + + # Compute this after cargo update so the key describes the graph that is + # actually compiled. The helper normalizes only Buzz Desktop's release + # version, allowing a canary to warm an otherwise identical tag build. + - name: Compute exact release cache key + id: rust_cache_key + env: + NATIVE_TOOLCHAIN_ID: ${{ steps.native_toolchain.outputs.id }} + run: | + KEY=$(scripts/desktop-release-cache-key.py \ + --platform "$RUNNER_OS" \ + --target x86_64-unknown-linux-gnu \ + --features mesh-llm \ + --native-inputs "$NATIVE_TOOLCHAIN_ID") + echo "key=$KEY" >> "$GITHUB_OUTPUT" + echo "Release cache key: $KEY" + + - name: Restore exact release Cargo cache + id: rust_cache + uses: actions/cache/restore@caa296126883cff596d87d8935842f9db880ef25 # v5 + with: + path: | + ~/.cargo/registry + ~/.cargo/git + target + desktop/src-tauri/target + !desktop/src-tauri/target/**/release/bundle + key: ${{ steps.rust_cache_key.outputs.key }} + - name: Generate non-updating bundle config run: | cat > desktop/src-tauri/tauri.canary.conf.json <<'JSON' @@ -190,6 +210,24 @@ jobs: fi bash desktop/scripts/fix-appimage.sh "${APPIMAGES[0]}" + - name: Measure release Cargo cache inputs + if: always() + run: du -sh ~/.cargo/registry ~/.cargo/git target desktop/src-tauri/target 2>/dev/null || true + + # Only this trusted, main-bound canary writes the cache. Excluding bundle + # output prevents installers from entering it. + - name: Save exact release Cargo cache + if: steps.rust_cache.outputs.cache-hit != 'true' + uses: actions/cache/save@caa296126883cff596d87d8935842f9db880ef25 # v5 + with: + path: | + ~/.cargo/registry + ~/.cargo/git + target + desktop/src-tauri/target + !desktop/src-tauri/target/**/release/bundle + key: ${{ steps.rust_cache_key.outputs.key }} + - name: Save pnpm store cache uses: actions/cache/save@caa296126883cff596d87d8935842f9db880ef25 # v5 with: diff --git a/.github/workflows/macos-intel-canary.yml b/.github/workflows/macos-intel-canary.yml new file mode 100644 index 0000000000..35b05313c9 --- /dev/null +++ b/.github/workflows/macos-intel-canary.yml @@ -0,0 +1,126 @@ +name: macOS Intel Canary + +# Produces an unsigned Intel DMG from trusted main. Its release-equivalent +# Cargo state warms the distinct x86_64 release target without signing or +# publishing anything. +on: + workflow_dispatch: + +permissions: + contents: read + +jobs: + build: + name: Build macOS Intel canary + if: github.repository == 'block/buzz' + runs-on: macos-latest + timeout-minutes: 60 + env: + TARGET: x86_64-apple-darwin + steps: + - name: Require main + env: + SOURCE_REF: ${{ github.ref }} + run: | + if [[ "$SOURCE_REF" != "refs/heads/main" ]]; then + echo "::error::Canary builds must run from main; got $SOURCE_REF" + exit 1 + fi + + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 + with: + persist-credentials: false + + - uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1 + + - name: Add Rust target + run: rustup target add "$TARGET" + + - name: Install desktop dependencies + run: just desktop-install-ci + + - name: Derive and patch canary version + run: | + BASE_VERSION=$(node -p "require('./desktop/package.json').version") + VERSION="${BASE_VERSION%%-*}-intel-test.${GITHUB_RUN_NUMBER}" + cd desktop && node scripts/set-version-from-tag.mjs "$VERSION" + cd src-tauri && cargo update --workspace + + - name: Resolve native toolchain identity + id: native_toolchain + run: echo "id=$(scripts/desktop-native-toolchain-id.sh macos)" >> "$GITHUB_OUTPUT" + + - name: Compute exact release cache key + id: rust_cache_key + env: + NATIVE_TOOLCHAIN_ID: ${{ steps.native_toolchain.outputs.id }} + run: | + KEY=$(scripts/desktop-release-cache-key.py \ + --platform "$RUNNER_OS" \ + --target "$TARGET" \ + --features default \ + --native-inputs "$NATIVE_TOOLCHAIN_ID") + echo "key=$KEY" >> "$GITHUB_OUTPUT" + echo "Release cache key: $KEY" + + - name: Restore exact release Cargo cache + id: rust_cache + uses: actions/cache/restore@caa296126883cff596d87d8935842f9db880ef25 # v5 + with: + path: | + ~/.cargo/registry + ~/.cargo/git + target + desktop/src-tauri/target + !desktop/src-tauri/target/**/release/bundle + key: ${{ steps.rust_cache_key.outputs.key }} + + - name: Generate non-updating bundle config + run: | + cat > desktop/src-tauri/tauri.canary.conf.json <<'JSON' + {"bundle":{"createUpdaterArtifacts":false,"macOS":{"minimumSystemVersion":"10.15"}}} + JSON + + - name: Build Intel sidecars + run: | + cargo build --release --target "$TARGET" -p buzz-acp -p buzz-agent -p buzz-backend-kubernetes -p buzz-dev-mcp -p git-credential-nostr -p buzz-cli + ./scripts/bundle-sidecars.sh "$TARGET" + + - name: Build unsigned Intel DMG + run: cd desktop && pnpm tauri build --verbose --no-sign --target "$TARGET" --bundles dmg --config src-tauri/tauri.canary.conf.json + env: + CMAKE_POLICY_VERSION_MINIMUM: "3.5" + MACOSX_DEPLOYMENT_TARGET: "10.15" + CMAKE_OSX_DEPLOYMENT_TARGET: "10.15" + TAURI_BUNDLER_DMG_IGNORE_CI: "true" + + - name: Locate fresh Intel DMG + id: artifact + run: | + DMG=$(find "desktop/src-tauri/target/${TARGET}/release/bundle/dmg" -name '*.dmg' -type f | head -1) + [[ -n "$DMG" ]] || { echo "::error::No Intel DMG found"; exit 1; } + echo "dmg=$DMG" >> "$GITHUB_OUTPUT" + + - name: Upload Intel canary + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 + with: + name: buzz-macos-intel-canary-${{ github.sha }} + path: ${{ steps.artifact.outputs.dmg }} + if-no-files-found: error + retention-days: 7 + + - name: Measure release Cargo cache inputs + if: always() + run: du -sh ~/.cargo/registry ~/.cargo/git target desktop/src-tauri/target 2>/dev/null || true + + - name: Save exact release Cargo cache + if: steps.rust_cache.outputs.cache-hit != 'true' + uses: actions/cache/save@caa296126883cff596d87d8935842f9db880ef25 # v5 + with: + path: | + ~/.cargo/registry + ~/.cargo/git + target + desktop/src-tauri/target + !desktop/src-tauri/target/**/release/bundle + key: ${{ steps.rust_cache_key.outputs.key }} diff --git a/.github/workflows/signed-macos-canary.yml b/.github/workflows/signed-macos-canary.yml index 0a3a513eef..5957f4785d 100644 --- a/.github/workflows/signed-macos-canary.yml +++ b/.github/workflows/signed-macos-canary.yml @@ -34,16 +34,6 @@ jobs: - uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1 - # Rust cache covering both the workspace sidecar build and the Tauri - # crate build. shared-key scoped to macos-canary-release so canary runs - # warm each other without colliding with CI's debug-profile keys. - - uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2 - with: - workspaces: | - . - desktop/src-tauri - shared-key: macos-canary-release - - name: Get pnpm store directory id: pnpm-cache run: echo "STORE_PATH=$(pnpm store path --silent)" >> "$GITHUB_OUTPUT" @@ -78,6 +68,38 @@ jobs: cd desktop && node scripts/set-version-from-tag.mjs "$VERSION" cd src-tauri && cargo update --workspace + - name: Resolve native toolchain identity + id: native_toolchain + run: echo "id=$(scripts/desktop-native-toolchain-id.sh macos)" >> "$GITHUB_OUTPUT" + + # Compute this after cargo update so the key describes the graph that is + # actually compiled. The helper normalizes only Buzz Desktop's release + # version, allowing a canary to warm an otherwise identical tag build. + - name: Compute exact release cache key + id: rust_cache_key + env: + NATIVE_TOOLCHAIN_ID: ${{ steps.native_toolchain.outputs.id }} + run: | + KEY=$(scripts/desktop-release-cache-key.py \ + --platform "$RUNNER_OS" \ + --target aarch64-apple-darwin \ + --features mesh-llm \ + --native-inputs "$NATIVE_TOOLCHAIN_ID") + echo "key=$KEY" >> "$GITHUB_OUTPUT" + echo "Release cache key: $KEY" + + - name: Restore exact release Cargo cache + id: rust_cache + uses: actions/cache/restore@caa296126883cff596d87d8935842f9db880ef25 # v5 + with: + path: | + ~/.cargo/registry + ~/.cargo/git + target + desktop/src-tauri/target + !desktop/src-tauri/target/**/release/bundle + key: ${{ steps.rust_cache_key.outputs.key }} + - name: Generate non-updating bundle config run: | cat > desktop/src-tauri/tauri.canary.conf.json <<'JSON' @@ -210,6 +232,24 @@ jobs: if-no-files-found: error retention-days: 7 + - name: Measure release Cargo cache inputs + if: always() + run: du -sh ~/.cargo/registry ~/.cargo/git target desktop/src-tauri/target 2>/dev/null || true + + # Only this trusted, main-bound canary writes the cache. Excluding bundle + # output prevents installers or signed artifacts from entering it. + - name: Save exact release Cargo cache + if: steps.rust_cache.outputs.cache-hit != 'true' + uses: actions/cache/save@caa296126883cff596d87d8935842f9db880ef25 # v5 + with: + path: | + ~/.cargo/registry + ~/.cargo/git + target + desktop/src-tauri/target + !desktop/src-tauri/target/**/release/bundle + key: ${{ steps.rust_cache_key.outputs.key }} + - name: Save pnpm store cache uses: actions/cache/save@caa296126883cff596d87d8935842f9db880ef25 # v5 with: diff --git a/.github/workflows/windows-canary.yml b/.github/workflows/windows-canary.yml index 29f74fa0f6..7093efd2dc 100644 --- a/.github/workflows/windows-canary.yml +++ b/.github/workflows/windows-canary.yml @@ -46,24 +46,9 @@ jobs: shell: bash run: rustup target add "$TARGET" - # Rust cache covering both the workspace sidecar build and the Tauri - # crate build. shared-key scoped to windows-canary-release so canary - # runs warm each other without colliding with CI's debug-profile key - # (CI windows job does clippy/check, not --release). - - uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2 - with: - workspaces: | - . - desktop/src-tauri - shared-key: windows-canary-release - - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0 with: node-version: 24.14.1 - # Disable setup-node's built-in cache: we manage the pnpm store cache - # explicitly below (restore before install, save after) to mirror the - # pattern used by ci.yml and to keep caching logic consistent across - # all three canary workflows. package-manager-cache: false - uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4.3.0 @@ -108,6 +93,40 @@ jobs: cd desktop && node scripts/set-version-from-tag.mjs "$VERSION" cd src-tauri && cargo update --workspace + - name: Resolve native toolchain identity + id: native_toolchain + shell: bash + run: echo "id=$(scripts/desktop-native-toolchain-id.sh windows)" >> "$GITHUB_OUTPUT" + + # Compute this after cargo update so the key describes the graph that is + # actually compiled. The helper normalizes only Buzz Desktop's release + # version, allowing a canary to warm an otherwise identical tag build. + - name: Compute exact release cache key + id: rust_cache_key + shell: bash + env: + NATIVE_TOOLCHAIN_ID: ${{ steps.native_toolchain.outputs.id }} + run: | + KEY=$(scripts/desktop-release-cache-key.py \ + --platform "$RUNNER_OS" \ + --target x86_64-pc-windows-msvc \ + --features default \ + --native-inputs "$NATIVE_TOOLCHAIN_ID") + echo "key=$KEY" >> "$GITHUB_OUTPUT" + echo "Release cache key: $KEY" + + - name: Restore exact release Cargo cache + id: rust_cache + uses: actions/cache/restore@caa296126883cff596d87d8935842f9db880ef25 # v5 + with: + path: | + ~/.cargo/registry + ~/.cargo/git + target + desktop/src-tauri/target + !desktop/src-tauri/target/**/release/bundle + key: ${{ steps.rust_cache_key.outputs.key }} + - name: Generate non-updating bundle config shell: bash run: | @@ -152,6 +171,25 @@ jobs: if-no-files-found: error retention-days: 7 + - name: Measure release Cargo cache inputs + if: always() + shell: bash + run: du -sh ~/.cargo/registry ~/.cargo/git target desktop/src-tauri/target 2>/dev/null || true + + # Only this trusted, main-bound canary writes the cache. Excluding bundle + # output prevents installers from entering it. + - name: Save exact release Cargo cache + if: steps.rust_cache.outputs.cache-hit != 'true' + uses: actions/cache/save@caa296126883cff596d87d8935842f9db880ef25 # v5 + with: + path: | + ~/.cargo/registry + ~/.cargo/git + target + desktop/src-tauri/target + !desktop/src-tauri/target/**/release/bundle + key: ${{ steps.rust_cache_key.outputs.key }} + - name: Save pnpm store cache uses: actions/cache/save@caa296126883cff596d87d8935842f9db880ef25 # v5 with: diff --git a/scripts/desktop-native-toolchain-id.sh b/scripts/desktop-native-toolchain-id.sh new file mode 100755 index 0000000000..b3c5f8bb75 --- /dev/null +++ b/scripts/desktop-native-toolchain-id.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env bash +set -euo pipefail + +platform=${1:?usage: desktop-native-toolchain-id.sh } +case "$platform" in + macos) + { + sw_vers + xcodebuild -version + xcrun --sdk macosx --show-sdk-path + xcrun --sdk macosx --show-sdk-version + xcrun clang --version + } ;; + linux) + { + cat /etc/os-release + dpkg-query -W -f='${Package}=${Version}\n' \ + build-essential libasound2-dev libayatana-appindicator3-dev \ + libgtk-3-dev librsvg2-dev libssl-dev libwebkit2gtk-4.1-dev \ + libxdo-dev patchelf pkg-config + gcc -dumpfullversion -dumpversion + gcc -dumpmachine + ld --version + } ;; + windows) + { + cmd.exe //c ver + powershell.exe -NoProfile -Command '$vswhere = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"; & $vswhere -latest -products * -property installationVersion; Get-ChildItem "${env:ProgramFiles}\Microsoft Visual Studio\2022" -Directory -ErrorAction SilentlyContinue | Select-Object -ExpandProperty Name; Get-ChildItem "${env:ProgramFiles(x86)}\Windows Kits\10\Include" -Directory | Select-Object -ExpandProperty Name; Get-ChildItem "${env:ProgramFiles}\Microsoft Visual Studio\2022\*\VC\Tools\MSVC" -Directory | Select-Object -ExpandProperty Name' + cmake --version + } ;; + *) + echo "unsupported native toolchain platform: $platform" >&2 + exit 1 ;; +esac | tr -d '\r' | python3 -c 'import hashlib, sys; print(hashlib.sha256(sys.stdin.buffer.read()).hexdigest())' diff --git a/scripts/desktop-release-cache-key.py b/scripts/desktop-release-cache-key.py new file mode 100755 index 0000000000..736b3fcfa9 --- /dev/null +++ b/scripts/desktop-release-cache-key.py @@ -0,0 +1,85 @@ +#!/usr/bin/env python3 +"""Compute an exact, version-agnostic Cargo release cache key.""" + +from __future__ import annotations + +import argparse +import hashlib +import pathlib +import re +import subprocess +import sys + +ROOT = pathlib.Path(__file__).resolve().parents[1] +DESKTOP_MANIFEST = pathlib.Path("desktop/src-tauri/Cargo.toml") +DESKTOP_LOCK = pathlib.Path("desktop/src-tauri/Cargo.lock") + + +def normalized(path: pathlib.Path, data: bytes) -> bytes: + text = data.decode() + if path == DESKTOP_MANIFEST: + text, count = re.subn( + r'(?ms)(^\[package\].*?^version\s*=\s*)"[^"]+"', + r'\1""', + text, + count=1, + ) + if count != 1: + raise ValueError(f"could not normalize package version in {path}") + elif path == DESKTOP_LOCK: + text, count = re.subn( + r'(?ms)(^name = "buzz-desktop"\nversion = )"[^"]+"', + r'\1""', + text, + count=1, + ) + if count != 1: + raise ValueError(f"could not normalize package version in {path}") + return text.encode() + + +def main() -> int: + parser = argparse.ArgumentParser() + parser.add_argument("--platform", required=True) + parser.add_argument("--target", required=True) + parser.add_argument("--features", default="default") + parser.add_argument("--native-inputs", required=True) + args = parser.parse_args() + + manifest_output = subprocess.check_output( + ["git", "ls-files", "*Cargo.toml"], cwd=ROOT, text=True + ) + paths = [ROOT / path for path in manifest_output.splitlines()] + paths += [ROOT / "Cargo.lock", ROOT / DESKTOP_LOCK, ROOT / "rust-toolchain.toml"] + cargo_config = ROOT / ".cargo/config.toml" + if cargo_config.exists(): + paths.append(cargo_config) + + digest = hashlib.sha256() + descriptors = { + "schema": "desktop-rust-release-v1", + "platform": args.platform, + "target": args.target, + "profile": "release", + "features": args.features, + "native-inputs": args.native_inputs, + "rustc": subprocess.check_output(["rustc", "-Vv"], text=True).strip(), + } + for name, value in sorted(descriptors.items()): + digest.update(f"{name}\0{value}\0".encode()) + + for absolute in sorted(set(paths)): + relative = absolute.relative_to(ROOT) + digest.update(str(relative).encode() + b"\0") + digest.update(normalized(relative, absolute.read_bytes()) + b"\0") + + print(f"desktop-rust-release-v1-{args.platform}-{args.target}-{digest.hexdigest()}") + return 0 + + +if __name__ == "__main__": + try: + raise SystemExit(main()) + except (OSError, ValueError, subprocess.CalledProcessError) as error: + print(f"error: {error}", file=sys.stderr) + raise SystemExit(1) diff --git a/scripts/test-desktop-release-cache-key.sh b/scripts/test-desktop-release-cache-key.sh new file mode 100755 index 0000000000..0b91b3e281 --- /dev/null +++ b/scripts/test-desktop-release-cache-key.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash +set -euo pipefail + +repo_root=$(cd "$(dirname "$0")/.." && pwd) +key_script="scripts/desktop-release-cache-key.py" +tmp=$(mktemp -d) +trap 'rm -rf "$tmp"' EXIT +cp -R "$repo_root"/. "$tmp/repo" +cd "$tmp/repo" + +args=(--platform Linux --target x86_64-unknown-linux-gnu --features mesh-llm --native-inputs ubuntu-24.04-mold) +original=$("$key_script" "${args[@]}") +python3 - <<'PY' +from pathlib import Path +manifest = Path("desktop/src-tauri/Cargo.toml") +manifest.write_text(manifest.read_text().replace('version = "0.5.4"', 'version = "9.8.7"', 1)) +lock = Path("desktop/src-tauri/Cargo.lock") +text = lock.read_text() +start = text.index('name = "buzz-desktop"') +version = text.index('version = "0.5.4"', start) +lock.write_text(text[:version] + 'version = "9.8.7"' + text[version + len('version = "0.5.4"'):]) +PY +version_only=$("$key_script" "${args[@]}") +[[ "$original" == "$version_only" ]] || { echo "desktop version changed cache key" >&2; exit 1; } +printf '\n# dependency input\n' >> crates/buzz-acp/Cargo.toml +dependency_changed=$("$key_script" "${args[@]}") +[[ "$original" != "$dependency_changed" ]] || { echo "dependency manifest did not change cache key" >&2; exit 1; } +[[ "$original" == desktop-rust-release-v1-Linux-x86_64-unknown-linux-gnu-* ]] || { echo "unexpected key: $original" >&2; exit 1; } +echo "desktop release cache key contract passed" diff --git a/scripts/test-desktop-release-cache-workflow.sh b/scripts/test-desktop-release-cache-workflow.sh new file mode 100755 index 0000000000..67f054a603 --- /dev/null +++ b/scripts/test-desktop-release-cache-workflow.sh @@ -0,0 +1,77 @@ +#!/usr/bin/env bash +set -euo pipefail +root=$(cd "$(dirname "$0")/.." && pwd) +release="$root/.github/workflows/release.yml" +proof="$root/.github/workflows/desktop-release-cache-proof.yml" +canaries=( + "$root/.github/workflows/signed-macos-canary.yml" + "$root/.github/workflows/macos-intel-canary.yml" + "$root/.github/workflows/windows-canary.yml" + "$root/.github/workflows/linux-canary.yml" +) + +if grep -q 'desktop-rust-release-v1\|desktop-release-cache-key' "$release"; then + echo "Gate 1 must not alter the release cache path" >&2 + exit 1 +fi +for workflow in "${canaries[@]}"; do + grep -q 'refs/heads/main' "$workflow" + grep -q 'desktop-native-toolchain-id.sh' "$workflow" + grep -q 'steps.native_toolchain.outputs.id' "$workflow" + grep -q 'actions/cache/restore@' "$workflow" + grep -q 'actions/cache/save@' "$workflow" + grep -q 'steps.rust_cache.outputs.cache-hit' "$workflow" + grep -q '!desktop/src-tauri/target/\*\*/release/bundle' "$workflow" + if grep -q 'restore-keys:.*desktop-rust\|Swatinem/rust-cache' "$workflow"; then + echo "release Cargo cache must use split actions with no fallback: $workflow" >&2 + exit 1 + fi +done + +# GitHub expressions must enter cache-key steps through env, never by direct +# interpolation into generated shell scripts. This blocks shell injection if a +# matrix or upstream output ever becomes attacker-controlled. +python3 - "$proof" "${canaries[@]}" <<'PY' +import pathlib +import re +import sys + +for filename in sys.argv[1:]: + text = pathlib.Path(filename).read_text() + steps = re.findall( + r"(?ms)^ - name: Compute exact release cache key\n(.*?)(?=^ - (?:name:|uses:)|\Z)", + text, + ) + if not steps: + raise SystemExit(f"cache-key step missing: {filename}") + for step in steps: + run = re.search(r"(?ms)^ run: \|\n(.*?)(?=^ \S|\Z)", step) + if not run: + raise SystemExit(f"cache-key run block missing: {filename}") + if "${{" in run.group(1): + raise SystemExit(f"GitHub expression interpolated into cache-key shell: {filename}") + if "NATIVE_TOOLCHAIN_ID: ${{ steps.native_toolchain.outputs.id }}" not in step: + raise SystemExit(f"native toolchain output not passed through env: {filename}") +PY + +# Producer/proof coverage must match all four release targets and features. +for target in aarch64-apple-darwin x86_64-apple-darwin x86_64-unknown-linux-gnu x86_64-pc-windows-msvc; do + grep -q -- "$target" "$proof" || { echo "proof missing $target" >&2; exit 1; } +done +grep -q -- '--features mesh-llm' "$proof" +grep -q -- '--features default' "$proof" +[[ $(grep -c 'actions/cache/save@' "$proof") -eq 0 ]] +[[ $(grep -c 'Require exact cache hit' "$proof") -eq 3 ]] +grep -q 'refs/tags/cache-proof-' "$proof" + +# Linux producer must match release's default linker, not the CI-only mold path. +if grep -q 'setup-mold\|ubuntu-24.04-mold' "$root/.github/workflows/linux-canary.yml"; then + echo "Linux cache producer diverges from the release linker" >&2 + exit 1 +fi +if grep -q 'setup-mold' "$release"; then + echo "release linker changed; re-review cache equivalence" >&2 + exit 1 +fi + +echo "desktop release cache workflow contract passed" diff --git a/scripts/test-release-ref-contract.sh b/scripts/test-release-ref-contract.sh index 6722135bb8..8bfd6798ee 100755 --- a/scripts/test-release-ref-contract.sh +++ b/scripts/test-release-ref-contract.sh @@ -54,6 +54,8 @@ grep -q 'verify-release-ref\.sh' "$repo_root/.github/workflows/release.yml" grep -q 'verify-release-ref\.sh' "$repo_root/.github/workflows/docker.yml" grep -q 'test-release-ref-contract\.sh' "$repo_root/.github/workflows/ci.yml" "$repo_root/scripts/test-signed-canary-contract.sh" +"$repo_root/scripts/test-desktop-release-cache-key.sh" +"$repo_root/scripts/test-desktop-release-cache-workflow.sh" auto_tag="$repo_root/.github/workflows/auto-tag-on-release-pr-merge.yml" grep -q 'actions/create-github-app-token@' "$auto_tag" grep -q 'client-id:.*vars\.BUZZ_RELEASE_TAGGER_CLIENT_ID' "$auto_tag" From 5c98932c59ee5344e9e8c14525c51f3de16ad2c2 Mon Sep 17 00:00:00 2001 From: Taylor Ho Date: Mon, 3 Aug 2026 13:05:47 -0700 Subject: [PATCH 18/27] feat(desktop): make onboarding model defaults skippable (#3968) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Category:** improvement **User Impact:** Users can skip default model configuration during onboarding and finish it later in Settings → Agents. **Problem:** Requiring model defaults during onboarding can block users who are not ready to choose a harness, provider, or model. Skipping also needs to leave existing configuration untouched rather than persisting partial selections. **Solution:** Stage onboarding edits locally and persist them only when users choose Next or Back. A delayed Skip action advances without any configuration write, while a footer hint points users to the settings location for completing setup later.
File changes **desktop/src/features/onboarding/ui/DefaultConfigStep.tsx** Adds the skip action and future-settings hint, and makes model configuration transactional so Skip discards staged changes while Next and Back preserve the intended save behavior. **desktop/src/testing/e2eBridge.ts** Exposes model-config setter call counts so tests can distinguish a true zero-write skip from a write-and-rollback implementation. **desktop/tests/e2e/onboarding-agent-defaults.spec.ts** Covers skipping during loading and after staged edits, verifies zero persistence calls, and confirms Next and Back still commit changes.
## Reproduction steps 1. Start fresh onboarding and continue through harness setup to **Configure your default model settings**. 2. Change the selected harness or model, then choose **Skip for now**. 3. Confirm onboarding advances to **Join or create a community** and the prior global model configuration remains unchanged. 4. Return through onboarding and confirm **Next** saves the staged selection; confirm **Back** also preserves staged changes before returning. 5. Confirm the footer says model defaults can be configured later in **Settings → Agents**. --------- Signed-off-by: Taylor Ho Signed-off-by: npub1223z34hd7vtwc6qj4s7flsxkj644nlre2nthu7lrrmkumhu3xddsrx9r6w <52a228d6edf316ec6812ac3c9fc0d696ab59fc7954d77e7be31eedcddf91335b@buzz.block.builderlab.xyz> Co-authored-by: npub1223z34hd7vtwc6qj4s7flsxkj644nlre2nthu7lrrmkumhu3xddsrx9r6w <52a228d6edf316ec6812ac3c9fc0d696ab59fc7954d77e7be31eedcddf91335b@buzz.block.builderlab.xyz> --- desktop/src/features/agents/AGENTS.md | 19 +- .../onboarding/ui/DefaultConfigStep.tsx | 235 +++++++++++------ .../onboarding/ui/MachineOnboardingFlow.tsx | 6 + .../onboarding/ui/saveCoalescer.test.mjs | 242 ------------------ .../features/onboarding/ui/saveCoalescer.ts | 96 ------- desktop/src/features/onboarding/ui/types.ts | 15 +- desktop/src/testing/e2eBridge.ts | 16 +- .../e2e/onboarding-agent-defaults.spec.ts | 219 +++++++++++++++- desktop/tests/helpers/bridge.ts | 2 + 9 files changed, 412 insertions(+), 438 deletions(-) delete mode 100644 desktop/src/features/onboarding/ui/saveCoalescer.test.mjs delete mode 100644 desktop/src/features/onboarding/ui/saveCoalescer.ts diff --git a/desktop/src/features/agents/AGENTS.md b/desktop/src/features/agents/AGENTS.md index d9222c7032..f2eb7f285c 100644 --- a/desktop/src/features/agents/AGENTS.md +++ b/desktop/src/features/agents/AGENTS.md @@ -67,11 +67,17 @@ with a TypeScript lookup table or an id comparison in a component. 7. **Onboarding setup detects readiness; it does not select defaults.** The setup page derives visible and ready harnesses from the runtime catalog and only offers install or sign-in actions. The following defaults page is the - sole onboarding surface that chooses and persists `preferred_runtime`, and - its Finish gate consumes the shared renderer's `onValidityChange` signal — - a harness selection alone does not complete onboarding when the harness + sole onboarding surface that chooses `preferred_runtime`. Its complete draft + lives in machine-onboarding session state, so Back performs no write and + restores even incomplete edits when the user returns. Skip abandons that + draft and advances with zero config writes. Next is the only persistence + boundary: it consumes the shared renderer's `onValidityChange` signal, + disables editing while awaiting `set_global_agent_config`, advances only on + success, and leaves the draft in place with a retryable inline error on + failure. A harness selection alone does not enable Next when the harness requires provider/model/credential config (e.g. buzz-agent with no - provider). Baked build env and runtime-file config satisfy the gate. + provider). Baked build env and runtime-file config satisfy the gate. Drafts + intentionally do not survive an app restart. `onboarding-agent-defaults.spec.ts` is the acceptance gate for anything touching this flow or the shared renderer. 8. **Omit the Model control only after a confirmed successful empty @@ -168,8 +174,9 @@ with a TypeScript lookup table or an id comparison in a component. plus both resolvers, including unknown-reads-as-local and blank-`runOn`-is-not-a-provider. - `desktop/tests/e2e/onboarding-agent-defaults.spec.ts` — onboarding behavior - acceptance coverage for readiness, failure states, defaults, navigation, - successful-empty vs failed optional-model discovery, and persistence races. + acceptance coverage for readiness, failure states, defaults, session-draft + restoration, zero-write Skip, Next save failure/retry, navigation, and + successful-empty vs failed optional-model discovery. - Rust: `runtime_metadata_env_vars` tests pin spawn-time key application. - Rust: persona sharing/retention tests pin relay+owner scoping, durable enqueue errors, relay rejection/unavailability, and accepted publication. diff --git a/desktop/src/features/onboarding/ui/DefaultConfigStep.tsx b/desktop/src/features/onboarding/ui/DefaultConfigStep.tsx index 50887f08aa..78a7a32db8 100644 --- a/desktop/src/features/onboarding/ui/DefaultConfigStep.tsx +++ b/desktop/src/features/onboarding/ui/DefaultConfigStep.tsx @@ -10,7 +10,6 @@ import { } from "@/features/agents/ui/AgentConfigFields"; import { resetConfigForHarnessChange } from "@/features/agents/ui/agentConfigOptions"; import { AgentDropdownSelect } from "@/features/agents/ui/agentConfigControls"; -import { createSaveCoalescer } from "./saveCoalescer"; import { getBakedBuildEnv, type BakedEnvEntry } from "@/shared/api/tauri"; import { getGlobalAgentConfig, @@ -32,11 +31,12 @@ import { getReadyOnboardingRuntimes, getVisibleOnboardingRuntimes, } from "./onboardingRuntimeSelection"; -import type { DefaultConfigStepActions } from "./types"; +import type { DefaultConfigDraft, DefaultConfigStepActions } from "./types"; type DefaultConfigStepProps = { actions: DefaultConfigStepActions; direction: OnboardingTransitionDirection; + draft: DefaultConfigDraft | null; readyRuntimeIds: readonly string[]; }; @@ -46,28 +46,40 @@ function formatHarnessLabel(runtime: AcpRuntimeCatalogEntry | undefined) { } function AgentDefaultsSection({ + draft, + isPending, + onDraftChange, onPersistenceStateChange, readyRuntimeIds, }: { + draft: DefaultConfigDraft | null; + isPending: boolean; + onDraftChange: (draft: DefaultConfigDraft) => void; onPersistenceStateChange: (state: { canComplete: boolean; - flush: () => Promise; + commit: () => Promise; }) => void; readyRuntimeIds: readonly string[]; }) { const runtimesQuery = useAcpRuntimesQuery(); - const [config, setConfig] = - React.useState(EMPTY_GLOBAL_CONFIG); - const [isLoading, setIsLoading] = React.useState(true); - const [isCustomProvider, setIsCustomProvider] = React.useState(false); - const [isCustomModelEditing, setIsCustomModelEditing] = React.useState(false); + const initialDraftRef = React.useRef(draft); + const [config, setConfig] = React.useState( + initialDraftRef.current?.config ?? EMPTY_GLOBAL_CONFIG, + ); + const [isLoading, setIsLoading] = React.useState( + initialDraftRef.current === null, + ); + const [isCustomProvider, setIsCustomProvider] = React.useState( + initialDraftRef.current?.isCustomProvider ?? false, + ); + const [isCustomModelEditing, setIsCustomModelEditing] = React.useState( + initialDraftRef.current?.isCustomModelEditing ?? false, + ); const [bakedEnv, setBakedEnv] = React.useState([]); - const coalescerRef = React.useRef<{ - enqueue: (value: GlobalAgentConfig) => void; - flush: () => Promise; - cancel: () => void; - } | null>(null); - const [isSaving, setIsSaving] = React.useState(false); + const configRef = React.useRef( + initialDraftRef.current?.config ?? EMPTY_GLOBAL_CONFIG, + ); + const isDirtyRef = React.useRef(initialDraftRef.current?.isDirty ?? false); const [configIsValid, setConfigIsValid] = React.useState(false); React.useEffect(() => { @@ -81,7 +93,11 @@ function AgentDefaultsSection({ if (unmounted) return; - if (configResult.status === "fulfilled") { + if ( + initialDraftRef.current === null && + configResult.status === "fulfilled" + ) { + configRef.current = configResult.value; setConfig(configResult.value); } if (bakedEnvResult.status === "fulfilled") { @@ -92,25 +108,8 @@ function AgentDefaultsSection({ void loadDefaults(); - // The coalescer serializes autosaves and drains any edit that arrived - // while a previous save was in flight. Cancel on unmount so a slow - // in-flight request never calls setState on an unmounted component. - const coalescer = createSaveCoalescer( - // set_global_agent_config returns a save result (config + restart - // counts); the coalescer round-trips the persisted config only. - async (next) => (await setGlobalAgentConfig(next)).config, - (saving) => { - if (!unmounted) setIsSaving(saving); - }, - (saved) => { - if (!unmounted) setConfig(saved); - }, - ); - coalescerRef.current = coalescer; - return () => { unmounted = true; - coalescer.cancel(); }; }, []); @@ -160,15 +159,33 @@ function AgentDefaultsSection({ [readyRuntimes], ); + const updateDraft = React.useCallback( + (next: GlobalAgentConfig, overrides: Partial = {}) => { + isDirtyRef.current = overrides.isDirty ?? true; + configRef.current = next; + setConfig(next); + onDraftChange({ + config: next, + isCustomModelEditing, + isCustomProvider, + isDirty: isDirtyRef.current, + ...overrides, + }); + }, + [isCustomModelEditing, isCustomProvider, onDraftChange], + ); + const handleHarnessChange = React.useCallback( (runtimeId: string) => { const next = resetConfigForHarnessChange(config, runtimeId); setIsCustomModelEditing(false); setIsCustomProvider(false); - setConfig(next); - coalescerRef.current?.enqueue(next); + updateDraft(next, { + isCustomModelEditing: false, + isCustomProvider: false, + }); }, - [config], + [config, updateDraft], ); React.useEffect(() => { @@ -182,28 +199,34 @@ function AgentDefaultsSection({ selectedRuntimeId, ]); - const flushPersistence = React.useCallback( - () => coalescerRef.current?.flush() ?? Promise.resolve(), - [], - ); + const commitPersistence = React.useCallback(async () => { + if (!isDirtyRef.current) return; + const saved = await setGlobalAgentConfig(configRef.current); + isDirtyRef.current = false; + configRef.current = saved.config; + setConfig(saved.config); + }, []); React.useEffect(() => { onPersistenceStateChange({ // configIsValid comes from AgentConfigFields' onValidityChange and // covers model + provider credentials — a harness selection alone is // not a working default (e.g. buzz-agent with no provider configured). - canComplete: selectedRuntimeId.length > 0 && configIsValid && !isSaving, - flush: flushPersistence, + canComplete: selectedRuntimeId.length > 0 && configIsValid, + commit: commitPersistence, }); }, [ + commitPersistence, configIsValid, - flushPersistence, - isSaving, onPersistenceStateChange, selectedRuntimeId, ]); return ( -
+
{configSurfaceLoading ? (
@@ -240,15 +263,25 @@ function AgentDefaultsSection({ config={config} isCustomModelEditing={isCustomModelEditing} isCustomProvider={isCustomProvider} - onConfigChange={(next) => { - // Always apply optimistically so the UI never reverts mid-save, - // then enqueue the persist — the coalescer serialises multiple - // rapid edits into a single trailing request. - setConfig(next); - coalescerRef.current?.enqueue(next); + onConfigChange={updateDraft} + onCustomModelEditingChange={(next) => { + setIsCustomModelEditing(next); + onDraftChange({ + config: configRef.current, + isCustomModelEditing: next, + isCustomProvider, + isDirty: isDirtyRef.current, + }); + }} + onIsCustomProviderChange={(next) => { + setIsCustomProvider(next); + onDraftChange({ + config: configRef.current, + isCustomModelEditing, + isCustomProvider: next, + isDirty: isDirtyRef.current, + }); }} - onCustomModelEditingChange={setIsCustomModelEditing} - onIsCustomProviderChange={setIsCustomProvider} onValidityChange={setConfigIsValid} placeholderClassName="text-foreground/70" runtimeFileConfig={runtimeFileConfig} @@ -259,7 +292,7 @@ function AgentDefaultsSection({ />
)} -
+ ); } @@ -271,28 +304,39 @@ function AgentDefaultsSection({ export function DefaultConfigStep({ actions, direction, + draft, readyRuntimeIds, }: DefaultConfigStepProps) { const [persistenceState, setPersistenceState] = React.useState<{ canComplete: boolean; - flush: () => Promise; - }>({ canComplete: false, flush: () => Promise.resolve() }); - const [completionError, setCompletionError] = React.useState( - null, - ); - const [isCompleting, setIsCompleting] = React.useState(false); + commit: () => Promise; + }>({ canComplete: false, commit: () => Promise.resolve() }); + const [isSaving, setIsSaving] = React.useState(false); + const [saveError, setSaveError] = React.useState(null); const handleComplete = React.useCallback(async () => { - setIsCompleting(true); - setCompletionError(null); + if (isSaving) return; + setIsSaving(true); + setSaveError(null); try { - await persistenceState.flush(); + await persistenceState.commit(); + actions.discardDraft(); actions.complete(); - } catch { - setCompletionError("Couldn't save your default harness. Try again."); - setIsCompleting(false); + } catch (cause) { + setSaveError( + cause instanceof Error + ? cause.message + : "Couldn’t save model settings.", + ); + } finally { + setIsSaving(false); } - }, [actions, persistenceState]); + }, [actions, isSaving, persistenceState]); + + const handleSkip = React.useCallback(() => { + actions.discardDraft(); + actions.complete(); + }, [actions]); return (
- {completionError ? ( -

- {completionError} -

- ) : null}
- + {/* Keep Next centered while the optional action sits beside it. */} +
+ + +
+ + {saveError ? ( +

+ Couldn’t save model settings. {saveError} Try again. +

+ ) : null} + +

+ Configure default models in{" "} + Settings → Agents after + setup. +

); diff --git a/desktop/src/features/onboarding/ui/MachineOnboardingFlow.tsx b/desktop/src/features/onboarding/ui/MachineOnboardingFlow.tsx index cee17c68f8..693d1af058 100644 --- a/desktop/src/features/onboarding/ui/MachineOnboardingFlow.tsx +++ b/desktop/src/features/onboarding/ui/MachineOnboardingFlow.tsx @@ -33,6 +33,7 @@ import { import { OnboardingFooterProvider } from "./OnboardingFooter"; import { OnboardingSlideTransition } from "./OnboardingSlideTransition"; import { SetupStep } from "./SetupStep"; +import type { DefaultConfigDraft } from "./types"; export type MachineOnboardingPage = | "identity" @@ -85,6 +86,8 @@ export function MachineOnboardingFlow({ IdentityStorage | undefined >(); const [readyRuntimeIds, setReadyRuntimeIds] = React.useState([]); + const [defaultConfigDraft, setDefaultConfigDraft] = + React.useState(null); const [backupSubview, setBackupSubview] = React.useState("created"); const [backupDirection, setBackupDirection] = React.useState< @@ -381,8 +384,11 @@ export function MachineOnboardingFlow({ actions={{ back: () => setPage("setup"), complete: () => complete(selectedPubkey ?? undefined), + discardDraft: () => setDefaultConfigDraft(null), + updateDraft: setDefaultConfigDraft, }} direction="forward" + draft={defaultConfigDraft} readyRuntimeIds={readyRuntimeIds} /> )} diff --git a/desktop/src/features/onboarding/ui/saveCoalescer.test.mjs b/desktop/src/features/onboarding/ui/saveCoalescer.test.mjs deleted file mode 100644 index 02e23c131f..0000000000 --- a/desktop/src/features/onboarding/ui/saveCoalescer.test.mjs +++ /dev/null @@ -1,242 +0,0 @@ -/** - * Unit tests for the save coalescer helper. - * - * Each test controls the in-flight save duration with a deferred promise so - * it can precisely verify interleaving: one edit during flight, multiple - * overwrites, cancellation, etc. - */ -import assert from "node:assert/strict"; -import test from "node:test"; - -import { createSaveCoalescer } from "./saveCoalescer.ts"; - -function deferred() { - let resolve; - let reject; - const promise = new Promise((res, rej) => { - resolve = res; - reject = rej; - }); - return { promise, resolve, reject }; -} - -// Drain one microtask queue turn so the async drain() loop can advance. -const tick = () => new Promise((r) => setTimeout(r, 0)); - -test("saveCoalescer_single_edit_is_persisted_and_saved_is_applied", async () => { - const persisted = []; - const saved = []; - - const coalescer = createSaveCoalescer( - async (v) => { - persisted.push(v); - return { ...v, fromServer: true }; - }, - () => {}, - (v) => saved.push(v), - ); - - coalescer.enqueue({ model: "claude" }); - await tick(); - await tick(); - - assert.equal(persisted.length, 1); - assert.equal(persisted[0].model, "claude"); - assert.equal(saved.length, 1); - assert.equal(saved[0].fromServer, true); -}); - -test("saveCoalescer_rapid_edits_coalesce_second_is_drained_after_first", async () => { - const d = deferred(); - const persisted = []; - - const coalescer = createSaveCoalescer( - async (v) => { - if (v.n === 0) await d.promise; - persisted.push(v.n); - return v; - }, - () => {}, - () => {}, - ); - - coalescer.enqueue({ n: 0 }); - // Second edit arrives while first save is still in flight. - coalescer.enqueue({ n: 1 }); - - d.resolve(); - await tick(); - await tick(); - - assert.deepEqual(persisted, [0, 1]); -}); - -test("saveCoalescer_three_rapid_edits_only_first_and_last_are_persisted", async () => { - const d = deferred(); - const persisted = []; - - const coalescer = createSaveCoalescer( - async (v) => { - if (v.n === 0) await d.promise; - persisted.push(v.n); - return v; - }, - () => {}, - () => {}, - ); - - coalescer.enqueue({ n: 0 }); - coalescer.enqueue({ n: 1 }); // overwritten before drain picks it up - coalescer.enqueue({ n: 2 }); // overwrites n:1 - - d.resolve(); - await tick(); - await tick(); - - // n:1 was never the pending value when the drain loop checked; only n:2. - assert.deepEqual(persisted, [0, 2]); -}); - -test("saveCoalescer_onSaved_suppressed_for_first_when_second_is_pending", async () => { - const d = deferred(); - const savedCalls = []; - - const coalescer = createSaveCoalescer( - async (v) => { - if (v.n === 0) await d.promise; - return v; - }, - () => {}, - (v) => savedCalls.push(v.n), - ); - - coalescer.enqueue({ n: 0 }); - // Queue n:1 before n:0 resolves — onSaved for n:0 should be suppressed. - coalescer.enqueue({ n: 1 }); - - d.resolve(); - await tick(); - await tick(); - - // Only n:1 (the final save round) triggers onSaved. - assert.deepEqual(savedCalls, [1]); -}); - -test("saveCoalescer_isSaving_transitions_true_then_false", async () => { - const d = deferred(); - const states = []; - - const coalescer = createSaveCoalescer( - async (v) => { - await d.promise; - return v; - }, - (s) => states.push(s), - () => {}, - ); - - coalescer.enqueue({ n: 0 }); - assert.deepEqual(states, [true]); - - d.resolve(); - await tick(); - await tick(); - - assert.deepEqual(states, [true, false]); -}); - -test("saveCoalescer_flush_waits_for_the_latest_pending_save", async () => { - const d = deferred(); - const persisted = []; - - const coalescer = createSaveCoalescer( - async (v) => { - if (v.n === 0) await d.promise; - persisted.push(v.n); - return v; - }, - () => {}, - () => {}, - ); - - coalescer.enqueue({ n: 0 }); - coalescer.enqueue({ n: 1 }); - let flushed = false; - const flush = coalescer.flush().then(() => { - flushed = true; - }); - await tick(); - assert.equal(flushed, false); - - d.resolve(); - await flush; - assert.deepEqual(persisted, [0, 1]); -}); - -test("saveCoalescer_flush_rejects_when_the_final_save_fails", async () => { - const coalescer = createSaveCoalescer( - async () => { - throw new Error("save failed"); - }, - () => {}, - () => {}, - ); - - coalescer.enqueue({ n: 0 }); - await assert.rejects(coalescer.flush(), /save failed/); -}); - -test("saveCoalescer_cancel_prevents_onSaved_and_onSaving_false", async () => { - const d = deferred(); - const states = []; - const savedCalls = []; - - const coalescer = createSaveCoalescer( - async (v) => { - await d.promise; - return v; - }, - (s) => states.push(s), - (v) => savedCalls.push(v), - ); - - coalescer.enqueue({ n: 0 }); - coalescer.cancel(); - d.resolve(); - await tick(); - await tick(); - - // After cancel, neither onSaved nor onSaving(false) fire. - assert.equal(savedCalls.length, 0); - assert.equal(states.includes(false), false); -}); - -test("saveCoalescer_save_error_does_not_call_onSaved_but_drains_pending", async () => { - const d = deferred(); - const persisted = []; - const savedCalls = []; - - const coalescer = createSaveCoalescer( - async (v) => { - if (v.n === 0) { - await d.promise; - throw new Error("network error"); - } - persisted.push(v.n); - return v; - }, - () => {}, - (v) => savedCalls.push(v.n), - ); - - coalescer.enqueue({ n: 0 }); - coalescer.enqueue({ n: 1 }); // pending while n:0 fails - - d.resolve(); - await tick(); - await tick(); - - // n:0 errored — no onSaved for it; n:1 was drained and saved. - assert.deepEqual(persisted, [1]); - assert.deepEqual(savedCalls, [1]); -}); diff --git a/desktop/src/features/onboarding/ui/saveCoalescer.ts b/desktop/src/features/onboarding/ui/saveCoalescer.ts deleted file mode 100644 index f34327453c..0000000000 --- a/desktop/src/features/onboarding/ui/saveCoalescer.ts +++ /dev/null @@ -1,96 +0,0 @@ -/** - * Creates an async save coalescer. - * - * When multiple calls to enqueue() arrive while a save is in flight, only - * the latest enqueued value is submitted per drain round — no edit is - * silently dropped and the final persisted state always reflects the most - * recent local change. - * - * Lifecycle: call cancel() on unmount so in-flight saves do not invoke - * callbacks after the owning component is gone. Call flush() before leaving - * a surface that must guarantee its latest optimistic value was persisted. - */ -export function createSaveCoalescer( - save: (value: T) => Promise, - onSaving: (isSaving: boolean) => void, - onSaved: (value: T) => void, -): { - enqueue: (value: T) => void; - flush: () => Promise; - cancel: () => void; -} { - let pending: T | undefined; - let hasPending = false; - let running = false; - let cancelled = false; - let finalError: unknown; - let flushWaiters: Array<{ - resolve: () => void; - reject: (error: unknown) => void; - }> = []; - - function settleFlushWaiters() { - const waiters = flushWaiters; - flushWaiters = []; - for (const waiter of waiters) { - if (finalError === undefined) waiter.resolve(); - else waiter.reject(finalError); - } - } - - async function drain() { - while (hasPending) { - const toSave = pending as T; - hasPending = false; - pending = undefined; - try { - const saved = await save(toSave); - finalError = undefined; - // Apply backend response only when no newer local edit is pending — - // a stale response must never overwrite fresher optimistic state. - if (!cancelled && !hasPending) { - onSaved(saved); - } - } catch (error) { - finalError = error; - } - } - running = false; - if (!cancelled) { - onSaving(false); - settleFlushWaiters(); - } - } - - return { - enqueue(value: T) { - pending = value; - hasPending = true; - if (running) return; - running = true; - finalError = undefined; - onSaving(true); - void drain(); - }, - flush() { - if (!running) { - return finalError === undefined - ? Promise.resolve() - : Promise.reject(finalError); - } - return new Promise((resolve, reject) => { - flushWaiters.push({ resolve, reject }); - }); - }, - cancel() { - cancelled = true; - hasPending = false; - pending = undefined; - const waiters = flushWaiters; - flushWaiters = []; - for (const waiter of waiters) { - waiter.reject(new Error("Save cancelled")); - } - }, - }; -} diff --git a/desktop/src/features/onboarding/ui/types.ts b/desktop/src/features/onboarding/ui/types.ts index 443a1f3f4e..5216bfefa4 100644 --- a/desktop/src/features/onboarding/ui/types.ts +++ b/desktop/src/features/onboarding/ui/types.ts @@ -1,4 +1,8 @@ -import type { AcpRuntimeCatalogEntry, Profile } from "@/shared/api/types"; +import type { + AcpRuntimeCatalogEntry, + GlobalAgentConfig, + Profile, +} from "@/shared/api/types"; export type OnboardingPage = | "profile" @@ -62,9 +66,18 @@ export type SetupStepActions = { navigateToAgentSettings?: () => void; }; +export type DefaultConfigDraft = { + config: GlobalAgentConfig; + isCustomModelEditing: boolean; + isCustomProvider: boolean; + isDirty: boolean; +}; + export type DefaultConfigStepActions = { back: () => void; complete: () => void; + discardDraft: () => void; + updateDraft: (draft: DefaultConfigDraft) => void; }; export type SetupStepRuntimeState = { diff --git a/desktop/src/testing/e2eBridge.ts b/desktop/src/testing/e2eBridge.ts index 03d37ed72e..5cbfb03331 100644 --- a/desktop/src/testing/e2eBridge.ts +++ b/desktop/src/testing/e2eBridge.ts @@ -448,9 +448,11 @@ type E2eConfig = { * initial render gating around build defaults. 0/undefined = instant. */ bakedBuildEnvDelayMs?: number; /** Delay (ms) applied to `set_global_agent_config` so tests can observe - * autosave behaviour while a request is in flight. 0/undefined = instant. - * Alias of `globalConfigSaveDelayMs` (kept for onboarding specs). */ + * pending save behaviour. 0/undefined = instant. Alias of + * `globalConfigSaveDelayMs` (kept for onboarding specs). */ setGlobalAgentConfigDelayMs?: number; + /** Sequenced save failures. A string rejects that call; null succeeds. */ + setGlobalAgentConfigErrors?: (string | null)[]; /** Errors returned by successive backup verification attempts. Null succeeds. */ backupVerificationErrors?: (string | null)[]; /** Public identities returned by successive successful backup verifications. */ @@ -7333,6 +7335,7 @@ let installCallCount = 0; /** Per-runtime call counters for `installAcpRuntimeByRuntime` sequences. */ const installCallCountByRuntime: Record = {}; let addChannelMembersCallCount = 0; +let setGlobalAgentConfigCallCount = 0; let mockGlobalAgentConfig: { env_vars: Record; provider: string | null; @@ -11643,7 +11646,16 @@ export function maybeInstallE2eTauriMocks() { } ); } + case "get_global_agent_config_set_call_count": + return setGlobalAgentConfigCallCount; case "set_global_agent_config": { + setGlobalAgentConfigCallCount += 1; + const saveErrors = activeConfig?.mock?.setGlobalAgentConfigErrors; + const saveError = + saveErrors?.[ + Math.min(setGlobalAgentConfigCallCount - 1, saveErrors.length - 1) + ]; + if (saveError) throw new Error(saveError); // Echo back the submitted config as the saved value (mirrors the // backend's strip-on-write pass in tests where all values are already // non-empty). The invoke payload wraps it as { config }. diff --git a/desktop/tests/e2e/onboarding-agent-defaults.spec.ts b/desktop/tests/e2e/onboarding-agent-defaults.spec.ts index dbd726d179..b3462a4903 100644 --- a/desktop/tests/e2e/onboarding-agent-defaults.spec.ts +++ b/desktop/tests/e2e/onboarding-agent-defaults.spec.ts @@ -57,6 +57,24 @@ async function readSavedRuntime(page: Parameters[0]) { }); } +async function readGlobalConfigSetterCallCount( + page: Parameters[0], +) { + return await page.evaluate(async () => { + return await ( + window as Window & { + __BUZZ_E2E_INVOKE_MOCK_COMMAND__?: ( + command: string, + payload: unknown, + ) => Promise; + } + ).__BUZZ_E2E_INVOKE_MOCK_COMMAND__?.( + "get_global_agent_config_set_call_count", + null, + ); + }); +} + test("setup shows all bundled harnesses as detected", async ({ page }) => { await installMockBridge( page, @@ -528,21 +546,127 @@ test("defaults keeps model control when optional harness discovery fails", async await expect(page.getByTestId("onboarding-finish")).toBeEnabled(); }); -test("defaults Back returns to harness setup", async ({ page }) => { +test("defaults can be skipped while loading without persisting configuration", async ({ + page, +}) => { await installMockBridge( page, { acpRuntimesCatalog: [ runtime("claude", "available", { status: "logged_in" }), ], + bakedBuildEnvDelayMs: 500, + globalAgentConfig: { + env_vars: {}, + provider: null, + model: null, + preferred_runtime: null, + }, }, { skipCommunitySeed: true, skipOnboardingSeed: true }, ); await page.goto("/"); await navigateToSetupPage(page); await page.getByTestId("onboarding-setup-next").click(); + + await expect(page.getByText("Loading…")).toBeVisible(); + await page.getByTestId("onboarding-config-skip").click(); + + await expect(page.getByText("Join or create a community")).toBeVisible(); + expect(await readSavedRuntime(page)).toBeNull(); +}); + +test("defaults stages auto-selection and edits without writing when skipped", async ({ + page, +}) => { + await installMockBridge( + page, + { + acpRuntimesCatalog: [ + runtime("claude", "available", { status: "logged_in" }), + ], + globalAgentConfig: { + env_vars: {}, + provider: null, + model: null, + preferred_runtime: null, + }, + }, + { skipCommunitySeed: true, skipOnboardingSeed: true }, + ); + await page.goto("/"); + await navigateToSetupPage(page); + await page.getByTestId("onboarding-setup-next").click(); + + await expect(page.getByTestId("global-agent-default-harness")).toHaveText( + "Claude Code", + ); + await page.getByTestId("global-agent-model").click(); + await page + .getByTestId("global-agent-model-option-claude-opus-4-20250514") + .click(); + expect(await readGlobalConfigSetterCallCount(page)).toBe(0); + await expect( + page.getByText( + "Configure default models in Settings → Agents after setup.", + ), + ).toBeVisible(); + + await page.getByTestId("onboarding-config-skip").click(); + + await expect(page.getByText("Join or create a community")).toBeVisible(); + expect(await readSavedRuntime(page)).toBeNull(); + expect(await readGlobalConfigSetterCallCount(page)).toBe(0); +}); + +test("Back preserves incomplete defaults draft without writing", async ({ + page, +}) => { + await installMockBridge( + page, + { + acpRuntimesCatalog: [ + runtime("buzz-agent", "available", { status: "not_applicable" }), + runtime("claude", "available", { status: "logged_in" }), + ], + discoverAgentModels: { + models: [{ id: "claude-sonnet-4", name: "Claude Sonnet 4" }], + supportsSwitching: true, + }, + globalAgentConfig: { + env_vars: {}, + provider: null, + model: null, + preferred_runtime: null, + }, + }, + { skipCommunitySeed: true, skipOnboardingSeed: true }, + ); + await page.goto("/"); + await navigateToSetupPage(page); + await page.getByTestId("onboarding-setup-next").click(); + + const harness = page.getByTestId("global-agent-default-harness"); + await harness.click(); + await page + .getByTestId("global-agent-default-harness-option-buzz-agent") + .click(); + await page.getByTestId("global-agent-provider").click(); + await page.getByTestId("global-agent-provider-option-anthropic").click(); + await expect(page.getByTestId("onboarding-finish")).toBeDisabled(); + await page.getByTestId("onboarding-back").click(); await expect(page.getByTestId("onboarding-page-2")).toBeVisible(); + expect(await readSavedRuntime(page)).toBeNull(); + expect(await readGlobalConfigSetterCallCount(page)).toBe(0); + + await page.getByTestId("onboarding-setup-next").click(); + await expect(harness).toHaveText("Buzz"); + await expect(page.getByTestId("global-agent-provider")).toHaveText( + "Anthropic", + ); + await expect(page.getByTestId("onboarding-finish")).toBeDisabled(); + expect(await readGlobalConfigSetterCallCount(page)).toBe(0); }); test("defaults auto-selects the only ready visible harness", async ({ @@ -575,12 +699,10 @@ test("defaults auto-selects the only ready visible harness", async ({ "Claude Code", ); await expect(page.getByTestId("onboarding-finish")).toBeEnabled(); - await expect.poll(() => readSavedRuntime(page)).toBe("claude"); + expect(await readSavedRuntime(page)).toBeNull(); }); -test("Finish waits for the latest rapid harness choice to persist", async ({ - page, -}) => { +test("Next persists the latest staged harness choice", async ({ page }) => { await installMockBridge( page, { @@ -608,13 +730,94 @@ test("Finish waits for the latest rapid harness choice to persist", async ({ await harness.click(); await page.getByTestId("global-agent-default-harness-option-codex").click(); const finish = page.getByTestId("onboarding-finish"); - await expect(finish).toBeDisabled(); - await expect(finish).toBeEnabled({ timeout: 2_000 }); + await expect(finish).toBeEnabled(); + expect(await readGlobalConfigSetterCallCount(page)).toBe(0); await finish.click(); + await expect(page.getByText("Join or create a community")).toBeVisible(); + await expect.poll(() => readSavedRuntime(page)).toBe("codex"); +}); + +test("Next shows saving state and advances only after persistence", async ({ + page, +}) => { + await installMockBridge( + page, + { + acpRuntimesCatalog: [ + runtime("claude", "available", { status: "logged_in" }), + runtime("codex", "available", { status: "logged_in" }), + ], + globalAgentConfig: { + env_vars: {}, + provider: null, + model: null, + preferred_runtime: null, + }, + setGlobalAgentConfigDelayMs: 500, + }, + { skipCommunitySeed: true, skipOnboardingSeed: true }, + ); + await page.goto("/"); + await navigateToSetupPage(page); + await page.getByTestId("onboarding-setup-next").click(); + + const harness = page.getByTestId("global-agent-default-harness"); + await harness.click(); + await page.getByTestId("global-agent-default-harness-option-codex").click(); + await page.getByTestId("onboarding-finish").click(); + + await expect(page.getByTestId("onboarding-finish")).toHaveText("Saving…"); + await expect(page.getByTestId("onboarding-config-skip")).toBeDisabled(); + await expect(page.getByTestId("onboarding-back")).toBeDisabled(); + await expect(page.getByTestId("onboarding-page-config")).toBeVisible(); + expect(await readSavedRuntime(page)).toBeNull(); + await expect(page.getByText("Join or create a community")).toBeVisible(); expect(await readSavedRuntime(page)).toBe("codex"); }); +test("Next keeps the draft and retries after a save failure", async ({ + page, +}) => { + await installMockBridge( + page, + { + acpRuntimesCatalog: [ + runtime("claude", "available", { status: "logged_in" }), + ], + globalAgentConfig: { + env_vars: {}, + provider: null, + model: null, + preferred_runtime: null, + }, + setGlobalAgentConfigErrors: ["Disk is read-only", null], + }, + { skipCommunitySeed: true, skipOnboardingSeed: true }, + ); + await page.goto("/"); + await navigateToSetupPage(page); + await page.getByTestId("onboarding-setup-next").click(); + await expect(page.getByTestId("global-agent-default-harness")).toHaveText( + "Claude Code", + ); + + await page.getByTestId("onboarding-finish").click(); + + await expect(page.getByTestId("onboarding-page-config")).toBeVisible(); + await expect(page.getByTestId("onboarding-config-save-error")).toContainText( + "Disk is read-only", + ); + await expect(page.getByTestId("onboarding-finish")).toBeEnabled(); + expect(await readSavedRuntime(page)).toBeNull(); + expect(await readGlobalConfigSetterCallCount(page)).toBe(1); + + await page.getByTestId("onboarding-finish").click(); + await expect(page.getByText("Join or create a community")).toBeVisible(); + expect(await readSavedRuntime(page)).toBe("claude"); + expect(await readGlobalConfigSetterCallCount(page)).toBe(2); +}); + test("defaults requires a choice when multiple visible harnesses are ready", async ({ page, }) => { @@ -660,7 +863,7 @@ test("defaults requires a choice when multiple visible harnesses are ready", asy await page.getByTestId("global-agent-default-harness-option-codex").click(); await expect(harness).toHaveText("Codex"); await expect(page.getByTestId("onboarding-finish")).toBeEnabled(); - await expect.poll(() => readSavedRuntime(page)).toBe("codex"); + expect(await readSavedRuntime(page)).toBeNull(); }); /** diff --git a/desktop/tests/helpers/bridge.ts b/desktop/tests/helpers/bridge.ts index 345e1ee4d7..830a82879a 100644 --- a/desktop/tests/helpers/bridge.ts +++ b/desktop/tests/helpers/bridge.ts @@ -467,6 +467,8 @@ type MockBridgeOptions = { /** Delay (ms) for `set_global_agent_config` — hold saves open in tests. * Alias of `globalConfigSaveDelayMs` (kept for onboarding specs). */ setGlobalAgentConfigDelayMs?: number; + /** Sequenced save failures. A string rejects that call; null succeeds. */ + setGlobalAgentConfigErrors?: (string | null)[]; /** Errors returned by successive backup verification attempts. Null succeeds. */ backupVerificationErrors?: (string | null)[]; /** Public identities returned by successive successful backup verifications. */ From d4a4570b9769743899d97480b3bf482860b51d9c Mon Sep 17 00:00:00 2001 From: Wes Date: Mon, 3 Aug 2026 14:47:52 -0600 Subject: [PATCH 19/27] fix(desktop): clarify inherited agent parallelism (#4010) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Summary - show an unambiguous `App default (10)` inherited state for parallelism in create and edit forms - explain that blank inherits the app default and suppress create-form number steppers that could silently set `1` - align the E2E mint fallback with production while preserving explicit input → definition → app-default precedence ## Why The forms displayed `1` even though an untouched field is omitted and desktop minting materializes `10`. The create-form spinner could also turn blank/inherited into an explicit `1` with one click while leaving the field looking nearly unchanged. ## Testing - `pnpm test` (desktop: 3,886 passed) - `pnpm typecheck` (desktop) - `pnpm check` (desktop) - pre-push `desktop-check` and `desktop-test` --------- Signed-off-by: Wes Co-authored-by: Carl --- desktop/src-tauri/src/key_backup_tests.rs | 12 +++++++---- .../agents/lib/agentParallelism.test.mjs | 20 +++++++++++++++++++ .../features/agents/lib/agentParallelism.ts | 18 +++++++++++++++++ .../agents/ui/EditAgentAdvancedFields.tsx | 7 ++++++- .../agents/ui/PersonaAdvancedFields.tsx | 10 +++++++--- desktop/src/testing/e2eBridge.ts | 7 +++++-- 6 files changed, 64 insertions(+), 10 deletions(-) create mode 100644 desktop/src/features/agents/lib/agentParallelism.test.mjs create mode 100644 desktop/src/features/agents/lib/agentParallelism.ts diff --git a/desktop/src-tauri/src/key_backup_tests.rs b/desktop/src-tauri/src/key_backup_tests.rs index 35b486f78d..ff9367641a 100644 --- a/desktop/src-tauri/src/key_backup_tests.rs +++ b/desktop/src-tauri/src/key_backup_tests.rs @@ -250,12 +250,16 @@ fn generated_passphrase_respects_word_count_and_separator() { #[test] fn generated_passphrase_clamps_word_count() { + // Use a separator that cannot appear in the EFF wordlist so a generated + // word such as "yo-yo" cannot be mistaken for two words. + const SEPARATOR: &str = "|"; + // Below the floor: clamped up to MIN_PASSPHRASE_WORDS, never shorter. - let phrase = generate_passphrase(1, "-").unwrap(); - assert_eq!(phrase.split('-').count(), MIN_PASSPHRASE_WORDS); + let phrase = generate_passphrase(1, SEPARATOR).unwrap(); + assert_eq!(phrase.split(SEPARATOR).count(), MIN_PASSPHRASE_WORDS); // Above the ceiling: clamped down to MAX_PASSPHRASE_WORDS. - let phrase = generate_passphrase(50, "-").unwrap(); - assert_eq!(phrase.split('-').count(), MAX_PASSPHRASE_WORDS); + let phrase = generate_passphrase(50, SEPARATOR).unwrap(); + assert_eq!(phrase.split(SEPARATOR).count(), MAX_PASSPHRASE_WORDS); } #[test] diff --git a/desktop/src/features/agents/lib/agentParallelism.test.mjs b/desktop/src/features/agents/lib/agentParallelism.test.mjs new file mode 100644 index 0000000000..8d03d087e7 --- /dev/null +++ b/desktop/src/features/agents/lib/agentParallelism.test.mjs @@ -0,0 +1,20 @@ +import assert from "node:assert/strict"; +import test from "node:test"; + +import { + DEFAULT_AGENT_PARALLELISM, + resolveAgentParallelism, +} from "./agentParallelism.ts"; + +test("parallelism uses the app default only when input and definition omit it", () => { + assert.equal( + resolveAgentParallelism(undefined, undefined), + DEFAULT_AGENT_PARALLELISM, + ); + assert.equal( + resolveAgentParallelism(undefined, null), + DEFAULT_AGENT_PARALLELISM, + ); + assert.equal(resolveAgentParallelism(undefined, 4), 4); + assert.equal(resolveAgentParallelism(2, 4), 2); +}); diff --git a/desktop/src/features/agents/lib/agentParallelism.ts b/desktop/src/features/agents/lib/agentParallelism.ts new file mode 100644 index 0000000000..89544c5bb4 --- /dev/null +++ b/desktop/src/features/agents/lib/agentParallelism.ts @@ -0,0 +1,18 @@ +/** + * Desktop-managed agents materialize this value when neither the create input + * nor the linked definition sets parallelism. Keep in sync with + * `managed_agents::DEFAULT_AGENT_PARALLELISM` in the Tauri backend. + */ +export const DEFAULT_AGENT_PARALLELISM = 10; + +export const AGENT_PARALLELISM_PLACEHOLDER = `App default (${DEFAULT_AGENT_PARALLELISM})`; +export const AGENT_PARALLELISM_HELP = `Leave blank to use the app default (currently ${DEFAULT_AGENT_PARALLELISM}). Custom values may be 1–32.`; +export const EDIT_AGENT_PARALLELISM_HELP = + "Current value for this agent. Custom values may be 1–32."; + +export function resolveAgentParallelism( + input: number | undefined, + definition: number | null | undefined, +): number { + return input ?? definition ?? DEFAULT_AGENT_PARALLELISM; +} diff --git a/desktop/src/features/agents/ui/EditAgentAdvancedFields.tsx b/desktop/src/features/agents/ui/EditAgentAdvancedFields.tsx index c8e21cd6fa..972c4e287e 100644 --- a/desktop/src/features/agents/ui/EditAgentAdvancedFields.tsx +++ b/desktop/src/features/agents/ui/EditAgentAdvancedFields.tsx @@ -11,6 +11,7 @@ import { import type { AgentPersona } from "@/shared/api/types"; import { BuzzAgentModelTuningFields } from "./buzzAgentModelTuningFields"; import { isBuzzAgentRuntime } from "./buzzAgentConfig"; +import { EDIT_AGENT_PARALLELISM_HELP } from "../lib/agentParallelism"; export function EditAgentAdvancedFields({ acpCommand, @@ -173,10 +174,14 @@ export function EditAgentAdvancedFields({ id="edit-agent-parallelism" inputMode="numeric" onChange={(event) => onParallelismChange(event.target.value)} - placeholder="1" + placeholder="Current value" + type="text" value={parallelism} />
+

+ {EDIT_AGENT_PARALLELISM_HELP} +

{/* Relay URL: intentionally no editor. The legacy per-record relay pin diff --git a/desktop/src/features/agents/ui/PersonaAdvancedFields.tsx b/desktop/src/features/agents/ui/PersonaAdvancedFields.tsx index 01485dd9eb..b7d1903784 100644 --- a/desktop/src/features/agents/ui/PersonaAdvancedFields.tsx +++ b/desktop/src/features/agents/ui/PersonaAdvancedFields.tsx @@ -4,6 +4,10 @@ import { EnvVarsEditor, type EnvVarsValue } from "./EnvVarsEditor"; import { CreateAgentRespondToField } from "./RespondToField"; import type { PersonaBehaviorDraft } from "./personaBehaviorDraft"; import { isBuzzAgentRuntime } from "./buzzAgentConfig"; +import { + AGENT_PARALLELISM_HELP, + AGENT_PARALLELISM_PLACEHOLDER, +} from "../lib/agentParallelism"; import { BuzzAgentModelTuningFields } from "./buzzAgentModelTuningFields"; import { CARD_MINT_KEY_ANNOTATIONS, @@ -83,7 +87,7 @@ export function PersonaAdvancedFields({ >

- How many conversations each running instance handles at once (1–32). + {AGENT_PARALLELISM_HELP}

diff --git a/desktop/src/testing/e2eBridge.ts b/desktop/src/testing/e2eBridge.ts index 5cbfb03331..895e770f0f 100644 --- a/desktop/src/testing/e2eBridge.ts +++ b/desktop/src/testing/e2eBridge.ts @@ -12,6 +12,7 @@ import { import { relayClient } from "@/shared/api/relayClient"; import { activateRateLimit } from "@/shared/api/relayRateLimitGate"; +import { resolveAgentParallelism } from "@/features/agents/lib/agentParallelism"; import type { ConnectionState } from "@/shared/api/relayClientShared"; import type { ChannelTemplate, RelayEvent } from "@/shared/api/types"; import { getMarkdownParseCount } from "@/shared/ui/markdown/nodeCache"; @@ -8075,8 +8076,10 @@ async function handleCreateManagedAgent( args.input.respondTo !== undefined ? (args.input.respondToAllowlist ?? []) : (linkedPersona?.respond_to_allowlist ?? []); - const mintParallelism = - args.input.parallelism ?? linkedPersona?.parallelism ?? 1; + const mintParallelism = resolveAgentParallelism( + args.input.parallelism, + linkedPersona?.parallelism, + ); const personaAvatarUrl = args.input.personaId === undefined ? null From 79815978483ef0ab78f7159c0add3492da6457a1 Mon Sep 17 00:00:00 2001 From: Taylor Ho Date: Mon, 3 Aug 2026 14:09:46 -0700 Subject: [PATCH 20/27] fix(reactions): wrap long popover names (#3834) **Category:** fix **User Impact:** Long custom emoji names now stay contained inside reaction popovers and remain fully readable. **Problem:** An unbroken custom emoji name could force a reaction popover beyond its intended maximum width and overflow the message view. **Solution:** Give the reaction popover a definite 288px width and allow the complete emoji name to wrap within it without truncation or ellipsis. Short names retain the same content and interaction behavior.
File changes **desktop/src/features/messages/ui/MessageReactions.tsx** Bounds the reaction popover width and allows long names to break across lines while preserving the full shortcode. **desktop/tests/e2e/reaction-names.spec.ts** Covers fixed width, full text preservation, and wrapping for the maximum supported colon-wrapped reaction name, with deterministic seeded Picsum visual fixtures and explicit image-load waits.
## Reproduction Steps 1. Open a message with a custom emoji reaction whose name is 64 characters. 2. Hover or focus the reaction pill to open its details popover. 3. Confirm the popover remains 288px wide and the complete name wraps within it without ellipsis. 4. Open a short-name reaction and confirm its popover remains readable and unchanged in behavior. ## Screenshots | Before | After | | --- | --- | | ![Maximum-length name before](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/3834/max-length-before-picsum.png) | ![Maximum-length name after](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/3834/max-length-after-picsum.png) | **Short-name regression check** ![Short reaction name](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/3834/short-name-after-picsum.png) ## Verification - `pnpm test` in `desktop`: 3,858 passed - Focused reaction-name E2E with seeded Picsum captures: 2 passed - Desktop checks and commit hooks passed Originating Buzz channel: `f2ec9671-d78e-4cde-894c-9f4c458c7f1f` --------- Signed-off-by: Taylor Ho Co-authored-by: npub1223z34hd7vtwc6qj4s7flsxkj644nlre2nthu7lrrmkumhu3xddsrx9r6w <52a228d6edf316ec6812ac3c9fc0d696ab59fc7954d77e7be31eedcddf91335b@buzz.block.builderlab.xyz> --- .../features/messages/ui/MessageReactions.tsx | 7 +- desktop/tests/e2e/reaction-names.spec.ts | 129 +++++++++++++++++- 2 files changed, 128 insertions(+), 8 deletions(-) diff --git a/desktop/src/features/messages/ui/MessageReactions.tsx b/desktop/src/features/messages/ui/MessageReactions.tsx index 2250b3931f..cbcb873f5b 100644 --- a/desktop/src/features/messages/ui/MessageReactions.tsx +++ b/desktop/src/features/messages/ui/MessageReactions.tsx @@ -126,7 +126,10 @@ function ReactionPopoverContent({ reaction }: { reaction: TimelineReaction }) {
{userText} reacted with
-
+
{displayName}
@@ -504,7 +507,7 @@ function ReactionPill({ align="start" side="top" sideOffset={6} - className="w-auto min-w-56 max-w-72 rounded-xl p-3" + className="w-72 rounded-xl p-3" onMouseEnter={handleMouseEnter} onMouseLeave={scheduleClose} onOpenAutoFocus={(e) => e.preventDefault()} diff --git a/desktop/tests/e2e/reaction-names.spec.ts b/desktop/tests/e2e/reaction-names.spec.ts index 512b913dff..028bb1645d 100644 --- a/desktop/tests/e2e/reaction-names.spec.ts +++ b/desktop/tests/e2e/reaction-names.spec.ts @@ -1,11 +1,23 @@ import { expect, test } from "@playwright/test"; +import * as fs from "node:fs"; +import * as path from "node:path"; +import { waitForAnimations } from "../helpers/animations"; import { installMockBridge } from "../helpers/bridge"; const REACTION_TARGET_CONTENT = "React to me with a custom emoji"; const REACTION_TARGET_EVENT_ID = "d".repeat(64); const BOB_PUBKEY = "bb22a5299220cad76ffd46190ccbeede8ab5dc260faa28b6e5a2cb31b9aff260"; +const MAX_REACTION_NAME = + "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl"; +const MAX_REACTION_AVATAR_URL = + 'data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"%3E%3Crect width="16" height="16" rx="4" fill="%23e5484d"/%3E%3C/svg%3E'; +const SHORT_REACTION_AVATAR_URL = + 'data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"%3E%3Crect width="16" height="16" rx="4" fill="%2300a36c"/%3E%3C/svg%3E'; +const SCREENSHOT_DIR = + process.env.REACTION_POPOVER_SCREENSHOT_DIR ?? + "test-results/reaction-popover-screenshots"; function reactionTargetRow(page: import("@playwright/test").Page) { return page @@ -14,8 +26,45 @@ function reactionTargetRow(page: import("@playwright/test").Page) { .last(); } +async function waitForImage( + image: import("@playwright/test").Locator, +): Promise { + await expect(image).toBeVisible(); + await expect + .poll(() => + image.evaluate( + (element) => + element instanceof HTMLImageElement && + element.complete && + element.naturalWidth > 0, + ), + ) + .toBe(true); +} + +async function capturePopover( + page: import("@playwright/test").Page, + popover: import("@playwright/test").Locator, + filename: string, +): Promise { + fs.mkdirSync(SCREENSHOT_DIR, { recursive: true }); + await waitForAnimations(page); + await popover.screenshot({ + animations: "disabled", + path: path.join(SCREENSHOT_DIR, filename), + }); +} + test.beforeEach(async ({ page }) => { - await installMockBridge(page); + await installMockBridge(page, { + searchProfiles: [ + { + pubkey: BOB_PUBKEY, + displayName: "bob", + avatarUrl: SHORT_REACTION_AVATAR_URL, + }, + ], + }); }); test("reaction popover resolves a reactor with no authored message in the window", async ({ @@ -33,21 +82,89 @@ test("reaction popover resolves a reactor with no authored message in the window ); await page.evaluate( - ({ pubkey, targetId }) => { + ({ pubkey, targetId, avatarUrl }) => { window.__BUZZ_E2E_EMIT_MOCK_MESSAGE__?.({ channelName: "general", - content: "🎉", - extraTags: [["e", targetId]], + content: ":react:", + extraTags: [ + ["e", targetId], + ["emoji", "react", avatarUrl], + ], kind: 7, pubkey, }); }, - { pubkey: BOB_PUBKEY, targetId: REACTION_TARGET_EVENT_ID }, + { + avatarUrl: SHORT_REACTION_AVATAR_URL, + pubkey: BOB_PUBKEY, + targetId: REACTION_TARGET_EVENT_ID, + }, ); const row = reactionTargetRow(page); - const pill = row.getByRole("button", { name: "Toggle 🎉 reaction" }); + const pill = row.getByRole("button", { name: "Toggle :react: reaction" }); await expect(pill).toBeVisible(); await pill.hover(); await expect(page.getByText("bob reacted with")).toBeVisible(); + const popover = page + .locator("[data-radix-popper-content-wrapper]") + .filter({ hasText: "bob reacted with" }); + const avatar = popover.locator("img"); + await expect(avatar).toHaveAttribute("src", SHORT_REACTION_AVATAR_URL); + await waitForImage(avatar); + await capturePopover(page, popover, "short-name-after.png"); +}); + +test("maximum-length reaction name wraps inside a fixed-width popover", async ({ + page, +}) => { + await page.goto("/"); + await page.getByTestId("channel-general").click(); + await expect(page.getByTestId("chat-title")).toHaveText("general"); + await page.waitForFunction( + () => + window.__BUZZ_E2E_HAS_MOCK_LIVE_SUBSCRIPTION__?.({ + channelName: "general", + kind: 7, + }) === true, + ); + + const reaction = `:${MAX_REACTION_NAME}:`; + await page.evaluate( + ({ content, targetId, avatarUrl }) => { + window.__BUZZ_E2E_EMIT_MOCK_MESSAGE__?.({ + channelName: "general", + content, + extraTags: [ + ["e", targetId], + ["emoji", content.slice(1, -1), avatarUrl], + ], + kind: 7, + }); + }, + { + avatarUrl: MAX_REACTION_AVATAR_URL, + content: reaction, + targetId: REACTION_TARGET_EVENT_ID, + }, + ); + + const pill = reactionTargetRow(page).getByRole("button", { + name: `Toggle ${reaction} reaction`, + }); + await expect(pill).toBeVisible(); + await pill.focus(); + + const popover = page + .locator("[data-radix-popper-content-wrapper]") + .filter({ hasText: reaction }); + await expect(popover).toBeVisible(); + await expect(popover).toHaveCSS("width", "288px"); + const reactionName = popover.getByTestId("reaction-popover-name"); + await expect(reactionName).toHaveCSS("word-break", "break-all"); + await expect(reactionName).toHaveText(reaction); + const avatar = popover.locator("img"); + await expect(avatar).toHaveAttribute("src", MAX_REACTION_AVATAR_URL); + await waitForImage(avatar); + await capturePopover(page, popover, "max-length-after.png"); }); From 027a74a61c8643a1d1086d3e8307fad89d7735f7 Mon Sep 17 00:00:00 2001 From: klopez4212 Date: Mon, 3 Aug 2026 22:12:21 +0100 Subject: [PATCH 21/27] Polish Share Compute settings (#3735) ## Summary - Refresh Share Compute with the shared agent-style model controls. - Reveal sharing details and advanced options only while sharing. - Remove the preview-only mesh API path. ## Validation - `pnpm check` - `pnpm test` - `pnpm exec playwright test tests/e2e/mesh-compute.spec.ts` Snapshots are attached in a follow-up comment. --------- Signed-off-by: kenny lopez --- .../ui/MeshComputeSettingsCard.tsx | 511 ++++++++++-------- desktop/src/testing/e2eBridge.ts | 47 +- .../global-agent-config-screenshots.spec.ts | 1 + desktop/tests/e2e/mesh-compute.spec.ts | 63 ++- 4 files changed, 364 insertions(+), 258 deletions(-) diff --git a/desktop/src/features/mesh-compute/ui/MeshComputeSettingsCard.tsx b/desktop/src/features/mesh-compute/ui/MeshComputeSettingsCard.tsx index fd7550eff0..bf2d8e7c22 100644 --- a/desktop/src/features/mesh-compute/ui/MeshComputeSettingsCard.tsx +++ b/desktop/src/features/mesh-compute/ui/MeshComputeSettingsCard.tsx @@ -1,9 +1,19 @@ import * as React from "react"; -import { ChevronDown, Cpu } from "lucide-react"; +import { ChevronDown } from "lucide-react"; +import { AnimatePresence, motion, useReducedMotion } from "motion/react"; -import { Input } from "@/shared/ui/input"; import { Switch } from "@/shared/ui/switch"; import { cn } from "@/shared/lib/cn"; +import { + AgentConfigTextInput, + AgentDropdownSelect, + type AgentDropdownOption, +} from "@/features/agents/ui/agentConfigControls"; +import { + CUSTOM_MODEL_DROPDOWN_VALUE, + PERSONA_FIELD_CONTROL_CLASS, + PERSONA_FIELD_SHELL_CLASS, +} from "@/features/agents/ui/agentConfigOptions"; import { meshStartNode, @@ -17,10 +27,6 @@ import type { MeshModelOption, MeshNodeStatus, } from "@/shared/api/tauriMesh"; -import { - SettingsOptionGroup, - SettingsOptionRow, -} from "@/features/settings/ui/SettingsOptionGroup"; import { SettingsSectionHeader } from "@/features/settings/ui/SettingsSectionHeader"; import { classifyModelRef } from "../classifyModelRef"; import { @@ -36,6 +42,20 @@ import { deriveServingIndicator } from "../servingUsage"; const MODEL_DRAFT_STORAGE_KEY = "buzz.mesh-compute.share.model.v1"; const MAX_VRAM_DRAFT_STORAGE_KEY = "buzz.mesh-compute.share.max-vram-gb.v1"; +// Keep the Share compute controls visually and behaviorally aligned with the +// agent configuration fields. This is intentionally the same shell used by +// AgentDefaultsEditor rather than a local approximation of a select. +const MESH_SELECT_TRIGGER_CLASS = cn( + PERSONA_FIELD_CONTROL_CLASS, + PERSONA_FIELD_SHELL_CLASS, + "h-11 px-3 py-2 leading-6 hover:bg-muted/40 focus:bg-muted/40 [&>svg]:text-muted-foreground/60", +); + +const SHARE_COMPUTE_REVEAL_TRANSITION = { + duration: 0.22, + ease: [0.23, 1, 0.32, 1], +} as const; + function readDraft(key: string): string { try { return window.localStorage.getItem(key) ?? ""; @@ -64,6 +84,7 @@ function writeDraft(key: string, value: string): void { * exposing implementation protocols or raw mesh controls. */ export function MeshComputeSettingsCard() { + const shouldReduceMotion = useReducedMotion(); const { status, error, refresh } = useMeshNodeStatus(); const [installedModels, setInstalledModels] = React.useState< MeshModelOption[] @@ -75,6 +96,7 @@ export function MeshComputeSettingsCard() { const [maxVramGb, setMaxVramGb] = React.useState(() => readDraft(MAX_VRAM_DRAFT_STORAGE_KEY), ); + const [isCustomModelEditing, setIsCustomModelEditing] = React.useState(false); const [advancedOpen, setAdvancedOpen] = React.useState(false); const [actionInFlight, setActionInFlight] = React.useState(false); const [pendingAction, setPendingAction] = React.useState< @@ -163,6 +185,7 @@ export function MeshComputeSettingsCard() { const controlsDisabled = actionInFlight || (slotOccupied && !isConsuming); const refClass = classifyModelRef(modelInput); const canStart = refClass.kind !== "unknown" && !actionInFlight; + const showSharingControls = isSharing || pendingAction === "start"; async function handleToggle(next: boolean) { // Never let the Share switch tear down a consume session. The switch is @@ -204,12 +227,7 @@ export function MeshComputeSettingsCard() {
- Share this machine with your relay. When on, other members can run - their agents here. - - } + description="Share this machine with members of this relay so they can run agents here." /> {error ? ( @@ -226,8 +244,8 @@ export function MeshComputeSettingsCard() { ) : null} - - +
+
- - {servingIndicator.show ? ( -

- {servingIndicator.label} - {servingIndicator.detail ? ( - - {" "} - · {servingIndicator.detail} - - ) : null} -

+ {!isSharing ? ( + ) : null}
- +
+ + { + setModelInput(next); + writeDraft(MODEL_DRAFT_STORAGE_KEY, next); + }} + /> -
-
- ) : null} -
+ ) : null} + + ) : null} -
- setAdvancedOpen((e.target as HTMLDetailsElement).open) - } - open={advancedOpen} - > - - - Advanced - -
- - { - const next = e.target.value; - setMaxVramGb(next); - writeDraft(MAX_VRAM_DRAFT_STORAGE_KEY, next); - }} - placeholder="No limit" - value={maxVramGb} - /> - {status?.consoleUrl ? ( -

- Debug console:{" "} - - {status.consoleUrl} - -

- ) : null} -
-
- - -

- Only members of this relay can use this machine's shared compute. -

+ + {showSharingControls ? ( + +
+

Sharing

+
+ + {servingIndicator.show ? ( +

+ {servingIndicator.label} + {servingIndicator.detail ? ( + + {" "} + · {servingIndicator.detail} + + ) : null} +

+ ) : null} +
+
+ + ) : null} + +
); } @@ -465,100 +465,159 @@ const FIT_CLASS: Record = { }; /** - * Hardware-ranked curated model list (mesh-console's diagnose pattern). - * Click a row to fill the model field. Models too large for this machine are - * listed but disabled — honest about why, instead of hiding them. + * Share Compute's models use the agent configuration picker instead of a + * second, hand-rolled option system. The catalog remains hardware-aware, but + * its recommendations, installed models, and advanced choices now appear in + * the same searchable dropdown used when customizing an agent. */ -function CatalogPicker({ +function MeshModelPicker({ catalog, disabled, - onPick, - selected, + installedModels, + isCustomModelEditing, + model, + onCustomModelEditingChange, + onModelChange, }: { - catalog: MeshModelCatalog; + catalog: MeshModelCatalog | null; disabled: boolean; - onPick: (name: string) => void; - selected: string; + installedModels: readonly MeshModelOption[]; + isCustomModelEditing: boolean; + model: string; + onCustomModelEditingChange: (editing: boolean) => void; + onModelChange: (model: string) => void; }) { - const [expanded, setExpanded] = React.useState(false); - // Above the fold: the Buzz-curated picks (models known to work well with - // agents on shared compute). Below: everything else, as advanced options. - const curated = catalog.entries.filter((e) => e.curated); - const advanced = catalog.entries.filter((e) => !e.curated); - const visible = expanded ? catalog.entries : curated; + const options = React.useMemo(() => { + const seen = new Set(); + const catalogOptions = (catalog?.entries ?? []).map((entry) => { + seen.add(entry.name); + return { + disabled: entry.fit === "too_large", + label: , + value: entry.name, + }; + }); + const localOptions = installedModels.flatMap((installed) => { + if (seen.has(installed.id)) return []; + return [ + { + label: ( +
+ + {installed.name ?? installed.id} + + + Installed + +
+ ), + value: installed.id, + }, + ]; + }); + return [ + ...catalogOptions, + ...localOptions, + { label: "Custom model…", value: CUSTOM_MODEL_DROPDOWN_VALUE }, + ]; + }, [catalog?.entries, installedModels]); + const knownModel = options.some((option) => option.value === model.trim()); + const showCustomModelInput = + isCustomModelEditing || (model.trim().length > 0 && !knownModel); + const selectedValue = showCustomModelInput + ? CUSTOM_MODEL_DROPDOWN_VALUE + : model.trim(); + + function handleModelChange(next: string) { + if (next === CUSTOM_MODEL_DROPDOWN_VALUE) { + onCustomModelEditingChange(true); + return; + } + onCustomModelEditingChange(false); + onModelChange(next); + } + return ( -
+
+ + + {showCustomModelInput ? ( + { + // A stored custom ref starts out inferred rather than explicitly + // selected. Mark it as an active custom edit before applying a + // cleared value so the field stays mounted while it is replaced. + onCustomModelEditingChange(true); + onModelChange(event.target.value); + }} + placeholder="Qwen3-8B-Q4_K_M or hf://meshllm/qwen3-8b@main" + usePersonaInputStyle + value={model} + /> + ) : null}

- Recommended for this machine - {catalog.gpuName ? ` (${catalog.gpuName}, ` : " ("} - {catalog.vramDisplay} AI memory): + {catalog + ? `Recommended for this machine${catalog.gpuName ? ` (${catalog.gpuName}, ${catalog.vramDisplay} AI memory)` : ""}.` + : "Choose a model or enter a model reference or local file."}{" "} + Buzz downloads remote models when sharing starts.

-
    - {visible.map((entry) => { - const isSelected = entry.name === selected; - const tooLarge = entry.fit === "too_large"; - return ( -
  • - -
    • - ); - })} -
- {advanced.length > 0 ? ( - +
+ ); +} + +function MeshModelOptionLabel({ entry }: { entry: MeshCatalogEntry }) { + return ( +
+ {entry.name} + {entry.size} + + {FIT_LABEL[entry.fit]} + + {entry.recommended ? ( + + Recommended + + ) : null} + {entry.installed ? ( + + Installed + + ) : null} + {!entry.curated ? ( + + Advanced + ) : null}
); } function StatusLine({ + displayModel, isConsuming, + omitSharingVerb = false, pendingAction, status, }: { + displayModel?: string; isConsuming: boolean; + omitSharingVerb?: boolean; pendingAction: "start" | "stop" | null; status: MeshNodeStatus | null; }) { @@ -583,12 +642,10 @@ function StatusLine({ return

Checking status…

; } const { state, health, modelId, modelName } = status; - const modelLabel = modelName ?? modelId ?? ""; + const modelLabel = displayModel ?? modelName ?? modelId ?? ""; if (state === "off") { - return ( -

Not sharing right now.

- ); + return null; } if (state === "starting") { const reason = @@ -614,7 +671,9 @@ function StatusLine({ } return (

- Sharing{modelLabel ? ` ${modelLabel}` : ""} with relay members. + {omitSharingVerb ? "" : "Sharing"} + {modelLabel ? `${omitSharingVerb ? "" : " "}${modelLabel}` : ""} with + relay members.

); } diff --git a/desktop/src/testing/e2eBridge.ts b/desktop/src/testing/e2eBridge.ts index 895e770f0f..6520dd760d 100644 --- a/desktop/src/testing/e2eBridge.ts +++ b/desktop/src/testing/e2eBridge.ts @@ -2950,6 +2950,7 @@ const ZERO_SERVING_USAGE: MockServingUsage = { const mockMeshState: { admitted: boolean; models: Array<{ id: string; name: string | null }>; + activeModel: { id: string; name: string | null } | null; denyReason: string; nodeState: "off" | "running"; nodeMode: "serve" | "client" | null; @@ -2957,6 +2958,7 @@ const mockMeshState: { } = { admitted: true, models: [{ id: "Gemma-4-E4B-it-Q4_K_M", name: "Gemma 4 E4B" }], + activeModel: null, denyReason: "not a relay member", nodeState: "off", nodeMode: null, @@ -2966,6 +2968,7 @@ const mockMeshState: { function resetMockMesh() { mockMeshState.admitted = true; mockMeshState.models = [{ id: "Gemma-4-E4B-it-Q4_K_M", name: "Gemma 4 E4B" }]; + mockMeshState.activeModel = null; mockMeshState.denyReason = "not a relay member"; mockMeshState.nodeState = "off"; mockMeshState.nodeMode = null; @@ -9908,22 +9911,32 @@ export function maybeInstallE2eTauriMocks() { window.__BUZZ_E2E_SEED_OBSERVER_EVENTS__ = ({ agentPubkey, events }) => { injectObserverEventsForE2E(agentPubkey, events); }; + const meshModelName = (modelId: string) => { + const basename = modelId.split("/").at(-1) ?? modelId; + return basename + .replace(/-(?:Instruct|GGUF)(?:-|:|$).*/, "") + .replace(/:.*/, "") + .replaceAll("-", " "); + }; const meshNodeStatus = ( state: "off" | "running", mode: "serve" | "client" | null, - ) => ({ - state, - mode, - health: { status: "ok" as const, reason: null }, - apiBaseUrl: state === "running" ? "http://127.0.0.1:9337/v1" : null, - consoleUrl: null, - modelId: mockMeshState.models[0]?.id ?? null, - modelName: mockMeshState.models[0]?.name ?? null, - inviteToken: state === "running" ? "mock-endpoint-addr" : null, - endpointId: state === "running" ? "mock-endpoint-id" : null, - deviceId: state === "running" ? "mock-endpoint-id" : null, - deviceName: state === "running" ? "Mock desktop" : null, - }); + ) => { + const model = mockMeshState.activeModel ?? mockMeshState.models[0] ?? null; + return { + state, + mode, + health: { status: "ok" as const, reason: null }, + apiBaseUrl: state === "running" ? "http://127.0.0.1:9337/v1" : null, + consoleUrl: null, + modelId: model?.id ?? null, + modelName: model?.name ?? null, + inviteToken: state === "running" ? "mock-endpoint-addr" : null, + endpointId: state === "running" ? "mock-endpoint-id" : null, + deviceId: state === "running" ? "mock-endpoint-id" : null, + deviceName: state === "running" ? "Mock desktop" : null, + }; + }; let mockImportedVoices: Array<{ key: string; displayName: string; @@ -10300,10 +10313,15 @@ export function maybeInstallE2eTauriMocks() { return mockMeshState.servingUsage; case "mesh_start_node": { const req = ( - payload as { request?: { mode?: "serve" | "client" } } | null + payload as { + request?: { mode?: "serve" | "client"; modelId?: string }; + } | null )?.request; mockMeshState.nodeState = "running"; mockMeshState.nodeMode = req?.mode ?? "serve"; + mockMeshState.activeModel = req?.modelId + ? { id: req.modelId, name: meshModelName(req.modelId) } + : (mockMeshState.models[0] ?? null); return meshNodeStatus(mockMeshState.nodeState, mockMeshState.nodeMode); } case "mesh_stop_node": @@ -10317,6 +10335,7 @@ export function maybeInstallE2eTauriMocks() { } mockMeshState.nodeState = "off"; mockMeshState.nodeMode = null; + mockMeshState.activeModel = null; return meshNodeStatus("off", null); case "get_identity": { const isLost = diff --git a/desktop/tests/e2e/global-agent-config-screenshots.spec.ts b/desktop/tests/e2e/global-agent-config-screenshots.spec.ts index 4c72b72f75..451989fb7f 100644 --- a/desktop/tests/e2e/global-agent-config-screenshots.spec.ts +++ b/desktop/tests/e2e/global-agent-config-screenshots.spec.ts @@ -226,6 +226,7 @@ test.describe("global agent config screenshots", () => { await page .getByTestId("global-agent-default-harness-option-claude") .click(); + await waitForAnimations(page); await expect(page.getByTestId("global-agent-model")).toHaveText( /Default model/, ); diff --git a/desktop/tests/e2e/mesh-compute.spec.ts b/desktop/tests/e2e/mesh-compute.spec.ts index b2e8fc28a9..c55b9db5d9 100644 --- a/desktop/tests/e2e/mesh-compute.spec.ts +++ b/desktop/tests/e2e/mesh-compute.spec.ts @@ -15,9 +15,8 @@ type E2eWindow = Window & { }) => void; }; -test("Share compute selects the curated default and starts and stops sharing", async ({ - page, -}) => { +test("Share compute chooses a model before sharing", async ({ page }) => { + const modelRef = "hf://demo/SmolLM2-135M-Instruct-GGUF:Q4_K_M"; await installMockBridge(page); await page.goto("/"); await openSettings(page, "compute"); @@ -26,19 +25,34 @@ test("Share compute selects the curated default and starts and stops sharing", a const toggle = page.getByTestId("mesh-share-compute-toggle"); const model = page.getByTestId("mesh-share-compute-model"); - await expect(card).toContainText("Not sharing right now"); - await expect(card).toContainText( - "Choose a suggested model below, or enter a model reference or local file", - ); - await expect(model).toHaveValue("Gemma-4-E4B-it-Q4_K_M"); + await expect(card).not.toContainText("Not sharing right now"); + await expect( + page.getByTestId("mesh-share-compute-options-motion"), + ).toHaveCount(0); + await expect( + page.getByTestId("mesh-share-compute-sharing-status"), + ).toHaveCount(0); + await expect(model).toBeVisible(); await expect(toggle).toBeEnabled(); + await model.click(); + await page.getByRole("option", { name: "Custom model…" }).click(); + await page.getByLabel("Custom model reference").fill(modelRef); + + await toggle.click(); + await expect( + page.getByTestId("mesh-share-compute-options-motion"), + ).toBeVisible(); + await expect( + page.getByTestId("mesh-share-compute-sharing-status"), + ).toBeVisible(); + await expect(model).toBeVisible(); await expect(card).toContainText( "Buzz downloads remote models when sharing starts", ); - - await toggle.click(); await expect(toggle).toBeChecked(); - await expect(card).toContainText("Sharing Gemma 4 E4B with relay members"); + await expect( + page.getByTestId("mesh-share-compute-sharing-status"), + ).toContainText("SmolLM2 135M with relay members"); await expect .poll(() => page.evaluate(() => (window as E2eWindow).__BUZZ_E2E_COMMANDS__ ?? []), @@ -53,13 +67,20 @@ test("Share compute selects the curated default and starts and stops sharing", a .toContainEqual({ command: "mesh_start_node", payload: { - request: { mode: "serve", modelId: "Gemma-4-E4B-it-Q4_K_M" }, + request: { mode: "serve", modelId: modelRef }, }, }); await toggle.click(); await expect(toggle).not.toBeChecked(); - await expect(card).toContainText("Not sharing right now"); + await expect(card).not.toContainText("Not sharing right now"); + await expect( + page.getByTestId("mesh-share-compute-options-motion"), + ).toHaveCount(0); + await expect( + page.getByTestId("mesh-share-compute-sharing-status"), + ).toHaveCount(0); + await expect(model).toBeVisible(); await expect .poll(() => page.evaluate(() => (window as E2eWindow).__BUZZ_E2E_COMMANDS__ ?? []), @@ -97,16 +118,20 @@ test("a consuming client can switch to sharing its saved local model", async ({ const card = page.getByTestId("settings-mesh-share-compute"); const toggle = page.getByTestId("mesh-share-compute-toggle"); - const model = page.getByTestId("mesh-share-compute-model"); - await expect(card).toContainText( "This machine is currently using another member's shared compute", ); await expect(card).toContainText("Buzz may briefly restart"); await expect(toggle).not.toBeChecked(); - await expect(model).toBeEnabled(); - await expect(model).toHaveValue(localModel); + await expect( + page.getByTestId("mesh-share-compute-options-motion"), + ).toHaveCount(0); await expect(toggle).toBeEnabled(); + const customModel = page.getByLabel("Custom model reference"); + await expect(customModel).toHaveValue(localModel); + await customModel.fill(""); + await expect(customModel).toBeVisible(); + await customModel.fill("hf://demo/replacement-model:Q4_K_M"); await toggle.click(); await expect(toggle).toBeChecked(); @@ -117,6 +142,8 @@ test("a consuming client can switch to sharing its saved local model", async ({ expect(commands.names).not.toContain("mesh_stop_node"); expect(commands.payloads).toContainEqual({ command: "mesh_start_node", - payload: { request: { mode: "serve", modelId: localModel } }, + payload: { + request: { mode: "serve", modelId: "hf://demo/replacement-model:Q4_K_M" }, + }, }); }); From 985cdcc6eac33ccd77bc50c26e22c701d07eda4e Mon Sep 17 00:00:00 2001 From: Will Pfleger Date: Mon, 3 Aug 2026 18:09:24 -0400 Subject: [PATCH 22/27] feat(agents): model-tuning parity in global Agent Defaults editor (#4578) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Overview The global Agent Defaults surface (Settings card, defaults modal, onboarding) exposed structured controls for Effort but left Max Output Tokens, Context Limit, and Max Rounds as raw env vars. Per-agent dialogs had structured numeric fields but only for `isBuzzAgentRuntime` — incorrectly excluding Goose. This PR unifies numeric-tuning capability across all surfaces, fixes a pre-existing dual-editor defect, and adds full test coverage. ## What changed ### Phase 1 — Catalog projection - Add `max_rounds_env_var` to `KnownAcpRuntime` in `runtime_metadata.rs` (`Some("BUZZ_AGENT_MAX_ROUNDS")` for buzz-agent, `None` elsewhere). - Project all three numeric env-var fields (`max_tokens_env_var`, `context_limit_env_var`, `max_rounds_env_var`) end-to-end: `AcpRuntimeCatalogEntry` Rust struct, TS `types.ts`, `RawAcpRuntimeCatalogEntry` + `fromRawAcpRuntimeCatalogEntry` in `tauri.ts`, and the e2e mock bridge (`withMockRuntimeConfigMetadata`). ### Phase 2 — Field model - `deriveAgentConfigFieldModel` now derives `maxOutputTokens` / `contextLimit` / `maxRounds` descriptors from catalog-projected fields. - `structuredEnvKeys(descriptors)` — exported helper that takes the **rendered** descriptor set (not the whole model). Hidden keys follow what is actually rendered per surface: global hides effort + all three numeric keys for buzz-agent / two for Goose; per-agent buzz-agent hides effort + three numeric keys; per-agent Goose hides only its two numeric keys. `BUZZ_AGENT_THINKING_EFFORT` stays a visible generic env row per-agent because no effort control renders there. ### Phase 3 — UI - Extract `NumericTuningFields` from `buzzAgentModelTuningFields.tsx` as a shared descriptor-driven component (`descriptors`, `envVars`, `inheritedEnvVars`, `onEnvVarChange`). Kind-specific minima: `NUMERIC_KIND_MIN` map (`maxOutputTokens`/`contextLimit`: 1, `maxRounds`: 0) applied to ``. - **Global surface** (`AgentConfigFields.tsx`): deduplicate the previously duplicated Advanced env-editor block; render `NumericTuningFields` below the env editor when descriptors exist; `hiddenKeys` and `bakedGenericRows` exclusions use `structuredEnvKeys` so structured keys are never double-rendered. Under 1000 lines. - **Per-agent surfaces** (`EditAgentAdvancedFields`, `PersonaAdvancedFields`): replace `isBuzzAgentRuntime` as the numeric-field gate with `deriveNumericDescriptors(selectedRuntime)` from `agentConfigCore`; hidden keys come from `structuredEnvKeys(numericDescriptors)` — the same rendered descriptor set, no local rebuilding (fixes pre-existing dual-editor defect). Catalog status carried as `RuntimeCatalogStatus` (`loading | ready | error`); both error and loading withhold structured controls and leave saved values visible as generic rows, making error distinguishable from "runtime not capable" (`ready` + no runtime). - **Dialogs** (`AgentDefinitionDialog`, `AgentInstanceEditDialog`, callers): `AgentDefinitionDialog` accepts `runtimeCatalogStatus?: "loading" | "ready" | "error"` (replaces separate `runtimesLoading`/`runtimesError` booleans); all call sites — `AgentManagementDialogs`, `AgentsView`, `RequestedAgentCreateDialogs`, `UserProfilePersonaDialogs` — compute and pass the status. ### Phase 4 — Tests - `buildRecord` exported from `EnvVarsEditor.tsx` as a pure `(nextRows, value, requiredKeys, hiddenKeys) => Record` helper for isolation testing. - **17 new node tests** in `agentConfigCore.test.mjs`: `deriveNumericDescriptors` (all three fields, partial, undefined runtime, matches field-model subset); `structuredEnvKeys` per surface including discriminating Goose per-agent effort-key invariant; `NUMERIC_KIND_MIN` values. - **4 new node tests** in `EnvVarsEditor.test.mjs`: hidden tuning key preserved through generic row edits; runtime-switch then generic edit (derives both descriptor sets, asserts new-runtime hidden key survives `buildRecord` via `hiddenKeys` and old-runtime key survives via generic rows); baked numeric key excluded via `filterBakedGenericRows` with `numericTuningPlaceholder` assertion; clearing a structured override — `numericTuningPlaceholder` verifies placeholder text. - **5 new Playwright tests** in `agent-numeric-tuning.spec.ts` (added to smoke project `testMatch`): global numeric fields visible for buzz-agent; global: non-capable runtime hides numeric controls; Goose per-agent shows `Inherit (16384)` after saving global value through the UI; delayed catalog: saved values visible as generic rows while loading then structured controls appear after settle; failed catalog: saved values remain visible as generic rows (never the "unsupported" empty state). ## Result - buzz-agent global defaults: Max output tokens, Context limit, Max rounds as structured inputs with `Inherit (N)` placeholders from baked env. - Goose global defaults: Max output tokens, Context limit as structured inputs. - A Goose global value surfaces as `Inherit ()` in the per-agent Goose edit dialog. - No structured key is editable in two places on any surface; no persisted key has zero editors. - No `runtime.id === "buzz-agent"` comparison decides numeric-field visibility anywhere — capability flows catalog → `AcpRuntimeCatalogEntry` → field model → UI. Signed-off-by: Will Pfleger Co-authored-by: npub1mn7jgtj4w2pd0g0zeuhxsa6jy6p0rewxz4kujt98my82ahfmp72sxjexk7 --- desktop/playwright.config.ts | 1 + .../src-tauri/src/commands/agent_config.rs | 3 +- .../src/commands/agent_config_tests.rs | 1 + .../src-tauri/src/commands/agent_discovery.rs | 27 +- .../config_bridge/reader_tests.rs | 2 + .../src-tauri/src/managed_agents/discovery.rs | 39 +- .../src/managed_agents/discovery/presets.rs | 3 + .../discovery/runtime_metadata.rs | 2 + .../src-tauri/src/managed_agents/readiness.rs | 12 +- desktop/src-tauri/src/managed_agents/types.rs | 12 +- .../agents/lib/agentConfigCore.test.mjs | 411 +++++++++++++++++- .../features/agents/lib/agentConfigCore.ts | 157 +++++++ .../features/agents/ui/AgentConfigFields.tsx | 126 +++--- .../agents/ui/AgentDefinitionDialog.tsx | 13 +- .../src/features/agents/ui/AgentDialog.tsx | 8 +- .../agents/ui/AgentInstanceEditDialog.tsx | 38 +- .../agents/ui/AgentManagementDialogs.tsx | 4 +- desktop/src/features/agents/ui/AgentsView.tsx | 16 +- .../agents/ui/EditAgentAdvancedFields.tsx | 85 +++- .../features/agents/ui/EnvVarsEditor.test.mjs | 308 +++++++++++++ .../src/features/agents/ui/EnvVarsEditor.tsx | 39 +- .../agents/ui/PersonaAdvancedFields.tsx | 79 +++- .../agents/ui/RequestedAgentCreateDialogs.tsx | 8 +- .../agents/ui/buzzAgentModelTuningFields.tsx | 196 ++++----- .../src/features/agents/useAgentManagement.ts | 6 +- .../features/profile/ui/UserProfilePanel.tsx | 1 + .../profile/ui/UserProfilePersonaDialogs.tsx | 9 +- desktop/src/shared/api/tauri.ts | 26 +- desktop/src/shared/api/types.ts | 10 +- desktop/src/testing/e2eBridge.ts | 56 ++- .../tests/e2e/agent-numeric-tuning.spec.ts | 372 ++++++++++++++++ desktop/tests/helpers/bridge.ts | 21 +- 32 files changed, 1769 insertions(+), 322 deletions(-) create mode 100644 desktop/tests/e2e/agent-numeric-tuning.spec.ts diff --git a/desktop/playwright.config.ts b/desktop/playwright.config.ts index 796fdede1e..f5c1e34a52 100644 --- a/desktop/playwright.config.ts +++ b/desktop/playwright.config.ts @@ -136,6 +136,7 @@ export default defineConfig({ "**/inline-custom-harness.spec.ts", "**/where-to-run-config.spec.ts", "**/huddle-transcription.spec.ts", + "**/agent-numeric-tuning.spec.ts", ], use: { ...devices["Desktop Chrome"], diff --git a/desktop/src-tauri/src/commands/agent_config.rs b/desktop/src-tauri/src/commands/agent_config.rs index 7aded79599..12e6983eea 100644 --- a/desktop/src-tauri/src/commands/agent_config.rs +++ b/desktop/src-tauri/src/commands/agent_config.rs @@ -31,8 +31,7 @@ pub struct RuntimeFileConfigSubset { pub provider: Option, /// Model set in the harness config file, if any. pub model: Option, - /// Flat credential env keys found in the harness config file's `extra` map - /// (e.g. `DATABRICKS_HOST`). Only non-empty values are included. + /// Flat credential env keys in the harness config file's `extra` map (e.g. `DATABRICKS_HOST`); only non-empty values included. pub satisfied_env_keys: Vec, } diff --git a/desktop/src-tauri/src/commands/agent_config_tests.rs b/desktop/src-tauri/src/commands/agent_config_tests.rs index f3667cff45..5519153578 100644 --- a/desktop/src-tauri/src/commands/agent_config_tests.rs +++ b/desktop/src-tauri/src/commands/agent_config_tests.rs @@ -57,6 +57,7 @@ fn goose_runtime() -> &'static KnownAcpRuntime { thinking_env_var: Some("GOOSE_THINKING_EFFORT"), max_tokens_env_var: Some("GOOSE_MAX_TOKENS"), context_limit_env_var: Some("GOOSE_CONTEXT_LIMIT"), + max_rounds_env_var: None, required_normalized_fields: &["model", "provider"], login_hint: None, auth_probe_args: None, diff --git a/desktop/src-tauri/src/commands/agent_discovery.rs b/desktop/src-tauri/src/commands/agent_discovery.rs index 4abf53ee91..0eb024a86a 100644 --- a/desktop/src-tauri/src/commands/agent_discovery.rs +++ b/desktop/src-tauri/src/commands/agent_discovery.rs @@ -21,25 +21,13 @@ fn active_installs() -> &'static std::sync::Mutex( runtime_id: &str, adapter_path: Option<&std::path::Path>, @@ -177,6 +165,9 @@ pub async fn save_custom_harness( model_env_var: None, provider_env_var: None, thinking_env_var: None, + max_tokens_env_var: None, + context_limit_env_var: None, + max_rounds_env_var: None, install_hint: definition.install_hint, install_instructions_url: definition.install_instructions_url, can_auto_install: false, diff --git a/desktop/src-tauri/src/managed_agents/config_bridge/reader_tests.rs b/desktop/src-tauri/src/managed_agents/config_bridge/reader_tests.rs index 153db1bbd8..62caffeb2e 100644 --- a/desktop/src-tauri/src/managed_agents/config_bridge/reader_tests.rs +++ b/desktop/src-tauri/src/managed_agents/config_bridge/reader_tests.rs @@ -56,6 +56,7 @@ fn test_runtime() -> &'static KnownAcpRuntime { thinking_env_var: Some("GOOSE_THINKING_EFFORT"), max_tokens_env_var: Some("GOOSE_MAX_TOKENS"), context_limit_env_var: Some("GOOSE_CONTEXT_LIMIT"), + max_rounds_env_var: None, required_normalized_fields: &["model", "provider"], login_hint: None, auth_probe_args: None, @@ -644,6 +645,7 @@ fn buzz_agent_runtime() -> &'static KnownAcpRuntime { thinking_env_var: Some("BUZZ_AGENT_THINKING_EFFORT"), max_tokens_env_var: Some("BUZZ_AGENT_MAX_OUTPUT_TOKENS"), context_limit_env_var: Some("BUZZ_AGENT_MAX_CONTEXT_TOKENS"), + max_rounds_env_var: Some("BUZZ_AGENT_MAX_ROUNDS"), required_normalized_fields: &["model", "provider"], login_hint: None, auth_probe_args: None, diff --git a/desktop/src-tauri/src/managed_agents/discovery.rs b/desktop/src-tauri/src/managed_agents/discovery.rs index 248625ce93..2cccccb95e 100644 --- a/desktop/src-tauri/src/managed_agents/discovery.rs +++ b/desktop/src-tauri/src/managed_agents/discovery.rs @@ -103,6 +103,7 @@ const KNOWN_ACP_RUNTIMES: &[KnownAcpRuntime] = &[ thinking_env_var: Some("GOOSE_THINKING_EFFORT"), max_tokens_env_var: Some("GOOSE_MAX_TOKENS"), context_limit_env_var: Some("GOOSE_CONTEXT_LIMIT"), + max_rounds_env_var: None, required_normalized_fields: &["model", "provider"], login_hint: None, auth_probe_args: None, @@ -135,6 +136,7 @@ const KNOWN_ACP_RUNTIMES: &[KnownAcpRuntime] = &[ thinking_env_var: None, max_tokens_env_var: None, context_limit_env_var: None, + max_rounds_env_var: None, required_normalized_fields: &[], login_hint: Some("Run the Claude CLI to complete authentication."), auth_probe_args: Some(&["claude", "auth", "status"]), @@ -167,6 +169,7 @@ const KNOWN_ACP_RUNTIMES: &[KnownAcpRuntime] = &[ thinking_env_var: None, max_tokens_env_var: None, context_limit_env_var: None, + max_rounds_env_var: None, required_normalized_fields: &[], login_hint: Some("Run `codex login` to authenticate."), // Verified: `codex login status` exits 0 when logged in, non-zero otherwise. @@ -200,6 +203,7 @@ const KNOWN_ACP_RUNTIMES: &[KnownAcpRuntime] = &[ thinking_env_var: Some("BUZZ_AGENT_THINKING_EFFORT"), max_tokens_env_var: Some("BUZZ_AGENT_MAX_OUTPUT_TOKENS"), context_limit_env_var: Some("BUZZ_AGENT_MAX_CONTEXT_TOKENS"), + max_rounds_env_var: Some("BUZZ_AGENT_MAX_ROUNDS"), required_normalized_fields: &["model", "provider"], login_hint: None, auth_probe_args: None, @@ -278,11 +282,8 @@ pub(crate) fn known_acp_runtime_exact(id: &str) -> Option<&'static KnownAcpRunti /// The agent command a freshly-created agent defaults to when the create /// request supplies none. Resolves the bundled `buzz-agent` from the catalog so /// the default cannot drift from the provider definition. Falls back to the id -/// if the catalog entry is missing. -/// -/// The previous default was the bare global `goose`, which is not on PATH on a -/// stock Windows install: every worker failed with `program not found`. The -/// bundled `buzz-agent` ships with the app and resolves on every platform. +/// if the catalog entry is missing. (Previous default was bare `goose`, which +/// is not on PATH on a stock Windows install; buzz-agent ships with the app.) pub fn default_agent_command() -> String { known_acp_runtime_exact("buzz-agent") .and_then(|p| p.commands.first().copied()) @@ -375,10 +376,8 @@ pub use overrides::{apply_agent_command_update, create_time_agent_command_overri /// Prefix of the typed dangling-harness error produced by /// `try_record_agent_command` / `resolve_effective_harness_descriptor`. -/// -/// This sentinel is an internal Rust contract: user-facing surfaces must -/// convert it to a sentence via [`user_facing_harness_error`] (spawn) or to -/// the missing id via [`dangling_harness_id`] (summary) — never show it raw. +/// Internal Rust contract: surfaces must convert it via [`user_facing_harness_error`] or +/// [`dangling_harness_id`] — never show it raw. pub(crate) const DANGLING_HARNESS_PREFIX: &str = "DANGLING_HARNESS_ID:"; /// Extract the missing harness id from a `DANGLING_HARNESS_ID:` error. @@ -398,22 +397,16 @@ pub(crate) fn user_facing_harness_error(error: &str) -> String { } } -/// Summary-row display for a dangling harness id: shows the *missing* id so -/// the agent list tells the same story as spawn (which refuses with the -/// sentence above), rather than silently falling back to the default command -/// as if the agent were healthy. +/// Summary-row display for a dangling harness id: shows the *missing* id so the agent list +/// tells the same story as spawn rather than silently falling back to the default command. pub(crate) fn dangling_harness_display(id: &str) -> String { format!("harness (deleted): {id}") } /// Spawn-time variant of `record_agent_command` that returns a typed error when -/// a record's `runtime` id or its persona's `runtime` id is set but cannot be -/// resolved (i.e. the definition was deleted after the agent was created). -/// -/// Returns `Err("DANGLING_HARNESS_ID:")` so callers can surface the error -/// without falling through to `buzz-agent`. When there is no runtime id at all -/// the fallback to `default_agent_command()` is intentional (legacy agents -/// pre-date the unified harness model). +/// a record's `runtime` id or persona's `runtime` id is set but unresolvable +/// (definition deleted after agent was created). Returns `Err("DANGLING_HARNESS_ID:")`. +/// When there is no runtime id at all, falls through to `default_agent_command()` intentionally. pub fn try_record_agent_command( record: &crate::managed_agents::types::ManagedAgentRecord, personas: &[crate::managed_agents::types::AgentDefinition], @@ -1413,6 +1406,9 @@ fn discover_acp_runtime_phase1(runtime: &'static KnownAcpRuntime) -> PartialEntr model_env_var: runtime.model_env_var.map(str::to_string), provider_env_var: runtime.provider_env_var.map(str::to_string), thinking_env_var: runtime.thinking_env_var.map(str::to_string), + max_tokens_env_var: runtime.max_tokens_env_var.map(str::to_string), + context_limit_env_var: runtime.context_limit_env_var.map(str::to_string), + max_rounds_env_var: runtime.max_rounds_env_var.map(str::to_string), install_hint, install_instructions_url: install_instructions_url.to_string(), can_auto_install, @@ -1571,6 +1567,9 @@ pub fn discover_acp_runtimes_from( model_env_var: None, provider_env_var: None, thinking_env_var: None, + max_tokens_env_var: None, + context_limit_env_var: None, + max_rounds_env_var: None, install_hint: def.install_hint.clone(), install_instructions_url: def.install_instructions_url.clone(), // Security line: custom definitions carry no install scripts. diff --git a/desktop/src-tauri/src/managed_agents/discovery/presets.rs b/desktop/src-tauri/src/managed_agents/discovery/presets.rs index 3622b21c4a..bcc4288005 100644 --- a/desktop/src-tauri/src/managed_agents/discovery/presets.rs +++ b/desktop/src-tauri/src/managed_agents/discovery/presets.rs @@ -67,6 +67,9 @@ pub(super) fn preset_catalog_entry( model_env_var: None, provider_env_var: None, thinking_env_var: None, + max_tokens_env_var: None, + context_limit_env_var: None, + max_rounds_env_var: None, install_hint: def.install_hint.to_string(), install_instructions_url: def.install_instructions_url.to_string(), can_auto_install: false, diff --git a/desktop/src-tauri/src/managed_agents/discovery/runtime_metadata.rs b/desktop/src-tauri/src/managed_agents/discovery/runtime_metadata.rs index fdfe9b8be7..34edecdcd9 100644 --- a/desktop/src-tauri/src/managed_agents/discovery/runtime_metadata.rs +++ b/desktop/src-tauri/src/managed_agents/discovery/runtime_metadata.rs @@ -52,6 +52,8 @@ pub(crate) struct KnownAcpRuntime { pub max_tokens_env_var: Option<&'static str>, /// Env var for normalizing `context_limit`. `None` when not applicable. pub context_limit_env_var: Option<&'static str>, + /// Env var for normalizing `max_rounds`. `None` when not applicable. + pub max_rounds_env_var: Option<&'static str>, /// Normalized field keys that must be set for this harness to function. /// Used by the config bridge to mark fields as required in the UI. /// Keys match the camelCase names used in `NormalizedConfig` (e.g. "model", "provider"). diff --git a/desktop/src-tauri/src/managed_agents/readiness.rs b/desktop/src-tauri/src/managed_agents/readiness.rs index fa8eb36fa1..26902ae8de 100644 --- a/desktop/src-tauri/src/managed_agents/readiness.rs +++ b/desktop/src-tauri/src/managed_agents/readiness.rs @@ -1051,19 +1051,16 @@ mod tests { thinking_env_var: None, max_tokens_env_var: None, context_limit_env_var: None, + max_rounds_env_var: None, required_normalized_fields: &[], login_hint: None, auth_probe_args: None, } } - /// Returns the absolute path of the currently-running test binary as a - /// `&'static str`. Host-portable stand-in for a "present" binary: - /// the path is absolute so `find_command` resolves it via `path.exists()` - /// rather than searching `PATH`, and the file always exists on the host. - /// - /// The tiny allocation is intentionally leaked — this runs at most once per - /// test process and the process exits immediately after tests complete. + /// Returns the absolute path of the currently-running test binary as a `&'static str`. + /// Host-portable stand-in for a "present" binary: absolute path so `find_command` resolves + /// it via `path.exists()`. Leaked allocation is intentional — process exits after tests. fn present_binary_str() -> &'static str { let path = std::env::current_exe().expect("current_exe must be available in tests"); Box::leak(path.to_string_lossy().into_owned().into_boxed_str()) @@ -1246,6 +1243,7 @@ mod tests { thinking_env_var: None, max_tokens_env_var: None, context_limit_env_var: None, + max_rounds_env_var: None, required_normalized_fields: &[], login_hint: None, auth_probe_args: None, diff --git a/desktop/src-tauri/src/managed_agents/types.rs b/desktop/src-tauri/src/managed_agents/types.rs index fcd8b13fc9..255c1aae32 100644 --- a/desktop/src-tauri/src/managed_agents/types.rs +++ b/desktop/src-tauri/src/managed_agents/types.rs @@ -594,10 +594,8 @@ pub enum AcpAvailabilityStatus { NotInstalled, } -/// Authentication/login status for a CLI-based ACP runtime. -/// -/// Serializes as a tagged union `{ status: "...", diagnostic?: "..." }` so -/// the TypeScript side can exhaustively switch on `status`. +/// Authentication/login status for a CLI-based ACP runtime. Serializes as a tagged union +/// `{ status: "...", diagnostic?: "..." }` so the TypeScript side can exhaustively switch on `status`. #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] #[serde(rename_all = "snake_case", tag = "status")] pub enum AuthStatus { @@ -616,8 +614,7 @@ pub enum AuthStatus { Unknown, } -/// Origin of an ACP runtime catalog entry. Serializes as a lowercase string -/// so the TypeScript consumer can switch on it without numeric comparisons. +/// Origin of an ACP runtime catalog entry. Serializes as a lowercase string so the TypeScript consumer can switch on it without numeric comparisons. #[derive(Debug, Clone, Serialize, PartialEq, Eq)] #[serde(rename_all = "snake_case")] pub enum HarnessSource { @@ -645,6 +642,9 @@ pub struct AcpRuntimeCatalogEntry { pub provider_env_var: Option, /// Environment variable used to apply thinking effort, when supported. pub thinking_env_var: Option, + pub max_tokens_env_var: Option, + pub context_limit_env_var: Option, + pub max_rounds_env_var: Option, pub install_hint: String, pub install_instructions_url: String, /// true when at least one automated install step is available diff --git a/desktop/src/features/agents/lib/agentConfigCore.test.mjs b/desktop/src/features/agents/lib/agentConfigCore.test.mjs index 62d8a61a6f..92159ff275 100644 --- a/desktop/src/features/agents/lib/agentConfigCore.test.mjs +++ b/desktop/src/features/agents/lib/agentConfigCore.test.mjs @@ -1,7 +1,12 @@ import assert from "node:assert/strict"; import test from "node:test"; -import { deriveAgentConfigFieldModel } from "./agentConfigCore.ts"; +import { + deriveAgentConfigFieldModel, + deriveNumericDescriptors, + structuredEnvKeys, +} from "./agentConfigCore.ts"; +import { NUMERIC_KIND_MIN } from "../ui/buzzAgentModelTuningFields.tsx"; const config = { env_vars: { BUZZ_AGENT_THINKING_EFFORT: "high" }, @@ -23,6 +28,9 @@ function runtime(id, metadata = {}) { modelEnvVar: null, providerEnvVar: null, thinkingEnvVar: null, + maxTokensEnvVar: null, + contextLimitEnvVar: null, + maxRoundsEnvVar: null, installHint: "", installInstructionsUrl: "", canAutoInstall: false, @@ -152,3 +160,404 @@ test("catalog mismatch cleanup is named and restricted to onboarding", () => { onCatalogMismatch: "explainOnly", }); }); + +// ── Numeric descriptor derivation per runtime ───────────────────────────── +// +// The catalog-projected fields (maxTokensEnvVar, contextLimitEnvVar, +// maxRoundsEnvVar) determine which numeric descriptors appear in the field +// model. Capability facts flow catalog → descriptor → UI; no runtime-ID +// comparison decides numeric-field visibility. + +test("buzz-agent derives three numeric descriptors from catalog fields", () => { + const model = deriveAgentConfigFieldModel({ + config, + runtime: runtime("buzz-agent", { + modelEnvVar: "BUZZ_AGENT_MODEL", + providerEnvVar: "BUZZ_AGENT_PROVIDER", + thinkingEnvVar: "BUZZ_AGENT_THINKING_EFFORT", + maxTokensEnvVar: "BUZZ_AGENT_MAX_OUTPUT_TOKENS", + contextLimitEnvVar: "BUZZ_AGENT_MAX_CONTEXT_TOKENS", + maxRoundsEnvVar: "BUZZ_AGENT_MAX_ROUNDS", + }), + scope: "global", + }); + + const numericKinds = model.fields + .filter((f) => + ["maxOutputTokens", "contextLimit", "maxRounds"].includes(f.kind), + ) + .map((f) => f.kind); + assert.deepEqual(numericKinds, [ + "maxOutputTokens", + "contextLimit", + "maxRounds", + ]); + + const maxOutput = field(model, "maxOutputTokens"); + assert.equal(maxOutput.render, "control"); + assert.deepEqual(maxOutput.currentPersistence, { + kind: "envVar", + key: "BUZZ_AGENT_MAX_OUTPUT_TOKENS", + }); + assert.deepEqual(maxOutput.targetApplication, { + kind: "envVar", + key: "BUZZ_AGENT_MAX_OUTPUT_TOKENS", + }); + + const ctx = field(model, "contextLimit"); + assert.deepEqual(ctx.currentPersistence, { + kind: "envVar", + key: "BUZZ_AGENT_MAX_CONTEXT_TOKENS", + }); + + const rounds = field(model, "maxRounds"); + assert.deepEqual(rounds.currentPersistence, { + kind: "envVar", + key: "BUZZ_AGENT_MAX_ROUNDS", + }); +}); + +test("Goose derives two numeric descriptors and no maxRounds", () => { + const model = deriveAgentConfigFieldModel({ + config, + runtime: runtime("goose", { + modelEnvVar: "GOOSE_MODEL", + providerEnvVar: "GOOSE_PROVIDER", + thinkingEnvVar: "GOOSE_THINKING_EFFORT", + maxTokensEnvVar: "GOOSE_MAX_TOKENS", + contextLimitEnvVar: "GOOSE_CONTEXT_LIMIT", + maxRoundsEnvVar: null, // Goose has no max-rounds env var + }), + scope: "global", + }); + + const numericKinds = model.fields + .filter((f) => + ["maxOutputTokens", "contextLimit", "maxRounds"].includes(f.kind), + ) + .map((f) => f.kind); + assert.deepEqual(numericKinds, ["maxOutputTokens", "contextLimit"]); + assert.equal( + field(model, "maxRounds"), + undefined, + "maxRounds must be absent for Goose", + ); + + assert.deepEqual(field(model, "maxOutputTokens").currentPersistence, { + kind: "envVar", + key: "GOOSE_MAX_TOKENS", + }); + assert.deepEqual(field(model, "contextLimit").currentPersistence, { + kind: "envVar", + key: "GOOSE_CONTEXT_LIMIT", + }); +}); + +test("Claude derives no numeric descriptors", () => { + const model = deriveAgentConfigFieldModel({ + config, + runtime: runtime("claude"), + scope: "global", + }); + + const hasNumeric = model.fields.some((f) => + ["maxOutputTokens", "contextLimit", "maxRounds"].includes(f.kind), + ); + assert.equal(hasNumeric, false, "Claude must have no numeric descriptors"); +}); + +test("Codex derives no numeric descriptors", () => { + const model = deriveAgentConfigFieldModel({ + config, + runtime: runtime("codex"), + scope: "global", + }); + + const hasNumeric = model.fields.some((f) => + ["maxOutputTokens", "contextLimit", "maxRounds"].includes(f.kind), + ); + assert.equal(hasNumeric, false, "Codex must have no numeric descriptors"); +}); + +test("numeric descriptor value is read from env_vars when set", () => { + const cfgWithTuning = { + env_vars: { + BUZZ_AGENT_MAX_OUTPUT_TOKENS: "8192", + BUZZ_AGENT_MAX_CONTEXT_TOKENS: "100000", + BUZZ_AGENT_MAX_ROUNDS: "25", + }, + model: "test-model", + preferred_runtime: null, + provider: "anthropic", + }; + const model = deriveAgentConfigFieldModel({ + config: cfgWithTuning, + runtime: runtime("buzz-agent", { + maxTokensEnvVar: "BUZZ_AGENT_MAX_OUTPUT_TOKENS", + contextLimitEnvVar: "BUZZ_AGENT_MAX_CONTEXT_TOKENS", + maxRoundsEnvVar: "BUZZ_AGENT_MAX_ROUNDS", + }), + scope: "global", + }); + + assert.equal(field(model, "maxOutputTokens").value, "8192"); + assert.equal(field(model, "contextLimit").value, "100000"); + assert.equal(field(model, "maxRounds").value, "25"); +}); + +test("numeric descriptor value is null when env var is absent", () => { + const cfgEmpty = { + env_vars: {}, + model: "test-model", + preferred_runtime: null, + provider: null, + }; + const model = deriveAgentConfigFieldModel({ + config: cfgEmpty, + runtime: runtime("buzz-agent", { + maxTokensEnvVar: "BUZZ_AGENT_MAX_OUTPUT_TOKENS", + contextLimitEnvVar: "BUZZ_AGENT_MAX_CONTEXT_TOKENS", + maxRoundsEnvVar: "BUZZ_AGENT_MAX_ROUNDS", + }), + scope: "global", + }); + + assert.equal(field(model, "maxOutputTokens").value, null); + assert.equal(field(model, "contextLimit").value, null); + assert.equal(field(model, "maxRounds").value, null); +}); + +// ── structuredEnvKeys: rendered-descriptor ownership ───────────────────── +// +// structuredEnvKeys accepts the descriptors a surface ACTUALLY renders and +// returns the env-var keys that surface owns. Keys only appear in the output +// when a first-class control for them renders — a persisted value must never +// have zero editors. +// +// Critical invariant: per-agent Goose passes only its two numeric descriptors +// (no effort descriptor, because no effort control renders there). The effort +// key (BUZZ_AGENT_THINKING_EFFORT) must NOT appear in the output — it must +// stay a visible generic env row where any saved value can be edited. + +test("structuredEnvKeys_global_includes_effort_key_and_numeric_keys", () => { + // Global surface renders effort + all numeric descriptors. + const buzzAgentModel = deriveAgentConfigFieldModel({ + config, + runtime: runtime("buzz-agent", { + modelEnvVar: "BUZZ_AGENT_MODEL", + providerEnvVar: "BUZZ_AGENT_PROVIDER", + thinkingEnvVar: "BUZZ_AGENT_THINKING_EFFORT", + maxTokensEnvVar: "BUZZ_AGENT_MAX_OUTPUT_TOKENS", + contextLimitEnvVar: "BUZZ_AGENT_MAX_CONTEXT_TOKENS", + maxRoundsEnvVar: "BUZZ_AGENT_MAX_ROUNDS", + }), + scope: "global", + }); + + // Global renders all renderable descriptors. + const renderedDescriptors = buzzAgentModel.fields.filter( + (f) => f.render === "control", + ); + const keys = structuredEnvKeys(renderedDescriptors); + + assert.ok( + keys.includes("BUZZ_AGENT_THINKING_EFFORT"), + "effort key must be hidden on global (effort control renders)", + ); + assert.ok( + keys.includes("BUZZ_AGENT_MAX_OUTPUT_TOKENS"), + "maxOutputTokens key must be hidden on global", + ); + assert.ok( + keys.includes("BUZZ_AGENT_MAX_CONTEXT_TOKENS"), + "contextLimit key must be hidden on global", + ); + assert.ok( + keys.includes("BUZZ_AGENT_MAX_ROUNDS"), + "maxRounds key must be hidden on global", + ); +}); + +test("structuredEnvKeys_per_agent_buzz_agent_includes_effort_and_numeric_keys", () => { + // Per-agent buzz-agent renders effort + all 3 numeric descriptors. + const buzzAgentModel = deriveAgentConfigFieldModel({ + config, + runtime: runtime("buzz-agent", { + thinkingEnvVar: "BUZZ_AGENT_THINKING_EFFORT", + maxTokensEnvVar: "BUZZ_AGENT_MAX_OUTPUT_TOKENS", + contextLimitEnvVar: "BUZZ_AGENT_MAX_CONTEXT_TOKENS", + maxRoundsEnvVar: "BUZZ_AGENT_MAX_ROUNDS", + }), + scope: "definition", + }); + + const renderedDescriptors = buzzAgentModel.fields.filter( + (f) => f.render === "control", + ); + const keys = structuredEnvKeys(renderedDescriptors); + + assert.ok(keys.includes("BUZZ_AGENT_THINKING_EFFORT"), "effort key present"); + assert.ok(keys.includes("BUZZ_AGENT_MAX_OUTPUT_TOKENS"), "maxTokens present"); + assert.ok( + keys.includes("BUZZ_AGENT_MAX_CONTEXT_TOKENS"), + "contextLimit present", + ); + assert.ok(keys.includes("BUZZ_AGENT_MAX_ROUNDS"), "maxRounds present"); +}); + +test("structuredEnvKeys_per_agent_goose_excludes_effort_key_discriminating_invariant", () => { + // Per-agent Goose: effort migration is out of scope, so no effort control + // renders on the per-agent surface for Goose. Only the 2 numeric descriptors + // are passed as the rendered set. The effort persistence key + // (BUZZ_AGENT_THINKING_EFFORT) must NOT appear in the output — any saved + // value must remain visible and editable as a generic env row. + const gooseModel = deriveAgentConfigFieldModel({ + config, + runtime: runtime("goose", { + thinkingEnvVar: "GOOSE_THINKING_EFFORT", + maxTokensEnvVar: "GOOSE_MAX_TOKENS", + contextLimitEnvVar: "GOOSE_CONTEXT_LIMIT", + }), + scope: "definition", + }); + + // Simulate per-agent surface: only the numeric descriptors render (no effort + // control for Goose per-agent — effort migration is out of scope). + const numericDescriptorsOnly = gooseModel.fields.filter((f) => + ["maxOutputTokens", "contextLimit", "maxRounds"].includes(f.kind), + ); + + const keys = structuredEnvKeys(numericDescriptorsOnly); + + assert.equal( + keys.includes("BUZZ_AGENT_THINKING_EFFORT"), + false, + "effort persistence key must NOT be hidden for Goose per-agent — no editor would replace it", + ); + assert.ok( + keys.includes("GOOSE_MAX_TOKENS"), + "maxTokens key must be present (control renders)", + ); + assert.ok( + keys.includes("GOOSE_CONTEXT_LIMIT"), + "contextLimit key must be present (control renders)", + ); +}); + +test("structuredEnvKeys_deferred_effort_excluded_from_result", () => { + // A deferred effort descriptor (render !== "control") must not contribute + // its key to the hidden set — the value has no editor on this surface. + const claudeModel = deriveAgentConfigFieldModel({ + config, + runtime: runtime("claude"), + scope: "global", + }); + + const allDescriptors = claudeModel.fields; // includes deferred effort + const keys = structuredEnvKeys(allDescriptors); + + // Claude's deferred effort has currentPersistence.kind === "unavailable" + // and render === "deferredUntilNativeOptionsAvailable"; no key emitted. + assert.equal( + keys.length, + 0, + "deferred effort and model descriptors must not contribute hidden keys", + ); +}); + +// ── deriveNumericDescriptors: standalone helper ─────────────────────────── +// +// The same logic that populates the numeric portion of deriveAgentConfigFieldModel +// is available as a standalone helper for per-agent surfaces that don't need +// the full field model. + +test("deriveNumericDescriptors_undefined_runtime_returns_empty", () => { + const ds = deriveNumericDescriptors(undefined); + assert.deepEqual(ds, []); +}); + +test("deriveNumericDescriptors_runtime_with_all_three_fields", () => { + const ds = deriveNumericDescriptors( + runtime("buzz-agent", { + maxTokensEnvVar: "BUZZ_AGENT_MAX_OUTPUT_TOKENS", + contextLimitEnvVar: "BUZZ_AGENT_MAX_CONTEXT_TOKENS", + maxRoundsEnvVar: "BUZZ_AGENT_MAX_ROUNDS", + }), + ); + assert.deepEqual( + ds.map((d) => d.kind), + ["maxOutputTokens", "contextLimit", "maxRounds"], + ); + for (const d of ds) { + assert.equal(d.render, "control"); + assert.equal(d.currentPersistence.kind, "envVar"); + assert.equal(d.value, null, "standalone helper returns null values"); + } +}); + +test("deriveNumericDescriptors_partial_fields_match_catalog_projection", () => { + // Goose: two numeric fields, no maxRounds. + const ds = deriveNumericDescriptors( + runtime("goose", { + maxTokensEnvVar: "GOOSE_MAX_TOKENS", + contextLimitEnvVar: "GOOSE_CONTEXT_LIMIT", + maxRoundsEnvVar: null, + }), + ); + assert.deepEqual( + ds.map((d) => d.kind), + ["maxOutputTokens", "contextLimit"], + ); +}); + +test("deriveNumericDescriptors_matches_deriveAgentConfigFieldModel_numeric_subset", () => { + // The standalone helper must produce the same descriptor set (without values) + // that deriveAgentConfigFieldModel embeds, so surfaces that call the helper + // directly get a consistent policy with the full field model. + const runtimeEntry = runtime("buzz-agent", { + maxTokensEnvVar: "BUZZ_AGENT_MAX_OUTPUT_TOKENS", + contextLimitEnvVar: "BUZZ_AGENT_MAX_CONTEXT_TOKENS", + maxRoundsEnvVar: "BUZZ_AGENT_MAX_ROUNDS", + }); + + const standalone = deriveNumericDescriptors(runtimeEntry); + const fromModel = deriveAgentConfigFieldModel({ + config, + runtime: runtimeEntry, + scope: "global", + }).fields.filter((f) => + ["maxOutputTokens", "contextLimit", "maxRounds"].includes(f.kind), + ); + + // Kinds and keys must match; values differ (standalone returns null, model + // reads from config). + assert.deepEqual( + standalone.map((d) => d.kind), + fromModel.map((d) => d.kind), + "descriptor kinds must match", + ); + for (let i = 0; i < standalone.length; i++) { + assert.deepEqual( + standalone[i].currentPersistence, + fromModel[i].currentPersistence, + `persistence must match for descriptor ${i}`, + ); + } +}); + +// ── NUMERIC_KIND_MIN: kind-specific input minima ────────────────────────── +// +// max output tokens and context limit must have min=1 (buzz-agent rejects 0). +// max rounds allows 0 (meaning unlimited). + +test("NUMERIC_KIND_MIN_maxOutputTokens_is_1", () => { + assert.equal(NUMERIC_KIND_MIN.maxOutputTokens, 1); +}); + +test("NUMERIC_KIND_MIN_contextLimit_is_1", () => { + assert.equal(NUMERIC_KIND_MIN.contextLimit, 1); +}); + +test("NUMERIC_KIND_MIN_maxRounds_is_0", () => { + assert.equal(NUMERIC_KIND_MIN.maxRounds, 0); +}); diff --git a/desktop/src/features/agents/lib/agentConfigCore.ts b/desktop/src/features/agents/lib/agentConfigCore.ts index 5827aedfa7..5a8b8cb1c3 100644 --- a/desktop/src/features/agents/lib/agentConfigCore.ts +++ b/desktop/src/features/agents/lib/agentConfigCore.ts @@ -4,6 +4,18 @@ import type { } from "@/shared/api/types"; import { BUZZ_AGENT_THINKING_EFFORT } from "../ui/buzzAgentConfig"; +/** + * Lifecycle status of the ACP runtime catalog query on a per-agent surface. + * + * - `loading` — query in flight; structured controls are withheld and env-var + * keys are not hidden (saved values remain visible as generic rows). + * - `ready` — query resolved; descriptors derived from `selectedRuntime`. + * - `error` — query failed; same gate as loading: no structured controls, + * keys not hidden, saved values stay visible. Distinguishable from + * "runtime not capable" (which is `ready` + no selectedRuntime). + */ +export type RuntimeCatalogStatus = "loading" | "ready" | "error"; + export type AgentConfigScope = | "onboarding" | "global" @@ -69,6 +81,13 @@ export type AgentConfigFieldDescriptor = | { kind: "acpConfigOption"; id: string; category: string }; render: "control" | "deferredUntilNativeOptionsAvailable"; value: string | null; + } + | { + kind: "maxOutputTokens" | "contextLimit" | "maxRounds"; + currentPersistence: EnvVarPersistence; + targetApplication: { kind: "envVar"; key: string }; + render: "control"; + value: string | null; }; export type AgentConfigOmission = { @@ -76,6 +95,18 @@ export type AgentConfigOmission = { reason: "ownedByModelId" | "unsupportedByHarness"; }; +/** + * A numeric tuning descriptor: one of the three env-var-backed number fields + * (max output tokens, context limit, max rounds). + * + * Defined here so both the field model derivation and the rendering surfaces + * share a single type — avoids the type being redefined in UI layers. + */ +export type NumericDescriptor = Extract< + AgentConfigFieldDescriptor, + { kind: "maxOutputTokens" | "contextLimit" | "maxRounds" } +>; + export type AgentConfigFieldModel = { fields: AgentConfigFieldDescriptor[]; omissions: AgentConfigOmission[]; @@ -86,6 +117,51 @@ function valueFromEnv(config: GlobalAgentConfig, key: string) { return config.env_vars[key]?.trim() || null; } +/** + * Derives the numeric descriptor set for a runtime from catalog fields. + * + * The returned descriptors drive `NumericTuningFields` on any surface that + * renders numeric knobs. Surfaces pass the same descriptor set to both the + * renderer and `structuredEnvKeys()` — one policy, no local rebuilding. + * + * Returns `[]` when `runtime` is undefined (catalog not yet settled, or the + * runtime has no numeric env-var fields). + */ +export function deriveNumericDescriptors( + runtime: AcpRuntimeCatalogEntry | undefined, +): NumericDescriptor[] { + if (!runtime) return []; + const ds: NumericDescriptor[] = []; + if (runtime.maxTokensEnvVar) { + ds.push({ + kind: "maxOutputTokens", + currentPersistence: { kind: "envVar", key: runtime.maxTokensEnvVar }, + targetApplication: { kind: "envVar", key: runtime.maxTokensEnvVar }, + render: "control", + value: null, + }); + } + if (runtime.contextLimitEnvVar) { + ds.push({ + kind: "contextLimit", + currentPersistence: { kind: "envVar", key: runtime.contextLimitEnvVar }, + targetApplication: { kind: "envVar", key: runtime.contextLimitEnvVar }, + render: "control", + value: null, + }); + } + if (runtime.maxRoundsEnvVar) { + ds.push({ + kind: "maxRounds", + currentPersistence: { kind: "envVar", key: runtime.maxRoundsEnvVar }, + targetApplication: { kind: "envVar", key: runtime.maxRoundsEnvVar }, + render: "control", + value: null, + }); + } + return ds; +} + /** * Derives the harness-scoped field model consumed by agent config renderers. * @@ -163,6 +239,16 @@ export function deriveAgentConfigFieldModel({ }); } + // Numeric fields — derived from the shared helper, then value-populated + // from config. Any surface needing only the descriptor structure (without + // saved values) calls deriveNumericDescriptors(runtime) directly. + for (const d of deriveNumericDescriptors(runtime)) { + fields.push({ + ...d, + value: valueFromEnv(config, d.currentPersistence.key), + }); + } + return { fields, omissions, @@ -191,3 +277,74 @@ export function getRenderableEffortField( field.kind === "effort" && field.render === "control", ); } + +/** + * Returns the env-var keys owned by the rendered descriptors on a surface. + * + * Pass only the descriptors that **actually render controls** on the surface — + * the resulting key set should be used as `EnvVarsEditor.hiddenKeys` and to + * exclude keys from baked-row generic display. + * + * Invariant: a key appears in the output only when a first-class control for + * it renders on the surface — a persisted value must never have zero editors. + * + * Per-surface consequences (assuming standard descriptor sets): + * - Global: effort key + numeric keys rendered by the descriptors + * - Per-agent buzz-agent: effort key + 3 numeric keys + * - Per-agent Goose: 2 numeric keys only — Goose effort (BUZZ_AGENT_THINKING_EFFORT) + * stays a visible generic env row because no effort control renders per-agent + * for Goose (effort migration is out of scope) + */ +export function structuredEnvKeys( + renderedDescriptors: AgentConfigFieldDescriptor[], +): string[] { + const keys: string[] = []; + for (const d of renderedDescriptors) { + if (d.render !== "control") continue; + if (d.kind === "effort" && d.currentPersistence.kind === "envVar") { + keys.push(d.currentPersistence.key); + } else if ( + d.kind === "maxOutputTokens" || + d.kind === "contextLimit" || + d.kind === "maxRounds" + ) { + keys.push(d.currentPersistence.key); + } + } + return keys; +} + +/** + * Filters a baked-env row array to exclude keys already covered by structured + * controls, preventing double-editing. The result is the set of baked rows + * that the generic env-vars editor should display. + * + * Call with the union of always-structured keys (provider/model/effort set) + * and numeric structured keys derived from `structuredEnvKeys()`. + * + * Pure — suitable for Node-layer unit tests without a component renderer. + */ +export function filterBakedGenericRows( + bakedEnv: readonly T[], + excludeKeys: ReadonlySet | readonly string[], +): T[] { + const exclude = + excludeKeys instanceof Set ? excludeKeys : new Set(excludeKeys); + return bakedEnv.filter((e) => !exclude.has(e.key)); +} + +/** + * Returns the placeholder string for a numeric tuning input. + * + * When an inherited value is present, the field shows `"Inherit ()"`. + * When absent (no global setting), the field shows `"Inherit (agent default)"`. + * + * Pure — used by NumericTuningFields and testable without a component renderer. + */ +export function numericTuningPlaceholder( + inheritedValue: string | null | undefined, +): string { + return inheritedValue + ? `Inherit (${inheritedValue})` + : "Inherit (agent default)"; +} diff --git a/desktop/src/features/agents/ui/AgentConfigFields.tsx b/desktop/src/features/agents/ui/AgentConfigFields.tsx index ce3d252203..11f68e8a56 100644 --- a/desktop/src/features/agents/ui/AgentConfigFields.tsx +++ b/desktop/src/features/agents/ui/AgentConfigFields.tsx @@ -24,6 +24,8 @@ import { deriveAgentConfigFieldModel, getRenderableEffortField, hasRenderableAgentConfigField, + structuredEnvKeys, + filterBakedGenericRows, } from "@/features/agents/lib/agentConfigCore"; import { getBakedProviderInheritLabel, @@ -52,7 +54,9 @@ import { } from "@/features/agents/ui/buzzAgentConfig"; import { EffortSelectField, + NumericTuningFields, useEffortAutoClear, + type NumericDescriptor, } from "@/features/agents/ui/buzzAgentModelTuningFields"; import { SettingsOptionGroup } from "@/features/settings/ui/SettingsOptionGroup"; import { AdvancedRequiredBadge } from "./AdvancedRequiredBadge"; @@ -66,7 +70,6 @@ export const EMPTY_GLOBAL_CONFIG: GlobalAgentConfig = { preferred_runtime: null, }; -/** Baked env keys that route to structured controls, not the generic env editor. */ const BAKED_STRUCTURED_KEYS = new Set([ "BUZZ_AGENT_PROVIDER", "BUZZ_AGENT_MODEL", @@ -103,12 +106,7 @@ export const CANONICAL_CONFIG_BEHAVIORS = { requireProviderForModelAndEffort, } as const; -/** - * Disclosure preset → the eight visibility decisions it owns. Full and - * progressive defaults expose the same controls; the progressive preset - * changes only when those controls are revealed. Exported for the contract - * test. - */ +/** Disclosure preset → the eight visibility decisions it owns. Exported for the contract test. */ export function resolveDisclosure(disclosure: AgentConfigDisclosure) { const full = disclosure !== "onboarding-essential"; return { @@ -139,14 +137,7 @@ export function shouldRevealDependentConfigFields({ ); } -/** - * Determines whether the status line beneath the Model field should render. - * - * Discovery warnings bypass the `onboarding-essential` preset so that a - * first-run failure is never silently invisible. On the happy path - * (`status === null`) the status line stays hidden in onboarding, keeping - * the page clean. - */ +/** Whether the status line under the Model field renders. Discovery warnings bypass onboarding-essential so first-run failures are never invisible. */ export function shouldShowModelStatusMessage( showDescriptions: boolean, status: { message: string; tone: string } | null, @@ -155,14 +146,8 @@ export function shouldShowModelStatusMessage( } /** - * Whether the Model control should render given discovery state. - * - * Optional-model harnesses (Claude Code / Codex, `acpNative`) omit the control - * while discovery is in flight and after a **confirmed successful empty** - * catalog (IPC resolved, no usable options) — there is nothing useful to pick. - * Discovery failures / unavailable runtimes keep the control so #2246 failure - * UI can render. Full disclosure still shows the control when Custom model is - * available. Required-model harnesses always render the control. + * Renders the Model control given discovery state. Optional-model harnesses omit it while + * discovery is loading or after confirmed successful empty; failures keep it for the #2246 UI. */ export function shouldRenderModelControl({ discoveredModelOptions, @@ -269,6 +254,19 @@ export function AgentConfigFields({ effortField?.currentPersistence.kind === "envVar" ? effortField.currentPersistence.key : null; + + const numericDescriptors = fieldModel.fields.filter( + (d): d is NumericDescriptor => + (d.kind === "maxOutputTokens" || + d.kind === "contextLimit" || + d.kind === "maxRounds") && + d.render === "control", + ); + const allStructuredKeys = structuredEnvKeys([ + ...(effortField ? [effortField] : []), + ...numericDescriptors, + ]); + const bakedEnvMap = Object.fromEntries(bakedEnv.map((e) => [e.key, e.value])); const bakedProvider = React.useMemo( () => bakedEnv.find((e) => e.key === "BUZZ_AGENT_PROVIDER")?.value ?? null, [bakedEnv], @@ -301,8 +299,12 @@ export function AgentConfigFields({ [bakedEnv], ); const bakedGenericRows = React.useMemo( - () => bakedEnv.filter((e) => !BAKED_STRUCTURED_KEYS.has(e.key)), - [bakedEnv], + () => + filterBakedGenericRows(bakedEnv, [ + ...BAKED_STRUCTURED_KEYS, + ...allStructuredKeys, + ]), + [bakedEnv, allStructuredKeys], ); const providerValue = providerFieldVisible ? (config.provider ?? "") : ""; @@ -573,16 +575,15 @@ export function AgentConfigFields({ } function handleEnvVarsChange(next: Record) { - const effort = effortPersistenceKey - ? config.env_vars[effortPersistenceKey] - : undefined; - const merged = { ...next }; - if (effortPersistenceKey && effort !== undefined) { - merged[effortPersistenceKey] = effort; - } - onConfigChange({ ...config, env_vars: merged }); + onConfigChange({ ...config, env_vars: next }); } + const handleNumericEnvVarChange = (key: string, value: string) => { + const next = { ...config.env_vars, [key]: value }; + if (value === "") delete next[key]; + onConfigChange({ ...config, env_vars: next }); + }; + // On internal Block builds, BUZZ_AGENT_PROVIDER is baked in and a boot // migration rewrites v1→v2. Hide the legacy v1 option so it is not offered // for new selections; OSS builds show it. @@ -739,6 +740,33 @@ export function AgentConfigFields({
) : null; + const advancedEditorBlock = ( + <> + + {numericDescriptors.length > 0 ? ( + + ) : null} + + ); + const dependentContent = ( <> {providerFieldVisible && apiKeyEnvVar ? ( @@ -903,40 +931,12 @@ export function AgentConfigFields({ : PROGRESSIVE_FIELDS_TRANSITION } > - k !== BUZZ_AGENT_THINKING_EFFORT, - ), - )} - /> + {advancedEditorBlock} ) : null} ) : advancedOpen ? ( - k !== BUZZ_AGENT_THINKING_EFFORT, - ), - )} - /> + advancedEditorBlock ) : null} ) : null} diff --git a/desktop/src/features/agents/ui/AgentDefinitionDialog.tsx b/desktop/src/features/agents/ui/AgentDefinitionDialog.tsx index 1916b57069..12702f45ac 100644 --- a/desktop/src/features/agents/ui/AgentDefinitionDialog.tsx +++ b/desktop/src/features/agents/ui/AgentDefinitionDialog.tsx @@ -101,7 +101,7 @@ type AgentDefinitionDialogProps = { error: Error | null; isPending: boolean; runtimes: AcpRuntimeCatalogEntry[]; - runtimesLoading?: boolean; + runtimeCatalogStatus?: "loading" | "ready" | "error"; onOpenChange: (open: boolean) => void; onSubmit: ( input: CreatePersonaInput | UpdatePersonaInput, @@ -128,13 +128,14 @@ export function AgentDefinitionDialog({ error, isPending, runtimes, - runtimesLoading = false, + runtimeCatalogStatus = "ready" as const, onOpenChange, onSubmit, publishCatalogUpdatesOnSave = false, createRunSection, createSubmitBlocked = false, }: AgentDefinitionDialogProps) { + const runtimesLoading = runtimeCatalogStatus === "loading"; const [displayName, setDisplayName] = React.useState(""); const [aiDefaultsOpen, setAiDefaultsOpen] = React.useState(false); const aiDefaultsTriggerRef = React.useRef(null); @@ -394,11 +395,7 @@ export function AgentDefinitionDialog({ (runtime.trim().length > 0 && runtimeCanChooseLlmProvider) || blankRuntimeModelProviderEditable; const trimmedProvider = provider.trim(); - // Required credential env keys for this runtime + provider combination. - // Used to show required markers on the LLM provider label and amber - // locked rows in the env vars editor. - // File-layer config for the selected runtime (e.g. goose config.yaml). - // Used to silence requirements already satisfied there. + // Required credential env keys and file-layer config; silences requirements satisfied in the file layer. const { data: runtimeFileConfig } = useRuntimeFileConfigQuery(runtime, { enabled: open, }); @@ -1016,6 +1013,8 @@ export function AgentDefinitionDialog({ model={model} modelTuningRuntimeId={runtime} namePoolText={namePoolText} + catalogStatus={runtimeCatalogStatus} + selectedRuntime={selectedRuntime} onBehaviorDraftChange={(nextBehaviorDraft) => { setHasUserChanges(true); setBehaviorDraft(nextBehaviorDraft); diff --git a/desktop/src/features/agents/ui/AgentDialog.tsx b/desktop/src/features/agents/ui/AgentDialog.tsx index dc608da489..a875770b38 100644 --- a/desktop/src/features/agents/ui/AgentDialog.tsx +++ b/desktop/src/features/agents/ui/AgentDialog.tsx @@ -34,7 +34,7 @@ type AgentDialogCreateProps = { definitionError: Error | null; isDefinitionPending: boolean; runtimes: AcpRuntimeCatalogEntry[]; - runtimesLoading: boolean; + runtimeCatalogStatus: "loading" | "ready" | "error"; onSubmitDefinition: ( input: CreatePersonaInput | UpdatePersonaInput, intent: AgentCreateIntent, @@ -68,7 +68,7 @@ type AgentDialogDefinitionEditProps = { error: Error | null; isPending: boolean; runtimes: AcpRuntimeCatalogEntry[]; - runtimesLoading?: boolean; + runtimeCatalogStatus?: "loading" | "ready" | "error"; onOpenChange: (open: boolean) => void; onSubmit: ( input: CreatePersonaInput | UpdatePersonaInput, @@ -125,7 +125,7 @@ function AgentCreateDialogRouter({ definitionError, isDefinitionPending, runtimes, - runtimesLoading, + runtimeCatalogStatus, onSubmitDefinition, }: AgentDialogCreateProps) { const [runDraft, setRunDraft] = React.useState(emptyWhereToRunDraft); @@ -166,7 +166,7 @@ function AgentCreateDialogRouter({ }} open runtimes={runtimes} - runtimesLoading={runtimesLoading} + runtimeCatalogStatus={runtimeCatalogStatus} submitLabel={copy.submitLabel} title={copy.title} /> diff --git a/desktop/src/features/agents/ui/AgentInstanceEditDialog.tsx b/desktop/src/features/agents/ui/AgentInstanceEditDialog.tsx index d717d773e8..adfb8182a8 100644 --- a/desktop/src/features/agents/ui/AgentInstanceEditDialog.tsx +++ b/desktop/src/features/agents/ui/AgentInstanceEditDialog.tsx @@ -266,16 +266,10 @@ export function AgentInstanceEditDialog({ return runtimeSupportsLlmProviderSelection(matched?.id ?? ""); }, [runtimes, originalAgentCommand]); - // The runtime id that will actually be active after submit. When inheriting, - // resolve from the LINKED PERSONA's runtime — that is what will run once the - // override is cleared. Deriving from agent.agentCommand here is wrong for a - // pinned agent that just toggled "Inherit runtime from template": the override - // (e.g. a Claude pin) is still present on the record, so it would resolve to - // the old pin instead of the persona's runtime, hiding required credentials. - // Fall back to the agent.agentCommand dual-match (command path, then id) only - // when there is no linked persona or its runtime is unset. This single - // prospective id feeds BOTH the block-save gate (requiredEnvKeys) and the - // submit path so they never disagree on which runtime is being saved. + // The runtime id active after submit. Inheriting resolves from the LINKED PERSONA's runtime + // (that is what runs once the override is cleared, not the current override). + // Falls back to dual-match (command path, then id) when no persona or its runtime is unset. + // This single prospective id feeds BOTH the block-save gate and submit so they always agree. const prospectiveRuntimeId = React.useMemo(() => { if (!inheritHarness) { return selectedRuntime?.id ?? selectedRuntimeId; @@ -307,6 +301,15 @@ export function AgentInstanceEditDialog({ const llmProviderFieldVisible = runtimeSupportsLlmProviderSelection(prospectiveRuntimeId); + const prospectiveRuntime = runtimes.find( + (r) => r.id === prospectiveRuntimeId, + ); + const runtimeCatalogStatus = runtimesQuery.isLoading + ? ("loading" as const) + : runtimesQuery.isError + ? ("error" as const) + : ("ready" as const); + // One-shot focus: when the dialog opens from a card deep-link, scroll and // focus the relevant field. The effect re-runs when `llmProviderFieldVisible` // changes so a provider-field focus request fires once the field materializes. @@ -339,9 +342,8 @@ export function AgentInstanceEditDialog({ return () => cancelAnimationFrame(id); }, [open, initialFocus, agent.pubkey, llmProviderFieldVisible]); - // Provider + env to PERSIST on submit — also fed to the credential gate so - // gate, saved record, and spawn snapshot all agree on one resolved value. - // See resolveInheritedRuntimeSubmission for the inherit/transition contract. + // Provider + env to PERSIST on submit — also fed to the credential gate so gate, saved record, + // and spawn snapshot all agree on one resolved value. See resolveInheritedRuntimeSubmission. const inheritedSubmission = React.useMemo( () => resolveInheritedRuntimeSubmission({ @@ -376,12 +378,8 @@ export function AgentInstanceEditDialog({ inheritedEnvVars: inheritedEnvVarsForAdvanced, } = useAgentDialogDefaults({ inheritedEnvVars, open }); - // Runtime/provider-required credential state, derived from the PROSPECTIVE - // post-submit runtime — see the hook for the inherit-transition rationale. - // Pass globalProvider so the hook uses it as a fallback when the per-agent - // provider is empty (global-provider-only configs must surface required keys). - // Pass globalEnvVars so keys satisfied by global config are excluded from - // requiredEnvKeys and do not block Save (display and gate agree). + // Runtime/provider-required credential state for the PROSPECTIVE post-submit runtime. + // globalProvider/globalEnvVars: fallback for empty per-agent provider; keys satisfied globally don't block Save. const { requiredEnvKeys, fileSatisfiedEnvKeys, requiredEnvKeyMissing } = useRequiredCredentialState({ open, @@ -1199,6 +1197,8 @@ export function AgentInstanceEditDialog({ parallelism={parallelism} provider={effectiveProvider} requiredEnvKeys={advancedRequiredEnvKeys} + catalogStatus={runtimeCatalogStatus} + selectedRuntime={prospectiveRuntime} systemPrompt={systemPrompt} onAcpCommandChange={setAcpCommand} onAgentArgsChange={setAgentArgs} diff --git a/desktop/src/features/agents/ui/AgentManagementDialogs.tsx b/desktop/src/features/agents/ui/AgentManagementDialogs.tsx index 0d01cbbcd1..b72669e5f6 100644 --- a/desktop/src/features/agents/ui/AgentManagementDialogs.tsx +++ b/desktop/src/features/agents/ui/AgentManagementDialogs.tsx @@ -22,7 +22,7 @@ export function AgentManagementDialogs() { }} onSubmitDefinition={management.submitCreate} runtimes={management.runtimes} - runtimesLoading={management.runtimesLoading} + runtimeCatalogStatus={management.runtimeCatalogStatus} /> ) : null} {management.createdAgent ? ( @@ -51,7 +51,7 @@ export function AgentManagementDialogs() { onSubmit={management.submitUpdate} open runtimes={management.runtimes} - runtimesLoading={management.runtimesLoading} + runtimeCatalogStatus={management.runtimeCatalogStatus} submitLabel="Save changes" title="Edit agent" /> diff --git a/desktop/src/features/agents/ui/AgentsView.tsx b/desktop/src/features/agents/ui/AgentsView.tsx index 3d1673c365..720d6e62ad 100644 --- a/desktop/src/features/agents/ui/AgentsView.tsx +++ b/desktop/src/features/agents/ui/AgentsView.tsx @@ -319,7 +319,13 @@ export function AgentsView() { }} onSubmitDefinition={personas.handleSubmit} runtimes={personas.acpRuntimesQuery.data ?? []} - runtimesLoading={personas.acpRuntimesQuery.isLoading} + runtimeCatalogStatus={ + personas.acpRuntimesQuery.isLoading + ? "loading" + : personas.acpRuntimesQuery.isError + ? "error" + : "ready" + } /> ) : null} {agents.agentToAddToChannel ? ( @@ -368,7 +374,13 @@ export function AgentsView() { isPending={personas.isPending} mode="definition-edit" runtimes={personas.acpRuntimesQuery.data ?? []} - runtimesLoading={personas.acpRuntimesQuery.isLoading} + runtimeCatalogStatus={ + personas.acpRuntimesQuery.isLoading + ? "loading" + : personas.acpRuntimesQuery.isError + ? "error" + : "ready" + } onOpenChange={(open) => { if (!open) { personas.setPersonaDialogState(null); diff --git a/desktop/src/features/agents/ui/EditAgentAdvancedFields.tsx b/desktop/src/features/agents/ui/EditAgentAdvancedFields.tsx index 972c4e287e..56685fd6c4 100644 --- a/desktop/src/features/agents/ui/EditAgentAdvancedFields.tsx +++ b/desktop/src/features/agents/ui/EditAgentAdvancedFields.tsx @@ -1,3 +1,4 @@ +import * as React from "react"; import { cn } from "@/shared/lib/cn"; import { Input } from "@/shared/ui/input"; import { Textarea } from "@/shared/ui/textarea"; @@ -9,9 +10,21 @@ import { PERSONA_LABEL_OPTIONAL_CLASS, } from "./agentConfigOptions"; import type { AgentPersona } from "@/shared/api/types"; -import { BuzzAgentModelTuningFields } from "./buzzAgentModelTuningFields"; -import { isBuzzAgentRuntime } from "./buzzAgentConfig"; +import type { AcpRuntimeCatalogEntry } from "@/shared/api/types"; +import { + BuzzAgentModelTuningFields, + NumericTuningFields, +} from "./buzzAgentModelTuningFields"; +import { + isBuzzAgentRuntime, + BUZZ_AGENT_THINKING_EFFORT, +} from "./buzzAgentConfig"; import { EDIT_AGENT_PARALLELISM_HELP } from "../lib/agentParallelism"; +import { + deriveNumericDescriptors, + structuredEnvKeys, + type RuntimeCatalogStatus, +} from "../lib/agentConfigCore"; export function EditAgentAdvancedFields({ acpCommand, @@ -30,6 +43,8 @@ export function EditAgentAdvancedFields({ parallelism, provider, requiredEnvKeys, + catalogStatus = "ready", + selectedRuntime, systemPrompt, onAcpCommandChange, onAgentArgsChange, @@ -55,7 +70,7 @@ export function EditAgentAdvancedFields({ model?: string; /** * The actual/prospective runtime id used to decide whether to show the - * buzz-agent model-tuning fields. Uses `prospectiveRuntimeId` from + * buzz-agent effort-tuning field. Uses `prospectiveRuntimeId` from * EditAgentDialog — the resolved runtime, not the "inherit"/"custom" sentinel. */ modelTuningRuntimeId: string; @@ -63,6 +78,24 @@ export function EditAgentAdvancedFields({ /** Active LLM provider id — forwarded to BuzzAgentModelTuningFields for effort filtering. */ provider?: string; requiredEnvKeys: readonly string[]; + /** + * Lifecycle status of the runtime catalog query. Controls the numeric-tuning + * gate and hidden-key behaviour: + * - `loading` or `error`: no structured controls; keys not hidden — saved + * values stay visible as generic rows. + * - `ready`: descriptors derived from `selectedRuntime` (empty when the + * runtime has no numeric env-var fields). + * + * Defaults to `"ready"` so existing callers without the catalog query do not + * need to change. + */ + catalogStatus?: RuntimeCatalogStatus; + /** + * The catalog entry for the prospective runtime. Drives descriptor-based + * numeric tuning fields (max output tokens / context limit / max rounds). + * When undefined after the catalog has settled, no numeric controls render. + */ + selectedRuntime?: AcpRuntimeCatalogEntry; systemPrompt: string; onAcpCommandChange: (value: string) => void; onAgentArgsChange: (value: string) => void; @@ -72,6 +105,29 @@ export function EditAgentAdvancedFields({ onAutoRestartChange: (value: boolean) => void; onSystemPromptChange: (value: string) => void; }) { + // Numeric tuning descriptors — gate on catalog status so that loading/error + // never collapses to "no controls": keys stay visible as generic rows. + const numericDescriptors = React.useMemo( + () => + catalogStatus === "ready" + ? deriveNumericDescriptors(selectedRuntime) + : [], + [catalogStatus, selectedRuntime], + ); + + // Build the effective hidden-key list: caller's secrets + effort key (when + // rendered by BuzzAgentModelTuningFields) + numeric keys via structuredEnvKeys. + const effectiveHiddenKeys = React.useMemo( + () => [ + ...hiddenEnvKeys, + ...(isBuzzAgentRuntime(modelTuningRuntimeId) + ? [BUZZ_AGENT_THINKING_EFFORT] + : []), + ...structuredEnvKeys(numericDescriptors), + ], + [hiddenEnvKeys, modelTuningRuntimeId, numericDescriptors], + ); + return (
{/* Inherit runtime from template */} @@ -248,7 +304,7 @@ export function EditAgentAdvancedFields({ - {/* Tier-1 buzz-agent model-tuning knobs — only shown for buzz-agent. */} + {/* Descriptor-driven numeric tuning knobs — shown when the catalog has settled + and the runtime exposes numeric env-var fields. */} + {numericDescriptors.length > 0 ? ( + { + const next = { ...envVars }; + if (value === "") { + delete next[key]; + } else { + next[key] = value; + } + onEnvVarsChange(next); + }} + /> + ) : null} + + {/* Effort-tuning knob — only shown for buzz-agent. */} {isBuzzAgentRuntime(modelTuningRuntimeId) ? ( { "annotation must not appear when its key is not in the env map", ); }); + +// ── buildRecord with hiddenKeys: structured-field preservation ──────────── +// +// These tests exercise the exported buildRecord(nextRows, value, requiredKeys, +// hiddenKeys) using the real implementation. hiddenKeys are structured-field +// env vars (e.g. BUZZ_AGENT_MAX_ROUNDS) that are owned by first-class controls +// outside the editor — they must survive onChange cycles even though they +// never appear as generic rows. +// +// Four scenarios from rev 4: +// 1. Edit an unrelated generic row → hidden (tuning) key is unchanged. +// 2. Runtime switch then generic edit: after switching to a new runtime, +// the new runtime's hidden keys survive; old runtime keys appear as +// generic rows and survive via toRecord, not hidden-key preservation. +// 3. Baked numeric key excluded via real descriptor/helper path: uses the +// production deriveAgentConfigFieldModel + structuredEnvKeys helpers to +// derive the hidden set, then verifies toRows excludes the numeric key. +// 4. Clearing a structured override → placeholder returns: after the user +// clears a structured field (key absent from value), buildRecord must +// not reintroduce it, leaving the structured field free to show the +// Inherit placeholder. + +test("buildRecord_hidden_tuning_key_unchanged_when_generic_row_edited", () => { + // Structured field set BUZZ_AGENT_MAX_ROUNDS to "50"; it lives in value + // as a hiddenKey. User then edits a generic env var via the row editor. + // The tuning key must survive the buildRecord emit cycle unchanged. + const value = { BUZZ_AGENT_MAX_ROUNDS: "50", MY_VAR: "old" }; + const nextRows = [{ id: "r1", key: "MY_VAR", value: "new" }]; + const record = buildRecordUtil( + nextRows, + value, + [], + ["BUZZ_AGENT_MAX_ROUNDS"], + ); + + assert.equal( + record.BUZZ_AGENT_MAX_ROUNDS, + "50", + "hidden tuning key must survive when an unrelated generic row is edited", + ); + assert.equal(record.MY_VAR, "new", "generic row edit applied"); +}); + +test("buildRecord_runtime_switch_new_hiddenKeys_then_generic_edit", () => { + // Scenario 2: runtime switch then generic edit. + // + // Before switch: agent is buzz-agent with BUZZ_AGENT_MAX_ROUNDS = "50" stored + // in value (set via the numeric tuning control). After switching to Goose, + // the buzz-agent key is no longer hidden — it becomes a visible generic row. + // The test verifies: + // (a) After the switch, the old buzz-agent key appears as a generic row + // (toRows with the new Goose hidden set projects it). + // (b) After a generic-row edit, buildRecord preserves BOTH the old-runtime + // key (now a generic row) and the new-runtime hidden key. + // (c) An unset new-runtime hidden key is not introduced. + + // Derive both descriptor sets from real runtime objects. + const buzzAgentRuntime = { + id: "buzz-agent", + label: "Buzz Agent", + avatarUrl: "", + availability: "available", + command: "buzz-agent", + binaryPath: "buzz-agent", + defaultArgs: [], + mcpCommand: null, + modelEnvVar: "BUZZ_AGENT_MODEL", + providerEnvVar: "BUZZ_AGENT_PROVIDER", + thinkingEnvVar: "BUZZ_AGENT_THINKING_EFFORT", + maxTokensEnvVar: "BUZZ_AGENT_MAX_OUTPUT_TOKENS", + contextLimitEnvVar: "BUZZ_AGENT_CONTEXT_LIMIT", + maxRoundsEnvVar: "BUZZ_AGENT_MAX_ROUNDS", + installHint: "", + installInstructionsUrl: "", + canAutoInstall: false, + underlyingCliPath: null, + nodeRequired: false, + authStatus: { status: "not_applicable" }, + loginHint: null, + }; + const gooseRuntime = { + id: "goose", + label: "Goose", + avatarUrl: "", + availability: "available", + command: "goose", + binaryPath: "goose", + defaultArgs: ["acp"], + mcpCommand: null, + modelEnvVar: null, + providerEnvVar: null, + thinkingEnvVar: null, + maxTokensEnvVar: "GOOSE_MAX_TOKENS", + contextLimitEnvVar: "GOOSE_CONTEXT_LIMIT", + maxRoundsEnvVar: null, + installHint: "", + installInstructionsUrl: "", + canAutoInstall: true, + underlyingCliPath: null, + nodeRequired: false, + authStatus: { status: "not_applicable" }, + loginHint: null, + }; + + const buzzDescriptors = deriveNumericDescriptors(buzzAgentRuntime); + const gooseDescriptors = deriveNumericDescriptors(gooseRuntime); + const buzzHiddenKeys = structuredEnvKeys(buzzDescriptors); + const gooseHiddenKeys = structuredEnvKeys(gooseDescriptors); + + // Sanity-check that BUZZ_AGENT_MAX_ROUNDS is hidden under buzz-agent but not + // under Goose — that contrast is what makes it become a generic row. + assert.ok( + buzzHiddenKeys.includes("BUZZ_AGENT_MAX_ROUNDS"), + "BUZZ_AGENT_MAX_ROUNDS must be hidden under buzz-agent descriptors", + ); + assert.equal( + gooseHiddenKeys.includes("BUZZ_AGENT_MAX_ROUNDS"), + false, + "BUZZ_AGENT_MAX_ROUNDS must not be hidden under Goose descriptors", + ); + + // Pre-switch value: buzz-agent max-rounds was set, GOOSE_MAX_TOKENS was + // already set (e.g. user configured it before switching back), plus a + // generic user var. GOOSE_MAX_TOKENS is a hidden key under the Goose + // descriptor set, so it must survive buildRecord() via hiddenKeys. + const valueBeforeSwitch = { + BUZZ_AGENT_MAX_ROUNDS: "50", + GOOSE_MAX_TOKENS: "16384", + USER_VAR: "original", + }; + + // After the switch to Goose, toRows is reproj with the new (Goose) hidden + // set. BUZZ_AGENT_MAX_ROUNDS is no longer hidden → appears as a generic row. + // GOOSE_MAX_TOKENS IS hidden under Goose → must not appear in generic rows. + const rowsAfterSwitch = toRows(valueBeforeSwitch, new Set(gooseHiddenKeys)); + assert.ok( + rowsAfterSwitch.some((r) => r.key === "BUZZ_AGENT_MAX_ROUNDS"), + "old-runtime key must become a generic row after the switch", + ); + assert.equal( + rowsAfterSwitch.some((r) => r.key === "GOOSE_MAX_TOKENS"), + false, + "new-runtime hidden key must not appear as a generic row after the switch", + ); + + // User edits the generic USER_VAR row. + const editedRows = rowsAfterSwitch.map((r) => + r.key === "USER_VAR" ? { ...r, value: "updated" } : r, + ); + + // buildRecord: old-runtime key survives via toRecord (it's now a generic + // row); new-runtime Goose hidden key survives via hiddenKeys (carried + // through from value). An unset Goose key must not be introduced. + const record = buildRecordUtil( + editedRows, + valueBeforeSwitch, + [], + gooseHiddenKeys, + ); + + assert.equal( + record.BUZZ_AGENT_MAX_ROUNDS, + "50", + "old-runtime key must survive as a generic row value after switch", + ); + assert.equal( + record.GOOSE_MAX_TOKENS, + "16384", + "new-runtime hidden key must survive buildRecord via hiddenKeys", + ); + assert.equal(record.USER_VAR, "updated", "generic row edit applied"); + assert.equal( + "GOOSE_CONTEXT_LIMIT" in record, + false, + "unset new-runtime hidden key must not be introduced", + ); +}); + +test("filterBakedGenericRows_numeric_baked_key_excluded_and_placeholder_shown", () => { + // Scenario 3: baked numeric key excluded via the real production helper. + // + // The global baked env contains BUZZ_AGENT_MAX_OUTPUT_TOKENS = "4096" + // (the baked value shipped with the agent). The production + // filterBakedGenericRows path must exclude this key from the generic + // baked-row display so it isn't editable twice, while the structured + // numeric input shows the inherited placeholder via numericTuningPlaceholder. + const buzzAgentRuntime = { + id: "buzz-agent", + label: "Buzz Agent", + avatarUrl: "", + availability: "available", + command: "buzz-agent", + binaryPath: "buzz-agent", + defaultArgs: [], + mcpCommand: null, + modelEnvVar: "BUZZ_AGENT_MODEL", + providerEnvVar: "BUZZ_AGENT_PROVIDER", + thinkingEnvVar: "BUZZ_AGENT_THINKING_EFFORT", + maxTokensEnvVar: "BUZZ_AGENT_MAX_OUTPUT_TOKENS", + contextLimitEnvVar: null, + maxRoundsEnvVar: null, + installHint: "", + installInstructionsUrl: "", + canAutoInstall: false, + underlyingCliPath: null, + nodeRequired: false, + authStatus: { status: "not_applicable" }, + loginHint: null, + }; + + const numericDescriptors = deriveNumericDescriptors(buzzAgentRuntime); + const numericStructuredKeys = structuredEnvKeys(numericDescriptors); + + assert.ok( + numericStructuredKeys.includes("BUZZ_AGENT_MAX_OUTPUT_TOKENS"), + "numeric key must appear in structured keys via production helpers", + ); + + // Simulate the baked env: BUZZ_AGENT_MAX_OUTPUT_TOKENS is baked, plus a + // non-structured baked var. + const bakedEnv = [ + { key: "BUZZ_AGENT_MAX_OUTPUT_TOKENS", value: "4096" }, + { key: "SOME_OTHER_BAKED_VAR", value: "hello" }, + ]; + + // filterBakedGenericRows must exclude the numeric key. + const genericRows = filterBakedGenericRows(bakedEnv, numericStructuredKeys); + + assert.equal( + genericRows.some((r) => r.key === "BUZZ_AGENT_MAX_OUTPUT_TOKENS"), + false, + "baked numeric key must be excluded from generic baked rows", + ); + assert.ok( + genericRows.some((r) => r.key === "SOME_OTHER_BAKED_VAR"), + "non-structured baked var must remain in generic rows", + ); + + // The structured numeric input shows the inherited placeholder for the + // baked value via numericTuningPlaceholder. + const bakedValue = "4096"; + assert.equal( + numericTuningPlaceholder(bakedValue), + "Inherit (4096)", + "structured placeholder must reflect the baked value", + ); + assert.equal( + numericTuningPlaceholder(undefined), + "Inherit (agent default)", + "structured placeholder without baked value shows agent-default text", + ); +}); + +test("buildRecord_clearing_structured_field_allows_placeholder_to_return", () => { + // Scenario 4: clearing a structured override → placeholder returns. + // + // Step 1: value has BUZZ_AGENT_MAX_ROUNDS = "50" (user set it via the + // structured field). BUZZ_AGENT_MAX_ROUNDS is in hiddenKeys. + // Step 2: user clears the structured field → onEnvVarChange(key, "") + // removes the key from value (value no longer contains it). + // Step 3: after the clear, buildRecord must not reintroduce the key. + // Step 4: with the key absent from value, numericTuningPlaceholder over + // the (now-empty) inheritedEnvVars shows "Inherit (agent default)" + // — the numeric field's empty-state placeholder. + + // After the clear, value no longer contains BUZZ_AGENT_MAX_ROUNDS. + const valueAfterClear = { MY_VAR: "foo" }; + const nextRows = [{ id: "r1", key: "MY_VAR", value: "updated" }]; + + const record = buildRecordUtil( + nextRows, + valueAfterClear, + [], + ["BUZZ_AGENT_MAX_ROUNDS"], + ); + + assert.equal( + "BUZZ_AGENT_MAX_ROUNDS" in record, + false, + "cleared structured key must not be reintroduced by buildRecord", + ); + assert.equal(record.MY_VAR, "updated"); + + // With the key cleared, the inherited value is also absent (not set + // globally). numericTuningPlaceholder returns the agent-default text — + // the placeholder that renders in the structured input. + const inheritedAfterClear = undefined; + assert.equal( + numericTuningPlaceholder(inheritedAfterClear), + "Inherit (agent default)", + "numeric input must show Inherit (agent default) after clear when no global override", + ); + + // If a global override IS set, the placeholder shows that value instead. + const inheritedGlobal = "25"; + assert.equal( + numericTuningPlaceholder(inheritedGlobal), + "Inherit (25)", + "numeric input must show Inherit () when a global override exists", + ); +}); diff --git a/desktop/src/features/agents/ui/EnvVarsEditor.tsx b/desktop/src/features/agents/ui/EnvVarsEditor.tsx index 91e5b07622..08496eece5 100644 --- a/desktop/src/features/agents/ui/EnvVarsEditor.tsx +++ b/desktop/src/features/agents/ui/EnvVarsEditor.tsx @@ -44,7 +44,9 @@ export function toRows( * Collapse an ordered row list back to a record, skipping rows with empty * keys. Exported for unit tests. */ -export function toRecord(rows: Row[]): EnvVarsValue { +export function toRecord( + rows: readonly { key: string; value: string }[], +): EnvVarsValue { const out: EnvVarsValue = {}; for (const row of rows) { // Empty key = user is mid-edit; skip it so we don't poison the record. @@ -177,6 +179,27 @@ type EnvVarsEditorProps = { type Row = { id: string; key: string; value: string }; +/** + * Pure record builder: merges `toRecord(nextRows)` with the current values of + * `requiredKeys` and `hiddenKeys` from `value`. Required and hidden keys are + * excluded from the row state (`skipKeys`), so this merge is the only place + * their current values survive an `onChange` emit cycle. + * + * Exported for unit testing. `EnvVarsEditor` calls this internally. + */ +export function buildRecord( + nextRows: readonly { key: string; value: string }[], + value: EnvVarsValue, + requiredKeys: readonly string[], + hiddenKeys: readonly string[], +): EnvVarsValue { + const base: EnvVarsValue = {}; + for (const key of [...requiredKeys, ...hiddenKeys]) { + if (key in value) base[key] = value[key]; + } + return { ...base, ...toRecord(nextRows) }; +} + /** * A flat key/value editor for environment variables. * @@ -241,18 +264,6 @@ export function EnvVarsEditor({ } }, [value, skipKeys]); - // Build the emitted record: normal rows + required-key values preserved - // from `value`. Required keys are never in `rows`, so `toRecord(rows)` - // would silently drop any required secret the user just typed unless we - // merge them back explicitly. - function buildRecord(nextRows: Row[]): EnvVarsValue { - const base: EnvVarsValue = {}; - for (const key of [...requiredKeys, ...hiddenKeys]) { - if (key in value) base[key] = value[key]; - } - return { ...base, ...toRecord(nextRows) }; - } - // Ref map: key → required-value Input element. Populated via callback refs // on each required-key row's value Input so focus can be dispatched directly // without any DOM walking through presentation classes. @@ -294,7 +305,7 @@ export function EnvVarsEditor({ function emit(next: Row[]) { setRows(next); - const record = buildRecord(next); + const record = buildRecord(next, value, requiredKeys, hiddenKeys); lastEmitted.current = record; onChange(record); } diff --git a/desktop/src/features/agents/ui/PersonaAdvancedFields.tsx b/desktop/src/features/agents/ui/PersonaAdvancedFields.tsx index b7d1903784..1ecd98b83f 100644 --- a/desktop/src/features/agents/ui/PersonaAdvancedFields.tsx +++ b/desktop/src/features/agents/ui/PersonaAdvancedFields.tsx @@ -1,20 +1,33 @@ +import * as React from "react"; import { Input } from "@/shared/ui/input"; import { cn } from "@/shared/lib/cn"; import { EnvVarsEditor, type EnvVarsValue } from "./EnvVarsEditor"; import { CreateAgentRespondToField } from "./RespondToField"; import type { PersonaBehaviorDraft } from "./personaBehaviorDraft"; -import { isBuzzAgentRuntime } from "./buzzAgentConfig"; +import { + isBuzzAgentRuntime, + BUZZ_AGENT_THINKING_EFFORT, +} from "./buzzAgentConfig"; import { AGENT_PARALLELISM_HELP, AGENT_PARALLELISM_PLACEHOLDER, } from "../lib/agentParallelism"; -import { BuzzAgentModelTuningFields } from "./buzzAgentModelTuningFields"; +import { + BuzzAgentModelTuningFields, + NumericTuningFields, +} from "./buzzAgentModelTuningFields"; import { CARD_MINT_KEY_ANNOTATIONS, PERSONA_FIELD_CONTROL_CLASS, PERSONA_FIELD_SHELL_CLASS, PERSONA_LABEL_OPTIONAL_CLASS, } from "./agentConfigOptions"; +import type { AcpRuntimeCatalogEntry } from "@/shared/api/types"; +import { + deriveNumericDescriptors, + structuredEnvKeys, + type RuntimeCatalogStatus, +} from "../lib/agentConfigCore"; export function PersonaAdvancedFields({ behaviorDraft, @@ -31,6 +44,8 @@ export function PersonaAdvancedFields({ requiredEnvKeys = [], fileSatisfiedEnvKeys = [], hiddenEnvKeys = [], + catalogStatus = "ready" as RuntimeCatalogStatus, + selectedRuntime, }: { behaviorDraft: PersonaBehaviorDraft; disabled: boolean; @@ -40,7 +55,7 @@ export function PersonaAdvancedFields({ inheritedEnvVars?: EnvVarsValue; /** Active LLM model — forwarded to BuzzAgentModelTuningFields for effort filtering. */ model?: string; - /** Runtime id for the buzz-agent tuning knobs visibility gate. */ + /** Runtime id for the buzz-agent effort-tuning knob visibility gate. */ modelTuningRuntimeId?: string; namePoolText: string; onBehaviorDraftChange: (value: PersonaBehaviorDraft) => void; @@ -51,7 +66,42 @@ export function PersonaAdvancedFields({ requiredEnvKeys?: readonly string[]; fileSatisfiedEnvKeys?: readonly string[]; hiddenEnvKeys?: readonly string[]; + /** + * Lifecycle status of the runtime catalog query. Controls the numeric-tuning + * gate and hidden-key behaviour: + * - `loading` or `error`: no structured controls; keys not hidden — saved + * values stay visible as generic rows. + * - `ready`: descriptors derived from `selectedRuntime` (empty when the + * runtime has no numeric env-var fields). + */ + catalogStatus?: RuntimeCatalogStatus; + /** + * The catalog entry for the selected runtime. Drives descriptor-based + * numeric tuning fields. When undefined after the catalog has settled, + * no numeric controls render. + */ + selectedRuntime?: AcpRuntimeCatalogEntry; }) { + // Numeric tuning descriptors — gate on catalog status so that loading/error + // never collapses to "no controls": keys stay visible as generic rows. + const numericDescriptors = React.useMemo( + () => + catalogStatus === "ready" + ? deriveNumericDescriptors(selectedRuntime) + : [], + [catalogStatus, selectedRuntime], + ); + + const effectiveHiddenKeys = React.useMemo( + () => [ + ...hiddenEnvKeys, + ...(isBuzzAgentRuntime(modelTuningRuntimeId) + ? [BUZZ_AGENT_THINKING_EFFORT] + : []), + ...structuredEnvKeys(numericDescriptors), + ], + [hiddenEnvKeys, modelTuningRuntimeId, numericDescriptors], + ); return (
- {/* Tier-1 buzz-agent model-tuning knobs — only shown for buzz-agent. */} + {/* Descriptor-driven numeric tuning knobs — shown when catalog has settled + and the runtime exposes numeric env-var fields. */} + {numericDescriptors.length > 0 ? ( + { + const next = { ...envVars }; + if (value === "") { + delete next[key]; + } else { + next[key] = value; + } + onEnvVarsChange(next); + }} + /> + ) : null} + + {/* Effort-tuning knob — only shown for buzz-agent. */} {isBuzzAgentRuntime(modelTuningRuntimeId) ? ( ) : null} {personas.createdAgent ? ( diff --git a/desktop/src/features/agents/ui/buzzAgentModelTuningFields.tsx b/desktop/src/features/agents/ui/buzzAgentModelTuningFields.tsx index 938d5edf5b..7fa87c4e6b 100644 --- a/desktop/src/features/agents/ui/buzzAgentModelTuningFields.tsx +++ b/desktop/src/features/agents/ui/buzzAgentModelTuningFields.tsx @@ -9,14 +9,13 @@ import * as React from "react"; import { Input } from "@/shared/ui/input"; import { cn } from "@/shared/lib/cn"; import type { EnvVarsValue } from "./EnvVarsEditor"; +import type { NumericDescriptor } from "../lib/agentConfigCore"; +import { numericTuningPlaceholder } from "../lib/agentConfigCore"; import { AgentDropdownSelect, type AgentDropdownOption, } from "./agentConfigControls"; import { - BUZZ_AGENT_MAX_CONTEXT_TOKENS, - BUZZ_AGENT_MAX_OUTPUT_TOKENS, - BUZZ_AGENT_MAX_ROUNDS, BUZZ_AGENT_THINKING_EFFORT, BUZZ_AGENT_THINKING_EFFORT_VALUES, getProviderEffortConfig, @@ -201,6 +200,98 @@ export function useEffortAutoClear({ }, [effortValid, currentEffort]); } +export type { NumericDescriptor }; + +const NUMERIC_KIND_LABELS: Record = { + maxOutputTokens: "Max output tokens", + contextLimit: "Context limit", + maxRounds: "Max rounds", +}; + +const NUMERIC_KIND_DESCRIPTIONS: Record = { + maxOutputTokens: + "Maximum tokens the LLM may generate per response. Leave blank to inherit.", + contextLimit: + "Maximum context window tokens tracked before a handoff. Leave blank to inherit.", + maxRounds: + "Maximum LLM + tool-call rounds per turn. 0 = unlimited. Leave blank to inherit.", +}; + +const NUMERIC_KIND_TEST_IDS: Record = { + maxOutputTokens: "numeric-max-output-tokens-input", + contextLimit: "numeric-context-limit-input", + maxRounds: "numeric-max-rounds-input", +}; + +/** + * Input `min` attribute per numeric kind. + * + * - `maxOutputTokens` / `contextLimit`: minimum 1 — the buzz-agent runtime + * rejects 0 for these fields (crates/buzz-agent/src/config.rs:921-928). + * - `maxRounds`: 0 is valid (means unlimited). + */ +export const NUMERIC_KIND_MIN: Record = { + maxOutputTokens: 1, + contextLimit: 1, + maxRounds: 0, +}; + +/** + * Descriptor-driven numeric tuning inputs. + * + * Renders a grid of number inputs for every numeric descriptor in `descriptors`. + * Label and help text are keyed by descriptor kind — the same copy renders on + * both the global defaults surface and per-agent dialogs. + */ +export function NumericTuningFields({ + descriptors, + envVars, + inheritedEnvVars, + onEnvVarChange, +}: { + /** Numeric descriptors to render. Empty array → renders nothing. */ + descriptors: NumericDescriptor[]; + envVars: EnvVarsValue; + inheritedEnvVars: EnvVarsValue; + onEnvVarChange: (key: string, value: string) => void; +}) { + if (descriptors.length === 0) return null; + return ( +
+ {descriptors.map((d) => { + const key = d.currentPersistence.key; + const label = NUMERIC_KIND_LABELS[d.kind]; + const description = NUMERIC_KIND_DESCRIPTIONS[d.kind]; + const testId = NUMERIC_KIND_TEST_IDS[d.kind]; + const inheritedVal = inheritedEnvVars[key]; + return ( +
+ + onEnvVarChange(key, event.target.value)} + placeholder={numericTuningPlaceholder(inheritedVal)} + step="1" + type="number" + value={envVars[key] ?? ""} + /> +

+ {description} +

+
+ ); + })} +
+ ); +} + export function BuzzAgentModelTuningFields({ envVars, inheritedEnvVars, @@ -257,105 +348,6 @@ export function BuzzAgentModelTuningFields({ blank to inherit from the global or persona default.

- - {/* Max Rounds */} -
- - - onEnvVarChange(BUZZ_AGENT_MAX_ROUNDS, event.target.value) - } - placeholder={ - inheritedEnvVars[BUZZ_AGENT_MAX_ROUNDS] - ? `Inherit (${inheritedEnvVars[BUZZ_AGENT_MAX_ROUNDS]})` - : "Inherit (agent default)" - } - step="1" - type="number" - value={envVars[BUZZ_AGENT_MAX_ROUNDS] ?? ""} - /> -

- Maximum LLM + tool-call rounds per turn. 0 = unlimited. Leave blank - to inherit. -

-
- - {/* Max Output Tokens */} -
- - - onEnvVarChange(BUZZ_AGENT_MAX_OUTPUT_TOKENS, event.target.value) - } - placeholder={ - inheritedEnvVars[BUZZ_AGENT_MAX_OUTPUT_TOKENS] - ? `Inherit (${inheritedEnvVars[BUZZ_AGENT_MAX_OUTPUT_TOKENS]})` - : "Inherit (agent default)" - } - step="1" - type="number" - value={envVars[BUZZ_AGENT_MAX_OUTPUT_TOKENS] ?? ""} - /> -

- Maximum tokens the LLM may generate per response. Leave blank to - inherit. -

-
- - {/* Context Limit */} -
- - - onEnvVarChange(BUZZ_AGENT_MAX_CONTEXT_TOKENS, event.target.value) - } - placeholder={ - inheritedEnvVars[BUZZ_AGENT_MAX_CONTEXT_TOKENS] - ? `Inherit (${inheritedEnvVars[BUZZ_AGENT_MAX_CONTEXT_TOKENS]})` - : "Inherit (agent default)" - } - step="1" - type="number" - value={envVars[BUZZ_AGENT_MAX_CONTEXT_TOKENS] ?? ""} - /> -

- Maximum context window tokens buzz-agent tracks before a handoff. - Leave blank to inherit. -

-
); diff --git a/desktop/src/features/agents/useAgentManagement.ts b/desktop/src/features/agents/useAgentManagement.ts index f4cdb895ef..066f7949a9 100644 --- a/desktop/src/features/agents/useAgentManagement.ts +++ b/desktop/src/features/agents/useAgentManagement.ts @@ -301,7 +301,11 @@ export function useAgentManagement() { ...createdAgentAttachment, isPending, runtimes: runtimesQuery.data ?? [], - runtimesLoading: runtimesQuery.isLoading, + runtimeCatalogStatus: runtimesQuery.isLoading + ? ("loading" as const) + : runtimesQuery.isError + ? ("error" as const) + : ("ready" as const), submitCreate, submitUpdate, dismiss, diff --git a/desktop/src/features/profile/ui/UserProfilePanel.tsx b/desktop/src/features/profile/ui/UserProfilePanel.tsx index af30728d6a..cb188dd008 100644 --- a/desktop/src/features/profile/ui/UserProfilePanel.tsx +++ b/desktop/src/features/profile/ui/UserProfilePanel.tsx @@ -957,6 +957,7 @@ export function UserProfilePanel({ personaToExportSnapshot={personaToExportSnapshot} resolvedPersona={resolvedPersona} runtimes={acpRuntimesQuery.data ?? []} + runtimesError={acpRuntimesQuery.isError} runtimesLoading={acpRuntimesQuery.isLoading} updateError={ updatePersonaMutation.error instanceof Error diff --git a/desktop/src/features/profile/ui/UserProfilePersonaDialogs.tsx b/desktop/src/features/profile/ui/UserProfilePersonaDialogs.tsx index 2de2e2f716..9fae1bd889 100644 --- a/desktop/src/features/profile/ui/UserProfilePersonaDialogs.tsx +++ b/desktop/src/features/profile/ui/UserProfilePersonaDialogs.tsx @@ -29,6 +29,7 @@ export function UserProfilePersonaDialogs({ resolvedPersona, runtimes, runtimesLoading, + runtimesError = false, updateError, onCloseCardMint, onCloseDelete, @@ -50,6 +51,7 @@ export function UserProfilePersonaDialogs({ resolvedPersona: AgentPersona | undefined; runtimes: AcpRuntimeCatalogEntry[]; runtimesLoading: boolean; + runtimesError?: boolean; updateError: Error | null; onCloseCardMint: () => void; onCloseDelete: () => void; @@ -59,6 +61,11 @@ export function UserProfilePersonaDialogs({ onExportSnapshot: (persona: AgentPersona) => void; onSubmit: (input: CreatePersonaInput | UpdatePersonaInput) => Promise; }) { + const runtimeCatalogStatus = runtimesLoading + ? "loading" + : runtimesError + ? "error" + : ("ready" as const); return ( <> { if (!open) { onCloseDialog(); diff --git a/desktop/src/shared/api/tauri.ts b/desktop/src/shared/api/tauri.ts index 69e2e455ec..bb56bc18e5 100644 --- a/desktop/src/shared/api/tauri.ts +++ b/desktop/src/shared/api/tauri.ts @@ -188,6 +188,9 @@ export type RawAcpRuntimeCatalogEntry = { model_env_var?: string | null; provider_env_var?: string | null; thinking_env_var?: string | null; + max_tokens_env_var?: string | null; + context_limit_env_var?: string | null; + max_rounds_env_var?: string | null; install_hint: string; install_instructions_url: string; can_auto_install: boolean; @@ -199,10 +202,7 @@ export type RawAcpRuntimeCatalogEntry = { auth_status: AuthStatus; login_hint?: string; source: "builtin" | "preset" | "custom"; - /** - * Definition-level env vars for `source: custom` entries. - * Omitted/absent for builtin and preset — skipped in Rust serialization when empty. - */ + /** Definition-level env vars for `source: custom` entries; absent for builtin/preset. */ definition_env?: Record; }; @@ -749,6 +749,9 @@ export function fromRawAcpRuntimeCatalogEntry( modelEnvVar: entry.model_env_var ?? null, providerEnvVar: entry.provider_env_var ?? null, thinkingEnvVar: entry.thinking_env_var ?? null, + maxTokensEnvVar: entry.max_tokens_env_var ?? null, + contextLimitEnvVar: entry.context_limit_env_var ?? null, + maxRoundsEnvVar: entry.max_rounds_env_var ?? null, installHint: entry.install_hint, installInstructionsUrl: entry.install_instructions_url, canAutoInstall: entry.can_auto_install, @@ -1024,9 +1027,8 @@ export type RuntimeFileConfigSubset = { }; /** - * Get the file-layer config for a runtime so dialogs can show - * "Set in goose config" instead of surfacing a false required-field marker. - * Returns `null` when the runtime has no config file or it cannot be parsed. + * Get the file-layer config for a runtime so dialogs can show "Set in goose config" instead of + * surfacing a false required-field marker. Returns `null` when unavailable or unparseable. */ export async function getRuntimeFileConfig( runtimeId: string, @@ -1040,13 +1042,9 @@ export async function getRuntimeFileConfig( } /** - * Return the key names of all non-empty baked build env vars. - * - * Internal (Block) builds bake provider credentials into the binary at compile - * time. This returns the *key names only* — never the values — so dialogs can - * treat them as satisfied without exposing secrets to the frontend. - * - * OSS builds return an empty array (no baked env). + * Return the key names of all non-empty baked build env vars. Internal (Block) builds bake + * provider credentials into the binary at compile time; this returns *key names only* (never + * values) so dialogs treat them as satisfied without exposing secrets. OSS builds return []. */ export async function getBakedBuildEnvKeys(): Promise { return invokeTauri("get_baked_build_env_keys"); diff --git a/desktop/src/shared/api/types.ts b/desktop/src/shared/api/types.ts index d0e8ee0047..fd2c71bced 100644 --- a/desktop/src/shared/api/types.ts +++ b/desktop/src/shared/api/types.ts @@ -517,6 +517,9 @@ export type AcpRuntimeCatalogEntry = { providerEnvVar: string | null; /** Environment variable used to apply thinking effort, when supported. */ thinkingEnvVar: string | null; + maxTokensEnvVar: string | null; + contextLimitEnvVar: string | null; + maxRoundsEnvVar: string | null; installHint: string; installInstructionsUrl: string; canAutoInstall: boolean; @@ -529,12 +532,7 @@ export type AcpRuntimeCatalogEntry = { authStatus: AuthStatus; /** Hint for completing authentication; null when not applicable or already logged in. */ loginHint: string | null; - /** - * Whether this entry is compiled into the app ("builtin"), a bundled preset - * ("preset" — PATH-probed, not editable/deletable), or loaded from a user - * JSON file in `custom_harnesses/` ("custom"). Controls editability in the - * UI — only "custom" entries can be edited or deleted. - */ + /** "builtin" (compiled in), "preset" (PATH-probed, not editable), or "custom" (user JSON). Controls UI editability. */ source: "builtin" | "preset" | "custom"; /** * Definition-level environment variables for `source: custom` entries. diff --git a/desktop/src/testing/e2eBridge.ts b/desktop/src/testing/e2eBridge.ts index 6520dd760d..9c6618c83a 100644 --- a/desktop/src/testing/e2eBridge.ts +++ b/desktop/src/testing/e2eBridge.ts @@ -74,7 +74,7 @@ type MockCommandAvailability = { resolvedPath?: string | null; }; -type MockManagedAgentSeed = { +export type MockManagedAgentSeed = { pubkey: string; name: string; avatarUrl?: string | null; @@ -91,6 +91,8 @@ type MockManagedAgentSeed = { autoRestartOnConfigChange?: boolean; respondTo?: RawManagedAgent["respond_to"]; respondToAllowlist?: string[]; + /** Per-agent env vars seeded into the mock store. */ + envVars?: Record; }; type MockManagedAgentRuntimeSeed = { @@ -214,6 +216,8 @@ type E2eConfig = { /** Catalog responses for successive discovery calls. The final response repeats. */ acpRuntimesCatalogSequence?: RawAcpRuntimeCatalogEntry[][]; acpRuntimesDelayMs?: number; + /** When true, the catalog discovery call throws — simulates a failed query. */ + acpRuntimesError?: boolean; acpAuthMethods?: Record; acpAuthMethodsErrors?: Record; acpAuthMethodsError?: string; @@ -2086,6 +2090,24 @@ function buildSeededManagedAgent(seed: MockManagedAgentSeed): MockManagedAgent { const now = new Date().toISOString(); const status = seed.status ?? "stopped"; + // Resolve agent_command and agent_args from the well-known default catalog + // so the fixture mirrors real wire shape. Hardcoding ["acp"] for all runtimes + // is incorrect: buzz-agent ships with no default args. + const DEFAULT_RUNTIME_COMMAND: Record< + string, + { command: string; args: string[] } + > = { + goose: { command: "goose", args: ["acp"] }, + "buzz-agent": { command: "buzz-agent", args: [] }, + claude: { command: "claude", args: [] }, + codex: { command: "codex", args: [] }, + }; + const catalogEntry = seed.runtime + ? DEFAULT_RUNTIME_COMMAND[seed.runtime] + : undefined; + const agentCommand = catalogEntry?.command ?? seed.runtime ?? "goose"; + const agentArgs = catalogEntry?.args ?? ["acp"]; + return { pubkey: seed.pubkey, name: seed.name, @@ -2095,8 +2117,8 @@ function buildSeededManagedAgent(seed: MockManagedAgentSeed): MockManagedAgent { runtime: seed.runtime ?? null, relay_url: DEFAULT_RELAY_WS_URL, acp_command: "buzz-acp", - agent_command: "goose", - agent_args: ["acp"], + agent_command: agentCommand, + agent_args: agentArgs, mcp_command: "", turn_timeout_seconds: 320, idle_timeout_seconds: null, @@ -2105,7 +2127,7 @@ function buildSeededManagedAgent(seed: MockManagedAgentSeed): MockManagedAgent { system_prompt: null, avatar_url: seed.avatarUrl ?? null, model: null, - env_vars: {}, + env_vars: { ...(seed.envVars ?? {}) }, status, pid: status === "running" ? 42000 + mockManagedAgents.length : null, created_at: now, @@ -7165,6 +7187,28 @@ function withMockRuntimeConfigMetadata( : runtime.id === "goose" ? "GOOSE_THINKING_EFFORT" : null, + max_tokens_env_var: + "max_tokens_env_var" in runtime + ? runtime.max_tokens_env_var + : runtime.id === "buzz-agent" + ? "BUZZ_AGENT_MAX_OUTPUT_TOKENS" + : runtime.id === "goose" + ? "GOOSE_MAX_TOKENS" + : null, + context_limit_env_var: + "context_limit_env_var" in runtime + ? runtime.context_limit_env_var + : runtime.id === "buzz-agent" + ? "BUZZ_AGENT_MAX_CONTEXT_TOKENS" + : runtime.id === "goose" + ? "GOOSE_CONTEXT_LIMIT" + : null, + max_rounds_env_var: + "max_rounds_env_var" in runtime + ? runtime.max_rounds_env_var + : runtime.id === "buzz-agent" + ? "BUZZ_AGENT_MAX_ROUNDS" + : null, }; } @@ -7182,6 +7226,10 @@ async function handleDiscoverAcpRuntimes( }); } + if (config?.mock?.acpRuntimesError) { + throw new Error("Mocked catalog discovery failure"); + } + const afterInstallSequence = config?.mock?.acpRuntimesCatalogAfterInstallSequence; if (mockInstallCompleted && afterInstallSequence?.length) { diff --git a/desktop/tests/e2e/agent-numeric-tuning.spec.ts b/desktop/tests/e2e/agent-numeric-tuning.spec.ts new file mode 100644 index 0000000000..dc70c8b12e --- /dev/null +++ b/desktop/tests/e2e/agent-numeric-tuning.spec.ts @@ -0,0 +1,372 @@ +/** + * Playwright regression tests for the numeric tuning fields (max output tokens, + * context limit, max rounds) on both the global Agent Defaults surface and the + * per-agent Advanced section. + * + * Covers: + * 1. Global defaults Advanced shows numeric inputs for buzz-agent. + * 2. Global defaults Advanced hides numeric inputs for non-capable runtimes. + * 3. Per-agent Goose: saving a max-tokens value globally surfaces as + * Inherit () placeholder in the per-agent edit dialog. + * 4. Delayed catalog: while loading, saved tuning env vars stay visible + * as generic rows (not silently dropped); structured controls appear + * once the catalog settles. + * 5. Failed catalog: when discovery errors, saved tuning env vars remain + * visible as generic rows (never the "unsupported" empty state). + */ + +import { expect, test } from "@playwright/test"; +import { installMockBridge, TEST_IDENTITIES } from "../helpers/bridge"; + +// ── Helpers ──────────────────────────────────────────────────────────────── + +async function openAiDefaultsSettings(page: import("@playwright/test").Page) { + await page.goto("/", { waitUntil: "domcontentloaded" }); + await page.getByTestId("open-settings").click(); + await page.getByTestId("profile-popover-settings").click(); + await expect(page.getByTestId("settings-view")).toBeVisible(); + await page.getByTestId("settings-nav-agents").click(); + await expect(page.getByTestId("settings-global-agent-config")).toBeVisible({ + timeout: 10_000, + }); + await expect(page.locator(".animate-spin").first()).not.toBeVisible({ + timeout: 5_000, + }); +} + +async function openEditAgentDialog( + page: import("@playwright/test").Page, + agentName: string, +) { + await page.goto("/"); + await page.getByTestId("open-agents-view").click(); + + const agentButton = page.getByRole("button", { + name: `${agentName} agent profile`, + }); + await expect(agentButton).toBeVisible({ timeout: 10_000 }); + await agentButton.click(); + await expect(page.getByTestId("user-profile-panel")).toBeVisible({ + timeout: 10_000, + }); + await page.getByTestId("user-profile-edit-agent").click(); + await expect(page.getByTestId("edit-agent-dialog")).toBeVisible({ + timeout: 10_000, + }); +} + +// ── Tests ────────────────────────────────────────────────────────────────── + +test("global_advanced_buzz_agent_shows_all_numeric_controls", async ({ + page, +}) => { + // The mock bridge's withMockRuntimeConfigMetadata injects the numeric env var + // fields for buzz-agent. When buzz-agent is selected and Advanced is opened, + // all three numeric inputs must be visible. + await installMockBridge(page, { + acpRuntimesCatalog: [ + { + id: "buzz-agent", + label: "Buzz Agent", + avatar_url: "", + availability: "available", + command: "buzz-agent", + binary_path: "/usr/local/bin/buzz-agent", + default_args: [], + mcp_command: null, + install_hint: "Ships with the Buzz desktop app.", + install_instructions_url: "https://github.com/block/buzz", + can_auto_install: false, + underlying_cli_path: null, + auth_status: { status: "not_applicable" }, + }, + ], + globalAgentConfig: { + env_vars: {}, + provider: "anthropic", + model: null, + preferred_runtime: "buzz-agent", + }, + }); + + await openAiDefaultsSettings(page); + + // Open the Advanced section. The settings card uses disclosure="full" (no + // animation wrapper), so we click the toggle and wait for content directly. + await page.getByTestId("global-agent-advanced-toggle").click(); + + // All three numeric inputs must be present for buzz-agent. + await expect(page.getByTestId("numeric-max-output-tokens-input")).toBeVisible( + { timeout: 5_000 }, + ); + await expect(page.getByTestId("numeric-context-limit-input")).toBeVisible(); + await expect(page.getByTestId("numeric-max-rounds-input")).toBeVisible(); +}); + +test("global_advanced_non_capable_runtime_hides_numeric_controls", async ({ + page, +}) => { + // Claude has no numeric tuning env vars (contextLimitEnvVar = null etc.). + // After selecting Claude, the Advanced section must show no numeric inputs. + await installMockBridge(page, { + acpRuntimesCatalog: [ + { + id: "claude", + label: "Claude Code", + avatar_url: "", + availability: "available", + command: "/usr/local/bin/claude-agent", + binary_path: "/usr/local/bin/claude-agent", + default_args: ["acp"], + mcp_command: null, + install_hint: "Install via npm.", + install_instructions_url: "https://example.com", + can_auto_install: true, + underlying_cli_path: "/usr/local/bin/claude", + auth_status: { status: "logged_in" }, + }, + ], + globalAgentConfig: { + env_vars: {}, + provider: null, + model: null, + preferred_runtime: "claude", + }, + }); + + await openAiDefaultsSettings(page); + + await page.getByTestId("global-agent-advanced-toggle").click(); + + // No numeric inputs must render for a non-capable runtime. + await expect(page.getByTestId("numeric-max-output-tokens-input")).toHaveCount( + 0, + ); + await expect(page.getByTestId("numeric-context-limit-input")).toHaveCount(0); + await expect(page.getByTestId("numeric-max-rounds-input")).toHaveCount(0); +}); + +test("goose_per_agent_advanced_max_tokens_shows_inherited_global_placeholder", async ({ + page, +}) => { + // Save GOOSE_MAX_TOKENS = 16384 in the global Agent Defaults settings via + // the UI, then open a Goose agent's edit dialog. The max-output-tokens input + // must show "Inherit (16384)" — the globally-saved value surfaced via the + // inherited placeholder. + await installMockBridge(page, { + globalAgentConfig: { + env_vars: { ANTHROPIC_API_KEY: "sk-ant-test-key" }, + provider: "anthropic", + model: "claude-opus-4-5", + preferred_runtime: "goose", + }, + managedAgents: [ + { + pubkey: TEST_IDENTITIES.tyler.pubkey, + name: "Tyler Agent", + runtime: "goose", + status: "stopped", + channelNames: ["agents"], + }, + ], + }); + + // Step 1: open global defaults, expand Advanced, enter the max-tokens value. + await openAiDefaultsSettings(page); + await page.getByTestId("global-agent-advanced-toggle").click(); + await expect(page.getByTestId("numeric-max-output-tokens-input")).toBeVisible( + { timeout: 5_000 }, + ); + await page.getByTestId("numeric-max-output-tokens-input").click(); + await page + .getByTestId("numeric-max-output-tokens-input") + .pressSequentially("16384"); + // Blur to ensure React's change event fires for the number input. + await page.keyboard.press("Tab"); + + // Step 2: save the global defaults. + await expect(page.getByRole("button", { name: "Save defaults" })).toBeEnabled( + { timeout: 5_000 }, + ); + await page.getByRole("button", { name: "Save defaults" }).click(); + // Wait for the save to complete: the button returns to disabled (dirty resets). + await expect( + page.getByRole("button", { name: "Save defaults" }), + ).toBeDisabled({ timeout: 5_000 }); + + // Step 3: navigate back and open the per-agent edit dialog for the Goose + // agent. We use the app's Back link rather than page.goto("/") to preserve + // the in-memory mock state (page.goto causes a full reload that resets it). + await page.getByRole("button", { name: "Back to app" }).click(); + await page.getByTestId("open-agents-view").click(); + const agentButton = page.getByRole("button", { + name: "Tyler Agent agent profile", + }); + await expect(agentButton).toBeVisible({ timeout: 10_000 }); + await agentButton.click(); + await expect(page.getByTestId("user-profile-panel")).toBeVisible({ + timeout: 10_000, + }); + await page.getByTestId("user-profile-edit-agent").click(); + await expect(page.getByTestId("edit-agent-dialog")).toBeVisible({ + timeout: 10_000, + }); + + // Wait for the provider field — signals the catalog and dialog have settled. + await expect(page.locator("#edit-agent-llm-provider")).toBeVisible({ + timeout: 10_000, + }); + + // Open the Advanced section. + await page.getByRole("button", { name: "Advanced", exact: true }).click(); + await expect(page.getByTestId("numeric-max-output-tokens-input")).toBeVisible( + { timeout: 5_000 }, + ); + + // The placeholder must reflect the globally-saved value. + await expect( + page.getByTestId("numeric-max-output-tokens-input"), + ).toHaveAttribute("placeholder", "Inherit (16384)"); +}); + +test("delayed_catalog_per_agent_saved_tuning_values_visible_then_structured_controls_appear", async ({ + page, +}) => { + // Scenario: catalog takes 5 seconds to respond (simulates slow discovery). + // The per-agent edit dialog opens. While the catalog is still in flight, + // saved tuning env vars must not be dropped from view — they appear as + // generic env rows (no hiddenKeys applied yet). Once the catalog settles, + // the structured numeric controls replace the generic rows. + await installMockBridge(page, { + acpRuntimesCatalog: [ + { + id: "buzz-agent", + label: "Buzz Agent", + avatar_url: "", + availability: "available", + command: "buzz-agent", + binary_path: "/usr/local/bin/buzz-agent", + default_args: [], + mcp_command: null, + install_hint: "Ships with the Buzz desktop app.", + install_instructions_url: "https://github.com/block/buzz", + can_auto_install: false, + underlying_cli_path: null, + auth_status: { status: "not_applicable" }, + }, + ], + // 5-second delay: generous enough that the dialog opens and Advanced is + // expanded while the catalog query is still in-flight (navigation takes + // ~1-2 s), but short enough to keep the test under 30 s. + acpRuntimesDelayMs: 5000, + globalAgentConfig: { + env_vars: {}, + provider: "anthropic", + model: null, + preferred_runtime: "buzz-agent", + }, + managedAgents: [ + { + pubkey: TEST_IDENTITIES.tyler.pubkey, + name: "Tyler Agent", + runtime: "buzz-agent", + status: "stopped", + channelNames: ["agents"], + envVars: { + BUZZ_AGENT_MAX_OUTPUT_TOKENS: "4096", + BUZZ_AGENT_MAX_ROUNDS: "25", + }, + }, + ], + }); + + await openEditAgentDialog(page, "Tyler Agent"); + + // Open Advanced before the catalog has settled (the dialog opens quickly; + // the catalog query fires when the dialog opens and takes ~5 seconds). + await page.getByRole("button", { name: "Advanced", exact: true }).click(); + + // While loading: structured numeric controls must NOT be visible yet — + // the catalog-settling gate withholds them. + await expect(page.getByTestId("numeric-max-output-tokens-input")).toHaveCount( + 0, + ); + + // The saved tuning env vars must be visible as generic rows (not hidden) + // while the catalog hasn't settled: BUZZ_AGENT_MAX_OUTPUT_TOKENS and + // BUZZ_AGENT_MAX_ROUNDS should appear in the env-vars editor. + await expect( + page.locator( + 'input[data-testid="env-vars-key"][value="BUZZ_AGENT_MAX_OUTPUT_TOKENS"]', + ), + ).toBeVisible(); + await expect( + page.locator( + 'input[data-testid="env-vars-key"][value="BUZZ_AGENT_MAX_ROUNDS"]', + ), + ).toBeVisible(); + + // After the catalog settles (allow up to 8 s — 5 s delay + margin): + // structured controls appear, replacing the generic rows. + await expect(page.getByTestId("numeric-max-output-tokens-input")).toBeVisible( + { timeout: 8_000 }, + ); + await expect(page.getByTestId("numeric-max-rounds-input")).toBeVisible({ + timeout: 8_000, + }); +}); + +test("failed_catalog_per_agent_saved_tuning_values_remain_visible_as_generic_rows", async ({ + page, +}) => { + // Scenario: catalog discovery fails (network error / IPC rejection). + // The per-agent edit dialog opens. The saved tuning env vars must remain + // visible as generic rows — the error state must never produce the + // "unsupported" no-controls state that would hide persisted values. + await installMockBridge(page, { + acpRuntimesError: true, + globalAgentConfig: { + env_vars: {}, + provider: "anthropic", + model: null, + preferred_runtime: "buzz-agent", + }, + managedAgents: [ + { + pubkey: TEST_IDENTITIES.tyler.pubkey, + name: "Tyler Agent", + runtime: "buzz-agent", + status: "stopped", + channelNames: ["agents"], + envVars: { + BUZZ_AGENT_MAX_OUTPUT_TOKENS: "8192", + BUZZ_AGENT_MAX_ROUNDS: "10", + }, + }, + ], + }); + + await openEditAgentDialog(page, "Tyler Agent"); + + // Open Advanced after a brief wait (query has had time to fail). + await page.waitForTimeout(500); + await page.getByRole("button", { name: "Advanced", exact: true }).click(); + + // Structured numeric controls must NOT render (catalog errored — no runtime). + await expect(page.getByTestId("numeric-max-output-tokens-input")).toHaveCount( + 0, + ); + + // Saved tuning values must still be visible as generic env rows — the error + // state must never hide persisted values with no editor to replace them. + await expect( + page.locator( + 'input[data-testid="env-vars-key"][value="BUZZ_AGENT_MAX_OUTPUT_TOKENS"]', + ), + ).toBeVisible({ timeout: 5_000 }); + await expect( + page.locator( + 'input[data-testid="env-vars-key"][value="BUZZ_AGENT_MAX_ROUNDS"]', + ), + ).toBeVisible(); +}); diff --git a/desktop/tests/helpers/bridge.ts b/desktop/tests/helpers/bridge.ts index 830a82879a..45766d25b6 100644 --- a/desktop/tests/helpers/bridge.ts +++ b/desktop/tests/helpers/bridge.ts @@ -1,5 +1,6 @@ import type { Page } from "@playwright/test"; import type { ChannelTemplate, RelayEvent } from "../../src/shared/api/types"; +import type { MockManagedAgentSeed } from "../../src/testing/e2eBridge"; import { FEATURE_OVERRIDES_STORAGE_KEY, PREVIEW_FEATURE_IDS } from "./features"; export const TEST_IDENTITIES = { @@ -43,24 +44,6 @@ type MockCommandAvailability = { resolvedPath?: string | null; }; -type MockManagedAgentSeed = { - pubkey: string; - name: string; - personaId?: string | null; - status?: "running" | "stopped" | "deployed" | "not_deployed"; - channelNames?: string[]; - channelIds?: string[]; - backend?: - | { type: "local" } - | { type: "provider"; id: string; config: Record }; - lastError?: string | null; - lastErrorCode?: number | null; - needsRestart?: boolean; - autoRestartOnConfigChange?: boolean; - respondTo?: "owner-only" | "allowlist" | "anyone"; - respondToAllowlist?: string[]; -}; - type MockSearchProfileSeed = { pubkey: string; displayName: string | null; @@ -199,6 +182,8 @@ type MockBridgeOptions = { /** Catalog responses for successive discovery calls. The final response repeats. */ acpRuntimesCatalogSequence?: Record[][]; acpRuntimesDelayMs?: number; + /** When true, the mock catalog discovery command throws an error. */ + acpRuntimesError?: boolean; acpAuthMethods?: Record[] }>; acpAuthMethodsError?: string; /** When set, the `delete_custom_harness` mock command throws with this message. */ From ede8d22dd5b336f146e0a6d760fd9dff78a42613 Mon Sep 17 00:00:00 2001 From: Taylor Ho Date: Mon, 3 Aug 2026 16:23:55 -0700 Subject: [PATCH 23/27] feat(mobile): bring channel menus to desktop parity (#3940) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Overview **Category:** improvement **User Impact:** Mobile users can now access consistent channel and DM actions from both the channel list and conversation header. **Problem:** Mobile channel menus exposed a narrower, inconsistent set of actions than desktop, and the available actions differed by entry point. **Solution:** This change introduces one reusable action sheet with a clear quick-action hierarchy, role-aware lifecycle controls, confirmations for consequential actions, and a deliberately narrower DM menu. ## Changes
File changes **mobile/lib/features/channels/channel_actions_sheet.dart** Adds the shared channel and DM action-sheet experience used by both entry points, including Star/Unstar and Read/Unread quick actions for channels, section movement, mute, management, inline copy actions, guarded lifecycle actions, confirmations, and a compact DM menu without quick actions. **mobile/lib/features/channels/channel_detail_page.dart** Routes the header ellipsis through the shared action sheet so the in-channel menu matches the channel-list experience, including for DMs. **mobile/lib/features/channels/channel_management_provider.dart** Adds archive and delete operations using the desktop-compatible relay event kinds and refreshes channel state after completion. **mobile/lib/features/channels/channels_page.dart** Makes the shared channel action-sheet entry point available to the channel-list implementation. **mobile/lib/features/channels/channels_page/channel_tile.dart** Replaces the tile-specific long-press menu with the reusable action sheet while preserving read state and section context. **mobile/test/features/channels/channel_actions_sheet_test.dart** Covers action hierarchy, owner/admin/member capability guards, loading and failure states, DM narrowing with no quick-action row, and inline copy actions. **mobile/test/features/channels/channel_detail_page_test.dart** Updates channel-header flows to exercise management through the new shared action sheet. **mobile/test/features/channels/channel_management_provider_test.dart** Verifies archive and delete event tags stay compatible with desktop behavior.
## Reproduction Steps 1. Run the mobile app and open a populated channel list. 2. Long-press a regular channel and verify the Star/Unstar and Read/Unread quick actions appear above Move to section…, Mute, Manage, Copy channel name, and Copy channel ID. 3. Choose either copy action and verify it copies the expected value. 4. Open a channel, tap the header ellipsis, and verify the same action sheet appears. 5. As an admin or owner, verify Archive appears; as an owner, verify Delete also appears. Confirm that lifecycle actions require confirmation. 6. Long-press or open the header menu for a DM and verify it has no quick-action row and starts with Mute, followed by Copy channel name and Copy channel ID. ## Screenshots ### Channel menu | Regular channel — Mark Unread | DM — no quick actions | Archive confirmation | |---|---|---| | ![Regular channel actions with Mark Unread](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/3940/final-regular-channel-mark-unread.png) | ![DM actions without quick actions](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/3940/final-dm-no-quick-actions.png) | ![Archive confirmation](https://d24qwcpro867f5.cloudfront.net/repos/buzz/prs/3940/final-archive-confirmation.png) | --------- Signed-off-by: Taylor Ho Co-authored-by: npub1223z34hd7vtwc6qj4s7flsxkj644nlre2nthu7lrrmkumhu3xddsrx9r6w <52a228d6edf316ec6812ac3c9fc0d696ab59fc7954d77e7be31eedcddf91335b@buzz.block.builderlab.xyz> --- .../channels/channel_actions_sheet.dart | 559 ++++++++++++++++++ .../channels/channel_detail_page.dart | 43 +- .../channels/channel_management_provider.dart | 44 ++ .../lib/features/channels/channels_page.dart | 1 + .../channels/channels_page/channel_tile.dart | 210 +------ .../channels/channel_actions_sheet_test.dart | 390 ++++++++++++ .../channels/channel_detail_page_test.dart | 45 +- .../channel_management_provider_test.dart | 22 + 8 files changed, 1082 insertions(+), 232 deletions(-) create mode 100644 mobile/lib/features/channels/channel_actions_sheet.dart create mode 100644 mobile/test/features/channels/channel_actions_sheet_test.dart diff --git a/mobile/lib/features/channels/channel_actions_sheet.dart b/mobile/lib/features/channels/channel_actions_sheet.dart new file mode 100644 index 0000000000..843ee992e6 --- /dev/null +++ b/mobile/lib/features/channels/channel_actions_sheet.dart @@ -0,0 +1,559 @@ +import 'package:flutter/material.dart'; +import 'package:hooks_riverpod/hooks_riverpod.dart'; +import 'package:lucide_icons_flutter/lucide_icons.dart'; + +import '../../shared/clipboard_utils.dart'; +import '../../shared/mentions/agent_identity_provider.dart'; +import '../../shared/theme/theme.dart'; +import '../../shared/widgets/buzz_loading_indicator.dart'; +import '../../shared/widgets/sheet_divider.dart'; +import 'channel.dart'; +import 'channel_management_provider.dart'; +import 'channel_mutes/channel_mutes_provider.dart'; +import 'channel_sections/channel_sections_provider.dart'; +import 'channel_stars/channel_stars_provider.dart'; +import 'channels_provider.dart'; +import 'manage_channel_sheet.dart'; +import 'read_state/read_state_provider.dart'; +import 'read_state/read_state_time.dart'; + +/// Opens the mobile channel actions sheet and returns whether its parent page +/// should close after a successful lifecycle action. +Future showChannelActionsSheet({ + required BuildContext context, + required Channel channel, + required bool isUnread, + VoidCallback? onMarkRead, + String? sectionId, +}) => showModalBottomSheet( + context: context, + isScrollControlled: true, + showDragHandle: true, + constraints: BoxConstraints( + maxWidth: 640, + maxHeight: MediaQuery.sizeOf(context).height * 0.7, + ), + builder: (_) => ChannelActionsSheet( + channel: channel, + isUnread: isUnread, + onMarkRead: onMarkRead, + sectionId: sectionId, + ), +); + +/// Mobile action sheet for channel-level read, organization, and lifecycle +/// operations. +class ChannelActionsSheet extends ConsumerWidget { + const ChannelActionsSheet({ + super.key, + required this.channel, + required this.isUnread, + this.onMarkRead, + this.sectionId, + }); + + final Channel channel; + final bool isUnread; + final VoidCallback? onMarkRead; + final String? sectionId; + + @override + Widget build(BuildContext context, WidgetRef ref) { + final isMuted = + ref.watch(channelMutesProvider).store.channels[channel.id]?.muted == + true; + final isStarred = + !channel.isDm && + ref.watch(channelStarsProvider).store.channels[channel.id]?.starred == + true; + final membersAsync = channel.isDm + ? const AsyncValue>.data([]) + : ref.watch(channelMembersProvider(channel.id)); + final agentOwnersAsync = channel.isDm + ? const AsyncValue>.data({}) + : ref.watch(agentOwnersProvider); + final currentPubkey = ref.watch(currentPubkeyProvider)?.toLowerCase(); + final currentMember = membersAsync.value?.cast().firstWhere( + (member) => member?.pubkey.toLowerCase() == currentPubkey, + orElse: () => null, + ); + final ownsOwnerAgent = + currentPubkey != null && + membersAsync.value?.any( + (member) => + member.isOwner && + agentOwnersAsync.value?[member.pubkey.toLowerCase()] + ?.toLowerCase() == + currentPubkey, + ) == + true; + final canManageLifecycle = + currentMember?.isElevated == true || ownsOwnerAgent; + final canArchive = !channel.isArchived && canManageLifecycle; + final canUnarchive = channel.isArchived && canManageLifecycle; + final canDelete = + !channel.isArchived && + (currentMember?.isOwner == true || ownsOwnerAgent); + final lifecycleCapabilitiesLoading = + membersAsync.isLoading || agentOwnersAsync.isLoading; + final lifecycleCapabilitiesUnavailable = + membersAsync.hasError || agentOwnersAsync.hasError; + + void close() => Navigator.of(context).pop(); + + return SafeArea( + top: false, + child: SingleChildScrollView( + padding: const EdgeInsets.fromLTRB( + Grid.gutter, + 0, + Grid.gutter, + Grid.xs, + ), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + if (!channel.isDm) ...[ + _ChannelQuickActionsRow( + isStarred: isStarred, + isUnread: isUnread, + onToggleStar: () { + close(); + final notifier = ref.read(channelStarsProvider.notifier); + isStarred + ? notifier.unstarChannel(channel.id) + : notifier.starChannel(channel.id); + }, + onToggleRead: () { + close(); + final timestamp = dateTimeToUnixSeconds( + channel.lastMessageAt, + ); + if (isUnread) { + onMarkRead?.call(); + if (timestamp != null) { + ref + .read(readStateProvider.notifier) + .markContextRead( + channel.id, + timestamp, + clearForcedMessages: true, + ); + ref + .read(channelsProvider.notifier) + .clearObservedUnreadCoveredByRead( + channel.id, + timestamp, + ); + } + } else { + ref + .read(readStateProvider.notifier) + .markContextUnread(channel.id, channelId: channel.id); + } + }, + ), + const SizedBox(height: Grid.xs), + ], + if (!channel.isDm) + ListTile( + leading: const Icon(LucideIcons.folderInput), + title: const Text('Move to section…'), + onTap: () async { + final pageContext = Navigator.of( + context, + rootNavigator: true, + ).context; + close(); + await _showMoveSectionSheet( + pageContext, + ref, + channel: channel, + sectionId: sectionId, + ); + }, + ), + ListTile( + leading: Icon(isMuted ? LucideIcons.bell : LucideIcons.bellOff), + title: Text(isMuted ? 'Unmute channel' : 'Mute channel'), + onTap: () { + close(); + final notifier = ref.read(channelMutesProvider.notifier); + isMuted + ? notifier.unmuteChannel(channel.id) + : notifier.muteChannel(channel.id); + }, + ), + if (!channel.isDm) + ListTile( + leading: const Icon(LucideIcons.settings), + title: const Text('Manage channel'), + onTap: () async { + final shouldClose = await showModalBottomSheet( + context: context, + isScrollControlled: true, + showDragHandle: true, + constraints: BoxConstraints( + maxWidth: 640, + maxHeight: MediaQuery.sizeOf(context).height * 0.9, + ), + builder: (_) => ManageChannelSheet(channel: channel), + ); + if (shouldClose == true && context.mounted) { + Navigator.of(context).pop(true); + } + }, + ), + ListTile( + leading: const Icon(LucideIcons.copy), + title: const Text('Copy channel name'), + onTap: () { + close(); + copyToClipboard( + context, + channel.name, + message: 'Channel name copied to clipboard', + ); + }, + ), + ListTile( + leading: const Icon(LucideIcons.hash), + title: const Text('Copy channel ID'), + onTap: () { + close(); + copyToClipboard( + context, + channel.id, + message: 'Channel ID copied to clipboard', + ); + }, + ), + if (!channel.isDm) ...[ + const SheetDivider(), + if (channel.isMember && !channel.isArchived) + _ActionTile( + icon: LucideIcons.logOut, + label: 'Leave channel', + destructive: true, + onTap: () => _confirmAndRun( + context, + ref, + title: 'Leave #${channel.name}?', + body: 'You’ll stop receiving messages from this channel.', + confirmLabel: 'Leave', + action: () => ref + .read(channelActionsProvider) + .leaveChannel(channel.id), + ), + ), + if (lifecycleCapabilitiesLoading) + const ListTile( + enabled: false, + leading: BuzzLoadingIndicator( + size: 20, + semanticLabel: 'Loading channel actions', + ), + title: Text('Loading channel actions…'), + ) + else if (lifecycleCapabilitiesUnavailable) + const ListTile( + enabled: false, + leading: Icon(LucideIcons.triangleAlert), + title: Text('Channel actions unavailable'), + ) + else ...[ + if (canArchive) + _ActionTile( + icon: LucideIcons.archive, + label: 'Archive channel', + onTap: () => _confirmAndRun( + context, + ref, + title: 'Archive #${channel.name}?', + body: 'The channel will become read-only.', + confirmLabel: 'Archive', + action: () => ref + .read(channelActionsProvider) + .archiveChannel(channel.id), + ), + ), + if (canUnarchive) + _ActionTile( + icon: LucideIcons.archiveRestore, + label: 'Unarchive channel', + onTap: () => _confirmAndRun( + context, + ref, + title: 'Unarchive #${channel.name}?', + body: 'The channel will become active again.', + confirmLabel: 'Unarchive', + action: () => ref + .read(channelActionsProvider) + .unarchiveChannel(channel.id), + ), + ), + if (canDelete) + _ActionTile( + icon: LucideIcons.trash2, + label: 'Delete channel', + destructive: true, + onTap: () => _confirmAndRun( + context, + ref, + title: 'Delete #${channel.name}?', + body: + 'This permanently deletes the channel and cannot be undone.', + confirmLabel: 'Delete', + action: () => ref + .read(channelActionsProvider) + .deleteChannel(channel.id), + ), + ), + ], + ], + ], + ), + ), + ); + } +} + +class _ChannelQuickActionsRow extends StatelessWidget { + const _ChannelQuickActionsRow({ + required this.isStarred, + required this.isUnread, + required this.onToggleStar, + required this.onToggleRead, + }); + + final bool isStarred; + final bool isUnread; + final VoidCallback onToggleStar; + final VoidCallback onToggleRead; + + @override + Widget build(BuildContext context) => Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + _ChannelQuickAction( + icon: isStarred ? LucideIcons.starOff : LucideIcons.star, + label: isStarred ? 'Unstar' : 'Star', + onTap: onToggleStar, + ), + _ChannelQuickAction( + icon: isUnread ? LucideIcons.checkCheck : LucideIcons.circleDot, + label: isUnread ? 'Mark Read' : 'Mark Unread', + onTap: onToggleRead, + ), + ], + ); +} + +class _ChannelQuickAction extends StatelessWidget { + const _ChannelQuickAction({ + required this.icon, + required this.label, + required this.onTap, + }); + + final IconData icon; + final String label; + final VoidCallback onTap; + + @override + Widget build(BuildContext context) => GestureDetector( + onTap: onTap, + behavior: HitTestBehavior.opaque, + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Container( + width: 76, + height: 56, + alignment: Alignment.center, + decoration: BoxDecoration( + color: context.colors.surfaceContainerHighest, + borderRadius: BorderRadius.circular(Radii.dialog), + ), + child: Icon(icon, size: 24, color: context.colors.onSurface), + ), + const SizedBox(height: Grid.xxs), + Text( + label, + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: context.textTheme.labelMedium?.copyWith( + color: context.colors.onSurface, + ), + ), + ], + ), + ); +} + +class _ActionTile extends StatelessWidget { + const _ActionTile({ + required this.icon, + required this.label, + required this.onTap, + this.destructive = false, + }); + + final IconData icon; + final String label; + final VoidCallback onTap; + final bool destructive; + + @override + Widget build(BuildContext context) => ListTile( + leading: Icon(icon, color: destructive ? context.colors.error : null), + title: Text( + label, + style: destructive ? TextStyle(color: context.colors.error) : null, + ), + onTap: onTap, + ); +} + +Future _confirmAndRun( + BuildContext sheetContext, + WidgetRef ref, { + required String title, + required String body, + required String confirmLabel, + required Future Function() action, +}) async { + final pageContext = Navigator.of(sheetContext, rootNavigator: true).context; + final confirmed = await showDialog( + context: pageContext, + builder: (dialogContext) => AlertDialog( + title: Text(title), + content: Text(body), + actions: [ + TextButton( + onPressed: () => Navigator.of(dialogContext).pop(false), + child: const Text('Cancel'), + ), + FilledButton( + onPressed: () => Navigator.of(dialogContext).pop(true), + child: Text(confirmLabel), + ), + ], + ), + ); + if (confirmed != true) return; + try { + await action(); + if (pageContext.mounted) Navigator.of(pageContext).pop(true); + } catch (error) { + if (!pageContext.mounted) return; + ScaffoldMessenger.of(pageContext).showSnackBar( + SnackBar( + content: Text( + 'Couldn’t ${confirmLabel.toLowerCase()} channel. Try again.', + ), + ), + ); + } +} + +Future _showMoveSectionSheet( + BuildContext context, + WidgetRef ref, { + required Channel channel, + required String? sectionId, +}) async { + final sections = [...ref.read(channelSectionsProvider).store.sections] + ..sort((a, b) => a.order.compareTo(b.order)); + await showModalBottomSheet( + context: context, + showDragHandle: true, + builder: (sheetContext) => SafeArea( + child: SingleChildScrollView( + padding: const EdgeInsets.fromLTRB( + Grid.gutter, + 0, + Grid.gutter, + Grid.xs, + ), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + for (final section in sections) + ListTile( + leading: const Icon(LucideIcons.folder), + title: Text(section.name), + trailing: sectionId == section.id + ? Icon( + LucideIcons.check, + color: sheetContext.colors.primary, + ) + : null, + onTap: () { + Navigator.of(sheetContext).pop(); + ref + .read(channelSectionsProvider.notifier) + .assignChannel(channel.id, section.id); + }, + ), + ListTile( + leading: const Icon(LucideIcons.folderPlus), + title: const Text('New section…'), + onTap: () async { + Navigator.of(sheetContext).pop(); + final name = await _showSectionNameDialog(context); + if (name == null || name.isEmpty) return; + final notifier = ref.read(channelSectionsProvider.notifier); + notifier.createSection(name); + final created = ref + .read(channelSectionsProvider) + .store + .sections + .where((section) => section.name == name.trim()) + .lastOrNull; + if (created != null) { + notifier.assignChannel(channel.id, created.id); + } + }, + ), + if (sectionId != null) + ListTile( + leading: const Icon(LucideIcons.folderMinus), + title: const Text('Remove from section'), + onTap: () { + Navigator.of(sheetContext).pop(); + ref + .read(channelSectionsProvider.notifier) + .unassignChannel(channel.id); + }, + ), + ], + ), + ), + ), + ); +} + +Future _showSectionNameDialog(BuildContext context) async { + final controller = TextEditingController(); + final result = await showDialog( + context: context, + builder: (dialogContext) => AlertDialog( + title: const Text('New Section'), + content: TextField(controller: controller, autofocus: true), + actions: [ + TextButton( + onPressed: () => Navigator.of(dialogContext).pop(), + child: const Text('Cancel'), + ), + FilledButton( + onPressed: () => + Navigator.of(dialogContext).pop(controller.text.trim()), + child: const Text('Create'), + ), + ], + ), + ); + controller.dispose(); + return result; +} diff --git a/mobile/lib/features/channels/channel_detail_page.dart b/mobile/lib/features/channels/channel_detail_page.dart index f1efb1557f..690e50905f 100644 --- a/mobile/lib/features/channels/channel_detail_page.dart +++ b/mobile/lib/features/channels/channel_detail_page.dart @@ -25,9 +25,11 @@ import '../profile/user_cache_provider.dart'; import '../profile/user_profile.dart'; import '../forum/forum_posts_view.dart'; import 'channel.dart'; +import 'channel_actions_sheet.dart'; import 'channel_link_navigation.dart'; import 'agent_activity/working_bots_provider.dart'; import 'channel_management_provider.dart'; +import 'channel_sections/channel_sections_provider.dart'; import 'channel_messages_provider.dart'; import 'channel_typing_provider.dart'; import 'channel_typing_indicator.dart'; @@ -38,7 +40,6 @@ import 'date_formatters.dart'; import 'day_divider.dart'; import 'dm_channel_labels.dart'; import 'ephemeral_channel_display.dart'; -import 'manage_channel_sheet.dart'; import 'members_sheet.dart'; import 'message_actions.dart'; import 'message_content.dart'; @@ -277,27 +278,25 @@ class ChannelDetailPage extends HookConsumerWidget { channel: resolvedChannel, currentPubkey: currentPubkey, ), - if (!resolvedChannel.isDm) - IconButton( - color: context.colors.primary, - onPressed: () async { - final shouldClose = await showModalBottomSheet( - context: context, - isScrollControlled: true, - showDragHandle: true, - constraints: BoxConstraints( - maxWidth: 640, - maxHeight: MediaQuery.sizeOf(context).height * 0.9, - ), - builder: (_) => ManageChannelSheet(channel: resolvedChannel), - ); - if (shouldClose == true && context.mounted) { - Navigator.of(context).pop(); - } - }, - tooltip: 'Manage channel', - icon: const Icon(LucideIcons.ellipsisVertical, size: 22), - ), + IconButton( + color: context.colors.primary, + onPressed: () async { + final shouldClose = await showChannelActionsSheet( + context: context, + channel: resolvedChannel, + isUnread: false, + sectionId: ref + .read(channelSectionsProvider) + .store + .assignments[resolvedChannel.id], + ); + if (shouldClose == true && context.mounted) { + Navigator.of(context).pop(); + } + }, + tooltip: 'Channel actions', + icon: const Icon(LucideIcons.ellipsisVertical, size: 22), + ), ], ), body: Stack( diff --git a/mobile/lib/features/channels/channel_management_provider.dart b/mobile/lib/features/channels/channel_management_provider.dart index b990194d15..ed9f6842f7 100644 --- a/mobile/lib/features/channels/channel_management_provider.dart +++ b/mobile/lib/features/channels/channel_management_provider.dart @@ -479,6 +479,20 @@ List> buildCreateChannelTags({ ]; } +/// Builds the relay tags for setting the archived state of [channelId]. +List> buildSetChannelArchivedTags( + String channelId, { + required bool archived, +}) => [ + ['h', channelId], + ['archived', archived.toString()], +]; + +/// Builds the relay tags for deleting [channelId]. +List> buildDeleteChannelTags(String channelId) => [ + ['h', channelId], +]; + class ChannelActions { final Ref _ref; final RelaySessionNotifier _session; @@ -584,6 +598,36 @@ class ChannelActions { await _refreshChannelState(channelId); } + /// Archives the channel and refreshes its cached state. + Future archiveChannel(String channelId) => + _setChannelArchived(channelId, archived: true); + + /// Unarchives the channel and refreshes its cached state. + Future unarchiveChannel(String channelId) => + _setChannelArchived(channelId, archived: false); + + Future _setChannelArchived( + String channelId, { + required bool archived, + }) async { + await _signedEventRelay.submit( + kind: 9002, + content: '', + tags: buildSetChannelArchivedTags(channelId, archived: archived), + ); + await _refreshChannelState(channelId); + } + + /// Deletes the channel and refreshes its cached state. + Future deleteChannel(String channelId) async { + await _signedEventRelay.submit( + kind: 9008, + content: '', + tags: buildDeleteChannelTags(channelId), + ); + await _refreshChannelState(channelId); + } + Future setCanvas({ required String channelId, required String content, diff --git a/mobile/lib/features/channels/channels_page.dart b/mobile/lib/features/channels/channels_page.dart index ba5d4ebf9d..607667e284 100644 --- a/mobile/lib/features/channels/channels_page.dart +++ b/mobile/lib/features/channels/channels_page.dart @@ -29,6 +29,7 @@ import '../profile/user_cache_provider.dart'; import '../pairing/pairing_page.dart'; import '../pairing/pairing_provider.dart'; import 'channel.dart'; +import 'channel_actions_sheet.dart'; import 'channel_detail_page.dart'; import 'channel_management_provider.dart'; import 'dm_channel_labels.dart'; diff --git a/mobile/lib/features/channels/channels_page/channel_tile.dart b/mobile/lib/features/channels/channels_page/channel_tile.dart index 551e3f8dd6..95d0b2c0be 100644 --- a/mobile/lib/features/channels/channels_page/channel_tile.dart +++ b/mobile/lib/features/channels/channels_page/channel_tile.dart @@ -118,212 +118,12 @@ class _ChannelTile extends ConsumerWidget { } void _showChannelActions(BuildContext context, WidgetRef ref) { - showModalBottomSheet( + showChannelActionsSheet( context: context, - showDragHandle: true, - builder: (sheetContext) { - final sections = ref.read(channelSectionsProvider).store.sections - ..sort((a, b) => a.order.compareTo(b.order)); - final isStarred = - ref - .read(channelStarsProvider) - .store - .channels[channel.id] - ?.starred == - true; - - return SafeArea( - child: Padding( - padding: const EdgeInsets.fromLTRB( - Grid.gutter, - 0, - Grid.gutter, - Grid.xs, - ), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - ListTile( - leading: Icon( - isStarred ? LucideIcons.starOff : LucideIcons.star, - ), - title: Text(isStarred ? 'Unstar channel' : 'Star channel'), - onTap: () { - Navigator.of(sheetContext).pop(); - if (isStarred) { - ref - .read(channelStarsProvider.notifier) - .unstarChannel(channel.id); - } else { - ref - .read(channelStarsProvider.notifier) - .starChannel(channel.id); - } - }, - ), - ListTile( - leading: const Icon(LucideIcons.folderInput), - title: const Text('Move to section'), - onTap: () async { - Navigator.of(sheetContext).pop(); - await _showMoveSectionSheet(context, ref, sections); - }, - ), - ListTile( - leading: Icon( - isMuted ? LucideIcons.bell : LucideIcons.bellOff, - ), - title: Text(isMuted ? 'Unmute channel' : 'Mute channel'), - onTap: () { - Navigator.of(sheetContext).pop(); - if (isMuted) { - ref - .read(channelMutesProvider.notifier) - .unmuteChannel(channel.id); - } else { - ref - .read(channelMutesProvider.notifier) - .muteChannel(channel.id); - } - }, - ), - ListTile( - leading: Icon( - isUnread ? LucideIcons.checkCheck : LucideIcons.circleDot, - ), - title: Text(isUnread ? 'Mark as read' : 'Mark as unread'), - onTap: () { - Navigator.of(sheetContext).pop(); - final ts = dateTimeToUnixSeconds(channel.lastMessageAt); - if (ts != null) { - if (isUnread) { - onMarkRead?.call(); - ref - .read(readStateProvider.notifier) - .markContextRead( - channel.id, - ts, - clearForcedMessages: true, - ); - ref - .read(channelsProvider.notifier) - .clearObservedUnreadCoveredByRead(channel.id, ts); - } else { - ref - .read(readStateProvider.notifier) - .markContextUnread( - channel.id, - channelId: channel.id, - ); - } - } - }, - ), - ], - ), - ), - ); - }, - ); - } - - Future _showMoveSectionSheet( - BuildContext context, - WidgetRef ref, - List sections, - ) async { - await showModalBottomSheet( - context: context, - showDragHandle: true, - builder: (sheetContext) { - return SafeArea( - child: Padding( - padding: const EdgeInsets.fromLTRB( - Grid.gutter, - 0, - Grid.gutter, - Grid.xs, - ), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - for (final section in sections) - ListTile( - leading: Icon( - LucideIcons.folder, - color: sectionId == section.id - ? sheetContext.colors.primary - : null, - ), - title: Text(section.name), - trailing: sectionId == section.id - ? Icon( - LucideIcons.check, - color: sheetContext.colors.primary, - ) - : null, - onTap: () { - Navigator.of(sheetContext).pop(); - ref - .read(channelSectionsProvider.notifier) - .assignChannel(channel.id, section.id); - }, - ), - ListTile( - leading: const Icon(LucideIcons.folderPlus), - title: const Text('New section…'), - onTap: () async { - Navigator.of(sheetContext).pop(); - if (!context.mounted) return; - final name = await showDialog( - context: context, - builder: (_) => const _SectionNameDialog( - title: 'New Section', - confirmLabel: 'Create', - ), - ); - if (name != null && name.isNotEmpty) { - ref - .read(channelSectionsProvider.notifier) - .createSection(name); - // Assign after create — sections list has been mutated, - // re-read to find the new section by name. - final newSection = ref - .read(channelSectionsProvider) - .store - .sections - .lastWhere( - (s) => s.name == name.trim(), - orElse: () => const ChannelSection( - id: '', - name: '', - order: -1, - ), - ); - if (newSection.id.isNotEmpty) { - ref - .read(channelSectionsProvider.notifier) - .assignChannel(channel.id, newSection.id); - } - } - }, - ), - if (sectionId != null) - ListTile( - leading: const Icon(LucideIcons.folderMinus), - title: const Text('Remove from section'), - onTap: () { - Navigator.of(sheetContext).pop(); - ref - .read(channelSectionsProvider.notifier) - .unassignChannel(channel.id); - }, - ), - ], - ), - ), - ); - }, + channel: channel, + isUnread: isUnread, + onMarkRead: onMarkRead, + sectionId: sectionId, ); } } diff --git a/mobile/test/features/channels/channel_actions_sheet_test.dart b/mobile/test/features/channels/channel_actions_sheet_test.dart new file mode 100644 index 0000000000..e38a40d9a5 --- /dev/null +++ b/mobile/test/features/channels/channel_actions_sheet_test.dart @@ -0,0 +1,390 @@ +import 'dart:async'; + +import 'package:buzz/features/channels/channel.dart'; +import 'package:buzz/features/channels/channel_actions_sheet.dart'; +import 'package:buzz/features/channels/channel_management_provider.dart'; +import 'package:buzz/shared/mentions/agent_identity_provider.dart'; +import 'package:buzz/shared/relay/relay.dart'; +import 'package:buzz/shared/theme/theme.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:hooks_riverpod/hooks_riverpod.dart'; + +const _currentPubkey = 'me'; + +Channel _channel({String type = 'stream', bool isArchived = false}) => Channel( + id: 'channel-id', + name: type == 'dm' ? 'Alice' : 'general', + channelType: type, + visibility: 'open', + description: '', + createdBy: 'owner', + createdAt: DateTime(2025), + memberCount: 2, + isMember: true, + archivedAt: isArchived ? DateTime(2025, 1, 2) : null, +); + +Widget _app({ + required Channel channel, + required Future> Function() loadMembers, + bool isUnread = false, + AsyncValue> agentOwners = const AsyncValue.data( + {}, + ), + ChannelActions Function(Ref ref)? createChannelActions, + String? currentPubkey = _currentPubkey, +}) => ProviderScope( + overrides: [ + currentPubkeyProvider.overrideWith((ref) => currentPubkey), + channelMembersProvider(channel.id).overrideWith((ref) => loadMembers()), + agentOwnersProvider.overrideWithValue(agentOwners), + if (createChannelActions != null) + channelActionsProvider.overrideWith(createChannelActions), + ], + child: MaterialApp( + theme: AppTheme.light(), + home: Scaffold( + body: ChannelActionsSheet(channel: channel, isUnread: isUnread), + ), + ), +); + +Widget _modalApp({ + required Channel channel, + required Future> Function() loadMembers, + required ChannelActions Function(Ref ref) createChannelActions, +}) => ProviderScope( + overrides: [ + currentPubkeyProvider.overrideWith((ref) => _currentPubkey), + channelMembersProvider(channel.id).overrideWith((ref) => loadMembers()), + channelActionsProvider.overrideWith(createChannelActions), + ], + child: MaterialApp( + theme: AppTheme.light(), + home: Builder( + builder: (context) => Scaffold( + body: TextButton( + onPressed: () => showChannelActionsSheet( + context: context, + channel: channel, + isUnread: false, + ), + child: const Text('Open actions'), + ), + ), + ), + ), +); + +void main() { + testWidgets('owner sees the complete regular-channel action set', ( + tester, + ) async { + await tester.pumpWidget( + _app( + channel: _channel(), + loadMembers: () async => [ + ChannelMember( + pubkey: _currentPubkey, + role: 'owner', + joinedAt: DateTime(2025), + ), + ], + ), + ); + await tester.pumpAndSettle(); + + for (final label in [ + 'Star', + 'Mark Unread', + 'Move to section…', + 'Mute channel', + 'Manage channel', + 'Copy channel name', + 'Copy channel ID', + 'Leave channel', + 'Archive channel', + 'Delete channel', + ]) { + expect(find.text(label), findsOneWidget, reason: label); + } + + final moveTop = tester.getTopLeft(find.text('Move to section…')).dy; + final muteTop = tester.getTopLeft(find.text('Mute channel')).dy; + final manageTop = tester.getTopLeft(find.text('Manage channel')).dy; + final copyNameTop = tester.getTopLeft(find.text('Copy channel name')).dy; + final copyIdTop = tester.getTopLeft(find.text('Copy channel ID')).dy; + expect(moveTop, lessThan(muteTop)); + expect(muteTop, lessThan(manageTop)); + expect(manageTop, lessThan(copyNameTop)); + expect(copyNameTop, lessThan(copyIdTop)); + }); + + testWidgets('unread channel uses the Mark Read label', (tester) async { + await tester.pumpWidget( + _app( + channel: _channel(), + isUnread: true, + loadMembers: () async => const [], + ), + ); + await tester.pumpAndSettle(); + + expect(find.text('Mark Read'), findsOneWidget); + expect(find.text('Mark Unread'), findsNothing); + }); + + testWidgets('admin can archive but cannot delete', (tester) async { + await tester.pumpWidget( + _app( + channel: _channel(), + loadMembers: () async => [ + ChannelMember( + pubkey: _currentPubkey, + role: 'admin', + joinedAt: DateTime(2025), + ), + ], + ), + ); + await tester.pumpAndSettle(); + + expect(find.text('Archive channel'), findsOneWidget); + expect(find.text('Delete channel'), findsNothing); + }); + + testWidgets('verified owner agent grants archive and delete', (tester) async { + const agentPubkey = 'agent'; + await tester.pumpWidget( + _app( + channel: _channel(), + agentOwners: const AsyncValue.data({agentPubkey: _currentPubkey}), + loadMembers: () async => [ + ChannelMember( + pubkey: agentPubkey, + role: 'owner', + joinedAt: DateTime(2025), + ), + ], + ), + ); + await tester.pumpAndSettle(); + + expect(find.text('Archive channel'), findsOneWidget); + expect(find.text('Delete channel'), findsOneWidget); + }); + + testWidgets('unresolved identity grants no lifecycle actions', ( + tester, + ) async { + await tester.pumpWidget( + _app( + channel: _channel(), + currentPubkey: null, + loadMembers: () async => [ + ChannelMember( + pubkey: 'ordinary-owner', + role: 'owner', + joinedAt: DateTime(2025), + ), + ], + ), + ); + await tester.pumpAndSettle(); + + expect(find.text('Archive channel'), findsNothing); + expect(find.text('Delete channel'), findsNothing); + }); + + testWidgets('archived owner can unarchive but cannot delete', (tester) async { + late _FakeChannelActions actions; + await tester.pumpWidget( + _app( + channel: _channel(isArchived: true), + loadMembers: () async => [ + ChannelMember( + pubkey: _currentPubkey, + role: 'owner', + joinedAt: DateTime(2025), + ), + ], + createChannelActions: (ref) => actions = _FakeChannelActions(ref), + ), + ); + await tester.pumpAndSettle(); + + expect(find.text('Archive channel'), findsNothing); + expect(find.text('Unarchive channel'), findsOneWidget); + expect(find.text('Delete channel'), findsNothing); + + await tester.tap(find.text('Unarchive channel')); + await tester.pumpAndSettle(); + expect(find.text('Unarchive #general?'), findsOneWidget); + await tester.tap(find.widgetWithText(FilledButton, 'Unarchive')); + await tester.pumpAndSettle(); + + expect(actions.unarchivedChannelId, 'channel-id'); + }); + + testWidgets('owned non-owner agent grants no lifecycle actions', ( + tester, + ) async { + const agentPubkey = 'agent'; + await tester.pumpWidget( + _app( + channel: _channel(), + agentOwners: const AsyncValue.data({agentPubkey: _currentPubkey}), + loadMembers: () async => [ + ChannelMember( + pubkey: agentPubkey, + role: 'bot', + joinedAt: DateTime(2025), + ), + ], + ), + ); + await tester.pumpAndSettle(); + + expect(find.text('Archive channel'), findsNothing); + expect(find.text('Delete channel'), findsNothing); + }); + + testWidgets('agent ownership loading keeps lifecycle actions pending', ( + tester, + ) async { + await tester.pumpWidget( + _app( + channel: _channel(), + agentOwners: const AsyncValue.loading(), + loadMembers: () async => const [], + ), + ); + await tester.pump(); + + expect(find.text('Loading channel actions…'), findsOneWidget); + expect(find.text('Archive channel'), findsNothing); + expect(find.text('Delete channel'), findsNothing); + }); + + testWidgets('member sees neither owner action', (tester) async { + await tester.pumpWidget( + _app( + channel: _channel(), + loadMembers: () async => [ + ChannelMember( + pubkey: _currentPubkey, + role: 'member', + joinedAt: DateTime(2025), + ), + ], + ), + ); + await tester.pumpAndSettle(); + + expect(find.text('Archive channel'), findsNothing); + expect(find.text('Delete channel'), findsNothing); + expect(find.text('Leave channel'), findsOneWidget); + }); + + testWidgets('shows loading and unavailable capability states', ( + tester, + ) async { + final pending = Completer>(); + await tester.pumpWidget( + _app(channel: _channel(), loadMembers: () => pending.future), + ); + await tester.pump(); + expect(find.text('Loading channel actions…'), findsOneWidget); + + pending.completeError(Exception('relay unavailable')); + await tester.pumpAndSettle(); + expect(find.text('Channel actions unavailable'), findsOneWidget); + }); + + testWidgets( + 'manage leave closes both nested sheets without popping the page', + (tester) async { + await tester.pumpWidget( + _modalApp( + channel: _channel(), + loadMembers: () async => const [], + createChannelActions: (ref) => _FakeChannelActions(ref), + ), + ); + await tester.pumpAndSettle(); + await tester.tap(find.text('Open actions')); + await tester.pumpAndSettle(); + + await tester.tap(find.text('Manage channel')); + await tester.pumpAndSettle(); + await tester.tap(find.text('Leave channel').last); + await tester.pumpAndSettle(); + + expect(find.byType(ChannelActionsSheet), findsNothing); + expect(find.byType(Scaffold), findsOneWidget); + }, + ); + + testWidgets('DM omits quick actions, then shows mute and copy rows', ( + tester, + ) async { + await tester.pumpWidget( + _app( + channel: _channel(type: 'dm'), + loadMembers: () async => const [], + ), + ); + await tester.pumpAndSettle(); + + for (final label in [ + 'Mute channel', + 'Copy channel name', + 'Copy channel ID', + ]) { + expect(find.text(label), findsOneWidget, reason: label); + } + for (final label in [ + 'Star', + 'Unstar', + 'Mark Unread', + 'Mark Read', + 'Move to section…', + 'Manage channel', + 'Leave channel', + 'Archive channel', + 'Delete channel', + ]) { + expect(find.text(label), findsNothing, reason: label); + } + + final muteTop = tester.getTopLeft(find.text('Mute channel')).dy; + final copyNameTop = tester.getTopLeft(find.text('Copy channel name')).dy; + final copyIdTop = tester.getTopLeft(find.text('Copy channel ID')).dy; + expect(muteTop, lessThan(copyNameTop)); + expect(copyNameTop, lessThan(copyIdTop)); + }); +} + +class _FakeChannelActions extends ChannelActions { + _FakeChannelActions(Ref ref) + : super( + ref: ref, + session: ref.read(relaySessionProvider.notifier), + signedEventRelay: SignedEventRelay( + session: ref.read(relaySessionProvider.notifier), + nsec: null, + ), + currentPubkey: _currentPubkey, + ); + + String? unarchivedChannelId; + + @override + Future leaveChannel(String channelId) async {} + + @override + Future unarchiveChannel(String channelId) async { + unarchivedChannelId = channelId; + } +} diff --git a/mobile/test/features/channels/channel_detail_page_test.dart b/mobile/test/features/channels/channel_detail_page_test.dart index 7f8d0774c3..4abf00f1e4 100644 --- a/mobile/test/features/channels/channel_detail_page_test.dart +++ b/mobile/test/features/channels/channel_detail_page_test.dart @@ -828,7 +828,14 @@ void main() { ); expect(find.text('Message…'), findsNothing); - await tester.tap(find.byTooltip('Manage channel')); + await tester.tap(find.byTooltip('Channel actions')); + await tester.pumpAndSettle(); + await tester.drag( + find.byType(SingleChildScrollView).last, + const Offset(0, -300), + ); + await tester.pumpAndSettle(); + await tester.tap(find.text('Manage channel').last); await tester.pumpAndSettle(); await tester.tap(find.text('Join channel')); await tester.pumpAndSettle(); @@ -841,6 +848,27 @@ void main() { expect(find.text('Message #general'), findsOneWidget); }); + testWidgets('detail-header manage leave closes the detail page', ( + tester, + ) async { + await tester.pumpWidget( + _buildTestable( + messages: const [], + createChannelActions: (ref) => _FakeChannelActions(ref), + ), + ); + await tester.pumpAndSettle(); + + await tester.tap(find.byTooltip('Channel actions')); + await tester.pumpAndSettle(); + await tester.tap(find.text('Manage channel').last); + await tester.pumpAndSettle(); + await tester.tap(find.text('Leave channel').last); + await tester.pumpAndSettle(); + + expect(find.byTooltip('Channel actions'), findsNothing); + }); + testWidgets('keeps manage sheet dismissible with a long canvas', ( tester, ) async { @@ -860,11 +888,18 @@ void main() { ); await tester.pumpAndSettle(); - await tester.tap(find.byTooltip('Manage channel')); + await tester.tap(find.byTooltip('Channel actions')); + await tester.pumpAndSettle(); + await tester.drag( + find.byType(SingleChildScrollView).last, + const Offset(0, -300), + ); + await tester.pumpAndSettle(); + await tester.tap(find.text('Manage channel').last); await tester.pumpAndSettle(); - final sheet = find.byType(BottomSheet); - expect(sheet, findsOneWidget); + final sheet = find.byType(BottomSheet).last; + expect(find.byType(BottomSheet), findsNWidgets(2)); expect(tester.getSize(sheet).height, lessThanOrEqualTo(720)); final sheetTop = tester.getTopLeft(sheet).dy; @@ -874,7 +909,7 @@ void main() { ); await tester.pumpAndSettle(); - expect(sheet, findsNothing); + expect(find.text('Manage channel'), findsOneWidget); }); testWidgets('shows empty state when no messages', (tester) async { diff --git a/mobile/test/features/channels/channel_management_provider_test.dart b/mobile/test/features/channels/channel_management_provider_test.dart index 4b31de18e8..89659f37e4 100644 --- a/mobile/test/features/channels/channel_management_provider_test.dart +++ b/mobile/test/features/channels/channel_management_provider_test.dart @@ -200,6 +200,28 @@ void main() { }); }); + group('build channel lifecycle tags', () { + test('archive matches kind 9002 tags', () { + expect(buildSetChannelArchivedTags('channel-id', archived: true), [ + ['h', 'channel-id'], + ['archived', 'true'], + ]); + }); + + test('unarchive matches kind 9002 tags', () { + expect(buildSetChannelArchivedTags('channel-id', archived: false), [ + ['h', 'channel-id'], + ['archived', 'false'], + ]); + }); + + test('delete matches desktop kind 9008 tags', () { + expect(buildDeleteChannelTags('channel-id'), [ + ['h', 'channel-id'], + ]); + }); + }); + group('directory providers relay-config invalidation', () { NostrEvent profile(String pubkey, String name) => NostrEvent( id: '$pubkey-profile', From b29c8cdaa456307ecdd63e565de4beb14402128e Mon Sep 17 00:00:00 2001 From: klopez4212 Date: Tue, 4 Aug 2026 01:16:09 +0100 Subject: [PATCH 24/27] feat(desktop): redesign the Huddle experience (#4281) ## Summary - open Huddles in a focused companion window with a clean handoff back to the in-app drawer and backing channel - redesign the participant film strip, sidebar control, transcript surface, and themed shell treatment - preserve microphone and device control across windows, start agent voice on the first reply, and show agent speaking activity in the film strip - give each agent a distinct session voice, beginning with the configured default, plus compact per-agent text-to-speech and voice controls - enroll only agents explicitly mentioned or deliberately added through an agent panel into the live Huddle roster - keep temporary Huddle channels out of the sidebar unless the user explicitly brings one into the main app - remove Huddle-only avatar policy badges and filter short silence or noise segments before speech-to-text posts ## Why The previous flow exposed the temporary channel as product UI, obscured who was present or speaking, and split transcript and audio state between the main and companion windows. This keeps backing channels as implementation details unless a user explicitly brings a Huddle into the app, while sharing the live conversation and audio lifecycle across both surfaces. Agent participants now join only after an explicit invitation, distinct voices make multi-agent Huddles easier to follow, and short microphone noise no longer becomes stray transcript messages. ## Validation - `pnpm check` - `pnpm build:e2e` - `pnpm exec playwright test tests/e2e/huddle-transcription.spec.ts --project=smoke` (13 passed) - Huddle sidebar visibility unit coverage (4 passed) - focused managed-agent and persona-mention E2E coverage (2 passed) - `pnpm test` (3,910 passed) - `cargo clippy --manifest-path desktop/src-tauri/Cargo.toml --all-targets -- -D warnings` - `cargo test --manifest-path desktop/src-tauri/Cargo.toml` (2,093 passed, 14 ignored; 3 diagnostics passed) --------- Signed-off-by: kenny lopez Signed-off-by: Wes Co-authored-by: Wes Co-authored-by: Carl --- desktop/src-tauri/capabilities/default.json | 4 +- desktop/src-tauri/src/huddle/agent_voice.rs | 310 +++++ desktop/src-tauri/src/huddle/agents.rs | 177 ++- desktop/src-tauri/src/huddle/mod.rs | 77 +- desktop/src-tauri/src/huddle/pipeline.rs | 82 +- desktop/src-tauri/src/huddle/playout.rs | 121 +- desktop/src-tauri/src/huddle/state.rs | 16 +- desktop/src-tauri/src/huddle/stt.rs | 121 +- desktop/src-tauri/src/huddle/tts.rs | 123 +- desktop/src-tauri/src/huddle/tts_activity.rs | 45 + desktop/src-tauri/src/huddle/tts_settings.rs | 3 +- desktop/src-tauri/src/huddle/tts_tests.rs | 31 +- .../src/huddle/tts_voice_selection_tests.rs | 20 +- .../src/huddle/tts_voice_transition.rs | 58 +- desktop/src-tauri/src/huddle/window.rs | 67 ++ desktop/src-tauri/src/initial_window.rs | 67 ++ desktop/src-tauri/src/lib.rs | 111 +- desktop/src/app/App.tsx | 14 +- desktop/src/app/AppHuddleBar.tsx | 6 +- desktop/src/app/AppHuddleShell.tsx | 76 ++ desktop/src/app/AppShell.tsx | 580 ++++----- desktop/src/app/AppShellChannelSurface.tsx | 43 + desktop/src/app/BuzzThemeSurfaces.tsx | 17 +- desktop/src/app/LazySettingsScreen.tsx | 6 + .../app/huddleBackingChannelStorage.test.mjs | 33 + .../src/app/huddleBackingChannelStorage.ts | 36 + .../src/app/huddleChannelVisibility.test.mjs | 65 + desktop/src/app/huddleChannelVisibility.ts | 19 + .../src/app/navigation/useAppNavigation.ts | 3 + desktop/src/app/routes/ChannelRouteScreen.tsx | 6 + .../src/app/routes/channels.$channelId.tsx | 11 +- .../app/useAppShellDesktopNotifications.ts | 8 +- .../src/app/useAppShellLifecycleEffects.ts | 7 + desktop/src/app/useHuddlePresentation.ts | 444 +++++++ desktop/src/app/useSettingsShortcuts.ts | 4 +- desktop/src/features/agents/hooks.ts | 7 + desktop/src/features/channels/hooks.ts | 16 + .../channels/ui/ChannelMembersBar.tsx | 4 +- .../channels/ui/ChannelPane.helpers.ts | 14 + .../src/features/channels/ui/ChannelPane.tsx | 80 +- .../features/channels/ui/ChannelPane.types.ts | 2 + .../features/channels/ui/ChannelScreen.tsx | 82 +- .../ui/ChannelScreenLoadingFallback.tsx | 14 + .../channels/ui/useChannelPaneMessages.ts | 50 + .../channels/ui/useHuddleChannelMessages.ts | 72 ++ .../channels/ui/useHuddleReadMarker.ts | 89 ++ .../channels/ui/useHuddleThreadIsolation.ts | 24 + desktop/src/features/huddle/HuddleContext.tsx | 549 ++++++--- .../features/huddle/HuddleContext.types.ts | 40 + .../huddle/components/AgentVoiceMenu.tsx | 152 +++ .../huddle/components/HuddleAttachment.tsx | 26 +- .../features/huddle/components/HuddleBar.tsx | 346 +++--- .../components/HuddleProfileControl.tsx | 176 +++ .../huddle/components/HuddleRoomHeader.tsx | 126 ++ .../huddle/components/HuddleStartingView.tsx | 18 + .../components/HuddleTranscriptIntro.tsx | 22 + .../huddle/components/MicControls.tsx | 35 +- .../huddle/components/ParticipantList.tsx | 492 ++++++-- desktop/src/features/huddle/index.ts | 4 + .../src/features/huddle/lib/huddleWindow.ts | 23 + .../features/huddle/lib/ttsLiveMessages.ts | 16 +- .../features/huddle/lib/useAudioDevices.ts | 18 +- .../features/huddle/lib/useHuddlePttState.ts | 73 ++ .../huddle/lib/useHuddleSpeakerActivity.ts | 99 ++ .../features/huddle/lib/useTtsSubscription.ts | 138 ++- .../messages/lib/virtualizedTimelineItems.ts | 3 +- .../src/features/messages/ui/MessageRow.tsx | 11 +- .../messages/ui/MessageThreadPanel.tsx | 137 ++- .../features/messages/ui/MessageTimeline.tsx | 43 +- .../features/messages/ui/MessageTimestamp.tsx | 1 + .../messages/ui/TimelineMessageList.tsx | 46 +- .../messages/ui/useMentionSendFlow.ts | 18 + .../src/features/messages/useThreadReplies.ts | 94 +- desktop/src/features/notifications/hooks.ts | 2 + .../use-feed-desktop-notifications.ts | 4 +- .../onboarding/communityOnboarding.tsx | 15 +- .../src/features/sidebar/ui/AppSidebar.tsx | 24 +- .../features/sidebar/ui/AppSidebar.types.ts | 7 + .../src/features/sidebar/ui/CommunityRail.tsx | 2 +- desktop/src/main.tsx | 3 +- .../shared/api/relayChannelFilters.test.mjs | 7 +- desktop/src/shared/api/relayChannelFilters.ts | 13 +- .../src/shared/styles/globals/components.css | 65 +- desktop/src/shared/styles/globals/theme.css | 46 +- desktop/src/shared/useMessageDeepLinks.ts | 6 +- desktop/src/testing/e2eBridge.ts | 351 +++++- desktop/tests/e2e/community-rail.spec.ts | 9 + .../tests/e2e/huddle-transcription.spec.ts | 1053 +++++++++++++++-- desktop/tests/helpers/bridge.ts | 9 + 89 files changed, 6260 insertions(+), 1327 deletions(-) create mode 100644 desktop/src-tauri/src/huddle/agent_voice.rs create mode 100644 desktop/src-tauri/src/huddle/tts_activity.rs create mode 100644 desktop/src-tauri/src/huddle/window.rs create mode 100644 desktop/src-tauri/src/initial_window.rs create mode 100644 desktop/src/app/AppHuddleShell.tsx create mode 100644 desktop/src/app/AppShellChannelSurface.tsx create mode 100644 desktop/src/app/LazySettingsScreen.tsx create mode 100644 desktop/src/app/huddleBackingChannelStorage.test.mjs create mode 100644 desktop/src/app/huddleBackingChannelStorage.ts create mode 100644 desktop/src/app/huddleChannelVisibility.test.mjs create mode 100644 desktop/src/app/huddleChannelVisibility.ts create mode 100644 desktop/src/app/useHuddlePresentation.ts create mode 100644 desktop/src/features/channels/ui/ChannelScreenLoadingFallback.tsx create mode 100644 desktop/src/features/channels/ui/useChannelPaneMessages.ts create mode 100644 desktop/src/features/channels/ui/useHuddleChannelMessages.ts create mode 100644 desktop/src/features/channels/ui/useHuddleReadMarker.ts create mode 100644 desktop/src/features/channels/ui/useHuddleThreadIsolation.ts create mode 100644 desktop/src/features/huddle/HuddleContext.types.ts create mode 100644 desktop/src/features/huddle/components/AgentVoiceMenu.tsx create mode 100644 desktop/src/features/huddle/components/HuddleProfileControl.tsx create mode 100644 desktop/src/features/huddle/components/HuddleRoomHeader.tsx create mode 100644 desktop/src/features/huddle/components/HuddleStartingView.tsx create mode 100644 desktop/src/features/huddle/components/HuddleTranscriptIntro.tsx create mode 100644 desktop/src/features/huddle/lib/huddleWindow.ts create mode 100644 desktop/src/features/huddle/lib/useHuddlePttState.ts create mode 100644 desktop/src/features/huddle/lib/useHuddleSpeakerActivity.ts create mode 100644 desktop/src/features/sidebar/ui/AppSidebar.types.ts diff --git a/desktop/src-tauri/capabilities/default.json b/desktop/src-tauri/capabilities/default.json index 8835b29dec..a2e09bcb33 100644 --- a/desktop/src-tauri/capabilities/default.json +++ b/desktop/src-tauri/capabilities/default.json @@ -1,8 +1,8 @@ { "$schema": "../gen/schemas/desktop-schema.json", "identifier": "default", - "description": "Capability for the main window", - "windows": ["main"], + "description": "Capability for the main window and trusted huddle companions", + "windows": ["main", "huddle-*"], "permissions": [ "core:default", "core:webview:allow-set-webview-zoom", diff --git a/desktop/src-tauri/src/huddle/agent_voice.rs b/desktop/src-tauri/src/huddle/agent_voice.rs new file mode 100644 index 0000000000..5232287d75 --- /dev/null +++ b/desktop/src-tauri/src/huddle/agent_voice.rs @@ -0,0 +1,310 @@ +//! Per-agent text-to-speech choices for one local huddle session. + +use std::collections::{BTreeMap, HashSet}; + +use serde::{Deserialize, Serialize}; +use tauri::{AppHandle, State}; + +use crate::app_state::AppState; + +use super::{ + tts_settings::{ + pocket_voice_reference, resolve_voice_for_backend_in_registry, voice_registry, + VoiceRegistryEntry, POCKET_BACKEND_ID, + }, + HuddlePhase, HuddleState, +}; + +#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] +pub struct AgentVoiceSettings { + pub enabled: bool, + pub voice_key: String, +} + +struct AgentVoiceCatalog { + default_voice_key: String, + voices: Vec, +} + +fn catalog(app: &AppHandle, state: &AppState) -> Result { + let registry = voice_registry(app); + let settings = state + .huddle_audio + .tts + .lock() + .map_err(|error| format!("text-to-speech settings lock poisoned: {error}"))? + .clone(); + let voices: Vec<_> = registry + .iter() + .filter(|voice| { + voice.backend == POCKET_BACKEND_ID + && matches!(voice.availability.as_str(), "bundled" | "installed") + }) + .cloned() + .collect(); + let default_voice_key = resolve_voice_for_backend_in_registry( + &settings.voice_preferences, + POCKET_BACKEND_ID, + &voices, + )? + .key; + Ok(AgentVoiceCatalog { + default_voice_key, + voices, + }) +} + +fn stable_voice_index(agent_pubkey: &str, huddle_generation: u64, len: usize) -> usize { + let hash = agent_pubkey.bytes().fold( + 0xcbf2_9ce4_8422_2325_u64 ^ huddle_generation, + |hash, byte| hash.wrapping_mul(0x0000_0100_0000_01b3) ^ u64::from(byte), + ); + (hash as usize) % len +} + +pub(crate) fn sync_agent_voice_assignments( + huddle: &mut HuddleState, + agent_pubkeys: &[String], + default_voice_key: &str, + voices: &[VoiceRegistryEntry], +) -> bool { + let previous = huddle.agent_voice_settings.clone(); + let available_keys: Vec<_> = voices.iter().map(|voice| voice.key.clone()).collect(); + let available: HashSet<_> = available_keys.iter().cloned().collect(); + let agents: HashSet<_> = agent_pubkeys.iter().cloned().collect(); + huddle.agent_voice_settings.retain(|pubkey, settings| { + agents.contains(pubkey) && available.contains(&settings.voice_key) + }); + + let mut used: HashSet<_> = huddle + .agent_voice_settings + .values() + .map(|settings| settings.voice_key.clone()) + .collect(); + for (index, pubkey) in agent_pubkeys.iter().enumerate() { + if huddle.agent_voice_settings.contains_key(pubkey) { + continue; + } + let preferred = if index == 0 && !used.contains(default_voice_key) { + Some(default_voice_key.to_owned()) + } else { + let unused_alternates: Vec<_> = available_keys + .iter() + .filter(|key| key.as_str() != default_voice_key && !used.contains(*key)) + .cloned() + .collect(); + let unused: Vec<_> = available_keys + .iter() + .filter(|key| !used.contains(*key)) + .cloned() + .collect(); + let candidates = if unused_alternates.is_empty() { + if unused.is_empty() { + &available_keys + } else { + &unused + } + } else { + &unused_alternates + }; + (!candidates.is_empty()).then(|| { + candidates[stable_voice_index(pubkey, huddle.huddle_generation, candidates.len())] + .clone() + }) + }; + if let Some(voice_key) = preferred { + used.insert(voice_key.clone()); + huddle.agent_voice_settings.insert( + pubkey.clone(), + AgentVoiceSettings { + enabled: true, + voice_key, + }, + ); + } + } + huddle.agent_voice_settings != previous +} + +fn ensure_with_catalog( + huddle: &mut HuddleState, + catalog: &AgentVoiceCatalog, + extra_agent: Option<&str>, +) -> bool { + let mut agents = huddle + .agent_pubkeys + .lock() + .unwrap_or_else(|error| error.into_inner()) + .clone(); + if let Some(pubkey) = extra_agent { + if !agents.iter().any(|agent| agent == pubkey) { + agents.push(pubkey.to_owned()); + } + } + sync_agent_voice_assignments(huddle, &agents, &catalog.default_voice_key, &catalog.voices) +} + +fn require_active_huddle(huddle: &HuddleState) -> Result<(), String> { + matches!(huddle.phase, HuddlePhase::Connected | HuddlePhase::Active) + .then_some(()) + .ok_or_else(|| "No active huddle".to_owned()) +} + +#[tauri::command] +pub fn ensure_huddle_agent_voice_settings( + app: AppHandle, + state: State<'_, AppState>, +) -> Result, String> { + let catalog = catalog(&app, &state)?; + let (changed, settings) = { + let mut huddle = state.huddle()?; + if !matches!(huddle.phase, HuddlePhase::Connected | HuddlePhase::Active) { + return Ok(BTreeMap::new()); + } + let changed = ensure_with_catalog(&mut huddle, &catalog, None); + (changed, huddle.agent_voice_settings.clone()) + }; + if changed { + state.emit_huddle_state_changed(); + } + Ok(settings) +} + +#[tauri::command] +pub fn set_huddle_agent_tts_enabled( + agent_pubkey: String, + enabled: bool, + app: AppHandle, + state: State<'_, AppState>, +) -> Result { + let catalog = catalog(&app, &state)?; + let settings = { + let mut huddle = state.huddle()?; + require_active_huddle(&huddle)?; + ensure_with_catalog(&mut huddle, &catalog, Some(&agent_pubkey)); + let settings = huddle + .agent_voice_settings + .get_mut(&agent_pubkey) + .ok_or("Agent is not in the active huddle")?; + settings.enabled = enabled; + settings.clone() + }; + state.emit_huddle_state_changed(); + Ok(settings) +} + +#[tauri::command] +pub fn set_huddle_agent_voice( + agent_pubkey: String, + voice_key: String, + app: AppHandle, + state: State<'_, AppState>, +) -> Result { + let catalog = catalog(&app, &state)?; + if !catalog.voices.iter().any(|voice| voice.key == voice_key) { + return Err("The selected Pocket voice is not available on this device".to_owned()); + } + let settings = { + let mut huddle = state.huddle()?; + require_active_huddle(&huddle)?; + ensure_with_catalog(&mut huddle, &catalog, Some(&agent_pubkey)); + let settings = huddle + .agent_voice_settings + .get_mut(&agent_pubkey) + .ok_or("Agent is not in the active huddle")?; + settings.voice_key = voice_key; + settings.clone() + }; + state.emit_huddle_state_changed(); + Ok(settings) +} + +pub(crate) fn voice_reference_for_agent( + app: &AppHandle, + state: &AppState, + agent_pubkey: &str, +) -> Result, String> { + let catalog = catalog(app, state)?; + let (changed, settings) = { + let mut huddle = state.huddle()?; + require_active_huddle(&huddle)?; + let changed = ensure_with_catalog(&mut huddle, &catalog, Some(agent_pubkey)); + let settings = huddle.agent_voice_settings.get(agent_pubkey).cloned(); + (changed, settings) + }; + if changed { + state.emit_huddle_state_changed(); + } + let Some(settings) = settings else { + return Err("Agent is not in the active huddle".to_owned()); + }; + if !settings.enabled { + return Ok(None); + } + pocket_voice_reference(app, &[settings.voice_key]).map(Some) +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::huddle::tts_settings::bundled_voice_registry; + + #[test] + fn first_agent_uses_default_and_additional_agents_are_distinct() { + let agents = vec!["first".to_owned(), "second".to_owned(), "third".to_owned()]; + let mut huddle = HuddleState { + huddle_generation: 9, + ..HuddleState::default() + }; + + assert!(sync_agent_voice_assignments( + &mut huddle, + &agents, + "pocket:vera", + &bundled_voice_registry(), + )); + + assert_eq!( + huddle.agent_voice_settings["first"].voice_key, + "pocket:vera" + ); + let distinct: HashSet<_> = huddle + .agent_voice_settings + .values() + .map(|settings| settings.voice_key.as_str()) + .collect(); + assert_eq!(distinct.len(), 3); + } + + #[test] + fn explicit_session_choices_survive_roster_resync() { + let agents = vec!["first".to_owned(), "second".to_owned()]; + let voices = bundled_voice_registry(); + let mut huddle = HuddleState::default(); + sync_agent_voice_assignments(&mut huddle, &agents, "pocket:mary", &voices); + huddle + .agent_voice_settings + .get_mut("second") + .unwrap() + .enabled = false; + huddle + .agent_voice_settings + .get_mut("second") + .unwrap() + .voice_key = "pocket:jane".into(); + + assert!(!sync_agent_voice_assignments( + &mut huddle, + &agents, + "pocket:mary", + &voices, + )); + assert_eq!( + huddle.agent_voice_settings["second"], + AgentVoiceSettings { + enabled: false, + voice_key: "pocket:jane".into(), + } + ); + } +} diff --git a/desktop/src-tauri/src/huddle/agents.rs b/desktop/src-tauri/src/huddle/agents.rs index 2de22f99d8..41a348d888 100644 --- a/desktop/src-tauri/src/huddle/agents.rs +++ b/desktop/src-tauri/src/huddle/agents.rs @@ -9,14 +9,24 @@ //! when it receives the kind:9000 membership notification. Huddle-specific //! env vars (interrupt mode, custom system prompt) are a post-MVP enhancement. +use std::collections::HashSet; + use serde::Serialize; +use tauri::State; use uuid::Uuid; use crate::{ - app_state::AppState, events, huddle::relay_api::fetch_channel_members_with_roles, + app_state::AppState, + events, + huddle::relay_api::{ + fetch_channel_members, fetch_channel_members_with_roles, validate_pubkey_hex, + MAX_HUDDLE_AGENTS, + }, relay::submit_event, }; +use super::{pipeline::start_auto_enabled_transcription, HuddlePhase}; + // ── Constants ───────────────────────────────────────────────────────────────── /// Voice-mode guidelines posted as kind:48106 (huddle guidelines) to the @@ -78,6 +88,21 @@ pub struct AgentAddResult { pub parent_error: Option, } +/// Result of reconciling channel agent additions into the active Huddle. +#[derive(Debug, Serialize)] +pub struct AgentHuddleSyncResult { + /// Whether `channel_id` belonged to the active Huddle. + pub matched_active_huddle: bool, + /// Agents newly enrolled in the Huddle's ephemeral channel. + pub added: Vec, +} + +// Multiple frontend mutation paths can observe the same membership addition +// (for example, the member hook and the mention send flow). Serialize native +// reconciliation so they share the first result instead of racing duplicate +// membership events through a relay read that has not caught up yet. +static AGENT_SYNC_LOCK: tokio::sync::Mutex<()> = tokio::sync::Mutex::const_new(()); + /// Add an agent to both the ephemeral and parent huddle channels. /// /// Returns `Err` only if the ephemeral-channel add fails (policy rejection or @@ -134,6 +159,156 @@ pub async fn add_agent_to_huddle( }) } +/// Reconcile explicitly added channel agents into the active Huddle. +/// +/// The source channel may be either the Huddle's parent or its ephemeral chat. +/// Existing ephemeral membership is hydrated first so a mention sent from the +/// Huddle chat does not publish a duplicate membership event. Missing agents +/// are added through the same parent + ephemeral path as the Add agent picker. +pub(crate) async fn sync_agents_for_active_huddle( + channel_id: &str, + agent_pubkeys: Vec, + state: &AppState, +) -> Result { + let mut seen = HashSet::new(); + let mut requested = Vec::new(); + for pubkey in agent_pubkeys { + let normalized = pubkey.to_ascii_lowercase(); + validate_pubkey_hex(&normalized)?; + if seen.insert(normalized.clone()) { + requested.push(normalized); + } + } + if requested.is_empty() { + return Ok(AgentHuddleSyncResult { + matched_active_huddle: false, + added: Vec::new(), + }); + } + let _sync_guard = AGENT_SYNC_LOCK.lock().await; + + let (ephemeral_channel_id, parent_channel_id, huddle_generation, state_agents) = { + let huddle = state.huddle()?; + if !matches!(huddle.phase, HuddlePhase::Connected | HuddlePhase::Active) { + return Ok(AgentHuddleSyncResult { + matched_active_huddle: false, + added: Vec::new(), + }); + } + let ephemeral_channel_id = huddle + .ephemeral_channel_id + .clone() + .ok_or("no ephemeral channel")?; + let parent_channel_id = huddle + .parent_channel_id + .clone() + .ok_or("no parent channel")?; + if channel_id != ephemeral_channel_id && channel_id != parent_channel_id { + return Ok(AgentHuddleSyncResult { + matched_active_huddle: false, + added: Vec::new(), + }); + } + let state_agents = huddle + .agent_pubkeys + .lock() + .unwrap_or_else(|error| error.into_inner()) + .clone(); + ( + ephemeral_channel_id, + parent_channel_id, + huddle.huddle_generation, + state_agents, + ) + }; + + // Membership reads can lag a just-accepted write, so merge the relay view + // with local state instead of allowing a stale snapshot to remove agents. + let fresh_agents = fetch_channel_members(&ephemeral_channel_id, Some("bot"), state) + .await + .unwrap_or_default(); + let mut known_agents = HashSet::new(); + let mut merged_agents = Vec::new(); + for pubkey in state_agents.into_iter().chain(fresh_agents) { + let normalized = pubkey.to_ascii_lowercase(); + if known_agents.insert(normalized.clone()) { + merged_agents.push(normalized); + } + } + let missing: Vec = requested + .into_iter() + .filter(|pubkey| !known_agents.contains(pubkey)) + .collect(); + if known_agents.len() + missing.len() > MAX_HUDDLE_AGENTS { + return Err(format!( + "agent limit reached: {} requested with {} already present (max {})", + missing.len(), + known_agents.len(), + MAX_HUDDLE_AGENTS + )); + } + + let ephemeral_uuid = Uuid::parse_str(&ephemeral_channel_id).map_err(|e| e.to_string())?; + let parent_uuid = Uuid::parse_str(&parent_channel_id).map_err(|e| e.to_string())?; + let mut added = Vec::new(); + for pubkey in missing { + add_agent_to_huddle(ephemeral_uuid, parent_uuid, &pubkey, state).await?; + merged_agents.push(pubkey.clone()); + added.push(pubkey); + } + + let (roster_changed, transcription_auto_enabled) = { + let mut huddle = state.huddle()?; + if !huddle.is_current_huddle(&ephemeral_channel_id, huddle_generation) { + return Ok(AgentHuddleSyncResult { + matched_active_huddle: true, + added, + }); + } + let mut roster_changed = false; + { + let mut current_agents = huddle + .agent_pubkeys + .lock() + .unwrap_or_else(|error| error.into_inner()); + if *current_agents != merged_agents { + *current_agents = merged_agents.clone(); + roster_changed = true; + } + } + for pubkey in &merged_agents { + if !huddle.participants.contains(pubkey) { + huddle.participants.push(pubkey.clone()); + roster_changed = true; + } + } + ( + roster_changed, + huddle.maybe_auto_enable_transcription_for_agents(), + ) + }; + + if transcription_auto_enabled { + start_auto_enabled_transcription(state, &ephemeral_channel_id).await; + } else if roster_changed { + state.emit_huddle_state_changed(); + } + + Ok(AgentHuddleSyncResult { + matched_active_huddle: true, + added, + }) +} + +#[tauri::command] +pub async fn sync_agents_to_active_huddle( + channel_id: String, + agent_pubkeys: Vec, + state: State<'_, AppState>, +) -> Result { + sync_agents_for_active_huddle(&channel_id, agent_pubkeys, &state).await +} + fn contains_member(members: &[(String, Option)], pubkey: &str) -> bool { members .iter() diff --git a/desktop/src-tauri/src/huddle/mod.rs b/desktop/src-tauri/src/huddle/mod.rs index 03264f80f4..99337400c9 100644 --- a/desktop/src-tauri/src/huddle/mod.rs +++ b/desktop/src-tauri/src/huddle/mod.rs @@ -24,6 +24,7 @@ //! and drops them outside the lock (thread joins can block ~200ms). mod agent_tts_routing; +pub mod agent_voice; pub mod agents; pub mod audio_output; pub mod jitter; @@ -41,6 +42,7 @@ pub mod tts; pub mod tts_settings; mod tts_voice_import; mod tts_voice_registry; +mod window; pub mod wire; // ── Shared utilities ────────────────────────────────────────────────────────── @@ -68,6 +70,7 @@ pub(super) fn drain_until_shutdown( pub use state::{HuddleJoinInfo, HuddlePhase, HuddleState, VoiceInputMode}; pub use transcription::{set_huddle_transcription_enabled, start_stt_pipeline}; pub use tts_settings::set_tts_enabled; +pub use window::{close_huddle_companion, open_huddle_window}; // ── Imports ─────────────────────────────────────────────────────────────────── @@ -90,6 +93,7 @@ use relay_api::{ count_human_members, fetch_channel_members, parse_channel_uuid, validate_pubkey_hex, MAX_HUDDLE_AGENTS, }; +use window::close_huddle_window; fn normalize_huddle_channel_name(candidate: Option, fallback: &str) -> String { let normalized = candidate @@ -175,6 +179,7 @@ pub async fn start_huddle( parent_channel_id: String, member_pubkeys: Vec, channel_name: Option, + app: tauri::AppHandle, state: State<'_, AppState>, ) -> Result { // Validate inputs at the Tauri boundary. @@ -198,6 +203,15 @@ pub async fn start_huddle( deduped }; + // Allocate the backing channel ID before the relay work starts. Publishing + // it with the Creating state lets the main webview open an immediate + // companion window while the channel and audio session are being prepared. + let ephemeral_uuid = Uuid::new_v4(); + let ephemeral_channel_id = ephemeral_uuid.to_string(); + let short_id = &ephemeral_channel_id[..8]; + let fallback_channel_name = format!("huddle-{short_id}"); + let channel_name = normalize_huddle_channel_name(channel_name, &fallback_channel_name); + // Transition to Creating. let huddle_generation = { let mut hs = state.huddle()?; @@ -210,20 +224,16 @@ pub async fn start_huddle( let generation = hs.begin_huddle_lifetime(); hs.phase = HuddlePhase::Creating; hs.parent_channel_id = Some(parent_channel_id.clone()); + hs.ephemeral_channel_id = Some(ephemeral_channel_id.clone()); generation }; - - let ephemeral_uuid = Uuid::new_v4(); - let ephemeral_channel_id = ephemeral_uuid.to_string(); - let short_id = &ephemeral_channel_id[..8]; - let fallback_channel_name = format!("huddle-{short_id}"); - let channel_name = normalize_huddle_channel_name(channel_name, &fallback_channel_name); + state.emit_huddle_state_changed(); // All steps wrapped so we can roll back on ANY failure, including step 1. // channel_was_created tracks whether we need to archive on rollback. let mut channel_was_created = false; - let result: Result, String> = async { + let result: Result<(Vec, String), String> = async { // 1. Create ephemeral channel. let create_builder = events::build_create_channel( ephemeral_uuid, @@ -265,14 +275,14 @@ pub async fn start_huddle( // 4. Emit HUDDLE_STARTED to parent channel. let started_builder = events::build_huddle_started(&parent_channel_id, &ephemeral_channel_id)?; - submit_event(started_builder, &state).await?; + let started_event = submit_event(started_builder, &state).await?; - Ok(successful_agents) + Ok((successful_agents, started_event.event_id)) } .await; match result { - Ok(successful_agents) => { + Ok((successful_agents, huddle_thread_event_id)) => { // 5. Store active state. let committed = { let mut hs = state.huddle()?; @@ -282,6 +292,7 @@ pub async fn start_huddle( hs.phase = HuddlePhase::Connected; hs.is_creator = true; hs.ephemeral_channel_id = Some(ephemeral_channel_id.clone()); + hs.huddle_thread_event_id = Some(huddle_thread_event_id); *hs.agent_pubkeys.lock().unwrap_or_else(|e| e.into_inner()) = successful_agents.clone(); hs.maybe_auto_enable_transcription_for_agents(); @@ -300,6 +311,7 @@ pub async fn start_huddle( }; if !committed { emit_end_and_archive(&parent_channel_id, &ephemeral_channel_id, &state).await; + close_huddle_window(&app, &ephemeral_channel_id); return Err("huddle start was superseded".to_owned()); } @@ -311,6 +323,7 @@ pub async fn start_huddle( match post_connect_setup(&state, &ephemeral_channel_id, huddle_generation).await { Ok(PostConnectOutcome::Ready) => {} Ok(PostConnectOutcome::Stale) => { + close_huddle_window(&app, &ephemeral_channel_id); return Err("huddle start was superseded".to_owned()); } Err(e) => { @@ -330,6 +343,7 @@ pub async fn start_huddle( } state.emit_huddle_state_changed(); } + close_huddle_window(&app, &ephemeral_channel_id); return Err(e); } } @@ -350,10 +364,19 @@ pub async fn start_huddle( } } // Reset only if this failed attempt still owns the Creating state. - if let Ok(mut hs) = state.huddle_state.lock() { + let reset = if let Ok(mut hs) = state.huddle_state.lock() { if hs.owns_huddle_lifetime(huddle_generation, HuddlePhase::Creating) { hs.reset_preserving_generation(); + true + } else { + false } + } else { + false + }; + if reset { + state.emit_huddle_state_changed(); + close_huddle_window(&app, &ephemeral_channel_id); } Err(e) } @@ -372,6 +395,7 @@ pub async fn start_huddle( pub async fn join_huddle( parent_channel_id: String, ephemeral_channel_id: String, + huddle_thread_event_id: Option, state: State<'_, AppState>, ) -> Result { // Transition to Connecting. @@ -387,6 +411,7 @@ pub async fn join_huddle( hs.phase = HuddlePhase::Connecting; hs.parent_channel_id = Some(parent_channel_id.clone()); hs.ephemeral_channel_id = Some(ephemeral_channel_id.clone()); + hs.huddle_thread_event_id = huddle_thread_event_id; generation }; @@ -557,7 +582,7 @@ async fn remove_huddle_agents(ephemeral_channel_id: &str, state: &AppState) { /// /// The relay emits kind:48102 (participant left) when the audio WS disconnects. #[tauri::command] -pub async fn leave_huddle(state: State<'_, AppState>) -> Result<(), String> { +pub async fn leave_huddle(app: tauri::AppHandle, state: State<'_, AppState>) -> Result<(), String> { let (parent_channel_id, ephemeral_channel_id) = { let mut hs = state.huddle()?; if hs.phase == HuddlePhase::Idle { @@ -606,6 +631,7 @@ pub async fn leave_huddle(state: State<'_, AppState>) -> Result<(), String> { } teardown_huddle(&state)?; + close_huddle_window(&app, &ephemeral_channel_id); Ok(()) } @@ -618,7 +644,11 @@ pub async fn leave_huddle(state: State<'_, AppState>) -> Result<(), String> { /// 3. Shut down the STT pipeline (Fix 5). /// 4. Clear local huddle state. #[tauri::command] -pub async fn end_huddle(force: Option, state: State<'_, AppState>) -> Result<(), String> { +pub async fn end_huddle( + force: Option, + app: tauri::AppHandle, + state: State<'_, AppState>, +) -> Result<(), String> { let (parent_channel_id, ephemeral_channel_id) = { let mut hs = state.huddle()?; if hs.phase == HuddlePhase::Idle { @@ -641,6 +671,7 @@ pub async fn end_huddle(force: Option, state: State<'_, AppState>) -> Resu emit_end_and_archive(&parent_channel_id, &ephemeral_channel_id, &state).await; teardown_huddle(&state)?; + close_huddle_window(&app, &ephemeral_channel_id); Ok(()) } @@ -767,6 +798,8 @@ pub fn get_model_status(_state: State<'_, AppState>) -> Result, ) -> Result<(), String> { eprintln!("buzz-desktop: tts stage=invoke status=started route_id={route_id}"); @@ -774,6 +807,22 @@ pub async fn speak_agent_message( // Use char count (not byte length) to avoid panicking on multi-byte UTF-8. let text = normalize_agent_tts_text(text); + if !state.huddle()?.tts_enabled { + eprintln!( + "buzz-desktop: tts stage=invoke status=no_op reason=disabled route_id={route_id}" + ); + return Ok(()); + } + + let Some(voice_reference) = + agent_voice::voice_reference_for_agent(&app, &state, &speaker_pubkey)? + else { + eprintln!( + "buzz-desktop: tts stage=invoke status=no_op reason=agent_disabled route_id={route_id}" + ); + return Ok(()); + }; + let needs_pipeline = { let mut hs = state.huddle()?; if hs @@ -831,7 +880,7 @@ pub async fn speak_agent_message( }; enqueue_agent_tts_text(route_id, text, move |route_id, text| { sender - .send(route_id, text) + .send(route_id, speaker_pubkey, voice_reference, text) .map_err(|error| format!("TTS queue closed while waiting to enqueue: {error}")) }) .await diff --git a/desktop/src-tauri/src/huddle/pipeline.rs b/desktop/src-tauri/src/huddle/pipeline.rs index fba5464a69..9572ac25bf 100644 --- a/desktop/src-tauri/src/huddle/pipeline.rs +++ b/desktop/src-tauri/src/huddle/pipeline.rs @@ -82,7 +82,7 @@ pub async fn check_pipeline_hotstart(state: State<'_, AppState>) -> Result<(), S .map(|m| m.take_tts_ready()) .unwrap_or(false); - // Start TTS first (so STT can capture tts_cancel). + // Start TTS first so STT can observe its active-playback gate. if !has_tts && (tts_ready || models::is_tts_ready()) { if let Err(e) = maybe_start_tts_pipeline(&state).await { eprintln!("buzz-desktop: TTS hotstart failed: {e}"); @@ -130,25 +130,45 @@ pub async fn check_pipeline_hotstart(state: State<'_, AppState>) -> Result<(), S .await .ok(); let fresh_members = fetch_channel_members(eph_id, None, &state).await.ok(); - let transcription_auto_enabled = if fresh_agents.is_some() || fresh_members.is_some() { - let mut hs = state.huddle()?; - if !hs.is_current_huddle(eph_id, huddle_generation) { - return Ok(()); - } - if let Some(agents) = fresh_agents { - *hs.agent_pubkeys.lock().unwrap_or_else(|e| e.into_inner()) = agents; - } - if let Some(members) = fresh_members { - hs.participants = members; - } - hs.last_agent_refresh = Some(std::time::Instant::now()); - hs.maybe_auto_enable_transcription_for_agents() - } else { - false - }; + let (roster_changed, transcription_auto_enabled) = + if fresh_agents.is_some() || fresh_members.is_some() { + let mut hs = state.huddle()?; + if !hs.is_current_huddle(eph_id, huddle_generation) { + return Ok(()); + } + let mut roster_changed = false; + if let Some(agents) = fresh_agents { + let mut current_agents = + hs.agent_pubkeys.lock().unwrap_or_else(|e| e.into_inner()); + if *current_agents != agents { + *current_agents = agents; + roster_changed = true; + } + } + if let Some(members) = fresh_members { + if hs.participants != members { + hs.participants = members; + roster_changed = true; + } + } + hs.last_agent_refresh = Some(std::time::Instant::now()); + ( + roster_changed, + hs.maybe_auto_enable_transcription_for_agents(), + ) + } else { + (false, false) + }; if transcription_auto_enabled { start_auto_enabled_transcription(&state, eph_id).await; } + // Audio authentication auto-adds a joining human to the ephemeral + // channel. Emit whenever that authoritative roster changes so the + // desktop participant strip updates immediately instead of waiting + // for its slow fallback IPC read. + if roster_changed || transcription_auto_enabled { + state.emit_huddle_state_changed(); + } } } @@ -173,23 +193,32 @@ pub(crate) async fn post_connect_setup( fetch_channel_members(ephemeral_channel_id, Some("bot"), state), fetch_channel_members(ephemeral_channel_id, None, state), ); - let transcription_auto_enabled = { + let (roster_changed, transcription_auto_enabled) = { let mut hs = state.huddle()?; if !hs.is_current_huddle(ephemeral_channel_id, huddle_generation) { return Ok(PostConnectOutcome::Stale); } + let mut roster_changed = false; if let Ok(agents) = agents_result { - *hs.agent_pubkeys.lock().unwrap_or_else(|e| e.into_inner()) = agents; + let mut current_agents = hs.agent_pubkeys.lock().unwrap_or_else(|e| e.into_inner()); + if *current_agents != agents { + *current_agents = agents; + roster_changed = true; + } } if let Ok(all_members) = all_members_result { - if !all_members.is_empty() { + if !all_members.is_empty() && hs.participants != all_members { hs.participants = all_members; + roster_changed = true; } } - hs.maybe_auto_enable_transcription_for_agents() + ( + roster_changed, + hs.maybe_auto_enable_transcription_for_agents(), + ) }; - if transcription_auto_enabled { + if roster_changed || transcription_auto_enabled { state.emit_huddle_state_changed(); } @@ -281,7 +310,6 @@ pub(crate) async fn maybe_start_stt_pipeline( // the worker thread (~200ms) and must not block under the mutex. let ( tts_active, - tts_cancel, agent_pubkeys_arc, session_gen, expected_generation, @@ -312,7 +340,6 @@ pub(crate) async fn maybe_start_stt_pipeline( }; ( Arc::clone(&hs.tts_active), - Some(Arc::clone(&hs.tts_cancel)), Arc::clone(&hs.agent_pubkeys), Arc::clone(&hs.session_generation), hs.session_generation.load(Ordering::Acquire), @@ -325,7 +352,7 @@ pub(crate) async fn maybe_start_stt_pipeline( drop(old_stt); let constructed = tokio::task::spawn_blocking(move || { - stt::SttPipeline::new(model_dir, tts_active, tts_cancel, ptt_active_for_stt) + stt::SttPipeline::new(model_dir, tts_active, ptt_active_for_stt) }) .await; let (pipeline, text_rx) = match constructed { @@ -421,8 +448,8 @@ pub(crate) async fn maybe_start_tts_pipeline(state: &AppState) -> Result super::tts_settings::pocket_voice_reference(&app, &voice_preferences)?, + let initial_voice = match app.as_ref() { + Some(app) => super::tts_settings::pocket_voice_reference(app, &voice_preferences)?, None => super::tts_settings::bundled_pocket_voice_reference(&voice_preferences), }; @@ -458,6 +485,7 @@ pub(crate) async fn maybe_start_tts_pipeline(state: &AppState) -> Result f32 { + ((f32::from(level_dbov) + 60.0) / 48.0).clamp(0.0, 1.0) +} + +fn should_recover_playout(depth: usize, currently_recovering: bool) -> bool { + if currently_recovering { + depth > PLAYOUT_QUEUE_RECOVERY_END + } else { + depth >= PLAYOUT_QUEUE_RECOVERY_START + } +} /// One remote peer's slot: jitter buffer + dedicated rodio Player. /// @@ -87,6 +105,7 @@ struct PeerSlot { /// by the playout tick to decide whether to keep draining NetEq into the /// Player. Updated on every successful `insert_packet`. last_packet_at: tokio::time::Instant, + recovering_playout: bool, } impl PeerSlot { @@ -96,6 +115,7 @@ impl PeerSlot { jitter, player: rodio::Player::connect_new(sink_mixer), last_packet_at: tokio::time::Instant::now(), + recovering_playout: false, }), Err(e) => { eprintln!("buzz-desktop: jitter buffer init peer {peer_idx}: {e}"); @@ -121,6 +141,19 @@ impl PeerSlot { fn is_active(&self) -> bool { self.last_packet_at.elapsed() < IDLE_PEER_GRACE || !self.jitter.is_empty() } + + fn update_playout_recovery(&mut self) { + let should_recover = should_recover_playout(self.player.len(), self.recovering_playout); + if should_recover == self.recovering_playout { + return; + } + self.recovering_playout = should_recover; + self.player.set_speed(if should_recover { + PLAYOUT_RECOVERY_SPEED + } else { + 1.0 + }); + } } /// Drive the receive loop until cancelled or the WS closes. @@ -149,12 +182,16 @@ pub(crate) async fn run_playout_recv_loop( let mut index_to_pubkey: std::collections::HashMap = initial_peers.into_iter().collect(); let mut active_indices: std::collections::HashSet = std::collections::HashSet::new(); + let mut speaker_levels: std::collections::HashMap = std::collections::HashMap::new(); let mut frame_counts: std::collections::HashMap = std::collections::HashMap::new(); let mut last_frame_reset = tokio::time::Instant::now(); let mut tts_was_active = false; let mut speaker_tick = tokio::time::interval(std::time::Duration::from_millis(SPEAKER_TICK_MS)); speaker_tick.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Skip); + let mut speaker_level_tick = + tokio::time::interval(std::time::Duration::from_millis(SPEAKER_LEVEL_TICK_MS)); + speaker_level_tick.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Skip); let mut playout_tick = tokio::time::interval(std::time::Duration::from_millis(PLAYOUT_TICK_MS)); // `Delay` (not `Skip`) so a brief stall in another select arm — e.g. the // ws_tx_for_pongs mutex contending with the encode-side task on a Ping — @@ -187,15 +224,14 @@ pub(crate) async fn run_playout_recv_loop( } match slot.jitter.get_audio() { Ok((samples, _vad)) => { - // Bound producer-vs-device-clock drift. If our - // tokio tick has gotten ahead of the audio - // callback's actual consumption rate, drop the - // oldest queued frame rather than letting the - // queue grow without bound. - if slot.player.len() >= PLAYOUT_QUEUE_HIGH_WATER { + // Smooth out producer-vs-device clock drift. A + // shallow hard drop used to remove entire 10 ms + // chunks and create audible discontinuities. + slot.update_playout_recovery(); + if slot.player.len() >= PLAYOUT_QUEUE_EMERGENCY_HIGH_WATER { eprintln!( - "buzz-desktop: playout queue high-water for peer {peer_idx} \ - (depth={}) — dropping oldest frame", + "buzz-desktop: playout queue emergency high-water for peer \ + {peer_idx} (depth={}) — dropping oldest frame", slot.player.len(), ); slot.player.skip_one(); @@ -221,6 +257,22 @@ pub(crate) async fn run_playout_recv_loop( } active_indices.clear(); } + _ = speaker_level_tick.tick() => { + if let Some(ref app) = app_handle { + use tauri::Emitter; + let levels: std::collections::HashMap = speaker_levels + .iter() + .filter_map(|(idx, level)| { + index_to_pubkey.get(idx).cloned().map(|pubkey| (pubkey, *level)) + }) + .collect(); + let _ = app.emit("huddle-speaker-levels", &levels); + } + for level in speaker_levels.values_mut() { + *level *= 0.55; + } + speaker_levels.retain(|_, level| *level > 0.015); + } msg = ws_rx.next() => { match msg { Some(Ok(WsMsg::Binary(data))) => { @@ -253,6 +305,11 @@ pub(crate) async fn run_playout_recv_loop( // make their tile flash for the 500 ms speaker tick. if !is_dtx { active_indices.insert(peer_idx); + let level = normalized_speaker_level(header.level_dbov); + speaker_levels + .entry(peer_idx) + .and_modify(|current| *current = current.max(level)) + .or_insert(level); } // TTS interrupt frame counter — reset on TTS rising edge. @@ -328,6 +385,7 @@ pub(crate) async fn run_playout_recv_loop( peers.remove(&key); frame_counts.remove(&key); active_indices.remove(&key); + speaker_levels.remove(&key); } index_to_pubkey.insert(key, pk.to_string()); } @@ -351,6 +409,7 @@ pub(crate) async fn run_playout_recv_loop( peers.retain(|idx, _| identity_unchanged(idx)); frame_counts.retain(|idx, _| identity_unchanged(idx)); active_indices.retain(identity_unchanged); + speaker_levels.retain(|idx, _| identity_unchanged(idx)); index_to_pubkey = replacement; } } @@ -359,6 +418,8 @@ pub(crate) async fn run_playout_recv_loop( let key = idx as u8; index_to_pubkey.remove(&key); frame_counts.remove(&key); + active_indices.remove(&key); + speaker_levels.remove(&key); // Dropping Player detaches its queue from the // device mixer, freeing the per-peer slot. peers.remove(&key); @@ -379,4 +440,34 @@ pub(crate) async fn run_playout_recv_loop( } } } + + if let Some(ref app) = app_handle { + use tauri::Emitter; + let _ = app.emit( + "huddle-speaker-levels", + &std::collections::HashMap::::new(), + ); + } +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn speaker_level_maps_conversational_range() { + assert_eq!(normalized_speaker_level(-127), 0.0); + assert_eq!(normalized_speaker_level(-60), 0.0); + assert!((normalized_speaker_level(-36) - 0.5).abs() < f32::EPSILON); + assert_eq!(normalized_speaker_level(-12), 1.0); + assert_eq!(normalized_speaker_level(0), 1.0); + } + + #[test] + fn playout_recovery_uses_hysteresis() { + assert!(!should_recover_playout(9, false)); + assert!(should_recover_playout(10, false)); + assert!(should_recover_playout(5, true)); + assert!(!should_recover_playout(4, true)); + } } diff --git a/desktop/src-tauri/src/huddle/state.rs b/desktop/src-tauri/src/huddle/state.rs index 37eb3533f6..0fe3a46f5a 100644 --- a/desktop/src-tauri/src/huddle/state.rs +++ b/desktop/src-tauri/src/huddle/state.rs @@ -4,11 +4,13 @@ //! phase enum, voice input mode, and response types. use serde::{Deserialize, Serialize}; +use std::collections::BTreeMap; use std::sync::{ atomic::{AtomicBool, AtomicU64, Ordering}, Arc, Mutex, }; +use super::agent_voice::AgentVoiceSettings; use super::{stt, tts}; /// Voice input mode: push-to-talk (PTT) or voice-activity detection (VAD). @@ -18,8 +20,9 @@ use super::{stt, tts}; /// (after a 200 ms delay) stops mic capture and flushes the utterance. /// /// VAD (default): the earshot VAD runs continuously and speech is accumulated -/// whenever the probability exceeds the threshold. Barge-in is enabled in this -/// mode. +/// whenever the probability exceeds the threshold. While local TTS is playing, +/// mic frames are discarded because VAD has no echo reference with which to +/// distinguish the app's own playback from a human interruption. #[derive(Debug, Clone, Default, Serialize, Deserialize, PartialEq)] #[serde(rename_all = "snake_case")] pub enum VoiceInputMode { @@ -44,6 +47,9 @@ pub struct HuddleState { pub phase: HuddlePhase, pub parent_channel_id: Option, pub ephemeral_channel_id: Option, + /// Root event for the huddle's visible parent-channel thread. Transcript + /// messages reply here while audio coordination stays ephemeral. + pub huddle_thread_event_id: Option, /// Cancellation token for the audio relay WS task. #[serde(skip)] pub audio_ws_cancel: Option, @@ -67,6 +73,8 @@ pub struct HuddleState { deserialize_with = "deserialize_agent_pubkeys" )] pub agent_pubkeys: Arc>>, + /// Local, huddle-scoped playback choices for each participating agent. + pub agent_voice_settings: BTreeMap, /// Active STT pipeline — not serialized, not cloned. #[serde(skip)] pub stt_pipeline: Option>, @@ -161,10 +169,12 @@ impl Clone for HuddleState { phase: self.phase.clone(), parent_channel_id: self.parent_channel_id.clone(), ephemeral_channel_id: self.ephemeral_channel_id.clone(), + huddle_thread_event_id: self.huddle_thread_event_id.clone(), audio_ws_cancel: None, // Never clone handles. audio_relay_pcm_tx: None, // Never clone handles. participants: self.participants.clone(), agent_pubkeys: Arc::new(Mutex::new(agent_pubkeys_snapshot)), + agent_voice_settings: self.agent_voice_settings.clone(), stt_pipeline: None, // Never clone the pipeline handle. tts_pipeline: None, // Never clone the pipeline handle. is_creator: self.is_creator, @@ -190,10 +200,12 @@ impl Default for HuddleState { phase: HuddlePhase::Idle, parent_channel_id: None, ephemeral_channel_id: None, + huddle_thread_event_id: None, audio_ws_cancel: None, audio_relay_pcm_tx: None, participants: Vec::new(), agent_pubkeys: Arc::new(Mutex::new(Vec::new())), + agent_voice_settings: BTreeMap::new(), stt_pipeline: None, tts_pipeline: None, is_creator: false, diff --git a/desktop/src-tauri/src/huddle/stt.rs b/desktop/src-tauri/src/huddle/stt.rs index 6f502ca72c..30a47f449a 100644 --- a/desktop/src-tauri/src/huddle/stt.rs +++ b/desktop/src-tauri/src/huddle/stt.rs @@ -63,13 +63,13 @@ impl SttPipeline { /// /// `tts_active` is a shared flag set by the TTS pipeline while audio is /// playing. The STT worker uses it to: - /// - discard accumulated speech (echo prevention / barge-in gating) - /// - apply a 200 ms cooldown after TTS stops before re-enabling STT - /// - detect barge-in: speech onset during TTS → set `tts_cancel` + /// - discard accumulated speech so local playback cannot feed back into STT + /// - apply a cooldown after TTS stops before re-enabling STT /// - /// `tts_cancel` (optional) is the TTS pipeline's cancel flag. When the STT - /// worker detects speech onset while TTS is active, it sets this flag to - /// stop playback immediately (barge-in). Pass `None` if TTS is unavailable. + /// Open-mic VAD cannot distinguish a nearby human from the app's own native + /// TTS playback because it has no acoustic echo reference. Local mic frames + /// therefore never cancel TTS. Push-to-talk and remote participant speech + /// remain explicit, reliable barge-in paths. /// /// `ptt_active` (optional) is the push-to-talk flag. When `Some`, the STT /// pipeline only accumulates speech while the flag is true (key held). @@ -86,7 +86,6 @@ impl SttPipeline { pub fn new( model_dir: PathBuf, tts_active: Arc, - tts_cancel: Option>, ptt_active: Option>, ) -> Result<(Self, tokio_mpsc::Receiver), String> { let (audio_tx, audio_rx) = mpsc::sync_channel::>(AUDIO_QUEUE_DEPTH); @@ -94,7 +93,6 @@ impl SttPipeline { let shutdown = Arc::new(AtomicBool::new(false)); let shutdown_worker = Arc::clone(&shutdown); - let tts_cancel_worker = tts_cancel.as_ref().map(Arc::clone); let ptt_active_worker = ptt_active.as_ref().map(Arc::clone); let handle = thread::Builder::new() .name("stt-worker".into()) @@ -105,7 +103,6 @@ impl SttPipeline { text_tx, shutdown_worker, tts_active, - tts_cancel_worker, ptt_active_worker, ) }) @@ -167,28 +164,26 @@ impl Drop for SttPipeline { /// Previous value (28 frames / 450 ms) felt sluggish in conversation. const SILENCE_FLUSH_FRAMES: usize = 19; -/// Consecutive VAD speech frames required before triggering barge-in during TTS. -/// 20 frames × 256 samples / 16 kHz ≈ 320 ms — must be long enough to filter -/// speaker-to-mic feedback (TTS audio bleeding through the mic) while still -/// catching real human interruptions. 80 ms (previous: 5 frames) was too -/// aggressive — laptop speakers without headphones triggered false barge-in -/// within the first word of TTS playback. -const BARGE_IN_DEBOUNCE_FRAMES: usize = 20; - /// earshot requires exactly 256 samples per frame at 16 kHz. const VAD_FRAME_SAMPLES: usize = 256; /// VAD probability threshold — above this is considered speech. const VAD_THRESHOLD: f32 = 0.5; +/// Minimum voiced audio needed before an utterance may be decoded. +/// One earshot false-positive frame is only 16 ms; requiring 192 ms prevents +/// silence/room-noise blips from reaching Parakeet and becoming hallucinated +/// transcript text while still preserving short replies such as "yes". +const MIN_VOICED_FRAMES: usize = 12; + /// How long the worker waits on the audio channel before checking the shutdown flag. const RECV_TIMEOUT: Duration = Duration::from_millis(50); -/// 50 ms cooldown after TTS stops before STT re-enables. +/// 150 ms cooldown after TTS stops before STT re-enables. /// Prevents the tail of TTS audio from being transcribed as speech. -/// Previous value (200 ms) was eating the first word when the user spoke -/// immediately after the agent finished. -const TTS_COOLDOWN: Duration = Duration::from_millis(50); +/// This remains shorter than the previous 200 ms gate that ate the first word, +/// but is long enough for speaker/AEC tail audio to leave the microphone path. +const TTS_COOLDOWN: Duration = Duration::from_millis(150); /// Number of ONNX Runtime intra-op threads used by the offline recognizer. /// @@ -207,7 +202,6 @@ fn stt_worker( text_tx: tokio_mpsc::Sender, shutdown: Arc, tts_active: Arc, - tts_cancel: Option>, ptt_active: Option>, ) { // ── 1. Initialise rubato resampler (48 kHz → 16 kHz, mono) ─────────────── @@ -274,9 +268,9 @@ fn stt_worker( let mut silence_frames: usize = 0; // Whether we're currently in a speech segment. let mut in_speech = false; - // Consecutive speech frames seen during TTS — used for barge-in debounce. - let mut barge_in_frames: usize = 0; - // Timestamp when TTS last stopped — used for the 200 ms cooldown. + // Number of frames earshot classified as voiced in the current segment. + let mut voiced_frames = 0; + // Timestamp when TTS last stopped — used for the playback-tail cooldown. let mut tts_stopped_at: Option = None; // ── 5. Main loop ────────────────────────────────────────────────────────── @@ -305,10 +299,11 @@ fn stt_worker( if let Some(ref ptt) = ptt_active { let ptt_now = ptt.load(Ordering::Acquire); if ptt_was_active && !ptt_now && in_speech && !speech_buf.is_empty() { - flush_to_stt(&speech_buf, &recognizer, &text_tx); + flush_to_stt(&speech_buf, voiced_frames, &recognizer, &text_tx); speech_buf.clear(); silence_frames = 0; in_speech = false; + voiced_frames = 0; } ptt_was_active = ptt_now; } @@ -342,11 +337,10 @@ fn stt_worker( &mut speech_buf, &mut silence_frames, &mut in_speech, - &mut barge_in_frames, + &mut voiced_frames, &recognizer, &text_tx, &tts_active, - tts_cancel.as_deref(), &mut tts_stopped_at, ptt_active.as_ref(), ); @@ -387,8 +381,8 @@ fn resample_chunk(resampler: &mut rubato::Fft, chunk_48k: &[f32]) -> Vec, silence_frames: &mut usize, in_speech: &mut bool, - barge_in_frames: &mut usize, + voiced_frames: &mut usize, recognizer: &sherpa_onnx::OfflineRecognizer, text_tx: &tokio_mpsc::Sender, tts_active: &Arc, - tts_cancel: Option<&AtomicBool>, tts_stopped_at: &mut Option, ptt_active: Option<&Arc>, ) { @@ -433,38 +426,16 @@ fn process_16k_samples( let tts_playing = tts_active.load(Ordering::Acquire); - // While TTS is playing: skip accumulation (echo prevention). + // While TTS is playing, discard local mic input. The native TTS output + // is not available as an echo-cancellation reference to this worker, so + // VAD cannot reliably tell speaker feedback from a human interruption. + // Push-to-talk and remote participant audio provide the intentional + // cancellation paths instead. if tts_playing { - if ptt_active.is_some() { - // PTT mode — PTT press handles TTS cancellation directly - // (via the global shortcut handler). Just skip accumulation. - *in_speech = false; - *barge_in_frames = 0; - speech_buf.clear(); - *silence_frames = 0; - continue; - } - - // VAD mode — barge-in detection. - // Without acoustic echo cancellation, this requires a longer - // debounce (BARGE_IN_DEBOUNCE_FRAMES ≈ 320 ms) to filter - // speaker-to-mic feedback. - if is_speech { - *barge_in_frames += 1; - if *barge_in_frames >= BARGE_IN_DEBOUNCE_FRAMES { - // Real speech detected during TTS — trigger barge-in. - if let Some(cancel) = tts_cancel { - cancel.store(true, Ordering::Release); - } - *barge_in_frames = 0; - } - } else { - *barge_in_frames = 0; - } - // Don't accumulate speech during TTS (echo prevention). *in_speech = false; speech_buf.clear(); *silence_frames = 0; + *voiced_frames = 0; continue; } @@ -477,28 +448,30 @@ fn process_16k_samples( } speech_buf.clear(); *silence_frames = 0; - *barge_in_frames = 0; + *voiced_frames = 0; continue; } else { // Cooldown expired — clear the timer and reset all segment state. *tts_stopped_at = None; *in_speech = false; *silence_frames = 0; - *barge_in_frames = 0; + *voiced_frames = 0; } } if is_speech { *silence_frames = 0; *in_speech = true; + *voiced_frames += 1; speech_buf.extend_from_slice(&frame); // OOM guard: flush and reset if the buffer exceeds 30 s of audio. if speech_buf.len() >= MAX_SPEECH_SAMPLES { - flush_to_stt(speech_buf, recognizer, text_tx); + flush_to_stt(speech_buf, *voiced_frames, recognizer, text_tx); speech_buf.clear(); *silence_frames = 0; *in_speech = false; + *voiced_frames = 0; } } else if *in_speech { // Still accumulate during brief silence gaps. @@ -511,10 +484,11 @@ fn process_16k_samples( // threshold so each natural pause becomes a separate message. if ptt_active.is_none() && *silence_frames >= SILENCE_FLUSH_FRAMES { // End of utterance — transcribe. - flush_to_stt(speech_buf, recognizer, text_tx); + flush_to_stt(speech_buf, *voiced_frames, recognizer, text_tx); speech_buf.clear(); *silence_frames = 0; *in_speech = false; + *voiced_frames = 0; } } // If not in speech and not accumulating, just discard the frame. @@ -527,10 +501,11 @@ fn process_16k_samples( /// The tokio channel's `blocking_send` is safe to call from sync contexts. fn flush_to_stt( speech_buf: &[f32], + voiced_frames: usize, recognizer: &sherpa_onnx::OfflineRecognizer, text_tx: &tokio_mpsc::Sender, ) { - if speech_buf.is_empty() { + if speech_buf.is_empty() || !has_enough_voiced_audio(voiced_frames) { return; } @@ -550,6 +525,10 @@ fn flush_to_stt( } } +fn has_enough_voiced_audio(voiced_frames: usize) -> bool { + voiced_frames >= MIN_VOICED_FRAMES +} + /// Convert raw bytes (f32 LE) to f32 samples. /// Caller should ensure `bytes.len() % 4 == 0`; extra bytes are silently truncated. /// @@ -565,3 +544,15 @@ fn bytes_to_f32(bytes: &[u8]) -> Vec { // drain_until_shutdown lives in super (huddle/mod.rs) — shared with tts.rs. use super::drain_until_shutdown; + +#[cfg(test)] +mod tests { + use super::{has_enough_voiced_audio, MIN_VOICED_FRAMES}; + + #[test] + fn short_vad_blips_do_not_reach_the_recognizer() { + assert!(!has_enough_voiced_audio(1)); + assert!(!has_enough_voiced_audio(MIN_VOICED_FRAMES - 1)); + assert!(has_enough_voiced_audio(MIN_VOICED_FRAMES)); + } +} diff --git a/desktop/src-tauri/src/huddle/tts.rs b/desktop/src-tauri/src/huddle/tts.rs index c03589f9fe..1901bb3d2e 100644 --- a/desktop/src-tauri/src/huddle/tts.rs +++ b/desktop/src-tauri/src/huddle/tts.rs @@ -35,7 +35,7 @@ //! can gate microphone input while the agent is speaking. use std::{ - collections::VecDeque, + collections::{HashMap, VecDeque}, num::NonZero, path::PathBuf, sync::{ @@ -44,7 +44,7 @@ use std::{ Arc, Mutex, MutexGuard, PoisonError, }, thread, - time::Duration, + time::{Duration, Instant}, }; use super::pocket::{ @@ -61,6 +61,9 @@ use startup::await_worker_startup; #[path = "tts_audio.rs"] mod audio; use audio::*; +#[path = "tts_activity.rs"] +mod activity; +use activity::*; // ── Constants ───────────────────────────────────────────────────────────────── @@ -77,6 +80,7 @@ const RECV_TIMEOUT: Duration = Duration::from_millis(100); /// ~5 ms — so playing audio dies ~15 ms after the flag is set, even while /// the worker is blocked inside `synth_chunk`. const MONITOR_TICK: Duration = Duration::from_millis(10); +const SPEAKER_ACTIVITY_TICK: Duration = Duration::from_millis(50); const AUDIO_PRIME_TIMEOUT: Duration = Duration::from_secs(2); /// Pocket TTS is a one-step consistency model, not diffusion. Kept for API compat. @@ -167,10 +171,12 @@ impl TtsPipeline { cancel: Arc, voice: &str, output_device: Option, + activity_app: Option, ) -> Result { let (text_tx, text_rx) = mpsc::sync_channel::(TEXT_QUEUE_DEPTH); let shutdown = Arc::new(AtomicBool::new(false)); - // cancel is passed in from HuddleState.tts_cancel — shared with STT for barge-in. + // cancel is passed in from HuddleState.tts_cancel — shared with remote + // participant interruption and the push-to-talk shortcut. let shutdown_worker = Arc::clone(&shutdown); let cancel_worker = Arc::clone(&cancel); @@ -203,6 +209,7 @@ impl TtsPipeline { (cancel_worker, worker_voice_cancel), ), output_device, + activity_app, startup_tx, ) }) @@ -231,6 +238,8 @@ impl TtsPipeline { .try_send(QueuedText { generation: self.voice_generation.load(Ordering::Acquire), route_id: 0, + speaker_pubkey: None, + voice_reference: None, text, }) .map_err(|e| { @@ -309,6 +318,7 @@ fn tts_worker( text_rx: mpsc::Receiver, control_state: WorkerControlState, output_device: Option, + activity_app: Option, startup_tx: mpsc::SyncSender>, ) { let (selected_voice, voice_generation, voice_change_ack) = voice_state; @@ -351,6 +361,7 @@ fn tts_worker( )); return; } + let mut style_cache = HashMap::from([(voice_name.clone(), style.clone())]); // ── 2b. Warmup inference ───────────────────────────────────────────────── // The first ONNX inference on any session is significantly slower than @@ -454,6 +465,7 @@ fn tts_worker( // `cancel == false` and no-ops. The lock is uncontended except during an // actual barge-in, so the hot path is unaffected. let player_ops = Arc::new(Mutex::new(())); + let activity_frames = Arc::new(Mutex::new(VecDeque::::new())); let monitor_stop = Arc::new(AtomicBool::new(false)); let monitor = { let player = Arc::clone(&player); @@ -462,9 +474,12 @@ fn tts_worker( let tts_active = Arc::clone(&tts_active); let stop = Arc::clone(&monitor_stop); let player_ops = Arc::clone(&player_ops); + let activity_frames = Arc::clone(&activity_frames); thread::Builder::new() .name("tts-barge-in-monitor".into()) .spawn(move || { + let mut last_activity_pubkey: Option = None; + let mut next_activity_tick = Instant::now(); while !stop.load(Ordering::Acquire) { if cancel.load(Ordering::Acquire) || voice_cancel.load(Ordering::Acquire) { let _ops = lock_player_ops(&player_ops); @@ -481,6 +496,46 @@ fn tts_worker( tts_active.store(false, Ordering::Release); } } + if let Some(ref app) = activity_app { + if tts_active.load(Ordering::Acquire) { + let now = Instant::now(); + if now >= next_activity_tick { + let frame = activity_frames + .lock() + .unwrap_or_else(|error| error.into_inner()) + .pop_front(); + if let Some(frame) = frame { + use tauri::Emitter; + let _ = app.emit( + "huddle-tts-speaker-level", + TtsSpeakerActivityPayload { + pubkey: Some(frame.pubkey.clone()), + level: frame.level, + }, + ); + last_activity_pubkey = Some(frame.pubkey); + } + next_activity_tick = now + SPEAKER_ACTIVITY_TICK; + } + } else { + let had_activity = last_activity_pubkey.take().is_some(); + activity_frames + .lock() + .unwrap_or_else(|error| error.into_inner()) + .clear(); + if had_activity { + use tauri::Emitter; + let _ = app.emit( + "huddle-tts-speaker-level", + TtsSpeakerActivityPayload { + pubkey: None, + level: 0.0, + }, + ); + } + next_activity_tick = Instant::now(); + } + } thread::sleep(MONITOR_TICK); } }) @@ -507,7 +562,9 @@ fn tts_worker( let mut first_append = true; let mut last_route_id = 0; let mut deferred_text = VecDeque::new(); - let append_audio = |prepared: PreparedModelAudio, route_id: u64| { + let append_audio = |prepared: PreparedModelAudio, + route_id: u64, + speaker_pubkey: Option<&str>| { let _ops = lock_player_ops(&player_ops); if cancel.load(Ordering::Acquire) || voice_cancel.load(Ordering::Acquire) @@ -525,6 +582,16 @@ fn tts_worker( ); return false; } + if let Some(pubkey) = speaker_pubkey { + activity_frames + .lock() + .unwrap_or_else(|error| error.into_inner()) + .extend(build_tts_speaker_activity_frames( + &prepared.buffer, + pubkey, + SAMPLE_RATE as usize, + )); + } player.append(SamplesBuffer::new(channels, rate, prepared.buffer)); eprintln!( "buzz-desktop: tts stage=player status=append_accepted route_id={route_id} chunk_index={} sample_count={}", @@ -555,14 +622,19 @@ fn tts_worker( continue; } - // Voice changes cancel the old utterance/queue and are observed here, - // before receiving subsequent text. A bad bundled asset falls back to - // Mary without discarding the already-warmed Pocket engine. - let voice_ready = - reconcile_selected_voice(&model_dir, &selected_voice, &mut voice_name, &mut style); - acknowledge_voice_change(&voice_change_ack, &voice_cancel); - if !voice_ready { - continue; + // A global Settings voice change cancels the old utterance and is + // acknowledged before receiving subsequent text. Per-agent voice + // changes are carried by each queue item and never drain other agents. + if has_pending_voice_change(&voice_change_ack) { + let voice_ready = + reconcile_selected_voice(&model_dir, &selected_voice, &mut voice_name, &mut style); + if voice_ready { + style_cache.insert(voice_name.clone(), style.clone()); + } + acknowledge_voice_change(&voice_change_ack, &voice_cancel); + if !voice_ready { + continue; + } } let mut queued_text = Some(match deferred_text.pop_front() { @@ -614,15 +686,28 @@ fn tts_worker( ); continue; } + let requested_voice = queued_text.voice_reference.unwrap_or_else(|| { + selected_voice + .lock() + .unwrap_or_else(|error| error.into_inner()) + .clone() + }); let raw_text = queued_text.text; + let speaker_pubkey = queued_text.speaker_pubkey; let route_id = queued_text.route_id; eprintln!("buzz-desktop: tts stage=synthesis status=started route_id={route_id}"); - // The selected voice can change while this worker is blocked in - // recv_timeout. Reconcile again after receipt so the first message - // queued after an unpublished pipeline is installed cannot use the - // voice captured when construction began. - if !reconcile_selected_voice(&model_dir, &selected_voice, &mut voice_name, &mut style) { + // The selected per-agent voice travels with the queue item, preserving + // message order while allowing one warmed Pocket engine to alternate + // between cached reference styles. + if !reconcile_queued_voice( + &model_dir, + &requested_voice, + &selected_voice, + &mut voice_name, + &mut style, + &mut style_cache, + ) { eprintln!( "buzz-desktop: tts stage=synthesis status=failed reason=voice_unavailable route_id={route_id}" ); @@ -761,7 +846,7 @@ fn tts_worker( silence_buf_len, player.empty(), ) { - if !append_audio(prepared, route_id) { + if !append_audio(prepared, route_id, speaker_pubkey.as_deref()) { first_append = true; synthesis_outcome = "cancelled"; break 'playback_chunks; @@ -787,7 +872,7 @@ fn tts_worker( if let Some(prepared) = playback_audio.finish(&mut first_append, silence_buf_len, player.empty()) { - if !append_audio(prepared, route_id) { + if !append_audio(prepared, route_id, speaker_pubkey.as_deref()) { first_append = true; synthesis_outcome = "cancelled"; break 'playback_chunks; diff --git a/desktop/src-tauri/src/huddle/tts_activity.rs b/desktop/src-tauri/src/huddle/tts_activity.rs new file mode 100644 index 0000000000..8e69609186 --- /dev/null +++ b/desktop/src-tauri/src/huddle/tts_activity.rs @@ -0,0 +1,45 @@ +//! Agent TTS activity envelope shared with the participant film strip. + +#[derive(Clone, serde::Serialize)] +pub(super) struct TtsSpeakerActivityPayload { + pub(super) pubkey: Option, + pub(super) level: f32, +} + +pub(super) struct TtsSpeakerActivityFrame { + pub(super) pubkey: String, + pub(super) level: f32, +} + +/// Build a 50 ms RMS envelope from the exact audio queued for playback. +/// The UI consumes these frames at the same cadence as remote speaker levels, +/// so an agent uses the normal participant ring rather than a generic pulse. +pub(super) fn build_tts_speaker_activity_frames( + samples: &[f32], + pubkey: &str, + sample_rate: usize, +) -> Vec { + let samples_per_frame = (sample_rate / 20).max(1); + samples + .chunks(samples_per_frame) + .map(|frame| { + let mean_square = frame + .iter() + .map(|sample| f64::from(*sample) * f64::from(*sample)) + .sum::() + / frame.len().max(1) as f64; + let rms = mean_square.sqrt() as f32; + let level = if rms <= 0.000_5 { + 0.0 + } else { + // Map roughly -60 dB..-12 dB into the same normalized range + // used by remote Opus speaker levels. + ((20.0 * rms.log10() + 60.0) / 48.0).clamp(0.12, 1.0) + }; + TtsSpeakerActivityFrame { + pubkey: pubkey.to_string(), + level, + } + }) + .collect() +} diff --git a/desktop/src-tauri/src/huddle/tts_settings.rs b/desktop/src-tauri/src/huddle/tts_settings.rs index 1b378af823..64fd6d8a94 100644 --- a/desktop/src-tauri/src/huddle/tts_settings.rs +++ b/desktop/src-tauri/src/huddle/tts_settings.rs @@ -175,7 +175,7 @@ pub fn resolve_voice_for_backend( resolve_voice_for_backend_in_registry(preferences, backend, &bundled_voice_registry()) } -fn resolve_voice_for_backend_in_registry( +pub(crate) fn resolve_voice_for_backend_in_registry( preferences: &[String], backend: &str, registry: &[VoiceRegistryEntry], @@ -624,6 +624,7 @@ pub async fn preview_pocket_voice( cancel, &voice_name, output_device, + None, )?; pipeline.speak("Hello! This is how I’ll read agent responses.".to_string())?; let started = std::time::Instant::now(); diff --git a/desktop/src-tauri/src/huddle/tts_tests.rs b/desktop/src-tauri/src/huddle/tts_tests.rs index 1908b096b1..1dee4de90c 100644 --- a/desktop/src-tauri/src/huddle/tts_tests.rs +++ b/desktop/src-tauri/src/huddle/tts_tests.rs @@ -32,6 +32,19 @@ mod token_split; // - Counters reset on the 500ms window (Instant-based in production, // on_tick() in tests — logically equivalent). // - Uses Acquire for tts_active reads, Release for tts_cancel writes. + +#[test] +fn tts_speaker_activity_uses_the_playback_waveform() { + let mut samples = vec![0.0; 1_200]; + samples.extend(vec![0.25; 1_200]); + + let frames = build_tts_speaker_activity_frames(&samples, "agent-pubkey", 24_000); + + assert_eq!(frames.len(), 2); + assert_eq!(frames[0].pubkey, "agent-pubkey"); + assert_eq!(frames[0].level, 0.0); + assert!(frames[1].level > 0.5); +} // use crate::huddle::relay_api::REMOTE_SPEECH_THRESHOLD; @@ -287,24 +300,6 @@ fn cancel_already_true_is_harmless() { ); } -// ── Regression: local-only interrupt still works ────────────────────────── - -/// The existing local barge-in path (STT detects speech → sets tts_cancel) -/// must continue to work independently of remote frame counting. -#[test] -fn local_barge_in_still_works_without_remote_frames() { - let _tts_active = AtomicBool::new(true); - let tts_cancel = AtomicBool::new(false); - - // Simulate local STT barge-in (stt.rs after BARGE_IN_DEBOUNCE_FRAMES). - tts_cancel.store(true, Ordering::Release); - - assert!( - tts_cancel.load(Ordering::Acquire), - "local barge-in should set tts_cancel", - ); -} - // ── Cancel consumption tests (TTS worker side) ──────────────────────────── /// TTS worker correctly resets both tts_cancel and tts_active after cancel. diff --git a/desktop/src-tauri/src/huddle/tts_voice_selection_tests.rs b/desktop/src-tauri/src/huddle/tts_voice_selection_tests.rs index 45662c9921..044b1acf1e 100644 --- a/desktop/src-tauri/src/huddle/tts_voice_selection_tests.rs +++ b/desktop/src-tauri/src/huddle/tts_voice_selection_tests.rs @@ -167,6 +167,8 @@ fn an_in_hand_post_change_message_survives_cancellation() { .send(QueuedText { generation: voice_generation.load(Ordering::Acquire), route_id: 1, + speaker_pubkey: None, + voice_reference: None, text: "new message".to_string(), }) .expect("new message"); @@ -178,11 +180,15 @@ fn an_in_hand_post_change_message_survives_cancellation() { QueuedText { generation: 1, route_id: 2, + speaker_pubkey: None, + voice_reference: None, text: "old message".to_string(), }, QueuedText { generation: voice_generation.load(Ordering::Acquire), route_id: 3, + speaker_pubkey: None, + voice_reference: None, text: "later new message".to_string(), }, ]); @@ -239,6 +245,8 @@ fn superseding_voice_change_removes_earlier_deferred_messages() { deferred_text.push_back(QueuedText { generation: voice_generation.load(Ordering::Acquire), route_id: 4, + speaker_pubkey: None, + voice_reference: None, text: "message for Eve".to_string(), }); assert!(handle_cancel_or_shutdown( @@ -285,6 +293,8 @@ fn barge_in_clears_deferred_voice_change_messages() { let mut deferred_text = VecDeque::from([QueuedText { generation: 2, route_id: 5, + speaker_pubkey: None, + voice_reference: None, text: "deferred message".to_string(), }]); let mut current_text = None; @@ -326,6 +336,8 @@ fn barge_in_during_a_voice_change_clears_post_change_messages() { deferred_text.push_back(QueuedText { generation: voice_generation.load(Ordering::Acquire), route_id: 6, + speaker_pubkey: None, + voice_reference: None, text: "post-change message".to_string(), }); barge_in.store(true, Ordering::Release); @@ -377,9 +389,15 @@ fn a_sender_captured_before_voice_change_is_stale_even_if_it_sends_after_drain() None, )); old_sender - .send(7, "late old message".to_string()) + .send( + 7, + "agent".to_string(), + "reference_sample".to_string(), + "late old message".to_string(), + ) .expect("late send"); let late = text_rx.recv().expect("late queued text"); assert!(late.generation < voice_generation.load(Ordering::Acquire)); + assert_eq!(late.voice_reference.as_deref(), Some("reference_sample")); } diff --git a/desktop/src-tauri/src/huddle/tts_voice_transition.rs b/desktop/src-tauri/src/huddle/tts_voice_transition.rs index 81b33672d3..3a65553756 100644 --- a/desktop/src-tauri/src/huddle/tts_voice_transition.rs +++ b/desktop/src-tauri/src/huddle/tts_voice_transition.rs @@ -1,5 +1,5 @@ use std::{ - collections::VecDeque, + collections::{HashMap, VecDeque}, path::Path, sync::{ atomic::{AtomicBool, AtomicU64, Ordering}, @@ -30,6 +30,8 @@ pub(super) type CancelSignals<'a> = (&'a AtomicBool, &'a AtomicBool); pub(super) struct QueuedText { pub(super) generation: u64, pub(super) route_id: u64, + pub(super) speaker_pubkey: Option, + pub(super) voice_reference: Option, pub(super) text: String, } @@ -40,17 +42,32 @@ pub(crate) struct TtsTextSender { } impl TtsTextSender { - pub(crate) fn send(&self, route_id: u64, text: String) -> Result<(), String> { + pub(crate) fn send( + &self, + route_id: u64, + speaker_pubkey: String, + voice_reference: String, + text: String, + ) -> Result<(), String> { self.text_tx .send(QueuedText { generation: self.generation, route_id, + speaker_pubkey: Some(speaker_pubkey), + voice_reference: Some(voice_reference), text, }) .map_err(|error| error.to_string()) } } +pub(super) fn has_pending_voice_change(voice_change_ack: &VoiceChangeAck) -> bool { + voice_change_ack + .lock() + .unwrap_or_else(|error| error.into_inner()) + .is_some() +} + pub(super) fn begin_voice_change( selected_voice: &Mutex, voice_generation: &AtomicU64, @@ -151,6 +168,43 @@ pub(super) fn reconcile_selected_voice( } } +pub(super) fn reconcile_queued_voice( + model_dir: &Path, + requested_voice: &str, + selected_voice: &Mutex, + voice_name: &mut String, + style: &mut VoiceStyle, + style_cache: &mut HashMap, +) -> bool { + if requested_voice == voice_name.as_str() { + return true; + } + if let Some(cached) = style_cache.get(requested_voice) { + *style = cached.clone(); + *voice_name = requested_voice.to_owned(); + return true; + } + + match load_voice_style(&voice_path(model_dir, requested_voice)) { + Ok(requested_style) => { + style_cache.insert(requested_voice.to_owned(), requested_style.clone()); + *style = requested_style; + *voice_name = requested_voice.to_owned(); + true + } + Err(_) => { + eprintln!( + "buzz-desktop: tts stage=agent_voice_switch status=fallback reason=voice_style" + ); + let ready = reconcile_selected_voice(model_dir, selected_voice, voice_name, style); + if ready { + style_cache.insert(voice_name.clone(), style.clone()); + } + ready + } + } +} + pub(super) fn voice_path(model_dir: &Path, voice: &str) -> std::path::PathBuf { let path = Path::new(voice); if path.is_absolute() { diff --git a/desktop/src-tauri/src/huddle/window.rs b/desktop/src-tauri/src/huddle/window.rs new file mode 100644 index 0000000000..cb3cfc8bfd --- /dev/null +++ b/desktop/src-tauri/src/huddle/window.rs @@ -0,0 +1,67 @@ +//! Native companion-window lifecycle for an active Huddle. + +use tauri::{Emitter, Manager, State, WebviewUrl, WebviewWindowBuilder}; + +use crate::app_state::AppState; + +/// Close the companion belonging to an ended huddle. The native lifecycle is +/// authoritative here because a webview can be suspended while it is closing. +pub(super) fn close_huddle_window(app: &tauri::AppHandle, ephemeral_channel_id: &str) { + if ephemeral_channel_id.is_empty() { + return; + } + let label = format!("huddle-{ephemeral_channel_id}"); + if let Some(window) = app.get_webview_window(&label) { + if let Err(error) = window.close() { + eprintln!("buzz-desktop: failed to close huddle companion: {error}"); + } + } +} + +/// Close the active companion without leaving the huddle. The main window uses +/// this to restore its drawer presentation while retaining the audio session. +#[tauri::command] +pub fn close_huddle_companion( + app: tauri::AppHandle, + state: State<'_, AppState>, +) -> Result<(), String> { + let ephemeral_channel_id = state + .huddle()? + .ephemeral_channel_id + .clone() + .ok_or("no active huddle")?; + close_huddle_window(&app, &ephemeral_channel_id); + app.emit("huddle-companion-returned", ()) + .map_err(|error| error.to_string())?; + Ok(()) +} + +/// Open the active huddle's ephemeral channel in a focused companion window. +/// The main window remains the owner of microphone capture; closing this room +/// must never leave the shared huddle session. +#[tauri::command] +pub async fn open_huddle_window( + app: tauri::AppHandle, + state: State<'_, AppState>, +) -> Result<(), String> { + let ephemeral_channel_id = state + .huddle()? + .ephemeral_channel_id + .clone() + .ok_or("no active huddle")?; + let label = format!("huddle-{ephemeral_channel_id}"); + + if let Some(window) = app.get_webview_window(&label) { + window.show().map_err(|error| error.to_string())?; + window.set_focus().map_err(|error| error.to_string())?; + return Ok(()); + } + + WebviewWindowBuilder::new(&app, label, WebviewUrl::App("index.html".into())) + .title("Huddle") + .inner_size(960.0, 720.0) + .min_inner_size(720.0, 520.0) + .build() + .map_err(|error| error.to_string())?; + Ok(()) +} diff --git a/desktop/src-tauri/src/initial_window.rs b/desktop/src-tauri/src/initial_window.rs new file mode 100644 index 0000000000..b124551512 --- /dev/null +++ b/desktop/src-tauri/src/initial_window.rs @@ -0,0 +1,67 @@ +//! First-frame window reveal helpers. + +#[cfg(target_os = "macos")] +pub(crate) const INITIAL_RENDER_READY_EVENT: &str = "initial-render-ready"; + +pub(crate) fn reveal_initial_window(window: &tauri::Window) { + if let Err(error) = window.show() { + eprintln!("buzz-desktop: failed to reveal main window: {error}"); + return; + } + if let Err(error) = window.set_focus() { + eprintln!("buzz-desktop: failed to focus main window: {error}"); + } +} + +#[cfg(target_os = "macos")] +pub(crate) fn set_initial_window_backing(window: &tauri::Window) { + // The window remains transparent at runtime for vibrancy. Use an opaque + // native backing only across the first visible frames so the previous app + // cannot show through before WebKit has submitted its first surface. + if let Err(error) = window.set_background_color(Some(tauri::window::Color(17, 21, 24, 255))) { + eprintln!("buzz-desktop: failed to set initial window backing: {error}"); + } +} + +#[cfg(target_os = "macos")] +pub(crate) async fn clear_initial_window_backing(window: &tauri::Window) { + tokio::time::sleep(std::time::Duration::from_millis(250)).await; + if let Err(error) = window.set_background_color(None) { + eprintln!("buzz-desktop: failed to clear initial window backing: {error}"); + } +} + +#[cfg(target_os = "macos")] +pub(crate) async fn wait_for_stable_initial_window_geometry( + window: &tauri::Window, +) { + const MAX_POLLS: usize = 120; + const REQUIRED_STABLE_POLLS: usize = 4; + + let mut previous_bounds = None; + let mut stable_polls = 0; + + for _ in 0..MAX_POLLS { + // Accept whatever geometry the window-state plugin restores — maximized + // or a normal saved size. macOS applies the restore asynchronously, so + // consecutive identical outer bounds are enough to know it settled. + let bounds = match (window.outer_position(), window.outer_size()) { + (Ok(position), Ok(size)) => Some((position.x, position.y, size.width, size.height)), + _ => None, + }; + + if bounds.is_some() && bounds == previous_bounds { + stable_polls += 1; + if stable_polls >= REQUIRED_STABLE_POLLS { + return; + } + } else { + stable_polls = 0; + } + previous_bounds = bounds; + + tokio::time::sleep(std::time::Duration::from_millis(16)).await; + } + + eprintln!("buzz-desktop: initial window geometry did not settle before reveal timeout"); +} diff --git a/desktop/src-tauri/src/lib.rs b/desktop/src-tauri/src/lib.rs index c4b733e3e0..7c5530db74 100644 --- a/desktop/src-tauri/src/lib.rs +++ b/desktop/src-tauri/src/lib.rs @@ -9,6 +9,7 @@ mod event_sync; mod events; mod huddle; mod identity_storage; +mod initial_window; mod key_backup; mod linux_media; mod managed_agents; @@ -49,11 +50,13 @@ use huddle::audio_output::{ }; use huddle::reconnect::reconnect_huddle_audio; use huddle::{ - add_agent_to_huddle, check_pipeline_hotstart, confirm_huddle_active, download_voice_models, - end_huddle, get_huddle_agent_pubkeys, get_huddle_state, get_model_status, get_voice_input_mode, - join_huddle, leave_huddle, push_audio_pcm, set_huddle_transcription_enabled, set_tts_enabled, - set_voice_input_mode, speak_agent_message, start_huddle, start_stt_pipeline, + add_agent_to_huddle, check_pipeline_hotstart, close_huddle_companion, confirm_huddle_active, + download_voice_models, end_huddle, get_huddle_agent_pubkeys, get_huddle_state, + get_model_status, get_voice_input_mode, join_huddle, leave_huddle, open_huddle_window, + push_audio_pcm, set_huddle_transcription_enabled, set_tts_enabled, set_voice_input_mode, + speak_agent_message, start_huddle, start_stt_pipeline, HuddlePhase, }; +use initial_window::*; use managed_agents::{ backfill_persona_snapshots, ensure_nest, list_managed_agent_runtimes, put_managed_agent_runtime_lifecycle, reconcile_managed_agent_runtimes, @@ -66,80 +69,13 @@ use mesh_llm_stubs::*; use shutdown::{hard_exit_after_mesh_shutdown, relaunch_after_mesh_shutdown}; use shutdown::{is_restart_request, shut_down_app}; use std::sync::{atomic::AtomicBool, atomic::Ordering, Arc}; -use tauri::{Emitter, Manager, RunEvent}; #[cfg(target_os = "macos")] -use tauri::{Listener, WindowEvent}; +use tauri::Listener; +use tauri::{Emitter, Manager, RunEvent, WindowEvent}; use tauri_plugin_window_state::StateFlags; #[cfg(target_os = "macos")] use tray_menu::show_main_window; -#[cfg(target_os = "macos")] -const INITIAL_RENDER_READY_EVENT: &str = "initial-render-ready"; - -fn reveal_initial_window(window: &tauri::Window) { - if let Err(error) = window.show() { - eprintln!("buzz-desktop: failed to reveal main window: {error}"); - return; - } - if let Err(error) = window.set_focus() { - eprintln!("buzz-desktop: failed to focus main window: {error}"); - } -} - -#[cfg(target_os = "macos")] -fn set_initial_window_backing(window: &tauri::Window) { - // The window remains transparent at runtime for vibrancy. Use an opaque - // native backing only across the first visible frames so the previous app - // cannot show through before WebKit has submitted its first surface. - if let Err(error) = window.set_background_color(Some(tauri::window::Color(17, 21, 24, 255))) { - eprintln!("buzz-desktop: failed to set initial window backing: {error}"); - } -} - -#[cfg(target_os = "macos")] -async fn clear_initial_window_backing(window: &tauri::Window) { - tokio::time::sleep(std::time::Duration::from_millis(250)).await; - if let Err(error) = window.set_background_color(None) { - eprintln!("buzz-desktop: failed to clear initial window backing: {error}"); - } -} - -#[cfg(target_os = "macos")] -async fn wait_for_stable_initial_window_geometry(window: &tauri::Window) { - const MAX_POLLS: usize = 120; - const REQUIRED_STABLE_POLLS: usize = 4; - - let mut previous_bounds = None; - let mut stable_polls = 0; - - for _ in 0..MAX_POLLS { - // Accept whatever geometry the window-state plugin restores — maximized - // or a normal saved size. macOS applies the restore asynchronously, so - // we only need consecutive identical outer bounds to know it settled. - // Gating on `is_maximized()` here would leave `bounds` permanently - // `None` for restored non-maximized windows and stall the reveal until - // the poll timeout. - let bounds = match (window.outer_position(), window.outer_size()) { - (Ok(position), Ok(size)) => Some((position.x, position.y, size.width, size.height)), - _ => None, - }; - - if bounds.is_some() && bounds == previous_bounds { - stable_polls += 1; - if stable_polls >= REQUIRED_STABLE_POLLS { - return; - } - } else { - stable_polls = 0; - } - previous_bounds = bounds; - - tokio::time::sleep(std::time::Duration::from_millis(16)).await; - } - - eprintln!("buzz-desktop: initial window geometry did not settle before reveal timeout"); -} - #[cfg_attr(mobile, tauri::mobile_entry_point)] pub fn run() { // mesh-llm's async chains (model download, node start/join) overflow @@ -885,6 +821,8 @@ pub fn run() { leave_huddle, end_huddle, get_huddle_state, + close_huddle_companion, + open_huddle_window, push_audio_pcm, reconnect_huddle_audio, start_stt_pipeline, @@ -898,8 +836,12 @@ pub fn run() { huddle::tts_settings::preview_pocket_voice, huddle::tts_settings::import_pocket_voice, huddle::tts_settings::delete_pocket_voice, + huddle::agent_voice::ensure_huddle_agent_voice_settings, + huddle::agent_voice::set_huddle_agent_tts_enabled, + huddle::agent_voice::set_huddle_agent_voice, speak_agent_message, add_agent_to_huddle, + huddle::agents::sync_agents_to_active_huddle, check_pipeline_hotstart, confirm_huddle_active, perform_sidebar_default_haptic, @@ -971,6 +913,29 @@ pub fn run() { } } } + RunEvent::WindowEvent { + label, + event: WindowEvent::CloseRequested { .. }, + .. + } if label.starts_with("huddle-") => { + let is_active_huddle_window = + app_handle + .state::() + .huddle() + .ok() + .is_some_and(|huddle| { + !matches!(huddle.phase, HuddlePhase::Idle | HuddlePhase::Leaving) + && huddle + .ephemeral_channel_id + .as_deref() + .is_some_and(|channel_id| label == format!("huddle-{channel_id}")) + }); + if is_active_huddle_window { + if let Err(error) = app_handle.emit("huddle-companion-returned", ()) { + eprintln!("buzz-desktop: failed to restore huddle drawer: {error}"); + } + } + } RunEvent::ExitRequested { code, .. } => { if is_restart_request(code) { restart_requested.store(true, Ordering::SeqCst); diff --git a/desktop/src/app/App.tsx b/desktop/src/app/App.tsx index 44618f2c72..104edcbaaf 100644 --- a/desktop/src/app/App.tsx +++ b/desktop/src/app/App.tsx @@ -20,6 +20,7 @@ import { deriveShellRoute } from "@/app/AppShell.helpers"; import { ThemeGrainientBackground } from "@/app/ThemeGrainientBackground"; import { useReloadShortcut } from "@/app/useReloadShortcut"; import { KnownAgentPubkeysProvider } from "@/features/agents/useKnownAgentPubkeys"; +import { huddleWindowChannelId } from "@/features/huddle/lib/huddleWindow"; import { useAppOnboardingState } from "@/features/onboarding/hooks"; import { useMachineOnboardingState } from "@/features/onboarding/machineOnboarding"; import { @@ -652,12 +653,13 @@ function MachineBootstrap({ sharedIdentity }: { sharedIdentity: boolean }) { [activeCommunity, communityOnboarding.start], ); - // Deep links are captured here — above the machine-onboarding gate — not in - // CommunityApp. The Rust side queues them; draining into the persisted - // community-onboarding transaction immediately means an invite opened on a - // fresh install is acknowledged on screen while the identity steps are - // still pending, and survives a relaunch in between. + // Community links are app-global work. A Huddle companion loads the same + // React tree, but must never race the main window for the native pending-link + // queue or replace its dedicated transcript surface with onboarding. + const acceptsCommunityDeepLinks = huddleWindowChannelId() === null; useEffect(() => { + if (!acceptsCommunityDeepLinks) return; + const unlisten = listenForDeepLinks({ startCommunityOnboarding: communityOnboarding.start, openAddCommunity, @@ -666,7 +668,7 @@ function MachineBootstrap({ sharedIdentity }: { sharedIdentity: boolean }) { return () => { void unlisten.then((fn) => fn()); }; - }, [communityOnboarding.start, openAddCommunity]); + }, [acceptsCommunityDeepLinks, communityOnboarding.start, openAddCommunity]); if (machine.stage === "reset-failed") return ; if (machine.stage === "keyring-locked") return ; diff --git a/desktop/src/app/AppHuddleBar.tsx b/desktop/src/app/AppHuddleBar.tsx index 9fa12d513f..5dfc31d41c 100644 --- a/desktop/src/app/AppHuddleBar.tsx +++ b/desktop/src/app/AppHuddleBar.tsx @@ -6,10 +6,12 @@ import { AppProfilePanelProvider } from "@/app/AppProfilePanelProvider"; type AppHuddleBarProps = Pick< React.ComponentProps, - "onOpenThread" | "onVisibilityChange" + "mode" | "onOpenHuddleWindow" | "onOpenThread" | "onVisibilityChange" >; export function AppHuddleBar({ + mode, + onOpenHuddleWindow, onOpenThread, onVisibilityChange, }: AppHuddleBarProps) { @@ -17,6 +19,8 @@ export function AppHuddleBar({ diff --git a/desktop/src/app/AppHuddleShell.tsx b/desktop/src/app/AppHuddleShell.tsx new file mode 100644 index 0000000000..8370e8efd4 --- /dev/null +++ b/desktop/src/app/AppHuddleShell.tsx @@ -0,0 +1,76 @@ +import type * as React from "react"; +import { AppHuddleBar } from "@/app/AppHuddleBar"; +import * as BuzzTheme from "@/app/BuzzThemeSurfaces"; +import { HuddleProvider } from "@/features/huddle"; +import { RemindMeLaterProvider } from "@/features/reminders/ui/RemindMeLaterProvider"; +import { cn } from "@/shared/lib/cn"; + +type AppHuddleShellProps = { + children: React.ReactNode; + currentPubkey?: string; + isCompanionOpen: boolean; + isDrawerOpen: boolean; + isRoom: boolean; + onCompanionOpen: () => void; + onHuddleStartPendingChange: (pending: boolean) => void; + onHuddleStarted: (ephemeralChannelId: string) => void | Promise; + onShowHuddleInMainApp: (ephemeralChannelId: string) => void; + onViewHuddleChannel: (ephemeralChannelId: string) => void; + onVisibilityChange: (visible: boolean) => void; +}; + +export function AppHuddleShell({ + children, + currentPubkey, + isCompanionOpen, + isDrawerOpen, + isRoom, + onCompanionOpen, + onHuddleStartPendingChange, + onHuddleStarted, + onShowHuddleInMainApp, + onViewHuddleChannel, + onVisibilityChange, +}: AppHuddleShellProps) { + return ( + + +
+
+ + {children} +
+ {isRoom || !isCompanionOpen ? ( +
+ +
+ ) : null} +
+ + + ); +} diff --git a/desktop/src/app/AppShell.tsx b/desktop/src/app/AppShell.tsx index 46e06b2f9f..e5f9f6d866 100644 --- a/desktop/src/app/AppShell.tsx +++ b/desktop/src/app/AppShell.tsx @@ -3,8 +3,9 @@ import { useQueryClient } from "@tanstack/react-query"; import { Outlet, useLocation } from "@tanstack/react-router"; import { deriveShellRoute, markAllReadSources } from "@/app/AppShell.helpers"; import { AppShellProvider } from "@/app/AppShellContext"; -import * as BuzzTheme from "@/app/BuzzThemeSurfaces"; import { AppShellOverlays } from "@/app/AppShellOverlays"; +import { AppShellChannelSurface } from "@/app/AppShellChannelSurface"; +import { AppHuddleShell } from "@/app/AppHuddleShell"; import { AppTopChrome } from "@/app/AppTopChrome"; import { useAppNavigation } from "@/app/navigation/useAppNavigation"; import { useBackForwardControls } from "@/app/navigation/useBackForwardControls"; @@ -18,6 +19,8 @@ import { useAppShellLifecycleEffects } from "@/app/useAppShellLifecycleEffects"; import { useChannelActivityProjection } from "@/app/useChannelActivityProjection"; import { useTauriWindowDrag } from "@/app/useTauriWindowDrag"; import { useWebviewZoomShortcuts } from "@/app/useWebviewZoomShortcuts"; +import { useHuddlePresentation } from "@/app/useHuddlePresentation"; +import { shouldShowSidebarChannel } from "@/app/huddleChannelVisibility"; import { channelsQueryKey, useChannelsQuery, @@ -62,10 +65,7 @@ import { type SettingsSection, isSettingsSection, } from "@/features/settings/ui/SettingsPanels"; -import { HuddleProvider } from "@/features/huddle"; -import { AppHuddleBar } from "@/app/AppHuddleBar"; import { useDueReminderBadgeCount } from "@/features/reminders/hooks"; -import { RemindMeLaterProvider } from "@/features/reminders/ui/RemindMeLaterProvider"; import { useReminderNotifications } from "@/features/reminders/useReminderNotifications"; import { AppSidebar } from "@/features/sidebar/ui/AppSidebar"; import { requestFocusedThreadClose } from "@/features/channels/focusedThreadCloseRequest"; @@ -86,28 +86,38 @@ import { useRelayAutoHeal } from "@/shared/api/useRelayAutoHeal"; import { useDeferredStartup } from "@/shared/hooks/useDeferredStartup"; import { useWebviewScrollBoundaryLock } from "@/shared/hooks/useWebviewScrollBoundaryLock"; import { joinChannel } from "@/shared/api/tauri"; -import type { ChannelVisibility, SearchHit } from "@/shared/api/types"; +import type { Channel, ChannelVisibility, SearchHit } from "@/shared/api/types"; import { ChannelNavigationProvider } from "@/shared/context/ChannelNavigationContext"; -import { MainInsetProvider } from "@/shared/layout/MainInsetContext"; -import { chromeCssVarDefaults } from "@/shared/layout/chromeLayout"; -import { cn } from "@/shared/lib/cn"; import { hasPrimaryShortcutModifier } from "@/shared/lib/platform"; import { useMessageDeepLinks } from "@/shared/useMessageDeepLinks"; -import { SidebarInset, SidebarProvider } from "@/shared/ui/sidebar"; +import { SidebarProvider } from "@/shared/ui/sidebar"; import { RelayConnectionOverlay } from "@/app/RelayConnectionOverlay"; import { useSidebarRelayConnectionCard } from "@/features/sidebar/ui/useSidebarRelayConnectionCard"; import { AppShellTrayMenu } from "@/app/useAppShellTrayMenu"; import { AppProfilePanelProvider } from "@/app/AppProfilePanelProvider"; -const LazySettingsScreen = React.lazy(async () => { - const module = await import("@/features/settings/ui/SettingsScreen"); - return { default: module.SettingsScreen }; -}); - +import { LazySettingsScreen } from "@/app/LazySettingsScreen"; +const EMPTY_CHANNELS: Channel[] = []; export function AppShell() { useWebviewZoomShortcuts(); useTauriWindowDrag(); useWebviewScrollBoundaryLock(); const communitiesHook = useCommunities(); + const { + handleHuddleCompanionOpen, + handleHuddleEnded, + handleHuddleStartPendingChange, + handleHuddleStarted, + handleHuddleVisibilityChange, + handleSidebarChannelSelect, + huddleBackingChannelIds, + revealedHuddleChannelIds, + isHuddleCompanionOpen, + isHuddleDrawerOpen, + isHuddleRoom, + isHuddleRoomStarting, + showHuddleInMainApp, + viewHuddleChannel, + } = useHuddlePresentation(); const hasCommunityRail = communitiesHook.communities.length > 1; const addCommunityDialog = useAddCommunityDialogState(); const [isChannelManagementOpen, setIsChannelManagementOpen] = @@ -118,7 +128,6 @@ export function AppShell() { const [searchFocusRequest, setSearchFocusRequest] = React.useState(0); const [isCreateChannelOpen, setIsCreateChannelOpen] = React.useState(false); const [isSendFeedbackOpen, setIsSendFeedbackOpen] = React.useState(false); - const [isHuddleDrawerOpen, setIsHuddleDrawerOpen] = React.useState(false); const mainInsetRef = React.useRef(null); const location = useLocation(); const queryClient = useQueryClient(); @@ -238,8 +247,17 @@ export function AppShell() { [channels], ); const sidebarChannels = React.useMemo( - () => memberChannels.filter((channel) => channel.archivedAt === null), - [memberChannels], + () => + memberChannels.filter( + (channel) => + channel.archivedAt === null && + shouldShowSidebarChannel( + channel, + huddleBackingChannelIds, + revealedHuddleChannelIds, + ), + ), + [huddleBackingChannelIds, memberChannels, revealedHuddleChannelIds], ); const hasRestoredCommunityDestinationRef = React.useRef(false); React.useEffect(() => { @@ -308,6 +326,7 @@ export function AppShell() { handleThreadReplyDesktopNotification, } = useAppShellDesktopNotifications({ channels, + enabled: !isHuddleRoom, goChannel, goHome, notificationSettings: notificationSettings.settings, @@ -344,19 +363,23 @@ export function AppShell() { mutedRootIds, muteThread, unmuteThread, - } = useUnreadChannels(sidebarChannels, activeChannel, { - pubkey: identityQuery.data?.pubkey, - relayClient, - relayUrl: communitiesHook.activeCommunity?.relayUrl, - currentPubkey: identityQuery.data?.pubkey, - mutedChannelIds, - notifyForActiveChannel: notificationSettings.settings.notifyWhileViewing, - onChannelMessage: handleChannelNotification, - onDmMessage: handleDmNotification, - onLiveMention: refetchHomeFeedFromLiveSignal, - onThreadReplyDesktopNotification: handleThreadReplyDesktopNotification, - followedRootIds, - }); + } = useUnreadChannels( + isHuddleRoom ? EMPTY_CHANNELS : sidebarChannels, + isHuddleRoom ? null : activeChannel, + { + pubkey: identityQuery.data?.pubkey, + relayClient, + relayUrl: communitiesHook.activeCommunity?.relayUrl, + currentPubkey: identityQuery.data?.pubkey, + mutedChannelIds, + notifyForActiveChannel: notificationSettings.settings.notifyWhileViewing, + onChannelMessage: handleChannelNotification, + onDmMessage: handleDmNotification, + onLiveMention: refetchHomeFeedFromLiveSignal, + onThreadReplyDesktopNotification: handleThreadReplyDesktopNotification, + followedRootIds, + }, + ); const { getThreadReadAt, @@ -397,6 +420,7 @@ export function AppShell() { markChannelRead, unreadThreadFeedItems, ]); + // Badge count consumes the shared NIP-RS read-state from useUnreadChannels. const { homeBadgeCount, homeBadgeCountExcludingHighPriority } = useHomeFeedNotificationState( @@ -404,6 +428,7 @@ export function AppShell() { identityQuery.data?.pubkey, notificationSettings.settings, notificationSettings.setDesktopEnabled, + !isHuddleRoom, selectedView === "home" && !settingsOpen, getChannelReadAt, readStateVersion, @@ -603,18 +628,20 @@ export function AppShell() { [openSearchHit], ); useAppShellLifecycleEffects({ + desktopBadgeEnabled: !isHuddleRoom, homeBadgeCountExcludingHighPriority, unreadChannelIds, unreadChannelNotificationCount, }); - // Dispatch `buzz://message` deep links into the router. - useMessageDeepLinks(); + // Dispatch `buzz://message` deep links only from the main window. The + // companion is dedicated to its active Huddle route. + useMessageDeepLinks(!isHuddleRoom); const handleOpenCreateChannel = React.useCallback( () => setIsCreateChannelOpen(true), [], ); React.useLayoutEffect(() => { - if (settingsOpen) { + if (settingsOpen || isHuddleRoom) { return; } @@ -674,12 +701,13 @@ export function AppShell() { handleOpenSearch, goNewMessage, goHome, + isHuddleRoom, settingsOpen, ]); useSettingsShortcuts({ onClose: handleCloseSettings, onOpenSettings: handleOpenSettings, - open: settingsOpen, + open: isHuddleRoom ? undefined : settingsOpen, }); useMarkAsReadShortcuts({ activeChannelId: activeChannel?.id ?? null, @@ -690,11 +718,13 @@ export function AppShell() { }); return ( - + {!isHuddleRoom ? ( + + ) : null} - - -
-
- - {hasCommunityRail ? ( - void handleRemoveCommunity(id)} - onReorderCommunities={communitiesHook.reorderCommunities} - onSwitchCommunity={handleSwitchCommunity} - onUpdateCommunity={communitiesHook.updateCommunity} - communities={communitiesHook.communities} - /> - ) : null} - - - {!settingsOpen ? ( - - ) : null} - {settingsOpen ? ( -
- - - -
- ) : ( -
- { - const id = communitiesHook.addCommunity({ - ...community, - pubkey: - community.pubkey ?? - identityQuery.data?.pubkey, - }); - handleSwitchCommunity(id); - }} - onAddCommunityOpenChange={ - addCommunityDialog.onOpenChange - } - onNewMessage={goNewMessage} - onBackgroundClick={requestFocusedThreadClose} - onCreateChannelOpenChange={setIsCreateChannelOpen} - onOpenAddCommunity={addCommunityDialog.openDialog} - onSendFeedback={() => setIsSendFeedbackOpen(true)} - onUpdateCommunity={communitiesHook.updateCommunity} - onRemoveCommunity={(id) => - void handleRemoveCommunity(id) - } - onSwitchCommunity={handleSwitchCommunity} - onCreateAgent={() => requestOpenCreateAgent()} - selfPresenceStatus={presenceSession.currentStatus} - communities={communitiesHook.communities} - onCreateChannel={handleCreateChannel} - onCreateForum={handleCreateForum} - onHideDm={handleHideDm} - onMarkAllChannelsRead={markAllChannelsRead} - onMarkChannelRead={markChannelRead} - onMarkChannelUnread={markChannelUnread} - onBrowseChannels={handleOpenBrowseChannels} - onOpenDm={async ({ pubkeys }) => { - const directMessage = - await openDmMutation.mutateAsync({ - pubkeys, - }); - await goChannel(directMessage.id); - }} - onSelectAgents={() => void goAgents()} - onSelectChannel={(channelId) => - void goChannel(channelId) - } - onOpenSearchResult={handleOpenSearchResult} - searchChannels={channels} - searchFocusRequest={searchFocusRequest} - onSelectHome={() => void goHome()} - onSelectProjects={() => void goProjects()} - onSelectPulse={() => void goPulse()} - onSelectSettings={handleOpenSettings} - onSelectWorkflows={() => void goWorkflows()} - onSetPresenceStatus={(status) => - presenceSession.setStatus(status) - } - onSetUserStatus={(text, emoji) => - setUserStatusMutation.mutate({ text, emoji }) - } - onClearUserStatus={() => - setUserStatusMutation.mutate({ - text: "", - emoji: "", - }) - } - profile={profileQuery.data} - selfUserStatus={ - deferredPubkey - ? (selfStatusQuery.data?.[ - deferredPubkey.toLowerCase() - ] ?? undefined) - : undefined - } - selectedChannelId={selectedChannelId} - selectedView={selectedView} - unreadChannelIds={unreadChannelIds} - unreadChannelCounts={unreadChannelCounts} - mutedChannelIds={mutedChannelIds} - onMuteChannel={muteChannel} - onUnmuteChannel={unmuteChannel} - starredChannelIds={starredChannelIds} - onStarChannel={starChannel} - onUnstarChannel={unstarChannel} - /> - - - - - - - - -
- )} - - - + {hasCommunityRail && !isHuddleRoom ? ( + void handleRemoveCommunity(id)} + onReorderCommunities={communitiesHook.reorderCommunities} + onSwitchCommunity={handleSwitchCommunity} + onUpdateCommunity={communitiesHook.updateCommunity} + communities={communitiesHook.communities} + /> + ) : null} + + + {!settingsOpen && !isHuddleRoom ? ( + + ) : null} + {settingsOpen ? ( +
+ + { - setIsChannelManagementOpen(open); - if (!open) { - setManagedChannelId(null); - } - }} - onDeleteActiveChannel={() => { - setIsChannelManagementOpen(false); - setManagedChannelId(null); - void goHome({ replace: true }); + notificationErrorMessage={ + notificationSettings.errorMessage + } + notificationPermission={notificationSettings.permission} + notificationSettings={notificationSettings.settings} + onClose={handleCloseSettings} + onSectionChange={handleSettingsSectionChange} + onSetDesktopNotificationsEnabled={ + notificationSettings.setDesktopEnabled + } + onSetHomeBadgeEnabled={ + notificationSettings.setHomeBadgeEnabled + } + onSetSlotAlertsEnabled={ + notificationSettings.setSlotAlertsEnabled + } + onSetNotifyWhileViewing={ + notificationSettings.setNotifyWhileViewing + } + onSetAllSlotAlertsEnabled={ + notificationSettings.setAllSlotAlertsEnabled + } + onSetSoundForSlot={notificationSettings.setSoundForSlot} + section={settingsSection} + /> + +
+ ) : ( +
+ {!isHuddleRoom ? ( + { + const id = communitiesHook.addCommunity({ + ...community, + pubkey: + community.pubkey ?? identityQuery.data?.pubkey, + }); + handleSwitchCommunity(id); }} - onSelectChannel={(channelId) => { - void goChannel(channelId); + onAddCommunityOpenChange={ + addCommunityDialog.onOpenChange + } + onNewMessage={goNewMessage} + onBackgroundClick={requestFocusedThreadClose} + onCreateChannelOpenChange={setIsCreateChannelOpen} + onOpenAddCommunity={addCommunityDialog.openDialog} + onSendFeedback={() => setIsSendFeedbackOpen(true)} + onUpdateCommunity={communitiesHook.updateCommunity} + onRemoveCommunity={(id) => + void handleRemoveCommunity(id) + } + onSwitchCommunity={handleSwitchCommunity} + onCreateAgent={() => requestOpenCreateAgent()} + selfPresenceStatus={presenceSession.currentStatus} + communities={communitiesHook.communities} + onCreateChannel={handleCreateChannel} + onCreateForum={handleCreateForum} + onHideDm={handleHideDm} + onHuddleEnded={handleHuddleEnded} + onMarkAllChannelsRead={markAllChannelsRead} + onMarkChannelRead={markChannelRead} + onMarkChannelUnread={markChannelUnread} + onBrowseChannels={handleOpenBrowseChannels} + onOpenDm={async ({ pubkeys }) => { + const directMessage = + await openDmMutation.mutateAsync({ + pubkeys, + }); + await goChannel(directMessage.id); }} + onSelectAgents={() => void goAgents()} + onSelectChannel={handleSidebarChannelSelect} + onOpenSearchResult={handleOpenSearchResult} + searchChannels={channels} + searchFocusRequest={searchFocusRequest} + onSelectHome={() => void goHome()} + onSelectProjects={() => void goProjects()} + onSelectPulse={() => void goPulse()} + onSelectSettings={handleOpenSettings} + onSelectWorkflows={() => void goWorkflows()} + onSetPresenceStatus={(status) => + presenceSession.setStatus(status) + } + onSetUserStatus={(text, emoji) => + setUserStatusMutation.mutate({ text, emoji }) + } + onClearUserStatus={() => + setUserStatusMutation.mutate({ + text: "", + emoji: "", + }) + } + profile={profileQuery.data} + selfUserStatus={ + deferredPubkey + ? (selfStatusQuery.data?.[ + deferredPubkey.toLowerCase() + ] ?? undefined) + : undefined + } + selectedChannelId={selectedChannelId} + selectedView={selectedView} + unreadChannelIds={unreadChannelIds} + unreadChannelCounts={unreadChannelCounts} + mutedChannelIds={mutedChannelIds} + onMuteChannel={muteChannel} + onUnmuteChannel={unmuteChannel} + starredChannelIds={starredChannelIds} + onStarChannel={starChannel} + onUnstarChannel={unstarChannel} /> - + + + {!isHuddleRoom ? ( + - - -
- -
- { - void goChannel(channelId, { - messageId, - threadRootId: messageId, - }); - }} - onVisibilityChange={setIsHuddleDrawerOpen} - /> -
-
- - + ) : null} +
+ )} + + + { + setIsChannelManagementOpen(open); + if (!open) { + setManagedChannelId(null); + } + }} + onDeleteActiveChannel={() => { + setIsChannelManagementOpen(false); + setManagedChannelId(null); + void goHome({ replace: true }); + }} + onSelectChannel={(channelId) => { + void goChannel(channelId); + }} + /> + + + + diff --git a/desktop/src/app/AppShellChannelSurface.tsx b/desktop/src/app/AppShellChannelSurface.tsx new file mode 100644 index 0000000000..4ab2ea1df3 --- /dev/null +++ b/desktop/src/app/AppShellChannelSurface.tsx @@ -0,0 +1,43 @@ +import type * as React from "react"; +import * as BuzzTheme from "@/app/BuzzThemeSurfaces"; +import { HuddleRoomHeader, HuddleStartingView } from "@/features/huddle"; +import { MainInsetProvider } from "@/shared/layout/MainInsetContext"; +import { chromeCssVarDefaults } from "@/shared/layout/chromeLayout"; +import { cn } from "@/shared/lib/cn"; +import { SidebarInset } from "@/shared/ui/sidebar"; + +type AppShellChannelSurfaceProps = { + children: React.ReactNode; + isHuddleRoom: boolean; + isHuddleRoomStarting: boolean; + mainInsetRef: React.RefObject; +}; + +export function AppShellChannelSurface({ + children, + isHuddleRoom, + isHuddleRoomStarting, + mainInsetRef, +}: AppShellChannelSurfaceProps) { + return ( + + + {isHuddleRoom && !isHuddleRoomStarting ? : null} + + {isHuddleRoomStarting ? : children} + + + + ); +} diff --git a/desktop/src/app/BuzzThemeSurfaces.tsx b/desktop/src/app/BuzzThemeSurfaces.tsx index 80461f0185..4976fc2ed8 100644 --- a/desktop/src/app/BuzzThemeSurfaces.tsx +++ b/desktop/src/app/BuzzThemeSurfaces.tsx @@ -7,6 +7,7 @@ export function GradientLayer() { className="buzz-theme-gradient-layer pointer-events-none absolute inset-0 -z-10" data-buzz-gradient-layer > +
{children}
diff --git a/desktop/src/app/LazySettingsScreen.tsx b/desktop/src/app/LazySettingsScreen.tsx new file mode 100644 index 0000000000..8308ec723b --- /dev/null +++ b/desktop/src/app/LazySettingsScreen.tsx @@ -0,0 +1,6 @@ +import * as React from "react"; + +export const LazySettingsScreen = React.lazy(async () => { + const module = await import("@/features/settings/ui/SettingsScreen"); + return { default: module.SettingsScreen }; +}); diff --git a/desktop/src/app/huddleBackingChannelStorage.test.mjs b/desktop/src/app/huddleBackingChannelStorage.test.mjs new file mode 100644 index 0000000000..f88c0e1feb --- /dev/null +++ b/desktop/src/app/huddleBackingChannelStorage.test.mjs @@ -0,0 +1,33 @@ +import assert from "node:assert/strict"; +import test from "node:test"; + +class MemoryStorage { + values = new Map(); + getItem(key) { + return this.values.get(key) ?? null; + } + setItem(key, value) { + this.values.set(key, value); + } +} + +globalThis.window = { localStorage: new MemoryStorage() }; +const { loadHuddleBackingChannelIds, rememberHuddleBackingChannelId } = + await import("./huddleBackingChannelStorage.ts"); + +test("restores remembered Huddle backing channels", () => { + rememberHuddleBackingChannelId("first"); + rememberHuddleBackingChannelId("second"); + rememberHuddleBackingChannelId("first"); + assert.deepEqual([...loadHuddleBackingChannelIds()], ["second", "first"]); +}); + +test("bounds persisted backing channels", () => { + for (let index = 0; index < 105; index += 1) { + rememberHuddleBackingChannelId(`channel-${index}`); + } + const ids = [...loadHuddleBackingChannelIds()]; + assert.equal(ids.length, 100); + assert.equal(ids.at(0), "channel-5"); + assert.equal(ids.at(-1), "channel-104"); +}); diff --git a/desktop/src/app/huddleBackingChannelStorage.ts b/desktop/src/app/huddleBackingChannelStorage.ts new file mode 100644 index 0000000000..44b21a25d2 --- /dev/null +++ b/desktop/src/app/huddleBackingChannelStorage.ts @@ -0,0 +1,36 @@ +const STORAGE_KEY = "buzz:huddle-backing-channel-ids:v1"; +const MAX_TRACKED_CHANNELS = 100; + +function readStoredIds(): string[] { + try { + const value = JSON.parse(window.localStorage.getItem(STORAGE_KEY) ?? "[]"); + return Array.isArray(value) + ? value.filter((id): id is string => typeof id === "string") + : []; + } catch { + return []; + } +} + +/** Restores Huddle implementation channels after an abnormal app restart. */ +export function loadHuddleBackingChannelIds(): ReadonlySet { + return new Set(readStoredIds()); +} + +/** + * Remembers a backing channel beyond the native Huddle process lifetime. + * Relay archive/removal can lag, so IDs remain hidden if the app crashes or is + * force-quit. The bounded list prevents abandoned local state growing forever. + */ +export function rememberHuddleBackingChannelId(channelId: string): void { + const ids = readStoredIds().filter((id) => id !== channelId); + ids.push(channelId); + try { + window.localStorage.setItem( + STORAGE_KEY, + JSON.stringify(ids.slice(-MAX_TRACKED_CHANNELS)), + ); + } catch { + // Storage can be unavailable in browser previews or locked-down webviews. + } +} diff --git a/desktop/src/app/huddleChannelVisibility.test.mjs b/desktop/src/app/huddleChannelVisibility.test.mjs new file mode 100644 index 0000000000..b08306e9e7 --- /dev/null +++ b/desktop/src/app/huddleChannelVisibility.test.mjs @@ -0,0 +1,65 @@ +import assert from "node:assert/strict"; +import test from "node:test"; + +import { + isHuddleBackingChannel, + shouldShowSidebarChannel, +} from "./huddleChannelVisibility.ts"; + +function channel(overrides = {}) { + return { + id: "channel-id", + name: "general", + ttlSeconds: null, + ...overrides, + }; +} + +test("ordinary channels stay visible without an explicit reveal", () => { + assert.equal(shouldShowSidebarChannel(channel(), new Set(), new Set()), true); +}); + +test("tracked huddle backing channels stay hidden by default", () => { + const huddle = channel({ + id: "stale-huddle", + name: "general huddle", + ttlSeconds: 3_600, + }); + const huddleBackingChannelIds = new Set([huddle.id]); + + assert.equal(isHuddleBackingChannel(huddle, huddleBackingChannelIds), true); + assert.equal( + shouldShowSidebarChannel(huddle, huddleBackingChannelIds, new Set()), + false, + ); +}); + +test("an explicitly revealed huddle channel appears in the sidebar", () => { + const huddle = channel({ + id: "active-huddle", + name: "huddle", + ttlSeconds: 3_600, + }); + + assert.equal( + shouldShowSidebarChannel( + huddle, + new Set([huddle.id]), + new Set([huddle.id]), + ), + true, + ); +}); + +test("one-hour channels with huddle-shaped names remain ordinary", () => { + const ordinaryChannel = channel({ + name: "design huddle", + ttlSeconds: 3_600, + }); + + assert.equal(isHuddleBackingChannel(ordinaryChannel, new Set()), false); + assert.equal( + shouldShowSidebarChannel(ordinaryChannel, new Set(), new Set()), + true, + ); +}); diff --git a/desktop/src/app/huddleChannelVisibility.ts b/desktop/src/app/huddleChannelVisibility.ts new file mode 100644 index 0000000000..cee0717bee --- /dev/null +++ b/desktop/src/app/huddleChannelVisibility.ts @@ -0,0 +1,19 @@ +import type { Channel } from "@/shared/api/types"; + +export function isHuddleBackingChannel( + channel: Channel, + huddleBackingChannelIds: ReadonlySet, +): boolean { + return huddleBackingChannelIds.has(channel.id); +} + +export function shouldShowSidebarChannel( + channel: Channel, + huddleBackingChannelIds: ReadonlySet, + revealedHuddleChannelIds: ReadonlySet, +): boolean { + return ( + !isHuddleBackingChannel(channel, huddleBackingChannelIds) || + revealedHuddleChannelIds.has(channel.id) + ); +} diff --git a/desktop/src/app/navigation/useAppNavigation.ts b/desktop/src/app/navigation/useAppNavigation.ts index d19ac03120..5afd0e7e4b 100644 --- a/desktop/src/app/navigation/useAppNavigation.ts +++ b/desktop/src/app/navigation/useAppNavigation.ts @@ -171,6 +171,8 @@ export function useAppNavigation() { autoSend?: string; messageId?: string; replace?: boolean; + /** Open this thread panel directly without waiting for a timeline row. */ + thread?: string; threadRootId?: string | null; }, ) => @@ -190,6 +192,7 @@ export function useAppNavigation() { ...(options?.agentSession ? { agentSession: options.agentSession } : {}), + ...(options?.thread ? { thread: options.thread } : {}), ...(options?.autoSend ? { autoSend: options.autoSend } : {}), }, }, diff --git a/desktop/src/app/routes/ChannelRouteScreen.tsx b/desktop/src/app/routes/ChannelRouteScreen.tsx index 9e689ab507..d626179ebb 100644 --- a/desktop/src/app/routes/ChannelRouteScreen.tsx +++ b/desktop/src/app/routes/ChannelRouteScreen.tsx @@ -4,6 +4,8 @@ import { getCachedSearchHitEvent } from "@/app/navigation/searchHitEventCache"; import { useAppNavigation } from "@/app/navigation/useAppNavigation"; import { useChannelsQuery } from "@/features/channels/hooks"; import { ChannelScreen } from "@/features/channels/ui/ChannelScreen"; +import { HuddleStartingView } from "@/features/huddle/components/HuddleStartingView"; +import { huddleWindowChannelId } from "@/features/huddle/lib/huddleWindow"; import { getThreadReference, isBroadcastReply, @@ -102,6 +104,7 @@ export function ChannelRouteScreen({ targetReplyId, targetThreadRootId, }: ChannelRouteScreenProps) { + const isHuddleTranscript = huddleWindowChannelId() !== null; const { closeForumPost, goForumPost } = useAppNavigation(); const channelsQuery = useChannelsQuery(); const identityQuery = useIdentityQuery(); @@ -186,6 +189,9 @@ export function ChannelRouteScreen({ }, [selectedPostId, targetMessageId, targetThreadRootId]); if (channelsQuery.isPending && !activeChannel) { + if (isHuddleTranscript) { + return ; + } return ( { function ChannelRouteComponent() { const { channelId } = Route.useParams(); const search = Route.useSearch(); + const isHuddleTranscript = huddleWindowChannelId() !== null; return ( } + fallback={ + isHuddleTranscript ? ( + + ) : ( + + ) + } > Promise; goHome: () => Promise; notificationSettings: NotificationSettings; @@ -42,6 +44,7 @@ export function useAppShellDesktopNotifications({ }) { const handleChannelNotification = React.useEffectEvent( (_channelId: string, event: RelayEvent) => { + if (!enabled) return; if (!shouldBounceForChannelNotification(event.tags)) return; if (!notificationSettings.desktopEnabled) return; void requestDockBounce(); @@ -50,6 +53,7 @@ export function useAppShellDesktopNotifications({ const handleDmNotification = React.useEffectEvent( (event: RelayEvent, channel: Channel) => { + if (!enabled) return; if ( !notificationSettings.desktopEnabled || !notificationSettings.slotAlertsEnabled.dm @@ -84,6 +88,7 @@ export function useAppShellDesktopNotifications({ const handleThreadReplyDesktopNotification = React.useEffectEvent( (channelId: string, event: RelayEvent) => { + if (!enabled) return; if ( !notificationSettings.desktopEnabled || !notificationSettings.slotAlertsEnabled.thread_reply @@ -151,6 +156,7 @@ export function useAppShellDesktopNotifications({ ); React.useEffect(() => { + if (!enabled) return; let isCancelled = false; let cleanup = () => {}; @@ -173,7 +179,7 @@ export function useAppShellDesktopNotifications({ isCancelled = true; cleanup(); }; - }, []); + }, [enabled]); return { handleChannelNotification, diff --git a/desktop/src/app/useAppShellLifecycleEffects.ts b/desktop/src/app/useAppShellLifecycleEffects.ts index cc0447cc32..02c97bac57 100644 --- a/desktop/src/app/useAppShellLifecycleEffects.ts +++ b/desktop/src/app/useAppShellLifecycleEffects.ts @@ -4,12 +4,14 @@ import { setDesktopAppBadge } from "@/features/notifications/lib/desktop"; import { relayClient } from "@/shared/api/relayClient"; type AppShellLifecycleEffectsOptions = { + desktopBadgeEnabled: boolean; homeBadgeCountExcludingHighPriority: number; unreadChannelIds: ReadonlySet; unreadChannelNotificationCount: number; }; export function useAppShellLifecycleEffects({ + desktopBadgeEnabled, homeBadgeCountExcludingHighPriority, unreadChannelIds, unreadChannelNotificationCount, @@ -64,6 +66,10 @@ export function useAppShellLifecycleEffects({ }, []); React.useEffect(() => { + if (!desktopBadgeEnabled) { + return; + } + const count = unreadChannelNotificationCount + homeBadgeCountExcludingHighPriority; void setDesktopAppBadge( @@ -72,6 +78,7 @@ export function useAppShellLifecycleEffects({ : { kind: unreadChannelIds.size ? "dot" : "none" }, ); }, [ + desktopBadgeEnabled, homeBadgeCountExcludingHighPriority, unreadChannelIds, unreadChannelNotificationCount, diff --git a/desktop/src/app/useHuddlePresentation.ts b/desktop/src/app/useHuddlePresentation.ts new file mode 100644 index 0000000000..ddc8674714 --- /dev/null +++ b/desktop/src/app/useHuddlePresentation.ts @@ -0,0 +1,444 @@ +import { useQueryClient } from "@tanstack/react-query"; +import { useLocation } from "@tanstack/react-router"; +import { invoke } from "@tauri-apps/api/core"; +import { listen } from "@tauri-apps/api/event"; +import * as React from "react"; +import { + loadHuddleBackingChannelIds, + rememberHuddleBackingChannelId, +} from "@/app/huddleBackingChannelStorage"; +import { useAppNavigation } from "@/app/navigation/useAppNavigation"; +import { channelsQueryKey } from "@/features/channels/hooks"; +import { huddleWindowChannelId } from "@/features/huddle/lib/huddleWindow"; +import { + channelMessagesKey, + channelWindowKey, +} from "@/features/messages/lib/messageQueryKeys"; + +type HuddleTranscriptRouteState = { + phase: + | "idle" + | "creating" + | "connecting" + | "connected" + | "active" + | "leaving"; + parent_channel_id: string | null; + ephemeral_channel_id: string | null; + huddle_thread_event_id: string | null; +}; + +export function useHuddlePresentation() { + const huddleRoomChannelId = huddleWindowChannelId(); + const isHuddleRoom = huddleRoomChannelId !== null; + const [isHuddleDrawerOpen, setIsHuddleDrawerOpen] = React.useState(false); + const [isHuddleCompanionOpen, setIsHuddleCompanionOpen] = + React.useState(false); + const [isHuddleStartPending, setIsHuddleStartPending] = React.useState(false); + const [revealedHuddleChannelIds, setRevealedHuddleChannelIds] = + React.useState>(() => new Set()); + const [huddleBackingChannelIds, setHuddleBackingChannelIds] = React.useState< + ReadonlySet + >(loadHuddleBackingChannelIds); + const activeHuddleChannelIdRef = React.useRef(null); + const huddleCompanionChannelIdRef = React.useRef(null); + const huddleCompanionDismissedChannelIdRef = React.useRef( + null, + ); + const huddleCompanionOpenPromiseRef = React.useRef | null>( + null, + ); + const activeHuddleParentChannelIdRef = React.useRef(null); + const [huddleTranscriptRoute, setHuddleTranscriptRoute] = + React.useState(null); + const location = useLocation(); + const queryClient = useQueryClient(); + const { goChannel } = useAppNavigation(); + + React.useEffect(() => { + if (!isHuddleRoom) return; + + let cancelled = false; + let unlisten: (() => void) | null = null; + const syncRoute = (state: HuddleTranscriptRouteState) => { + if (!cancelled) setHuddleTranscriptRoute(state); + }; + + void invoke("get_huddle_state") + .then(syncRoute) + .catch((error) => { + console.error("Failed to resolve huddle transcript route:", error); + if (!cancelled) { + setHuddleTranscriptRoute({ + ephemeral_channel_id: huddleRoomChannelId, + huddle_thread_event_id: null, + parent_channel_id: null, + phase: "active", + }); + } + }); + void listen("huddle-state-changed", (event) => + syncRoute(event.payload), + ).then((cleanup) => { + if (cancelled) cleanup(); + else unlisten = cleanup; + }); + + return () => { + cancelled = true; + unlisten?.(); + }; + }, [huddleRoomChannelId, isHuddleRoom]); + + const huddleRouteResolved = huddleTranscriptRoute !== null; + const huddleRouteEphemeralChannelId = + huddleTranscriptRoute?.ephemeral_channel_id ?? null; + const huddleRouteIsActive = huddleTranscriptRoute?.phase === "active"; + const huddleRouteDestinationChannelId = + huddleRouteEphemeralChannelId ?? huddleRoomChannelId; + const huddleRouteMatchesLocation = Boolean( + huddleRouteDestinationChannelId && + location.pathname === `/channels/${huddleRouteDestinationChannelId}`, + ); + const isHuddleRoomStarting = + isHuddleRoom && + (!huddleRouteResolved || + !huddleRouteIsActive || + !huddleRouteMatchesLocation); + + React.useEffect(() => { + if (!huddleRoomChannelId || !huddleRouteResolved || !huddleRouteIsActive) { + return; + } + + let cancelled = false; + const channelId = huddleRouteEphemeralChannelId ?? huddleRoomChannelId; + void Promise.all([ + queryClient.invalidateQueries({ queryKey: channelsQueryKey }), + queryClient.invalidateQueries({ + queryKey: channelMessagesKey(channelId), + }), + queryClient.invalidateQueries({ queryKey: channelWindowKey(channelId) }), + ]).then(() => { + if (!cancelled) void goChannel(channelId, { replace: true }); + }); + + return () => { + cancelled = true; + }; + }, [ + goChannel, + huddleRoomChannelId, + huddleRouteEphemeralChannelId, + huddleRouteIsActive, + huddleRouteResolved, + queryClient, + ]); + + const handleHuddleStartPendingChange = React.useCallback( + (pending: boolean) => { + setIsHuddleStartPending(pending); + if (pending) setIsHuddleDrawerOpen(false); + }, + [], + ); + const handleHuddleVisibilityChange = React.useCallback( + (visible: boolean) => { + setIsHuddleDrawerOpen( + visible && !isHuddleStartPending && !isHuddleCompanionOpen, + ); + }, + [isHuddleCompanionOpen, isHuddleStartPending], + ); + const hideHuddleChannel = React.useCallback( + (ephemeralChannelId: string | null | undefined) => { + if (!ephemeralChannelId) return; + setRevealedHuddleChannelIds((current) => { + if (!current.has(ephemeralChannelId)) return current; + const next = new Set(current); + next.delete(ephemeralChannelId); + return next; + }); + }, + [], + ); + const trackHuddleBackingChannel = React.useCallback( + (ephemeralChannelId: string) => { + rememberHuddleBackingChannelId(ephemeralChannelId); + setHuddleBackingChannelIds((current) => { + if (current.has(ephemeralChannelId)) return current; + const next = new Set(current); + next.add(ephemeralChannelId); + return next; + }); + }, + [], + ); + const revealHuddleChannel = React.useCallback( + (ephemeralChannelId: string) => { + setRevealedHuddleChannelIds((current) => { + if (current.has(ephemeralChannelId)) return current; + const next = new Set(current); + next.add(ephemeralChannelId); + return next; + }); + }, + [], + ); + const returnMainWindowToHuddleParent = React.useCallback( + (state: HuddleTranscriptRouteState) => { + const ephemeralChannelId = state.ephemeral_channel_id; + const parentChannelId = state.parent_channel_id; + if (parentChannelId) { + activeHuddleParentChannelIdRef.current = parentChannelId; + } + if ( + ephemeralChannelId && + parentChannelId && + location.pathname === `/channels/${ephemeralChannelId}` + ) { + void goChannel(parentChannelId, { replace: true }); + } + }, + [goChannel, location.pathname], + ); + const handleHuddleCompanionOpen = React.useCallback(() => { + const ephemeralChannelId = activeHuddleChannelIdRef.current; + huddleCompanionDismissedChannelIdRef.current = null; + hideHuddleChannel(ephemeralChannelId); + setIsHuddleDrawerOpen(false); + setIsHuddleCompanionOpen(true); + + const parentChannelId = activeHuddleParentChannelIdRef.current; + if ( + ephemeralChannelId && + parentChannelId && + location.pathname === `/channels/${ephemeralChannelId}` + ) { + void goChannel(parentChannelId, { replace: true }); + return; + } + + void invoke("get_huddle_state") + .then(returnMainWindowToHuddleParent) + .catch((error) => { + console.error("Failed to restore the huddle parent channel:", error); + }); + }, [ + goChannel, + hideHuddleChannel, + location.pathname, + returnMainWindowToHuddleParent, + ]); + const openHuddleCompanion = React.useCallback( + (ephemeralChannelId: string) => { + activeHuddleChannelIdRef.current = ephemeralChannelId; + trackHuddleBackingChannel(ephemeralChannelId); + + if (huddleCompanionDismissedChannelIdRef.current === ephemeralChannelId) { + return Promise.resolve(); + } + + huddleCompanionDismissedChannelIdRef.current = null; + hideHuddleChannel(ephemeralChannelId); + setIsHuddleDrawerOpen(false); + setIsHuddleCompanionOpen(true); + + if ( + huddleCompanionChannelIdRef.current === ephemeralChannelId && + huddleCompanionOpenPromiseRef.current + ) { + return huddleCompanionOpenPromiseRef.current; + } + + huddleCompanionChannelIdRef.current = ephemeralChannelId; + const openPromise = invoke("open_huddle_window").catch((error) => { + if (huddleCompanionChannelIdRef.current === ephemeralChannelId) { + huddleCompanionChannelIdRef.current = null; + huddleCompanionOpenPromiseRef.current = null; + setIsHuddleCompanionOpen(false); + } + throw error; + }); + huddleCompanionOpenPromiseRef.current = openPromise; + return openPromise; + }, + [hideHuddleChannel, trackHuddleBackingChannel], + ); + const handleHuddleStarted = React.useCallback( + async (ephemeralChannelId: string) => { + try { + await openHuddleCompanion(ephemeralChannelId); + } catch (error) { + revealHuddleChannel(ephemeralChannelId); + throw error; + } + }, + [openHuddleCompanion, revealHuddleChannel], + ); + const viewHuddleChannel = React.useCallback( + (ephemeralChannelId: string) => { + revealHuddleChannel(ephemeralChannelId); + void queryClient.invalidateQueries({ queryKey: channelsQueryKey }); + void queryClient.invalidateQueries({ + queryKey: channelMessagesKey(ephemeralChannelId), + }); + void queryClient.invalidateQueries({ + queryKey: channelWindowKey(ephemeralChannelId), + }); + void goChannel(ephemeralChannelId); + }, + [goChannel, queryClient, revealHuddleChannel], + ); + const showHuddleInMainApp = React.useCallback( + (ephemeralChannelId: string) => { + activeHuddleChannelIdRef.current = ephemeralChannelId; + trackHuddleBackingChannel(ephemeralChannelId); + viewHuddleChannel(ephemeralChannelId); + }, + [trackHuddleBackingChannel, viewHuddleChannel], + ); + const handleSidebarChannelSelect = React.useCallback( + (channelId: string) => { + if ( + isHuddleDrawerOpen && + channelId === activeHuddleChannelIdRef.current + ) { + showHuddleInMainApp(channelId); + return; + } + void goChannel(channelId); + }, + [goChannel, isHuddleDrawerOpen, showHuddleInMainApp], + ); + const handleHuddleEnded = React.useCallback( + (ephemeralChannelId: string | null) => { + const endedChannelId = + ephemeralChannelId ?? activeHuddleChannelIdRef.current; + hideHuddleChannel(endedChannelId); + activeHuddleChannelIdRef.current = null; + huddleCompanionChannelIdRef.current = null; + huddleCompanionDismissedChannelIdRef.current = null; + huddleCompanionOpenPromiseRef.current = null; + setIsHuddleCompanionOpen(false); + void queryClient.invalidateQueries({ queryKey: channelsQueryKey }); + }, + [hideHuddleChannel, queryClient], + ); + + React.useEffect(() => { + if (isHuddleRoom) return; + + let cancelled = false; + let unlisten: (() => void) | null = null; + void listen("huddle-companion-returned", () => { + if (cancelled) return; + huddleCompanionDismissedChannelIdRef.current = + activeHuddleChannelIdRef.current; + huddleCompanionChannelIdRef.current = null; + huddleCompanionOpenPromiseRef.current = null; + setIsHuddleCompanionOpen(false); + setIsHuddleDrawerOpen(true); + void invoke("get_huddle_state") + .then((state) => { + if (!state.ephemeral_channel_id) return; + if (state.parent_channel_id) { + activeHuddleParentChannelIdRef.current = state.parent_channel_id; + } + showHuddleInMainApp(state.ephemeral_channel_id); + }) + .catch((error) => { + console.error("Failed to open huddle in the main app:", error); + }); + }).then((cleanup) => { + if (cancelled) cleanup(); + else unlisten = cleanup; + }); + return () => { + cancelled = true; + unlisten?.(); + }; + }, [isHuddleRoom, showHuddleInMainApp]); + + React.useEffect(() => { + let cancelled = false; + let unlisten: (() => void) | null = null; + void invoke("get_huddle_state") + .then((state) => { + if (cancelled || !state.ephemeral_channel_id) return; + activeHuddleChannelIdRef.current = state.ephemeral_channel_id; + trackHuddleBackingChannel(state.ephemeral_channel_id); + if (state.parent_channel_id) { + activeHuddleParentChannelIdRef.current = state.parent_channel_id; + } + }) + .catch(() => { + /* lifecycle events remain authoritative */ + }); + listen("huddle-state-changed", (event) => { + if (cancelled) return; + if (event.payload.ephemeral_channel_id) { + activeHuddleChannelIdRef.current = event.payload.ephemeral_channel_id; + trackHuddleBackingChannel(event.payload.ephemeral_channel_id); + } + if (event.payload.parent_channel_id) { + activeHuddleParentChannelIdRef.current = + event.payload.parent_channel_id; + } + if ( + !isHuddleRoom && + event.payload.phase === "creating" && + event.payload.ephemeral_channel_id + ) { + void openHuddleCompanion(event.payload.ephemeral_channel_id).catch( + (error) => { + console.error("Failed to open starting huddle window:", error); + }, + ); + } + if (event.payload.phase === "idle") { + hideHuddleChannel(activeHuddleChannelIdRef.current); + activeHuddleChannelIdRef.current = null; + activeHuddleParentChannelIdRef.current = null; + huddleCompanionChannelIdRef.current = null; + huddleCompanionDismissedChannelIdRef.current = null; + huddleCompanionOpenPromiseRef.current = null; + setIsHuddleDrawerOpen(false); + setIsHuddleCompanionOpen(false); + setIsHuddleStartPending(false); + void queryClient.invalidateQueries({ queryKey: channelsQueryKey }); + } + }).then((cleanup) => { + if (cancelled) cleanup(); + else unlisten = cleanup; + }); + return () => { + cancelled = true; + unlisten?.(); + }; + }, [ + hideHuddleChannel, + isHuddleRoom, + openHuddleCompanion, + queryClient, + trackHuddleBackingChannel, + ]); + + return { + handleHuddleCompanionOpen, + handleHuddleEnded, + handleHuddleStartPendingChange, + handleHuddleStarted, + handleHuddleVisibilityChange, + handleSidebarChannelSelect, + huddleBackingChannelIds, + revealedHuddleChannelIds, + isHuddleCompanionOpen, + isHuddleDrawerOpen, + isHuddleRoom, + isHuddleRoomStarting, + isHuddleStartPending, + showHuddleInMainApp, + viewHuddleChannel, + }; +} diff --git a/desktop/src/app/useSettingsShortcuts.ts b/desktop/src/app/useSettingsShortcuts.ts index 0d0813a35e..757ddc65e1 100644 --- a/desktop/src/app/useSettingsShortcuts.ts +++ b/desktop/src/app/useSettingsShortcuts.ts @@ -5,7 +5,7 @@ import { hasPrimaryShortcutModifier } from "@/shared/lib/platform"; type UseSettingsShortcutsOptions = { onClose: () => void; onOpenSettings: () => void; - open: boolean; + open?: boolean; }; export function useSettingsShortcuts({ @@ -14,6 +14,8 @@ export function useSettingsShortcuts({ open, }: UseSettingsShortcutsOptions) { React.useLayoutEffect(() => { + if (open === undefined) return; + function handleKeyDown(event: KeyboardEvent) { const isSettingsShortcut = hasPrimaryShortcutModifier(event) && diff --git a/desktop/src/features/agents/hooks.ts b/desktop/src/features/agents/hooks.ts index 122c872e54..b39a7e8ec8 100644 --- a/desktop/src/features/agents/hooks.ts +++ b/desktop/src/features/agents/hooks.ts @@ -33,6 +33,7 @@ import { getManagedAgentLog, getRuntimeFileConfig, installAcpRuntime, + invokeTauri, listManagedAgents, listRelayAgents, saveCustomHarness, @@ -647,6 +648,12 @@ export function useAttachManagedAgentToChannelMutation( pubkey: result.agent.pubkey, }), ); + void invokeTauri("sync_agents_to_active_huddle", { + channelId: effectiveChannelId, + agentPubkeys: [result.agent.pubkey], + }).catch((error) => { + console.warn("Could not sync attached agent into Huddle:", error); + }); }, onSettled: (_data, _err, variables) => { // Invalidate the effective channel (the one the server actually mutated) diff --git a/desktop/src/features/channels/hooks.ts b/desktop/src/features/channels/hooks.ts index 9003d0f5a5..8829edab39 100644 --- a/desktop/src/features/channels/hooks.ts +++ b/desktop/src/features/channels/hooks.ts @@ -14,6 +14,7 @@ import { joinChannel, leaveChannel, openDm, + invokeTauri, removeChannelMember, setCanvas, setChannelPurpose, @@ -517,6 +518,21 @@ export function useAddChannelMembersMutation(channelId: string | null) { return addChannelMembers({ ...rest, channelId: effectiveChannelId }); }, + onSuccess: (result, variables) => { + const effectiveChannelId = variables.channelId ?? channelId; + if ( + effectiveChannelId && + variables.role === "bot" && + result.added.length > 0 + ) { + void invokeTauri("sync_agents_to_active_huddle", { + channelId: effectiveChannelId, + agentPubkeys: result.added, + }).catch((error) => { + console.warn("Could not sync added agents into Huddle:", error); + }); + } + }, onSettled: async (_data, _err, variables) => { // Invalidate the effective channel (the one actually mutated) not the // live hook-closure channel, which may have changed mid-send. diff --git a/desktop/src/features/channels/ui/ChannelMembersBar.tsx b/desktop/src/features/channels/ui/ChannelMembersBar.tsx index 7b9bf2b79f..2debd9e7a9 100644 --- a/desktop/src/features/channels/ui/ChannelMembersBar.tsx +++ b/desktop/src/features/channels/ui/ChannelMembersBar.tsx @@ -165,8 +165,8 @@ export function ChannelMembersBar({ members, }), ); - // Refetch channels so the new ephemeral channel appears in the sidebar immediately - // (default poll interval is 60s — too slow for huddle UX). + // Keep the channel cache current so the ephemeral transcript is + // available immediately if the huddle returns to the in-app drawer. void queryClient.invalidateQueries({ queryKey: ["channels"] }); } catch (e) { console.error("Failed to start huddle:", e); diff --git a/desktop/src/features/channels/ui/ChannelPane.helpers.ts b/desktop/src/features/channels/ui/ChannelPane.helpers.ts index a30ee24114..cb0600a28a 100644 --- a/desktop/src/features/channels/ui/ChannelPane.helpers.ts +++ b/desktop/src/features/channels/ui/ChannelPane.helpers.ts @@ -43,6 +43,20 @@ export function isWelcomeSetupSystemMessage(message: TimelineMessage) { } } +export function isChannelCreatedSystemMessage(message: TimelineMessage) { + if (message.kind !== KIND_SYSTEM_MESSAGE) { + return false; + } + + try { + return ( + (JSON.parse(message.body) as { type?: string }).type === "channel_created" + ); + } catch { + return false; + } +} + export function mentionsKnownAgent( mentionPubkeys: string[], knownAgentPubkeys: ReadonlySet, diff --git a/desktop/src/features/channels/ui/ChannelPane.tsx b/desktop/src/features/channels/ui/ChannelPane.tsx index 770c45e445..54c0dcd5d9 100644 --- a/desktop/src/features/channels/ui/ChannelPane.tsx +++ b/desktop/src/features/channels/ui/ChannelPane.tsx @@ -48,16 +48,14 @@ import { WELCOME_PERSONA_ROTATION_MS, type WelcomeComposerBannerState, } from "@/features/channels/ui/WelcomeComposerBanner"; -import { - isWelcomeSetupSystemMessage, - mentionsKnownAgent, -} from "@/features/channels/ui/ChannelPane.helpers"; +import { mentionsKnownAgent } from "@/features/channels/ui/ChannelPane.helpers"; +import { HuddleStartingView, HuddleTranscriptIntro } from "@/features/huddle"; import { useChannelIntro } from "@/features/channels/ui/useChannelIntro"; import type { ChannelPaneProps } from "@/features/channels/ui/ChannelPane.types"; import * as agentSessionSelection from "@/features/channels/ui/agentSessionSelection"; import { usePrepareDmSendChannel } from "@/features/channels/ui/usePrepareDmSendChannel"; +import { useChannelPaneMessages } from "@/features/channels/ui/useChannelPaneMessages"; import { Button } from "@/shared/ui/button"; -import { buildMainTimelineEntries } from "@/features/messages/lib/threadPanel"; import { useRenderScopedReactionHydration } from "@/features/messages/lib/useRenderScopedReactionHydration"; import type { TimelineMessage } from "@/features/messages/types"; import { isWelcomeExperienceChannel as isWelcomeExperience } from "@/features/onboarding/welcome"; @@ -65,6 +63,12 @@ import { KIND_SYSTEM_MESSAGE } from "@/shared/constants/kinds"; import { useIsThreadPanelOverlay } from "@/shared/hooks/use-mobile"; import { channelChrome } from "@/shared/layout/chromeLayout"; import { cn } from "@/shared/lib/cn"; + +const HUDDLE_TRANSCRIPT_ROOT_STYLE = { + "--buzz-channel-content-top-padding": "0rem", + "--channel-top-chrome-height": "0.25rem", +} as React.CSSProperties; + export const ChannelPane = React.memo(function ChannelPane({ activeChannel, agentPubkeys, @@ -83,6 +87,7 @@ export const ChannelPane = React.memo(function ChannelPane({ hasOlderMessages, historyExhausted, isFetchingOlder, + isHuddleTranscript = false, followThreadById, isFollowingThread, isFollowingThreadById, @@ -191,13 +196,8 @@ export const ChannelPane = React.memo(function ChannelPane({ channelPaneMountedRef.current = false; }; }, []); - // Clear the ?autoSend search param once the auto-submit fires so - // back-navigation cannot re-trigger the send. - // When `onAutoSendComplete` is provided it does a surgical single-key clear - // that preserves `?thread` and all other panel search state (required for - // the thread-draft send path so the thread panel does not unmount before the - // deferred setTimeout(0) submit fires). The goChannel fallback is kept for - // callers that do not supply the prop (e.g. isolated tests / older wrappers). + // Clear only the auto-send key so thread state survives deferred submission; + // older wrappers fall back to goChannel to prevent back-navigation replay. const handleAutoSubmitComplete = React.useCallback(() => { if (onAutoSendComplete) { onAutoSendComplete(); @@ -409,8 +409,6 @@ export const ChannelPane = React.memo(function ChannelPane({ activeChannel?.id ?? null, ); const hasComposerBotActivity = composerWorkingBotPubkeys.length > 0; - // Background card mints surface in the same rail ("Minting card…" chip), - // so they must also reserve the activity row. const hasCardMintActivity = useCardMintJobs().length > 0; const hasComposerBottomActivity = hasComposerBotActivity || hasTypingActivity || hasCardMintActivity; @@ -444,7 +442,7 @@ export const ChannelPane = React.memo(function ChannelPane({ messageTimelineRef.current?.scrollToBottomOnNextUpdate(), }); }, [onAddAgent]); - const channelIntro = useChannelIntro({ + const standardChannelIntro = useChannelIntro({ activeChannel, onAddAgent, onBrowseChannels, @@ -452,23 +450,14 @@ export const ChannelPane = React.memo(function ChannelPane({ onOpenMembers, onWelcomeAddAgent: onAddAgent ? handleWelcomeAddAgent : undefined, }); - const visibleMessages = React.useMemo(() => { - if (!isWelcomeExperience(activeChannel)) { - return messages; - } - - return messages.filter((message) => !isWelcomeSetupSystemMessage(message)); - }, [activeChannel, messages]); - const mainTimelineEntries = React.useMemo( - () => - buildMainTimelineEntries( - visibleMessages, - new Set(), - threadSummaries, - profiles, - ), - [profiles, threadSummaries, visibleMessages], - ); + const channelIntro = isHuddleTranscript ? null : standardChannelIntro; + const { mainTimelineEntries, visibleMessages } = useChannelPaneMessages({ + activeChannel, + isHuddleTranscript, + messages, + profiles, + threadSummaries, + }); useRenderScopedReactionHydration({ activeChannel, mainTimelineEntries, @@ -585,9 +574,14 @@ export const ChannelPane = React.memo(function ChannelPane({ isSinglePanelView, useSplitAuxiliaryPane, }); + const timelineReplyHandler = + activeChannel?.archivedAt || isHuddleTranscript ? undefined : onOpenThread; return ( -
- {!isSinglePanelView ? ( +
+ {!isSinglePanelView && !isHuddleTranscript ? (