Skip to content

feat: migrate MCP dependencies to CLI-first + Skills architecture#51

Merged
izo merged 3 commits intomainfrom
claude/migrate-mcp-to-cli-skills-UYwo7
Mar 23, 2026
Merged

feat: migrate MCP dependencies to CLI-first + Skills architecture#51
izo merged 3 commits intomainfrom
claude/migrate-mcp-to-cli-skills-UYwo7

Conversation

@izo
Copy link
Copy Markdown
Owner

@izo izo commented Mar 23, 2026

Replace MCP server dependencies with CLI tools and Skills to reduce
context window consumption (MCP injects 40-50% before any useful action).

New files:

  • tools/cli-registry.json: Central registry of 24 CLI tools
  • tools/skills-registry.json: Registry of 12 custom + 4 community skills
  • tools/check-tools.sh: CLI & Skills diagnostic script
  • schemas/cli-registry.schema.json + skills-registry.schema.json
  • agents/_shared/cli-tools-protocol.md: Shared protocol (CLI > MCP)
  • skills/: 12 SKILL.md files (vercel, github, neon, docker, spip, asc,
    figma, shadcn, pgcli, pandoc, productivity, find-skill)

Modified:

  • install.sh: Skills installation, --check-tools, --with-community-skills
  • CLAUDE.md: CLI Tools + Skills sections
  • Agents (bruce, blackemperor, robocop, brigitte, 2b3, steve, deploy:vercel,
    analyze:spip): Added cli-tools-protocol reference and CLI tool sections
  • site/data/commands.json: Added "tools" category

https://claude.ai/code/session_01F1JWMm3AdYUEAqTrNWKXLu

Summary by CodeRabbit

  • New Features

    • CLI-first tool architecture prioritizes command-line utilities over MCP servers to reduce context usage.
    • Custom skills system with 12+ built-in skills installed under ~/.claude/skills.
    • Community skills installation support.
    • Diagnostic commands for verifying tool and skill status.
    • Steve agent for iOS/Swift 6 development and App Store deployment workflows.
  • Documentation

    • Updated agent protocols and CLI tool guidance for developers.
    • Skills discovery and installation documentation.

claude added 3 commits March 22, 2026 23:30
Replace MCP server dependencies with CLI tools and Skills to reduce
context window consumption (MCP injects 40-50% before any useful action).

New files:
- tools/cli-registry.json: Central registry of 24 CLI tools
- tools/skills-registry.json: Registry of 12 custom + 4 community skills
- tools/check-tools.sh: CLI & Skills diagnostic script
- schemas/cli-registry.schema.json + skills-registry.schema.json
- agents/_shared/cli-tools-protocol.md: Shared protocol (CLI > MCP)
- skills/: 12 SKILL.md files (vercel, github, neon, docker, spip, asc,
  figma, shadcn, pgcli, pandoc, productivity, find-skill)

Modified:
- install.sh: Skills installation, --check-tools, --with-community-skills
- CLAUDE.md: CLI Tools + Skills sections
- Agents (bruce, blackemperor, robocop, brigitte, 2b3, steve, deploy:vercel,
  analyze:spip): Added cli-tools-protocol reference and CLI tool sections
- site/data/commands.json: Added "tools" category

https://claude.ai/code/session_01F1JWMm3AdYUEAqTrNWKXLu
- site/index.html: New "CLI & Skills" section with CLI vs MCP comparison,
  recommended tools grid, and skills install commands. Nav link added.
- README.md: CLI Tools & Skills section with rules, recommended CLIs,
  skills list, and diagnostic commands. Version bumped to 3.5.0.
- CHANGELOG.md: v3.5.0 entry documenting full CLI-first migration.
- uninstall.sh: Now detects and removes ulk-* skills from ~/.claude/skills/
- install-remote.sh: Now installs skills from skills/ directory
- diagnostic-skills.sh: New section 9 verifying skills installation
- site/data/commands.json: Version bumped to 3.5.0, tools entries in agentFileMap

https://claude.ai/code/session_01F1JWMm3AdYUEAqTrNWKXLu
… 6, App Store deploy

- Model: sonnet → opus (matches peer orchestrators bruce/blackemperor)
- Phase 0: auto-diagnostic, resume detection, tool verification, context-protocol
- Persistent memory: .claude/agents/steve.md subagent with memory: local
- Swift 6: strict concurrency (actors, Sendable, typed throws, @mainactor)
- Privacy Manifest: PrivacyInfo.xcprivacy template
- Modern extensions: Widgets, Live Activities, App Intents, App Clips
- Phase 8: App Store deployment via asc CLI (signing, TestFlight, submission)
- Roadmap: T-shirt effort estimates (XS/S/M/L/XL) on all tasks
- Updated CLAUDE.md: 5→6 subagents, steve in memory table
- Updated site description: reflects full Apple ecosystem scope

https://claude.ai/code/session_01F1JWMm3AdYUEAqTrNWKXLu
@izo izo merged commit 8bc6eac into main Mar 23, 2026
1 check was pending
@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Mar 23, 2026

Caution

Review failed

The pull request is closed.

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 41382a4c-c67d-48f4-bf24-2ed33f36f050

📥 Commits

Reviewing files that changed from the base of the PR and between 7f2898f and c2c18fd.

📒 Files selected for processing (36)
  • .claude/agents/steve.md
  • CHANGELOG.md
  • CLAUDE.md
  • README.md
  • agents/08-2b3.md
  • agents/10-analyze/spip.md
  • agents/11-deploy/vercel.md
  • agents/11-robocop.md
  • agents/18-blackemperor.md
  • agents/24-brigitte.md
  • agents/25-bruce.md
  • agents/27-steve.md
  • agents/_shared/cli-tools-protocol.md
  • diagnostic-skills.sh
  • install-remote.sh
  • install.sh
  • schemas/cli-registry.schema.json
  • schemas/skills-registry.schema.json
  • site/data/commands.json
  • site/index.html
  • skills/cli-asc/SKILL.md
  • skills/cli-deploy-vercel/SKILL.md
  • skills/cli-docker/SKILL.md
  • skills/cli-figma/SKILL.md
  • skills/cli-github/SKILL.md
  • skills/cli-neon/SKILL.md
  • skills/cli-pandoc/SKILL.md
  • skills/cli-pgcli/SKILL.md
  • skills/cli-productivity/SKILL.md
  • skills/cli-shadcn/SKILL.md
  • skills/cli-spip/SKILL.md
  • skills/ulk-find-skill/SKILL.md
  • tools/check-tools.sh
  • tools/cli-registry.json
  • tools/skills-registry.json
  • uninstall.sh

📝 Walkthrough

Walkthrough

This PR introduces a CLI-first architecture migration from MCP-centric tooling, adds a persistent-memory "steve" agent, establishes a custom skills system (ulk-*), creates tool/skills registries with diagnostic infrastructure, and bumps the version to 3.5.0 with expanded documentation across multiple agent definitions and installation workflows.

Changes

Cohort / File(s) Summary
Persistent Memory Agent (Steve)
.claude/agents/steve.md, agents/27-steve.md
Added persistent-memory layer agent with 9-phase flow (Diagnostic→Audit→API→Architecture→Code→Deploy), Swift 6 strict concurrency focus, App Store deliverables (PrivacyInfo, signing), deployment via asc, and memory state management at ~/.claude/agent-memory-local/steve/MEMORY.md. Changed model from sonnet to opus.
CLI-First Protocol & Tool References
agents/_shared/cli-tools-protocol.md, agents/08-2b3.md, agents/10-analyze/spip.md, agents/11-deploy/vercel.md, agents/11-robocop.md, agents/18-blackemperor.md, agents/24-brigitte.md, agents/25-bruce.md
Introduced shared cli-tools-protocol.md defining CLI priority (over MCP) with fallback selection logic. Updated 8 agent files to reference the protocol, add "Outils" sections with specific CLI tools (gh, vercel, neonctl, spip, etc.), and implement verification via command -v checks with MCP fallback guidance.
CLI & Skills Registries
tools/cli-registry.json, tools/skills-registry.json, schemas/cli-registry.schema.json, schemas/skills-registry.schema.json
Created structured registries for 30+ CLI tools and custom/community skills with metadata (id, command, check, install, replaces_mcp, priority, category) and corresponding JSON Schema definitions for validation. Registries map CLI tools to MCP fallbacks and track skill locations.
Diagnostic & Installation Scripts
tools/check-tools.sh, install.sh, install-remote.sh, uninstall.sh, diagnostic-skills.sh
Added check-tools.sh (231 lines) for comprehensive CLI/skills diagnostics with tabular/compact output. Extended install.sh with --check-tools and --with-community-skills flags, skills installation from ./skills to ~/.claude/skills/ulk-*. Updated installers and uninstaller to manage skills and call diagnostics. Added skills check section 9 to diagnostic-skills.sh.
Custom Skills Documentation
skills/cli-asc/SKILL.md, skills/cli-deploy-vercel/SKILL.md, skills/cli-docker/SKILL.md, skills/cli-figma/SKILL.md, skills/cli-github/SKILL.md, skills/cli-neon/SKILL.md, skills/cli-pandoc/SKILL.md, skills/cli-pgcli/SKILL.md, skills/cli-productivity/SKILL.md, skills/cli-shadcn/SKILL.md, skills/cli-spip/SKILL.md, skills/ulk-find-skill/SKILL.md
Added 12 skill documentation files (asc, vercel, docker, figma, github, neon, pandoc, pgcli, productivity, shadcn, spip, find-skill) with prerequisites, command examples, composition snippets, and optional MCP fallback guidance. Each skill prefixed with ulk- or descriptive identifier.
Version & Documentation Updates
CHANGELOG.md, CLAUDE.md, README.md, site/data/commands.json, site/index.html
Bumped version 3.4.0 → 3.5.0. Updated CLAUDE.md to document CLI/Skills sections, increased Auto Memory agents from 5 to 6 (added steve), added installer notes. Extended README with CLI Tools & Skills section and diagnostic commands. Added new /ulk:tools category with check and list commands. Extended site index with new CLI & Skills landing section (103 lines).

Sequence Diagram(s)

sequenceDiagram
    participant Agent as Steve Agent
    participant FileSystem as ~/.claude/agent-memory-local/steve/
    participant Context as Project Context
    participant SubAgent as Sub-Agent Executor
    
    Agent->>FileSystem: Phase 0: Read MEMORY.md (if exists)
    FileSystem-->>Agent: Return steve_project_state + preferences
    Agent->>Agent: Detect RESUME or scan docs/api/, docs/apple-starter-kit/
    Agent->>Agent: Verify CLI tools (asc, mobicon, xcrun)
    Agent->>Context: Build CONTEXTE PROJET block
    Agent->>SubAgent: Pass context to 9-phase workflow
    SubAgent->>SubAgent: Execute Phases 1-7 (Audit→Deploy)
    SubAgent->>SubAgent: Optional Phase 8: App Store deployment via asc
    SubAgent-->>Agent: Return results + state updates
    Agent->>FileSystem: Update MEMORY.md with project_state + preferences
    FileSystem-->>Agent: Persist memory for next session
Loading
sequenceDiagram
    participant Agent as Agent
    participant CheckCmd as command -v
    participant CLITool as CLI Tool
    participant MCPConfig as /mcp (MCP Config)
    participant User as User Notification
    
    Agent->>CheckCmd: Verify tool presence (e.g., 'gh', 'vercel')
    alt Tool Available
        CheckCmd-->>Agent: ✓ Found
        Agent->>CLITool: Use CLI (prioritized, low context)
    else Tool Not Found
        CheckCmd-->>Agent: ✗ Not found
        Agent->>MCPConfig: Check for configured MCP fallback
        alt MCP Available
            MCPConfig-->>Agent: ✓ MCP configured
            Agent->>Agent: Use MCP (fallback mode)
        else No MCP
            MCPConfig-->>Agent: ✗ No MCP config
            Agent->>User: Notify missing tool & propose installation
        end
    end
Loading

Estimated Code Review Effort

🎯 4 (Complex) | ⏱️ ~60 minutes

This PR involves heterogeneous changes across multiple domains: 12 new skill documentation files, major agent logic rewrites (steve with 9 phases + Swift 6), CLI-first protocol references in 8 agents, complex shell scripts (check-tools.sh with TUI logic and jq-based registry parsing, install.sh with skills installation and branching), JSON registry structures, installer/diagnostic enhancements, and site UI updates. While many skill files follow repetitive patterns, the logic density in diagnostic scripts, installer modifications, and steve's persistent memory control flow demand careful review across distinct codebases.

Possibly Related PRs

Poem

🐰 Steve hops in with seven-phase mighty flow,
CLI tools leading where MCPs used to go,
Skills multiply under ulk- branded names,
Memory persists across sessions—sweet games!
From Vercel to ASC, from gh to the cloud,
Our fuzzy architect stands swift and proud. 🚀

✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch claude/migrate-mcp-to-cli-skills-UYwo7

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants