Initial plan

.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"
 	],

.devcontainer/post-create.sh

@@ -51,33 +51,32 @@ echo -e "\n🤖 Installing OpenCode CLI..."
 run_command "npm install -g opencode-ai@latest"
 echo "✅ Done"
 
-echo -e "\n🤖 Installing Kiro CLI..."
+echo -e "\n🤖 Installing Amazon Q CLI..."
-# https://kiro.dev/docs/cli/
+# 👉🏾 https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/command-line-verify-download.html
-KIRO_INSTALLER_URL="https://cli.kiro.dev/install"
-KIRO_INSTALLER_SHA256="7487a65cf310b7fb59b357c4b5e6e3f3259d383f4394ecedb39acf70f307cffb"
-KIRO_INSTALLER_PATH="$(mktemp)"
 
-cleanup_kiro_installer() {
+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'"
-  rm -f "$KIRO_INSTALLER_PATH"
+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'
-trap cleanup_kiro_installer EXIT
+-----BEGIN PGP PUBLIC KEY BLOCK-----
 
-run_command "curl -fsSL \"$KIRO_INSTALLER_URL\" -o \"$KIRO_INSTALLER_PATH\""
+mDMEZig60RYJKwYBBAHaRw8BAQdAy/+G05U5/EOA72WlcD4WkYn5SInri8pc4Z6D
-run_command "echo \"$KIRO_INSTALLER_SHA256  $KIRO_INSTALLER_PATH\" | sha256sum -c -"
+BKNNGOm0JEFtYXpvbiBRIENMSSBUZWFtIDxxLWNsaUBhbWF6b24uY29tPoiZBBMW
-
+CgBBFiEEmvYEF+gnQskUPgPsUNx6jcJMVmcFAmYoOtECGwMFCQPCZwAFCwkIBwIC
-run_command "bash \"$KIRO_INSTALLER_PATH\""
+IgIGFQoJCAsCBBYCAwECHgcCF4AACgkQUNx6jcJMVmef5QD/QWWEGG/cOnbDnp68
-
+SJXuFkwiNwlH2rPw9ZRIQMnfAS0A/0V6ZsGB4kOylBfc7CNfzRFGtovdBBgHqA6P
-kiro_binary=""
+zQ/PNscGuDgEZig60RIKKwYBBAGXVQEFAQEHQC4qleONMBCq3+wJwbZSr0vbuRba
-if command -v kiro-cli >/dev/null 2>&1; then
+D1xr4wUPn4Avn4AnAwEIB4h+BBgWCgAmFiEEmvYEF+gnQskUPgPsUNx6jcJMVmcF
-  kiro_binary="kiro-cli"
+AmYoOtECGwwFCQPCZwAACgkQUNx6jcJMVmchMgEA6l3RveCM0YHAGQaSFMkguoAo
-elif command -v kiro >/dev/null 2>&1; then
+vK6FgOkDawgP0NPIP2oA/jIAO4gsAntuQgMOsPunEdDeji2t+AhV02+DQIsXZpoB
-  kiro_binary="kiro"
+=f8yY
-else
+-----END PGP PUBLIC KEY BLOCK-----
-  echo -e "\033[0;31m[ERROR] Kiro CLI installation did not create 'kiro-cli' or 'kiro' in PATH.\033[0m" >&2
+EOF
-  exit 1
+run_command "gpg --batch --import amazonq-public-key.asc"
-fi
+run_command "gpg --verify q.zip.sig q.zip"
-
+run_command "unzip -q q.zip"
-run_command "$kiro_binary --help > /dev/null"
+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..."

.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

.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

.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

.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+.

.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
 

.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

.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"

.github/workflows/release.yml

@@ -2,60 +2,68 @@ name: Create Release
 
 on:
   push:
-    tags:
+    branches: [ main ]
-      - 'v*'
+    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: Get latest tag
-      - name: Extract version from tag
+        id: get_tag
-        id: version
         run: |
-          VERSION=${GITHUB_REF#refs/tags/}
+          chmod +x .github/workflows/scripts/get-next-version.sh
-          echo "tag=$VERSION" >> $GITHUB_OUTPUT
+          .github/workflows/scripts/get-next-version.sh
-          echo "Building release for $VERSION"
-
       - 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
+          .github/workflows/scripts/generate-release-notes.sh ${{ steps.get_tag.outputs.new_version }} ${{ steps.get_tag.outputs.latest_tag }}
-          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"
-
       - 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
 

.github/workflows/scripts/create-github-release.sh

@@ -46,8 +46,8 @@ 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-kiro-cli-sh-"$VERSION".zip \
+  .genreleases/spec-kit-template-q-sh-"$VERSION".zip \
-  .genreleases/spec-kit-template-kiro-cli-ps-"$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 \

.github/workflows/scripts/create-release-packages.ps1

@@ -14,7 +14,7 @@
 
 .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, agy, 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)
@@ -335,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' {
+        'q' {
-            $cmdDir = Join-Path $baseDir ".kiro/prompts"
+            $cmdDir = Join-Path $baseDir ".amazonq/prompts"
-            Generate-Commands -Agent 'kiro-cli' -Extension 'md' -ArgFormat '$ARGUMENTS' -OutputDir $cmdDir -ScriptVariant $Script
+            Generate-Commands -Agent 'q' -Extension 'md' -ArgFormat '$ARGUMENTS' -OutputDir $cmdDir -ScriptVariant $Script
         }
         'bob' {
             $cmdDir = Join-Path $baseDir ".bob/commands"
@@ -347,21 +347,10 @@ 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
-        }
-        'agy' {
-            $cmdDir = Join-Path $baseDir ".agent/workflows"
-            Generate-Commands -Agent 'agy' -Extension 'md' -ArgFormat '$ARGUMENTS' -OutputDir $cmdDir -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
@@ -371,7 +360,7 @@ 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', 'agy', '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 {

.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 kiro-cli agy bob qodercli 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
@@ -212,9 +212,9 @@ build_variant() {
     shai)
       mkdir -p "$base_dir/.shai/commands"
       generate_commands shai md "\$ARGUMENTS" "$base_dir/.shai/commands" "$script" ;;
-    kiro-cli)
+    q)
-      mkdir -p "$base_dir/.kiro/prompts"
+      mkdir -p "$base_dir/.amazonq/prompts"
-      generate_commands kiro-cli md "\$ARGUMENTS" "$base_dir/.kiro/prompts" "$script" ;;
+      generate_commands q md "\$ARGUMENTS" "$base_dir/.amazonq/prompts" "$script" ;;
     agy)
       mkdir -p "$base_dir/.agent/workflows"
       generate_commands agy md "\$ARGUMENTS" "$base_dir/.agent/workflows" "$script" ;;
@@ -230,7 +230,7 @@ build_variant() {
 }
 
 # Determine agent list
-ALL_AGENTS=(claude gemini copilot cursor-agent qwen opencode windsurf codex kilocode auggie roo codebuddy amp shai kiro-cli agy bob qodercli 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() {
@@ -277,3 +277,4 @@ done
 
 echo "Archives in $GENRELEASES_DIR:"
 ls -1 "$GENRELEASES_DIR"/spec-kit-template-*-"${NEW_VERSION}".zip
+

.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 ""

.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 }}
 

AGENTS.md

@@ -44,7 +44,7 @@ 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                    |
 | **IBM Bob**                | `.bob/commands/`       | Markdown | N/A (IDE-based) | IBM Bob IDE                 |
@@ -86,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, agy), `"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
@@ -96,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.
@@ -117,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
@@ -317,7 +317,7 @@ 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
@@ -335,7 +335,7 @@ Work within integrated development environments:
 
 ### Markdown Format
 
-Used by: Claude, Cursor, opencode, Windsurf, Kiro CLI, Amp, SHAI, IBM Bob
+Used by: Claude, Cursor, opencode, Windsurf, Amazon Q Developer, Amp, SHAI, IBM Bob
 
 **Standard format:**
 

CHANGELOG.md

@@ -7,82 +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.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

README.md

@@ -144,7 +144,7 @@ Want to see Spec Kit in action? Watch our [video overview](https://www.youtube.c
 | 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)                                 | ✅      |                                                                                                                                           |
@@ -173,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`) |
+| `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`, 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                                                                                                                                              |
@@ -210,9 +210,6 @@ 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
 
@@ -396,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, or Kiro 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:
+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

extensions/EXTENSION-DEVELOPMENT-GUIDE.md

@@ -456,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`
+2. **Add entry** to `extensions/catalog.json`
-3. **Update** `extensions/README.md` with your extension
+3. **Create PR**
-4. **Create PR** following the [Extension Publishing Guide](EXTENSION-PUBLISHING-GUIDE.md)
+4. **After merge**, users can install with:
-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)
 
-See the [Extension Publishing Guide](EXTENSION-PUBLISHING-GUIDE.md) for detailed submission instructions.
+   ```bash
+   specify extension add my-ext  # No URL needed!
+   ```
 
 ---
 

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
+### 3. Submit Pull Request
-
-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
 
 ```bash
 # Create a branch
 git checkout -b add-your-extension
 
 # Commit your changes
-git add extensions/catalog.community.json extensions/README.md
+git add extensions/catalog.json
-git commit -m "Add your-extension to community catalog
+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:

extensions/EXTENSION-USER-GUIDE.md

@@ -76,15 +76,13 @@ vim .specify/extensions/jira/jira-config.yml
 
 ## Finding Extensions
 
-**Note**: By default, `specify extension search` uses your organization's catalog (`catalog.json`). If the catalog is empty, you won't see any results. See [Extension Catalogs](#extension-catalogs) to learn how to populate your catalog from the community reference catalog.
-
 ### Browse All Extensions
 
 ```bash
 specify extension search
 ```
 
-Shows all extensions in your organization's catalog.
+Shows all available extensions in the catalog.
 
 ### Search by Keyword
 
@@ -417,15 +415,11 @@ export SPECKIT_CATALOG_URL="https://example.com/staging/catalog.json"
 
 ---
 
-## Extension Catalogs
-
-For information about how Spec Kit's dual-catalog system works (`catalog.json` vs `catalog.community.json`), see the main [Extensions README](README.md#extension-catalogs).
-
 ## Organization Catalog Customization
 
-### Why Customize Your Catalog
+### Why the Default Catalog is Empty
 
-Organizations customize their `catalog.json` 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

extensions/README.md

@@ -1,123 +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
+## Available Extensions
-
-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):
 
 | Extension | Purpose | URL |
 |-----------|---------|-----|
-| 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) |
-| 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) |
-| 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) |
 | 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
+See the [Extension Publishing Guide](EXTENSION-PUBLISHING-GUIDE.md) for instructions on how to submit your extension to the community catalog.
-
-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).

extensions/RFC-EXTENSION-SYSTEM.md

@@ -858,41 +858,11 @@ def should_execute_hook(hook: dict, config: dict) -> bool:
 
 ## Extension Discovery & Catalog
 
-### Dual Catalog System
+### Central Catalog
-
-Spec Kit uses two catalog files with different purposes:
-
-#### User Catalog (`catalog.json`)
 
 **URL**: `https://raw.githubusercontent.com/github/spec-kit/main/extensions/catalog.json`
 
-- **Purpose**: Organization's curated catalog of approved extensions
+**Format**:
-- **Default State**: Empty by design - users populate with extensions they trust
-- **Usage**: Default catalog used by `specify extension` CLI commands
-- **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**: Browse to discover extensions, then copy to your `catalog.json`
-
-**How It Works:**
-
-1. **Discover**: Browse `catalog.community.json` to find available extensions
-2. **Review**: Evaluate extensions for security, quality, and organizational fit
-3. **Curate**: Copy approved extension entries from community catalog to your `catalog.json`
-4. **Install**: Use `specify extension add <name>` (pulls from your curated catalog)
-
-This approach gives organizations full control over which extensions are available to their teams while maintaining a shared community resource for discovery.
-
-### Catalog Format
-
-**Format** (same for both catalogs):
 
 ```json
 {
@@ -961,52 +931,25 @@ specify extension info jira
 
 ### Custom Catalogs
 
-**⚠️ FUTURE FEATURE - NOT YET IMPLEMENTED**
+Organizations can host private catalogs:
-
-The following catalog management commands are proposed design concepts but are not yet available in the current implementation:
 
 ```bash
-# Add custom catalog (FUTURE - NOT AVAILABLE)
+# Add custom catalog
 specify extension add-catalog https://internal.company.com/spec-kit/catalog.json
 
-# Set as default (FUTURE - NOT AVAILABLE)
+# Set as default
 specify extension set-catalog --default https://internal.company.com/spec-kit/catalog.json
 
-# List catalogs (FUTURE - NOT AVAILABLE)
+# List catalogs
 specify extension catalogs
 ```
 
-**Proposed catalog priority** (future design):
+**Catalog priority**:
 
-1. Project-specific catalog (`.specify/extension-catalogs.yml`) - *not implemented*
+1. Project-specific catalog (`.specify/extension-catalogs.yml`)
-2. User-level catalog (`~/.specify/extension-catalogs.yml`) - *not implemented*
+2. User-level catalog (`~/.specify/extension-catalogs.yml`)
 3. Default GitHub catalog
 
-#### Current Implementation: SPECKIT_CATALOG_URL
-
-**The currently available method** for using custom catalogs is the `SPECKIT_CATALOG_URL` environment variable:
-
-```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
-```
-
 ---
 
 ## CLI Commands

extensions/catalog.community.json

@@ -1,6 +1,6 @@
 {
   "schema_version": "1.0",
-  "updated_at": "2026-03-03T00:00:00Z",
+  "updated_at": "2026-02-24T00:00:00Z",
   "catalog_url": "https://raw.githubusercontent.com/github/spec-kit/main/extensions/catalog.community.json",
   "extensions": {
     "cleanup": {
@@ -55,32 +55,6 @@
       "created_at": "2026-02-24T00:00:00Z",
       "updated_at": "2026-02-24T00: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"
-    },
     "v-model": {
       "name": "V-Model Extension Pack",
       "id": "v-model",
@@ -106,32 +80,6 @@
       "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"
     }
   }
 }

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "specify-cli"
-version = "0.1.13"
+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 = [
@@ -51,3 +51,4 @@ precision = 2
 show_missing = true
 skip_covered = false
 
+

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"
@@ -279,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
+    git checkout -b "$BRANCH_NAME"
-        # 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
 else
     >&2 echo "[specify] Warning: Git repository not detected; skipped branch creation for $BRANCH_NAME"
 fi

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, Kiro CLI, or Antigravity
+#    - 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|kiro-cli|agy|bob|qodercli
+# 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
@@ -73,7 +73,7 @@ CODEBUDDY_FILE="$REPO_ROOT/CODEBUDDY.md"
 QODER_FILE="$REPO_ROOT/QODER.md"
 AMP_FILE="$REPO_ROOT/AGENTS.md"
 SHAI_FILE="$REPO_ROOT/SHAI.md"
-KIRO_FILE="$REPO_ROOT/AGENTS.md"
+Q_FILE="$REPO_ROOT/AGENTS.md"
 AGY_FILE="$REPO_ROOT/.agent/rules/specify-rules.md"
 BOB_FILE="$REPO_ROOT/AGENTS.md"
 
@@ -355,15 +355,6 @@ create_new_agent_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
 }
 
@@ -501,17 +492,6 @@ 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"
@@ -648,8 +628,8 @@ update_specific_agent() {
         shai)
             update_agent_file "$SHAI_FILE" "SHAI"
             ;;
-        kiro-cli)
+        q)
-            update_agent_file "$KIRO_FILE" "Kiro CLI"
+            update_agent_file "$Q_FILE" "Amazon Q Developer CLI"
             ;;
         agy)
             update_agent_file "$AGY_FILE" "Antigravity"
@@ -662,7 +642,7 @@ update_specific_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|kiro-cli|agy|bob|qodercli|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
@@ -737,8 +717,8 @@ update_all_existing_agents() {
         found_agent=true
     fi
 
-    if [[ -f "$KIRO_FILE" ]]; then
+    if [[ -f "$Q_FILE" ]]; then
-        update_agent_file "$KIRO_FILE" "Kiro CLI"
+        update_agent_file "$Q_FILE" "Amazon Q Developer CLI"
         found_agent=true
     fi
 
@@ -775,7 +755,7 @@ print_summary() {
     
     echo
 
-    log_info "Usage: $0 [claude|gemini|copilot|cursor-agent|qwen|opencode|codex|windsurf|kilocode|auggie|roo|codebuddy|amp|shai|kiro-cli|agy|bob|qodercli]"
+    log_info "Usage: $0 [claude|gemini|copilot|cursor-agent|qwen|opencode|codex|windsurf|kilocode|auggie|roo|codebuddy|amp|shai|q|agy|bob|qodercli]"
 }
 
 #==============================================================================
@@ -827,3 +807,4 @@ main() {
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
     main "$@"
 fi
+

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 -b $branchName 2>$null | Out-Null
+        git checkout -b $branchName | Out-Null
-        if ($LASTEXITCODE -eq 0) {
-            $branchCreated = $true
-        }
     } catch {
-        # Exception during git command
+        Write-Warning "Failed to create git branch: $branchName"
-    }
-
-    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
-        }
     }
 } else {
     Write-Warning "[specify] Warning: Git repository not detected; skipped branch creation for $branchName"

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, kiro-cli, agy, bob, qodercli)
+ 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','kiro-cli','agy','bob','qodercli','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,7 +58,7 @@ $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'
-$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'
 
@@ -258,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
@@ -340,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
 }
@@ -399,11 +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' }
-        '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' }
         '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|kiro-cli|agy|bob|qodercli|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 }
     }
 }
 
@@ -423,7 +411,7 @@ 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 $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 (-not $found) {
@@ -440,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|kiro-cli|agy|bob|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 {
@@ -461,3 +449,4 @@ function Main {
 }
 
 Main
+

src/specify_cli/__init__.py

@@ -216,11 +216,11 @@ AGENT_CONFIG = {
         "install_url": None,  # IDE-based
         "requires_cli": False,
     },
-    "kiro-cli": {
+    "q": {
-        "name": "Kiro CLI",
+        "name": "Amazon Q Developer CLI",
-        "folder": ".kiro/",
+        "folder": ".amazonq/",
         "commands_subdir": "prompts",  # Special: uses prompts/ not commands/
-        "install_url": "https://kiro.dev/docs/cli/",
+        "install_url": "https://aws.amazon.com/developer/learning/q-developer-cli/",
         "requires_cli": True,
     },
     "amp": {
@@ -260,34 +260,6 @@ AGENT_CONFIG = {
     },
 }
 
-AI_ASSISTANT_ALIASES = {
-    "kiro": "kiro-cli",
-}
-
-def _build_ai_assistant_help() -> str:
-    """Build the --ai help text from AGENT_CONFIG so it stays in sync with runtime config."""
-
-    non_generic_agents = sorted(agent for agent in AGENT_CONFIG if agent != "generic")
-    base_help = (
-        f"AI assistant to use: {', '.join(non_generic_agents)}, "
-        "or generic (requires --ai-commands-dir)."
-    )
-
-    if not AI_ASSISTANT_ALIASES:
-        return base_help
-
-    alias_phrases = []
-    for alias, target in sorted(AI_ASSISTANT_ALIASES.items()):
-        alias_phrases.append(f"'{alias}' as an alias for '{target}'")
-
-    if len(alias_phrases) == 1:
-        aliases_text = alias_phrases[0]
-    else:
-        aliases_text = ', '.join(alias_phrases[:-1]) + ' and ' + alias_phrases[-1]
-
-    return base_help + " Use " + aliases_text + "."
-AI_ASSISTANT_HELP = _build_ai_assistant_help()
-
 SCRIPT_TYPE_CHOICES = {"sh": "POSIX Shell (bash/zsh)", "ps": "PowerShell"}
 
 CLAUDE_LOCAL_PATH = Path.home() / ".claude" / "local" / "claude"
@@ -562,12 +534,7 @@ def check_tool(tool: str, tracker: StepTracker = None) -> bool:
                 tracker.complete(tool, "available")
             return True
     
-    if tool == "kiro-cli":
+    found = shutil.which(tool) is not None
-        # Kiro currently supports both executable names. Prefer kiro-cli and
-        # accept kiro as a compatibility fallback.
-        found = shutil.which("kiro-cli") is not None or shutil.which("kiro") is not None
-    else:
-        found = shutil.which(tool) is not None
     
     if tracker:
         if found:
@@ -1247,7 +1214,7 @@ def install_ai_skills(project_path: Path, selected_ai: str, tracker: StepTracker
 @app.command()
 def init(
     project_name: str = typer.Argument(None, help="Name for your new project directory (optional if using --here, or use '.' for current directory)"),
-    ai_assistant: str = typer.Option(None, "--ai", help=AI_ASSISTANT_HELP),
+    ai_assistant: str = typer.Option(None, "--ai", help="AI assistant to use: claude, gemini, copilot, cursor-agent, qwen, opencode, codex, windsurf, kilocode, auggie, codebuddy, amp, shai, q, agy, bob, qodercli, or generic (requires --ai-commands-dir)"),
     ai_commands_dir: str = typer.Option(None, "--ai-commands-dir", help="Directory for agent command files (required with --ai generic, e.g. .myagent/commands/)"),
     script_type: str = typer.Option(None, "--script", help="Script type to use: sh or ps"),
     ignore_agent_tools: bool = typer.Option(False, "--ignore-agent-tools", help="Skip checks for AI agent tools like Claude Code"),
@@ -1303,9 +1270,6 @@ def init(
         console.print("[yellow]Example:[/yellow] specify init --ai generic --ai-commands-dir .myagent/commands/")
         raise typer.Exit(1)
 
-    if ai_assistant:
-        ai_assistant = AI_ASSISTANT_ALIASES.get(ai_assistant, ai_assistant)
-
     if project_name == ".":
         here = True
         project_name = None  # Clear project_name to use existing validation logic
@@ -1500,9 +1464,8 @@ def init(
                 if skills_ok and not here:
                     agent_cfg = AGENT_CONFIG.get(selected_ai, {})
                     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"
                         if cmds_dir.exists():
                             try:
                                 shutil.rmtree(cmds_dir)
@@ -2387,3 +2350,4 @@ def main():
 
 if __name__ == "__main__":
     main()
+

src/specify_cli/extensions.py

@@ -455,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():
@@ -603,7 +597,7 @@ class CommandRegistrar:
             "dir": ".github/agents",
             "format": "markdown",
             "args": "$ARGUMENTS",
-            "extension": ".agent.md"
+            "extension": ".md"
         },
         "cursor": {
             "dir": ".cursor/commands",
@@ -659,8 +653,8 @@ class CommandRegistrar:
             "args": "$ARGUMENTS",
             "extension": ".md"
         },
-        "kiro-cli": {
+        "q": {
-            "dir": ".kiro/prompts",
+            "dir": ".amazonq/prompts",
             "format": "markdown",
             "args": "$ARGUMENTS",
             "extension": ".md"
@@ -877,40 +871,16 @@ class CommandRegistrar:
             dest_file = commands_dir / f"{cmd_name}{agent_config['extension']}"
             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.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,
@@ -1812,3 +1782,4 @@ class HookExecutor:
 
         self.save_project_config(config)
 
+

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 exists, append to existing file
-     - If file does NOT exist: Create new file and number items starting from CHK001
+   - Number items sequentially 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)
+   - Each `/speckit.checklist` run creates a NEW file (never overwrites existing checklists)
-   - Never delete or replace existing checklist content - always preserve and append
 
    **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

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").

templates/commands/implement.md

@@ -88,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`, `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/`

tests/test_agent_config_consistency.py

@@ -1,99 +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_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/workflows", ps_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

tests/test_ai_skills.py

@@ -162,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")
@@ -465,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")
 
@@ -489,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()
 
@@ -497,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
@@ -539,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()
@@ -570,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()
@@ -664,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."""

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"
-            )

tests/test_extensions.py

@@ -399,12 +399,6 @@ class TestExtensionManager:
 class TestCommandRegistrar:
     """Test CommandRegistrar command registration."""
 
-    def test_kiro_cli_agent_config_present(self):
-        """Kiro CLI should be mapped to .kiro/prompts and legacy q removed."""
-        assert "kiro-cli" in CommandRegistrar.AGENT_CONFIGS
-        assert CommandRegistrar.AGENT_CONFIGS["kiro-cli"]["dir"] == ".kiro/prompts"
-        assert "q" not in CommandRegistrar.AGENT_CONFIGS
-
     def test_parse_frontmatter_valid(self):
         """Test parsing valid YAML frontmatter."""
         content = """---
@@ -526,121 +520,6 @@ $ARGUMENTS
         assert (claude_dir / "speckit.alias.cmd.md").exists()
         assert (claude_dir / "speckit.shortcut.md").exists()
 
-    def test_register_commands_for_copilot(self, extension_dir, project_dir):
-        """Test registering commands for Copilot agent with .agent.md extension."""
-        # Create .github/agents directory (Copilot project)
-        agents_dir = project_dir / ".github" / "agents"
-        agents_dir.mkdir(parents=True)
-
-        manifest = ExtensionManifest(extension_dir / "extension.yml")
-
-        registrar = CommandRegistrar()
-        registered = registrar.register_commands_for_agent(
-            "copilot", manifest, extension_dir, project_dir
-        )
-
-        assert len(registered) == 1
-        assert "speckit.test.hello" in registered
-
-        # Verify command file uses .agent.md extension
-        cmd_file = agents_dir / "speckit.test.hello.agent.md"
-        assert cmd_file.exists()
-
-        # Verify NO plain .md file was created
-        plain_md_file = agents_dir / "speckit.test.hello.md"
-        assert not plain_md_file.exists()
-
-        content = cmd_file.read_text()
-        assert "description: Test hello command" in content
-        assert "<!-- Extension: test-ext -->" in content
-
-    def test_copilot_companion_prompt_created(self, extension_dir, project_dir):
-        """Test that companion .prompt.md files are created in .github/prompts/."""
-        agents_dir = project_dir / ".github" / "agents"
-        agents_dir.mkdir(parents=True)
-
-        manifest = ExtensionManifest(extension_dir / "extension.yml")
-
-        registrar = CommandRegistrar()
-        registrar.register_commands_for_agent(
-            "copilot", manifest, extension_dir, project_dir
-        )
-
-        # Verify companion .prompt.md file exists
-        prompt_file = project_dir / ".github" / "prompts" / "speckit.test.hello.prompt.md"
-        assert prompt_file.exists()
-
-        # Verify content has correct agent frontmatter
-        content = prompt_file.read_text()
-        assert content == "---\nagent: speckit.test.hello\n---\n"
-
-    def test_copilot_aliases_get_companion_prompts(self, project_dir, temp_dir):
-        """Test that aliases also get companion .prompt.md files for Copilot."""
-        import yaml
-
-        ext_dir = temp_dir / "ext-alias-copilot"
-        ext_dir.mkdir()
-
-        manifest_data = {
-            "schema_version": "1.0",
-            "extension": {
-                "id": "ext-alias-copilot",
-                "name": "Extension with Alias",
-                "version": "1.0.0",
-                "description": "Test",
-            },
-            "requires": {"speckit_version": ">=0.1.0"},
-            "provides": {
-                "commands": [
-                    {
-                        "name": "speckit.alias-copilot.cmd",
-                        "file": "commands/cmd.md",
-                        "aliases": ["speckit.shortcut-copilot"],
-                    }
-                ]
-            },
-        }
-
-        with open(ext_dir / "extension.yml", "w") as f:
-            yaml.dump(manifest_data, f)
-
-        (ext_dir / "commands").mkdir()
-        (ext_dir / "commands" / "cmd.md").write_text(
-            "---\ndescription: Test\n---\n\nTest"
-        )
-
-        # Set up Copilot project
-        (project_dir / ".github" / "agents").mkdir(parents=True)
-
-        manifest = ExtensionManifest(ext_dir / "extension.yml")
-        registrar = CommandRegistrar()
-        registered = registrar.register_commands_for_agent(
-            "copilot", manifest, ext_dir, project_dir
-        )
-
-        assert len(registered) == 2
-
-        # Both primary and alias get companion .prompt.md
-        prompts_dir = project_dir / ".github" / "prompts"
-        assert (prompts_dir / "speckit.alias-copilot.cmd.prompt.md").exists()
-        assert (prompts_dir / "speckit.shortcut-copilot.prompt.md").exists()
-
-    def test_non_copilot_agent_no_companion_file(self, extension_dir, project_dir):
-        """Test that non-copilot agents do NOT create .prompt.md files."""
-        claude_dir = project_dir / ".claude" / "commands"
-        claude_dir.mkdir(parents=True)
-
-        manifest = ExtensionManifest(extension_dir / "extension.yml")
-
-        registrar = CommandRegistrar()
-        registrar.register_commands_for_agent(
-            "claude", manifest, extension_dir, project_dir
-        )
-
-        # No .github/prompts directory should exist
-        prompts_dir = project_dir / ".github" / "prompts"
-        assert not prompts_dir.exists()
-
 
 # ===== Utility Function Tests =====
 
@@ -717,31 +596,6 @@ class TestIntegration:
         assert not cmd_file.exists()
         assert len(manager.list_installed()) == 0
 
-    def test_copilot_cleanup_removes_prompt_files(self, extension_dir, project_dir):
-        """Test that removing a Copilot extension also removes .prompt.md files."""
-        agents_dir = project_dir / ".github" / "agents"
-        agents_dir.mkdir(parents=True)
-
-        manager = ExtensionManager(project_dir)
-        manager.install_from_directory(extension_dir, "0.1.0", register_commands=True)
-
-        # Verify copilot was detected and registered
-        metadata = manager.registry.get("test-ext")
-        assert "copilot" in metadata["registered_commands"]
-
-        # Verify files exist before cleanup
-        agent_file = agents_dir / "speckit.test.hello.agent.md"
-        prompt_file = project_dir / ".github" / "prompts" / "speckit.test.hello.prompt.md"
-        assert agent_file.exists()
-        assert prompt_file.exists()
-
-        # Use the extension manager to remove — exercises the copilot prompt cleanup code
-        result = manager.remove("test-ext")
-        assert result is True
-
-        assert not agent_file.exists()
-        assert not prompt_file.exists()
-
     def test_multiple_extensions(self, temp_dir, project_dir):
         """Test installing multiple extensions."""
         import yaml