Merge branch 'main' into feat-opencode

# Conflicts:
#	cmd/server/server.go
#	cmd/server/server_test.go
#	lib/msgfmt/msgfmt.go
#	lib/msgfmt/msgfmt_test.go

Author: 35C4n0r

AGENTS.md

@@ -0,0 +1,85 @@
+# AGENTS.md
+
+This file provides guidance to AI agents working with code in this repository.
+
+## Build Commands
+
+- `make build` - Build the binary to `out/agentapi` (includes chat UI build)
+- `make embed` - Build the chat UI and embed it into Go
+- `go build -o out/agentapi main.go` - Direct Go build without chat UI
+- `go generate ./...` - Generate OpenAPI schema and version info
+
+## Testing
+
+- `go test ./...` - Run all Go tests
+- Tests are located alongside source files (e.g., `lib/httpapi/server_test.go`)
+
+## Development Commands
+
+- `agentapi server -- claude` - Start server with Claude Code agent
+- `agentapi server -- aider --model sonnet` - Start server with Aider agent
+- `agentapi server -- goose` - Start server with Goose agent
+- `agentapi server --type=codex -- codex` - Start server with Codex (requires explicit type)
+- `agentapi server --type=gemini -- gemini` - Start server with Gemini (requires explicit type)
+- `agentapi attach --url localhost:3284` - Attach to running agent terminal
+- Server runs on port 3284 by default
+- Chat UI available at http://localhost:3284/chat
+- API documentation at http://localhost:3284/docs
+
+## Architecture
+
+This is a Go HTTP API server that controls coding agents (Claude Code, Aider, Goose, etc.) through terminal emulation.
+
+**Core Components:**
+- `main.go` - Entry point using cobra CLI framework
+- `cmd/` - CLI command definitions (server, attach)
+- `lib/httpapi/` - HTTP server, routes, and OpenAPI schema
+- `lib/screentracker/` - Terminal output parsing and message splitting
+- `lib/termexec/` - Terminal process execution and management
+- `lib/msgfmt/` - Message formatting for different agent types (claude, goose, aider, codex, gemini, amp, cursor-agent, cursor, auggie, custom)
+- `chat/` - Next.js web UI (embedded into Go binary)
+
+**Key Architecture:**
+- Runs agents in an in-memory terminal emulator
+- Translates API calls to terminal keystrokes
+- Parses terminal output into structured messages
+- Supports multiple agent types with different message formats
+- Embeds Next.js chat UI as static assets in Go binary
+
+**Message Flow:**
+1. User sends message via HTTP API
+2. Server takes terminal snapshot
+3. Message sent to agent as terminal input
+4. Terminal output changes tracked and parsed
+5. New content becomes agent response message
+6. SSE events stream updates to clients
+
+## API Endpoints
+
+- GET `/messages` - Get all messages in conversation
+- POST `/message` - Send message to agent (content, type fields)
+- GET `/status` - Get agent status ("stable" or "running")
+- GET `/events` - SSE stream of agent events
+- GET `/openapi.json` - OpenAPI schema
+- GET `/docs` - API documentation UI
+- GET `/chat` - Web chat interface
+
+## Supported Agents
+
+Agents with explicit type requirement (use `--type=<agent>`):
+- `codex` - OpenAI Codex
+- `gemini` - Google Gemini CLI
+- `amp` - Sourcegraph Amp CLI
+- `cursor` - Cursor CLI
+
+Agents with auto-detection:
+- `claude` - Claude Code (default)
+- `goose` - Goose
+- `aider` - Aider
+
+## Project Structure
+
+- Go module with standard layout
+- Chat UI in `chat/` directory (Next.js + TypeScript)
+- OpenAPI schema auto-generated to `openapi.json`
+- Version managed via `version.sh` script

README.md

@@ -1,6 +1,6 @@
 # AgentAPI
 
-Control [Claude Code](https://github.com/anthropics/claude-code), [Goose](https://github.com/block/goose), [Aider](https://github.com/Aider-AI/aider), [Gemini](https://github.com/google-gemini/gemini-cli), [Sourcegraph Amp](https://github.com/sourcegraph/amp-cli), [Codex](https://github.com/openai/codex), [Auggie](https://docs.augmentcode.com/cli/overview), and [Cursor CLI](https://cursor.com/en/cli) with an HTTP API.
+Control [Claude Code](https://github.com/anthropics/claude-code), [AmazonQ](https://aws.amazon.com/developer/learning/q-developer-cli/), [Goose](https://github.com/block/goose), [Aider](https://github.com/Aider-AI/aider), [Gemini](https://github.com/google-gemini/gemini-cli), [Sourcegraph Amp](https://github.com/sourcegraph/amp-cli), [Codex](https://github.com/openai/codex), [Auggie](https://docs.augmentcode.com/cli/overview), and [Cursor CLI](https://cursor.com/en/cli) with an HTTP API.
 
 ![agentapi-chat](https://github.com/user-attachments/assets/57032c9f-4146-4b66-b219-09e38ab7690d)
 

cmd/server/server.go

@@ -23,46 +23,46 @@ import (
 type AgentType = msgfmt.AgentType
 
 const (
-	AgentTypeClaude      AgentType = msgfmt.AgentTypeClaude
-	AgentTypeGoose       AgentType = msgfmt.AgentTypeGoose
-	AgentTypeAider       AgentType = msgfmt.AgentTypeAider
-	AgentTypeCodex       AgentType = msgfmt.AgentTypeCodex
-	AgentTypeGemini      AgentType = msgfmt.AgentTypeGemini
-	AgentTypeAmp         AgentType = msgfmt.AgentTypeAmp
-	AgentTypeCursorAgent AgentType = msgfmt.AgentTypeCursorAgent
-	AgentTypeCursor      AgentType = msgfmt.AgentTypeCursor
-	AgentTypeAuggie      AgentType = msgfmt.AgentTypeAuggie
-	AgentTypeOpencode    AgentType = msgfmt.AgentTypeOpencode
-	AgentTypeCustom      AgentType = msgfmt.AgentTypeCustom
+	AgentTypeClaude   AgentType = msgfmt.AgentTypeClaude
+	AgentTypeGoose    AgentType = msgfmt.AgentTypeGoose
+	AgentTypeAider    AgentType = msgfmt.AgentTypeAider
+	AgentTypeCodex    AgentType = msgfmt.AgentTypeCodex
+	AgentTypeGemini   AgentType = msgfmt.AgentTypeGemini
+	AgentTypeAmp      AgentType = msgfmt.AgentTypeAmp
+	AgentTypeCursor   AgentType = msgfmt.AgentTypeCursor
+	AgentTypeAuggie   AgentType = msgfmt.AgentTypeAuggie
+	AgentTypeAmazonQ  AgentType = msgfmt.AgentTypeAmazonQ
+	AgentTypeOpencode AgentType = msgfmt.AgentTypeOpencode
+	AgentTypeCustom   AgentType = msgfmt.AgentTypeCustom
 )
 
-// exhaustiveness of this map is checked by the exhaustive linter
-var agentTypeMap = map[AgentType]bool{
-	AgentTypeClaude:      true,
-	AgentTypeGoose:       true,
-	AgentTypeAider:       true,
-	AgentTypeCodex:       true,
-	AgentTypeGemini:      true,
-	AgentTypeAmp:         true,
-	AgentTypeCursorAgent: true,
-	AgentTypeCursor:      true,
-	AgentTypeAuggie:      true,
-	AgentTypeOpencode:    true,
-	AgentTypeCustom:      true,
+// agentTypeAliases contains the mapping of possible input agent type strings to their canonical AgentType values
+var agentTypeAliases = map[string]AgentType{
+	"claude":       AgentTypeClaude,
+	"goose":        AgentTypeGoose,
+	"aider":        AgentTypeAider,
+	"codex":        AgentTypeCodex,
+	"gemini":       AgentTypeGemini,
+	"amp":          AgentTypeAmp,
+	"auggie":       AgentTypeAuggie,
+	"cursor":       AgentTypeCursor,
+	"cursor-agent": AgentTypeCursor,
+	"q":            AgentTypeAmazonQ,
+	"amazonq":      AgentTypeAmazonQ,
+	"opencode":     AgentTypeOpencode,
+	"custom":       AgentTypeCustom,
 }
 
 func parseAgentType(firstArg string, agentTypeVar string) (AgentType, error) {
 	// if the agent type is provided, use it
-	castedAgentType := AgentType(agentTypeVar)
-	if _, ok := agentTypeMap[castedAgentType]; ok {
+	if castedAgentType, ok := agentTypeAliases[agentTypeVar]; ok {
 		return castedAgentType, nil
 	}
 	if agentTypeVar != "" {
 		return AgentTypeCustom, fmt.Errorf("invalid agent type: %s", agentTypeVar)
 	}
 	// if the agent type is not provided, guess it from the first argument
-	castedFirstArg := AgentType(firstArg)
-	if _, ok := agentTypeMap[castedFirstArg]; ok {
+	if castedFirstArg, ok := agentTypeAliases[firstArg]; ok {
 		return castedFirstArg, nil
 	}
 	return AgentTypeCustom, nil
@@ -146,9 +146,9 @@ func runServer(ctx context.Context, logger *slog.Logger, argsToPass []string) er
 }
 
 var agentNames = (func() []string {
-	names := make([]string, 0, len(agentTypeMap))
-	for agentType := range agentTypeMap {
-		names = append(names, string(agentType))
+	names := make([]string, 0, len(agentTypeAliases))
+	for agentType := range agentTypeAliases {
+		names = append(names, agentType)
 	}
 	sort.Strings(names)
 	return names

cmd/server/server_test.go

@@ -50,13 +50,23 @@ func TestParseAgentType(t *testing.T) {
 		{
 			firstArg:     "cursor-agent",
 			agentTypeVar: "",
-			want:         AgentTypeCursorAgent,
+			want:         AgentTypeCursor,
 		},
 		{
 			firstArg:     "cursor",
 			agentTypeVar: "",
 			want:         AgentTypeCursor,
 		},
+		{
+			firstArg:     "amazonq",
+			agentTypeVar: "",
+			want:         AgentTypeAmazonQ,
+		},
+		{
+			firstArg:     "q",
+			agentTypeVar: "",
+			want:         AgentTypeAmazonQ,
+		},
 		{
 			firstArg:     "opencode",
 			agentTypeVar: "",
@@ -102,6 +112,16 @@ func TestParseAgentType(t *testing.T) {
 			agentTypeVar: "gemini",
 			want:         AgentTypeGemini,
 		},
+		{
+			firstArg:     "claude",
+			agentTypeVar: "amazonq",
+			want:         AgentTypeAmazonQ,
+		},
+		{
+			firstArg:     "claude",
+			agentTypeVar: "q",
+			want:         AgentTypeAmazonQ,
+		},
 		{
 			firstArg:     "claude",
 			agentTypeVar: "opencode",
@@ -110,7 +130,7 @@ func TestParseAgentType(t *testing.T) {
 		{
 			firstArg:     "claude",
 			agentTypeVar: "cursor-agent",
-			want:         AgentTypeCursorAgent,
+			want:         AgentTypeCursor,
 		},
 		{
 			firstArg:     "claude",

lib/msgfmt/msgfmt.go

@@ -192,7 +192,7 @@ func RemoveUserInput(msgRaw string, userInputRaw string, agentType AgentType) st
 		if idx, found := skipTrailingInputBoxLine(msgLines, lastUserInputLineIdx, "╯", "╰"); found {
 			lastUserInputLineIdx = idx
 		}
-	} else if agentType == AgentTypeCursorAgent || agentType == AgentTypeCursor {
+	} else if agentType == AgentTypeCursor {
 		if idx, found := skipTrailingInputBoxLine(msgLines, lastUserInputLineIdx, "┘", "└"); found {
 			lastUserInputLineIdx = idx
 		}
@@ -232,17 +232,17 @@ func trimEmptyLines(message string) string {
 type AgentType string
 
 const (
-	AgentTypeClaude      AgentType = "claude"
-	AgentTypeGoose       AgentType = "goose"
-	AgentTypeAider       AgentType = "aider"
-	AgentTypeCodex       AgentType = "codex"
-	AgentTypeGemini      AgentType = "gemini"
-	AgentTypeAmp         AgentType = "amp"
-	AgentTypeCursorAgent AgentType = "cursor-agent"
-	AgentTypeCursor      AgentType = "cursor"
-	AgentTypeAuggie      AgentType = "auggie"
+	AgentTypeClaude  AgentType = "claude"
+	AgentTypeGoose   AgentType = "goose"
+	AgentTypeAider   AgentType = "aider"
+	AgentTypeCodex   AgentType = "codex"
+	AgentTypeGemini  AgentType = "gemini"
+	AgentTypeAmp     AgentType = "amp"
+	AgentTypeCursor  AgentType = "cursor"
+	AgentTypeAuggie  AgentType = "auggie"
+	AgentTypeAmazonQ AgentType = "amazonq"
 	AgentTypeOpencode    AgentType = "opencode"
-	AgentTypeCustom      AgentType = "custom"
+	AgentTypeCustom  AgentType = "custom"
 )
 
 func formatGenericMessage(message string, userInput string, agentType AgentType) string {
@@ -280,12 +280,12 @@ func FormatAgentMessage(agentType AgentType, message string, userInput string) s
 		return formatGenericMessage(message, userInput, agentType)
 	case AgentTypeAmp:
 		return formatGenericMessage(message, userInput, agentType)
-	case AgentTypeCursorAgent:
-		return formatGenericMessage(message, userInput, agentType)
 	case AgentTypeCursor:
 		return formatGenericMessage(message, userInput, agentType)
 	case AgentTypeAuggie:
 		return formatGenericMessage(message, userInput, agentType)
+	case AgentTypeAmazonQ:
+		return formatGenericMessage(message, userInput, agentType)
 	case AgentTypeOpencode:
 		return formatOpencodeMessage(message, userInput)
 	case AgentTypeCustom:

lib/msgfmt/msgfmt_test.go

@@ -218,7 +218,7 @@ func TestTrimEmptyLines(t *testing.T) {
 
 func TestFormatAgentMessage(t *testing.T) {
 	dir := "testdata/format"
-	agentTypes := []AgentType{AgentTypeClaude, AgentTypeGoose, AgentTypeAider, AgentTypeGemini, AgentTypeAmp, AgentTypeCodex, AgentTypeCursorAgent, AgentTypeCursor, AgentTypeAuggie, AgentTypeOpencode, AgentTypeCustom}
+	agentTypes := []AgentType{AgentTypeClaude, AgentTypeGoose, AgentTypeAider, AgentTypeGemini, AgentTypeAmp, AgentTypeCodex, AgentTypeCursor, AgentTypeAuggie, AgentTypeAmazonQ, AgentTypeOpencode, AgentTypeCustom}
 	for _, agentType := range agentTypes {
 		t.Run(string(agentType), func(t *testing.T) {
 			cases, err := testdataDir.ReadDir(path.Join(dir, string(agentType)))

lib/msgfmt/testdata/format/amazonq/confirmation_box/expected.txt

@@ -0,0 +1,13 @@
+🛠️  Using tool: coder_report_task from mcp server coder
+ ⋮ 
+ ● Running coder_report_task with the param:
+ ⋮  {
+ ⋮    "name": "coder_report_task",
+ ⋮    "arguments": {
+ ⋮      "summary": "Checking current directory to identify repository",
+ ⋮      "link": "",
+ ⋮      "state": "working"
+ ⋮    }
+ ⋮  }
+
+Allow this action? Use 't' to trust (always allow) this tool for the session. [y/n/t]:

lib/msgfmt/testdata/format/amazonq/confirmation_box/msg.txt

@@ -0,0 +1,20 @@
+> what repo is this ?
+
+
+
+
+🛠️  Using tool: coder_report_task from mcp server coder
+ ⋮ 
+ ● Running coder_report_task with the param:
+ ⋮  {
+ ⋮    "name": "coder_report_task",
+ ⋮    "arguments": {
+ ⋮      "summary": "Checking current directory to identify repository",
+ ⋮      "link": "",
+ ⋮      "state": "working"
+ ⋮    }
+ ⋮  }
+
+Allow this action? Use 't' to trust (always allow) this tool for the session. [y/n/t]:
+
+>

lib/msgfmt/testdata/format/amazonq/confirmation_box/user.txt

@@ -0,0 +1 @@
+what repo is this ?

lib/msgfmt/testdata/format/amazonq/first_message/expected.txt

@@ -0,0 +1,12 @@
+✓ coder loaded in 0.03 s
+
+Welcome to Amazon Q!
+
+💡 Run /prompts to learn how to build & run repeatable workflows
+
+/help all commands
+ctrl + j new lines
+ctrl + s fuzzy search
+
+
+🤖 You are chatting with claude-sonnet-4