canary-agent 0.1.6 → 0.2.0

package/README.md

@@ -1,16 +1,43 @@
 # canary-agent
 
-API observability SDK for AI agents. Zero-dependency Node.js library that captures HTTP telemetry and structured feedback from AI agent sessions.
+API observability SDK for AI agents. Captures HTTP telemetry and structured feedback from AI agent sessions.
 
-## Install
+## Setup
+
+### Option A: Paste into Claude Code (easiest)
+
+Copy this prompt and paste it into Claude Code:
+
+```
+Install and configure canary-agent for me. Run these two commands:
+
+1. npm install canary-agent
+2. npx canary-setup --api-key PASTE_YOUR_KEY_HERE --local
+
+Then verify that .mcp.json was created with the canary-journal MCP server entry,
+and that ~/.claude/skills/canary-feedback/SKILL.md exists. Tell me when it's ready.
+```
+
+Replace `PASTE_YOUR_KEY_HERE` with your actual API key (`cnry_sk_...`).
+
+### Option B: One command
+
+```bash
+npm install canary-agent && npx canary-setup --api-key cnry_sk_YOUR_KEY --local
+```
+
+This writes `.mcp.json` (MCP server config) and installs the Claude Code skill. Restart Claude Code and you're done.
+
+### Option C: Interactive setup
 
 ```bash
 npm install canary-agent
+npx canary-setup
 ```
 
-## Quick Start
+Walks you through API key, endpoint, config location (Claude Code / Cursor / both), and skill installation.
 
-### As MCP Server (recommended for Claude Code / Cursor)
+### Option D: Manual
 
 Add to your project's `.mcp.json`:
 
@@ -21,108 +48,79 @@ Add to your project's `.mcp.json`:
       "command": "npx",
       "args": ["-y", "canary-agent"],
       "env": {
-        "CANARY_API_KEY": "your_api_key",
-        "CANARY_ENDPOINT": "https://api.canary.dev"
+        "CANARY_API_KEY": "cnry_sk_YOUR_KEY"
       }
     }
   }
 }
 ```
 
-The MCP server provides two tools:
+## What gets installed
 
-- **`canary_annotate`** — Record API observations during your work
-- **`canary_report`** — Submit structured feedback when your task is complete
+| Component | Purpose | Location |
+|-----------|---------|----------|
+| **MCP server** | Provides `canary_annotate` + `canary_report` tools | `.mcp.json` or `~/.claude/mcp.json` |
+| **Skill** | Tells Claude *when and how* to use the tools | `~/.claude/skills/canary-feedback/` |
 
-### As SDK (programmatic)
+Both are needed for Claude Code. The MCP server provides the tools; the skill provides the instructions.
 
-```typescript
-import { init, shutdown, survey } from 'canary-agent';
-
-// Initialize — patches http/https and fetch automatically
-init({
-  apiKey: process.env.CANARY_API_KEY,
-  endpoint: 'https://api.canary.dev',
-});
-
-// All HTTP calls to tracked APIs are now captured automatically
-const res = await fetch('https://api.stripe.com/v1/charges');
+## Setup flags
 
-// Optional: submit manual feedback
-survey({
-  worked: true,
-  context: 'Payment processed successfully',
-  provider: 'stripe',
-});
-
-// At shutdown, auto-reports are generated
-await shutdown();
 ```
+npx canary-setup [options]
 
-## Configuration
-
-| Option | Env Var | Description |
-|--------|---------|-------------|
-| `apiKey` | `CANARY_API_KEY` | Your Canary API key (required, starts with `cnry_sk_`) |
-| `endpoint` | `CANARY_ENDPOINT` | Backend URL (default: `https://api.canary.dev`) |
-| `sessionId` | `CANARY_SESSION_ID` | Link to a specific session |
-| `agentName` | `CANARY_AGENT_NAME` | Identify this agent in multi-agent setups |
-| `autoReport` | — | Auto-generate feedback at shutdown (default: `true`) |
-| `autoFlush` | — | Start periodic flush timer (default: `true`) |
-
-## Session Correlation
-
-Use `runWithSession()` to scope API calls to a session:
+--api-key KEY    Your Canary API key (enables non-interactive mode)
+--local          Write .mcp.json in current directory (default: ~/.claude/mcp.json)
+--cursor         Write config for Cursor (~/.cursor/mcp.json)
+--endpoint URL   Custom backend URL
+--no-skill       Skip skill installation
+```
 
-```typescript
-import { runWithSession } from 'canary-agent';
+## How it works
 
-await runWithSession('skill-execution-42', async () => {
-  // All API calls here are grouped under one session
-  await fetch('https://api.stripe.com/v1/charges', { ... });
-});
+```
+Your agent (Claude Code, Cursor, etc.)
+  ├── canary_annotate  →  saves notes locally (~/.canary/annotations/)
+  └── canary_report    →  submits feedback to Canary backend
+                              ↓
+                         Dashboard shows reports, quality scores, credits
 ```
 
-## MCP Server CLI
+## SDK (programmatic)
 
-```bash
-npx canary-agent --api-key=YOUR_KEY --endpoint=https://api.canary.dev
-```
+For embedding in your own Node.js app:
 
-Or with environment variables:
+```typescript
+import { init, shutdown, survey } from 'canary-agent';
 
-```bash
-CANARY_API_KEY=your_key npx canary-agent
-```
+init({ apiKey: process.env.CANARY_API_KEY });
 
-## Multi-Agent Setup
+// All HTTP calls are now captured automatically
+const res = await fetch('https://api.stripe.com/v1/charges');
 
-Set `CANARY_AGENT_NAME` to identify each agent under a shared API key:
+survey({ worked: true, context: 'Payment processed', provider: 'stripe' });
 
-```json
-{
-  "mcpServers": {
-    "canary-journal": {
-      "command": "npx",
-      "args": ["-y", "canary-agent"],
-      "env": {
-        "CANARY_API_KEY": "shared_team_key",
-        "CANARY_AGENT_NAME": "checkout-agent"
-      }
-    }
-  }
-}
+await shutdown();
 ```
 
 ## OpenClaw Integration
 
-For OpenClaw skills, import the auto-init module:
+For OpenClaw agents, import the auto-init module:
 
 ```typescript
 import 'canary-agent/openclaw';
 ```
 
-This automatically initializes Canary when `OPENCLAW_SESSION_ID` and `CANARY_API_KEY` are set.
+This automatically initializes when `OPENCLAW_SESSION_ID` and `CANARY_API_KEY` are set. HTTP interception works automatically in the OpenClaw process.
+
+## Configuration
+
+| Option | Env Var | Description |
+|--------|---------|-------------|
+| `apiKey` | `CANARY_API_KEY` | Your API key (required, starts with `cnry_sk_`) |
+| `endpoint` | `CANARY_ENDPOINT` | Backend URL (default: production) |
+| `sessionId` | `CANARY_SESSION_ID` | Link to a specific session |
+| `agentName` | `CANARY_AGENT_NAME` | Identify this agent in multi-agent setups |
 
 ## Tracked Providers
 

package/dist/openclaw.cjs

@@ -11,7 +11,7 @@ var sessionId = process.env.OPENCLAW_SESSION_ID;
 if (apiKey && sessionId) {
   _chunkDRKEGQ7Ucjs.init.call(void 0, {
     apiKey,
-    endpoint: process.env.CANARY_ENDPOINT || "https://api.canary.dev"
+    endpoint: process.env.CANARY_ENDPOINT || "https://canary-production-89d8.up.railway.app"
   });
   _chunkDRKEGQ7Ucjs.setFrameworkSession.call(void 0, sessionId);
   const cleanup = () => {

package/dist/openclaw.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/stalapaneni/conductor/workspaces/canary/brasilia-v1/canary/dist/openclaw.cjs","../src/openclaw.ts"],"names":[],"mappings":"AAAA;AACE;AACA;AACA;AACA;AACF,wDAA6B;AAC7B;AACA;ACWA,IAAM,OAAA,EAAS,OAAA,CAAQ,GAAA,CAAI,cAAA;AAC3B,IAAM,UAAA,EAAY,OAAA,CAAQ,GAAA,CAAI,mBAAA;AAE9B,GAAA,CAAI,OAAA,GAAU,SAAA,EAAW;AACvB,EAAA,oCAAA;AAAK,IACH,MAAA;AAAA,IACA,QAAA,EAAU,OAAA,CAAQ,GAAA,CAAI,gBAAA,GAAmB;AAAA,EAC3C,CAAC,CAAA;AACD,EAAA,mDAAA,SAA6B,CAAA;AAE7B,EAAA,MAAM,QAAA,EAAU,CAAA,EAAA,GAAM;AACpB,IAAA,qDAAA,CAAsB;AACtB,IAAA,wCAAA,CAAS,CAAE,KAAA,CAAM,CAAA,EAAA,GAAM;AAAA,IAAC,CAAC,CAAA;AAAA,EAC3B,CAAA;AAEA,EAAA,OAAA,CAAQ,EAAA,CAAG,YAAA,EAAc,OAAO,CAAA;AAChC,EAAA,OAAA,CAAQ,EAAA,CAAG,SAAA,EAAW,OAAO,CAAA;AAC7B,EAAA,OAAA,CAAQ,EAAA,CAAG,QAAA,EAAU,OAAO,CAAA;AAC9B;ADXA;AACE;AACA;AACA;AACF,0JAAC","file":"/Users/stalapaneni/conductor/workspaces/canary/brasilia-v1/canary/dist/openclaw.cjs","sourcesContent":[null,"/**\n * OpenClaw auto-init entry point.\n * Import this module in OpenClaw skills to automatically initialize Canary.\n *\n * Environment variables:\n *   CANARY_API_KEY — required\n *   CANARY_ENDPOINT — backend URL (default: https://api.canary.dev)\n *   OPENCLAW_SESSION_ID — used as framework_session_id\n *   CANARY_AGENT_NAME — agent identifier\n */\n\nimport {\n  clearFrameworkSession,\n  init,\n  shutdown,\n  setFrameworkSession,\n} from \"./index.js\";\n\nconst apiKey = process.env.CANARY_API_KEY;\nconst sessionId = process.env.OPENCLAW_SESSION_ID;\n\nif (apiKey && sessionId) {\n  init({\n    apiKey,\n    endpoint: process.env.CANARY_ENDPOINT || \"https://api.canary.dev\",\n  });\n  setFrameworkSession(sessionId);\n\n  const cleanup = () => {\n    clearFrameworkSession();\n    shutdown().catch(() => {});\n  };\n\n  process.on(\"beforeExit\", cleanup);\n  process.on(\"SIGTERM\", cleanup);\n  process.on(\"SIGINT\", cleanup);\n}\n\nexport { init, shutdown, setFrameworkSession } from \"./index.js\";\n"]}
+{"version":3,"sources":["/Users/stalapaneni/conductor/workspaces/canary/brasilia-v1/canary/dist/openclaw.cjs","../src/openclaw.ts"],"names":[],"mappings":"AAAA;AACE;AACA;AACA;AACA;AACF,wDAA6B;AAC7B;AACA;ACWA,IAAM,OAAA,EAAS,OAAA,CAAQ,GAAA,CAAI,cAAA;AAC3B,IAAM,UAAA,EAAY,OAAA,CAAQ,GAAA,CAAI,mBAAA;AAE9B,GAAA,CAAI,OAAA,GAAU,SAAA,EAAW;AACvB,EAAA,oCAAA;AAAK,IACH,MAAA;AAAA,IACA,QAAA,EAAU,OAAA,CAAQ,GAAA,CAAI,gBAAA,GAAmB;AAAA,EAC3C,CAAC,CAAA;AACD,EAAA,mDAAA,SAA6B,CAAA;AAE7B,EAAA,MAAM,QAAA,EAAU,CAAA,EAAA,GAAM;AACpB,IAAA,qDAAA,CAAsB;AACtB,IAAA,wCAAA,CAAS,CAAE,KAAA,CAAM,CAAA,EAAA,GAAM;AAAA,IAAC,CAAC,CAAA;AAAA,EAC3B,CAAA;AAEA,EAAA,OAAA,CAAQ,EAAA,CAAG,YAAA,EAAc,OAAO,CAAA;AAChC,EAAA,OAAA,CAAQ,EAAA,CAAG,SAAA,EAAW,OAAO,CAAA;AAC7B,EAAA,OAAA,CAAQ,EAAA,CAAG,QAAA,EAAU,OAAO,CAAA;AAC9B;ADXA;AACE;AACA;AACA;AACF,0JAAC","file":"/Users/stalapaneni/conductor/workspaces/canary/brasilia-v1/canary/dist/openclaw.cjs","sourcesContent":[null,"/**\n * OpenClaw auto-init entry point.\n * Import this module in OpenClaw skills to automatically initialize Canary.\n *\n * Environment variables:\n *   CANARY_API_KEY — required\n *   CANARY_ENDPOINT — backend URL (default: https://api.canary.dev)\n *   OPENCLAW_SESSION_ID — used as framework_session_id\n *   CANARY_AGENT_NAME — agent identifier\n */\n\nimport {\n  clearFrameworkSession,\n  init,\n  shutdown,\n  setFrameworkSession,\n} from \"./index.js\";\n\nconst apiKey = process.env.CANARY_API_KEY;\nconst sessionId = process.env.OPENCLAW_SESSION_ID;\n\nif (apiKey && sessionId) {\n  init({\n    apiKey,\n    endpoint: process.env.CANARY_ENDPOINT || \"https://canary-production-89d8.up.railway.app\",\n  });\n  setFrameworkSession(sessionId);\n\n  const cleanup = () => {\n    clearFrameworkSession();\n    shutdown().catch(() => {});\n  };\n\n  process.on(\"beforeExit\", cleanup);\n  process.on(\"SIGTERM\", cleanup);\n  process.on(\"SIGINT\", cleanup);\n}\n\nexport { init, shutdown, setFrameworkSession } from \"./index.js\";\n"]}

package/dist/openclaw.js

@@ -11,7 +11,7 @@ var sessionId = process.env.OPENCLAW_SESSION_ID;
 if (apiKey && sessionId) {
   init({
     apiKey,
-    endpoint: process.env.CANARY_ENDPOINT || "https://api.canary.dev"
+    endpoint: process.env.CANARY_ENDPOINT || "https://canary-production-89d8.up.railway.app"
   });
   setFrameworkSession(sessionId);
   const cleanup = () => {

package/dist/openclaw.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/openclaw.ts"],"sourcesContent":["/**\n * OpenClaw auto-init entry point.\n * Import this module in OpenClaw skills to automatically initialize Canary.\n *\n * Environment variables:\n *   CANARY_API_KEY — required\n *   CANARY_ENDPOINT — backend URL (default: https://api.canary.dev)\n *   OPENCLAW_SESSION_ID — used as framework_session_id\n *   CANARY_AGENT_NAME — agent identifier\n */\n\nimport {\n  clearFrameworkSession,\n  init,\n  shutdown,\n  setFrameworkSession,\n} from \"./index.js\";\n\nconst apiKey = process.env.CANARY_API_KEY;\nconst sessionId = process.env.OPENCLAW_SESSION_ID;\n\nif (apiKey && sessionId) {\n  init({\n    apiKey,\n    endpoint: process.env.CANARY_ENDPOINT || \"https://api.canary.dev\",\n  });\n  setFrameworkSession(sessionId);\n\n  const cleanup = () => {\n    clearFrameworkSession();\n    shutdown().catch(() => {});\n  };\n\n  process.on(\"beforeExit\", cleanup);\n  process.on(\"SIGTERM\", cleanup);\n  process.on(\"SIGINT\", cleanup);\n}\n\nexport { init, shutdown, setFrameworkSession } from \"./index.js\";\n"],"mappings":";;;;;;;;AAkBA,IAAM,SAAS,QAAQ,IAAI;AAC3B,IAAM,YAAY,QAAQ,IAAI;AAE9B,IAAI,UAAU,WAAW;AACvB,OAAK;AAAA,IACH;AAAA,IACA,UAAU,QAAQ,IAAI,mBAAmB;AAAA,EAC3C,CAAC;AACD,sBAAoB,SAAS;AAE7B,QAAM,UAAU,MAAM;AACpB,0BAAsB;AACtB,aAAS,EAAE,MAAM,MAAM;AAAA,IAAC,CAAC;AAAA,EAC3B;AAEA,UAAQ,GAAG,cAAc,OAAO;AAChC,UAAQ,GAAG,WAAW,OAAO;AAC7B,UAAQ,GAAG,UAAU,OAAO;AAC9B;","names":[]}
+{"version":3,"sources":["../src/openclaw.ts"],"sourcesContent":["/**\n * OpenClaw auto-init entry point.\n * Import this module in OpenClaw skills to automatically initialize Canary.\n *\n * Environment variables:\n *   CANARY_API_KEY — required\n *   CANARY_ENDPOINT — backend URL (default: https://api.canary.dev)\n *   OPENCLAW_SESSION_ID — used as framework_session_id\n *   CANARY_AGENT_NAME — agent identifier\n */\n\nimport {\n  clearFrameworkSession,\n  init,\n  shutdown,\n  setFrameworkSession,\n} from \"./index.js\";\n\nconst apiKey = process.env.CANARY_API_KEY;\nconst sessionId = process.env.OPENCLAW_SESSION_ID;\n\nif (apiKey && sessionId) {\n  init({\n    apiKey,\n    endpoint: process.env.CANARY_ENDPOINT || \"https://canary-production-89d8.up.railway.app\",\n  });\n  setFrameworkSession(sessionId);\n\n  const cleanup = () => {\n    clearFrameworkSession();\n    shutdown().catch(() => {});\n  };\n\n  process.on(\"beforeExit\", cleanup);\n  process.on(\"SIGTERM\", cleanup);\n  process.on(\"SIGINT\", cleanup);\n}\n\nexport { init, shutdown, setFrameworkSession } from \"./index.js\";\n"],"mappings":";;;;;;;;AAkBA,IAAM,SAAS,QAAQ,IAAI;AAC3B,IAAM,YAAY,QAAQ,IAAI;AAE9B,IAAI,UAAU,WAAW;AACvB,OAAK;AAAA,IACH;AAAA,IACA,UAAU,QAAQ,IAAI,mBAAmB;AAAA,EAC3C,CAAC;AACD,sBAAoB,SAAS;AAE7B,QAAM,UAAU,MAAM;AACpB,0BAAsB;AACtB,aAAS,EAAE,MAAM,MAAM;AAAA,IAAC,CAAC;AAAA,EAC3B;AAEA,UAAQ,GAAG,cAAc,OAAO;AAChC,UAAQ,GAAG,WAAW,OAAO;AAC7B,UAAQ,GAAG,UAAU,OAAO;AAC9B;","names":[]}

package/dist/setup.cjs

@@ -8,10 +8,95 @@ var import_node_os = require("os");
 var import_node_readline = require("readline");
 var import_meta = {};
 var DEFAULT_ENDPOINT = "https://canary-production-89d8.up.railway.app";
+function parseCliArgs() {
+  const args = process.argv.slice(2);
+  let apiKey = "";
+  let endpoint = "";
+  let local = false;
+  let cursor = false;
+  let skipSkill = false;
+  for (let i = 0; i < args.length; i++) {
+    if (args[i] === "--api-key" && args[i + 1]) apiKey = args[++i];
+    else if (args[i].startsWith("--api-key=")) apiKey = args[i].split("=").slice(1).join("=");
+    else if (args[i] === "--endpoint" && args[i + 1]) endpoint = args[++i];
+    else if (args[i].startsWith("--endpoint=")) endpoint = args[i].split("=").slice(1).join("=");
+    else if (args[i] === "--local") local = true;
+    else if (args[i] === "--cursor") cursor = true;
+    else if (args[i] === "--no-skill") skipSkill = true;
+  }
+  return { apiKey, endpoint, local, cursor, skipSkill, isNonInteractive: !!apiKey };
+}
 function ask(rl, question) {
   return new Promise((resolve) => rl.question(question, resolve));
 }
-async function main() {
+function buildMcpEntry(apiKey, endpoint) {
+  return {
+    command: "npx",
+    args: ["-y", "canary-agent"],
+    env: {
+      CANARY_API_KEY: apiKey || "YOUR_API_KEY_HERE",
+      ...endpoint !== DEFAULT_ENDPOINT ? { CANARY_ENDPOINT: endpoint } : {}
+    }
+  };
+}
+function mergeJsonFile(path, key, serverName, entry) {
+  let existing = {};
+  if ((0, import_node_fs.existsSync)(path)) {
+    try {
+      existing = JSON.parse((0, import_node_fs.readFileSync)(path, "utf8"));
+    } catch {
+    }
+  }
+  const merged = {
+    ...existing,
+    [key]: {
+      ...existing[key] || {},
+      [serverName]: entry
+    }
+  };
+  (0, import_node_fs.writeFileSync)(path, JSON.stringify(merged, null, 2) + "\n");
+}
+function writeClaudeGlobalMcp(apiKey, endpoint) {
+  const claudeDir = (0, import_node_path.join)((0, import_node_os.homedir)(), ".claude");
+  (0, import_node_fs.mkdirSync)(claudeDir, { recursive: true });
+  const configPath = (0, import_node_path.join)(claudeDir, "mcp.json");
+  mergeJsonFile(configPath, "mcpServers", "canary-journal", buildMcpEntry(apiKey, endpoint));
+  return configPath;
+}
+function writeProjectMcp(apiKey, endpoint) {
+  const configPath = (0, import_node_path.join)(process.cwd(), ".mcp.json");
+  mergeJsonFile(configPath, "mcpServers", "canary-journal", buildMcpEntry(apiKey, endpoint));
+  return configPath;
+}
+function writeCursorMcp(apiKey, endpoint) {
+  const cursorDir = (0, import_node_path.join)((0, import_node_os.homedir)(), ".cursor");
+  (0, import_node_fs.mkdirSync)(cursorDir, { recursive: true });
+  const configPath = (0, import_node_path.join)(cursorDir, "mcp.json");
+  mergeJsonFile(configPath, "mcpServers", "canary-journal", buildMcpEntry(apiKey, endpoint));
+  return configPath;
+}
+function installSkill() {
+  try {
+    const thisDir = typeof __dirname !== "undefined" ? __dirname : new URL(".", import_meta.url).pathname;
+    const pkgRoot = (0, import_node_path.join)(thisDir, "..");
+    const skillSrc = (0, import_node_path.join)(pkgRoot, "skills", "canary-feedback");
+    const claudeDir = (0, import_node_path.join)((0, import_node_os.homedir)(), ".claude");
+    const skillDest = (0, import_node_path.join)(claudeDir, "skills", "canary-feedback");
+    if ((0, import_node_fs.existsSync)((0, import_node_path.join)(skillSrc, "SKILL.md"))) {
+      (0, import_node_fs.mkdirSync)(skillDest, { recursive: true });
+      for (const file of ["SKILL.md", "manifest.yaml", "mcp-config.json"]) {
+        const src = (0, import_node_path.join)(skillSrc, file);
+        if ((0, import_node_fs.existsSync)(src)) {
+          (0, import_node_fs.writeFileSync)((0, import_node_path.join)(skillDest, file), (0, import_node_fs.readFileSync)(src, "utf8"));
+        }
+      }
+      return skillDest;
+    }
+  } catch {
+  }
+  return null;
+}
+async function runInteractive() {
   const rl = (0, import_node_readline.createInterface)({ input: process.stdin, output: process.stdout });
   console.log("");
   console.log("  Canary Agent Setup");
@@ -19,93 +104,89 @@ async function main() {
   console.log("");
   const apiKey = await ask(rl, "  Enter your Canary API key (cnry_sk_...): ");
   if (!apiKey.trim()) {
-    console.log("\n  No API key provided. You can set CANARY_API_KEY env var later.");
+    console.log("  No API key provided. You can set CANARY_API_KEY env var later.\n");
   }
-  const customEndpoint = await ask(
-    rl,
-    `  Backend endpoint [${DEFAULT_ENDPOINT}]: `
-  );
+  const customEndpoint = await ask(rl, `  Backend endpoint [${DEFAULT_ENDPOINT}]: `);
   const endpoint = customEndpoint.trim() || DEFAULT_ENDPOINT;
   console.log("");
-  console.log("  Where should the MCP config be written?");
-  console.log("    1) ~/.claude/mcp.json  (global \u2014 works for all projects)");
-  console.log("    2) .mcp.json           (project-local \u2014 current directory only)");
+  console.log("  Where are you using Canary?");
+  console.log("    1) Claude Code (global ~/.claude/mcp.json)");
+  console.log("    2) Claude Code (project .mcp.json)");
+  console.log("    3) Cursor");
+  console.log("    4) All of the above");
   console.log("");
-  const configChoice = await ask(rl, "  Choice [1]: ");
-  const mcpConfig = {
-    mcpServers: {
-      "canary-journal": {
-        command: "npx",
-        args: ["-y", "canary-agent"],
-        env: {
-          CANARY_API_KEY: apiKey.trim() || "YOUR_API_KEY_HERE",
-          ...endpoint !== DEFAULT_ENDPOINT ? { CANARY_ENDPOINT: endpoint } : {}
-        }
-      }
-    }
-  };
-  let configPath;
-  if (configChoice.trim() === "2") {
-    configPath = (0, import_node_path.join)(process.cwd(), ".mcp.json");
+  const choice = await ask(rl, "  Choice [1]: ");
+  const paths = [];
+  const c = choice.trim();
+  if (c === "2") {
+    paths.push(writeProjectMcp(apiKey.trim(), endpoint));
+  } else if (c === "3") {
+    paths.push(writeCursorMcp(apiKey.trim(), endpoint));
+  } else if (c === "4") {
+    paths.push(writeClaudeGlobalMcp(apiKey.trim(), endpoint));
+    paths.push(writeProjectMcp(apiKey.trim(), endpoint));
+    paths.push(writeCursorMcp(apiKey.trim(), endpoint));
   } else {
-    const claudeDir = (0, import_node_path.join)((0, import_node_os.homedir)(), ".claude");
-    (0, import_node_fs.mkdirSync)(claudeDir, { recursive: true });
-    configPath = (0, import_node_path.join)(claudeDir, "mcp.json");
+    paths.push(writeClaudeGlobalMcp(apiKey.trim(), endpoint));
   }
-  let existing = {};
-  if ((0, import_node_fs.existsSync)(configPath)) {
-    try {
-      existing = JSON.parse((0, import_node_fs.readFileSync)(configPath, "utf8"));
-    } catch {
-    }
+  for (const p of paths) {
+    console.log(`  Wrote MCP config: ${p}`);
   }
-  const merged = {
-    ...existing,
-    mcpServers: {
-      ...existing.mcpServers || {},
-      ...mcpConfig.mcpServers
-    }
-  };
-  (0, import_node_fs.writeFileSync)(configPath, JSON.stringify(merged, null, 2) + "\n");
-  console.log(`
-  Wrote MCP config to: ${configPath}`);
   console.log("");
-  const installSkill = await ask(
-    rl,
-    "  Install the canary-feedback skill for Claude Code? (Y/n): "
-  );
-  if (installSkill.trim().toLowerCase() !== "n") {
-    try {
-      const thisDir = typeof __dirname !== "undefined" ? __dirname : new URL(".", import_meta.url).pathname;
-      const pkgRoot = (0, import_node_path.join)(thisDir, "..");
-      const skillSrc = (0, import_node_path.join)(pkgRoot, "skills", "canary-feedback");
-      const claudeDir = (0, import_node_path.join)((0, import_node_os.homedir)(), ".claude");
-      const skillDest = (0, import_node_path.join)(claudeDir, "skills", "canary-feedback");
-      if ((0, import_node_fs.existsSync)((0, import_node_path.join)(skillSrc, "SKILL.md"))) {
-        (0, import_node_fs.mkdirSync)(skillDest, { recursive: true });
-        for (const file of ["SKILL.md", "manifest.yaml", "mcp-config.json"]) {
-          const src = (0, import_node_path.join)(skillSrc, file);
-          if ((0, import_node_fs.existsSync)(src)) {
-            (0, import_node_fs.writeFileSync)((0, import_node_path.join)(skillDest, file), (0, import_node_fs.readFileSync)(src, "utf8"));
-          }
-        }
-        console.log(`  Installed skill to: ${skillDest}`);
-      } else {
-        console.log("  Skill files not found in package. Skipping.");
-      }
-    } catch (err) {
-      console.log(`  Could not install skill: ${err.message}`);
-    }
+  const doSkill = await ask(rl, "  Install the canary-feedback skill for Claude Code? (Y/n): ");
+  if (doSkill.trim().toLowerCase() !== "n") {
+    const dest = installSkill();
+    if (dest) console.log(`  Installed skill: ${dest}`);
+    else console.log("  Skill files not found in package. Skipping.");
+  }
+  rl.close();
+  printDone(paths);
+}
+function runNonInteractive(cli2) {
+  console.log("");
+  console.log("  Canary Agent Setup");
+  console.log("  ==================");
+  console.log("");
+  const endpoint = cli2.endpoint || DEFAULT_ENDPOINT;
+  const paths = [];
+  if (cli2.cursor) {
+    paths.push(writeCursorMcp(cli2.apiKey, endpoint));
+  }
+  if (cli2.local) {
+    paths.push(writeProjectMcp(cli2.apiKey, endpoint));
+  }
+  if (!cli2.local && !cli2.cursor) {
+    paths.push(writeClaudeGlobalMcp(cli2.apiKey, endpoint));
   }
+  for (const p of paths) {
+    console.log(`  Wrote MCP config: ${p}`);
+  }
+  if (!cli2.skipSkill) {
+    const dest = installSkill();
+    if (dest) console.log(`  Installed skill: ${dest}`);
+  }
+  printDone(paths);
+}
+function printDone(paths) {
+  console.log("");
+  console.log("  Setup complete!");
   console.log("");
-  console.log("  Setup complete! Next steps:");
-  console.log("    1. Start Claude Code in any project");
+  console.log("  What was installed:");
+  console.log("    - MCP server config (canary_annotate + canary_report tools)");
+  console.log("    - canary-feedback skill (tells Claude when/how to use the tools)");
+  console.log("");
+  console.log("  Next steps:");
+  console.log("    1. Restart Claude Code / Cursor");
   console.log("    2. The canary-journal MCP server will auto-start");
-  console.log("    3. Claude will use canary_annotate and canary_report tools automatically");
+  console.log("    3. Claude will annotate API calls and submit feedback automatically");
   console.log("");
-  rl.close();
 }
-main().catch((err) => {
-  console.error("Setup failed:", err.message);
-  process.exit(1);
-});
+var cli = parseCliArgs();
+if (cli.isNonInteractive) {
+  runNonInteractive(cli);
+} else {
+  runInteractive().catch((err) => {
+    console.error("Setup failed:", err.message);
+    process.exit(1);
+  });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "canary-agent",
-  "version": "0.1.6",
+  "version": "0.2.0",
   "description": "Canary API observability SDK for Node.js — zero-dependency HTTP telemetry and structured feedback for AI agents",
   "license": "MIT",
   "engines": {