Context

Two open PRs (#9 and #15) fix overlapping bugs with different approaches. This PR consolidates the best of both, resolves their conflicts, and applies all 6 fixes not yet in main.

The one area of overlap — plans cleanup — was already merged via PR #6 using the subdirectory strategy (PR #9's cleaner approach). It is intentionally excluded here.

Changes

clawteam/team/mailbox.py

Bug 1 — broadcast sender exclusion broken (from PR #15)

broadcast() compared inbox directory names (e.g. alice_worker) against logical agent names (e.g. worker) in the exclude set. These never matched, so the sender always received their own broadcast.

Fix: resolve each logical name to its inbox directory name via TeamManager.resolve_inbox() before building the exclusion set.

Bug 2 — receive() / peek() crash on corrupted messages (from PR #9)

A single invalid JSON file in an inbox raised an exception that aborted the entire fetch, losing all subsequent valid messages (with consume=True, already-deleted messages were gone too).

Fix: extract a _parse_messages() helper that wraps each message in try/except, silently skipping corrupted entries.

clawteam/transport/file.py

Bug 3 — fetch(consume=True) has a race condition (from PR #15)

When two processes call fetch(consume=True) concurrently, both could read_bytes() the same file before either called unlink(), resulting in duplicate message delivery.

Fix: atomically rename() the file to .consumed before reading. Only one process can win the rename; others get OSError and skip the message.

clawteam/cli/commands.py

Bug 4 — config set/get only accept 3 of 7 valid keys (from PR #15)

Both commands hardcoded {"data_dir", "user", "default_team"}, making transport, workspace, default_backend, and skip_permissions impossible to set or get via CLI (even though config show displays all 7).

Fix: derive valid_keys dynamically from ClawTeamConfig.model_fields. Handle boolean fields (skip_permissions) with an explicit string→bool conversion.

Bug 5 — approve-join silently fabricates an agent name (from PR #9)

When no matching join request is found, team approve-join fabricated a name (agent-{id[:6]}) and proceeded to add a spurious team member.

Fix: return an error message and exit(1) when the join request cannot be found.

Bug 6 — launch does not pass skip_permissions to spawned agents (from PR #15)

clawteam spawn correctly reads skip_permissions from config and passes --dangerously-skip-permissions to Claude. clawteam launch did not, so agents spawned via templates always ran without the flag regardless of config.

Fix: read skip_permissions from config via get_effective() and forward it to be.spawn().

Relationship to PR #9 and PR #15

Fix This PR PR #9 PR #15
broadcast exclusion ✅ ❌ ✅
receive/peek crash ✅ ✅ ❌
file transport race ✅ ❌ ✅
config set/get keys ✅ ❌ ✅
approve-join fabrication ✅ ✅ ❌
launch skip_permissions ✅ ❌ ✅
plans cleanup already merged (PR #6) ✅ subdirectory ✅ member-filter
If this PR is merged, both #9 and #15 can be closed as superseded (or cherry-picked for anything missed).

Test plan

• All 135 existing tests pass (pytest tests/ -q)
• Manually verify broadcast does not deliver to sender
• Manually verify config set transport file and config set skip_permissions true work
• Manually verify team approve-join with an invalid request ID returns an error
• Manually verify clawteam launch hedge-fund respects skip_permissions config

🤖 Generated with Claude Code

Thanks for putting this together.

I didn’t merge this PR as-is because it no longer applies cleanly on top of current main, and part of it had already been fixed upstream. Instead, I manually absorbed the remaining high-value fixes into main in a
smaller, current-main-compatible form.

The fixes now in main include:

• config set/get supporting the full config surface, including boolean handling
• team approve-join erroring when the request ID does not exist
• mailbox receive/peek skipping corrupted messages instead of failing the whole batch
• broadcast exclude working correctly with namespaced inboxes
• file transport reducing duplicate-consumption risk when consume=True

Merged into main via:

• 791ce16 Fix CLI and mailbox edge cases from PR #16

Thanks again — this PR was useful and directly informed the fixes that are now in main.

Closing this PR since the relevant fixes have now been absorbed into main.