afjcjsbx be59133ce9 resolve conflicts

2026-03-22 20:58:46 +01:00

..

context_budget_test.go

merge: resolve conflicts between refactor/agent and main

2026-03-22 19:21:58 +08:00

context_budget.go

merge: resolve conflicts between refactor/agent and main

2026-03-22 19:21:58 +08:00

context_cache_test.go

merge: resolve conflicts between refactor/agent and main

2026-03-22 19:21:58 +08:00

context_test.go

fix deepseek-chat bug (#1066)

2026-03-06 16:04:31 +08:00

context.go

Merge branch 'main' into feat/skill-channel-commands

2026-03-22 20:51:16 +01:00

definition_test.go

merge: resolve conflicts between refactor/agent and main

2026-03-22 19:21:58 +08:00

definition.go

merge: resolve conflicts between refactor/agent and main

2026-03-22 19:21:58 +08:00

eventbus_test.go

merge: resolve conflicts between refactor/agent and main

2026-03-22 19:21:58 +08:00

eventbus.go

merge: resolve conflicts between refactor/agent and main

2026-03-22 19:21:58 +08:00

events.go

merge: resolve conflicts between refactor/agent and main

2026-03-22 19:21:58 +08:00

hook_mount_test.go

merge: resolve conflicts between refactor/agent and main

2026-03-22 19:21:58 +08:00

hook_mount.go

merge: resolve conflicts between refactor/agent and main

2026-03-22 19:21:58 +08:00

hook_process_test.go

merge: resolve conflicts between refactor/agent and main

2026-03-22 19:21:58 +08:00

hook_process.go

merge: resolve conflicts between refactor/agent and main

2026-03-22 19:21:58 +08:00

hooks_test.go

merge: resolve conflicts between refactor/agent and main

2026-03-22 19:21:58 +08:00

hooks.go

merge: resolve conflicts between refactor/agent and main

2026-03-22 19:21:58 +08:00

instance_test.go

Revert "feat(tools): add exec tool enhancement with background execution and …"

2026-03-22 00:39:47 +08:00

instance.go

merge: resolve conflicts between refactor/agent and main

2026-03-22 19:21:58 +08:00

loop_mcp_test.go

feat(mcp): per server deferred mode (#1654)

2026-03-19 17:03:17 +08:00

loop_mcp.go

feat(mcp): per server deferred mode (#1654)

2026-03-19 17:03:17 +08:00

loop_media.go

feat: expose local file paths for non-image media to enable agent file tools (#1516)

2026-03-14 12:09:11 +08:00

loop_test.go

Merge branch 'main' into feat/skill-channel-commands

2026-03-22 20:51:16 +01:00

loop.go

resolve conflicts

2026-03-22 20:58:46 +01:00

memory.go

…

mock_provider_test.go

…

model_resolution.go

fix(agent): rebind provider after /switch model to (#1769)

2026-03-19 21:44:01 +08:00

registry_test.go

…

registry.go

feat(session): integrate JSONL persistence into agent loop (#1170)

2026-03-10 15:14:09 +08:00

steering_test.go

merge: resolve conflicts between refactor/agent and main

2026-03-22 19:21:58 +08:00

steering.go

fix(agent): fix subturn panic result, hard abort rollback, and drain bus exit

2026-03-22 20:35:14 +08:00

subturn_test.go

merge: resolve conflicts between refactor/agent and main

2026-03-22 19:21:58 +08:00

subturn.go

fix(agent): fix subturn panic result, hard abort rollback, and drain bus exit

2026-03-22 20:35:14 +08:00

thinking_test.go

…

thinking.go

…

turn.go

merge: resolve conflicts between refactor/agent and main

2026-03-22 19:21:58 +08:00