Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
cf0e226
test: cover non-blocking Codex feed permissions
lawrencecchen Jun 6, 2026
970950f
fix: keep Codex permission hooks non-blocking
lawrencecchen Jun 6, 2026
dc3f0c9
feat: bridge Codex app-server approvals to Feed
lawrencecchen Jun 6, 2026
d57d329
Validate Codex Teams launch cwd
lawrencecchen Jun 6, 2026
7ed2a21
Address Codex Teams approval review findings
lawrencecchen Jun 6, 2026
851b337
Align Feed TUI Codex permission modes
lawrencecchen Jun 6, 2026
da2eb3a
Handle unsupported Codex app-server requests
lawrencecchen Jun 6, 2026
f310df0
Close Codex watcher on unsupported requests
lawrencecchen Jun 6, 2026
b2ff9f4
Preserve persistent Codex file approvals
lawrencecchen Jun 6, 2026
f5f8d0e
Close Codex watcher on unresolved approvals
lawrencecchen Jun 6, 2026
01629cb
Honor Codex advertised approval decisions
lawrencecchen Jun 6, 2026
1bf0e8e
Bound Codex approval item cache
lawrencecchen Jun 6, 2026
79313b8
Convert Feed coordinator tests to Swift Testing
lawrencecchen Jun 6, 2026
6e7dcda
Ignore unsupported Codex watcher requests
lawrencecchen Jun 6, 2026
89b82c2
Share Codex approval bridge with tests
lawrencecchen Jun 8, 2026
7e75cfe
Merge remote-tracking branch 'origin/main' into feat-codex-permission…
lawrencecchen Jun 8, 2026
9c53e39
Serialize Feed coordinator tests
lawrencecchen Jun 8, 2026
bda5691
Gate Codex persistent approval modes per request
lawrencecchen Jun 8, 2026
3dedb11
Merge remote-tracking branch 'origin/main' into feat-codex-permission…
lawrencecchen Jun 8, 2026
4e1898a
Keep Codex approval scopes explicit
lawrencecchen Jun 8, 2026
97888a4
Avoid denial for unsupported Codex persistent replies
lawrencecchen Jun 8, 2026
f88ad19
Merge remote-tracking branch 'origin/main' into feat-codex-permission…
lawrencecchen Jun 8, 2026
bc0fcbb
Isolate Codex watcher approval waits
lawrencecchen Jun 8, 2026
cd49928
Gate Codex approval actions by capability
lawrencecchen Jun 8, 2026
1a6aa40
Treat file-change approvals as one-shot by default
lawrencecchen Jun 8, 2026
cf30c9e
Validate Codex notification approval actions
lawrencecchen Jun 8, 2026
73aa15c
Close Codex approval feed sockets
lawrencecchen Jun 8, 2026
7aab7f5
Harden Codex approval feed bridge
lawrencecchen Jun 8, 2026
8d2f296
Merge remote-tracking branch 'origin/main' into feat-codex-permission…
lawrencecchen Jun 8, 2026
5f63044
Merge remote-tracking branch 'origin/main' into feat-codex-permission…
lawrencecchen Jun 8, 2026
8863a42
Fix feed capability test encoder call
lawrencecchen Jun 8, 2026
524cbea
Keep Codex watcher approvals soft fallback
lawrencecchen Jun 8, 2026
c36c8bb
Answer Codex watcher approval fallbacks
lawrencecchen Jun 8, 2026
bb19d16
Keep Codex approval fallback native
lawrencecchen Jun 8, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CLI/CMUXCLI+AgentHookDefinitions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ extension CMUXCLI {

enum HookFormat {
case flat // Cursor: {"hooks": {"event": [{"command": "..."}]}, "version": 1}
case nested(timeoutMs: Int) // Codex/Gemini: nested with type/command/timeout
case nested(timeoutMs: Int) // Nested type/command/timeout hooks; timeout unit is agent-specific.
case kiroAgentJSON(timeoutMs: Int) // ~/.kiro/agents/*.json flat command entries with timeout_ms
case antigravityJSON(timeoutSeconds: Int) // ~/.gemini/config/hooks.json named hook groups
case rovoDevYAML
Expand Down Expand Up @@ -158,7 +158,7 @@ extension CMUXCLI {
name: "codex", displayName: "Codex", statusKey: "codex",
configDir: ".codex", configFile: "hooks.json", configDirEnvOverride: "CODEX_HOME",
sessionStoreSuffix: "codex", disableEnvVar: "CMUX_CODEX_HOOKS_DISABLED",
hookMarker: "cmux hooks codex", format: .nested(timeoutMs: 5000),
hookMarker: "cmux hooks codex", format: .nested(timeoutMs: 5),
events: [
.init(agentEvent: "SessionStart", cmuxSubcommand: "session-start"),
.init(agentEvent: "UserPromptSubmit", cmuxSubcommand: "prompt-submit"),
Expand Down
Loading
Loading