mirror of
https://github.com/block/buzz.git
synced 2026-11-02 23:41:08 +00:00
61d47b7671
Resolves 54 content conflicts against main at a61239f0. All
permission-card seams preserved exactly (#5106 reviewed behavior
intact); all incoming main changes incorporated.
High-risk resolutions:
crates/buzz-acp/src/acp.rs: additive — main's BUZZ_PI_ACP_NAME
(Pi adapter, #7552) placed before #5106's permission-policy
constants (PERMISSION_MAP_CAP, PERMISSION_OPTIONS_MAX,
PERMISSION_ASK_TIMEOUT_SECS, SENTINEL_PUBLISH_TIMEOUT_SECS,
RESOLVED_RETRANSMIT_BACKOFF, RESOLVED_DELIVERY_WINDOW_SECS).
No semantic interaction.
crates/buzz-acp/src/pool.rs: additive — #5106's
record_permission_decision/was_recently_decided methods inserted
before main's record_scope_owner, which grew a generation return
value and SessionOwner struct (#7340/#7337). #5106's callers are
independent of the owner-generation path. No semantic interaction.
desktop/src-tauri/src/commands/agents_deploy.rs: main's
effective_acp_session_policy(record, &personas) used for the
session_policy arg (better than HEAD's acp_session_policy(state));
#5106's Some(effective_policy) permission arg retained.
desktop/src/shared/api/managedAgentMapping.ts: main added
sessionPolicy to the inline fromRawManagedAgent in tauri.ts; HEAD
had already moved that function to managedAgentMapping.ts. Added
session_policy field to RawManagedAgent and sessionPolicy mapping
to fromRawManagedAgent in the canonical file.
desktop/src/features/messages/lib/formatTimelineMessages.ts:
main renamed truncatePubkey -> truncateNpub; HEAD added
isPermissionRequestSentinel import. Used main's truncateNpub +
kept HEAD's permissionRequest import.
Remaining 48 conflicts: mechanical additive field additions
(permission_policy: None + session_policy: Default::default())
from #5106 and main's #7578 persona-catalog sweep. All
resolved keep-both.
Co-authored-by: Will Pfleger <pfleger.will@gmail.com>
Signed-off-by: Will Pfleger <pfleger.will@gmail.com>