Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion backend/internal/adapters/chatdriver/acp/conversation.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,9 @@ type conversation struct {
configOptions []ports.ChatConfigOption
skills []ports.ChatSkill
skillsKnown bool
// compactAdvertised is whether the agent's own list, before HideCommand,
// named compact; start derives compaction from it, not from the shown skills.
compactAdvertised bool
closed bool
// sessionLost records that the agent stopped holding this conversation's
// session and the provider was stopped for it. See providerSessionLost.
Expand Down Expand Up @@ -211,6 +214,7 @@ type conversation struct {
sessionPromptResponseFailure func(string, acpsdk.PromptResponse, bool) error
hibernationCheck func(context.Context, *acpsdk.ClientSideConnection, acpsdk.SessionId) (bool, error)
historyNotice func(string) bool
hideCommand func(acpsdk.AvailableCommand) bool
// promptErrorFailure: see Config.PromptErrorFailure.
promptErrorFailure func(error, bool) error
// historyUserChunkIsMessage: see Config.HistoryUserChunkIsMessage.
Expand Down Expand Up @@ -417,7 +421,7 @@ func (c *conversation) start(
}
if c.skillsKnown {
c.capabilities[ports.ChatCapabilitySkills] = true
c.capabilities[ports.ChatCapabilityCompaction] = hasCompactSkill(c.skills)
c.capabilities[ports.ChatCapabilityCompaction] = c.compactAdvertised
}
c.modeFor = modeFor
c.optionsFor = optionsFor
Expand Down
10 changes: 10 additions & 0 deletions backend/internal/adapters/chatdriver/acp/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,15 @@ type Config struct {
// session (claude-agent-acp's task list), re-sent into later turns, rather
// than a plan for the turn it arrives in.
PlansSpanTurns bool
// HideCommand reports an advertised command that AO keeps out of the `/`
// menu. AO sends a picked command as ordinary prompt text, so a built-in
// that drives the agent's own terminal UI, or changes a setting AO has its
// own control for (Claude's `/model` switches the model behind AO's
// picker), misleads there. Agents report no command kind over ACP, so each
// binding names its own built-ins; see HideCommands. A hidden command still
// counts for capability checks such as compaction, and typing it by hand
// still sends it. Nil keeps every command.
HideCommand func(acpsdk.AvailableCommand) bool
// QuickStop marks a provider whose stop gains nothing from waiting (it never
// reacts to stdin closing): a short session/close wait, then a quick signal.
QuickStop bool
Expand Down Expand Up @@ -936,6 +945,7 @@ func (d *Driver) initialize(
conv.hibernationCheck = d.cfg.CanHibernate
conv.decodeConversationID = d.cfg.DecodeProviderConversationID
conv.historyNotice = d.cfg.HistoryNotice
conv.hideCommand = d.cfg.HideCommand
conv.historyUserChunkIsMessage = d.cfg.HistoryUserChunkIsMessage
conv.historyReconciler = d.cfg.HistoryReconciler
conv.plansSpanTurns = d.cfg.PlansSpanTurns
Expand Down
77 changes: 77 additions & 0 deletions backend/internal/adapters/chatdriver/acp/driver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6310,3 +6310,80 @@ func TestModelAliasAdmissionUsesTheBindingHarness(t *testing.T) {
})
}
}

func TestACPDriverHidesCommandsTheBindingNames(t *testing.T) {
agent := &fakeAgent{}
driver := New(Config{
Harness: domain.HarnessClaudeCode,
Capabilities: ports.ChatCapabilities{ports.ChatCapabilityStreaming: true},
Probe: func(context.Context) error { return nil },
Launch: func(context.Context, LaunchConfig) (Launch, error) { return Launch{Command: "fake"}, nil },
HideCommand: HideCommands("model", "compact"),
}, slog.New(slog.NewTextHandler(io.Discard, nil)))
driver.useTestProcess(fakeSpawn(agent))

conv, err := driver.Start(context.Background(), ports.ChatStartConfig{WorkspacePath: t.TempDir()})
if err != nil {
t.Fatalf("Start: %v", err)
}
defer conv.Close()

if err := agent.conn.SessionUpdate(context.Background(), acpsdk.SessionNotification{
SessionId: acpsdk.SessionId(conv.ProviderConversationID()),
Update: acpsdk.SessionUpdate{AvailableCommandsUpdate: &acpsdk.SessionAvailableCommandsUpdate{
AvailableCommands: []acpsdk.AvailableCommand{
{Name: "goal", Description: "Keep working until a condition is met"},
{Name: "model", Description: "Set the AI model"},
{Name: "compact", Description: "Summarize the conversation"},
},
}},
}); err != nil {
t.Fatalf("SessionUpdate: %v", err)
}

skills := awaitSkillCount(t, conv.(ports.ChatSkillLister), 1)
if skills[0].Name != "goal" {
t.Fatalf("skills = %#v, want only goal", skills)
}
// Hiding is presentation only: the agent's compaction stays usable.
if !conv.Capabilities().Has(ports.ChatCapabilityCompaction) {
t.Fatal("hiding compact from the menu also disabled compaction")
}
}

// Commands can arrive during session/new, before start() derives compaction.
// Hiding compact from the menu must not turn compaction off on that path either.
func TestACPEarlyHiddenCompactKeepsCompactionInStart(t *testing.T) {
agent := &fakeAgent{
newSessionUpdates: []acpsdk.SessionUpdate{{
AvailableCommandsUpdate: &acpsdk.SessionAvailableCommandsUpdate{
AvailableCommands: []acpsdk.AvailableCommand{
{Name: "compact", Description: "Compact history"},
{Name: "goal", Description: "Keep working until a condition is met"},
},
},
}},
}
driver := New(Config{
Harness: domain.HarnessClaudeCode,
Capabilities: ports.ChatCapabilities{ports.ChatCapabilityStreaming: true},
Probe: func(context.Context) error { return nil },
Launch: func(context.Context, LaunchConfig) (Launch, error) { return Launch{Command: "fake"}, nil },
HideCommand: HideCommands("compact"),
}, slog.New(slog.NewTextHandler(io.Discard, nil)))
driver.useTestProcess(fakeSpawn(agent))

opened, err := driver.Start(context.Background(), ports.ChatStartConfig{WorkspacePath: t.TempDir()})
if err != nil {
t.Fatalf("Start: %v", err)
}
defer opened.Close()

if !opened.Capabilities().Has(ports.ChatCapabilityCompaction) {
t.Fatal("a compact hidden from the menu before start() disabled compaction")
}
skills := awaitSkillCount(t, opened.(ports.ChatSkillLister), 1)
if skills[0].Name != "goal" {
t.Fatalf("skills = %#v, want only goal", skills)
}
}
32 changes: 23 additions & 9 deletions backend/internal/adapters/chatdriver/acp/skills.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ func (c *conversation) replaceAvailableCommands(commands []acpsdk.AvailableComma
if command.Name == "compact" {
hasCompact = true
}
// Hiding is presentation only, so it runs after the capability checks:
// an agent's compaction still works when its command stays off the menu.
if c.hideCommand != nil && c.hideCommand(command) {
continue
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
}
inputHint := ""
if command.Input != nil && command.Input.Unstructured != nil {
inputHint = command.Input.Unstructured.Hint
Expand All @@ -49,22 +54,31 @@ func (c *conversation) replaceAvailableCommands(commands []acpsdk.AvailableComma
c.mu.Lock()
c.skills = skills
c.skillsKnown = true
c.compactAdvertised = hasCompact
if c.capabilities != nil {
c.capabilities[ports.ChatCapabilitySkills] = true
c.capabilities[ports.ChatCapabilityCompaction] = hasCompact
}
c.mu.Unlock()
}

func cloneSkills(skills []ports.ChatSkill) []ports.ChatSkill {
return append([]ports.ChatSkill(nil), skills...)
// HideCommands returns a Config.HideCommand that hides the named built-ins.
//
// Matching is by name because ACP carries no command kind. That is safe only for
// an agent whose built-ins win over a same-named user command (the user's copy
// is unreachable anyway). An agent that lets a user command replace a built-in
// needs a HideCommand that also checks the agent's own provenance metadata.
func HideCommands(names ...string) func(acpsdk.AvailableCommand) bool {
hidden := make(map[string]struct{}, len(names))
for _, name := range names {
hidden[name] = struct{}{}
}
return func(command acpsdk.AvailableCommand) bool {
_, ok := hidden[command.Name]
return ok
}
}

func hasCompactSkill(skills []ports.ChatSkill) bool {
for _, skill := range skills {
if skill.Name == "compact" {
return true
}
}
return false
func cloneSkills(skills []ports.ChatSkill) []ports.ChatSkill {
return append([]ports.ChatSkill(nil), skills...)
}
14 changes: 14 additions & 0 deletions backend/internal/adapters/chatdriver/agyacp/commands.go
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",
)
3 changes: 2 additions & 1 deletion backend/internal/adapters/chatdriver/agyacp/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ func New(plugin Plugin, log *slog.Logger) ports.ChatDriver {

func buildConfig(plugin Plugin, resolve resolver, log *slog.Logger) acpdriver.Config {
return acpdriver.Config{
Harness: domain.HarnessAgy,
Harness: domain.HarnessAgy,
HideCommand: hiddenCommands,
Capabilities: ports.ChatCapabilities{
ports.ChatCapabilityStreaming: true,
ports.ChatCapabilityTools: true,
Expand Down
13 changes: 13 additions & 0 deletions backend/internal/adapters/chatdriver/claudeacp/commands.go
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 backend/internal/adapters/chatdriver/claudeacp/commands_test.go
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)
}
}
}
3 changes: 2 additions & 1 deletion backend/internal/adapters/chatdriver/claudeacp/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ type claudeLaunchAuthenticator interface {
// both Chat and TUI modes.
func New(plugin claudePlugin, log *slog.Logger, onAuthRejected func()) ports.ChatDriver {
return &checkpointDriver{plugin: plugin, ChatDriver: acpdriver.New(acpdriver.Config{
Harness: domain.HarnessClaudeCode,
Harness: domain.HarnessClaudeCode,
HideCommand: hiddenCommands,
// A live rejection is the ground truth that outranks any cached
// verdict, so drop the cache the moment one arrives. This is also the
// only auth correction that works for credential sources AO cannot
Expand Down
13 changes: 13 additions & 0 deletions backend/internal/adapters/chatdriver/copilotacp/commands.go
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",
)
3 changes: 2 additions & 1 deletion backend/internal/adapters/chatdriver/copilotacp/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ func New(plugin Plugin, log *slog.Logger) ports.ChatDriver {

func config(plugin Plugin) nativeacp.Config {
return nativeacp.Config{
Harness: domain.HarnessCopilot,
Harness: domain.HarnessCopilot,
HideCommand: hiddenCommands,
Capabilities: ports.ChatCapabilities{
// Copilot reports token usage on every prompt response.
ports.ChatCapabilityUsage: true,
Expand Down
10 changes: 10 additions & 0 deletions backend/internal/adapters/chatdriver/cursoracp/commands.go
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")
1 change: 1 addition & 0 deletions backend/internal/adapters/chatdriver/cursoracp/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
func New(plugin nativeacp.Plugin, log *slog.Logger) ports.ChatDriver {
return nativeacp.New(plugin, nativeacp.Config{
Harness: domain.HarnessCursor,
HideCommand: hiddenCommands,
Configure: configure,
SessionOptions: sessionOptions,
SessionPreamble: sessionPreamble,
Expand Down
9 changes: 9 additions & 0 deletions backend/internal/adapters/chatdriver/grokacp/commands.go
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")
3 changes: 2 additions & 1 deletion backend/internal/adapters/chatdriver/grokacp/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ import (
// ownership of its cached login, model catalog, and native session history.
func New(plugin nativeacp.Plugin, log *slog.Logger) ports.ChatDriver {
return nativeacp.New(plugin, nativeacp.Config{
Harness: domain.HarnessGrok,
Harness: domain.HarnessGrok,
HideCommand: hiddenCommands,
Capabilities: ports.ChatCapabilities{
ports.ChatCapabilityHistory: true,
},
Expand Down
12 changes: 12 additions & 0 deletions backend/internal/adapters/chatdriver/hermesacp/commands.go
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")
3 changes: 2 additions & 1 deletion backend/internal/adapters/chatdriver/hermesacp/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ func New(plugin nativeacp.Plugin, log *slog.Logger) ports.ChatDriver {

func newDriver(plugin nativeacp.Plugin, probe nativeacp.VersionProbe, log *slog.Logger) ports.ChatDriver {
return nativeacp.New(plugin, nativeacp.Config{
Harness: domain.HarnessHermes,
Harness: domain.HarnessHermes,
HideCommand: hiddenCommands,
Capabilities: ports.ChatCapabilities{
ports.ChatCapabilityDiffs: true,
},
Expand Down
10 changes: 10 additions & 0 deletions backend/internal/adapters/chatdriver/kimchiacp/commands.go
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")
1 change: 1 addition & 0 deletions backend/internal/adapters/chatdriver/kimchiacp/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
func New(plugin nativeacp.Plugin, log *slog.Logger) ports.ChatDriver {
return nativeacp.New(plugin, nativeacp.Config{
Harness: domain.HarnessKimchi,
HideCommand: hiddenCommands,
Configure: configure,
SessionOptions: sessionOptions,
SteerRequest: steerRequest,
Expand Down
3 changes: 3 additions & 0 deletions backend/internal/adapters/chatdriver/nativeacp/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ type Config struct {
ValidateEnvironment func(context.Context, map[string]string) error
// QuickStop: see acpdriver.Config.QuickStop.
QuickStop bool
// HideCommand: see acpdriver.Config.HideCommand.
HideCommand func(acpsdk.AvailableCommand) bool
}

// New creates a Chat driver that launches the exact executable resolved by the
Expand Down Expand Up @@ -205,5 +207,6 @@ func buildConfig(plugin Plugin, cfg Config, log *slog.Logger) acpdriver.Config {
EncodeProviderConversationID: cfg.EncodeProviderConversationID,
DecodeProviderConversationID: cfg.DecodeProviderConversationID,
QuickStop: cfg.QuickStop,
HideCommand: cfg.HideCommand,
}
}
16 changes: 16 additions & 0 deletions backend/internal/adapters/chatdriver/ompacp/commands.go
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",
)
Loading
Loading