Skip to content

Merge upstream: 8 commits - fixes, extensions, and Mistral Vibe support#74

Merged
kanfil merged 9 commits intomainfrom
merge/upstream-main
Mar 9, 2026
Merged

Merge upstream: 8 commits - fixes, extensions, and Mistral Vibe support#74
kanfil merged 9 commits intomainfrom
merge/upstream-main

Conversation

@kanfil
Copy link
Member

@kanfil kanfil commented Mar 9, 2026

Summary

Merge all recent upstream changes from github/spec-kit into our fork (8 commits total).

Upstream Changes Merged

🐛 Bug Fixes (2 commits)

🚀 New Extensions (4 commits)

🤖 New Agent Support (1 commit)

📖 Documentation (1 commit)

Files Changed

File Changes
templates/commands/specify.md Fixed branch numbering instructions
extensions/catalog.community.json Added 4 new extensions (+186 lines)
extensions/README.md Updated extension documentation
src/specify_cli/__init__.py Added vibe agent support
README.md Added vibe agent, preserved detailed CLI docs
scripts/bash/update-agent-context.sh Added vibe agent handling
scripts/powershell/update-agent-context.ps1 Added vibe agent handling
3x release scripts Added vibe agent to release packages

Conflict Resolution

All conflicts resolved by keeping our fork's enhancements while adopting upstream's improvements:

specify.md: Kept --json flag requirement + upstream's clearer instructions
README.md: Preserved detailed CLI documentation + added vibe agent
Release scripts: Added vibe agent to all agent arrays
Namespace: Kept adlc.spec.* naming (our fork's convention)

Testing

  • ✅ All extension tests passing (45/45)
  • ✅ All trace command tests passing (12/12)
  • ✅ No breaking changes detected
  • ✅ All custom enhancements preserved
  • ✅ Merge conflict resolution verified

Benefits for Users

Bug Fixes:

  • Branch numbering now works correctly (001, 002, 003...)
  • Cleaner command templates

New Extensions:

  • Review Extension - Code review workflow
  • Fleet Orchestrator - Fleet management
  • Understanding - Documentation understanding
  • Ralph Loop - Iterative development

New Agent:

  • Mistral Vibe support for French AI model users

Our Enhancements Preserved:

  • Detailed CLI documentation
  • Extension system with bundling
  • adlc.* namespace conventions
  • All custom extensions (product, levelup, architect, tdd, quick)

Next Steps

After merge:

  • All users get bug fixes automatically
  • New extensions available in community catalog
  • Mistral Vibe users can use --ai vibe
  • No migration needed for existing projects

fsilvaortiz and others added 9 commits March 9, 2026 07:37
…ithub#1757)

* fix: remove per-short-name number detection from specify prompt

The specify.md prompt instructed the AI to search for existing branches
filtered by the exact short-name, causing every new feature to start at
001 since no branches matched the new short-name. The underlying
create-new-feature.sh script already has correct global numbering logic
via check_existing_branches() that searches ALL branches and spec
directories.

The fix removes the AI's flawed number-detection steps and tells it to
NOT pass --number, letting the script auto-detect the next globally
available number.

Closes github#1744
Closes github#1468

🤖 Generated with [Claude Code](https://claude.com/code)

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

* fix: clarify --json flag requirement per Copilot review

- Rephrased step 2 to mention both --short-name and --json flags
- Added explicit note to always include the JSON flag for reliable output parsing

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

---------

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
* Add Mistral Vibe support to Spec Kit

This commit adds comprehensive support for Mistral Vibe as an AI agent in the
Spec Kit project. The integration includes:

- Added Mistral Vibe to AGENT_CONFIG with proper CLI tool configuration
- Updated README.md with Mistral Vibe in supported agents table and examples
- Modified release package scripts to generate Mistral Vibe templates
- Updated both bash and PowerShell agent context update scripts
- Added appropriate CLI help text and documentation

Mistral Vibe is now fully supported with the same level of integration as
other CLI-based agents like Claude Code, Gemini CLI, etc.

Generated by Mistral Vibe.
Co-Authored-By: Mistral Vibe <vibe@mistral.ai>

* Add Mistral Vibe support to Spec Kit

- Added Mistral Vibe (vibe) to AGENT_CONFIG with proper TOML format support
- Updated CLI help text to include vibe as a valid AI assistant option
- Added Mistral Vibe to release scripts with correct .vibe/agents/ directory structure
- Updated agent context scripts (bash and PowerShell) with proper TOML file paths
- Added Mistral Vibe to README.md supported agents table with v2.0 slash command notes
- Used correct argument syntax {{args}} for Mistral Vibe TOML configurations

Mistral Vibe is now fully integrated with the same level of support as other
CLI-based agents like Gemini and Qwen. Users can now use specify init --ai vibe
to create projects with Mistral Vibe support.

Generated by Mistral Vibe.
Co-Authored-By: Mistral Vibe <vibe@mistral.ai>

* Add Vibe templates to GitHub release script

creation of Mistral vibe zip

* Add 'vibe' agent to release package script

* Add 'vibe' to the list of agents in create-release-packages.sh

* chore: bump version to v1.0.1 [skip ci]

* Add generic spec kit templates to release script

* chore: bump version to v1.0.2 [skip ci]

* Update project version to 0.1.5

* Add generic spec kit templates to release script

* Add 'generic' and 'qodercli' to agent list to be aligned

* Update supported agents in update-agent-context.sh to be aligned

* Update README with new AI assistant options to be aligned

* Document --ai-commands-dir option in README to be aligned

Added new option for AI commands directory in README.

* Fix formatting in README.md for init arguments to be aligned

* Update README with AI assistant options to be aligned

Added AI options to specify init arguments in README.

* Fix formatting in README.md for project-name argument

* Update expected agent types in update-agent-context.sh to be aligned

* Update agent types and usage in update-agent-context.ps1 to be aligned

* Add support for generic AI assistant configuration to be aligned

* Fix formatting in __init__.py clean space

* Update AI assistant options in init command to be aligned

* Add 'qodercli' to expected agent types to be aligned

* Remove 'vibe' case from release package script

Removed the 'vibe' case from the create-release-packages script.

* Update README.md

ok for this

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

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

ok to commit

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Add commands_subdir key to Mistral Vibe configuration

* Rename specify-agents.toml to specify-agents.md

* Update scripts/bash/update-agent-context.sh

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update .github/workflows/scripts/create-release-packages.sh

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update src/specify_cli/__init__.py

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update src/specify_cli/__init__.py

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Fix duplicate 'commands_subdir' in vibe configuration

Removed duplicate 'commands_subdir' entries for 'vibe'.

* Add support for 'vibe' command in release script

add an mkdir and generate command

* Change commands_subdir from 'commands' to 'prompts'

* Update README.md

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update update-agent-context.ps1

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update create-release-packages.sh

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update create-release-packages.ps1

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update agent list in update-agent-context.sh

Kiro

---------

Co-authored-by: Lénaïc Huard <lenaic@lhuard.fr>
Co-authored-by: Mistral Vibe <vibe@mistral.ai>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
- Extension ID: fleet
- Version: 1.0.0
- Author: sharathsatish
- Description: Orchestrate a full feature lifecycle with human-in-the-loop gates across all SpecKit phases
Add spec-kit-review to catalog.community.json
and the Available Community Extensions table in extensions/README.md.

Co-authored-by: Ismael <ismael.jimenez-martinez@bmw.de>
* Update README with project initialization instructions

Added instructions for creating a new project and initializing in an existing project.

* Update README.md with alternative one-time usage command for existing projects

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Added --ai option to prevent interactive AI selection

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
- Extension ID: ralph
- Version: 1.0.0
- Author: Rubiss
- Description: Autonomous implementation loop using AI agent CLI
* Add Understanding extension to community catalog

31 deterministic requirements quality metrics based on IEEE/ISO standards.
Catches ambiguity, missing testability, and structural issues before implementation.
Includes experimental energy-based ambiguity detection.

Repository: https://github.com/Testimonial/understanding
Commands: scan, validate, energy
Hook: after_tasks validation prompt

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

* Sort README table and catalog entries alphabetically

Move Understanding extension entry between Spec Sync and V-Model
to maintain alphabetical ordering in both files.

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

---------

Co-authored-by: Ladislav Bihari <ladislav.bihari@statsperform.com>
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
Upstream changes merged (8 commits total):
- fix: use global branch numbering instead of per-short-name detection (github#1757)
- fix: Remove duplicate options in specify.md (github#1765)
- feat: add review extension to community catalog (github#1775)
- feat: add fleet extension to community catalog (github#1771)
- feat: Integration of Mistral vibe support into speckit (github#1725)
- feat: Add Understanding extension to community catalog (github#1778)
- feat: Add ralph extension to community catalog (github#1780)
- docs: Update README with project initialization instructions (github#1772)

Conflict resolution:
- templates/commands/specify.md: Kept --json flag and clearer instructions
- README.md: Preserved detailed CLI docs + added vibe agent
- Release scripts: Added vibe agent support
- extensions/catalog.community.json: All 4 new extensions added (review, fleet, understanding, ralph)

All conflicts resolved by keeping our enhancements.
@kanfil kanfil merged commit f6f6580 into main Mar 9, 2026
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants