-
Notifications
You must be signed in to change notification settings - Fork 104
feat: add experimental ACP mode (--experimental-acp) #186
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
Draft
johnstcn
wants to merge
2
commits into
cj/refactor/event-emitter
Choose a base branch
from
cj/exp/acp
base: cj/refactor/event-emitter
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.
Draft
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -129,7 +129,42 @@ func WriteRawInputOverHTTP(ctx context.Context, url string, msg string) error { | |
| return nil | ||
| } | ||
|
|
||
| // statusResponse is used to parse the /status endpoint response. | ||
| type statusResponse struct { | ||
| Status string `json:"status"` | ||
| AgentType string `json:"agent_type"` | ||
| ACPMode bool `json:"acp_mode"` | ||
| } | ||
|
|
||
| func checkACPMode(remoteUrl string) error { | ||
| resp, err := http.Get(remoteUrl + "/status") | ||
| if err != nil { | ||
| return xerrors.Errorf("failed to check server status: %w", err) | ||
| } | ||
| defer func() { _ = resp.Body.Close() }() | ||
|
|
||
| if resp.StatusCode != http.StatusOK { | ||
| return xerrors.Errorf("unexpected %d response from server: %s", resp.StatusCode, resp.Status) | ||
| } | ||
|
|
||
| var status statusResponse | ||
| if err := json.NewDecoder(resp.Body).Decode(&status); err != nil { | ||
| return xerrors.Errorf("failed to decode server status: %w", err) | ||
| } | ||
|
|
||
| if status.ACPMode { | ||
| return xerrors.New("attach is not supported in ACP mode. The server is running with --experimental-acp which uses JSON-RPC instead of terminal emulation.") | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. review: It should be eventually supported but I'm not sure what form it should take yet. |
||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func runAttach(remoteUrl string) error { | ||
| // Check if server is running in ACP mode (attach not supported) | ||
| if err := checkACPMode(remoteUrl); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| ctx, cancel := context.WithCancel(context.Background()) | ||
| defer cancel() | ||
| stdin := int(os.Stdin.Fd()) | ||
|
|
||
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,145 @@ | ||
| //go:build ignore | ||
|
|
||
| package main | ||
|
|
||
| import ( | ||
| "context" | ||
| "encoding/json" | ||
| "fmt" | ||
| "os" | ||
| "os/signal" | ||
| "strings" | ||
|
|
||
| acp "github.com/coder/acp-go-sdk" | ||
| ) | ||
|
|
||
| // ScriptEntry defines a single entry in the test script. | ||
| type ScriptEntry struct { | ||
| ExpectMessage string `json:"expectMessage"` | ||
| ThinkDurationMS int64 `json:"thinkDurationMS"` | ||
| ResponseMessage string `json:"responseMessage"` | ||
| } | ||
|
|
||
| // acpEchoAgent implements the ACP Agent interface for testing. | ||
| type acpEchoAgent struct { | ||
| script []ScriptEntry | ||
| scriptIndex int | ||
| conn *acp.AgentSideConnection | ||
| sessionID acp.SessionId | ||
| } | ||
|
|
||
| var _ acp.Agent = (*acpEchoAgent)(nil) | ||
|
|
||
| func main() { | ||
| if len(os.Args) != 2 { | ||
| fmt.Fprintln(os.Stderr, "Usage: acp_echo <script.json>") | ||
| os.Exit(1) | ||
| } | ||
|
|
||
| script, err := loadScript(os.Args[1]) | ||
| if err != nil { | ||
| fmt.Fprintf(os.Stderr, "Error loading script: %v\n", err) | ||
| os.Exit(1) | ||
| } | ||
|
|
||
| if len(script) == 0 { | ||
| fmt.Fprintln(os.Stderr, "Script is empty") | ||
| os.Exit(1) | ||
| } | ||
|
|
||
| sigCh := make(chan os.Signal, 1) | ||
| signal.Notify(sigCh, os.Interrupt) | ||
| go func() { | ||
| <-sigCh | ||
| os.Exit(0) | ||
| }() | ||
|
|
||
| agent := &acpEchoAgent{ | ||
| script: script, | ||
| } | ||
|
|
||
| conn := acp.NewAgentSideConnection(agent, os.Stdout, os.Stdin) | ||
| agent.conn = conn | ||
|
|
||
| <-conn.Done() | ||
| } | ||
|
|
||
| func (a *acpEchoAgent) Initialize(_ context.Context, _ acp.InitializeRequest) (acp.InitializeResponse, error) { | ||
| return acp.InitializeResponse{ | ||
| ProtocolVersion: acp.ProtocolVersionNumber, | ||
| AgentCapabilities: acp.AgentCapabilities{}, | ||
| }, nil | ||
| } | ||
|
|
||
| func (a *acpEchoAgent) Authenticate(_ context.Context, _ acp.AuthenticateRequest) (acp.AuthenticateResponse, error) { | ||
| return acp.AuthenticateResponse{}, nil | ||
| } | ||
|
|
||
| func (a *acpEchoAgent) Cancel(_ context.Context, _ acp.CancelNotification) error { | ||
| return nil | ||
| } | ||
|
|
||
| func (a *acpEchoAgent) NewSession(_ context.Context, _ acp.NewSessionRequest) (acp.NewSessionResponse, error) { | ||
| a.sessionID = "test-session" | ||
| return acp.NewSessionResponse{ | ||
| SessionId: a.sessionID, | ||
| }, nil | ||
| } | ||
|
|
||
| func (a *acpEchoAgent) Prompt(ctx context.Context, params acp.PromptRequest) (acp.PromptResponse, error) { | ||
| // Extract text from prompt | ||
| var promptText string | ||
| for _, block := range params.Prompt { | ||
| if block.Text != nil { | ||
| promptText = block.Text.Text | ||
| break | ||
| } | ||
| } | ||
| promptText = strings.TrimSpace(promptText) | ||
|
|
||
| if a.scriptIndex >= len(a.script) { | ||
| return acp.PromptResponse{ | ||
| StopReason: acp.StopReasonEndTurn, | ||
| }, nil | ||
| } | ||
|
|
||
| entry := a.script[a.scriptIndex] | ||
| expected := strings.TrimSpace(entry.ExpectMessage) | ||
|
|
||
| // Empty ExpectMessage matches any prompt | ||
| if expected != "" && expected != promptText { | ||
| return acp.PromptResponse{}, fmt.Errorf("expected message %q but got %q", expected, promptText) | ||
| } | ||
|
|
||
| a.scriptIndex++ | ||
|
|
||
| // Send response via session update | ||
| if err := a.conn.SessionUpdate(ctx, acp.SessionNotification{ | ||
| SessionId: params.SessionId, | ||
| Update: acp.UpdateAgentMessageText(entry.ResponseMessage), | ||
| }); err != nil { | ||
| return acp.PromptResponse{}, err | ||
| } | ||
|
|
||
| return acp.PromptResponse{ | ||
| StopReason: acp.StopReasonEndTurn, | ||
| }, nil | ||
| } | ||
|
|
||
| func (a *acpEchoAgent) SetSessionMode(_ context.Context, _ acp.SetSessionModeRequest) (acp.SetSessionModeResponse, error) { | ||
| return acp.SetSessionModeResponse{}, nil | ||
| } | ||
|
|
||
| func loadScript(scriptPath string) ([]ScriptEntry, error) { | ||
| data, err := os.ReadFile(scriptPath) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to read script file: %w", err) | ||
| } | ||
|
|
||
| var script []ScriptEntry | ||
| if err := json.Unmarshal(data, &script); err != nil { | ||
| return nil, fmt.Errorf("failed to parse script JSON: %w", err) | ||
| } | ||
|
|
||
| return script, nil | ||
| } |
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,6 @@ | ||
| [ | ||
| { | ||
| "expectMessage": "This is a test message.", | ||
| "responseMessage": "Echo: This is a test message." | ||
| } | ||
| ] |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
review: this was causing a 'flicker' when sending a message in the UI