mirror of
https://github.com/pocketpaw/pocketpaw.git
synced 2026-05-21 09:14:59 +00:00
Resolves 6 conflicts from the OSS-EE split landing on `ee` while `dev` advanced independently. All resolutions are unions of both sides: - agents/backend.py: AgentBackend protocol gains both ee's attach_specialist_tools and dev's get/set_tool_policy. - agents/codex_cli.py: keep ee's SDK abort-controller path; add dev's _policy init (drop dead _process — ee removed subprocess use). - agents/loop.py: _publish_pocket_event takes both metadata and trace_id; pocket_created builds the payload dict with cloud identity + trace_id; budget + titling methods both kept. - agents/router.py: keep both create_isolated_backend and scoped_tool_policy. - config.py: union pydantic imports (AliasChoices + field/model_validator + NoDecode). - security/guardian.py: keep ee's deferred-import rationale comment. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>