Commit 03fa909
docs(iconography): complete Fluent + Material icon sets (20+20) (#560)
* chore: update heliosCLI → helios-cli in CLAUDE.md
* fix: resolve merge conflicts in codex-rs workspace
Resolved 187 files with uncommitted merge conflict markers across:
- codex-protocol (model types, approval types, execpolicy, network-proxy)
- codex-execpolicy (matches_for_command_with_options signature)
- codex-core (features/plugins modules, git_info_tests)
- codex-rmcp-client (OAuth launch_browser param, test imports)
- codex-state (runtime init, agent_jobs, migrations)
- codex-network-proxy (audit_endpoint_override param)
- app-server-protocol (common, v1, v2, thread_history)
Key fixes:
- protocol: models.rs — add `try_from = "MacOsAutomationPermissionDe"` to
MacOsAutomationPermission to enable array-based JSON deserialization
(143 tests passing, up from 140 with 3 failed)
- app-server-protocol: v1.rs — add missing imports (Uuid, ByteRange, TextElement,
EventMsg) and fix CoreByteRange → ByteRange
- execpolicy: remove stale `heuristics_fallback` param from 3 call sites
- core: lib.rs — keep Phenotype features module, resolve plugins conflict
- state: runtime.rs — add LOGS_MIGRATOR and STATE_MIGRATOR imports
Strategy: keep HEAD (Phenotype) for most conflicts; accept upstream additions
where they add new fields/parameters not in HEAD.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
* docs(iconography): complete Fluent + Material icon sets (20+20)
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---------
Co-authored-by: Codex <noreply@openai.com>
Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>1 parent 22ce02a commit 03fa909
20 files changed
Lines changed: 60 additions & 0 deletions
File tree
- docs/operations/iconography
- fluent
- material
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
0 commit comments