Merge pull request 'development' (#57) from development into main

Reviewed-on: #57
2026-01-21 16:56:12 +00:00
parent 39105688a5 f781c6f7b1
commit 6c142a9710
11 changed files with 72 additions and 83 deletions
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -140,7 +140,7 @@ leo-claude-mktplace/

 | Level | Location | Purpose |
 |-------|----------|---------|
-| System | `~/.config/claude/gitea.env` | Credentials (GITEA_URL, GITEA_TOKEN) |
+| System | `~/.config/claude/gitea.env` | Credentials (GITEA_API_URL, GITEA_API_TOKEN) |
 | Project | `.env` in project root | Repository specification (GITEA_ORG, GITEA_REPO) |

 **Note:** `GITEA_ORG` is at project level since different projects may belong to different organizations.
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ AI-guided sprint planning with full Gitea integration. Transforms a proven 15-sp
 - Branch-aware security (development/staging/production)
 - Pre-sprint-close code quality review and test verification

-**Commands:** `/sprint-plan`, `/sprint-start`, `/sprint-status`, `/sprint-close`, `/labels-sync`, `/initial-setup`, `/review`, `/test-check`, `/test-gen`
+**Commands:** `/sprint-plan`, `/sprint-start`, `/sprint-status`, `/sprint-close`, `/labels-sync`, `/initial-setup`, `/project-init`, `/project-sync`, `/review`, `/test-check`, `/test-gen`

 #### [git-flow](./plugins/git-flow/README.md) *NEW in v3.0.0*
 **Git Workflow Automation**
@@ -44,7 +44,7 @@ Comprehensive pull request review using specialized agents.
 - Actionable feedback with suggested fixes
 - Gitea integration for automated review submission

-**Commands:** `/pr-review`, `/pr-summary`, `/pr-findings`
+**Commands:** `/pr-review`, `/pr-summary`, `/pr-findings`, `/initial-setup`, `/project-init`, `/project-sync`

 #### [claude-config-maintainer](./plugins/claude-config-maintainer/README.md)
 **CLAUDE.md Optimization and Maintenance**
@@ -94,7 +94,7 @@ Security vulnerability detection and code refactoring tools.

 Full CRUD operations for network infrastructure management directly from Claude Code.

-**Commands:** `/cmdb-search`, `/cmdb-device`, `/cmdb-ip`, `/cmdb-site`
+**Commands:** `/initial-setup`, `/cmdb-search`, `/cmdb-device`, `/cmdb-ip`, `/cmdb-site`

 ## MCP Servers

@@ -157,47 +157,32 @@ Add to `.claude/settings.json` in your target project:
 }
 ```

-### Configure MCP Server Dependencies
+### Run Interactive Setup

-Install dependencies for shared MCP servers:
+After installing plugins, run the setup wizard:

-```bash
-# Gitea MCP (for projman, pr-review)
-cd mcp-servers/gitea
-python3 -m venv .venv
-source .venv/bin/activate
-pip install -r requirements.txt
-deactivate
-
-# NetBox MCP (for cmdb-assistant)
-cd ../netbox
-python3 -m venv .venv
-source .venv/bin/activate
-pip install -r requirements.txt
-deactivate
+```
+/initial-setup
 ```

-### Configure Credentials
+The wizard handles everything:
+- Sets up MCP server (Python venv + dependencies)
+- Creates system config (`~/.config/claude/gitea.env`)
+- Guides you through adding your API token
+- Detects and validates your repository via API
+- Creates project config (`.env`)

-See [docs/CONFIGURATION.md](./docs/CONFIGURATION.md) for complete setup instructions.
-
-**Quick start:**
-```bash
-mkdir -p ~/.config/claude
-
-# Gitea credentials
-cat > ~/.config/claude/gitea.env << 'EOF'
-GITEA_URL=https://gitea.example.com
-GITEA_TOKEN=your_token
-GITEA_ORG=your_org
-EOF
-chmod 600 ~/.config/claude/gitea.env
-
-# Project-level settings
-cat > .env << 'EOF'
-GITEA_REPO=your-repository-name
-EOF
+**For new projects** (when system is already configured):
 ```
+/project-init
+```
+
+**After moving a repository:**
+```
+/project-sync
+```
+
+See [docs/CONFIGURATION.md](./docs/CONFIGURATION.md) for manual setup and advanced options.

 ## Verifying Plugin Installation

@@ -269,6 +254,8 @@ leo-claude-mktplace/
 |----------|-------------|
 | [CLAUDE.md](./CLAUDE.md) | Main project instructions |
 | [CONFIGURATION.md](./docs/CONFIGURATION.md) | Centralized setup guide |
+| [COMMANDS-CHEATSHEET.md](./docs/COMMANDS-CHEATSHEET.md) | All commands quick reference |
+| [UPDATING.md](./docs/UPDATING.md) | Update guide for the marketplace |
 | [CANONICAL-PATHS.md](./docs/CANONICAL-PATHS.md) | Authoritative path reference |
 | [CHANGELOG.md](./CHANGELOG.md) | Version history |

--- a/docs/CONFIGURATION.md
+++ b/docs/CONFIGURATION.md
@@ -160,8 +160,8 @@ This marketplace uses a **hybrid configuration** approach:
 │                    SYSTEM-LEVEL (once per machine)             │
 │                    ~/.config/claude/                            │
 ├─────────────────────────────────────────────────────────────────┤
-│  gitea.env     │  GITEA_URL, GITEA_TOKEN                       │
-│  netbox.env    │  NETBOX_URL, NETBOX_TOKEN                     │
+│  gitea.env     │  GITEA_API_URL, GITEA_API_TOKEN                       │
+│  netbox.env    │  NETBOX_API_URL, NETBOX_API_TOKEN                     │
 │  git-flow.env  │  GIT_WORKFLOW_STYLE, GIT_DEFAULT_BASE, etc.   │
 └─────────────────────────────────────────────────────────────────┘
                              │
@@ -250,8 +250,8 @@ mkdir -p ~/.config/claude

 # Gitea configuration (credentials only)
 cat > ~/.config/claude/gitea.env << 'EOF'
-GITEA_URL=https://gitea.example.com
-GITEA_TOKEN=your_token_here
+GITEA_API_URL=https://gitea.example.com
+GITEA_API_TOKEN=your_token_here
 EOF
 chmod 600 ~/.config/claude/gitea.env
 ```
@@ -298,14 +298,14 @@ Located in `~/.config/claude/`:

 ```bash
 # ~/.config/claude/gitea.env
-GITEA_URL=https://gitea.example.com
-GITEA_TOKEN=your_gitea_token_here
+GITEA_API_URL=https://gitea.example.com/api/v1
+GITEA_API_TOKEN=your_gitea_token_here
 ```

 | Variable | Description | Example |
 |----------|-------------|---------|
-| `GITEA_URL` | Gitea base URL (no `/api/v1`) | `https://gitea.example.com` |
-| `GITEA_TOKEN` | Personal access token | `abc123...` |
+| `GITEA_API_URL` | Gitea API endpoint (with `/api/v1`) | `https://gitea.example.com/api/v1` |
+| `GITEA_API_TOKEN` | Personal access token | `abc123...` |

 **Note:** `GITEA_ORG` is configured at the project level (see below) since different projects may belong to different organizations.

@@ -323,14 +323,14 @@ GITEA_TOKEN=your_gitea_token_here

 ```bash
 # ~/.config/claude/netbox.env
-NETBOX_URL=https://netbox.example.com
-NETBOX_TOKEN=your_netbox_token_here
+NETBOX_API_URL=https://netbox.example.com
+NETBOX_API_TOKEN=your_netbox_token_here
 ```

 | Variable | Description | Example |
 |----------|-------------|---------|
-| `NETBOX_URL` | NetBox base URL | `https://netbox.example.com` |
-| `NETBOX_TOKEN` | API token | `abc123...` |
+| `NETBOX_API_URL` | NetBox base URL | `https://netbox.example.com` |
+| `NETBOX_API_TOKEN` | API token | `abc123...` |

 ### Git-Flow Configuration

@@ -456,7 +456,7 @@ This helps when you:

 ```bash
 source ~/.config/claude/gitea.env
-curl -H "Authorization: token $GITEA_TOKEN" "$GITEA_URL/api/v1/user"
+curl -H "Authorization: token $GITEA_API_TOKEN" "$GITEA_API_URL/user"
 ```

 ### Verify Project Setup
@@ -492,7 +492,7 @@ stat ~/.config/claude/gitea.env
 ```bash
 # Test token directly
 source ~/.config/claude/gitea.env
-curl -H "Authorization: token $GITEA_TOKEN" "$GITEA_URL/api/v1/user"
+curl -H "Authorization: token $GITEA_API_TOKEN" "$GITEA_API_URL/user"
 ```

 If you get 401, regenerate your token in Gitea.
--- a/plugins/cmdb-assistant/commands/initial-setup.md
+++ b/plugins/cmdb-assistant/commands/initial-setup.md
@@ -84,8 +84,8 @@ cat > ~/.config/claude/netbox.env << 'EOF'
 # NetBox API Configuration
 # Generated by cmdb-assistant /initial-setup

-NETBOX_URL=<USER_PROVIDED_URL>
-NETBOX_TOKEN=PASTE_YOUR_TOKEN_HERE
+NETBOX_API_URL=<USER_PROVIDED_URL>
+NETBOX_API_TOKEN=PASTE_YOUR_TOKEN_HERE
 EOF
 chmod 600 ~/.config/claude/netbox.env
 ```
@@ -120,7 +120,7 @@ Use AskUserQuestion:
 ### Step 4.1: Test Configuration (if token was added)

 ```bash
-source ~/.config/claude/netbox.env && curl -s -o /dev/null -w "%{http_code}" -H "Authorization: Token $NETBOX_TOKEN" "$NETBOX_URL/api/"
+source ~/.config/claude/netbox.env && curl -s -o /dev/null -w "%{http_code}" -H "Authorization: Token $NETBOX_API_TOKEN" "$NETBOX_API_URL/api/"
 ```

 Report result:
--- a/plugins/pr-review/commands/initial-setup.md
+++ b/plugins/pr-review/commands/initial-setup.md
@@ -97,8 +97,8 @@ cat > ~/.config/claude/gitea.env << 'EOF'
 # Generated by pr-review /initial-setup
 # Note: GITEA_ORG is configured per-project in .env

-GITEA_URL=<USER_PROVIDED_URL>
-GITEA_TOKEN=PASTE_YOUR_TOKEN_HERE
+GITEA_API_URL=<USER_PROVIDED_URL>
+GITEA_API_TOKEN=PASTE_YOUR_TOKEN_HERE
 EOF
 chmod 600 ~/.config/claude/gitea.env
 ```
@@ -163,7 +163,7 @@ git remote get-url origin 2>/dev/null | sed 's/.*[:/]\([^/]*\)\.git$/\1/' | sed

 ```bash
 source ~/.config/claude/gitea.env
-curl -s -o /dev/null -w "%{http_code}" -H "Authorization: token $GITEA_TOKEN" "$GITEA_URL/api/v1/repos/<detected-org>/<detected-repo>"
+curl -s -o /dev/null -w "%{http_code}" -H "Authorization: token $GITEA_API_TOKEN" "$GITEA_API_URL/repos/<detected-org>/<detected-repo>"
 ```

 | HTTP Code | Action |
@@ -229,7 +229,7 @@ If customize, ask about:
 ### Step 4.1: Test Configuration (if token was added)

 ```bash
-source ~/.config/claude/gitea.env && curl -s -o /dev/null -w "%{http_code}" -H "Authorization: token $GITEA_TOKEN" "$GITEA_URL/api/v1/user"
+source ~/.config/claude/gitea.env && curl -s -o /dev/null -w "%{http_code}" -H "Authorization: token $GITEA_API_TOKEN" "$GITEA_API_URL/user"
 ```

 Report result:
--- a/plugins/pr-review/commands/project-init.md
+++ b/plugins/pr-review/commands/project-init.md
@@ -18,7 +18,7 @@ Fast setup for a new project when system-level configuration is already complete
 ### Step 1: Verify System Configuration

 ```bash
-cat ~/.config/claude/gitea.env 2>/dev/null | grep -v "^#" | grep -v "PASTE_YOUR" | grep "GITEA_TOKEN=" && echo "SYSTEM_OK" || echo "SYSTEM_MISSING"
+cat ~/.config/claude/gitea.env 2>/dev/null | grep -v "^#" | grep -v "PASTE_YOUR" | grep "GITEA_API_TOKEN=" && echo "SYSTEM_OK" || echo "SYSTEM_MISSING"
 ```

 **If SYSTEM_MISSING:**
@@ -67,7 +67,7 @@ git remote get-url origin 2>/dev/null | sed 's/.*[:/]\([^/]*\)\.git$/\1/' | sed

 ```bash
 source ~/.config/claude/gitea.env
-curl -s -o /dev/null -w "%{http_code}" -H "Authorization: token $GITEA_TOKEN" "$GITEA_URL/api/v1/repos/<detected-org>/<detected-repo>"
+curl -s -o /dev/null -w "%{http_code}" -H "Authorization: token $GITEA_API_TOKEN" "$GITEA_API_URL/repos/<detected-org>/<detected-repo>"
 ```

 | HTTP Code | Action |
--- a/plugins/pr-review/commands/project-sync.md
+++ b/plugins/pr-review/commands/project-sync.md
@@ -17,7 +17,7 @@ Updates project configuration when the git remote URL has changed.
 ## Step 1: Verify System Configuration

 ```bash
-cat ~/.config/claude/gitea.env 2>/dev/null | grep -v "^#" | grep -v "PASTE_YOUR" | grep "GITEA_TOKEN=" && echo "SYSTEM_OK" || echo "SYSTEM_MISSING"
+cat ~/.config/claude/gitea.env 2>/dev/null | grep -v "^#" | grep -v "PASTE_YOUR" | grep "GITEA_API_TOKEN=" && echo "SYSTEM_OK" || echo "SYSTEM_MISSING"
 ```

 **If SYSTEM_MISSING:** Run `/initial-setup` first.
@@ -59,7 +59,7 @@ Extract organization and repository from URL.

 ```bash
 source ~/.config/claude/gitea.env
-curl -s -o /dev/null -w "%{http_code}" -H "Authorization: token $GITEA_TOKEN" "$GITEA_URL/api/v1/repos/<NEW_ORG>/<NEW_REPO>"
+curl -s -o /dev/null -w "%{http_code}" -H "Authorization: token $GITEA_API_TOKEN" "$GITEA_API_URL/repos/<NEW_ORG>/<NEW_REPO>"
 ```

 | Code | Action |
--- a/plugins/projman/commands/initial-setup.md
+++ b/plugins/projman/commands/initial-setup.md
@@ -19,7 +19,7 @@ This command guides the user through complete projman setup interactively. It ha
 **FIRST**, check if system-level setup is already complete:

 ```bash
-cat ~/.config/claude/gitea.env 2>/dev/null | grep -v "^#" | grep -v "PASTE_YOUR" | grep -v "example.com" | grep "GITEA_TOKEN=" && echo "SYSTEM_CONFIGURED" || echo "SYSTEM_NEEDS_SETUP"
+cat ~/.config/claude/gitea.env 2>/dev/null | grep -v "^#" | grep -v "PASTE_YOUR" | grep -v "example.com" | grep "GITEA_API_TOKEN=" && echo "SYSTEM_CONFIGURED" || echo "SYSTEM_NEEDS_SETUP"
 ```

 **If SYSTEM_CONFIGURED:**
@@ -168,8 +168,8 @@ cat > ~/.config/claude/gitea.env << 'EOF'
 # Generated by /initial-setup
 # Note: GITEA_ORG is configured per-project in .env

-GITEA_URL=<USER_PROVIDED_URL>
-GITEA_TOKEN=PASTE_YOUR_TOKEN_HERE
+GITEA_API_URL=<USER_PROVIDED_URL>
+GITEA_API_TOKEN=PASTE_YOUR_TOKEN_HERE
 EOF
 chmod 600 ~/.config/claude/gitea.env
 ```
@@ -225,15 +225,17 @@ Use AskUserQuestion:
 Read the config file and verify it has non-placeholder values:

 ```bash
-source ~/.config/claude/gitea.env && echo "URL: $GITEA_URL" && echo "ORG: $GITEA_ORG" && echo "TOKEN_LENGTH: ${#GITEA_TOKEN}"
+source ~/.config/claude/gitea.env && echo "URL: $GITEA_API_URL" && echo "TOKEN_LENGTH: ${#GITEA_API_TOKEN}"
 ```

 If TOKEN_LENGTH is less than 10 or contains "PASTE" or "your_", the token hasn't been set properly.

+**Note:** GITEA_ORG is configured per-project in `.env`, not in the system-level config.
+
 **Test connectivity (optional but recommended):**

 ```bash
-source ~/.config/claude/gitea.env && curl -s -o /dev/null -w "%{http_code}" -H "Authorization: token $GITEA_TOKEN" "$GITEA_URL/api/v1/user"
+source ~/.config/claude/gitea.env && curl -s -o /dev/null -w "%{http_code}" -H "Authorization: token $GITEA_API_TOKEN" "$GITEA_API_URL/user"
 ```

 - **200:** Success! Credentials are valid.
@@ -327,7 +329,7 @@ git remote get-url origin 2>/dev/null | sed 's/.*[:/]\([^/]*\)\.git$/\1/' | sed

 ```bash
 source ~/.config/claude/gitea.env
-curl -s -o /dev/null -w "%{http_code}" -H "Authorization: token $GITEA_TOKEN" "$GITEA_URL/api/v1/repos/<detected-org>/<detected-repo>"
+curl -s -o /dev/null -w "%{http_code}" -H "Authorization: token $GITEA_API_TOKEN" "$GITEA_API_URL/repos/<detected-org>/<detected-repo>"
 ```

 **Based on response:**
--- a/plugins/projman/commands/project-init.md
+++ b/plugins/projman/commands/project-init.md
@@ -24,7 +24,7 @@ Fast setup for a new project when system-level configuration is already complete
 Quickly verify system setup is complete:

 ```bash
-cat ~/.config/claude/gitea.env 2>/dev/null | grep -v "^#" | grep -v "PASTE_YOUR" | grep "GITEA_TOKEN=" && echo "SYSTEM_OK" || echo "SYSTEM_MISSING"
+cat ~/.config/claude/gitea.env 2>/dev/null | grep -v "^#" | grep -v "PASTE_YOUR" | grep "GITEA_API_TOKEN=" && echo "SYSTEM_OK" || echo "SYSTEM_MISSING"
 ```

 **If SYSTEM_MISSING:**
@@ -107,7 +107,7 @@ Verify the repository exists and is accessible:

 ```bash
 source ~/.config/claude/gitea.env
-curl -s -o /dev/null -w "%{http_code}" -H "Authorization: token $GITEA_TOKEN" "$GITEA_URL/api/v1/repos/<detected-org>/<detected-repo>"
+curl -s -o /dev/null -w "%{http_code}" -H "Authorization: token $GITEA_API_TOKEN" "$GITEA_API_URL/repos/<detected-org>/<detected-repo>"
 ```

 | HTTP Code | Action |
--- a/plugins/projman/commands/project-sync.md
+++ b/plugins/projman/commands/project-sync.md
@@ -17,7 +17,7 @@ Updates project configuration when the git remote URL has changed (repository mo
 ## Step 1: Verify System Configuration

 ```bash
-cat ~/.config/claude/gitea.env 2>/dev/null | grep -v "^#" | grep -v "PASTE_YOUR" | grep "GITEA_TOKEN=" && echo "SYSTEM_OK" || echo "SYSTEM_MISSING"
+cat ~/.config/claude/gitea.env 2>/dev/null | grep -v "^#" | grep -v "PASTE_YOUR" | grep "GITEA_API_TOKEN=" && echo "SYSTEM_OK" || echo "SYSTEM_MISSING"
 ```

 **If SYSTEM_MISSING:** Stop and instruct user to run `/initial-setup` first.
@@ -109,7 +109,7 @@ Verify the new repository exists and is accessible:

 ```bash
 source ~/.config/claude/gitea.env
-curl -s -o /dev/null -w "%{http_code}" -H "Authorization: token $GITEA_TOKEN" "$GITEA_URL/api/v1/repos/<NEW_ORG>/<NEW_REPO>"
+curl -s -o /dev/null -w "%{http_code}" -H "Authorization: token $GITEA_API_TOKEN" "$GITEA_API_URL/repos/<NEW_ORG>/<NEW_REPO>"
 ```

 | HTTP Code | Action |
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -134,10 +134,10 @@ setup_config_templates() {
        cat > "$config_dir/gitea.env" << 'EOF'
 # Gitea API Configuration
 # Update these values with your Gitea instance details
+# Note: GITEA_ORG is configured per-project in .env

-GITEA_URL=https://gitea.example.com
-GITEA_TOKEN=your_gitea_token_here
-GITEA_ORG=your_organization_name
+GITEA_API_URL=https://gitea.example.com/api/v1
+GITEA_API_TOKEN=your_gitea_token_here
 EOF
        chmod 600 "$config_dir/gitea.env"
        log_success "gitea.env template created"
@@ -152,8 +152,8 @@ EOF
 # NetBox API Configuration
 # Update these values with your NetBox instance details

-NETBOX_URL=https://netbox.example.com
-NETBOX_TOKEN=your_netbox_token_here
+NETBOX_API_URL=https://netbox.example.com/api
+NETBOX_API_TOKEN=your_netbox_token_here
 EOF
        chmod 600 "$config_dir/netbox.env"
        log_success "netbox.env template created"
@@ -189,8 +189,8 @@ validate_config() {
    # Check Gitea config has real values
    if [[ -f "$config_dir/gitea.env" ]]; then
        source "$config_dir/gitea.env"
-        if [[ "${GITEA_TOKEN:-}" == "your_gitea_token_here" ]] || [[ -z "${GITEA_TOKEN:-}" ]]; then
-            log_todo "Update GITEA_TOKEN in ~/.config/claude/gitea.env"
+        if [[ "${GITEA_API_TOKEN:-}" == "your_gitea_token_here" ]] || [[ -z "${GITEA_API_TOKEN:-}" ]]; then
+            log_todo "Update GITEA_API_TOKEN in ~/.config/claude/gitea.env"
        else
            log_success "Gitea configuration appears valid"
        fi
@@ -199,8 +199,8 @@ validate_config() {
    # Check NetBox config has real values
    if [[ -f "$config_dir/netbox.env" ]]; then
        source "$config_dir/netbox.env"
-        if [[ "${NETBOX_TOKEN:-}" == "your_netbox_token_here" ]] || [[ -z "${NETBOX_TOKEN:-}" ]]; then
-            log_todo "Update NETBOX_TOKEN in ~/.config/claude/netbox.env"
+        if [[ "${NETBOX_API_TOKEN:-}" == "your_netbox_token_here" ]] || [[ -z "${NETBOX_API_TOKEN:-}" ]]; then
+            log_todo "Update NETBOX_API_TOKEN in ~/.config/claude/netbox.env"
        else
            log_success "NetBox configuration appears valid"
        fi