claude-setup 1.1.9 → 2.0.3

package/dist/commands/add.js

@@ -6,6 +6,7 @@ import { updateManifest } from "../manifest.js";
 import { buildAddCommand } from "../builder.js";
 import { estimateTokens, estimateCost } from "../tokens.js";
 import { c } from "../output.js";
+import { installMarketplaceFetcher } from "./init.js";
 function ensureDir(dir) {
     if (!existsSync(dir))
         mkdirSync(dir, { recursive: true });
@@ -46,6 +47,7 @@ capabilities that need documentation, MCP servers, skills, and hooks together.
     const tokens = estimateTokens(content);
     const cost = estimateCost(tokens);
     ensureDir(".claude/commands");
+    installMarketplaceFetcher();
     writeFileSync(".claude/commands/stack-add.md", content, "utf8");
     await updateManifest("add", collected, {
         input: userInput,

package/dist/commands/init.d.ts

@@ -1,3 +1,5 @@
+/** Install the marketplace-fetcher subagent so /stack-add can spawn it */
+export declare function installMarketplaceFetcher(cwd?: string): void;
 export declare function runInit(opts?: {
     dryRun?: boolean;
     template?: string;

package/dist/commands/init.js

@@ -71,6 +71,71 @@ No further action needed — the output IS the status.
         writeFileSync(filepath, content, "utf8");
     }
 }
+/** Install the marketplace-fetcher subagent so /stack-add can spawn it */
+export function installMarketplaceFetcher(cwd = process.cwd()) {
+    const agentsDir = join(cwd, ".claude", "agents");
+    ensureDir(agentsDir);
+    const filepath = join(agentsDir, "marketplace-fetcher.md");
+    // Always overwrite — this is a system agent, not user-authored
+    writeFileSync(filepath, `---
+name: marketplace-fetcher
+description: Fetches skills and agents from all 4 marketplace catalogs. Spawned automatically by stack-add. Runs in isolation, writes to disk, returns only the install confirmation.
+tools: Bash
+model: haiku
+---
+
+You are a marketplace fetch agent. You receive a prompt containing marketplace instructions with bash code blocks. Your job is to RUN those bash commands, use the output to find matching files, download them, and confirm the install.
+
+## CRITICAL RULES — read before doing anything
+
+1. **You MUST run curl commands.** Your entire purpose is to fetch from remote catalogs. If you finish without running at least 3 curl commands, you have failed.
+2. **NEVER skip to custom creation early.** You may only create custom content after you have attempted ALL catalog steps with real curl calls and each one returned empty or errored.
+3. **Use relative paths only.** Never prepend \`cd /some/path &&\` to commands. You are already in the project directory.
+4. **Pipe curl output through node parsers.** Never let raw JSON/README enter the context. Every curl MUST pipe through \`| node -e "..."\` to extract only the lines you need.
+5. **A curl failure or empty result means: try the next step.** It does NOT mean stop. Log what failed in one line, then continue to the next step.
+6. **Fill in template variables.** The instructions contain placeholder variables like \`CATEGORY="09-meta-orchestration"\` and \`SKILL_DIR="matched-directory"\`. Replace these with ACTUAL values from the previous step's output.
+7. **Verify downloads.** After every curl -o, check the file exists and has >50 characters of content. If empty or stub: delete it, log failure, continue.
+
+## How to execute the instructions
+
+Your prompt contains numbered STEPs with bash code blocks. For each STEP:
+
+1. Run the first bash command (the catalog listing/search)
+2. Read the output — it shows available files/directories
+3. Pick the entry that best matches the user's request
+4. Substitute that entry name into the download command
+5. Run the download command
+6. Verify the downloaded file has real content
+7. If it works → return the success line. If not → go to next STEP.
+
+## Return format
+
+Return exactly ONE line:
+- \`INSTALLED .claude/agents/<file> <bytes>b\` or
+- \`INSTALLED .claude/skills/<dir>/SKILL.md <bytes>b\` or
+- \`CREATED .claude/agents/<file> <bytes>b\` (only after ALL catalogs exhausted) or
+- \`CREATED .claude/skills/<dir>/SKILL.md <bytes>b\` or
+- \`FAILED no match in any catalog and custom creation not possible\`
+
+## Example of correct behavior
+
+If the instructions say:
+\`\`\`bash
+curl -sf "https://api.github.com/repos/X/Y/contents/categories/03-infrastructure" | node -e "..."
+\`\`\`
+And the output shows: \`docker-compose-agent.md\`, \`kubernetes-agent.md\`, \`terraform-agent.md\`
+
+Then for the download command that says \`AGENT_FILE="matched-agent.md"\`, you substitute:
+\`\`\`bash
+AGENT_FILE="kubernetes-agent.md"
+curl -sf "https://raw.githubusercontent.com/X/Y/main/categories/03-infrastructure/kubernetes-agent.md" -o ".claude/agents/kubernetes-agent.md"
+\`\`\`
+
+Then verify: \`wc -c ".claude/agents/kubernetes-agent.md"\`
+
+Now execute the instructions in your prompt. Start with STEP 1 immediately.
+`, "utf8");
+}
 function installTokenHook(cwd = process.cwd()) {
     // Write the hook script
     const hooksDir = join(cwd, ".claude", "hooks");
@@ -139,6 +204,7 @@ export async function runInit(opts = {}) {
         writeFileSync(".claude/commands/stack-init.md", content, "utf8");
         writeFileSync(".claude/commands/stack-sync.md", buildBootstrapSync(), "utf8");
         installBootstrapCommands(".claude/commands");
+        installMarketplaceFetcher();
         await updateManifest("init", collected, { estimatedTokens: tokens, estimatedCost: cost });
         installTokenHook();
         // Create initial snapshot — collectFilesForSnapshot scans all .claude/ automatically
@@ -181,6 +247,7 @@ Claude Code will ask 3 questions, then set up your environment.
     writeFileSync(".claude/commands/stack-init.md", orchestrator, "utf8");
     writeFileSync(".claude/commands/stack-sync.md", buildBootstrapSync(), "utf8");
     installBootstrapCommands(".claude/commands");
+    installMarketplaceFetcher();
     await updateManifest("init", collected, { estimatedTokens: tokens, estimatedCost: cost });
     installTokenHook();
     // Create initial snapshot — collectFilesForSnapshot scans all .claude/ automatically

package/dist/marketplace.js

@@ -48,6 +48,33 @@ export const SAAS_PACKS = [
     "Supabase", "Vercel", "OpenRouter", "GitHub", "Azure", "MongoDB",
     "Playwright", "Tavily", "Stripe", "Slack", "Linear", "Notion",
 ];
+// ── Adjacent category map (for fallback when primary SKIP) ─────────────
+const ADJACENT_CATEGORIES = {
+    "01-core-development": ["02-language-specialists", "06-developer-experience"],
+    "02-language-specialists": ["01-core-development", "06-developer-experience"],
+    "03-infrastructure": ["04-quality-security", "09-meta-orchestration"],
+    "04-quality-security": ["03-infrastructure", "01-core-development"],
+    "05-data-ai": ["10-research-analysis", "07-specialized-domains"],
+    "06-developer-experience": ["01-core-development", "02-language-specialists"],
+    "07-specialized-domains": ["05-data-ai", "08-business-product"],
+    "08-business-product": ["07-specialized-domains", "09-meta-orchestration"],
+    "09-meta-orchestration": ["03-infrastructure", "04-quality-security"],
+    "10-research-analysis": ["05-data-ai", "07-specialized-domains"],
+};
+/** Expand target categories with their adjacent neighbors, deduplicating */
+function expandWithAdjacent(targets) {
+    const seen = new Set(targets);
+    const adjacent = [];
+    for (const cat of targets) {
+        for (const adj of (ADJACENT_CATEGORIES[cat] ?? [])) {
+            if (!seen.has(adj)) {
+                seen.add(adj);
+                adjacent.push(adj);
+            }
+        }
+    }
+    return adjacent;
+}
 // ── Agent detection keywords ────────────────────────────────────────────
 const AGENT_KEYWORDS = [
     "agent", "subagent", "sub-agent", "orchestrat", "multi-agent",
@@ -208,6 +235,49 @@ export function classifyRequest(input) {
         agentCategories: matchAgentCategories(input),
     };
 }
+// ── Query keyword extraction (for inline filtering in node parsers) ─────
+/** Extract meaningful search keywords from user input for inline node filtering */
+function buildQueryRegex(input) {
+    const stopWords = new Set(["a", "an", "the", "and", "or", "for", "to", "in", "of", "with", "add", "install", "setup", "get", "find", "need", "want", "skill", "agent", "plugin", "tool"]);
+    const words = input.toLowerCase()
+        .replace(/[^a-z0-9\s-]/g, "")
+        .split(/\s+/)
+        .filter(w => w.length > 2 && !stopWords.has(w));
+    if (words.length === 0)
+        return "."; // match everything if no keywords
+    return words.join("|");
+}
+/**
+ * Build a universal section-aware README parser as an inline node -e script.
+ * Rules (no hardcoding):
+ *   1. Split README into sections by any heading (## / ### / **Bold**)
+ *   2. Find sections whose heading matches the query keywords
+ *   3. Extract ALL links from matching sections (relative ./ AND absolute github.com)
+ *   4. If no section matches, fall back to all links in the entire README
+ * This works for any README structure — ComposioHQ, VoltAgent, or anything else.
+ */
+function buildSectionAwareParser(queryRegex) {
+    // Each part is carefully escaped for: TypeScript template → bash double-quotes → node -e
+    return (`const t=require('fs').readFileSync(0,'utf8');` +
+        `const q=/${queryRegex}/i;` +
+        // Split by ## headings, ### headings, and **Bold** subsection headers
+        `const secs=t.split(/\\n(?=#{2,3}\\s|\\*\\*[A-Z])/);` +
+        // 1st pass: sections whose heading matches query
+        `let hit=secs.filter(s=>q.test(s.split('\\n')[0]));` +
+        // 2nd pass: if no heading matched, find sections that have a link whose name matches
+        `if(hit.length===0)hit=secs.filter(s=>{const lk=/\\[([^\\]]+)\\]/g;let x;while((x=lk.exec(s))!=null){if(q.test(x[1]))return true}return false});` +
+        // Use matching sections, or fall back to entire README
+        `const src=hit.length>0?hit.join('\\n'):t;` +
+        // Extract all links — relative (./dir/) and absolute (github.com) and SKILL.md
+        `const re=/\\[([^\\]]+)\\]\\(([^)]+)\\)/g;let m;const r=[];` +
+        `while((m=re.exec(src))!=null){` +
+        `const u=m[2];` +
+        `if(u.startsWith('./')||u.includes('github.com')||u.includes('SKILL.md'))` +
+        `r.push(m[1]+' | '+u)` +
+        `}` +
+        `r.slice(0,10).forEach(x=>console.log(x));` +
+        `if(r.length===0)console.log('NO_README_MATCHES')`);
+}
 // ── Marketplace instruction builder ─────────────────────────────────────
 // Implements Rule 6 (4-catalog exhaustion) and Rule 7 (3-stage fetch).
 // Agent requests route to VoltAgent subagents first.
@@ -266,10 +336,12 @@ export function buildMarketplaceInstructions(input) {
 // ── Agent pipeline (VoltAgent subagents → skills fallback) ──────────
 function buildAgentPipeline(lines, input, agentCategories, categoryFilter) {
     const safeName = input.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-|-$/g, '');
+    const queryRegex = buildQueryRegex(input);
     const targetCategories = agentCategories.length > 0
         ? agentCategories
         : ["09-meta-orchestration"];
     // ── STEP 1: VoltAgent/awesome-claude-code-subagents ──────────────
+    const adjacentCategories = expandWithAdjacent(targetCategories);
     lines.push(`---`);
     lines.push(``);
     lines.push(`### STEP 1 — VoltAgent subagents (PRIMARY source for agents — 127+ specialized agents)`);
@@ -277,52 +349,74 @@ function buildAgentPipeline(lines, input, agentCategories, categoryFilter) {
     lines.push(`This is the preferred source for anything agent-shaped. 10 categories, 127+ agents.`);
     lines.push(`If a match is found here, install to \`.claude/agents/\` (NOT .claude/skills/).`);
     lines.push(``);
-    lines.push(`**1a. List agent files in the matched categories:**`);
-    lines.push(`If any curl below fails, skip to the next category or STEP 2 immediately.`);
+    lines.push(`**1a. List agent files in the primary categories:**`);
     lines.push(``);
     for (const cat of targetCategories) {
         lines.push(`\`\`\`bash`);
-        lines.push(`# Category: ${cat}`);
+        lines.push(`# Primary category: ${cat}`);
         lines.push(`curl -sf \${GITHUB_TOKEN:+-H "Authorization: token \$GITHUB_TOKEN"} "${VOLTAGENT_SUBAGENTS_API}/${cat}" \\`);
         lines.push(`  | node -e "const d=JSON.parse(require('fs').readFileSync(0,'utf8'));` +
-            `if(!Array.isArray(d)){console.log('SKIP');process.exit(0)}` +
-            `d.filter(x=>x.name.endsWith('.md')&&x.name!=='README.md').forEach(x=>console.log(x.name))"`);
+            `if(Array.isArray(d)===false){console.log('SKIP');process.exit(0)}` +
+            `d.filter(x=>x.name.endsWith('.md')&&(x.name==='README.md')===false).forEach(x=>console.log(x.name))"`);
         lines.push(`\`\`\``);
         lines.push(``);
     }
-    lines.push(`**1b. From the file list above, pick the BEST match for "${input}".**`);
-    lines.push(`Match by name and relevance. If multiple candidates exist, pick the closest one.`);
+    if (adjacentCategories.length > 0) {
+        lines.push(`**1b. If ALL primary categories above returned SKIP, try adjacent categories:**`);
+        lines.push(`Do NOT skip this step. A SKIP in the primary category does NOT mean VoltAgent has no match.`);
+        lines.push(``);
+        for (const cat of adjacentCategories) {
+            lines.push(`\`\`\`bash`);
+            lines.push(`# Adjacent category: ${cat}`);
+            lines.push(`curl -sf \${GITHUB_TOKEN:+-H "Authorization: token \$GITHUB_TOKEN"} "${VOLTAGENT_SUBAGENTS_API}/${cat}" \\`);
+            lines.push(`  | node -e "const d=JSON.parse(require('fs').readFileSync(0,'utf8'));` +
+                `if(Array.isArray(d)===false){console.log('SKIP');process.exit(0)}` +
+                `d.filter(x=>x.name.endsWith('.md')&&(x.name==='README.md')===false).forEach(x=>console.log(x.name))"`);
+            lines.push(`\`\`\``);
+            lines.push(``);
+        }
+    }
+    lines.push(`**1c. From ALL file lists above (primary + adjacent), pick the BEST match for "${input}".**`);
+    lines.push(`Pick the filename closest to the request. If multiple candidates: pick the first relevant one.`);
     lines.push(``);
-    lines.push(`**1c. Download the matched agent file (3-stage resolution — this is stage 3):**`);
+    lines.push(`**1d. Download and verify the matched agent file (single step):**`);
     lines.push(`\`\`\`bash`);
-    lines.push(`# Replace CATEGORY and AGENT_FILE with actual values from 1a/1b`);
+    lines.push(`# Replace CATEGORY and AGENT_FILE with actual values from 1a-1c`);
     lines.push(`CATEGORY="${targetCategories[0]}"`);
     lines.push(`AGENT_FILE="matched-agent.md"`);
     lines.push(`mkdir -p ".claude/agents"`);
     lines.push(`curl -sf "${VOLTAGENT_SUBAGENTS_RAW}/\${CATEGORY}/\${AGENT_FILE}" \\`);
-    lines.push(`  -o ".claude/agents/\${AGENT_FILE}"`);
+    lines.push(`  -o ".claude/agents/\${AGENT_FILE}" && wc -c ".claude/agents/\${AGENT_FILE}"`);
     lines.push(`\`\`\``);
+    lines.push(`If >50 bytes: agent is installed. Return the success line.`);
+    lines.push(`If empty or 0 bytes: delete it, log the failure, try README fallback below.`);
+    lines.push(``);
+    lines.push(`**1f. README-driven fallback — if ALL category listings (primary + adjacent) returned SKIP:**`);
+    lines.push(`You MUST run this before moving to STEP 2. The README contains the full agent listing.`);
     lines.push(``);
-    lines.push(`**1d. Verify the file has real content (Rule 7 — must not be empty):**`);
     lines.push(`\`\`\`bash`);
-    lines.push(`# File must have frontmatter (---) and body content`);
-    lines.push(`head -3 ".claude/agents/\${AGENT_FILE}"`);
-    lines.push(`wc -l ".claude/agents/\${AGENT_FILE}"`);
+    lines.push(`# Fetch README — parser finds sections matching your query, extracts all links`);
+    lines.push(`curl -sf "https://raw.githubusercontent.com/${VOLTAGENT_SUBAGENTS_REPO}/main/README.md" \\`);
+    lines.push(`  | node -e "${buildSectionAwareParser(queryRegex)}"`);
     lines.push(`\`\`\``);
-    lines.push(`If the file is empty or just frontmatter with no body: delete it, log the failure, continue to STEP 2.`);
-    lines.push(`If the file has real content: agent is installed. Skip to "Install result format" below.`);
     lines.push(``);
-    lines.push(`**README-driven fallback:** If a category listing returns a README.md instead of agent files,`);
-    lines.push(`parse the README for entries with links. Entries may point to external repos — follow them`);
-    lines.push(`using the universal URL resolution rules (extract {owner}/{repo} dynamically from the link).`);
-    lines.push(`Navigate the foreign repo to locate the agent .md file and download it.`);
+    lines.push(`From the output, pick the FIRST entry. Extract the URL (after " | "). Resolve it:`);
+    lines.push(`- If URL starts with \`./\`: it is relative to the repo root. Prepend \`https://raw.githubusercontent.com/${VOLTAGENT_SUBAGENTS_REPO}/main/\``);
+    lines.push(`- If URL contains \`github.com/OWNER/REPO/blob/BRANCH/\`: replace with \`raw.githubusercontent.com/OWNER/REPO/BRANCH/\``);
+    lines.push(`- If URL contains \`github.com/OWNER/REPO/tree/BRANCH/\`: use API \`api.github.com/repos/OWNER/REPO/contents/PATH\` to list files, then download the .md file`);
+    lines.push(`Then download:`);
+    lines.push(`\`\`\`bash`);
+    lines.push(`mkdir -p ".claude/agents"`);
+    lines.push(`curl -sf "RESOLVED_URL" -o ".claude/agents/AGENT_FILE.md" && wc -c ".claude/agents/AGENT_FILE.md"`);
+    lines.push(`\`\`\``);
+    lines.push(`If >50 bytes: installed. If empty or NO_README_MATCHES: continue to STEP 2.`);
     lines.push(``);
     // ── STEP 2: jeremylongshore community skills (fallback for agents) ─
     lines.push(`---`);
     lines.push(``);
     lines.push(`### STEP 2 — Community skills catalog (fallback — 416 plugins)`);
     lines.push(``);
-    lines.push(`Only reach here if STEP 1 found no match.`);
+    lines.push(`**Before continuing:** Document in one line why STEP 1 produced no result.`);
     lines.push(`Search for agent-like skills in the community catalog.`);
     lines.push(`If curl fails, skip to STEP 3.`);
     lines.push(``);
@@ -332,7 +426,7 @@ function buildAgentPipeline(lines, input, agentCategories, categoryFilter) {
     lines.push(``);
     lines.push(`### STEP 3 — ComposioHQ service integrations (1000+ skills — fallback)`);
     lines.push(``);
-    lines.push(`Only reach here if STEP 1 and 2 found no match.`);
+    lines.push(`**Before continuing:** Document in one line why STEPs 1 and 2 produced no result.`);
     lines.push(`Strong for API and SaaS automation. Skills live in per-directory SKILL.md files.`);
     lines.push(`If curl fails, skip to STEP 4.`);
     lines.push(``);
@@ -365,6 +459,7 @@ function buildAgentPipeline(lines, input, agentCategories, categoryFilter) {
 // ── Skill pipeline (community → VoltAgent skills → ComposioHQ) ──────
 function buildSkillPipeline(lines, input, categoryFilter, saasMatches) {
     const safeName = input.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-|-$/g, '');
+    const queryRegex = buildQueryRegex(input);
     // ── STEP 1: Official Anthropic plugins ────────────────────────────
     lines.push(`---`);
     lines.push(``);
@@ -392,35 +487,55 @@ function buildSkillPipeline(lines, input, categoryFilter, saasMatches) {
     lines.push(``);
     lines.push(`### STEP 3 — VoltAgent curated agent skills (production-proven)`);
     lines.push(``);
-    lines.push(`Only reach here if STEP 2 found no match.`);
+    lines.push(`**Before continuing:** Document in one line why STEP 2 produced no result.`);
     lines.push(`Curated real-world skills from engineering teams. If curl fails, skip to STEP 4.`);
     lines.push(``);
     lines.push(`\`\`\`bash`);
     lines.push(`curl -sf \${GITHUB_TOKEN:+-H "Authorization: token \$GITHUB_TOKEN"} "${VOLTAGENT_SKILLS_API}" \\`);
     lines.push(`  | node -e "const d=JSON.parse(require('fs').readFileSync(0,'utf8'));` +
-        `if(!Array.isArray(d)){console.log('SKIP');process.exit(0)}` +
-        `d.filter(x=>x.type==='dir'&&!x.name.startsWith('.')).forEach(x=>console.log(x.name))"`);
+        `if(Array.isArray(d)===false){console.log('SKIP');process.exit(0)}` +
+        `const q=/${queryRegex}/i;` +
+        `const all=d.filter(x=>x.type==='dir'&&(x.name[0]==='.')===false).map(x=>x.name);` +
+        `const matched=all.filter(n=>q.test(n));` +
+        `const out=matched.length>0?matched:all;` +
+        `out.slice(0,10).forEach(x=>console.log(x))"`);
     lines.push(`\`\`\``);
-    lines.push(`If any directory name matches "${input}", fetch its SKILL.md:`);
+    lines.push(`Pick the FIRST directory from output that matches "${input}" and download:`);
     lines.push(`\`\`\`bash`);
+    lines.push(`# Replace SKILL_DIR with the actual directory name from the listing above`);
     lines.push(`SKILL_DIR="matched-skill"`);
     lines.push(`mkdir -p ".claude/skills/\${SKILL_DIR}"`);
     lines.push(`curl -sf "https://raw.githubusercontent.com/${VOLTAGENT_SKILLS_REPO}/main/\${SKILL_DIR}/SKILL.md" \\`);
     lines.push(`  -o ".claude/skills/\${SKILL_DIR}/SKILL.md"`);
+    lines.push(`wc -c ".claude/skills/\${SKILL_DIR}/SKILL.md"`);
+    lines.push(`\`\`\``);
+    lines.push(`If >50 bytes: installed. If empty: delete and try README fallback below.`);
+    lines.push(``);
+    lines.push(`**README-driven fallback:** If the API listing above returned SKIP or no match:`);
+    lines.push(``);
+    lines.push(`\`\`\`bash`);
+    lines.push(`# Fetch README — parser finds sections matching your query, extracts all links`);
+    lines.push(`curl -sf "https://raw.githubusercontent.com/${VOLTAGENT_SKILLS_REPO}/main/README.md" \\`);
+    lines.push(`  | node -e "${buildSectionAwareParser(queryRegex)}"`);
     lines.push(`\`\`\``);
-    lines.push(`Verify content is real (not empty). If empty, delete and continue.`);
     lines.push(``);
-    lines.push(`**README-driven fallback:** If the API returns a single file (README.md) instead of a directory listing,`);
-    lines.push(`parse its markdown sections for entries matching "${input}". Entries may link to external repos owned by`);
-    lines.push(`different authors — follow those links using the universal URL resolution rules above (extract {owner}/{repo}`);
-    lines.push(`dynamically, never hardcode). Navigate the foreign repo to find the installable .md file and download it.`);
+    lines.push(`From the output, pick the FIRST entry. Extract the URL (after " | "). Resolve it:`);
+    lines.push(`- If URL starts with \`./\`: prepend \`https://raw.githubusercontent.com/${VOLTAGENT_SKILLS_REPO}/main/\``);
+    lines.push(`- If URL contains \`github.com/OWNER/REPO/blob/BRANCH/\`: replace with \`raw.githubusercontent.com/OWNER/REPO/BRANCH/\``);
+    lines.push(`- If URL contains \`github.com/OWNER/REPO/tree/BRANCH/\`: use API to list files, then download the SKILL.md`);
+    lines.push(`\`\`\`bash`);
+    lines.push(`SKILL_DIR="matched-skill"`);
+    lines.push(`mkdir -p ".claude/skills/\${SKILL_DIR}"`);
+    lines.push(`curl -sf "RESOLVED_URL" -o ".claude/skills/\${SKILL_DIR}/SKILL.md" && wc -c ".claude/skills/\${SKILL_DIR}/SKILL.md"`);
+    lines.push(`\`\`\``);
+    lines.push(`If >50 bytes: installed. If empty or NO_README_MATCHES: continue to next STEP.`);
     lines.push(``);
     // ── STEP 4: ComposioHQ service integrations ───────────────────────
     lines.push(`---`);
     lines.push(``);
     lines.push(`### STEP 4 — ComposioHQ service integrations (1000+ skills)`);
     lines.push(``);
-    lines.push(`Only reach here if STEPs 2+3 found no match.`);
+    lines.push(`**Before continuing:** Document in one line why STEPs 2 and 3 produced no result.`);
     lines.push(`Strong for API/SaaS automation: Gmail, Slack, GitHub, Notion, Stripe, Shopify, etc.`);
     lines.push(`If curl fails, skip to STEP 5.`);
     lines.push(``);
@@ -482,7 +597,16 @@ function buildUniversalRulesBlock(lines) {
     lines.push(`- **Uniqueness**: does it duplicate something already installed in .claude/skills/ or .claude/agents/? Deprioritize duplicates.`);
     lines.push(`Install only the highest-scoring candidate. One high-quality tool per task.`);
     lines.push(``);
-    lines.push(`**5. Content verification — never keep stubs:**`);
+    lines.push(`**5. No absolute paths — never \`cd\` before commands:**`);
+    lines.push(`Claude Code already runs in the project working directory. Do NOT prepend \`cd /absolute/path &&\` to any command.`);
+    lines.push(`Use relative paths only (e.g., \`.claude/agents/\`, \`.claude/skills/\`). Absolute paths with backslashes break bash on Windows.`);
+    lines.push(``);
+    lines.push(`**6. Output filtering — cap context cost:**`);
+    lines.push(`Every curl result MUST be piped through a node parser that returns at most 5–15 lines of structured data.`);
+    lines.push(`The raw JSON/README response must NEVER enter the context unfiltered.`);
+    lines.push(`Chain multiple sequential fetch decisions inside a single bash script so they execute as one tool call.`);
+    lines.push(``);
+    lines.push(`**7. Content verification — never keep stubs:**`);
     lines.push(`After downloading any file, verify ALL of these before accepting:`);
     lines.push(`- Not empty (0 bytes)`);
     lines.push(`- Not only YAML frontmatter with no body (just \`---\\nname: x\\n---\` and nothing after)`);
@@ -492,68 +616,83 @@ function buildUniversalRulesBlock(lines) {
 }
 // ── Shared fetch blocks ─────────────────────────────────────────────────
 function buildCommunitySkillsFetchBlock(lines, categoryFilter) {
-    lines.push(`**Stage 1 — Fetch catalog and find matching plugin:**`);
+    lines.push(`**Stage 1 — Fetch catalog and find matching plugins (compact output — one line per match):**`);
     lines.push(`\`\`\`bash`);
     lines.push(`curl -sf "${MARKETPLACE_CATALOG_URL}" \\`);
     lines.push(`  | node -e "const d=JSON.parse(require('fs').readFileSync(0,'utf8'));` +
-        `const q='${categoryFilter}';` +
-        `const r=d.plugins.filter(p=>(q===''||p.category.includes(q))&&p.name&&p.source).slice(0,10)` +
-        `.map(p=>({name:p.name,source:p.source,desc:p.description}));` +
-        `console.log(JSON.stringify(r,null,2));"`);
+        `const q='${categoryFilter}'.replace(/^\\\\d+-/,'');` +
+        `const r=d.plugins.filter(p=>(q===''||p.category.includes(q)||q.includes(p.category))&&p.name&&p.source).slice(0,10);` +
+        `r.forEach(p=>console.log(p.name+' | '+p.source));` +
+        `if(r.length===0)console.log('NO_PLUGINS')"`);
     lines.push(`\`\`\``);
-    lines.push(`If this returns an error or empty array, skip to the next STEP.`);
+    lines.push(`If NO_PLUGINS or error: skip to next STEP.`);
     lines.push(``);
-    lines.push(`**Stage 2 — Score candidates and pick the best match (see rule 4: Relevance > Scope > Uniqueness):**`);
+    lines.push(`**Stage 2 — Pick the FIRST match from output. Extract the source path (after " | "). List its skills:**`);
     lines.push(`\`\`\`bash`);
     lines.push(`# Replace PLUGIN_SOURCE_PATH with the "source" value from Stage 1`);
     lines.push(`PLUGIN_SOURCE_PATH="plugins/category/plugin-name"`);
     lines.push(`curl -sf \${GITHUB_TOKEN:+-H "Authorization: token \$GITHUB_TOKEN"} "https://api.github.com/repos/${MARKETPLACE_REPO}/contents/\${PLUGIN_SOURCE_PATH}/skills" \\`);
     lines.push(`  | node -e "const a=JSON.parse(require('fs').readFileSync(0,'utf8'));` +
-        `if(!Array.isArray(a)){console.log('NO_SKILLS_DIR');process.exit(0)}` +
+        `if(Array.isArray(a)===false){console.log('NO_SKILLS_DIR');process.exit(0)}` +
         `a.forEach(x=>console.log(x.name))"`);
     lines.push(`\`\`\``);
-    lines.push(`If this fails or shows NO_SKILLS_DIR, the plugin has no installable skills — skip.`);
+    lines.push(`If NO_SKILLS_DIR: try the next plugin from Stage 1, or skip to next STEP.`);
     lines.push(``);
-    lines.push(`**Stage 3 — Download each skill file and install:**`);
+    lines.push(`**Stage 3 — Download the skill file:**`);
     lines.push(`\`\`\`bash`);
-    lines.push(`# Replace PLUGIN_SOURCE_PATH and SKILL_NAME with actual values`);
+    lines.push(`# Replace PLUGIN_SOURCE_PATH and SKILL_NAME with actual values from above`);
     lines.push(`PLUGIN_SOURCE_PATH="plugins/category/plugin-name"`);
     lines.push(`SKILL_NAME="skill-directory-name"`);
     lines.push(`mkdir -p ".claude/skills/\${SKILL_NAME}"`);
     lines.push(`curl -sf "https://raw.githubusercontent.com/${MARKETPLACE_REPO}/main/\${PLUGIN_SOURCE_PATH}/skills/\${SKILL_NAME}/SKILL.md" \\`);
     lines.push(`  -o ".claude/skills/\${SKILL_NAME}/SKILL.md"`);
+    lines.push(`wc -c ".claude/skills/\${SKILL_NAME}/SKILL.md"`);
     lines.push(`\`\`\``);
-    lines.push(`Verify the file has real content (not empty, not just frontmatter). If empty: delete and move on.`);
+    lines.push(`If >50 bytes: installed. If empty: delete and move on to next plugin or next STEP.`);
     lines.push(``);
 }
 function buildComposioFetchBlock(lines, input) {
-    lines.push(`**Stage 1 — List available skill directories:**`);
+    const queryRegex = buildQueryRegex(input);
+    lines.push(`**Stage 1 — List available skill directories and filter by query:**`);
     lines.push(`\`\`\`bash`);
     lines.push(`curl -sf \${GITHUB_TOKEN:+-H "Authorization: token \$GITHUB_TOKEN"} "${COMPOSIO_API}" \\`);
     lines.push(`  | node -e "const d=JSON.parse(require('fs').readFileSync(0,'utf8'));` +
-        `if(!Array.isArray(d)){console.log('SKIP');process.exit(0)}` +
-        `d.filter(x=>x.type==='dir'&&!x.name.startsWith('.')).forEach(x=>console.log(x.name))"`);
+        `if(Array.isArray(d)===false){console.log('SKIP');process.exit(0)}` +
+        `const q=/${queryRegex}/i;` +
+        `const all=d.filter(x=>x.type==='dir'&&(x.name[0]==='.')===false).map(x=>x.name);` +
+        `const matched=all.filter(n=>q.test(n));` +
+        `const out=matched.length>0?matched:all;` +
+        `out.slice(0,10).forEach(x=>console.log(x))"`);
     lines.push(`\`\`\``);
     lines.push(``);
-    lines.push(`**Stage 2 — Pick the directory that best matches "${input}":**`);
-    lines.push(`Match by name similarity. If no directory name is relevant, skip.`);
-    lines.push(``);
-    lines.push(`**Stage 3 — Download the SKILL.md from the matched directory:**`);
+    lines.push(`**Stage 2 — Pick the FIRST directory from the output that matches "${input}" and download:**`);
     lines.push(`\`\`\`bash`);
+    lines.push(`# Replace SKILL_DIR with the actual directory name from Stage 1 output`);
     lines.push(`SKILL_DIR="matched-directory"`);
     lines.push(`mkdir -p ".claude/skills/\${SKILL_DIR}"`);
     lines.push(`curl -sf "${COMPOSIO_RAW}/\${SKILL_DIR}/SKILL.md" \\`);
     lines.push(`  -o ".claude/skills/\${SKILL_DIR}/SKILL.md"`);
+    lines.push(`wc -c ".claude/skills/\${SKILL_DIR}/SKILL.md"`);
+    lines.push(`\`\`\``);
+    lines.push(`If >50 bytes: installed. If empty: delete and try README fallback below.`);
+    lines.push(``);
+    lines.push(`**README-driven fallback:** If the directory listing returned SKIP or no match:`);
+    lines.push(``);
+    lines.push(`\`\`\`bash`);
+    lines.push(`# Fetch README — parser finds sections matching your query, extracts all links`);
+    lines.push(`curl -sf "https://raw.githubusercontent.com/${COMPOSIO_REPO}/master/README.md" \\`);
+    lines.push(`  | node -e "${buildSectionAwareParser(queryRegex)}"`);
     lines.push(`\`\`\``);
-    lines.push(`Verify the file has real content (rule 5 above). If empty: delete and move on.`);
     lines.push(``);
-    lines.push(`**README-driven fallback:** If the directory listing above fails or returns unexpected content,`);
-    lines.push(`fetch the repo's README.md and parse it for sections matching "${input}":`);
+    lines.push(`From the output, pick the FIRST entry. Extract the URL (after " | "). Resolve it:`);
+    lines.push(`- If URL starts with \`./\`: prepend \`https://raw.githubusercontent.com/${COMPOSIO_REPO}/master/\` and append \`SKILL.md\` if the URL is a directory`);
+    lines.push(`- If URL contains \`github.com/OWNER/REPO/blob/BRANCH/\`: replace with \`raw.githubusercontent.com/OWNER/REPO/BRANCH/\``);
+    lines.push(`- If URL contains \`github.com/OWNER/REPO/tree/BRANCH/\`: use API to list files, then download the SKILL.md`);
     lines.push(`\`\`\`bash`);
-    lines.push(`# Derive owner/repo dynamically from the catalog source — never hardcode`);
-    lines.push(`curl -sf "https://raw.githubusercontent.com/${COMPOSIO_REPO}/master/README.md" | head -300`);
+    lines.push(`SKILL_DIR="matched-skill"`);
+    lines.push(`mkdir -p ".claude/skills/\${SKILL_DIR}"`);
+    lines.push(`curl -sf "RESOLVED_URL" -o ".claude/skills/\${SKILL_DIR}/SKILL.md" && wc -c ".claude/skills/\${SKILL_DIR}/SKILL.md"`);
     lines.push(`\`\`\``);
-    lines.push(`Scan sections for entries with external links. Follow those links using universal URL resolution`);
-    lines.push(`(rule 2+3 above) to download from the linked repo, regardless of its owner.`);
+    lines.push(`If >50 bytes: installed. If empty or NO_README_MATCHES: continue to next STEP.`);
     lines.push(``);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-setup",
-  "version": "1.1.9",
+  "version": "2.0.3",
   "description": "Setup layer for Claude Code — reads your project, writes command files, Claude Code does the rest",
   "type": "module",
   "bin": {

package/templates/add.md

@@ -30,8 +30,32 @@ Skills: {{SKILLS_LIST}} | Commands: {{COMMANDS_LIST}}
 
 ---
 
+## Marketplace search — AUTOMATICALLY spawn the marketplace-fetcher subagent
+
+**MANDATORY:** For any request that involves installing a skill, agent, plugin, or integration,
+you MUST use the Agent tool to spawn the `marketplace-fetcher` subagent. Do NOT run catalog
+fetches in your own context. Do NOT ask the user whether to spawn — just do it.
+
+**How to spawn:** Use the Agent tool with these parameters:
+- `description`: "Fetch and install: {{USER_INPUT}}"
+- `prompt`: Copy the ENTIRE marketplace instructions block below (between the `BEGIN` and `END` markers) as the subagent's task prompt.
+
+The subagent runs in isolation on Haiku: it fetches catalogs, parses READMEs, downloads files to disk,
+and returns exactly one confirmation line. Its context dies when it finishes — zero catalog bloat
+enters your session. This cuts API calls from ~113 to ~6 and cache-read tokens from ~4.8M to ~180K.
+
+**Only skip the subagent** if the request is purely a single-file edit (add one MCP server to .mcp.json,
+add a hook to settings.json, or append to CLAUDE.md) with no catalog search needed.
+
+--- BEGIN MARKETPLACE INSTRUCTIONS (pass this entire block to the subagent) ---
+
 {{MARKETPLACE_INSTRUCTIONS}}
 
+--- END MARKETPLACE INSTRUCTIONS ---
+
+After the subagent returns its one-line result, continue to the post-install steps below.
+If the subagent returned `FAILED`, create a production-quality custom skill/agent yourself.
+
 ---
 
 ## What you must actually do