[pull] trunk from cli:trunk

api/queries_pr.go

@@ -62,6 +62,7 @@ type PullRequest struct {
 	MergedBy            *Author
 	HeadRepositoryOwner Owner
 	HeadRepository      *PRRepository
+	Repository          *PRRepository
 	IsCrossRepository   bool
 	IsDraft             bool
 	MaintainerCanModify bool
@@ -251,8 +252,9 @@ type Workflow struct {
 }
 
 type PRRepository struct {
-	ID   string `json:"id"`
-	Name string `json:"name"`
+	ID            string `json:"id"`
+	Name          string `json:"name"`
+	NameWithOwner string `json:"nameWithOwner"`
 }
 
 type AutoMergeRequest struct {

api/queries_repo.go

@@ -141,9 +141,10 @@ type RepositoryOwner struct {
 }
 
 type GitHubUser struct {
-	ID    string `json:"id"`
-	Login string `json:"login"`
-	Name  string `json:"name"`
+	ID         string `json:"id"`
+	Login      string `json:"login"`
+	Name       string `json:"name"`
+	DatabaseID int64  `json:"databaseId"`
 }
 
 // Actor is a superset of User and Bot, among others.

go.mod

@@ -51,6 +51,7 @@ require (
 	github.com/spf13/pflag v1.0.7
 	github.com/stretchr/testify v1.11.0
 	github.com/theupdateframework/go-tuf/v2 v2.1.1
+	github.com/vmihailenco/msgpack/v5 v5.4.1
 	github.com/yuin/goldmark v1.7.13
 	github.com/zalando/go-keyring v0.2.6
 	golang.org/x/crypto v0.41.0
@@ -205,6 +206,7 @@ require (
 	github.com/transparency-dev/merkle v0.0.2 // indirect
 	github.com/transparency-dev/tessera v0.2.1-0.20250610150926-8ee4e93b2823 // indirect
 	github.com/vbatts/tar-split v0.12.1 // indirect
+	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
 	github.com/yuin/goldmark-emoji v1.0.6 // indirect
 	github.com/zeebo/errs v1.4.0 // indirect

go.sum

@@ -1417,6 +1417,10 @@ github.com/transparency-dev/tessera v0.2.1-0.20250610150926-8ee4e93b2823 h1:s3p7
 github.com/transparency-dev/tessera v0.2.1-0.20250610150926-8ee4e93b2823/go.mod h1:Jv2IDwG1q8QNXZTaI1X6QX8s96WlJn73ka2hT1n4N5c=
 github.com/vbatts/tar-split v0.12.1 h1:CqKoORW7BUWBe7UL/iqTVvkTBOF8UvOMKOIZykxnnbo=
 github.com/vbatts/tar-split v0.12.1/go.mod h1:eF6B6i6ftWQcDqEn3/iGFRFRo8cBIMSJVOpnNdfTMFA=
+github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IUPn0Bjt8=
+github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok=
+github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
+github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

pkg/cmd/agent-task/agent_task.go

@@ -0,0 +1,100 @@
+package agent
+
+import (
+	"errors"
+	"fmt"
+	"strings"
+
+	"github.com/MakeNowJust/heredoc"
+	cmdCreate "github.com/cli/cli/v2/pkg/cmd/agent-task/create"
+	cmdList "github.com/cli/cli/v2/pkg/cmd/agent-task/list"
+	cmdView "github.com/cli/cli/v2/pkg/cmd/agent-task/view"
+	"github.com/cli/cli/v2/pkg/cmdutil"
+	"github.com/cli/go-gh/v2/pkg/auth"
+	"github.com/spf13/cobra"
+)
+
+// NewCmdAgentTask creates the base `agent-task` command.
+func NewCmdAgentTask(f *cmdutil.Factory) *cobra.Command {
+	cmd := &cobra.Command{
+		Use:     "agent-task <command>",
+		Aliases: []string{"agent-tasks", "agent", "agents"},
+		Short:   "Work with agent tasks (preview)",
+		Long: heredoc.Doc(`
+			Working with agent tasks in the GitHub CLI is in preview and
+			subject to change without notice.
+		`),
+		Annotations: map[string]string{
+			"help:arguments": heredoc.Doc(`
+				A task can be identified as argument in any of the following formats:
+				- by pull request number, e.g. "123"; or
+				- by session ID, e.g. "12345abc-12345-12345-12345-12345abc"; or
+				- by URL, e.g. "https://github.com/OWNER/REPO/pull/123/agent-sessions/12345abc-12345-12345-12345-12345abc";
+
+				Identifying tasks by pull request is not recommended for non-interactive use cases as
+				there may be multiple tasks for a given pull request that require disambiguation.
+			`),
+		},
+		Example: heredoc.Doc(`
+			# List your most recent agent tasks
+			$ gh agent-task list
+
+			# Create a new agent task on the current repository
+			$ gh agent-task create "Improve the performance of the data processing pipeline"
+
+			# View details about agent tasks associated with a pull request
+			$ gh agent-task view 123
+
+			# View details about a specific agent task
+			$ gh agent-task view 12345abc-12345-12345-12345-12345abc
+		`),
+		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
+			return requireOAuthToken(f)
+		},
+		// This is required to run this root command. We want to
+		// run it to test PersistentPreRunE behavior.
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return cmd.Help()
+		},
+	}
+
+	// register subcommands
+	cmd.AddCommand(cmdList.NewCmdList(f, nil))
+	cmd.AddCommand(cmdCreate.NewCmdCreate(f, nil))
+	cmd.AddCommand(cmdView.NewCmdView(f, nil))
+
+	return cmd
+}
+
+// requireOAuthToken ensures an OAuth (device flow) token is present and valid.
+// agent-task subcommands inherit this check via PersistentPreRunE.
+func requireOAuthToken(f *cmdutil.Factory) error {
+	cfg, err := f.Config()
+	if err != nil {
+		return err
+	}
+
+	authCfg := cfg.Authentication()
+	host, _ := authCfg.DefaultHost()
+	if host == "" {
+		return errors.New("no default host configured; run 'gh auth login'")
+	}
+
+	if auth.IsEnterprise(host) {
+		return errors.New("agent tasks are not supported on this host")
+	}
+
+	token, source := authCfg.ActiveToken(host)
+
+	// Tokens from sources "oauth_token" and "keyring" are likely
+	// minted through our device flow.
+	tokenSourceIsDeviceFlow := source == "oauth_token" || source == "keyring"
+	// Tokens with "gho_" prefix are OAuth tokens.
+	tokenIsOAuth := strings.HasPrefix(token, "gho_")
+
+	// Reject if the token is not from a device flow source or is not an OAuth token
+	if !tokenSourceIsDeviceFlow || !tokenIsOAuth {
+		return fmt.Errorf("this command requires an OAuth token. Re-authenticate with: gh auth login")
+	}
+	return nil
+}

pkg/cmd/agent-task/agent_task_test.go

@@ -0,0 +1,149 @@
+package agent
+
+import (
+	"testing"
+
+	"github.com/cli/cli/v2/internal/config"
+	"github.com/cli/cli/v2/internal/gh"
+	ghmock "github.com/cli/cli/v2/internal/gh/mock"
+	"github.com/cli/cli/v2/pkg/cmdutil"
+	"github.com/cli/cli/v2/pkg/iostreams"
+	"github.com/stretchr/testify/require"
+)
+
+// setupMockOAuthConfig configures a blank config with a default host and optional token behavior.
+func setupMockOAuthConfig(t *testing.T, tokenSource string) gh.Config {
+	t.Helper()
+	c := config.NewBlankConfig()
+	switch tokenSource {
+	case "oauth_token":
+		// valid OAuth device flow token stored in config
+		c.Set("github.com", "oauth_token", "gho_OAUTH123")
+	case "keyring":
+		// valid OAuth device flow token stored in keyring
+		c.Set("github.com", "oauth_token", "gho_OAUTH123")
+	case "GH_TOKEN":
+		// classic style token stored in config (will fail prefix check)
+		c.Set("github.com", "oauth_token", "ghp_CLASSIC123")
+	case "GH_ENTERPRISE_TOKEN":
+		// enterprise style token stored in config (will fail prefix check)
+		c.Set("something.ghes.com", "oauth_token", "ghe_ENTERPRISE123")
+	}
+	return c
+}
+
+func TestNewCmdAgentTask(t *testing.T) {
+	tests := []struct {
+		name            string
+		tokenSource     string
+		customConfig    func() (gh.Config, error)
+		wantErr         bool
+		wantErrContains string
+		wantStdout      string
+	}{
+		{
+			name:        "oauth token is accepted",
+			tokenSource: "oauth_token",
+			wantErr:     false,
+			wantStdout:  "",
+		},
+		{
+			name:        "keyring oauth token is accepted",
+			tokenSource: "keyring",
+			wantErr:     false,
+			wantStdout:  "",
+		},
+		{
+			name:            "env var token is rejected",
+			tokenSource:     "GH_TOKEN",
+			wantErr:         true,
+			wantErrContains: "requires an OAuth token",
+		},
+		{
+			name:        "enterprise token alone is ignored and rejected",
+			tokenSource: "GH_ENTERPRISE_TOKEN",
+			wantErr:     true,
+		},
+		{
+			name: "github.com oauth is accepted and enterprise token ignored",
+			customConfig: func() (gh.Config, error) {
+				c := config.NewBlankConfig()
+				c.Set("something.ghes.com", "oauth_token", "ghe_ENTERPRISE123")
+				c.Set("github.com", "oauth_token", "gho_OAUTH123")
+				return c, nil
+			},
+			wantErr:    false,
+			wantStdout: "",
+		},
+		{
+			name: "enterprise host is rejected",
+			customConfig: func() (gh.Config, error) {
+				return &ghmock.ConfigMock{
+					AuthenticationFunc: func() gh.AuthConfig {
+						c := &config.AuthConfig{}
+						c.SetDefaultHost("something.ghes.com", "GH_HOST")
+						return c
+					},
+				}, nil
+			},
+			wantErr:         true,
+			wantErrContains: "not supported on this host",
+		},
+		{
+			name: "empty host is rejected",
+			customConfig: func() (gh.Config, error) {
+				return &ghmock.ConfigMock{
+					AuthenticationFunc: func() gh.AuthConfig {
+						c := &config.AuthConfig{}
+						c.SetDefaultHost("", "GH_HOST")
+						return c
+					},
+				}, nil
+			},
+			wantErr:         true,
+			wantErrContains: "no default host configured",
+		},
+		{
+			name:        "no auth is rejected",
+			tokenSource: "",
+			wantErr:     true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			f := &cmdutil.Factory{}
+			ios, _, stdout, _ := iostreams.Test()
+			f.IOStreams = ios
+			if tt.customConfig != nil {
+				f.Config = tt.customConfig
+			} else {
+				f.Config = func() (gh.Config, error) { return setupMockOAuthConfig(t, tt.tokenSource), nil }
+			}
+
+			cmd := NewCmdAgentTask(f)
+			err := cmd.Execute()
+
+			if tt.wantErr {
+				require.Error(t, err)
+				if tt.wantErrContains != "" {
+					require.Contains(t, err.Error(), tt.wantErrContains)
+				}
+			} else {
+				require.NoError(t, err)
+				require.Equal(t, tt.wantStdout, stdout.String())
+			}
+		})
+	}
+}
+
+func TestAliasAreSet(t *testing.T) {
+	f := &cmdutil.Factory{}
+	ios, _, _, _ := iostreams.Test()
+	f.IOStreams = ios
+	f.Config = func() (gh.Config, error) { return setupMockOAuthConfig(t, "oauth_token"), nil }
+
+	cmd := NewCmdAgentTask(f)
+
+	require.ElementsMatch(t, []string{"agent-tasks", "agent", "agents"}, cmd.Aliases)
+}

pkg/cmd/agent-task/capi/client.go

@@ -0,0 +1,72 @@
+package capi
+
+import (
+	"context"
+	"net/http"
+
+	"github.com/cli/cli/v2/internal/gh"
+)
+
+//go:generate moq -rm -out client_mock.go . CapiClient
+
+const baseCAPIURL = "https://api.githubcopilot.com"
+const capiHost = "api.githubcopilot.com"
+
+// CapiClient defines the methods used by the caller. Implementations
+// may be replaced with test doubles in unit tests.
+type CapiClient interface {
+	ListLatestSessionsForViewer(ctx context.Context, limit int) ([]*Session, error)
+	CreateJob(ctx context.Context, owner, repo, problemStatement, baseBranch string) (*Job, error)
+	GetJob(ctx context.Context, owner, repo, jobID string) (*Job, error)
+	GetSession(ctx context.Context, id string) (*Session, error)
+	GetSessionLogs(ctx context.Context, id string) ([]byte, error)
+	ListSessionsByResourceID(ctx context.Context, resourceType string, resourceID int64, limit int) ([]*Session, error)
+	GetPullRequestDatabaseID(ctx context.Context, hostname string, owner string, repo string, number int) (int64, string, error)
+}
+
+// CAPIClient is a client for interacting with the Copilot API
+type CAPIClient struct {
+	httpClient *http.Client
+	authCfg    gh.AuthConfig
+}
+
+// NewCAPIClient creates a new CAPI client. Provide a token and an HTTP client which
+// will be used as the base transport for CAPI requests.
+//
+// The provided HTTP client will be mutated for use with CAPI, so it should not
+// be reused elsewhere.
+func NewCAPIClient(httpClient *http.Client, authCfg gh.AuthConfig) *CAPIClient {
+	host, _ := authCfg.DefaultHost()
+	token, _ := authCfg.ActiveToken(host)
+
+	httpClient.Transport = newCAPITransport(token, httpClient.Transport)
+	return &CAPIClient{
+		httpClient: httpClient,
+		authCfg:    authCfg,
+	}
+}
+
+// capiTransport adds the Copilot auth headers
+type capiTransport struct {
+	rp    http.RoundTripper
+	token string
+}
+
+func newCAPITransport(token string, rp http.RoundTripper) *capiTransport {
+	return &capiTransport{
+		rp:    rp,
+		token: token,
+	}
+}
+
+func (ct *capiTransport) RoundTrip(req *http.Request) (*http.Response, error) {
+	req.Header.Set("Authorization", "Bearer "+ct.token)
+
+	// Since this RoundTrip is reused for both Copilot API and
+	// GitHub API requests, we conditionally add the integration
+	// ID only when performing requests to the Copilot API.
+	if req.URL.Host == capiHost {
+		req.Header.Add("Copilot-Integration-Id", "copilot-4-cli")
+	}
+	return ct.rp.RoundTrip(req)
+}