fix(email): allow move_to_label to restore inbox - #3267

Request changes

The single-message fix is right and matches what the issue asked for: asking the email agent to put a message back in the inbox now actually leaves it there instead of silently archiving it again, and non-inbox moves are untouched. Two things to sort out before merge.

The bulk version still has the original bug. The batch "move these messages to a label" tool always archives after labelling, so restoring three or more messages at once still adds the message to the inbox and takes it right back out — while reporting success. Since this PR advertises inbox restore in the tool description the model reads, the model will reach for the bulk tool the moment a user names more than a couple of messages, and land on exactly the silent no-op #2626 is about. Either apply the same guard there, or make the bulk tool refuse an inbox target and point at the single-message tool, and file the follow-up.

Missing changelog entry. Comparable email-agent fixes (the label-resolution and archive-verification fixes) each added an entry to the agent package's changelog, and the project rule is that a behavior change lands in the package's docs in the same change. This is a user-visible behavior change to a shipped tool with no entry.

Real-world evidence

N/A — no evidence bundle was produced for this run, so this verdict rests on static review plus reading the changed code and its tests. Worth noting the PR description shows unit tests and lint only, while the issue explicitly asked for a before/after label set on a real or fixture message demonstrating the restore. The change also edits a tool description the model sees, which the project treats as an LLM-affecting surface — prior email PRs either ran the agent eval or stated in the description why it wasn't warranted; this one does neither. A one-line note either way would close that out.

 def _move_op(backend, mid: str) -> str:
 resolved = _resolve_label_id(backend, label_id_local, label_cache)
 backend.add_label(mid, resolved)
 if resolved != _INBOX_LABEL:
 backend.archive_message(mid)
 return resolved

 if label_id != _INBOX_LABEL:

Implemented the batch follow-up in commit 3f68d283cf883f7ae9775f8d2e7a68fa0a7a62f9.

move_to_label_batch now uses the same INBOX guard as the single-message path: it adds INBOX without immediately archiving when restoring messages, while non-INBOX targets retain their existing archive behavior. Extended the #2626 regression coverage through the real batch tool boundary with three messages, and added the missing email package changelog entry.

Validation:

• .venv\\Scripts\\python.exe -m pytest hub/agents/email/python/tests/test_move_to_label_inbox_2626.py -q --basetemp pytest-tmp-3267-inbox — 3 passed
• .venv\\Scripts\\python.exe -m pytest hub/agents/email/python/tests/test_label_resolution_2428.py -q --basetemp pytest-tmp-3267-label — 9 passed
• .venv\\Scripts\\python.exe -m compileall -q hub/agents/email/python/gaia_agent_email/tools/organize_tools.py hub/agents/email/python/tests/test_move_to_label_inbox_2626.py — passed
• git diff --check — passed

The updated PR head is remotely verified and the new CI run is pending.

Follow-up for the CI failure: commit 72e74aa adds the missing minimal OrganizeToolsMixin test host and preserves the tool registry around registration. The batch regression now reaches the real move_to_label_batch closure and asserts all three messages retain INBOX with zero archive calls.

Validation:

• test_move_to_label_inbox_2626.py and test_label_resolution_2428.py: 12 passed
• git diff --check passed

The new GitHub Actions run is pending.

🟡 The changelog entry for this fix landed in four places instead of one — the correct [Unreleased] section and three already-released version sections. Entries in released sections falsify the history by implying the batch-inbox fix shipped before this PR.

Remove the three copies from the released version blocks; keep only the one in [Unreleased].