Skip to content

upstream(sync): huddle agent prompt — spoken pickup rules (#5863) - #299

Merged
oscarlehuu merged 1 commit into
mainfrom
devin/issue-276-huddle-spoken-pickup
Aug 23, 2026
Merged

oscarlehuu merged 1 commit into
mainfrom
devin/issue-276-huddle-spoken-pickup

Conversation

@devin-ai-integration

@devin-ai-integration devin-ai-integration Bot commented Aug 22, 2026 •

Copy link
Copy Markdown

Summary

Ports upstream block#5863 ("Clarify immediate spoken huddle replies") into the Crew fork as part of the 0.5.18 sync stack (#285): the huddle voice_mode_guidelines prompt now pins the spoken-pickup invariants —

  • only buzz messages send to the huddle channel is spoken aloud; everything else is silent
  • when addressed, the FIRST tool call must be a brief spoken reply, before any file read/search/other tool
  • the no-bare-acknowledgment rule is explicitly overridden for the voice pickup
  • follow-up speech is bounded (sentence-at-a-time, "a few sentences per answer, not a monologue")

After this port, desktop/src-tauri/src/huddle/agents.rs is byte-identical to upstream desktop-v0.5.18 (verified with git diff desktop-v0.5.18 -- <file> → empty).

Divergence from the issue's plan (deliberate): issue #276's conflict matrix targets crates/buzz-acp/src/base_prompt.md + buzz-acp prompt tests, but upstream block#5863 does not touch base_prompt.md at all — its whole diff is voice_mode_guidelines() (prompt string + doc comment + invariant test) in desktop/src-tauri/src/huddle/agents.rs. This PR ports that actual upstream diff. Notes:

Related issue

Fixes #276 (part of meta #285; upstream PR block#5863)

Testing

TDD, RED → GREEN (full logs attached to the session):

  • RED: added upstream's voice_mode_guidelines_pin_spoken_reply_as_first_tool_call test first — failed on old prompt (left: 18, right: 6 line count).
  • GREEN: after porting the prompt, cargo test --manifest-path desktop/src-tauri/Cargo.toml --lib huddle::agents::tests → 2 passed / 0 failed.

Gates run locally (all on this branch):

Gate Result
pnpm --filter buzz check pass
pnpm --filter buzz typecheck pass
pnpm --filter buzz test 5528 passed / 0 failed (1 skipped)
just test-unit fails only in buzz-cli (3: command-inventory-stability) and buzz-db (1: migration count) — verified identical failures on main, pre-existing and unrelated to this diff; all other suites pass
cargo test -p buzz-acp --lib 1023 passed / 0 failed (incl. new no-bare-ack guard)
cargo test --manifest-path desktop/src-tauri/Cargo.toml --lib 2694 passed / 0 failed
just check-compile pass

No UI-visible change (Rust prompt string consumed by agents), so evidence is terminal logs rather than screenshots.

NOTES (handover)

DONE

  • Full implementation of issue upstream(sync): Huddle agent prompt — spoken pickup rules (#5863) #276: ported upstream Clarify immediate spoken huddle replies block/buzz#5863 — voice_mode_guidelines() prompt + doc comment + invariant test in desktop/src-tauri/src/huddle/agents.rs; file is byte-identical to upstream desktop-v0.5.18.
  • Regression guard added: shared_base_prompt_keeps_text_channel_no_bare_acknowledgement_rule in crates/buzz-acp/src/lib.rs (text-channel no-bare-ack rule stays intact; base_prompt.md untouched — deliberate divergence from the issue plan, see Summary above).
  • TDD RED→GREEN shown (RED: line-count 18 vs 6; GREEN: 2 passed).
  • Gates run + results: pnpm --filter buzz check/typecheck pass; pnpm --filter buzz test 5528 passed; cargo test -p buzz-acp --lib 1023 passed; tauri lib 2694 passed; just check-compile pass; just test-unit fails only in buzz-cli (3) + buzz-db (1), verified identical on main (pre-existing).
  • Evidence: 12 terminal logs (RED/GREEN/gates/main-baseline/CI-triage) attached to the Devin session; full-window app screenshot embedded in the PR comment above. Non-UI Rust change, so evidence is logs.
  • Testing-agent desktop E2E regression: 1043/1112 smoke tests passed; all investigated failures reproduced on an origin/main control run (pre-existing). All 30 huddle-transcription tests + channels huddle header tests passed.
  • Branch is pushed and up to date with main (parent's merge commit 372077b fast-forwarded locally).

IN PROGRESS

  • Nothing half-done in this PR; the two-file diff is complete and green locally.
  • Uncommitted on the session machine only (intentionally excluded from this PR): .agents/skills/desktop-e2e-observation/SKILL.md update (delivered as a separate skill-PR suggestion in the requester's timeline) and a non-functional test-plan scratch file.

TODO / NEXT

  • Merge is owned by the parent session. CI on this branch was cancelled/serialized deliberately by the parent (org runner saturation) — the ❌ NuncioCrew Gate / skipped E2E jobs from cancelled runs are expected, not a failure of this change. Earlier real E2E failures (Smoke E2E (2), Integration (2/2)) were triaged as pre-existing on base — identical specs fail on unrelated sibling run 32559285507. Do NOT fix CI config.
  • Known risk: none specific to this diff; merge conflicts unlikely (only huddle/agents.rs + buzz-acp/lib.rs; sibling issues touch other areas — upstream(sync): Huddle perf — CPU churn, TTS latency, speech boundaries (#5825, #5671, #6397) #275 perf machinery is the nearest neighbor but doesn't overlap this file's delta).
  • Optional follow-up: file an issue for the pre-existing smoke-suite failure debt on main (whole project-pr-review suite broken; channel-mute opacity assertion 0.5 vs 0.45).

Link to Devin session: https://app.devin.ai/sessions/4b0883acec13436cbc057908d8e3111b
Requested by: @oscarlehuu

@devin-ai-integration

Copy link
Copy Markdown
Author

🤖 Devin AI Engineer

I'll be helping with this pull request! Here's what you should know:

✅ I will automatically:

  • Address comments on this PR. Add '(aside)' to your comment to have me ignore it.
  • Look at CI failures and help fix them

Note: I can only respond to comments from users who have write access to this repository.

⚙️ Control Options:

  • Disable automatic comment, CI, and merge conflict monitoring

@devin-ai-integration

Copy link
Copy Markdown
Author

CI failure triage + desktop E2E regression pass (Devin)

CI triage — the failing E2E jobs are pre-existing on the shared base, not from this PR.
This diff touches only Rust (desktop/src-tauri/src/huddle/agents.rs, crates/buzz-acp/src/lib.rs); no frontend/Playwright files changed, so the built dist/ under test is identical to main.

  • Desktop Smoke E2E (2) (job 96999037765): 4 failed / 1 flaky / 268 passed — edit-agent.spec.ts:288, entity-link-recipient-cards.spec.ts:20, image-attachment-gallery.spec.ts:259, inbox-reactions.spec.ts:36.
  • Desktop E2E Integration (2/2) (job 96999037802): 3 failed / 80 passed — profile.spec.ts:1647, profile.spec.ts:1697, profile.spec.ts:1840.
  • Baseline evidence: the unrelated sibling PR run 32559285507 (branch devin/issue-283-acp-prompt-compose, completely different diff, same base) fails the identical specs in both jobs. All current 0.5.18-sync sibling runs fail the same Smoke/Integration jobs; the latest main CI runs were cancelled, so no green main baseline exists for them.

Local desktop E2E regression pass (headless, E2E mock bridge)

  • Build (pnpm --filter buzz build:e2e): ✅
  • Full Playwright smoke project: 1043 passed / 62 failed / 7 skipped (~1h, 1 worker) — every investigated failure is pre-existing on main: a control run of the failing specs on a fresh origin/main worktree reproduced the identical failures (all 23 project-pr-review tests time out in openBuzzProject; channel-mute.spec.ts:74 expects opacity 0.5 vs rendered 0.45; huddle-transcription:779 was a load flake that passes serially). ~38 further scattered failures were not individually control-run, but no frontend code changed in this PR so they cannot be caused by it — the smoke suite's failure debt deserves a separate cleanup issue.
  • Huddle-adjacent UI: all 30 huddle-transcription.spec.ts tests ✅ (serial run), plus channels.spec.ts huddle header trigger/tooltip/rollback tests ✅.
  • Live voice huddle / spoken-pickup runtime behavior: untested (no audio pipeline in the test env); the kind:48106 prompt content is covered by this PR's tauri unit tests.

App rendered on this branch (E2E mock bridge), huddle trigger visible in the channel header:

NuncioCrew desktop on PR branch — #random channel with huddle header control

@devin-ai-integration

Copy link
Copy Markdown
Author

NOTES (handover)

DONE

  • Full implementation of issue upstream(sync): Huddle agent prompt — spoken pickup rules (#5863) #276: ported upstream Clarify immediate spoken huddle replies block/buzz#5863 — voice_mode_guidelines() prompt + doc comment + invariant test in desktop/src-tauri/src/huddle/agents.rs; file is byte-identical to upstream desktop-v0.5.18.
  • Regression guard added: shared_base_prompt_keeps_text_channel_no_bare_acknowledgement_rule in crates/buzz-acp/src/lib.rs (text-channel no-bare-ack rule stays intact; base_prompt.md untouched — deliberate divergence from the issue plan, see Summary above).
  • TDD RED→GREEN shown (RED: line-count 18 vs 6; GREEN: 2 passed).
  • Gates run + results: pnpm --filter buzz check/typecheck pass; pnpm --filter buzz test 5528 passed; cargo test -p buzz-acp --lib 1023 passed; tauri lib 2694 passed; just check-compile pass; just test-unit fails only in buzz-cli (3) + buzz-db (1), verified identical on main (pre-existing).
  • Evidence: 12 terminal logs (RED/GREEN/gates/main-baseline/CI-triage) attached to the Devin session; full-window app screenshot embedded in the PR comment above. Non-UI Rust change, so evidence is logs.
  • Testing-agent desktop E2E regression: 1043/1112 smoke tests passed; all investigated failures reproduced on an origin/main control run (pre-existing). All 30 huddle-transcription tests + channels huddle header tests passed.
  • Branch is pushed and up to date with main (parent's merge commit 372077b fast-forwarded locally).

IN PROGRESS

  • Nothing half-done in this PR; the two-file diff is complete and green locally.
  • Uncommitted on the session machine only (intentionally excluded from this PR): .agents/skills/desktop-e2e-observation/SKILL.md update (delivered as a separate skill-PR suggestion in the requester's timeline) and a non-functional test-plan scratch file.

TODO / NEXT

  • Merge is owned by the parent session. CI on this branch was cancelled/serialized deliberately by the parent (org runner saturation) — the ❌ NuncioCrew Gate / skipped E2E jobs from cancelled runs are expected, not a failure of this change. Earlier real E2E failures (Smoke E2E (2), Integration (2/2)) were triaged as pre-existing on base — identical specs fail on unrelated sibling run 32559285507. Do NOT fix CI config.
  • Known risk: none specific to this diff; merge conflicts unlikely (only huddle/agents.rs + buzz-acp/lib.rs; sibling issues touch other areas — upstream(sync): Huddle perf — CPU churn, TTS latency, speech boundaries (#5825, #5671, #6397) #275 perf machinery is the nearest neighbor but doesn't overlap this file's delta).
  • Optional follow-up: file an issue for the pre-existing smoke-suite failure debt on main (whole project-pr-review suite broken; channel-mute opacity assertion 0.5 vs 0.45).

Port block#5863 (via block#5671 prompt base) into voice_mode_guidelines:
only buzz messages send is spoken, spoken pickup must be the FIRST tool
call, no-bare-ack rule explicitly overridden for huddles, follow-up
speech bounded. Pin the invariants in the desktop prompt test and add a
buzz-acp guard that the text-channel no-bare-ack rule stays intact.

Fixes #276

Signed-off-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-Authored-By: Oscar Le <[email protected]>
@cursor
cursor Bot force-pushed the devin/issue-276-huddle-spoken-pickup branch from 372077b to 30e17b1 Compare August 23, 2026 03:59
@oscarlehuu
oscarlehuu merged commit 5ef2d1d into main Aug 23, 2026
8 of 14 checks passed
@oscarlehuu
oscarlehuu deleted the devin/issue-276-huddle-spoken-pickup branch August 23, 2026 04:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

upstream(sync): Huddle agent prompt — spoken pickup rules (#5863)

1 participant