Commit b6b36d7
Merge main into codex/agents-plugin
Re-integrate the agent-adapter layer onto main's rewritten session lane.
main (#62/#66/#67/#68/#69) moved the session manager into session_manager
plus a service layer, reworked the domain (Activity, IsTerminated), and
removed the tmux runtime. This merge:
- Keeps the rich, hooks-capable ports.Agent (in internal/ports) as the
canonical agent contract; session_manager.Manager now resolves a real
adapter per session via ports.AgentResolver (from cfg.Harness on Spawn,
the stored harness on Restore) and builds RuntimeConfig.Argv.
- Drops the tmux runtime; standardizes on zellij.
- Re-adds the daemon's per-session agent resolver wiring
(buildAgentResolver over the claude-code + codex registry, AO_AGENT
default), ready to plug into the httpd session-route slot.
go build, go vet, and go test -race are green; the zellij/tmux real
integration tests are environment-gated.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>180 files changed
Lines changed: 8183 additions & 9194 deletions
File tree
- backend
- cmd/genspec
- internal
- adapters
- runtime
- tmux
- zellij
- scm/github
- tracker/github
- workspace/gitworktree
- cdc
- cli
- config
- daemon
- domain
- decide
- httpd
- apispec
- specgen
- controllers
- integration
- lifecycle
- notification
- observe/reaper
- ports
- processalive
- project
- runfile
- service
- project
- pr
- session
- session_manager
- storage/sqlite
- gen
- migrations
- queries
- store
- terminal
- docs
- cli
- test/cli
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
31 | 34 | | |
32 | 35 | | |
33 | 36 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
| 7 | + | |
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
34 | | - | |
35 | | - | |
| 34 | + | |
| 35 | + | |
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
| |||
47 | 47 | | |
48 | 48 | | |
49 | 49 | | |
| 50 | + | |
50 | 51 | | |
51 | 52 | | |
52 | 53 | | |
53 | 54 | | |
54 | | - | |
55 | | - | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
56 | 58 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| 11 | + | |
| 12 | + | |
11 | 13 | | |
12 | 14 | | |
13 | 15 | | |
| |||
23 | 25 | | |
24 | 26 | | |
25 | 27 | | |
| 28 | + | |
26 | 29 | | |
27 | 30 | | |
| 31 | + | |
28 | 32 | | |
29 | 33 | | |
30 | 34 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
1 | 5 | | |
2 | 6 | | |
3 | 7 | | |
| |||
15 | 19 | | |
16 | 20 | | |
17 | 21 | | |
| 22 | + | |
| 23 | + | |
18 | 24 | | |
19 | 25 | | |
20 | 26 | | |
| |||
30 | 36 | | |
31 | 37 | | |
32 | 38 | | |
| 39 | + | |
| 40 | + | |
33 | 41 | | |
34 | 42 | | |
35 | 43 | | |
| |||
38 | 46 | | |
39 | 47 | | |
40 | 48 | | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
41 | 61 | | |
42 | 62 | | |
43 | 63 | | |
| |||
50 | 70 | | |
51 | 71 | | |
52 | 72 | | |
| 73 | + | |
| 74 | + | |
53 | 75 | | |
54 | 76 | | |
55 | 77 | | |
| |||
This file was deleted.
0 commit comments