Merge upstream/main (v0.5.1) - preserve fork customizations

Author: kanfil

CHANGELOG.md

@@ -5,6 +5,16 @@ All notable 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 to [Semantic Versioning](https://semver.org/spec/v2.0.0/).
 
+## [0.4.0] - 2026-04-08
+
+### Changed
+
+- **Upstream merge**: Synced with github/spec-kit (v0.5.1)
+  - Added git extension stage 2 (GIT_BRANCH_NAME override, --force, auto-install tests)
+  - Added Branch Convention community extension
+  - Fixed alias compatibility for community extensions
+- **Test fixes**: Updated tests to match upstream validation messages and behavior
+
 ## [0.3.11] - 2026-04-04
 
 ### Added

FORK.md

@@ -371,4 +371,76 @@ uv run pytest
    uv run pytest
    ```
 3. **Check for conflicts**: `grep -rn "<<<<<<" src/`
-4. **Review recent changes**: `git log --oneline -10`
+4. **Review recent changes**: `git log --oneline -10`
+
+## Post-Merge Issues and Fixes
+
+This section documents issues encountered during upstream merges and how to resolve them.
+
+### Issue 1: Duplicate Validation Code Blocks
+
+**Problem**: During merge conflict resolution in `extensions.py`, the validation logic was duplicated - resulting in two blocks of similar code where only one should exist.
+
+**Location**: `src/specify_cli/extensions.py` lines ~569-625
+
+**Symptom**: Tests failed with:
+```
+ValidationError: Invalid command 'speckit.git.feature': must follow pattern '{extension}.{command}'
+```
+
+**Root Cause**: The conflict resolution kept both "ours" and "theirs" versions of the validation code, creating a second block that incorrectly validated commands using the alias pattern instead of the command pattern.
+
+**Fix**: Remove the duplicate validation block (the second one that re-validates using alias pattern).
+
+**Prevention**: After any merge with conflicts in `extensions.py`:
+- Search for duplicate code blocks: `grep -n "if kind ==" src/specify_cli/extensions.py`
+- Verify both command and alias patterns work correctly
+
+### Issue 2: Alias Namespace Strictness
+
+**Problem**: After fixing the duplicate code, aliases like `speckit.shortcut` failed because the namespace check expected aliases to match the extension ID exactly.
+
+**Symptom**:
+```
+ValidationError: Alias 'speckit.shortcut' must use extension namespace 'alias-shortcut'
+```
+
+**Root Cause**: The validation logic applied namespace checking to aliases with the same strictness as commands, but aliases can use any prefix (they're short-form alternatives).
+
+**Fix**: Only apply namespace validation to commands, not aliases:
+```python
+# Skip namespace validation for aliases - they can use any prefix
+if kind == "command":
+    if namespace != manifest.id:
+        raise ValidationError(...)
+```
+
+### Issue 3: Test Message Mismatches
+
+**Problem**: Tests failed because upstream changed validation error messages.
+
+**Examples**:
+- "must provide at least one command" → "must provide at least one command or hook"
+- Fork allowed short aliases, upstream rejected them
+
+**Fix**:
+- Update test assertions to match current validation messages
+- Change test behavior to match fork's intended functionality (e.g., allow short aliases)
+
+### Verification Commands
+
+After any merge, always verify:
+```bash
+# Verify patterns
+python3 -c "
+from src.specify_cli import ACCENT_COLOR
+from src.specify_cli.extensions import EXTENSION_COMMAND_NAME_PATTERN
+print('ACCENT_COLOR:', ACCENT_COLOR)
+print('Pattern:', EXTENSION_COMMAND_NAME_PATTERN.pattern)
+"
+# Expected: ACCENT_COLOR: #f47721
+# Expected: Pattern: ^(?:speckit|adlc)\.([a-z0-9-]+)\.([a-z0-9-]+)$
+
+# Run tests
+uv run pytest tests/test_extensions.py -v
+```

extensions/EXTENSION-API-REFERENCE.md

@@ -108,7 +108,7 @@ defaults:                # Optional, default configuration values
 #### `hooks`
 
 - **Type**: object
-- **Keys**: Event names (e.g., `after_specify`, `after_plan`, `after_tasks`, `after_implement`, `before_commit`)
+- **Keys**: Event names (e.g., `after_specify`, `after_plan`, `after_tasks`, `after_implement`, `before_analyze`)
 - **Description**: Hooks that execute at lifecycle events
 - **Events**: Defined by core spec-kit commands
 
@@ -559,8 +559,16 @@ Standard events (defined by core):
 - `after_tasks` - After task generation
 - `before_implement` - Before implementation
 - `after_implement` - After implementation
-- `before_commit` - Before git commit *(planned - not yet wired into core templates)*
-- `after_commit` - After git commit *(planned - not yet wired into core templates)*
+- `before_analyze` - Before cross-artifact analysis
+- `after_analyze` - After cross-artifact analysis
+- `before_checklist` - Before checklist generation
+- `after_checklist` - After checklist generation
+- `before_clarify` - Before spec clarification
+- `after_clarify` - After spec clarification
+- `before_constitution` - Before constitution update
+- `after_constitution` - After constitution update
+- `before_taskstoissues` - Before tasks-to-issues conversion
+- `after_taskstoissues` - After tasks-to-issues conversion
 
 ### Hook Configuration
 

extensions/EXTENSION-DEVELOPMENT-GUIDE.md

@@ -177,9 +177,9 @@ Compatibility requirements.
 
 What the extension provides.
 
-**Required sub-fields**:
+**Optional sub-fields**:
 
-- `commands`: Array of command objects (must have at least one)
+- `commands`: Array of command objects (at least one command or hook is required)
 
 **Command object**:
 
@@ -196,12 +196,19 @@ Integration hooks for automatic execution.
 
 Available hook points:
 
-- `after_tasks`: After `/speckit.tasks` completes
-- `after_implement`: After `/speckit.implement` completes (future)
+- `before_specify` / `after_specify`: Before/after specification generation
+- `before_plan` / `after_plan`: Before/after implementation planning
+- `before_tasks` / `after_tasks`: Before/after task generation
+- `before_implement` / `after_implement`: Before/after implementation
+- `before_analyze` / `after_analyze`: Before/after cross-artifact analysis
+- `before_checklist` / `after_checklist`: Before/after checklist generation
+- `before_clarify` / `after_clarify`: Before/after spec clarification
+- `before_constitution` / `after_constitution`: Before/after constitution update
+- `before_taskstoissues` / `after_taskstoissues`: Before/after tasks-to-issues conversion
 
 Hook object:
 
-- `command`: Command to execute (must be in `provides.commands`)
+- `command`: Command to execute (typically from `provides.commands`, but can reference any registered command)
 - `optional`: If true, prompt user before executing
 - `prompt`: Prompt text for optional hooks
 - `description`: Hook description

extensions/EXTENSION-USER-GUIDE.md

@@ -403,8 +403,10 @@ settings:
 
 # Hook configuration
 # Available events: before_specify, after_specify, before_plan, after_plan,
-#                   before_tasks, after_tasks, before_implement, after_implement
-# Planned (not yet wired into core templates): before_commit, after_commit
+#                   before_tasks, after_tasks, before_implement, after_implement,
+#                   before_analyze, after_analyze, before_checklist, after_checklist,
+#                   before_clarify, after_clarify, before_constitution, after_constitution,
+#                   before_taskstoissues, after_taskstoissues
 hooks:
   after_tasks:
     - extension: jira

extensions/catalog.community.json

@@ -1,6 +1,6 @@
 {
   "schema_version": "1.0",
-  "updated_at": "2026-04-03T12:35:01Z",
+  "updated_at": "2026-04-08T00:00:00Z",
   "catalog_url": "https://raw.githubusercontent.com/github/spec-kit/main/extensions/catalog.community.json",
   "extensions": {
     "aide": {
@@ -106,6 +106,73 @@
       "created_at": "2026-03-03T00:00:00Z",
       "updated_at": "2026-03-03T00:00:00Z"
     },
+    "branch-convention": {
+      "name": "Branch Convention",
+      "id": "branch-convention",
+      "description": "Configurable branch and folder naming conventions for /specify with presets and custom patterns.",
+      "author": "Quratulain-bilal",
+      "version": "1.0.0",
+      "download_url": "https://github.com/Quratulain-bilal/spec-kit-branch-convention/archive/refs/tags/v1.0.0.zip",
+      "repository": "https://github.com/Quratulain-bilal/spec-kit-branch-convention",
+      "homepage": "https://github.com/Quratulain-bilal/spec-kit-branch-convention",
+      "documentation": "https://github.com/Quratulain-bilal/spec-kit-branch-convention/blob/main/README.md",
+      "changelog": "https://github.com/Quratulain-bilal/spec-kit-branch-convention/blob/main/CHANGELOG.md",
+      "license": "MIT",
+      "requires": {
+        "speckit_version": ">=0.4.0"
+      },
+      "provides": {
+        "commands": 3,
+        "hooks": 1
+      },
+      "tags": [
+        "branch",
+        "naming",
+        "convention",
+        "gitflow",
+        "workflow"
+      ],
+      "verified": false,
+      "downloads": 0,
+      "stars": 0,
+      "created_at": "2026-04-08T00:00:00Z",
+      "updated_at": "2026-04-08T00:00:00Z"
+    },
+    "canon": {
+      "name": "Canon",
+      "id": "canon",
+      "description": "Adds canon-driven (baseline-driven) workflows: spec-first, code-first, spec-drift. Requires Canon Core preset installation.",
+      "author": "Maxim Stupakov",
+      "version": "0.1.0",
+      "download_url": "https://github.com/maximiliamus/spec-kit-canon/releases/download/v0.1.0/spec-kit-canon-v0.1.0.zip",
+      "repository": "https://github.com/maximiliamus/spec-kit-canon",
+      "homepage": "https://github.com/maximiliamus/spec-kit-canon",
+      "documentation": "https://github.com/maximiliamus/spec-kit-canon/blob/master/README.md",
+      "changelog": "https://github.com/maximiliamus/spec-kit-canon/blob/master/CHANGELOG.md",
+      "license": "MIT",
+      "requires": {
+        "speckit_version": ">=0.4.3"
+      },
+      "provides": {
+        "commands": 16,
+        "hooks": 0
+      },
+      "tags": [
+        "process",
+        "baseline",
+        "canon",
+        "drift",
+        "spec-first",
+        "code-first",
+        "spec-drift",
+        "vibecoding"
+      ],
+      "verified": false,
+      "downloads": 0,
+      "stars": 0,
+      "created_at": "2026-03-29T00:00:00Z",
+      "updated_at": "2026-03-29T00:00:00Z"
+    },
     "checkpoint": {
       "name": "Checkpoint Extension",
       "id": "checkpoint",
@@ -232,8 +299,8 @@
       "id": "confluence",
       "description": "Create, read, and update Confluence docs for your project",
       "author": "aaronrsun",
-      "version": "1.1.0",
-      "download_url": "https://github.com/aaronrsun/spec-kit-confluence/archive/refs/tags/v1.1.0.zip",
+      "version": "1.1.1",
+      "download_url": "https://github.com/aaronrsun/spec-kit-confluence/archive/refs/tags/v1.1.1.zip",
       "repository": "https://github.com/aaronrsun/spec-kit-confluence",
       "homepage": "https://github.com/aaronrsun/spec-kit-confluence",
       "documentation": "https://github.com/aaronrsun/spec-kit-confluence/blob/main/README.md",
@@ -1032,7 +1099,39 @@
       "created_at": "2026-03-14T00:00:00Z",
       "updated_at": "2026-03-14T00:00:00Z"
     },
-    "repoindex":{
+    "refine": {
+      "name": "Spec Refine",
+      "id": "refine",
+      "description": "Update specs in-place, propagate changes to plan and tasks, and diff impact across artifacts.",
+      "author": "Quratulain-bilal",
+      "version": "1.0.0",
+      "download_url": "https://github.com/Quratulain-bilal/spec-kit-refine/archive/refs/tags/v1.0.0.zip",
+      "repository": "https://github.com/Quratulain-bilal/spec-kit-refine",
+      "homepage": "https://github.com/Quratulain-bilal/spec-kit-refine",
+      "documentation": "https://github.com/Quratulain-bilal/spec-kit-refine/blob/main/README.md",
+      "changelog": "https://github.com/Quratulain-bilal/spec-kit-refine/blob/main/CHANGELOG.md",
+      "license": "MIT",
+      "requires": {
+        "speckit_version": ">=0.4.0"
+      },
+      "provides": {
+        "commands": 4,
+        "hooks": 2
+      },
+      "tags": [
+        "refine",
+        "iterate",
+        "propagation",
+        "workflow",
+        "specifications"
+      ],
+      "verified": false,
+      "downloads": 0,
+      "stars": 0,
+      "created_at": "2026-04-08T00:00:00Z",
+      "updated_at": "2026-04-08T00:00:00Z"
+    },
+    "repoindex": {
       "name": "Repository Index",
       "id": "repoindex",
       "description": "Generate index of your repo for overview, architecture and module",
@@ -1047,7 +1146,7 @@
       "requires": {
         "speckit_version": ">=0.1.0",
         "tools": [
-         {
+          {
             "name": "no need",
             "version": ">=1.0.0",
             "required": false
@@ -1401,8 +1500,8 @@
       "id": "v-model",
       "description": "Enforces V-Model paired generation of development specs and test specs with full traceability.",
       "author": "leocamello",
-      "version": "0.4.0",
-      "download_url": "https://github.com/leocamello/spec-kit-v-model/archive/refs/tags/v0.4.0.zip",
+      "version": "0.5.0",
+      "download_url": "https://github.com/leocamello/spec-kit-v-model/archive/refs/tags/v0.5.0.zip",
       "repository": "https://github.com/leocamello/spec-kit-v-model",
       "homepage": "https://github.com/leocamello/spec-kit-v-model",
       "documentation": "https://github.com/leocamello/spec-kit-v-model/blob/main/README.md",
@@ -1412,7 +1511,7 @@
         "speckit_version": ">=0.1.0"
       },
       "provides": {
-        "commands": 9,
+        "commands": 14,
         "hooks": 1
       },
       "tags": [
@@ -1426,7 +1525,7 @@
       "downloads": 0,
       "stars": 0,
       "created_at": "2026-02-20T00:00:00Z",
-      "updated_at": "2026-02-22T00:00:00Z"
+      "updated_at": "2026-04-06T00:00:00Z"
     },
     "verify": {
       "name": "Verify Extension",
@@ -1491,6 +1590,5 @@
       "created_at": "2026-03-16T00:00:00Z",
       "updated_at": "2026-03-16T00:00:00Z"
     }
-    
   }
 }