diff --git a/pkg/cmd/agent-task/shared/capi.go b/pkg/cmd/agent-task/shared/capi.go
new file mode 100644
index 000000000..f23ee86d2
--- /dev/null
+++ b/pkg/cmd/agent-task/shared/capi.go
@@ -0,0 +1,23 @@
+package shared
+
+import (
+	"github.com/cli/cli/v2/pkg/cmd/agent-task/capi"
+	"github.com/cli/cli/v2/pkg/cmdutil"
+)
+
+func CapiClientFunc(f *cmdutil.Factory) func() (capi.CapiClient, error) {
+	return func() (capi.CapiClient, error) {
+		cfg, err := f.Config()
+		if err != nil {
+			return nil, err
+		}
+
+		httpClient, err := f.HttpClient()
+		if err != nil {
+			return nil, err
+		}
+
+		authCfg := cfg.Authentication()
+		return capi.NewCAPIClient(httpClient, authCfg), nil
+	}
+}