Skip to content

Move agent activity below composer#579

Merged
wesbillman merged 3 commits into
mainfrom
bot-activity
May 14, 2026
Merged

Move agent activity below composer#579
wesbillman merged 3 commits into
mainfrom
bot-activity

Conversation

@thomaspblock
Copy link
Copy Markdown
Collaborator

Summary

  • Move active agent activity out of the composer toolbar into the strip below the composer.
  • Add compact, aligned human and agent activity rows with shared grayscale spotlight text animation.
  • Reuse the existing agent activity popover and activity-thread selection while showing single-agent log headlines inline.

Test plan

  • cd desktop && pnpm run typecheck
  • Pre-commit/pre-push hooks passed during commit and push, including desktop check/build, Rust checks/tests, mobile check/test, and web check/build.

Made with Cursor

Co-authored-by: Cursor <cursoragent@cursor.com>
@thomaspblock thomaspblock requested a review from wesbillman as a code owner May 14, 2026 13:19
Copy link
Copy Markdown
Collaborator

🤖 Added follow-up fix in a95458d9b7c to keep bot activity clickable while agents are working/typing.

Summary:

  • Classifies managed agents, relay agents, and role: bot channel members as activity-capable.
  • Keeps human typing separate while preserving the clickable agent activity popup when any recognized bot is typing or working.
  • Keeps Stop/Interrupt limited to controllable managed agents.
  • Ignores stale/replayed typing indicators so old typing state does not mask the activity UI.

Verification:

  • Pre-commit and pre-push hooks passed, including desktop/web checks and builds, Rust fmt/clippy/unit tests, mobile analyze/tests, and Tauri check.
  • Existing warnings remained in web/src/features/repos/use-git-browse.ts for forbidden non-null assertions; they did not fail the hooks.

@wesbillman
Copy link
Copy Markdown
Collaborator

Screenshot 2026-05-14 at 9 05 47 AM Screenshot 2026-05-14 at 9 34 19 AM

Copy link
Copy Markdown
Collaborator

🤖 Pushed follow-up commit 4f3b4c65664 to address the typing/activity smoke failures.

What changed:

  • Scoped relay-agent matching to the channels the relay agent actually advertises, so a relay-agent pubkey is not treated as a bot in unrelated channels.
  • Restored a small recent backfill window for typing subscriptions while keeping timestamp-based stale filtering.
  • Tightened the E2E mock relay so tests can wait for the actual typing subscription and live events respect subscribed kinds.
  • Updated the smoke coverage: agent typing now asserts the clickable activity popup/sidebar path, while human typing order uses a non-agent channel.

Verification:

  • cd desktop && pnpm check passed.
  • Focused smoke cases passed: channels.spec.ts activity indicators + stable typing order.
  • pnpm test:e2e:smoke passed the updated typing/activity cases and ended at 89/91 locally; the two remaining failures were unrelated keyboard-shortcut openers.
  • Pre-push hooks passed, including desktop/web checks and builds, Rust fmt/clippy/unit tests, mobile analyze/tests, and Tauri check.

@wesbillman wesbillman merged commit aad564b into main May 14, 2026
15 checks passed
@wesbillman wesbillman deleted the bot-activity branch May 14, 2026 16:46
tlongwell-block added a commit that referenced this pull request May 14, 2026
Pulls in 8 commits from origin/main:
- 1858e98 fix(desktop): drive unread badges from live subscription, not refetched lastMessageAt (#581)
- 9e76a08 fix(desktop): refine header scaling and shadow (#573)
- b74ec95 fix(desktop): keep day dividers below header (#574)
- aad564b Move agent activity below composer (#579)
- bda98da docs(nips): NIP-AE — Agent Engrams (#575)
- 1b87a09 refactor: extract shared @mention resolver into sprout-sdk (#580)
- 2ee7356 fix: add default-run to sprout-relay so `cargo run -p sprout-relay` works (#577)
- f0549b5 feat(desktop): channel hover state and right-click mark-unread context menu (#578)

No conflicts.

* origin/main:
  fix(desktop): drive unread badges from live subscription, not refetched lastMessageAt (#581)
  fix(desktop): refine header scaling and shadow (#573)
  fix(desktop): keep day dividers below header (#574)
  Move agent activity below composer (#579)
  docs(nips): NIP-AE — Agent Engrams (#575)
  refactor: extract shared @mention resolver into sprout-sdk (#580)
  fix: add default-run to sprout-relay so `cargo run -p sprout-relay` works (#577)
  feat(desktop): channel hover state and right-click mark-unread context menu (#578)
tlongwell-block added a commit that referenced this pull request May 15, 2026
* origin/main: (33 commits)
  dev-mcp: add view_image tool (#602)
  fix(relay,desktop): only advertise NIP-43 when enforced; probe pairing by supported_nips (#601)
  fix(desktop): derive unread state from NIP-RS + relay catch-up only (#599)
  docs(testing): rewrite TESTING.md for current API and CLI-first workflow (#597)
  fix(agent): fix OpenAI-compat request body serialization and max_tokens (#595)
  feat(desktop): per-persona and per-agent env var overrides (#594)
  fix(desktop): stop pinning agents to deprecated SPROUT_ACP_TURN_TIMEOUT (#592)
  fix(desktop): populate member_count in get_channels so channel browser shows real counts (#548)
  fix(desktop): autofocus message composer on channel/thread open (#572)
  refactor(cli): restructure flat commands into 12 subcommand groups (#585)
  feat(sdk): add builder functions for workflows, DMs, and presence (#589)
  feat(desktop): add message more-actions dropdown menu (#590)
  fix(mobile): preserve channel list across background/resume reconnection (#588)
  Redesign Home as an inbox (#582)
  fix(desktop): drive unread badges from live subscription, not refetched lastMessageAt (#581)
  fix(desktop): refine header scaling and shadow (#573)
  fix(desktop): keep day dividers below header (#574)
  Move agent activity below composer (#579)
  docs(nips): NIP-AE — Agent Engrams (#575)
  refactor: extract shared @mention resolver into sprout-sdk (#580)
  ...

Signed-off-by: Tyler Longwell <tlongwell@squareup.com>
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.

2 participants