Initial plan

2026-03-17 19:03:08 +00:00 · 2026-02-25 18:55:39 +00:00
54 changed files with 790 additions and 6264 deletions
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -50,6 +50,8 @@
 		"kilocode.Kilo-Code",
 		// Roo Code
 		"RooVeterinaryInc.roo-cline",
+		// Amazon Developer Q
+		"AmazonWebServices.amazon-q-vscode",
 		// Claude Code
 		"anthropic.claude-code"
 	],
--- a/.devcontainer/post-create.sh
+++ b/.devcontainer/post-create.sh
@@ -8,15 +8,15 @@ run_command() {
    local command_to_run="$*"
    local output
    local exit_code
-
+    
    # Capture all output (stdout and stderr)
    output=$(eval "$command_to_run" 2>&1) || exit_code=$?
    exit_code=${exit_code:-0}
-
+    
    if [ $exit_code -ne 0 ]; then
        echo -e "\033[0;31m[ERROR] Command failed (Exit Code $exit_code): $command_to_run\033[0m" >&2
        echo -e "\033[0;31m$output\033[0m" >&2
-
+        
        exit $exit_code
    fi
 }
@@ -51,38 +51,32 @@ echo -e "\n🤖 Installing OpenCode CLI..."
 run_command "npm install -g opencode-ai@latest"
 echo "✅ Done"

-echo -e "\n🤖 Installing Kiro CLI..."
-# https://kiro.dev/docs/cli/
-KIRO_INSTALLER_URL="https://kiro.dev/install.sh"
-KIRO_INSTALLER_SHA256="7487a65cf310b7fb59b357c4b5e6e3f3259d383f4394ecedb39acf70f307cffb"
-KIRO_INSTALLER_PATH="$(mktemp)"
+echo -e "\n🤖 Installing Amazon Q CLI..."
+# 👉🏾 https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/command-line-verify-download.html

-cleanup_kiro_installer() {
-  rm -f "$KIRO_INSTALLER_PATH"
-}
-trap cleanup_kiro_installer EXIT
+run_command "curl --proto '=https' --tlsv1.2 -sSf 'https://desktop-release.q.us-east-1.amazonaws.com/latest/q-x86_64-linux.zip' -o 'q.zip'"
+run_command "curl --proto '=https' --tlsv1.2 -sSf 'https://desktop-release.q.us-east-1.amazonaws.com/latest/q-x86_64-linux.zip.sig' -o 'q.zip.sig'"
+cat > amazonq-public-key.asc << 'EOF'
+-----BEGIN PGP PUBLIC KEY BLOCK-----

-run_command "curl -fsSL \"$KIRO_INSTALLER_URL\" -o \"$KIRO_INSTALLER_PATH\""
-run_command "echo \"$KIRO_INSTALLER_SHA256  $KIRO_INSTALLER_PATH\" | sha256sum -c -"
-
-run_command "bash \"$KIRO_INSTALLER_PATH\""
-
-kiro_binary=""
-if command -v kiro-cli >/dev/null 2>&1; then
-  kiro_binary="kiro-cli"
-elif command -v kiro >/dev/null 2>&1; then
-  kiro_binary="kiro"
-else
-  echo -e "\033[0;31m[ERROR] Kiro CLI installation did not create 'kiro-cli' or 'kiro' in PATH.\033[0m" >&2
-  exit 1
-fi
-
-run_command "$kiro_binary --help > /dev/null"
-echo "✅ Done"
-
-echo -e "\n🤖 Installing Kimi CLI..."
-# https://code.kimi.com
-run_command "pipx install kimi-cli"
+mDMEZig60RYJKwYBBAHaRw8BAQdAy/+G05U5/EOA72WlcD4WkYn5SInri8pc4Z6D
+BKNNGOm0JEFtYXpvbiBRIENMSSBUZWFtIDxxLWNsaUBhbWF6b24uY29tPoiZBBMW
+CgBBFiEEmvYEF+gnQskUPgPsUNx6jcJMVmcFAmYoOtECGwMFCQPCZwAFCwkIBwIC
+IgIGFQoJCAsCBBYCAwECHgcCF4AACgkQUNx6jcJMVmef5QD/QWWEGG/cOnbDnp68
+SJXuFkwiNwlH2rPw9ZRIQMnfAS0A/0V6ZsGB4kOylBfc7CNfzRFGtovdBBgHqA6P
+zQ/PNscGuDgEZig60RIKKwYBBAGXVQEFAQEHQC4qleONMBCq3+wJwbZSr0vbuRba
+D1xr4wUPn4Avn4AnAwEIB4h+BBgWCgAmFiEEmvYEF+gnQskUPgPsUNx6jcJMVmcF
+AmYoOtECGwwFCQPCZwAACgkQUNx6jcJMVmchMgEA6l3RveCM0YHAGQaSFMkguoAo
+vK6FgOkDawgP0NPIP2oA/jIAO4gsAntuQgMOsPunEdDeji2t+AhV02+DQIsXZpoB
+=f8yY
+-----END PGP PUBLIC KEY BLOCK-----
+EOF
+run_command "gpg --batch --import amazonq-public-key.asc"
+run_command "gpg --verify q.zip.sig q.zip"
+run_command "unzip -q q.zip"
+run_command "chmod +x ./q/install.sh"
+run_command "./q/install.sh --no-confirm"
+run_command "rm -rf ./q q.zip q.zip.sig amazonq-public-key.asc"
 echo "✅ Done"

 echo -e "\n🤖 Installing CodeBuddy CLI..."
--- a/.github/ISSUE_TEMPLATE/agent_request.yml
+++ b/.github/ISSUE_TEMPLATE/agent_request.yml
@@ -8,7 +8,7 @@ body:
      value: |
        Thanks for requesting a new agent! Before submitting, please check if the agent is already supported.
        
-        **Currently supported agents**: Claude Code, Gemini CLI, GitHub Copilot, Cursor, Qwen Code, opencode, Codex CLI, Windsurf, Kilo Code, Auggie CLI, Roo Code, CodeBuddy, Qoder CLI, Kiro CLI, Amp, SHAI, IBM Bob, Antigravity
+        **Currently supported agents**: Claude Code, Gemini CLI, GitHub Copilot, Cursor, Qwen Code, opencode, Codex CLI, Windsurf, Kilo Code, Auggie CLI, Roo Code, CodeBuddy, Qoder CLI, Amazon Q Developer CLI, Amp, SHAI, IBM Bob, Antigravity

  - type: input
    id: agent-name
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -75,7 +75,7 @@ body:
        - Roo Code
        - CodeBuddy
        - Qoder CLI
-        - Kiro CLI
+        - Amazon Q Developer CLI
        - Amp
        - SHAI
        - IBM Bob
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -69,7 +69,7 @@ body:
        - Roo Code
        - CodeBuddy
        - Qoder CLI
-        - Kiro CLI
+        - Amazon Q Developer CLI
        - Amp
        - SHAI
        - IBM Bob
--- a/.github/workflows/RELEASE-PROCESS.md
+++ b/.github/workflows/RELEASE-PROCESS.md
@@ -1,191 +0,0 @@
-# Release Process
-
-This document describes the automated release process for Spec Kit.
-
-## Overview
-
-The release process is split into two workflows to ensure version consistency:
-
-1. **Release Trigger Workflow** (`release-trigger.yml`) - Manages versioning and triggers release
-2. **Release Workflow** (`release.yml`) - Builds and publishes artifacts
-
-This separation ensures that git tags always point to commits with the correct version in `pyproject.toml`.
-
-## Before Creating a Release
-
-**Important**: Write clear, descriptive commit messages!
-
-### How CHANGELOG.md Works
-
-The CHANGELOG is **automatically generated** from your git commit messages:
-
-1. **During Development**: Write clear, descriptive commit messages:
-   ```bash
-   git commit -m "feat: Add new authentication feature"
-   git commit -m "fix: Resolve timeout issue in API client (#123)"
-   git commit -m "docs: Update installation instructions"
-   ```
-
-2. **When Releasing**: The release trigger workflow automatically:
-   - Finds all commits since the last release tag
-   - Formats them as changelog entries
-   - Inserts them into CHANGELOG.md
-   - Commits the updated changelog before creating the new tag
-
-### Commit Message Best Practices
-
-Good commit messages make good changelogs:
- **Be descriptive**: "Add user authentication" not "Update files"
- **Reference issues/PRs**: Include `(#123)` for automated linking
- **Use conventional commits** (optional): `feat:`, `fix:`, `docs:`, `chore:`
- **Keep it concise**: One line is ideal, details go in commit body
-
-**Example commits that become good changelog entries:**
-```
-fix: prepend YAML frontmatter to Cursor .mdc files (#1699)
-feat: add generic agent support with customizable command directories (#1639)
-docs: document dual-catalog system for extensions (#1689)
-```
-
-## Creating a Release
-
-### Option 1: Auto-Increment (Recommended for patches)
-
-1. Go to **Actions** → **Release Trigger**
-2. Click **Run workflow**
-3. Leave the version field **empty**
-4. Click **Run workflow**
-
-The workflow will:
- Auto-increment the patch version (e.g., `0.1.10` → `0.1.11`)
- Update `pyproject.toml`
- Update `CHANGELOG.md` by adding a new section for the release based on commits since the last tag
- Commit changes to a `chore/release-vX.Y.Z` branch
- Create and push the git tag from that branch
- Open a PR to merge the version bump into `main`
- Trigger the release workflow automatically via the tag push
-
-### Option 2: Manual Version (For major/minor bumps)
-
-1. Go to **Actions** → **Release Trigger**
-2. Click **Run workflow**
-3. Enter the desired version (e.g., `0.2.0` or `v0.2.0`)
-4. Click **Run workflow**
-
-The workflow will:
- Use your specified version
- Update `pyproject.toml`
- Update `CHANGELOG.md` by adding a new section for the release based on commits since the last tag
- Commit changes to a `chore/release-vX.Y.Z` branch
- Create and push the git tag from that branch
- Open a PR to merge the version bump into `main`
- Trigger the release workflow automatically via the tag push
-
-## What Happens Next
-
-Once the release trigger workflow completes:
-
-1. A `chore/release-vX.Y.Z` branch is pushed with the version bump commit
-2. The git tag is pushed, pointing to that commit
-3. The **Release Workflow** is automatically triggered by the tag push
-4. Release artifacts are built for all supported agents
-5. A GitHub Release is created with all assets
-6. A PR is opened to merge the version bump branch into `main`
-
-> **Note**: Merge the auto-opened PR after the release is published to keep `main` in sync.
-
-## Workflow Details
-
-### Release Trigger Workflow
-
-**File**: `.github/workflows/release-trigger.yml`
-
-**Trigger**: Manual (`workflow_dispatch`)
-
-**Permissions Required**: `contents: write`
-
-**Steps**:
-1. Checkout repository
-2. Determine version (manual or auto-increment)
-3. Check if tag already exists (prevents duplicates)
-4. Create `chore/release-vX.Y.Z` branch
-5. Update `pyproject.toml`
-6. Update `CHANGELOG.md` from git commits
-7. Commit changes
-8. Push branch and tag
-9. Open PR to merge version bump into `main`
-
-### Release Workflow
-
-**File**: `.github/workflows/release.yml`
-
-**Trigger**: Tag push (`v*`)
-
-**Permissions Required**: `contents: write`
-
-**Steps**:
-1. Checkout repository at tag
-2. Extract version from tag name
-3. Check if release already exists
-4. Build release package variants (all agents × shell/powershell)
-5. Generate release notes from commits
-6. Create GitHub Release with all assets
-
-## Version Constraints
-
- Tags must follow format: `v{MAJOR}.{MINOR}.{PATCH}`
- Example valid versions: `v0.1.11`, `v0.2.0`, `v1.0.0`
- Auto-increment only bumps patch version
- Cannot create duplicate tags (workflow will fail)
-
-## Benefits of This Approach
-
-✅ **Version Consistency**: Git tags point to commits with matching `pyproject.toml` version
-
-✅ **Single Source of Truth**: Version set once, used everywhere
-
-✅ **Prevents Drift**: No more manual version synchronization needed
-
-✅ **Clean Separation**: Versioning logic separate from artifact building
-
-✅ **Flexibility**: Supports both auto-increment and manual versioning
-
-## Troubleshooting
-
-### No Commits Since Last Release
-
-If you run the release trigger workflow when there are no new commits since the last tag:
- The workflow will still succeed
- The CHANGELOG will show "- Initial release" if it's the first release
- Or it will be empty if there are no commits
- Consider adding meaningful commits before releasing
-
-**Best Practice**: Use descriptive commit messages - they become your changelog!
-
-### Tag Already Exists
-
-If you see "Error: Tag vX.Y.Z already exists!", you need to:
- Choose a different version number, or
- Delete the existing tag if it was created in error
-
-### Release Workflow Didn't Trigger
-
-Check that:
- The release trigger workflow completed successfully
- The tag was pushed (check repository tags)
- The release workflow is enabled in Actions settings
-
-### Version Mismatch
-
-If `pyproject.toml` doesn't match the latest tag:
- Run the release trigger workflow to sync versions
- Or manually update `pyproject.toml` and push changes before running the release trigger
-
-## Legacy Behavior (Pre-v0.1.10)
-
-Before this change, the release workflow:
- Created tags automatically on main branch pushes
- Updated `pyproject.toml` AFTER creating the tag
- Resulted in tags pointing to commits with outdated versions
-
-This has been fixed in v0.1.10+.
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -29,7 +29,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0 # Fetch all history for git info

--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -12,7 +12,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4

      - name: Run markdownlint-cli2
        uses: DavidAnson/markdownlint-cli2-action@v19
--- a/.github/workflows/release-trigger.yml
+++ b/.github/workflows/release-trigger.yml
@@ -1,161 +0,0 @@
-name: Release Trigger
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Version to release (e.g., 0.1.11). Leave empty to auto-increment patch version.'
-        required: false
-        type: string
-
-jobs:
-  bump-version:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.RELEASE_PAT }}
-
-      - name: Configure Git
-        run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-
-      - name: Determine version
-        id: version
-        env:
-          INPUT_VERSION: ${{ github.event.inputs.version }}
-        run: |
-          if [[ -n "$INPUT_VERSION" ]]; then
-            # Manual version specified - strip optional v prefix
-            VERSION="${INPUT_VERSION#v}"
-            # Validate strict semver format to prevent injection
-            if [[ ! "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-              echo "Error: Invalid version format '$VERSION'. Must be X.Y.Z (e.g. 1.2.3 or v1.2.3)"
-              exit 1
-            fi
-            echo "version=$VERSION" >> $GITHUB_OUTPUT
-            echo "tag=v$VERSION" >> $GITHUB_OUTPUT
-            echo "Using manual version: $VERSION"
-          else
-            # Auto-increment patch version
-            LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0")
-            echo "Latest tag: $LATEST_TAG"
-
-            # Extract version number and increment
-            VERSION=$(echo $LATEST_TAG | sed 's/v//')
-            IFS='.' read -ra VERSION_PARTS <<< "$VERSION"
-            MAJOR=${VERSION_PARTS[0]:-0}
-            MINOR=${VERSION_PARTS[1]:-0}
-            PATCH=${VERSION_PARTS[2]:-0}
-
-            # Increment patch version
-            PATCH=$((PATCH + 1))
-            NEW_VERSION="$MAJOR.$MINOR.$PATCH"
-
-            echo "version=$NEW_VERSION" >> $GITHUB_OUTPUT
-            echo "tag=v$NEW_VERSION" >> $GITHUB_OUTPUT
-            echo "Auto-incremented version: $NEW_VERSION"
-          fi
-
-      - name: Check if tag already exists
-        run: |
-          if git rev-parse "${{ steps.version.outputs.tag }}" >/dev/null 2>&1; then
-            echo "Error: Tag ${{ steps.version.outputs.tag }} already exists!"
-            exit 1
-          fi
-
-      - name: Create release branch
-        run: |
-          BRANCH="chore/release-${{ steps.version.outputs.tag }}"
-          git checkout -b "$BRANCH"
-          echo "branch=$BRANCH" >> $GITHUB_ENV
-
-      - name: Update pyproject.toml
-        run: |
-          sed -i "s/version = \".*\"/version = \"${{ steps.version.outputs.version }}\"/" pyproject.toml
-          echo "Updated pyproject.toml to version ${{ steps.version.outputs.version }}"
-
-      - name: Update CHANGELOG.md
-        run: |
-          if [ -f "CHANGELOG.md" ]; then
-            DATE=$(date +%Y-%m-%d)
-
-            # Get the previous tag to compare commits
-            PREVIOUS_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
-
-            echo "Generating changelog from commits..."
-            if [[ -n "$PREVIOUS_TAG" ]]; then
-              echo "Changes since $PREVIOUS_TAG"
-              COMMITS=$(git log --oneline "$PREVIOUS_TAG"..HEAD --no-merges --pretty=format:"- %s" 2>/dev/null || echo "- Initial release")
-            else
-              echo "No previous tag found - this is the first release"
-              COMMITS="- Initial release"
-            fi
-
-            # Create new changelog entry
-            {
-              head -n 8 CHANGELOG.md
-              echo ""
-              echo "## [${{ steps.version.outputs.version }}] - $DATE"
-              echo ""
-              echo "### Changed"
-              echo ""
-              echo "$COMMITS"
-              echo ""
-              tail -n +9 CHANGELOG.md
-            } > CHANGELOG.md.tmp
-            mv CHANGELOG.md.tmp CHANGELOG.md
-
-            echo "✅ Updated CHANGELOG.md with commits since $PREVIOUS_TAG"
-          else
-            echo "No CHANGELOG.md found"
-          fi
-
-      - name: Commit version bump
-        run: |
-          if [ -f "CHANGELOG.md" ]; then
-            git add pyproject.toml CHANGELOG.md
-          else
-            git add pyproject.toml
-          fi
-
-          if git diff --cached --quiet; then
-            echo "No changes to commit"
-          else
-            git commit -m "chore: bump version to ${{ steps.version.outputs.version }}"
-            echo "Changes committed"
-          fi
-
-      - name: Create and push tag
-        run: |
-          git tag -a "${{ steps.version.outputs.tag }}" -m "Release ${{ steps.version.outputs.tag }}"
-          git push origin "${{ env.branch }}"
-          git push origin "${{ steps.version.outputs.tag }}"
-          echo "Branch ${{ env.branch }} and tag ${{ steps.version.outputs.tag }} pushed"
-
-      - name: Open pull request
-        env:
-          GITHUB_TOKEN: ${{ secrets.RELEASE_PAT }}
-        run: |
-          gh pr create \
-            --base main \
-            --head "${{ env.branch }}" \
-            --title "chore: bump version to ${{ steps.version.outputs.version }}" \
-            --body "Automated version bump to ${{ steps.version.outputs.version }}.
-
-          This PR was created by the Release Trigger workflow. The git tag \`${{ steps.version.outputs.tag }}\` has already been pushed and the release artifacts are being built.
-
-          Merge this PR to record the version bump and changelog update on \`main\`."
-
-      - name: Summary
-        run: |
-          echo "✅ Version bumped to ${{ steps.version.outputs.version }}"
-          echo "✅ Tag ${{ steps.version.outputs.tag }} created and pushed"
-          echo "✅ PR opened to merge version bump into main"
-          echo "🚀 Release workflow is building artifacts from the tag"
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,60 +2,68 @@ name: Create Release

 on:
  push:
-    tags:
-      - 'v*'
+    branches: [ main ]
+    paths:
+      - 'memory/**'
+      - 'scripts/**'
+      - 'src/**'
+      - 'templates/**'
+      - '.github/workflows/**'
+  workflow_dispatch:

 jobs:
  release:
    runs-on: ubuntu-latest
    permissions:
      contents: write
+      pull-requests: write
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
          token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract version from tag
-        id: version
+      - name: Get latest tag
+        id: get_tag
        run: |
-          VERSION=${GITHUB_REF#refs/tags/}
-          echo "tag=$VERSION" >> $GITHUB_OUTPUT
-          echo "Building release for $VERSION"
-
+          chmod +x .github/workflows/scripts/get-next-version.sh
+          .github/workflows/scripts/get-next-version.sh
      - name: Check if release already exists
        id: check_release
        run: |
          chmod +x .github/workflows/scripts/check-release-exists.sh
-          .github/workflows/scripts/check-release-exists.sh ${{ steps.version.outputs.tag }}
+          .github/workflows/scripts/check-release-exists.sh ${{ steps.get_tag.outputs.new_version }}
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
      - name: Create release package variants
        if: steps.check_release.outputs.exists == 'false'
        run: |
          chmod +x .github/workflows/scripts/create-release-packages.sh
-          .github/workflows/scripts/create-release-packages.sh ${{ steps.version.outputs.tag }}
-
+          .github/workflows/scripts/create-release-packages.sh ${{ steps.get_tag.outputs.new_version }}
      - name: Generate release notes
        if: steps.check_release.outputs.exists == 'false'
        id: release_notes
        run: |
          chmod +x .github/workflows/scripts/generate-release-notes.sh
-          # Get the previous tag for changelog generation
-          PREVIOUS_TAG=$(git describe --tags --abbrev=0 ${{ steps.version.outputs.tag }}^ 2>/dev/null || echo "")
-          # Default to v0.0.0 if no previous tag is found (e.g., first release)
-          if [ -z "$PREVIOUS_TAG" ]; then
-            PREVIOUS_TAG="v0.0.0"
-          fi
-          .github/workflows/scripts/generate-release-notes.sh ${{ steps.version.outputs.tag }} "$PREVIOUS_TAG"
-
+          .github/workflows/scripts/generate-release-notes.sh ${{ steps.get_tag.outputs.new_version }} ${{ steps.get_tag.outputs.latest_tag }}
      - name: Create GitHub Release
        if: steps.check_release.outputs.exists == 'false'
        run: |
          chmod +x .github/workflows/scripts/create-github-release.sh
-          .github/workflows/scripts/create-github-release.sh ${{ steps.version.outputs.tag }}
+          .github/workflows/scripts/create-github-release.sh ${{ steps.get_tag.outputs.new_version }}
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Update version in pyproject.toml (for release artifacts only)
+        if: steps.check_release.outputs.exists == 'false'
+        run: |
+          chmod +x .github/workflows/scripts/update-version.sh
+          .github/workflows/scripts/update-version.sh ${{ steps.get_tag.outputs.new_version }}
+      - name: Commit version bump to main
+        if: steps.check_release.outputs.exists == 'false'
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git add pyproject.toml
+          git diff --cached --quiet || git commit -m "chore: bump version to ${{ steps.get_tag.outputs.new_version }} [skip ci]"
+          git push

--- a/.github/workflows/scripts/create-github-release.sh
+++ b/.github/workflows/scripts/create-github-release.sh
@@ -46,18 +46,12 @@ gh release create "$VERSION" \
  .genreleases/spec-kit-template-amp-ps-"$VERSION".zip \
  .genreleases/spec-kit-template-shai-sh-"$VERSION".zip \
  .genreleases/spec-kit-template-shai-ps-"$VERSION".zip \
-  .genreleases/spec-kit-template-tabnine-sh-"$VERSION".zip \
-  .genreleases/spec-kit-template-tabnine-ps-"$VERSION".zip \
-  .genreleases/spec-kit-template-kiro-cli-sh-"$VERSION".zip \
-  .genreleases/spec-kit-template-kiro-cli-ps-"$VERSION".zip \
+  .genreleases/spec-kit-template-q-sh-"$VERSION".zip \
+  .genreleases/spec-kit-template-q-ps-"$VERSION".zip \
  .genreleases/spec-kit-template-agy-sh-"$VERSION".zip \
  .genreleases/spec-kit-template-agy-ps-"$VERSION".zip \
  .genreleases/spec-kit-template-bob-sh-"$VERSION".zip \
  .genreleases/spec-kit-template-bob-ps-"$VERSION".zip \
-  .genreleases/spec-kit-template-vibe-sh-"$VERSION".zip \
-  .genreleases/spec-kit-template-vibe-ps-"$VERSION".zip \
-  .genreleases/spec-kit-template-kimi-sh-"$VERSION".zip \
-  .genreleases/spec-kit-template-kimi-ps-"$VERSION".zip \
  .genreleases/spec-kit-template-generic-sh-"$VERSION".zip \
  .genreleases/spec-kit-template-generic-ps-"$VERSION".zip \
  --title "Spec Kit Templates - $VERSION_NO_V" \
--- a/.github/workflows/scripts/create-release-packages.ps1
+++ b/.github/workflows/scripts/create-release-packages.ps1
@@ -8,13 +8,13 @@
 .DESCRIPTION
    create-release-packages.ps1 (workflow-local)
    Build Spec Kit template release archives for each supported AI assistant and script type.
-
+    
 .PARAMETER Version
    Version string with leading 'v' (e.g., v0.2.0)

 .PARAMETER Agents
    Comma or space separated subset of agents to build (default: all)
-    Valid agents: claude, gemini, copilot, cursor-agent, qwen, opencode, windsurf, codex, kilocode, auggie, roo, codebuddy, amp, kiro-cli, bob, qodercli, shai, tabnine, agy, vibe, kimi, generic
+    Valid agents: claude, gemini, copilot, cursor-agent, qwen, opencode, windsurf, codex, kilocode, auggie, roo, codebuddy, amp, q, bob, qodercli, shai, agy, generic

 .PARAMETER Scripts
    Comma or space separated subset of script types to build (default: both)
@@ -33,10 +33,10 @@
 param(
    [Parameter(Mandatory=$true, Position=0)]
    [string]$Version,
-
+    
    [Parameter(Mandatory=$false)]
    [string]$Agents = "",
-
+    
    [Parameter(Mandatory=$false)]
    [string]$Scripts = ""
 )
@@ -60,7 +60,7 @@ New-Item -ItemType Directory -Path $GenReleasesDir -Force | Out-Null

 function Rewrite-Paths {
    param([string]$Content)
-
+    
    $Content = $Content -replace '(/?)\bmemory/', '.specify/memory/'
    $Content = $Content -replace '(/?)\bscripts/', '.specify/scripts/'
    $Content = $Content -replace '(/?)\btemplates/', '.specify/templates/'
@@ -75,55 +75,55 @@ function Generate-Commands {
        [string]$OutputDir,
        [string]$ScriptVariant
    )
-
+    
    New-Item -ItemType Directory -Path $OutputDir -Force | Out-Null
-
+    
    $templates = Get-ChildItem -Path "templates/commands/*.md" -File -ErrorAction SilentlyContinue
-
+    
    foreach ($template in $templates) {
        $name = [System.IO.Path]::GetFileNameWithoutExtension($template.Name)
-
+        
        # Read file content and normalize line endings
        $fileContent = (Get-Content -Path $template.FullName -Raw) -replace "`r`n", "`n"
-
+        
        # Extract description from YAML frontmatter
        $description = ""
        if ($fileContent -match '(?m)^description:\s*(.+)$') {
            $description = $matches[1]
        }
-
+        
        # Extract script command from YAML frontmatter
        $scriptCommand = ""
        if ($fileContent -match "(?m)^\s*${ScriptVariant}:\s*(.+)$") {
            $scriptCommand = $matches[1]
        }
-
+        
        if ([string]::IsNullOrEmpty($scriptCommand)) {
            Write-Warning "No script command found for $ScriptVariant in $($template.Name)"
            $scriptCommand = "(Missing script command for $ScriptVariant)"
        }
-
+        
        # Extract agent_script command from YAML frontmatter if present
        $agentScriptCommand = ""
        if ($fileContent -match "(?ms)agent_scripts:.*?^\s*${ScriptVariant}:\s*(.+?)$") {
            $agentScriptCommand = $matches[1].Trim()
        }
-
+        
        # Replace {SCRIPT} placeholder with the script command
        $body = $fileContent -replace '\{SCRIPT\}', $scriptCommand
-
+        
        # Replace {AGENT_SCRIPT} placeholder with the agent script command if found
        if (-not [string]::IsNullOrEmpty($agentScriptCommand)) {
            $body = $body -replace '\{AGENT_SCRIPT\}', $agentScriptCommand
        }
-
+        
        # Remove the scripts: and agent_scripts: sections from frontmatter
        $lines = $body -split "`n"
        $outputLines = @()
        $inFrontmatter = $false
        $skipScripts = $false
        $dashCount = 0
-
+        
        foreach ($line in $lines) {
            if ($line -match '^---$') {
                $outputLines += $line
@@ -135,7 +135,7 @@ function Generate-Commands {
                }
                continue
            }
-
+            
            if ($inFrontmatter) {
                if ($line -match '^(scripts|agent_scripts):$') {
                    $skipScripts = $true
@@ -148,20 +148,20 @@ function Generate-Commands {
                    continue
                }
            }
-
+            
            $outputLines += $line
        }
-
+        
        $body = $outputLines -join "`n"
-
+        
        # Apply other substitutions
        $body = $body -replace '\{ARGS\}', $ArgFormat
        $body = $body -replace '__AGENT__', $Agent
        $body = Rewrite-Paths -Content $body
-
+        
        # Generate output file based on extension
        $outputFile = Join-Path $OutputDir "speckit.$name.$Extension"
-
+        
        switch ($Extension) {
            'toml' {
                $body = $body -replace '\\', '\\'
@@ -183,15 +183,15 @@ function Generate-CopilotPrompts {
        [string]$AgentsDir,
        [string]$PromptsDir
    )
-
+    
    New-Item -ItemType Directory -Path $PromptsDir -Force | Out-Null
-
+    
    $agentFiles = Get-ChildItem -Path "$AgentsDir/speckit.*.agent.md" -File -ErrorAction SilentlyContinue
-
+    
    foreach ($agentFile in $agentFiles) {
        $basename = $agentFile.Name -replace '\.agent\.md$', ''
        $promptFile = Join-Path $PromptsDir "$basename.prompt.md"
-
+        
        $content = @"
 ---
 agent: $basename
@@ -201,118 +201,31 @@ agent: $basename
    }
 }

-# Create Kimi Code skills in .kimi/skills/<name>/SKILL.md format.
-# Kimi CLI discovers skills as directories containing a SKILL.md file,
-# invoked with /skill:<name> (e.g. /skill:speckit.specify).
-function New-KimiSkills {
-    param(
-        [string]$SkillsDir,
-        [string]$ScriptVariant
-    )
-
-    $templates = Get-ChildItem -Path "templates/commands/*.md" -File -ErrorAction SilentlyContinue
-
-    foreach ($template in $templates) {
-        $name = [System.IO.Path]::GetFileNameWithoutExtension($template.Name)
-        $skillName = "speckit.$name"
-        $skillDir = Join-Path $SkillsDir $skillName
-        New-Item -ItemType Directory -Force -Path $skillDir | Out-Null
-
-        $fileContent = (Get-Content -Path $template.FullName -Raw) -replace "`r`n", "`n"
-
-        # Extract description
-        $description = "Spec Kit: $name workflow"
-        if ($fileContent -match '(?m)^description:\s*(.+)$') {
-            $description = $matches[1]
-        }
-
-        # Extract script command
-        $scriptCommand = "(Missing script command for $ScriptVariant)"
-        if ($fileContent -match "(?m)^\s*${ScriptVariant}:\s*(.+)$") {
-            $scriptCommand = $matches[1]
-        }
-
-        # Extract agent_script command from frontmatter if present
-        $agentScriptCommand = ""
-        if ($fileContent -match "(?ms)agent_scripts:.*?^\s*${ScriptVariant}:\s*(.+?)$") {
-            $agentScriptCommand = $matches[1].Trim()
-        }
-
-        # Replace {SCRIPT}, strip scripts sections, rewrite paths
-        $body = $fileContent -replace '\{SCRIPT\}', $scriptCommand
-        if (-not [string]::IsNullOrEmpty($agentScriptCommand)) {
-            $body = $body -replace '\{AGENT_SCRIPT\}', $agentScriptCommand
-        }
-
-        $lines = $body -split "`n"
-        $outputLines = @()
-        $inFrontmatter = $false
-        $skipScripts = $false
-        $dashCount = 0
-
-        foreach ($line in $lines) {
-            if ($line -match '^---$') {
-                $outputLines += $line
-                $dashCount++
-                $inFrontmatter = ($dashCount -eq 1)
-                continue
-            }
-            if ($inFrontmatter) {
-                if ($line -match '^(scripts|agent_scripts):$') { $skipScripts = $true; continue }
-                if ($line -match '^[a-zA-Z].*:' -and $skipScripts) { $skipScripts = $false }
-                if ($skipScripts -and $line -match '^\s+') { continue }
-            }
-            $outputLines += $line
-        }
-
-        $body = $outputLines -join "`n"
-        $body = $body -replace '\{ARGS\}', '$ARGUMENTS'
-        $body = $body -replace '__AGENT__', 'kimi'
-        $body = Rewrite-Paths -Content $body
-
-        # Strip existing frontmatter, keep only body
-        $templateBody = ""
-        $fmCount = 0
-        $inBody = $false
-        foreach ($line in ($body -split "`n")) {
-            if ($line -match '^---$') {
-                $fmCount++
-                if ($fmCount -eq 2) { $inBody = $true }
-                continue
-            }
-            if ($inBody) { $templateBody += "$line`n" }
-        }
-
-        $skillContent = "---`nname: `"$skillName`"`ndescription: `"$description`"`n---`n`n$templateBody"
-        Set-Content -Path (Join-Path $skillDir "SKILL.md") -Value $skillContent -NoNewline
-    }
-}
-
 function Build-Variant {
    param(
        [string]$Agent,
        [string]$Script
    )
-
+    
    $baseDir = Join-Path $GenReleasesDir "sdd-${Agent}-package-${Script}"
    Write-Host "Building $Agent ($Script) package..."
    New-Item -ItemType Directory -Path $baseDir -Force | Out-Null
-
+    
    # Copy base structure but filter scripts by variant
    $specDir = Join-Path $baseDir ".specify"
    New-Item -ItemType Directory -Path $specDir -Force | Out-Null
-
+    
    # Copy memory directory
    if (Test-Path "memory") {
        Copy-Item -Path "memory" -Destination $specDir -Recurse -Force
        Write-Host "Copied memory -> .specify"
    }
-
+    
    # Only copy the relevant script variant directory
    if (Test-Path "scripts") {
        $scriptsDestDir = Join-Path $specDir "scripts"
        New-Item -ItemType Directory -Path $scriptsDestDir -Force | Out-Null
-
+        
        switch ($Script) {
            'sh' {
                if (Test-Path "scripts/bash") {
@@ -327,17 +240,18 @@ function Build-Variant {
                }
            }
        }
-
+        
+        # Copy any script files that aren't in variant-specific directories
        Get-ChildItem -Path "scripts" -File -ErrorAction SilentlyContinue | ForEach-Object {
            Copy-Item -Path $_.FullName -Destination $scriptsDestDir -Force
        }
    }
-
+    
    # Copy templates (excluding commands directory and vscode-settings.json)
    if (Test-Path "templates") {
        $templatesDestDir = Join-Path $specDir "templates"
        New-Item -ItemType Directory -Path $templatesDestDir -Force | Out-Null
-
+        
        Get-ChildItem -Path "templates" -Recurse -File | Where-Object {
            $_.FullName -notmatch 'templates[/\\]commands[/\\]' -and $_.Name -ne 'vscode-settings.json'
        } | ForEach-Object {
@@ -349,7 +263,7 @@ function Build-Variant {
        }
        Write-Host "Copied templates -> .specify/templates"
    }
-
+    
    # Generate agent-specific command files
    switch ($Agent) {
        'claude' {
@@ -366,10 +280,12 @@ function Build-Variant {
        'copilot' {
            $agentsDir = Join-Path $baseDir ".github/agents"
            Generate-Commands -Agent 'copilot' -Extension 'agent.md' -ArgFormat '$ARGUMENTS' -OutputDir $agentsDir -ScriptVariant $Script
-
+            
+            # Generate companion prompt files
            $promptsDir = Join-Path $baseDir ".github/prompts"
            Generate-CopilotPrompts -AgentsDir $agentsDir -PromptsDir $promptsDir
-
+            
+            # Create VS Code workspace settings
            $vscodeDir = Join-Path $baseDir ".vscode"
            New-Item -ItemType Directory -Path $vscodeDir -Force | Out-Null
            if (Test-Path "templates/vscode-settings.json") {
@@ -382,7 +298,7 @@ function Build-Variant {
        }
        'qwen' {
            $cmdDir = Join-Path $baseDir ".qwen/commands"
-            Generate-Commands -Agent 'qwen' -Extension 'md' -ArgFormat '$ARGUMENTS' -OutputDir $cmdDir -ScriptVariant $Script
+            Generate-Commands -Agent 'qwen' -Extension 'toml' -ArgFormat '{{args}}' -OutputDir $cmdDir -ScriptVariant $Script
            if (Test-Path "agent_templates/qwen/QWEN.md") {
                Copy-Item -Path "agent_templates/qwen/QWEN.md" -Destination (Join-Path $baseDir "QWEN.md")
            }
@@ -419,9 +335,9 @@ function Build-Variant {
            $cmdDir = Join-Path $baseDir ".agents/commands"
            Generate-Commands -Agent 'amp' -Extension 'md' -ArgFormat '$ARGUMENTS' -OutputDir $cmdDir -ScriptVariant $Script
        }
-        'kiro-cli' {
-            $cmdDir = Join-Path $baseDir ".kiro/prompts"
-            Generate-Commands -Agent 'kiro-cli' -Extension 'md' -ArgFormat '$ARGUMENTS' -OutputDir $cmdDir -ScriptVariant $Script
+        'q' {
+            $cmdDir = Join-Path $baseDir ".amazonq/prompts"
+            Generate-Commands -Agent 'q' -Extension 'md' -ArgFormat '$ARGUMENTS' -OutputDir $cmdDir -ScriptVariant $Script
        }
        'bob' {
            $cmdDir = Join-Path $baseDir ".bob/commands"
@@ -431,38 +347,12 @@ function Build-Variant {
            $cmdDir = Join-Path $baseDir ".qoder/commands"
            Generate-Commands -Agent 'qodercli' -Extension 'md' -ArgFormat '$ARGUMENTS' -OutputDir $cmdDir -ScriptVariant $Script
        }
-        'shai' {
-            $cmdDir = Join-Path $baseDir ".shai/commands"
-            Generate-Commands -Agent 'shai' -Extension 'md' -ArgFormat '$ARGUMENTS' -OutputDir $cmdDir -ScriptVariant $Script
-        }
-        'tabnine' {
-            $cmdDir = Join-Path $baseDir ".tabnine/agent/commands"
-            Generate-Commands -Agent 'tabnine' -Extension 'toml' -ArgFormat '{{args}}' -OutputDir $cmdDir -ScriptVariant $Script
-            $tabnineTemplate = Join-Path 'agent_templates' 'tabnine/TABNINE.md'
-            if (Test-Path $tabnineTemplate) { Copy-Item $tabnineTemplate (Join-Path $baseDir 'TABNINE.md') }
-        }
-        'agy' {
-            $cmdDir = Join-Path $baseDir ".agent/commands"
-            Generate-Commands -Agent 'agy' -Extension 'md' -ArgFormat '$ARGUMENTS' -OutputDir $cmdDir -ScriptVariant $Script
-        }
-        'vibe' {
-            $cmdDir = Join-Path $baseDir ".vibe/prompts"
-            Generate-Commands -Agent 'vibe' -Extension 'md' -ArgFormat '$ARGUMENTS' -OutputDir $cmdDir -ScriptVariant $Script
-        }
-        'kimi' {
-            $skillsDir = Join-Path $baseDir ".kimi/skills"
-            New-Item -ItemType Directory -Force -Path $skillsDir | Out-Null
-            New-KimiSkills -SkillsDir $skillsDir -ScriptVariant $Script
-        }
        'generic' {
            $cmdDir = Join-Path $baseDir ".speckit/commands"
            Generate-Commands -Agent 'generic' -Extension 'md' -ArgFormat '$ARGUMENTS' -OutputDir $cmdDir -ScriptVariant $Script
        }
-        default {
-            throw "Unsupported agent '$Agent'."
-        }
    }
-
+    
    # Create zip archive
    $zipFile = Join-Path $GenReleasesDir "spec-kit-template-${Agent}-${Script}-${Version}.zip"
    Compress-Archive -Path "$baseDir/*" -DestinationPath $zipFile -Force
@@ -470,16 +360,17 @@ function Build-Variant {
 }

 # Define all agents and scripts
-$AllAgents = @('claude', 'gemini', 'copilot', 'cursor-agent', 'qwen', 'opencode', 'windsurf', 'codex', 'kilocode', 'auggie', 'roo', 'codebuddy', 'amp', 'kiro-cli', 'bob', 'qodercli', 'shai', 'tabnine', 'agy', 'vibe', 'kimi', 'generic')
+$AllAgents = @('claude', 'gemini', 'copilot', 'cursor-agent', 'qwen', 'opencode', 'windsurf', 'codex', 'kilocode', 'auggie', 'roo', 'codebuddy', 'amp', 'q', 'bob', 'qodercli', 'shai', 'agy', 'generic')
 $AllScripts = @('sh', 'ps')

 function Normalize-List {
    param([string]$Input)
-
+    
    if ([string]::IsNullOrEmpty($Input)) {
        return @()
    }
-
+    
+    # Split by comma or space and remove duplicates while preserving order
    $items = $Input -split '[,\s]+' | Where-Object { $_ } | Select-Object -Unique
    return $items
 }
@@ -490,7 +381,7 @@ function Validate-Subset {
        [string[]]$Allowed,
        [string[]]$Items
    )
-
+    
    $ok = $true
    foreach ($item in $Items) {
        if ($item -notin $Allowed) {
@@ -534,4 +425,4 @@ foreach ($agent in $AgentList) {
 Write-Host "`nArchives in ${GenReleasesDir}:"
 Get-ChildItem -Path $GenReleasesDir -Filter "spec-kit-template-*-${Version}.zip" | ForEach-Object {
    Write-Host "  $($_.Name)"
-}
+}
--- a/.github/workflows/scripts/create-release-packages.sh
+++ b/.github/workflows/scripts/create-release-packages.sh
@@ -6,7 +6,7 @@ set -euo pipefail
 # Usage: .github/workflows/scripts/create-release-packages.sh <version>
 #   Version argument should include leading 'v'.
 #   Optionally set AGENTS and/or SCRIPTS env vars to limit what gets built.
-#     AGENTS  : space or comma separated subset of: claude gemini copilot cursor-agent qwen opencode windsurf codex kilocode auggie roo codebuddy amp shai tabnine kiro-cli agy bob vibe qodercli kimi generic (default: all)
+#     AGENTS  : space or comma separated subset of: claude gemini copilot cursor-agent qwen opencode windsurf codex amp shai bob generic (default: all)
 #     SCRIPTS : space or comma separated subset of: sh ps (default: both)
 #   Examples:
 #     AGENTS=claude SCRIPTS=sh $0 v0.2.0
@@ -45,19 +45,19 @@ generate_commands() {
    [[ -f "$template" ]] || continue
    local name description script_command agent_script_command body
    name=$(basename "$template" .md)
-
+    
    # Normalize line endings
    file_content=$(tr -d '\r' < "$template")
-
+    
    # Extract description and script command from YAML frontmatter
    description=$(printf '%s\n' "$file_content" | awk '/^description:/ {sub(/^description:[[:space:]]*/, ""); print; exit}')
    script_command=$(printf '%s\n' "$file_content" | awk -v sv="$script_variant" '/^[[:space:]]*'"$script_variant"':[[:space:]]*/ {sub(/^[[:space:]]*'"$script_variant"':[[:space:]]*/, ""); print; exit}')
-
+    
    if [[ -z $script_command ]]; then
      echo "Warning: no script command found for $script_variant in $template" >&2
      script_command="(Missing script command for $script_variant)"
    fi
-
+    
    # Extract agent_script command from YAML frontmatter if present
    agent_script_command=$(printf '%s\n' "$file_content" | awk '
      /^agent_scripts:$/ { in_agent_scripts=1; next }
@@ -68,15 +68,15 @@ generate_commands() {
      }
      in_agent_scripts && /^[a-zA-Z]/ { in_agent_scripts=0 }
    ')
-
+    
    # Replace {SCRIPT} placeholder with the script command
    body=$(printf '%s\n' "$file_content" | sed "s|{SCRIPT}|${script_command}|g")
-
+    
    # Replace {AGENT_SCRIPT} placeholder with the agent script command if found
    if [[ -n $agent_script_command ]]; then
      body=$(printf '%s\n' "$body" | sed "s|{AGENT_SCRIPT}|${agent_script_command}|g")
    fi
-
+    
    # Remove the scripts: and agent_scripts: sections from frontmatter while preserving YAML structure
    body=$(printf '%s\n' "$body" | awk '
      /^---$/ { print; if (++dash_count == 1) in_frontmatter=1; else in_frontmatter=0; next }
@@ -86,10 +86,10 @@ generate_commands() {
      in_frontmatter && skip_scripts && /^[[:space:]]/ { next }
      { print }
    ')
-
+    
    # Apply other substitutions
    body=$(printf '%s\n' "$body" | sed "s/{ARGS}/$arg_format/g" | sed "s/__AGENT__/$agent/g" | rewrite_paths)
-
+    
    case $ext in
      toml)
        body=$(printf '%s\n' "$body" | sed 's/\\/\\\\/g')
@@ -105,14 +105,15 @@ generate_commands() {
 generate_copilot_prompts() {
  local agents_dir=$1 prompts_dir=$2
  mkdir -p "$prompts_dir"
-
+  
  # Generate a .prompt.md file for each .agent.md file
  for agent_file in "$agents_dir"/speckit.*.agent.md; do
    [[ -f "$agent_file" ]] || continue
-
+    
    local basename=$(basename "$agent_file" .agent.md)
    local prompt_file="$prompts_dir/${basename}.prompt.md"
-
+    
+    # Create prompt file with agent frontmatter
    cat > "$prompt_file" <<EOF
 ---
 agent: ${basename}
@@ -121,104 +122,41 @@ EOF
  done
 }

-# Create Kimi Code skills in .kimi/skills/<name>/SKILL.md format.
-# Kimi CLI discovers skills as directories containing a SKILL.md file,
-# invoked with /skill:<name> (e.g. /skill:speckit.specify).
-create_kimi_skills() {
-  local skills_dir="$1"
-  local script_variant="$2"
-
-  for template in templates/commands/*.md; do
-    [[ -f "$template" ]] || continue
-    local name
-    name=$(basename "$template" .md)
-    local skill_name="speckit.${name}"
-    local skill_dir="${skills_dir}/${skill_name}"
-    mkdir -p "$skill_dir"
-
-    local file_content
-    file_content=$(tr -d '\r' < "$template")
-
-    # Extract description from frontmatter
-    local description
-    description=$(printf '%s\n' "$file_content" | awk '/^description:/ {sub(/^description:[[:space:]]*/, ""); print; exit}')
-    [[ -z "$description" ]] && description="Spec Kit: ${name} workflow"
-
-    # Extract script command
-    local script_command
-    script_command=$(printf '%s\n' "$file_content" | awk -v sv="$script_variant" '/^[[:space:]]*'"$script_variant"':[[:space:]]*/ {sub(/^[[:space:]]*'"$script_variant"':[[:space:]]*/, ""); print; exit}')
-    [[ -z "$script_command" ]] && script_command="(Missing script command for $script_variant)"
-
-    # Extract agent_script command from frontmatter if present
-    local agent_script_command
-    agent_script_command=$(printf '%s\n' "$file_content" | awk '
-      /^agent_scripts:$/ { in_agent_scripts=1; next }
-      in_agent_scripts && /^[[:space:]]*'"$script_variant"':[[:space:]]*/ {
-        sub(/^[[:space:]]*'"$script_variant"':[[:space:]]*/, "")
-        print
-        exit
-      }
-      in_agent_scripts && /^[a-zA-Z]/ { in_agent_scripts=0 }
-    ')
-
-    # Build body: replace placeholders, strip scripts sections, rewrite paths
-    local body
-    body=$(printf '%s\n' "$file_content" | sed "s|{SCRIPT}|${script_command}|g")
-    if [[ -n $agent_script_command ]]; then
-      body=$(printf '%s\n' "$body" | sed "s|{AGENT_SCRIPT}|${agent_script_command}|g")
-    fi
-    body=$(printf '%s\n' "$body" | awk '
-      /^---$/ { print; if (++dash_count == 1) in_frontmatter=1; else in_frontmatter=0; next }
-      in_frontmatter && /^scripts:$/ { skip_scripts=1; next }
-      in_frontmatter && /^agent_scripts:$/ { skip_scripts=1; next }
-      in_frontmatter && /^[a-zA-Z].*:/ && skip_scripts { skip_scripts=0 }
-      in_frontmatter && skip_scripts && /^[[:space:]]/ { next }
-      { print }
-    ')
-    body=$(printf '%s\n' "$body" | sed 's/{ARGS}/\$ARGUMENTS/g' | sed 's/__AGENT__/kimi/g' | rewrite_paths)
-
-    # Strip existing frontmatter and prepend Kimi frontmatter
-    local template_body
-    template_body=$(printf '%s\n' "$body" | awk '/^---/{p++; if(p==2){found=1; next}} found')
-
-    {
-      printf -- '---\n'
-      printf 'name: "%s"\n' "$skill_name"
-      printf 'description: "%s"\n' "$description"
-      printf -- '---\n\n'
-      printf '%s\n' "$template_body"
-    } > "$skill_dir/SKILL.md"
-  done
-}
-
 build_variant() {
  local agent=$1 script=$2
  local base_dir="$GENRELEASES_DIR/sdd-${agent}-package-${script}"
  echo "Building $agent ($script) package..."
  mkdir -p "$base_dir"
-
+  
  # Copy base structure but filter scripts by variant
  SPEC_DIR="$base_dir/.specify"
  mkdir -p "$SPEC_DIR"
-
+  
  [[ -d memory ]] && { cp -r memory "$SPEC_DIR/"; echo "Copied memory -> .specify"; }
-
+  
  # Only copy the relevant script variant directory
  if [[ -d scripts ]]; then
    mkdir -p "$SPEC_DIR/scripts"
    case $script in
      sh)
        [[ -d scripts/bash ]] && { cp -r scripts/bash "$SPEC_DIR/scripts/"; echo "Copied scripts/bash -> .specify/scripts"; }
+        # Copy any script files that aren't in variant-specific directories
        find scripts -maxdepth 1 -type f -exec cp {} "$SPEC_DIR/scripts/" \; 2>/dev/null || true
        ;;
      ps)
        [[ -d scripts/powershell ]] && { cp -r scripts/powershell "$SPEC_DIR/scripts/"; echo "Copied scripts/powershell -> .specify/scripts"; }
+        # Copy any script files that aren't in variant-specific directories
        find scripts -maxdepth 1 -type f -exec cp {} "$SPEC_DIR/scripts/" \; 2>/dev/null || true
        ;;
    esac
  fi
-
+  
  [[ -d templates ]] && { mkdir -p "$SPEC_DIR/templates"; find templates -type f -not -path "templates/commands/*" -not -name "vscode-settings.json" -exec cp --parents {} "$SPEC_DIR"/ \; ; echo "Copied templates -> .specify/templates"; }
+  
+  # NOTE: We substitute {ARGS} internally. Outward tokens differ intentionally:
+  #   * Markdown/prompt (claude, copilot, cursor-agent, opencode): $ARGUMENTS
+  #   * TOML (gemini, qwen): {{args}}
+  # This keeps formats readable without extra abstraction.

  case $agent in
    claude)
@@ -231,7 +169,9 @@ build_variant() {
    copilot)
      mkdir -p "$base_dir/.github/agents"
      generate_commands copilot agent.md "\$ARGUMENTS" "$base_dir/.github/agents" "$script"
+      # Generate companion prompt files
      generate_copilot_prompts "$base_dir/.github/agents" "$base_dir/.github/prompts"
+      # Create VS Code workspace settings
      mkdir -p "$base_dir/.vscode"
      [[ -f templates/vscode-settings.json ]] && cp templates/vscode-settings.json "$base_dir/.vscode/settings.json"
      ;;
@@ -240,7 +180,7 @@ build_variant() {
      generate_commands cursor-agent md "\$ARGUMENTS" "$base_dir/.cursor/commands" "$script" ;;
    qwen)
      mkdir -p "$base_dir/.qwen/commands"
-      generate_commands qwen md "\$ARGUMENTS" "$base_dir/.qwen/commands" "$script"
+      generate_commands qwen toml "{{args}}" "$base_dir/.qwen/commands" "$script"
      [[ -f agent_templates/qwen/QWEN.md ]] && cp agent_templates/qwen/QWEN.md "$base_dir/QWEN.md" ;;
    opencode)
      mkdir -p "$base_dir/.opencode/command"
@@ -272,25 +212,15 @@ build_variant() {
    shai)
      mkdir -p "$base_dir/.shai/commands"
      generate_commands shai md "\$ARGUMENTS" "$base_dir/.shai/commands" "$script" ;;
-    tabnine)
-      mkdir -p "$base_dir/.tabnine/agent/commands"
-      generate_commands tabnine toml "{{args}}" "$base_dir/.tabnine/agent/commands" "$script"
-      [[ -f agent_templates/tabnine/TABNINE.md ]] && cp agent_templates/tabnine/TABNINE.md "$base_dir/TABNINE.md" ;;
-    kiro-cli)
-      mkdir -p "$base_dir/.kiro/prompts"
-      generate_commands kiro-cli md "\$ARGUMENTS" "$base_dir/.kiro/prompts" "$script" ;;
+    q)
+      mkdir -p "$base_dir/.amazonq/prompts"
+      generate_commands q md "\$ARGUMENTS" "$base_dir/.amazonq/prompts" "$script" ;;
    agy)
-      mkdir -p "$base_dir/.agent/commands"
-      generate_commands agy md "\$ARGUMENTS" "$base_dir/.agent/commands" "$script" ;;
+      mkdir -p "$base_dir/.agent/workflows"
+      generate_commands agy md "\$ARGUMENTS" "$base_dir/.agent/workflows" "$script" ;;
    bob)
      mkdir -p "$base_dir/.bob/commands"
      generate_commands bob md "\$ARGUMENTS" "$base_dir/.bob/commands" "$script" ;;
-    vibe)
-      mkdir -p "$base_dir/.vibe/prompts"
-      generate_commands vibe md "\$ARGUMENTS" "$base_dir/.vibe/prompts" "$script" ;;
-    kimi)
-      mkdir -p "$base_dir/.kimi/skills"
-      create_kimi_skills "$base_dir/.kimi/skills" "$script" ;;
    generic)
      mkdir -p "$base_dir/.speckit/commands"
      generate_commands generic md "\$ARGUMENTS" "$base_dir/.speckit/commands" "$script" ;;
@@ -300,10 +230,11 @@ build_variant() {
 }

 # Determine agent list
-ALL_AGENTS=(claude gemini copilot cursor-agent qwen opencode windsurf codex kilocode auggie roo codebuddy amp shai tabnine kiro-cli agy bob vibe qodercli kimi generic)
+ALL_AGENTS=(claude gemini copilot cursor-agent qwen opencode windsurf codex kilocode auggie roo codebuddy amp shai q agy bob qodercli generic)
 ALL_SCRIPTS=(sh ps)

 norm_list() {
+  # convert comma+space separated -> line separated unique while preserving order of first occurrence
  tr ',\n' '  ' | awk '{for(i=1;i<=NF;i++){if(!seen[$i]++){printf((out?"\n":"") $i);out=1}}}END{printf("\n")}'
 }

@@ -346,3 +277,4 @@ done

 echo "Archives in $GENRELEASES_DIR:"
 ls -1 "$GENRELEASES_DIR"/spec-kit-template-*-"${NEW_VERSION}".zip
+
--- a/.github/workflows/scripts/simulate-release.sh
+++ b/.github/workflows/scripts/simulate-release.sh
@@ -1,161 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# simulate-release.sh
-# Simulate the release process locally without pushing to GitHub
-# Usage: simulate-release.sh [version]
-#   If version is omitted, auto-increments patch version
-
-# Colors for output
-GREEN='\033[0;32m'
-BLUE='\033[0;34m'
-YELLOW='\033[1;33m'
-RED='\033[0;31m'
-NC='\033[0m' # No Color
-
-echo -e "${BLUE}🧪 Simulating Release Process Locally${NC}"
-echo "======================================"
-echo ""
-
-# Step 1: Determine version
-if [[ -n "${1:-}" ]]; then
-  VERSION="${1#v}"
-  TAG="v$VERSION"
-  echo -e "${GREEN}📝 Using manual version: $VERSION${NC}"
-else
-  LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0")
-  echo -e "${BLUE}Latest tag: $LATEST_TAG${NC}"
-  
-  VERSION=$(echo $LATEST_TAG | sed 's/v//')
-  IFS='.' read -ra VERSION_PARTS <<< "$VERSION"
-  MAJOR=${VERSION_PARTS[0]:-0}
-  MINOR=${VERSION_PARTS[1]:-0}
-  PATCH=${VERSION_PARTS[2]:-0}
-  
-  PATCH=$((PATCH + 1))
-  VERSION="$MAJOR.$MINOR.$PATCH"
-  TAG="v$VERSION"
-  echo -e "${GREEN}📝 Auto-incremented to: $VERSION${NC}"
-fi
-
-echo ""
-
-# Step 2: Check if tag exists
-if git rev-parse "$TAG" >/dev/null 2>&1; then
-  echo -e "${RED}❌ Error: Tag $TAG already exists!${NC}"
-  echo "   Please use a different version or delete the tag first."
-  exit 1
-fi
-echo -e "${GREEN}✓ Tag $TAG is available${NC}"
-
-# Step 3: Backup current state
-echo ""
-echo -e "${YELLOW}💾 Creating backup of current state...${NC}"
-BACKUP_DIR=$(mktemp -d)
-cp pyproject.toml "$BACKUP_DIR/pyproject.toml.bak"
-cp CHANGELOG.md "$BACKUP_DIR/CHANGELOG.md.bak"
-echo -e "${GREEN}✓ Backup created at: $BACKUP_DIR${NC}"
-
-# Step 4: Update pyproject.toml
-echo ""
-echo -e "${YELLOW}📝 Updating pyproject.toml...${NC}"
-sed -i.tmp "s/version = \".*\"/version = \"$VERSION\"/" pyproject.toml
-rm -f pyproject.toml.tmp
-echo -e "${GREEN}✓ Updated pyproject.toml to version $VERSION${NC}"
-
-# Step 5: Update CHANGELOG.md
-echo ""
-echo -e "${YELLOW}📝 Updating CHANGELOG.md...${NC}"
-DATE=$(date +%Y-%m-%d)
-
-# Get the previous tag to compare commits
-PREVIOUS_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
-
-if [[ -n "$PREVIOUS_TAG" ]]; then
-  echo "   Generating changelog from commits since $PREVIOUS_TAG"
-  # Get commits since last tag, format as bullet points
-  COMMITS=$(git log --oneline "$PREVIOUS_TAG"..HEAD --no-merges --pretty=format:"- %s" 2>/dev/null || echo "- Initial release")
-else
-  echo "   No previous tag found - this is the first release"
-  COMMITS="- Initial release"
-fi
-
-# Create temp file with new entry
-{
-  head -n 8 CHANGELOG.md
-  echo ""
-  echo "## [$VERSION] - $DATE"
-  echo ""
-  echo "### Changed"
-  echo ""
-  echo "$COMMITS"
-  echo ""
-  tail -n +9 CHANGELOG.md
-} > CHANGELOG.md.tmp
-mv CHANGELOG.md.tmp CHANGELOG.md
-echo -e "${GREEN}✓ Updated CHANGELOG.md with commits since $PREVIOUS_TAG${NC}"
-
-# Step 6: Show what would be committed
-echo ""
-echo -e "${YELLOW}📋 Changes that would be committed:${NC}"
-git diff pyproject.toml CHANGELOG.md
-
-# Step 7: Create temporary tag (no push)
-echo ""
-echo -e "${YELLOW}🏷️  Creating temporary local tag...${NC}"
-git tag -a "$TAG" -m "Simulated release $TAG" 2>/dev/null || true
-echo -e "${GREEN}✓ Tag $TAG created locally${NC}"
-
-# Step 8: Simulate release artifact creation
-echo ""
-echo -e "${YELLOW}📦 Simulating release package creation...${NC}"
-echo "   (High-level simulation only; packaging script is not executed)"
-echo ""
-
-# Check if script exists and is executable
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-if [[ -x "$SCRIPT_DIR/create-release-packages.sh" ]]; then
-  echo -e "${BLUE}In a real release, the following command would be run to create packages:${NC}"
-  echo "  $SCRIPT_DIR/create-release-packages.sh \"$TAG\""
-  echo ""
-  echo "This simulation does not enumerate individual package files to avoid"
-  echo "drifting from the actual behavior of create-release-packages.sh."
-else
-  echo -e "${RED}⚠️  create-release-packages.sh not found or not executable${NC}"
-fi
-
-# Step 9: Simulate release notes generation
-echo ""
-echo -e "${YELLOW}📄 Simulating release notes generation...${NC}"
-echo ""
-PREVIOUS_TAG=$(git describe --tags --abbrev=0 $TAG^ 2>/dev/null || echo "")
-if [[ -n "$PREVIOUS_TAG" ]]; then
-  echo -e "${BLUE}Changes since $PREVIOUS_TAG:${NC}"
-  git log --oneline "$PREVIOUS_TAG".."$TAG" | head -n 10
-  echo ""
-else
-  echo -e "${BLUE}No previous tag found - this would be the first release${NC}"
-fi
-
-# Step 10: Summary
-echo ""
-echo -e "${GREEN}🎉 Simulation Complete!${NC}"
-echo "======================================"
-echo ""
-echo -e "${BLUE}Summary:${NC}"
-echo "  Version: $VERSION"
-echo "  Tag: $TAG"
-echo "  Backup: $BACKUP_DIR"
-echo ""
-echo -e "${YELLOW}⚠️  SIMULATION ONLY - NO CHANGES PUSHED${NC}"
-echo ""
-echo -e "${BLUE}Next steps:${NC}"
-echo "  1. Review the changes above"
-echo "  2. To keep changes: git add pyproject.toml CHANGELOG.md && git commit"
-echo "  3. To discard changes: git checkout pyproject.toml CHANGELOG.md && git tag -d $TAG"
-echo "  4. To restore from backup: cp $BACKUP_DIR/* ."
-echo ""
-echo -e "${BLUE}To run the actual release:${NC}"
-echo "  Go to: https://github.com/github/spec-kit/actions/workflows/release-trigger.yml"
-echo "  Click 'Run workflow' and enter version: $VERSION"
-echo ""
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,10 +16,10 @@ jobs:
        uses: actions/checkout@v4

      - name: Install uv
-        uses: astral-sh/setup-uv@v7
+        uses: astral-sh/setup-uv@v6

      - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
        with:
          python-version: "3.13"

@@ -36,10 +36,10 @@ jobs:
        uses: actions/checkout@v4

      - name: Install uv
-        uses: astral-sh/setup-uv@v7
+        uses: astral-sh/setup-uv@v6

      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
        with:
          python-version: ${{ matrix.python-version }}

--- a/AGENTS.md
+++ b/AGENTS.md
@@ -35,7 +35,7 @@ Specify supports multiple AI agents by generating agent-specific command files a
 | **Gemini CLI**             | `.gemini/commands/`    | TOML     | `gemini`        | Google's Gemini CLI         |
 | **GitHub Copilot**         | `.github/agents/`      | Markdown | N/A (IDE-based) | GitHub Copilot in VS Code   |
 | **Cursor**                 | `.cursor/commands/`    | Markdown | `cursor-agent`  | Cursor CLI                  |
-| **Qwen Code**              | `.qwen/commands/`      | Markdown | `qwen`          | Alibaba's Qwen Code CLI     |
+| **Qwen Code**              | `.qwen/commands/`      | TOML     | `qwen`          | Alibaba's Qwen Code CLI     |
 | **opencode**               | `.opencode/command/`   | Markdown | `opencode`      | opencode CLI                |
 | **Codex CLI**              | `.codex/commands/`     | Markdown | `codex`         | Codex CLI                   |
 | **Windsurf**               | `.windsurf/workflows/` | Markdown | N/A (IDE-based) | Windsurf IDE workflows      |
@@ -44,11 +44,9 @@ Specify supports multiple AI agents by generating agent-specific command files a
 | **Roo Code**               | `.roo/rules/`          | Markdown | N/A (IDE-based) | Roo Code IDE                |
 | **CodeBuddy CLI**          | `.codebuddy/commands/` | Markdown | `codebuddy`     | CodeBuddy CLI               |
 | **Qoder CLI**              | `.qoder/commands/`     | Markdown | `qodercli`      | Qoder CLI                   |
-| **Kiro CLI**               | `.kiro/prompts/`       | Markdown | `kiro-cli`      | Kiro CLI                    |
+| **Amazon Q Developer CLI** | `.amazonq/prompts/`    | Markdown | `q`             | Amazon Q Developer CLI      |
 | **Amp**                    | `.agents/commands/`    | Markdown | `amp`           | Amp CLI                     |
 | **SHAI**                   | `.shai/commands/`      | Markdown | `shai`          | SHAI CLI                    |
-| **Tabnine CLI**            | `.tabnine/agent/commands/` | TOML | `tabnine`       | Tabnine CLI                 |
-| **Kimi Code**              | `.kimi/skills/`        | Markdown | `kimi`          | Kimi Code CLI (Moonshot AI) |
 | **IBM Bob**                | `.bob/commands/`       | Markdown | N/A (IDE-based) | IBM Bob IDE                 |
 | **Generic**                | User-specified via `--ai-commands-dir` | Markdown | N/A | Bring your own agent        |

@@ -88,7 +86,7 @@ This eliminates the need for special-case mappings throughout the codebase.
 - `folder`: Directory where agent-specific files are stored (relative to project root)
 - `commands_subdir`: Subdirectory name within the agent folder where command/prompt files are stored (default: `"commands"`)
  - Most agents use `"commands"` (e.g., `.claude/commands/`)
-  - Some agents use alternative names: `"agents"` (copilot), `"workflows"` (windsurf, kilocode), `"prompts"` (codex, kiro-cli), `"command"` (opencode - singular)
+  - Some agents use alternative names: `"agents"` (copilot), `"workflows"` (windsurf, kilocode, agy), `"prompts"` (codex, q), `"command"` (opencode - singular)
  - This field enables `--ai-skills` to locate command templates correctly for skill generation
 - `install_url`: Installation documentation URL (set to `None` for IDE-based agents)
 - `requires_cli`: Whether the agent requires a CLI tool check during initialization
@@ -98,7 +96,7 @@ This eliminates the need for special-case mappings throughout the codebase.
 Update the `--ai` parameter help text in the `init()` command to include the new agent:

 ```python
-ai_assistant: str = typer.Option(None, "--ai", help="AI assistant to use: claude, gemini, copilot, cursor-agent, qwen, opencode, codex, windsurf, kilocode, auggie, codebuddy, new-agent-cli, or kiro-cli"),
+ai_assistant: str = typer.Option(None, "--ai", help="AI assistant to use: claude, gemini, copilot, cursor-agent, qwen, opencode, codex, windsurf, kilocode, auggie, codebuddy, new-agent-cli, or q"),
 ```

 Also update any function docstrings, examples, and error messages that list available agents.
@@ -119,7 +117,7 @@ Modify `.github/workflows/scripts/create-release-packages.sh`:
 ##### Add to ALL_AGENTS array

 ```bash
-ALL_AGENTS=(claude gemini copilot cursor-agent qwen opencode windsurf kiro-cli)
+ALL_AGENTS=(claude gemini copilot cursor-agent qwen opencode windsurf q)
 ```

 ##### Add case statement for directory structure
@@ -319,13 +317,11 @@ Require a command-line tool to be installed:
 - **Cursor**: `cursor-agent` CLI
 - **Qwen Code**: `qwen` CLI
 - **opencode**: `opencode` CLI
- **Kiro CLI**: `kiro-cli` CLI
+- **Amazon Q Developer CLI**: `q` CLI
 - **CodeBuddy CLI**: `codebuddy` CLI
 - **Qoder CLI**: `qodercli` CLI
 - **Amp**: `amp` CLI
 - **SHAI**: `shai` CLI
- **Tabnine CLI**: `tabnine` CLI
- **Kimi Code**: `kimi` CLI

 ### IDE-Based Agents

@@ -339,7 +335,7 @@ Work within integrated development environments:

 ### Markdown Format

-Used by: Claude, Cursor, opencode, Windsurf, Kiro CLI, Amp, SHAI, IBM Bob, Kimi Code, Qwen
+Used by: Claude, Cursor, opencode, Windsurf, Amazon Q Developer, Amp, SHAI, IBM Bob

 **Standard format:**

@@ -364,7 +360,7 @@ Command content with {SCRIPT} and $ARGUMENTS placeholders.

 ### TOML Format

-Used by: Gemini, Tabnine
+Used by: Gemini, Qwen

 ```toml
 description = "Command description"
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,190 +7,6 @@ Recent changes to the Specify CLI and templates are documented here.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

-## [0.2.1] - 2026-03-11
-
-### Changed
-
- Added February 2026 newsletter (#1812)
- feat: add Kimi Code CLI agent support (#1790)
- docs: fix broken links in quickstart guide (#1759) (#1797)
- docs: add catalog cli help documentation (#1793) (#1794)
- fix: use quiet checkout to avoid exception on git checkout (#1792)
- feat(extensions): support .extensionignore to exclude files during install (#1781)
- feat: add Codex support for extension command registration (#1767)
- chore: bump version to 0.2.0 (#1786)
- fix: sync agent list comments with actual supported agents (#1785)
- feat(extensions): support multiple active catalogs simultaneously (#1720)
- Pavel/add tabnine cli support (#1503)
- Add Understanding extension to community catalog (#1778)
- Add ralph extension to community catalog (#1780)
- Update README with project initialization instructions (#1772)
- feat: add review extension to community catalog (#1775)
- Add fleet extension to community catalog (#1771)
- Integration of Mistral vibe support into speckit (#1725)
- fix: Remove duplicate options in specify.md (#1765)
- fix: use global branch numbering instead of per-short-name detection (#1757)
- Add Community Walkthroughs section to README (#1766)
- feat(extensions): add Jira Integration to community catalog (#1764)
- Add Azure DevOps Integration extension to community catalog (#1734)
- Fix docs: update Antigravity link and add initialization example (#1748)
- fix: wire after_tasks and after_implement hook events into command templates (#1702)
- make c ignores consistent with c++ (#1747)
- chore: bump version to 0.1.13 (#1746)
- feat: add kiro-cli and AGENT_CONFIG consistency coverage (#1690)
- feat: add verify extension to community catalog (#1726)
- Add Retrospective Extension to community catalog README table (#1741)
- fix(scripts): add empty description validation and branch checkout error handling (#1559)
- fix: correct Copilot extension command registration (#1724)
- fix(implement): remove Makefile from C ignore patterns (#1558)
- Add sync extension to community catalog (#1728)
- fix(checklist): clarify file handling behavior for append vs create (#1556)
- fix(clarify): correct conflicting question limit from 10 to 5 (#1557)
- chore: bump version to 0.1.12 (#1737)
- fix: use RELEASE_PAT so tag push triggers release workflow (#1736)
- fix: release-trigger uses release branch + PR instead of direct push to main (#1733)
- fix: Split release process to sync pyproject.toml version with git tags (#1732)
-
-
-## [Unreleased]
-
-### Added
-
- feat(extensions): support `.extensionignore` to exclude files/folders during `specify extension add` (#1781)
-
-## [0.2.0] - 2026-03-09
-
-### Changed
-
- feat: add Kimi Code CLI agent support
- fix: sync agent list comments with actual supported agents (#1785)
- feat(extensions): support multiple active catalogs simultaneously (#1720)
- Pavel/add tabnine cli support (#1503)
- Add Understanding extension to community catalog (#1778)
- Add ralph extension to community catalog (#1780)
- Update README with project initialization instructions (#1772)
- feat: add review extension to community catalog (#1775)
- Add fleet extension to community catalog (#1771)
- Integration of Mistral vibe support into speckit (#1725)
- fix: Remove duplicate options in specify.md (#1765)
- fix: use global branch numbering instead of per-short-name detection (#1757)
- Add Community Walkthroughs section to README (#1766)
- feat(extensions): add Jira Integration to community catalog (#1764)
- Add Azure DevOps Integration extension to community catalog (#1734)
- Fix docs: update Antigravity link and add initialization example (#1748)
- fix: wire after_tasks and after_implement hook events into command templates (#1702)
- make c ignores consistent with c++ (#1747)
- chore: bump version to 0.1.13 (#1746)
- feat: add kiro-cli and AGENT_CONFIG consistency coverage (#1690)
- feat: add verify extension to community catalog (#1726)
- Add Retrospective Extension to community catalog README table (#1741)
- fix(scripts): add empty description validation and branch checkout error handling (#1559)
- fix: correct Copilot extension command registration (#1724)
- fix(implement): remove Makefile from C ignore patterns (#1558)
- Add sync extension to community catalog (#1728)
- fix(checklist): clarify file handling behavior for append vs create (#1556)
- fix(clarify): correct conflicting question limit from 10 to 5 (#1557)
- chore: bump version to 0.1.12 (#1737)
- fix: use RELEASE_PAT so tag push triggers release workflow (#1736)
- fix: release-trigger uses release branch + PR instead of direct push to main (#1733)
- fix: Split release process to sync pyproject.toml version with git tags (#1732)
-
-## [0.1.14] - 2026-03-09
-
-### Added
-
- feat: add Tabnine CLI agent support
- **Multi-Catalog Support (#1707)**: Extension catalog system now supports multiple active catalogs simultaneously via a catalog stack
-  - New `specify extension catalog list` command lists all active catalogs with name, URL, priority, and `install_allowed` status
-  - New `specify extension catalog add` and `specify extension catalog remove` commands for project-scoped catalog management
-  - Default built-in stack includes `catalog.json` (default, installable) and `catalog.community.json` (community, discovery only) — community extensions are now surfaced in search results out of the box
-  - `specify extension search` aggregates results across all active catalogs, annotating each result with source catalog
-  - `specify extension add` enforces `install_allowed` policy — extensions from discovery-only catalogs cannot be installed directly
-  - Project-level `.specify/extension-catalogs.yml` and user-level `~/.specify/extension-catalogs.yml` config files supported, with project-level taking precedence
-  - `SPECKIT_CATALOG_URL` environment variable still works for backward compatibility (replaces full stack with single catalog)
-  - All catalog URLs require HTTPS (HTTP allowed for localhost development)
-  - New `CatalogEntry` dataclass in `extensions.py` for catalog stack representation
-  - Per-URL hash-based caching for non-default catalogs; legacy cache preserved for default catalog
-  - Higher-priority catalogs win on merge conflicts (same extension id in multiple catalogs)
-  - 13 new tests covering catalog stack resolution, merge conflicts, URL validation, and `install_allowed` enforcement
-  - Updated RFC, Extension User Guide, and Extension API Reference documentation
-
-## [0.1.13] - 2026-03-03
-
-### Changed
-
- feat: add kiro-cli and AGENT_CONFIG consistency coverage (#1690)
- feat: add verify extension to community catalog (#1726)
- Add Retrospective Extension to community catalog README table (#1741)
- fix(scripts): add empty description validation and branch checkout error handling (#1559)
- fix: correct Copilot extension command registration (#1724)
- fix(implement): remove Makefile from C ignore patterns (#1558)
- Add sync extension to community catalog (#1728)
- fix(checklist): clarify file handling behavior for append vs create (#1556)
- fix(clarify): correct conflicting question limit from 10 to 5 (#1557)
- chore: bump version to 0.1.12 (#1737)
- fix: use RELEASE_PAT so tag push triggers release workflow (#1736)
- fix: release-trigger uses release branch + PR instead of direct push to main (#1733)
- fix: Split release process to sync pyproject.toml version with git tags (#1732)
-
-
-## [0.1.13] - 2026-03-03
-
-### Fixed
-
- **Copilot Extension Commands Not Visible**: Fixed extension commands not appearing in GitHub Copilot when installed via `specify extension add --dev`
-  - Changed Copilot file extension from `.md` to `.agent.md` in `CommandRegistrar.AGENT_CONFIGS` so Copilot recognizes agent files
-  - Added generation of companion `.prompt.md` files in `.github/prompts/` during extension command registration, matching the release packaging behavior
-  - Added cleanup of `.prompt.md` companion files when removing extensions via `specify extension remove`
- Fixed a syntax regression in `src/specify_cli/__init__.py` in `_build_ai_assistant_help()` that broke `ruff` and `pytest` collection in CI.
-## [0.1.12] - 2026-03-02
-
-### Changed
-
- fix: use RELEASE_PAT so tag push triggers release workflow (#1736)
- fix: release-trigger uses release branch + PR instead of direct push to main (#1733)
- fix: Split release process to sync pyproject.toml version with git tags (#1732)
-
-
-## [0.1.10] - 2026-03-02
-
-### Fixed
-
- **Version Sync Issue (#1721)**: Fixed version mismatch between `pyproject.toml` and git release tags
-  - Split release process into two workflows: `release-trigger.yml` for version management and `release.yml` for artifact building
-  - Version bump now happens BEFORE tag creation, ensuring tags point to commits with correct version
-  - Supports both manual version specification and auto-increment (patch version)
-  - Git tags now accurately reflect the version in `pyproject.toml` at that commit
-  - Prevents confusion when installing from source
-
-## [0.1.9] - 2026-02-28
-
-### Changed
-
- Updated dependency: bumped astral-sh/setup-uv from 6 to 7
-
-## [0.1.8] - 2026-02-28
-
-### Changed
-
- Updated dependency: bumped actions/setup-python from 5 to 6
-
-## [0.1.7] - 2026-02-27
-
-### Changed
-
- Updated outdated GitHub Actions versions
- Documented dual-catalog system for extensions
-
-### Fixed
-
- Fixed version command in documentation
-
-### Added
-
- Added Cleanup Extension to README
- Added retrospective extension to community catalog
-
 ## [0.1.6] - 2026-02-23

 ### Fixed
--- a/README.md
+++ b/README.md
@@ -22,7 +22,6 @@
 - [🤔 What is Spec-Driven Development?](#-what-is-spec-driven-development)
 - [⚡ Get Started](#-get-started)
 - [📽️ Video Overview](#️-video-overview)
- [🚶 Community Walkthroughs](#-community-walkthroughs)
 - [🤖 Supported AI Agents](#-supported-ai-agents)
 - [🔧 Specify CLI Reference](#-specify-cli-reference)
 - [📚 Core Philosophy](#-core-philosophy)
@@ -80,13 +79,7 @@ uv tool install specify-cli --force --from git+https://github.com/github/spec-ki
 Run directly without installing:

 ```bash
-# Create new project
 uvx --from git+https://github.com/github/spec-kit.git specify init <PROJECT_NAME>
-
-# Or initialize in existing project
-uvx --from git+https://github.com/github/spec-kit.git specify init . --ai claude
-# or
-uvx --from git+https://github.com/github/spec-kit.git specify init --here --ai claude
 ```

 **Benefits of persistent installation:**
@@ -146,24 +139,12 @@ Want to see Spec Kit in action? Watch our [video overview](https://www.youtube.c

 [![Spec Kit video header](/media/spec-kit-video-header.jpg)](https://www.youtube.com/watch?v=a9eR1xsfvHg&pp=0gcJCckJAYcqIYzv)

-## 🚶 Community Walkthroughs
-
-See Spec-Driven Development in action across different scenarios with these community-contributed walkthroughs:
-
- **[Greenfield .NET CLI tool](https://github.com/mnriem/spec-kit-dotnet-cli-demo)** — Builds a Timezone Utility as a .NET single-binary CLI tool from a blank directory, covering the full spec-kit workflow: constitution, specify, plan, tasks, and multi-pass implement using GitHub Copilot agents.
-
- **[Greenfield Spring Boot + React platform](https://github.com/mnriem/spec-kit-spring-react-demo)** — Builds an LLM performance analytics platform (REST API, graphs, iteration tracking) from scratch using Spring Boot, embedded React, PostgreSQL, and Docker Compose, with a clarify step and a cross-artifact consistency analysis pass included.
-
- **[Brownfield ASP.NET CMS extension](https://github.com/mnriem/spec-kit-aspnet-brownfield-demo)** — Extends an existing open-source .NET CMS (CarrotCakeCMS-Core, ~307,000 lines of C#, Razor, SQL, JavaScript, and config files) with two new features — cross-platform Docker Compose infrastructure and a token-authenticated headless REST API — demonstrating how spec-kit fits into existing codebases without prior specs or a constitution.
-
- **[Brownfield Java runtime extension](https://github.com/mnriem/spec-kit-java-brownfield-demo)** — Extends an existing open-source Jakarta EE runtime (Piranha, ~420,000 lines of Java, XML, JSP, HTML, and config files across 180 Maven modules) with a password-protected Server Admin Console, demonstrating spec-kit on a large multi-module Java project with no prior specs or constitution.
-
 ## 🤖 Supported AI Agents

 | Agent                                                                                | Support | Notes                                                                                                                                     |
 | ------------------------------------------------------------------------------------ | ------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
 | [Qoder CLI](https://qoder.com/cli)                                                   | ✅      |                                                                                                                                           |
-| [Kiro CLI](https://kiro.dev/docs/cli/)                                               | ✅      | Use `--ai kiro-cli` (alias: `--ai kiro`)                                                                                                 |
+| [Amazon Q Developer CLI](https://aws.amazon.com/developer/learning/q-developer-cli/) | ⚠️      | Amazon Q Developer CLI [does not support](https://github.com/aws/amazon-q-developer-cli/issues/3064) custom arguments for slash commands. |
 | [Amp](https://ampcode.com/)                                                          | ✅      |                                                                                                                                           |
 | [Auggie CLI](https://docs.augmentcode.com/cli/overview)                              | ✅      |                                                                                                                                           |
 | [Claude Code](https://www.anthropic.com/claude-code)                                 | ✅      |                                                                                                                                           |
@@ -179,11 +160,8 @@ See Spec-Driven Development in action across different scenarios with these comm
 | [Qwen Code](https://github.com/QwenLM/qwen-code)                                     | ✅      |                                                                                                                                           |
 | [Roo Code](https://roocode.com/)                                                     | ✅      |                                                                                                                                           |
 | [SHAI (OVHcloud)](https://github.com/ovh/shai)                                       | ✅      |                                                                                                                                           |
-| [Tabnine CLI](https://docs.tabnine.com/main/getting-started/tabnine-cli)             | ✅      |                                                                                                                                           |
-| [Mistral Vibe](https://github.com/mistralai/mistral-vibe)                            | ✅      |                                                                                                                                           |
-| [Kimi Code](https://code.kimi.com/)                                                  | ✅      |                                                                                                                                           |
 | [Windsurf](https://windsurf.com/)                                                    | ✅      |                                                                                                                                           |
-| [Antigravity (agy)](https://antigravity.google/)                                     | ✅      | Requires `--ai-skills` |
+| [Antigravity (agy)](https://agy.ai/)                                                 | ✅      |                                                                                                                                           |
 | Generic                                                                              | ✅      | Bring your own agent — use `--ai generic --ai-commands-dir <path>` for unsupported agents                                                 |

 ## 🔧 Specify CLI Reference
@@ -195,14 +173,14 @@ The `specify` command supports the following options:
 | Command | Description                                                                                                                                             |
 | ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `init`  | Initialize a new Specify project from the latest template                                                                                               |
-| `check` | Check for installed tools (`git`, `claude`, `gemini`, `code`/`code-insiders`, `cursor-agent`, `windsurf`, `qwen`, `opencode`, `codex`, `kiro-cli`, `shai`, `qodercli`, `vibe`, `kimi`) |
+| `check` | Check for installed tools (`git`, `claude`, `gemini`, `code`/`code-insiders`, `cursor-agent`, `windsurf`, `qwen`, `opencode`, `codex`, `shai`, `qodercli`) |

 ### `specify init` Arguments & Options

 | Argument/Option        | Type     | Description                                                                                                                                                                                  |
 | ---------------------- | -------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `<project-name>`       | Argument | Name for your new project directory (optional if using `--here`, or use `.` for current directory)                                                                                           |
-| `--ai`                 | Option   | AI assistant to use: `claude`, `gemini`, `copilot`, `cursor-agent`, `qwen`, `opencode`, `codex`, `windsurf`, `kilocode`, `auggie`, `roo`, `codebuddy`, `amp`, `shai`, `kiro-cli` (`kiro` alias), `agy`, `bob`, `qodercli`, `vibe`, `kimi`, or `generic` (requires `--ai-commands-dir`) |
+| `--ai`                 | Option   | AI assistant to use: `claude`, `gemini`, `copilot`, `cursor-agent`, `qwen`, `opencode`, `codex`, `windsurf`, `kilocode`, `auggie`, `roo`, `codebuddy`, `amp`, `shai`, `q`, `agy`, `bob`, `qodercli`, or `generic` (requires `--ai-commands-dir`) |
 | `--ai-commands-dir`    | Option   | Directory for agent command files (required with `--ai generic`, e.g. `.myagent/commands/`)                                                                                                  |
 | `--script`             | Option   | Script variant to use: `sh` (bash/zsh) or `ps` (PowerShell)                                                                                                                                  |
 | `--ignore-agent-tools` | Flag     | Skip checks for AI agent tools like Claude Code                                                                                                                                              |
@@ -232,24 +210,15 @@ specify init my-project --ai qodercli
 # Initialize with Windsurf support
 specify init my-project --ai windsurf

-# Initialize with Kiro CLI support
-specify init my-project --ai kiro-cli
-
 # Initialize with Amp support
 specify init my-project --ai amp

 # Initialize with SHAI support
 specify init my-project --ai shai

-# Initialize with Mistral Vibe support
-specify init my-project --ai vibe
-
 # Initialize with IBM Bob support
 specify init my-project --ai bob

-# Initialize with Antigravity support
-specify init my-project --ai agy --ai-skills
-
 # Initialize with an unsupported agent (generic / bring your own agent)
 specify init my-project --ai generic --ai-commands-dir .myagent/commands/

@@ -424,7 +393,7 @@ specify init . --force --ai claude
 specify init --here --force --ai claude
 ```

-The CLI will check if you have Claude Code, Gemini CLI, Cursor CLI, Qwen CLI, opencode, Codex CLI, Qoder CLI, Tabnine CLI, Kiro CLI, or Mistral Vibe installed. If you do not, or you prefer to get the templates without checking for the right tools, use `--ignore-agent-tools` with your command:
+The CLI will check if you have Claude Code, Gemini CLI, Cursor CLI, Qwen CLI, opencode, Codex CLI, Qoder CLI, or Amazon Q Developer CLI installed. If you do not, or you prefer to get the templates without checking for the right tools, use `--ignore-agent-tools` with your command:

 ```bash
 specify init <project_name> --ai claude --ignore-agent-tools
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -173,6 +173,6 @@ Finally, implement the solution:

 ## Next Steps

- Read the [complete methodology](https://github.com/github/spec-kit/blob/main/spec-driven.md) for in-depth guidance
- Check out [more examples](https://github.com/github/spec-kit/tree/main/templates) in the repository
+- Read the [complete methodology](../spec-driven.md) for in-depth guidance
+- Check out [more examples](../templates) in the repository
 - Explore the [source code on GitHub](https://github.com/github/spec-kit)
--- a/extensions/EXTENSION-API-REFERENCE.md
+++ b/extensions/EXTENSION-API-REFERENCE.md
@@ -243,34 +243,6 @@ manager.check_compatibility(
 )  # Raises: CompatibilityError if incompatible
 ```

-### CatalogEntry
-
-**Module**: `specify_cli.extensions`
-
-Represents a single catalog in the active catalog stack.
-
-```python
-from specify_cli.extensions import CatalogEntry
-
-entry = CatalogEntry(
-    url="https://example.com/catalog.json",
-    name="default",
-    priority=1,
-    install_allowed=True,
-    description="Built-in catalog of installable extensions",
-)
-```
-
-**Fields**:
-
-| Field | Type | Description |
-|-------|------|-------------|
-| `url` | `str` | Catalog URL (must use HTTPS, or HTTP for localhost) |
-| `name` | `str` | Human-readable catalog name |
-| `priority` | `int` | Sort order (lower = higher priority, wins on conflicts) |
-| `install_allowed` | `bool` | Whether extensions from this catalog can be installed |
-| `description` | `str` | Optional human-readable description of the catalog (default: empty) |
-
 ### ExtensionCatalog

 **Module**: `specify_cli.extensions`
@@ -281,67 +253,30 @@ from specify_cli.extensions import ExtensionCatalog
 catalog = ExtensionCatalog(project_root)
 ```

-**Class attributes**:
-
-```python
-ExtensionCatalog.DEFAULT_CATALOG_URL    # default catalog URL
-ExtensionCatalog.COMMUNITY_CATALOG_URL  # community catalog URL
-```
-
 **Methods**:

 ```python
-# Get the ordered list of active catalogs
-entries = catalog.get_active_catalogs()  # List[CatalogEntry]
-
-# Fetch catalog (primary catalog, backward compat)
+# Fetch catalog
 catalog_data = catalog.fetch_catalog(force_refresh: bool = False)  # Dict

-# Search extensions across all active catalogs
-# Each result includes _catalog_name and _install_allowed
+# Search extensions
 results = catalog.search(
    query: Optional[str] = None,
    tag: Optional[str] = None,
    author: Optional[str] = None,
    verified_only: bool = False
-)  # Returns: List[Dict]  — each dict includes _catalog_name, _install_allowed
+)  # Returns: List[Dict]

-# Get extension info (searches all active catalogs)
-# Returns None if not found; includes _catalog_name and _install_allowed
+# Get extension info
 ext_info = catalog.get_extension_info(extension_id: str)  # Optional[Dict]

-# Check cache validity (primary catalog)
+# Check cache validity
 is_valid = catalog.is_cache_valid()  # bool

-# Clear all catalog caches
+# Clear cache
 catalog.clear_cache()
 ```

-**Result annotation fields**:
-
-Each extension dict returned by `search()` and `get_extension_info()` includes:
-
-| Field | Type | Description |
-|-------|------|-------------|
-| `_catalog_name` | `str` | Name of the source catalog |
-| `_install_allowed` | `bool` | Whether installation is allowed from this catalog |
-
-**Catalog config file** (`.specify/extension-catalogs.yml`):
-
-```yaml
-catalogs:
-  - name: "default"
-    url: "https://raw.githubusercontent.com/github/spec-kit/main/extensions/catalog.json"
-    priority: 1
-    install_allowed: true
-    description: "Built-in catalog of installable extensions"
-  - name: "community"
-    url: "https://raw.githubusercontent.com/github/spec-kit/main/extensions/catalog.community.json"
-    priority: 2
-    install_allowed: false
-    description: "Community-contributed extensions (discovery only)"
-```
-
 ### HookExecutor

 **Module**: `specify_cli.extensions`
@@ -608,39 +543,6 @@ EXECUTE_COMMAND: {command}

 **Output**: List of installed extensions with metadata

-### extension catalog list
-
-**Usage**: `specify extension catalog list`
-
-Lists all active catalogs in the current catalog stack, showing name, description, URL, priority, and `install_allowed` status.
-
-### extension catalog add
-
-**Usage**: `specify extension catalog add URL [OPTIONS]`
-
-**Options**:
-
- `--name NAME` - Catalog name (required)
- `--priority INT` - Priority (lower = higher priority, default: 10)
- `--install-allowed / --no-install-allowed` - Allow installs from this catalog (default: false)
- `--description TEXT` - Optional description of the catalog
-
-**Arguments**:
-
- `URL` - Catalog URL (must use HTTPS)
-
-Adds a catalog entry to `.specify/extension-catalogs.yml`.
-
-### extension catalog remove
-
-**Usage**: `specify extension catalog remove NAME`
-
-**Arguments**:
-
- `NAME` - Catalog name to remove
-
-Removes a catalog entry from `.specify/extension-catalogs.yml`.
-
 ### extension add

 **Usage**: `specify extension add EXTENSION [OPTIONS]`
@@ -649,13 +551,13 @@ Removes a catalog entry from `.specify/extension-catalogs.yml`.

 - `--from URL` - Install from custom URL
 - `--dev PATH` - Install from local directory
+- `--version VERSION` - Install specific version
+- `--no-register` - Skip command registration

 **Arguments**:

 - `EXTENSION` - Extension name or URL

-**Note**: Extensions from catalogs with `install_allowed: false` cannot be installed via this command.
-
 ### extension remove

 **Usage**: `specify extension remove EXTENSION [OPTIONS]`
@@ -673,8 +575,6 @@ Removes a catalog entry from `.specify/extension-catalogs.yml`.

 **Usage**: `specify extension search [QUERY] [OPTIONS]`

-Searches all active catalogs simultaneously. Results include source catalog name and install_allowed status.
-
 **Options**:

 - `--tag TAG` - Filter by tag
@@ -689,8 +589,6 @@ Searches all active catalogs simultaneously. Results include source catalog name

 **Usage**: `specify extension info EXTENSION`

-Shows source catalog and install_allowed status.
-
 **Arguments**:

 - `EXTENSION` - Extension ID
--- a/extensions/EXTENSION-DEVELOPMENT-GUIDE.md
+++ b/extensions/EXTENSION-DEVELOPMENT-GUIDE.md
@@ -332,67 +332,6 @@ echo "$config"

 ---

-## Excluding Files with `.extensionignore`
-
-Extension authors can create a `.extensionignore` file in the extension root to exclude files and folders from being copied when a user installs the extension with `specify extension add`. This is useful for keeping development-only files (tests, CI configs, docs source, etc.) out of the installed copy.
-
-### Format
-
-The file uses `.gitignore`-compatible patterns (one per line), powered by the [`pathspec`](https://pypi.org/project/pathspec/) library:
-
- Blank lines are ignored
- Lines starting with `#` are comments
- `*` matches anything **except** `/` (does not cross directory boundaries)
- `**` matches zero or more directories (e.g., `docs/**/*.draft.md`)
- `?` matches any single character except `/`
- A trailing `/` restricts a pattern to directories only
- Patterns containing `/` (other than a trailing slash) are anchored to the extension root
- Patterns without `/` match at any depth in the tree
- `!` negates a previously excluded pattern (re-includes a file)
- Backslashes in patterns are normalised to forward slashes for cross-platform compatibility
- The `.extensionignore` file itself is always excluded automatically
-
-### Example
-
-```gitignore
-# .extensionignore
-
-# Development files
-tests/
-.github/
-.gitignore
-
-# Build artifacts
-__pycache__/
-*.pyc
-dist/
-
-# Documentation source (keep only the built README)
-docs/
-CONTRIBUTING.md
-```
-
-### Pattern Matching
-
-| Pattern | Matches | Does NOT match |
-|---------|---------|----------------|
-| `*.pyc` | Any `.pyc` file in any directory | — |
-| `tests/` | The `tests` directory (and all its contents) | A file named `tests` |
-| `docs/*.draft.md` | `docs/api.draft.md` (directly inside `docs/`) | `docs/sub/api.draft.md` (nested) |
-| `.env` | The `.env` file at any level | — |
-| `!README.md` | Re-includes `README.md` even if matched by an earlier pattern | — |
-| `docs/**/*.draft.md` | `docs/api.draft.md`, `docs/sub/api.draft.md` | — |
-
-### Unsupported Features
-
-The following `.gitignore` features are **not applicable** in this context:
-
- **Multiple `.extensionignore` files**: Only a single file at the extension root is supported (`.gitignore` supports files in subdirectories)
- **`$GIT_DIR/info/exclude` and `core.excludesFile`**: These are Git-specific and have no equivalent here
- **Negation inside excluded directories**: Because file copying uses `shutil.copytree`, excluding a directory prevents recursion into it entirely. A negation pattern cannot re-include a file inside a directory that was itself excluded. For example, the combination `tests/` followed by `!tests/important.py` will **not** preserve `tests/important.py` — the `tests/` directory is skipped at the root level and its contents are never evaluated. To work around this, exclude the directory's contents individually instead of the directory itself (e.g., `tests/*.pyc` and `tests/.cache/` rather than `tests/`).
-
---
-
 ## Validation Rules

 ### Extension ID
@@ -517,20 +456,18 @@ Users install with:
 specify extension add --from https://github.com/.../spec-kit-my-ext-1.0.0.zip
 ```

-### Option 3: Community Reference Catalog
+### Option 3: Extension Catalog (Future)

-Submit to the community catalog for public discovery:
+Submit to official catalog:

 1. **Fork** spec-kit repository
-2. **Add entry** to `extensions/catalog.community.json`
-3. **Update** `extensions/README.md` with your extension
-4. **Create PR** following the [Extension Publishing Guide](EXTENSION-PUBLISHING-GUIDE.md)
-5. **After merge**, your extension becomes available:
-   - Users can browse `catalog.community.json` to discover your extension
-   - Users copy the entry to their own `catalog.json`
-   - Users install with: `specify extension add my-ext` (from their catalog)
+2. **Add entry** to `extensions/catalog.json`
+3. **Create PR**
+4. **After merge**, users can install with:

-See the [Extension Publishing Guide](EXTENSION-PUBLISHING-GUIDE.md) for detailed submission instructions.
+   ```bash
+   specify extension add my-ext  # No URL needed!
+   ```

 ---

--- a/extensions/EXTENSION-PUBLISHING-GUIDE.md
+++ b/extensions/EXTENSION-PUBLISHING-GUIDE.md
@@ -129,32 +129,26 @@ specify extension add --from https://github.com/your-org/spec-kit-your-extension

 ## Submit to Catalog

-### Understanding the Catalogs
-
-Spec Kit uses a dual-catalog system. For details about how catalogs work, see the main [Extensions README](README.md#extension-catalogs).
-
-**For extension publishing**: All community extensions should be added to `catalog.community.json`. Users browse this catalog and copy extensions they trust into their own `catalog.json`.
-
 ### 1. Fork the spec-kit Repository

 ```bash
 # Fork on GitHub
-# https://github.com/github/spec-kit/fork
+# https://github.com/statsperform/spec-kit/fork

 # Clone your fork
 git clone https://github.com/YOUR-USERNAME/spec-kit.git
 cd spec-kit
 ```

-### 2. Add Extension to Community Catalog
+### 2. Add Extension to Catalog

-Edit `extensions/catalog.community.json` and add your extension:
+Edit `extensions/catalog.json` and add your extension:

 ```json
 {
  "schema_version": "1.0",
  "updated_at": "2026-01-28T15:54:00Z",
-  "catalog_url": "https://raw.githubusercontent.com/github/spec-kit/main/extensions/catalog.community.json",
+  "catalog_url": "https://raw.githubusercontent.com/statsperform/spec-kit/main/extensions/catalog.json",
  "extensions": {
    "your-extension": {
      "name": "Your Extension Name",
@@ -204,25 +198,15 @@ Edit `extensions/catalog.community.json` and add your extension:
 - Use current timestamp for `created_at` and `updated_at`
 - Update the top-level `updated_at` to current time

-### 3. Update Extensions README
-
-Add your extension to the Available Extensions table in `extensions/README.md`:
-
-```markdown
-| Your Extension Name | Brief description of what it does | [repo-name](https://github.com/your-org/spec-kit-your-extension) |
-```
-
-Insert your extension in alphabetical order in the table.
-
-### 4. Submit Pull Request
+### 3. Submit Pull Request

 ```bash
 # Create a branch
 git checkout -b add-your-extension

 # Commit your changes
-git add extensions/catalog.community.json extensions/README.md
-git commit -m "Add your-extension to community catalog
+git add extensions/catalog.json
+git commit -m "Add your-extension to catalog

 - Extension ID: your-extension
 - Version: 1.0.0
@@ -234,7 +218,7 @@ git commit -m "Add your-extension to community catalog
 git push origin add-your-extension

 # Create Pull Request on GitHub
-# https://github.com/github/spec-kit/compare
+# https://github.com/statsperform/spec-kit/compare
 ```

 **Pull Request Template**:
@@ -259,8 +243,6 @@ Brief description of what your extension does.
 - [x] Extension tested on real project
 - [x] All commands working
 - [x] No security vulnerabilities
- [x] Added to extensions/catalog.community.json
- [x] Added to extensions/README.md Available Extensions table

 ### Testing
 Tested on:
--- a/extensions/EXTENSION-USER-GUIDE.md
+++ b/extensions/EXTENSION-USER-GUIDE.md
@@ -76,15 +76,13 @@ vim .specify/extensions/jira/jira-config.yml

 ## Finding Extensions

-`specify extension search` searches **all active catalogs** simultaneously, including the community catalog by default. Results are annotated with their source catalog and install status.
-
 ### Browse All Extensions

 ```bash
 specify extension search
 ```

-Shows all extensions across all active catalogs (default and community by default).
+Shows all available extensions in the catalog.

 ### Search by Keyword

@@ -402,13 +400,13 @@ In addition to extension-specific environment variables (`SPECKIT_{EXT_ID}_*`),

 | Variable | Description | Default |
 |----------|-------------|---------|
-| `SPECKIT_CATALOG_URL`       | Override the full catalog stack with a single URL (backward compat) | Built-in default stack |
+| `SPECKIT_CATALOG_URL`       | Override the extension catalog URL | GitHub-hosted catalog |
 | `GH_TOKEN` / `GITHUB_TOKEN` | GitHub API token for downloads     | None                  |

 #### Example: Using a custom catalog for testing

 ```bash
-# Point to a local or alternative catalog (replaces the full stack)
+# Point to a local or alternative catalog
 export SPECKIT_CATALOG_URL="http://localhost:8000/catalog.json"

 # Or use a staging catalog
@@ -417,98 +415,11 @@ export SPECKIT_CATALOG_URL="https://example.com/staging/catalog.json"

 ---

-## Extension Catalogs
-
-Spec Kit uses a **catalog stack** — an ordered list of catalogs searched simultaneously. By default, two catalogs are active:
-
-| Priority | Catalog | Install Allowed | Purpose |
-|----------|---------|-----------------|---------|
-| 1 | `catalog.json` (default) | ✅ Yes | Curated extensions available for installation |
-| 2 | `catalog.community.json` (community) | ❌ No (discovery only) | Browse community extensions |
-
-### Listing Active Catalogs
-
-```bash
-specify extension catalog list
-```
-
-### Managing Catalogs via CLI
-
-You can view the main catalog management commands using `--help`:
-
-```text
-specify extension catalog --help
-
- Usage: specify extension catalog [OPTIONS] COMMAND [ARGS]...
-
- Manage extension catalogs
-╭─ Options ────────────────────────────────────────────────────────────────────────╮
-│ --help          Show this message and exit.                                      │
-╰──────────────────────────────────────────────────────────────────────────────────╯
-╭─ Commands ───────────────────────────────────────────────────────────────────────╮
-│ list     List all active extension catalogs.                                     │
-│ add      Add a catalog to .specify/extension-catalogs.yml.                       │
-│ remove   Remove a catalog from .specify/extension-catalogs.yml.                  │
-╰──────────────────────────────────────────────────────────────────────────────────╯
-```
-
-### Adding a Catalog (Project-scoped)
-
-```bash
-# Add an internal catalog that allows installs
-specify extension catalog add \
-  --name "internal" \
-  --priority 2 \
-  --install-allowed \
-  https://internal.company.com/spec-kit/catalog.json
-
-# Add a discovery-only catalog
-specify extension catalog add \
-  --name "partner" \
-  --priority 5 \
-  https://partner.example.com/spec-kit/catalog.json
-```
-
-This creates or updates `.specify/extension-catalogs.yml`.
-
-### Removing a Catalog
-
-```bash
-specify extension catalog remove internal
-```
-
-### Manual Config File
-
-You can also edit `.specify/extension-catalogs.yml` directly:
-
-```yaml
-catalogs:
-  - name: "default"
-    url: "https://raw.githubusercontent.com/github/spec-kit/main/extensions/catalog.json"
-    priority: 1
-    install_allowed: true
-    description: "Built-in catalog of installable extensions"
-
-  - name: "internal"
-    url: "https://internal.company.com/spec-kit/catalog.json"
-    priority: 2
-    install_allowed: true
-    description: "Internal company extensions"
-
-  - name: "community"
-    url: "https://raw.githubusercontent.com/github/spec-kit/main/extensions/catalog.community.json"
-    priority: 3
-    install_allowed: false
-    description: "Community-contributed extensions (discovery only)"
-```
-
-A user-level equivalent lives at `~/.specify/extension-catalogs.yml`. Project-level config takes full precedence when it contains one or more catalog entries. An empty `catalogs: []` list falls back to built-in defaults.
-
 ## Organization Catalog Customization

-### Why Customize Your Catalog
+### Why the Default Catalog is Empty

-Organizations customize their catalogs to:
+The default spec-kit catalog ships empty by design. This allows organizations to:

 - **Control available extensions** - Curate which extensions your team can install
 - **Host private extensions** - Internal tools that shouldn't be public
@@ -586,40 +497,24 @@ Options for hosting your catalog:

 #### 3. Configure Your Environment

-##### Option A: Catalog stack config file (recommended)
-
-Add to `.specify/extension-catalogs.yml` in your project:
-
-```yaml
-catalogs:
-  - name: "my-org"
-    url: "https://your-org.com/spec-kit/catalog.json"
-    priority: 1
-    install_allowed: true
-```
-
-Or use the CLI:
-
-```bash
-specify extension catalog add \
-  --name "my-org" \
-  --install-allowed \
-  https://your-org.com/spec-kit/catalog.json
-```
-
-##### Option B: Environment variable (recommended for CI/CD, single-catalog)
+##### Option A: Environment variable (recommended for CI/CD)

 ```bash
 # In ~/.bashrc, ~/.zshrc, or CI pipeline
 export SPECKIT_CATALOG_URL="https://your-org.com/spec-kit/catalog.json"
 ```

+##### Option B: Per-project configuration
+
+Create `.env` or set in your shell before running spec-kit commands:
+
+```bash
+SPECKIT_CATALOG_URL="https://your-org.com/spec-kit/catalog.json" specify extension search
+```
+
 #### 4. Verify Configuration

 ```bash
-# List active catalogs
-specify extension catalog list
-
 # Search should now show your catalog's extensions
 specify extension search

--- a/extensions/README.md
+++ b/extensions/README.md
@@ -1,130 +1,14 @@
-# Spec Kit Extensions
+# Spec Kit Community Extensions

-Extension system for [Spec Kit](https://github.com/github/spec-kit) - add new functionality without bloating the core framework.
+Community-contributed extensions for [Spec Kit](https://github.com/github/spec-kit).

-## Extension Catalogs
-
-Spec Kit provides two catalog files with different purposes:
-
-### Your Catalog (`catalog.json`)
-
- **Purpose**: Default upstream catalog of extensions used by the Spec Kit CLI
- **Default State**: Empty by design in the upstream project - you or your organization populate a fork/copy with extensions you trust
- **Location (upstream)**: `extensions/catalog.json` in the GitHub-hosted spec-kit repo
- **CLI Default**: The `specify extension` commands use the upstream catalog URL by default, unless overridden
- **Org Catalog**: Point `SPECKIT_CATALOG_URL` at your organization's fork or hosted catalog JSON to use it instead of the upstream default
- **Customization**: Copy entries from the community catalog into your org catalog, or add your own extensions directly
-
-**Example override:**
-```bash
-# Override the default upstream catalog with your organization's catalog
-export SPECKIT_CATALOG_URL="https://your-org.com/spec-kit/catalog.json"
-specify extension search  # Now uses your organization's catalog instead of the upstream default
-```
-
-### Community Reference Catalog (`catalog.community.json`)
-
- **Purpose**: Browse available community-contributed extensions
- **Status**: Active - contains extensions submitted by the community
- **Location**: `extensions/catalog.community.json`
- **Usage**: Reference catalog for discovering available extensions
- **Submission**: Open to community contributions via Pull Request
-
-**How It Works:**
-
-## Making Extensions Available
-
-You control which extensions your team can discover and install:
-
-### Option 1: Curated Catalog (Recommended for Organizations)
-
-Populate your `catalog.json` with approved extensions:
-
-1. **Discover** extensions from various sources:
-   - Browse `catalog.community.json` for community extensions
-   - Find private/internal extensions in your organization's repos
-   - Discover extensions from trusted third parties
-2. **Review** extensions and choose which ones you want to make available
-3. **Add** those extension entries to your own `catalog.json`
-4. **Team members** can now discover and install them:
-   - `specify extension search` shows your curated catalog
-   - `specify extension add <name>` installs from your catalog
-
-**Benefits**: Full control over available extensions, team consistency, organizational approval workflow
-
-**Example**: Copy an entry from `catalog.community.json` to your `catalog.json`, then your team can discover and install it by name.
-
-### Option 2: Direct URLs (For Ad-hoc Use)
-
-Skip catalog curation - team members install directly using URLs:
-
-```bash
-specify extension add --from https://github.com/org/spec-kit-ext/archive/refs/tags/v1.0.0.zip
-```
-
-**Benefits**: Quick for one-off testing or private extensions
-
-**Tradeoff**: Extensions installed this way won't appear in `specify extension search` for other team members unless you also add them to your `catalog.json`.
-
-## Available Community Extensions
-
-The following community-contributed extensions are available in [`catalog.community.json`](catalog.community.json):
+## Available Extensions

 | Extension | Purpose | URL |
 |-----------|---------|-----|
-| Azure DevOps Integration | Sync user stories and tasks to Azure DevOps work items using OAuth authentication | [spec-kit-azure-devops](https://github.com/pragya247/spec-kit-azure-devops) |
-| Cleanup Extension | Post-implementation quality gate that reviews changes, fixes small issues (scout rule), creates tasks for medium issues, and generates analysis for large issues | [spec-kit-cleanup](https://github.com/dsrednicki/spec-kit-cleanup) |
-| Fleet Orchestrator | Orchestrate a full feature lifecycle with human-in-the-loop gates across all SpecKit phases | [spec-kit-fleet](https://github.com/sharathsatish/spec-kit-fleet) |
-| Jira Integration | Create Jira Epics, Stories, and Issues from spec-kit specifications and task breakdowns with configurable hierarchy and custom field support | [spec-kit-jira](https://github.com/mbachorik/spec-kit-jira) |
-| Project Health Check | Diagnose a Spec Kit project and report health issues across structure, agents, features, scripts, extensions, and git | [spec-kit-doctor](https://github.com/KhawarHabibKhan/spec-kit-doctor) |
-| Ralph Loop | Autonomous implementation loop using AI agent CLI | [spec-kit-ralph](https://github.com/Rubiss/spec-kit-ralph) |
-| Retrospective Extension | Post-implementation retrospective with spec adherence scoring, drift analysis, and human-gated spec updates | [spec-kit-retrospective](https://github.com/emi-dm/spec-kit-retrospective) |
-| Review Extension | Post-implementation comprehensive code review with specialized agents for code quality, comments, tests, error handling, type design, and simplification | [spec-kit-review](https://github.com/ismaelJimenez/spec-kit-review) |
-| Spec Sync | Detect and resolve drift between specs and implementation. AI-assisted resolution with human approval | [spec-kit-sync](https://github.com/bgervin/spec-kit-sync) |
-| Understanding | Automated requirements quality analysis — 31 deterministic metrics against IEEE/ISO standards with experimental energy-based ambiguity detection | [understanding](https://github.com/Testimonial/understanding) |
 | V-Model Extension Pack | Enforces V-Model paired generation of development specs and test specs with full traceability | [spec-kit-v-model](https://github.com/leocamello/spec-kit-v-model) |
-| Verify Extension | Post-implementation quality gate that validates implemented code against specification artifacts | [spec-kit-verify](https://github.com/ismaelJimenez/spec-kit-verify) |
-
+| Cleanup Extension | Post-implementation quality gate that reviews changes, fixes small issues (scout rule), creates tasks for medium issues, and generates analysis for large issues | [spec-kit-cleanup](https://github.com/dsrednicki/spec-kit-cleanup) |

 ## Adding Your Extension

-### Submission Process
-
-To add your extension to the community catalog:
-
-1. **Prepare your extension** following the [Extension Development Guide](EXTENSION-DEVELOPMENT-GUIDE.md)
-2. **Create a GitHub release** for your extension
-3. **Submit a Pull Request** that:
-   - Adds your extension to `extensions/catalog.community.json`
-   - Updates this README with your extension in the Available Extensions table
-4. **Wait for review** - maintainers will review and merge if criteria are met
-
-See the [Extension Publishing Guide](EXTENSION-PUBLISHING-GUIDE.md) for detailed step-by-step instructions.
-
-### Submission Checklist
-
-Before submitting, ensure:
-
- ✅ Valid `extension.yml` manifest
- ✅ Complete README with installation and usage instructions
- ✅ LICENSE file included
- ✅ GitHub release created with semantic version (e.g., v1.0.0)
- ✅ Extension tested on a real project
- ✅ All commands working as documented
-
-## Installing Extensions
-Once extensions are available (either in your catalog or via direct URL), install them:
-
-```bash
-# From your curated catalog (by name)
-specify extension search                  # See what's in your catalog
-specify extension add <extension-name>    # Install by name
-
-# Direct from URL (bypasses catalog)
-specify extension add --from https://github.com/<org>/<repo>/archive/refs/tags/<version>.zip
-
-# List installed extensions
-specify extension list
-```
-
-For more information, see the [Extension User Guide](EXTENSION-USER-GUIDE.md).
+See the [Extension Publishing Guide](EXTENSION-PUBLISHING-GUIDE.md) for instructions on how to submit your extension to the community catalog.
--- a/extensions/RFC-EXTENSION-SYSTEM.md
+++ b/extensions/RFC-EXTENSION-SYSTEM.md
@@ -1,9 +1,9 @@
 # RFC: Spec Kit Extension System

-**Status**: Implemented
+**Status**: Draft
 **Author**: Stats Perform Engineering
 **Created**: 2026-01-28
-**Updated**: 2026-03-11
+**Updated**: 2026-01-28

 ---

@@ -24,9 +24,8 @@
 13. [Security Considerations](#security-considerations)
 14. [Migration Strategy](#migration-strategy)
 15. [Implementation Phases](#implementation-phases)
-16. [Resolved Questions](#resolved-questions)
-17. [Open Questions (Remaining)](#open-questions-remaining)
-18. [Appendices](#appendices)
+16. [Open Questions](#open-questions)
+17. [Appendices](#appendices)

 ---

@@ -859,41 +858,11 @@ def should_execute_hook(hook: dict, config: dict) -> bool:

 ## Extension Discovery & Catalog

-### Dual Catalog System
-
-Spec Kit uses two catalog files with different purposes:
-
-#### User Catalog (`catalog.json`)
+### Central Catalog

 **URL**: `https://raw.githubusercontent.com/github/spec-kit/main/extensions/catalog.json`

- **Purpose**: Organization's curated catalog of approved extensions
- **Default State**: Empty by design - users populate with extensions they trust
- **Usage**: Primary catalog (priority 1, `install_allowed: true`) in the default stack
- **Control**: Organizations maintain their own fork/version for their teams
-
-#### Community Reference Catalog (`catalog.community.json`)
-
-**URL**: `https://raw.githubusercontent.com/github/spec-kit/main/extensions/catalog.community.json`
-
- **Purpose**: Reference catalog of available community-contributed extensions
- **Verification**: Community extensions may have `verified: false` initially
- **Status**: Active - open for community contributions
- **Submission**: Via Pull Request following the Extension Publishing Guide
- **Usage**: Secondary catalog (priority 2, `install_allowed: false`) in the default stack — discovery only
-
-**How It Works (default stack):**
-
-1. **Discover**: `specify extension search` searches both catalogs — community extensions appear automatically
-2. **Review**: Evaluate community extensions for security, quality, and organizational fit
-3. **Curate**: Copy approved entries from community catalog to your `catalog.json`, or add to `.specify/extension-catalogs.yml` with `install_allowed: true`
-4. **Install**: Use `specify extension add <name>` — only allowed from `install_allowed: true` catalogs
-
-This approach gives organizations full control over which extensions can be installed while still providing community discoverability out of the box.
-
-### Catalog Format
-
-**Format** (same for both catalogs):
+**Format**:

 ```json
 {
@@ -962,113 +931,24 @@ specify extension info jira

 ### Custom Catalogs

-Spec Kit supports a **catalog stack** — an ordered list of catalogs that the CLI merges and searches across. This allows organizations to maintain their own org-approved extensions alongside an internal catalog and community discovery, all at once.
-
-#### Catalog Stack Resolution
-
-The active catalog stack is resolved in this order (first match wins):
-
-1. **`SPECKIT_CATALOG_URL` environment variable** — single catalog replacing all defaults (backward compat)
-2. **Project-level `.specify/extension-catalogs.yml`** — full control for the project
-3. **User-level `~/.specify/extension-catalogs.yml`** — personal defaults
-4. **Built-in default stack** — `catalog.json` (install_allowed: true) + `catalog.community.json` (install_allowed: false)
-
-#### Default Built-in Stack
-
-When no config file exists, the CLI uses:
-
-| Priority | Catalog | install_allowed | Purpose |
-|----------|---------|-----------------|---------|
-| 1 | `catalog.json` (default) | `true` | Curated extensions available for installation |
-| 2 | `catalog.community.json` (community) | `false` | Discovery only — browse but not install |
-
-This means `specify extension search` surfaces community extensions out of the box, while `specify extension add` is still restricted to entries from catalogs with `install_allowed: true`.
-
-#### `.specify/extension-catalogs.yml` Config File
-
-```yaml
-catalogs:
-  - name: "default"
-    url: "https://raw.githubusercontent.com/github/spec-kit/main/extensions/catalog.json"
-    priority: 1          # Highest — only approved entries can be installed
-    install_allowed: true
-    description: "Built-in catalog of installable extensions"
-
-  - name: "internal"
-    url: "https://internal.company.com/spec-kit/catalog.json"
-    priority: 2
-    install_allowed: true
-    description: "Internal company extensions"
-
-  - name: "community"
-    url: "https://raw.githubusercontent.com/github/spec-kit/main/extensions/catalog.community.json"
-    priority: 3          # Lowest — discovery only, not installable
-    install_allowed: false
-    description: "Community-contributed extensions (discovery only)"
-```
-
-A user-level equivalent lives at `~/.specify/extension-catalogs.yml`. When a project-level config is present with one or more catalog entries, it takes full control and the built-in defaults are not applied. An empty `catalogs: []` list is treated the same as no config file, falling back to defaults.
-
-#### Catalog CLI Commands
+Organizations can host private catalogs:

 ```bash
-# List active catalogs with name, URL, priority, and install_allowed
-specify extension catalog list
+# Add custom catalog
+specify extension add-catalog https://internal.company.com/spec-kit/catalog.json

-# Add a catalog (project-scoped)
-specify extension catalog add --name "internal" --install-allowed \
-  https://internal.company.com/spec-kit/catalog.json
+# Set as default
+specify extension set-catalog --default https://internal.company.com/spec-kit/catalog.json

-# Add a discovery-only catalog
-specify extension catalog add --name "community" \
-  https://raw.githubusercontent.com/github/spec-kit/main/extensions/catalog.community.json
-
-# Remove a catalog
-specify extension catalog remove internal
-
-# Show which catalog an extension came from
-specify extension info jira
-# → Source catalog: default
+# List catalogs
+specify extension catalogs
 ```

-#### Merge Conflict Resolution
+**Catalog priority**:

-When the same extension `id` appears in multiple catalogs, the higher-priority (lower priority number) catalog wins. Extensions from lower-priority catalogs with the same `id` are ignored.
-
-#### `install_allowed: false` Behavior
-
-Extensions from discovery-only catalogs are shown in `specify extension search` results but cannot be installed directly:
-
-```
-⚠  'linear' is available in the 'community' catalog but installation is not allowed from that catalog.
-
-To enable installation, add 'linear' to an approved catalog (install_allowed: true) in .specify/extension-catalogs.yml.
-```
-
-#### `SPECKIT_CATALOG_URL` (Backward Compatibility)
-
-The `SPECKIT_CATALOG_URL` environment variable still works — it is treated as a single `install_allowed: true` catalog, **replacing both defaults** for full backward compatibility:
-
-```bash
-# Point to your organization's catalog
-export SPECKIT_CATALOG_URL="https://internal.company.com/spec-kit/catalog.json"
-
-# All extension commands now use your custom catalog
-specify extension search       # Uses custom catalog
-specify extension add jira     # Installs from custom catalog
-```
-
-**Requirements:**
- URL must use HTTPS (HTTP only allowed for localhost testing)
- Catalog must follow the standard catalog.json schema
- Must be publicly accessible or accessible within your network
-
-**Example for testing:**
-```bash
-# Test with localhost during development
-export SPECKIT_CATALOG_URL="http://localhost:8000/catalog.json"
-specify extension search
-```
+1. Project-specific catalog (`.specify/extension-catalogs.yml`)
+2. User-level catalog (`~/.specify/extension-catalogs.yml`)
+3. Default GitHub catalog

 ---

@@ -1505,225 +1385,203 @@ AI agent registers both names, so old scripts work.

 ## Implementation Phases

-### Phase 1: Core Extension System ✅ COMPLETED
+### Phase 1: Core Extension System (Week 1-2)

 **Goal**: Basic extension infrastructure

 **Deliverables**:

- [x] Extension manifest schema (`extension.yml`)
- [x] Extension directory structure
- [x] CLI commands:
-  - [x] `specify extension list`
-  - [x] `specify extension add` (from URL and local `--dev`)
-  - [x] `specify extension remove`
- [x] Extension registry (`.specify/extensions/.registry`)
- [x] Command registration (Claude and 15+ other agents)
- [x] Basic validation (manifest schema, compatibility)
- [x] Documentation (extension development guide)
+- [ ] Extension manifest schema (`extension.yml`)
+- [ ] Extension directory structure
+- [ ] CLI commands:
+  - [ ] `specify extension list`
+  - [ ] `specify extension add` (from URL)
+  - [ ] `specify extension remove`
+- [ ] Extension registry (`.specify/extensions/.registry`)
+- [ ] Command registration (Claude only initially)
+- [ ] Basic validation (manifest schema, compatibility)
+- [ ] Documentation (extension development guide)

 **Testing**:

- [x] Unit tests for manifest parsing
- [x] Integration test: Install dummy extension
- [x] Integration test: Register commands with Claude
+- [ ] Unit tests for manifest parsing
+- [ ] Integration test: Install dummy extension
+- [ ] Integration test: Register commands with Claude

-### Phase 2: Jira Extension ✅ COMPLETED
+### Phase 2: Jira Extension (Week 3)

 **Goal**: First production extension

 **Deliverables**:

- [x] Create `spec-kit-jira` repository
- [x] Port Jira functionality to extension
- [x] Create `jira-config.yml` template
- [x] Commands:
-  - [x] `specstoissues.md`
-  - [x] `discover-fields.md`
-  - [x] `sync-status.md`
- [x] Helper scripts
- [x] Documentation (README, configuration guide, examples)
- [x] Release v3.0.0
+- [ ] Create `spec-kit-jira` repository
+- [ ] Port Jira functionality to extension
+- [ ] Create `jira-config.yml` template
+- [ ] Commands:
+  - [ ] `specstoissues.md`
+  - [ ] `discover-fields.md`
+  - [ ] `sync-status.md`
+- [ ] Helper scripts
+- [ ] Documentation (README, configuration guide, examples)
+- [ ] Release v1.0.0

 **Testing**:

- [x] Test on `eng-msa-ts` project
- [x] Verify spec→Epic, phase→Story, task→Issue mapping
- [x] Test configuration loading and validation
- [x] Test custom field application
+- [ ] Test on `eng-msa-ts` project
+- [ ] Verify spec→Epic, phase→Story, task→Issue mapping
+- [ ] Test configuration loading and validation
+- [ ] Test custom field application

-### Phase 3: Extension Catalog ✅ COMPLETED
+### Phase 3: Extension Catalog (Week 4)

 **Goal**: Discovery and distribution

 **Deliverables**:

- [x] Central catalog (`extensions/catalog.json` in spec-kit repo)
- [x] Community catalog (`extensions/catalog.community.json`)
- [x] Catalog fetch and parsing with multi-catalog support
- [x] CLI commands:
-  - [x] `specify extension search`
-  - [x] `specify extension info`
-  - [x] `specify extension catalog list`
-  - [x] `specify extension catalog add`
-  - [x] `specify extension catalog remove`
- [x] Documentation (how to publish extensions)
+- [ ] Central catalog (`extensions/catalog.json` in spec-kit repo)
+- [ ] Catalog fetch and parsing
+- [ ] CLI commands:
+  - [ ] `specify extension search`
+  - [ ] `specify extension info`
+- [ ] Catalog publishing process (GitHub Action)
+- [ ] Documentation (how to publish extensions)

 **Testing**:

- [x] Test catalog fetch
- [x] Test extension search/filtering
- [x] Test catalog caching
- [x] Test multi-catalog merge with priority
+- [ ] Test catalog fetch
+- [ ] Test extension search/filtering
+- [ ] Test catalog caching

-### Phase 4: Advanced Features ✅ COMPLETED
+### Phase 4: Advanced Features (Week 5-6)

 **Goal**: Hooks, updates, multi-agent support

 **Deliverables**:

- [x] Hook system (`hooks` in extension.yml)
- [x] Hook registration and execution
- [x] Project extensions config (`.specify/extensions.yml`)
- [x] CLI commands:
-  - [x] `specify extension update` (with atomic backup/restore)
-  - [x] `specify extension enable/disable`
- [x] Command registration for multiple agents (15+ agents including Claude, Copilot, Gemini, Cursor, etc.)
- [x] Extension update notifications (version comparison)
- [x] Configuration layer resolution (project, local, env)
-
-**Additional features implemented beyond original RFC**:
-
- [x] **Display name resolution**: All commands accept extension display names in addition to IDs
- [x] **Ambiguous name handling**: User-friendly tables when multiple extensions match a name
- [x] **Atomic update with rollback**: Full backup of extension dir, commands, hooks, and registry with automatic rollback on failure
- [x] **Pre-install ID validation**: Validates extension ID from ZIP before installing (security)
- [x] **Enabled state preservation**: Disabled extensions stay disabled after update
- [x] **Registry update/restore methods**: Clean API for enable/disable and rollback operations
- [x] **Catalog error fallback**: `extension info` falls back to local info when catalog unavailable
- [x] **`_install_allowed` flag**: Discovery-only catalogs can't be used for installation
- [x] **Cache invalidation**: Cache invalidated when `SPECKIT_CATALOG_URL` changes
+- [ ] Hook system (`hooks` in extension.yml)
+- [ ] Hook registration and execution
+- [ ] Project extensions config (`.specify/extensions.yml`)
+- [ ] CLI commands:
+  - [ ] `specify extension update`
+  - [ ] `specify extension enable/disable`
+- [ ] Command registration for multiple agents (Gemini, Copilot)
+- [ ] Extension update notifications
+- [ ] Configuration layer resolution (project, local, env)

 **Testing**:

- [x] Test hooks in core commands
- [x] Test extension updates (preserve config)
- [x] Test multi-agent registration
- [x] Test atomic rollback on update failure
- [x] Test enabled state preservation
- [x] Test display name resolution
+- [ ] Test hooks in core commands
+- [ ] Test extension updates (preserve config)
+- [ ] Test multi-agent registration

-### Phase 5: Polish & Documentation ✅ COMPLETED
+### Phase 5: Polish & Documentation (Week 7)

 **Goal**: Production ready

 **Deliverables**:

- [x] Comprehensive documentation:
-  - [x] User guide (EXTENSION-USER-GUIDE.md)
-  - [x] Extension development guide (EXTENSION-DEV-GUIDE.md)
-  - [x] Extension API reference (EXTENSION-API-REFERENCE.md)
- [x] Error messages and validation improvements
- [x] CLI help text updates
+- [ ] Comprehensive documentation:
+  - [ ] User guide (installing/using extensions)
+  - [ ] Extension development guide
+  - [ ] Extension API reference
+  - [ ] Migration guide (core → extension)
+- [ ] Error messages and validation improvements
+- [ ] CLI help text updates
+- [ ] Example extension template (cookiecutter)
+- [ ] Blog post / announcement
+- [ ] Video tutorial

 **Testing**:

- [x] End-to-end testing on multiple projects
- [x] 163 unit tests passing
+- [ ] End-to-end testing on multiple projects
+- [ ] Community beta testing
+- [ ] Performance testing (large projects)

 ---

-## Resolved Questions
+## Open Questions

-The following questions from the original RFC have been resolved during implementation:
-
-### 1. Extension Namespace ✅ RESOLVED
+### 1. Extension Namespace

 **Question**: Should extension commands use namespace prefix?

-**Decision**: **Option C** - Both prefixed and aliases are supported. Commands use `speckit.{extension}.{command}` as canonical name, with optional aliases defined in manifest.
+**Options**:

-**Implementation**: The `aliases` field in `extension.yml` allows extensions to register additional command names.
+- A) Prefixed: `/speckit.jira.specstoissues` (explicit, avoids conflicts)
+- B) Short alias: `/jira.specstoissues` (shorter, less verbose)
+- C) Both: Register both names, prefer prefixed in docs
+
+**Recommendation**: C (both), prefixed is canonical

 ---

-### 2. Config File Location ✅ RESOLVED
+### 2. Config File Location

 **Question**: Where should extension configs live?

-**Decision**: **Option A** - Extension directory (`.specify/extensions/{ext-id}/{ext-id}-config.yml`). This keeps extensions self-contained and easier to manage.
+**Options**:

-**Implementation**: Each extension has its own config file within its directory, with layered resolution (defaults → project → local → env vars).
+- A) Extension directory: `.specify/extensions/jira/jira-config.yml` (encapsulated)
+- B) Root level: `.specify/jira-config.yml` (more visible)
+- C) Unified: `.specify/extensions.yml` (all extension configs in one file)
+
+**Recommendation**: A (extension directory), cleaner separation

 ---

-### 3. Command File Format ✅ RESOLVED
+### 3. Command File Format

 **Question**: Should extensions use universal format or agent-specific?

-**Decision**: **Option A** - Universal Markdown format. Extensions write commands once, CLI converts to agent-specific format during registration.
+**Options**:

-**Implementation**: `CommandRegistrar` class handles conversion to 15+ agent formats (Claude, Copilot, Gemini, Cursor, etc.).
+- A) Universal Markdown: Extensions write once, CLI converts per-agent
+- B) Agent-specific: Extensions provide separate files for each agent
+- C) Hybrid: Universal default, agent-specific overrides
+
+**Recommendation**: A (universal), reduces duplication

 ---

-### 4. Hook Execution Model ✅ RESOLVED
+### 4. Hook Execution Model

 **Question**: How should hooks execute?

-**Decision**: **Option A** - Hooks are registered in `.specify/extensions.yml` and executed by the AI agent when it sees the hook trigger. Hook state (enabled/disabled) is managed per-extension.
+**Options**:

-**Implementation**: `HookExecutor` class manages hook registration and state in `extensions.yml`.
+- A) AI agent interprets: Core commands output `EXECUTE_COMMAND: name`
+- B) CLI executes: Core commands call `specify extension hook after_tasks`
+- C) Agent built-in: Extension system built into AI agent (Claude SDK)
+
+**Recommendation**: A initially (simpler), move to C long-term

 ---

-### 5. Extension Distribution ✅ RESOLVED
+### 5. Extension Distribution

 **Question**: How should extensions be packaged?

-**Decision**: **Option A** - ZIP archives downloaded from GitHub releases (via catalog `download_url`). Local development uses `--dev` flag with directory path.
+**Options**:

-**Implementation**: `ExtensionManager.install_from_zip()` handles ZIP extraction and validation.
+- A) ZIP archives: Downloaded from GitHub releases
+- B) Git repos: Cloned directly (`git clone`)
+- C) Python packages: Installable via `uv tool install`
+
+**Recommendation**: A (ZIP), simpler for non-Python extensions in future

 ---

-### 6. Multi-Version Support ✅ RESOLVED
+### 6. Multi-Version Support

 **Question**: Can multiple versions of same extension coexist?

-**Decision**: **Option A** - Single version only. Updates replace the existing version with atomic rollback on failure.
-
-**Implementation**: `extension update` performs atomic backup/restore to ensure safe updates.
-
---
-
-## Open Questions (Remaining)
-
-### 1. Sandboxing / Permissions (Future)
-
-**Question**: Should extensions declare required permissions?
-
 **Options**:

- A) No sandboxing (current): Extensions run with same privileges as AI agent
- B) Permission declarations: Extensions declare `filesystem:read`, `network:external`, etc.
- C) Opt-in sandboxing: Organizations can enable permission enforcement
+- A) Single version: Only one version installed at a time
+- B) Multi-version: Side-by-side versions (`.specify/extensions/jira@1.0/`, `.specify/extensions/jira@2.0/`)
+- C) Per-branch: Different branches use different versions

-**Status**: Deferred to future version. Currently using trust-based model where users trust extension authors.
-
---
-
-### 2. Package Signatures (Future)
-
-**Question**: Should extensions be cryptographically signed?
-
-**Options**:
-
- A) No signatures (current): Trust based on catalog source
- B) GPG/Sigstore signatures: Verify package integrity
- C) Catalog-level verification: Catalog maintainers verify packages
-
-**Status**: Deferred to future version. `checksum` field is available in catalog schema but not enforced.
+**Recommendation**: A initially (simpler), consider B in future if needed

 ---

--- a/extensions/catalog.community.json
+++ b/extensions/catalog.community.json
@@ -1,47 +1,8 @@
 {
  "schema_version": "1.0",
-  "updated_at": "2026-03-13T12:00:00Z",
+  "updated_at": "2026-02-24T00:00:00Z",
  "catalog_url": "https://raw.githubusercontent.com/github/spec-kit/main/extensions/catalog.community.json",
  "extensions": {
-    "azure-devops": {
-      "name": "Azure DevOps Integration",
-      "id": "azure-devops",
-      "description": "Sync user stories and tasks to Azure DevOps work items using OAuth authentication.",
-      "author": "pragya247",
-      "version": "1.0.0",
-      "download_url": "https://github.com/pragya247/spec-kit-azure-devops/archive/refs/tags/v1.0.0.zip",
-      "repository": "https://github.com/pragya247/spec-kit-azure-devops",
-      "homepage": "https://github.com/pragya247/spec-kit-azure-devops",
-      "documentation": "https://github.com/pragya247/spec-kit-azure-devops/blob/main/README.md",
-      "changelog": "https://github.com/pragya247/spec-kit-azure-devops/blob/main/CHANGELOG.md",
-      "license": "MIT",
-      "requires": {
-        "speckit_version": ">=0.1.0",
-        "tools": [
-          {
-            "name": "az",
-            "version": ">=2.0.0",
-            "required": true
-          }
-        ]
-      },
-      "provides": {
-        "commands": 1,
-        "hooks": 1
-      },
-      "tags": [
-        "azure",
-        "devops",
-        "project-management",
-        "work-items",
-        "issue-tracking"
-      ],
-      "verified": false,
-      "downloads": 0,
-      "stars": 0,
-      "created_at": "2026-03-03T00:00:00Z",
-      "updated_at": "2026-03-03T00:00:00Z"
-    },
    "cleanup": {
      "name": "Cleanup Extension",
      "id": "cleanup",
@@ -61,143 +22,13 @@
        "commands": 1,
        "hooks": 1
      },
-      "tags": [
-        "quality",
-        "tech-debt",
-        "review",
-        "cleanup",
-        "scout-rule"
-      ],
+      "tags": ["quality", "tech-debt", "review", "cleanup", "scout-rule"],
      "verified": false,
      "downloads": 0,
      "stars": 0,
      "created_at": "2026-02-22T00:00:00Z",
      "updated_at": "2026-02-22T00:00:00Z"
    },
-    "doctor": {
-      "name": "Project Health Check",
-      "id": "doctor",
-      "description": "Diagnose a Spec Kit project and report health issues across structure, agents, features, scripts, extensions, and git.",
-      "author": "KhawarHabibKhan",
-      "version": "1.0.0",
-      "download_url": "https://github.com/KhawarHabibKhan/spec-kit-doctor/archive/refs/tags/v1.0.0.zip",
-      "repository": "https://github.com/KhawarHabibKhan/spec-kit-doctor",
-      "homepage": "https://github.com/KhawarHabibKhan/spec-kit-doctor",
-      "documentation": "https://github.com/KhawarHabibKhan/spec-kit-doctor/blob/main/README.md",
-      "changelog": "https://github.com/KhawarHabibKhan/spec-kit-doctor/blob/main/CHANGELOG.md",
-      "license": "MIT",
-      "requires": {
-        "speckit_version": ">=0.1.0"
-      },
-      "provides": {
-        "commands": 1,
-        "hooks": 0
-      },
-      "tags": [
-        "diagnostics",
-        "health-check",
-        "validation",
-        "project-structure"
-      ],
-      "verified": false,
-      "downloads": 0,
-      "stars": 0,
-      "created_at": "2026-03-13T00:00:00Z",
-      "updated_at": "2026-03-13T00:00:00Z"
-    },
-    "fleet": {
-      "name": "Fleet Orchestrator",
-      "id": "fleet",
-      "description": "Orchestrate a full feature lifecycle with human-in-the-loop gates across all SpecKit phases.",
-      "author": "sharathsatish",
-      "version": "1.0.0",
-      "download_url": "https://github.com/sharathsatish/spec-kit-fleet/archive/refs/tags/v1.0.0.zip",
-      "repository": "https://github.com/sharathsatish/spec-kit-fleet",
-      "homepage": "https://github.com/sharathsatish/spec-kit-fleet",
-      "documentation": "https://github.com/sharathsatish/spec-kit-fleet/blob/main/README.md",
-      "changelog": "https://github.com/sharathsatish/spec-kit-fleet/blob/main/CHANGELOG.md",
-      "license": "MIT",
-      "requires": {
-        "speckit_version": ">=0.1.0"
-      },
-      "provides": {
-        "commands": 2,
-        "hooks": 1
-      },
-      "tags": ["orchestration", "workflow", "human-in-the-loop", "parallel"],
-      "verified": false,
-      "downloads": 0,
-      "stars": 0,
-      "created_at": "2026-03-06T00:00:00Z",
-      "updated_at": "2026-03-06T00:00:00Z"
-    },
-    "jira": {
-      "name": "Jira Integration",
-      "id": "jira",
-      "description": "Create Jira Epics, Stories, and Issues from spec-kit specifications and task breakdowns with configurable hierarchy and custom field support.",
-      "author": "mbachorik",
-      "version": "2.1.0",
-      "download_url": "https://github.com/mbachorik/spec-kit-jira/archive/refs/tags/v2.1.0.zip",
-      "repository": "https://github.com/mbachorik/spec-kit-jira",
-      "homepage": "https://github.com/mbachorik/spec-kit-jira",
-      "documentation": "https://github.com/mbachorik/spec-kit-jira/blob/main/README.md",
-      "changelog": "https://github.com/mbachorik/spec-kit-jira/blob/main/CHANGELOG.md",
-      "license": "MIT",
-      "requires": {
-        "speckit_version": ">=0.1.0"
-      },
-      "provides": {
-        "commands": 3,
-        "hooks": 1
-      },
-      "tags": [
-        "issue-tracking",
-        "jira",
-        "atlassian",
-        "project-management"
-      ],
-      "verified": false,
-      "downloads": 0,
-      "stars": 0,
-      "created_at": "2026-03-05T00:00:00Z",
-      "updated_at": "2026-03-05T00:00:00Z"
-    },
-    "ralph": {
-      "name": "Ralph Loop",
-      "id": "ralph",
-      "description": "Autonomous implementation loop using AI agent CLI.",
-      "author": "Rubiss",
-      "version": "1.0.0",
-      "download_url": "https://github.com/Rubiss/spec-kit-ralph/archive/refs/tags/v1.0.0.zip",
-      "repository": "https://github.com/Rubiss/spec-kit-ralph",
-      "homepage": "https://github.com/Rubiss/spec-kit-ralph",
-      "documentation": "https://github.com/Rubiss/spec-kit-ralph/blob/main/README.md",
-      "changelog": "https://github.com/Rubiss/spec-kit-ralph/blob/main/CHANGELOG.md",
-      "license": "MIT",
-      "requires": {
-        "speckit_version": ">=0.1.0",
-        "tools": [
-          {
-            "name": "copilot",
-            "required": true
-          },
-          {
-            "name": "git",
-            "required": true
-          }
-        ]
-      },
-      "provides": {
-        "commands": 2,
-        "hooks": 1
-      },
-      "tags": ["implementation", "automation", "loop", "copilot"],
-      "verified": false,
-      "downloads": 0,
-      "stars": 0,
-      "created_at": "2026-03-09T00:00:00Z",
-      "updated_at": "2026-03-09T00:00:00Z"
-    },
    "retrospective": {
      "name": "Retrospective Extension",
      "id": "retrospective",
@@ -217,118 +48,13 @@
        "commands": 1,
        "hooks": 1
      },
-      "tags": [
-        "retrospective",
-        "spec-drift",
-        "quality",
-        "analysis",
-        "governance"
-      ],
+      "tags": ["retrospective", "spec-drift", "quality", "analysis", "governance"],
      "verified": false,
      "downloads": 0,
      "stars": 0,
      "created_at": "2026-02-24T00:00:00Z",
      "updated_at": "2026-02-24T00:00:00Z"
    },
-    "review": {
-      "name": "Review Extension",
-      "id": "review",
-      "description": "Post-implementation comprehensive code review with specialized agents for code quality, comments, tests, error handling, type design, and simplification.",
-      "author": "ismaelJimenez",
-      "version": "1.0.0",
-      "download_url": "https://github.com/ismaelJimenez/spec-kit-review/archive/refs/tags/v1.0.0.zip",
-      "repository": "https://github.com/ismaelJimenez/spec-kit-review",
-      "homepage": "https://github.com/ismaelJimenez/spec-kit-review",
-      "documentation": "https://github.com/ismaelJimenez/spec-kit-review/blob/main/README.md",
-      "changelog": "https://github.com/ismaelJimenez/spec-kit-review/blob/main/CHANGELOG.md",
-      "license": "MIT",
-      "requires": {
-        "speckit_version": ">=0.1.0"
-      },
-      "provides": {
-        "commands": 7,
-        "hooks": 1
-      },
-      "tags": ["code-review", "quality", "review", "testing", "error-handling", "type-design", "simplification"],
-      "verified": false,
-      "downloads": 0,
-      "stars": 0,
-      "created_at": "2026-03-06T00:00:00Z",
-      "updated_at": "2026-03-06T00:00:00Z"
-    },
-    "sync": {
-      "name": "Spec Sync",
-      "id": "sync",
-      "description": "Detect and resolve drift between specs and implementation. AI-assisted resolution with human approval.",
-      "author": "bgervin",
-      "version": "0.1.0",
-      "download_url": "https://github.com/bgervin/spec-kit-sync/archive/refs/tags/v0.1.0.zip",
-      "repository": "https://github.com/bgervin/spec-kit-sync",
-      "homepage": "https://github.com/bgervin/spec-kit-sync",
-      "documentation": "https://github.com/bgervin/spec-kit-sync/blob/main/README.md",
-      "changelog": "https://github.com/bgervin/spec-kit-sync/blob/main/CHANGELOG.md",
-      "license": "MIT",
-      "requires": {
-        "speckit_version": ">=0.1.0"
-      },
-      "provides": {
-        "commands": 5,
-        "hooks": 1
-      },
-      "tags": [
-        "sync",
-        "drift",
-        "validation",
-        "bidirectional",
-        "backfill"
-      ],
-      "verified": false,
-      "downloads": 0,
-      "stars": 0,
-      "created_at": "2026-03-02T00:00:00Z",
-      "updated_at": "2026-03-02T00:00:00Z"
-    },
-    "understanding": {
-      "name": "Understanding",
-      "id": "understanding",
-      "description": "Automated requirements quality analysis — validates specs against IEEE/ISO standards using 31 deterministic metrics. Catches ambiguity, missing testability, and structural issues before they reach implementation. Includes experimental energy-based ambiguity detection using local LM token perplexity.",
-      "author": "Ladislav Bihari",
-      "version": "3.4.0",
-      "download_url": "https://github.com/Testimonial/understanding/archive/refs/tags/v3.4.0.zip",
-      "repository": "https://github.com/Testimonial/understanding",
-      "homepage": "https://github.com/Testimonial/understanding",
-      "documentation": "https://github.com/Testimonial/understanding/blob/main/extension/README.md",
-      "changelog": "https://github.com/Testimonial/understanding/blob/main/extension/CHANGELOG.md",
-      "license": "MIT",
-      "requires": {
-        "speckit_version": ">=0.1.0",
-        "tools": [
-          {
-            "name": "understanding",
-            "version": ">=3.4.0",
-            "required": true
-          }
-        ]
-      },
-      "provides": {
-        "commands": 3,
-        "hooks": 1
-      },
-      "tags": [
-        "quality",
-        "metrics",
-        "requirements",
-        "validation",
-        "readability",
-        "IEEE-830",
-        "ISO-29148"
-      ],
-      "verified": false,
-      "downloads": 0,
-      "stars": 0,
-      "created_at": "2026-03-07T00:00:00Z",
-      "updated_at": "2026-03-07T00:00:00Z"
-    },
    "v-model": {
      "name": "V-Model Extension Pack",
      "id": "v-model",
@@ -348,50 +74,12 @@
        "commands": 9,
        "hooks": 1
      },
-      "tags": [
-        "v-model",
-        "traceability",
-        "testing",
-        "compliance",
-        "safety-critical"
-      ],
+      "tags": ["v-model", "traceability", "testing", "compliance", "safety-critical"],
      "verified": false,
      "downloads": 0,
      "stars": 0,
      "created_at": "2026-02-20T00:00:00Z",
      "updated_at": "2026-02-22T00:00:00Z"
-    },
-    "verify": {
-      "name": "Verify Extension",
-      "id": "verify",
-      "description": "Post-implementation quality gate that validates implemented code against specification artifacts.",
-      "author": "ismaelJimenez",
-      "version": "1.0.0",
-      "download_url": "https://github.com/ismaelJimenez/spec-kit-verify/archive/refs/tags/v1.0.0.zip",
-      "repository": "https://github.com/ismaelJimenez/spec-kit-verify",
-      "homepage": "https://github.com/ismaelJimenez/spec-kit-verify",
-      "documentation": "https://github.com/ismaelJimenez/spec-kit-verify/blob/main/README.md",
-      "changelog": "https://github.com/ismaelJimenez/spec-kit-verify/blob/main/CHANGELOG.md",
-      "license": "MIT",
-      "requires": {
-        "speckit_version": ">=0.1.0"
-      },
-      "provides": {
-        "commands": 1,
-        "hooks": 1
-      },
-      "tags": [
-        "verification",
-        "quality-gate",
-        "implementation",
-        "spec-adherence",
-        "compliance"
-      ],
-      "verified": false,
-      "downloads": 0,
-      "stars": 0,
-      "created_at": "2026-03-03T00:00:00Z",
-      "updated_at": "2026-03-03T00:00:00Z"
    }
  }
 }
--- a/extensions/catalog.json
+++ b/extensions/catalog.json
@@ -1,21 +1,6 @@
 {
  "schema_version": "1.0",
-  "updated_at": "2026-03-10T00:00:00Z",
+  "updated_at": "2026-02-03T00:00:00Z",
  "catalog_url": "https://raw.githubusercontent.com/github/spec-kit/main/extensions/catalog.json",
-  "extensions": {
-    "selftest": {
-      "name": "Spec Kit Self-Test Utility",
-      "id": "selftest",
-      "version": "1.0.0",
-      "description": "Verifies catalog extensions by programmatically walking through the discovery, installation, and registration lifecycle.",
-      "author": "spec-kit-core",
-      "repository": "https://github.com/github/spec-kit",
-      "download_url": "https://github.com/github/spec-kit/releases/download/selftest-v1.0.0/selftest.zip",
-      "tags": [
-        "testing",
-        "core",
-        "utility"
-      ]
-    }
-  }
-}
+  "extensions": {}
+}
--- a/extensions/selftest/commands/selftest.md
+++ b/extensions/selftest/commands/selftest.md
@@ -1,69 +0,0 @@
---
-description: "Validate the lifecycle of an extension from the catalog."
---
-
-# Extension Self-Test: `$ARGUMENTS`
-
-This command drives a self-test simulating the developer experience with the `$ARGUMENTS` extension.
-
-## Goal
-
-Validate the end-to-end lifecycle (discovery, installation, registration) for the extension: `$ARGUMENTS`.
-If `$ARGUMENTS` is empty, you must tell the user to provide an extension name, for example: `/speckit.selftest.extension linear`.
-
-## Steps
-
-### Step 1: Catalog Discovery Validation
-
-Check if the extension exists in the Spec Kit catalog.
-Execute this command and verify that it completes successfully and that the returned extension ID exactly matches `$ARGUMENTS`. If the command fails or the ID does not match `$ARGUMENTS`, fail the test.
-
-```bash
-specify extension info "$ARGUMENTS"
-```
-
-### Step 2: Simulate Installation
-
-First, try to add the extension to the current workspace configuration directly. If the catalog provides the extension as `install_allowed: false` (discovery-only), this step is *expected* to fail.
-
-```bash
-specify extension add "$ARGUMENTS"
-```
-
-Then, simulate adding the extension by installing it from its catalog download URL, which should bypass the restriction.
-Obtain the extension's `download_url` from the catalog metadata (for example, via a catalog info command or UI), then run:
-
-```bash
-specify extension add "$ARGUMENTS" --from "<download_url>"
-```
-
-### Step 3: Registration Verification
-
-Once the `add` command completes, verify the installation by checking the project configuration.
-Use terminal tools (like `cat`) to verify that the following file contains a record for `$ARGUMENTS`.
-
-```bash
-cat .specify/extensions/.registry/$ARGUMENTS.json
-```
-
-### Step 4: Verification Report
-
-Analyze the standard output of the three steps. 
-Generate a terminal-style test output format detailing the results of discovery, installation, and registration. Return this directly to the user.
-
-Example output format:
-```text
-============================= test session starts ==============================
-collected 3 items
-
-test_selftest_discovery.py::test_catalog_search [PASS/FAIL]
-  Details: [Provide execution result of specify extension search]
-
-test_selftest_installation.py::test_extension_add [PASS/FAIL]
-  Details: [Provide execution result of specify extension add]
-
-test_selftest_registration.py::test_config_verification [PASS/FAIL]
-  Details: [Provide execution result of registry record verification]
-
-============================== [X] passed in ... ==============================
-```
--- a/extensions/selftest/extension.yml
+++ b/extensions/selftest/extension.yml
@@ -1,16 +0,0 @@
-schema_version: "1.0"
-extension:
-  id: selftest
-  name: Spec Kit Self-Test Utility
-  version: 1.0.0
-  description: Verifies catalog extensions by programmatically walking through the discovery, installation, and registration lifecycle.
-  author: spec-kit-core
-  repository: https://github.com/github/spec-kit
-  license: MIT
-requires:
-  speckit_version: ">=0.2.0"
-provides:
-  commands:
-    - name: speckit.selftest.extension
-      file: commands/selftest.md
-      description: Validate the lifecycle of an extension from the catalog.
--- a/newsletters/2026-February.md
+++ b/newsletters/2026-February.md
@@ -1,54 +0,0 @@
-# Spec Kit - February 2026 Newsletter
-
-This edition covers Spec Kit activity in February 2026. Versions v0.1.7 through v0.1.13 shipped during the month, addressing bugs and adding features including a dual-catalog extension system and additional agent integrations. Community activity included blog posts, tutorials, and meetup sessions. A category summary is in the table below, followed by details.
-
-| **Spec Kit Core (Feb 2026)** | **Community & Content** | **Roadmap & Next** |
-| --- | --- | --- |
-| Versions **v0.1.7** through **v0.1.13** shipped with bug fixes and features, including a **dual-catalog extension system** and new agent integrations. Over 300 issues were closed (of ~800 filed). The repo reached 71k stars and 6.4k forks. [\[github.com\]](https://github.com/github/spec-kit/releases) [\[github.com\]](https://github.com/github/spec-kit/issues) [\[rywalker.com\]](https://rywalker.com/research/github-spec-kit) | Eduardo Luz published a LinkedIn article on SDD and Spec Kit [\[linkedin.com\]](https://www.linkedin.com/pulse/specification-driven-development-sdd-github-spec-kit-elevating-luz-tojmc?tl=en). Erick Matsen blogged a walkthrough of building a bioinformatics pipeline with Spec Kit [\[matsen.fredhutch.org\]](https://matsen.fredhutch.org/general/2026/02/10/spec-kit-walkthrough.html). Microsoft MVP [Eric Boyd](https://ericboyd.com/) (not the Microsoft AI Platform VP of the same name) presented at the Cleveland .NET User Group [\[ericboyd.com\]](https://ericboyd.com/events/cleveland-csharp-user-group-february-25-2026-spec-driven-development-sdd-github-spec-kit). | **v0.2.0** was released in early March, consolidating February's work. It added extensions for Jira and Azure DevOps, community plugin support, and agents for Tabnine CLI and Kiro CLI [\[github.com\]](https://github.com/github/spec-kit/releases). Future work includes spec lifecycle management and progress toward a stable 1.0 release [\[martinfowler.com\]](https://martinfowler.com/articles/exploring-gen-ai/sdd-3-tools.html). |
-
-***
-
-## Spec Kit Project Updates
-
-Spec Kit released versions **v0.1.7** through **v0.1.13** during February. Version 0.1.7 (early February) updated documentation for the newly introduced **dual-catalog extension system**, which allows both core and community extension catalogs to coexist. Subsequent patches (0.1.8, 0.1.9, etc.) bumped dependencies such as GitHub Actions versions and resolved minor issues. **v0.1.10** fixed YAML front-matter handling in generated files. By late February, **v0.1.12** and **v0.1.13** shipped with additional fixes in preparation for the next version bump. [\[github.com\]](https://github.com/github/spec-kit/releases)
-
-The main architectural addition was the **modular extension system** with separate "core" and "community" extension catalogs for third-party add-ons. Multiple community-contributed extensions were merged during the month, including a **Jira extension** for issue tracker integration, an **Azure DevOps extension**, and utility extensions for code review, retrospective documentation, and CI/CD sync. The pending 0.2.0 release changelog lists over a dozen changes from February, including the extension additions and support for **multiple agent catalogs concurrently**. [\[github.com\]](https://github.com/github/spec-kit/releases)
-
-By end of February, **over 330 issues/feature requests had been closed on GitHub** (out of ~870 filed to date). External contributors submitted pull requests including the **Tabnine CLI support**, which was merged in late February. The repository reached ~71k stars and crossed 6,000 forks. [\[github.com\]](https://github.com/github/spec-kit/issues) [\[github.com\]](https://github.com/github/spec-kit/releases) [\[rywalker.com\]](https://rywalker.com/research/github-spec-kit)
-
-On the stability side, February's work focused on tightening core workflows and fixing edge-case bugs in the specification, planning, and task-generation commands. The team addressed file-handling issues (e.g., clarifying how output files are created/appended) and improved the reliability of the automated release pipeline. The project also added **Kiro CLI** to the supported agent list and updated integration scripts for Cursor and Code Interpreter, bringing the total number of supported AI coding assistants to over 20. [\[github.com\]](https://github.com/github/spec-kit/releases) [\[github.com\]](https://github.com/github/spec-kit)
-
-## Community & Content
-
-**Eduardo Luz** published a LinkedIn article on Feb 15 titled *"Specification Driven Development (SDD) and the GitHub Spec Kit: Elevating Software Engineering."* The article draws on his experience as a senior engineer to describe common causes of technical debt and inconsistent designs, and how SDD addresses them. It walks through Spec Kit's **four-layer approach** (Constitution, Design, Tasks, Implementation) and discusses treating specifications as a source of truth. The post generated discussion among software architects on LinkedIn about reducing misunderstandings and rework through spec-driven workflows. [\[linkedin.com\]](https://www.linkedin.com/pulse/specification-driven-development-sdd-github-spec-kit-elevating-luz-tojmc?tl=en)
-
-**Erick Matsen** (Fred Hutchinson Cancer Center) posted a detailed walkthrough on Feb 10 titled *"Spec-Driven Development with spec-kit."* He describes building a **bioinformatics pipeline** in a single day using Spec Kit's workflow (from `speckit.constitution` to `speckit.implement`). The post includes command outputs and notes on decisions made along the way, such as refining the spec to add domain-specific requirements. He writes: "I really recommend this approach. This feels like the way software development should be." [\[matsen.fredhutch.org\]](https://matsen.fredhutch.org/general/2026/02/10/spec-kit-walkthrough.html) [\[github.com\]](https://github.com/mnriem/spec-kit-dotnet-cli-demo)
-
-Several other tutorials and guides appeared during the month. An article on *IntuitionLabs* (updated Feb 21) provided a guide to Spec Kit covering the philosophy behind SDD and a walkthrough of the four-phase workflow with examples. A piece by Ry Walker (Feb 22) summarized key aspects of Spec Kit, noting its agent-agnostic design and 71k-star count. Microsoft's Developer Blog post from late 2025 (*"Diving Into Spec-Driven Development with GitHub Spec Kit"* by Den Delimarsky) continued to circulate among new users. [\[intuitionlabs.ai\]](https://intuitionlabs.ai/articles/spec-driven-development-spec-kit) [\[rywalker.com\]](https://rywalker.com/research/github-spec-kit)
-
-On **Feb 25**, the Cleveland C# .NET User Group hosted a session titled *"Spec Driven Development with GitHub Spec Kit."* The talk was delivered by Microsoft MVP **[Eric Boyd](https://ericboyd.com/)** (Cleveland-based .NET developer; not to be confused with the Microsoft AI Platform VP of the same name). Boyd covered how specs change an AI coding assistant's output, patterns for iterating and refining specs over multiple cycles, and moving from ad-hoc prompting to a repeatable spec-driven workflow. Other groups, including GDG Madison, also listed sessions on spec-driven development in late February and early March. [\[ericboyd.com\]](https://ericboyd.com/events/cleveland-csharp-user-group-february-25-2026-spec-driven-development-sdd-github-spec-kit)
-
-On GitHub, the **Spec Kit Discussions forum** saw activity around installation troubleshooting, handling multi-feature projects with Spec Kit's branching model, and feature suggestions. One thread discussed how Spec Kit treats each spec as a short-lived artifact tied to a feature branch, which led to discussion about future support for long-running "spec of record" use cases. [\[martinfowler.com\]](https://martinfowler.com/articles/exploring-gen-ai/sdd-3-tools.html)
-
-## SDD Ecosystem
-
-Other spec-driven development tools also saw activity in February.
-
-AWS **Kiro** released version 0.10 on Feb 18 with two new spec workflows: a **Design-First** mode (starting from architecture/pseudocode to derive requirements) and a **Bugfix** mode (structured root-cause analysis producing a `bugfix.md` spec file). Kiro also added hunk-level code review for AI-generated changes and pre/post task hooks for custom automation. AWS expanded Kiro to GovCloud regions on Feb 17 for government compliance use cases. [\[kiro.dev\]](https://kiro.dev/changelog/)
-
-**OpenSpec** (by Fission AI), a lightweight SDD framework, reached ~29.3k stars and nearly 2k forks. Its community published guides and comparisons during the month, including *"Spec-Driven Development Made Easy: A Practical Guide with OpenSpec."* OpenSpec emphasizes simplicity and flexibility, integrating with multiple AI coding assistants via YAML configs.
-
-**Tessl** remained in private beta. As described by Thoughtworks writer Birgitta Boeckeler, Tessl pursues a **spec-as-source** model where specifications are maintained long-term and directly generate code files one-to-one, with generated code labeled as "do not edit." This contrasts with Spec Kit's current approach of creating specs per feature/branch. [\[martinfowler.com\]](https://martinfowler.com/articles/exploring-gen-ai/sdd-3-tools.html)
-
-An **arXiv preprint** (January 2026) categorized SDD implementations into three levels: *spec-first*, *spec-anchored*, and *spec-as-source*. Spec Kit was identified as primarily spec-first with elements of spec-anchored. Tech media published reviews including a *Vibe Coding* "GitHub Spec Kit Review (2026)" and a blog post titled *"Putting Spec Kit Through Its Paces: Radical Idea or Reinvented Waterfall?"* which concluded that SDD with AI assistance is more iterative than traditional Waterfall. [\[intuitionlabs.ai\]](https://intuitionlabs.ai/articles/spec-driven-development-spec-kit) [\[martinfowler.com\]](https://martinfowler.com/articles/exploring-gen-ai/sdd-3-tools.html)
-
-## Roadmap
-
-**v0.2.0** was released on March 10, 2026, consolidating the month's work. It includes new extensions (Jira, Azure DevOps, review, sync), support for multiple extension catalogs and community plugins, and additional agent integrations (Tabnine CLI, Kiro CLI). [\[github.com\]](https://github.com/github/spec-kit/releases)
-
-Areas under discussion or in progress for future development:
-
- **Spec lifecycle management** -- supporting longer-lived specifications that can evolve across multiple iterations, rather than being tied to a single feature branch. Users have raised this in GitHub Discussions, and the concept of "spec-anchored" development is under consideration. [\[martinfowler.com\]](https://martinfowler.com/articles/exploring-gen-ai/sdd-3-tools.html)
- **CI/CD integration** -- incorporating Spec Kit verification (e.g., `speckit.checklist` or `speckit.verify`) into pull request workflows and project management tools. February's Jira and Azure DevOps extensions are a step in this direction. [\[github.com\]](https://github.com/github/spec-kit/releases)
- **Continued agent support** -- adding integrations as new AI coding assistants emerge. The project currently supports over 20 agents and has been adding new ones (Kiro CLI, Tabnine CLI) as they become available. [\[github.com\]](https://github.com/github/spec-kit)
- **Community ecosystem** -- the open extension model allows external contributors to add functionality directly. February's Jira and Azure DevOps plugins were community-contributed. The Spec Kit README now links to community walkthrough demos for .NET, Spring Boot, and other stacks. [\[github.com\]](https://github.com/github/spec-kit)
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "specify-cli"
-version = "0.2.1"
+version = "0.1.6"
 description = "Specify CLI, part of GitHub Spec Kit. A tool to bootstrap your projects for Spec-Driven Development (SDD)."
 requires-python = ">=3.11"
 dependencies = [
@@ -13,7 +13,6 @@ dependencies = [
    "truststore>=0.10.4",
    "pyyaml>=6.0",
    "packaging>=23.0",
-    "pathspec>=0.12.0",
 ]

 [project.scripts]
@@ -52,3 +51,4 @@ precision = 2
 show_missing = true
 skip_covered = false

+
--- a/scripts/bash/check-prerequisites.sh
+++ b/scripts/bash/check-prerequisites.sh
@@ -79,28 +79,15 @@ SCRIPT_DIR="$(CDPATH="" cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$SCRIPT_DIR/common.sh"

 # Get feature paths and validate branch
-_paths_output=$(get_feature_paths) || { echo "ERROR: Failed to resolve feature paths" >&2; exit 1; }
-eval "$_paths_output"
-unset _paths_output
+eval $(get_feature_paths)
 check_feature_branch "$CURRENT_BRANCH" "$HAS_GIT" || exit 1

 # If paths-only mode, output paths and exit (support JSON + paths-only combined)
 if $PATHS_ONLY; then
    if $JSON_MODE; then
        # Minimal JSON paths payload (no validation performed)
-        if has_jq; then
-            jq -cn \
-                --arg repo_root "$REPO_ROOT" \
-                --arg branch "$CURRENT_BRANCH" \
-                --arg feature_dir "$FEATURE_DIR" \
-                --arg feature_spec "$FEATURE_SPEC" \
-                --arg impl_plan "$IMPL_PLAN" \
-                --arg tasks "$TASKS" \
-                '{REPO_ROOT:$repo_root,BRANCH:$branch,FEATURE_DIR:$feature_dir,FEATURE_SPEC:$feature_spec,IMPL_PLAN:$impl_plan,TASKS:$tasks}'
-        else
-            printf '{"REPO_ROOT":"%s","BRANCH":"%s","FEATURE_DIR":"%s","FEATURE_SPEC":"%s","IMPL_PLAN":"%s","TASKS":"%s"}\n' \
-                "$(json_escape "$REPO_ROOT")" "$(json_escape "$CURRENT_BRANCH")" "$(json_escape "$FEATURE_DIR")" "$(json_escape "$FEATURE_SPEC")" "$(json_escape "$IMPL_PLAN")" "$(json_escape "$TASKS")"
-        fi
+        printf '{"REPO_ROOT":"%s","BRANCH":"%s","FEATURE_DIR":"%s","FEATURE_SPEC":"%s","IMPL_PLAN":"%s","TASKS":"%s"}\n' \
+            "$REPO_ROOT" "$CURRENT_BRANCH" "$FEATURE_DIR" "$FEATURE_SPEC" "$IMPL_PLAN" "$TASKS"
    else
        echo "REPO_ROOT: $REPO_ROOT"
        echo "BRANCH: $CURRENT_BRANCH"
@@ -154,25 +141,14 @@ fi
 # Output results
 if $JSON_MODE; then
    # Build JSON array of documents
-    if has_jq; then
-        if [[ ${#docs[@]} -eq 0 ]]; then
-            json_docs="[]"
-        else
-            json_docs=$(printf '%s\n' "${docs[@]}" | jq -R . | jq -s .)
-        fi
-        jq -cn \
-            --arg feature_dir "$FEATURE_DIR" \
-            --argjson docs "$json_docs" \
-            '{FEATURE_DIR:$feature_dir,AVAILABLE_DOCS:$docs}'
+    if [[ ${#docs[@]} -eq 0 ]]; then
+        json_docs="[]"
    else
-        if [[ ${#docs[@]} -eq 0 ]]; then
-            json_docs="[]"
-        else
-            json_docs=$(printf '"%s",' "${docs[@]}")
-            json_docs="[${json_docs%,}]"
-        fi
-        printf '{"FEATURE_DIR":"%s","AVAILABLE_DOCS":%s}\n' "$(json_escape "$FEATURE_DIR")" "$json_docs"
+        json_docs=$(printf '"%s",' "${docs[@]}")
+        json_docs="[${json_docs%,}]"
    fi
+    
+    printf '{"FEATURE_DIR":"%s","AVAILABLE_DOCS":%s}\n' "$FEATURE_DIR" "$json_docs"
 else
    # Text output
    echo "FEATURE_DIR:$FEATURE_DIR"
--- a/scripts/bash/common.sh
+++ b/scripts/bash/common.sh
@@ -120,7 +120,7 @@ find_feature_dir_by_prefix() {
        # Multiple matches - this shouldn't happen with proper naming convention
        echo "ERROR: Multiple spec directories found with prefix '$prefix': ${matches[*]}" >&2
        echo "Please ensure only one spec directory exists per numeric prefix." >&2
-        return 1
+        echo "$specs_dir/$branch_name"  # Return something to avoid breaking the script
    fi
 }

@@ -134,42 +134,21 @@ get_feature_paths() {
    fi

    # Use prefix-based lookup to support multiple branches per spec
-    local feature_dir
-    if ! feature_dir=$(find_feature_dir_by_prefix "$repo_root" "$current_branch"); then
-        echo "ERROR: Failed to resolve feature directory" >&2
-        return 1
-    fi
+    local feature_dir=$(find_feature_dir_by_prefix "$repo_root" "$current_branch")

-    # Use printf '%q' to safely quote values, preventing shell injection
-    # via crafted branch names or paths containing special characters
-    printf 'REPO_ROOT=%q\n' "$repo_root"
-    printf 'CURRENT_BRANCH=%q\n' "$current_branch"
-    printf 'HAS_GIT=%q\n' "$has_git_repo"
-    printf 'FEATURE_DIR=%q\n' "$feature_dir"
-    printf 'FEATURE_SPEC=%q\n' "$feature_dir/spec.md"
-    printf 'IMPL_PLAN=%q\n' "$feature_dir/plan.md"
-    printf 'TASKS=%q\n' "$feature_dir/tasks.md"
-    printf 'RESEARCH=%q\n' "$feature_dir/research.md"
-    printf 'DATA_MODEL=%q\n' "$feature_dir/data-model.md"
-    printf 'QUICKSTART=%q\n' "$feature_dir/quickstart.md"
-    printf 'CONTRACTS_DIR=%q\n' "$feature_dir/contracts"
-}
-
-# Check if jq is available for safe JSON construction
-has_jq() {
-    command -v jq >/dev/null 2>&1
-}
-
-# Escape a string for safe embedding in a JSON value (fallback when jq is unavailable).
-# Handles backslash, double-quote, and control characters (newline, tab, carriage return).
-json_escape() {
-    local s="$1"
-    s="${s//\\/\\\\}"
-    s="${s//\"/\\\"}"
-    s="${s//$'\n'/\\n}"
-    s="${s//$'\t'/\\t}"
-    s="${s//$'\r'/\\r}"
-    printf '%s' "$s"
+    cat <<EOF
+REPO_ROOT='$repo_root'
+CURRENT_BRANCH='$current_branch'
+HAS_GIT='$has_git_repo'
+FEATURE_DIR='$feature_dir'
+FEATURE_SPEC='$feature_dir/spec.md'
+IMPL_PLAN='$feature_dir/plan.md'
+TASKS='$feature_dir/tasks.md'
+RESEARCH='$feature_dir/research.md'
+DATA_MODEL='$feature_dir/data-model.md'
+QUICKSTART='$feature_dir/quickstart.md'
+CONTRACTS_DIR='$feature_dir/contracts'
+EOF
 }

 check_file() { [[ -f "$1" ]] && echo "  ✓ $2" || echo "  ✗ $2"; }
--- a/scripts/bash/create-new-feature.sh
+++ b/scripts/bash/create-new-feature.sh
@@ -67,13 +67,6 @@ if [ -z "$FEATURE_DESCRIPTION" ]; then
    exit 1
 fi

-# Trim whitespace and validate description is not empty (e.g., user passed only whitespace)
-FEATURE_DESCRIPTION=$(echo "$FEATURE_DESCRIPTION" | xargs)
-if [ -z "$FEATURE_DESCRIPTION" ]; then
-    echo "Error: Feature description cannot be empty or contain only whitespace" >&2
-    exit 1
-fi
-
 # Function to find the repository root by searching for existing project markers
 find_repo_root() {
    local dir="$1"
@@ -162,17 +155,6 @@ clean_branch_name() {
    echo "$name" | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9]/-/g' | sed 's/-\+/-/g' | sed 's/^-//' | sed 's/-$//'
 }

-# Escape a string for safe embedding in a JSON value (fallback when jq is unavailable).
-json_escape() {
-    local s="$1"
-    s="${s//\\/\\\\}"
-    s="${s//\"/\\\"}"
-    s="${s//$'\n'/\\n}"
-    s="${s//$'\t'/\\t}"
-    s="${s//$'\r'/\\r}"
-    printf '%s' "$s"
-}
-
 # Resolve repository root. Prefer git information when available, but fall back
 # to searching for repository markers so the workflow still functions in repositories that
 # were initialised with --no-git.
@@ -290,16 +272,7 @@ if [ ${#BRANCH_NAME} -gt $MAX_BRANCH_LENGTH ]; then
 fi

 if [ "$HAS_GIT" = true ]; then
-    if ! git checkout -b "$BRANCH_NAME" 2>/dev/null; then
-        # Check if branch already exists
-        if git branch --list "$BRANCH_NAME" | grep -q .; then
-            >&2 echo "Error: Branch '$BRANCH_NAME' already exists. Please use a different feature name or specify a different number with --number."
-            exit 1
-        else
-            >&2 echo "Error: Failed to create git branch '$BRANCH_NAME'. Please check your git configuration and try again."
-            exit 1
-        fi
-    fi
+    git checkout -b "$BRANCH_NAME"
 else
    >&2 echo "[specify] Warning: Git repository not detected; skipped branch creation for $BRANCH_NAME"
 fi
@@ -311,22 +284,14 @@ TEMPLATE="$REPO_ROOT/.specify/templates/spec-template.md"
 SPEC_FILE="$FEATURE_DIR/spec.md"
 if [ -f "$TEMPLATE" ]; then cp "$TEMPLATE" "$SPEC_FILE"; else touch "$SPEC_FILE"; fi

-# Inform the user how to persist the feature variable in their own shell
-printf '# To persist: export SPECIFY_FEATURE=%q\n' "$BRANCH_NAME" >&2
+# Set the SPECIFY_FEATURE environment variable for the current session
+export SPECIFY_FEATURE="$BRANCH_NAME"

 if $JSON_MODE; then
-    if command -v jq >/dev/null 2>&1; then
-        jq -cn \
-            --arg branch_name "$BRANCH_NAME" \
-            --arg spec_file "$SPEC_FILE" \
-            --arg feature_num "$FEATURE_NUM" \
-            '{BRANCH_NAME:$branch_name,SPEC_FILE:$spec_file,FEATURE_NUM:$feature_num}'
-    else
-        printf '{"BRANCH_NAME":"%s","SPEC_FILE":"%s","FEATURE_NUM":"%s"}\n' "$(json_escape "$BRANCH_NAME")" "$(json_escape "$SPEC_FILE")" "$(json_escape "$FEATURE_NUM")"
-    fi
+    printf '{"BRANCH_NAME":"%s","SPEC_FILE":"%s","FEATURE_NUM":"%s"}\n' "$BRANCH_NAME" "$SPEC_FILE" "$FEATURE_NUM"
 else
    echo "BRANCH_NAME: $BRANCH_NAME"
    echo "SPEC_FILE: $SPEC_FILE"
    echo "FEATURE_NUM: $FEATURE_NUM"
-    printf '# To persist in your shell: export SPECIFY_FEATURE=%q\n' "$BRANCH_NAME"
+    echo "SPECIFY_FEATURE environment variable set to: $BRANCH_NAME"
 fi
--- a/scripts/bash/setup-plan.sh
+++ b/scripts/bash/setup-plan.sh
@@ -28,9 +28,7 @@ SCRIPT_DIR="$(CDPATH="" cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$SCRIPT_DIR/common.sh"

 # Get all paths and variables from common functions
-_paths_output=$(get_feature_paths) || { echo "ERROR: Failed to resolve feature paths" >&2; exit 1; }
-eval "$_paths_output"
-unset _paths_output
+eval $(get_feature_paths)

 # Check if we're on a proper feature branch (only for git repos)
 check_feature_branch "$CURRENT_BRANCH" "$HAS_GIT" || exit 1
@@ -51,18 +49,8 @@ fi

 # Output results
 if $JSON_MODE; then
-    if has_jq; then
-        jq -cn \
-            --arg feature_spec "$FEATURE_SPEC" \
-            --arg impl_plan "$IMPL_PLAN" \
-            --arg specs_dir "$FEATURE_DIR" \
-            --arg branch "$CURRENT_BRANCH" \
-            --arg has_git "$HAS_GIT" \
-            '{FEATURE_SPEC:$feature_spec,IMPL_PLAN:$impl_plan,SPECS_DIR:$specs_dir,BRANCH:$branch,HAS_GIT:$has_git}'
-    else
-        printf '{"FEATURE_SPEC":"%s","IMPL_PLAN":"%s","SPECS_DIR":"%s","BRANCH":"%s","HAS_GIT":"%s"}\n' \
-            "$(json_escape "$FEATURE_SPEC")" "$(json_escape "$IMPL_PLAN")" "$(json_escape "$FEATURE_DIR")" "$(json_escape "$CURRENT_BRANCH")" "$(json_escape "$HAS_GIT")"
-    fi
+    printf '{"FEATURE_SPEC":"%s","IMPL_PLAN":"%s","SPECS_DIR":"%s","BRANCH":"%s","HAS_GIT":"%s"}\n' \
+        "$FEATURE_SPEC" "$IMPL_PLAN" "$FEATURE_DIR" "$CURRENT_BRANCH" "$HAS_GIT"
 else
    echo "FEATURE_SPEC: $FEATURE_SPEC"
    echo "IMPL_PLAN: $IMPL_PLAN" 
--- a/scripts/bash/update-agent-context.sh
+++ b/scripts/bash/update-agent-context.sh
@@ -30,12 +30,12 @@
 #
 # 5. Multi-Agent Support
 #    - Handles agent-specific file paths and naming conventions
-#    - Supports: Claude, Gemini, Copilot, Cursor, Qwen, opencode, Codex, Windsurf, Kilo Code, Auggie CLI, Roo Code, CodeBuddy CLI, Qoder CLI, Amp, SHAI, Tabnine CLI, Kiro CLI, Mistral Vibe, Kimi Code, Antigravity or Generic
+#    - Supports: Claude, Gemini, Copilot, Cursor, Qwen, opencode, Codex, Windsurf, Kilo Code, Auggie CLI, Roo Code, CodeBuddy CLI, Qoder CLI, Amp, SHAI, Amazon Q Developer CLI, or Antigravity
 #    - Can update single agents or all existing agent files
 #    - Creates default Claude file if no agent files exist
 #
 # Usage: ./update-agent-context.sh [agent_type]
-# Agent types: claude|gemini|copilot|cursor-agent|qwen|opencode|codex|windsurf|kilocode|auggie|roo|codebuddy|amp|shai|tabnine|kiro-cli|agy|bob|vibe|qodercli|kimi|generic
+# Agent types: claude|gemini|copilot|cursor-agent|qwen|opencode|codex|windsurf|kilocode|auggie|roo|codebuddy|amp|shai|q|agy|bob|qodercli
 # Leave empty to update all existing agent files

 set -e
@@ -53,9 +53,7 @@ SCRIPT_DIR="$(CDPATH="" cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$SCRIPT_DIR/common.sh"

 # Get all paths and variables from common functions
-_paths_output=$(get_feature_paths) || { echo "ERROR: Failed to resolve feature paths" >&2; exit 1; }
-eval "$_paths_output"
-unset _paths_output
+eval $(get_feature_paths)

 NEW_PLAN="$IMPL_PLAN"  # Alias for compatibility with existing code
 AGENT_TYPE="${1:-}"
@@ -73,16 +71,11 @@ AUGGIE_FILE="$REPO_ROOT/.augment/rules/specify-rules.md"
 ROO_FILE="$REPO_ROOT/.roo/rules/specify-rules.md"
 CODEBUDDY_FILE="$REPO_ROOT/CODEBUDDY.md"
 QODER_FILE="$REPO_ROOT/QODER.md"
-# AMP, Kiro CLI, and IBM Bob all share AGENTS.md — use AGENTS_FILE to avoid
-# updating the same file multiple times.
-AMP_FILE="$AGENTS_FILE"
+AMP_FILE="$REPO_ROOT/AGENTS.md"
 SHAI_FILE="$REPO_ROOT/SHAI.md"
-TABNINE_FILE="$REPO_ROOT/TABNINE.md"
-KIRO_FILE="$AGENTS_FILE"
+Q_FILE="$REPO_ROOT/AGENTS.md"
 AGY_FILE="$REPO_ROOT/.agent/rules/specify-rules.md"
-BOB_FILE="$AGENTS_FILE"
-VIBE_FILE="$REPO_ROOT/.vibe/agents/specify-agents.md"
-KIMI_FILE="$REPO_ROOT/KIMI.md"
+BOB_FILE="$REPO_ROOT/AGENTS.md"

 # Template file
 TEMPLATE_FILE="$REPO_ROOT/.specify/templates/agent-file-template.md"
@@ -116,8 +109,6 @@ log_warning() {
 # Cleanup function for temporary files
 cleanup() {
    local exit_code=$?
-    # Disarm traps to prevent re-entrant loop
-    trap - EXIT INT TERM
    rm -f /tmp/agent_update_*_$$
    rm -f /tmp/manual_additions_$$
    exit $exit_code
@@ -360,19 +351,10 @@ create_new_agent_file() {
    # Convert \n sequences to actual newlines
    newline=$(printf '\n')
    sed -i.bak2 "s/\\\\n/${newline}/g" "$temp_file"
-
+    
    # Clean up backup files
    rm -f "$temp_file.bak" "$temp_file.bak2"
-
-    # Prepend Cursor frontmatter for .mdc files so rules are auto-included
-    if [[ "$target_file" == *.mdc ]]; then
-        local frontmatter_file
-        frontmatter_file=$(mktemp) || return 1
-        printf '%s\n' "---" "description: Project Development Guidelines" "globs: [\"**/*\"]" "alwaysApply: true" "---" "" > "$frontmatter_file"
-        cat "$temp_file" >> "$frontmatter_file"
-        mv "$frontmatter_file" "$temp_file"
-    fi
-
+    
    return 0
 }

@@ -482,7 +464,7 @@ update_existing_agent_file() {
        fi
        
        # Update timestamp
-        if [[ "$line" =~ (\*\*)?Last\ updated(\*\*)?:.*[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] ]]; then
+        if [[ "$line" =~ \*\*Last\ updated\*\*:.*[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] ]]; then
            echo "$line" | sed "s/[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]/$current_date/" >> "$temp_file"
        else
            echo "$line" >> "$temp_file"
@@ -510,24 +492,13 @@ update_existing_agent_file() {
        changes_entries_added=true
    fi
    
-    # Ensure Cursor .mdc files have YAML frontmatter for auto-inclusion
-    if [[ "$target_file" == *.mdc ]]; then
-        if ! head -1 "$temp_file" | grep -q '^---'; then
-            local frontmatter_file
-            frontmatter_file=$(mktemp) || { rm -f "$temp_file"; return 1; }
-            printf '%s\n' "---" "description: Project Development Guidelines" "globs: [\"**/*\"]" "alwaysApply: true" "---" "" > "$frontmatter_file"
-            cat "$temp_file" >> "$frontmatter_file"
-            mv "$frontmatter_file" "$temp_file"
-        fi
-    fi
-
    # Move temp file to target atomically
    if ! mv "$temp_file" "$target_file"; then
        log_error "Failed to update target file"
        rm -f "$temp_file"
        return 1
    fi
-
+    
    return 0
 }
 #==============================================================================
@@ -613,74 +584,65 @@ update_specific_agent() {
    
    case "$agent_type" in
        claude)
-            update_agent_file "$CLAUDE_FILE" "Claude Code" || return 1
+            update_agent_file "$CLAUDE_FILE" "Claude Code"
            ;;
        gemini)
-            update_agent_file "$GEMINI_FILE" "Gemini CLI" || return 1
+            update_agent_file "$GEMINI_FILE" "Gemini CLI"
            ;;
        copilot)
-            update_agent_file "$COPILOT_FILE" "GitHub Copilot" || return 1
+            update_agent_file "$COPILOT_FILE" "GitHub Copilot"
            ;;
        cursor-agent)
-            update_agent_file "$CURSOR_FILE" "Cursor IDE" || return 1
+            update_agent_file "$CURSOR_FILE" "Cursor IDE"
            ;;
        qwen)
-            update_agent_file "$QWEN_FILE" "Qwen Code" || return 1
+            update_agent_file "$QWEN_FILE" "Qwen Code"
            ;;
        opencode)
-            update_agent_file "$AGENTS_FILE" "opencode" || return 1
+            update_agent_file "$AGENTS_FILE" "opencode"
            ;;
        codex)
-            update_agent_file "$AGENTS_FILE" "Codex CLI" || return 1
+            update_agent_file "$AGENTS_FILE" "Codex CLI"
            ;;
        windsurf)
-            update_agent_file "$WINDSURF_FILE" "Windsurf" || return 1
+            update_agent_file "$WINDSURF_FILE" "Windsurf"
            ;;
        kilocode)
-            update_agent_file "$KILOCODE_FILE" "Kilo Code" || return 1
+            update_agent_file "$KILOCODE_FILE" "Kilo Code"
            ;;
        auggie)
-            update_agent_file "$AUGGIE_FILE" "Auggie CLI" || return 1
+            update_agent_file "$AUGGIE_FILE" "Auggie CLI"
            ;;
        roo)
-            update_agent_file "$ROO_FILE" "Roo Code" || return 1
+            update_agent_file "$ROO_FILE" "Roo Code"
            ;;
        codebuddy)
-            update_agent_file "$CODEBUDDY_FILE" "CodeBuddy CLI" || return 1
+            update_agent_file "$CODEBUDDY_FILE" "CodeBuddy CLI"
            ;;
        qodercli)
-            update_agent_file "$QODER_FILE" "Qoder CLI" || return 1
+            update_agent_file "$QODER_FILE" "Qoder CLI"
            ;;
        amp)
-            update_agent_file "$AMP_FILE" "Amp" || return 1
+            update_agent_file "$AMP_FILE" "Amp"
            ;;
        shai)
-            update_agent_file "$SHAI_FILE" "SHAI" || return 1
+            update_agent_file "$SHAI_FILE" "SHAI"
            ;;
-        tabnine)
-            update_agent_file "$TABNINE_FILE" "Tabnine CLI" || return 1
-            ;;
-        kiro-cli)
-            update_agent_file "$KIRO_FILE" "Kiro CLI" || return 1
+        q)
+            update_agent_file "$Q_FILE" "Amazon Q Developer CLI"
            ;;
        agy)
-            update_agent_file "$AGY_FILE" "Antigravity" || return 1
+            update_agent_file "$AGY_FILE" "Antigravity"
            ;;
        bob)
-            update_agent_file "$BOB_FILE" "IBM Bob" || return 1
-            ;;
-        vibe)
-            update_agent_file "$VIBE_FILE" "Mistral Vibe" || return 1
-            ;;
-        kimi)
-            update_agent_file "$KIMI_FILE" "Kimi Code" || return 1
+            update_agent_file "$BOB_FILE" "IBM Bob"
            ;;
        generic)
            log_info "Generic agent: no predefined context file. Use the agent-specific update script for your agent."
            ;;
        *)
            log_error "Unknown agent type '$agent_type'"
-            log_error "Expected: claude|gemini|copilot|cursor-agent|qwen|opencode|codex|windsurf|kilocode|auggie|roo|codebuddy|amp|shai|tabnine|kiro-cli|agy|bob|vibe|qodercli|kimi|generic"
+            log_error "Expected: claude|gemini|copilot|cursor-agent|qwen|opencode|codex|windsurf|kilocode|auggie|roo|codebuddy|amp|shai|q|agy|bob|qodercli|generic"
            exit 1
            ;;
    esac
@@ -688,53 +650,91 @@ update_specific_agent() {

 update_all_existing_agents() {
    local found_agent=false
-    local _updated_paths=()
-
-    # Helper: skip non-existent files and files already updated (dedup by
-    # realpath so that variables pointing to the same file — e.g. AMP_FILE,
-    # KIRO_FILE, BOB_FILE all resolving to AGENTS_FILE — are only written once).
-    # Uses a linear array instead of associative array for bash 3.2 compatibility.
-    update_if_new() {
-        local file="$1" name="$2"
-        [[ -f "$file" ]] || return 0
-        local real_path
-        real_path=$(realpath "$file" 2>/dev/null || echo "$file")
-        local p
-        if [[ ${#_updated_paths[@]} -gt 0 ]]; then
-            for p in "${_updated_paths[@]}"; do
-                [[ "$p" == "$real_path" ]] && return 0
-            done
-        fi
-        update_agent_file "$file" "$name" || return 1
-        _updated_paths+=("$real_path")
+    
+    # Check each possible agent file and update if it exists
+    if [[ -f "$CLAUDE_FILE" ]]; then
+        update_agent_file "$CLAUDE_FILE" "Claude Code"
        found_agent=true
-    }
+    fi
+    
+    if [[ -f "$GEMINI_FILE" ]]; then
+        update_agent_file "$GEMINI_FILE" "Gemini CLI"
+        found_agent=true
+    fi
+    
+    if [[ -f "$COPILOT_FILE" ]]; then
+        update_agent_file "$COPILOT_FILE" "GitHub Copilot"
+        found_agent=true
+    fi
+    
+    if [[ -f "$CURSOR_FILE" ]]; then
+        update_agent_file "$CURSOR_FILE" "Cursor IDE"
+        found_agent=true
+    fi
+    
+    if [[ -f "$QWEN_FILE" ]]; then
+        update_agent_file "$QWEN_FILE" "Qwen Code"
+        found_agent=true
+    fi
+    
+    if [[ -f "$AGENTS_FILE" ]]; then
+        update_agent_file "$AGENTS_FILE" "Codex/opencode"
+        found_agent=true
+    fi
+    
+    if [[ -f "$WINDSURF_FILE" ]]; then
+        update_agent_file "$WINDSURF_FILE" "Windsurf"
+        found_agent=true
+    fi
+    
+    if [[ -f "$KILOCODE_FILE" ]]; then
+        update_agent_file "$KILOCODE_FILE" "Kilo Code"
+        found_agent=true
+    fi

-    update_if_new "$CLAUDE_FILE" "Claude Code"
-    update_if_new "$GEMINI_FILE" "Gemini CLI"
-    update_if_new "$COPILOT_FILE" "GitHub Copilot"
-    update_if_new "$CURSOR_FILE" "Cursor IDE"
-    update_if_new "$QWEN_FILE" "Qwen Code"
-    update_if_new "$AGENTS_FILE" "Codex/opencode"
-    update_if_new "$AMP_FILE" "Amp"
-    update_if_new "$KIRO_FILE" "Kiro CLI"
-    update_if_new "$BOB_FILE" "IBM Bob"
-    update_if_new "$WINDSURF_FILE" "Windsurf"
-    update_if_new "$KILOCODE_FILE" "Kilo Code"
-    update_if_new "$AUGGIE_FILE" "Auggie CLI"
-    update_if_new "$ROO_FILE" "Roo Code"
-    update_if_new "$CODEBUDDY_FILE" "CodeBuddy CLI"
-    update_if_new "$SHAI_FILE" "SHAI"
-    update_if_new "$TABNINE_FILE" "Tabnine CLI"
-    update_if_new "$QODER_FILE" "Qoder CLI"
-    update_if_new "$AGY_FILE" "Antigravity"
-    update_if_new "$VIBE_FILE" "Mistral Vibe"
-    update_if_new "$KIMI_FILE" "Kimi Code"
+    if [[ -f "$AUGGIE_FILE" ]]; then
+        update_agent_file "$AUGGIE_FILE" "Auggie CLI"
+        found_agent=true
+    fi
+    
+    if [[ -f "$ROO_FILE" ]]; then
+        update_agent_file "$ROO_FILE" "Roo Code"
+        found_agent=true
+    fi

+    if [[ -f "$CODEBUDDY_FILE" ]]; then
+        update_agent_file "$CODEBUDDY_FILE" "CodeBuddy CLI"
+        found_agent=true
+    fi
+
+    if [[ -f "$SHAI_FILE" ]]; then
+        update_agent_file "$SHAI_FILE" "SHAI"
+        found_agent=true
+    fi
+
+    if [[ -f "$QODER_FILE" ]]; then
+        update_agent_file "$QODER_FILE" "Qoder CLI"
+        found_agent=true
+    fi
+
+    if [[ -f "$Q_FILE" ]]; then
+        update_agent_file "$Q_FILE" "Amazon Q Developer CLI"
+        found_agent=true
+    fi
+
+    if [[ -f "$AGY_FILE" ]]; then
+        update_agent_file "$AGY_FILE" "Antigravity"
+        found_agent=true
+    fi
+    if [[ -f "$BOB_FILE" ]]; then
+        update_agent_file "$BOB_FILE" "IBM Bob"
+        found_agent=true
+    fi
+    
    # If no agent files exist, create a default Claude file
    if [[ "$found_agent" == false ]]; then
        log_info "No existing agent files found, creating default Claude file..."
-        update_agent_file "$CLAUDE_FILE" "Claude Code" || return 1
+        update_agent_file "$CLAUDE_FILE" "Claude Code"
    fi
 }
 print_summary() {
@@ -754,7 +754,8 @@ print_summary() {
    fi
    
    echo
-    log_info "Usage: $0 [claude|gemini|copilot|cursor-agent|qwen|opencode|codex|windsurf|kilocode|auggie|roo|codebuddy|amp|shai|tabnine|kiro-cli|agy|bob|vibe|qodercli|kimi|generic]"
+
+    log_info "Usage: $0 [claude|gemini|copilot|cursor-agent|qwen|opencode|codex|windsurf|kilocode|auggie|roo|codebuddy|amp|shai|q|agy|bob|qodercli]"
 }

 #==============================================================================
@@ -806,3 +807,4 @@ main() {
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
    main "$@"
 fi
+
--- a/scripts/powershell/create-new-feature.ps1
+++ b/scripts/powershell/create-new-feature.ps1
@@ -35,12 +35,6 @@ if (-not $FeatureDescription -or $FeatureDescription.Count -eq 0) {

 $featureDesc = ($FeatureDescription -join ' ').Trim()

-# Validate description is not empty after trimming (e.g., user passed only whitespace)
-if ([string]::IsNullOrWhiteSpace($featureDesc)) {
-    Write-Error "Error: Feature description cannot be empty or contain only whitespace"
-    exit 1
-}
-
 # Resolve repository root. Prefer git information when available, but fall back
 # to searching for repository markers so the workflow still functions in repositories that
 # were initialized with --no-git.
@@ -248,26 +242,10 @@ if ($branchName.Length -gt $maxBranchLength) {
 }

 if ($hasGit) {
-    $branchCreated = $false
    try {
-        git checkout -q -b $branchName 2>$null | Out-Null
-        if ($LASTEXITCODE -eq 0) {
-            $branchCreated = $true
-        }
+        git checkout -b $branchName | Out-Null
    } catch {
-        # Exception during git command
-    }
-
-    if (-not $branchCreated) {
-        # Check if branch already exists
-        $existingBranch = git branch --list $branchName 2>$null
-        if ($existingBranch) {
-            Write-Error "Error: Branch '$branchName' already exists. Please use a different feature name or specify a different number with -Number."
-            exit 1
-        } else {
-            Write-Error "Error: Failed to create git branch '$branchName'. Please check your git configuration and try again."
-            exit 1
-        }
+        Write-Warning "Failed to create git branch: $branchName"
    }
 } else {
    Write-Warning "[specify] Warning: Git repository not detected; skipped branch creation for $branchName"
--- a/scripts/powershell/update-agent-context.ps1
+++ b/scripts/powershell/update-agent-context.ps1
@@ -9,7 +9,7 @@ Mirrors the behavior of scripts/bash/update-agent-context.sh:
 2. Plan Data Extraction
 3. Agent File Management (create from template or update existing)
 4. Content Generation (technology stack, recent changes, timestamp)
- 5. Multi-Agent Support (claude, gemini, copilot, cursor-agent, qwen, opencode, codex, windsurf, kilocode, auggie, roo, codebuddy, amp, shai, tabnine, kiro-cli, agy, bob, vibe, qodercli, kimi, generic)
+ 5. Multi-Agent Support (claude, gemini, copilot, cursor-agent, qwen, opencode, codex, windsurf, kilocode, auggie, roo, codebuddy, amp, shai, q, agy, bob, qodercli)

 .PARAMETER AgentType
 Optional agent key to update a single agent. If omitted, updates all existing agent files (creating a default Claude file if none exist).
@@ -25,7 +25,7 @@ Relies on common helper functions in common.ps1
 #>
 param(
    [Parameter(Position=0)]
-    [ValidateSet('claude','gemini','copilot','cursor-agent','qwen','opencode','codex','windsurf','kilocode','auggie','roo','codebuddy','amp','shai','tabnine','kiro-cli','agy','bob','qodercli','vibe','kimi','generic')]
+    [ValidateSet('claude','gemini','copilot','cursor-agent','qwen','opencode','codex','windsurf','kilocode','auggie','roo','codebuddy','amp','shai','q','agy','bob','qodercli','generic')]
    [string]$AgentType
 )

@@ -58,12 +58,9 @@ $CODEBUDDY_FILE = Join-Path $REPO_ROOT 'CODEBUDDY.md'
 $QODER_FILE    = Join-Path $REPO_ROOT 'QODER.md'
 $AMP_FILE      = Join-Path $REPO_ROOT 'AGENTS.md'
 $SHAI_FILE     = Join-Path $REPO_ROOT 'SHAI.md'
-$TABNINE_FILE  = Join-Path $REPO_ROOT 'TABNINE.md'
-$KIRO_FILE     = Join-Path $REPO_ROOT 'AGENTS.md'
+$Q_FILE        = Join-Path $REPO_ROOT 'AGENTS.md'
 $AGY_FILE      = Join-Path $REPO_ROOT '.agent/rules/specify-rules.md'
 $BOB_FILE      = Join-Path $REPO_ROOT 'AGENTS.md'
-$VIBE_FILE     = Join-Path $REPO_ROOT '.vibe/agents/specify-agents.md'
-$KIMI_FILE     = Join-Path $REPO_ROOT 'KIMI.md'

 $TEMPLATE_FILE = Join-Path $REPO_ROOT '.specify/templates/agent-file-template.md'

@@ -261,12 +258,6 @@ function New-AgentFile {
    # Convert literal \n sequences introduced by Escape to real newlines
    $content = $content -replace '\\n',[Environment]::NewLine

-    # Prepend Cursor frontmatter for .mdc files so rules are auto-included
-    if ($TargetFile -match '\.mdc$') {
-        $frontmatter = @('---','description: Project Development Guidelines','globs: ["**/*"]','alwaysApply: true','---','') -join [Environment]::NewLine
-        $content = $frontmatter + $content
-    }
-
    $parent = Split-Path -Parent $TargetFile
    if (-not (Test-Path $parent)) { New-Item -ItemType Directory -Path $parent | Out-Null }
    Set-Content -LiteralPath $TargetFile -Value $content -NoNewline -Encoding utf8
@@ -331,7 +322,7 @@ function Update-ExistingAgentFile {
            if ($existingChanges -lt 2) { $output.Add($line); $existingChanges++ }
            continue
        }
-        if ($line -match '(\*\*)?Last updated(\*\*)?: .*\d{4}-\d{2}-\d{2}') {
+        if ($line -match '\*\*Last updated\*\*: .*\d{4}-\d{2}-\d{2}') {
            $output.Add(($line -replace '\d{4}-\d{2}-\d{2}',$Date.ToString('yyyy-MM-dd')))
            continue
        }
@@ -343,12 +334,6 @@ function Update-ExistingAgentFile {
        $newTechEntries | ForEach-Object { $output.Add($_) }
    }

-    # Ensure Cursor .mdc files have YAML frontmatter for auto-inclusion
-    if ($TargetFile -match '\.mdc$' -and $output.Count -gt 0 -and $output[0] -ne '---') {
-        $frontmatter = @('---','description: Project Development Guidelines','globs: ["**/*"]','alwaysApply: true','---','')
-        $output.InsertRange(0, $frontmatter)
-    }
-
    Set-Content -LiteralPath $TargetFile -Value ($output -join [Environment]::NewLine) -Encoding utf8
    return $true
 }
@@ -402,14 +387,11 @@ function Update-SpecificAgent {
        'qodercli' { Update-AgentFile -TargetFile $QODER_FILE    -AgentName 'Qoder CLI' }
        'amp'      { Update-AgentFile -TargetFile $AMP_FILE      -AgentName 'Amp' }
        'shai'     { Update-AgentFile -TargetFile $SHAI_FILE     -AgentName 'SHAI' }
-        'tabnine'  { Update-AgentFile -TargetFile $TABNINE_FILE  -AgentName 'Tabnine CLI' }
-        'kiro-cli' { Update-AgentFile -TargetFile $KIRO_FILE     -AgentName 'Kiro CLI' }
+        'q'        { Update-AgentFile -TargetFile $Q_FILE        -AgentName 'Amazon Q Developer CLI' }
        'agy'      { Update-AgentFile -TargetFile $AGY_FILE      -AgentName 'Antigravity' }
        'bob'      { Update-AgentFile -TargetFile $BOB_FILE      -AgentName 'IBM Bob' }
-        'vibe'     { Update-AgentFile -TargetFile $VIBE_FILE     -AgentName 'Mistral Vibe' }
-        'kimi'     { Update-AgentFile -TargetFile $KIMI_FILE     -AgentName 'Kimi Code' }
        'generic'  { Write-Info 'Generic agent: no predefined context file. Use the agent-specific update script for your agent.' }
-        default { Write-Err "Unknown agent type '$Type'"; Write-Err 'Expected: claude|gemini|copilot|cursor-agent|qwen|opencode|codex|windsurf|kilocode|auggie|roo|codebuddy|amp|shai|tabnine|kiro-cli|agy|bob|vibe|qodercli|kimi|generic'; return $false }
+        default { Write-Err "Unknown agent type '$Type'"; Write-Err 'Expected: claude|gemini|copilot|cursor-agent|qwen|opencode|codex|windsurf|kilocode|auggie|roo|codebuddy|amp|shai|q|agy|bob|qodercli|generic'; return $false }
    }
 }

@@ -429,12 +411,9 @@ function Update-AllExistingAgents {
    if (Test-Path $CODEBUDDY_FILE) { if (-not (Update-AgentFile -TargetFile $CODEBUDDY_FILE -AgentName 'CodeBuddy CLI')) { $ok = $false }; $found = $true }
    if (Test-Path $QODER_FILE)    { if (-not (Update-AgentFile -TargetFile $QODER_FILE    -AgentName 'Qoder CLI')) { $ok = $false }; $found = $true }
    if (Test-Path $SHAI_FILE)     { if (-not (Update-AgentFile -TargetFile $SHAI_FILE     -AgentName 'SHAI')) { $ok = $false }; $found = $true }
-    if (Test-Path $TABNINE_FILE)  { if (-not (Update-AgentFile -TargetFile $TABNINE_FILE  -AgentName 'Tabnine CLI')) { $ok = $false }; $found = $true }
-    if (Test-Path $KIRO_FILE)     { if (-not (Update-AgentFile -TargetFile $KIRO_FILE     -AgentName 'Kiro CLI')) { $ok = $false }; $found = $true }
+    if (Test-Path $Q_FILE)        { if (-not (Update-AgentFile -TargetFile $Q_FILE        -AgentName 'Amazon Q Developer CLI')) { $ok = $false }; $found = $true }
    if (Test-Path $AGY_FILE)      { if (-not (Update-AgentFile -TargetFile $AGY_FILE      -AgentName 'Antigravity')) { $ok = $false }; $found = $true }
    if (Test-Path $BOB_FILE)      { if (-not (Update-AgentFile -TargetFile $BOB_FILE      -AgentName 'IBM Bob')) { $ok = $false }; $found = $true }
-    if (Test-Path $VIBE_FILE)     { if (-not (Update-AgentFile -TargetFile $VIBE_FILE     -AgentName 'Mistral Vibe')) { $ok = $false }; $found = $true }
-    if (Test-Path $KIMI_FILE)     { if (-not (Update-AgentFile -TargetFile $KIMI_FILE     -AgentName 'Kimi Code')) { $ok = $false }; $found = $true }
    if (-not $found) {
        Write-Info 'No existing agent files found, creating default Claude file...'
        if (-not (Update-AgentFile -TargetFile $CLAUDE_FILE -AgentName 'Claude Code')) { $ok = $false }
@@ -449,7 +428,7 @@ function Print-Summary {
    if ($NEW_FRAMEWORK) { Write-Host "  - Added framework: $NEW_FRAMEWORK" }
    if ($NEW_DB -and $NEW_DB -ne 'N/A') { Write-Host "  - Added database: $NEW_DB" }
    Write-Host ''
-    Write-Info 'Usage: ./update-agent-context.ps1 [-AgentType claude|gemini|copilot|cursor-agent|qwen|opencode|codex|windsurf|kilocode|auggie|roo|codebuddy|amp|shai|tabnine|kiro-cli|agy|bob|vibe|qodercli|generic]'
+    Write-Info 'Usage: ./update-agent-context.ps1 [-AgentType claude|gemini|copilot|cursor-agent|qwen|opencode|codex|windsurf|kilocode|auggie|roo|codebuddy|amp|shai|q|agy|bob|qodercli|generic]'
 }

 function Main {
@@ -470,3 +449,4 @@ function Main {
 }

 Main
+
--- a/src/specify_cli/init.py
+++ b/src/specify_cli/init.py
--- a/src/specify_cli/extensions.py
+++ b/src/specify_cli/extensions.py
@@ -8,19 +8,14 @@ without bloating the core framework.

 import json
 import hashlib
-import os
 import tempfile
 import zipfile
 import shutil
-import copy
-from dataclasses import dataclass
 from pathlib import Path
-from typing import Optional, Dict, List, Any, Callable, Set
+from typing import Optional, Dict, List, Any
 from datetime import datetime, timezone
 import re

-import pathspec
-
 import yaml
 from packaging import version as pkg_version
 from packaging.specifiers import SpecifierSet, InvalidSpecifier
@@ -41,16 +36,6 @@ class CompatibilityError(ExtensionError):
    pass


-@dataclass
-class CatalogEntry:
-    """Represents a single catalog entry in the catalog stack."""
-    url: str
-    name: str
-    priority: int
-    install_allowed: bool
-    description: str = ""
-
-
 class ExtensionManifest:
    """Represents and validates an extension manifest (extension.yml)."""

@@ -229,54 +214,6 @@ class ExtensionRegistry:
        }
        self._save()

-    def update(self, extension_id: str, metadata: dict):
-        """Update extension metadata in registry, merging with existing entry.
-
-        Merges the provided metadata with the existing entry, preserving any
-        fields not specified in the new metadata. The installed_at timestamp
-        is always preserved from the original entry.
-
-        Use this method instead of add() when updating existing extension
-        metadata (e.g., enabling/disabling) to preserve the original
-        installation timestamp and other existing fields.
-
-        Args:
-            extension_id: Extension ID
-            metadata: Extension metadata fields to update (merged with existing)
-
-        Raises:
-            KeyError: If extension is not installed
-        """
-        if extension_id not in self.data["extensions"]:
-            raise KeyError(f"Extension '{extension_id}' is not installed")
-        # Merge new metadata with existing, preserving original installed_at
-        existing = self.data["extensions"][extension_id]
-        # Merge: existing fields preserved, new fields override
-        merged = {**existing, **metadata}
-        # Always preserve original installed_at based on key existence, not truthiness,
-        # to handle cases where the field exists but may be falsy (legacy/corruption)
-        if "installed_at" in existing:
-            merged["installed_at"] = existing["installed_at"]
-        else:
-            # If not present in existing, explicitly remove from merged if caller provided it
-            merged.pop("installed_at", None)
-        self.data["extensions"][extension_id] = merged
-        self._save()
-
-    def restore(self, extension_id: str, metadata: dict):
-        """Restore extension metadata to registry without modifying timestamps.
-
-        Use this method for rollback scenarios where you have a complete backup
-        of the registry entry (including installed_at) and want to restore it
-        exactly as it was.
-
-        Args:
-            extension_id: Extension ID
-            metadata: Complete extension metadata including installed_at
-        """
-        self.data["extensions"][extension_id] = dict(metadata)
-        self._save()
-
    def remove(self, extension_id: str):
        """Remove extension from registry.

@@ -290,28 +227,21 @@ class ExtensionRegistry:
    def get(self, extension_id: str) -> Optional[dict]:
        """Get extension metadata from registry.

-        Returns a deep copy to prevent callers from accidentally mutating
-        nested internal registry state without going through the write path.
-
        Args:
            extension_id: Extension ID

        Returns:
-            Deep copy of extension metadata, or None if not found
+            Extension metadata or None if not found
        """
-        entry = self.data["extensions"].get(extension_id)
-        return copy.deepcopy(entry) if entry is not None else None
+        return self.data["extensions"].get(extension_id)

    def list(self) -> Dict[str, dict]:
        """Get all installed extensions.

-        Returns a deep copy of the extensions mapping to prevent callers
-        from accidentally mutating nested internal registry state.
-
        Returns:
-            Dictionary of extension_id -> metadata (deep copies)
+            Dictionary of extension_id -> metadata
        """
-        return copy.deepcopy(self.data["extensions"])
+        return self.data["extensions"]

    def is_installed(self, extension_id: str) -> bool:
        """Check if extension is installed.
@@ -338,70 +268,6 @@ class ExtensionManager:
        self.extensions_dir = project_root / ".specify" / "extensions"
        self.registry = ExtensionRegistry(self.extensions_dir)

-    @staticmethod
-    def _load_extensionignore(source_dir: Path) -> Optional[Callable[[str, List[str]], Set[str]]]:
-        """Load .extensionignore and return an ignore function for shutil.copytree.
-
-        The .extensionignore file uses .gitignore-compatible patterns (one per line).
-        Lines starting with '#' are comments. Blank lines are ignored.
-        The .extensionignore file itself is always excluded.
-
-        Pattern semantics mirror .gitignore:
-        - '*' matches anything except '/'
-        - '**' matches zero or more directories
-        - '?' matches any single character except '/'
-        - Trailing '/' restricts a pattern to directories only
-        - Patterns with '/' (other than trailing) are anchored to the root
-        - '!' negates a previously excluded pattern
-
-        Args:
-            source_dir: Path to the extension source directory
-
-        Returns:
-            An ignore function compatible with shutil.copytree, or None
-            if no .extensionignore file exists.
-        """
-        ignore_file = source_dir / ".extensionignore"
-        if not ignore_file.exists():
-            return None
-
-        lines: List[str] = ignore_file.read_text().splitlines()
-
-        # Normalise backslashes in patterns so Windows-authored files work
-        normalised: List[str] = []
-        for line in lines:
-            stripped = line.strip()
-            if stripped and not stripped.startswith("#"):
-                normalised.append(stripped.replace("\\", "/"))
-            else:
-                # Preserve blanks/comments so pathspec line numbers stay stable
-                normalised.append(line)
-
-        # Always ignore the .extensionignore file itself
-        normalised.append(".extensionignore")
-
-        spec = pathspec.GitIgnoreSpec.from_lines(normalised)
-
-        def _ignore(directory: str, entries: List[str]) -> Set[str]:
-            ignored: Set[str] = set()
-            rel_dir = Path(directory).relative_to(source_dir)
-            for entry in entries:
-                rel_path = str(rel_dir / entry) if str(rel_dir) != "." else entry
-                # Normalise to forward slashes for consistent matching
-                rel_path_fwd = rel_path.replace("\\", "/")
-
-                entry_full = Path(directory) / entry
-                if entry_full.is_dir():
-                    # Append '/' so directory-only patterns (e.g. tests/) match
-                    if spec.match_file(rel_path_fwd + "/"):
-                        ignored.add(entry)
-                else:
-                    if spec.match_file(rel_path_fwd):
-                        ignored.add(entry)
-            return ignored
-
-        return _ignore
-
    def check_compatibility(
        self,
        manifest: ExtensionManifest,
@@ -475,8 +341,7 @@ class ExtensionManager:
        if dest_dir.exists():
            shutil.rmtree(dest_dir)

-        ignore_fn = self._load_extensionignore(source_dir)
-        shutil.copytree(source_dir, dest_dir, ignore=ignore_fn)
+        shutil.copytree(source_dir, dest_dir)

        # Register commands with AI agents
        registered_commands = {}
@@ -590,12 +455,6 @@ class ExtensionManager:
                    if cmd_file.exists():
                        cmd_file.unlink()

-                    # Also remove companion .prompt.md for Copilot
-                    if agent_name == "copilot":
-                        prompt_file = self.project_root / ".github" / "prompts" / f"{cmd_name}.prompt.md"
-                        if prompt_file.exists():
-                            prompt_file.unlink()
-
        if keep_config:
            # Preserve config files, only remove non-config files
            if extension_dir.exists():
@@ -656,7 +515,7 @@ class ExtensionManager:
                result.append({
                    "id": ext_id,
                    "name": manifest.name,
-                    "version": metadata.get("version", "unknown"),
+                    "version": metadata["version"],
                    "description": manifest.description,
                    "enabled": metadata.get("enabled", True),
                    "installed_at": metadata.get("installed_at"),
@@ -738,7 +597,7 @@ class CommandRegistrar:
            "dir": ".github/agents",
            "format": "markdown",
            "args": "$ARGUMENTS",
-            "extension": ".agent.md"
+            "extension": ".md"
        },
        "cursor": {
            "dir": ".cursor/commands",
@@ -748,9 +607,9 @@ class CommandRegistrar:
        },
        "qwen": {
            "dir": ".qwen/commands",
-            "format": "markdown",
-            "args": "$ARGUMENTS",
-            "extension": ".md"
+            "format": "toml",
+            "args": "{{args}}",
+            "extension": ".toml"
        },
        "opencode": {
            "dir": ".opencode/command",
@@ -758,12 +617,6 @@ class CommandRegistrar:
            "args": "$ARGUMENTS",
            "extension": ".md"
        },
-        "codex": {
-            "dir": ".codex/prompts",
-            "format": "markdown",
-            "args": "$ARGUMENTS",
-            "extension": ".md"
-        },
        "windsurf": {
            "dir": ".windsurf/workflows",
            "format": "markdown",
@@ -783,7 +636,7 @@ class CommandRegistrar:
            "extension": ".md"
        },
        "roo": {
-            "dir": ".roo/commands",
+            "dir": ".roo/rules",
            "format": "markdown",
            "args": "$ARGUMENTS",
            "extension": ".md"
@@ -800,8 +653,8 @@ class CommandRegistrar:
            "args": "$ARGUMENTS",
            "extension": ".md"
        },
-        "kiro-cli": {
-            "dir": ".kiro/prompts",
+        "q": {
+            "dir": ".amazonq/prompts",
            "format": "markdown",
            "args": "$ARGUMENTS",
            "extension": ".md"
@@ -818,23 +671,11 @@ class CommandRegistrar:
            "args": "$ARGUMENTS",
            "extension": ".md"
        },
-        "tabnine": {
-            "dir": ".tabnine/agent/commands",
-            "format": "toml",
-            "args": "{{args}}",
-            "extension": ".toml"
-        },
        "bob": {
            "dir": ".bob/commands",
            "format": "markdown",
            "args": "$ARGUMENTS",
            "extension": ".md"
-        },
-        "kimi": {
-            "dir": ".kimi/skills",
-            "format": "markdown",
-            "args": "$ARGUMENTS",
-            "extension": "/SKILL.md"
        }
    }

@@ -1028,44 +869,18 @@ class CommandRegistrar:

            # Write command file
            dest_file = commands_dir / f"{cmd_name}{agent_config['extension']}"
-            dest_file.parent.mkdir(parents=True, exist_ok=True)
            dest_file.write_text(output)

-            # Generate companion .prompt.md for Copilot agents
-            if agent_name == "copilot":
-                self._write_copilot_prompt(project_root, cmd_name)
-
            registered.append(cmd_name)

            # Register aliases
            for alias in cmd_info.get("aliases", []):
                alias_file = commands_dir / f"{alias}{agent_config['extension']}"
-                alias_file.parent.mkdir(parents=True, exist_ok=True)
                alias_file.write_text(output)
-                # Generate companion .prompt.md for alias too
-                if agent_name == "copilot":
-                    self._write_copilot_prompt(project_root, alias)
                registered.append(alias)

        return registered

-    @staticmethod
-    def _write_copilot_prompt(project_root: Path, cmd_name: str) -> None:
-        """Generate a companion .prompt.md file for a Copilot agent command.
-
-        Copilot requires a .prompt.md file in .github/prompts/ that references
-        the corresponding .agent.md file in .github/agents/ via an ``agent:``
-        frontmatter field.
-
-        Args:
-            project_root: Path to project root
-            cmd_name: Command name (used as the file stem, e.g. 'speckit.my-ext.example')
-        """
-        prompts_dir = project_root / ".github" / "prompts"
-        prompts_dir.mkdir(parents=True, exist_ok=True)
-        prompt_file = prompts_dir / f"{cmd_name}.prompt.md"
-        prompt_file.write_text(f"---\nagent: {cmd_name}\n---\n")
-
    def register_commands_for_all_agents(
        self,
        manifest: ExtensionManifest,
@@ -1125,7 +940,6 @@ class ExtensionCatalog:
    """Manages extension catalog fetching, caching, and searching."""

    DEFAULT_CATALOG_URL = "https://raw.githubusercontent.com/github/spec-kit/main/extensions/catalog.json"
-    COMMUNITY_CATALOG_URL = "https://raw.githubusercontent.com/github/spec-kit/main/extensions/catalog.community.json"
    CACHE_DURATION = 3600  # 1 hour in seconds

    def __init__(self, project_root: Path):
@@ -1140,123 +954,43 @@ class ExtensionCatalog:
        self.cache_file = self.cache_dir / "catalog.json"
        self.cache_metadata_file = self.cache_dir / "catalog-metadata.json"

-    def _validate_catalog_url(self, url: str) -> None:
-        """Validate that a catalog URL uses HTTPS (localhost HTTP allowed).
+    def get_catalog_url(self) -> str:
+        """Get catalog URL from config or use default.

-        Args:
-            url: URL to validate
+        Checks in order:
+        1. SPECKIT_CATALOG_URL environment variable
+        2. Default catalog URL
+
+        Returns:
+            URL to fetch catalog from

        Raises:
-            ValidationError: If URL is invalid or uses non-HTTPS scheme
+            ValidationError: If custom URL is invalid (non-HTTPS)
        """
+        import os
+        import sys
        from urllib.parse import urlparse

-        parsed = urlparse(url)
-        is_localhost = parsed.hostname in ("localhost", "127.0.0.1", "::1")
-        if parsed.scheme != "https" and not (parsed.scheme == "http" and is_localhost):
-            raise ValidationError(
-                f"Catalog URL must use HTTPS (got {parsed.scheme}://). "
-                "HTTP is only allowed for localhost."
-            )
-        if not parsed.netloc:
-            raise ValidationError("Catalog URL must be a valid URL with a host.")
-
-    def _load_catalog_config(self, config_path: Path) -> Optional[List[CatalogEntry]]:
-        """Load catalog stack configuration from a YAML file.
-
-        Args:
-            config_path: Path to extension-catalogs.yml
-
-        Returns:
-            Ordered list of CatalogEntry objects, or None if file doesn't exist.
-
-        Raises:
-            ValidationError: If any catalog entry has an invalid URL,
-                the file cannot be parsed, a priority value is invalid,
-                or the file exists but contains no valid catalog entries
-                (fail-closed for security).
-        """
-        if not config_path.exists():
-            return None
-        try:
-            data = yaml.safe_load(config_path.read_text()) or {}
-        except (yaml.YAMLError, OSError) as e:
-            raise ValidationError(
-                f"Failed to read catalog config {config_path}: {e}"
-            )
-        catalogs_data = data.get("catalogs", [])
-        if not catalogs_data:
-            # File exists but has no catalogs key or empty list - fail closed
-            raise ValidationError(
-                f"Catalog config {config_path} exists but contains no 'catalogs' entries. "
-                f"Remove the file to use built-in defaults, or add valid catalog entries."
-            )
-        if not isinstance(catalogs_data, list):
-            raise ValidationError(
-                f"Invalid catalog config: 'catalogs' must be a list, got {type(catalogs_data).__name__}"
-            )
-        entries: List[CatalogEntry] = []
-        skipped_entries: List[int] = []
-        for idx, item in enumerate(catalogs_data):
-            if not isinstance(item, dict):
-                raise ValidationError(
-                    f"Invalid catalog entry at index {idx}: expected a mapping, got {type(item).__name__}"
-                )
-            url = str(item.get("url", "")).strip()
-            if not url:
-                skipped_entries.append(idx)
-                continue
-            self._validate_catalog_url(url)
-            try:
-                priority = int(item.get("priority", idx + 1))
-            except (TypeError, ValueError):
-                raise ValidationError(
-                    f"Invalid priority for catalog '{item.get('name', idx + 1)}': "
-                    f"expected integer, got {item.get('priority')!r}"
-                )
-            raw_install = item.get("install_allowed", False)
-            if isinstance(raw_install, str):
-                install_allowed = raw_install.strip().lower() in ("true", "yes", "1")
-            else:
-                install_allowed = bool(raw_install)
-            entries.append(CatalogEntry(
-                url=url,
-                name=str(item.get("name", f"catalog-{idx + 1}")),
-                priority=priority,
-                install_allowed=install_allowed,
-                description=str(item.get("description", "")),
-            ))
-        entries.sort(key=lambda e: e.priority)
-        if not entries:
-            # All entries were invalid (missing URLs) - fail closed for security
-            raise ValidationError(
-                f"Catalog config {config_path} contains {len(catalogs_data)} entries but none have valid URLs "
-                f"(entries at indices {skipped_entries} were skipped). "
-                f"Each catalog entry must have a 'url' field."
-            )
-        return entries
-
-    def get_active_catalogs(self) -> List[CatalogEntry]:
-        """Get the ordered list of active catalogs.
-
-        Resolution order:
-        1. SPECKIT_CATALOG_URL env var — single catalog replacing all defaults
-        2. Project-level .specify/extension-catalogs.yml
-        3. User-level ~/.specify/extension-catalogs.yml
-        4. Built-in default stack (default + community)
-
-        Returns:
-            List of CatalogEntry objects sorted by priority (ascending)
-
-        Raises:
-            ValidationError: If a catalog URL is invalid
-        """
-        import sys
-
-        # 1. SPECKIT_CATALOG_URL env var replaces all defaults for backward compat
+        # Environment variable override (useful for testing)
        if env_value := os.environ.get("SPECKIT_CATALOG_URL"):
            catalog_url = env_value.strip()
-            self._validate_catalog_url(catalog_url)
+            parsed = urlparse(catalog_url)
+
+            # Require HTTPS for security (prevent man-in-the-middle attacks)
+            # Allow http://localhost for local development/testing
+            is_localhost = parsed.hostname in ("localhost", "127.0.0.1", "::1")
+            if parsed.scheme != "https" and not (parsed.scheme == "http" and is_localhost):
+                raise ValidationError(
+                    f"Invalid SPECKIT_CATALOG_URL: must use HTTPS (got {parsed.scheme}://). "
+                    "HTTP is only allowed for localhost."
+                )
+
+            if not parsed.netloc:
+                raise ValidationError(
+                    "Invalid SPECKIT_CATALOG_URL: must be a valid URL with a host."
+                )
+
+            # Warn users when using a non-default catalog (once per instance)
            if catalog_url != self.DEFAULT_CATALOG_URL:
                if not getattr(self, "_non_default_catalog_warning_shown", False):
                    print(
@@ -1265,163 +999,11 @@ class ExtensionCatalog:
                        file=sys.stderr,
                    )
                    self._non_default_catalog_warning_shown = True
-            return [CatalogEntry(url=catalog_url, name="custom", priority=1, install_allowed=True, description="Custom catalog via SPECKIT_CATALOG_URL")]

-        # 2. Project-level config overrides all defaults
-        project_config_path = self.project_root / ".specify" / "extension-catalogs.yml"
-        catalogs = self._load_catalog_config(project_config_path)
-        if catalogs is not None:
-            return catalogs
+            return catalog_url

-        # 3. User-level config
-        user_config_path = Path.home() / ".specify" / "extension-catalogs.yml"
-        catalogs = self._load_catalog_config(user_config_path)
-        if catalogs is not None:
-            return catalogs
-
-        # 4. Built-in default stack
-        return [
-            CatalogEntry(url=self.DEFAULT_CATALOG_URL, name="default", priority=1, install_allowed=True, description="Built-in catalog of installable extensions"),
-            CatalogEntry(url=self.COMMUNITY_CATALOG_URL, name="community", priority=2, install_allowed=False, description="Community-contributed extensions (discovery only)"),
-        ]
-
-    def get_catalog_url(self) -> str:
-        """Get the primary catalog URL.
-
-        Returns the URL of the highest-priority catalog. Kept for backward
-        compatibility. Use get_active_catalogs() for full multi-catalog support.
-
-        Returns:
-            URL of the primary catalog
-
-        Raises:
-            ValidationError: If a catalog URL is invalid
-        """
-        active = self.get_active_catalogs()
-        return active[0].url if active else self.DEFAULT_CATALOG_URL
-
-    def _fetch_single_catalog(self, entry: CatalogEntry, force_refresh: bool = False) -> Dict[str, Any]:
-        """Fetch a single catalog with per-URL caching.
-
-        For the DEFAULT_CATALOG_URL, uses legacy cache files (self.cache_file /
-        self.cache_metadata_file) for backward compatibility. For all other URLs,
-        uses URL-hash-based cache files in self.cache_dir.
-
-        Args:
-            entry: CatalogEntry describing the catalog to fetch
-            force_refresh: If True, bypass cache
-
-        Returns:
-            Catalog data dictionary
-
-        Raises:
-            ExtensionError: If catalog cannot be fetched or has invalid format
-        """
-        import urllib.request
-        import urllib.error
-
-        # Determine cache file paths (backward compat for default catalog)
-        if entry.url == self.DEFAULT_CATALOG_URL:
-            cache_file = self.cache_file
-            cache_meta_file = self.cache_metadata_file
-            is_valid = not force_refresh and self.is_cache_valid()
-        else:
-            url_hash = hashlib.sha256(entry.url.encode()).hexdigest()[:16]
-            cache_file = self.cache_dir / f"catalog-{url_hash}.json"
-            cache_meta_file = self.cache_dir / f"catalog-{url_hash}-metadata.json"
-            is_valid = False
-            if not force_refresh and cache_file.exists() and cache_meta_file.exists():
-                try:
-                    metadata = json.loads(cache_meta_file.read_text())
-                    cached_at = datetime.fromisoformat(metadata.get("cached_at", ""))
-                    if cached_at.tzinfo is None:
-                        cached_at = cached_at.replace(tzinfo=timezone.utc)
-                    age = (datetime.now(timezone.utc) - cached_at).total_seconds()
-                    is_valid = age < self.CACHE_DURATION
-                except (json.JSONDecodeError, ValueError, KeyError, TypeError):
-                    # If metadata is invalid or missing expected fields, treat cache as invalid
-                    pass
-
-        # Use cache if valid
-        if is_valid:
-            try:
-                return json.loads(cache_file.read_text())
-            except json.JSONDecodeError:
-                pass
-
-        # Fetch from network
-        try:
-            with urllib.request.urlopen(entry.url, timeout=10) as response:
-                catalog_data = json.loads(response.read())
-
-            if "schema_version" not in catalog_data or "extensions" not in catalog_data:
-                raise ExtensionError(f"Invalid catalog format from {entry.url}")
-
-            # Save to cache
-            self.cache_dir.mkdir(parents=True, exist_ok=True)
-            cache_file.write_text(json.dumps(catalog_data, indent=2))
-            cache_meta_file.write_text(json.dumps({
-                "cached_at": datetime.now(timezone.utc).isoformat(),
-                "catalog_url": entry.url,
-            }, indent=2))
-
-            return catalog_data
-
-        except urllib.error.URLError as e:
-            raise ExtensionError(f"Failed to fetch catalog from {entry.url}: {e}")
-        except json.JSONDecodeError as e:
-            raise ExtensionError(f"Invalid JSON in catalog from {entry.url}: {e}")
-
-    def _get_merged_extensions(self, force_refresh: bool = False) -> List[Dict[str, Any]]:
-        """Fetch and merge extensions from all active catalogs.
-
-        Higher-priority (lower priority number) catalogs win on conflicts
-        (same extension id in two catalogs). Each extension dict is annotated with:
-          - _catalog_name: name of the source catalog
-          - _install_allowed: whether installation is allowed from this catalog
-
-        Catalogs that fail to fetch are skipped. Raises ExtensionError only if
-        ALL catalogs fail.
-
-        Args:
-            force_refresh: If True, bypass all caches
-
-        Returns:
-            List of merged extension dicts
-
-        Raises:
-            ExtensionError: If all catalogs fail to fetch
-        """
-        import sys
-
-        active_catalogs = self.get_active_catalogs()
-        merged: Dict[str, Dict[str, Any]] = {}
-        any_success = False
-
-        for catalog_entry in active_catalogs:
-            try:
-                catalog_data = self._fetch_single_catalog(catalog_entry, force_refresh)
-                any_success = True
-            except ExtensionError as e:
-                print(
-                    f"Warning: Could not fetch catalog '{catalog_entry.name}': {e}",
-                    file=sys.stderr,
-                )
-                continue
-
-            for ext_id, ext_data in catalog_data.get("extensions", {}).items():
-                if ext_id not in merged:  # Higher-priority catalog wins
-                    merged[ext_id] = {
-                        **ext_data,
-                        "id": ext_id,
-                        "_catalog_name": catalog_entry.name,
-                        "_install_allowed": catalog_entry.install_allowed,
-                    }
-
-        if not any_success and active_catalogs:
-            raise ExtensionError("Failed to fetch any extension catalog")
-
-        return list(merged.values())
+        # TODO: Support custom catalogs from .specify/extension-catalogs.yml
+        return self.DEFAULT_CATALOG_URL

    def is_cache_valid(self) -> bool:
        """Check if cached catalog is still valid.
@@ -1435,11 +1017,9 @@ class ExtensionCatalog:
        try:
            metadata = json.loads(self.cache_metadata_file.read_text())
            cached_at = datetime.fromisoformat(metadata.get("cached_at", ""))
-            if cached_at.tzinfo is None:
-                cached_at = cached_at.replace(tzinfo=timezone.utc)
            age_seconds = (datetime.now(timezone.utc) - cached_at).total_seconds()
            return age_seconds < self.CACHE_DURATION
-        except (json.JSONDecodeError, ValueError, KeyError, TypeError):
+        except (json.JSONDecodeError, ValueError, KeyError):
            return False

    def fetch_catalog(self, force_refresh: bool = False) -> Dict[str, Any]:
@@ -1500,7 +1080,7 @@ class ExtensionCatalog:
        author: Optional[str] = None,
        verified_only: bool = False,
    ) -> List[Dict[str, Any]]:
-        """Search catalog for extensions across all active catalogs.
+        """Search catalog for extensions.

        Args:
            query: Search query (searches name, description, tags)
@@ -1509,16 +1089,14 @@ class ExtensionCatalog:
            verified_only: If True, show only verified extensions

        Returns:
-            List of matching extension metadata, each annotated with
-            ``_catalog_name`` and ``_install_allowed`` from its source catalog.
+            List of matching extension metadata
        """
-        all_extensions = self._get_merged_extensions()
+        catalog = self.fetch_catalog()
+        extensions = catalog.get("extensions", {})

        results = []

-        for ext_data in all_extensions:
-            ext_id = ext_data["id"]
-
+        for ext_id, ext_data in extensions.items():
            # Apply filters
            if verified_only and not ext_data.get("verified", False):
                continue
@@ -1544,26 +1122,25 @@ class ExtensionCatalog:
                if query_lower not in searchable_text:
                    continue

-            results.append(ext_data)
+            results.append({"id": ext_id, **ext_data})

        return results

    def get_extension_info(self, extension_id: str) -> Optional[Dict[str, Any]]:
        """Get detailed information about a specific extension.

-        Searches all active catalogs in priority order.
-
        Args:
            extension_id: ID of the extension

        Returns:
-            Extension metadata (annotated with ``_catalog_name`` and
-            ``_install_allowed``) or None if not found.
+            Extension metadata or None if not found
        """
-        all_extensions = self._get_merged_extensions()
-        for ext_data in all_extensions:
-            if ext_data["id"] == extension_id:
-                return ext_data
+        catalog = self.fetch_catalog()
+        extensions = catalog.get("extensions", {})
+
+        if extension_id in extensions:
+            return {"id": extension_id, **extensions[extension_id]}
+
        return None

    def download_extension(self, extension_id: str, target_dir: Optional[Path] = None) -> Path:
@@ -1623,18 +1200,11 @@ class ExtensionCatalog:
            raise ExtensionError(f"Failed to save extension ZIP: {e}")

    def clear_cache(self):
-        """Clear the catalog cache (both legacy and URL-hash-based files)."""
+        """Clear the catalog cache."""
        if self.cache_file.exists():
            self.cache_file.unlink()
        if self.cache_metadata_file.exists():
            self.cache_metadata_file.unlink()
-        # Also clear any per-URL hash-based cache files
-        if self.cache_dir.exists():
-            for extra_cache in self.cache_dir.glob("catalog-*.json"):
-                if extra_cache != self.cache_file:
-                    extra_cache.unlink(missing_ok=True)
-            for extra_meta in self.cache_dir.glob("catalog-*-metadata.json"):
-                extra_meta.unlink(missing_ok=True)


 class ConfigManager:
@@ -2212,3 +1782,4 @@ class HookExecutor:

        self.save_project_config(config)

+
--- a/templates/commands/checklist.md
+++ b/templates/commands/checklist.md
@@ -94,10 +94,9 @@ You **MUST** consider the user input before proceeding (if not empty).
   - Generate unique checklist filename:
     - Use short, descriptive name based on domain (e.g., `ux.md`, `api.md`, `security.md`)
     - Format: `[domain].md`
-   - File handling behavior:
-     - If file does NOT exist: Create new file and number items starting from CHK001
-     - If file exists: Append new items to existing file, continuing from the last CHK ID (e.g., if last item is CHK015, start new items at CHK016)
-   - Never delete or replace existing checklist content - always preserve and append
+     - If file exists, append to existing file
+   - Number items sequentially starting from CHK001
+   - Each `/speckit.checklist` run creates a NEW file (never overwrites existing checklists)

   **CORE PRINCIPLE - Test the Requirements, Not the Implementation**:
   Every checklist item MUST evaluate the REQUIREMENTS THEMSELVES for:
@@ -209,13 +208,13 @@ You **MUST** consider the user input before proceeding (if not empty).

 6. **Structure Reference**: Generate the checklist following the canonical template in `templates/checklist-template.md` for title, meta section, category headings, and ID formatting. If template is unavailable, use: H1 title, purpose/created meta lines, `##` category sections containing `- [ ] CHK### <requirement item>` lines with globally incrementing IDs starting at CHK001.

-7. **Report**: Output full path to checklist file, item count, and summarize whether the run created a new file or appended to an existing one. Summarize:
+7. **Report**: Output full path to created checklist, item count, and remind user that each run creates a new file. Summarize:
   - Focus areas selected
   - Depth level
   - Actor/timing
   - Any explicit user-specified must-have items incorporated

-**Important**: Each `/speckit.checklist` command invocation uses a short, descriptive checklist filename and either creates a new file or appends to an existing one. This allows:
+**Important**: Each `/speckit.checklist` command invocation creates a checklist file using short, descriptive names unless file already exists. This allows:

 - Multiple checklists of different types (e.g., `ux.md`, `test.md`, `security.md`)
 - Simple, memorable filenames that indicate checklist purpose
--- a/templates/commands/clarify.md
+++ b/templates/commands/clarify.md
@@ -89,7 +89,7 @@ Execution steps:
   - Information is better deferred to planning phase (note internally)

 3. Generate (internally) a prioritized queue of candidate clarification questions (maximum 5). Do NOT output them all at once. Apply these constraints:
-    - Maximum of 5 total questions across the whole session.
+    - Maximum of 10 total questions across the whole session.
    - Each question must be answerable with EITHER:
       - A short multiple‑choice selection (2–5 distinct, mutually exclusive options), OR
       - A one-word / short‑phrase answer (explicitly constrain: "Answer in <=5 words").
--- a/templates/commands/implement.md
+++ b/templates/commands/implement.md
@@ -13,40 +13,6 @@ $ARGUMENTS

 You **MUST** consider the user input before proceeding (if not empty).

-## Pre-Execution Checks
-
-**Check for extension hooks (before implementation)**:
- Check if `.specify/extensions.yml` exists in the project root.
- If it exists, read it and look for entries under the `hooks.before_implement` key
- If the YAML cannot be parsed or is invalid, skip hook checking silently and continue normally
- Filter to only hooks where `enabled: true`
- For each remaining hook, do **not** attempt to interpret or evaluate hook `condition` expressions:
-  - If the hook has no `condition` field, or it is null/empty, treat the hook as executable
-  - If the hook defines a non-empty `condition`, skip the hook and leave condition evaluation to the HookExecutor implementation
- For each executable hook, output the following based on its `optional` flag:
-  - **Optional hook** (`optional: true`):
-    ```
-    ## Extension Hooks
-
-    **Optional Pre-Hook**: {extension}
-    Command: `/{command}`
-    Description: {description}
-
-    Prompt: {prompt}
-    To execute: `/{command}`
-    ```
-  - **Mandatory hook** (`optional: false`):
-    ```
-    ## Extension Hooks
-
-    **Automatic Pre-Hook**: {extension}
-    Executing: `/{command}`
-    EXECUTE_COMMAND: {command}
-    
-    Wait for the result of the hook command before proceeding to the Outline.
-    ```
- If no hooks are registered or `.specify/extensions.yml` does not exist, skip silently
-
 ## Outline

 1. Run `{SCRIPT}` from repo root and parse FEATURE_DIR and AVAILABLE_DOCS list. All paths must be absolute. For single quotes in args like "I'm Groot", use escape syntax: e.g 'I'\''m Groot' (or double-quote if possible: "I'm Groot").
@@ -122,7 +88,7 @@ You **MUST** consider the user input before proceeding (if not empty).
   - **Rust**: `target/`, `debug/`, `release/`, `*.rs.bk`, `*.rlib`, `*.prof*`, `.idea/`, `*.log`, `.env*`
   - **Kotlin**: `build/`, `out/`, `.gradle/`, `.idea/`, `*.class`, `*.jar`, `*.iml`, `*.log`, `.env*`
   - **C++**: `build/`, `bin/`, `obj/`, `out/`, `*.o`, `*.so`, `*.a`, `*.exe`, `*.dll`, `.idea/`, `*.log`, `.env*`
-   - **C**: `build/`, `bin/`, `obj/`, `out/`, `*.o`, `*.a`, `*.so`, `*.exe`, `*.dll`, `autom4te.cache/`, `config.status`, `config.log`, `.idea/`, `*.log`, `.env*`
+   - **C**: `build/`, `bin/`, `obj/`, `out/`, `*.o`, `*.a`, `*.so`, `*.exe`, `Makefile`, `config.log`, `.idea/`, `*.log`, `.env*`
   - **Swift**: `.build/`, `DerivedData/`, `*.swiftpm/`, `Packages/`
   - **R**: `.Rproj.user/`, `.Rhistory`, `.RData`, `.Ruserdata`, `*.Rproj`, `packrat/`, `renv/`
   - **Universal**: `.DS_Store`, `Thumbs.db`, `*.tmp`, `*.swp`, `.vscode/`, `.idea/`
@@ -170,32 +136,3 @@ You **MUST** consider the user input before proceeding (if not empty).
   - Report final status with summary of completed work

 Note: This command assumes a complete task breakdown exists in tasks.md. If tasks are incomplete or missing, suggest running `/speckit.tasks` first to regenerate the task list.
-
-10. **Check for extension hooks**: After completion validation, check if `.specify/extensions.yml` exists in the project root.
-    - If it exists, read it and look for entries under the `hooks.after_implement` key
-    - If the YAML cannot be parsed or is invalid, skip hook checking silently and continue normally
-    - Filter to only hooks where `enabled: true`
-    - For each remaining hook, do **not** attempt to interpret or evaluate hook `condition` expressions:
-      - If the hook has no `condition` field, or it is null/empty, treat the hook as executable
-      - If the hook defines a non-empty `condition`, skip the hook and leave condition evaluation to the HookExecutor implementation
-    - For each executable hook, output the following based on its `optional` flag:
-      - **Optional hook** (`optional: true`):
-        ```
-        ## Extension Hooks
-
-        **Optional Hook**: {extension}
-        Command: `/{command}`
-        Description: {description}
-
-        Prompt: {prompt}
-        To execute: `/{command}`
-        ```
-      - **Mandatory hook** (`optional: false`):
-        ```
-        ## Extension Hooks
-
-        **Automatic Hook**: {extension}
-        Executing: `/{command}`
-        EXECUTE_COMMAND: {command}
-        ```
-    - If no hooks are registered or `.specify/extensions.yml` does not exist, skip silently
--- a/templates/commands/specify.md
+++ b/templates/commands/specify.md
@@ -9,8 +9,8 @@ handoffs:
    prompt: Clarify specification requirements
    send: true
 scripts:
-  sh: scripts/bash/create-new-feature.sh "{ARGS}"
-  ps: scripts/powershell/create-new-feature.ps1 "{ARGS}"
+  sh: scripts/bash/create-new-feature.sh --json "{ARGS}"
+  ps: scripts/powershell/create-new-feature.ps1 -Json "{ARGS}"
 ---

 ## User Input
@@ -39,14 +39,33 @@ Given that feature description, do this:
     - "Create a dashboard for analytics" → "analytics-dashboard"
     - "Fix payment processing timeout bug" → "fix-payment-timeout"

-2. **Create the feature branch** by running the script with `--short-name` (and `--json`), and do NOT pass `--number` (the script auto-detects the next globally available number across all branches and spec directories):
+2. **Check for existing branches before creating new one**:

-   - Bash example: `{SCRIPT} --json --short-name "user-auth" "Add user authentication"`
-   - PowerShell example: `{SCRIPT} -Json -ShortName "user-auth" "Add user authentication"`
+   a. First, fetch all remote branches to ensure we have the latest information:
+
+      ```bash
+      git fetch --all --prune
+      ```
+
+   b. Find the highest feature number across all sources for the short-name:
+      - Remote branches: `git ls-remote --heads origin | grep -E 'refs/heads/[0-9]+-<short-name>$'`
+      - Local branches: `git branch | grep -E '^[* ]*[0-9]+-<short-name>$'`
+      - Specs directories: Check for directories matching `specs/[0-9]+-<short-name>`
+
+   c. Determine the next available number:
+      - Extract all numbers from all three sources
+      - Find the highest number N
+      - Use N+1 for the new branch number
+
+   d. Run the script `{SCRIPT}` with the calculated number and short-name:
+      - Pass `--number N+1` and `--short-name "your-short-name"` along with the feature description
+      - Bash example: `{SCRIPT} --json --number 5 --short-name "user-auth" "Add user authentication"`
+      - PowerShell example: `{SCRIPT} -Json -Number 5 -ShortName "user-auth" "Add user authentication"`

   **IMPORTANT**:
-   - Do NOT pass `--number` — the script determines the correct next number automatically
-   - Always include the JSON flag (`--json` for Bash, `-Json` for PowerShell) so the output can be parsed reliably
+   - Check all three sources (remote branches, local branches, specs directories) to find the highest number
+   - Only match branches/directories with the exact short-name pattern
+   - If no existing branches/directories found with this short-name, start with number 1
   - You must only ever run this script once per feature
   - The JSON is provided in the terminal as output - always refer to it to get the actual content you're looking for
   - The JSON output will contain BRANCH_NAME and SPEC_FILE paths
@@ -129,7 +148,7 @@ Given that feature description, do this:

   c. **Handle Validation Results**:

-      - **If all items pass**: Mark checklist complete and proceed to step 7
+      - **If all items pass**: Mark checklist complete and proceed to step 6

      - **If items fail (excluding [NEEDS CLARIFICATION])**:
        1. List the failing items and specific issues
@@ -178,6 +197,8 @@ Given that feature description, do this:

 **NOTE:** The script creates and checks out the new branch and initializes the spec file before writing.

+## General Guidelines
+
 ## Quick Guidelines

 - Focus on **WHAT** users need and **WHY**.
--- a/templates/commands/tasks.md
+++ b/templates/commands/tasks.md
@@ -22,40 +22,6 @@ $ARGUMENTS

 You **MUST** consider the user input before proceeding (if not empty).

-## Pre-Execution Checks
-
-**Check for extension hooks (before tasks generation)**:
- Check if `.specify/extensions.yml` exists in the project root.
- If it exists, read it and look for entries under the `hooks.before_tasks` key
- If the YAML cannot be parsed or is invalid, skip hook checking silently and continue normally
- Filter to only hooks where `enabled: true`
- For each remaining hook, do **not** attempt to interpret or evaluate hook `condition` expressions:
-  - If the hook has no `condition` field, or it is null/empty, treat the hook as executable
-  - If the hook defines a non-empty `condition`, skip the hook and leave condition evaluation to the HookExecutor implementation
- For each executable hook, output the following based on its `optional` flag:
-  - **Optional hook** (`optional: true`):
-    ```
-    ## Extension Hooks
-
-    **Optional Pre-Hook**: {extension}
-    Command: `/{command}`
-    Description: {description}
-
-    Prompt: {prompt}
-    To execute: `/{command}`
-    ```
-  - **Mandatory hook** (`optional: false`):
-    ```
-    ## Extension Hooks
-
-    **Automatic Pre-Hook**: {extension}
-    Executing: `/{command}`
-    EXECUTE_COMMAND: {command}
-    
-    Wait for the result of the hook command before proceeding to the Outline.
-    ```
- If no hooks are registered or `.specify/extensions.yml` does not exist, skip silently
-
 ## Outline

 1. **Setup**: Run `{SCRIPT}` from repo root and parse FEATURE_DIR and AVAILABLE_DOCS list. All paths must be absolute. For single quotes in args like "I'm Groot", use escape syntax: e.g 'I'\''m Groot' (or double-quote if possible: "I'm Groot").
@@ -97,35 +63,6 @@ You **MUST** consider the user input before proceeding (if not empty).
   - Suggested MVP scope (typically just User Story 1)
   - Format validation: Confirm ALL tasks follow the checklist format (checkbox, ID, labels, file paths)

-6. **Check for extension hooks**: After tasks.md is generated, check if `.specify/extensions.yml` exists in the project root.
-   - If it exists, read it and look for entries under the `hooks.after_tasks` key
-   - If the YAML cannot be parsed or is invalid, skip hook checking silently and continue normally
-   - Filter to only hooks where `enabled: true`
-   - For each remaining hook, do **not** attempt to interpret or evaluate hook `condition` expressions:
-     - If the hook has no `condition` field, or it is null/empty, treat the hook as executable
-     - If the hook defines a non-empty `condition`, skip the hook and leave condition evaluation to the HookExecutor implementation
-   - For each executable hook, output the following based on its `optional` flag:
-     - **Optional hook** (`optional: true`):
-       ```
-       ## Extension Hooks
-
-       **Optional Hook**: {extension}
-       Command: `/{command}`
-       Description: {description}
-
-       Prompt: {prompt}
-       To execute: `/{command}`
-       ```
-     - **Mandatory hook** (`optional: false`):
-       ```
-       ## Extension Hooks
-
-       **Automatic Hook**: {extension}
-       Executing: `/{command}`
-       EXECUTE_COMMAND: {command}
-       ```
-   - If no hooks are registered or `.specify/extensions.yml` does not exist, skip silently
-
 Context for task generation: {ARGS}

 The tasks.md should be immediately executable - each task must be specific enough that an LLM can complete it without additional context.
--- a/tests/hooks/.specify/extensions.yml
+++ b/tests/hooks/.specify/extensions.yml
@@ -1,34 +0,0 @@
-hooks:
-  before_implement:
-    - id: pre_test
-      enabled: true
-      optional: false
-      extension: "test-extension"
-      command: "pre_implement_test"
-      description: "Test before implement hook execution"
-      
-  after_implement:
-    - id: post_test
-      enabled: true
-      optional: true
-      extension: "test-extension"
-      command: "post_implement_test"
-      description: "Test after implement hook execution"
-      prompt: "Would you like to run the post-implement test?"
-
-  before_tasks:
-    - id: pre_tasks_test
-      enabled: true
-      optional: false
-      extension: "test-extension"
-      command: "pre_tasks_test"
-      description: "Test before tasks hook execution"
-
-  after_tasks:
-    - id: post_tasks_test
-      enabled: true
-      optional: true
-      extension: "test-extension"
-      command: "post_tasks_test"
-      description: "Test after tasks hook execution"
-      prompt: "Would you like to run the post-tasks test?"
--- a/tests/hooks/TESTING.md
+++ b/tests/hooks/TESTING.md
@@ -1,30 +0,0 @@
-# Testing Extension Hooks
-
-This directory contains a mock project to verify that LLM agents correctly identify and execute hook commands defined in `.specify/extensions.yml`.
-
-## Test 1: Testing `before_tasks` and `after_tasks`
-
-1. Open a chat with an LLM (like GitHub Copilot) in this project.
-2. Ask it to generate tasks for the current directory:
-   > "Please follow `/speckit.tasks` for the `./tests/hooks` directory."
-3. **Expected Behavior**: 
-   - Before doing any generation, the LLM should notice the `AUTOMATIC Pre-Hook` in `.specify/extensions.yml` under `before_tasks`.
-   - It should state it is executing `EXECUTE_COMMAND: pre_tasks_test`.
-   - It should then proceed to read the `.md` docs and produce a `tasks.md`.
-   - After generation, it should output the optional `after_tasks` hook (`post_tasks_test`) block, asking if you want to run it.
-
-## Test 2: Testing `before_implement` and `after_implement`
-
-*(Requires `tasks.md` from Test 1 to exist)*
-
-1. In the same (or new) chat, ask the LLM to implement the tasks:
-   > "Please follow `/speckit.implement` for the `./tests/hooks` directory."
-2. **Expected Behavior**:
-   - The LLM should first check for `before_implement` hooks.
-   - It should state it is executing `EXECUTE_COMMAND: pre_implement_test` BEFORE doing any actual task execution.
-   - It should evaluate the checklists and execute the code writing tasks.
-   - Upon completion, it should output the optional `after_implement` hook (`post_implement_test`) block.
-
-## How it works
-
-The templates for these commands in `templates/commands/tasks.md` and `templates/commands/implement.md` contains strict ordered lists. The new `before_*` hooks are explicitly formulated in a **Pre-Execution Checks** section prior to the outline to ensure they're evaluated first without breaking template step numbers.
--- a/tests/hooks/plan.md
+++ b/tests/hooks/plan.md
@@ -1,3 +0,0 @@
-# Test Setup for Hooks
-
-This feature is designed to test if LLMs correctly invoke Spec Kit extensions hooks when generating tasks and implementing code.
--- a/tests/hooks/spec.md
+++ b/tests/hooks/spec.md
@@ -1 +0,0 @@
- **User Story 1:** I want a test script that prints "Hello hooks!".
--- a/tests/hooks/tasks.md
+++ b/tests/hooks/tasks.md
@@ -1 +0,0 @@
- [ ] T001 [US1] Create script that prints 'Hello hooks!' in hello.py
--- a/tests/test_agent_config_consistency.py
+++ b/tests/test_agent_config_consistency.py
@@ -1,235 +0,0 @@
-"""Consistency checks for agent configuration across runtime and packaging scripts."""
-
-import re
-from pathlib import Path
-
-from specify_cli import AGENT_CONFIG, AI_ASSISTANT_ALIASES, AI_ASSISTANT_HELP
-from specify_cli.extensions import CommandRegistrar
-
-
-REPO_ROOT = Path(__file__).resolve().parent.parent
-
-
-class TestAgentConfigConsistency:
-    """Ensure kiro-cli migration stays synchronized across key surfaces."""
-
-    def test_runtime_config_uses_kiro_cli_and_removes_q(self):
-        """AGENT_CONFIG should include kiro-cli and exclude legacy q."""
-        assert "kiro-cli" in AGENT_CONFIG
-        assert AGENT_CONFIG["kiro-cli"]["folder"] == ".kiro/"
-        assert AGENT_CONFIG["kiro-cli"]["commands_subdir"] == "prompts"
-        assert "q" not in AGENT_CONFIG
-
-    def test_extension_registrar_uses_kiro_cli_and_removes_q(self):
-        """Extension command registrar should target .kiro/prompts."""
-        cfg = CommandRegistrar.AGENT_CONFIGS
-
-        assert "kiro-cli" in cfg
-        assert cfg["kiro-cli"]["dir"] == ".kiro/prompts"
-        assert "q" not in cfg
-
-    def test_extension_registrar_includes_codex(self):
-        """Extension command registrar should include codex targeting .codex/prompts."""
-        cfg = CommandRegistrar.AGENT_CONFIGS
-
-        assert "codex" in cfg
-        assert cfg["codex"]["dir"] == ".codex/prompts"
-
-    def test_release_agent_lists_include_kiro_cli_and_exclude_q(self):
-        """Bash and PowerShell release scripts should agree on agent key set for Kiro."""
-        sh_text = (REPO_ROOT / ".github" / "workflows" / "scripts" / "create-release-packages.sh").read_text(encoding="utf-8")
-        ps_text = (REPO_ROOT / ".github" / "workflows" / "scripts" / "create-release-packages.ps1").read_text(encoding="utf-8")
-
-        sh_match = re.search(r"ALL_AGENTS=\(([^)]*)\)", sh_text)
-        assert sh_match is not None
-        sh_agents = sh_match.group(1).split()
-
-        ps_match = re.search(r"\$AllAgents = @\(([^)]*)\)", ps_text)
-        assert ps_match is not None
-        ps_agents = re.findall(r"'([^']+)'", ps_match.group(1))
-
-        assert "kiro-cli" in sh_agents
-        assert "kiro-cli" in ps_agents
-        assert "shai" in sh_agents
-        assert "shai" in ps_agents
-        assert "agy" in sh_agents
-        assert "agy" in ps_agents
-        assert "q" not in sh_agents
-        assert "q" not in ps_agents
-
-    def test_release_ps_switch_has_shai_and_agy_generation(self):
-        """PowerShell release builder must generate files for shai and agy agents."""
-        ps_text = (REPO_ROOT / ".github" / "workflows" / "scripts" / "create-release-packages.ps1").read_text(encoding="utf-8")
-
-        assert re.search(r"'shai'\s*\{.*?\.shai/commands", ps_text, re.S) is not None
-        assert re.search(r"'agy'\s*\{.*?\.agent/commands", ps_text, re.S) is not None
-
-    def test_release_sh_switch_has_shai_and_agy_generation(self):
-        """Bash release builder must generate files for shai and agy agents."""
-        sh_text = (REPO_ROOT / ".github" / "workflows" / "scripts" / "create-release-packages.sh").read_text(encoding="utf-8")
-
-        assert re.search(r"shai\)\s*\n.*?\.shai/commands", sh_text, re.S) is not None
-        assert re.search(r"agy\)\s*\n.*?\.agent/commands", sh_text, re.S) is not None
-
-    def test_init_ai_help_includes_roo_and_kiro_alias(self):
-        """CLI help text for --ai should stay in sync with agent config and alias guidance."""
-        assert "roo" in AI_ASSISTANT_HELP
-        for alias, target in AI_ASSISTANT_ALIASES.items():
-            assert alias in AI_ASSISTANT_HELP
-            assert target in AI_ASSISTANT_HELP
-
-    def test_devcontainer_kiro_installer_uses_pinned_checksum(self):
-        """Devcontainer installer should always verify Kiro installer via pinned SHA256."""
-        post_create_text = (REPO_ROOT / ".devcontainer" / "post-create.sh").read_text(encoding="utf-8")
-
-        assert 'KIRO_INSTALLER_SHA256="7487a65cf310b7fb59b357c4b5e6e3f3259d383f4394ecedb39acf70f307cffb"' in post_create_text
-        assert "sha256sum -c -" in post_create_text
-        assert "KIRO_SKIP_KIRO_INSTALLER_VERIFY" not in post_create_text
-
-    def test_release_output_targets_kiro_prompt_dir(self):
-        """Packaging and release scripts should no longer emit amazonq artifacts."""
-        sh_text = (REPO_ROOT / ".github" / "workflows" / "scripts" / "create-release-packages.sh").read_text(encoding="utf-8")
-        ps_text = (REPO_ROOT / ".github" / "workflows" / "scripts" / "create-release-packages.ps1").read_text(encoding="utf-8")
-        gh_release_text = (REPO_ROOT / ".github" / "workflows" / "scripts" / "create-github-release.sh").read_text(encoding="utf-8")
-
-        assert ".kiro/prompts" in sh_text
-        assert ".kiro/prompts" in ps_text
-        assert ".amazonq/prompts" not in sh_text
-        assert ".amazonq/prompts" not in ps_text
-
-        assert "spec-kit-template-kiro-cli-sh-" in gh_release_text
-        assert "spec-kit-template-kiro-cli-ps-" in gh_release_text
-        assert "spec-kit-template-q-sh-" not in gh_release_text
-        assert "spec-kit-template-q-ps-" not in gh_release_text
-
-    def test_agent_context_scripts_use_kiro_cli(self):
-        """Agent context scripts should advertise kiro-cli and not legacy q agent key."""
-        bash_text = (REPO_ROOT / "scripts" / "bash" / "update-agent-context.sh").read_text(encoding="utf-8")
-        pwsh_text = (REPO_ROOT / "scripts" / "powershell" / "update-agent-context.ps1").read_text(encoding="utf-8")
-
-        assert "kiro-cli" in bash_text
-        assert "kiro-cli" in pwsh_text
-        assert "Amazon Q Developer CLI" not in bash_text
-        assert "Amazon Q Developer CLI" not in pwsh_text
-
-    # --- Tabnine CLI consistency checks ---
-
-    def test_runtime_config_includes_tabnine(self):
-        """AGENT_CONFIG should include tabnine with correct folder and subdir."""
-        assert "tabnine" in AGENT_CONFIG
-        assert AGENT_CONFIG["tabnine"]["folder"] == ".tabnine/agent/"
-        assert AGENT_CONFIG["tabnine"]["commands_subdir"] == "commands"
-        assert AGENT_CONFIG["tabnine"]["requires_cli"] is True
-        assert AGENT_CONFIG["tabnine"]["install_url"] is not None
-
-    def test_extension_registrar_includes_tabnine(self):
-        """CommandRegistrar.AGENT_CONFIGS should include tabnine with correct TOML config."""
-        from specify_cli.extensions import CommandRegistrar
-
-        assert "tabnine" in CommandRegistrar.AGENT_CONFIGS
-        cfg = CommandRegistrar.AGENT_CONFIGS["tabnine"]
-        assert cfg["dir"] == ".tabnine/agent/commands"
-        assert cfg["format"] == "toml"
-        assert cfg["args"] == "{{args}}"
-        assert cfg["extension"] == ".toml"
-
-    def test_release_agent_lists_include_tabnine(self):
-        """Bash and PowerShell release scripts should include tabnine in agent lists."""
-        sh_text = (REPO_ROOT / ".github" / "workflows" / "scripts" / "create-release-packages.sh").read_text(encoding="utf-8")
-        ps_text = (REPO_ROOT / ".github" / "workflows" / "scripts" / "create-release-packages.ps1").read_text(encoding="utf-8")
-
-        sh_match = re.search(r"ALL_AGENTS=\(([^)]*)\)", sh_text)
-        assert sh_match is not None
-        sh_agents = sh_match.group(1).split()
-
-        ps_match = re.search(r"\$AllAgents = @\(([^)]*)\)", ps_text)
-        assert ps_match is not None
-        ps_agents = re.findall(r"'([^']+)'", ps_match.group(1))
-
-        assert "tabnine" in sh_agents
-        assert "tabnine" in ps_agents
-
-    def test_release_scripts_generate_tabnine_toml_commands(self):
-        """Release scripts should generate TOML commands for tabnine in .tabnine/agent/commands."""
-        sh_text = (REPO_ROOT / ".github" / "workflows" / "scripts" / "create-release-packages.sh").read_text(encoding="utf-8")
-        ps_text = (REPO_ROOT / ".github" / "workflows" / "scripts" / "create-release-packages.ps1").read_text(encoding="utf-8")
-
-        assert ".tabnine/agent/commands" in sh_text
-        assert ".tabnine/agent/commands" in ps_text
-        assert re.search(r"'tabnine'\s*\{.*?\.tabnine/agent/commands", ps_text, re.S) is not None
-
-    def test_github_release_includes_tabnine_packages(self):
-        """GitHub release script should include tabnine template packages."""
-        gh_release_text = (REPO_ROOT / ".github" / "workflows" / "scripts" / "create-github-release.sh").read_text(encoding="utf-8")
-
-        assert "spec-kit-template-tabnine-sh-" in gh_release_text
-        assert "spec-kit-template-tabnine-ps-" in gh_release_text
-
-    def test_agent_context_scripts_include_tabnine(self):
-        """Agent context scripts should support tabnine agent type."""
-        bash_text = (REPO_ROOT / "scripts" / "bash" / "update-agent-context.sh").read_text(encoding="utf-8")
-        pwsh_text = (REPO_ROOT / "scripts" / "powershell" / "update-agent-context.ps1").read_text(encoding="utf-8")
-
-        assert "tabnine" in bash_text
-        assert "TABNINE_FILE" in bash_text
-        assert "tabnine" in pwsh_text
-        assert "TABNINE_FILE" in pwsh_text
-
-    def test_ai_help_includes_tabnine(self):
-        """CLI help text for --ai should include tabnine."""
-        assert "tabnine" in AI_ASSISTANT_HELP
-
-    # --- Kimi Code CLI consistency checks ---
-
-    def test_kimi_in_agent_config(self):
-        """AGENT_CONFIG should include kimi with correct folder and commands_subdir."""
-        assert "kimi" in AGENT_CONFIG
-        assert AGENT_CONFIG["kimi"]["folder"] == ".kimi/"
-        assert AGENT_CONFIG["kimi"]["commands_subdir"] == "skills"
-        assert AGENT_CONFIG["kimi"]["requires_cli"] is True
-
-    def test_kimi_in_extension_registrar(self):
-        """Extension command registrar should include kimi using .kimi/skills and SKILL.md."""
-        cfg = CommandRegistrar.AGENT_CONFIGS
-
-        assert "kimi" in cfg
-        kimi_cfg = cfg["kimi"]
-        assert kimi_cfg["dir"] == ".kimi/skills"
-        assert kimi_cfg["extension"] == "/SKILL.md"
-
-    def test_kimi_in_release_agent_lists(self):
-        """Bash and PowerShell release scripts should include kimi in agent lists."""
-        sh_text = (REPO_ROOT / ".github" / "workflows" / "scripts" / "create-release-packages.sh").read_text(encoding="utf-8")
-        ps_text = (REPO_ROOT / ".github" / "workflows" / "scripts" / "create-release-packages.ps1").read_text(encoding="utf-8")
-
-        sh_match = re.search(r"ALL_AGENTS=\(([^)]*)\)", sh_text)
-        assert sh_match is not None
-        sh_agents = sh_match.group(1).split()
-
-        ps_match = re.search(r"\$AllAgents = @\(([^)]*)\)", ps_text)
-        assert ps_match is not None
-        ps_agents = re.findall(r"'([^']+)'", ps_match.group(1))
-
-        assert "kimi" in sh_agents
-        assert "kimi" in ps_agents
-
-    def test_kimi_in_powershell_validate_set(self):
-        """PowerShell update-agent-context script should include 'kimi' in ValidateSet."""
-        ps_text = (REPO_ROOT / "scripts" / "powershell" / "update-agent-context.ps1").read_text(encoding="utf-8")
-
-        validate_set_match = re.search(r"\[ValidateSet\(([^)]*)\)\]", ps_text)
-        assert validate_set_match is not None
-        validate_set_values = re.findall(r"'([^']+)'", validate_set_match.group(1))
-
-        assert "kimi" in validate_set_values
-
-    def test_kimi_in_github_release_output(self):
-        """GitHub release script should include kimi template packages."""
-        gh_release_text = (REPO_ROOT / ".github" / "workflows" / "scripts" / "create-github-release.sh").read_text(encoding="utf-8")
-
-        assert "spec-kit-template-kimi-sh-" in gh_release_text
-        assert "spec-kit-template-kimi-ps-" in gh_release_text
-
-    def test_ai_help_includes_kimi(self):
-        """CLI help text for --ai should include kimi."""
-        assert "kimi" in AI_ASSISTANT_HELP
--- a/tests/test_ai_skills.py
+++ b/tests/test_ai_skills.py
@@ -132,16 +132,6 @@ def commands_dir_gemini(project_dir):
    return cmd_dir


-@pytest.fixture
-def commands_dir_qwen(project_dir):
-    """Create a populated .qwen/commands directory (Markdown format)."""
-    cmd_dir = project_dir / ".qwen" / "commands"
-    cmd_dir.mkdir(parents=True, exist_ok=True)
-    for name in ["speckit.specify.md", "speckit.plan.md", "speckit.tasks.md"]:
-        (cmd_dir / name).write_text(f"# {name}\nContent here\n")
-    return cmd_dir
-
-
 # ===== _get_skills_dir Tests =====

 class TestGetSkillsDir:
@@ -157,11 +147,6 @@ class TestGetSkillsDir:
        result = _get_skills_dir(project_dir, "gemini")
        assert result == project_dir / ".gemini" / "skills"

-    def test_tabnine_skills_dir(self, project_dir):
-        """Tabnine should use .tabnine/agent/skills/."""
-        result = _get_skills_dir(project_dir, "tabnine")
-        assert result == project_dir / ".tabnine" / "agent" / "skills"
-
    def test_copilot_skills_dir(self, project_dir):
        """Copilot should use .github/skills/."""
        result = _get_skills_dir(project_dir, "copilot")
@@ -177,11 +162,6 @@ class TestGetSkillsDir:
        result = _get_skills_dir(project_dir, "cursor-agent")
        assert result == project_dir / ".cursor" / "skills"

-    def test_kiro_cli_skills_dir(self, project_dir):
-        """Kiro CLI should use .kiro/skills/."""
-        result = _get_skills_dir(project_dir, "kiro-cli")
-        assert result == project_dir / ".kiro" / "skills"
-
    def test_unknown_agent_uses_default(self, project_dir):
        """Unknown agents should fall back to DEFAULT_SKILLS_DIR."""
        result = _get_skills_dir(project_dir, "nonexistent-agent")
@@ -400,28 +380,6 @@ class TestInstallAiSkills:
        # .toml commands should be untouched
        assert (cmds_dir / "speckit.specify.toml").exists()

-    def test_qwen_md_commands_dir_installs_skills(self, project_dir):
-        """Qwen now uses Markdown format; skills should install directly from .qwen/commands/."""
-        cmds_dir = project_dir / ".qwen" / "commands"
-        cmds_dir.mkdir(parents=True)
-        (cmds_dir / "speckit.specify.md").write_text(
-            "---\ndescription: Create or update the feature specification.\n---\n\n# Specify\n\nBody.\n"
-        )
-        (cmds_dir / "speckit.plan.md").write_text(
-            "---\ndescription: Generate implementation plan.\n---\n\n# Plan\n\nBody.\n"
-        )
-
-        result = install_ai_skills(project_dir, "qwen")
-
-        assert result is True
-        skills_dir = project_dir / ".qwen" / "skills"
-        assert skills_dir.exists()
-        skill_dirs = [d.name for d in skills_dir.iterdir() if d.is_dir()]
-        assert len(skill_dirs) >= 1
-        # .md commands should be untouched
-        assert (cmds_dir / "speckit.specify.md").exists()
-        assert (cmds_dir / "speckit.plan.md").exists()
-
    @pytest.mark.parametrize("agent_key", [k for k in AGENT_CONFIG.keys() if k != "generic"])
    def test_skills_install_for_all_agents(self, temp_dir, agent_key):
        """install_ai_skills should produce skills for every configured agent."""
@@ -442,11 +400,8 @@ class TestInstallAiSkills:
        skills_dir = _get_skills_dir(proj, agent_key)
        assert skills_dir.exists()
        skill_dirs = [d.name for d in skills_dir.iterdir() if d.is_dir()]
-        # Kimi uses dot-separator (speckit.specify) to match /skill:speckit.* invocation;
-        # all other agents use hyphen-separator (speckit-specify).
-        expected_skill_name = "speckit.specify" if agent_key == "kimi" else "speckit-specify"
-        assert expected_skill_name in skill_dirs
-        assert (skills_dir / expected_skill_name / "SKILL.md").exists()
+        assert "speckit-specify" in skill_dirs
+        assert (skills_dir / "speckit-specify" / "SKILL.md").exists()



@@ -478,15 +433,6 @@ class TestCommandCoexistence:
        remaining = list(commands_dir_gemini.glob("speckit.*"))
        assert len(remaining) == 3

-    def test_existing_commands_preserved_qwen(self, project_dir, templates_dir, commands_dir_qwen):
-        """install_ai_skills must NOT remove pre-existing .qwen/commands files."""
-        assert len(list(commands_dir_qwen.glob("speckit.*"))) == 3
-
-        install_ai_skills(project_dir, "qwen")
-
-        remaining = list(commands_dir_qwen.glob("speckit.*"))
-        assert len(remaining) == 3
-
    def test_commands_dir_not_removed(self, project_dir, templates_dir, commands_dir_claude):
        """install_ai_skills must not remove the commands directory."""
        install_ai_skills(project_dir, "claude")
@@ -514,9 +460,8 @@ class TestNewProjectCommandSkip:
        """Simulate template extraction: create agent commands dir."""
        agent_cfg = AGENT_CONFIG.get(agent, {})
        agent_folder = agent_cfg.get("folder", "")
-        commands_subdir = agent_cfg.get("commands_subdir", "commands")
        if agent_folder:
-            cmds_dir = project_path / agent_folder.rstrip("/") / commands_subdir
+            cmds_dir = project_path / agent_folder.rstrip("/") / "commands"
            cmds_dir.mkdir(parents=True, exist_ok=True)
            (cmds_dir / "speckit.specify.md").write_text("# spec")

@@ -538,7 +483,6 @@ class TestNewProjectCommandSkip:
             patch("specify_cli.shutil.which", return_value="/usr/bin/git"):
            result = runner.invoke(app, ["init", str(target), "--ai", "claude", "--ai-skills", "--script", "sh", "--no-git"])

-        assert result.exit_code == 0
        # Skills should have been called
        mock_skills.assert_called_once()

@@ -546,30 +490,6 @@ class TestNewProjectCommandSkip:
        cmds_dir = target / ".claude" / "commands"
        assert not cmds_dir.exists()

-    def test_new_project_nonstandard_commands_subdir_removed_after_skills_succeed(self, tmp_path):
-        """For non-standard agents, configured commands_subdir should be removed on success."""
-        from typer.testing import CliRunner
-
-        runner = CliRunner()
-        target = tmp_path / "new-kiro-proj"
-
-        def fake_download(project_path, *args, **kwargs):
-            self._fake_extract("kiro-cli", project_path)
-
-        with patch("specify_cli.download_and_extract_template", side_effect=fake_download), \
-             patch("specify_cli.ensure_executable_scripts"), \
-             patch("specify_cli.ensure_constitution_from_template"), \
-             patch("specify_cli.install_ai_skills", return_value=True) as mock_skills, \
-             patch("specify_cli.is_git_repo", return_value=False), \
-             patch("specify_cli.shutil.which", return_value="/usr/bin/git"):
-            result = runner.invoke(app, ["init", str(target), "--ai", "kiro-cli", "--ai-skills", "--script", "sh", "--no-git"])
-
-        assert result.exit_code == 0
-        mock_skills.assert_called_once()
-
-        prompts_dir = target / ".kiro" / "prompts"
-        assert not prompts_dir.exists()
-
    def test_commands_preserved_when_skills_fail(self, tmp_path):
        """If skills fail, commands should NOT be removed (safety net)."""
        from typer.testing import CliRunner
@@ -588,7 +508,6 @@ class TestNewProjectCommandSkip:
             patch("specify_cli.shutil.which", return_value="/usr/bin/git"):
            result = runner.invoke(app, ["init", str(target), "--ai", "claude", "--ai-skills", "--script", "sh", "--no-git"])

-        assert result.exit_code == 0
        # Commands should still exist since skills failed
        cmds_dir = target / ".claude" / "commands"
        assert cmds_dir.exists()
@@ -619,9 +538,8 @@ class TestNewProjectCommandSkip:
             patch("specify_cli.install_ai_skills", return_value=True), \
             patch("specify_cli.is_git_repo", return_value=True), \
             patch("specify_cli.shutil.which", return_value="/usr/bin/git"):
-            result = runner.invoke(app, ["init", "--here", "--ai", "claude", "--ai-skills", "--script", "sh", "--no-git"], input="y\n")
+            result = runner.invoke(app, ["init", "--here", "--ai", "claude", "--ai-skills", "--script", "sh", "--no-git"])

-        assert result.exit_code == 0
        # Commands must remain for --here
        assert cmds_dir.exists()
        assert (cmds_dir / "speckit.specify.md").exists()
@@ -702,59 +620,6 @@ class TestCliValidation:
        assert "Usage:" in result.output
        assert "--ai" in result.output

-    def test_agy_without_ai_skills_fails(self):
-        """--ai agy without --ai-skills should fail with exit code 1."""
-        from typer.testing import CliRunner
-
-        runner = CliRunner()
-        result = runner.invoke(app, ["init", "test-proj", "--ai", "agy"])
-
-        assert result.exit_code == 1
-        assert "Explicit command support was deprecated in Antigravity version 1.20.5." in result.output
-        assert "--ai-skills" in result.output
-
-    def test_interactive_agy_without_ai_skills_prompts_skills(self, monkeypatch):
-        """Interactive selector returning agy without --ai-skills should automatically enable --ai-skills."""
-        from typer.testing import CliRunner
-
-        # Mock select_with_arrows to simulate the user picking 'agy' for AI,
-        # and return a deterministic default for any other prompts to avoid
-        # calling the real interactive implementation.
-        def _fake_select_with_arrows(*args, **kwargs):
-            options = kwargs.get("options")
-            if options is None and len(args) >= 1:
-                options = args[0]
-
-            # If the options include 'agy', simulate selecting it.
-            if isinstance(options, dict) and "agy" in options:
-                return "agy"
-            if isinstance(options, (list, tuple)) and "agy" in options:
-                return "agy"
-
-            # For any other prompt, return a deterministic, non-interactive default:
-            # pick the first option if available.
-            if isinstance(options, dict) and options:
-                return next(iter(options.keys()))
-            if isinstance(options, (list, tuple)) and options:
-                return options[0]
-
-            # If no options are provided, fall back to None (should not occur in normal use).
-            return None
-
-        monkeypatch.setattr("specify_cli.select_with_arrows", _fake_select_with_arrows)
-        
-        # Mock download_and_extract_template to prevent real HTTP downloads during testing
-        monkeypatch.setattr("specify_cli.download_and_extract_template", lambda *args, **kwargs: None)
-        # We need to bypass the `git init` step, wait, it has `--no-git` by default in tests maybe?
-        runner = CliRunner()
-        # Create temp dir to avoid directory already exists errors or whatever
-        with runner.isolated_filesystem():
-            result = runner.invoke(app, ["init", "test-proj", "--no-git"])
-
-            # Interactive selection should NOT raise the deprecation error!
-            assert result.exit_code == 0
-            assert "Explicit command support was deprecated" not in result.output
-
    def test_ai_skills_flag_appears_in_help(self):
        """--ai-skills should appear in init --help output."""
        from typer.testing import CliRunner
@@ -766,42 +631,6 @@ class TestCliValidation:
        assert "--ai-skills" in plain
        assert "agent skills" in plain.lower()

-    def test_kiro_alias_normalized_to_kiro_cli(self, tmp_path):
-        """--ai kiro should normalize to canonical kiro-cli agent key."""
-        from typer.testing import CliRunner
-
-        runner = CliRunner()
-        target = tmp_path / "kiro-alias-proj"
-
-        with patch("specify_cli.download_and_extract_template") as mock_download, \
-             patch("specify_cli.ensure_executable_scripts"), \
-             patch("specify_cli.ensure_constitution_from_template"), \
-             patch("specify_cli.is_git_repo", return_value=False), \
-             patch("specify_cli.shutil.which", return_value="/usr/bin/git"):
-            result = runner.invoke(
-                app,
-                [
-                    "init",
-                    str(target),
-                    "--ai",
-                    "kiro",
-                    "--ignore-agent-tools",
-                    "--script",
-                    "sh",
-                    "--no-git",
-                ],
-            )
-
-        assert result.exit_code == 0
-        assert mock_download.called
-        # download_and_extract_template(project_path, ai_assistant, script_type, ...)
-        assert mock_download.call_args.args[1] == "kiro-cli"
-
-    def test_q_removed_from_agent_config(self):
-        """Amazon Q legacy key should not remain in AGENT_CONFIG."""
-        assert "q" not in AGENT_CONFIG
-        assert "kiro-cli" in AGENT_CONFIG
-

 class TestParameterOrderingIssue:
    """Test fix for GitHub issue #1641: parameter ordering issues."""
--- a/tests/test_cursor_frontmatter.py
+++ b/tests/test_cursor_frontmatter.py
@@ -1,263 +0,0 @@
-"""
-Tests for Cursor .mdc frontmatter generation (issue #669).
-
-Verifies that update-agent-context.sh properly prepends YAML frontmatter
-to .mdc files so that Cursor IDE auto-includes the rules.
-"""
-
-import os
-import shutil
-import subprocess
-import textwrap
-
-import pytest
-
-SCRIPT_PATH = os.path.join(
-    os.path.dirname(__file__),
-    os.pardir,
-    "scripts",
-    "bash",
-    "update-agent-context.sh",
-)
-
-EXPECTED_FRONTMATTER_LINES = [
-    "---",
-    "description: Project Development Guidelines",
-    'globs: ["**/*"]',
-    "alwaysApply: true",
-    "---",
-]
-
-requires_git = pytest.mark.skipif(
-    shutil.which("git") is None,
-    reason="git is not installed",
-)
-
-
-class TestScriptFrontmatterPattern:
-    """Static analysis — no git required."""
-
-    def test_create_new_has_mdc_frontmatter_logic(self):
-        """create_new_agent_file() must contain .mdc frontmatter logic."""
-        with open(SCRIPT_PATH, encoding="utf-8") as f:
-            content = f.read()
-        assert 'if [[ "$target_file" == *.mdc ]]' in content
-        assert "alwaysApply: true" in content
-
-    def test_update_existing_has_mdc_frontmatter_logic(self):
-        """update_existing_agent_file() must also handle .mdc frontmatter."""
-        with open(SCRIPT_PATH, encoding="utf-8") as f:
-            content = f.read()
-        # There should be two occurrences of the .mdc check — one per function
-        occurrences = content.count('if [[ "$target_file" == *.mdc ]]')
-        assert occurrences >= 2, (
-            f"Expected at least 2 .mdc frontmatter checks, found {occurrences}"
-        )
-
-    def test_powershell_script_has_mdc_frontmatter_logic(self):
-        """PowerShell script must also handle .mdc frontmatter."""
-        ps_path = os.path.join(
-            os.path.dirname(__file__),
-            os.pardir,
-            "scripts",
-            "powershell",
-            "update-agent-context.ps1",
-        )
-        with open(ps_path, encoding="utf-8") as f:
-            content = f.read()
-        assert "alwaysApply: true" in content
-        occurrences = content.count(r"\.mdc$")
-        assert occurrences >= 2, (
-            f"Expected at least 2 .mdc frontmatter checks in PS script, found {occurrences}"
-        )
-
-
-@requires_git
-class TestCursorFrontmatterIntegration:
-    """Integration tests using a real git repo."""
-
-    @pytest.fixture
-    def git_repo(self, tmp_path):
-        """Create a minimal git repo with the spec-kit structure."""
-        repo = tmp_path / "repo"
-        repo.mkdir()
-
-        # Init git repo
-        subprocess.run(
-            ["git", "init"], cwd=str(repo), capture_output=True, check=True
-        )
-        subprocess.run(
-            ["git", "config", "user.email", "test@test.com"],
-            cwd=str(repo),
-            capture_output=True,
-            check=True,
-        )
-        subprocess.run(
-            ["git", "config", "user.name", "Test"],
-            cwd=str(repo),
-            capture_output=True,
-            check=True,
-        )
-
-        # Create .specify dir with config
-        specify_dir = repo / ".specify"
-        specify_dir.mkdir()
-        (specify_dir / "config.yaml").write_text(
-            textwrap.dedent("""\
-                project_type: webapp
-                language: python
-                framework: fastapi
-                database: N/A
-            """)
-        )
-
-        # Create template
-        templates_dir = specify_dir / "templates"
-        templates_dir.mkdir()
-        (templates_dir / "agent-file-template.md").write_text(
-            "# [PROJECT NAME] Development Guidelines\n\n"
-            "Auto-generated from all feature plans. Last updated: [DATE]\n\n"
-            "## Active Technologies\n\n"
-            "[EXTRACTED FROM ALL PLAN.MD FILES]\n\n"
-            "## Project Structure\n\n"
-            "[ACTUAL STRUCTURE FROM PLANS]\n\n"
-            "## Development Commands\n\n"
-            "[ONLY COMMANDS FOR ACTIVE TECHNOLOGIES]\n\n"
-            "## Coding Conventions\n\n"
-            "[LANGUAGE-SPECIFIC, ONLY FOR LANGUAGES IN USE]\n\n"
-            "## Recent Changes\n\n"
-            "[LAST 3 FEATURES AND WHAT THEY ADDED]\n"
-        )
-
-        # Create initial commit
-        subprocess.run(
-            ["git", "add", "-A"], cwd=str(repo), capture_output=True, check=True
-        )
-        subprocess.run(
-            ["git", "commit", "-m", "init"],
-            cwd=str(repo),
-            capture_output=True,
-            check=True,
-        )
-
-        # Create a feature branch so CURRENT_BRANCH detection works
-        subprocess.run(
-            ["git", "checkout", "-b", "001-test-feature"],
-            cwd=str(repo),
-            capture_output=True,
-            check=True,
-        )
-
-        # Create a spec so the script detects the feature
-        spec_dir = repo / "specs" / "001-test-feature"
-        spec_dir.mkdir(parents=True)
-        (spec_dir / "plan.md").write_text(
-            "# Test Feature Plan\n\n"
-            "## Technology Stack\n\n"
-            "- Language: Python\n"
-            "- Framework: FastAPI\n"
-        )
-
-        return repo
-
-    def _run_update(self, repo, agent_type="cursor-agent"):
-        """Run update-agent-context.sh for a specific agent type."""
-        script = os.path.abspath(SCRIPT_PATH)
-        result = subprocess.run(
-            ["bash", script, agent_type],
-            cwd=str(repo),
-            capture_output=True,
-            text=True,
-            timeout=30,
-        )
-        return result
-
-    def test_new_mdc_file_has_frontmatter(self, git_repo):
-        """Creating a new .mdc file must include YAML frontmatter."""
-        result = self._run_update(git_repo)
-        assert result.returncode == 0, f"Script failed: {result.stderr}"
-
-        mdc_file = git_repo / ".cursor" / "rules" / "specify-rules.mdc"
-        assert mdc_file.exists(), "Cursor .mdc file was not created"
-
-        content = mdc_file.read_text()
-        lines = content.splitlines()
-
-        # First line must be the opening ---
-        assert lines[0] == "---", f"Expected frontmatter start, got: {lines[0]}"
-
-        # Check all frontmatter lines are present
-        for expected in EXPECTED_FRONTMATTER_LINES:
-            assert expected in content, f"Missing frontmatter line: {expected}"
-
-        # Content after frontmatter should be the template content
-        assert "Development Guidelines" in content
-
-    def test_existing_mdc_without_frontmatter_gets_it_added(self, git_repo):
-        """Updating an existing .mdc file that lacks frontmatter must add it."""
-        # First, create the file WITHOUT frontmatter (simulating pre-fix state)
-        cursor_dir = git_repo / ".cursor" / "rules"
-        cursor_dir.mkdir(parents=True, exist_ok=True)
-        mdc_file = cursor_dir / "specify-rules.mdc"
-        mdc_file.write_text(
-            "# repo Development Guidelines\n\n"
-            "Auto-generated from all feature plans. Last updated: 2025-01-01\n\n"
-            "## Active Technologies\n\n"
-            "- Python + FastAPI (main)\n\n"
-            "## Recent Changes\n\n"
-            "- main: Added Python + FastAPI\n"
-        )
-
-        result = self._run_update(git_repo)
-        assert result.returncode == 0, f"Script failed: {result.stderr}"
-
-        content = mdc_file.read_text()
-        lines = content.splitlines()
-
-        assert lines[0] == "---", f"Expected frontmatter start, got: {lines[0]}"
-        for expected in EXPECTED_FRONTMATTER_LINES:
-            assert expected in content, f"Missing frontmatter line: {expected}"
-
-    def test_existing_mdc_with_frontmatter_not_duplicated(self, git_repo):
-        """Updating an .mdc file that already has frontmatter must not duplicate it."""
-        cursor_dir = git_repo / ".cursor" / "rules"
-        cursor_dir.mkdir(parents=True, exist_ok=True)
-        mdc_file = cursor_dir / "specify-rules.mdc"
-
-        frontmatter = (
-            "---\n"
-            "description: Project Development Guidelines\n"
-            'globs: ["**/*"]\n'
-            "alwaysApply: true\n"
-            "---\n\n"
-        )
-        body = (
-            "# repo Development Guidelines\n\n"
-            "Auto-generated from all feature plans. Last updated: 2025-01-01\n\n"
-            "## Active Technologies\n\n"
-            "- Python + FastAPI (main)\n\n"
-            "## Recent Changes\n\n"
-            "- main: Added Python + FastAPI\n"
-        )
-        mdc_file.write_text(frontmatter + body)
-
-        result = self._run_update(git_repo)
-        assert result.returncode == 0, f"Script failed: {result.stderr}"
-
-        content = mdc_file.read_text()
-        # Count occurrences of the frontmatter delimiter
-        assert content.count("alwaysApply: true") == 1, (
-            "Frontmatter was duplicated"
-        )
-
-    def test_non_mdc_file_has_no_frontmatter(self, git_repo):
-        """Non-.mdc agent files (e.g., Claude) must NOT get frontmatter."""
-        result = self._run_update(git_repo, agent_type="claude")
-        assert result.returncode == 0, f"Script failed: {result.stderr}"
-
-        claude_file = git_repo / ".claude" / "CLAUDE.md"
-        if claude_file.exists():
-            content = claude_file.read_text()
-            assert not content.startswith("---"), (
-                "Non-mdc file should not have frontmatter"
-            )
--- a/tests/test_extensions.py
+++ b/tests/test_extensions.py
				`@@ -1 +0,0 @@`
				`- User Story 1: I want a test script that prints "Hello hooks!".`
				`@@ -1 +0,0 @@`
				`- [ ] T001 [US1] Create script that prints 'Hello hooks!' in hello.py`