feat: add MCP healthcheck probes and new templates (grafana, home-assistant, node-red)

- Add healthCheck spec to templates and servers (tool, arguments, interval, timeout, failureThreshold)
- Add healthStatus, lastHealthCheck, events fields to instances
- Create grafana, home-assistant, node-red templates with healthcheck probes
- Add healthcheck probes to existing templates (github, slack, postgres, jira)
- Show HEALTH column in `get instances` and Events section in `describe instance`
- Display healthCheck details in `describe server` and `describe template`
- Schema + storage + display only; actual probe runner is future work

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

.dockerignore

@@ -0,0 +1,15 @@
+node_modules
+*/node_modules
+**/node_modules
+dist
+**/dist
+.git
+.taskmaster
+.claude
+*.md
+!pnpm-workspace.yaml
+.env
+.env.*
+deploy/docker-compose.yml
+src/cli
+src/mcplocal

.gitea/workflows/ci.yml

@@ -0,0 +1,142 @@
+name: CI
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: pnpm/action-setup@v4
+        with:
+          version: 9
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: pnpm
+
+      - run: pnpm install --frozen-lockfile
+
+      - name: Lint
+        run: pnpm lint
+
+  typecheck:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: pnpm/action-setup@v4
+        with:
+          version: 9
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: pnpm
+
+      - run: pnpm install --frozen-lockfile
+
+      - name: Generate Prisma client
+        run: pnpm --filter @mcpctl/db exec prisma generate
+
+      - name: Typecheck
+        run: pnpm typecheck
+
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: pnpm/action-setup@v4
+        with:
+          version: 9
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: pnpm
+
+      - run: pnpm install --frozen-lockfile
+
+      - name: Generate Prisma client
+        run: pnpm --filter @mcpctl/db exec prisma generate
+
+      - name: Run tests
+        run: pnpm test:run
+
+  build:
+    runs-on: ubuntu-latest
+    needs: [lint, typecheck, test]
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: pnpm/action-setup@v4
+        with:
+          version: 9
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: pnpm
+
+      - run: pnpm install --frozen-lockfile
+
+      - name: Generate Prisma client
+        run: pnpm --filter @mcpctl/db exec prisma generate
+
+      - name: Build all packages
+        run: pnpm build
+
+  package:
+    runs-on: ubuntu-latest
+    needs: [build]
+    if: github.ref == 'refs/heads/main' && github.event_name == 'push'
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: pnpm/action-setup@v4
+        with:
+          version: 9
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: pnpm
+
+      - run: pnpm install --frozen-lockfile
+
+      - name: Generate Prisma client
+        run: pnpm --filter @mcpctl/db exec prisma generate
+
+      - name: Build TypeScript
+        run: pnpm build
+
+      - name: Install bun
+        uses: oven-sh/setup-bun@v2
+
+      - name: Install nfpm
+        run: |
+          curl -sL -o /tmp/nfpm.tar.gz "https://github.com/goreleaser/nfpm/releases/download/v2.45.0/nfpm_2.45.0_Linux_x86_64.tar.gz"
+          tar xzf /tmp/nfpm.tar.gz -C /usr/local/bin nfpm
+
+      - name: Bundle standalone binary
+        run: bun build src/cli/src/index.ts --compile --outfile dist/mcpctl
+
+      - name: Build RPM
+        run: nfpm pkg --packager rpm --target dist/
+
+      - name: Publish to Gitea packages
+        env:
+          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+        run: |
+          RPM_FILE=$(ls dist/mcpctl-*.rpm | head -1)
+          curl --fail -X PUT \
+            -H "Authorization: token ${GITEA_TOKEN}" \
+            --upload-file "$RPM_FILE" \
+            "${{ github.server_url }}/api/packages/${{ github.repository_owner }}/rpm/upload"

.gitignore

@@ -9,6 +9,8 @@ dist/
 .env
 .env.local
 .env.*.local
+stack/.env
+.portainer_password
 
 # Logs
 logs/

.taskmaster/docs/prd-v2-architecture.md

@@ -0,0 +1,272 @@
+# mcpctl v2 - Corrected 3-Tier Architecture PRD
+
+## Overview
+
+mcpctl is a kubectl-inspired system for managing MCP (Model Context Protocol) servers. It consists of 4 components arranged in a 3-tier architecture:
+
+```
+Claude Code
+    |
+    v (stdio - MCP protocol)
+mcplocal (Local Daemon - runs on developer machine)
+    |
+    v (HTTP REST)
+mcpd (External Daemon - runs on server/NAS)
+    |
+    v (Docker API / K8s API)
+mcp_servers (MCP server containers)
+```
+
+## Components
+
+### 1. mcpctl (CLI Tool)
+- **Package**: `src/cli/` (`@mcpctl/cli`)
+- **What it is**: kubectl-like CLI for managing the entire system
+- **Talks to**: mcplocal (local daemon) via HTTP REST
+- **Key point**: mcpctl does NOT talk to mcpd directly. It always goes through mcplocal.
+- **Distributed as**: RPM package via Gitea registry (bun compile + nfpm)
+- **Commands**: get, describe, apply, setup, instance, claude, project, backup, restore, config, status
+
+### 2. mcplocal (Local Daemon)
+- **Package**: `src/local-proxy/` (rename to `src/mcplocal/`)
+- **What it is**: Local daemon running on the developer's machine
+- **Talks to**: mcpd (external daemon) via HTTP REST
+- **Exposes to Claude**: MCP protocol via stdio (tools, resources, prompts)
+- **Exposes to mcpctl**: HTTP REST API for management commands
+
+**Core responsibility: LLM Pre-processing**
+
+This is the intelligence layer. When Claude asks for data from MCP servers, mcplocal:
+
+1. Receives Claude's request (e.g., "get Slack messages about security")
+2. Uses a local/cheap LLM (Gemini CLI binary, Ollama, vLLM, DeepSeek API) to interpret what Claude actually wants
+3. Sends narrow, filtered requests to mcpd which forwards to the actual MCP servers
+4. Receives raw results from MCP servers (via mcpd)
+5. Uses the local LLM again to filter/summarize results - extracting only what's relevant
+6. Returns the smallest, most comprehensive response to Claude
+
+**Why**: Claude Code tokens are expensive. Instead of dumping 500 Slack messages into Claude's context window, mcplocal uses a cheap LLM to pre-filter to the 12 relevant ones.
+
+**LLM Provider Strategy** (already partially exists):
+- Gemini CLI binary (local, free)
+- Ollama (local, free)
+- vLLM (local, free)
+- DeepSeek API (cheap)
+- OpenAI API (fallback)
+- Anthropic API (fallback)
+
+**Additional mcplocal responsibilities**:
+- MCP protocol routing (namespace tools: `slack/send_message`, `jira/create_issue`)
+- Connection health monitoring for upstream MCP servers
+- Caching frequently requested data
+- Proxying mcpctl management commands to mcpd
+
+### 3. mcpd (External Daemon)
+- **Package**: `src/mcpd/` (`@mcpctl/mcpd`)
+- **What it is**: Server-side daemon that runs on centralized infrastructure (Synology NAS, cloud server, etc.)
+- **Deployed via**: Docker Compose (Dockerfile + docker-compose.yml)
+- **Database**: PostgreSQL for state, audit logs, access control
+
+**Core responsibilities**:
+- **Deploy and run MCP server containers** (Docker now, Kubernetes later)
+- **Instance lifecycle management**: start, stop, restart, logs, inspect
+- **MCP server registry**: Store server definitions, configuration templates, profiles
+- **Project management**: Group MCP profiles into projects for Claude sessions
+- **Auditing**: Log every operation - who ran what, when, with what result
+- **Access management**: Users, sessions, permissions - who can access which MCP servers
+- **Credential storage**: MCP servers often need API tokens (Slack, Jira, GitHub) - stored securely on server side, never exposed to local machine
+- **Backup/restore**: Export and import configuration
+
+**Key point**: mcpd holds the credentials. When mcplocal asks mcpd to query Slack, mcpd runs the Slack MCP server container with the proper SLACK_TOKEN injected - mcplocal never sees the token.
+
+### 4. mcp_servers (MCP Server Containers)
+- **What they are**: The actual MCP server processes (Slack, Jira, GitHub, Terraform, filesystem, postgres, etc.)
+- **Managed by**: mcpd via Docker/Podman API
+- **Network**: Isolated network, only accessible by mcpd
+- **Credentials**: Injected by mcpd as environment variables
+- **Communication**: MCP protocol (stdio or SSE/HTTP) between mcpd and the containers
+
+## Data Flow Examples
+
+### Example 1: Claude asks for Slack messages
+```
+Claude: "Get messages about security incidents from the last week"
+    |
+    v (MCP tools/call: slack/search_messages)
+mcplocal:
+    1. Intercepts the tool call
+    2. Calls local Gemini: "User wants security incident messages from last week.
+       Generate optimal Slack search query and date filters."
+    3. Gemini returns: query="security incident OR vulnerability OR CVE", after="2024-01-15"
+    4. Sends filtered request to mcpd
+    |
+    v (HTTP POST /api/v1/mcp/proxy)
+mcpd:
+    1. Looks up Slack MCP instance (injects SLACK_TOKEN)
+    2. Forwards narrowed query to Slack MCP server container
+    3. Returns raw results (200 messages)
+    |
+    v (response)
+mcplocal:
+    1. Receives 200 messages
+    2. Calls local Gemini: "Filter these 200 Slack messages. Keep only those
+       directly about security incidents. Return message IDs and 1-line summaries."
+    3. Gemini returns: 15 relevant messages with summaries
+    4. Returns filtered result to Claude
+    |
+    v (MCP response: 15 messages instead of 200)
+Claude: processes only the relevant 15 messages
+```
+
+### Example 2: mcpctl management command
+```
+$ mcpctl get servers
+    |
+    v (HTTP GET)
+mcplocal:
+    1. Recognizes this is a management command (not MCP data)
+    2. Proxies directly to mcpd (no LLM processing needed)
+    |
+    v (HTTP GET /api/v1/servers)
+mcpd:
+    1. Queries PostgreSQL for server definitions
+    2. Returns list
+    |
+    v (proxied response)
+mcplocal -> mcpctl -> formatted table output
+```
+
+### Example 3: mcpctl instance management
+```
+$ mcpctl instance start slack
+    |
+    v
+mcplocal -> mcpd:
+    1. Creates Docker container for Slack MCP server
+    2. Injects SLACK_TOKEN from secure storage
+    3. Connects to isolated mcp-servers network
+    4. Logs audit entry: "user X started slack instance"
+    5. Returns instance status
+```
+
+## What Already Exists (completed work)
+
+### Done and reusable as-is:
+- Project structure: pnpm monorepo, TypeScript strict mode, Vitest, ESLint
+- Database schema: Prisma + PostgreSQL (User, McpServer, McpProfile, Project, McpInstance, AuditLog)
+- mcpd server framework: Fastify 5, routes, services, repositories, middleware
+- mcpd MCP server CRUD: registration, profiles, projects
+- mcpd Docker container management: dockerode, instance lifecycle
+- mcpd audit logging, health monitoring, metrics, backup/restore
+- mcpctl CLI framework: Commander.js, commands, config, API client, formatters
+- mcpctl RPM distribution: bun compile, nfpm, Gitea publishing, shell completions
+- MCP protocol routing in local-proxy: namespace tools, resources, prompts
+- LLM provider abstractions: OpenAI, Anthropic, Ollama adapters (defined but unused)
+- Shared types and profile templates
+
+### Needs rework:
+- mcpctl currently talks to mcpd directly -> must talk to mcplocal instead
+- local-proxy is just a dumb router -> needs LLM pre-processing intelligence
+- local-proxy has no HTTP API for mcpctl -> needs REST endpoints for management proxying
+- mcpd has no MCP proxy endpoint -> needs endpoint that mcplocal can call to execute MCP tool calls on managed instances
+- No integration between LLM providers and MCP request/response pipeline
+
+## New Tasks Needed
+
+### Phase 1: Rename and restructure local-proxy -> mcplocal
+- Rename `src/local-proxy/` to `src/mcplocal/`
+- Update all package references and imports
+- Add HTTP REST server (Fastify) alongside existing stdio server
+- mcplocal needs TWO interfaces: stdio for Claude, HTTP for mcpctl
+
+### Phase 2: mcplocal management proxy
+- Add REST endpoints that mirror mcpd's API (get servers, instances, projects, etc.)
+- mcpctl config changes: `daemonUrl` now points to mcplocal (e.g., localhost:3200) instead of mcpd
+- mcplocal proxies management requests to mcpd (configurable `mcpdUrl` e.g., http://nas:3100)
+- Pass-through with no LLM processing for management commands
+
+### Phase 3: mcpd MCP proxy endpoint
+- Add `/api/v1/mcp/proxy` endpoint to mcpd
+- Accepts: `{ serverId, method, params }` - execute an MCP tool call on a managed instance
+- mcpd looks up the instance, connects to the container, executes the MCP call, returns result
+- This is how mcplocal talks to MCP servers without needing direct Docker access
+
+### Phase 4: LLM pre-processing pipeline in mcplocal
+- Create request interceptor in mcplocal's MCP router
+- Before forwarding `tools/call` to mcpd, run the request through LLM for interpretation
+- After receiving response from mcpd, run through LLM for filtering/summarization
+- LLM provider selection based on config (prefer local/cheap models)
+- Configurable: enable/disable pre-processing per server or per tool
+- Bypass for simple operations (list, create, delete - no filtering needed)
+
+### Phase 5: Smart context optimization
+- Token counting: estimate how many tokens the raw response would consume
+- Decision logic: if raw response < threshold, skip LLM filtering (not worth the latency)
+- If raw response > threshold, filter with LLM
+- Cache LLM filtering decisions for repeated similar queries
+- Metrics: track tokens saved, latency added by filtering
+
+### Phase 6: mcpctl -> mcplocal migration
+- Update mcpctl's default daemonUrl to point to mcplocal (localhost:3200)
+- Update all CLI commands to work through mcplocal proxy
+- Add `mcpctl config set mcpd-url <url>` for configuring upstream mcpd
+- Add `mcpctl config set mcplocal-url <url>` for configuring local daemon
+- Health check: `mcpctl status` shows both mcplocal and mcpd connectivity
+- Shell completions update if needed
+
+### Phase 7: End-to-end integration testing
+- Test full flow: mcpctl -> mcplocal -> mcpd -> mcp_server -> response -> LLM filter -> Claude
+- Test management commands pass through correctly
+- Test LLM pre-processing reduces context window size
+- Test credential isolation (mcplocal never sees MCP server credentials)
+- Test health monitoring across all tiers
+
+## Authentication & Authorization
+
+### Database ownership
+- **mcpd owns the database** (PostgreSQL). It is the only component that talks to the DB.
+- mcplocal has NO database. It is stateless (config file only).
+- mcpctl has NO database. It stores user credentials locally in `~/.mcpctl/config.yaml`.
+
+### Auth flow
+```
+mcpctl login
+    |
+    v (user enters mcpd URL + credentials)
+mcpctl stores API token in ~/.mcpctl/config.yaml
+    |
+    v (passes token to mcplocal config)
+mcplocal authenticates to mcpd using Bearer token on every request
+    |
+    v (Authorization: Bearer <token>)
+mcpd validates token against Session table in PostgreSQL
+    |
+    v (authenticated request proceeds)
+```
+
+### mcpctl responsibilities
+- `mcpctl login` command: prompts user for mcpd URL and credentials (username/password or API token)
+- `mcpctl login` calls mcpd's auth endpoint to get a session token
+- Stores the token in `~/.mcpctl/config.yaml` (or `~/.mcpctl/credentials` with restricted permissions)
+- Passes the token to mcplocal (either via config or as startup argument)
+- `mcpctl logout` command: invalidates the session token
+
+### mcplocal responsibilities
+- Reads auth token from its config (set by mcpctl)
+- Attaches `Authorization: Bearer <token>` header to ALL requests to mcpd
+- If mcpd returns 401, mcplocal returns appropriate error to mcpctl/Claude
+- Does NOT store credentials itself - they come from mcpctl's config
+
+### mcpd responsibilities
+- Owns User and Session tables
+- Provides auth endpoints: `POST /api/v1/auth/login`, `POST /api/v1/auth/logout`
+- Validates Bearer tokens on every request via auth middleware (already exists)
+- Returns 401 for invalid/expired tokens
+- Audit logs include the authenticated user
+
+## Non-functional Requirements
+- mcplocal must start fast (developer's machine, runs per-session or as daemon)
+- LLM pre-processing must not add more than 2-3 seconds latency
+- If local LLM is unavailable, fall back to passing data through unfiltered
+- All components must be independently deployable and testable
+- mcpd must remain stateless (outside of DB) and horizontally scalable

.taskmaster/tasks/tasks.json

@@ -307,7 +307,7 @@
         "dependencies": [
           "4"
         ],
-        "status": "pending",
+        "status": "done",
         "subtasks": [
           {
             "id": 1,
@@ -367,7 +367,8 @@
             "testStrategy": "Run full integration test suite. Verify coverage >85% for project-related files.",
             "parentId": "undefined"
           }
-        ]
+        ],
+        "updatedAt": "2026-02-21T04:30:43.622Z"
       },
       {
         "id": "6",
@@ -380,7 +381,7 @@
           "3",
           "4"
         ],
-        "status": "pending",
+        "status": "done",
         "subtasks": [
           {
             "id": 1,
@@ -465,7 +466,8 @@
             "testStrategy": "Unit tests for getLogs. Integration test: run container, tail logs, verify output.",
             "parentId": "undefined"
           }
-        ]
+        ],
+        "updatedAt": "2026-02-21T04:52:51.544Z"
       },
       {
         "id": "7",
@@ -514,8 +516,9 @@
         "dependencies": [
           "7"
         ],
-        "status": "pending",
-        "subtasks": []
+        "status": "done",
+        "subtasks": [],
+        "updatedAt": "2026-02-21T04:55:53.675Z"
       },
       {
         "id": "9",
@@ -528,8 +531,9 @@
           "7",
           "4"
         ],
-        "status": "pending",
-        "subtasks": []
+        "status": "done",
+        "subtasks": [],
+        "updatedAt": "2026-02-21T05:14:48.368Z"
       },
       {
         "id": "10",
@@ -542,8 +546,9 @@
           "7",
           "5"
         ],
-        "status": "pending",
-        "subtasks": []
+        "status": "done",
+        "subtasks": [],
+        "updatedAt": "2026-02-21T05:17:02.390Z"
       },
       {
         "id": "11",
@@ -555,8 +560,9 @@
         "dependencies": [
           "1"
         ],
-        "status": "pending",
-        "subtasks": []
+        "status": "done",
+        "subtasks": [],
+        "updatedAt": "2026-02-21T05:00:28.388Z"
       },
       {
         "id": "12",
@@ -568,8 +574,74 @@
         "dependencies": [
           "11"
         ],
-        "status": "pending",
-        "subtasks": []
+        "status": "done",
+        "subtasks": [
+          {
+            "id": 1,
+            "title": "Create main.ts entry point with configuration loading",
+            "description": "Implement the main.ts entry point that reads proxy configuration from file or CLI arguments, initializes upstreams based on config, and boots the StdioProxyServer.",
+            "dependencies": [],
+            "details": "Create src/local-proxy/src/main.ts that: 1) Parses command-line arguments (--config flag for JSON config path, or individual --upstream flags), 2) Loads ProxyConfig from JSON file if specified, 3) Instantiates StdioUpstream or HttpUpstream for each UpstreamConfig based on transport type, 4) Calls start() on each StdioUpstream to spawn child processes, 5) Adds all upstreams to McpRouter via addUpstream(), 6) Creates StdioProxyServer with the router and calls start(), 7) Handles SIGTERM/SIGINT for graceful shutdown calling router.closeAll(). Use a simple arg parser or process.argv directly. Export a main() function and call it when run directly.",
+            "status": "done",
+            "testStrategy": "Test config file loading with valid/invalid JSON. Test CLI argument parsing. Integration test: spawn proxy with mock upstream config and verify it starts and responds to initialize request.",
+            "parentId": "undefined",
+            "updatedAt": "2026-02-21T05:05:48.624Z"
+          },
+          {
+            "id": 2,
+            "title": "Add resource forwarding support to McpRouter",
+            "description": "Extend McpRouter to handle resources/list and resources/read methods, forwarding them to upstream servers with proper namespacing similar to tools.",
+            "dependencies": [
+              1
+            ],
+            "details": "Modify src/local-proxy/src/router.ts to: 1) Add a resourceToServer Map similar to toolToServer, 2) Create discoverResources() method that calls resources/list on each upstream and aggregates results with namespaced URIs (e.g., 'servername://resource'), 3) Add 'resources' to capabilities in initialize response, 4) Handle 'resources/list' in route() by calling discoverResources(), 5) Handle 'resources/read' by parsing the namespaced URI, extracting server name, stripping prefix, and forwarding to correct upstream, 6) Handle 'resources/subscribe' and 'resources/unsubscribe' if needed for completeness. Update types.ts if additional resource-related types are needed.",
+            "status": "done",
+            "testStrategy": "Unit test discoverResources() with mocked upstreams returning different resources. Test resources/read routing extracts correct server and forwards properly. Test error handling when resource URI has unknown server prefix.",
+            "parentId": "undefined",
+            "updatedAt": "2026-02-21T05:05:48.626Z"
+          },
+          {
+            "id": 3,
+            "title": "Add prompt forwarding support to McpRouter",
+            "description": "Extend McpRouter to handle prompts/list and prompts/get methods, forwarding them to upstream servers with proper namespacing.",
+            "dependencies": [
+              1
+            ],
+            "details": "Modify src/local-proxy/src/router.ts to: 1) Add a promptToServer Map for tracking prompt origins, 2) Create discoverPrompts() method that calls prompts/list on each upstream and aggregates with namespaced names (e.g., 'servername/prompt-name'), 3) Add 'prompts' to capabilities in initialize response, 4) Handle 'prompts/list' in route() by calling discoverPrompts(), 5) Handle 'prompts/get' by parsing namespaced prompt name, extracting server, stripping prefix, and forwarding to correct upstream. Follow same pattern as tools for consistency.",
+            "status": "done",
+            "testStrategy": "Unit test discoverPrompts() with mocked upstreams. Test prompts/get routing correctly forwards to upstream. Test error handling for unknown prompt names.",
+            "parentId": "undefined",
+            "updatedAt": "2026-02-21T05:05:48.638Z"
+          },
+          {
+            "id": 4,
+            "title": "Implement notification forwarding from upstreams to client",
+            "description": "Add support for forwarding JSON-RPC notifications from upstream servers to the proxy client, enabling real-time updates like progress notifications.",
+            "dependencies": [
+              1
+            ],
+            "details": "Modify upstream classes and server: 1) Add onNotification callback to UpstreamConnection interface in types.ts, 2) Update StdioUpstream to detect notifications (messages without 'id' field) in stdout handler and invoke onNotification callback with namespaced method if needed, 3) Update HttpUpstream if SSE support is needed (may require EventSource or SSE client for true streaming), 4) Add setNotificationHandler(callback) method to McpRouter that registers handler and wires it to all upstreams, 5) Update StdioProxyServer to call router.setNotificationHandler() with a function that writes notification JSON to stdout, 6) Consider namespacing notification params to indicate source server.",
+            "status": "done",
+            "testStrategy": "Test StdioUpstream correctly identifies and forwards notifications. Integration test: upstream sends progress notification, verify proxy forwards it to stdout. Test notifications are properly namespaced with source server name.",
+            "parentId": "undefined",
+            "updatedAt": "2026-02-21T05:05:48.641Z"
+          },
+          {
+            "id": 5,
+            "title": "Implement connection health monitoring with reconnection",
+            "description": "Add health monitoring for upstream connections with automatic status tracking, health check pings, and reconnection logic for failed STDIO upstreams.",
+            "dependencies": [
+              1,
+              4
+            ],
+            "details": "Create src/local-proxy/src/health.ts with HealthMonitor class: 1) Track connection state for each upstream (healthy, degraded, disconnected), 2) Implement periodic health checks using ping/pong or a lightweight method like calling initialize, 3) Emit health status change events via EventEmitter pattern, 4) Add reconnection logic for StdioUpstream: detect process exit, attempt restart with exponential backoff (1s, 2s, 4s... max 30s), 5) Update McpRouter to accept HealthMonitor instance and use it to filter available upstreams, 6) Add health status to proxy logs/stderr for debugging, 7) Optionally expose health status via a special proxy method (e.g., 'proxy/health'). Update main.ts to instantiate and wire HealthMonitor.",
+            "status": "done",
+            "testStrategy": "Test health check detects unresponsive upstream. Test reconnection attempts with mocked process that fails then succeeds. Test exponential backoff timing. Test degraded upstream is excluded from tool discovery until healthy.",
+            "parentId": "undefined",
+            "updatedAt": "2026-02-21T05:05:48.643Z"
+          }
+        ],
+        "updatedAt": "2026-02-21T05:05:48.643Z"
       },
       {
         "id": "13",
@@ -581,8 +653,9 @@
         "dependencies": [
           "12"
         ],
-        "status": "pending",
-        "subtasks": []
+        "status": "done",
+        "subtasks": [],
+        "updatedAt": "2026-02-21T05:22:44.011Z"
       },
       {
         "id": "14",
@@ -594,8 +667,9 @@
         "dependencies": [
           "3"
         ],
-        "status": "pending",
-        "subtasks": []
+        "status": "done",
+        "subtasks": [],
+        "updatedAt": "2026-02-21T05:09:18.694Z"
       },
       {
         "id": "15",
@@ -607,8 +681,71 @@
         "dependencies": [
           "4"
         ],
-        "status": "pending",
-        "subtasks": []
+        "status": "done",
+        "subtasks": [
+          {
+            "id": 1,
+            "title": "Define Profile Template Types and Schemas",
+            "description": "Create TypeScript interfaces and Zod validation schemas for profile templates that extend the existing McpProfile type.",
+            "dependencies": [],
+            "details": "Create src/shared/src/profiles/types.ts with ProfileTemplate interface containing: id, serverType, name, displayName, description, category (filesystem/database/integration/etc), command, args, requiredEnvVars (with EnvTemplateEntry array), optionalEnvVars, defaultPermissions, setupInstructions, and documentationUrl. Also create profileTemplateSchema.ts with Zod schemas for validation. The templates should be immutable definitions that can be instantiated into actual profiles.",
+            "status": "pending",
+            "testStrategy": "Unit test Zod schemas with valid and invalid template data. Verify type compatibility with existing McpServerConfig and McpProfile types.",
+            "parentId": "undefined"
+          },
+          {
+            "id": 2,
+            "title": "Implement Common MCP Server Profile Templates",
+            "description": "Create profile template definitions for common MCP servers including filesystem, github, postgres, slack, and other popular integrations.",
+            "dependencies": [
+              1
+            ],
+            "details": "Create src/shared/src/profiles/templates/ directory with individual template files: filesystem.ts (npx @modelcontextprotocol/server-filesystem with path args), github.ts (npx @modelcontextprotocol/server-github with GITHUB_TOKEN env), postgres.ts (npx @modelcontextprotocol/server-postgres with DATABASE_URL), slack.ts (npx @modelcontextprotocol/server-slack with SLACK_TOKEN), memory.ts, and fetch.ts. Each template exports a ProfileTemplate constant with pre-configured best-practice settings. Include clear descriptions and setup guides for each.",
+            "status": "pending",
+            "testStrategy": "Validate each template against the ProfileTemplate Zod schema. Verify all required fields are populated. Test that commands and args are syntactically correct.",
+            "parentId": "undefined"
+          },
+          {
+            "id": 3,
+            "title": "Build Profile Registry with Lookup and Filtering",
+            "description": "Create a profile registry that aggregates all templates and provides lookup, filtering, and search capabilities.",
+            "dependencies": [
+              1,
+              2
+            ],
+            "details": "Create src/shared/src/profiles/registry.ts implementing a ProfileRegistry class with methods: getAll(), getById(id), getByCategory(category), getByServerType(type), search(query), and getCategories(). The registry should be a singleton that lazily loads all templates from the templates directory. Export a default registry instance. Also create src/shared/src/profiles/index.ts to export all profile-related types, templates, and the registry.",
+            "status": "pending",
+            "testStrategy": "Test registry initialization loads all templates. Test each lookup method returns correct results. Test search functionality with partial matches. Verify no duplicate IDs across templates.",
+            "parentId": "undefined"
+          },
+          {
+            "id": 4,
+            "title": "Add Profile Validation and Instantiation Utilities",
+            "description": "Create utility functions to validate profile templates and instantiate them into concrete profile configurations.",
+            "dependencies": [
+              1,
+              3
+            ],
+            "details": "Create src/shared/src/profiles/utils.ts with functions: validateTemplate(template) - validates a ProfileTemplate against schema, instantiateProfile(templateId, envValues) - creates a concrete profile config from a template by filling in env vars, validateEnvValues(template, envValues) - checks if all required env vars are provided, getMissingEnvVars(template, envValues) - returns list of missing required env vars, and generateMcpJsonEntry(profile) - converts instantiated profile to .mcp.json format entry.",
+            "status": "pending",
+            "testStrategy": "Test validateTemplate with valid and invalid templates. Test instantiateProfile produces correct configs. Test env validation catches missing required vars. Test .mcp.json output matches expected format.",
+            "parentId": "undefined"
+          },
+          {
+            "id": 5,
+            "title": "Export Profiles Module and Add Integration Tests",
+            "description": "Export the profiles module from shared package main entry and create comprehensive integration tests.",
+            "dependencies": [
+              3,
+              4
+            ],
+            "details": "Update src/shared/src/index.ts to add 'export * from ./profiles/index.js'. Create src/shared/src/profiles/__tests__/profiles.test.ts with tests covering: all templates are valid, registry contains expected templates, instantiation works for each template type, .mcp.json generation produces valid output, and round-trip validation (instantiate then validate). Also add documentation comments to all exported functions and types.",
+            "status": "pending",
+            "testStrategy": "Run full test suite with vitest. Verify exports are accessible from @mcpctl/shared. Integration test the full workflow: lookup template, validate, instantiate with env vars, generate .mcp.json entry.",
+            "parentId": "undefined"
+          }
+        ],
+        "updatedAt": "2026-02-21T05:26:02.010Z"
       },
       {
         "id": "16",
@@ -620,8 +757,9 @@
         "dependencies": [
           "6"
         ],
-        "status": "pending",
-        "subtasks": []
+        "status": "done",
+        "subtasks": [],
+        "updatedAt": "2026-02-21T05:11:52.795Z"
       },
       {
         "id": "17",
@@ -633,8 +771,70 @@
         "dependencies": [
           "6"
         ],
-        "status": "pending",
-        "subtasks": []
+        "status": "done",
+        "subtasks": [
+          {
+            "id": 1,
+            "title": "Create K8s API HTTP client and connection handling",
+            "description": "Implement a Kubernetes API client using node:http/https to communicate with the K8s API server, including authentication, TLS handling, and base request/response utilities.",
+            "dependencies": [],
+            "details": "Create src/mcpd/src/services/k8s/k8s-client.ts with: 1) K8sClientConfig interface supporting kubeconfig file parsing, in-cluster config detection, and direct API server URL/token config. 2) HTTP client wrapper using node:http/https that handles TLS certificates, bearer token auth, and API versioning. 3) Base request methods (get, post, delete, patch) with proper error handling and response parsing. 4) Support for watching resources with streaming responses. Reference the Docker container-manager.ts pattern for constructor options and ping() implementation.",
+            "status": "pending",
+            "testStrategy": "Unit tests with mocked HTTP responses for successful API calls, auth failures, connection errors. Test kubeconfig parsing with sample config files. Test in-cluster config detection by mocking environment variables and service account token file.",
+            "parentId": "undefined"
+          },
+          {
+            "id": 2,
+            "title": "Implement K8s manifest generation for MCP servers",
+            "description": "Create manifest generator that converts ContainerSpec to Kubernetes Pod and Deployment YAML/JSON specifications with proper resource limits and security contexts.",
+            "dependencies": [
+              1
+            ],
+            "details": "Create src/mcpd/src/services/k8s/manifest-generator.ts with: 1) generatePodSpec(spec: ContainerSpec, namespace: string) that creates a Pod manifest with container image, env vars, resource limits (CPU/memory from spec.nanoCpus and spec.memoryLimit), and labels including mcpctl.managed=true. 2) generateDeploymentSpec() for replicated deployments with selector labels. 3) generateServiceSpec() for exposing container ports. 4) Security context configuration (non-root user, read-only root filesystem, drop capabilities). 5) Map ContainerSpec fields to K8s equivalents (memoryLimit to resources.limits.memory, nanoCpus to resources.limits.cpu, etc.).",
+            "status": "pending",
+            "testStrategy": "Unit tests validating generated manifests match expected K8s spec structure. Test resource limit conversion (bytes to Ki/Mi/Gi, nanoCPUs to millicores). Test label propagation from ContainerSpec.labels. Validate manifests against K8s API schema if possible.",
+            "parentId": "undefined"
+          },
+          {
+            "id": 3,
+            "title": "Implement KubernetesOrchestrator class with McpOrchestrator interface",
+            "description": "Create the main KubernetesOrchestrator class that implements the McpOrchestrator interface using the K8s client and manifest generator.",
+            "dependencies": [
+              1,
+              2
+            ],
+            "details": "Create src/mcpd/src/services/k8s/kubernetes-orchestrator.ts implementing McpOrchestrator interface: 1) Constructor accepting K8sClientConfig and default namespace. 2) ping() - call /api/v1 endpoint to verify cluster connectivity. 3) pullImage() - no-op for K8s (images pulled on pod schedule) or optionally create a pre-pull DaemonSet. 4) createContainer(spec) - generate Pod/Deployment manifest, POST to K8s API, wait for pod Ready condition, return ContainerInfo with pod name as containerId. 5) stopContainer(containerId) - scale deployment to 0 or delete pod. 6) removeContainer(containerId) - DELETE the pod/deployment resource. 7) inspectContainer(containerId) - GET pod status, map phase to ContainerInfo state (Running→running, Pending→starting, Failed→error, etc.). 8) getContainerLogs(containerId) - GET /api/v1/namespaces/{ns}/pods/{name}/log endpoint.",
+            "status": "pending",
+            "testStrategy": "Integration tests with mocked K8s API responses for each method. Test createContainer returns valid ContainerInfo with mapped state. Test state mapping from K8s pod phases. Test log retrieval with tail and since parameters. Test error handling when pod not found or API errors.",
+            "parentId": "undefined"
+          },
+          {
+            "id": 4,
+            "title": "Add namespace and multi-namespace support",
+            "description": "Extend KubernetesOrchestrator to support configurable namespaces, namespace creation, and querying resources across namespaces.",
+            "dependencies": [
+              3
+            ],
+            "details": "Enhance src/mcpd/src/services/k8s/kubernetes-orchestrator.ts with: 1) Add namespace parameter to ContainerSpec or use labels to specify target namespace. 2) ensureNamespace(name) method that creates namespace if not exists (POST /api/v1/namespaces). 3) listContainers(namespace?: string) method to list all mcpctl-managed pods in a namespace or all namespaces. 4) Add namespace to ContainerInfo response. 5) Support 'default' namespace fallback and configurable default namespace in constructor. 6) Add namespace label to generated manifests for filtering. 7) Validate namespace names (DNS-1123 label format).",
+            "status": "pending",
+            "testStrategy": "Test namespace creation with mocked API. Test namespace validation for invalid names. Test listing pods across namespaces. Test ContainerInfo includes correct namespace. Test default namespace fallback behavior.",
+            "parentId": "undefined"
+          },
+          {
+            "id": 5,
+            "title": "Add comprehensive tests and module exports",
+            "description": "Create unit tests with mocked K8s API responses, integration test utilities, and export the KubernetesOrchestrator from the services module.",
+            "dependencies": [
+              3,
+              4
+            ],
+            "details": "1) Create src/mcpd/src/services/k8s/index.ts exporting KubernetesOrchestrator, K8sClientConfig, and helper types. 2) Update src/mcpd/src/services/index.ts to export k8s module. 3) Create src/mcpd/src/services/k8s/__tests__/kubernetes-orchestrator.test.ts with mocked HTTP responses using vitest's mock system. 4) Create mock-k8s-api.ts helper that simulates K8s API responses (pod list, pod status, logs, errors). 5) Test all McpOrchestrator interface methods with success and error cases. 6) Add tests for resource limit edge cases (0 memory, very high CPU). 7) Document usage examples in code comments showing how to switch from DockerContainerManager to KubernetesOrchestrator.",
+            "status": "pending",
+            "testStrategy": "Ensure all tests pass with mocked responses. Verify test coverage for all public methods. Test error scenarios (404 pod not found, 403 forbidden, 500 server error). Optional: Add integration test script that runs against kind/minikube if available.",
+            "parentId": "undefined"
+          }
+        ],
+        "updatedAt": "2026-02-21T05:30:53.921Z"
       },
       {
         "id": "18",
@@ -649,8 +849,9 @@
           "9",
           "10"
         ],
-        "status": "pending",
-        "subtasks": []
+        "status": "done",
+        "subtasks": [],
+        "updatedAt": "2026-02-21T05:19:02.525Z"
       },
       {
         "id": "19",
@@ -658,7 +859,7 @@
         "description": "Merged into Task 3 subtasks",
         "details": null,
         "testStrategy": null,
-        "priority": null,
+        "priority": "low",
         "dependencies": [],
         "status": "cancelled",
         "subtasks": [],
@@ -670,7 +871,7 @@
         "description": "Merged into Task 5",
         "details": null,
         "testStrategy": null,
-        "priority": null,
+        "priority": "low",
         "dependencies": [],
         "status": "cancelled",
         "subtasks": [],
@@ -682,7 +883,7 @@
         "description": "Merged into Task 14",
         "details": null,
         "testStrategy": null,
-        "priority": null,
+        "priority": "low",
         "dependencies": [],
         "status": "cancelled",
         "subtasks": [],
@@ -699,8 +900,72 @@
           "6",
           "14"
         ],
-        "status": "pending",
-        "subtasks": []
+        "status": "done",
+        "subtasks": [
+          {
+            "id": 1,
+            "title": "Create MetricsCollector Service",
+            "description": "Implement a MetricsCollector service in src/mcpd/src/services/metrics-collector.ts that tracks instance health metrics, uptime, request counts, error rates, and resource usage data.",
+            "dependencies": [],
+            "details": "Create MetricsCollector class with methods: recordRequest(), recordError(), updateInstanceMetrics(), getMetrics(). Store metrics in-memory using Map<instanceId, InstanceMetrics>. Define InstanceMetrics interface with fields: instanceId, status, uptime, requestCount, errorCount, lastRequestAt, memoryUsage, cpuUsage. Inject IMcpInstanceRepository and McpOrchestrator dependencies to gather real-time instance status from containers. Export service from src/mcpd/src/services/index.ts.",
+            "status": "pending",
+            "testStrategy": "Unit tests with mocked repository and orchestrator dependencies. Test metric recording, aggregation, and retrieval. Verify error rate calculations and uptime tracking accuracy.",
+            "parentId": "undefined"
+          },
+          {
+            "id": 2,
+            "title": "Implement Health Aggregation Service",
+            "description": "Create a HealthAggregator service that computes overall system health by aggregating health status across all MCP server instances.",
+            "dependencies": [
+              1
+            ],
+            "details": "Add HealthAggregator class in src/mcpd/src/services/health-aggregator.ts. Methods: getOverview() returns SystemHealth with totalInstances, healthyCount, unhealthyCount, errorCount, and overallStatus (healthy/degraded/unhealthy). Use MetricsCollector to gather per-instance metrics. Include orchestrator.ping() check for runtime availability. Compute aggregate error rate and average uptime. Export from services/index.ts.",
+            "status": "pending",
+            "testStrategy": "Unit tests with mocked MetricsCollector. Test aggregation logic for various instance states. Verify overall status determination rules (e.g., >50% unhealthy = degraded).",
+            "parentId": "undefined"
+          },
+          {
+            "id": 3,
+            "title": "Create Health Monitoring REST Endpoints",
+            "description": "Implement REST endpoints for health monitoring: GET /api/v1/health/overview, GET /api/v1/health/instances/:id, and GET /api/v1/metrics in src/mcpd/src/routes/health-monitoring.ts.",
+            "dependencies": [
+              1,
+              2
+            ],
+            "details": "Create registerHealthMonitoringRoutes(app, deps) function. GET /api/v1/health/overview returns SystemHealth from HealthAggregator.getOverview(). GET /api/v1/health/instances/:id returns InstanceMetrics for specific instance from MetricsCollector. GET /api/v1/metrics returns all metrics in Prometheus-compatible format or JSON. Add proper error handling for 404 when instance not found. Register routes in src/mcpd/src/routes/index.ts and wire up in server.ts.",
+            "status": "pending",
+            "testStrategy": "Integration tests using Fastify inject(). Test all three endpoints with mocked services. Verify 200 responses with correct payload structure, 404 for missing instances.",
+            "parentId": "undefined"
+          },
+          {
+            "id": 4,
+            "title": "Add Request/Error Metrics Middleware",
+            "description": "Create middleware in src/mcpd/src/middleware/metrics.ts that intercepts requests to record metrics for request counts and error rates per instance.",
+            "dependencies": [
+              1
+            ],
+            "details": "Implement Fastify preHandler hook that extracts instance ID from request params/query where applicable. Record request start time. Use onResponse hook to record completion and calculate latency. Use onError hook to record errors with MetricsCollector.recordError(). Track metrics per-route and per-instance. Register middleware in src/mcpd/src/middleware/index.ts. Apply to instance-related routes (/api/v1/instances/*) to track per-instance metrics.",
+            "status": "pending",
+            "testStrategy": "Unit tests verifying hooks call MetricsCollector methods. Integration tests confirming request/error counts increment correctly after API calls.",
+            "parentId": "undefined"
+          },
+          {
+            "id": 5,
+            "title": "Write Comprehensive Health Monitoring Tests",
+            "description": "Create test suite in src/mcpd/tests/health-monitoring.test.ts covering MetricsCollector, HealthAggregator, health monitoring routes, and metrics middleware.",
+            "dependencies": [
+              1,
+              2,
+              3,
+              4
+            ],
+            "details": "Write tests for: MetricsCollector - test recordRequest(), recordError(), getMetrics(), concurrent access safety. HealthAggregator - test getOverview() with various instance states, edge cases (no instances, all unhealthy). Routes - test /api/v1/health/overview, /api/v1/health/instances/:id, /api/v1/metrics endpoints with mocked dependencies. Middleware - test request counting, error tracking, latency recording. Use vi.mock() for dependencies following existing test patterns in the codebase.",
+            "status": "pending",
+            "testStrategy": "Self-referential - this subtask IS the test implementation. Verify all tests pass with `npm test`. Aim for >80% coverage on new health monitoring code.",
+            "parentId": "undefined"
+          }
+        ],
+        "updatedAt": "2026-02-21T05:34:25.289Z"
       },
       {
         "id": "23",
@@ -713,8 +978,71 @@
           "2",
           "5"
         ],
-        "status": "pending",
-        "subtasks": []
+        "status": "done",
+        "subtasks": [
+          {
+            "id": 1,
+            "title": "Implement BackupService for JSON export",
+            "description": "Create BackupService in src/mcpd/src/services/backup/ that exports servers, profiles, and projects from repositories to a structured JSON bundle.",
+            "dependencies": [],
+            "details": "Create BackupService class that uses IMcpServerRepository, IMcpProfileRepository, and IProjectRepository to fetch all data. Define a BackupBundle interface with metadata (version, timestamp, mcpctlVersion), servers array, profiles array, and projects array. Implement createBackup() method that aggregates all data into the bundle format. Add optional filtering by resource type (e.g., only servers, or only specific profiles). Export via services/index.ts following existing patterns.",
+            "status": "pending",
+            "testStrategy": "Unit test BackupService with mocked repositories. Verify bundle structure includes all expected fields. Test filtering options. Test handling of empty repositories.",
+            "parentId": "undefined"
+          },
+          {
+            "id": 2,
+            "title": "Add secrets encryption using Node crypto",
+            "description": "Implement AES-256-GCM encryption for sensitive data in backup bundles using password-derived keys via scrypt.",
+            "dependencies": [
+              1
+            ],
+            "details": "Create crypto utility module in src/mcpd/src/services/backup/crypto.ts using Node's built-in crypto module. Implement deriveKey() using scrypt with configurable salt length and key length. Implement encrypt() that creates IV, encrypts data with AES-256-GCM, and returns base64-encoded result with IV and auth tag prepended. Implement decrypt() that reverses the process. In BackupService, detect fields containing secrets (env vars with sensitive patterns like *_KEY, *_SECRET, *_TOKEN, PASSWORD) and encrypt them. Store encryption metadata (algorithm, salt) in bundle header.",
+            "status": "pending",
+            "testStrategy": "Test encryption/decryption round-trip with various data sizes. Verify wrong password fails decryption. Test key derivation produces consistent results with same inputs. Test detection of sensitive field patterns.",
+            "parentId": "undefined"
+          },
+          {
+            "id": 3,
+            "title": "Implement RestoreService for JSON import",
+            "description": "Create RestoreService that imports a backup bundle back into the system, handling decryption and conflict resolution.",
+            "dependencies": [
+              1,
+              2
+            ],
+            "details": "Create RestoreService class in src/mcpd/src/services/backup/. Implement restore() method that parses JSON bundle, validates version compatibility, decrypts encrypted fields using provided password, and imports data using repositories. Support conflict resolution strategies: 'skip' (ignore existing), 'overwrite' (replace existing), 'fail' (abort on conflict). Implement validateBundle() for schema validation before import. Handle partial failures with transaction-like rollback or detailed error reporting.",
+            "status": "pending",
+            "testStrategy": "Test restore with valid bundle creates expected resources. Test conflict resolution modes (skip, overwrite, fail). Test encrypted bundle restore with correct/incorrect passwords. Test invalid bundle rejection.",
+            "parentId": "undefined"
+          },
+          {
+            "id": 4,
+            "title": "Add REST endpoints for backup and restore",
+            "description": "Create REST API routes in src/mcpd/src/routes/ for triggering backup creation and restore operations.",
+            "dependencies": [
+              1,
+              2,
+              3
+            ],
+            "details": "Create backup.ts routes file with: POST /api/v1/backup (create backup, optional password for encryption, returns JSON bundle), POST /api/v1/restore (accepts JSON bundle in body, password if encrypted, conflict strategy option, returns import summary). Register routes in routes/index.ts. Define BackupDeps interface following existing patterns. Add appropriate error handling for invalid bundles, decryption failures, and conflict errors. Include validation schemas for request bodies.",
+            "status": "pending",
+            "testStrategy": "Integration test backup endpoint returns valid JSON bundle. Test restore endpoint with valid/invalid bundles. Test encrypted backup/restore round-trip via API. Test error responses for various failure scenarios.",
+            "parentId": "undefined"
+          },
+          {
+            "id": 5,
+            "title": "Add CLI commands for backup and restore",
+            "description": "Implement CLI commands in src/cli/src/commands/ for backup export to file and restore from file.",
+            "dependencies": [
+              4
+            ],
+            "details": "Create backup.ts commands file with: 'mcpctl backup' command with options --output/-o (file path), --encrypt (prompt for password), --resources (filter: servers,profiles,projects). Create 'mcpctl restore' command with options --input/-i (file path), --password (or prompt if encrypted), --conflict (skip|overwrite|fail). Commands should call the daemon API endpoints. Add progress output and summary of backed up/restored resources. Register commands in cli/src/index.ts following existing createXxxCommand pattern.",
+            "status": "pending",
+            "testStrategy": "Test backup command creates valid file. Test restore command from backup file. Test encryption password prompting. Test --resources filtering. Test various conflict resolution modes via CLI.",
+            "parentId": "undefined"
+          }
+        ],
+        "updatedAt": "2026-02-21T05:40:51.787Z"
       },
       {
         "id": "24",
@@ -726,15 +1054,367 @@
         "dependencies": [
           "1"
         ],
-        "status": "pending",
-        "subtasks": []
+        "status": "done",
+        "subtasks": [],
+        "updatedAt": "2026-02-21T05:12:31.235Z"
+      },
+      {
+        "id": "25",
+        "title": "Rename local-proxy to mcplocal",
+        "description": "Rename the src/local-proxy directory to src/mcplocal and update all package references, imports, and build configurations throughout the monorepo.",
+        "details": "1. Rename directory: `mv src/local-proxy src/mcplocal`\n2. Update package.json name from `@mcpctl/local-proxy` to `@mcpctl/mcplocal`\n3. Update pnpm-workspace.yaml if needed\n4. Update all imports in other packages that reference local-proxy:\n   - Search for `@mcpctl/local-proxy` and replace with `@mcpctl/mcplocal`\n   - Check tsconfig references and path mappings\n5. Update any scripts in package.json root that reference local-proxy\n6. Update docker-compose files in deploy/ if they reference local-proxy\n7. Update documentation and README references\n8. Run `pnpm install` to regenerate lockfile with new package name\n9. Verify TypeScript compilation succeeds: `pnpm build`\n10. Run existing tests to ensure nothing broke: `pnpm test`",
+        "testStrategy": "1. Verify directory rename completed: `ls src/mcplocal`\n2. Verify package.json has correct name\n3. Run `pnpm install` - should complete without errors\n4. Run `pnpm build` - all packages should compile\n5. Run `pnpm test` - all existing tests should pass\n6. Grep codebase for 'local-proxy' - should find no stale references except git history",
+        "priority": "high",
+        "dependencies": [],
+        "status": "done",
+        "subtasks": [],
+        "updatedAt": "2026-02-21T18:04:17.018Z"
+      },
+      {
+        "id": "26",
+        "title": "Add HTTP REST server to mcplocal",
+        "description": "Add a Fastify HTTP server to mcplocal that runs alongside the existing stdio server, providing REST endpoints for mcpctl management commands.",
+        "details": "1. Add Fastify dependency to mcplocal package.json: `@fastify/cors`, `fastify`\n2. Create `src/mcplocal/src/http/server.ts` with Fastify app setup:\n   ```typescript\n   import Fastify from 'fastify';\n   import cors from '@fastify/cors';\n   \n   export async function createHttpServer(config: HttpServerConfig) {\n     const app = Fastify({ logger: true });\n     await app.register(cors, { origin: true });\n     // Register routes\n     return app;\n   }\n   ```\n3. Create `src/mcplocal/src/http/routes/` directory structure\n4. Create health check endpoint: `GET /health`\n5. Create config types in `src/mcplocal/src/config.ts`:\n   - `httpPort`: number (default 3200)\n   - `httpHost`: string (default '127.0.0.1')\n   - `mcpdUrl`: string (default 'http://localhost:3100')\n6. Update mcplocal entry point to start both servers:\n   - stdio server for Claude MCP protocol\n   - HTTP server for mcpctl REST API\n7. Add graceful shutdown handling for both servers",
+        "testStrategy": "1. Unit test: HTTP server starts on configured port\n2. Unit test: Health endpoint returns 200 OK\n3. Integration test: Both stdio and HTTP servers can run simultaneously\n4. Test graceful shutdown stops both servers cleanly\n5. Test CORS headers are present on responses\n6. Manual test: curl http://localhost:3200/health",
+        "priority": "high",
+        "dependencies": [
+          "25"
+        ],
+        "status": "done",
+        "subtasks": [],
+        "updatedAt": "2026-02-21T18:09:26.322Z"
+      },
+      {
+        "id": "27",
+        "title": "Implement mcplocal management proxy routes",
+        "description": "Add REST endpoints to mcplocal that mirror mcpd's API and proxy management requests to mcpd without LLM processing. All requests must include proper authentication to mcpd using a Bearer token read from mcplocal config.",
+        "status": "done",
+        "dependencies": [
+          "26"
+        ],
+        "priority": "high",
+        "details": "1. Create HTTP client for mcpd communication with auth: `src/local-proxy/src/http/mcpd-client.ts`\n   ```typescript\n   export class McpdClient {\n     private token: string;\n     \n     constructor(private baseUrl: string, token: string) {\n       this.token = token;\n     }\n     \n     private getHeaders(): Record<string, string> {\n       return {\n         'Content-Type': 'application/json',\n         'Authorization': `Bearer ${this.token}`\n       };\n     }\n     \n     async get<T>(path: string): Promise<T> {\n       const response = await fetch(`${this.baseUrl}${path}`, {\n         method: 'GET',\n         headers: this.getHeaders()\n       });\n       await this.handleAuthError(response);\n       return response.json();\n     }\n     \n     async post<T>(path: string, body: unknown): Promise<T> {\n       const response = await fetch(`${this.baseUrl}${path}`, {\n         method: 'POST',\n         headers: this.getHeaders(),\n         body: JSON.stringify(body)\n       });\n       await this.handleAuthError(response);\n       return response.json();\n     }\n     \n     async put<T>(path: string, body: unknown): Promise<T> {\n       const response = await fetch(`${this.baseUrl}${path}`, {\n         method: 'PUT',\n         headers: this.getHeaders(),\n         body: JSON.stringify(body)\n       });\n       await this.handleAuthError(response);\n       return response.json();\n     }\n     \n     async delete<T>(path: string): Promise<T> {\n       const response = await fetch(`${this.baseUrl}${path}`, {\n         method: 'DELETE',\n         headers: this.getHeaders()\n       });\n       await this.handleAuthError(response);\n       return response.json();\n     }\n     \n     private async handleAuthError(response: Response): Promise<void> {\n       if (response.status === 401) {\n         throw new AuthenticationError('Invalid or expired token. Please check mcplocal config.');\n       }\n     }\n   }\n   \n   export class AuthenticationError extends Error {\n     constructor(message: string) {\n       super(message);\n       this.name = 'AuthenticationError';\n     }\n   }\n   ```\n2. Add token to mcplocal config type (extend ProxyConfig or similar):\n   ```typescript\n   export interface McpdAuthConfig {\n     /** Bearer token for mcpd API authentication */\n     mcpdToken: string;\n   }\n   ```\n3. Create proxy routes in `src/local-proxy/src/http/routes/`:\n   - `servers.ts`: GET/POST /api/v1/servers, GET/PUT/DELETE /api/v1/servers/:id\n   - `profiles.ts`: GET/POST /api/v1/profiles, GET/PUT/DELETE /api/v1/profiles/:id\n   - `instances.ts`: GET/POST /api/v1/instances, GET/POST/DELETE /api/v1/instances/:id, etc.\n   - `projects.ts`: GET/POST /api/v1/projects, etc.\n   - `audit.ts`: GET /api/v1/audit-logs\n   - `backup.ts`: POST /api/v1/backup, POST /api/v1/restore\n4. Each route handler forwards to mcpd with auth:\n   ```typescript\n   app.get('/api/v1/servers', async (req, reply) => {\n     try {\n       const result = await mcpdClient.get('/api/v1/servers');\n       return result;\n     } catch (error) {\n       if (error instanceof AuthenticationError) {\n         return reply.status(401).send({ error: error.message });\n       }\n       throw error;\n     }\n   });\n   ```\n5. Add comprehensive error handling:\n   - If mcpd is unreachable, return 503 Service Unavailable\n   - If mcpd returns 401, return 401 with clear message about token configuration\n   - Forward other HTTP errors from mcpd with appropriate status codes\n6. Add request/response logging for debugging",
+        "testStrategy": "1. Unit test: McpdClient attaches Authorization header to all request methods (GET, POST, PUT, DELETE)\n2. Unit test: McpdClient throws AuthenticationError on 401 response from mcpd\n3. Unit test: Each proxy route forwards requests correctly with auth headers\n4. Unit test: Error handling when mcpd is unreachable (503 response)\n5. Unit test: Error handling when mcpd returns 401 (clear error message returned)\n6. Integration test: Full request flow mcpctl -> mcplocal -> mcpd with valid token\n7. Integration test: Full request flow with invalid token returns 401\n8. Test query parameters are forwarded correctly\n9. Test request body is forwarded correctly for POST/PUT\n10. Test path parameters (:id) are passed through correctly\n11. Mock mcpd responses and verify mcplocal returns them unchanged\n12. Test token is read correctly from mcplocal config",
+        "subtasks": [],
+        "updatedAt": "2026-02-21T18:34:20.942Z"
+      },
+      {
+        "id": "28",
+        "title": "Add MCP proxy endpoint to mcpd",
+        "description": "Create a new endpoint in mcpd at /api/v1/mcp/proxy that accepts MCP tool call requests and executes them on managed MCP server instances. Also add authentication endpoints (login/logout) that mcpctl will use to authenticate users.",
+        "status": "done",
+        "dependencies": [],
+        "priority": "high",
+        "details": "## MCP Proxy Endpoint\n\n1. Create new route file: `src/mcpd/src/routes/mcp-proxy.ts`\n2. Define request schema:\n   ```typescript\n   interface McpProxyRequest {\n     serverId: string;  // or instanceId\n     method: string;    // e.g., 'tools/call', 'resources/read'\n     params: Record<string, unknown>;\n   }\n   ```\n3. Create McpProxyService in `src/mcpd/src/services/mcp-proxy-service.ts`:\n   - Look up instance by serverId (auto-start if profile allows)\n   - Connect to the container via stdio or HTTP (depending on transport type)\n   - Execute the MCP JSON-RPC call\n   - Return the result\n4. Handle MCP JSON-RPC protocol:\n   ```typescript\n   async executeCall(instanceId: string, method: string, params: unknown) {\n     const instance = await this.instanceService.getInstance(instanceId);\n     const connection = await this.getOrCreateConnection(instance);\n     const result = await connection.call(method, params);\n     return result;\n   }\n   ```\n5. Connection pooling: maintain persistent connections to running instances\n6. Add route: `POST /api/v1/mcp/proxy` (must be behind auth middleware)\n7. Add audit logging for all MCP proxy calls - include authenticated userId from request.userId\n8. Handle errors: instance not found, instance not running, MCP call failed\n\n## Authentication Endpoints\n\n9. Create auth routes file: `src/mcpd/src/routes/auth.ts`\n10. Implement `POST /api/v1/auth/login`:\n    - Request body: `{ username: string, password: string }`\n    - Validate credentials against User table (use bcrypt for password comparison)\n    - Create new Session record with token (use crypto.randomUUID or similar)\n    - Response: `{ token: string, expiresAt: string }`\n11. Implement `POST /api/v1/auth/logout`:\n    - Requires Bearer token in Authorization header\n    - Delete/invalidate the Session record\n    - Response: `{ success: true }`\n\n## Auth Integration Notes\n\n- Existing auth middleware in `src/mcpd/src/middleware/auth.ts` validates Bearer tokens against Session table\n- It sets `request.userId` on successful authentication\n- MCP proxy endpoint MUST use this auth middleware\n- Auth endpoints (login) should NOT require auth middleware\n- Logout endpoint SHOULD require auth middleware to validate the session being invalidated",
+        "testStrategy": "1. Unit test: Proxy service looks up correct instance\n2. Unit test: JSON-RPC call is formatted correctly\n3. Integration test: Full flow with a mock MCP server container\n4. Test error handling: non-existent server returns 404\n5. Test error handling: stopped instance returns appropriate error\n6. Test audit log entries include authenticated userId\n7. Test connection reuse for multiple calls to same instance\n8. Test login endpoint: valid credentials return session token\n9. Test login endpoint: invalid credentials return 401\n10. Test logout endpoint: valid session is invalidated\n11. Test logout endpoint: invalid/missing token returns 401\n12. Test MCP proxy endpoint without auth token returns 401\n13. Test MCP proxy endpoint with expired token returns 401\n14. Test MCP proxy endpoint with valid token succeeds and logs userId in audit",
+        "subtasks": [
+          {
+            "id": 1,
+            "title": "Create auth routes with login/logout endpoints",
+            "description": "Create src/mcpd/src/routes/auth.ts with POST /api/v1/auth/login and POST /api/v1/auth/logout endpoints for mcpctl authentication.",
+            "dependencies": [],
+            "details": "Implement login endpoint: validate username/password against User table using bcrypt, create Session record with generated token and expiry. Implement logout endpoint: require auth middleware, delete/invalidate Session record. Login does NOT require auth, logout DOES require auth. Export registerAuthRoutes function and update routes/index.ts.",
+            "status": "pending",
+            "testStrategy": "Test login with valid/invalid credentials. Test logout invalidates session. Test logout requires valid auth token. Test session token format and expiry.",
+            "parentId": "undefined"
+          },
+          {
+            "id": 2,
+            "title": "Create MCP proxy route file with auth middleware",
+            "description": "Create src/mcpd/src/routes/mcp-proxy.ts with POST /api/v1/mcp/proxy endpoint protected by auth middleware.",
+            "dependencies": [
+              1
+            ],
+            "details": "Define McpProxyRequest interface (serverId, method, params). Register route handler that extracts userId from request.userId (set by auth middleware). Apply auth middleware using preHandler hook. Validate request body schema.",
+            "status": "pending",
+            "testStrategy": "Test endpoint returns 401 without auth token. Test endpoint returns 401 with invalid/expired token. Test valid auth token allows request through.",
+            "parentId": "undefined"
+          },
+          {
+            "id": 3,
+            "title": "Create McpProxyService for instance lookup and connection",
+            "description": "Create src/mcpd/src/services/mcp-proxy-service.ts to handle instance lookup, connection management, and MCP call execution.",
+            "dependencies": [],
+            "details": "Implement getInstance to look up by serverId, auto-start if profile allows. Implement getOrCreateConnection for connection pooling. Handle both stdio and HTTP transports. Implement executeCall method that formats JSON-RPC call and returns result.",
+            "status": "pending",
+            "testStrategy": "Unit test instance lookup. Unit test connection pooling reuses connections. Test auto-start behavior. Test both transport types.",
+            "parentId": "undefined"
+          },
+          {
+            "id": 4,
+            "title": "Implement MCP JSON-RPC call execution",
+            "description": "Implement the core JSON-RPC call logic in McpProxyService to execute tool calls on MCP server instances.",
+            "dependencies": [
+              3
+            ],
+            "details": "Format JSON-RPC 2.0 request with method and params. Send request over established connection (stdio/HTTP). Parse JSON-RPC response and handle errors. Return result or throw appropriate error for failed calls.",
+            "status": "pending",
+            "testStrategy": "Unit test JSON-RPC request formatting. Test successful call returns result. Test JSON-RPC error responses are handled. Integration test with mock MCP server.",
+            "parentId": "undefined"
+          },
+          {
+            "id": 5,
+            "title": "Add audit logging with userId for MCP proxy calls",
+            "description": "Ensure all MCP proxy calls are logged to audit log including the authenticated userId from the session.",
+            "dependencies": [
+              2,
+              4
+            ],
+            "details": "Use existing audit middleware/service. Include userId from request.userId in audit log entry. Log serverId, method, and outcome (success/failure). Log any errors that occur during MCP call execution.",
+            "status": "pending",
+            "testStrategy": "Test audit log entries contain userId. Test audit log entries contain serverId and method. Test failed calls are logged with error details.",
+            "parentId": "undefined"
+          },
+          {
+            "id": 6,
+            "title": "Integrate auth and proxy routes into server.ts",
+            "description": "Register the new auth and mcp-proxy routes in the Fastify server with proper auth middleware wiring.",
+            "dependencies": [
+              1,
+              2,
+              5
+            ],
+            "details": "Update server.ts to register auth routes (no auth required for login). Register mcp-proxy routes with auth middleware. Ensure auth middleware is wired with findSession dependency from Prisma. Update routes/index.ts exports.",
+            "status": "pending",
+            "testStrategy": "Integration test full login -> proxy call flow. Test auth middleware correctly protects proxy endpoint. Test health endpoints remain unauthenticated.",
+            "parentId": "undefined"
+          }
+        ],
+        "updatedAt": "2026-02-21T18:09:26.327Z"
+      },
+      {
+        "id": "29",
+        "title": "Implement LLM pre-processing pipeline in mcplocal",
+        "description": "Create the core LLM pre-processing pipeline that intercepts MCP tool calls, uses a local LLM to optimize requests before sending to mcpd, and filters responses before returning to Claude.",
+        "details": "1. Create `src/mcplocal/src/llm/processor.ts` - the core pipeline:\n   ```typescript\n   export class LlmProcessor {\n     constructor(\n       private providerRegistry: ProviderRegistry,\n       private config: LlmProcessorConfig\n     ) {}\n     \n     async preprocessRequest(toolName: string, params: unknown): Promise<ProcessedRequest> {\n       // Use LLM to interpret and optimize the request\n       const prompt = this.buildRequestPrompt(toolName, params);\n       const result = await this.providerRegistry.getActiveProvider().complete({\n         systemPrompt: REQUEST_OPTIMIZATION_SYSTEM_PROMPT,\n         userPrompt: prompt\n       });\n       return this.parseOptimizedRequest(result);\n     }\n     \n     async filterResponse(toolName: string, originalRequest: unknown, rawResponse: unknown): Promise<FilteredResponse> {\n       // Use LLM to filter/summarize the response\n       const prompt = this.buildFilterPrompt(toolName, originalRequest, rawResponse);\n       const result = await this.providerRegistry.getActiveProvider().complete({\n         systemPrompt: RESPONSE_FILTER_SYSTEM_PROMPT,\n         userPrompt: prompt\n       });\n       return this.parseFilteredResponse(result);\n     }\n   }\n   ```\n2. Create system prompts in `src/mcplocal/src/llm/prompts.ts`:\n   - REQUEST_OPTIMIZATION_SYSTEM_PROMPT: instruct LLM to generate optimal queries\n   - RESPONSE_FILTER_SYSTEM_PROMPT: instruct LLM to extract relevant information\n3. Integrate into router.ts - wrap tools/call handler:\n   ```typescript\n   async handleToolsCall(request: JsonRpcRequest) {\n     if (this.shouldPreprocess(request.params.name)) {\n       const processed = await this.llmProcessor.preprocessRequest(...);\n       // Call mcpd with processed request\n       const rawResponse = await this.callMcpd(processed);\n       const filtered = await this.llmProcessor.filterResponse(...);\n       return filtered;\n     }\n     return this.callMcpd(request.params);\n   }\n   ```\n4. Add configuration options:\n   - `enablePreprocessing`: boolean\n   - `preprocessingExclude`: string[] (tool names to skip)\n   - `preferredProvider`: string (ollama, gemini, deepseek, etc.)\n5. Add bypass logic for simple operations (list, create, delete)",
+        "testStrategy": "1. Unit test: Request preprocessing generates optimized queries\n2. Unit test: Response filtering reduces data volume\n3. Unit test: Bypass logic works for excluded tools\n4. Integration test: Full pipeline with mock LLM provider\n5. Test error handling: LLM failure falls back to unfiltered pass-through\n6. Test configuration options are respected\n7. Measure: response size reduction percentage",
+        "priority": "high",
+        "dependencies": [
+          "25",
+          "27",
+          "28"
+        ],
+        "status": "done",
+        "subtasks": [],
+        "updatedAt": "2026-02-21T18:41:26.539Z"
+      },
+      {
+        "id": "30",
+        "title": "Add Gemini CLI LLM provider",
+        "description": "Implement a new LLM provider that uses the Gemini CLI binary for local, free LLM inference as the preferred provider for pre-processing.",
+        "details": "1. Create `src/mcplocal/src/providers/gemini-cli.ts`:\n   ```typescript\n   import { spawn } from 'child_process';\n   \n   export class GeminiCliProvider implements LlmProvider {\n     readonly name = 'gemini-cli';\n     private binaryPath: string;\n     \n     constructor(config: GeminiCliConfig) {\n       this.binaryPath = config.binaryPath || 'gemini';\n     }\n     \n     async isAvailable(): Promise<boolean> {\n       // Check if gemini binary exists and is executable\n       try {\n         await this.runCommand(['--version']);\n         return true;\n       } catch {\n         return false;\n       }\n     }\n     \n     async complete(options: CompletionOptions): Promise<CompletionResult> {\n       const input = this.formatPrompt(options);\n       const output = await this.runCommand(['--prompt', input]);\n       return { content: output, model: 'gemini-cli' };\n     }\n     \n     private async runCommand(args: string[]): Promise<string> {\n       // Spawn gemini CLI process and capture output\n     }\n   }\n   ```\n2. Research actual Gemini CLI interface and adjust implementation\n3. Add to provider registry with high priority (prefer over API providers)\n4. Add configuration: `geminiCliBinaryPath`\n5. Handle timeout for slow inference\n6. Add fallback to next provider if Gemini CLI fails",
+        "testStrategy": "1. Unit test: Provider correctly detects CLI availability\n2. Unit test: Prompt formatting is correct\n3. Unit test: Output parsing handles various formats\n4. Integration test: Full completion with actual Gemini CLI (if available)\n5. Test timeout handling for slow responses\n6. Test fallback when CLI is not installed",
+        "priority": "medium",
+        "dependencies": [
+          "25"
+        ],
+        "status": "done",
+        "subtasks": [],
+        "updatedAt": "2026-02-21T18:34:20.968Z"
+      },
+      {
+        "id": "31",
+        "title": "Add DeepSeek API LLM provider",
+        "description": "Implement DeepSeek API provider as a cheap cloud-based fallback when local LLMs are unavailable.",
+        "details": "1. Create `src/mcplocal/src/providers/deepseek.ts`:\n   ```typescript\n   export class DeepSeekProvider implements LlmProvider {\n     readonly name = 'deepseek';\n     private apiKey: string;\n     private baseUrl = 'https://api.deepseek.com/v1';\n     \n     constructor(config: DeepSeekConfig) {\n       this.apiKey = config.apiKey || process.env.DEEPSEEK_API_KEY;\n     }\n     \n     async isAvailable(): Promise<boolean> {\n       return !!this.apiKey;\n     }\n     \n     async complete(options: CompletionOptions): Promise<CompletionResult> {\n       // DeepSeek uses OpenAI-compatible API\n       const response = await fetch(`${this.baseUrl}/chat/completions`, {\n         method: 'POST',\n         headers: {\n           'Authorization': `Bearer ${this.apiKey}`,\n           'Content-Type': 'application/json'\n         },\n         body: JSON.stringify({\n           model: 'deepseek-chat',\n           messages: [{ role: 'user', content: options.userPrompt }]\n         })\n       });\n       // Parse and return\n     }\n   }\n   ```\n2. Add DEEPSEEK_API_KEY to configuration\n3. Register in provider registry with medium priority\n4. Support both deepseek-chat and deepseek-coder models\n5. Add rate limiting handling",
+        "testStrategy": "1. Unit test: Provider correctly checks API key availability\n2. Unit test: Request formatting matches DeepSeek API spec\n3. Unit test: Response parsing handles all fields\n4. Integration test: Full completion with actual API (with valid key)\n5. Test error handling for rate limits\n6. Test error handling for invalid API key",
+        "priority": "medium",
+        "dependencies": [
+          "25"
+        ],
+        "status": "done",
+        "subtasks": [],
+        "updatedAt": "2026-02-21T18:34:20.974Z"
+      },
+      {
+        "id": "32",
+        "title": "Implement smart context optimization",
+        "description": "Add token counting and decision logic to intelligently skip LLM filtering when responses are small enough, and cache filtering decisions for repeated queries.",
+        "details": "1. Create `src/mcplocal/src/llm/token-counter.ts`:\n   ```typescript\n   export function estimateTokens(text: string): number {\n     // Simple estimation: ~4 chars per token for English\n     // More accurate: use tiktoken or similar library\n     return Math.ceil(text.length / 4);\n   }\n   ```\n2. Create `src/mcplocal/src/llm/filter-cache.ts`:\n   ```typescript\n   export class FilterCache {\n     private cache: LRUCache<string, FilterDecision>;\n     \n     shouldFilter(toolName: string, params: unknown, responseSize: number): boolean {\n       const key = this.computeKey(toolName, params);\n       const cached = this.cache.get(key);\n       if (cached) return cached.shouldFilter;\n       // No cache hit - use default threshold logic\n       return responseSize > this.tokenThreshold;\n     }\n     \n     recordDecision(toolName: string, params: unknown, decision: FilterDecision): void {\n       const key = this.computeKey(toolName, params);\n       this.cache.set(key, decision);\n     }\n   }\n   ```\n3. Add configuration options:\n   - `tokenThreshold`: number (default 1000 tokens)\n   - `filterCacheSize`: number (default 1000 entries)\n   - `filterCacheTtl`: number (default 3600 seconds)\n4. Integrate into LlmProcessor:\n   ```typescript\n   async filterResponse(...) {\n     const tokens = estimateTokens(JSON.stringify(rawResponse));\n     if (tokens < this.config.tokenThreshold) {\n       // Not worth filtering - return as-is\n       return { filtered: false, response: rawResponse };\n     }\n     // Proceed with LLM filtering\n   }\n   ```\n5. Add metrics tracking:\n   - Total tokens processed\n   - Tokens saved by filtering\n   - Filter cache hit rate\n   - Average latency added by filtering",
+        "testStrategy": "1. Unit test: Token estimation is reasonably accurate\n2. Unit test: Cache correctly stores and retrieves decisions\n3. Unit test: Threshold logic skips filtering for small responses\n4. Unit test: Cache TTL expiration works correctly\n5. Integration test: Metrics are recorded accurately\n6. Performance test: Cache improves latency for repeated queries",
+        "priority": "medium",
+        "dependencies": [
+          "29"
+        ],
+        "status": "done",
+        "subtasks": [],
+        "updatedAt": "2026-02-21T18:47:07.709Z"
+      },
+      {
+        "id": "33",
+        "title": "Update mcpctl to use mcplocal as daemon",
+        "description": "Modify mcpctl CLI to connect to mcplocal instead of mcpd directly, update configuration options, add dual connectivity status checking, and implement authentication commands (login/logout) with secure credential storage.",
+        "status": "done",
+        "dependencies": [
+          "27"
+        ],
+        "priority": "high",
+        "details": "1. Update `src/cli/src/config/schema.ts`:\n   ```typescript\n   export interface McpctlConfig {\n     mcplocalUrl: string;  // NEW: default 'http://localhost:3200'\n     mcpdUrl: string;      // Keep for reference/direct access if needed\n     // ... other fields\n   }\n   ```\n2. Update `src/cli/src/config/defaults.ts`:\n   - Change default daemonUrl to http://localhost:3200 (mcplocal)\n3. Update `src/cli/src/api-client.ts`:\n   - Default baseUrl now points to mcplocal\n4. Add new config commands in `src/cli/src/commands/config.ts`:\n   ```typescript\n   .command('set-mcplocal-url <url>')\n   .command('set-mcpd-url <url>')\n   .command('get-mcplocal-url')\n   .command('get-mcpd-url')\n   ```\n5. Update `src/cli/src/commands/status.ts` to show both connections and auth status:\n   ```\n   $ mcpctl status\n   mcplocal: connected (localhost:3200)\n   mcpd: connected (nas.local:3100) via mcplocal\n   Auth: logged in as user@example.com\n   LLM Provider: ollama (llama3.2)\n   Token savings: 45% (last 24h)\n   ```\n6. Update CLI --daemon-url flag to point to mcplocal\n7. Add --direct flag to bypass mcplocal and talk to mcpd directly (for debugging)\n8. Create `src/cli/src/commands/auth.ts` with login/logout commands:\n   - `mcpctl login`: Prompt for mcpd URL (if not configured) and credentials\n   - Call POST /api/v1/auth/login with { email, password }\n   - Store session token in ~/.mcpctl/credentials with 0600 permissions\n   - `mcpctl logout`: Invalidate session and delete stored token\n9. Create `src/cli/src/auth/credentials.ts` for secure token storage:\n   - Use fs.chmod to set 0600 permissions on credentials file\n   - Token format: { token: string, mcpdUrl: string, user: string, expiresAt?: string }\n10. Update api-client.ts to include stored token in requests to mcplocal\n    - mcplocal passes this token to mcpd for authentication",
+        "testStrategy": "1. Unit test: Default config points to mcplocal URL\n2. Unit test: Config commands update correct fields\n3. Integration test: CLI commands work through mcplocal proxy\n4. Test status command shows both mcplocal and mcpd status\n5. Test --direct flag bypasses mcplocal\n6. Test backward compatibility with existing config files\n7. Unit test: login command stores token with correct permissions (0600)\n8. Unit test: logout command removes credentials file\n9. Integration test: login flow with POST /api/v1/auth/login\n10. Test status command shows auth status (logged in as user)\n11. Test token is passed to mcplocal in API requests\n12. Test invalid credentials return appropriate error message\n13. Test expired token handling",
+        "subtasks": [
+          {
+            "id": 1,
+            "title": "Update config schema for mcplocal and mcpd URLs",
+            "description": "Modify McpctlConfigSchema in src/cli/src/config/schema.ts to include separate mcplocalUrl and mcpdUrl fields with appropriate defaults.",
+            "dependencies": [],
+            "details": "Update the Zod schema to add mcplocalUrl (default: http://localhost:3200) and mcpdUrl (default: http://localhost:3100). Update DEFAULT_CONFIG and ensure backward compatibility with existing daemonUrl field by mapping it to mcplocalUrl.",
+            "status": "pending",
+            "testStrategy": "Unit test schema validation for new URL fields. Test default values are correct. Test backward compatibility mapping.",
+            "parentId": "undefined"
+          },
+          {
+            "id": 2,
+            "title": "Create auth credentials storage module",
+            "description": "Create src/cli/src/auth/credentials.ts to handle secure storage and retrieval of session tokens in ~/.mcpctl/credentials.",
+            "dependencies": [],
+            "details": "Implement saveCredentials(token, mcpdUrl, user), loadCredentials(), and deleteCredentials() functions. Use fs.chmod to set 0600 permissions. Store JSON format: { token, mcpdUrl, user, expiresAt }. Handle file not found gracefully in loadCredentials.",
+            "status": "pending",
+            "testStrategy": "Unit test credentials are saved with 0600 permissions. Test load returns null when file doesn't exist. Test delete removes the file.",
+            "parentId": "undefined"
+          },
+          {
+            "id": 3,
+            "title": "Implement login command",
+            "description": "Create src/cli/src/commands/auth.ts with mcpctl login command that prompts for mcpd URL and credentials, calls POST /api/v1/auth/login, and stores the session token.",
+            "dependencies": [
+              2
+            ],
+            "details": "Use inquirer or prompts library for interactive credential input (email, password). If mcpdUrl not configured, prompt for it. Call POST /api/v1/auth/login with credentials. On success, save token using credentials module. Display 'Logged in as {user}' on success. Handle errors (invalid credentials, network errors) with clear messages.",
+            "status": "pending",
+            "testStrategy": "Test prompts collect correct input. Test successful login stores credentials. Test failed login shows error without storing token.",
+            "parentId": "undefined"
+          },
+          {
+            "id": 4,
+            "title": "Implement logout command",
+            "description": "Add mcpctl logout command to auth.ts that invalidates the session and removes stored credentials.",
+            "dependencies": [
+              2
+            ],
+            "details": "Load stored credentials, optionally call a logout endpoint on mcpd to invalidate server-side session, then delete the local credentials file. Display 'Logged out successfully' or 'Not logged in' as appropriate.",
+            "status": "pending",
+            "testStrategy": "Test logout removes credentials file. Test logout when not logged in shows appropriate message.",
+            "parentId": "undefined"
+          },
+          {
+            "id": 5,
+            "title": "Update api-client to include auth token",
+            "description": "Modify src/cli/src/api-client.ts to load and include stored session token in Authorization header for requests to mcplocal.",
+            "dependencies": [
+              2
+            ],
+            "details": "Import loadCredentials from auth module. Add Authorization: Bearer {token} header to requests when credentials exist. Handle expired token by returning appropriate error suggesting re-login.",
+            "status": "pending",
+            "testStrategy": "Test requests include Authorization header when logged in. Test requests work without token when not logged in.",
+            "parentId": "undefined"
+          },
+          {
+            "id": 6,
+            "title": "Update status command to show auth status",
+            "description": "Modify src/cli/src/commands/status.ts to display authentication status (logged in as user X or not logged in) along with mcplocal and mcpd connectivity.",
+            "dependencies": [
+              2,
+              5
+            ],
+            "details": "Load credentials and display auth status line: 'Auth: logged in as {user}' or 'Auth: not logged in'. Update status output format to show mcplocal and mcpd status separately with the auth info.",
+            "status": "pending",
+            "testStrategy": "Test status shows 'logged in as user' when credentials exist. Test status shows 'not logged in' when no credentials.",
+            "parentId": "undefined"
+          },
+          {
+            "id": 7,
+            "title": "Add config commands for mcplocal and mcpd URLs",
+            "description": "Add set-mcplocal-url, set-mcpd-url, get-mcplocal-url, and get-mcpd-url commands to src/cli/src/commands/config.ts.",
+            "dependencies": [
+              1
+            ],
+            "details": "Add four new subcommands to the config command for setting and getting the mcplocal and mcpd URLs independently. Update the generic 'set' command to handle these new schema fields.",
+            "status": "pending",
+            "testStrategy": "Test each command correctly reads/writes the appropriate config field.",
+            "parentId": "undefined"
+          },
+          {
+            "id": 8,
+            "title": "Add --direct flag for mcpd bypass",
+            "description": "Add --direct flag to CLI commands that bypasses mcplocal and connects directly to mcpd for debugging purposes.",
+            "dependencies": [
+              1,
+              5
+            ],
+            "details": "Add global --direct option to the main CLI. When set, api-client uses mcpdUrl instead of mcplocalUrl. Useful for debugging connectivity issues between mcplocal and mcpd.",
+            "status": "pending",
+            "testStrategy": "Test --direct flag causes requests to use mcpdUrl. Test normal operation uses mcplocalUrl.",
+            "parentId": "undefined"
+          },
+          {
+            "id": 9,
+            "title": "Register auth commands in CLI entry point",
+            "description": "Import and register the login and logout commands in src/cli/src/index.ts.",
+            "dependencies": [
+              3,
+              4
+            ],
+            "details": "Import createAuthCommand from commands/auth.ts and add it to the main program with program.addCommand(createAuthCommand()).",
+            "status": "pending",
+            "testStrategy": "Test mcpctl login and mcpctl logout are available as commands.",
+            "parentId": "undefined"
+          }
+        ],
+        "updatedAt": "2026-02-21T18:39:11.345Z"
+      },
+      {
+        "id": "34",
+        "title": "Connect mcplocal MCP router to mcpd proxy endpoint",
+        "description": "Update mcplocal's MCP router to forward tool calls to mcpd's new /api/v1/mcp/proxy endpoint instead of connecting to MCP servers directly.",
+        "details": "1. Update `src/mcplocal/src/router.ts` to use mcpd proxy:\n   ```typescript\n   class Router {\n     private mcpdClient: McpdClient;\n     \n     async handleToolsCall(request: JsonRpcRequest) {\n       const { name, arguments: args } = request.params;\n       const [serverName, toolName] = name.split('/');\n       \n       // Pre-process with LLM if enabled\n       const processedArgs = this.config.enablePreprocessing\n         ? await this.llmProcessor.preprocessRequest(toolName, args)\n         : args;\n       \n       // Call mcpd proxy endpoint\n       const result = await this.mcpdClient.post('/api/v1/mcp/proxy', {\n         serverId: serverName,\n         method: 'tools/call',\n         params: { name: toolName, arguments: processedArgs }\n       });\n       \n       // Post-process response with LLM if enabled\n       return this.config.enablePreprocessing\n         ? await this.llmProcessor.filterResponse(toolName, args, result)\n         : result;\n     }\n   }\n   ```\n2. Update upstream configuration:\n   - Remove direct upstream connections for managed servers\n   - Keep option for local/unmanaged upstreams\n3. Add server discovery from mcpd:\n   ```typescript\n   async refreshServerList() {\n     const servers = await this.mcpdClient.get('/api/v1/servers');\n     this.updateAvailableTools(servers);\n   }\n   ```\n4. Handle tools/list by aggregating from mcpd servers\n5. Handle resources/list and prompts/list similarly",
+        "testStrategy": "1. Unit test: Tool calls are forwarded to mcpd proxy correctly\n2. Unit test: Server name is extracted from namespaced tool name\n3. Integration test: Full flow Claude -> mcplocal -> mcpd -> container\n4. Test tools/list aggregates from all mcpd servers\n5. Test error handling when mcpd is unreachable\n6. Test LLM preprocessing is applied when enabled",
+        "priority": "high",
+        "dependencies": [
+          "28",
+          "29"
+        ],
+        "status": "done",
+        "subtasks": [],
+        "updatedAt": "2026-02-21T18:43:14.673Z"
+      },
+      {
+        "id": "35",
+        "title": "Implement health monitoring across all tiers",
+        "description": "Extend health monitoring to track connectivity and status across mcplocal, mcpd, and individual MCP server instances.",
+        "details": "1. Update mcplocal health monitor in `src/mcplocal/src/health.ts`:\n   ```typescript\n   export class TieredHealthMonitor {\n     async checkHealth(): Promise<TieredHealthStatus> {\n       return {\n         mcplocal: {\n           status: 'healthy',\n           llmProvider: await this.checkLlmProvider(),\n           uptime: process.uptime()\n         },\n         mcpd: await this.checkMcpdHealth(),\n         instances: await this.checkInstancesHealth()\n       };\n     }\n     \n     private async checkMcpdHealth(): Promise<McpdHealth> {\n       try {\n         const health = await this.mcpdClient.get('/api/v1/health');\n         return { status: 'connected', ...health };\n       } catch {\n         return { status: 'disconnected' };\n       }\n     }\n     \n     private async checkInstancesHealth(): Promise<InstanceHealth[]> {\n       const instances = await this.mcpdClient.get('/api/v1/instances');\n       return instances.map(i => ({\n         name: i.name,\n         status: i.status,\n         lastHealthCheck: i.lastHealthCheck\n       }));\n     }\n   }\n   ```\n2. Add health endpoint to mcplocal HTTP server: `GET /health`\n3. Update mcpctl status command to display tiered health\n4. Add degraded state detection:\n   - LLM provider unavailable but mcpd reachable\n   - Some instances down but others healthy\n5. Add health event notifications for state transitions\n6. Add configurable health check intervals",
+        "testStrategy": "1. Unit test: Health check correctly identifies all states\n2. Unit test: Degraded state is detected correctly\n3. Integration test: Full health check across all tiers\n4. Test health endpoint returns correct format\n5. Test mcpctl status displays health correctly\n6. Test state transition events are emitted",
+        "priority": "medium",
+        "dependencies": [
+          "33",
+          "34"
+        ],
+        "status": "done",
+        "subtasks": [],
+        "updatedAt": "2026-02-21T18:46:07.885Z"
+      },
+      {
+        "id": "36",
+        "title": "End-to-end integration testing",
+        "description": "Create comprehensive integration tests that validate the full data flow from mcpctl through mcplocal to mcpd to MCP server containers and back.",
+        "details": "1. Create test fixtures in `src/mcplocal/test/fixtures/`:\n   - Mock MCP server that returns predictable responses\n   - Test configuration files\n   - Sample tool call payloads\n2. Create integration test suite in `src/mcplocal/test/integration/`:\n   ```typescript\n   describe('End-to-end flow', () => {\n     it('mcpctl -> mcplocal -> mcpd -> mcp_server', async () => {\n       // Start mock MCP server\n       // Start mcpd with test config\n       // Start mcplocal pointing to mcpd\n       // Execute mcpctl command\n       // Verify response flows back correctly\n     });\n     \n     it('LLM pre-processing reduces response size', async () => {\n       // Send query that returns large dataset\n       // Verify LLM filtering reduces token count\n       // Verify relevant data is preserved\n     });\n     \n     it('credentials never leave mcpd', async () => {\n       // Monitor all traffic from mcplocal\n       // Verify no credentials appear in requests/responses\n     });\n   });\n   ```\n3. Test scenarios:\n   - Management commands (get servers, instances, etc.)\n   - MCP tool calls with LLM preprocessing\n   - MCP tool calls without preprocessing\n   - Error handling (mcpd down, instance down, LLM failure)\n   - Health monitoring accuracy\n4. Add CI integration test workflow\n5. Create docker-compose.test.yml for test environment",
+        "testStrategy": "1. All integration tests pass in CI environment\n2. Test coverage includes happy path and error scenarios\n3. Performance benchmarks: measure latency at each tier\n4. Security test: verify credential isolation\n5. Load test: multiple concurrent requests\n6. Chaos test: random component failures",
+        "priority": "high",
+        "dependencies": [
+          "29",
+          "33",
+          "34",
+          "35"
+        ],
+        "status": "done",
+        "subtasks": [],
+        "updatedAt": "2026-02-21T18:52:29.084Z"
       }
     ],
     "metadata": {
       "version": "1.0.0",
-      "lastModified": "2026-02-21T04:26:06.239Z",
-      "taskCount": 24,
-      "completedCount": 5,
+      "lastModified": "2026-02-21T18:52:29.084Z",
+      "taskCount": 36,
+      "completedCount": 33,
       "tags": [
         "master"
       ]

cli-buildrelease.sh

@@ -0,0 +1,69 @@
+#!/bin/bash
+set -e
+
+cd "$(dirname "$0")"
+
+# Load .env if present
+if [ -f .env ]; then
+  set -a; source .env; set +a
+fi
+
+# Ensure tools are on PATH
+export PATH="$HOME/.npm-global/bin:$HOME/.bun/bin:$HOME/.local/bin:$PATH"
+
+echo "=== mcpctl CLI build & release ==="
+echo ""
+
+# 1. Build TypeScript
+echo "==> Building TypeScript..."
+pnpm build
+
+# 2. Bundle standalone binary
+echo "==> Bundling standalone binary..."
+mkdir -p dist
+rm -f dist/mcpctl dist/mcpctl-*.rpm
+bun build src/cli/src/index.ts --compile --outfile dist/mcpctl
+echo "    Binary: $(du -h dist/mcpctl | cut -f1)"
+
+# 3. Package RPM
+echo "==> Packaging RPM..."
+nfpm pkg --packager rpm --target dist/
+RPM_FILE=$(ls dist/mcpctl-*.rpm 2>/dev/null | head -1)
+RPM_VERSION=$(rpm -qp --queryformat '%{VERSION}-%{RELEASE}' "$RPM_FILE")
+echo "    RPM: $RPM_FILE ($(du -h "$RPM_FILE" | cut -f1))"
+
+# 4. Publish to Gitea
+GITEA_URL="${GITEA_URL:-http://10.0.0.194:3012}"
+GITEA_OWNER="${GITEA_OWNER:-michal}"
+
+if [ -z "$GITEA_TOKEN" ]; then
+  echo ""
+  echo "WARNING: GITEA_TOKEN not set, skipping publish. Add it to .env"
+  echo ""
+else
+  echo "==> Publishing to ${GITEA_URL}..."
+  EXISTING=$(curl -s -o /dev/null -w "%{http_code}" \
+    -H "Authorization: token ${GITEA_TOKEN}" \
+    "${GITEA_URL}/api/v1/packages/${GITEA_OWNER}/rpm/mcpctl/${RPM_VERSION}")
+
+  if [ "$EXISTING" = "200" ]; then
+    echo "    Replacing existing version $RPM_VERSION..."
+    curl -s -o /dev/null -X DELETE \
+      -H "Authorization: token ${GITEA_TOKEN}" \
+      "${GITEA_URL}/api/v1/packages/${GITEA_OWNER}/rpm/mcpctl/${RPM_VERSION}"
+  fi
+
+  curl --fail -s -X PUT \
+    -H "Authorization: token ${GITEA_TOKEN}" \
+    --upload-file "$RPM_FILE" \
+    "${GITEA_URL}/api/packages/${GITEA_OWNER}/rpm/upload"
+  echo "    Published!"
+fi
+
+# 5. Install locally
+echo "==> Installing..."
+sudo rpm -U --force "$RPM_FILE"
+
+echo ""
+echo "=== Done ==="
+mcpctl --version

completions/mcpctl.bash

@@ -0,0 +1,93 @@
+_mcpctl() {
+  local cur prev words cword
+  _init_completion || return
+
+  local commands="config status get describe instance instances apply setup claude project projects backup restore help"
+  local global_opts="-v --version -o --output --daemon-url -h --help"
+  local resources="servers profiles projects instances"
+
+  case "${words[1]}" in
+    config)
+      COMPREPLY=($(compgen -W "view set path reset help" -- "$cur"))
+      return ;;
+    status)
+      COMPREPLY=($(compgen -W "--daemon-url -h --help" -- "$cur"))
+      return ;;
+    get)
+      if [[ $cword -eq 2 ]]; then
+        COMPREPLY=($(compgen -W "$resources" -- "$cur"))
+      else
+        COMPREPLY=($(compgen -W "-o --output --daemon-url -h --help" -- "$cur"))
+      fi
+      return ;;
+    describe)
+      if [[ $cword -eq 2 ]]; then
+        COMPREPLY=($(compgen -W "$resources" -- "$cur"))
+      else
+        COMPREPLY=($(compgen -W "-o --output --daemon-url -h --help" -- "$cur"))
+      fi
+      return ;;
+    instance|instances)
+      if [[ $cword -eq 2 ]]; then
+        COMPREPLY=($(compgen -W "list ls start stop restart remove rm logs inspect help" -- "$cur"))
+      else
+        case "${words[2]}" in
+          logs)
+            COMPREPLY=($(compgen -W "--tail --since -h --help" -- "$cur"))
+            ;;
+          start)
+            COMPREPLY=($(compgen -W "--env --image -h --help" -- "$cur"))
+            ;;
+          list|ls)
+            COMPREPLY=($(compgen -W "--server-id -o --output -h --help" -- "$cur"))
+            ;;
+        esac
+      fi
+      return ;;
+    claude)
+      if [[ $cword -eq 2 ]]; then
+        COMPREPLY=($(compgen -W "generate show add remove help" -- "$cur"))
+      else
+        case "${words[2]}" in
+          generate|show|add|remove)
+            COMPREPLY=($(compgen -W "--path -p -h --help" -- "$cur"))
+            ;;
+        esac
+      fi
+      return ;;
+    project|projects)
+      if [[ $cword -eq 2 ]]; then
+        COMPREPLY=($(compgen -W "list ls create delete rm show profiles set-profiles help" -- "$cur"))
+      else
+        case "${words[2]}" in
+          create)
+            COMPREPLY=($(compgen -W "--description -d -h --help" -- "$cur"))
+            ;;
+          list|ls)
+            COMPREPLY=($(compgen -W "-o --output -h --help" -- "$cur"))
+            ;;
+        esac
+      fi
+      return ;;
+    apply)
+      COMPREPLY=($(compgen -f -- "$cur"))
+      return ;;
+    backup)
+      COMPREPLY=($(compgen -W "-o --output -p --password -r --resources -h --help" -- "$cur"))
+      return ;;
+    restore)
+      COMPREPLY=($(compgen -W "-i --input -p --password -c --conflict -h --help" -- "$cur"))
+      return ;;
+    setup)
+      return ;;
+    help)
+      COMPREPLY=($(compgen -W "$commands" -- "$cur"))
+      return ;;
+  esac
+
+  if [[ $cword -eq 1 ]]; then
+    COMPREPLY=($(compgen -W "$commands $global_opts" -- "$cur"))
+  fi
+}
+
+complete -F _mcpctl mcpctl

completions/mcpctl.fish

@@ -0,0 +1,81 @@
+# mcpctl fish completions
+
+set -l commands config status get describe instance instances apply setup claude project projects backup restore help
+
+# Disable file completions by default
+complete -c mcpctl -f
+
+# Global options
+complete -c mcpctl -s v -l version -d 'Show version'
+complete -c mcpctl -s o -l output -d 'Output format' -xa 'table json yaml'
+complete -c mcpctl -l daemon-url -d 'mcpd daemon URL' -x
+complete -c mcpctl -s h -l help -d 'Show help'
+
+# Top-level commands
+complete -c mcpctl -n "not __fish_seen_subcommand_from $commands" -a config -d 'Manage configuration'
+complete -c mcpctl -n "not __fish_seen_subcommand_from $commands" -a status -d 'Show status and connectivity'
+complete -c mcpctl -n "not __fish_seen_subcommand_from $commands" -a get -d 'List resources'
+complete -c mcpctl -n "not __fish_seen_subcommand_from $commands" -a describe -d 'Show resource details'
+complete -c mcpctl -n "not __fish_seen_subcommand_from $commands" -a instance -d 'Manage instances'
+complete -c mcpctl -n "not __fish_seen_subcommand_from $commands" -a apply -d 'Apply configuration from file'
+complete -c mcpctl -n "not __fish_seen_subcommand_from $commands" -a setup -d 'Interactive setup wizard'
+complete -c mcpctl -n "not __fish_seen_subcommand_from $commands" -a claude -d 'Manage Claude .mcp.json'
+complete -c mcpctl -n "not __fish_seen_subcommand_from $commands" -a project -d 'Manage projects'
+complete -c mcpctl -n "not __fish_seen_subcommand_from $commands" -a backup -d 'Backup configuration'
+complete -c mcpctl -n "not __fish_seen_subcommand_from $commands" -a restore -d 'Restore from backup'
+complete -c mcpctl -n "not __fish_seen_subcommand_from $commands" -a help -d 'Show help'
+
+# get/describe resources
+complete -c mcpctl -n "__fish_seen_subcommand_from get describe" -a 'servers profiles projects instances' -d 'Resource type'
+
+# config subcommands
+complete -c mcpctl -n "__fish_seen_subcommand_from config; and not __fish_seen_subcommand_from view set path reset" -a view -d 'Show configuration'
+complete -c mcpctl -n "__fish_seen_subcommand_from config; and not __fish_seen_subcommand_from view set path reset" -a set -d 'Set a config value'
+complete -c mcpctl -n "__fish_seen_subcommand_from config; and not __fish_seen_subcommand_from view set path reset" -a path -d 'Show config file path'
+complete -c mcpctl -n "__fish_seen_subcommand_from config; and not __fish_seen_subcommand_from view set path reset" -a reset -d 'Reset to defaults'
+
+# instance subcommands
+set -l instance_cmds list ls start stop restart remove rm logs inspect
+complete -c mcpctl -n "__fish_seen_subcommand_from instance instances; and not __fish_seen_subcommand_from $instance_cmds" -a list -d 'List instances'
+complete -c mcpctl -n "__fish_seen_subcommand_from instance instances; and not __fish_seen_subcommand_from $instance_cmds" -a start -d 'Start instance'
+complete -c mcpctl -n "__fish_seen_subcommand_from instance instances; and not __fish_seen_subcommand_from $instance_cmds" -a stop -d 'Stop instance'
+complete -c mcpctl -n "__fish_seen_subcommand_from instance instances; and not __fish_seen_subcommand_from $instance_cmds" -a restart -d 'Restart instance'
+complete -c mcpctl -n "__fish_seen_subcommand_from instance instances; and not __fish_seen_subcommand_from $instance_cmds" -a remove -d 'Remove instance'
+complete -c mcpctl -n "__fish_seen_subcommand_from instance instances; and not __fish_seen_subcommand_from $instance_cmds" -a logs -d 'Get logs'
+complete -c mcpctl -n "__fish_seen_subcommand_from instance instances; and not __fish_seen_subcommand_from $instance_cmds" -a inspect -d 'Inspect container'
+complete -c mcpctl -n "__fish_seen_subcommand_from instance instances; and __fish_seen_subcommand_from logs" -l tail -d 'Number of lines' -x
+complete -c mcpctl -n "__fish_seen_subcommand_from instance instances; and __fish_seen_subcommand_from logs" -l since -d 'Since timestamp' -x
+
+# claude subcommands
+set -l claude_cmds generate show add remove
+complete -c mcpctl -n "__fish_seen_subcommand_from claude; and not __fish_seen_subcommand_from $claude_cmds" -a generate -d 'Generate .mcp.json'
+complete -c mcpctl -n "__fish_seen_subcommand_from claude; and not __fish_seen_subcommand_from $claude_cmds" -a show -d 'Show .mcp.json'
+complete -c mcpctl -n "__fish_seen_subcommand_from claude; and not __fish_seen_subcommand_from $claude_cmds" -a add -d 'Add server entry'
+complete -c mcpctl -n "__fish_seen_subcommand_from claude; and not __fish_seen_subcommand_from $claude_cmds" -a remove -d 'Remove server entry'
+complete -c mcpctl -n "__fish_seen_subcommand_from claude; and __fish_seen_subcommand_from $claude_cmds" -s p -l path -d 'Path to .mcp.json' -rF
+
+# project subcommands
+set -l project_cmds list ls create delete rm show profiles set-profiles
+complete -c mcpctl -n "__fish_seen_subcommand_from project projects; and not __fish_seen_subcommand_from $project_cmds" -a list -d 'List projects'
+complete -c mcpctl -n "__fish_seen_subcommand_from project projects; and not __fish_seen_subcommand_from $project_cmds" -a create -d 'Create project'
+complete -c mcpctl -n "__fish_seen_subcommand_from project projects; and not __fish_seen_subcommand_from $project_cmds" -a delete -d 'Delete project'
+complete -c mcpctl -n "__fish_seen_subcommand_from project projects; and not __fish_seen_subcommand_from $project_cmds" -a show -d 'Show project'
+complete -c mcpctl -n "__fish_seen_subcommand_from project projects; and not __fish_seen_subcommand_from $project_cmds" -a profiles -d 'List profiles'
+complete -c mcpctl -n "__fish_seen_subcommand_from project projects; and not __fish_seen_subcommand_from $project_cmds" -a set-profiles -d 'Set profiles'
+complete -c mcpctl -n "__fish_seen_subcommand_from project projects; and __fish_seen_subcommand_from create" -s d -l description -d 'Description' -x
+
+# backup options
+complete -c mcpctl -n "__fish_seen_subcommand_from backup" -s o -l output -d 'Output file' -rF
+complete -c mcpctl -n "__fish_seen_subcommand_from backup" -s p -l password -d 'Encryption password' -x
+complete -c mcpctl -n "__fish_seen_subcommand_from backup" -s r -l resources -d 'Resources to backup' -xa 'servers profiles projects'
+
+# restore options
+complete -c mcpctl -n "__fish_seen_subcommand_from restore" -s i -l input -d 'Input file' -rF
+complete -c mcpctl -n "__fish_seen_subcommand_from restore" -s p -l password -d 'Decryption password' -x
+complete -c mcpctl -n "__fish_seen_subcommand_from restore" -s c -l conflict -d 'Conflict strategy' -xa 'skip overwrite fail'
+
+# apply takes a file
+complete -c mcpctl -n "__fish_seen_subcommand_from apply" -F
+
+# help completions
+complete -c mcpctl -n "__fish_seen_subcommand_from help" -a "$commands"

deploy.sh

@@ -0,0 +1,398 @@
+#!/bin/bash
+# Deploy mcpctl stack to Portainer
+# Usage: ./deploy.sh [--dry-run]
+
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+STACK_DIR="$SCRIPT_DIR/stack"
+COMPOSE_FILE="$STACK_DIR/docker-compose.yml"
+ENV_FILE="$STACK_DIR/.env"
+
+# Portainer configuration
+PORTAINER_URL="${PORTAINER_URL:-http://10.0.0.194:9000}"
+PORTAINER_USER="${PORTAINER_USER:-michal}"
+STACK_NAME="mcpctl"
+ENDPOINT_ID="2"
+
+# Colors for output
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+NC='\033[0m'
+
+log_info() { echo -e "${GREEN}[INFO]${NC} $1" >&2; }
+log_warn() { echo -e "${YELLOW}[WARN]${NC} $1" >&2; }
+log_error() { echo -e "${RED}[ERROR]${NC} $1" >&2; }
+
+check_files() {
+    if [[ ! -f "$COMPOSE_FILE" ]]; then
+        log_error "Compose file not found: $COMPOSE_FILE"
+        exit 1
+    fi
+    if [[ ! -f "$ENV_FILE" ]]; then
+        log_error "Environment file not found: $ENV_FILE"
+        exit 1
+    fi
+    log_info "Found compose file: $COMPOSE_FILE"
+    log_info "Found env file: $ENV_FILE"
+}
+
+get_password() {
+    if [[ -n "$PORTAINER_PASSWORD" ]]; then
+        echo "$PORTAINER_PASSWORD"
+        return
+    fi
+    if [[ -f "$SCRIPT_DIR/.portainer_password" ]]; then
+        cat "$SCRIPT_DIR/.portainer_password"
+        return
+    fi
+    if [[ -f "$HOME/.portainer_password" ]]; then
+        cat "$HOME/.portainer_password"
+        return
+    fi
+    read -s -p "Enter Portainer password for $PORTAINER_USER: " password
+    echo >&2
+    echo "$password"
+}
+
+get_jwt_token() {
+    local password="$1"
+    log_info "Authenticating to Portainer..."
+
+    local escaped_password
+    escaped_password=$(printf '%s' "$password" | jq -Rs .)
+
+    local response
+    response=$(curl -s -X POST "$PORTAINER_URL/api/auth" \
+        -H "Content-Type: application/json" \
+        -d "{\"Username\":\"$PORTAINER_USER\",\"Password\":$escaped_password}")
+
+    local token
+    token=$(echo "$response" | jq -r '.jwt // empty')
+
+    if [[ -z "$token" ]]; then
+        log_error "Authentication failed: $(echo "$response" | jq -r '.message // "Unknown error"')"
+        exit 1
+    fi
+    echo "$token"
+}
+
+parse_env_to_json() {
+    local env_file="$1"
+    local json_array="["
+    local first=true
+
+    while IFS= read -r line || [[ -n "$line" ]]; do
+        [[ "$line" =~ ^#.*$ ]] && continue
+        [[ -z "$line" ]] && continue
+
+        local name="${line%%=*}"
+        local value="${line#*=}"
+        [[ "$name" == "$line" ]] && continue
+
+        if [[ "$first" == "true" ]]; then
+            first=false
+        else
+            json_array+=","
+        fi
+
+        value=$(echo "$value" | sed 's/\\/\\\\/g; s/"/\\"/g')
+        json_array+="{\"name\":\"$name\",\"value\":\"$value\"}"
+    done < "$env_file"
+
+    json_array+="]"
+    echo "$json_array"
+}
+
+# Find existing stack by name
+find_stack_id() {
+    local token="$1"
+    local response
+    response=$(curl -s -X GET "$PORTAINER_URL/api/stacks" \
+        -H "Authorization: Bearer $token")
+
+    echo "$response" | jq -r --arg name "$STACK_NAME" \
+        '.[] | select(.Name == $name) | .Id // empty'
+}
+
+get_stack_info() {
+    local token="$1"
+    local stack_id="$2"
+    curl -s -X GET "$PORTAINER_URL/api/stacks/$stack_id" \
+        -H "Authorization: Bearer $token" \
+        -H "Content-Type: application/json"
+}
+
+get_stack_file() {
+    local token="$1"
+    local stack_id="$2"
+    local response
+    response=$(curl -s -X GET "$PORTAINER_URL/api/stacks/$stack_id/file" \
+        -H "Authorization: Bearer $token" \
+        -H "Content-Type: application/json")
+
+    if echo "$response" | jq -e '.StackFileContent' > /dev/null 2>&1; then
+        echo "$response" | jq -r '.StackFileContent'
+    else
+        echo "# Could not retrieve current compose file"
+    fi
+}
+
+show_diff() {
+    local token="$1"
+    local stack_id="$2"
+    local env_json="$3"
+
+    log_info "Fetching current state from Portainer..."
+
+    local current_compose
+    current_compose=$(get_stack_file "$token" "$stack_id")
+
+    local current_env
+    local stack_info
+    stack_info=$(get_stack_info "$token" "$stack_id")
+    current_env=$(echo "$stack_info" | jq -r 'if .Env then .Env[] | "\(.name)=\(.value)" else empty end' 2>/dev/null | sort)
+
+    local new_env
+    new_env=$(echo "$env_json" | jq -r '.[] | "\(.name)=\(.value)"' | sort)
+
+    local tmp_dir
+    tmp_dir=$(mktemp -d)
+
+    echo "$current_compose" > "$tmp_dir/current_compose.yml"
+    cat "$COMPOSE_FILE" > "$tmp_dir/new_compose.yml"
+    echo "$current_env" > "$tmp_dir/current_env.txt"
+    echo "$new_env" > "$tmp_dir/new_env.txt"
+
+    echo ""
+    echo "=== ENVIRONMENT VARIABLES DIFF ==="
+    echo ""
+
+    if diff -u "$tmp_dir/current_env.txt" "$tmp_dir/new_env.txt" > "$tmp_dir/env_diff.txt" 2>&1; then
+        echo -e "${GREEN}No changes in environment variables${NC}"
+    else
+        while IFS= read -r line; do
+            if [[ "$line" == ---* ]] || [[ "$line" == +++* ]] || [[ "$line" == @@* ]]; then
+                echo -e "${YELLOW}$line${NC}"
+            elif [[ "$line" == -* ]]; then
+                echo -e "${RED}$line${NC}"
+            elif [[ "$line" == +* ]]; then
+                echo -e "${GREEN}$line${NC}"
+            else
+                echo "$line"
+            fi
+        done < "$tmp_dir/env_diff.txt"
+    fi
+
+    echo ""
+    echo "=== COMPOSE FILE DIFF ==="
+    echo ""
+
+    if diff -u "$tmp_dir/current_compose.yml" "$tmp_dir/new_compose.yml" > "$tmp_dir/compose_diff.txt" 2>&1; then
+        echo -e "${GREEN}No changes in compose file${NC}"
+    else
+        while IFS= read -r line; do
+            if [[ "$line" == ---* ]] || [[ "$line" == +++* ]] || [[ "$line" == @@* ]]; then
+                echo -e "${YELLOW}$line${NC}"
+            elif [[ "$line" == -* ]]; then
+                echo -e "${RED}$line${NC}"
+            elif [[ "$line" == +* ]]; then
+                echo -e "${GREEN}$line${NC}"
+            else
+                echo "$line"
+            fi
+        done < "$tmp_dir/compose_diff.txt"
+    fi
+
+    rm -rf "$tmp_dir"
+}
+
+create_stack() {
+    local token="$1"
+    local env_json="$2"
+
+    local compose_content
+    compose_content=$(cat "$COMPOSE_FILE")
+
+    local compose_escaped
+    compose_escaped=$(echo "$compose_content" | jq -Rs .)
+
+    log_info "Creating new stack '$STACK_NAME'..."
+
+    local payload
+    payload=$(jq -n \
+        --arg name "$STACK_NAME" \
+        --argjson env "$env_json" \
+        --argjson stackFileContent "$compose_escaped" \
+        '{
+            "name": $name,
+            "env": $env,
+            "stackFileContent": $stackFileContent
+        }')
+
+    local response
+    response=$(curl -s -X POST "$PORTAINER_URL/api/stacks?type=2&method=string&endpointId=$ENDPOINT_ID" \
+        -H "Authorization: Bearer $token" \
+        -H "Content-Type: application/json" \
+        -d "$payload")
+
+    local error_msg
+    error_msg=$(echo "$response" | jq -r '.message // empty')
+
+    if [[ -n "$error_msg" ]]; then
+        log_error "Stack creation failed: $error_msg"
+        echo "$response" | jq .
+        exit 1
+    fi
+
+    local new_id
+    new_id=$(echo "$response" | jq -r '.Id')
+    log_info "Stack created successfully! (ID: $new_id)"
+    echo "$response" | jq '{Id, Name, Status, CreationDate}'
+}
+
+update_stack() {
+    local token="$1"
+    local stack_id="$2"
+    local dry_run="$3"
+
+    local compose_content
+    compose_content=$(cat "$COMPOSE_FILE")
+
+    local env_json
+    env_json=$(parse_env_to_json "$ENV_FILE")
+
+    if [[ "$dry_run" == "true" ]]; then
+        log_warn "DRY RUN - Not actually deploying"
+        show_diff "$token" "$stack_id" "$env_json"
+        echo ""
+        log_warn "DRY RUN complete - no changes made"
+        log_info "Run without --dry-run to apply these changes"
+        return 0
+    fi
+
+    local env_count
+    env_count=$(echo "$env_json" | jq 'length')
+    log_info "Deploying $env_count environment variables"
+    log_info "Updating stack '$STACK_NAME' (ID: $stack_id)..."
+
+    local compose_escaped
+    compose_escaped=$(echo "$compose_content" | jq -Rs .)
+
+    local payload
+    payload=$(jq -n \
+        --argjson env "$env_json" \
+        --argjson stackFileContent "$compose_escaped" \
+        '{
+            "env": $env,
+            "stackFileContent": $stackFileContent,
+            "prune": true,
+            "pullImage": true
+        }')
+
+    local response
+    response=$(curl -s -X PUT "$PORTAINER_URL/api/stacks/$stack_id?endpointId=$ENDPOINT_ID" \
+        -H "Authorization: Bearer $token" \
+        -H "Content-Type: application/json" \
+        -d "$payload")
+
+    local error_msg
+    error_msg=$(echo "$response" | jq -r '.message // empty')
+
+    if [[ -n "$error_msg" ]]; then
+        log_error "Deployment failed: $error_msg"
+        echo "$response" | jq .
+        exit 1
+    fi
+
+    log_info "Stack updated successfully!"
+    echo "$response" | jq '{Id, Name, Status, CreationDate, UpdateDate}'
+}
+
+main() {
+    local dry_run=false
+
+    while [[ $# -gt 0 ]]; do
+        case $1 in
+            --dry-run)
+                dry_run=true
+                shift
+                ;;
+            --help|-h)
+                echo "Usage: $0 [--dry-run]"
+                echo ""
+                echo "Deploy mcpctl stack to Portainer"
+                echo ""
+                echo "Options:"
+                echo "  --dry-run    Show what would be deployed without actually deploying"
+                echo "  --help       Show this help message"
+                echo ""
+                echo "Environment variables:"
+                echo "  PORTAINER_URL       Portainer URL (default: http://10.0.0.194:9000)"
+                echo "  PORTAINER_USER      Portainer username (default: michal)"
+                echo "  PORTAINER_PASSWORD  Portainer password (or store in ~/.portainer_password)"
+                exit 0
+                ;;
+            *)
+                log_error "Unknown option: $1"
+                exit 1
+                ;;
+        esac
+    done
+
+    echo "========================================"
+    echo "  mcpctl Stack Deployment"
+    echo "========================================"
+    echo ""
+
+    check_files
+
+    local password
+    password=$(get_password)
+
+    local token
+    token=$(get_jwt_token "$password")
+    log_info "Authentication successful"
+
+    # Find or create stack
+    local stack_id
+    stack_id=$(find_stack_id "$token")
+
+    if [[ -z "$stack_id" ]]; then
+        if [[ "$dry_run" == "true" ]]; then
+            log_warn "Stack '$STACK_NAME' does not exist yet"
+            log_info "A real deploy would create it"
+            return 0
+        fi
+
+        log_info "Stack '$STACK_NAME' not found, creating..."
+        local env_json
+        env_json=$(parse_env_to_json "$ENV_FILE")
+        create_stack "$token" "$env_json"
+    else
+        local stack_info
+        stack_info=$(get_stack_info "$token" "$stack_id")
+        local status_code
+        status_code=$(echo "$stack_info" | jq -r '.Status // 0')
+        local status_text="Unknown"
+        case "$status_code" in
+            1) status_text="Active" ;;
+            2) status_text="Inactive" ;;
+        esac
+        log_info "Current stack status: $status_text (ID: $stack_id, Env vars: $(echo "$stack_info" | jq '.Env | length'))"
+
+        echo ""
+        update_stack "$token" "$stack_id" "$dry_run"
+    fi
+
+    echo ""
+    log_info "Done!"
+
+    if [[ "$dry_run" == "false" ]]; then
+        log_info "Check Portainer UI to verify containers are running"
+        log_info "URL: $PORTAINER_URL/#!/$ENDPOINT_ID/docker/stacks/$STACK_NAME"
+    fi
+}
+
+main "$@"

deploy/Dockerfile.mcpd

@@ -0,0 +1,64 @@
+# Stage 1: Build TypeScript
+FROM node:20-alpine AS builder
+
+RUN corepack enable && corepack prepare pnpm@9.15.0 --activate
+
+WORKDIR /app
+
+# Copy workspace config and package manifests
+COPY pnpm-workspace.yaml pnpm-lock.yaml package.json tsconfig.base.json ./
+COPY src/mcpd/package.json src/mcpd/tsconfig.json src/mcpd/
+COPY src/db/package.json src/db/tsconfig.json src/db/
+COPY src/shared/package.json src/shared/tsconfig.json src/shared/
+
+# Install all dependencies
+RUN pnpm install --frozen-lockfile
+
+# Copy source code
+COPY src/mcpd/src/ src/mcpd/src/
+COPY src/db/src/ src/db/src/
+COPY src/db/prisma/ src/db/prisma/
+COPY src/shared/src/ src/shared/src/
+
+# Generate Prisma client and build TypeScript
+RUN pnpm -F @mcpctl/db db:generate
+RUN pnpm -F @mcpctl/shared build && pnpm -F @mcpctl/db build && pnpm -F @mcpctl/mcpd build
+
+# Stage 2: Production runtime
+FROM node:20-alpine
+
+RUN corepack enable && corepack prepare pnpm@9.15.0 --activate
+
+WORKDIR /app
+
+# Copy workspace config, manifests, and lockfile
+COPY pnpm-workspace.yaml pnpm-lock.yaml package.json ./
+COPY src/mcpd/package.json src/mcpd/
+COPY src/db/package.json src/db/
+COPY src/shared/package.json src/shared/
+
+# Install all deps (prisma CLI needed at runtime for db push)
+RUN pnpm install --frozen-lockfile
+
+# Copy prisma schema and generate client
+COPY src/db/prisma/ src/db/prisma/
+RUN pnpm -F @mcpctl/db db:generate
+
+# Copy built output from builder
+COPY --from=builder /app/src/shared/dist/ src/shared/dist/
+COPY --from=builder /app/src/db/dist/ src/db/dist/
+COPY --from=builder /app/src/mcpd/dist/ src/mcpd/dist/
+
+# Copy templates for seeding
+COPY templates/ templates/
+
+# Copy entrypoint
+COPY deploy/entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+EXPOSE 3100
+
+HEALTHCHECK --interval=10s --timeout=5s --retries=3 --start-period=10s \
+  CMD wget -q --spider http://localhost:3100/healthz || exit 1
+
+ENTRYPOINT ["/entrypoint.sh"]

deploy/docker-compose.yml

@@ -15,6 +15,38 @@ services:
       interval: 5s
       timeout: 5s
       retries: 5
+    networks:
+      - mcpctl
+
+  mcpd:
+    build:
+      context: ..
+      dockerfile: deploy/Dockerfile.mcpd
+    container_name: mcpctl-mcpd
+    ports:
+      - "3100:3100"
+    environment:
+      DATABASE_URL: postgresql://mcpctl:mcpctl_dev@postgres:5432/mcpctl
+      MCPD_PORT: "3100"
+      MCPD_HOST: "0.0.0.0"
+      MCPD_LOG_LEVEL: info
+    depends_on:
+      postgres:
+        condition: service_healthy
+    volumes:
+      # Mount container runtime socket (Docker or Podman)
+      # For Docker: /var/run/docker.sock
+      # For Podman: /run/user/<UID>/podman/podman.sock
+      - ${CONTAINER_SOCK:-/var/run/docker.sock}:/var/run/docker.sock
+    networks:
+      - mcpctl
+      - mcp-servers
+    healthcheck:
+      test: ["CMD-SHELL", "wget -q --spider http://localhost:3100/healthz || exit 1"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 10s
 
   postgres-test:
     image: postgres:16-alpine
@@ -32,6 +64,15 @@ services:
       interval: 5s
       timeout: 5s
       retries: 5
+    profiles:
+      - test
+
+networks:
+  mcpctl:
+    driver: bridge
+  mcp-servers:
+    driver: bridge
+    internal: true
 
 volumes:
   mcpctl-pgdata:

deploy/entrypoint.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+echo "mcpd: pushing database schema..."
+pnpm -F @mcpctl/db exec prisma db push --schema=prisma/schema.prisma --accept-data-loss 2>&1
+
+echo "mcpd: seeding templates..."
+TEMPLATES_DIR=templates node src/mcpd/dist/seed-runner.js
+
+echo "mcpd: starting server..."
+exec node src/mcpd/dist/main.js

deploy/mcplocal.service

@@ -0,0 +1,15 @@
+[Unit]
+Description=mcpctl local MCP proxy
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/mcpctl-local
+Restart=on-failure
+RestartSec=5
+Environment=MCPLOCAL_MCPD_URL=http://10.0.0.194:3100
+Environment=MCPLOCAL_HTTP_PORT=3200
+Environment=MCPLOCAL_HTTP_HOST=127.0.0.1
+
+[Install]
+WantedBy=default.target

docs/architecture.md

@@ -0,0 +1,149 @@
+# mcpctl Architecture
+
+## Overview
+
+mcpctl is a kubectl-like management tool for MCP (Model Context Protocol) servers. It consists of a CLI, a daemon server, a database layer, a local proxy, and shared utilities.
+
+## Package Structure
+
+```
+src/
+├── cli/          @mcpctl/cli          - Command-line interface
+├── mcpd/         @mcpctl/mcpd         - Daemon server (REST API)
+├── db/           @mcpctl/db           - Database layer (Prisma + PostgreSQL)
+├── local-proxy/  @mcpctl/local-proxy  - MCP protocol proxy
+└── shared/       @mcpctl/shared       - Shared constants and utilities
+```
+
+## Component Diagram
+
+```
+┌─────────────────┐     HTTP      ┌──────────────┐     Prisma     ┌────────────┐
+│   mcpctl CLI    │ ──────────────│    mcpd      │ ──────────────│ PostgreSQL │
+│  (Commander.js) │               │  (Fastify 5) │               │            │
+└─────────────────┘               └──────┬───────┘               └────────────┘
+                                         │
+                                         │ Docker/Podman API
+                                         ▼
+                                  ┌──────────────┐
+                                  │  Containers  │
+                                  │ (MCP servers)│
+                                  └──────────────┘
+
+┌─────────────────┐    STDIO     ┌──────────────┐    STDIO/HTTP   ┌────────────┐
+│  Claude / LLM   │ ────────────│  local-proxy  │ ──────────────│ MCP Servers│
+│                 │              │  (McpRouter)  │               │            │
+└─────────────────┘              └──────────────┘               └────────────┘
+```
+
+## CLI (`@mcpctl/cli`)
+
+The CLI is built with Commander.js and communicates with mcpd via HTTP REST.
+
+### Commands
+
+| Command | Description |
+|---------|-------------|
+| `mcpctl get <resource>` | List resources (servers, profiles, projects, instances) |
+| `mcpctl describe <resource> <id>` | Show detailed resource info |
+| `mcpctl apply <file>` | Apply declarative YAML/JSON configuration |
+| `mcpctl setup [name]` | Interactive server setup wizard |
+| `mcpctl instance list/start/stop/restart/remove/logs/inspect` | Manage instances |
+| `mcpctl claude generate/show/add/remove` | Manage .mcp.json files |
+| `mcpctl project list/create/delete/show/profiles/set-profiles` | Manage projects |
+| `mcpctl config get/set/path` | Manage CLI configuration |
+| `mcpctl status` | Check daemon connectivity |
+
+### Configuration
+
+CLI config is stored at `~/.config/mcpctl/config.json` with:
+- `daemonUrl`: mcpd server URL (default: `http://localhost:4444`)
+
+## Daemon (`@mcpctl/mcpd`)
+
+Fastify 5-based REST API server that manages MCP server lifecycle.
+
+### Layers
+
+1. **Routes** - HTTP handlers, parameter extraction
+2. **Services** - Business logic, validation (Zod schemas), error handling
+3. **Repositories** - Data access via Prisma (interface-based for testability)
+
+### API Endpoints
+
+| Endpoint | Methods | Description |
+|----------|---------|-------------|
+| `/api/v1/servers` | GET, POST | MCP server definitions |
+| `/api/v1/servers/:id` | GET, PUT, DELETE | Single server operations |
+| `/api/v1/profiles` | GET, POST | Server configuration profiles |
+| `/api/v1/profiles/:id` | GET, PUT, DELETE | Single profile operations |
+| `/api/v1/projects` | GET, POST | Project management |
+| `/api/v1/projects/:id` | GET, PUT, DELETE | Single project operations |
+| `/api/v1/projects/:id/profiles` | GET, PUT | Project profile assignments |
+| `/api/v1/projects/:id/mcp-config` | GET | Generate .mcp.json |
+| `/api/v1/instances` | GET, POST | Instance lifecycle |
+| `/api/v1/instances/:id` | GET, DELETE | Instance operations |
+| `/api/v1/instances/:id/stop` | POST | Stop instance |
+| `/api/v1/instances/:id/restart` | POST | Restart instance |
+| `/api/v1/instances/:id/inspect` | GET | Container inspection |
+| `/api/v1/instances/:id/logs` | GET | Container logs |
+| `/api/v1/audit-logs` | GET | Query audit logs |
+| `/api/v1/audit-logs/:id` | GET | Single audit log |
+| `/api/v1/audit-logs/purge` | POST | Purge expired logs |
+| `/health` | GET | Health check (detailed) |
+| `/healthz` | GET | Liveness probe |
+
+### Container Orchestration
+
+The `McpOrchestrator` interface abstracts container management:
+- `DockerContainerManager` - Docker/Podman implementation via dockerode
+- Future: `KubernetesOrchestrator` for k8s deployments
+
+## Local Proxy (`@mcpctl/local-proxy`)
+
+Aggregates multiple MCP servers behind a single STDIO endpoint.
+
+### Features
+
+- **Tool namespacing**: `servername/toolname` routing
+- **Resource forwarding**: `resources/list` and `resources/read`
+- **Prompt forwarding**: `prompts/list` and `prompts/get`
+- **Notification pass-through**: Upstream notifications forwarded to client
+- **Health monitoring**: Periodic health checks with state tracking
+- **Transport support**: STDIO (child process) and HTTP (SSE/Streamable HTTP)
+
+### Usage
+
+```bash
+# Via config file
+mcpctl-proxy --config proxy.json
+
+# Via CLI flags
+mcpctl-proxy --upstream "slack:npx -y @anthropic/slack-mcp" \
+             --upstream "github:npx -y @anthropic/github-mcp"
+```
+
+## Database (`@mcpctl/db`)
+
+Prisma ORM with PostgreSQL. Key models:
+
+- **User** / **Session** - Authentication
+- **McpServer** - Server definitions (name, transport, package, docker image)
+- **McpProfile** - Per-server configurations (env overrides, permissions)
+- **Project** - Grouping of profiles for a workspace
+- **McpInstance** - Running container instances with lifecycle state
+- **AuditLog** - Immutable operation audit trail
+
+## Shared (`@mcpctl/shared`)
+
+Constants and utilities shared across packages:
+- `APP_NAME`, `APP_VERSION`
+- Common type definitions
+
+## Design Principles
+
+1. **Interface-based repositories** - All data access through interfaces for testability
+2. **Dependency injection** - Services receive dependencies via constructor
+3. **Zod validation** - All user input validated with Zod schemas
+4. **Namespaced errors** - Custom error classes with HTTP status codes
+5. **TypeScript strict mode** - `exactOptionalPropertyTypes`, `noUncheckedIndexedAccess`

docs/getting-started.md

@@ -0,0 +1,157 @@
+# Getting Started with mcpctl
+
+## Prerequisites
+
+- Node.js >= 20.0.0
+- pnpm >= 9.0.0
+- PostgreSQL (for mcpd)
+- Docker or Podman (for container management)
+
+## Installation
+
+```bash
+# Clone the repository
+git clone <repo-url>
+cd mcpctl
+
+# Install dependencies
+pnpm install
+
+# Generate Prisma client
+pnpm --filter @mcpctl/db exec prisma generate
+
+# Build all packages
+pnpm build
+```
+
+## Quick Start
+
+### 1. Start the Database
+
+```bash
+# Start PostgreSQL via Docker Compose
+pnpm db:up
+
+# Run database migrations
+pnpm --filter @mcpctl/db exec prisma db push
+```
+
+### 2. Start the Daemon
+
+```bash
+cd src/mcpd
+pnpm dev
+```
+
+The daemon starts on `http://localhost:4444` by default.
+
+### 3. Use the CLI
+
+```bash
+# Check daemon status
+mcpctl status
+
+# Register an MCP server
+mcpctl apply config.yaml
+
+# Or use the interactive wizard
+mcpctl setup my-server
+
+# List registered servers
+mcpctl get servers
+
+# Start an instance
+mcpctl instance start <server-id>
+
+# Check instance status
+mcpctl instance list
+
+# View instance logs
+mcpctl instance logs <instance-id>
+```
+
+### 4. Generate .mcp.json for Claude
+
+```bash
+# Create a project
+mcpctl project create my-workspace
+
+# Assign profiles to project
+mcpctl project set-profiles <project-id> <profile-id-1> <profile-id-2>
+
+# Generate .mcp.json
+mcpctl claude generate <project-id>
+
+# Or manually add servers
+mcpctl claude add my-server -c npx -a -y @my/mcp-server
+```
+
+## Example Configuration
+
+Create a `config.yaml` file:
+
+```yaml
+servers:
+  - name: slack
+    description: Slack MCP server
+    transport: STDIO
+    packageName: "@anthropic/slack-mcp"
+    env:
+      - name: SLACK_TOKEN
+        valueFrom:
+          secretRef:
+            name: slack-secrets
+            key: token
+
+  - name: github
+    description: GitHub MCP server
+    transport: STDIO
+    packageName: "@anthropic/github-mcp"
+
+profiles:
+  - name: default
+    server: slack
+    envOverrides:
+      SLACK_TOKEN: "xoxb-your-token"
+
+projects:
+  - name: dev-workspace
+    description: Development workspace
+```
+
+Apply it:
+
+```bash
+mcpctl apply config.yaml
+```
+
+## Running Tests
+
+```bash
+# Run all tests
+pnpm test:run
+
+# Run tests for a specific package
+pnpm --filter @mcpctl/cli test:run
+pnpm --filter @mcpctl/mcpd test:run
+pnpm --filter @mcpctl/local-proxy test:run
+
+# Run tests with coverage
+pnpm test:coverage
+
+# Typecheck
+pnpm typecheck
+
+# Lint
+pnpm lint
+```
+
+## Development
+
+```bash
+# Watch mode for tests
+pnpm test
+
+# Build in watch mode
+cd src/cli && pnpm dev
+```

examples/ha-mcp.yaml

@@ -0,0 +1,28 @@
+servers:
+  - name: ha-mcp
+    description: "Home Assistant MCP - smart home control via MCP"
+    dockerImage: "ghcr.io/homeassistant-ai/ha-mcp:2.4"
+    transport: STREAMABLE_HTTP
+    containerPort: 3000
+    # For mcpd-managed containers:
+    command:
+      - python
+      - "-c"
+      - "from ha_mcp.server import HomeAssistantSmartMCPServer; s = HomeAssistantSmartMCPServer(); s.mcp.run(transport='sse', host='0.0.0.0', port=3000)"
+    # For connecting to an already-running instance (host.containers.internal for container-to-host):
+    externalUrl: "http://host.containers.internal:8086/mcp"
+    env:
+      - name: HOMEASSISTANT_URL
+        value: ""
+      - name: HOMEASSISTANT_TOKEN
+        valueFrom:
+          secretRef:
+            name: ha-secrets
+            key: token
+
+profiles:
+  - name: production
+    server: ha-mcp
+    envOverrides:
+      HOMEASSISTANT_URL: "https://ha.itaz.eu"
+      HOMEASSISTANT_TOKEN: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiIyNjFlZTRhOWI2MGM0YTllOGJkNTIxN2Q3YmVmZDkzNSIsImlhdCI6MTc3MDA3NjYzOCwiZXhwIjoyMDg1NDM2NjM4fQ.17mAQxIrCBrQx3ogqAUetwEt-cngRmJiH-e7sLt-3FY"

installlocal.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+# Build (if needed) and install mcpctl RPM locally
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+cd "$SCRIPT_DIR"
+
+RPM_FILE=$(ls dist/mcpctl-*.rpm 2>/dev/null | head -1)
+
+# Build if no RPM exists or if source is newer than the RPM
+if [[ -z "$RPM_FILE" ]] || [[ $(find src/ -name '*.ts' -newer "$RPM_FILE" 2>/dev/null | head -1) ]]; then
+    echo "==> Building RPM..."
+    bash scripts/build-rpm.sh
+    RPM_FILE=$(ls dist/mcpctl-*.rpm 2>/dev/null | head -1)
+else
+    echo "==> RPM is up to date: $RPM_FILE"
+fi
+
+echo "==> Installing $RPM_FILE..."
+sudo rpm -Uvh --force "$RPM_FILE"
+
+echo "==> Reloading systemd user units..."
+systemctl --user daemon-reload
+
+echo "==> Done!"
+echo "    Enable mcplocal: systemctl --user enable --now mcplocal"

nfpm.yaml

@@ -0,0 +1,28 @@
+name: mcpctl
+arch: amd64
+version: 0.1.0
+release: "1"
+maintainer: michal
+description: kubectl-like CLI for managing MCP servers
+license: MIT
+contents:
+  - src: ./dist/mcpctl
+    dst: /usr/bin/mcpctl
+    file_info:
+      mode: 0755
+  - src: ./dist/mcpctl-local
+    dst: /usr/bin/mcpctl-local
+    file_info:
+      mode: 0755
+  - src: ./deploy/mcplocal.service
+    dst: /usr/lib/systemd/user/mcplocal.service
+    file_info:
+      mode: 0644
+  - src: ./completions/mcpctl.bash
+    dst: /usr/share/bash-completion/completions/mcpctl
+    file_info:
+      mode: 0644
+  - src: ./completions/mcpctl.fish
+    dst: /usr/share/fish/vendor_completions.d/mcpctl.fish
+    file_info:
+      mode: 0644

package.json

@@ -15,7 +15,14 @@
     "clean": "pnpm -r run clean && rimraf node_modules",
     "db:up": "docker compose -f deploy/docker-compose.yml up -d",
     "db:down": "docker compose -f deploy/docker-compose.yml down",
-    "typecheck": "tsc --build"
+    "typecheck": "tsc --build",
+    "rpm:build": "bash scripts/build-rpm.sh",
+    "rpm:publish": "bash scripts/publish-rpm.sh",
+    "release": "bash scripts/release.sh",
+    "mcpd:build": "bash scripts/build-mcpd.sh",
+    "mcpd:deploy": "bash deploy.sh",
+    "mcpd:deploy-dry": "bash deploy.sh --dry-run",
+    "mcpd:logs": "bash logs.sh"
   },
   "engines": {
     "node": ">=20.0.0",
@@ -23,6 +30,7 @@
   },
   "packageManager": "pnpm@9.15.0",
   "devDependencies": {
+    "@types/node": "^25.3.0",
     "@typescript-eslint/eslint-plugin": "^8.56.0",
     "@typescript-eslint/parser": "^8.56.0",
     "@vitest/coverage-v8": "^4.0.18",

scripts/build-mcpd.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+# Build mcpd Docker image and push to Gitea container registry
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
+cd "$PROJECT_ROOT"
+
+# Load .env for GITEA_TOKEN
+if [ -f .env ]; then
+  set -a; source .env; set +a
+fi
+
+# Push directly to internal address (external proxy has body size limit)
+REGISTRY="10.0.0.194:3012"
+IMAGE="mcpd"
+TAG="${1:-latest}"
+
+echo "==> Building mcpd image..."
+podman build -t "$IMAGE:$TAG" -f deploy/Dockerfile.mcpd .
+
+echo "==> Tagging as $REGISTRY/michal/$IMAGE:$TAG..."
+podman tag "$IMAGE:$TAG" "$REGISTRY/michal/$IMAGE:$TAG"
+
+echo "==> Logging in to $REGISTRY..."
+podman login --tls-verify=false -u michal -p "$GITEA_TOKEN" "$REGISTRY"
+
+echo "==> Pushing to $REGISTRY/michal/$IMAGE:$TAG..."
+podman push --tls-verify=false "$REGISTRY/michal/$IMAGE:$TAG"
+
+echo "==> Done!"
+echo "    Image: $REGISTRY/michal/$IMAGE:$TAG"

scripts/build-rpm.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
+cd "$PROJECT_ROOT"
+
+# Load .env if present
+if [ -f .env ]; then
+  set -a; source .env; set +a
+fi
+
+# Ensure tools are on PATH
+export PATH="$HOME/.npm-global/bin:$HOME/.bun/bin:$HOME/.local/bin:$PATH"
+
+echo "==> Building TypeScript..."
+pnpm build
+
+echo "==> Bundling standalone binaries..."
+mkdir -p dist
+rm -f dist/mcpctl dist/mcpctl-local dist/mcpctl-*.rpm
+bun build src/cli/src/index.ts --compile --outfile dist/mcpctl
+bun build src/mcplocal/src/main.ts --compile --outfile dist/mcpctl-local
+
+echo "==> Packaging RPM..."
+nfpm pkg --packager rpm --target dist/
+
+RPM_FILE=$(ls dist/mcpctl-*.rpm 2>/dev/null | head -1)
+echo "==> Built: $RPM_FILE"
+echo "    Size: $(du -h "$RPM_FILE" | cut -f1)"
+rpm -qpi "$RPM_FILE"

scripts/publish-rpm.sh

@@ -0,0 +1,55 @@
+#!/bin/bash
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
+cd "$PROJECT_ROOT"
+
+# Load .env if present
+if [ -f .env ]; then
+  set -a; source .env; set +a
+fi
+
+GITEA_URL="${GITEA_URL:-http://10.0.0.194:3012}"
+GITEA_OWNER="${GITEA_OWNER:-michal}"
+
+if [ -z "$GITEA_TOKEN" ]; then
+  echo "Error: GITEA_TOKEN not set. Add it to .env or export it."
+  exit 1
+fi
+
+RPM_FILE=$(ls dist/mcpctl-*.rpm 2>/dev/null | head -1)
+if [ -z "$RPM_FILE" ]; then
+  echo "Error: No RPM found in dist/. Run scripts/build-rpm.sh first."
+  exit 1
+fi
+
+# Get version string as it appears in Gitea (e.g. "0.1.0-1")
+RPM_VERSION=$(rpm -qp --queryformat '%{VERSION}-%{RELEASE}' "$RPM_FILE")
+
+echo "==> Publishing $RPM_FILE (version $RPM_VERSION) to ${GITEA_URL}..."
+
+# Check if version already exists and delete it first
+EXISTING=$(curl -s -o /dev/null -w "%{http_code}" \
+  -H "Authorization: token ${GITEA_TOKEN}" \
+  "${GITEA_URL}/api/v1/packages/${GITEA_OWNER}/rpm/mcpctl/${RPM_VERSION}")
+
+if [ "$EXISTING" = "200" ]; then
+  echo "==> Version $RPM_VERSION already exists, replacing..."
+  curl -s -o /dev/null -X DELETE \
+    -H "Authorization: token ${GITEA_TOKEN}" \
+    "${GITEA_URL}/api/v1/packages/${GITEA_OWNER}/rpm/mcpctl/${RPM_VERSION}"
+fi
+
+# Upload
+curl --fail -s -X PUT \
+  -H "Authorization: token ${GITEA_TOKEN}" \
+  --upload-file "$RPM_FILE" \
+  "${GITEA_URL}/api/packages/${GITEA_OWNER}/rpm/upload"
+
+echo ""
+echo "==> Published successfully!"
+echo ""
+echo "Install with:"
+echo "  sudo dnf config-manager --add-repo ${GITEA_URL}/api/packages/${GITEA_OWNER}/rpm.repo"
+echo "  sudo dnf install mcpctl"

scripts/release.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
+cd "$PROJECT_ROOT"
+
+# Load .env if present
+if [ -f .env ]; then
+  set -a; source .env; set +a
+fi
+
+echo "=== mcpctl release ==="
+echo ""
+
+# Build
+bash scripts/build-rpm.sh
+
+echo ""
+
+# Publish
+bash scripts/publish-rpm.sh
+
+echo ""
+
+# Install locally
+echo "==> Installing locally..."
+RPM_FILE=$(ls dist/mcpctl-*.rpm 2>/dev/null | head -1)
+sudo rpm -U --force "$RPM_FILE"
+
+echo ""
+echo "==> Installed:"
+mcpctl --version
+echo ""
+
+GITEA_URL="${GITEA_URL:-http://10.0.0.194:3012}"
+GITEA_OWNER="${GITEA_OWNER:-michal}"
+echo "=== Done! ==="
+echo "Others can install with:"
+echo "  sudo dnf config-manager --add-repo ${GITEA_URL}/api/packages/${GITEA_OWNER}/rpm.repo"
+echo "  sudo dnf install mcpctl"

src/cli/src/api-client.ts

@@ -0,0 +1,98 @@
+import http from 'node:http';
+
+export interface ApiClientOptions {
+  baseUrl: string;
+  timeout?: number | undefined;
+  token?: string | undefined;
+}
+
+export interface ApiResponse<T = unknown> {
+  status: number;
+  data: T;
+}
+
+export class ApiError extends Error {
+  constructor(
+    public readonly status: number,
+    public readonly body: string,
+  ) {
+    super(`API error ${status}: ${body}`);
+    this.name = 'ApiError';
+  }
+}
+
+function request<T>(method: string, url: string, timeout: number, body?: unknown, token?: string): Promise<ApiResponse<T>> {
+  return new Promise((resolve, reject) => {
+    const parsed = new URL(url);
+    const headers: Record<string, string> = { 'Content-Type': 'application/json' };
+    if (token) {
+      headers['Authorization'] = `Bearer ${token}`;
+    }
+    const opts: http.RequestOptions = {
+      hostname: parsed.hostname,
+      port: parsed.port,
+      path: parsed.pathname + parsed.search,
+      method,
+      timeout,
+      headers,
+    };
+
+    const req = http.request(opts, (res) => {
+      const chunks: Buffer[] = [];
+      res.on('data', (chunk: Buffer) => chunks.push(chunk));
+      res.on('end', () => {
+        const raw = Buffer.concat(chunks).toString('utf-8');
+        const status = res.statusCode ?? 0;
+        if (status >= 400) {
+          reject(new ApiError(status, raw));
+          return;
+        }
+        try {
+          resolve({ status, data: JSON.parse(raw) as T });
+        } catch {
+          resolve({ status, data: raw as unknown as T });
+        }
+      });
+    });
+    req.on('error', reject);
+    req.on('timeout', () => {
+      req.destroy();
+      reject(new Error(`Request to ${url} timed out`));
+    });
+    if (body !== undefined) {
+      req.write(JSON.stringify(body));
+    }
+    req.end();
+  });
+}
+
+export class ApiClient {
+  private baseUrl: string;
+  private timeout: number;
+  private token?: string | undefined;
+
+  constructor(opts: ApiClientOptions) {
+    this.baseUrl = opts.baseUrl.replace(/\/$/, '');
+    this.timeout = opts.timeout ?? 10000;
+    this.token = opts.token;
+  }
+
+  async get<T = unknown>(path: string): Promise<T> {
+    const res = await request<T>('GET', `${this.baseUrl}${path}`, this.timeout, undefined, this.token);
+    return res.data;
+  }
+
+  async post<T = unknown>(path: string, body?: unknown): Promise<T> {
+    const res = await request<T>('POST', `${this.baseUrl}${path}`, this.timeout, body, this.token);
+    return res.data;
+  }
+
+  async put<T = unknown>(path: string, body?: unknown): Promise<T> {
+    const res = await request<T>('PUT', `${this.baseUrl}${path}`, this.timeout, body, this.token);
+    return res.data;
+  }
+
+  async delete(path: string): Promise<void> {
+    await request('DELETE', `${this.baseUrl}${path}`, this.timeout, undefined, this.token);
+  }
+}

src/cli/src/auth/credentials.ts

@@ -0,0 +1,50 @@
+import { existsSync, mkdirSync, readFileSync, writeFileSync, unlinkSync, chmodSync } from 'node:fs';
+import { join } from 'node:path';
+import { homedir } from 'node:os';
+
+export interface StoredCredentials {
+  token: string;
+  mcpdUrl: string;
+  user: string;
+  expiresAt?: string;
+}
+
+export interface CredentialsDeps {
+  configDir: string;
+}
+
+function defaultConfigDir(): string {
+  return join(homedir(), '.mcpctl');
+}
+
+function credentialsPath(deps?: Partial<CredentialsDeps>): string {
+  return join(deps?.configDir ?? defaultConfigDir(), 'credentials');
+}
+
+export function saveCredentials(creds: StoredCredentials, deps?: Partial<CredentialsDeps>): void {
+  const dir = deps?.configDir ?? defaultConfigDir();
+  if (!existsSync(dir)) {
+    mkdirSync(dir, { recursive: true });
+  }
+  const path = credentialsPath(deps);
+  writeFileSync(path, JSON.stringify(creds, null, 2) + '\n', 'utf-8');
+  chmodSync(path, 0o600);
+}
+
+export function loadCredentials(deps?: Partial<CredentialsDeps>): StoredCredentials | null {
+  const path = credentialsPath(deps);
+  if (!existsSync(path)) {
+    return null;
+  }
+  const raw = readFileSync(path, 'utf-8');
+  return JSON.parse(raw) as StoredCredentials;
+}
+
+export function deleteCredentials(deps?: Partial<CredentialsDeps>): boolean {
+  const path = credentialsPath(deps);
+  if (!existsSync(path)) {
+    return false;
+  }
+  unlinkSync(path);
+  return true;
+}

src/cli/src/auth/index.ts

@@ -0,0 +1,2 @@
+export { saveCredentials, loadCredentials, deleteCredentials } from './credentials.js';
+export type { StoredCredentials, CredentialsDeps } from './credentials.js';

src/cli/src/commands/apply.ts

@@ -0,0 +1,202 @@
+import { Command } from 'commander';
+import { readFileSync } from 'node:fs';
+import yaml from 'js-yaml';
+import { z } from 'zod';
+import type { ApiClient } from '../api-client.js';
+
+const HealthCheckSchema = z.object({
+  tool: z.string().min(1),
+  arguments: z.record(z.unknown()).default({}),
+  intervalSeconds: z.number().int().min(5).max(3600).default(60),
+  timeoutSeconds: z.number().int().min(1).max(120).default(10),
+  failureThreshold: z.number().int().min(1).max(20).default(3),
+});
+
+const ServerEnvEntrySchema = z.object({
+  name: z.string().min(1),
+  value: z.string().optional(),
+  valueFrom: z.object({
+    secretRef: z.object({ name: z.string(), key: z.string() }),
+  }).optional(),
+});
+
+const ServerSpecSchema = z.object({
+  name: z.string().min(1),
+  description: z.string().default(''),
+  packageName: z.string().optional(),
+  dockerImage: z.string().optional(),
+  transport: z.enum(['STDIO', 'SSE', 'STREAMABLE_HTTP']).default('STDIO'),
+  repositoryUrl: z.string().url().optional(),
+  externalUrl: z.string().url().optional(),
+  command: z.array(z.string()).optional(),
+  containerPort: z.number().int().min(1).max(65535).optional(),
+  replicas: z.number().int().min(0).max(10).default(1),
+  env: z.array(ServerEnvEntrySchema).default([]),
+  healthCheck: HealthCheckSchema.optional(),
+});
+
+const SecretSpecSchema = z.object({
+  name: z.string().min(1),
+  data: z.record(z.string()).default({}),
+});
+
+const TemplateEnvEntrySchema = z.object({
+  name: z.string().min(1),
+  description: z.string().optional(),
+  required: z.boolean().optional(),
+  defaultValue: z.string().optional(),
+});
+
+const TemplateSpecSchema = z.object({
+  name: z.string().min(1),
+  version: z.string().default('1.0.0'),
+  description: z.string().default(''),
+  packageName: z.string().optional(),
+  dockerImage: z.string().optional(),
+  transport: z.enum(['STDIO', 'SSE', 'STREAMABLE_HTTP']).default('STDIO'),
+  repositoryUrl: z.string().optional(),
+  externalUrl: z.string().optional(),
+  command: z.array(z.string()).optional(),
+  containerPort: z.number().int().min(1).max(65535).optional(),
+  replicas: z.number().int().min(0).max(10).default(1),
+  env: z.array(TemplateEnvEntrySchema).default([]),
+  healthCheck: HealthCheckSchema.optional(),
+});
+
+const ProjectSpecSchema = z.object({
+  name: z.string().min(1),
+  description: z.string().default(''),
+});
+
+const ApplyConfigSchema = z.object({
+  servers: z.array(ServerSpecSchema).default([]),
+  secrets: z.array(SecretSpecSchema).default([]),
+  projects: z.array(ProjectSpecSchema).default([]),
+  templates: z.array(TemplateSpecSchema).default([]),
+});
+
+export type ApplyConfig = z.infer<typeof ApplyConfigSchema>;
+
+export interface ApplyCommandDeps {
+  client: ApiClient;
+  log: (...args: unknown[]) => void;
+}
+
+export function createApplyCommand(deps: ApplyCommandDeps): Command {
+  const { client, log } = deps;
+
+  return new Command('apply')
+    .description('Apply declarative configuration from a YAML or JSON file')
+    .argument('<file>', 'Path to config file (.yaml, .yml, or .json)')
+    .option('--dry-run', 'Validate and show changes without applying')
+    .action(async (file: string, opts: { dryRun?: boolean }) => {
+      const config = loadConfigFile(file);
+
+      if (opts.dryRun) {
+        log('Dry run - would apply:');
+        if (config.servers.length > 0) log(`  ${config.servers.length} server(s)`);
+        if (config.secrets.length > 0) log(`  ${config.secrets.length} secret(s)`);
+        if (config.projects.length > 0) log(`  ${config.projects.length} project(s)`);
+        if (config.templates.length > 0) log(`  ${config.templates.length} template(s)`);
+        return;
+      }
+
+      await applyConfig(client, config, log);
+    });
+}
+
+function loadConfigFile(path: string): ApplyConfig {
+  const raw = readFileSync(path, 'utf-8');
+  let parsed: unknown;
+
+  if (path.endsWith('.json')) {
+    parsed = JSON.parse(raw);
+  } else {
+    parsed = yaml.load(raw);
+  }
+
+  return ApplyConfigSchema.parse(parsed);
+}
+
+async function applyConfig(client: ApiClient, config: ApplyConfig, log: (...args: unknown[]) => void): Promise<void> {
+  // Apply servers first
+  for (const server of config.servers) {
+    try {
+      const existing = await findByName(client, 'servers', server.name);
+      if (existing) {
+        await client.put(`/api/v1/servers/${(existing as { id: string }).id}`, server);
+        log(`Updated server: ${server.name}`);
+      } else {
+        await client.post('/api/v1/servers', server);
+        log(`Created server: ${server.name}`);
+      }
+    } catch (err) {
+      log(`Error applying server '${server.name}': ${err instanceof Error ? err.message : err}`);
+    }
+  }
+
+  // Apply secrets
+  for (const secret of config.secrets) {
+    try {
+      const existing = await findByName(client, 'secrets', secret.name);
+      if (existing) {
+        await client.put(`/api/v1/secrets/${(existing as { id: string }).id}`, { data: secret.data });
+        log(`Updated secret: ${secret.name}`);
+      } else {
+        await client.post('/api/v1/secrets', secret);
+        log(`Created secret: ${secret.name}`);
+      }
+    } catch (err) {
+      log(`Error applying secret '${secret.name}': ${err instanceof Error ? err.message : err}`);
+    }
+  }
+
+  // Apply projects
+  for (const project of config.projects) {
+    try {
+      const existing = await findByName(client, 'projects', project.name);
+      if (existing) {
+        await client.put(`/api/v1/projects/${(existing as { id: string }).id}`, {
+          description: project.description,
+        });
+        log(`Updated project: ${project.name}`);
+      } else {
+        await client.post('/api/v1/projects', {
+          name: project.name,
+          description: project.description,
+        });
+        log(`Created project: ${project.name}`);
+      }
+    } catch (err) {
+      log(`Error applying project '${project.name}': ${err instanceof Error ? err.message : err}`);
+    }
+  }
+
+  // Apply templates
+  for (const template of config.templates) {
+    try {
+      const existing = await findByName(client, 'templates', template.name);
+      if (existing) {
+        await client.put(`/api/v1/templates/${(existing as { id: string }).id}`, template);
+        log(`Updated template: ${template.name}`);
+      } else {
+        await client.post('/api/v1/templates', template);
+        log(`Created template: ${template.name}`);
+      }
+    } catch (err) {
+      log(`Error applying template '${template.name}': ${err instanceof Error ? err.message : err}`);
+    }
+  }
+}
+
+async function findByName(client: ApiClient, resource: string, name: string): Promise<unknown | null> {
+  try {
+    const items = await client.get<Array<{ name: string }>>(`/api/v1/${resource}`);
+    return items.find((item) => item.name === name) ?? null;
+  } catch {
+    return null;
+  }
+}
+
+// Export for testing
+export { loadConfigFile, applyConfig };

src/cli/src/commands/auth.ts

@@ -0,0 +1,148 @@
+import { Command } from 'commander';
+import http from 'node:http';
+import { loadConfig } from '../config/index.js';
+import type { ConfigLoaderDeps } from '../config/index.js';
+import { saveCredentials, loadCredentials, deleteCredentials } from '../auth/index.js';
+import type { CredentialsDeps } from '../auth/index.js';
+
+export interface PromptDeps {
+  input(message: string): Promise<string>;
+  password(message: string): Promise<string>;
+}
+
+export interface AuthCommandDeps {
+  configDeps: Partial<ConfigLoaderDeps>;
+  credentialsDeps: Partial<CredentialsDeps>;
+  prompt: PromptDeps;
+  log: (...args: string[]) => void;
+  loginRequest: (mcpdUrl: string, email: string, password: string) => Promise<LoginResponse>;
+  logoutRequest: (mcpdUrl: string, token: string) => Promise<void>;
+}
+
+interface LoginResponse {
+  token: string;
+  user: { email: string };
+}
+
+function defaultLoginRequest(mcpdUrl: string, email: string, password: string): Promise<LoginResponse> {
+  return new Promise((resolve, reject) => {
+    const url = new URL('/api/v1/auth/login', mcpdUrl);
+    const body = JSON.stringify({ email, password });
+    const opts: http.RequestOptions = {
+      hostname: url.hostname,
+      port: url.port,
+      path: url.pathname,
+      method: 'POST',
+      timeout: 10000,
+      headers: { 'Content-Type': 'application/json', 'Content-Length': Buffer.byteLength(body) },
+    };
+    const req = http.request(opts, (res) => {
+      const chunks: Buffer[] = [];
+      res.on('data', (chunk: Buffer) => chunks.push(chunk));
+      res.on('end', () => {
+        const raw = Buffer.concat(chunks).toString('utf-8');
+        if (res.statusCode === 401) {
+          reject(new Error('Invalid credentials'));
+          return;
+        }
+        if ((res.statusCode ?? 0) >= 400) {
+          reject(new Error(`Login failed (${res.statusCode}): ${raw}`));
+          return;
+        }
+        resolve(JSON.parse(raw) as LoginResponse);
+      });
+    });
+    req.on('error', (err) => reject(new Error(`Cannot reach mcpd: ${err.message}`)));
+    req.on('timeout', () => { req.destroy(); reject(new Error('Login request timed out')); });
+    req.write(body);
+    req.end();
+  });
+}
+
+function defaultLogoutRequest(mcpdUrl: string, token: string): Promise<void> {
+  return new Promise((resolve) => {
+    const url = new URL('/api/v1/auth/logout', mcpdUrl);
+    const opts: http.RequestOptions = {
+      hostname: url.hostname,
+      port: url.port,
+      path: url.pathname,
+      method: 'POST',
+      timeout: 10000,
+      headers: { 'Authorization': `Bearer ${token}` },
+    };
+    const req = http.request(opts, (res) => {
+      res.resume();
+      res.on('end', () => resolve());
+    });
+    req.on('error', () => resolve()); // Don't fail logout on network errors
+    req.on('timeout', () => { req.destroy(); resolve(); });
+    req.end();
+  });
+}
+
+async function defaultInput(message: string): Promise<string> {
+  const { default: inquirer } = await import('inquirer');
+  const { answer } = await inquirer.prompt([{ type: 'input', name: 'answer', message }]);
+  return answer as string;
+}
+
+async function defaultPassword(message: string): Promise<string> {
+  const { default: inquirer } = await import('inquirer');
+  const { answer } = await inquirer.prompt([{ type: 'password', name: 'answer', message }]);
+  return answer as string;
+}
+
+const defaultDeps: AuthCommandDeps = {
+  configDeps: {},
+  credentialsDeps: {},
+  prompt: { input: defaultInput, password: defaultPassword },
+  log: (...args) => console.log(...args),
+  loginRequest: defaultLoginRequest,
+  logoutRequest: defaultLogoutRequest,
+};
+
+export function createLoginCommand(deps?: Partial<AuthCommandDeps>): Command {
+  const { configDeps, credentialsDeps, prompt, log, loginRequest } = { ...defaultDeps, ...deps };
+
+  return new Command('login')
+    .description('Authenticate with mcpd')
+    .option('--mcpd-url <url>', 'mcpd URL to authenticate against')
+    .action(async (opts: { mcpdUrl?: string }) => {
+      const config = loadConfig(configDeps);
+      const mcpdUrl = opts.mcpdUrl ?? config.mcpdUrl;
+
+      const email = await prompt.input('Email:');
+      const password = await prompt.password('Password:');
+
+      try {
+        const result = await loginRequest(mcpdUrl, email, password);
+        saveCredentials({
+          token: result.token,
+          mcpdUrl,
+          user: result.user.email,
+        }, credentialsDeps);
+        log(`Logged in as ${result.user.email}`);
+      } catch (err) {
+        log(`Login failed: ${(err as Error).message}`);
+        process.exitCode = 1;
+      }
+    });
+}
+
+export function createLogoutCommand(deps?: Partial<AuthCommandDeps>): Command {
+  const { credentialsDeps, log, logoutRequest } = { ...defaultDeps, ...deps };
+
+  return new Command('logout')
+    .description('Log out and remove stored credentials')
+    .action(async () => {
+      const creds = loadCredentials(credentialsDeps);
+      if (!creds) {
+        log('Not logged in');
+        return;
+      }
+
+      await logoutRequest(creds.mcpdUrl, creds.token);
+      deleteCredentials(credentialsDeps);
+      log('Logged out successfully');
+    });
+}

src/cli/src/commands/backup.ts

@@ -0,0 +1,80 @@
+import { Command } from 'commander';
+import fs from 'node:fs';
+import type { ApiClient } from '../api-client.js';
+
+export interface BackupDeps {
+  client: ApiClient;
+  log: (...args: unknown[]) => void;
+}
+
+export function createBackupCommand(deps: BackupDeps): Command {
+  const cmd = new Command('backup')
+    .description('Backup mcpctl configuration to a JSON file')
+    .option('-o, --output <path>', 'output file path', 'mcpctl-backup.json')
+    .option('-p, --password <password>', 'encrypt sensitive values with password')
+    .option('-r, --resources <types>', 'resource types to backup (comma-separated: servers,profiles,projects)')
+    .action(async (options: { output: string; password?: string; resources?: string }) => {
+      const body: Record<string, unknown> = {};
+      if (options.password) {
+        body.password = options.password;
+      }
+      if (options.resources) {
+        body.resources = options.resources.split(',').map((s) => s.trim());
+      }
+
+      const bundle = await deps.client.post('/api/v1/backup', body);
+      fs.writeFileSync(options.output, JSON.stringify(bundle, null, 2), 'utf-8');
+      deps.log(`Backup saved to ${options.output}`);
+    });
+
+  return cmd;
+}
+
+export function createRestoreCommand(deps: BackupDeps): Command {
+  const cmd = new Command('restore')
+    .description('Restore mcpctl configuration from a backup file')
+    .option('-i, --input <path>', 'backup file path', 'mcpctl-backup.json')
+    .option('-p, --password <password>', 'decryption password for encrypted backups')
+    .option('-c, --conflict <strategy>', 'conflict resolution: skip, overwrite, fail', 'skip')
+    .action(async (options: { input: string; password?: string; conflict: string }) => {
+      if (!fs.existsSync(options.input)) {
+        deps.log(`Error: File not found: ${options.input}`);
+        return;
+      }
+
+      const raw = fs.readFileSync(options.input, 'utf-8');
+      const bundle = JSON.parse(raw) as unknown;
+
+      const body: Record<string, unknown> = {
+        bundle,
+        conflictStrategy: options.conflict,
+      };
+      if (options.password) {
+        body.password = options.password;
+      }
+
+      const result = await deps.client.post<{
+        serversCreated: number;
+        serversSkipped: number;
+        profilesCreated: number;
+        profilesSkipped: number;
+        projectsCreated: number;
+        projectsSkipped: number;
+        errors: string[];
+      }>('/api/v1/restore', body);
+
+      deps.log('Restore complete:');
+      deps.log(`  Servers:  ${result.serversCreated} created, ${result.serversSkipped} skipped`);
+      deps.log(`  Profiles: ${result.profilesCreated} created, ${result.profilesSkipped} skipped`);
+      deps.log(`  Projects: ${result.projectsCreated} created, ${result.projectsSkipped} skipped`);
+
+      if (result.errors.length > 0) {
+        deps.log(`  Errors:`);
+        for (const err of result.errors) {
+          deps.log(`    - ${err}`);
+        }
+      }
+    });
+
+  return cmd;
+}

src/cli/src/commands/claude.ts

@@ -0,0 +1,155 @@
+import { Command } from 'commander';
+import { writeFileSync, readFileSync, existsSync } from 'node:fs';
+import { resolve } from 'node:path';
+import type { ApiClient } from '../api-client.js';
+
+interface McpConfig {
+  mcpServers: Record<string, { command: string; args: string[]; env?: Record<string, string> }>;
+}
+
+export interface ClaudeCommandDeps {
+  client: ApiClient;
+  log: (...args: unknown[]) => void;
+}
+
+export function createClaudeCommand(deps: ClaudeCommandDeps): Command {
+  const { client, log } = deps;
+
+  const cmd = new Command('claude')
+    .description('Manage Claude MCP configuration (.mcp.json)');
+
+  cmd
+    .command('generate <projectId>')
+    .description('Generate .mcp.json from a project configuration')
+    .option('-o, --output <path>', 'Output file path', '.mcp.json')
+    .option('--merge', 'Merge with existing .mcp.json instead of overwriting')
+    .option('--stdout', 'Print to stdout instead of writing a file')
+    .action(async (projectId: string, opts: { output: string; merge?: boolean; stdout?: boolean }) => {
+      const config = await client.get<McpConfig>(`/api/v1/projects/${projectId}/mcp-config`);
+
+      if (opts.stdout) {
+        log(JSON.stringify(config, null, 2));
+        return;
+      }
+
+      const outputPath = resolve(opts.output);
+      let finalConfig = config;
+
+      if (opts.merge && existsSync(outputPath)) {
+        try {
+          const existing = JSON.parse(readFileSync(outputPath, 'utf-8')) as McpConfig;
+          finalConfig = {
+            mcpServers: {
+              ...existing.mcpServers,
+              ...config.mcpServers,
+            },
+          };
+        } catch {
+          // If existing file is invalid, just overwrite
+        }
+      }
+
+      writeFileSync(outputPath, JSON.stringify(finalConfig, null, 2) + '\n');
+      const serverCount = Object.keys(finalConfig.mcpServers).length;
+      log(`Wrote ${outputPath} (${serverCount} server(s))`);
+    });
+
+  cmd
+    .command('show')
+    .description('Show current .mcp.json configuration')
+    .option('-p, --path <path>', 'Path to .mcp.json', '.mcp.json')
+    .action((opts: { path: string }) => {
+      const filePath = resolve(opts.path);
+      if (!existsSync(filePath)) {
+        log(`No .mcp.json found at ${filePath}`);
+        return;
+      }
+      const content = readFileSync(filePath, 'utf-8');
+      try {
+        const config = JSON.parse(content) as McpConfig;
+        const servers = Object.entries(config.mcpServers ?? {});
+        if (servers.length === 0) {
+          log('No MCP servers configured.');
+          return;
+        }
+        log(`MCP servers in ${filePath}:\n`);
+        for (const [name, server] of servers) {
+          log(`  ${name}`);
+          log(`    command: ${server.command} ${server.args.join(' ')}`);
+          if (server.env) {
+            const envKeys = Object.keys(server.env);
+            log(`    env: ${envKeys.join(', ')}`);
+          }
+        }
+      } catch {
+        log(`Invalid JSON in ${filePath}`);
+      }
+    });
+
+  cmd
+    .command('add <name>')
+    .description('Add an MCP server entry to .mcp.json')
+    .requiredOption('-c, --command <cmd>', 'Command to run')
+    .option('-a, --args <args...>', 'Command arguments')
+    .option('-e, --env <key=value...>', 'Environment variables')
+    .option('-p, --path <path>', 'Path to .mcp.json', '.mcp.json')
+    .action((name: string, opts: { command: string; args?: string[]; env?: string[]; path: string }) => {
+      const filePath = resolve(opts.path);
+      let config: McpConfig = { mcpServers: {} };
+
+      if (existsSync(filePath)) {
+        try {
+          config = JSON.parse(readFileSync(filePath, 'utf-8')) as McpConfig;
+        } catch {
+          // Start fresh
+        }
+      }
+
+      const entry: { command: string; args: string[]; env?: Record<string, string> } = {
+        command: opts.command,
+        args: opts.args ?? [],
+      };
+
+      if (opts.env && opts.env.length > 0) {
+        const env: Record<string, string> = {};
+        for (const pair of opts.env) {
+          const eqIdx = pair.indexOf('=');
+          if (eqIdx > 0) {
+            env[pair.slice(0, eqIdx)] = pair.slice(eqIdx + 1);
+          }
+        }
+        entry.env = env;
+      }
+
+      config.mcpServers[name] = entry;
+      writeFileSync(filePath, JSON.stringify(config, null, 2) + '\n');
+      log(`Added '${name}' to ${filePath}`);
+    });
+
+  cmd
+    .command('remove <name>')
+    .description('Remove an MCP server entry from .mcp.json')
+    .option('-p, --path <path>', 'Path to .mcp.json', '.mcp.json')
+    .action((name: string, opts: { path: string }) => {
+      const filePath = resolve(opts.path);
+      if (!existsSync(filePath)) {
+        log(`No .mcp.json found at ${filePath}`);
+        return;
+      }
+
+      try {
+        const config = JSON.parse(readFileSync(filePath, 'utf-8')) as McpConfig;
+        if (!(name in config.mcpServers)) {
+          log(`Server '${name}' not found in ${filePath}`);
+          return;
+        }
+        delete config.mcpServers[name];
+        writeFileSync(filePath, JSON.stringify(config, null, 2) + '\n');
+        log(`Removed '${name}' from ${filePath}`);
+      } catch {
+        log(`Invalid JSON in ${filePath}`);
+      }
+    });
+
+  return cmd;
+}

src/cli/src/commands/config.ts

@@ -41,6 +41,9 @@ export function createConfigCommand(deps?: Partial<ConfigCommandDeps>): Command
         updates[key] = parseInt(value, 10);
       } else if (key === 'registries') {
         updates[key] = value.split(',').map((s) => s.trim());
+      } else if (key === 'daemonUrl') {
+        // Backward compat: map daemonUrl to mcplocalUrl
+        updates['mcplocalUrl'] = value;
       } else {
         updates[key] = value;
       }

src/cli/src/commands/create.ts

@@ -0,0 +1,179 @@
+import { Command } from 'commander';
+import type { ApiClient } from '../api-client.js';
+export interface CreateCommandDeps {
+  client: ApiClient;
+  log: (...args: unknown[]) => void;
+}
+
+function collect(value: string, prev: string[]): string[] {
+  return [...prev, value];
+}
+
+interface ServerEnvEntry {
+  name: string;
+  value?: string;
+  valueFrom?: { secretRef: { name: string; key: string } };
+}
+
+function parseServerEnv(entries: string[]): ServerEnvEntry[] {
+  return entries.map((entry) => {
+    const eqIdx = entry.indexOf('=');
+    if (eqIdx === -1) {
+      throw new Error(`Invalid env format '${entry}'. Expected KEY=value or KEY=secretRef:SECRET:KEY`);
+    }
+    const envName = entry.slice(0, eqIdx);
+    const rhs = entry.slice(eqIdx + 1);
+
+    if (rhs.startsWith('secretRef:')) {
+      const parts = rhs.split(':');
+      if (parts.length !== 3) {
+        throw new Error(`Invalid secretRef format '${entry}'. Expected KEY=secretRef:SECRET_NAME:SECRET_KEY`);
+      }
+      return {
+        name: envName,
+        valueFrom: { secretRef: { name: parts[1]!, key: parts[2]! } },
+      };
+    }
+
+    return { name: envName, value: rhs };
+  });
+}
+
+function parseEnvEntries(entries: string[]): Record<string, string> {
+  const result: Record<string, string> = {};
+  for (const entry of entries) {
+    const eqIdx = entry.indexOf('=');
+    if (eqIdx === -1) {
+      throw new Error(`Invalid env format '${entry}'. Expected KEY=value`);
+    }
+    result[entry.slice(0, eqIdx)] = entry.slice(eqIdx + 1);
+  }
+  return result;
+}
+
+export function createCreateCommand(deps: CreateCommandDeps): Command {
+  const { client, log } = deps;
+
+  const cmd = new Command('create')
+    .description('Create a resource (server, project)');
+
+  // --- create server ---
+  cmd.command('server')
+    .description('Create an MCP server definition')
+    .argument('<name>', 'Server name (lowercase, hyphens allowed)')
+    .option('-d, --description <text>', 'Server description')
+    .option('--package-name <name>', 'NPM package name')
+    .option('--docker-image <image>', 'Docker image')
+    .option('--transport <type>', 'Transport type (STDIO, SSE, STREAMABLE_HTTP)')
+    .option('--repository-url <url>', 'Source repository URL')
+    .option('--external-url <url>', 'External endpoint URL')
+    .option('--command <arg>', 'Command argument (repeat for multiple)', collect, [])
+    .option('--container-port <port>', 'Container port number')
+    .option('--replicas <count>', 'Number of replicas')
+    .option('--env <entry>', 'Env var: KEY=value (inline) or KEY=secretRef:SECRET:KEY (secret ref, repeat for multiple)', collect, [])
+    .option('--from-template <name>', 'Create from template (name or name:version)')
+    .action(async (name: string, opts) => {
+      let base: Record<string, unknown> = {};
+
+      // If --from-template, fetch template and use as base
+      if (opts.fromTemplate) {
+        const tplRef = opts.fromTemplate as string;
+        const [tplName, tplVersion] = tplRef.includes(':')
+          ? [tplRef.slice(0, tplRef.indexOf(':')), tplRef.slice(tplRef.indexOf(':') + 1)]
+          : [tplRef, undefined];
+
+        const templates = await client.get<Array<Record<string, unknown>>>(`/api/v1/templates?name=${encodeURIComponent(tplName)}`);
+        let template: Record<string, unknown> | undefined;
+        if (tplVersion) {
+          template = templates.find((t) => t.name === tplName && t.version === tplVersion);
+          if (!template) throw new Error(`Template '${tplName}' version '${tplVersion}' not found`);
+        } else {
+          template = templates.find((t) => t.name === tplName);
+          if (!template) throw new Error(`Template '${tplName}' not found`);
+        }
+
+        // Copy template fields as base (strip template-only fields)
+        const { id: _id, createdAt: _c, updatedAt: _u, ...tplFields } = template;
+        base = { ...tplFields };
+
+        // Convert template env (description/required) to server env (name/value/valueFrom)
+        const tplEnv = template.env as Array<{ name: string; description?: string; required?: boolean; defaultValue?: string }> | undefined;
+        if (tplEnv && tplEnv.length > 0) {
+          base.env = tplEnv.map((e) => ({ name: e.name, value: e.defaultValue ?? '' }));
+        }
+
+        // Track template origin
+        base.templateName = tplName;
+        base.templateVersion = (template.version as string) ?? '1.0.0';
+      }
+
+      // Build body: template base → CLI overrides (last wins)
+      const body: Record<string, unknown> = {
+        ...base,
+        name,
+      };
+      if (opts.description !== undefined) body.description = opts.description;
+      if (opts.transport) body.transport = opts.transport;
+      if (opts.replicas) body.replicas = parseInt(opts.replicas, 10);
+      if (opts.packageName) body.packageName = opts.packageName;
+      if (opts.dockerImage) body.dockerImage = opts.dockerImage;
+      if (opts.repositoryUrl) body.repositoryUrl = opts.repositoryUrl;
+      if (opts.externalUrl) body.externalUrl = opts.externalUrl;
+      if (opts.command.length > 0) body.command = opts.command;
+      if (opts.containerPort) body.containerPort = parseInt(opts.containerPort, 10);
+      if (opts.env.length > 0) {
+        // Merge: CLI env entries override template env entries by name
+        const cliEnv = parseServerEnv(opts.env);
+        const existing = (body.env as ServerEnvEntry[] | undefined) ?? [];
+        const merged = [...existing];
+        for (const entry of cliEnv) {
+          const idx = merged.findIndex((e) => e.name === entry.name);
+          if (idx >= 0) {
+            merged[idx] = entry;
+          } else {
+            merged.push(entry);
+          }
+        }
+        body.env = merged;
+      }
+
+      // Defaults when no template
+      if (!opts.fromTemplate) {
+        if (body.description === undefined) body.description = '';
+        if (!body.transport) body.transport = 'STDIO';
+        if (!body.replicas) body.replicas = 1;
+      }
+
+      const server = await client.post<{ id: string; name: string }>('/api/v1/servers', body);
+      log(`server '${server.name}' created (id: ${server.id})`);
+    });
+
+  // --- create secret ---
+  cmd.command('secret')
+    .description('Create a secret')
+    .argument('<name>', 'Secret name (lowercase, hyphens allowed)')
+    .option('--data <entry>', 'Secret data KEY=value (repeat for multiple)', collect, [])
+    .action(async (name: string, opts) => {
+      const data = parseEnvEntries(opts.data);
+      const secret = await client.post<{ id: string; name: string }>('/api/v1/secrets', {
+        name,
+        data,
+      });
+      log(`secret '${secret.name}' created (id: ${secret.id})`);
+    });
+
+  // --- create project ---
+  cmd.command('project')
+    .description('Create a project')
+    .argument('<name>', 'Project name')
+    .option('-d, --description <text>', 'Project description', '')
+    .action(async (name: string, opts) => {
+      const project = await client.post<{ id: string; name: string }>('/api/v1/projects', {
+        name,
+        description: opts.description,
+      });
+      log(`project '${project.name}' created (id: ${project.id})`);
+    });
+
+  return cmd;
+}

src/cli/src/commands/delete.ts

@@ -0,0 +1,33 @@
+import { Command } from 'commander';
+import type { ApiClient } from '../api-client.js';
+import { resolveResource, resolveNameOrId } from './shared.js';
+
+export interface DeleteCommandDeps {
+  client: ApiClient;
+  log: (...args: unknown[]) => void;
+}
+
+export function createDeleteCommand(deps: DeleteCommandDeps): Command {
+  const { client, log } = deps;
+
+  return new Command('delete')
+    .description('Delete a resource (server, instance, profile, project)')
+    .argument('<resource>', 'resource type')
+    .argument('<id>', 'resource ID or name')
+    .action(async (resourceArg: string, idOrName: string) => {
+      const resource = resolveResource(resourceArg);
+
+      // Resolve name → ID for any resource type
+      let id: string;
+      try {
+        id = await resolveNameOrId(client, resource, idOrName);
+      } catch {
+        id = idOrName; // Fall through with original
+      }
+
+      await client.delete(`/api/v1/${resource}/${id}`);
+
+      const singular = resource.replace(/s$/, '');
+      log(`${singular} '${idOrName}' deleted.`);
+    });
+}

src/cli/src/commands/describe.ts

@@ -0,0 +1,326 @@
+import { Command } from 'commander';
+import { formatJson, formatYaml } from '../formatters/output.js';
+import { resolveResource, resolveNameOrId } from './shared.js';
+import type { ApiClient } from '../api-client.js';
+
+export interface DescribeCommandDeps {
+  client: ApiClient;
+  fetchResource: (resource: string, id: string) => Promise<unknown>;
+  fetchInspect?: (id: string) => Promise<unknown>;
+  log: (...args: string[]) => void;
+}
+
+function pad(label: string, width = 18): string {
+  return label.padEnd(width);
+}
+
+function formatServerDetail(server: Record<string, unknown>): string {
+  const lines: string[] = [];
+  lines.push(`=== Server: ${server.name} ===`);
+  lines.push(`${pad('Name:')}${server.name}`);
+  lines.push(`${pad('Transport:')}${server.transport ?? '-'}`);
+  lines.push(`${pad('Replicas:')}${server.replicas ?? 1}`);
+  if (server.dockerImage) lines.push(`${pad('Docker Image:')}${server.dockerImage}`);
+  if (server.packageName) lines.push(`${pad('Package:')}${server.packageName}`);
+  if (server.externalUrl) lines.push(`${pad('External URL:')}${server.externalUrl}`);
+  if (server.repositoryUrl) lines.push(`${pad('Repository:')}${server.repositoryUrl}`);
+  if (server.containerPort) lines.push(`${pad('Container Port:')}${server.containerPort}`);
+  if (server.description) lines.push(`${pad('Description:')}${server.description}`);
+
+  const command = server.command as string[] | null;
+  if (command && command.length > 0) {
+    lines.push('');
+    lines.push('Command:');
+    lines.push(`  ${command.join(' ')}`);
+  }
+
+  const env = server.env as Array<{ name: string; value?: string; valueFrom?: { secretRef: { name: string; key: string } } }> | undefined;
+  if (env && env.length > 0) {
+    lines.push('');
+    lines.push('Environment:');
+    const nameW = Math.max(6, ...env.map((e) => e.name.length)) + 2;
+    lines.push(`  ${'NAME'.padEnd(nameW)}SOURCE`);
+    for (const e of env) {
+      if (e.value !== undefined) {
+        lines.push(`  ${e.name.padEnd(nameW)}${e.value}`);
+      } else if (e.valueFrom?.secretRef) {
+        const ref = e.valueFrom.secretRef;
+        lines.push(`  ${e.name.padEnd(nameW)}secret:${ref.name}/${ref.key}`);
+      }
+    }
+  }
+
+  const hc = server.healthCheck as { tool: string; arguments?: Record<string, unknown>; intervalSeconds?: number; timeoutSeconds?: number; failureThreshold?: number } | null;
+  if (hc) {
+    lines.push('');
+    lines.push('Health Check:');
+    lines.push(`  ${pad('Tool:', 22)}${hc.tool}`);
+    if (hc.arguments && Object.keys(hc.arguments).length > 0) {
+      lines.push(`  ${pad('Arguments:', 22)}${JSON.stringify(hc.arguments)}`);
+    }
+    lines.push(`  ${pad('Interval:', 22)}${hc.intervalSeconds ?? 60}s`);
+    lines.push(`  ${pad('Timeout:', 22)}${hc.timeoutSeconds ?? 10}s`);
+    lines.push(`  ${pad('Failure Threshold:', 22)}${hc.failureThreshold ?? 3}`);
+  }
+
+  lines.push('');
+  lines.push('Metadata:');
+  lines.push(`  ${pad('ID:', 12)}${server.id}`);
+  if (server.createdAt) lines.push(`  ${pad('Created:', 12)}${server.createdAt}`);
+  if (server.updatedAt) lines.push(`  ${pad('Updated:', 12)}${server.updatedAt}`);
+
+  return lines.join('\n');
+}
+
+function formatInstanceDetail(instance: Record<string, unknown>, inspect?: Record<string, unknown>): string {
+  const lines: string[] = [];
+  lines.push(`=== Instance: ${instance.id} ===`);
+  lines.push(`${pad('Status:')}${instance.status}`);
+  lines.push(`${pad('Server ID:')}${instance.serverId}`);
+  lines.push(`${pad('Container ID:')}${instance.containerId ?? '-'}`);
+  lines.push(`${pad('Port:')}${instance.port ?? '-'}`);
+
+  // Health section
+  const healthStatus = instance.healthStatus as string | null;
+  const lastHealthCheck = instance.lastHealthCheck as string | null;
+  if (healthStatus || lastHealthCheck) {
+    lines.push('');
+    lines.push('Health:');
+    lines.push(`  ${pad('Status:', 16)}${healthStatus ?? 'unknown'}`);
+    if (lastHealthCheck) lines.push(`  ${pad('Last Check:', 16)}${lastHealthCheck}`);
+  }
+
+  const metadata = instance.metadata as Record<string, unknown> | undefined;
+  if (metadata && Object.keys(metadata).length > 0) {
+    lines.push('');
+    lines.push('Metadata:');
+    for (const [key, value] of Object.entries(metadata)) {
+      lines.push(`  ${pad(key + ':', 16)}${String(value)}`);
+    }
+  }
+
+  if (inspect) {
+    lines.push('');
+    lines.push('Container:');
+    for (const [key, value] of Object.entries(inspect)) {
+      if (typeof value === 'object' && value !== null) {
+        lines.push(`  ${key}: ${JSON.stringify(value)}`);
+      } else {
+        lines.push(`  ${pad(key + ':', 16)}${String(value)}`);
+      }
+    }
+  }
+
+  // Events section (k8s-style)
+  const events = instance.events as Array<{ timestamp: string; type: string; message: string }> | undefined;
+  if (events && events.length > 0) {
+    lines.push('');
+    lines.push('Events:');
+    const tsW = 26;
+    const typeW = 10;
+    lines.push(`  ${'TIMESTAMP'.padEnd(tsW)}${'TYPE'.padEnd(typeW)}MESSAGE`);
+    for (const ev of events) {
+      lines.push(`  ${(ev.timestamp ?? '').padEnd(tsW)}${(ev.type ?? '').padEnd(typeW)}${ev.message ?? ''}`);
+    }
+  }
+
+  lines.push('');
+  lines.push(`  ${pad('ID:', 12)}${instance.id}`);
+  if (instance.createdAt) lines.push(`  ${pad('Created:', 12)}${instance.createdAt}`);
+  if (instance.updatedAt) lines.push(`  ${pad('Updated:', 12)}${instance.updatedAt}`);
+
+  return lines.join('\n');
+}
+
+function formatProjectDetail(project: Record<string, unknown>): string {
+  const lines: string[] = [];
+  lines.push(`=== Project: ${project.name} ===`);
+  lines.push(`${pad('Name:')}${project.name}`);
+  if (project.description) lines.push(`${pad('Description:')}${project.description}`);
+  if (project.ownerId) lines.push(`${pad('Owner:')}${project.ownerId}`);
+
+  lines.push('');
+  lines.push('Metadata:');
+  lines.push(`  ${pad('ID:', 12)}${project.id}`);
+  if (project.createdAt) lines.push(`  ${pad('Created:', 12)}${project.createdAt}`);
+  if (project.updatedAt) lines.push(`  ${pad('Updated:', 12)}${project.updatedAt}`);
+
+  return lines.join('\n');
+}
+
+function formatSecretDetail(secret: Record<string, unknown>, showValues: boolean): string {
+  const lines: string[] = [];
+  lines.push(`=== Secret: ${secret.name} ===`);
+  lines.push(`${pad('Name:')}${secret.name}`);
+
+  const data = secret.data as Record<string, string> | undefined;
+  if (data && Object.keys(data).length > 0) {
+    lines.push('');
+    lines.push('Data:');
+    const keyW = Math.max(4, ...Object.keys(data).map((k) => k.length)) + 2;
+    for (const [key, value] of Object.entries(data)) {
+      const display = showValues ? value : '***';
+      lines.push(`  ${key.padEnd(keyW)}${display}`);
+    }
+    if (!showValues) {
+      lines.push('');
+      lines.push('  (use --show-values to reveal)');
+    }
+  } else {
+    lines.push(`${pad('Data:')}(empty)`);
+  }
+
+  lines.push('');
+  lines.push('Metadata:');
+  lines.push(`  ${pad('ID:', 12)}${secret.id}`);
+  if (secret.createdAt) lines.push(`  ${pad('Created:', 12)}${secret.createdAt}`);
+  if (secret.updatedAt) lines.push(`  ${pad('Updated:', 12)}${secret.updatedAt}`);
+
+  return lines.join('\n');
+}
+
+function formatTemplateDetail(template: Record<string, unknown>): string {
+  const lines: string[] = [];
+  lines.push(`=== Template: ${template.name} ===`);
+  lines.push(`${pad('Name:')}${template.name}`);
+  lines.push(`${pad('Version:')}${template.version ?? '1.0.0'}`);
+  lines.push(`${pad('Transport:')}${template.transport ?? 'STDIO'}`);
+  lines.push(`${pad('Replicas:')}${template.replicas ?? 1}`);
+  if (template.dockerImage) lines.push(`${pad('Docker Image:')}${template.dockerImage}`);
+  if (template.packageName) lines.push(`${pad('Package:')}${template.packageName}`);
+  if (template.externalUrl) lines.push(`${pad('External URL:')}${template.externalUrl}`);
+  if (template.repositoryUrl) lines.push(`${pad('Repository:')}${template.repositoryUrl}`);
+  if (template.containerPort) lines.push(`${pad('Container Port:')}${template.containerPort}`);
+  if (template.description) lines.push(`${pad('Description:')}${template.description}`);
+
+  const command = template.command as string[] | null;
+  if (command && command.length > 0) {
+    lines.push('');
+    lines.push('Command:');
+    lines.push(`  ${command.join(' ')}`);
+  }
+
+  const env = template.env as Array<{ name: string; description?: string; required?: boolean; defaultValue?: string }> | undefined;
+  if (env && env.length > 0) {
+    lines.push('');
+    lines.push('Environment Variables:');
+    const nameW = Math.max(6, ...env.map((e) => e.name.length)) + 2;
+    lines.push(`  ${'NAME'.padEnd(nameW)}${'REQUIRED'.padEnd(10)}DESCRIPTION`);
+    for (const e of env) {
+      const req = e.required ? 'yes' : 'no';
+      const desc = e.description ?? '';
+      lines.push(`  ${e.name.padEnd(nameW)}${req.padEnd(10)}${desc}`);
+    }
+  }
+
+  const hc = template.healthCheck as { tool: string; arguments?: Record<string, unknown>; intervalSeconds?: number; timeoutSeconds?: number; failureThreshold?: number } | null;
+  if (hc) {
+    lines.push('');
+    lines.push('Health Check:');
+    lines.push(`  ${pad('Tool:', 22)}${hc.tool}`);
+    if (hc.arguments && Object.keys(hc.arguments).length > 0) {
+      lines.push(`  ${pad('Arguments:', 22)}${JSON.stringify(hc.arguments)}`);
+    }
+    lines.push(`  ${pad('Interval:', 22)}${hc.intervalSeconds ?? 60}s`);
+    lines.push(`  ${pad('Timeout:', 22)}${hc.timeoutSeconds ?? 10}s`);
+    lines.push(`  ${pad('Failure Threshold:', 22)}${hc.failureThreshold ?? 3}`);
+  }
+
+  lines.push('');
+  lines.push('Usage:');
+  lines.push(`  mcpctl create server my-${template.name} --from-template=${template.name}`);
+
+  lines.push('');
+  lines.push('Metadata:');
+  lines.push(`  ${pad('ID:', 12)}${template.id}`);
+  if (template.createdAt) lines.push(`  ${pad('Created:', 12)}${template.createdAt}`);
+  if (template.updatedAt) lines.push(`  ${pad('Updated:', 12)}${template.updatedAt}`);
+
+  return lines.join('\n');
+}
+
+function formatGenericDetail(obj: Record<string, unknown>): string {
+  const lines: string[] = [];
+  for (const [key, value] of Object.entries(obj)) {
+    if (value === null || value === undefined) {
+      lines.push(`${pad(key + ':')}  -`);
+    } else if (Array.isArray(value)) {
+      if (value.length === 0) {
+        lines.push(`${pad(key + ':')}  []`);
+      } else {
+        lines.push(`${key}:`);
+        for (const item of value) {
+          lines.push(`  - ${typeof item === 'object' ? JSON.stringify(item) : String(item)}`);
+        }
+      }
+    } else if (typeof value === 'object') {
+      lines.push(`${key}:`);
+      for (const [k, v] of Object.entries(value as Record<string, unknown>)) {
+        lines.push(`  ${pad(k + ':')}${String(v)}`);
+      }
+    } else {
+      lines.push(`${pad(key + ':')}${String(value)}`);
+    }
+  }
+  return lines.join('\n');
+}
+
+export function createDescribeCommand(deps: DescribeCommandDeps): Command {
+  return new Command('describe')
+    .description('Show detailed information about a resource')
+    .argument('<resource>', 'resource type (server, project, instance)')
+    .argument('<id>', 'resource ID or name')
+    .option('-o, --output <format>', 'output format (detail, json, yaml)', 'detail')
+    .option('--show-values', 'Show secret values (default: masked)')
+    .action(async (resourceArg: string, idOrName: string, opts: { output: string; showValues?: boolean }) => {
+      const resource = resolveResource(resourceArg);
+
+      // Resolve name → ID
+      let id: string;
+      try {
+        id = await resolveNameOrId(deps.client, resource, idOrName);
+      } catch {
+        id = idOrName;
+      }
+
+      const item = await deps.fetchResource(resource, id) as Record<string, unknown>;
+
+      // Enrich instances with container inspect data
+      let inspect: Record<string, unknown> | undefined;
+      if (resource === 'instances' && deps.fetchInspect && item.containerId) {
+        try {
+          inspect = await deps.fetchInspect(id) as Record<string, unknown>;
+          item.containerInspect = inspect;
+        } catch {
+          // Container may not be available
+        }
+      }
+
+      if (opts.output === 'json') {
+        deps.log(formatJson(item));
+      } else if (opts.output === 'yaml') {
+        deps.log(formatYaml(item));
+      } else {
+        // Visually clean sectioned output
+        switch (resource) {
+          case 'servers':
+            deps.log(formatServerDetail(item));
+            break;
+          case 'instances':
+            deps.log(formatInstanceDetail(item, inspect));
+            break;
+          case 'secrets':
+            deps.log(formatSecretDetail(item, opts.showValues === true));
+            break;
+          case 'templates':
+            deps.log(formatTemplateDetail(item));
+            break;
+          case 'projects':
+            deps.log(formatProjectDetail(item));
+            break;
+          default:
+            deps.log(formatGenericDetail(item));
+        }
+      }
+    });
+}

src/cli/src/commands/edit.ts

@@ -0,0 +1,114 @@
+import { Command } from 'commander';
+import { writeFileSync, readFileSync, unlinkSync, mkdtempSync } from 'node:fs';
+import { join } from 'node:path';
+import { tmpdir } from 'node:os';
+import { execSync } from 'node:child_process';
+import yaml from 'js-yaml';
+import type { ApiClient } from '../api-client.js';
+import { resolveResource, resolveNameOrId, stripInternalFields } from './shared.js';
+
+export interface EditCommandDeps {
+  client: ApiClient;
+  log: (...args: unknown[]) => void;
+  /** Override for testing — return editor binary name. */
+  getEditor?: () => string;
+  /** Override for testing — simulate opening the editor. */
+  openEditor?: (filePath: string, editor: string) => void;
+}
+
+function getEditor(deps: EditCommandDeps): string {
+  if (deps.getEditor) return deps.getEditor();
+  return process.env.VISUAL ?? process.env.EDITOR ?? 'vi';
+}
+
+function openEditor(filePath: string, editor: string, deps: EditCommandDeps): void {
+  if (deps.openEditor) {
+    deps.openEditor(filePath, editor);
+    return;
+  }
+  execSync(`${editor} "${filePath}"`, { stdio: 'inherit' });
+}
+
+export function createEditCommand(deps: EditCommandDeps): Command {
+  const { client, log } = deps;
+
+  return new Command('edit')
+    .description('Edit a resource in your default editor (server, project)')
+    .argument('<resource>', 'Resource type (server, project)')
+    .argument('<name-or-id>', 'Resource name or ID')
+    .action(async (resourceArg: string, nameOrId: string) => {
+      const resource = resolveResource(resourceArg);
+
+      // Instances are immutable
+      if (resource === 'instances') {
+        log('Error: instances are immutable and cannot be edited.');
+        log('To change an instance, update the server definition and let reconciliation handle it.');
+        process.exitCode = 1;
+        return;
+      }
+
+      const validResources = ['servers', 'secrets', 'projects'];
+      if (!validResources.includes(resource)) {
+        log(`Error: unknown resource type '${resourceArg}'`);
+        process.exitCode = 1;
+        return;
+      }
+
+      // Resolve name → ID
+      const id = await resolveNameOrId(client, resource, nameOrId);
+
+      // Fetch current state
+      const current = await client.get<Record<string, unknown>>(`/api/v1/${resource}/${id}`);
+
+      // Strip read-only fields for editor
+      const editable = stripInternalFields(current);
+
+      // Serialize to YAML
+      const singular = resource.replace(/s$/, '');
+      const header = `# Editing ${singular}: ${nameOrId}\n# Save and close to apply changes. Clear the file to cancel.\n`;
+      const originalYaml = yaml.dump(editable, { lineWidth: 120, noRefs: true });
+      const content = header + originalYaml;
+
+      // Write to temp file
+      const tmpDir = mkdtempSync(join(tmpdir(), 'mcpctl-edit-'));
+      const tmpFile = join(tmpDir, `${singular}-${nameOrId}.yaml`);
+      writeFileSync(tmpFile, content, 'utf-8');
+
+      try {
+        // Open editor
+        const editor = getEditor(deps);
+        openEditor(tmpFile, editor, deps);
+
+        // Read back
+        const modified = readFileSync(tmpFile, 'utf-8');
+
+        // Strip comments for comparison
+        const modifiedClean = modified
+          .split('\n')
+          .filter((line) => !line.startsWith('#'))
+          .join('\n')
+          .trim();
+
+        if (!modifiedClean) {
+          log('Edit cancelled (empty file).');
+          return;
+        }
+
+        if (modifiedClean === originalYaml.trim()) {
+          log(`${singular} '${nameOrId}' unchanged.`);
+          return;
+        }
+
+        // Parse and apply
+        const updates = yaml.load(modifiedClean) as Record<string, unknown>;
+        await client.put(`/api/v1/${resource}/${id}`, updates);
+        log(`${singular} '${nameOrId}' updated.`);
+      } finally {
+        try {
+          unlinkSync(tmpFile);
+        } catch {
+          // Ignore cleanup errors
+        }
+      }
+    });
+}

src/cli/src/commands/get.ts

@@ -0,0 +1,145 @@
+import { Command } from 'commander';
+import { formatTable } from '../formatters/table.js';
+import { formatJson, formatYaml } from '../formatters/output.js';
+import type { Column } from '../formatters/table.js';
+import { resolveResource, stripInternalFields } from './shared.js';
+
+export interface GetCommandDeps {
+  fetchResource: (resource: string, id?: string) => Promise<unknown[]>;
+  log: (...args: string[]) => void;
+}
+
+interface ServerRow {
+  id: string;
+  name: string;
+  transport: string;
+  packageName: string | null;
+  dockerImage: string | null;
+}
+
+interface ProjectRow {
+  id: string;
+  name: string;
+  description: string;
+  ownerId: string;
+}
+
+interface SecretRow {
+  id: string;
+  name: string;
+  data: Record<string, string>;
+}
+
+interface TemplateRow {
+  id: string;
+  name: string;
+  version: string;
+  transport: string;
+  packageName: string | null;
+  description: string;
+}
+
+interface InstanceRow {
+  id: string;
+  serverId: string;
+  status: string;
+  containerId: string | null;
+  port: number | null;
+  healthStatus: string | null;
+}
+
+const serverColumns: Column<ServerRow>[] = [
+  { header: 'NAME', key: 'name' },
+  { header: 'TRANSPORT', key: 'transport', width: 16 },
+  { header: 'PACKAGE', key: (r) => r.packageName ?? '-' },
+  { header: 'IMAGE', key: (r) => r.dockerImage ?? '-' },
+  { header: 'ID', key: 'id' },
+];
+
+const projectColumns: Column<ProjectRow>[] = [
+  { header: 'NAME', key: 'name' },
+  { header: 'DESCRIPTION', key: 'description', width: 40 },
+  { header: 'OWNER', key: 'ownerId' },
+  { header: 'ID', key: 'id' },
+];
+
+const secretColumns: Column<SecretRow>[] = [
+  { header: 'NAME', key: 'name' },
+  { header: 'KEYS', key: (r) => Object.keys(r.data).join(', ') || '-', width: 40 },
+  { header: 'ID', key: 'id' },
+];
+
+const templateColumns: Column<TemplateRow>[] = [
+  { header: 'NAME', key: 'name' },
+  { header: 'VERSION', key: 'version', width: 10 },
+  { header: 'TRANSPORT', key: 'transport', width: 16 },
+  { header: 'PACKAGE', key: (r) => r.packageName ?? '-' },
+  { header: 'DESCRIPTION', key: 'description', width: 50 },
+];
+
+const instanceColumns: Column<InstanceRow>[] = [
+  { header: 'STATUS', key: 'status', width: 10 },
+  { header: 'HEALTH', key: (r) => r.healthStatus ?? '-', width: 10 },
+  { header: 'SERVER ID', key: 'serverId' },
+  { header: 'PORT', key: (r) => r.port != null ? String(r.port) : '-', width: 6 },
+  { header: 'CONTAINER', key: (r) => r.containerId ? r.containerId.slice(0, 12) : '-', width: 14 },
+  { header: 'ID', key: 'id' },
+];
+
+function getColumnsForResource(resource: string): Column<Record<string, unknown>>[] {
+  switch (resource) {
+    case 'servers':
+      return serverColumns as unknown as Column<Record<string, unknown>>[];
+    case 'projects':
+      return projectColumns as unknown as Column<Record<string, unknown>>[];
+    case 'secrets':
+      return secretColumns as unknown as Column<Record<string, unknown>>[];
+    case 'templates':
+      return templateColumns as unknown as Column<Record<string, unknown>>[];
+    case 'instances':
+      return instanceColumns as unknown as Column<Record<string, unknown>>[];
+    default:
+      return [
+        { header: 'ID', key: 'id' as keyof Record<string, unknown> },
+        { header: 'NAME', key: 'name' as keyof Record<string, unknown> },
+      ];
+  }
+}
+
+/**
+ * Transform API response items into apply-compatible format.
+ * Strips internal fields and wraps in the resource key.
+ */
+function toApplyFormat(resource: string, items: unknown[]): Record<string, unknown[]> {
+  const cleaned = items.map((item) => {
+    return stripInternalFields(item as Record<string, unknown>);
+  });
+  return { [resource]: cleaned };
+}
+
+export function createGetCommand(deps: GetCommandDeps): Command {
+  return new Command('get')
+    .description('List resources (servers, projects, instances)')
+    .argument('<resource>', 'resource type (servers, projects, instances)')
+    .argument('[id]', 'specific resource ID or name')
+    .option('-o, --output <format>', 'output format (table, json, yaml)', 'table')
+    .action(async (resourceArg: string, id: string | undefined, opts: { output: string }) => {
+      const resource = resolveResource(resourceArg);
+      const items = await deps.fetchResource(resource, id);
+
+      if (opts.output === 'json') {
+        // Apply-compatible JSON wrapped in resource key
+        deps.log(formatJson(toApplyFormat(resource, items)));
+      } else if (opts.output === 'yaml') {
+        // Apply-compatible YAML wrapped in resource key
+        deps.log(formatYaml(toApplyFormat(resource, items)));
+      } else {
+        if (items.length === 0) {
+          deps.log(`No ${resource} found.`);
+          return;
+        }
+        const columns = getColumnsForResource(resource);
+        deps.log(formatTable(items as Record<string, unknown>[], columns));
+      }
+    });
+}

src/cli/src/commands/logs.ts

@@ -0,0 +1,29 @@
+import { Command } from 'commander';
+import type { ApiClient } from '../api-client.js';
+
+export interface LogsCommandDeps {
+  client: ApiClient;
+  log: (...args: unknown[]) => void;
+}
+
+export function createLogsCommand(deps: LogsCommandDeps): Command {
+  const { client, log } = deps;
+
+  return new Command('logs')
+    .description('Get logs from an MCP server instance')
+    .argument('<instance-id>', 'Instance ID')
+    .option('-t, --tail <lines>', 'Number of lines to show')
+    .action(async (id: string, opts: { tail?: string }) => {
+      let url = `/api/v1/instances/${id}/logs`;
+      if (opts.tail) {
+        url += `?tail=${opts.tail}`;
+      }
+      const logs = await client.get<{ stdout: string; stderr: string }>(url);
+      if (logs.stdout) {
+        log(logs.stdout);
+      }
+      if (logs.stderr) {
+        process.stderr.write(logs.stderr);
+      }
+    });
+}

src/cli/src/commands/project.ts

@@ -0,0 +1,15 @@
+import { Command } from 'commander';
+import type { ApiClient } from '../api-client.js';
+
+export interface ProjectCommandDeps {
+  client: ApiClient;
+  log: (...args: unknown[]) => void;
+}
+
+export function createProjectCommand(_deps: ProjectCommandDeps): Command {
+  const cmd = new Command('project')
+    .alias('proj')
+    .description('Project-specific actions (create with "create project", list with "get projects")');
+
+  return cmd;
+}

src/cli/src/commands/shared.ts

@@ -0,0 +1,44 @@
+import type { ApiClient } from '../api-client.js';
+
+export const RESOURCE_ALIASES: Record<string, string> = {
+  server: 'servers',
+  srv: 'servers',
+  project: 'projects',
+  proj: 'projects',
+  instance: 'instances',
+  inst: 'instances',
+  secret: 'secrets',
+  sec: 'secrets',
+  template: 'templates',
+  tpl: 'templates',
+};
+
+export function resolveResource(name: string): string {
+  const lower = name.toLowerCase();
+  return RESOURCE_ALIASES[lower] ?? lower;
+}
+
+/** Resolve a name-or-ID to an ID. CUIDs pass through; names are looked up. */
+export async function resolveNameOrId(
+  client: ApiClient,
+  resource: string,
+  nameOrId: string,
+): Promise<string> {
+  // CUIDs start with 'c' followed by 24+ alphanumeric chars
+  if (/^c[a-z0-9]{24}/.test(nameOrId)) {
+    return nameOrId;
+  }
+  const items = await client.get<Array<{ id: string; name: string }>>(`/api/v1/${resource}`);
+  const match = items.find((item) => item.name === nameOrId);
+  if (match) return match.id;
+  throw new Error(`${resource.replace(/s$/, '')} '${nameOrId}' not found`);
+}
+
+/** Strip internal/read-only fields from an API response to make it apply-compatible. */
+export function stripInternalFields(obj: Record<string, unknown>): Record<string, unknown> {
+  const result = { ...obj };
+  for (const key of ['id', 'createdAt', 'updatedAt', 'version', 'ownerId']) {
+    delete result[key];
+  }
+  return result;
+}

src/cli/src/commands/status.ts

@@ -2,16 +2,19 @@ import { Command } from 'commander';
 import http from 'node:http';
 import { loadConfig } from '../config/index.js';
 import type { ConfigLoaderDeps } from '../config/index.js';
+import { loadCredentials } from '../auth/index.js';
+import type { CredentialsDeps } from '../auth/index.js';
 import { formatJson, formatYaml } from '../formatters/index.js';
 import { APP_VERSION } from '@mcpctl/shared';
 
 export interface StatusCommandDeps {
   configDeps: Partial<ConfigLoaderDeps>;
+  credentialsDeps: Partial<CredentialsDeps>;
   log: (...args: string[]) => void;
-  checkDaemon: (url: string) => Promise<boolean>;
+  checkHealth: (url: string) => Promise<boolean>;
 }
 
-function defaultCheckDaemon(url: string): Promise<boolean> {
+function defaultCheckHealth(url: string): Promise<boolean> {
   return new Promise((resolve) => {
     const req = http.get(`${url}/health`, { timeout: 3000 }, (res) => {
       resolve(res.statusCode !== undefined && res.statusCode >= 200 && res.statusCode < 400);
@@ -27,24 +30,33 @@ function defaultCheckDaemon(url: string): Promise<boolean> {
 
 const defaultDeps: StatusCommandDeps = {
   configDeps: {},
+  credentialsDeps: {},
   log: (...args) => console.log(...args),
-  checkDaemon: defaultCheckDaemon,
+  checkHealth: defaultCheckHealth,
 };
 
 export function createStatusCommand(deps?: Partial<StatusCommandDeps>): Command {
-  const { configDeps, log, checkDaemon } = { ...defaultDeps, ...deps };
+  const { configDeps, credentialsDeps, log, checkHealth } = { ...defaultDeps, ...deps };
 
   return new Command('status')
     .description('Show mcpctl status and connectivity')
     .option('-o, --output <format>', 'output format (table, json, yaml)', 'table')
     .action(async (opts: { output: string }) => {
       const config = loadConfig(configDeps);
-      const daemonReachable = await checkDaemon(config.daemonUrl);
+      const creds = loadCredentials(credentialsDeps);
+
+      const [mcplocalReachable, mcpdReachable] = await Promise.all([
+        checkHealth(config.mcplocalUrl),
+        checkHealth(config.mcpdUrl),
+      ]);
 
       const status = {
         version: APP_VERSION,
-        daemonUrl: config.daemonUrl,
-        daemonReachable,
+        mcplocalUrl: config.mcplocalUrl,
+        mcplocalReachable,
+        mcpdUrl: config.mcpdUrl,
+        mcpdReachable,
+        auth: creds ? { user: creds.user } : null,
         registries: config.registries,
         outputFormat: config.outputFormat,
       };
@@ -55,7 +67,9 @@ export function createStatusCommand(deps?: Partial<StatusCommandDeps>): Command
         log(formatYaml(status));
       } else {
         log(`mcpctl v${status.version}`);
-        log(`Daemon:     ${status.daemonUrl} (${daemonReachable ? 'connected' : 'unreachable'})`);
+        log(`mcplocal:   ${status.mcplocalUrl} (${mcplocalReachable ? 'connected' : 'unreachable'})`);
+        log(`mcpd:       ${status.mcpdUrl} (${mcpdReachable ? 'connected' : 'unreachable'})`);
+        log(`Auth:       ${creds ? `logged in as ${creds.user}` : 'not logged in'}`);
         log(`Registries: ${status.registries.join(', ')}`);
         log(`Output:     ${status.outputFormat}`);
       }

src/cli/src/config/schema.ts

@@ -1,8 +1,12 @@
 import { z } from 'zod';
 
 export const McpctlConfigSchema = z.object({
-  /** mcpd daemon endpoint */
-  daemonUrl: z.string().default('http://localhost:3000'),
+  /** mcplocal daemon endpoint (local LLM pre-processing proxy) */
+  mcplocalUrl: z.string().default('http://localhost:3200'),
+  /** mcpd daemon endpoint (remote instance manager) */
+  mcpdUrl: z.string().default('http://localhost:3100'),
+  /** @deprecated Use mcplocalUrl instead. Kept for backward compatibility. */
+  daemonUrl: z.string().optional(),
   /** Active registries for search */
   registries: z.array(z.enum(['official', 'glama', 'smithery'])).default(['official', 'glama', 'smithery']),
   /** Cache TTL in milliseconds */
@@ -15,6 +19,13 @@ export const McpctlConfigSchema = z.object({
   outputFormat: z.enum(['table', 'json', 'yaml']).default('table'),
   /** Smithery API key */
   smitheryApiKey: z.string().optional(),
+}).transform((cfg) => {
+  // Backward compatibility: if old daemonUrl is set but mcplocalUrl wasn't explicitly changed,
+  // use daemonUrl as mcplocalUrl
+  if (cfg.daemonUrl && cfg.mcplocalUrl === 'http://localhost:3200') {
+    return { ...cfg, mcplocalUrl: cfg.daemonUrl };
+  }
+  return cfg;
 });
 
 export type McpctlConfig = z.infer<typeof McpctlConfigSchema>;

src/cli/src/index.ts

@@ -3,17 +3,135 @@ import { Command } from 'commander';
 import { APP_NAME, APP_VERSION } from '@mcpctl/shared';
 import { createConfigCommand } from './commands/config.js';
 import { createStatusCommand } from './commands/status.js';
+import { createGetCommand } from './commands/get.js';
+import { createDescribeCommand } from './commands/describe.js';
+import { createDeleteCommand } from './commands/delete.js';
+import { createLogsCommand } from './commands/logs.js';
+import { createApplyCommand } from './commands/apply.js';
+import { createCreateCommand } from './commands/create.js';
+import { createEditCommand } from './commands/edit.js';
+import { createClaudeCommand } from './commands/claude.js';
+import { createProjectCommand } from './commands/project.js';
+import { createBackupCommand, createRestoreCommand } from './commands/backup.js';
+import { createLoginCommand, createLogoutCommand } from './commands/auth.js';
+import { ApiClient } from './api-client.js';
+import { loadConfig } from './config/index.js';
+import { loadCredentials } from './auth/index.js';
+import { resolveNameOrId } from './commands/shared.js';
 
 export function createProgram(): Command {
   const program = new Command()
     .name(APP_NAME)
     .description('Manage MCP servers like kubectl manages containers')
     .version(APP_VERSION, '-v, --version')
-    .option('-o, --output <format>', 'output format (table, json, yaml)', 'table')
-    .option('--daemon-url <url>', 'mcpd daemon URL');
+    .enablePositionalOptions()
+    .option('--daemon-url <url>', 'mcplocal daemon URL')
+    .option('--direct', 'bypass mcplocal and connect directly to mcpd');
 
   program.addCommand(createConfigCommand());
   program.addCommand(createStatusCommand());
+  program.addCommand(createLoginCommand());
+  program.addCommand(createLogoutCommand());
+
+  // Resolve target URL: --direct goes to mcpd, default goes to mcplocal
+  const config = loadConfig();
+  const creds = loadCredentials();
+  const opts = program.opts();
+  let baseUrl: string;
+  if (opts.daemonUrl) {
+    baseUrl = opts.daemonUrl as string;
+  } else if (opts.direct) {
+    baseUrl = config.mcpdUrl;
+  } else {
+    baseUrl = config.mcplocalUrl;
+  }
+
+  const client = new ApiClient({ baseUrl, token: creds?.token ?? undefined });
+
+  const fetchResource = async (resource: string, nameOrId?: string): Promise<unknown[]> => {
+    if (nameOrId) {
+      // Glob pattern — use query param filtering
+      if (nameOrId.includes('*')) {
+        return client.get<unknown[]>(`/api/v1/${resource}?name=${encodeURIComponent(nameOrId)}`);
+      }
+      let id: string;
+      try {
+        id = await resolveNameOrId(client, resource, nameOrId);
+      } catch {
+        id = nameOrId;
+      }
+      const item = await client.get(`/api/v1/${resource}/${id}`);
+      return [item];
+    }
+    return client.get<unknown[]>(`/api/v1/${resource}`);
+  };
+
+  const fetchSingleResource = async (resource: string, nameOrId: string): Promise<unknown> => {
+    let id: string;
+    try {
+      id = await resolveNameOrId(client, resource, nameOrId);
+    } catch {
+      id = nameOrId;
+    }
+    return client.get(`/api/v1/${resource}/${id}`);
+  };
+
+  program.addCommand(createGetCommand({
+    fetchResource,
+    log: (...args) => console.log(...args),
+  }));
+
+  program.addCommand(createDescribeCommand({
+    client,
+    fetchResource: fetchSingleResource,
+    fetchInspect: async (id: string) => client.get(`/api/v1/instances/${id}/inspect`),
+    log: (...args) => console.log(...args),
+  }));
+
+  program.addCommand(createDeleteCommand({
+    client,
+    log: (...args) => console.log(...args),
+  }));
+
+  program.addCommand(createLogsCommand({
+    client,
+    log: (...args) => console.log(...args),
+  }));
+
+  program.addCommand(createCreateCommand({
+    client,
+    log: (...args) => console.log(...args),
+  }));
+
+  program.addCommand(createEditCommand({
+    client,
+    log: (...args) => console.log(...args),
+  }));
+
+  program.addCommand(createApplyCommand({
+    client,
+    log: (...args) => console.log(...args),
+  }));
+
+  program.addCommand(createClaudeCommand({
+    client,
+    log: (...args) => console.log(...args),
+  }));
+
+  program.addCommand(createProjectCommand({
+    client,
+    log: (...args) => console.log(...args),
+  }));
+
+  program.addCommand(createBackupCommand({
+    client,
+    log: (...args) => console.log(...args),
+  }));
+
+  program.addCommand(createRestoreCommand({
+    client,
+    log: (...args) => console.log(...args),
+  }));
 
   return program;
 }

src/cli/src/registry/client.ts

@@ -0,0 +1,105 @@
+import type { RegistryServer, SearchOptions, RegistryClientConfig, RegistryName } from './types.js';
+import { RegistrySource } from './base.js';
+import { OfficialRegistrySource } from './sources/official.js';
+import { GlamaRegistrySource } from './sources/glama.js';
+import { SmitheryRegistrySource } from './sources/smithery.js';
+import { RegistryCache } from './cache.js';
+import { deduplicateResults } from './dedup.js';
+import { rankResults } from './ranking.js';
+
+export class RegistryClient {
+  private sources: Map<RegistryName, RegistrySource>;
+  private cache: RegistryCache;
+  private enabledRegistries: RegistryName[];
+  private metrics = {
+    queryLatencies: new Map<string, number[]>(),
+    errorCounts: new Map<string, number>(),
+  };
+
+  constructor(config: RegistryClientConfig = {}) {
+    this.enabledRegistries = config.registries ?? ['official', 'glama', 'smithery'];
+    this.cache = new RegistryCache(config.cacheTTLMs);
+
+    this.sources = new Map<RegistryName, RegistrySource>([
+      ['official', new OfficialRegistrySource()],
+      ['glama', new GlamaRegistrySource()],
+      ['smithery', new SmitheryRegistrySource()],
+    ]);
+  }
+
+  async search(options: SearchOptions): Promise<RegistryServer[]> {
+    // Check cache
+    const cached = this.cache.get(options.query, options);
+    if (cached !== null) {
+      return cached;
+    }
+
+    const registries = options.registries ?? this.enabledRegistries;
+    const limit = options.limit ?? 20;
+
+    // Query all enabled registries in parallel
+    const promises = registries
+      .map((name) => this.sources.get(name))
+      .filter((source): source is RegistrySource => source !== undefined)
+      .map(async (source) => {
+        const start = Date.now();
+        try {
+          const results = await source.search(options.query, limit);
+          this.recordLatency(source.name, Date.now() - start);
+          return results;
+        } catch (error) {
+          this.recordError(source.name);
+          // Graceful degradation: log and continue
+          return [];
+        }
+      });
+
+    const settled = await Promise.all(promises);
+    let combined = settled.flat();
+
+    // Apply filters
+    if (options.verified === true) {
+      combined = combined.filter((s) => s.verified);
+    }
+    if (options.transport !== undefined) {
+      combined = combined.filter((s) => s.transport === options.transport);
+    }
+
+    // Deduplicate, rank, and limit
+    const deduped = deduplicateResults(combined);
+    const ranked = rankResults(deduped, options.query);
+    const results = ranked.slice(0, limit);
+
+    // Cache results
+    this.cache.set(options.query, options, results);
+
+    return results;
+  }
+
+  getCacheMetrics(): { hits: number; misses: number; ratio: number } {
+    return this.cache.getHitRatio();
+  }
+
+  getQueryLatencies(): Map<string, number[]> {
+    return new Map(this.metrics.queryLatencies);
+  }
+
+  getErrorCounts(): Map<string, number> {
+    return new Map(this.metrics.errorCounts);
+  }
+
+  clearCache(): void {
+    this.cache.clear();
+  }
+
+  private recordLatency(source: string, ms: number): void {
+    const existing = this.metrics.queryLatencies.get(source) ?? [];
+    existing.push(ms);
+    this.metrics.queryLatencies.set(source, existing);
+  }
+
+  private recordError(source: string): void {
+    const count = this.metrics.errorCounts.get(source) ?? 0;
+    this.metrics.errorCounts.set(source, count + 1);
+  }
+}

src/cli/src/registry/index.ts

@@ -0,0 +1,17 @@
+export { RegistryClient } from './client.js';
+export { RegistryCache } from './cache.js';
+export { RegistrySource } from './base.js';
+export { deduplicateResults } from './dedup.js';
+export { rankResults } from './ranking.js';
+export { withRetry } from './retry.js';
+export { OfficialRegistrySource } from './sources/official.js';
+export { GlamaRegistrySource } from './sources/glama.js';
+export { SmitheryRegistrySource } from './sources/smithery.js';
+export type {
+  RegistryServer,
+  SearchOptions,
+  RegistryClientConfig,
+  RegistryName,
+  EnvVar,
+} from './types.js';
+export { sanitizeString } from './types.js';

src/cli/src/registry/ranking.ts

@@ -0,0 +1,63 @@
+import type { RegistryServer } from './types.js';
+
+const WEIGHT_RELEVANCE = 0.4;
+const WEIGHT_POPULARITY = 0.3;
+const WEIGHT_VERIFIED = 0.2;
+const WEIGHT_RECENCY = 0.1;
+
+function textRelevance(server: RegistryServer, query: string): number {
+  const q = query.toLowerCase();
+  const name = server.name.toLowerCase();
+  const desc = server.description.toLowerCase();
+
+  // Exact name match
+  if (name === q) return 1.0;
+  // Name starts with query
+  if (name.startsWith(q)) return 0.9;
+  // Name contains query
+  if (name.includes(q)) return 0.7;
+  // Description contains query
+  if (desc.includes(q)) return 0.4;
+
+  // Word-level matching
+  const queryWords = q.split(/\s+/);
+  const matchCount = queryWords.filter(
+    (w) => name.includes(w) || desc.includes(w),
+  ).length;
+  return queryWords.length > 0 ? (matchCount / queryWords.length) * 0.3 : 0;
+}
+
+function popularityScore(server: RegistryServer): number {
+  // Normalize to 0-1 range; use log scale since popularity can vary hugely
+  if (server.popularityScore <= 0) return 0;
+  // Log scale: log10(1) = 0, log10(10000) ≈ 4 → normalize to 0-1 with cap at 100k
+  return Math.min(Math.log10(server.popularityScore + 1) / 5, 1.0);
+}
+
+function verifiedScore(server: RegistryServer): number {
+  return server.verified ? 1.0 : 0;
+}
+
+function recencyScore(server: RegistryServer): number {
+  if (server.lastUpdated === undefined) return 0.5; // Unknown = middle score
+  const ageMs = Date.now() - server.lastUpdated.getTime();
+  const ageDays = ageMs / (1000 * 60 * 60 * 24);
+  // Less than 30 days = 1.0, decays to 0 at 365 days
+  return Math.max(0, 1 - ageDays / 365);
+}
+
+function computeScore(server: RegistryServer, query: string): number {
+  return (
+    WEIGHT_RELEVANCE * textRelevance(server, query) +
+    WEIGHT_POPULARITY * popularityScore(server) +
+    WEIGHT_VERIFIED * verifiedScore(server) +
+    WEIGHT_RECENCY * recencyScore(server)
+  );
+}
+
+export function rankResults(
+  results: RegistryServer[],
+  query: string,
+): RegistryServer[] {
+  return [...results].sort((a, b) => computeScore(b, query) - computeScore(a, query));
+}

src/cli/src/registry/retry.ts

@@ -0,0 +1,16 @@
+export async function withRetry<T>(
+  fn: () => Promise<T>,
+  maxRetries = 3,
+  baseDelay = 1000,
+): Promise<T> {
+  for (let attempt = 0; attempt < maxRetries; attempt++) {
+    try {
+      return await fn();
+    } catch (error) {
+      if (attempt === maxRetries - 1) throw error;
+      const delay = baseDelay * Math.pow(2, attempt) + Math.random() * 1000;
+      await new Promise((r) => setTimeout(r, delay));
+    }
+  }
+  throw new Error('Unreachable');
+}

src/cli/src/registry/sources/glama.ts

@@ -0,0 +1,92 @@
+import { RegistrySource } from '../base.js';
+import {
+  GlamaRegistryResponseSchema,
+  sanitizeString,
+  type GlamaServerEntry,
+  type RegistryServer,
+} from '../types.js';
+import { withRetry } from '../retry.js';
+
+const BASE_URL = 'https://glama.ai/api/mcp/v1/servers';
+
+export class GlamaRegistrySource extends RegistrySource {
+  readonly name = 'glama' as const;
+
+  async search(query: string, limit: number): Promise<RegistryServer[]> {
+    const results: RegistryServer[] = [];
+    let cursor: string | null | undefined;
+
+    while (results.length < limit) {
+      const url = new URL(BASE_URL);
+      url.searchParams.set('query', query);
+      if (cursor !== undefined && cursor !== null) {
+        url.searchParams.set('after', cursor);
+      }
+
+      const response = await withRetry(() => fetch(url.toString()));
+      if (!response.ok) {
+        throw new Error(`Glama registry returned ${String(response.status)}`);
+      }
+
+      const raw: unknown = await response.json();
+      const parsed = GlamaRegistryResponseSchema.parse(raw);
+
+      for (const entry of parsed.servers) {
+        results.push(this.normalizeResult(entry));
+      }
+
+      if (!parsed.pageInfo.hasNextPage || parsed.servers.length === 0) break;
+      cursor = parsed.pageInfo.endCursor;
+    }
+
+    return results.slice(0, limit);
+  }
+
+  protected normalizeResult(raw: unknown): RegistryServer {
+    const entry = raw as GlamaServerEntry;
+
+    // Extract env vars from JSON Schema
+    const props = entry.environmentVariablesJsonSchema?.properties ?? {};
+    const envTemplate = Object.entries(props).map(([name, schemaProp]) => {
+      const envVar: import('../types.js').EnvVar = {
+        name,
+        description: sanitizeString(schemaProp.description ?? ''),
+        isSecret: name.toLowerCase().includes('token') ||
+          name.toLowerCase().includes('secret') ||
+          name.toLowerCase().includes('password') ||
+          name.toLowerCase().includes('key'),
+      };
+      if (schemaProp.default !== undefined) {
+        envVar.defaultValue = schemaProp.default;
+      }
+      return envVar;
+    });
+
+    // Determine transport from attributes
+    const attrs = entry.attributes;
+    let transport: RegistryServer['transport'] = 'stdio';
+    if (attrs.includes('hosting:remote-capable') || attrs.includes('hosting:hybrid')) {
+      transport = 'sse';
+    }
+
+    const packages: RegistryServer['packages'] = {};
+    if (entry.slug !== '') {
+      packages.npm = entry.slug;
+    }
+
+    const result: RegistryServer = {
+      name: sanitizeString(entry.name),
+      description: sanitizeString(entry.description),
+      packages,
+      envTemplate,
+      transport,
+      popularityScore: 0, // Glama has no popularity metrics in list
+      verified: attrs.includes('author:official'),
+      sourceRegistry: 'glama',
+    };
+    if (entry.repository?.url !== undefined) {
+      result.repositoryUrl = entry.repository.url;
+    }
+    return result;
+  }
+}

src/cli/src/registry/sources/official.ts

@@ -0,0 +1,106 @@
+import { RegistrySource } from '../base.js';
+import {
+  OfficialRegistryResponseSchema,
+  sanitizeString,
+  type OfficialServerEntry,
+  type RegistryServer,
+} from '../types.js';
+import { withRetry } from '../retry.js';
+
+const BASE_URL = 'https://registry.modelcontextprotocol.io/v0/servers';
+
+export class OfficialRegistrySource extends RegistrySource {
+  readonly name = 'official' as const;
+
+  async search(query: string, limit: number): Promise<RegistryServer[]> {
+    const results: RegistryServer[] = [];
+    let cursor: string | null | undefined;
+
+    while (results.length < limit) {
+      const url = new URL(BASE_URL);
+      url.searchParams.set('search', query);
+      url.searchParams.set('limit', String(Math.min(limit - results.length, 100)));
+      if (cursor !== undefined && cursor !== null) {
+        url.searchParams.set('cursor', cursor);
+      }
+
+      const response = await withRetry(() => fetch(url.toString()));
+      if (!response.ok) {
+        throw new Error(`Official registry returned ${String(response.status)}`);
+      }
+
+      const raw: unknown = await response.json();
+      const parsed = OfficialRegistryResponseSchema.parse(raw);
+
+      for (const entry of parsed.servers) {
+        results.push(this.normalizeResult(entry));
+      }
+
+      cursor = parsed.metadata?.nextCursor;
+      if (cursor === null || cursor === undefined || parsed.servers.length === 0) break;
+    }
+
+    return results.slice(0, limit);
+  }
+
+  protected normalizeResult(raw: unknown): RegistryServer {
+    const entry = raw as OfficialServerEntry;
+    const server = entry.server;
+
+    // Extract env vars from packages
+    const envTemplate = server.packages.flatMap((pkg: { environmentVariables: Array<{ name: string; description?: string; isSecret?: boolean }> }) =>
+      pkg.environmentVariables.map((ev: { name: string; description?: string; isSecret?: boolean }) => ({
+        name: ev.name,
+        description: sanitizeString(ev.description ?? ''),
+        isSecret: ev.isSecret ?? false,
+      })),
+    );
+
+    // Determine transport from packages or remotes
+    let transport: RegistryServer['transport'] = 'stdio';
+    if (server.packages.length > 0) {
+      const pkgTransport = server.packages[0]?.transport?.type;
+      if (pkgTransport === 'stdio') transport = 'stdio';
+    }
+    if (server.remotes.length > 0) {
+      const remoteType = server.remotes[0]?.type;
+      if (remoteType === 'sse') transport = 'sse';
+      else if (remoteType === 'streamable-http') transport = 'streamable-http';
+    }
+
+    // Extract npm package identifier
+    const npmPkg = server.packages.find((p: { registryType: string }) => p.registryType === 'npm');
+    const dockerPkg = server.packages.find((p: { registryType: string }) => p.registryType === 'oci');
+
+    // Extract dates from _meta
+    const meta = entry._meta as Record<string, Record<string, unknown>> | undefined;
+    const officialMeta = meta?.['io.modelcontextprotocol.registry/official'];
+    const updatedAt = officialMeta?.['updatedAt'];
+
+    const packages: RegistryServer['packages'] = {};
+    if (npmPkg !== undefined) {
+      packages.npm = npmPkg.identifier;
+    }
+    if (dockerPkg !== undefined) {
+      packages.docker = dockerPkg.identifier;
+    }
+
+    const result: RegistryServer = {
+      name: sanitizeString(server.title ?? server.name),
+      description: sanitizeString(server.description),
+      packages,
+      envTemplate,
+      transport,
+      popularityScore: 0, // Official registry has no popularity data
+      verified: false, // Official registry has no verified badges
+      sourceRegistry: 'official',
+    };
+    if (server.repository?.url !== undefined) {
+      result.repositoryUrl = server.repository.url;
+    }
+    if (typeof updatedAt === 'string') {
+      result.lastUpdated = new Date(updatedAt);
+    }
+    return result;
+  }
+}

src/cli/src/registry/sources/smithery.ts

@@ -0,0 +1,62 @@
+import { RegistrySource } from '../base.js';
+import {
+  SmitheryRegistryResponseSchema,
+  sanitizeString,
+  type SmitheryServerEntry,
+  type RegistryServer,
+} from '../types.js';
+import { withRetry } from '../retry.js';
+
+const BASE_URL = 'https://registry.smithery.ai/servers';
+
+export class SmitheryRegistrySource extends RegistrySource {
+  readonly name = 'smithery' as const;
+
+  async search(query: string, limit: number): Promise<RegistryServer[]> {
+    const results: RegistryServer[] = [];
+    let page = 1;
+
+    while (results.length < limit) {
+      const url = new URL(BASE_URL);
+      url.searchParams.set('q', query);
+      url.searchParams.set('pageSize', String(Math.min(limit - results.length, 50)));
+      url.searchParams.set('page', String(page));
+
+      const response = await withRetry(() => fetch(url.toString()));
+      if (!response.ok) {
+        throw new Error(`Smithery registry returned ${String(response.status)}`);
+      }
+
+      const raw: unknown = await response.json();
+      const parsed = SmitheryRegistryResponseSchema.parse(raw);
+
+      for (const entry of parsed.servers) {
+        results.push(this.normalizeResult(entry));
+      }
+
+      if (page >= parsed.pagination.totalPages || parsed.servers.length === 0) break;
+      page++;
+    }
+
+    return results.slice(0, limit);
+  }
+
+  protected normalizeResult(raw: unknown): RegistryServer {
+    const entry = raw as SmitheryServerEntry;
+
+    const result: RegistryServer = {
+      name: sanitizeString(entry.displayName !== '' ? entry.displayName : entry.qualifiedName),
+      description: sanitizeString(entry.description),
+      packages: {},
+      envTemplate: [], // Smithery doesn't include env vars in list view
+      transport: entry.remote ? 'sse' : 'stdio',
+      popularityScore: entry.useCount,
+      verified: entry.verified,
+      sourceRegistry: 'smithery',
+    };
+    if (entry.createdAt !== undefined) {
+      result.lastUpdated = new Date(entry.createdAt);
+    }
+    return result;
+  }
+}

src/cli/src/registry/types.ts

@@ -173,7 +173,7 @@ export type SmitheryServerEntry = z.infer<typeof SmitheryServerSchema>;
 
 // ── Security utilities ──
 
-const ANSI_ESCAPE_RE = /\x1b\[[0-9;]*[a-zA-Z]|[\x00-\x08\x0B\x0C\x0E-\x1F]/g;
+const ANSI_ESCAPE_RE = /\x1b\[[0-9;]*[a-zA-Z]|[\x00-\x08\x0B\x0C\x0E-\x1A\x1C-\x1F]|\x1b/g;
 
 export function sanitizeString(text: string): string {
   return text.replace(ANSI_ESCAPE_RE, '');

src/cli/tests/api-client.test.ts

@@ -0,0 +1,100 @@
+import { describe, it, expect, beforeAll, afterAll } from 'vitest';
+import http from 'node:http';
+import { ApiClient, ApiError } from '../src/api-client.js';
+
+let server: http.Server;
+let port: number;
+
+beforeAll(async () => {
+  server = http.createServer((req, res) => {
+    if (req.url === '/api/v1/servers' && req.method === 'GET') {
+      res.writeHead(200, { 'Content-Type': 'application/json' });
+      res.end(JSON.stringify([{ id: 'srv-1', name: 'slack' }]));
+    } else if (req.url === '/api/v1/servers/srv-1' && req.method === 'GET') {
+      res.writeHead(200, { 'Content-Type': 'application/json' });
+      res.end(JSON.stringify({ id: 'srv-1', name: 'slack', transport: 'STDIO' }));
+    } else if (req.url === '/api/v1/servers' && req.method === 'POST') {
+      const chunks: Buffer[] = [];
+      req.on('data', (c: Buffer) => chunks.push(c));
+      req.on('end', () => {
+        const body = JSON.parse(Buffer.concat(chunks).toString());
+        res.writeHead(201, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ id: 'srv-new', ...body }));
+      });
+    } else if (req.url === '/api/v1/missing' && req.method === 'GET') {
+      res.writeHead(404, { 'Content-Type': 'application/json' });
+      res.end(JSON.stringify({ error: 'Not found' }));
+    } else {
+      res.writeHead(404);
+      res.end();
+    }
+  });
+
+  await new Promise<void>((resolve) => {
+    server.listen(0, () => {
+      const addr = server.address();
+      if (addr && typeof addr === 'object') {
+        port = addr.port;
+      }
+      resolve();
+    });
+  });
+});
+
+afterAll(() => {
+  server.close();
+});
+
+describe('ApiClient', () => {
+  it('performs GET request for list', async () => {
+    const client = new ApiClient({ baseUrl: `http://localhost:${port}` });
+    const result = await client.get<Array<{ id: string; name: string }>>('/api/v1/servers');
+    expect(result).toEqual([{ id: 'srv-1', name: 'slack' }]);
+  });
+
+  it('performs GET request for single item', async () => {
+    const client = new ApiClient({ baseUrl: `http://localhost:${port}` });
+    const result = await client.get<{ id: string; name: string }>('/api/v1/servers/srv-1');
+    expect(result.name).toBe('slack');
+  });
+
+  it('performs POST request', async () => {
+    const client = new ApiClient({ baseUrl: `http://localhost:${port}` });
+    const result = await client.post<{ id: string; name: string }>('/api/v1/servers', { name: 'github' });
+    expect(result.id).toBe('srv-new');
+    expect(result.name).toBe('github');
+  });
+
+  it('throws ApiError on 404', async () => {
+    const client = new ApiClient({ baseUrl: `http://localhost:${port}` });
+    await expect(client.get('/api/v1/missing')).rejects.toThrow(ApiError);
+  });
+
+  it('throws on connection error', async () => {
+    const client = new ApiClient({ baseUrl: 'http://localhost:1' });
+    await expect(client.get('/anything')).rejects.toThrow();
+  });
+
+  it('sends Authorization header when token provided', async () => {
+    // We need a separate server to check the header
+    let receivedAuth = '';
+    const authServer = http.createServer((req, res) => {
+      receivedAuth = req.headers['authorization'] ?? '';
+      res.writeHead(200, { 'Content-Type': 'application/json' });
+      res.end(JSON.stringify({ ok: true }));
+    });
+    const authPort = await new Promise<number>((resolve) => {
+      authServer.listen(0, () => {
+        const addr = authServer.address();
+        if (addr && typeof addr === 'object') resolve(addr.port);
+      });
+    });
+    try {
+      const client = new ApiClient({ baseUrl: `http://localhost:${authPort}`, token: 'my-token' });
+      await client.get('/test');
+      expect(receivedAuth).toBe('Bearer my-token');
+    } finally {
+      authServer.close();
+    }
+  });
+});

src/cli/tests/auth/credentials.test.ts

@@ -0,0 +1,59 @@
+import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { mkdtempSync, rmSync, statSync, existsSync } from 'node:fs';
+import { join } from 'node:path';
+import { tmpdir } from 'node:os';
+import { saveCredentials, loadCredentials, deleteCredentials } from '../../src/auth/index.js';
+
+let tempDir: string;
+
+beforeEach(() => {
+  tempDir = mkdtempSync(join(tmpdir(), 'mcpctl-auth-test-'));
+});
+
+afterEach(() => {
+  rmSync(tempDir, { recursive: true, force: true });
+});
+
+describe('saveCredentials', () => {
+  it('saves credentials file', () => {
+    saveCredentials({ token: 'tok123', mcpdUrl: 'http://x:3100', user: 'alice@test.com' }, { configDir: tempDir });
+    expect(existsSync(join(tempDir, 'credentials'))).toBe(true);
+  });
+
+  it('sets 0600 permissions', () => {
+    saveCredentials({ token: 'tok123', mcpdUrl: 'http://x:3100', user: 'alice@test.com' }, { configDir: tempDir });
+    const stat = statSync(join(tempDir, 'credentials'));
+    expect(stat.mode & 0o777).toBe(0o600);
+  });
+
+  it('creates config dir if missing', () => {
+    const nested = join(tempDir, 'sub', 'dir');
+    saveCredentials({ token: 'tok', mcpdUrl: 'http://x:3100', user: 'bob' }, { configDir: nested });
+    expect(existsSync(join(nested, 'credentials'))).toBe(true);
+  });
+});
+
+describe('loadCredentials', () => {
+  it('returns null when no credentials file', () => {
+    expect(loadCredentials({ configDir: tempDir })).toBeNull();
+  });
+
+  it('round-trips credentials', () => {
+    const creds = { token: 'tok456', mcpdUrl: 'http://remote:3100', user: 'charlie@test.com', expiresAt: '2099-01-01' };
+    saveCredentials(creds, { configDir: tempDir });
+    const loaded = loadCredentials({ configDir: tempDir });
+    expect(loaded).toEqual(creds);
+  });
+});
+
+describe('deleteCredentials', () => {
+  it('returns false when no credentials file', () => {
+    expect(deleteCredentials({ configDir: tempDir })).toBe(false);
+  });
+
+  it('deletes credentials file', () => {
+    saveCredentials({ token: 'tok', mcpdUrl: 'http://x:3100', user: 'u' }, { configDir: tempDir });
+    expect(deleteCredentials({ configDir: tempDir })).toBe(true);
+    expect(existsSync(join(tempDir, 'credentials'))).toBe(false);
+  });
+});

src/cli/tests/cli.test.ts

@@ -24,9 +24,10 @@ describe('createProgram', () => {
     expect(status).toBeDefined();
   });
 
-  it('has output option', () => {
+  it('subcommands have output option', () => {
     const program = createProgram();
-    const opt = program.options.find((o) => o.long === '--output');
+    const get = program.commands.find((c) => c.name() === 'get');
+    const opt = get?.options.find((o) => o.long === '--output');
     expect(opt).toBeDefined();
   });
 

src/cli/tests/commands/apply.test.ts

@@ -0,0 +1,162 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { writeFileSync, mkdtempSync, rmSync } from 'node:fs';
+import { join } from 'node:path';
+import { tmpdir } from 'node:os';
+import { createApplyCommand } from '../../src/commands/apply.js';
+import type { ApiClient } from '../../src/api-client.js';
+
+function mockClient(): ApiClient {
+  return {
+    get: vi.fn(async () => []),
+    post: vi.fn(async () => ({ id: 'new-id', name: 'test' })),
+    put: vi.fn(async () => ({ id: 'existing-id', name: 'test' })),
+    delete: vi.fn(async () => {}),
+  } as unknown as ApiClient;
+}
+
+describe('apply command', () => {
+  let client: ReturnType<typeof mockClient>;
+  let output: string[];
+  let tmpDir: string;
+  const log = (...args: unknown[]) => output.push(args.map(String).join(' '));
+
+  beforeEach(() => {
+    client = mockClient();
+    output = [];
+    tmpDir = mkdtempSync(join(tmpdir(), 'mcpctl-test-'));
+  });
+
+  it('applies servers from YAML file', async () => {
+    const configPath = join(tmpDir, 'config.yaml');
+    writeFileSync(configPath, `
+servers:
+  - name: slack
+    description: Slack MCP server
+    transport: STDIO
+    packageName: "@anthropic/slack-mcp"
+`);
+
+    const cmd = createApplyCommand({ client, log });
+    await cmd.parseAsync([configPath], { from: 'user' });
+
+    expect(client.post).toHaveBeenCalledWith('/api/v1/servers', expect.objectContaining({ name: 'slack' }));
+    expect(output.join('\n')).toContain('Created server: slack');
+
+    rmSync(tmpDir, { recursive: true, force: true });
+  });
+
+  it('applies servers from JSON file', async () => {
+    const configPath = join(tmpDir, 'config.json');
+    writeFileSync(configPath, JSON.stringify({
+      servers: [{ name: 'github', transport: 'STDIO' }],
+    }));
+
+    const cmd = createApplyCommand({ client, log });
+    await cmd.parseAsync([configPath], { from: 'user' });
+
+    expect(client.post).toHaveBeenCalledWith('/api/v1/servers', expect.objectContaining({ name: 'github' }));
+    expect(output.join('\n')).toContain('Created server: github');
+
+    rmSync(tmpDir, { recursive: true, force: true });
+  });
+
+  it('updates existing servers', async () => {
+    vi.mocked(client.get).mockResolvedValue([{ id: 'srv-1', name: 'slack' }]);
+
+    const configPath = join(tmpDir, 'config.yaml');
+    writeFileSync(configPath, `
+servers:
+  - name: slack
+    description: Updated description
+    transport: STDIO
+`);
+
+    const cmd = createApplyCommand({ client, log });
+    await cmd.parseAsync([configPath], { from: 'user' });
+
+    expect(client.put).toHaveBeenCalledWith('/api/v1/servers/srv-1', expect.objectContaining({ name: 'slack' }));
+    expect(output.join('\n')).toContain('Updated server: slack');
+
+    rmSync(tmpDir, { recursive: true, force: true });
+  });
+
+  it('supports dry-run mode', async () => {
+    const configPath = join(tmpDir, 'config.yaml');
+    writeFileSync(configPath, `
+servers:
+  - name: test
+    transport: STDIO
+`);
+
+    const cmd = createApplyCommand({ client, log });
+    await cmd.parseAsync([configPath, '--dry-run'], { from: 'user' });
+
+    expect(client.post).not.toHaveBeenCalled();
+    expect(output.join('\n')).toContain('Dry run');
+    expect(output.join('\n')).toContain('1 server(s)');
+
+    rmSync(tmpDir, { recursive: true, force: true });
+  });
+
+  it('applies secrets', async () => {
+    const configPath = join(tmpDir, 'config.yaml');
+    writeFileSync(configPath, `
+secrets:
+  - name: ha-creds
+    data:
+      TOKEN: abc123
+      URL: https://ha.local
+`);
+
+    const cmd = createApplyCommand({ client, log });
+    await cmd.parseAsync([configPath], { from: 'user' });
+
+    expect(client.post).toHaveBeenCalledWith('/api/v1/secrets', expect.objectContaining({
+      name: 'ha-creds',
+      data: { TOKEN: 'abc123', URL: 'https://ha.local' },
+    }));
+    expect(output.join('\n')).toContain('Created secret: ha-creds');
+
+    rmSync(tmpDir, { recursive: true, force: true });
+  });
+
+  it('updates existing secrets', async () => {
+    vi.mocked(client.get).mockImplementation(async (url: string) => {
+      if (url === '/api/v1/secrets') return [{ id: 'sec-1', name: 'ha-creds' }];
+      return [];
+    });
+
+    const configPath = join(tmpDir, 'config.yaml');
+    writeFileSync(configPath, `
+secrets:
+  - name: ha-creds
+    data:
+      TOKEN: new-token
+`);
+
+    const cmd = createApplyCommand({ client, log });
+    await cmd.parseAsync([configPath], { from: 'user' });
+
+    expect(client.put).toHaveBeenCalledWith('/api/v1/secrets/sec-1', { data: { TOKEN: 'new-token' } });
+    expect(output.join('\n')).toContain('Updated secret: ha-creds');
+
+    rmSync(tmpDir, { recursive: true, force: true });
+  });
+
+  it('applies projects', async () => {
+    const configPath = join(tmpDir, 'config.yaml');
+    writeFileSync(configPath, `
+projects:
+  - name: my-project
+    description: A test project
+`);
+
+    const cmd = createApplyCommand({ client, log });
+    await cmd.parseAsync([configPath], { from: 'user' });
+
+    expect(client.post).toHaveBeenCalledWith('/api/v1/projects', expect.objectContaining({ name: 'my-project' }));
+    expect(output.join('\n')).toContain('Created project: my-project');
+
+    rmSync(tmpDir, { recursive: true, force: true });
+  });
+});

src/cli/tests/commands/auth.test.ts

@@ -0,0 +1,144 @@
+import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { mkdtempSync, rmSync } from 'node:fs';
+import { join } from 'node:path';
+import { tmpdir } from 'node:os';
+import { createLoginCommand, createLogoutCommand } from '../../src/commands/auth.js';
+import { saveCredentials, loadCredentials } from '../../src/auth/index.js';
+import { saveConfig, DEFAULT_CONFIG } from '../../src/config/index.js';
+
+let tempDir: string;
+let output: string[];
+
+function log(...args: string[]) {
+  output.push(args.join(' '));
+}
+
+beforeEach(() => {
+  tempDir = mkdtempSync(join(tmpdir(), 'mcpctl-auth-cmd-test-'));
+  output = [];
+});
+
+afterEach(() => {
+  rmSync(tempDir, { recursive: true, force: true });
+});
+
+describe('login command', () => {
+  it('stores credentials on successful login', async () => {
+    const cmd = createLoginCommand({
+      configDeps: { configDir: tempDir },
+      credentialsDeps: { configDir: tempDir },
+      prompt: {
+        input: async () => 'alice@test.com',
+        password: async () => 'secret123',
+      },
+      log,
+      loginRequest: async (_url, email, _password) => ({
+        token: 'session-token-123',
+        user: { email },
+      }),
+      logoutRequest: async () => {},
+    });
+    await cmd.parseAsync([], { from: 'user' });
+    expect(output[0]).toContain('Logged in as alice@test.com');
+
+    const creds = loadCredentials({ configDir: tempDir });
+    expect(creds).not.toBeNull();
+    expect(creds!.token).toBe('session-token-123');
+    expect(creds!.user).toBe('alice@test.com');
+  });
+
+  it('shows error on failed login', async () => {
+    const cmd = createLoginCommand({
+      configDeps: { configDir: tempDir },
+      credentialsDeps: { configDir: tempDir },
+      prompt: {
+        input: async () => 'alice@test.com',
+        password: async () => 'wrong',
+      },
+      log,
+      loginRequest: async () => { throw new Error('Invalid credentials'); },
+      logoutRequest: async () => {},
+    });
+    await cmd.parseAsync([], { from: 'user' });
+    expect(output[0]).toContain('Login failed');
+    expect(output[0]).toContain('Invalid credentials');
+
+    const creds = loadCredentials({ configDir: tempDir });
+    expect(creds).toBeNull();
+  });
+
+  it('uses mcpdUrl from config', async () => {
+    saveConfig({ ...DEFAULT_CONFIG, mcpdUrl: 'http://custom:3100' }, { configDir: tempDir });
+    let capturedUrl = '';
+    const cmd = createLoginCommand({
+      configDeps: { configDir: tempDir },
+      credentialsDeps: { configDir: tempDir },
+      prompt: {
+        input: async () => 'user@test.com',
+        password: async () => 'pass',
+      },
+      log,
+      loginRequest: async (url, email) => {
+        capturedUrl = url;
+        return { token: 'tok', user: { email } };
+      },
+      logoutRequest: async () => {},
+    });
+    await cmd.parseAsync([], { from: 'user' });
+    expect(capturedUrl).toBe('http://custom:3100');
+  });
+
+  it('allows --mcpd-url flag override', async () => {
+    let capturedUrl = '';
+    const cmd = createLoginCommand({
+      configDeps: { configDir: tempDir },
+      credentialsDeps: { configDir: tempDir },
+      prompt: {
+        input: async () => 'user@test.com',
+        password: async () => 'pass',
+      },
+      log,
+      loginRequest: async (url, email) => {
+        capturedUrl = url;
+        return { token: 'tok', user: { email } };
+      },
+      logoutRequest: async () => {},
+    });
+    await cmd.parseAsync(['--mcpd-url', 'http://override:3100'], { from: 'user' });
+    expect(capturedUrl).toBe('http://override:3100');
+  });
+});
+
+describe('logout command', () => {
+  it('removes credentials on logout', async () => {
+    saveCredentials({ token: 'tok', mcpdUrl: 'http://x:3100', user: 'alice' }, { configDir: tempDir });
+    let logoutCalled = false;
+    const cmd = createLogoutCommand({
+      configDeps: { configDir: tempDir },
+      credentialsDeps: { configDir: tempDir },
+      prompt: { input: async () => '', password: async () => '' },
+      log,
+      loginRequest: async () => ({ token: '', user: { email: '' } }),
+      logoutRequest: async () => { logoutCalled = true; },
+    });
+    await cmd.parseAsync([], { from: 'user' });
+    expect(output[0]).toContain('Logged out successfully');
+    expect(logoutCalled).toBe(true);
+
+    const creds = loadCredentials({ configDir: tempDir });
+    expect(creds).toBeNull();
+  });
+
+  it('shows not logged in when no credentials', async () => {
+    const cmd = createLogoutCommand({
+      configDeps: { configDir: tempDir },
+      credentialsDeps: { configDir: tempDir },
+      prompt: { input: async () => '', password: async () => '' },
+      log,
+      loginRequest: async () => ({ token: '', user: { email: '' } }),
+      logoutRequest: async () => {},
+    });
+    await cmd.parseAsync([], { from: 'user' });
+    expect(output[0]).toContain('Not logged in');
+  });
+});

src/cli/tests/commands/backup.test.ts

@@ -0,0 +1,120 @@
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import fs from 'node:fs';
+import { createBackupCommand, createRestoreCommand } from '../../src/commands/backup.js';
+
+const mockClient = {
+  get: vi.fn(),
+  post: vi.fn(),
+  put: vi.fn(),
+  delete: vi.fn(),
+};
+
+const log = vi.fn();
+
+describe('backup command', () => {
+  beforeEach(() => {
+    vi.resetAllMocks();
+  });
+
+  afterEach(() => {
+    // Clean up any created files
+    try { fs.unlinkSync('test-backup.json'); } catch { /* ignore */ }
+  });
+
+  it('creates backup command', () => {
+    const cmd = createBackupCommand({ client: mockClient as never, log });
+    expect(cmd.name()).toBe('backup');
+  });
+
+  it('calls API and writes file', async () => {
+    const bundle = { version: '1', servers: [], profiles: [], projects: [] };
+    mockClient.post.mockResolvedValue(bundle);
+
+    const cmd = createBackupCommand({ client: mockClient as never, log });
+    await cmd.parseAsync(['-o', 'test-backup.json'], { from: 'user' });
+
+    expect(mockClient.post).toHaveBeenCalledWith('/api/v1/backup', {});
+    expect(fs.existsSync('test-backup.json')).toBe(true);
+    expect(log).toHaveBeenCalledWith(expect.stringContaining('test-backup.json'));
+  });
+
+  it('passes password when provided', async () => {
+    mockClient.post.mockResolvedValue({ version: '1', servers: [], profiles: [], projects: [] });
+
+    const cmd = createBackupCommand({ client: mockClient as never, log });
+    await cmd.parseAsync(['-o', 'test-backup.json', '-p', 'secret'], { from: 'user' });
+
+    expect(mockClient.post).toHaveBeenCalledWith('/api/v1/backup', { password: 'secret' });
+  });
+
+  it('passes resource filter', async () => {
+    mockClient.post.mockResolvedValue({ version: '1', servers: [], profiles: [], projects: [] });
+
+    const cmd = createBackupCommand({ client: mockClient as never, log });
+    await cmd.parseAsync(['-o', 'test-backup.json', '-r', 'servers,profiles'], { from: 'user' });
+
+    expect(mockClient.post).toHaveBeenCalledWith('/api/v1/backup', {
+      resources: ['servers', 'profiles'],
+    });
+  });
+});
+
+describe('restore command', () => {
+  const testFile = 'test-restore-input.json';
+
+  beforeEach(() => {
+    vi.resetAllMocks();
+    fs.writeFileSync(testFile, JSON.stringify({
+      version: '1', servers: [], profiles: [], projects: [],
+    }));
+  });
+
+  afterEach(() => {
+    try { fs.unlinkSync(testFile); } catch { /* ignore */ }
+  });
+
+  it('creates restore command', () => {
+    const cmd = createRestoreCommand({ client: mockClient as never, log });
+    expect(cmd.name()).toBe('restore');
+  });
+
+  it('reads file and calls API', async () => {
+    mockClient.post.mockResolvedValue({
+      serversCreated: 1, serversSkipped: 0,
+      profilesCreated: 0, profilesSkipped: 0,
+      projectsCreated: 0, projectsSkipped: 0,
+      errors: [],
+    });
+
+    const cmd = createRestoreCommand({ client: mockClient as never, log });
+    await cmd.parseAsync(['-i', testFile], { from: 'user' });
+
+    expect(mockClient.post).toHaveBeenCalledWith('/api/v1/restore', expect.objectContaining({
+      bundle: expect.objectContaining({ version: '1' }),
+      conflictStrategy: 'skip',
+    }));
+    expect(log).toHaveBeenCalledWith('Restore complete:');
+  });
+
+  it('reports errors from restore', async () => {
+    mockClient.post.mockResolvedValue({
+      serversCreated: 0, serversSkipped: 0,
+      profilesCreated: 0, profilesSkipped: 0,
+      projectsCreated: 0, projectsSkipped: 0,
+      errors: ['Server "x" already exists'],
+    });
+
+    const cmd = createRestoreCommand({ client: mockClient as never, log });
+    await cmd.parseAsync(['-i', testFile], { from: 'user' });
+
+    expect(log).toHaveBeenCalledWith(expect.stringContaining('Errors'));
+  });
+
+  it('logs error for missing file', async () => {
+    const cmd = createRestoreCommand({ client: mockClient as never, log });
+    await cmd.parseAsync(['-i', 'nonexistent.json'], { from: 'user' });
+
+    expect(log).toHaveBeenCalledWith(expect.stringContaining('not found'));
+    expect(mockClient.post).not.toHaveBeenCalled();
+  });
+});

src/cli/tests/commands/claude.test.ts

@@ -0,0 +1,158 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { writeFileSync, readFileSync, mkdtempSync, rmSync } from 'node:fs';
+import { join } from 'node:path';
+import { tmpdir } from 'node:os';
+import { createClaudeCommand } from '../../src/commands/claude.js';
+import type { ApiClient } from '../../src/api-client.js';
+
+function mockClient(): ApiClient {
+  return {
+    get: vi.fn(async () => ({
+      mcpServers: {
+        'slack--default': { command: 'npx', args: ['-y', '@anthropic/slack-mcp'], env: { WORKSPACE: 'test' } },
+        'github--default': { command: 'npx', args: ['-y', '@anthropic/github-mcp'] },
+      },
+    })),
+    post: vi.fn(async () => ({})),
+    put: vi.fn(async () => ({})),
+    delete: vi.fn(async () => {}),
+  } as unknown as ApiClient;
+}
+
+describe('claude command', () => {
+  let client: ReturnType<typeof mockClient>;
+  let output: string[];
+  let tmpDir: string;
+  const log = (...args: unknown[]) => output.push(args.map(String).join(' '));
+
+  beforeEach(() => {
+    client = mockClient();
+    output = [];
+    tmpDir = mkdtempSync(join(tmpdir(), 'mcpctl-claude-'));
+  });
+
+  describe('generate', () => {
+    it('generates .mcp.json from project config', async () => {
+      const outPath = join(tmpDir, '.mcp.json');
+      const cmd = createClaudeCommand({ client, log });
+      await cmd.parseAsync(['generate', 'proj-1', '-o', outPath], { from: 'user' });
+
+      expect(client.get).toHaveBeenCalledWith('/api/v1/projects/proj-1/mcp-config');
+      const written = JSON.parse(readFileSync(outPath, 'utf-8'));
+      expect(written.mcpServers['slack--default']).toBeDefined();
+      expect(output.join('\n')).toContain('2 server(s)');
+
+      rmSync(tmpDir, { recursive: true, force: true });
+    });
+
+    it('prints to stdout with --stdout', async () => {
+      const cmd = createClaudeCommand({ client, log });
+      await cmd.parseAsync(['generate', 'proj-1', '--stdout'], { from: 'user' });
+
+      expect(output[0]).toContain('mcpServers');
+      rmSync(tmpDir, { recursive: true, force: true });
+    });
+
+    it('merges with existing .mcp.json', async () => {
+      const outPath = join(tmpDir, '.mcp.json');
+      writeFileSync(outPath, JSON.stringify({
+        mcpServers: { 'existing--server': { command: 'echo', args: [] } },
+      }));
+
+      const cmd = createClaudeCommand({ client, log });
+      await cmd.parseAsync(['generate', 'proj-1', '-o', outPath, '--merge'], { from: 'user' });
+
+      const written = JSON.parse(readFileSync(outPath, 'utf-8'));
+      expect(written.mcpServers['existing--server']).toBeDefined();
+      expect(written.mcpServers['slack--default']).toBeDefined();
+      expect(output.join('\n')).toContain('3 server(s)');
+
+      rmSync(tmpDir, { recursive: true, force: true });
+    });
+  });
+
+  describe('show', () => {
+    it('shows servers in .mcp.json', () => {
+      const filePath = join(tmpDir, '.mcp.json');
+      writeFileSync(filePath, JSON.stringify({
+        mcpServers: {
+          'slack': { command: 'npx', args: ['-y', '@anthropic/slack-mcp'], env: { TOKEN: 'x' } },
+        },
+      }));
+
+      const cmd = createClaudeCommand({ client, log });
+      cmd.parseAsync(['show', '-p', filePath], { from: 'user' });
+
+      expect(output.join('\n')).toContain('slack');
+      expect(output.join('\n')).toContain('npx -y @anthropic/slack-mcp');
+      expect(output.join('\n')).toContain('TOKEN');
+
+      rmSync(tmpDir, { recursive: true, force: true });
+    });
+
+    it('handles missing file', () => {
+      const cmd = createClaudeCommand({ client, log });
+      cmd.parseAsync(['show', '-p', join(tmpDir, 'nonexistent.json')], { from: 'user' });
+
+      expect(output.join('\n')).toContain('No .mcp.json found');
+      rmSync(tmpDir, { recursive: true, force: true });
+    });
+  });
+
+  describe('add', () => {
+    it('adds a server entry', () => {
+      const filePath = join(tmpDir, '.mcp.json');
+      const cmd = createClaudeCommand({ client, log });
+      cmd.parseAsync(['add', 'my-server', '-c', 'npx', '-a', '-y', 'my-pkg', '-p', filePath], { from: 'user' });
+
+      const written = JSON.parse(readFileSync(filePath, 'utf-8'));
+      expect(written.mcpServers['my-server']).toEqual({
+        command: 'npx',
+        args: ['-y', 'my-pkg'],
+      });
+
+      rmSync(tmpDir, { recursive: true, force: true });
+    });
+
+    it('adds server with env vars', () => {
+      const filePath = join(tmpDir, '.mcp.json');
+      const cmd = createClaudeCommand({ client, log });
+      cmd.parseAsync(['add', 'my-server', '-c', 'node', '-e', 'KEY=val', 'SECRET=abc', '-p', filePath], { from: 'user' });
+
+      const written = JSON.parse(readFileSync(filePath, 'utf-8'));
+      expect(written.mcpServers['my-server'].env).toEqual({ KEY: 'val', SECRET: 'abc' });
+
+      rmSync(tmpDir, { recursive: true, force: true });
+    });
+  });
+
+  describe('remove', () => {
+    it('removes a server entry', () => {
+      const filePath = join(tmpDir, '.mcp.json');
+      writeFileSync(filePath, JSON.stringify({
+        mcpServers: { 'slack': { command: 'npx', args: [] }, 'github': { command: 'npx', args: [] } },
+      }));
+
+      const cmd = createClaudeCommand({ client, log });
+      cmd.parseAsync(['remove', 'slack', '-p', filePath], { from: 'user' });
+
+      const written = JSON.parse(readFileSync(filePath, 'utf-8'));
+      expect(written.mcpServers['slack']).toBeUndefined();
+      expect(written.mcpServers['github']).toBeDefined();
+      expect(output.join('\n')).toContain("Removed 'slack'");
+
+      rmSync(tmpDir, { recursive: true, force: true });
+    });
+
+    it('reports when server not found', () => {
+      const filePath = join(tmpDir, '.mcp.json');
+      writeFileSync(filePath, JSON.stringify({ mcpServers: {} }));
+
+      const cmd = createClaudeCommand({ client, log });
+      cmd.parseAsync(['remove', 'nonexistent', '-p', filePath], { from: 'user' });
+
+      expect(output.join('\n')).toContain('not found');
+      rmSync(tmpDir, { recursive: true, force: true });
+    });
+  });
+});

src/cli/tests/commands/config.test.ts

@@ -34,23 +34,38 @@ describe('config view', () => {
     await cmd.parseAsync(['view'], { from: 'user' });
     expect(output).toHaveLength(1);
     const parsed = JSON.parse(output[0]) as Record<string, unknown>;
-    expect(parsed['daemonUrl']).toBe('http://localhost:3000');
+    expect(parsed['mcplocalUrl']).toBe('http://localhost:3200');
+    expect(parsed['mcpdUrl']).toBe('http://localhost:3100');
   });
 
   it('outputs config as YAML with --output yaml', async () => {
     const cmd = makeCommand();
     await cmd.parseAsync(['view', '-o', 'yaml'], { from: 'user' });
-    expect(output[0]).toContain('daemonUrl:');
+    expect(output[0]).toContain('mcplocalUrl:');
   });
 });
 
 describe('config set', () => {
-  it('sets a string value', async () => {
+  it('sets mcplocalUrl', async () => {
     const cmd = makeCommand();
-    await cmd.parseAsync(['set', 'daemonUrl', 'http://new:9000'], { from: 'user' });
-    expect(output[0]).toContain('daemonUrl');
+    await cmd.parseAsync(['set', 'mcplocalUrl', 'http://new:9000'], { from: 'user' });
+    expect(output[0]).toContain('mcplocalUrl');
     const config = loadConfig({ configDir: tempDir });
-    expect(config.daemonUrl).toBe('http://new:9000');
+    expect(config.mcplocalUrl).toBe('http://new:9000');
+  });
+
+  it('sets mcpdUrl', async () => {
+    const cmd = makeCommand();
+    await cmd.parseAsync(['set', 'mcpdUrl', 'http://remote:3100'], { from: 'user' });
+    const config = loadConfig({ configDir: tempDir });
+    expect(config.mcpdUrl).toBe('http://remote:3100');
+  });
+
+  it('maps daemonUrl to mcplocalUrl for backward compat', async () => {
+    const cmd = makeCommand();
+    await cmd.parseAsync(['set', 'daemonUrl', 'http://legacy:3000'], { from: 'user' });
+    const config = loadConfig({ configDir: tempDir });
+    expect(config.mcplocalUrl).toBe('http://legacy:3000');
   });
 
   it('sets cacheTTLMs as integer', async () => {
@@ -87,13 +102,13 @@ describe('config path', () => {
 describe('config reset', () => {
   it('resets to defaults', async () => {
     // First set a custom value
-    saveConfig({ ...DEFAULT_CONFIG, daemonUrl: 'http://custom' }, { configDir: tempDir });
+    saveConfig({ ...DEFAULT_CONFIG, mcplocalUrl: 'http://custom' }, { configDir: tempDir });
 
     const cmd = makeCommand();
     await cmd.parseAsync(['reset'], { from: 'user' });
     expect(output[0]).toContain('reset');
 
     const config = loadConfig({ configDir: tempDir });
-    expect(config.daemonUrl).toBe(DEFAULT_CONFIG.daemonUrl);
+    expect(config.mcplocalUrl).toBe(DEFAULT_CONFIG.mcplocalUrl);
   });
 });

src/cli/tests/commands/create.test.ts

@@ -0,0 +1,123 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { createCreateCommand } from '../../src/commands/create.js';
+import type { ApiClient } from '../../src/api-client.js';
+
+function mockClient(): ApiClient {
+  return {
+    get: vi.fn(async () => []),
+    post: vi.fn(async () => ({ id: 'new-id', name: 'test' })),
+    put: vi.fn(async () => ({})),
+    delete: vi.fn(async () => {}),
+  } as unknown as ApiClient;
+}
+
+describe('create command', () => {
+  let client: ReturnType<typeof mockClient>;
+  let output: string[];
+  const log = (...args: unknown[]) => output.push(args.map(String).join(' '));
+
+  beforeEach(() => {
+    client = mockClient();
+    output = [];
+  });
+
+  describe('create server', () => {
+    it('creates a server with minimal flags', async () => {
+      const cmd = createCreateCommand({ client, log });
+      await cmd.parseAsync(['server', 'my-server'], { from: 'user' });
+      expect(client.post).toHaveBeenCalledWith('/api/v1/servers', expect.objectContaining({
+        name: 'my-server',
+        transport: 'STDIO',
+        replicas: 1,
+      }));
+      expect(output.join('\n')).toContain("server 'test' created");
+    });
+
+    it('creates a server with all flags', async () => {
+      const cmd = createCreateCommand({ client, log });
+      await cmd.parseAsync([
+        'server', 'ha-mcp',
+        '-d', 'Home Assistant MCP',
+        '--docker-image', 'ghcr.io/ha-mcp:latest',
+        '--transport', 'STREAMABLE_HTTP',
+        '--external-url', 'http://localhost:8086/mcp',
+        '--container-port', '3000',
+        '--replicas', '2',
+        '--command', 'python',
+        '--command', '-c',
+        '--command', 'print("hello")',
+        '--env', 'API_KEY=secretRef:creds:API_KEY',
+        '--env', 'BASE_URL=http://localhost',
+      ], { from: 'user' });
+
+      expect(client.post).toHaveBeenCalledWith('/api/v1/servers', {
+        name: 'ha-mcp',
+        description: 'Home Assistant MCP',
+        dockerImage: 'ghcr.io/ha-mcp:latest',
+        transport: 'STREAMABLE_HTTP',
+        externalUrl: 'http://localhost:8086/mcp',
+        containerPort: 3000,
+        replicas: 2,
+        command: ['python', '-c', 'print("hello")'],
+        env: [
+          { name: 'API_KEY', valueFrom: { secretRef: { name: 'creds', key: 'API_KEY' } } },
+          { name: 'BASE_URL', value: 'http://localhost' },
+        ],
+      });
+    });
+
+    it('defaults transport to STDIO', async () => {
+      const cmd = createCreateCommand({ client, log });
+      await cmd.parseAsync(['server', 'test'], { from: 'user' });
+      expect(client.post).toHaveBeenCalledWith('/api/v1/servers', expect.objectContaining({
+        transport: 'STDIO',
+      }));
+    });
+  });
+
+  describe('create secret', () => {
+    it('creates a secret with --data flags', async () => {
+      const cmd = createCreateCommand({ client, log });
+      await cmd.parseAsync([
+        'secret', 'ha-creds',
+        '--data', 'TOKEN=abc123',
+        '--data', 'URL=https://ha.local',
+      ], { from: 'user' });
+      expect(client.post).toHaveBeenCalledWith('/api/v1/secrets', {
+        name: 'ha-creds',
+        data: { TOKEN: 'abc123', URL: 'https://ha.local' },
+      });
+      expect(output.join('\n')).toContain("secret 'test' created");
+    });
+
+    it('creates a secret with empty data', async () => {
+      const cmd = createCreateCommand({ client, log });
+      await cmd.parseAsync(['secret', 'empty-secret'], { from: 'user' });
+      expect(client.post).toHaveBeenCalledWith('/api/v1/secrets', {
+        name: 'empty-secret',
+        data: {},
+      });
+    });
+  });
+
+  describe('create project', () => {
+    it('creates a project', async () => {
+      const cmd = createCreateCommand({ client, log });
+      await cmd.parseAsync(['project', 'my-project', '-d', 'A test project'], { from: 'user' });
+      expect(client.post).toHaveBeenCalledWith('/api/v1/projects', {
+        name: 'my-project',
+        description: 'A test project',
+      });
+      expect(output.join('\n')).toContain("project 'test' created");
+    });
+
+    it('creates a project with no description', async () => {
+      const cmd = createCreateCommand({ client, log });
+      await cmd.parseAsync(['project', 'minimal'], { from: 'user' });
+      expect(client.post).toHaveBeenCalledWith('/api/v1/projects', {
+        name: 'minimal',
+        description: '',
+      });
+    });
+  });
+});

src/cli/tests/commands/describe.test.ts

@@ -0,0 +1,142 @@
+import { describe, it, expect, vi } from 'vitest';
+import { createDescribeCommand } from '../../src/commands/describe.js';
+import type { DescribeCommandDeps } from '../../src/commands/describe.js';
+import type { ApiClient } from '../../src/api-client.js';
+
+function mockClient(): ApiClient {
+  return {
+    get: vi.fn(async () => []),
+    post: vi.fn(async () => ({})),
+    put: vi.fn(async () => ({})),
+    delete: vi.fn(async () => {}),
+  } as unknown as ApiClient;
+}
+
+function makeDeps(item: unknown = {}): DescribeCommandDeps & { output: string[] } {
+  const output: string[] = [];
+  return {
+    output,
+    client: mockClient(),
+    fetchResource: vi.fn(async () => item),
+    log: (...args: string[]) => output.push(args.join(' ')),
+  };
+}
+
+describe('describe command', () => {
+  it('shows detailed server info with sections', async () => {
+    const deps = makeDeps({
+      id: 'srv-1',
+      name: 'slack',
+      transport: 'STDIO',
+      packageName: '@slack/mcp',
+      dockerImage: null,
+      env: [],
+      createdAt: '2025-01-01',
+    });
+    const cmd = createDescribeCommand(deps);
+    await cmd.parseAsync(['node', 'test', 'server', 'srv-1']);
+
+    expect(deps.fetchResource).toHaveBeenCalledWith('servers', 'srv-1');
+    const text = deps.output.join('\n');
+    expect(text).toContain('=== Server: slack ===');
+    expect(text).toContain('Name:');
+    expect(text).toContain('slack');
+    expect(text).toContain('Transport:');
+    expect(text).toContain('STDIO');
+    expect(text).toContain('Package:');
+    expect(text).toContain('@slack/mcp');
+    expect(text).toContain('Metadata:');
+    expect(text).toContain('ID:');
+  });
+
+  it('resolves resource aliases', async () => {
+    const deps = makeDeps({ id: 's1' });
+    const cmd = createDescribeCommand(deps);
+    await cmd.parseAsync(['node', 'test', 'sec', 's1']);
+    expect(deps.fetchResource).toHaveBeenCalledWith('secrets', 's1');
+  });
+
+  it('outputs JSON format', async () => {
+    const deps = makeDeps({ id: 'srv-1', name: 'slack' });
+    const cmd = createDescribeCommand(deps);
+    await cmd.parseAsync(['node', 'test', 'server', 'srv-1', '-o', 'json']);
+
+    const parsed = JSON.parse(deps.output[0] ?? '');
+    expect(parsed.name).toBe('slack');
+  });
+
+  it('outputs YAML format', async () => {
+    const deps = makeDeps({ id: 'srv-1', name: 'slack' });
+    const cmd = createDescribeCommand(deps);
+    await cmd.parseAsync(['node', 'test', 'server', 'srv-1', '-o', 'yaml']);
+    expect(deps.output[0]).toContain('name: slack');
+  });
+
+  it('shows project detail', async () => {
+    const deps = makeDeps({
+      id: 'proj-1',
+      name: 'my-project',
+      description: 'A test project',
+      ownerId: 'user-1',
+      createdAt: '2025-01-01',
+    });
+    const cmd = createDescribeCommand(deps);
+    await cmd.parseAsync(['node', 'test', 'project', 'proj-1']);
+
+    const text = deps.output.join('\n');
+    expect(text).toContain('=== Project: my-project ===');
+    expect(text).toContain('A test project');
+    expect(text).toContain('user-1');
+  });
+
+  it('shows secret detail with masked values', async () => {
+    const deps = makeDeps({
+      id: 'sec-1',
+      name: 'ha-creds',
+      data: { TOKEN: 'abc123', URL: 'https://ha.local' },
+      createdAt: '2025-01-01',
+    });
+    const cmd = createDescribeCommand(deps);
+    await cmd.parseAsync(['node', 'test', 'secret', 'sec-1']);
+
+    const text = deps.output.join('\n');
+    expect(text).toContain('=== Secret: ha-creds ===');
+    expect(text).toContain('TOKEN');
+    expect(text).toContain('***');
+    expect(text).not.toContain('abc123');
+    expect(text).toContain('use --show-values to reveal');
+  });
+
+  it('shows secret detail with revealed values when --show-values', async () => {
+    const deps = makeDeps({
+      id: 'sec-1',
+      name: 'ha-creds',
+      data: { TOKEN: 'abc123' },
+      createdAt: '2025-01-01',
+    });
+    const cmd = createDescribeCommand(deps);
+    await cmd.parseAsync(['node', 'test', 'secret', 'sec-1', '--show-values']);
+
+    const text = deps.output.join('\n');
+    expect(text).toContain('abc123');
+    expect(text).not.toContain('***');
+  });
+
+  it('shows instance detail with container info', async () => {
+    const deps = makeDeps({
+      id: 'inst-1',
+      serverId: 'srv-1',
+      status: 'RUNNING',
+      containerId: 'abc123',
+      port: 3000,
+      createdAt: '2025-01-01',
+    });
+    const cmd = createDescribeCommand(deps);
+    await cmd.parseAsync(['node', 'test', 'instance', 'inst-1']);
+
+    const text = deps.output.join('\n');
+    expect(text).toContain('=== Instance: inst-1 ===');
+    expect(text).toContain('RUNNING');
+    expect(text).toContain('abc123');
+  });
+});

src/cli/tests/commands/edit.test.ts

@@ -0,0 +1,153 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { readFileSync, writeFileSync } from 'node:fs';
+import yaml from 'js-yaml';
+import { createEditCommand } from '../../src/commands/edit.js';
+import type { ApiClient } from '../../src/api-client.js';
+
+function mockClient(): ApiClient {
+  return {
+    get: vi.fn(async () => ({})),
+    post: vi.fn(async () => ({})),
+    put: vi.fn(async () => ({})),
+    delete: vi.fn(async () => {}),
+  } as unknown as ApiClient;
+}
+
+describe('edit command', () => {
+  let client: ReturnType<typeof mockClient>;
+  let output: string[];
+  const log = (...args: unknown[]) => output.push(args.map(String).join(' '));
+
+  beforeEach(() => {
+    client = mockClient();
+    output = [];
+  });
+
+  it('fetches server, opens editor, applies changes on save', async () => {
+    // GET /api/v1/servers returns list for resolveNameOrId
+    vi.mocked(client.get).mockImplementation(async (path: string) => {
+      if (path === '/api/v1/servers') {
+        return [{ id: 'srv-1', name: 'ha-mcp' }];
+      }
+      // GET /api/v1/servers/srv-1 returns full server
+      return {
+        id: 'srv-1',
+        name: 'ha-mcp',
+        description: 'Old desc',
+        transport: 'STDIO',
+        replicas: 1,
+        createdAt: '2025-01-01',
+        updatedAt: '2025-01-01',
+        version: 1,
+      };
+    });
+
+    const cmd = createEditCommand({
+      client,
+      log,
+      getEditor: () => 'vi',
+      openEditor: (filePath) => {
+        // Simulate user editing the file
+        const content = readFileSync(filePath, 'utf-8');
+        const modified = content
+          .replace('Old desc', 'New desc')
+          .replace('replicas: 1', 'replicas: 3');
+        writeFileSync(filePath, modified, 'utf-8');
+      },
+    });
+
+    await cmd.parseAsync(['server', 'ha-mcp'], { from: 'user' });
+
+    expect(client.put).toHaveBeenCalledWith('/api/v1/servers/srv-1', expect.objectContaining({
+      description: 'New desc',
+      replicas: 3,
+    }));
+    expect(output.join('\n')).toContain("server 'ha-mcp' updated");
+  });
+
+  it('detects no changes and skips PUT', async () => {
+    vi.mocked(client.get).mockImplementation(async (path: string) => {
+      if (path === '/api/v1/servers') return [{ id: 'srv-1', name: 'test' }];
+      return {
+        id: 'srv-1', name: 'test', description: '', transport: 'STDIO',
+        createdAt: '2025-01-01', updatedAt: '2025-01-01', version: 1,
+      };
+    });
+
+    const cmd = createEditCommand({
+      client,
+      log,
+      getEditor: () => 'vi',
+      openEditor: () => {
+        // Don't modify the file
+      },
+    });
+
+    await cmd.parseAsync(['server', 'test'], { from: 'user' });
+
+    expect(client.put).not.toHaveBeenCalled();
+    expect(output.join('\n')).toContain("unchanged");
+  });
+
+  it('handles empty file as cancel', async () => {
+    vi.mocked(client.get).mockImplementation(async (path: string) => {
+      if (path === '/api/v1/servers') return [{ id: 'srv-1', name: 'test' }];
+      return { id: 'srv-1', name: 'test', createdAt: '2025-01-01', updatedAt: '2025-01-01', version: 1 };
+    });
+
+    const cmd = createEditCommand({
+      client,
+      log,
+      getEditor: () => 'vi',
+      openEditor: (filePath) => {
+        writeFileSync(filePath, '', 'utf-8');
+      },
+    });
+
+    await cmd.parseAsync(['server', 'test'], { from: 'user' });
+
+    expect(client.put).not.toHaveBeenCalled();
+    expect(output.join('\n')).toContain('cancelled');
+  });
+
+  it('strips read-only fields from editor content', async () => {
+    vi.mocked(client.get).mockImplementation(async (path: string) => {
+      if (path === '/api/v1/servers') return [{ id: 'srv-1', name: 'test' }];
+      return {
+        id: 'srv-1', name: 'test', description: '', transport: 'STDIO',
+        createdAt: '2025-01-01', updatedAt: '2025-01-01', version: 1,
+      };
+    });
+
+    let editorContent = '';
+    const cmd = createEditCommand({
+      client,
+      log,
+      getEditor: () => 'vi',
+      openEditor: (filePath) => {
+        editorContent = readFileSync(filePath, 'utf-8');
+      },
+    });
+
+    await cmd.parseAsync(['server', 'test'], { from: 'user' });
+
+    // The editor content should NOT contain read-only fields
+    expect(editorContent).not.toContain('id:');
+    expect(editorContent).not.toContain('createdAt');
+    expect(editorContent).not.toContain('updatedAt');
+    expect(editorContent).not.toContain('version');
+    // But should contain editable fields
+    expect(editorContent).toContain('name:');
+  });
+
+  it('rejects edit instance with error message', async () => {
+    const cmd = createEditCommand({ client, log });
+
+    await cmd.parseAsync(['instance', 'inst-1'], { from: 'user' });
+
+    expect(client.get).not.toHaveBeenCalled();
+    expect(client.put).not.toHaveBeenCalled();
+    expect(output.join('\n')).toContain('immutable');
+  });
+
+});

src/cli/tests/commands/get.test.ts

@@ -0,0 +1,86 @@
+import { describe, it, expect, vi } from 'vitest';
+import { createGetCommand } from '../../src/commands/get.js';
+import type { GetCommandDeps } from '../../src/commands/get.js';
+
+function makeDeps(items: unknown[] = []): GetCommandDeps & { output: string[] } {
+  const output: string[] = [];
+  return {
+    output,
+    fetchResource: vi.fn(async () => items),
+    log: (...args: string[]) => output.push(args.join(' ')),
+  };
+}
+
+describe('get command', () => {
+  it('lists servers in table format', async () => {
+    const deps = makeDeps([
+      { id: 'srv-1', name: 'slack', transport: 'STDIO', packageName: '@slack/mcp', dockerImage: null },
+      { id: 'srv-2', name: 'github', transport: 'SSE', packageName: null, dockerImage: 'ghcr.io/github-mcp' },
+    ]);
+    const cmd = createGetCommand(deps);
+    await cmd.parseAsync(['node', 'test', 'servers']);
+
+    expect(deps.fetchResource).toHaveBeenCalledWith('servers', undefined);
+    expect(deps.output[0]).toContain('NAME');
+    expect(deps.output[0]).toContain('TRANSPORT');
+    expect(deps.output.join('\n')).toContain('slack');
+    expect(deps.output.join('\n')).toContain('github');
+  });
+
+  it('resolves resource aliases', async () => {
+    const deps = makeDeps([]);
+    const cmd = createGetCommand(deps);
+    await cmd.parseAsync(['node', 'test', 'srv']);
+    expect(deps.fetchResource).toHaveBeenCalledWith('servers', undefined);
+  });
+
+  it('passes ID when provided', async () => {
+    const deps = makeDeps([{ id: 'srv-1', name: 'slack' }]);
+    const cmd = createGetCommand(deps);
+    await cmd.parseAsync(['node', 'test', 'servers', 'srv-1']);
+    expect(deps.fetchResource).toHaveBeenCalledWith('servers', 'srv-1');
+  });
+
+  it('outputs apply-compatible JSON format', async () => {
+    const deps = makeDeps([{ id: 'srv-1', name: 'slack', createdAt: '2025-01-01', updatedAt: '2025-01-01', version: 1 }]);
+    const cmd = createGetCommand(deps);
+    await cmd.parseAsync(['node', 'test', 'servers', '-o', 'json']);
+
+    const parsed = JSON.parse(deps.output[0] ?? '');
+    // Wrapped in resource key, internal fields stripped
+    expect(parsed).toHaveProperty('servers');
+    expect(parsed.servers[0].name).toBe('slack');
+    expect(parsed.servers[0]).not.toHaveProperty('id');
+    expect(parsed.servers[0]).not.toHaveProperty('createdAt');
+    expect(parsed.servers[0]).not.toHaveProperty('updatedAt');
+    expect(parsed.servers[0]).not.toHaveProperty('version');
+  });
+
+  it('outputs apply-compatible YAML format', async () => {
+    const deps = makeDeps([{ id: 'srv-1', name: 'slack', createdAt: '2025-01-01' }]);
+    const cmd = createGetCommand(deps);
+    await cmd.parseAsync(['node', 'test', 'servers', '-o', 'yaml']);
+    const text = deps.output[0];
+    expect(text).toContain('servers:');
+    expect(text).toContain('name: slack');
+    expect(text).not.toContain('id:');
+    expect(text).not.toContain('createdAt:');
+  });
+
+  it('lists instances with correct columns', async () => {
+    const deps = makeDeps([
+      { id: 'inst-1', serverId: 'srv-1', status: 'RUNNING', containerId: 'abc123def456', port: 3000 },
+    ]);
+    const cmd = createGetCommand(deps);
+    await cmd.parseAsync(['node', 'test', 'instances']);
+    expect(deps.output[0]).toContain('STATUS');
+    expect(deps.output.join('\n')).toContain('RUNNING');
+  });
+
+  it('shows no results message for empty list', async () => {
+    const deps = makeDeps([]);
+    const cmd = createGetCommand(deps);
+    await cmd.parseAsync(['node', 'test', 'servers']);
+    expect(deps.output[0]).toContain('No servers found');
+  });
+});

src/cli/tests/commands/instances.test.ts

@@ -0,0 +1,85 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { createDeleteCommand } from '../../src/commands/delete.js';
+import { createLogsCommand } from '../../src/commands/logs.js';
+import type { ApiClient } from '../../src/api-client.js';
+
+function mockClient(): ApiClient {
+  return {
+    get: vi.fn(async () => []),
+    post: vi.fn(async () => ({})),
+    put: vi.fn(async () => ({})),
+    delete: vi.fn(async () => {}),
+  } as unknown as ApiClient;
+}
+
+describe('delete command', () => {
+  let client: ReturnType<typeof mockClient>;
+  let output: string[];
+  const log = (...args: unknown[]) => output.push(args.map(String).join(' '));
+
+  beforeEach(() => {
+    client = mockClient();
+    output = [];
+  });
+
+  it('deletes an instance by ID', async () => {
+    const cmd = createDeleteCommand({ client, log });
+    await cmd.parseAsync(['instance', 'inst-1'], { from: 'user' });
+    expect(client.delete).toHaveBeenCalledWith('/api/v1/instances/inst-1');
+    expect(output.join('\n')).toContain('deleted');
+  });
+
+  it('deletes a server by ID', async () => {
+    const cmd = createDeleteCommand({ client, log });
+    await cmd.parseAsync(['server', 'srv-1'], { from: 'user' });
+    expect(client.delete).toHaveBeenCalledWith('/api/v1/servers/srv-1');
+    expect(output.join('\n')).toContain('deleted');
+  });
+
+  it('resolves server name to ID', async () => {
+    vi.mocked(client.get).mockResolvedValue([
+      { id: 'srv-abc', name: 'ha-mcp' },
+    ]);
+    const cmd = createDeleteCommand({ client, log });
+    await cmd.parseAsync(['server', 'ha-mcp'], { from: 'user' });
+    expect(client.delete).toHaveBeenCalledWith('/api/v1/servers/srv-abc');
+  });
+
+  it('deletes a project', async () => {
+    const cmd = createDeleteCommand({ client, log });
+    await cmd.parseAsync(['project', 'proj-1'], { from: 'user' });
+    expect(client.delete).toHaveBeenCalledWith('/api/v1/projects/proj-1');
+  });
+
+  it('accepts resource aliases', async () => {
+    const cmd = createDeleteCommand({ client, log });
+    await cmd.parseAsync(['srv', 'srv-1'], { from: 'user' });
+    expect(client.delete).toHaveBeenCalledWith('/api/v1/servers/srv-1');
+  });
+});
+
+describe('logs command', () => {
+  let client: ReturnType<typeof mockClient>;
+  let output: string[];
+  const log = (...args: unknown[]) => output.push(args.map(String).join(' '));
+
+  beforeEach(() => {
+    client = mockClient();
+    output = [];
+  });
+
+  it('shows logs', async () => {
+    vi.mocked(client.get).mockResolvedValue({ stdout: 'hello world\n', stderr: '' });
+    const cmd = createLogsCommand({ client, log });
+    await cmd.parseAsync(['inst-1'], { from: 'user' });
+    expect(client.get).toHaveBeenCalledWith('/api/v1/instances/inst-1/logs');
+    expect(output.join('\n')).toContain('hello world');
+  });
+
+  it('passes tail option', async () => {
+    vi.mocked(client.get).mockResolvedValue({ stdout: '', stderr: '' });
+    const cmd = createLogsCommand({ client, log });
+    await cmd.parseAsync(['inst-1', '-t', '50'], { from: 'user' });
+    expect(client.get).toHaveBeenCalledWith('/api/v1/instances/inst-1/logs?tail=50');
+  });
+});

src/cli/tests/commands/project.test.ts

@@ -0,0 +1,29 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { createProjectCommand } from '../../src/commands/project.js';
+import type { ApiClient } from '../../src/api-client.js';
+
+function mockClient(): ApiClient {
+  return {
+    get: vi.fn(async () => []),
+    post: vi.fn(async () => ({ id: 'proj-1', name: 'my-project' })),
+    put: vi.fn(async () => ({})),
+    delete: vi.fn(async () => {}),
+  } as unknown as ApiClient;
+}
+
+describe('project command', () => {
+  let client: ReturnType<typeof mockClient>;
+  let output: string[];
+  const log = (...args: unknown[]) => output.push(args.map(String).join(' '));
+
+  beforeEach(() => {
+    client = mockClient();
+    output = [];
+  });
+
+  it('creates command with alias', () => {
+    const cmd = createProjectCommand({ client, log });
+    expect(cmd.name()).toBe('project');
+    expect(cmd.alias()).toBe('proj');
+  });
+});

src/cli/tests/commands/status.test.ts

@@ -4,6 +4,7 @@ import { join } from 'node:path';
 import { tmpdir } from 'node:os';
 import { createStatusCommand } from '../../src/commands/status.js';
 import { saveConfig, DEFAULT_CONFIG } from '../../src/config/index.js';
+import { saveCredentials } from '../../src/auth/index.js';
 
 let tempDir: string;
 let output: string[];
@@ -25,67 +26,101 @@ describe('status command', () => {
   it('shows status in table format', async () => {
     const cmd = createStatusCommand({
       configDeps: { configDir: tempDir },
+      credentialsDeps: { configDir: tempDir },
       log,
-      checkDaemon: async () => true,
+      checkHealth: async () => true,
     });
     await cmd.parseAsync([], { from: 'user' });
-    expect(output.join('\n')).toContain('mcpctl v');
-    expect(output.join('\n')).toContain('connected');
+    const out = output.join('\n');
+    expect(out).toContain('mcpctl v');
+    expect(out).toContain('mcplocal:');
+    expect(out).toContain('mcpd:');
+    expect(out).toContain('connected');
   });
 
-  it('shows unreachable when daemon is down', async () => {
+  it('shows unreachable when daemons are down', async () => {
     const cmd = createStatusCommand({
       configDeps: { configDir: tempDir },
+      credentialsDeps: { configDir: tempDir },
       log,
-      checkDaemon: async () => false,
+      checkHealth: async () => false,
     });
     await cmd.parseAsync([], { from: 'user' });
     expect(output.join('\n')).toContain('unreachable');
   });
 
+  it('shows not logged in when no credentials', async () => {
+    const cmd = createStatusCommand({
+      configDeps: { configDir: tempDir },
+      credentialsDeps: { configDir: tempDir },
+      log,
+      checkHealth: async () => true,
+    });
+    await cmd.parseAsync([], { from: 'user' });
+    expect(output.join('\n')).toContain('not logged in');
+  });
+
+  it('shows logged in user when credentials exist', async () => {
+    saveCredentials({ token: 'tok', mcpdUrl: 'http://x:3100', user: 'alice@example.com' }, { configDir: tempDir });
+    const cmd = createStatusCommand({
+      configDeps: { configDir: tempDir },
+      credentialsDeps: { configDir: tempDir },
+      log,
+      checkHealth: async () => true,
+    });
+    await cmd.parseAsync([], { from: 'user' });
+    expect(output.join('\n')).toContain('logged in as alice@example.com');
+  });
+
   it('shows status in JSON format', async () => {
     const cmd = createStatusCommand({
       configDeps: { configDir: tempDir },
+      credentialsDeps: { configDir: tempDir },
       log,
-      checkDaemon: async () => true,
+      checkHealth: async () => true,
     });
     await cmd.parseAsync(['-o', 'json'], { from: 'user' });
     const parsed = JSON.parse(output[0]) as Record<string, unknown>;
     expect(parsed['version']).toBe('0.1.0');
-    expect(parsed['daemonReachable']).toBe(true);
+    expect(parsed['mcplocalReachable']).toBe(true);
+    expect(parsed['mcpdReachable']).toBe(true);
   });
 
   it('shows status in YAML format', async () => {
     const cmd = createStatusCommand({
       configDeps: { configDir: tempDir },
+      credentialsDeps: { configDir: tempDir },
       log,
-      checkDaemon: async () => false,
+      checkHealth: async () => false,
     });
     await cmd.parseAsync(['-o', 'yaml'], { from: 'user' });
-    expect(output[0]).toContain('daemonReachable: false');
+    expect(output[0]).toContain('mcplocalReachable: false');
   });
 
-  it('uses custom daemon URL from config', async () => {
-    saveConfig({ ...DEFAULT_CONFIG, daemonUrl: 'http://custom:5555' }, { configDir: tempDir });
-    let checkedUrl = '';
+  it('checks correct URLs from config', async () => {
+    saveConfig({ ...DEFAULT_CONFIG, mcplocalUrl: 'http://local:3200', mcpdUrl: 'http://remote:3100' }, { configDir: tempDir });
+    const checkedUrls: string[] = [];
     const cmd = createStatusCommand({
       configDeps: { configDir: tempDir },
+      credentialsDeps: { configDir: tempDir },
       log,
-      checkDaemon: async (url) => {
-        checkedUrl = url;
+      checkHealth: async (url) => {
+        checkedUrls.push(url);
         return false;
       },
     });
     await cmd.parseAsync([], { from: 'user' });
-    expect(checkedUrl).toBe('http://custom:5555');
+    expect(checkedUrls).toContain('http://local:3200');
+    expect(checkedUrls).toContain('http://remote:3100');
   });
 
   it('shows registries from config', async () => {
     saveConfig({ ...DEFAULT_CONFIG, registries: ['official'] }, { configDir: tempDir });
     const cmd = createStatusCommand({
       configDeps: { configDir: tempDir },
+      credentialsDeps: { configDir: tempDir },
       log,
-      checkDaemon: async () => true,
+      checkHealth: async () => true,
     });
     await cmd.parseAsync([], { from: 'user' });
     expect(output.join('\n')).toContain('official');

src/cli/tests/config/loader.test.ts

@@ -28,18 +28,25 @@ describe('loadConfig', () => {
   });
 
   it('loads config from file', () => {
-    saveConfig({ ...DEFAULT_CONFIG, daemonUrl: 'http://custom:5000' }, { configDir: tempDir });
+    saveConfig({ ...DEFAULT_CONFIG, mcplocalUrl: 'http://custom:5000' }, { configDir: tempDir });
     const config = loadConfig({ configDir: tempDir });
-    expect(config.daemonUrl).toBe('http://custom:5000');
+    expect(config.mcplocalUrl).toBe('http://custom:5000');
   });
 
   it('applies defaults for missing fields', () => {
     const { writeFileSync } = require('node:fs') as typeof import('node:fs');
-    writeFileSync(join(tempDir, 'config.json'), '{"daemonUrl":"http://x:1"}');
+    writeFileSync(join(tempDir, 'config.json'), '{"mcplocalUrl":"http://x:1"}');
     const config = loadConfig({ configDir: tempDir });
-    expect(config.daemonUrl).toBe('http://x:1');
+    expect(config.mcplocalUrl).toBe('http://x:1');
     expect(config.registries).toEqual(['official', 'glama', 'smithery']);
   });
+
+  it('backward compat: daemonUrl maps to mcplocalUrl', () => {
+    const { writeFileSync } = require('node:fs') as typeof import('node:fs');
+    writeFileSync(join(tempDir, 'config.json'), '{"daemonUrl":"http://old:3000"}');
+    const config = loadConfig({ configDir: tempDir });
+    expect(config.mcplocalUrl).toBe('http://old:3000');
+  });
 });
 
 describe('saveConfig', () => {
@@ -57,7 +64,7 @@ describe('saveConfig', () => {
   it('round-trips configuration', () => {
     const custom = {
       ...DEFAULT_CONFIG,
-      daemonUrl: 'http://custom:9000',
+      mcplocalUrl: 'http://custom:9000',
       registries: ['official' as const],
       outputFormat: 'json' as const,
     };
@@ -70,14 +77,14 @@ describe('saveConfig', () => {
 describe('mergeConfig', () => {
   it('merges overrides into existing config', () => {
     saveConfig(DEFAULT_CONFIG, { configDir: tempDir });
-    const merged = mergeConfig({ daemonUrl: 'http://new:1234' }, { configDir: tempDir });
-    expect(merged.daemonUrl).toBe('http://new:1234');
+    const merged = mergeConfig({ mcplocalUrl: 'http://new:1234' }, { configDir: tempDir });
+    expect(merged.mcplocalUrl).toBe('http://new:1234');
     expect(merged.registries).toEqual(DEFAULT_CONFIG.registries);
   });
 
   it('works when no config file exists', () => {
     const merged = mergeConfig({ outputFormat: 'yaml' }, { configDir: tempDir });
     expect(merged.outputFormat).toBe('yaml');
-    expect(merged.daemonUrl).toBe('http://localhost:3000');
+    expect(merged.mcplocalUrl).toBe('http://localhost:3200');
   });
 });

src/cli/tests/config/schema.test.ts

@@ -4,7 +4,8 @@ import { McpctlConfigSchema, DEFAULT_CONFIG } from '../../src/config/schema.js';
 describe('McpctlConfigSchema', () => {
   it('provides sensible defaults from empty object', () => {
     const config = McpctlConfigSchema.parse({});
-    expect(config.daemonUrl).toBe('http://localhost:3000');
+    expect(config.mcplocalUrl).toBe('http://localhost:3200');
+    expect(config.mcpdUrl).toBe('http://localhost:3100');
     expect(config.registries).toEqual(['official', 'glama', 'smithery']);
     expect(config.cacheTTLMs).toBe(3_600_000);
     expect(config.outputFormat).toBe('table');
@@ -15,7 +16,8 @@ describe('McpctlConfigSchema', () => {
 
   it('validates a full config', () => {
     const config = McpctlConfigSchema.parse({
-      daemonUrl: 'http://custom:4000',
+      mcplocalUrl: 'http://local:3200',
+      mcpdUrl: 'http://custom:4000',
       registries: ['official'],
       cacheTTLMs: 60_000,
       httpProxy: 'http://proxy:8080',
@@ -23,11 +25,26 @@ describe('McpctlConfigSchema', () => {
       outputFormat: 'json',
       smitheryApiKey: 'sk-test',
     });
-    expect(config.daemonUrl).toBe('http://custom:4000');
+    expect(config.mcplocalUrl).toBe('http://local:3200');
+    expect(config.mcpdUrl).toBe('http://custom:4000');
     expect(config.registries).toEqual(['official']);
     expect(config.outputFormat).toBe('json');
   });
 
+  it('backward compat: maps daemonUrl to mcplocalUrl', () => {
+    const config = McpctlConfigSchema.parse({ daemonUrl: 'http://legacy:3000' });
+    expect(config.mcplocalUrl).toBe('http://legacy:3000');
+    expect(config.mcpdUrl).toBe('http://localhost:3100');
+  });
+
+  it('mcplocalUrl takes precedence over daemonUrl', () => {
+    const config = McpctlConfigSchema.parse({
+      daemonUrl: 'http://legacy:3000',
+      mcplocalUrl: 'http://explicit:3200',
+    });
+    expect(config.mcplocalUrl).toBe('http://explicit:3200');
+  });
+
   it('rejects invalid registry names', () => {
     expect(() => McpctlConfigSchema.parse({ registries: ['invalid'] })).toThrow();
   });

src/cli/tests/e2e/cli-commands.test.ts

@@ -0,0 +1,67 @@
+import { describe, it, expect } from 'vitest';
+import { createProgram } from '../../src/index.js';
+
+/**
+ * End-to-end tests that verify CLI command registration and help output
+ * without requiring a running daemon.
+ */
+describe('CLI command registration (e2e)', () => {
+  it('program has all expected commands', () => {
+    const program = createProgram();
+    const commandNames = program.commands.map((c) => c.name());
+
+    expect(commandNames).toContain('config');
+    expect(commandNames).toContain('status');
+    expect(commandNames).toContain('login');
+    expect(commandNames).toContain('logout');
+    expect(commandNames).toContain('get');
+    expect(commandNames).toContain('describe');
+    expect(commandNames).toContain('delete');
+    expect(commandNames).toContain('logs');
+    expect(commandNames).toContain('apply');
+    expect(commandNames).toContain('create');
+    expect(commandNames).toContain('edit');
+    expect(commandNames).toContain('claude');
+    expect(commandNames).toContain('project');
+    expect(commandNames).toContain('backup');
+    expect(commandNames).toContain('restore');
+  });
+
+  it('instance command is removed (use get/delete/logs instead)', () => {
+    const program = createProgram();
+    const commandNames = program.commands.map((c) => c.name());
+    expect(commandNames).not.toContain('instance');
+  });
+
+  it('claude command has config management subcommands', () => {
+    const program = createProgram();
+    const claude = program.commands.find((c) => c.name() === 'claude');
+    expect(claude).toBeDefined();
+
+    const subcommands = claude!.commands.map((c) => c.name());
+    expect(subcommands).toContain('generate');
+    expect(subcommands).toContain('show');
+    expect(subcommands).toContain('add');
+    expect(subcommands).toContain('remove');
+  });
+
+  it('project command exists with alias', () => {
+    const program = createProgram();
+    const project = program.commands.find((c) => c.name() === 'project');
+    expect(project).toBeDefined();
+    expect(project!.alias()).toBe('proj');
+  });
+
+  it('displays version', () => {
+    const program = createProgram();
+    expect(program.version()).toBeDefined();
+    expect(program.version()).toMatch(/^\d+\.\d+\.\d+$/);
+  });
+
+  it('displays help without error', () => {
+    const program = createProgram();
+    const helpText = program.helpInformation();
+    expect(helpText).toContain('mcpctl');
+    expect(helpText).toContain('Manage MCP servers');
+  });
+});

src/cli/tests/registry/cache.test.ts

@@ -0,0 +1,90 @@
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { RegistryCache } from '../../src/registry/cache.js';
+import type { RegistryServer, SearchOptions } from '../../src/registry/types.js';
+
+function makeServer(name: string): RegistryServer {
+  return {
+    name,
+    description: `${name} server`,
+    packages: {},
+    envTemplate: [],
+    transport: 'stdio',
+    popularityScore: 0,
+    verified: false,
+    sourceRegistry: 'official',
+  };
+}
+
+const defaultOptions: SearchOptions = { query: 'test' };
+
+describe('RegistryCache', () => {
+  beforeEach(() => {
+    vi.useFakeTimers();
+  });
+  afterEach(() => {
+    vi.useRealTimers();
+  });
+
+  it('returns null for cache miss', () => {
+    const cache = new RegistryCache();
+    expect(cache.get('unknown', defaultOptions)).toBeNull();
+  });
+
+  it('returns data for cache hit within TTL', () => {
+    const cache = new RegistryCache();
+    const data = [makeServer('test')];
+    cache.set('test', defaultOptions, data);
+    expect(cache.get('test', defaultOptions)).toEqual(data);
+  });
+
+  it('returns null after TTL expires', () => {
+    const cache = new RegistryCache(1000); // 1 second TTL
+    cache.set('test', defaultOptions, [makeServer('test')]);
+
+    vi.advanceTimersByTime(1001);
+    expect(cache.get('test', defaultOptions)).toBeNull();
+  });
+
+  it('generates deterministic cache keys', () => {
+    const cache = new RegistryCache();
+    const data = [makeServer('test')];
+    cache.set('query', { query: 'query', limit: 10 }, data);
+    expect(cache.get('query', { query: 'query', limit: 10 })).toEqual(data);
+  });
+
+  it('generates different keys for different queries', () => {
+    const cache = new RegistryCache();
+    cache.set('a', { query: 'a' }, [makeServer('a')]);
+    expect(cache.get('b', { query: 'b' })).toBeNull();
+  });
+
+  it('tracks hits and misses correctly', () => {
+    const cache = new RegistryCache();
+    cache.set('test', defaultOptions, [makeServer('test')]);
+
+    cache.get('test', defaultOptions); // hit
+    cache.get('test', defaultOptions); // hit
+    cache.get('miss', { query: 'miss' }); // miss
+
+    const ratio = cache.getHitRatio();
+    expect(ratio.hits).toBe(2);
+    expect(ratio.misses).toBe(1);
+    expect(ratio.ratio).toBeCloseTo(2 / 3);
+  });
+
+  it('returns 0 ratio when no accesses', () => {
+    const cache = new RegistryCache();
+    expect(cache.getHitRatio().ratio).toBe(0);
+  });
+
+  it('clears all entries and resets metrics', () => {
+    const cache = new RegistryCache();
+    cache.set('a', { query: 'a' }, [makeServer('a')]);
+    cache.get('a', { query: 'a' }); // hit
+    cache.clear();
+
+    expect(cache.get('a', { query: 'a' })).toBeNull();
+    expect(cache.size).toBe(0);
+    expect(cache.getHitRatio().hits).toBe(0);
+  });
+});

src/cli/tests/registry/client.test.ts

@@ -0,0 +1,282 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { RegistryClient } from '../../src/registry/client.js';
+import type { RegistryServer } from '../../src/registry/types.js';
+
+function makeServer(name: string, source: 'official' | 'glama' | 'smithery'): RegistryServer {
+  return {
+    name,
+    description: `${name} description`,
+    packages: { npm: `@test/${name}` },
+    envTemplate: [],
+    transport: 'stdio',
+    popularityScore: 50,
+    verified: source === 'smithery',
+    sourceRegistry: source,
+  };
+}
+
+// Mock fetch globally
+const mockFetch = vi.fn();
+
+beforeEach(() => {
+  vi.stubGlobal('fetch', mockFetch);
+  mockFetch.mockReset();
+});
+
+function mockRegistryResponse(source: string, servers: RegistryServer[]): void {
+  mockFetch.mockImplementation((url: string) => {
+    if (url.includes('registry.modelcontextprotocol.io')) {
+      return Promise.resolve({
+        ok: true,
+        json: () => Promise.resolve({
+          servers: servers
+            .filter((s) => s.sourceRegistry === 'official')
+            .map((s) => ({
+              server: {
+                name: s.name,
+                description: s.description,
+                packages: s.packages.npm !== undefined ? [{
+                  registryType: 'npm',
+                  identifier: s.packages.npm,
+                  transport: { type: 'stdio' },
+                  environmentVariables: [],
+                }] : [],
+                remotes: [],
+              },
+            })),
+          metadata: { nextCursor: null, count: 1 },
+        }),
+      });
+    }
+    if (url.includes('glama.ai')) {
+      return Promise.resolve({
+        ok: true,
+        json: () => Promise.resolve({
+          servers: servers
+            .filter((s) => s.sourceRegistry === 'glama')
+            .map((s) => ({
+              id: s.name,
+              name: s.name,
+              description: s.description,
+              attributes: [],
+              slug: s.packages.npm ?? '',
+            })),
+          pageInfo: { hasNextPage: false, hasPreviousPage: false },
+        }),
+      });
+    }
+    if (url.includes('registry.smithery.ai')) {
+      return Promise.resolve({
+        ok: true,
+        json: () => Promise.resolve({
+          servers: servers
+            .filter((s) => s.sourceRegistry === 'smithery')
+            .map((s) => ({
+              qualifiedName: s.name,
+              displayName: s.name,
+              description: s.description,
+              verified: s.verified,
+              useCount: s.popularityScore,
+              remote: false,
+            })),
+          pagination: { currentPage: 1, pageSize: 20, totalPages: 1, totalCount: 1 },
+        }),
+      });
+    }
+    return Promise.reject(new Error(`Unexpected URL: ${url}`));
+  });
+}
+
+describe('RegistryClient', () => {
+  it('queries all enabled registries', async () => {
+    const testServers = [
+      makeServer('slack-official', 'official'),
+      makeServer('slack-glama', 'glama'),
+      makeServer('slack-smithery', 'smithery'),
+    ];
+    mockRegistryResponse('all', testServers);
+
+    const client = new RegistryClient();
+    const results = await client.search({ query: 'slack' });
+
+    expect(results.length).toBeGreaterThan(0);
+    expect(mockFetch).toHaveBeenCalledTimes(3);
+  });
+
+  it('uses cached results on second call', async () => {
+    mockRegistryResponse('all', [makeServer('slack', 'official')]);
+
+    const client = new RegistryClient();
+    await client.search({ query: 'slack' });
+    mockFetch.mockClear();
+    await client.search({ query: 'slack' });
+
+    expect(mockFetch).not.toHaveBeenCalled();
+  });
+
+  it('filters by registry when specified', async () => {
+    mockRegistryResponse('all', [makeServer('test', 'official')]);
+
+    const client = new RegistryClient();
+    await client.search({ query: 'test', registries: ['official'] });
+
+    expect(mockFetch).toHaveBeenCalledTimes(1);
+    const calledUrl = mockFetch.mock.calls[0]?.[0] as string;
+    expect(calledUrl).toContain('modelcontextprotocol.io');
+  });
+
+  it('handles partial failures gracefully', async () => {
+    mockFetch.mockImplementation((url: string) => {
+      if (url.includes('glama.ai')) {
+        return Promise.reject(new Error('Network error'));
+      }
+      if (url.includes('registry.smithery.ai')) {
+        return Promise.resolve({
+          ok: true,
+          json: () => Promise.resolve({
+            servers: [{
+              qualifiedName: 'slack',
+              displayName: 'Slack',
+              description: 'Slack',
+              verified: true,
+              useCount: 100,
+              remote: false,
+            }],
+            pagination: { currentPage: 1, pageSize: 20, totalPages: 1, totalCount: 1 },
+          }),
+        });
+      }
+      return Promise.resolve({
+        ok: true,
+        json: () => Promise.resolve({
+          servers: [],
+          metadata: { nextCursor: null },
+        }),
+      });
+    });
+
+    const client = new RegistryClient();
+    const results = await client.search({ query: 'slack' });
+
+    // Should still return results from successful sources
+    expect(results.length).toBeGreaterThan(0);
+  });
+
+  it('records error counts on failures', async () => {
+    mockFetch.mockImplementation((url: string) => {
+      if (url.includes('glama.ai')) {
+        return Promise.reject(new Error('fail'));
+      }
+      // Return empty for others
+      if (url.includes('modelcontextprotocol')) {
+        return Promise.resolve({
+          ok: true,
+          json: () => Promise.resolve({ servers: [], metadata: { nextCursor: null } }),
+        });
+      }
+      return Promise.resolve({
+        ok: true,
+        json: () => Promise.resolve({
+          servers: [],
+          pagination: { currentPage: 1, pageSize: 20, totalPages: 1, totalCount: 0 },
+        }),
+      });
+    });
+
+    const client = new RegistryClient();
+    await client.search({ query: 'test' });
+
+    const errors = client.getErrorCounts();
+    expect(errors.get('glama')).toBe(1);
+  });
+
+  it('filters by verified when specified', async () => {
+    mockFetch.mockImplementation((url: string) => {
+      if (url.includes('registry.smithery.ai')) {
+        return Promise.resolve({
+          ok: true,
+          json: () => Promise.resolve({
+            servers: [
+              { qualifiedName: 'verified', displayName: 'Verified', description: '', verified: true, useCount: 100, remote: false },
+              { qualifiedName: 'unverified', displayName: 'Unverified', description: '', verified: false, useCount: 50, remote: false },
+            ],
+            pagination: { currentPage: 1, pageSize: 20, totalPages: 1, totalCount: 2 },
+          }),
+        });
+      }
+      return Promise.resolve({
+        ok: true,
+        json: () => Promise.resolve({ servers: [], metadata: { nextCursor: null } }),
+      });
+    });
+
+    // Mock glama too
+    mockFetch.mockImplementation((url: string) => {
+      if (url.includes('registry.smithery.ai')) {
+        return Promise.resolve({
+          ok: true,
+          json: () => Promise.resolve({
+            servers: [
+              { qualifiedName: 'verified', displayName: 'Verified', description: '', verified: true, useCount: 100, remote: false },
+              { qualifiedName: 'unverified', displayName: 'Unverified', description: '', verified: false, useCount: 50, remote: false },
+            ],
+            pagination: { currentPage: 1, pageSize: 20, totalPages: 1, totalCount: 2 },
+          }),
+        });
+      }
+      if (url.includes('glama.ai')) {
+        return Promise.resolve({
+          ok: true,
+          json: () => Promise.resolve({ servers: [], pageInfo: { hasNextPage: false, hasPreviousPage: false } }),
+        });
+      }
+      return Promise.resolve({
+        ok: true,
+        json: () => Promise.resolve({ servers: [], metadata: { nextCursor: null } }),
+      });
+    });
+
+    const client = new RegistryClient();
+    const results = await client.search({ query: 'test', verified: true });
+
+    for (const r of results) {
+      expect(r.verified).toBe(true);
+    }
+  });
+
+  it('respects limit option', async () => {
+    mockRegistryResponse('all', [
+      makeServer('a', 'official'),
+      makeServer('b', 'glama'),
+      makeServer('c', 'smithery'),
+    ]);
+
+    const client = new RegistryClient();
+    const results = await client.search({ query: 'test', limit: 1 });
+    expect(results.length).toBeLessThanOrEqual(1);
+  });
+
+  it('records latency metrics', async () => {
+    mockRegistryResponse('all', [makeServer('test', 'official')]);
+
+    const client = new RegistryClient();
+    await client.search({ query: 'test' });
+
+    const latencies = client.getQueryLatencies();
+    expect(latencies.size).toBeGreaterThan(0);
+  });
+
+  it('clearCache empties cache', async () => {
+    mockRegistryResponse('all', [makeServer('test', 'official')]);
+
+    const client = new RegistryClient();
+    await client.search({ query: 'test' });
+    client.clearCache();
+    mockFetch.mockClear();
+    mockRegistryResponse('all', [makeServer('test', 'official')]);
+    await client.search({ query: 'test' });
+
+    // Should have fetched again after cache clear
+    expect(mockFetch).toHaveBeenCalled();
+  });
+});

src/cli/tests/registry/dedup.test.ts

@@ -0,0 +1,105 @@
+import { describe, it, expect } from 'vitest';
+import { deduplicateResults } from '../../src/registry/dedup.js';
+import type { RegistryServer } from '../../src/registry/types.js';
+
+function makeServer(overrides: Partial<RegistryServer> = {}): RegistryServer {
+  return {
+    name: 'test-server',
+    description: 'A test server',
+    packages: {},
+    envTemplate: [],
+    transport: 'stdio',
+    popularityScore: 0,
+    verified: false,
+    sourceRegistry: 'official',
+    ...overrides,
+  };
+}
+
+describe('deduplicateResults', () => {
+  it('keeps unique servers', () => {
+    const servers = [
+      makeServer({ name: 'server-a', packages: { npm: 'pkg-a' } }),
+      makeServer({ name: 'server-b', packages: { npm: 'pkg-b' } }),
+    ];
+    expect(deduplicateResults(servers)).toHaveLength(2);
+  });
+
+  it('deduplicates by npm package name, keeps higher popularity', () => {
+    const servers = [
+      makeServer({ name: 'low', packages: { npm: '@test/slack' }, popularityScore: 10, sourceRegistry: 'official' }),
+      makeServer({ name: 'high', packages: { npm: '@test/slack' }, popularityScore: 100, sourceRegistry: 'smithery' }),
+    ];
+    const result = deduplicateResults(servers);
+    expect(result).toHaveLength(1);
+    expect(result[0]?.name).toBe('high');
+    expect(result[0]?.popularityScore).toBe(100);
+  });
+
+  it('deduplicates by GitHub URL with different formats', () => {
+    const servers = [
+      makeServer({ name: 'a', repositoryUrl: 'https://github.com/org/repo', popularityScore: 5 }),
+      makeServer({ name: 'b', repositoryUrl: 'git@github.com:org/repo.git', popularityScore: 50 }),
+    ];
+    const result = deduplicateResults(servers);
+    expect(result).toHaveLength(1);
+    expect(result[0]?.name).toBe('b');
+  });
+
+  it('merges envTemplate from both sources', () => {
+    const servers = [
+      makeServer({
+        name: 'a',
+        packages: { npm: 'pkg' },
+        envTemplate: [{ name: 'TOKEN', description: 'API token', isSecret: true }],
+        popularityScore: 10,
+      }),
+      makeServer({
+        name: 'b',
+        packages: { npm: 'pkg' },
+        envTemplate: [{ name: 'URL', description: 'Base URL', isSecret: false }],
+        popularityScore: 5,
+      }),
+    ];
+    const result = deduplicateResults(servers);
+    expect(result).toHaveLength(1);
+    expect(result[0]?.envTemplate).toHaveLength(2);
+    expect(result[0]?.envTemplate.map((e) => e.name)).toContain('TOKEN');
+    expect(result[0]?.envTemplate.map((e) => e.name)).toContain('URL');
+  });
+
+  it('deduplicates envTemplate by var name', () => {
+    const servers = [
+      makeServer({
+        packages: { npm: 'pkg' },
+        envTemplate: [{ name: 'TOKEN', description: 'from a', isSecret: true }],
+        popularityScore: 10,
+      }),
+      makeServer({
+        packages: { npm: 'pkg' },
+        envTemplate: [{ name: 'TOKEN', description: 'from b', isSecret: true }],
+        popularityScore: 5,
+      }),
+    ];
+    const result = deduplicateResults(servers);
+    expect(result[0]?.envTemplate).toHaveLength(1);
+  });
+
+  it('merges verified status (OR)', () => {
+    const servers = [
+      makeServer({ packages: { npm: 'pkg' }, verified: true, popularityScore: 10 }),
+      makeServer({ packages: { npm: 'pkg' }, verified: false, popularityScore: 5 }),
+    ];
+    const result = deduplicateResults(servers);
+    expect(result[0]?.verified).toBe(true);
+  });
+
+  it('handles servers with no npm or repo', () => {
+    const servers = [
+      makeServer({ name: 'a' }),
+      makeServer({ name: 'b' }),
+    ];
+    // No matching key → no dedup
+    expect(deduplicateResults(servers)).toHaveLength(2);
+  });
+});

src/cli/tests/registry/ranking.test.ts

@@ -0,0 +1,91 @@
+import { describe, it, expect } from 'vitest';
+import { rankResults } from '../../src/registry/ranking.js';
+import type { RegistryServer } from '../../src/registry/types.js';
+
+function makeServer(overrides: Partial<RegistryServer> = {}): RegistryServer {
+  return {
+    name: 'test-server',
+    description: 'A test server',
+    packages: {},
+    envTemplate: [],
+    transport: 'stdio',
+    popularityScore: 0,
+    verified: false,
+    sourceRegistry: 'official',
+    ...overrides,
+  };
+}
+
+describe('rankResults', () => {
+  it('puts exact name match first', () => {
+    const servers = [
+      makeServer({ name: 'slack-extended-tools' }),
+      makeServer({ name: 'slack' }),
+      makeServer({ name: 'my-slack-bot' }),
+    ];
+    const ranked = rankResults(servers, 'slack');
+    expect(ranked[0]?.name).toBe('slack');
+  });
+
+  it('ranks verified servers higher than unverified', () => {
+    const servers = [
+      makeServer({ name: 'server-a', verified: false }),
+      makeServer({ name: 'server-b', verified: true }),
+    ];
+    const ranked = rankResults(servers, 'server');
+    expect(ranked[0]?.name).toBe('server-b');
+  });
+
+  it('ranks popular servers higher', () => {
+    const servers = [
+      makeServer({ name: 'unpopular', popularityScore: 1 }),
+      makeServer({ name: 'popular', popularityScore: 10000 }),
+    ];
+    const ranked = rankResults(servers, 'test');
+    expect(ranked[0]?.name).toBe('popular');
+  });
+
+  it('considers recency', () => {
+    const recent = new Date();
+    const old = new Date(Date.now() - 365 * 24 * 60 * 60 * 1000);
+    const servers = [
+      makeServer({ name: 'old-server', lastUpdated: old }),
+      makeServer({ name: 'new-server', lastUpdated: recent }),
+    ];
+    const ranked = rankResults(servers, 'test');
+    expect(ranked[0]?.name).toBe('new-server');
+  });
+
+  it('handles missing lastUpdated gracefully', () => {
+    const servers = [
+      makeServer({ name: 'no-date' }),
+      makeServer({ name: 'has-date', lastUpdated: new Date() }),
+    ];
+    // Should not throw
+    const ranked = rankResults(servers, 'test');
+    expect(ranked).toHaveLength(2);
+  });
+
+  it('produces stable ordering for identical scores', () => {
+    const servers = Array.from({ length: 10 }, (_, i) =>
+      makeServer({ name: `server-${String(i)}` }),
+    );
+    const ranked1 = rankResults(servers, 'test');
+    const ranked2 = rankResults(servers, 'test');
+    expect(ranked1.map((s) => s.name)).toEqual(ranked2.map((s) => s.name));
+  });
+
+  it('returns empty array for empty input', () => {
+    expect(rankResults([], 'test')).toEqual([]);
+  });
+
+  it('does not mutate original array', () => {
+    const servers = [
+      makeServer({ name: 'b' }),
+      makeServer({ name: 'a' }),
+    ];
+    const original = [...servers];
+    rankResults(servers, 'test');
+    expect(servers.map((s) => s.name)).toEqual(original.map((s) => s.name));
+  });
+});

src/db/prisma/migrations/20260222121228_add_external_url_command_port/migration.sql

@@ -0,0 +1,204 @@
+-- CreateEnum
+CREATE TYPE "Role" AS ENUM ('USER', 'ADMIN');
+
+-- CreateEnum
+CREATE TYPE "Transport" AS ENUM ('STDIO', 'SSE', 'STREAMABLE_HTTP');
+
+-- CreateEnum
+CREATE TYPE "InstanceStatus" AS ENUM ('STARTING', 'RUNNING', 'STOPPING', 'STOPPED', 'ERROR');
+
+-- CreateTable
+CREATE TABLE "User" (
+    "id" TEXT NOT NULL,
+    "email" TEXT NOT NULL,
+    "name" TEXT,
+    "passwordHash" TEXT NOT NULL,
+    "role" "Role" NOT NULL DEFAULT 'USER',
+    "version" INTEGER NOT NULL DEFAULT 1,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "User_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "Session" (
+    "id" TEXT NOT NULL,
+    "token" TEXT NOT NULL,
+    "userId" TEXT NOT NULL,
+    "expiresAt" TIMESTAMP(3) NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "Session_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "McpServer" (
+    "id" TEXT NOT NULL,
+    "name" TEXT NOT NULL,
+    "description" TEXT NOT NULL DEFAULT '',
+    "packageName" TEXT,
+    "dockerImage" TEXT,
+    "transport" "Transport" NOT NULL DEFAULT 'STDIO',
+    "repositoryUrl" TEXT,
+    "externalUrl" TEXT,
+    "command" JSONB,
+    "containerPort" INTEGER,
+    "envTemplate" JSONB NOT NULL DEFAULT '[]',
+    "version" INTEGER NOT NULL DEFAULT 1,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "McpServer_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "McpProfile" (
+    "id" TEXT NOT NULL,
+    "name" TEXT NOT NULL,
+    "serverId" TEXT NOT NULL,
+    "permissions" JSONB NOT NULL DEFAULT '[]',
+    "envOverrides" JSONB NOT NULL DEFAULT '{}',
+    "version" INTEGER NOT NULL DEFAULT 1,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "McpProfile_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "Project" (
+    "id" TEXT NOT NULL,
+    "name" TEXT NOT NULL,
+    "description" TEXT NOT NULL DEFAULT '',
+    "ownerId" TEXT NOT NULL,
+    "version" INTEGER NOT NULL DEFAULT 1,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "Project_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "ProjectMcpProfile" (
+    "id" TEXT NOT NULL,
+    "projectId" TEXT NOT NULL,
+    "profileId" TEXT NOT NULL,
+
+    CONSTRAINT "ProjectMcpProfile_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "McpInstance" (
+    "id" TEXT NOT NULL,
+    "serverId" TEXT NOT NULL,
+    "containerId" TEXT,
+    "status" "InstanceStatus" NOT NULL DEFAULT 'STOPPED',
+    "port" INTEGER,
+    "metadata" JSONB NOT NULL DEFAULT '{}',
+    "version" INTEGER NOT NULL DEFAULT 1,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "McpInstance_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "AuditLog" (
+    "id" TEXT NOT NULL,
+    "userId" TEXT NOT NULL,
+    "action" TEXT NOT NULL,
+    "resource" TEXT NOT NULL,
+    "resourceId" TEXT,
+    "details" JSONB NOT NULL DEFAULT '{}',
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "AuditLog_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "User_email_key" ON "User"("email");
+
+-- CreateIndex
+CREATE INDEX "User_email_idx" ON "User"("email");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Session_token_key" ON "Session"("token");
+
+-- CreateIndex
+CREATE INDEX "Session_token_idx" ON "Session"("token");
+
+-- CreateIndex
+CREATE INDEX "Session_userId_idx" ON "Session"("userId");
+
+-- CreateIndex
+CREATE INDEX "Session_expiresAt_idx" ON "Session"("expiresAt");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "McpServer_name_key" ON "McpServer"("name");
+
+-- CreateIndex
+CREATE INDEX "McpServer_name_idx" ON "McpServer"("name");
+
+-- CreateIndex
+CREATE INDEX "McpProfile_serverId_idx" ON "McpProfile"("serverId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "McpProfile_name_serverId_key" ON "McpProfile"("name", "serverId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Project_name_key" ON "Project"("name");
+
+-- CreateIndex
+CREATE INDEX "Project_name_idx" ON "Project"("name");
+
+-- CreateIndex
+CREATE INDEX "Project_ownerId_idx" ON "Project"("ownerId");
+
+-- CreateIndex
+CREATE INDEX "ProjectMcpProfile_projectId_idx" ON "ProjectMcpProfile"("projectId");
+
+-- CreateIndex
+CREATE INDEX "ProjectMcpProfile_profileId_idx" ON "ProjectMcpProfile"("profileId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "ProjectMcpProfile_projectId_profileId_key" ON "ProjectMcpProfile"("projectId", "profileId");
+
+-- CreateIndex
+CREATE INDEX "McpInstance_serverId_idx" ON "McpInstance"("serverId");
+
+-- CreateIndex
+CREATE INDEX "McpInstance_status_idx" ON "McpInstance"("status");
+
+-- CreateIndex
+CREATE INDEX "AuditLog_userId_idx" ON "AuditLog"("userId");
+
+-- CreateIndex
+CREATE INDEX "AuditLog_action_idx" ON "AuditLog"("action");
+
+-- CreateIndex
+CREATE INDEX "AuditLog_resource_idx" ON "AuditLog"("resource");
+
+-- CreateIndex
+CREATE INDEX "AuditLog_createdAt_idx" ON "AuditLog"("createdAt");
+
+-- AddForeignKey
+ALTER TABLE "Session" ADD CONSTRAINT "Session_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "McpProfile" ADD CONSTRAINT "McpProfile_serverId_fkey" FOREIGN KEY ("serverId") REFERENCES "McpServer"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Project" ADD CONSTRAINT "Project_ownerId_fkey" FOREIGN KEY ("ownerId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "ProjectMcpProfile" ADD CONSTRAINT "ProjectMcpProfile_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "Project"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "ProjectMcpProfile" ADD CONSTRAINT "ProjectMcpProfile_profileId_fkey" FOREIGN KEY ("profileId") REFERENCES "McpProfile"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "McpInstance" ADD CONSTRAINT "McpInstance_serverId_fkey" FOREIGN KEY ("serverId") REFERENCES "McpServer"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "AuditLog" ADD CONSTRAINT "AuditLog_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;

src/db/prisma/migrations/migration_lock.toml

@@ -0,0 +1,3 @@
+# Please do not edit this file manually
+# It should be added in your version-control system (e.g., Git)
+provider = "postgresql"

src/db/prisma/schema.prisma

@@ -10,13 +10,14 @@ datasource db {
 // ── Users ──
 
 model User {
-  id        String   @id @default(cuid())
-  email     String   @unique
-  name      String?
-  role      Role     @default(USER)
-  version   Int      @default(1)
-  createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
+  id           String   @id @default(cuid())
+  email        String   @unique
+  name         String?
+  passwordHash String
+  role         Role     @default(USER)
+  version      Int      @default(1)
+  createdAt    DateTime @default(now())
+  updatedAt    DateTime @updatedAt
 
   sessions  Session[]
   auditLogs AuditLog[]
@@ -56,12 +57,19 @@ model McpServer {
   dockerImage   String?
   transport     Transport       @default(STDIO)
   repositoryUrl String?
-  envTemplate   Json            @default("[]")
+  externalUrl   String?
+  command       Json?
+  containerPort Int?
+  replicas      Int             @default(1)
+  env           Json            @default("[]")
+  healthCheck   Json?
   version       Int             @default(1)
   createdAt     DateTime        @default(now())
   updatedAt     DateTime        @updatedAt
 
-  profiles  McpProfile[]
+  templateName    String?
+  templateVersion String?
+
   instances McpInstance[]
 
   @@index([name])
@@ -73,23 +81,40 @@ enum Transport {
   STREAMABLE_HTTP
 }
 
-// ── MCP Profiles ──
+// ── MCP Templates ──
 
-model McpProfile {
-  id          String   @id @default(cuid())
-  name        String
-  serverId    String
-  permissions Json     @default("[]")
-  envOverrides Json    @default("{}")
-  version     Int      @default(1)
-  createdAt   DateTime @default(now())
-  updatedAt   DateTime @updatedAt
+model McpTemplate {
+  id            String    @id @default(cuid())
+  name          String    @unique
+  version       String    @default("1.0.0")
+  description   String    @default("")
+  packageName   String?
+  dockerImage   String?
+  transport     Transport @default(STDIO)
+  repositoryUrl String?
+  externalUrl   String?
+  command       Json?
+  containerPort Int?
+  replicas      Int       @default(1)
+  env           Json      @default("[]")
+  healthCheck   Json?
+  createdAt     DateTime  @default(now())
+  updatedAt     DateTime  @updatedAt
 
-  server   McpServer            @relation(fields: [serverId], references: [id], onDelete: Cascade)
-  projects ProjectMcpProfile[]
+  @@index([name])
+}
 
-  @@unique([name, serverId])
-  @@index([serverId])
+// ── Secrets ──
+
+model Secret {
+  id        String   @id @default(cuid())
+  name      String   @unique
+  data      Json     @default("{}")
+  version   Int      @default(1)
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  @@index([name])
 }
 
 // ── Projects ──
@@ -104,27 +129,11 @@ model Project {
   updatedAt   DateTime @updatedAt
 
   owner    User                 @relation(fields: [ownerId], references: [id], onDelete: Cascade)
-  profiles ProjectMcpProfile[]
 
   @@index([name])
   @@index([ownerId])
 }
 
-// ── Project <-> Profile join table ──
-
-model ProjectMcpProfile {
-  id        String @id @default(cuid())
-  projectId String
-  profileId String
-
-  project Project    @relation(fields: [projectId], references: [id], onDelete: Cascade)
-  profile McpProfile @relation(fields: [profileId], references: [id], onDelete: Cascade)
-
-  @@unique([projectId, profileId])
-  @@index([projectId])
-  @@index([profileId])
-}
-
 // ── MCP Instances (running containers) ──
 
 model McpInstance {
@@ -133,10 +142,13 @@ model McpInstance {
   containerId String?
   status      InstanceStatus @default(STOPPED)
   port        Int?
-  metadata    Json           @default("{}")
-  version     Int            @default(1)
-  createdAt   DateTime       @default(now())
-  updatedAt   DateTime       @updatedAt
+  metadata        Json           @default("{}")
+  healthStatus    String?
+  lastHealthCheck DateTime?
+  events          Json           @default("[]")
+  version         Int            @default(1)
+  createdAt       DateTime       @default(now())
+  updatedAt       DateTime       @updatedAt
 
   server McpServer @relation(fields: [serverId], references: [id], onDelete: Cascade)
 

src/db/src/index.ts

@@ -4,9 +4,9 @@ export type {
   User,
   Session,
   McpServer,
-  McpProfile,
+  McpTemplate,
+  Secret,
   Project,
-  ProjectMcpProfile,
   McpInstance,
   AuditLog,
   Role,
@@ -14,5 +14,5 @@ export type {
   InstanceStatus,
 } from '@prisma/client';
 
-export { seedMcpServers, defaultServers } from './seed/index.js';
-export type { SeedServer } from './seed/index.js';
+export { seedTemplates } from './seed/index.js';
+export type { SeedTemplate, TemplateEnvEntry, HealthCheckSpec } from './seed/index.js';

src/db/src/seed/index.ts

@@ -1,131 +1,77 @@
-import { PrismaClient } from '@prisma/client';
+import { PrismaClient, Prisma } from '@prisma/client';
 
-export interface SeedServer {
+export interface TemplateEnvEntry {
   name: string;
-  description: string;
-  packageName: string;
-  transport: 'STDIO' | 'SSE' | 'STREAMABLE_HTTP';
-  repositoryUrl: string;
-  envTemplate: Array<{
-    name: string;
-    description: string;
-    isSecret: boolean;
-    setupUrl?: string;
-  }>;
+  description?: string;
+  required?: boolean;
+  defaultValue?: string;
 }
 
-export const defaultServers: SeedServer[] = [
-  {
-    name: 'slack',
-    description: 'Slack MCP server for reading channels, messages, and user info',
-    packageName: '@anthropic/slack-mcp',
-    transport: 'STDIO',
-    repositoryUrl: 'https://github.com/modelcontextprotocol/servers/tree/main/src/slack',
-    envTemplate: [
-      {
-        name: 'SLACK_BOT_TOKEN',
-        description: 'Slack Bot User OAuth Token (xoxb-...)',
-        isSecret: true,
-        setupUrl: 'https://api.slack.com/apps',
-      },
-      {
-        name: 'SLACK_TEAM_ID',
-        description: 'Slack Workspace Team ID',
-        isSecret: false,
-      },
-    ],
-  },
-  {
-    name: 'jira',
-    description: 'Jira MCP server for issues, projects, and boards',
-    packageName: '@anthropic/jira-mcp',
-    transport: 'STDIO',
-    repositoryUrl: 'https://github.com/modelcontextprotocol/servers/tree/main/src/jira',
-    envTemplate: [
-      {
-        name: 'JIRA_URL',
-        description: 'Jira instance URL (e.g., https://company.atlassian.net)',
-        isSecret: false,
-      },
-      {
-        name: 'JIRA_EMAIL',
-        description: 'Jira account email',
-        isSecret: false,
-      },
-      {
-        name: 'JIRA_API_TOKEN',
-        description: 'Jira API token',
-        isSecret: true,
-        setupUrl: 'https://id.atlassian.com/manage-profile/security/api-tokens',
-      },
-    ],
-  },
-  {
-    name: 'github',
-    description: 'GitHub MCP server for repos, issues, PRs, and code search',
-    packageName: '@anthropic/github-mcp',
-    transport: 'STDIO',
-    repositoryUrl: 'https://github.com/modelcontextprotocol/servers/tree/main/src/github',
-    envTemplate: [
-      {
-        name: 'GITHUB_TOKEN',
-        description: 'GitHub Personal Access Token',
-        isSecret: true,
-        setupUrl: 'https://github.com/settings/tokens',
-      },
-    ],
-  },
-  {
-    name: 'terraform',
-    description: 'Terraform MCP server for infrastructure documentation and state',
-    packageName: '@anthropic/terraform-mcp',
-    transport: 'STDIO',
-    repositoryUrl: 'https://github.com/modelcontextprotocol/servers/tree/main/src/terraform',
-    envTemplate: [],
-  },
-];
+export interface HealthCheckSpec {
+  tool: string;
+  arguments?: Record<string, unknown>;
+  intervalSeconds?: number;
+  timeoutSeconds?: number;
+  failureThreshold?: number;
+}
 
-export async function seedMcpServers(
+export interface SeedTemplate {
+  name: string;
+  version: string;
+  description: string;
+  packageName?: string;
+  dockerImage?: string;
+  transport: 'STDIO' | 'SSE' | 'STREAMABLE_HTTP';
+  repositoryUrl?: string;
+  externalUrl?: string;
+  command?: string[];
+  containerPort?: number;
+  replicas?: number;
+  env?: TemplateEnvEntry[];
+  healthCheck?: HealthCheckSpec;
+}
+
+export async function seedTemplates(
   prisma: PrismaClient,
-  servers: SeedServer[] = defaultServers,
+  templates: SeedTemplate[],
 ): Promise<number> {
-  let created = 0;
+  let upserted = 0;
 
-  for (const server of servers) {
-    await prisma.mcpServer.upsert({
-      where: { name: server.name },
+  for (const tpl of templates) {
+    await prisma.mcpTemplate.upsert({
+      where: { name: tpl.name },
       update: {
-        description: server.description,
-        packageName: server.packageName,
-        transport: server.transport,
-        repositoryUrl: server.repositoryUrl,
-        envTemplate: server.envTemplate,
+        version: tpl.version,
+        description: tpl.description,
+        packageName: tpl.packageName ?? null,
+        dockerImage: tpl.dockerImage ?? null,
+        transport: tpl.transport,
+        repositoryUrl: tpl.repositoryUrl ?? null,
+        externalUrl: tpl.externalUrl ?? null,
+        command: (tpl.command ?? Prisma.JsonNull) as Prisma.InputJsonValue,
+        containerPort: tpl.containerPort ?? null,
+        replicas: tpl.replicas ?? 1,
+        env: (tpl.env ?? []) as unknown as Prisma.InputJsonValue,
+        healthCheck: (tpl.healthCheck ?? Prisma.JsonNull) as unknown as Prisma.InputJsonValue,
       },
       create: {
-        name: server.name,
-        description: server.description,
-        packageName: server.packageName,
-        transport: server.transport,
-        repositoryUrl: server.repositoryUrl,
-        envTemplate: server.envTemplate,
+        name: tpl.name,
+        version: tpl.version,
+        description: tpl.description,
+        packageName: tpl.packageName ?? null,
+        dockerImage: tpl.dockerImage ?? null,
+        transport: tpl.transport,
+        repositoryUrl: tpl.repositoryUrl ?? null,
+        externalUrl: tpl.externalUrl ?? null,
+        command: (tpl.command ?? Prisma.JsonNull) as Prisma.InputJsonValue,
+        containerPort: tpl.containerPort ?? null,
+        replicas: tpl.replicas ?? 1,
+        env: (tpl.env ?? []) as unknown as Prisma.InputJsonValue,
+        healthCheck: (tpl.healthCheck ?? Prisma.JsonNull) as unknown as Prisma.InputJsonValue,
       },
     });
-    created++;
+    upserted++;
   }
 
-  return created;
-}
-
-// CLI entry point
-if (import.meta.url === `file://${process.argv[1]}`) {
-  const prisma = new PrismaClient();
-  seedMcpServers(prisma)
-    .then((count) => {
-      console.log(`Seeded ${count} MCP servers`);
-      return prisma.$disconnect();
-    })
-    .catch((e) => {
-      console.error(e);
-      return prisma.$disconnect().then(() => process.exit(1));
-    });
+  return upserted;
 }

src/db/tests/helpers.ts

@@ -48,11 +48,11 @@ export async function cleanupTestDb(): Promise<void> {
 export async function clearAllTables(client: PrismaClient): Promise<void> {
   // Delete in order respecting foreign keys
   await client.auditLog.deleteMany();
-  await client.projectMcpProfile.deleteMany();
   await client.mcpInstance.deleteMany();
-  await client.mcpProfile.deleteMany();
+  await client.secret.deleteMany();
   await client.session.deleteMany();
   await client.project.deleteMany();
   await client.mcpServer.deleteMany();
+  await client.mcpTemplate.deleteMany();
   await client.user.deleteMany();
 }

src/db/tests/models.test.ts

@@ -123,7 +123,7 @@ describe('McpServer', () => {
     const server = await createServer();
     expect(server.transport).toBe('STDIO');
     expect(server.version).toBe(1);
-    expect(server.envTemplate).toEqual([]);
+    expect(server.env).toEqual([]);
   });
 
   it('enforces unique name', async () => {
@@ -131,18 +131,18 @@ describe('McpServer', () => {
     await expect(createServer({ name: 'slack' })).rejects.toThrow();
   });
 
-  it('stores envTemplate as JSON', async () => {
+  it('stores env as JSON', async () => {
     const server = await prisma.mcpServer.create({
       data: {
         name: 'with-env',
-        envTemplate: [
-          { name: 'API_KEY', description: 'Key', isSecret: true },
+        env: [
+          { name: 'API_KEY', value: 'test-key' },
         ],
       },
     });
-    const envTemplate = server.envTemplate as Array<{ name: string }>;
-    expect(envTemplate).toHaveLength(1);
-    expect(envTemplate[0].name).toBe('API_KEY');
+    const env = server.env as Array<{ name: string }>;
+    expect(env).toHaveLength(1);
+    expect(env[0].name).toBe('API_KEY');
   });
 
   it('supports SSE transport', async () => {
@@ -151,43 +151,46 @@ describe('McpServer', () => {
   });
 });
 
-// ── McpProfile model ──
+// ── Secret model ──
 
-describe('McpProfile', () => {
-  it('creates a profile linked to server', async () => {
-    const server = await createServer();
-    const profile = await prisma.mcpProfile.create({
+describe('Secret', () => {
+  it('creates a secret with defaults', async () => {
+    const secret = await prisma.secret.create({
+      data: { name: 'my-secret' },
+    });
+    expect(secret.name).toBe('my-secret');
+    expect(secret.data).toEqual({});
+    expect(secret.version).toBe(1);
+  });
+
+  it('stores key-value data as JSON', async () => {
+    const secret = await prisma.secret.create({
       data: {
-        name: 'readonly',
-        serverId: server.id,
-        permissions: ['read'],
+        name: 'api-keys',
+        data: { API_KEY: 'test-key', API_SECRET: 'test-secret' },
       },
     });
-    expect(profile.name).toBe('readonly');
-    expect(profile.serverId).toBe(server.id);
+    const data = secret.data as Record<string, string>;
+    expect(data['API_KEY']).toBe('test-key');
+    expect(data['API_SECRET']).toBe('test-secret');
   });
 
-  it('enforces unique name per server', async () => {
-    const server = await createServer();
-    const data = { name: 'default', serverId: server.id };
-    await prisma.mcpProfile.create({ data });
-    await expect(prisma.mcpProfile.create({ data })).rejects.toThrow();
+  it('enforces unique name', async () => {
+    await prisma.secret.create({ data: { name: 'dup-secret' } });
+    await expect(prisma.secret.create({ data: { name: 'dup-secret' } })).rejects.toThrow();
   });
 
-  it('allows same profile name on different servers', async () => {
-    const server1 = await createServer({ name: 'server-1' });
-    const server2 = await createServer({ name: 'server-2' });
-    await prisma.mcpProfile.create({ data: { name: 'default', serverId: server1.id } });
-    const profile2 = await prisma.mcpProfile.create({ data: { name: 'default', serverId: server2.id } });
-    expect(profile2.name).toBe('default');
-  });
-
-  it('cascades delete when server is deleted', async () => {
-    const server = await createServer();
-    await prisma.mcpProfile.create({ data: { name: 'test', serverId: server.id } });
-    await prisma.mcpServer.delete({ where: { id: server.id } });
-    const profiles = await prisma.mcpProfile.findMany({ where: { serverId: server.id } });
-    expect(profiles).toHaveLength(0);
+  it('updates data', async () => {
+    const secret = await prisma.secret.create({
+      data: { name: 'updatable', data: { KEY: 'old' } },
+    });
+    const updated = await prisma.secret.update({
+      where: { id: secret.id },
+      data: { data: { KEY: 'new', EXTRA: 'added' } },
+    });
+    const data = updated.data as Record<string, string>;
+    expect(data['KEY']).toBe('new');
+    expect(data['EXTRA']).toBe('added');
   });
 });
 
@@ -220,62 +223,6 @@ describe('Project', () => {
   });
 });
 
-// ── ProjectMcpProfile (join table) ──
-
-describe('ProjectMcpProfile', () => {
-  it('links project to profile', async () => {
-    const user = await createUser();
-    const server = await createServer();
-    const profile = await prisma.mcpProfile.create({
-      data: { name: 'default', serverId: server.id },
-    });
-    const project = await prisma.project.create({
-      data: { name: 'test-project', ownerId: user.id },
-    });
-
-    const link = await prisma.projectMcpProfile.create({
-      data: { projectId: project.id, profileId: profile.id },
-    });
-    expect(link.projectId).toBe(project.id);
-    expect(link.profileId).toBe(profile.id);
-  });
-
-  it('enforces unique project+profile combination', async () => {
-    const user = await createUser();
-    const server = await createServer();
-    const profile = await prisma.mcpProfile.create({
-      data: { name: 'default', serverId: server.id },
-    });
-    const project = await prisma.project.create({
-      data: { name: 'test-project', ownerId: user.id },
-    });
-
-    const data = { projectId: project.id, profileId: profile.id };
-    await prisma.projectMcpProfile.create({ data });
-    await expect(prisma.projectMcpProfile.create({ data })).rejects.toThrow();
-  });
-
-  it('loads profiles through project include', async () => {
-    const user = await createUser();
-    const server = await createServer();
-    const profile = await prisma.mcpProfile.create({
-      data: { name: 'slack-ro', serverId: server.id },
-    });
-    const project = await prisma.project.create({
-      data: { name: 'reports', ownerId: user.id },
-    });
-    await prisma.projectMcpProfile.create({
-      data: { projectId: project.id, profileId: profile.id },
-    });
-
-    const loaded = await prisma.project.findUnique({
-      where: { id: project.id },
-      include: { profiles: { include: { profile: true } } },
-    });
-    expect(loaded!.profiles).toHaveLength(1);
-    expect(loaded!.profiles[0].profile.name).toBe('slack-ro');
-  });
-});
 
 // ── McpInstance model ──
 

src/db/tests/seed.test.ts

@@ -1,7 +1,8 @@
 import { describe, it, expect, beforeAll, afterAll, beforeEach } from 'vitest';
 import type { PrismaClient } from '@prisma/client';
 import { setupTestDb, cleanupTestDb, clearAllTables } from './helpers.js';
-import { seedMcpServers, defaultServers } from '../src/seed/index.js';
+import { seedTemplates } from '../src/seed/index.js';
+import type { SeedTemplate } from '../src/seed/index.js';
 
 let prisma: PrismaClient;
 
@@ -17,55 +18,69 @@ beforeEach(async () => {
   await clearAllTables(prisma);
 });
 
-describe('seedMcpServers', () => {
-  it('seeds all default servers', async () => {
-    const count = await seedMcpServers(prisma);
-    expect(count).toBe(defaultServers.length);
+const testTemplates: SeedTemplate[] = [
+  {
+    name: 'github',
+    version: '1.0.0',
+    description: 'GitHub MCP server',
+    packageName: '@anthropic/github-mcp',
+    transport: 'STDIO',
+    env: [{ name: 'GITHUB_TOKEN', description: 'Personal access token', required: true }],
+  },
+  {
+    name: 'slack',
+    version: '1.0.0',
+    description: 'Slack MCP server',
+    packageName: '@anthropic/slack-mcp',
+    transport: 'STDIO',
+    env: [],
+  },
+];
 
-    const servers = await prisma.mcpServer.findMany({ orderBy: { name: 'asc' } });
-    expect(servers).toHaveLength(defaultServers.length);
+describe('seedTemplates', () => {
+  it('seeds templates', async () => {
+    const count = await seedTemplates(prisma, testTemplates);
+    expect(count).toBe(2);
 
-    const names = servers.map((s) => s.name);
-    expect(names).toContain('slack');
-    expect(names).toContain('github');
-    expect(names).toContain('jira');
-    expect(names).toContain('terraform');
+    const templates = await prisma.mcpTemplate.findMany({ orderBy: { name: 'asc' } });
+    expect(templates).toHaveLength(2);
+    expect(templates.map((t) => t.name)).toEqual(['github', 'slack']);
   });
 
   it('is idempotent (upsert)', async () => {
-    await seedMcpServers(prisma);
-    const count = await seedMcpServers(prisma);
-    expect(count).toBe(defaultServers.length);
+    await seedTemplates(prisma, testTemplates);
+    const count = await seedTemplates(prisma, testTemplates);
+    expect(count).toBe(2);
 
-    const servers = await prisma.mcpServer.findMany();
-    expect(servers).toHaveLength(defaultServers.length);
+    const templates = await prisma.mcpTemplate.findMany();
+    expect(templates).toHaveLength(2);
   });
 
-  it('seeds envTemplate correctly', async () => {
-    await seedMcpServers(prisma);
-    const slack = await prisma.mcpServer.findUnique({ where: { name: 'slack' } });
-    const envTemplate = slack!.envTemplate as Array<{ name: string; isSecret: boolean }>;
-    expect(envTemplate).toHaveLength(2);
-    expect(envTemplate[0].name).toBe('SLACK_BOT_TOKEN');
-    expect(envTemplate[0].isSecret).toBe(true);
+  it('seeds env correctly', async () => {
+    await seedTemplates(prisma, testTemplates);
+    const github = await prisma.mcpTemplate.findUnique({ where: { name: 'github' } });
+    const env = github!.env as Array<{ name: string; description?: string; required?: boolean }>;
+    expect(env).toHaveLength(1);
+    expect(env[0].name).toBe('GITHUB_TOKEN');
+    expect(env[0].required).toBe(true);
   });
 
-  it('accepts custom server list', async () => {
-    const custom = [
+  it('accepts custom template list', async () => {
+    const custom: SeedTemplate[] = [
       {
-        name: 'custom-server',
-        description: 'Custom test server',
+        name: 'custom-template',
+        version: '2.0.0',
+        description: 'Custom test template',
         packageName: '@test/custom',
-        transport: 'STDIO' as const,
-        repositoryUrl: 'https://example.com',
-        envTemplate: [],
+        transport: 'STDIO',
+        env: [],
       },
     ];
-    const count = await seedMcpServers(prisma, custom);
+    const count = await seedTemplates(prisma, custom);
     expect(count).toBe(1);
 
-    const servers = await prisma.mcpServer.findMany();
-    expect(servers).toHaveLength(1);
-    expect(servers[0].name).toBe('custom-server');
+    const templates = await prisma.mcpTemplate.findMany();
+    expect(templates).toHaveLength(1);
+    expect(templates[0].name).toBe('custom-template');
   });
 });

src/local-proxy/src/index.ts

@@ -1,2 +0,0 @@
-// Local LLM proxy entry point
-// Will be implemented in Task 11

src/mcpd/package.json

@@ -9,7 +9,7 @@
     "build": "tsc --build",
     "clean": "rimraf dist",
     "dev": "tsx watch src/index.ts",
-    "start": "node dist/index.js",
+    "start": "node dist/main.js",
     "test": "vitest",
     "test:run": "vitest run"
   },
@@ -20,10 +20,16 @@
     "@mcpctl/db": "workspace:*",
     "@mcpctl/shared": "workspace:*",
     "@prisma/client": "^6.0.0",
+    "bcrypt": "^5.1.1",
+    "dockerode": "^4.0.9",
     "fastify": "^5.0.0",
+    "js-yaml": "^4.1.0",
     "zod": "^3.24.0"
   },
   "devDependencies": {
+    "@types/bcrypt": "^5.0.2",
+    "@types/dockerode": "^4.0.1",
+    "@types/js-yaml": "^4.0.9",
     "@types/node": "^25.3.0"
   }
 }

src/mcpd/src/main.ts

@@ -0,0 +1,146 @@
+import { readdirSync, readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { PrismaClient } from '@prisma/client';
+import yaml from 'js-yaml';
+import { seedTemplates } from '@mcpctl/db';
+import type { SeedTemplate } from '@mcpctl/db';
+import { loadConfigFromEnv } from './config/index.js';
+import { createServer } from './server.js';
+import { setupGracefulShutdown } from './utils/index.js';
+import {
+  McpServerRepository,
+  SecretRepository,
+  McpInstanceRepository,
+  ProjectRepository,
+  AuditLogRepository,
+  TemplateRepository,
+} from './repositories/index.js';
+import {
+  McpServerService,
+  SecretService,
+  InstanceService,
+  ProjectService,
+  AuditLogService,
+  DockerContainerManager,
+  MetricsCollector,
+  HealthAggregator,
+  BackupService,
+  RestoreService,
+  AuthService,
+  McpProxyService,
+  TemplateService,
+} from './services/index.js';
+import {
+  registerMcpServerRoutes,
+  registerSecretRoutes,
+  registerInstanceRoutes,
+  registerProjectRoutes,
+  registerAuditLogRoutes,
+  registerHealthMonitoringRoutes,
+  registerBackupRoutes,
+  registerAuthRoutes,
+  registerMcpProxyRoutes,
+  registerTemplateRoutes,
+} from './routes/index.js';
+
+async function main(): Promise<void> {
+  const config = loadConfigFromEnv();
+
+  // Database
+  const prisma = new PrismaClient({
+    datasources: { db: { url: config.databaseUrl } },
+  });
+  await prisma.$connect();
+
+  // Seed templates from YAML files
+  const templatesDir = process.env.TEMPLATES_DIR ?? 'templates';
+  const templateFiles = (() => {
+    try {
+      return readdirSync(templatesDir).filter((f) => f.endsWith('.yaml') || f.endsWith('.yml'));
+    } catch {
+      return [];
+    }
+  })();
+  const templates: SeedTemplate[] = templateFiles.map((f) => {
+    const content = readFileSync(join(templatesDir, f), 'utf-8');
+    const parsed = yaml.load(content) as SeedTemplate;
+    return {
+      ...parsed,
+      transport: parsed.transport ?? 'STDIO',
+      version: parsed.version ?? '1.0.0',
+      description: parsed.description ?? '',
+      ...(parsed.healthCheck ? { healthCheck: parsed.healthCheck } : {}),
+    };
+  });
+  await seedTemplates(prisma, templates);
+
+  // Repositories
+  const serverRepo = new McpServerRepository(prisma);
+  const secretRepo = new SecretRepository(prisma);
+  const instanceRepo = new McpInstanceRepository(prisma);
+  const projectRepo = new ProjectRepository(prisma);
+  const auditLogRepo = new AuditLogRepository(prisma);
+  const templateRepo = new TemplateRepository(prisma);
+
+  // Orchestrator
+  const orchestrator = new DockerContainerManager();
+
+  // Services
+  const serverService = new McpServerService(serverRepo);
+  const instanceService = new InstanceService(instanceRepo, serverRepo, orchestrator, secretRepo);
+  serverService.setInstanceService(instanceService);
+  const secretService = new SecretService(secretRepo);
+  const projectService = new ProjectService(projectRepo);
+  const auditLogService = new AuditLogService(auditLogRepo);
+  const metricsCollector = new MetricsCollector();
+  const healthAggregator = new HealthAggregator(metricsCollector, orchestrator);
+  const backupService = new BackupService(serverRepo, projectRepo, secretRepo);
+  const restoreService = new RestoreService(serverRepo, projectRepo, secretRepo);
+  const authService = new AuthService(prisma);
+  const templateService = new TemplateService(templateRepo);
+  const mcpProxyService = new McpProxyService(instanceRepo, serverRepo);
+
+  // Server
+  const app = await createServer(config, {
+    health: {
+      checkDb: async () => {
+        try {
+          await prisma.$queryRaw`SELECT 1`;
+          return true;
+        } catch {
+          return false;
+        }
+      },
+    },
+  });
+
+  // Routes
+  registerMcpServerRoutes(app, serverService, instanceService);
+  registerTemplateRoutes(app, templateService);
+  registerSecretRoutes(app, secretService);
+  registerInstanceRoutes(app, instanceService);
+  registerProjectRoutes(app, projectService);
+  registerAuditLogRoutes(app, auditLogService);
+  registerHealthMonitoringRoutes(app, { healthAggregator, metricsCollector });
+  registerBackupRoutes(app, { backupService, restoreService });
+  registerAuthRoutes(app, { authService });
+  registerMcpProxyRoutes(app, {
+    mcpProxyService,
+    auditLogService,
+    authDeps: { findSession: (token) => authService.findSession(token) },
+  });
+
+  // Start
+  await app.listen({ port: config.port, host: config.host });
+  app.log.info(`mcpd listening on ${config.host}:${config.port}`);
+
+  // Graceful shutdown
+  setupGracefulShutdown(app, {
+    disconnectDb: () => prisma.$disconnect(),
+  });
+}
+
+main().catch((err) => {
+  console.error('Failed to start mcpd:', err);
+  process.exit(1);
+});

src/mcpd/src/repositories/audit-log.repository.ts

@@ -0,0 +1,70 @@
+import type { PrismaClient, AuditLog, Prisma } from '@prisma/client';
+import type { IAuditLogRepository, AuditLogFilter } from './interfaces.js';
+
+export class AuditLogRepository implements IAuditLogRepository {
+  constructor(private readonly prisma: PrismaClient) {}
+
+  async findAll(filter?: AuditLogFilter): Promise<AuditLog[]> {
+    const where = buildWhere(filter);
+    return this.prisma.auditLog.findMany({
+      where,
+      orderBy: { createdAt: 'desc' },
+      take: filter?.limit ?? 100,
+      skip: filter?.offset ?? 0,
+    });
+  }
+
+  async findById(id: string): Promise<AuditLog | null> {
+    return this.prisma.auditLog.findUnique({ where: { id } });
+  }
+
+  async create(data: {
+    userId: string;
+    action: string;
+    resource: string;
+    resourceId?: string;
+    details?: Record<string, unknown>;
+  }): Promise<AuditLog> {
+    const createData: Prisma.AuditLogUncheckedCreateInput = {
+      userId: data.userId,
+      action: data.action,
+      resource: data.resource,
+      details: (data.details ?? {}) as Prisma.InputJsonValue,
+    };
+    if (data.resourceId !== undefined) {
+      createData.resourceId = data.resourceId;
+    }
+    return this.prisma.auditLog.create({ data: createData });
+  }
+
+  async count(filter?: AuditLogFilter): Promise<number> {
+    const where = buildWhere(filter);
+    return this.prisma.auditLog.count({ where });
+  }
+
+  async deleteOlderThan(date: Date): Promise<number> {
+    const result = await this.prisma.auditLog.deleteMany({
+      where: { createdAt: { lt: date } },
+    });
+    return result.count;
+  }
+}
+
+function buildWhere(filter?: AuditLogFilter): Prisma.AuditLogWhereInput {
+  const where: Prisma.AuditLogWhereInput = {};
+  if (!filter) return where;
+
+  if (filter.userId !== undefined) where.userId = filter.userId;
+  if (filter.action !== undefined) where.action = filter.action;
+  if (filter.resource !== undefined) where.resource = filter.resource;
+  if (filter.resourceId !== undefined) where.resourceId = filter.resourceId;
+
+  if (filter.since !== undefined || filter.until !== undefined) {
+    const createdAt: Prisma.DateTimeFilter = {};
+    if (filter.since !== undefined) createdAt.gte = filter.since;
+    if (filter.until !== undefined) createdAt.lte = filter.until;
+    where.createdAt = createdAt;
+  }
+
+  return where;
+}

src/mcpd/src/repositories/index.ts

@@ -1,5 +1,9 @@
-export type { IMcpServerRepository, IMcpProfileRepository } from './interfaces.js';
+export type { IMcpServerRepository, IMcpInstanceRepository, ISecretRepository, IAuditLogRepository, AuditLogFilter } from './interfaces.js';
 export { McpServerRepository } from './mcp-server.repository.js';
-export { McpProfileRepository } from './mcp-profile.repository.js';
+export { SecretRepository } from './secret.repository.js';
 export type { IProjectRepository } from './project.repository.js';
 export { ProjectRepository } from './project.repository.js';
+export { McpInstanceRepository } from './mcp-instance.repository.js';
+export { AuditLogRepository } from './audit-log.repository.js';
+export type { ITemplateRepository } from './template.repository.js';
+export { TemplateRepository } from './template.repository.js';

src/mcpd/src/repositories/interfaces.ts

@@ -1,6 +1,6 @@
-import type { McpServer, McpProfile } from '@prisma/client';
+import type { McpServer, McpInstance, AuditLog, Secret, InstanceStatus } from '@prisma/client';
 import type { CreateMcpServerInput, UpdateMcpServerInput } from '../validation/mcp-server.schema.js';
-import type { CreateMcpProfileInput, UpdateMcpProfileInput } from '../validation/mcp-profile.schema.js';
+import type { CreateSecretInput, UpdateSecretInput } from '../validation/secret.schema.js';
 
 export interface IMcpServerRepository {
   findAll(): Promise<McpServer[]>;
@@ -11,11 +11,39 @@ export interface IMcpServerRepository {
   delete(id: string): Promise<void>;
 }
 
-export interface IMcpProfileRepository {
-  findAll(serverId?: string): Promise<McpProfile[]>;
-  findById(id: string): Promise<McpProfile | null>;
-  findByServerAndName(serverId: string, name: string): Promise<McpProfile | null>;
-  create(data: CreateMcpProfileInput): Promise<McpProfile>;
-  update(id: string, data: UpdateMcpProfileInput): Promise<McpProfile>;
+export interface IMcpInstanceRepository {
+  findAll(serverId?: string): Promise<McpInstance[]>;
+  findById(id: string): Promise<McpInstance | null>;
+  findByContainerId(containerId: string): Promise<McpInstance | null>;
+  create(data: { serverId: string; containerId?: string; status?: InstanceStatus; port?: number; metadata?: Record<string, unknown> }): Promise<McpInstance>;
+  updateStatus(id: string, status: InstanceStatus, fields?: { containerId?: string; port?: number; metadata?: Record<string, unknown>; healthStatus?: string; lastHealthCheck?: Date; events?: unknown[] }): Promise<McpInstance>;
   delete(id: string): Promise<void>;
 }
+
+export interface ISecretRepository {
+  findAll(): Promise<Secret[]>;
+  findById(id: string): Promise<Secret | null>;
+  findByName(name: string): Promise<Secret | null>;
+  create(data: CreateSecretInput): Promise<Secret>;
+  update(id: string, data: UpdateSecretInput): Promise<Secret>;
+  delete(id: string): Promise<void>;
+}
+
+export interface AuditLogFilter {
+  userId?: string;
+  action?: string;
+  resource?: string;
+  resourceId?: string;
+  since?: Date;
+  until?: Date;
+  limit?: number;
+  offset?: number;
+}
+
+export interface IAuditLogRepository {
+  findAll(filter?: AuditLogFilter): Promise<AuditLog[]>;
+  findById(id: string): Promise<AuditLog | null>;
+  create(data: { userId: string; action: string; resource: string; resourceId?: string; details?: Record<string, unknown> }): Promise<AuditLog>;
+  count(filter?: AuditLogFilter): Promise<number>;
+  deleteOlderThan(date: Date): Promise<number>;
+}

src/mcpd/src/repositories/mcp-instance.repository.ts

@@ -0,0 +1,80 @@
+import type { PrismaClient, McpInstance, InstanceStatus, Prisma } from '@prisma/client';
+import type { IMcpInstanceRepository } from './interfaces.js';
+
+export class McpInstanceRepository implements IMcpInstanceRepository {
+  constructor(private prisma: PrismaClient) {}
+
+  async findAll(serverId?: string): Promise<McpInstance[]> {
+    const where: Prisma.McpInstanceWhereInput = {};
+    if (serverId) {
+      where.serverId = serverId;
+    }
+    return this.prisma.mcpInstance.findMany({
+      where,
+      orderBy: { createdAt: 'desc' },
+    });
+  }
+
+  async findById(id: string): Promise<McpInstance | null> {
+    return this.prisma.mcpInstance.findUnique({ where: { id } });
+  }
+
+  async findByContainerId(containerId: string): Promise<McpInstance | null> {
+    return this.prisma.mcpInstance.findFirst({ where: { containerId } });
+  }
+
+  async create(data: {
+    serverId: string;
+    containerId?: string;
+    status?: InstanceStatus;
+    port?: number;
+    metadata?: Record<string, unknown>;
+  }): Promise<McpInstance> {
+    return this.prisma.mcpInstance.create({
+      data: {
+        serverId: data.serverId,
+        containerId: data.containerId ?? null,
+        status: data.status ?? 'STOPPED',
+        port: data.port ?? null,
+        metadata: (data.metadata ?? {}) as Prisma.InputJsonValue,
+      },
+    });
+  }
+
+  async updateStatus(
+    id: string,
+    status: InstanceStatus,
+    fields?: { containerId?: string; port?: number; metadata?: Record<string, unknown>; healthStatus?: string; lastHealthCheck?: Date; events?: unknown[] },
+  ): Promise<McpInstance> {
+    const updateData: Prisma.McpInstanceUpdateInput = {
+      status,
+      version: { increment: 1 },
+    };
+    if (fields?.containerId !== undefined) {
+      updateData.containerId = fields.containerId;
+    }
+    if (fields?.port !== undefined) {
+      updateData.port = fields.port;
+    }
+    if (fields?.metadata !== undefined) {
+      updateData.metadata = fields.metadata as Prisma.InputJsonValue;
+    }
+    if (fields?.healthStatus !== undefined) {
+      updateData.healthStatus = fields.healthStatus;
+    }
+    if (fields?.lastHealthCheck !== undefined) {
+      updateData.lastHealthCheck = fields.lastHealthCheck;
+    }
+    if (fields?.events !== undefined) {
+      updateData.events = fields.events as unknown as Prisma.InputJsonValue;
+    }
+    return this.prisma.mcpInstance.update({
+      where: { id },
+      data: updateData,
+    });
+  }
+
+  async delete(id: string): Promise<void> {
+    await this.prisma.mcpInstance.delete({ where: { id } });
+  }
+}

src/mcpd/src/repositories/mcp-profile.repository.ts

@@ -1,46 +0,0 @@
-import type { PrismaClient, McpProfile } from '@prisma/client';
-import type { IMcpProfileRepository } from './interfaces.js';
-import type { CreateMcpProfileInput, UpdateMcpProfileInput } from '../validation/mcp-profile.schema.js';
-
-export class McpProfileRepository implements IMcpProfileRepository {
-  constructor(private readonly prisma: PrismaClient) {}
-
-  async findAll(serverId?: string): Promise<McpProfile[]> {
-    const where = serverId !== undefined ? { serverId } : {};
-    return this.prisma.mcpProfile.findMany({ where, orderBy: { name: 'asc' } });
-  }
-
-  async findById(id: string): Promise<McpProfile | null> {
-    return this.prisma.mcpProfile.findUnique({ where: { id } });
-  }
-
-  async findByServerAndName(serverId: string, name: string): Promise<McpProfile | null> {
-    return this.prisma.mcpProfile.findUnique({
-      where: { name_serverId: { name, serverId } },
-    });
-  }
-
-  async create(data: CreateMcpProfileInput): Promise<McpProfile> {
-    return this.prisma.mcpProfile.create({
-      data: {
-        name: data.name,
-        serverId: data.serverId,
-        permissions: data.permissions,
-        envOverrides: data.envOverrides,
-      },
-    });
-  }
-
-  async update(id: string, data: UpdateMcpProfileInput): Promise<McpProfile> {
-    const updateData: Record<string, unknown> = {};
-    if (data.name !== undefined) updateData['name'] = data.name;
-    if (data.permissions !== undefined) updateData['permissions'] = data.permissions;
-    if (data.envOverrides !== undefined) updateData['envOverrides'] = data.envOverrides;
-
-    return this.prisma.mcpProfile.update({ where: { id }, data: updateData });
-  }
-
-  async delete(id: string): Promise<void> {
-    await this.prisma.mcpProfile.delete({ where: { id } });
-  }
-}

src/mcpd/src/repositories/mcp-server.repository.ts

@@ -1,4 +1,4 @@
-import type { PrismaClient, McpServer } from '@prisma/client';
+import { type PrismaClient, type McpServer, Prisma } from '@prisma/client';
 import type { IMcpServerRepository } from './interfaces.js';
 import type { CreateMcpServerInput, UpdateMcpServerInput } from '../validation/mcp-server.schema.js';
 
@@ -26,7 +26,12 @@ export class McpServerRepository implements IMcpServerRepository {
         dockerImage: data.dockerImage ?? null,
         transport: data.transport,
         repositoryUrl: data.repositoryUrl ?? null,
-        envTemplate: data.envTemplate,
+        externalUrl: data.externalUrl ?? null,
+        command: data.command ?? Prisma.DbNull,
+        containerPort: data.containerPort ?? null,
+        replicas: data.replicas,
+        env: data.env,
+        healthCheck: (data.healthCheck ?? Prisma.JsonNull) as Prisma.InputJsonValue,
       },
     });
   }
@@ -38,7 +43,12 @@ export class McpServerRepository implements IMcpServerRepository {
     if (data.dockerImage !== undefined) updateData['dockerImage'] = data.dockerImage;
     if (data.transport !== undefined) updateData['transport'] = data.transport;
     if (data.repositoryUrl !== undefined) updateData['repositoryUrl'] = data.repositoryUrl;
-    if (data.envTemplate !== undefined) updateData['envTemplate'] = data.envTemplate;
+    if (data.externalUrl !== undefined) updateData['externalUrl'] = data.externalUrl;
+    if (data.command !== undefined) updateData['command'] = data.command;
+    if (data.containerPort !== undefined) updateData['containerPort'] = data.containerPort;
+    if (data.replicas !== undefined) updateData['replicas'] = data.replicas;
+    if (data.env !== undefined) updateData['env'] = data.env;
+    if (data.healthCheck !== undefined) updateData['healthCheck'] = (data.healthCheck ?? Prisma.JsonNull) as Prisma.InputJsonValue;
 
     return this.prisma.mcpServer.update({ where: { id }, data: updateData });
   }

src/mcpd/src/repositories/project.repository.ts

@@ -8,8 +8,6 @@ export interface IProjectRepository {
   create(data: CreateProjectInput & { ownerId: string }): Promise<Project>;
   update(id: string, data: UpdateProjectInput): Promise<Project>;
   delete(id: string): Promise<void>;
-  setProfiles(projectId: string, profileIds: string[]): Promise<void>;
-  getProfileIds(projectId: string): Promise<string[]>;
 }
 
 export class ProjectRepository implements IProjectRepository {
@@ -48,22 +46,4 @@ export class ProjectRepository implements IProjectRepository {
     await this.prisma.project.delete({ where: { id } });
   }
 
-  async setProfiles(projectId: string, profileIds: string[]): Promise<void> {
-    await this.prisma.$transaction([
-      this.prisma.projectMcpProfile.deleteMany({ where: { projectId } }),
-      ...profileIds.map((profileId) =>
-        this.prisma.projectMcpProfile.create({
-          data: { projectId, profileId },
-        }),
-      ),
-    ]);
-  }
-
-  async getProfileIds(projectId: string): Promise<string[]> {
-    const links = await this.prisma.projectMcpProfile.findMany({
-      where: { projectId },
-      select: { profileId: true },
-    });
-    return links.map((l) => l.profileId);
-  }
 }

src/mcpd/src/repositories/secret.repository.ts

@@ -0,0 +1,39 @@
+import { type PrismaClient, type Secret } from '@prisma/client';
+import type { ISecretRepository } from './interfaces.js';
+import type { CreateSecretInput, UpdateSecretInput } from '../validation/secret.schema.js';
+
+export class SecretRepository implements ISecretRepository {
+  constructor(private readonly prisma: PrismaClient) {}
+
+  async findAll(): Promise<Secret[]> {
+    return this.prisma.secret.findMany({ orderBy: { name: 'asc' } });
+  }
+
+  async findById(id: string): Promise<Secret | null> {
+    return this.prisma.secret.findUnique({ where: { id } });
+  }
+
+  async findByName(name: string): Promise<Secret | null> {
+    return this.prisma.secret.findUnique({ where: { name } });
+  }
+
+  async create(data: CreateSecretInput): Promise<Secret> {
+    return this.prisma.secret.create({
+      data: {
+        name: data.name,
+        data: data.data,
+      },
+    });
+  }
+
+  async update(id: string, data: UpdateSecretInput): Promise<Secret> {
+    return this.prisma.secret.update({
+      where: { id },
+      data: { data: data.data },
+    });
+  }
+
+  async delete(id: string): Promise<void> {
+    await this.prisma.secret.delete({ where: { id } });
+  }
+}

src/mcpd/src/repositories/template.repository.ts

@@ -0,0 +1,82 @@
+import { type PrismaClient, type McpTemplate, Prisma } from '@prisma/client';
+import type { CreateTemplateInput, UpdateTemplateInput } from '../validation/template.schema.js';
+
+export interface ITemplateRepository {
+  findAll(): Promise<McpTemplate[]>;
+  findById(id: string): Promise<McpTemplate | null>;
+  findByName(name: string): Promise<McpTemplate | null>;
+  search(pattern: string): Promise<McpTemplate[]>;
+  create(data: CreateTemplateInput): Promise<McpTemplate>;
+  update(id: string, data: UpdateTemplateInput): Promise<McpTemplate>;
+  delete(id: string): Promise<void>;
+}
+
+export class TemplateRepository implements ITemplateRepository {
+  constructor(private readonly prisma: PrismaClient) {}
+
+  async findAll(): Promise<McpTemplate[]> {
+    return this.prisma.mcpTemplate.findMany({ orderBy: { name: 'asc' } });
+  }
+
+  async findById(id: string): Promise<McpTemplate | null> {
+    return this.prisma.mcpTemplate.findUnique({ where: { id } });
+  }
+
+  async findByName(name: string): Promise<McpTemplate | null> {
+    return this.prisma.mcpTemplate.findUnique({ where: { name } });
+  }
+
+  async search(pattern: string): Promise<McpTemplate[]> {
+    // Convert glob * to SQL %
+    const sqlPattern = pattern.replace(/\*/g, '%');
+    return this.prisma.mcpTemplate.findMany({
+      where: { name: { contains: sqlPattern.replace(/%/g, ''), mode: 'insensitive' } },
+      orderBy: { name: 'asc' },
+    });
+  }
+
+  async create(data: CreateTemplateInput): Promise<McpTemplate> {
+    return this.prisma.mcpTemplate.create({
+      data: {
+        name: data.name,
+        version: data.version,
+        description: data.description,
+        packageName: data.packageName ?? null,
+        dockerImage: data.dockerImage ?? null,
+        transport: data.transport,
+        repositoryUrl: data.repositoryUrl ?? null,
+        externalUrl: data.externalUrl ?? null,
+        command: (data.command ?? Prisma.JsonNull) as Prisma.InputJsonValue,
+        containerPort: data.containerPort ?? null,
+        replicas: data.replicas,
+        env: (data.env ?? []) as unknown as Prisma.InputJsonValue,
+        healthCheck: (data.healthCheck ?? Prisma.JsonNull) as Prisma.InputJsonValue,
+      },
+    });
+  }
+
+  async update(id: string, data: UpdateTemplateInput): Promise<McpTemplate> {
+    const updateData: Record<string, unknown> = {};
+    if (data.version !== undefined) updateData.version = data.version;
+    if (data.description !== undefined) updateData.description = data.description;
+    if (data.packageName !== undefined) updateData.packageName = data.packageName;
+    if (data.dockerImage !== undefined) updateData.dockerImage = data.dockerImage;
+    if (data.transport !== undefined) updateData.transport = data.transport;
+    if (data.repositoryUrl !== undefined) updateData.repositoryUrl = data.repositoryUrl;
+    if (data.externalUrl !== undefined) updateData.externalUrl = data.externalUrl;
+    if (data.command !== undefined) updateData.command = (data.command ?? Prisma.JsonNull) as Prisma.InputJsonValue;
+    if (data.containerPort !== undefined) updateData.containerPort = data.containerPort;
+    if (data.replicas !== undefined) updateData.replicas = data.replicas;
+    if (data.env !== undefined) updateData.env = (data.env ?? []) as Prisma.InputJsonValue;
+    if (data.healthCheck !== undefined) updateData.healthCheck = (data.healthCheck ?? Prisma.JsonNull) as Prisma.InputJsonValue;
+
+    return this.prisma.mcpTemplate.update({
+      where: { id },
+      data: updateData,
+    });
+  }
+
+  async delete(id: string): Promise<void> {
+    await this.prisma.mcpTemplate.delete({ where: { id } });
+  }
+}

src/mcpd/src/routes/audit-logs.ts

@@ -0,0 +1,39 @@
+import type { FastifyInstance } from 'fastify';
+import type { AuditLogService } from '../services/audit-log.service.js';
+
+interface AuditLogQuery {
+  userId?: string;
+  action?: string;
+  resource?: string;
+  resourceId?: string;
+  since?: string;
+  until?: string;
+  limit?: string;
+  offset?: string;
+}
+
+export function registerAuditLogRoutes(app: FastifyInstance, service: AuditLogService): void {
+  app.get<{ Querystring: AuditLogQuery }>('/api/v1/audit-logs', async (request) => {
+    const q = request.query;
+    const params: Record<string, unknown> = {};
+    if (q.userId !== undefined) params.userId = q.userId;
+    if (q.action !== undefined) params.action = q.action;
+    if (q.resource !== undefined) params.resource = q.resource;
+    if (q.resourceId !== undefined) params.resourceId = q.resourceId;
+    if (q.since !== undefined) params.since = q.since;
+    if (q.until !== undefined) params.until = q.until;
+    if (q.limit !== undefined) params.limit = parseInt(q.limit, 10);
+    if (q.offset !== undefined) params.offset = parseInt(q.offset, 10);
+    return service.list(params);
+  });
+
+  app.get<{ Params: { id: string } }>('/api/v1/audit-logs/:id', async (request) => {
+    return service.getById(request.params.id);
+  });
+
+  app.post('/api/v1/audit-logs/purge', async (_request, reply) => {
+    const deleted = await service.purgeExpired();
+    reply.code(200);
+    return { deleted };
+  });
+}

src/mcpd/src/routes/auth.ts

@@ -0,0 +1,31 @@
+import type { FastifyInstance } from 'fastify';
+import type { AuthService } from '../services/auth.service.js';
+import { createAuthMiddleware } from '../middleware/auth.js';
+
+export interface AuthRouteDeps {
+  authService: AuthService;
+}
+
+export function registerAuthRoutes(app: FastifyInstance, deps: AuthRouteDeps): void {
+  const authMiddleware = createAuthMiddleware({
+    findSession: (token) => deps.authService.findSession(token),
+  });
+
+  // POST /api/v1/auth/login — no auth required
+  app.post<{
+    Body: { email: string; password: string };
+  }>('/api/v1/auth/login', async (request) => {
+    const { email, password } = request.body;
+    const result = await deps.authService.login(email, password);
+    return result;
+  });
+
+  // POST /api/v1/auth/logout — auth required
+  app.post('/api/v1/auth/logout', { preHandler: [authMiddleware] }, async (request) => {
+    const header = request.headers.authorization;
+    // Auth middleware already validated the header; extract the token
+    const token = header!.slice(7);
+    await deps.authService.logout(token);
+    return { success: true };
+  });
+}

src/mcpd/src/routes/backup.ts

@@ -0,0 +1,60 @@
+import type { FastifyInstance } from 'fastify';
+import type { BackupService } from '../services/backup/backup-service.js';
+import type { RestoreService } from '../services/backup/restore-service.js';
+import type { BackupBundle, BackupOptions } from '../services/backup/backup-service.js';
+import type { ConflictStrategy, RestoreOptions } from '../services/backup/restore-service.js';
+
+export interface BackupDeps {
+  backupService: BackupService;
+  restoreService: RestoreService;
+}
+
+export function registerBackupRoutes(app: FastifyInstance, deps: BackupDeps): void {
+  app.post<{
+    Body: {
+      password?: string;
+      resources?: Array<'servers' | 'secrets' | 'projects'>;
+    };
+  }>('/api/v1/backup', async (request) => {
+    const opts: BackupOptions = {};
+    if (request.body?.password) {
+      opts.password = request.body.password;
+    }
+    if (request.body?.resources) {
+      opts.resources = request.body.resources;
+    }
+    const bundle = await deps.backupService.createBackup(opts);
+    return bundle;
+  });
+
+  app.post<{
+    Body: {
+      bundle: BackupBundle;
+      password?: string;
+      conflictStrategy?: ConflictStrategy;
+    };
+  }>('/api/v1/restore', async (request, reply) => {
+    const { bundle, password, conflictStrategy } = request.body;
+
+    if (!deps.restoreService.validateBundle(bundle)) {
+      reply.code(400);
+      return { error: 'Invalid backup bundle format', statusCode: 400 };
+    }
+
+    const restoreOpts: RestoreOptions = {};
+    if (password) {
+      restoreOpts.password = password;
+    }
+    if (conflictStrategy) {
+      restoreOpts.conflictStrategy = conflictStrategy;
+    }
+
+    const result = await deps.restoreService.restore(bundle, restoreOpts);
+
+    if (result.errors.length > 0 && result.serversCreated === 0 && result.secretsCreated === 0 && result.projectsCreated === 0) {
+      reply.code(422);
+    }
+
+    return result;
+  });
+}

src/mcpd/src/routes/health-monitoring.ts

@@ -0,0 +1,39 @@
+import type { FastifyInstance } from 'fastify';
+import type { HealthAggregator } from '../services/health-aggregator.js';
+import type { MetricsCollector } from '../services/metrics-collector.js';
+
+export interface HealthMonitoringDeps {
+  healthAggregator: HealthAggregator;
+  metricsCollector: MetricsCollector;
+}
+
+export function registerHealthMonitoringRoutes(app: FastifyInstance, deps: HealthMonitoringDeps): void {
+  app.get('/api/v1/health/overview', async () => {
+    return deps.healthAggregator.getOverview();
+  });
+
+  app.get<{ Params: { id: string } }>('/api/v1/health/instances/:id', async (request, reply) => {
+    const health = deps.healthAggregator.getInstanceHealth(request.params.id);
+    if (!health) {
+      reply.code(404);
+      return { error: `Instance '${request.params.id}' not found`, statusCode: 404 };
+    }
+    return health;
+  });
+
+  app.get('/api/v1/metrics', async () => {
+    const allMetrics = deps.metricsCollector.getAllMetrics();
+    return {
+      instances: allMetrics.map((m) => ({
+        instanceId: m.instanceId,
+        status: m.status,
+        uptime: m.uptime,
+        requestCount: m.requestCount,
+        errorCount: m.errorCount,
+        errorRate: m.requestCount > 0 ? m.errorCount / m.requestCount : 0,
+        lastRequestAt: m.lastRequestAt?.toISOString() ?? null,
+      })),
+      timestamp: new Date().toISOString(),
+    };
+  });
+}

src/mcpd/src/routes/index.ts

@@ -1,5 +1,16 @@
 export { registerHealthRoutes } from './health.js';
 export type { HealthDeps } from './health.js';
 export { registerMcpServerRoutes } from './mcp-servers.js';
-export { registerMcpProfileRoutes } from './mcp-profiles.js';
+export { registerSecretRoutes } from './secrets.js';
 export { registerProjectRoutes } from './projects.js';
+export { registerInstanceRoutes } from './instances.js';
+export { registerAuditLogRoutes } from './audit-logs.js';
+export { registerHealthMonitoringRoutes } from './health-monitoring.js';
+export type { HealthMonitoringDeps } from './health-monitoring.js';
+export { registerBackupRoutes } from './backup.js';
+export type { BackupDeps } from './backup.js';
+export { registerAuthRoutes } from './auth.js';
+export type { AuthRouteDeps } from './auth.js';
+export { registerMcpProxyRoutes } from './mcp-proxy.js';
+export type { McpProxyRouteDeps } from './mcp-proxy.js';
+export { registerTemplateRoutes } from './templates.js';

src/mcpd/src/routes/instances.ts

@@ -0,0 +1,34 @@
+import type { FastifyInstance } from 'fastify';
+import type { InstanceService } from '../services/instance.service.js';
+
+export function registerInstanceRoutes(app: FastifyInstance, service: InstanceService): void {
+  app.get<{ Querystring: { serverId?: string } }>('/api/v1/instances', async (request) => {
+    return service.list(request.query.serverId);
+  });
+
+  app.get<{ Params: { id: string } }>('/api/v1/instances/:id', async (request) => {
+    return service.getById(request.params.id);
+  });
+
+  app.delete<{ Params: { id: string } }>('/api/v1/instances/:id', async (request, reply) => {
+    const { serverId } = await service.remove(request.params.id);
+    // Reconcile: server will auto-create a replacement if replicas > 0
+    await service.reconcile(serverId);
+    reply.code(204);
+  });
+
+  app.get<{ Params: { id: string } }>('/api/v1/instances/:id/inspect', async (request) => {
+    return service.inspect(request.params.id);
+  });
+
+  app.get<{ Params: { id: string }; Querystring: { tail?: string } }>(
+    '/api/v1/instances/:id/logs',
+    async (request) => {
+      const opts: { tail?: number } = {};
+      if (request.query.tail) {
+        opts.tail = parseInt(request.query.tail, 10);
+      }
+      return service.getLogs(request.params.id, opts);
+    },
+  );
+}

src/mcpd/src/routes/mcp-profiles.ts

@@ -1,27 +0,0 @@
-import type { FastifyInstance } from 'fastify';
-import type { McpProfileService } from '../services/mcp-profile.service.js';
-
-export function registerMcpProfileRoutes(app: FastifyInstance, service: McpProfileService): void {
-  app.get<{ Querystring: { serverId?: string } }>('/api/v1/profiles', async (request) => {
-    return service.list(request.query.serverId);
-  });
-
-  app.get<{ Params: { id: string } }>('/api/v1/profiles/:id', async (request) => {
-    return service.getById(request.params.id);
-  });
-
-  app.post('/api/v1/profiles', async (request, reply) => {
-    const profile = await service.create(request.body);
-    reply.code(201);
-    return profile;
-  });
-
-  app.put<{ Params: { id: string } }>('/api/v1/profiles/:id', async (request) => {
-    return service.update(request.params.id, request.body);
-  });
-
-  app.delete<{ Params: { id: string } }>('/api/v1/profiles/:id', async (request, reply) => {
-    await service.delete(request.params.id);
-    reply.code(204);
-  });
-}