Skip to content

Commit 64a50de

Browse files
committed
chore: merge upstream 0.12.2 into fork (0.12.2+adlc1)
Upstream commits merged (19): - Retire iflow/roo/windsurf integrations (github#3166, github#3167, github#3168, github#3211, github#3212, github#3213) - Move version_satisfies to _utils.py, allow prereleases (github#2695) - Workflow fan-out max_concurrency via bounded thread pool (github#3224) - Reject bool max_iterations in while/do-while validation (github#3237) - bash 3.2 portability: echo→printf, ${word^^}→tr (github#3192) - --no-persist in common.sh for read-only path resolution (github#3025) - Reject host-less catalog URLs (github#3209, github#3227) - Extension updates: Intake v0.1.3, Architecture Workflow v1.2.2, Repository Governance, Workflow Preset v1.3.11 - Release 0.12.1 → 0.12.2 → 0.12.3.dev0 (github#3253, github#3259) - CI Python matrix alignment + bash 3.2 portability (github#3244) - Docs: Windsurf→Kilo Code references throughout Conflicts resolved (2): - pyproject.toml: kept fork name/description, bumped to 0.12.2+adlc1 - AGENTS.md: accepted upstream's condensed agent table (retired agents removed) Assisted-by: opencode (model: glm-5.2, supervised)
2 parents d402fd2 + 36501d4 commit 64a50de

54 files changed

Lines changed: 1054 additions & 395 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.devcontainer/devcontainer.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@
4848
"openai.chatgpt",
4949
// Kilo Code
5050
"kilocode.Kilo-Code",
51-
// Roo Code
52-
"RooVeterinaryInc.roo-cline",
5351
// Claude Code
5452
"anthropic.claude-code"
5553
],

‎.github/ISSUE_TEMPLATE/agent_request.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ body:
88
value: |
99
Thanks for requesting a new agent! Before submitting, please check if the agent is already supported.
1010
11-
**Currently supported agents**: Amp, Antigravity, Auggie CLI, Claude Code, Cline, CodeBuddy, Codex CLI, Cursor, Devin for Terminal, Firebender, Forge, Gemini CLI, GitHub Copilot, Goose, Hermes Agent, IBM Bob, iFlow CLI, Junie, Kilo Code, Kimi Code, Kiro CLI, Lingma, Mistral Vibe, Oh My Pi, opencode, Pi Coding Agent, Qoder CLI, Qwen Code, Roo Code, RovoDev ACLI, SHAI, Tabnine CLI, Trae, Windsurf, ZCode, Zed
11+
**Currently supported agents**: Amp, Antigravity, Auggie CLI, Claude Code, Cline, CodeBuddy, Codex CLI, Cursor, Devin for Terminal, Firebender, Forge, Gemini CLI, GitHub Copilot, Goose, Hermes Agent, IBM Bob, Junie, Kilo Code, Kimi Code, Kiro CLI, Lingma, Mistral Vibe, Oh My Pi, opencode, Pi Coding Agent, Qoder CLI, Qwen Code, RovoDev ACLI, SHAI, Tabnine CLI, Trae, ZCode, Zed
1212
1313
- type: input
1414
id: agent-name

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ body:
7878
- Goose
7979
- Hermes Agent
8080
- IBM Bob
81-
- iFlow CLI
8281
- Junie
8382
- Kilo Code
8483
- Kimi Code
@@ -90,12 +89,10 @@ body:
9089
- Pi Coding Agent
9190
- Qoder CLI
9291
- Qwen Code
93-
- Roo Code
9492
- RovoDev ACLI
9593
- SHAI
9694
- Tabnine CLI
9795
- Trae
98-
- Windsurf
9996
- ZCode
10097
- Zed
10198
- Not applicable

‎.github/ISSUE_TEMPLATE/feature_request.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ body:
7272
- Goose
7373
- Hermes Agent
7474
- IBM Bob
75-
- iFlow CLI
7675
- Junie
7776
- Kilo Code
7877
- Kimi Code
@@ -84,12 +83,10 @@ body:
8483
- Pi Coding Agent
8584
- Qoder CLI
8685
- Qwen Code
87-
- Roo Code
8886
- RovoDev ACLI
8987
- SHAI
9088
- Tabnine CLI
9189
- Trae
92-
- Windsurf
9390
- ZCode
9491
- Zed
9592
- Not applicable

‎.github/workflows/lint.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,16 @@ jobs:
5454
# (notably SC2155). Tighten in a follow-up after cleanup.
5555
- name: Run shellcheck on shell scripts
5656
run: git ls-files -z -- '*.sh' | xargs -0 shellcheck --severity=error
57+
58+
# macOS ships bash 3.2, where bash 4+ case-modification parameter
59+
# expansions error with "bad substitution". shellcheck assumes bash 4+
60+
# from the shebang and cannot flag these, so guard explicitly; use tr
61+
# for portable case conversion.
62+
- name: Reject bash 4+ case-modification expansions
63+
run: |
64+
matches=$(git ls-files -z -- '*.sh' | xargs -0 grep -nE '\$\{[A-Za-z_][A-Za-z0-9_]*(\[[^]]*\])?(\^\^?|,,?|~~?|@[UuLl])[^}]*\}' || true)
65+
if [ -n "$matches" ]; then
66+
echo "Found bash 4+ case-modification expansion(s); use tr for portability (macOS ships bash 3.2):"
67+
echo "$matches"
68+
exit 1
69+
fi

‎.github/workflows/test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Set up Python
2222
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6
2323
with:
24-
python-version: "3.13"
24+
python-version: "3.14"
2525

2626
- name: Run ruff check
2727
run: uvx ruff check src/
@@ -30,8 +30,8 @@ jobs:
3030
runs-on: ${{ matrix.os }}
3131
strategy:
3232
matrix:
33-
os: [ubuntu-latest, windows-latest]
34-
python-version: ["3.11", "3.12", "3.13"]
33+
os: [ubuntu-latest, windows-latest, macos-latest]
34+
python-version: ["3.13", "3.14"]
3535
steps:
3636
- name: Checkout
3737
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0

‎AGENTS.md‎

Lines changed: 11 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ src/specify_cli/integrations/
2323
│ └── __init__.py # ClaudeIntegration class
2424
├── gemini/ # Example: TomlIntegration subclass
2525
│ └── __init__.py
26-
├── windsurf/ # Example: MarkdownIntegration subclass
26+
├── kilocode/ # Example: MarkdownIntegration subclass
2727
│ └── __init__.py
2828
├── copilot/ # Example: IntegrationBase subclass (custom setup)
2929
│ └── __init__.py
@@ -49,63 +49,25 @@ Specify supports multiple AI agents by generating agent-specific command files a
4949

5050
### Current Supported Agents
5151

52-
| Agent | Directory | Format | CLI Tool | Description |
53-
| -------------------------- | ---------------------- | -------- | --------------- | --------------------------- |
54-
| **Claude Code** | `.claude/commands/` | Markdown | `claude` | Anthropic's Claude Code CLI |
55-
| **Gemini CLI** | `.gemini/commands/` | TOML | `gemini` | Google's Gemini CLI |
56-
| **GitHub Copilot** | `.github/agents/` | Markdown | N/A (IDE-based) | GitHub Copilot in VS Code |
57-
| **Cursor** | `.cursor/commands/` | Markdown | N/A (IDE-based) | Cursor IDE (`--ai cursor-agent`) |
58-
| **Qwen Code** | `.qwen/commands/` | Markdown | `qwen` | Alibaba's Qwen Code CLI |
59-
| **opencode** | `.opencode/command/` | Markdown | `opencode` | opencode CLI |
60-
| **Codex CLI** | `.agents/skills/` | Markdown | `codex` | Codex CLI (`--ai codex --ai-skills`) |
61-
| **Windsurf** | `.windsurf/workflows/` | Markdown | N/A (IDE-based) | Windsurf IDE workflows |
62-
| **Junie** | `.junie/commands/` | Markdown | `junie` | Junie by JetBrains |
63-
| **Kilo Code** | `.kilocode/workflows/` | Markdown | N/A (IDE-based) | Kilo Code IDE |
64-
| **Auggie CLI** | `.augment/commands/` | Markdown | `auggie` | Auggie CLI |
65-
| **Roo Code** | `.roo/commands/` | Markdown | N/A (IDE-based) | Roo Code IDE |
66-
| **CodeBuddy CLI** | `.codebuddy/commands/` | Markdown | `codebuddy` | CodeBuddy CLI |
67-
| **Qoder CLI** | `.qoder/commands/` | Markdown | `qodercli` | Qoder CLI |
68-
| **Kiro CLI** | `.kiro/prompts/` | Markdown | `kiro-cli` | Kiro CLI |
69-
| **Amp** | `.agents/commands/` | Markdown | `amp` | Amp CLI |
70-
| **SHAI** | `.shai/commands/` | Markdown | `shai` | SHAI CLI |
71-
| **Tabnine CLI** | `.tabnine/agent/commands/` | TOML | `tabnine` | Tabnine CLI |
72-
| **Kimi Code** | `.kimi/skills/` | Markdown | `kimi` | Kimi Code CLI (Moonshot AI) |
73-
| **Pi Coding Agent** | `.pi/prompts/` | Markdown | `pi` | Pi terminal coding agent |
74-
| **iFlow CLI** | `.iflow/commands/` | Markdown | `iflow` | iFlow CLI (iflow-ai) |
75-
| **Forge** | `.forge/commands/` | Markdown | `forge` | Forge CLI (forgecode.dev) |
76-
| **IBM Bob** | `.bob/commands/` | Markdown | N/A (IDE-based) | IBM Bob IDE |
77-
| **Trae** | `.trae/rules/` | Markdown | N/A (IDE-based) | Trae IDE |
78-
| **Antigravity** | `.agent/commands/` | Markdown | N/A (IDE-based) | Antigravity IDE (`--ai agy --ai-skills`) |
79-
| **Mistral Vibe** | `.vibe/prompts/` | Markdown | `vibe` | Mistral Vibe CLI |
80-
| **Generic** | User-specified via `--ai-commands-dir` | Markdown | N/A | Bring your own agent |
81-
82-
### Step-by-Step Integration Guide
83-
84-
Follow these steps to add a new agent (using a hypothetical new agent as an example):
85-
86-
#### 1. Add to AGENT_CONFIG
87-
88-
**IMPORTANT**: Use the actual CLI tool name as the key, not a shortened version.
89-
90-
Add the new agent to the `AGENT_CONFIG` dictionary in `src/specify_cli/__init__.py`. This is the **single source of truth** for all agent metadata:
52+
**Minimal example — Markdown agent (Kilo Code):**
9153

9254
```python
93-
"""Windsurf IDE integration."""
55+
"""Kilo Code IDE integration."""
9456

9557
from ..base import MarkdownIntegration
9658

9759

98-
class WindsurfIntegration(MarkdownIntegration):
99-
key = "windsurf"
60+
class KilocodeIntegration(MarkdownIntegration):
61+
key = "kilocode"
10062
config = {
101-
"name": "Windsurf",
102-
"folder": ".windsurf/",
63+
"name": "Kilo Code",
64+
"folder": ".kilocode/",
10365
"commands_subdir": "workflows",
10466
"install_url": None,
10567
"requires_cli": False,
10668
}
10769
registrar_config = {
108-
"dir": ".windsurf/workflows",
70+
"dir": ".kilocode/workflows",
10971
"format": "markdown",
11072
"args": "$ARGUMENTS",
11173
"extension": ".md",
@@ -206,7 +168,7 @@ class CodexIntegration(SkillsIntegration):
206168
| `config` | Class attribute (dict) | Agent metadata: `name`, `folder`, `commands_subdir`, `install_url`, `requires_cli` |
207169
| `registrar_config` | Class attribute (dict) | Command output config: `dir`, `format`, `args` placeholder, file `extension` |
208170
209-
**Key design rule:** For CLI-based integrations (`requires_cli: True`), `key` must be the actual executable name (e.g., `"cursor-agent"` not `"cursor"`). This ensures `shutil.which(key)` works for CLI-tool checks without special-case mappings. IDE-based integrations (`requires_cli: False`) should use their canonical identifier (e.g., `"windsurf"`, `"copilot"`).
171+
**Key design rule:** For CLI-based integrations (`requires_cli: True`), `key` must be the actual executable name (e.g., `"cursor-agent"` not `"cursor"`). This ensures `shutil.which(key)` works for CLI-tool checks without special-case mappings. IDE-based integrations (`requires_cli: False`) should use their canonical identifier (e.g., `"kilocode"`, `"copilot"`).
210172
211173
### 3. Register it
212174
@@ -259,8 +221,8 @@ Only add custom setup logic when the agent needs non-standard behavior. Integrat
259221
specify init my-project --integration <key>
260222
261223
# Verify files were created in the commands directory configured by
262-
# config["folder"] + config["commands_subdir"] (for example, .windsurf/workflows/)
263-
ls -R my-project/.windsurf/workflows/
224+
# config["folder"] + config["commands_subdir"] (for example, .kilocode/workflows/)
225+
ls -R my-project/.kilocode/workflows/
264226
265227
# Uninstall cleanly
266228
cd my-project && specify integration uninstall <key>

‎CHANGELOG.md‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,23 @@
22

33
All notable changes to the Specify CLI and templates are documented here.
44

5+
# [0.12.2+adlc1] - 2026-06-30
6+
7+
### Changed
8+
9+
- **Upstream merge (0.12.1 → 0.12.2)**: Merged 19 upstream commits from `github/spec-kit`. Key changes adopted:
10+
- **Retired 3 integrations**: iflow (product discontinued), roo (extension shut down), windsurf (absorbed into Cognition Devin). Removed integration directories, registry entries, and test files.
11+
- **`version_satisfies` moved to `_utils.py`**: Consolidated from `extensions/__init__.py` into `_utils.py`, now allows prerelease builds (benefits fork's `+adlcN` version suffix). Updated imports in `extensions/__init__.py`, `presets/__init__.py`, and `test_extensions.py`.
12+
- **Workflow engine**: `max_concurrency` in fan-out via bounded thread pool (#3224); bool `max_iterations` rejection in while/do-while validation (#3237).
13+
- **Script portability**: bash 3.2 fixes (`echo`→`printf`, `${word^^}`→`tr`) in `create-new-feature.sh` and `create-new-feature-branch.sh` (#3192); `--no-persist` flag in `common.sh` for read-only path resolution (#3025).
14+
- **Extension updates**: Intake v0.1.3, Architecture Workflow v1.2.2, Repository Governance (community catalog), Workflow Preset v1.3.11.
15+
- **Docs**: Windsurf → Kilo Code references throughout AGENTS.md, docs/upgrade.md, docs/index.md.
16+
17+
### Conflicts Resolved
18+
19+
- `pyproject.toml`: Kept fork name/description, bumped to `0.12.2+adlc1`.
20+
- `AGENTS.md`: Accepted upstream's condensed agent table (removed retired agents).
21+
522
# [0.11.9+adlc9] - 2026-06-30
623

724
### Changed
@@ -2961,6 +2978,37 @@ This release migrates fork-specific customizations to a preset system to reduce
29612978

29622979
The following entries are from the upstream spec-kit project and are included for reference.
29632980

2981+
## [0.12.2] - 2026-06-30
2982+
2983+
### Changed
2984+
2985+
- fix(scripts): portable uppercase for branch-name acronym retention (bash 3.2) (#3192)
2986+
- chore: retire Windsurf integration — absorbed into Cognition Devin (#3168) (#3213)
2987+
- [extension] Update Intake extension to v0.1.3 (#3254)
2988+
- feat(workflows): honor max_concurrency in fan-out via a bounded thread pool (#3224)
2989+
- Update Architecture Workflow extension to v1.2.2 (#3255)
2990+
- Add Repository Governance extension to community catalog (#3252)
2991+
- Update Workflow Preset to v1.3.11 (#3251)
2992+
- chore: retire iflow integration — product discontinued (#3166) (#3211)
2993+
- docs(codebuddy): fix dead install links and CodeBuddy capitalization (#3172) (#3216)
2994+
- fix: reject host-less catalog URLs in base and preset validators (#3209) (#3227)
2995+
- chore: release 0.12.1, begin 0.12.2.dev0 development (#3253)
2996+
2997+
## [0.12.1] - 2026-06-30
2998+
2999+
### Changed
3000+
3001+
- chore: align CI Python matrix with devguide lifecycle + fix bash 3.2 portability (#3244)
3002+
- fix: stop check-prerequisites --paths-only from writing feature.json (#3025) (#3190)
3003+
- docs: document integration catalog subcommands (#3206)
3004+
- fix(scripts): use ASCII [OK] marker in initialize-repo.sh (parity with PowerShell twin) (#3231)
3005+
- docs: document integration `search`/`info`/`scaffold` subcommands (#3174) (#3194)
3006+
- docs: remove Cursor from `specify check` agent list (#3178) (#3193)
3007+
- fix(goose): repoint install_url and docs to goose-docs.ai (#3171) (#3215)
3008+
- fix(scripts): route 'Plan template not found' per --json in setup-plan.ps1 (parity with bash) (#3241)
3009+
- fix(bundle): send command errors to stderr so --json stdout stays parseable (#3235)
3010+
- chore: release 0.12.0, begin 0.12.1.dev0 development (#3243)
3011+
29643012
## [0.12.0] - 2026-06-29
29653013

29663014
### Changed

‎FORK.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ When a fork release changes only bundled extension behavior, keep the CLI versio
6565

6666
| Version | Date | Base Upstream | Changes |
6767
|---------|------|---------------|---------|
68+
| 0.12.2+adlc1 | 2026-06-30 | 0.12.2 | Merge upstream 0.12.2 (19 commits): retired iflow/roo/windsurf integrations, moved `version_satisfies` to `_utils.py` (allows prereleases), workflow fan-out `max_concurrency`, bool `max_iterations` rejection, bash 3.2 portability fixes, `--no-persist` in common.sh, extension catalog updates (Intake v0.1.3, Architecture Workflow v1.2.2, Repository Governance, Workflow Preset v1.3.11). 2 conflicts resolved (pyproject.toml, AGENTS.md). |
6869
| 0.11.9+adlc9 | 2026-06-30 | 0.11.9 | Fixed F811 ruff lint (duplicate `_locate_bundled_preset` import). Consolidated `_extension_fork.py` into `_core_fork.py` (three-tier → two-tier dependency graph). Agent-context opt-in alignment in `adlc.spec.plan` (conditional context-file update). |
6970
| 0.11.9+adlc4 | 2026-06-29 | 0.11.9 | Fixed 4 remaining CI test failures: Generic integration converge prefix mismatch (3 tests), eval.yml action SHA pinning (1 test). Pinned all 6 GitHub Actions to commit SHAs. All CI tests now pass. |
7071
| 0.11.9+adlc3 | 2026-06-29 | 0.11.9 | Merge upstream 2 new commits: community bundle submission issue template + docs (#3162), docs for /speckit.converge (#3181). All doc files already identical; only README.md required merge. Added new **Community Bundles** section to README with contribution link. Fixed 6 CI test failures: converge command keeps `speckit.` prefix (like taskstoissues); Firebender `_expected_files` accepts `project` kwarg + dedup; setup-plan test uses `SPECIFY_FEATURE_DIRECTORY`; PS `create-new-feature.ps1` null `$featureDir` fix; PS test uses correct extension script path. |

0 commit comments

Comments
 (0)