musi
|
062158a00a
|
Merge remote-tracking branch 'origin/main' into dev/extensions
# Conflicts:
# packages/cli/src/cli.ts
# packages/core/src/agents/codex/model-catalog.ts
# packages/core/src/config/config.ts
# packages/core/test/unit/agents/agent-console-launcher.test.mjs
# packages/core/test/unit/agents/plugin-permissions.test.mjs
# packages/core/test/unit/agents/plugin-stop-reason.test.mjs
# packages/core/test/unit/agents/socket-compat.test.mjs
# packages/electron/src/main/ipc.ts
# packages/ui/test/component/extensions.test.ts
# tests/main/codex-model-catalog.test.mjs
|
2026-07-21 12:43:12 +08:00 |
|