diff --git a/.agents/plugins/marketplace.json b/.agents/plugins/marketplace.json
new file mode 100644
index 0000000..6fcd255
--- /dev/null
+++ b/.agents/plugins/marketplace.json
@@ -0,0 +1,16 @@
+{
+  "name": "agent-cli",
+  "interface": {
+    "displayName": "HubSpot Agent CLI"
+  },
+  "plugins": [
+    {
+      "name": "hubspot-agent-cli",
+      "source": {
+        "source": "local",
+        "path": "./hubspot-agent-cli"
+      },
+      "category": "Development"
+    }
+  ]
+}
diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
new file mode 100644
index 0000000..6e7b335
--- /dev/null
+++ b/.claude-plugin/marketplace.json
@@ -0,0 +1,18 @@
+{
+  "$schema": "https://json.schemastore.org/claude-code-marketplace.json",
+  "name": "HubSpot Agent CLI",
+  "description": "HubSpot CLI skills for AI agents — CRM operations, bulk data, workflows, and more",
+  "owner": {
+    "name": "HubSpot",
+    "email": "developer-experience@hubspot.com"
+  },
+  "plugins": [
+    {
+      "name": "hubspot-agent-cli",
+      "source": "./hubspot-agent-cli",
+      "description": "Skills for using the HubSpot CLI to accomplish CRM tasks — bulk operations, deal management, workflows, and more",
+      "category": "crm",
+      "tags": ["hubspot", "crm", "cli", "sales", "marketing"]
+    }
+  ]
+}
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..e9b72d4
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "hubspot-agent-cli/skills"]
+	path = hubspot-agent-cli/skills
+	url = https://github.com/HubSpot/agent-cli-skills.git
diff --git a/hubspot-agent-cli/.claude-plugin/plugin.json b/hubspot-agent-cli/.claude-plugin/plugin.json
new file mode 100644
index 0000000..630adad
--- /dev/null
+++ b/hubspot-agent-cli/.claude-plugin/plugin.json
@@ -0,0 +1,10 @@
+{
+  "name": "hubspot-agent-cli",
+  "version": "1.0.0",
+  "description": "Skills for using the HubSpot CLI to accomplish CRM tasks — bulk operations, deal management, workflows, and more",
+  "author": {
+    "name": "HubSpot",
+    "email": "developer-experience@hubspot.com"
+  },
+  "repository": "https://github.com/HubSpot/agent-cli"
+}
diff --git a/hubspot-agent-cli/.codex-plugin/plugin.json b/hubspot-agent-cli/.codex-plugin/plugin.json
new file mode 100644
index 0000000..091c1d5
--- /dev/null
+++ b/hubspot-agent-cli/.codex-plugin/plugin.json
@@ -0,0 +1,10 @@
+{
+  "name": "hubspot-agent-cli",
+  "version": "1.0.0",
+  "description": "Skills for using the HubSpot CLI to accomplish CRM tasks — bulk operations, deal management, workflows, and more",
+  "author": {
+    "name": "HubSpot",
+    "email": "developer-experience@hubspot.com"
+  },
+  "skills": "./skills/"
+}
diff --git a/hubspot-agent-cli/bootstrap.sh b/hubspot-agent-cli/bootstrap.sh
new file mode 100644
index 0000000..22a1cb5
--- /dev/null
+++ b/hubspot-agent-cli/bootstrap.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+# Install the HubSpot CLI if it isn't already available.
+
+if command -v hubspot &>/dev/null; then
+  exit 0
+fi
+
+if curl -fsSL --connect-timeout 5 https://install.hubspot.com 2>/dev/null | sh 2>/dev/null; then
+  exit 0
+fi
+
+cat <<'MSG'
+HubSpot CLI auto-install failed.
+
+To install manually:
+  curl -fsSL https://install.hubspot.com | sh
+
+If you are in a cloud/remote session, allowlist these hosts in your
+environment's network-access settings (Custom mode):
+  install.hubspot.com
+  api.hubapi.com
+
+Run /hubspot-agent-cli:hubspot-setup for step-by-step guidance.
+MSG
+exit 0
diff --git a/hubspot-agent-cli/hooks/hooks.json b/hubspot-agent-cli/hooks/hooks.json
new file mode 100644
index 0000000..ea71317
--- /dev/null
+++ b/hubspot-agent-cli/hooks/hooks.json
@@ -0,0 +1,14 @@
+{
+  "hooks": {
+    "SessionStart": [
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "bash ${CLAUDE_PLUGIN_ROOT}/bootstrap.sh"
+          }
+        ]
+      }
+    ]
+  }
+}
diff --git a/hubspot-agent-cli/skills b/hubspot-agent-cli/skills
new file mode 160000
index 0000000..71f2bde
--- /dev/null
+++ b/hubspot-agent-cli/skills
@@ -0,0 +1 @@
+Subproject commit 71f2bdefcc0247b1f378cb98186800dc57b6f6b1