Go: remove hand-written PermissionRequest that conflicts with generated type (#685)

Author: SteveSandersonMS

go/internal/e2e/tools_test.go

@@ -350,8 +350,8 @@ func TestTools(t *testing.T) {
 		for _, req := range permissionRequests {
 			if req.Kind == "custom-tool" {
 				customToolReqs++
-				if toolName, ok := req.Extra["toolName"].(string); !ok || toolName != "encrypt_string" {
-					t.Errorf("Expected toolName 'encrypt_string', got '%v'", req.Extra["toolName"])
+				if req.ToolName == nil || *req.ToolName != "encrypt_string" {
+					t.Errorf("Expected toolName 'encrypt_string', got '%v'", req.ToolName)
 				}
 			}
 		}

go/types.go

@@ -99,39 +99,6 @@ type SystemMessageConfig struct {
 	Content string `json:"content,omitempty"`
 }
 
-// PermissionRequest represents a permission request from the server
-type PermissionRequest struct {
-	Kind       string         `json:"kind"`
-	ToolCallID string         `json:"toolCallId,omitempty"`
-	Extra      map[string]any `json:"-"` // Additional fields vary by kind
-}
-
-// UnmarshalJSON implements custom JSON unmarshaling for PermissionRequest
-// to capture additional fields (varying by kind) into the Extra map.
-func (p *PermissionRequest) UnmarshalJSON(data []byte) error {
-	// Unmarshal known fields via an alias to avoid infinite recursion
-	type Alias PermissionRequest
-	var alias Alias
-	if err := json.Unmarshal(data, &alias); err != nil {
-		return err
-	}
-	*p = PermissionRequest(alias)
-
-	// Unmarshal all fields into a generic map
-	var raw map[string]any
-	if err := json.Unmarshal(data, &raw); err != nil {
-		return err
-	}
-
-	// Remove known fields, keep the rest as Extra
-	delete(raw, "kind")
-	delete(raw, "toolCallId")
-	if len(raw) > 0 {
-		p.Extra = raw
-	}
-	return nil
-}
-
 // PermissionRequestResultKind represents the kind of a permission request result.
 type PermissionRequestResultKind string
 

test/scenarios/callbacks/permissions/go/main.go

@@ -30,7 +30,10 @@ func main() {
 		Model: "claude-haiku-4.5",
 		OnPermissionRequest: func(req copilot.PermissionRequest, inv copilot.PermissionInvocation) (copilot.PermissionRequestResult, error) {
 			permissionLogMu.Lock()
-			toolName, _ := req.Extra["toolName"].(string)
+			toolName := ""
+			if req.ToolName != nil {
+				toolName = *req.ToolName
+			}
 			permissionLog = append(permissionLog, fmt.Sprintf("approved:%s", toolName))
 			permissionLogMu.Unlock()
 			return copilot.PermissionRequestResult{Kind: "approved"}, nil