diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
new file mode 100644
index 0000000..06db950
--- /dev/null
+++ b/.claude-plugin/marketplace.json
@@ -0,0 +1,14 @@
+{
+  "name": "glassflow",
+  "owner": {
+    "name": "GlassFlow",
+    "url": "https://github.com/glassflow"
+  },
+  "plugins": [
+    {
+      "name": "glassflow-connect-agent",
+      "source": "./.claude-plugin/plugins/glassflow-connect-agent",
+      "description": "Mint an API key, install the SDK, wire it into your agent, and see your first trace — all in one command."
+    }
+  ]
+}
diff --git a/.claude-plugin/plugins/glassflow-connect-agent/plugin.json b/.claude-plugin/plugins/glassflow-connect-agent/plugin.json
new file mode 100644
index 0000000..dea42d3
--- /dev/null
+++ b/.claude-plugin/plugins/glassflow-connect-agent/plugin.json
@@ -0,0 +1,5 @@
+{
+  "name": "glassflow-connect-agent",
+  "version": "0.1.0",
+  "description": "Connect a Python agent repo to GlassFlow observability end-to-end: API key, SDK install, instrumentation, first trace, UI link."
+}
diff --git a/.claude-plugin/plugins/glassflow-connect-agent/skills/glassflow-connect-agent/SKILL.md b/.claude-plugin/plugins/glassflow-connect-agent/skills/glassflow-connect-agent/SKILL.md
new file mode 100644
index 0000000..d7d3b6f
--- /dev/null
+++ b/.claude-plugin/plugins/glassflow-connect-agent/skills/glassflow-connect-agent/SKILL.md
@@ -0,0 +1,98 @@
+---
+name: glassflow-connect-agent
+description: Connect this repo's agent to GlassFlow observability — mints an API key, installs the SDK, wires it into your code, runs your agent, and shows you your first trace in the UI.
+---
+
+# Connect this agent to GlassFlow
+
+Run this procedure top to bottom. Do not skip the admin check before attempting to create a key — a non-admin call is a wasted round trip you can avoid by checking first.
+
+## 1. Check for an existing key
+
+Look for `GLASSFLOW_API_KEY` in this repo's `.env` file (or already set in the shell environment). If it's already there, tell the user you found an existing key and are skipping key creation — but still proceed to step 2 and run its role check and workspace-id capture (needed for step 10's handoff link), just skip sub-steps 2a/2b (minting or requesting a key). Note that step 2's org-less stop condition still applies even with an existing key: a user with a stale key but now no organization (or a pending invite) must still stop there, not proceed.
+
+## 2. Check the caller's role
+
+Call the `get_me` MCP tool. Read the Workspaces table (you may have to come back to it once a key is minted — see 2a — since a caller with multiple workspaces can't tell from this table alone which one `create_api_key` will use). Read its `**Organization**` section:
+
+- If it says `none (you have not joined an organization yet)` — **stop here**. Tell the user: "You don't belong to a workspace yet — if someone invited you, accept that invite link first, then re-run this skill." Do not proceed to any key step.
+- If a key already exists (step 1) — skip 2a/2b, but still resolve the workspace id needed for step 10: if the Workspaces table has exactly one row, use its `id`; if it has more than one, ask the user which workspace they're using, then use that row's `id`.
+- If the role shown is `admin` — proceed to 2a.
+- If the role shown is `member` (or anything other than `admin`) — proceed to 2b.
+
+### 2a. Admin: mint a key
+
+Call the `create_api_key` MCP tool with no arguments (uses the caller's default workspace). Its response either starts with `"Created a new API key in workspace '"` (success — extract the plaintext key from the text after `"Save it now — it will not be shown again:"`, which appears as plaintext on the line following a blank line) or with `"You need admin access"` / contains `"Workspace not found"` (treat these as stop conditions and relay the message verbatim; the role check above means the admin-message case should be rare, but the tool can still return it, e.g. if role changed between the check and the call).
+
+On success, take the workspace name from `create_api_key`'s own message (`"Created a new API key in workspace '<name>'"`) and match it to the same-named row in the Workspaces table from step 2 — use **that row's** `id` for step 10. Do not use an id noted from an earlier ambiguous multi-row read: if the caller belongs to more than one workspace, only the name echoed back by `create_api_key` tells you which workspace the key actually landed in.
+
+State to the user, plainly: `Created a new API key in workspace '<name>' and I'm about to save it to .env as GLASSFLOW_API_KEY.`
+
+### 2b. Non-admin: ask for a key
+
+Tell the user: `You're a member (not an admin) in workspace '<name>', so I can't mint a key myself — paste an existing API key below (ask a workspace admin if you don't have one), or press Enter to skip and add it yourself later.`
+
+Wait for their reply.
+- If they paste a key: state `Saving the key you gave me to .env as GLASSFLOW_API_KEY.`
+- If they skip: tell them clearly that `.env` will not get a `GLASSFLOW_API_KEY` line, and that the rest of this skill (SDK install, entrypoint patch) will still run, but the run/verify steps later will not produce a trace until a real key is added. Do not fabricate a placeholder key.
+
+## 3. Install the SDK
+
+Detect the project's package manager by which file exists at the repo root, in this order: `uv.lock` → `uv add glassflow-ai`; `pyproject.toml` (no `uv.lock`) → `pip install glassflow-ai` inside the project's existing venv if one is active, otherwise `pip install glassflow-ai`; `Pipfile` → `pipenv install glassflow-ai`; `requirements.txt` or none of the above → `pip install glassflow-ai`. Run the chosen command and show its output.
+
+## 4. Write `.env`
+
+Determine `GLASSFLOW_SERVICE_NAME` as the repo's directory name, lowercased, with anything that isn't `[a-z0-9-]` replaced by `-`.
+
+If `.env` exists, append only the lines below that aren't already present (never overwrite existing lines, and never duplicate one that's already there):
+```
+GLASSFLOW_API_KEY=<key from step 2, if one was obtained>
+GLASSFLOW_SERVICE_NAME=<computed name>
+GLASSFLOW_HEARTBEAT=true
+```
+If `.env` doesn't exist, create it with just those lines. If no key was obtained (user skipped in step 2b), omit the `GLASSFLOW_API_KEY` line entirely and say so.
+
+State the exact file path you wrote to, e.g. `Wrote /path/to/repo/.env`.
+
+## 5. Find the entrypoint
+
+Look for `AGENTS.md` or `CLAUDE.md` at the repo root first. If either exists, read it for an explicit description of the project's entrypoint or main script — use whatever it names.
+
+If neither exists or neither names an entrypoint clearly, fall back to a heuristic scan of the repo root (not subdirectories) for `main.py` or `app.py`, in that order. If both exist, or neither exists, ask the user: "Which file is your agent's entrypoint?"
+
+## 6. Patch the entrypoint
+
+Near the top of the entrypoint file (after its existing imports), insert:
+```python
+import glassflow
+glassflow.init(service_name="<GLASSFLOW_SERVICE_NAME from step 4>")
+```
+
+Then find the function that looks like the agent's main entry — the function called from `if __name__ == "__main__":`, or if there's no such guard, the sole top-level function that takes a string argument shaped like a query/prompt. Add `@observe` immediately above its `def` line (import `observe` from `glassflow` alongside `glassflow` itself: `from glassflow import observe`). Decorate exactly one function. If no single obvious candidate exists, ask the user which function to decorate rather than guessing.
+
+Show the user a before/after diff of the entrypoint file.
+
+## 7. Ask for a run command
+
+Ask the user: "What command runs your agent or your eval set?" Accept any shell command (e.g. `python main.py`, `pytest tests/eval`).
+
+## 8. Run it
+
+Execute the given command with the repo's `.env` loaded into the environment. Stream its output back to the user as-is, including failures. If it exits non-zero, stop here — report the failure and do not proceed to verification, since there is nothing to verify.
+
+## 9. Verify a trace arrived
+
+Call the `list_agent_traces` MCP tool with `service=<GLASSFLOW_SERVICE_NAME>` and `hours=1`. If its response is `_No results._`, wait 5 seconds and try again, up to 6 total attempts (~30 seconds).
+
+- If a trace shows up (the response is a markdown table with at least one row): proceed to handoff.
+- If still empty after 6 attempts: tell the user a trace didn't arrive, and list the likely causes: network egress to the SDK's configured endpoint may be blocked, the command run in step 8 may not be the one that actually executes the patched entrypoint, or an exception may have prevented any span from closing (point them back at the step 8 output). Do not print a UI link in this case.
+
+## 10. Hand off
+
+Print:
+- The UI link: `https://<ui-host>/w/<workspaceId>/traces?service=<GLASSFLOW_SERVICE_NAME>` (substitute the `workspaceId` resolved in step 2/2a; `<ui-host>` has no fixed value — fill in the UI host the user or operator gives you for this deployment).
+- One note about `.env` not being auto-loaded: their app won't pick up `GLASSFLOW_API_KEY` (or the other vars) on its own next run — they need to either add `python-dotenv`'s `load_dotenv()` call near their entrypoint's other imports, or export the vars in their shell first (e.g. `set -a; source .env; set +a`).
+- These example prompts to try next, verbatim:
+  - "Summarize my agent's traces from the last hour"
+  - "Show me the slowest trace from that run"
+  - "Did any of those spans error?"
diff --git a/README.md b/README.md
index 68e0c08..01d822e 100644
--- a/README.md
+++ b/README.md
@@ -66,6 +66,23 @@ glassflow.init(mask=lambda value, *, key: hash_pii(value) if "input" in key else
 glassflow.init(capture_content=False)             # drop content entirely, keep metadata
 ```
 
+## Claude Code integration
+
+The `glassflow-connect-agent` plugin drives the whole setup above end-to-end
+inside Claude Code — it mints an API key, installs the SDK, patches your
+entrypoint, runs your agent, and confirms your first trace.
+
+```
+/plugin marketplace add glassflow/glassflow-python
+/plugin install glassflow-connect-agent
+```
+
+Then invoke it in a Claude Code session with:
+
+```
+/glassflow-connect-agent
+```
+
 ## Auto-instrumentation
 
 The SDK bundles existing OTel instrumentors (OpenInference) as optional extras,
diff --git a/examples/connect-agent-smoke-with-agents-md/AGENTS.md b/examples/connect-agent-smoke-with-agents-md/AGENTS.md
new file mode 100644
index 0000000..22d3028
--- /dev/null
+++ b/examples/connect-agent-smoke-with-agents-md/AGENTS.md
@@ -0,0 +1,3 @@
+# Sample agent
+
+Entrypoint: `run.py`. Run with `python run.py`.
diff --git a/examples/connect-agent-smoke-with-agents-md/main.py b/examples/connect-agent-smoke-with-agents-md/main.py
new file mode 100644
index 0000000..452bf20
--- /dev/null
+++ b/examples/connect-agent-smoke-with-agents-md/main.py
@@ -0,0 +1,4 @@
+"""Deliberately misleadingly-named file: NOT the entrypoint (AGENTS.md names run.py).
+Exists to prove the skill reads AGENTS.md instead of guessing main.py."""
+
+raise SystemExit("this file should never be executed by the skill")
diff --git a/examples/connect-agent-smoke-with-agents-md/requirements.txt b/examples/connect-agent-smoke-with-agents-md/requirements.txt
new file mode 100644
index 0000000..70bb09f
--- /dev/null
+++ b/examples/connect-agent-smoke-with-agents-md/requirements.txt
@@ -0,0 +1 @@
+glassflow-ai
diff --git a/examples/connect-agent-smoke-with-agents-md/run.py b/examples/connect-agent-smoke-with-agents-md/run.py
new file mode 100644
index 0000000..642cbfc
--- /dev/null
+++ b/examples/connect-agent-smoke-with-agents-md/run.py
@@ -0,0 +1,6 @@
+def handle(query: str) -> str:
+    return f"you asked: {query}"
+
+
+if __name__ == "__main__":
+    print(handle("what's on the agenda today"))
diff --git a/examples/connect-agent-smoke/main.py b/examples/connect-agent-smoke/main.py
new file mode 100644
index 0000000..38abb0e
--- /dev/null
+++ b/examples/connect-agent-smoke/main.py
@@ -0,0 +1,9 @@
+"""Tiny sample agent used to manually verify the glassflow-connect-agent skill end to end."""
+
+
+def handle(query: str) -> str:
+    return f"you asked: {query}"
+
+
+if __name__ == "__main__":
+    print(handle("what's the weather like"))
diff --git a/examples/connect-agent-smoke/requirements.txt b/examples/connect-agent-smoke/requirements.txt
new file mode 100644
index 0000000..70bb09f
--- /dev/null
+++ b/examples/connect-agent-smoke/requirements.txt
@@ -0,0 +1 @@
+glassflow-ai