Skip to content

Merge upstream: branch fixes, new extensions, and Mistral Vibe support#73

Closed
kanfil wants to merge 6 commits intomainfrom
merge/upstream-main
Closed

Merge upstream: branch fixes, new extensions, and Mistral Vibe support#73
kanfil wants to merge 6 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.

Upstream Changes Merged

Bug Fixes

New Extensions

New Agent Support

Files Changed

  • templates/commands/specify.md - Fixed branch numbering instructions
  • extensions/catalog.community.json - Added review & fleet extensions
  • src/specify_cli/__init__.py - Added vibe agent support
  • README.md - Added vibe agent to supported agents list
  • scripts/bash/update-agent-context.sh - Added vibe agent
  • scripts/powershell/update-agent-context.ps1 - Added vibe agent
  • 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:

  • ✅ Kept --json flag requirement in specify.md
  • ✅ Kept adlc.spec.* namespace
  • ✅ Added vibe agent to all agent lists
  • ✅ Preserved detailed CLI documentation

Testing

  • ✅ All extension tests passing (45/45)
  • ✅ All trace command tests passing (12/12)
  • ✅ No breaking changes
  • ✅ All custom enhancements preserved

Benefits

  • Users get upstream bug fixes (branch numbering, duplicate options)
  • New community extensions available (review, fleet)
  • New agent support (Mistral Vibe)
  • Our enhancements preserved (detailed docs, extensions, adlc namespace)

fsilvaortiz and others added 6 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>
…port

Upstream changes merged:
- 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)

Conflict resolution:
- templates/commands/specify.md: Kept our namespace (adlc.spec.*) and --json flag requirement
- README.md: Added Mistral Vibe to supported agents and CLI options
- Release scripts: Added Mistral Vibe to agent arrays
- All release scripts now include vibe agent in ALL_AGENTS array

All 5 conflicts resolved successfully.
@kanfil
Copy link
Member Author

kanfil commented Mar 9, 2026

Superseded by updated PR with all 8 upstream commits

@kanfil kanfil closed this Mar 9, 2026
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.

6 participants