Repository navigation
fix(chat): open the model menu from /model and hide built-ins that duplicate AO controls #8549
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
rhithesh
wants to merge
4
commits into
OrchestratorInc:main
Choose a base branch
from
rhithesh:fix/chat-slash-model-and-builtins
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+560
−41
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
84a0349
fix(chat): open the model menu from /model and hide built-ins that du…
rhithesh b1f0c32
fix(chat): keep compaction for a hidden compact and clear the /model …
rhithesh 3f194fc
fix(chat): offer /model only with a usable model menu, never in a que…
rhithesh 5f2a483
Merge main into fix/chat-slash-model-and-builtins
rhithesh File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| package agyacp | ||
|
|
||
| import acpdriver "github.com/aoagents/agent-orchestrator/backend/internal/adapters/chatdriver/acp" | ||
|
|
||
| // hiddenCommands are Antigravity built-ins kept out of the `/` menu. | ||
| // | ||
| // agy_acp_server (agy before 1.5.4) advertises plan, logout and usage. `agy acp` | ||
| // in later CLIs lists its system commands and skills; its terminal-only commands | ||
| // are not known to reach ACP, but they are named here so they cannot appear. | ||
| // automation and generative_ui are documented as app-only. | ||
| var hiddenCommands = acpdriver.HideCommands( | ||
| "logout", "model", "effort", "rename", "resume", "config", "permissions", | ||
| "rewind", "automation", "generative_ui", | ||
| ) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
backend/internal/adapters/chatdriver/claudeacp/commands.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| package claudeacp | ||
|
|
||
| import acpdriver "github.com/aoagents/agent-orchestrator/backend/internal/adapters/chatdriver/acp" | ||
|
|
||
| // hiddenCommands are Claude Code built-ins kept out of the `/` menu. | ||
| // | ||
| // claude-agent-acp forwards the CLI's whole command list and strips only a few | ||
| // names, and Claude reports skills and built-ins together, so AO names the | ||
| // built-ins. Each of these changes a choice AO's own controls own, and AO's | ||
| // controls would not show the change: /model, /effort and /fast belong to the | ||
| // model menu (AO's /model opens it), and /auto-mode-setup to the approval mode. | ||
| // Sent as chat text, /model also only printed Claude's terminal usage. | ||
| var hiddenCommands = acpdriver.HideCommands("model", "effort", "fast", "auto-mode-setup") |
22 changes: 22 additions & 0 deletions
22
backend/internal/adapters/chatdriver/claudeacp/commands_test.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| package claudeacp | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| acpsdk "github.com/coder/acp-go-sdk" | ||
| ) | ||
|
|
||
| func TestHiddenCommandsKeepWhatWorksInChat(t *testing.T) { | ||
| // /model printed its terminal usage text and could switch the model behind | ||
| // AO's picker; these others do real work when sent as prompt text. | ||
| for name, hidden := range map[string]bool{ | ||
| "model": true, "effort": true, "fast": true, "auto-mode-setup": true, | ||
| "goal": false, "init": false, "security-review": false, "context": false, | ||
| "usage": false, "compact": false, "code-review": false, | ||
| "autocompact": false, "rename": false, "config": false, "advisor": false, | ||
| } { | ||
| if got := hiddenCommands(acpsdk.AvailableCommand{Name: name}); got != hidden { | ||
| t.Errorf("/%s hidden = %v, want %v", name, got, hidden) | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
backend/internal/adapters/chatdriver/copilotacp/commands.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| package copilotacp | ||
|
|
||
| import acpdriver "github.com/aoagents/agent-orchestrator/backend/internal/adapters/chatdriver/acp" | ||
|
|
||
| // hiddenCommands are Copilot CLI built-ins kept out of the `/` menu. | ||
| // | ||
| // Copilot runs a built-in before a same-named skill, so a name is enough. These | ||
| // change the model, the session name, the approval policy or the working | ||
| // directory, all of which AO controls. Read from @github/copilot 1.0.62, the | ||
| // last release that ships readable JavaScript. | ||
| var hiddenCommands = acpdriver.HideCommands( | ||
| "model", "rename", "allow-all", "reset-allowed-tools", "autopilot", "cwd", | ||
| ) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
backend/internal/adapters/chatdriver/cursoracp/commands.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| package cursoracp | ||
|
|
||
| import acpdriver "github.com/aoagents/agent-orchestrator/backend/internal/adapters/chatdriver/acp" | ||
|
|
||
| // hiddenCommands are Cursor CLI built-ins kept out of the `/` menu. | ||
| // | ||
| // Cursor's only advertised built-in copies a request id to the clipboard of the | ||
| // machine the agent runs on. Everything else in its list is a user, team or | ||
| // project command, or a skill. | ||
| var hiddenCommands = acpdriver.HideCommands("copy-request-id") |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| package grokacp | ||
|
|
||
| import acpdriver "github.com/aoagents/agent-orchestrator/backend/internal/adapters/chatdriver/acp" | ||
|
|
||
| // hiddenCommands are Grok CLI built-ins kept out of the `/` menu. | ||
| // | ||
| // always-approve changes the approval policy that AO's permission picker owns. | ||
| // Grok qualifies a skill whose name a built-in takes, so a name is enough. | ||
| var hiddenCommands = acpdriver.HideCommands("always-approve") |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
backend/internal/adapters/chatdriver/hermesacp/commands.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| package hermesacp | ||
|
|
||
| import acpdriver "github.com/aoagents/agent-orchestrator/backend/internal/adapters/chatdriver/acp" | ||
|
|
||
| // hiddenCommands are Hermes built-ins kept out of the `/` menu. | ||
| // | ||
| // /model and /title change what AO's model picker and thread name show. AO | ||
| // sends /steer itself, and /queue reorders the same mid-turn delivery. /undo | ||
| // and /retry rewind Hermes' history without AO's transcript following. /reset | ||
| // stays: AO handles it (see resetsConversation). /compress stays because it is | ||
| // Hermes' only compaction. | ||
| var hiddenCommands = acpdriver.HideCommands("model", "title", "steer", "queue", "undo", "retry") |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
backend/internal/adapters/chatdriver/kimchiacp/commands.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| package kimchiacp | ||
|
|
||
| import acpdriver "github.com/aoagents/agent-orchestrator/backend/internal/adapters/chatdriver/acp" | ||
|
|
||
| // hiddenCommands are Kimchi built-ins kept out of the `/` menu. | ||
| // | ||
| // /bug opens a browser on the agent's machine. /language writes a global | ||
| // setting and replies through a notification AO does not render, so it looks | ||
| // like nothing happened. Skills carry a `skill:` prefix and cannot collide. | ||
| var hiddenCommands = acpdriver.HideCommands("bug", "language") |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| package ompacp | ||
|
|
||
| import acpdriver "github.com/aoagents/agent-orchestrator/backend/internal/adapters/chatdriver/acp" | ||
|
|
||
| // hiddenCommands are oh-my-pi built-ins kept out of the `/` menu. | ||
| // | ||
| // OMP advertises only built-ins with a text handler and reserves their names | ||
| // before user commands, so a name is enough. These switch the model or effort | ||
| // AO's pickers show, rename the session, forget approvals, move the session's | ||
| // directory or worktree, open a dashboard on the agent's machine, or pin | ||
| // sessions in OMP's own resume list. | ||
| var hiddenCommands = acpdriver.HideCommands( | ||
| "model", "models", "switch", "effort", "modelpreset", "fast", "slow", | ||
| "extended-context", "rename", "forget-approvals", "move", "wt", "worktree", | ||
| "trace", "stats", "pin", "unpin", | ||
| ) |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.