Merge branch 'main' into feat-file-upload

Author: 35C4n0r

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v0.8.0
+
+### Features
+- Add Support for GitHub Copilot
+- Fix inconsistent openapi generation
+
 ## v0.7.1
 
 ### Fixes

README.md

@@ -1,6 +1,6 @@
 # AgentAPI
 
-Control [Claude Code](https://github.com/anthropics/claude-code), [AmazonQ](https://aws.amazon.com/developer/learning/q-developer-cli/), [Opencode](https://opencode.ai/), [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/), [Opencode](https://opencode.ai/), [Goose](https://github.com/block/goose), [Aider](https://github.com/Aider-AI/aider), [Gemini](https://github.com/google-gemini/gemini-cli), [GitHub Copilot](https://github.com/github/copilot-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)
 
@@ -65,7 +65,7 @@ agentapi server -- goose
 ```
 
 > [!NOTE]
-> When using Codex, Opencode, Gemini, Amp or CursorCLI, always specify the agent type explicitly (eg: `agentapi server --type=codex -- codex`), or message formatting may break.
+> When using Codex, Opencode, Copilot, Gemini, Amp or CursorCLI, always specify the agent type explicitly (eg: `agentapi server --type=codex -- codex`), or message formatting may break.
 
 An OpenAPI schema is available in [openapi.json](openapi.json).
 

chat/package.json

@@ -49,5 +49,5 @@
     "start": "next start",
     "storybook": "storybook dev -p 6006"
   },
-  "version": "0.7.1"
+  "version": "0.8.0"
 }

cmd/server/server.go

@@ -28,6 +28,7 @@ const (
 	AgentTypeAider    AgentType = msgfmt.AgentTypeAider
 	AgentTypeCodex    AgentType = msgfmt.AgentTypeCodex
 	AgentTypeGemini   AgentType = msgfmt.AgentTypeGemini
+	AgentTypeCopilot  AgentType = msgfmt.AgentTypeCopilot
 	AgentTypeAmp      AgentType = msgfmt.AgentTypeAmp
 	AgentTypeCursor   AgentType = msgfmt.AgentTypeCursor
 	AgentTypeAuggie   AgentType = msgfmt.AgentTypeAuggie
@@ -43,6 +44,7 @@ var agentTypeAliases = map[string]AgentType{
 	"aider":        AgentTypeAider,
 	"codex":        AgentTypeCodex,
 	"gemini":       AgentTypeGemini,
+	"copilot":      AgentTypeCopilot,
 	"amp":          AgentTypeAmp,
 	"auggie":       AgentTypeAuggie,
 	"cursor":       AgentTypeCursor,

cmd/server/server_test.go

@@ -47,6 +47,11 @@ func TestParseAgentType(t *testing.T) {
 			agentTypeVar: "",
 			want:         AgentTypeGemini,
 		},
+		{
+			firstArg:     "copilot",
+			agentTypeVar: "",
+			want:         AgentTypeCopilot,
+		},
 		{
 			firstArg:     "cursor-agent",
 			agentTypeVar: "",
@@ -102,6 +107,11 @@ func TestParseAgentType(t *testing.T) {
 			agentTypeVar: "goose",
 			want:         AgentTypeGoose,
 		},
+		{
+			firstArg:     "claude",
+			agentTypeVar: "copilot",
+			want:         AgentTypeCopilot,
+		},
 		{
 			firstArg:     "goose",
 			agentTypeVar: "claude",

internal/version/version.go

@@ -2,4 +2,4 @@
 
 package version
 
-var Version = "0.7.1"
+var Version = "0.8.0"

lib/httpapi/server.go

@@ -13,6 +13,7 @@ import (
 	"os"
 	"path/filepath"
 	"slices"
+	"sort"
 	"strings"
 	"sync"
 	"time"
@@ -46,6 +47,27 @@ type Server struct {
 	chatBasePath string
 }
 
+func (s *Server) NormalizeSchema(schema any) any {
+	switch val := (schema).(type) {
+	case *any:
+		s.NormalizeSchema(*val)
+	case []any:
+		for i := range val {
+			s.NormalizeSchema(&val[i])
+		}
+		sort.SliceStable(val, func(i, j int) bool {
+			return fmt.Sprintf("%v", val[i]) < fmt.Sprintf("%v", val[j])
+		})
+	case map[string]any:
+		for k := range val {
+			valUnderKey := val[k]
+			s.NormalizeSchema(&valUnderKey)
+			val[k] = valUnderKey
+		}
+	}
+	return schema
+}
+
 func (s *Server) GetOpenAPI() string {
 	jsonBytes, err := s.api.OpenAPI().MarshalJSON()
 	if err != nil {
@@ -56,7 +78,11 @@ func (s *Server) GetOpenAPI() string {
 	if err := json.Unmarshal(jsonBytes, &jsonObj); err != nil {
 		return ""
 	}
-	prettyJSON, err := json.MarshalIndent(jsonObj, "", "  ")
+
+	// Normalize
+	normalized := s.NormalizeSchema(jsonObj)
+
+	prettyJSON, err := json.MarshalIndent(normalized, "", "  ")
 	if err != nil {
 		return ""
 	}

lib/httpapi/server_test.go

@@ -3,13 +3,11 @@ package httpapi_test
 import (
 	"context"
 	"encoding/json"
-	"fmt"
 	"io"
 	"log/slog"
 	"net/http"
 	"net/http/httptest"
 	"os"
-	"sort"
 	"testing"
 
 	"github.com/coder/agentapi/lib/httpapi"
@@ -19,28 +17,6 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func normalizeSchema(t *testing.T, schema any) any {
-	t.Helper()
-	switch val := (schema).(type) {
-	case *any:
-		normalizeSchema(t, *val)
-	case []any:
-		for i := range val {
-			normalizeSchema(t, &val[i])
-		}
-		sort.SliceStable(val, func(i, j int) bool {
-			return fmt.Sprintf("%v", val[i]) < fmt.Sprintf("%v", val[j])
-		})
-	case map[string]any:
-		for k := range val {
-			valUnderKey := val[k]
-			normalizeSchema(t, &valUnderKey)
-			val[k] = valUnderKey
-		}
-	}
-	return schema
-}
-
 // Ensure the OpenAPI schema on disk is up to date.
 // To update the schema, run `go run main.go server --print-openapi dummy > openapi.json`.
 func TestOpenAPISchema(t *testing.T) {
@@ -79,9 +55,6 @@ func TestOpenAPISchema(t *testing.T) {
 		t.Fatalf("failed to unmarshal disk schema: %s", err)
 	}
 
-	normalizeSchema(t, &currentSchema)
-	normalizeSchema(t, &diskSchema)
-
 	require.Equal(t, currentSchema, diskSchema)
 }
 

lib/msgfmt/msgfmt.go

@@ -188,7 +188,7 @@ func RemoveUserInput(msgRaw string, userInputRaw string, agentType AgentType) st
 	lastUserInputLineIdx := msgRuneLineLocations[userInputEndIdx]
 
 	// Skip Gemini/Cursor trailing input box line
-	if agentType == AgentTypeGemini {
+	if agentType == AgentTypeGemini || agentType == AgentTypeCopilot {
 		if idx, found := skipTrailingInputBoxLine(msgLines, lastUserInputLineIdx, "╯", "╰"); found {
 			lastUserInputLineIdx = idx
 		}
@@ -232,17 +232,18 @@ 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"
-	AgentTypeCursor  AgentType = "cursor"
-	AgentTypeAuggie  AgentType = "auggie"
-	AgentTypeAmazonQ AgentType = "amazonq"
-	AgentTypeOpencode    AgentType = "opencode"
-	AgentTypeCustom  AgentType = "custom"
+	AgentTypeClaude   AgentType = "claude"
+	AgentTypeGoose    AgentType = "goose"
+	AgentTypeAider    AgentType = "aider"
+	AgentTypeCodex    AgentType = "codex"
+	AgentTypeGemini   AgentType = "gemini"
+	AgentTypeCopilot  AgentType = "copilot"
+	AgentTypeAmp      AgentType = "amp"
+	AgentTypeCursor   AgentType = "cursor"
+	AgentTypeAuggie   AgentType = "auggie"
+	AgentTypeAmazonQ  AgentType = "amazonq"
+	AgentTypeOpencode AgentType = "opencode"
+	AgentTypeCustom   AgentType = "custom"
 )
 
 func formatGenericMessage(message string, userInput string, agentType AgentType) string {
@@ -278,6 +279,8 @@ func FormatAgentMessage(agentType AgentType, message string, userInput string) s
 		return formatCodexMessage(message, userInput)
 	case AgentTypeGemini:
 		return formatGenericMessage(message, userInput, agentType)
+	case AgentTypeCopilot:
+		return formatGenericMessage(message, userInput, agentType)
 	case AgentTypeAmp:
 		return formatGenericMessage(message, userInput, agentType)
 	case AgentTypeCursor:

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, AgentTypeCursor, AgentTypeAuggie, AgentTypeAmazonQ, AgentTypeOpencode, AgentTypeCustom}
+	agentTypes := []AgentType{AgentTypeClaude, AgentTypeGoose, AgentTypeAider, AgentTypeGemini, AgentTypeCopilot, 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)))