fix: converge prefix, Firebender expected_files, PS null featureDir, setup-plan env var

Merge upstream/main (2 commits: bundle submission + converge docs) and fix
6 CI test failures:

- converge command keeps speckit. prefix (like taskstoissues) in
  command_filename() — no fork preset alias exists for it
- Firebender _expected_files: accept project kwarg, pass to super() for
  fork-aware scanning, dedup with set() after .md->.mdc remap
- setup-plan test: use SPECIFY_FEATURE_DIRECTORY (full path) instead of
  SPECIFY_FEATURE (name only) to match get_feature_paths() resolution
- PS create-new-feature.ps1: move featureDir assignment before the
  already-exists check to prevent null Test-Path error
- PS test_branch_pattern_with_issue: reference create-new-feature-branch.ps1
  (extension script) not create-new-feature.ps1 (core script)

Version: 0.11.9+adlc3

Assisted-by: opencode (model: glm-5.2, autonomous)

Author: kanfil

CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to the Specify CLI and templates are documented here.
 
+# [0.11.9+adlc3] - 2026-06-29
+
+### Fixed
+
+- **converge command prefix**: Treated `converge` like `taskstoissues` — keeps `speckit.` prefix instead of fork `spec.` prefix in `command_filename()`, since `converge` is a new upstream command without a fork preset alias. Updated all three integration test base classes (Markdown, TOML, YAML) to include `converge` in the exception tuple.
+- **Firebender `_expected_files`**: Fixed signature to accept `project` kwarg and pass it to `super()`, enabling fork-aware project scanning. Added `set()` dedup to prevent duplicate `.mdc` entries after remapping.
+- **setup-plan.sh test**: Fixed `test_setup_plan_outputs_context_paths` to set `SPECIFY_FEATURE_DIRECTORY` (full path) instead of `SPECIFY_FEATURE` (feature name only), matching `get_feature_paths()` resolution logic.
+- **PowerShell `create-new-feature.ps1`**: Moved `$featureDir = Join-Path $specsDir $branchName` before the "already exists" check to prevent null `$featureDir` error in non-dry-run mode.
+- **PowerShell test script path**: Fixed `test_branch_pattern_with_issue` to reference `create-new-feature-branch.ps1` (extension script) instead of `create-new-feature.ps1` (core script).
+
+### Changed
+
+- **Align fork docs with upstream**: Merged upstream commits b7e67f55 (Add community bundle submission path) and 3e97b106 (Docs: Document /speckit.converge command). All docs files were already identical; only README.md needed merge resolution. Added a new **Community Bundles** section to the README with contribution link from upstream. Upstream's `/speckit.converge` docs are already present in fork with `spec.` prefix branding.
+
 # [0.11.9+adlc2] - 2026-06-29
 
 ### Added

FORK.md

@@ -58,15 +58,17 @@ Examples:
 
 ### Tag Format
 Use `agentic-sdlc-v<version>` with plus:
-- Version: `0.11.9+adlc1`
+- Version: `0.11.9+adlc3`
 
-- Tag: `agentic-sdlc-v0.11.9+adlc1`
+- Tag: `agentic-sdlc-v0.11.9+adlc3`
 When a fork release changes only bundled extension behavior, keep the CLI version on the upstream base (for example `0.10.0+adlc3`) and bump the affected extension manifest version independently (for example `extensions/git/extension.yml` to `1.5.0`).
 
 ### Version History
 
 | Version | Date | Base Upstream | Changes |
 |---------|------|---------------|---------|
+| 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.11.9+adlc2 | 2026-06-29 | 0.11.9 | Re-added `specify preset update` CLI command (registration lost during upstream merge). Fixed `test_e2e_branch_pattern_with_issue_config` to source `git-common.sh` (core `common.sh` no longer has `check_feature_branch`). |
 | 0.11.9+adlc1 | 2026-06-28 | 0.11.9 | Merge upstream 0.11.9 (15 commits): mandatory hook invocation enforcement (#2901), PowerShell branch-name acronym case-sensitivity fix (#3129), GHES private release asset resolution (#3157), community bundle submission path (#3162), docs for --force and --refresh-shared-infra (#3179). Fork fixes: relative imports in extensions/ and presets/ __init__.py, registered.append guard in agents.py, bundled extension update uses install_from_directory not catalog download. |
 | 0.11.8+adlc1 | 2026-06-28 | 0.11.8 | Merge upstream 0.11.8 (19 commits): standardized EXECUTE_COMMAND hook format across all core command templates; git extension aligned to upstream opt-in (removed --no-git flag); forked core and preset commands split their hook strategies (upstream's EXECUTE_COMMAND for core, fork's manifest-lookup dispatcher for presets); script delegation paths fixed (core -> git extension); workflow tests adapted to fork's run_and_tee streaming; bundled-extension update checks bundled version first. |
 | 0.10.0+adlc33 | 2026-06-22 | 0.10.0 | Orange accent theming sweep: replaced all 54 `[green]` Rich markup references with `accent()` across 8 files — every success message, checkmark symbol, and status indicator now uses `#f47721` orange instead of green. Affects `__init__.py`, `_init_fork.py`, `_version.py`, `_utils.py`, `_console.py`, `commands/init.py`, integrations/_install_commands.py, integrations/_migrate_commands.py, integrations/_query_commands.py. |

README.md

@@ -52,6 +52,7 @@ This fork represents the evolution from a development process to a complete orga
 - [🧩 Community Extensions](#-community-extensions)
 - [🎨 Community Presets](#-community-presets)
 - [🚶 Community Walkthroughs](#-community-walkthroughs)
+- [📦 Community Bundles](#-community-bundles)
 - [🎯 Core Features](#-core-features)
 - [📦 Bundled Extensions](#-bundled-extensions)
 - [🔧 Team AI Directives Integration](#-team-ai-directives-integration)
@@ -239,6 +240,12 @@ To submit your own preset, see the [Presets Publishing Guide](presets/PUBLISHING
 
 See Spec-Driven Development in action across different scenarios with community-contributed walkthroughs; find the full list on the [Community Walkthroughs](https://github.github.io/spec-kit/community/walkthroughs.html) page.
 
+## 📦 Community Bundles
+
+Community-contributed bundles package extensions, presets, workflows, and steps into a single role-oriented setup. See the [Community Bundles](https://github.github.io/spec-kit/community/bundles.html) page.
+
+Want to contribute? See the [Extension Publishing Guide](extensions/EXTENSION-PUBLISHING-GUIDE.md), the [Presets Publishing Guide](presets/PUBLISHING.md), or the [Community Bundles guide](docs/community/bundles.md).
+
 ## 🎯 Core Features
 
 This fork provides additional features beyond the upstream Spec Kit:

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agentic-sdlc-specify-cli"
-version = "0.11.9+adlc2"
+version = "0.11.9+adlc3"
 description = "Specify CLI (tikalk fork). Agentic SDLC toolkit for Spec-Driven Development with pre-installed extensions and AI integrations."
 readme = "README.md"
 requires-python = ">=3.11"

scripts/powershell/create-new-feature.ps1

@@ -269,6 +269,7 @@ if ($branchName.Length -gt $maxBranchLength) {
     Write-Warning "[specify] Truncated to: $branchName ($($branchName.Length) bytes)"
 }
 
+$featureDir = Join-Path $specsDir $branchName
 if (-not $DryRun) {
     if ((Test-Path -LiteralPath $featureDir -PathType Container) -and -not $AllowExistingBranch) {
         if ($Timestamp) {
@@ -280,7 +281,6 @@ if (-not $DryRun) {
     }
 }
 
-$featureDir = Join-Path $specsDir $branchName
 if (-not $DryRun) {
     New-Item -ItemType Directory -Path $featureDir -Force | Out-Null
 }

src/specify_cli/integrations/base.py

@@ -453,10 +453,11 @@ def command_filename(self, template_name: str) -> str:
 
         *template_name* is the stem of the source file (e.g. ``"plan"``).
         Default: ``spec.{template_name}.md`` (fork uses "spec" prefix).
-        Exception: ``taskstoissues`` keeps ``speckit.`` prefix for backwards compatibility.
+        Exceptions: ``taskstoissues`` and ``converge`` keep ``speckit.`` prefix
+        for backwards/upstream compatibility.
         Subclasses override to change the extension or naming convention.
         """
-        if template_name == "taskstoissues":
+        if template_name in ("taskstoissues", "converge"):
             return f"speckit.{template_name}.md"
         return f"spec.{template_name}.md"
 

tests/integrations/test_integration_base_markdown.py

@@ -275,7 +275,7 @@ def _expected_files(self, script_variant: str, project=None) -> list[str]:
         pfx = _cmd_prefix()
         for stem in self.COMMAND_STEMS:
             # taskstoissues and agent-context.update keep the speckit prefix
-            stem_pfx = "speckit" if stem in ("taskstoissues", "agent-context.update") else pfx
+            stem_pfx = "speckit" if stem in ("taskstoissues", "agent-context.update", "converge") else pfx
             files.append(f"{cmd_dir}/{stem_pfx}.{stem}.md")
 
         # Framework files

tests/integrations/test_integration_base_toml.py

@@ -508,7 +508,7 @@ def _expected_files(self, script_variant: str, project=None) -> list[str]:
         from tests.conftest import _cmd_prefix
         pfx = _cmd_prefix()
         for stem in self.COMMAND_STEMS:
-            stem_pfx = "speckit" if stem in ("taskstoissues", "agent-context.update") else pfx
+            stem_pfx = "speckit" if stem in ("taskstoissues", "agent-context.update", "converge") else pfx
             files.append(f"{cmd_dir}/{stem_pfx}.{stem}.toml")
 
         # Framework files

tests/integrations/test_integration_base_yaml.py

@@ -397,7 +397,7 @@ def _expected_files(self, script_variant: str, project=None) -> list[str]:
 
         # Command files (.yaml)
         for stem in self.COMMAND_STEMS:
-            stem_pfx = "speckit" if stem in ("taskstoissues", "agent-context.update") else pfx
+            stem_pfx = "speckit" if stem in ("taskstoissues", "agent-context.update", "converge") else pfx
             files.append(f"{cmd_dir}/{stem_pfx}.{stem}.yaml")
 
         # Framework files

tests/integrations/test_integration_firebender.py

@@ -34,12 +34,12 @@ def test_setup_creates_files(self, tmp_path):
             assert f.name.startswith("speckit.")
             assert f.name.endswith(".mdc")
 
-    def _expected_files(self, script_variant: str) -> list[str]:
+    def _expected_files(self, script_variant: str, project=None) -> list[str]:
         # Firebender emits ``.mdc`` command files, so remap the base mixin's
         # ``.md`` expectations for files under this integration's command dir.
         cmd_dir = get_integration(self.KEY).registrar_config["dir"]
         prefix = cmd_dir + "/"
-        return sorted(
+        return sorted(set(
             f[:-3] + ".mdc" if f.startswith(prefix) and f.endswith(".md") else f
-            for f in super()._expected_files(script_variant)
-        )
+            for f in super()._expected_files(script_variant, project=project)
+        ))